Merge remote-tracking branch 'strapi/master' into discordProvider

This commit is contained in:
DMehaffy 2018-07-29 12:30:41 -07:00
commit a2aefab312
49 changed files with 478 additions and 114 deletions

View File

@ -15,10 +15,10 @@ The most advanced open-source Content Management Framework to build powerful API
{% endcenter %}
## v3@alpha.12 is available!
## v3@alpha.13 is available!
We've been working on a major update for Strapi during the past months, rewriting the core framework and the dashboard.
This documentation is only related to Strapi v3@alpha.12 ([v1 documentation is still available](http://strapi.io/documentation/1.x.x)).
This documentation is only related to Strapi v3@alpha.13 ([v1 documentation is still available](http://strapi.io/documentation/1.x.x)).
**[Get Started](getting-started/installation.md)**<br />
Learn how to install Strapi and start developing your API.

View File

@ -213,9 +213,9 @@ Most of the application's configurations are defined by environment. It means th
"client": "postgres",
"host": "localhost",
"port": 5432,
"username": "aureliengeorget",
"password": "${process.env.USERNAME}",
"database": "${process.env.PWD}",
"username": "${process.env.USERNAME}",
"password": "${process.env.PWD}",
"database": "strapi",
"schema": "public"
},
"options": {
@ -228,7 +228,7 @@ Most of the application's configurations are defined by environment. It means th
"client": "mysql",
"host": "localhost",
"port": 5432,
"username": "aureliengeorget",
"username": "strapi",
"password": "root",
"database": ""
},

View File

@ -1,6 +1,6 @@
{
"private": true,
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"dependencies": {},
"devDependencies": {
"assert": "~1.3.0",

View File

@ -64,8 +64,14 @@ export function* pluginsGet() {
},
};
// Retrieve plugins list.
const availablePlugins = yield call(request, 'https://marketplace.strapi.io/plugins', opts);
let availablePlugins;
try {
// Retrieve plugins list.
availablePlugins = yield call(request, 'https://marketplace.strapi.io/plugins', opts);
} catch (e) {
availablePlugins = [];
}
yield put(getPluginsSucceeded(availablePlugins));
} catch(err) {

View File

@ -52,8 +52,14 @@ export function* pluginsGet() {
},
};
// Fetch plugins informations.
const availablePlugins = yield call(request, 'https://marketplace.strapi.io/plugins', opts);
let availablePlugins;
try {
// Fetch plugins informations.
availablePlugins = yield call(request, 'https://marketplace.strapi.io/plugins', opts);
} catch (e) {
availablePlugins = [];
}
// Add logo URL to object.
Object.keys(response[0].plugins).map(name => {

View File

@ -1,6 +1,6 @@
{
"name": "strapi-admin",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Strapi Admin",
"repository": {
"type": "git",
@ -31,8 +31,8 @@
},
"devDependencies": {
"sanitize.css": "^4.1.0",
"strapi-helper-plugin": "3.0.0-alpha.12.7.1",
"strapi-utils": "3.0.0-alpha.12.7.1"
"strapi-helper-plugin": "3.0.0-alpha.13.0.1",
"strapi-utils": "3.0.0-alpha.13.0.1"
},
"author": {
"name": "Strapi",
@ -51,4 +51,4 @@
"npm": ">= 5.0.0"
},
"license": "MIT"
}
}

View File

@ -0,0 +1,16 @@
root = true
[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[{package.json,*.yml}]
indent_style = space
indent_size = 2
[*.md]
trim_trailing_whitespace = false

View File

@ -0,0 +1,96 @@
############################
# OS X
############################
.DS_Store
.AppleDouble
.LSOverride
Icon
.Spotlight-V100
.Trashes
._*
############################
# Linux
############################
*~
############################
# Windows
############################
Thumbs.db
ehthumbs.db
Desktop.ini
$RECYCLE.BIN/
*.cab
*.msi
*.msm
*.msp
############################
# Packages
############################
*.7z
*.csv
*.dat
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
*.com
*.class
*.dll
*.exe
*.o
*.seed
*.so
*.swo
*.swp
*.swn
*.swm
*.out
*.pid
############################
# Logs and databases
############################
.tmp
*.log
*.sql
*.sqlite
############################
# Misc.
############################
*#
.idea
nbproject
############################
# Node.js
############################
lib-cov
lcov.info
pids
logs
results
build
node_modules
.node_history
package-lock.json
yarn.lock

View File

@ -0,0 +1,104 @@
############################
# OS X
############################
.DS_Store
.AppleDouble
.LSOverride
Icon
.Spotlight-V100
.Trashes
._*
############################
# Linux
############################
*~
############################
# Windows
############################
Thumbs.db
ehthumbs.db
Desktop.ini
$RECYCLE.BIN/
*.cab
*.msi
*.msm
*.msp
############################
# Packages
############################
*.7z
*.csv
*.dat
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
*.com
*.class
*.dll
*.exe
*.o
*.seed
*.so
*.swo
*.swp
*.swn
*.swm
*.out
*.pid
############################
# Logs and databases
############################
.tmp
*.log
*.sql
*.sqlite
############################
# Misc.
############################
*#
ssl
.editorconfig
.gitattributes
.idea
nbproject
############################
# Node.js
############################
lib-cov
lcov.info
pids
logs
results
build
node_modules
.node_history
############################
# Tests
############################
test

View File

@ -0,0 +1,7 @@
Copyright (c) 2018 Nikolay Tsenkov (nikolay@tsenkov.net).
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

View File

@ -0,0 +1,11 @@
# strapi-email-amazon-ses
## Resources
- [MIT License](LICENSE.md)
## Links
- [Strapi website](http://strapi.io/)
- [Strapi community on Slack](http://slack.strapi.io)
- [Strapi news on Twitter](https://twitter.com/strapijs)

View File

@ -0,0 +1,73 @@
'use strict';
/**
* Module dependencies
*/
/* eslint-disable import/no-unresolved */
/* eslint-disable prefer-template */
// Public node modules.
const _ = require('lodash');
const nodeSES = require('node-ses');
/* eslint-disable no-unused-vars */
module.exports = {
provider: 'amazon-ses',
name: 'Amazon SES',
auth: {
amazon_ses_default_from: {
label: 'Default From',
type: 'text'
},
amazon_ses_default_replyto: {
label: 'Default Reply-To',
type: 'text'
},
amazon_ses_api_key: {
label: 'Amazon Access key ID',
type: 'text'
},
amazon_ses_secret: {
label: 'Amazon Secret access key',
type: 'text'
}
},
init: (config) => {
var client = nodeSES.createClient({
key: config.amazon_ses_api_key,
secret: config.amazon_ses_secret
});
return {
send: (options, cb) => {
return new Promise((resolve, reject) => {
// Default values.
options = _.isObject(options) ? options : {};
options.from = options.from || config.amazon_ses_default_from;
options.replyTo = options.replyTo || config.amazon_ses_default_replyto;
options.text = options.text || options.html;
options.html = options.html || options.text;
let msg = {
from: options.from,
to: options.to,
replyTo: options.replyTo,
subject: options.subject,
altText: options.text,
message: options.html
};
client.sendEmail(msg, function (err) {
if (err) {
reject([{ messages: [{ id: 'Auth.form.error.email.invalid' }] }]);
} else {
resolve();
}
});
});
}
};
}
};

View File

@ -0,0 +1,45 @@
{
"name": "strapi-email-amazon-ses",
"version": "3.0.0-alpha.13",
"description": "Amazon SES provider for strapi email",
"homepage": "http://strapi.io",
"keywords": [
"email",
"strapi",
"amazon",
"ses"
],
"directories": {
"lib": "./lib"
},
"main": "./lib",
"dependencies": {
"node-ses": "^2.1.0"
},
"strapi": {
"isProvider": true
},
"author": {
"email": "nikolay@tsenkov.net",
"name": "Nikolay tsenkov"
},
"maintainers": [
{
"name": "Strapi team",
"email": "hi@strapi.io",
"url": "http://strapi.io"
}
],
"repository": {
"type": "git",
"url": "git://github.com/strapi/strapi.git"
},
"bugs": {
"url": "https://github.com/strapi/strapi/issues"
},
"engines": {
"node": ">= 9.0.0",
"npm": ">= 5.3.0"
},
"license": "MIT"
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-email-mailgun",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Mailgun provider for strapi email plugin",
"homepage": "http://strapi.io",
"keywords": [
@ -42,4 +42,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-email-sendgrid",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Sendgrid provider for strapi email",
"homepage": "http://strapi.io",
"keywords": [
@ -42,4 +42,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-email-sendmail",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Sendmail provider for strapi email",
"homepage": "http://strapi.io",
"keywords": [
@ -41,4 +41,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-admin",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Generate the default admin panel for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
@ -15,8 +15,8 @@
"dependencies": {
"fs-extra": "^4.0.1",
"lodash": "^4.17.4",
"strapi-admin": "3.0.0-alpha.12.7.1",
"strapi-utils": "3.0.0-alpha.12.7.1"
"strapi-admin": "3.0.0-alpha.13.0.1",
"strapi-utils": "3.0.0-alpha.13.0.1"
},
"author": {
"email": "hi@strapi.io",
@ -42,4 +42,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-api",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Generate an API for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-controller",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Generate a controller for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-model",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Generate a model for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-new",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Generate a new Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
@ -19,7 +19,7 @@
"listr": "^0.14.1",
"lodash": "^4.17.4",
"ora": "^2.1.0",
"strapi-utils": "3.0.0-alpha.12.7.1",
"strapi-utils": "3.0.0-alpha.13.0.1",
"uuid": "^3.1.0"
},
"scripts": {
@ -49,4 +49,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-plugin",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Generate an plugin for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
@ -44,4 +44,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-policy",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Generate a policy for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-service",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Generate a service for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Master of ceremonies for the Strapi generators.",
"homepage": "http://strapi.io",
"keywords": [
@ -17,7 +17,7 @@
"fs-extra": "^4.0.0",
"lodash": "^4.17.4",
"reportback": "^2.0.1",
"strapi-utils": "3.0.0-alpha.12.7.1"
"strapi-utils": "3.0.0-alpha.13.0.1"
},
"author": {
"name": "Strapi team",
@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-helper-plugin",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Helper for Strapi plugins development",
"engines": {
"node": ">= 9.0.0",
@ -115,4 +115,4 @@
"webpack-hot-middleware": "^2.18.2",
"whatwg-fetch": "^2.0.3"
}
}
}

View File

@ -402,7 +402,7 @@ module.exports = function(strapi) {
} else {
switch (attribute.type) {
case 'text':
type = 'text';
type = definition.client === 'pg' ? type = 'text' : 'longtext';
break;
case 'json':
type = definition.client === 'pg' ? 'jsonb' : 'longtext';

View File

@ -381,7 +381,7 @@ module.exports = {
[`${params.alias}_id`]: params.refId,
[`${params.alias}_type`]: params.ref,
field: params.field
}, _.isEmpty))
}, _.isUndefined))
.destroy();
}
};

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-bookshelf",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Bookshelf hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -20,8 +20,8 @@
"inquirer": "^5.2.0",
"lodash": "^4.17.4",
"pluralize": "^6.0.0",
"strapi-hook-knex": "3.0.0-alpha.12.7.1",
"strapi-utils": "3.0.0-alpha.12.7.1"
"strapi-hook-knex": "3.0.0-alpha.13.0.1",
"strapi-utils": "3.0.0-alpha.13.0.1"
},
"strapi": {
"dependencies": [
@ -55,4 +55,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-ejs",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "EJS hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-knex",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Knex hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -43,4 +43,4 @@
"npm": ">= 5.0.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-mongoose",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Mongoose hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -19,7 +19,7 @@
"mongoose": "^5.0.16",
"mongoose-float": "^1.0.2",
"pluralize": "^6.0.0",
"strapi-utils": "3.0.0-alpha.12.7.1"
"strapi-utils": "3.0.0-alpha.13.0.1"
},
"author": {
"email": "hi@strapi.io",
@ -45,4 +45,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-redis",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Redis hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -18,7 +18,7 @@
"ioredis": "^3.1.2",
"lodash": "^4.17.4",
"stack-trace": "0.0.10",
"strapi-utils": "3.0.0-alpha.12.7.1"
"strapi-utils": "3.0.0-alpha.13.0.1"
},
"author": {
"email": "hi@strapi.io",
@ -44,4 +44,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-lint",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Strapi eslint and prettier configurations",
"directories": {
"lib": "lib"
@ -41,4 +41,4 @@
"babel-eslint": "^8.2.3",
"prettier": "^1.12.1"
}
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-middleware-views",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Views middleware to enable server-side rendering for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-content-manager",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "A powerful UI to easily manage your data.",
"strapi": {
"name": "Content Manager",
@ -28,7 +28,7 @@
"react-dnd-html5-backend": "^5.0.1",
"react-select": "^1.2.1",
"showdown": "^1.8.6",
"strapi-helper-plugin": "3.0.0-alpha.12.7.1"
"strapi-helper-plugin": "3.0.0-alpha.13.0.1"
},
"author": {
"name": "Strapi team",
@ -51,4 +51,4 @@
"npm": ">= 5.0.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-content-type-builder",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Strapi plugin to create content type (API).",
"strapi": {
"name": "Content Type Builder",
@ -23,11 +23,11 @@
},
"dependencies": {
"pluralize": "^7.0.0",
"strapi-generate": "3.0.0-alpha.12.7.1",
"strapi-generate-api": "3.0.0-alpha.12.7.1"
"strapi-generate": "3.0.0-alpha.13.0.1",
"strapi-generate-api": "3.0.0-alpha.13.0.1"
},
"devDependencies": {
"strapi-helper-plugin": "3.0.0-alpha.12.7.1"
"strapi-helper-plugin": "3.0.0-alpha.13.0.1"
},
"author": {
"name": "Strapi team",
@ -50,4 +50,4 @@
"npm": ">= 5.0.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-email",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Email",
@ -22,11 +22,11 @@
"prepublishOnly": "IS_MONOREPO=true npm run build"
},
"dependencies": {
"strapi-email-sendmail": "3.0.0-alpha.12.7.1"
"strapi-email-sendmail": "3.0.0-alpha.13.0.1"
},
"devDependencies": {
"react-copy-to-clipboard": "5.0.1",
"strapi-helper-plugin": "3.0.0-alpha.12.7.1"
"strapi-helper-plugin": "3.0.0-alpha.13.0.1"
},
"author": {
"name": "Strapi team",
@ -49,4 +49,4 @@
"npm": ">= 5.0.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-graphql",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "This is the description of the plugin.",
"strapi": {
"name": "graphql",
@ -30,7 +30,7 @@
"graphql-type-json": "^0.2.1",
"graphql-type-datetime": "^0.2.2",
"pluralize": "^7.0.0",
"strapi-utils": "3.0.0-alpha.12.7.1"
"strapi-utils": "3.0.0-alpha.13.0.1"
},
"author": {
"name": "A Strapi developer",
@ -49,4 +49,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-settings-manager",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Strapi plugin to manage settings.",
"strapi": {
"name": "Settings Manager",
@ -25,7 +25,7 @@
"devDependencies": {
"flag-icon-css": "^2.8.0",
"react-select": "^1.0.0-rc.5",
"strapi-helper-plugin": "3.0.0-alpha.12.7.1"
"strapi-helper-plugin": "3.0.0-alpha.13.0.1"
},
"author": {
"name": "Strapi team",
@ -48,4 +48,4 @@
"npm": ">= 5.0.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-upload",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Files Upload",
@ -23,12 +23,12 @@
},
"dependencies": {
"react-copy-to-clipboard": "^5.0.1",
"strapi-upload-local": "3.0.0-alpha.12.7.1",
"strapi-upload-local": "3.0.0-alpha.13.0.1",
"stream-to-array": "^2.3.0",
"uuid": "^3.2.1"
},
"devDependencies": {
"strapi-helper-plugin": "3.0.0-alpha.12.7.1"
"strapi-helper-plugin": "3.0.0-alpha.13.0.1"
},
"author": {
"name": "A Strapi developer",
@ -47,4 +47,4 @@
"npm": ">= 3.0.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-users-permissions",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Protect your API with a full-authentication process based on JWT",
"strapi": {
"name": "Roles & Permissions",
@ -31,7 +31,7 @@
"uuid": "^3.1.0"
},
"devDependencies": {
"strapi-helper-plugin": "3.0.0-alpha.12.7.1"
"strapi-helper-plugin": "3.0.0-alpha.13.0.1"
},
"author": {
"name": "Strapi team",
@ -54,4 +54,4 @@
"npm": ">= 5.0.0"
},
"license": "MIT"
}
}

View File

@ -88,7 +88,7 @@ module.exports = {
},
getPlugins: (plugin, lang = 'en') => {
return new Promise((resolve, reject) => {
return new Promise((resolve) => {
request({
uri: `https://marketplace.strapi.io/plugins?lang=${lang}`,
json: true,
@ -97,7 +97,7 @@ module.exports = {
}
}, (err, response, body) => {
if (err) {
return reject(err);
return resolve([]);
}
resolve(body);

View File

@ -1,6 +1,6 @@
{
"name": "strapi-upload-aws-s3",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "AWS S3 provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [
@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-upload-cloudinary",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Cloudinary provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [
@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-upload-local",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Local provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [
@ -39,4 +39,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-upload-rackspace",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Rackspace provider for strapi upload",
"main": "./lib",
"scripts": {
@ -13,4 +13,4 @@
"pkgcloud": "^1.5.0",
"streamifier": "^0.1.1"
}
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi-utils",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "Shared utilities for the Strapi packages",
"homepage": "http://strapi.io",
"keywords": [
@ -49,4 +49,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "strapi",
"version": "3.0.0-alpha.12.7.1",
"version": "3.0.0-alpha.13.0.1",
"description": "An open source solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier.",
"homepage": "http://strapi.io",
"keywords": [
@ -55,16 +55,16 @@
"rimraf": "^2.6.2",
"semver": "^5.4.1",
"stack-trace": "0.0.10",
"strapi-generate": "3.0.0-alpha.12.7.1",
"strapi-generate-admin": "3.0.0-alpha.12.7.1",
"strapi-generate-api": "3.0.0-alpha.12.7.1",
"strapi-generate-controller": "3.0.0-alpha.12.7.1",
"strapi-generate-model": "3.0.0-alpha.12.7.1",
"strapi-generate-new": "3.0.0-alpha.12.7.1",
"strapi-generate-plugin": "3.0.0-alpha.12.7.1",
"strapi-generate-policy": "3.0.0-alpha.12.7.1",
"strapi-generate-service": "3.0.0-alpha.12.7.1",
"strapi-utils": "3.0.0-alpha.12.7.1"
"strapi-generate": "3.0.0-alpha.13.0.1",
"strapi-generate-admin": "3.0.0-alpha.13.0.1",
"strapi-generate-api": "3.0.0-alpha.13.0.1",
"strapi-generate-controller": "3.0.0-alpha.13.0.1",
"strapi-generate-model": "3.0.0-alpha.13.0.1",
"strapi-generate-new": "3.0.0-alpha.13.0.1",
"strapi-generate-plugin": "3.0.0-alpha.13.0.1",
"strapi-generate-policy": "3.0.0-alpha.13.0.1",
"strapi-generate-service": "3.0.0-alpha.13.0.1",
"strapi-utils": "3.0.0-alpha.13.0.1"
},
"author": {
"email": "hi@strapi.io",
@ -91,4 +91,4 @@
},
"preferGlobal": true,
"license": "MIT"
}
}