From 404afec5dee6da2b81301643c2e696c27569928f Mon Sep 17 00:00:00 2001 From: Jim LAURIE Date: Fri, 19 Oct 2018 09:26:09 +0200 Subject: [PATCH 1/5] Prefix providers --- docs/3.x.x/guides/email.md | 8 ++++---- docs/3.x.x/guides/upload.md | 10 +++++----- .../config/functions/bootstrap.js | 4 ++-- packages/strapi-plugin-email/package.json | 2 +- packages/strapi-plugin-email/services/Email.js | 2 +- .../config/functions/bootstrap.js | 4 ++-- packages/strapi-plugin-upload/package.json | 2 +- packages/strapi-plugin-upload/services/Upload.js | 2 +- .../.editorconfig | 0 .../.gitignore | 0 .../.npmignore | 0 .../LICENSE.md | 0 packages/strapi-provider-email-amazon-ses/README.md | 11 +++++++++++ .../lib/index.js | 0 .../package.json | 7 ++----- .../.editorconfig | 0 .../.gitignore | 0 .../.npmignore | 0 .../LICENSE.md | 0 .../README.md | 2 +- .../lib/index.js | 0 .../package.json | 4 ++-- .../.editorconfig | 0 .../.gitignore | 0 .../.npmignore | 0 .../LICENSE.md | 0 .../README.md | 2 +- .../lib/index.js | 0 .../package.json | 4 ++-- .../.editorconfig | 0 .../.gitignore | 0 .../.npmignore | 0 .../LICENSE.md | 0 packages/strapi-provider-email-sendmail/README.md | 11 +++++++++++ .../lib/index.js | 0 .../package.json | 4 ++-- .../.editorconfig | 0 .../.gitignore | 0 .../.npmignore | 0 .../LICENSE.md | 0 .../README.md | 2 +- .../lib/index.js | 0 .../package.json | 4 ++-- .../.editorconfig | 0 .../.gitattributes | 0 .../.gitignore | 0 .../.npmignore | 0 packages/strapi-provider-upload-cloudinary/README.md | 11 +++++++++++ .../lib/index.js | 0 .../package.json | 4 ++-- .../.editorconfig | 0 .../.gitignore | 0 .../.npmignore | 0 .../LICENSE.md | 0 .../README.md | 2 +- .../lib/index.js | 0 .../package.json | 4 ++-- .../.editorconfig | 0 .../.gitignore | 0 .../.npmignore | 0 .../LICENSE.md | 0 packages/strapi-provider-upload-rackspace/README.md | 11 +++++++++++ .../lib/index.js | 0 .../package.json | 4 ++-- packages/strapi-upload-aws-s3/README.md | 11 ----------- packages/strapi-upload-cloudinary/README.md | 11 ----------- packages/strapi-upload-local/README.md | 11 ----------- packages/strapi-upload-rackspace/README.md | 11 ----------- scripts/setup.js | 12 ++++++------ 69 files changed, 87 insertions(+), 90 deletions(-) rename packages/{strapi-email-amazon-ses => strapi-provider-email-amazon-ses}/.editorconfig (100%) rename packages/{strapi-email-amazon-ses => strapi-provider-email-amazon-ses}/.gitignore (100%) rename packages/{strapi-email-amazon-ses => strapi-provider-email-amazon-ses}/.npmignore (100%) rename packages/{strapi-email-amazon-ses => strapi-provider-email-amazon-ses}/LICENSE.md (100%) create mode 100644 packages/strapi-provider-email-amazon-ses/README.md rename packages/{strapi-email-amazon-ses => strapi-provider-email-amazon-ses}/lib/index.js (100%) rename packages/{strapi-email-amazon-ses => strapi-provider-email-amazon-ses}/package.json (90%) rename packages/{strapi-email-mailgun => strapi-provider-email-mailgun}/.editorconfig (100%) rename packages/{strapi-email-mailgun => strapi-provider-email-mailgun}/.gitignore (100%) rename packages/{strapi-email-mailgun => strapi-provider-email-mailgun}/.npmignore (100%) rename packages/{strapi-email-mailgun => strapi-provider-email-mailgun}/LICENSE.md (100%) rename packages/{strapi-email-mailgun => strapi-provider-email-mailgun}/README.md (86%) rename packages/{strapi-email-mailgun => strapi-provider-email-mailgun}/lib/index.js (100%) rename packages/{strapi-email-mailgun => strapi-provider-email-mailgun}/package.json (94%) rename packages/{strapi-email-sendgrid => strapi-provider-email-sendgrid}/.editorconfig (100%) rename packages/{strapi-email-sendgrid => strapi-provider-email-sendgrid}/.gitignore (100%) rename packages/{strapi-email-sendgrid => strapi-provider-email-sendgrid}/.npmignore (100%) rename packages/{strapi-email-sendgrid => strapi-provider-email-sendgrid}/LICENSE.md (100%) rename packages/{strapi-email-sendmail => strapi-provider-email-sendgrid}/README.md (86%) rename packages/{strapi-email-sendgrid => strapi-provider-email-sendgrid}/lib/index.js (100%) rename packages/{strapi-email-sendgrid => strapi-provider-email-sendgrid}/package.json (94%) rename packages/{strapi-email-sendmail => strapi-provider-email-sendmail}/.editorconfig (100%) rename packages/{strapi-email-sendmail => strapi-provider-email-sendmail}/.gitignore (100%) rename packages/{strapi-email-sendmail => strapi-provider-email-sendmail}/.npmignore (100%) rename packages/{strapi-email-sendmail => strapi-provider-email-sendmail}/LICENSE.md (100%) create mode 100644 packages/strapi-provider-email-sendmail/README.md rename packages/{strapi-email-sendmail => strapi-provider-email-sendmail}/lib/index.js (100%) rename packages/{strapi-email-sendmail => strapi-provider-email-sendmail}/package.json (94%) rename packages/{strapi-upload-aws-s3 => strapi-provider-upload-aws-s3}/.editorconfig (100%) rename packages/{strapi-upload-aws-s3 => strapi-provider-upload-aws-s3}/.gitignore (100%) rename packages/{strapi-upload-aws-s3 => strapi-provider-upload-aws-s3}/.npmignore (100%) rename packages/{strapi-upload-aws-s3 => strapi-provider-upload-aws-s3}/LICENSE.md (100%) rename packages/{strapi-email-amazon-ses => strapi-provider-upload-aws-s3}/README.md (86%) rename packages/{strapi-upload-aws-s3 => strapi-provider-upload-aws-s3}/lib/index.js (100%) rename packages/{strapi-upload-aws-s3 => strapi-provider-upload-aws-s3}/package.json (94%) rename packages/{strapi-upload-cloudinary => strapi-provider-upload-cloudinary}/.editorconfig (100%) rename packages/{strapi-upload-cloudinary => strapi-provider-upload-cloudinary}/.gitattributes (100%) rename packages/{strapi-upload-cloudinary => strapi-provider-upload-cloudinary}/.gitignore (100%) rename packages/{strapi-upload-cloudinary => strapi-provider-upload-cloudinary}/.npmignore (100%) create mode 100644 packages/strapi-provider-upload-cloudinary/README.md rename packages/{strapi-upload-cloudinary => strapi-provider-upload-cloudinary}/lib/index.js (100%) rename packages/{strapi-upload-cloudinary => strapi-provider-upload-cloudinary}/package.json (94%) rename packages/{strapi-upload-local => strapi-provider-upload-local}/.editorconfig (100%) rename packages/{strapi-upload-local => strapi-provider-upload-local}/.gitignore (100%) rename packages/{strapi-upload-local => strapi-provider-upload-local}/.npmignore (100%) rename packages/{strapi-upload-local => strapi-provider-upload-local}/LICENSE.md (100%) rename packages/{strapi-email-sendgrid => strapi-provider-upload-local}/README.md (86%) rename packages/{strapi-upload-local => strapi-provider-upload-local}/lib/index.js (100%) rename packages/{strapi-upload-local => strapi-provider-upload-local}/package.json (94%) rename packages/{strapi-upload-rackspace => strapi-provider-upload-rackspace}/.editorconfig (100%) rename packages/{strapi-upload-rackspace => strapi-provider-upload-rackspace}/.gitignore (100%) rename packages/{strapi-upload-rackspace => strapi-provider-upload-rackspace}/.npmignore (100%) rename packages/{strapi-upload-rackspace => strapi-provider-upload-rackspace}/LICENSE.md (100%) create mode 100644 packages/strapi-provider-upload-rackspace/README.md rename packages/{strapi-upload-rackspace => strapi-provider-upload-rackspace}/lib/index.js (100%) rename packages/{strapi-upload-rackspace => strapi-provider-upload-rackspace}/package.json (88%) delete mode 100644 packages/strapi-upload-aws-s3/README.md delete mode 100644 packages/strapi-upload-cloudinary/README.md delete mode 100644 packages/strapi-upload-local/README.md delete mode 100644 packages/strapi-upload-rackspace/README.md diff --git a/docs/3.x.x/guides/email.md b/docs/3.x.x/guides/email.md index b9db09ded4..650f6b8561 100644 --- a/docs/3.x.x/guides/email.md +++ b/docs/3.x.x/guides/email.md @@ -26,11 +26,11 @@ By default Strapi provides a local email system. You might want to send email wi To install a new provider run: ``` -$ npm install strapi-email-sendgrid@alpha --save +$ npm install strapi-provider-email-sendgrid@alpha --save ``` -We have two providers available `strapi-email-sendgrid` and `strapi-upload-mailgun`, use the alpha tag to install one of them. Then, visit `/admin/plugins/email/configurations/development` on your web browser and configure the provider. +We have two providers available `strapi-provider-email-sendgrid` and `strapi-provider-upload-mailgun`, use the alpha tag to install one of them. Then, visit `/admin/plugins/email/configurations/development` on your web browser and configure the provider. -If you want to create your own, make sure the name starts with `strapi-email-` (duplicating an existing one will be easier to create), modify the `auth` config object and customize the `send` functions. +If you want to create your own, make sure the name starts with `strapi-provider-email-` (duplicating an existing one will be easier to create), modify the `auth` config object and customize the `send` functions. -Check all community providers available on npmjs.org - [Providers list](https://www.npmjs.com/search?q=strapi-email-) +Check all community providers available on npmjs.org - [Providers list](https://www.npmjs.com/search?q=strapi-provider-email-) diff --git a/docs/3.x.x/guides/upload.md b/docs/3.x.x/guides/upload.md index d842224a52..38c6bfa075 100644 --- a/docs/3.x.x/guides/upload.md +++ b/docs/3.x.x/guides/upload.md @@ -17,7 +17,7 @@ Please send the request using multipart/form-data encoding **Parameters** - `files`: The file(s) to upload. The value(s) can be a Buffer or Stream. -- `path`: (optional): The folder where the file(s) will be uploaded to (only supported on strapi-upload-aws-s3 now). +- `path`: (optional): The folder where the file(s) will be uploaded to (only supported on strapi-provider-upload-aws-s3 now). - `refId`: (optional): The ID of the entry which the file(s) will be linked to. - `ref`: (optional): The name of the model which the file(s) will be linked to (see more below). - `source`: (optional): The name of the plugin where the model is located. @@ -136,11 +136,11 @@ By default Strapi provides a local file upload system. You might want to upload To install a new provider run: ``` -$ npm install strapi-upload-aws-s3@alpha --save +$ npm install strapi-provider-upload-aws-s3@alpha --save ``` -We have two providers available `strapi-upload-aws-s3` and `strapi-upload-cloudinary`, use the alpha tag to install one of them. Then, visit `/admin/plugins/upload/configurations/development` on your web browser and configure the provider. +We have two providers available `strapi-provider-upload-aws-s3` and `strapi-provider-upload-cloudinary`, use the alpha tag to install one of them. Then, visit `/admin/plugins/upload/configurations/development` on your web browser and configure the provider. -If you want to create your own, make sure the name starts with `strapi-upload-` (duplicating an existing one will be easier to create), modify the `auth` config object and customize the `upload` and `delete` functions. +If you want to create your own, make sure the name starts with `strapi-provider-upload-` (duplicating an existing one will be easier to create), modify the `auth` config object and customize the `upload` and `delete` functions. -Check all community providers available on npmjs.org - [Providers list](https://www.npmjs.com/search?q=strapi-upload-) +Check all community providers available on npmjs.org - [Providers list](https://www.npmjs.com/search?q=strapi-provider-upload-) diff --git a/packages/strapi-plugin-email/config/functions/bootstrap.js b/packages/strapi-plugin-email/config/functions/bootstrap.js index 433a24cb4c..784a00eea5 100644 --- a/packages/strapi-plugin-email/config/functions/bootstrap.js +++ b/packages/strapi-plugin-email/config/functions/bootstrap.js @@ -26,7 +26,7 @@ module.exports = async cb => { fs.readdir(path.join(basePath, 'node_modules'), async (err, node_modules) => { // get all email providers const emails = _.filter(node_modules, (node_module) => { - return _.startsWith(node_module, ('strapi-email')); + return _.startsWith(node_module, ('strapi-provider-email')); }); // mount all providers to get configs @@ -51,7 +51,7 @@ module.exports = async cb => { } } catch (err) { strapi.log.error(`Can't load ${config.provider} email provider.`); - strapi.log.warn(`Please install strapi-email-${config.provider} --save in ${path.join(strapi.config.appPath, 'plugins', 'email')} folder.`); + strapi.log.warn(`Please install strapi-provider-email-${config.provider} --save in ${path.join(strapi.config.appPath, 'plugins', 'email')} folder.`); strapi.stop(); } diff --git a/packages/strapi-plugin-email/package.json b/packages/strapi-plugin-email/package.json index 2184e20f2e..7857fde38b 100644 --- a/packages/strapi-plugin-email/package.json +++ b/packages/strapi-plugin-email/package.json @@ -22,7 +22,7 @@ "prepublishOnly": "IS_MONOREPO=true npm run build" }, "dependencies": { - "strapi-email-sendmail": "3.0.0-alpha.14.3" + "strapi-provider-email-sendmail": "3.0.0-alpha.14.3" }, "devDependencies": { "react-copy-to-clipboard": "5.0.1", diff --git a/packages/strapi-plugin-email/services/Email.js b/packages/strapi-plugin-email/services/Email.js index 52fe32461a..1e32c94303 100644 --- a/packages/strapi-plugin-email/services/Email.js +++ b/packages/strapi-plugin-email/services/Email.js @@ -51,7 +51,7 @@ module.exports = { const provider = _.find(strapi.plugins.email.config.providers, { provider: config.provider }); if (!provider) { - throw new Error(`The provider package isn't installed. Please run \`npm install strapi-email-${config.provider}\``); + throw new Error(`The provider package isn't installed. Please run \`npm install strapi-provider-email-${config.provider}\``); } const actions = provider.init(config); diff --git a/packages/strapi-plugin-upload/config/functions/bootstrap.js b/packages/strapi-plugin-upload/config/functions/bootstrap.js index 5cfa1cce78..d20fd0b657 100644 --- a/packages/strapi-plugin-upload/config/functions/bootstrap.js +++ b/packages/strapi-plugin-upload/config/functions/bootstrap.js @@ -26,7 +26,7 @@ module.exports = async cb => { fs.readdir(path.join(basePath, 'node_modules'), async (err, node_modules) => { // get all upload provider const uploads = _.filter(node_modules, (node_module) => { - return _.startsWith(node_module, ('strapi-upload')); + return _.startsWith(node_module, ('strapi-provider-upload')); }); // mount all providers to get configs @@ -53,7 +53,7 @@ module.exports = async cb => { } } catch (err) { strapi.log.error(`Can't load ${config.provider} upload provider.`); - strapi.log.warn(`Please install strapi-upload-${config.provider} --save in ${path.join(strapi.config.appPath, 'plugins', 'upload')} folder.`); + strapi.log.warn(`Please install strapi-provider-upload-${config.provider} --save in ${path.join(strapi.config.appPath, 'plugins', 'upload')} folder.`); strapi.stop(); } diff --git a/packages/strapi-plugin-upload/package.json b/packages/strapi-plugin-upload/package.json index fade690c9a..7c92005331 100644 --- a/packages/strapi-plugin-upload/package.json +++ b/packages/strapi-plugin-upload/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "react-copy-to-clipboard": "^5.0.1", - "strapi-upload-local": "3.0.0-alpha.14.3", + "strapi-provider-upload-local": "3.0.0-alpha.14.3", "stream-to-array": "^2.3.0", "uuid": "^3.2.1" }, diff --git a/packages/strapi-plugin-upload/services/Upload.js b/packages/strapi-plugin-upload/services/Upload.js index c4d79d3441..6755d0ee8a 100644 --- a/packages/strapi-plugin-upload/services/Upload.js +++ b/packages/strapi-plugin-upload/services/Upload.js @@ -65,7 +65,7 @@ module.exports = { if (!provider) { throw new Error( - `The provider package isn't installed. Please run \`npm install strapi-upload-${ + `The provider package isn't installed. Please run \`npm install strapi-provider-upload-${ config.provider }\``, ); diff --git a/packages/strapi-email-amazon-ses/.editorconfig b/packages/strapi-provider-email-amazon-ses/.editorconfig similarity index 100% rename from packages/strapi-email-amazon-ses/.editorconfig rename to packages/strapi-provider-email-amazon-ses/.editorconfig diff --git a/packages/strapi-email-amazon-ses/.gitignore b/packages/strapi-provider-email-amazon-ses/.gitignore similarity index 100% rename from packages/strapi-email-amazon-ses/.gitignore rename to packages/strapi-provider-email-amazon-ses/.gitignore diff --git a/packages/strapi-email-amazon-ses/.npmignore b/packages/strapi-provider-email-amazon-ses/.npmignore similarity index 100% rename from packages/strapi-email-amazon-ses/.npmignore rename to packages/strapi-provider-email-amazon-ses/.npmignore diff --git a/packages/strapi-email-amazon-ses/LICENSE.md b/packages/strapi-provider-email-amazon-ses/LICENSE.md similarity index 100% rename from packages/strapi-email-amazon-ses/LICENSE.md rename to packages/strapi-provider-email-amazon-ses/LICENSE.md diff --git a/packages/strapi-provider-email-amazon-ses/README.md b/packages/strapi-provider-email-amazon-ses/README.md new file mode 100644 index 0000000000..533eeed3a8 --- /dev/null +++ b/packages/strapi-provider-email-amazon-ses/README.md @@ -0,0 +1,11 @@ +# strapi-provider-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) diff --git a/packages/strapi-email-amazon-ses/lib/index.js b/packages/strapi-provider-email-amazon-ses/lib/index.js similarity index 100% rename from packages/strapi-email-amazon-ses/lib/index.js rename to packages/strapi-provider-email-amazon-ses/lib/index.js diff --git a/packages/strapi-email-amazon-ses/package.json b/packages/strapi-provider-email-amazon-ses/package.json similarity index 90% rename from packages/strapi-email-amazon-ses/package.json rename to packages/strapi-provider-email-amazon-ses/package.json index 49b03890e3..94d1eb083e 100644 --- a/packages/strapi-email-amazon-ses/package.json +++ b/packages/strapi-provider-email-amazon-ses/package.json @@ -1,5 +1,5 @@ { - "name": "strapi-email-amazon-ses", + "name": "strapi-provider-email-amazon-ses", "version": "3.0.0-alpha.14.3", "description": "Amazon SES provider for strapi email", "homepage": "http://strapi.io", @@ -16,9 +16,6 @@ "dependencies": { "node-ses": "^2.1.0" }, - "strapi": { - "isProvider": true - }, "author": { "email": "nikolay@tsenkov.net", "name": "Nikolay tsenkov" @@ -42,4 +39,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-email-mailgun/.editorconfig b/packages/strapi-provider-email-mailgun/.editorconfig similarity index 100% rename from packages/strapi-email-mailgun/.editorconfig rename to packages/strapi-provider-email-mailgun/.editorconfig diff --git a/packages/strapi-email-mailgun/.gitignore b/packages/strapi-provider-email-mailgun/.gitignore similarity index 100% rename from packages/strapi-email-mailgun/.gitignore rename to packages/strapi-provider-email-mailgun/.gitignore diff --git a/packages/strapi-email-mailgun/.npmignore b/packages/strapi-provider-email-mailgun/.npmignore similarity index 100% rename from packages/strapi-email-mailgun/.npmignore rename to packages/strapi-provider-email-mailgun/.npmignore diff --git a/packages/strapi-email-mailgun/LICENSE.md b/packages/strapi-provider-email-mailgun/LICENSE.md similarity index 100% rename from packages/strapi-email-mailgun/LICENSE.md rename to packages/strapi-provider-email-mailgun/LICENSE.md diff --git a/packages/strapi-email-mailgun/README.md b/packages/strapi-provider-email-mailgun/README.md similarity index 86% rename from packages/strapi-email-mailgun/README.md rename to packages/strapi-provider-email-mailgun/README.md index 4bf87b4f56..6f219e1ac0 100644 --- a/packages/strapi-email-mailgun/README.md +++ b/packages/strapi-provider-email-mailgun/README.md @@ -1,4 +1,4 @@ -# strapi-email-sendmail +# strapi-provider-email-sendmail ## Resources diff --git a/packages/strapi-email-mailgun/lib/index.js b/packages/strapi-provider-email-mailgun/lib/index.js similarity index 100% rename from packages/strapi-email-mailgun/lib/index.js rename to packages/strapi-provider-email-mailgun/lib/index.js diff --git a/packages/strapi-email-mailgun/package.json b/packages/strapi-provider-email-mailgun/package.json similarity index 94% rename from packages/strapi-email-mailgun/package.json rename to packages/strapi-provider-email-mailgun/package.json index 427eee2104..d59285c755 100644 --- a/packages/strapi-email-mailgun/package.json +++ b/packages/strapi-provider-email-mailgun/package.json @@ -1,5 +1,5 @@ { - "name": "strapi-email-mailgun", + "name": "strapi-provider-email-mailgun", "version": "3.0.0-alpha.14.3", "description": "Mailgun provider for strapi email plugin", "homepage": "http://strapi.io", @@ -42,4 +42,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-email-sendgrid/.editorconfig b/packages/strapi-provider-email-sendgrid/.editorconfig similarity index 100% rename from packages/strapi-email-sendgrid/.editorconfig rename to packages/strapi-provider-email-sendgrid/.editorconfig diff --git a/packages/strapi-email-sendgrid/.gitignore b/packages/strapi-provider-email-sendgrid/.gitignore similarity index 100% rename from packages/strapi-email-sendgrid/.gitignore rename to packages/strapi-provider-email-sendgrid/.gitignore diff --git a/packages/strapi-email-sendgrid/.npmignore b/packages/strapi-provider-email-sendgrid/.npmignore similarity index 100% rename from packages/strapi-email-sendgrid/.npmignore rename to packages/strapi-provider-email-sendgrid/.npmignore diff --git a/packages/strapi-email-sendgrid/LICENSE.md b/packages/strapi-provider-email-sendgrid/LICENSE.md similarity index 100% rename from packages/strapi-email-sendgrid/LICENSE.md rename to packages/strapi-provider-email-sendgrid/LICENSE.md diff --git a/packages/strapi-email-sendmail/README.md b/packages/strapi-provider-email-sendgrid/README.md similarity index 86% rename from packages/strapi-email-sendmail/README.md rename to packages/strapi-provider-email-sendgrid/README.md index 4bf87b4f56..6f219e1ac0 100644 --- a/packages/strapi-email-sendmail/README.md +++ b/packages/strapi-provider-email-sendgrid/README.md @@ -1,4 +1,4 @@ -# strapi-email-sendmail +# strapi-provider-email-sendmail ## Resources diff --git a/packages/strapi-email-sendgrid/lib/index.js b/packages/strapi-provider-email-sendgrid/lib/index.js similarity index 100% rename from packages/strapi-email-sendgrid/lib/index.js rename to packages/strapi-provider-email-sendgrid/lib/index.js diff --git a/packages/strapi-email-sendgrid/package.json b/packages/strapi-provider-email-sendgrid/package.json similarity index 94% rename from packages/strapi-email-sendgrid/package.json rename to packages/strapi-provider-email-sendgrid/package.json index 147336e936..7f313fc889 100644 --- a/packages/strapi-email-sendgrid/package.json +++ b/packages/strapi-provider-email-sendgrid/package.json @@ -1,5 +1,5 @@ { - "name": "strapi-email-sendgrid", + "name": "strapi-provider-email-sendgrid", "version": "3.0.0-alpha.14.3", "description": "Sendgrid provider for strapi email", "homepage": "http://strapi.io", @@ -42,4 +42,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-email-sendmail/.editorconfig b/packages/strapi-provider-email-sendmail/.editorconfig similarity index 100% rename from packages/strapi-email-sendmail/.editorconfig rename to packages/strapi-provider-email-sendmail/.editorconfig diff --git a/packages/strapi-email-sendmail/.gitignore b/packages/strapi-provider-email-sendmail/.gitignore similarity index 100% rename from packages/strapi-email-sendmail/.gitignore rename to packages/strapi-provider-email-sendmail/.gitignore diff --git a/packages/strapi-email-sendmail/.npmignore b/packages/strapi-provider-email-sendmail/.npmignore similarity index 100% rename from packages/strapi-email-sendmail/.npmignore rename to packages/strapi-provider-email-sendmail/.npmignore diff --git a/packages/strapi-email-sendmail/LICENSE.md b/packages/strapi-provider-email-sendmail/LICENSE.md similarity index 100% rename from packages/strapi-email-sendmail/LICENSE.md rename to packages/strapi-provider-email-sendmail/LICENSE.md diff --git a/packages/strapi-provider-email-sendmail/README.md b/packages/strapi-provider-email-sendmail/README.md new file mode 100644 index 0000000000..6f219e1ac0 --- /dev/null +++ b/packages/strapi-provider-email-sendmail/README.md @@ -0,0 +1,11 @@ +# strapi-provider-email-sendmail + +## 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) diff --git a/packages/strapi-email-sendmail/lib/index.js b/packages/strapi-provider-email-sendmail/lib/index.js similarity index 100% rename from packages/strapi-email-sendmail/lib/index.js rename to packages/strapi-provider-email-sendmail/lib/index.js diff --git a/packages/strapi-email-sendmail/package.json b/packages/strapi-provider-email-sendmail/package.json similarity index 94% rename from packages/strapi-email-sendmail/package.json rename to packages/strapi-provider-email-sendmail/package.json index fde2174406..f337359cfb 100644 --- a/packages/strapi-email-sendmail/package.json +++ b/packages/strapi-provider-email-sendmail/package.json @@ -1,5 +1,5 @@ { - "name": "strapi-email-sendmail", + "name": "strapi-provider-email-sendmail", "version": "3.0.0-alpha.14.3", "description": "Sendmail provider for strapi email", "homepage": "http://strapi.io", @@ -41,4 +41,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-upload-aws-s3/.editorconfig b/packages/strapi-provider-upload-aws-s3/.editorconfig similarity index 100% rename from packages/strapi-upload-aws-s3/.editorconfig rename to packages/strapi-provider-upload-aws-s3/.editorconfig diff --git a/packages/strapi-upload-aws-s3/.gitignore b/packages/strapi-provider-upload-aws-s3/.gitignore similarity index 100% rename from packages/strapi-upload-aws-s3/.gitignore rename to packages/strapi-provider-upload-aws-s3/.gitignore diff --git a/packages/strapi-upload-aws-s3/.npmignore b/packages/strapi-provider-upload-aws-s3/.npmignore similarity index 100% rename from packages/strapi-upload-aws-s3/.npmignore rename to packages/strapi-provider-upload-aws-s3/.npmignore diff --git a/packages/strapi-upload-aws-s3/LICENSE.md b/packages/strapi-provider-upload-aws-s3/LICENSE.md similarity index 100% rename from packages/strapi-upload-aws-s3/LICENSE.md rename to packages/strapi-provider-upload-aws-s3/LICENSE.md diff --git a/packages/strapi-email-amazon-ses/README.md b/packages/strapi-provider-upload-aws-s3/README.md similarity index 86% rename from packages/strapi-email-amazon-ses/README.md rename to packages/strapi-provider-upload-aws-s3/README.md index b6c41e6f2e..f5e05fa6aa 100644 --- a/packages/strapi-email-amazon-ses/README.md +++ b/packages/strapi-provider-upload-aws-s3/README.md @@ -1,4 +1,4 @@ -# strapi-email-amazon-ses +# strapi-provider-upload-local ## Resources diff --git a/packages/strapi-upload-aws-s3/lib/index.js b/packages/strapi-provider-upload-aws-s3/lib/index.js similarity index 100% rename from packages/strapi-upload-aws-s3/lib/index.js rename to packages/strapi-provider-upload-aws-s3/lib/index.js diff --git a/packages/strapi-upload-aws-s3/package.json b/packages/strapi-provider-upload-aws-s3/package.json similarity index 94% rename from packages/strapi-upload-aws-s3/package.json rename to packages/strapi-provider-upload-aws-s3/package.json index cd99a6e261..884bdcf28f 100644 --- a/packages/strapi-upload-aws-s3/package.json +++ b/packages/strapi-provider-upload-aws-s3/package.json @@ -1,5 +1,5 @@ { - "name": "strapi-upload-aws-s3", + "name": "strapi-provider-upload-aws-s3", "version": "3.0.0-alpha.14.3", "description": "AWS S3 provider for strapi upload", "homepage": "http://strapi.io", @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-upload-cloudinary/.editorconfig b/packages/strapi-provider-upload-cloudinary/.editorconfig similarity index 100% rename from packages/strapi-upload-cloudinary/.editorconfig rename to packages/strapi-provider-upload-cloudinary/.editorconfig diff --git a/packages/strapi-upload-cloudinary/.gitattributes b/packages/strapi-provider-upload-cloudinary/.gitattributes similarity index 100% rename from packages/strapi-upload-cloudinary/.gitattributes rename to packages/strapi-provider-upload-cloudinary/.gitattributes diff --git a/packages/strapi-upload-cloudinary/.gitignore b/packages/strapi-provider-upload-cloudinary/.gitignore similarity index 100% rename from packages/strapi-upload-cloudinary/.gitignore rename to packages/strapi-provider-upload-cloudinary/.gitignore diff --git a/packages/strapi-upload-cloudinary/.npmignore b/packages/strapi-provider-upload-cloudinary/.npmignore similarity index 100% rename from packages/strapi-upload-cloudinary/.npmignore rename to packages/strapi-provider-upload-cloudinary/.npmignore diff --git a/packages/strapi-provider-upload-cloudinary/README.md b/packages/strapi-provider-upload-cloudinary/README.md new file mode 100644 index 0000000000..ad7c24c116 --- /dev/null +++ b/packages/strapi-provider-upload-cloudinary/README.md @@ -0,0 +1,11 @@ +# strapi-provider-upload-cloudinary + +## 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) diff --git a/packages/strapi-upload-cloudinary/lib/index.js b/packages/strapi-provider-upload-cloudinary/lib/index.js similarity index 100% rename from packages/strapi-upload-cloudinary/lib/index.js rename to packages/strapi-provider-upload-cloudinary/lib/index.js diff --git a/packages/strapi-upload-cloudinary/package.json b/packages/strapi-provider-upload-cloudinary/package.json similarity index 94% rename from packages/strapi-upload-cloudinary/package.json rename to packages/strapi-provider-upload-cloudinary/package.json index c5e13cc1f7..9b0b369b15 100644 --- a/packages/strapi-upload-cloudinary/package.json +++ b/packages/strapi-provider-upload-cloudinary/package.json @@ -1,5 +1,5 @@ { - "name": "strapi-upload-cloudinary", + "name": "strapi-provider-upload-cloudinary", "version": "3.0.0-alpha.14.3", "description": "Cloudinary provider for strapi upload", "homepage": "http://strapi.io", @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-upload-local/.editorconfig b/packages/strapi-provider-upload-local/.editorconfig similarity index 100% rename from packages/strapi-upload-local/.editorconfig rename to packages/strapi-provider-upload-local/.editorconfig diff --git a/packages/strapi-upload-local/.gitignore b/packages/strapi-provider-upload-local/.gitignore similarity index 100% rename from packages/strapi-upload-local/.gitignore rename to packages/strapi-provider-upload-local/.gitignore diff --git a/packages/strapi-upload-local/.npmignore b/packages/strapi-provider-upload-local/.npmignore similarity index 100% rename from packages/strapi-upload-local/.npmignore rename to packages/strapi-provider-upload-local/.npmignore diff --git a/packages/strapi-upload-local/LICENSE.md b/packages/strapi-provider-upload-local/LICENSE.md similarity index 100% rename from packages/strapi-upload-local/LICENSE.md rename to packages/strapi-provider-upload-local/LICENSE.md diff --git a/packages/strapi-email-sendgrid/README.md b/packages/strapi-provider-upload-local/README.md similarity index 86% rename from packages/strapi-email-sendgrid/README.md rename to packages/strapi-provider-upload-local/README.md index 4bf87b4f56..f5e05fa6aa 100644 --- a/packages/strapi-email-sendgrid/README.md +++ b/packages/strapi-provider-upload-local/README.md @@ -1,4 +1,4 @@ -# strapi-email-sendmail +# strapi-provider-upload-local ## Resources diff --git a/packages/strapi-upload-local/lib/index.js b/packages/strapi-provider-upload-local/lib/index.js similarity index 100% rename from packages/strapi-upload-local/lib/index.js rename to packages/strapi-provider-upload-local/lib/index.js diff --git a/packages/strapi-upload-local/package.json b/packages/strapi-provider-upload-local/package.json similarity index 94% rename from packages/strapi-upload-local/package.json rename to packages/strapi-provider-upload-local/package.json index bbceb10f9d..601870dd92 100644 --- a/packages/strapi-upload-local/package.json +++ b/packages/strapi-provider-upload-local/package.json @@ -1,5 +1,5 @@ { - "name": "strapi-upload-local", + "name": "strapi-provider-upload-local", "version": "3.0.0-alpha.14.3", "description": "Local provider for strapi upload", "homepage": "http://strapi.io", @@ -39,4 +39,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-upload-rackspace/.editorconfig b/packages/strapi-provider-upload-rackspace/.editorconfig similarity index 100% rename from packages/strapi-upload-rackspace/.editorconfig rename to packages/strapi-provider-upload-rackspace/.editorconfig diff --git a/packages/strapi-upload-rackspace/.gitignore b/packages/strapi-provider-upload-rackspace/.gitignore similarity index 100% rename from packages/strapi-upload-rackspace/.gitignore rename to packages/strapi-provider-upload-rackspace/.gitignore diff --git a/packages/strapi-upload-rackspace/.npmignore b/packages/strapi-provider-upload-rackspace/.npmignore similarity index 100% rename from packages/strapi-upload-rackspace/.npmignore rename to packages/strapi-provider-upload-rackspace/.npmignore diff --git a/packages/strapi-upload-rackspace/LICENSE.md b/packages/strapi-provider-upload-rackspace/LICENSE.md similarity index 100% rename from packages/strapi-upload-rackspace/LICENSE.md rename to packages/strapi-provider-upload-rackspace/LICENSE.md diff --git a/packages/strapi-provider-upload-rackspace/README.md b/packages/strapi-provider-upload-rackspace/README.md new file mode 100644 index 0000000000..6384dc9a54 --- /dev/null +++ b/packages/strapi-provider-upload-rackspace/README.md @@ -0,0 +1,11 @@ +# strapi-provider-upload-rackspace + +## 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) diff --git a/packages/strapi-upload-rackspace/lib/index.js b/packages/strapi-provider-upload-rackspace/lib/index.js similarity index 100% rename from packages/strapi-upload-rackspace/lib/index.js rename to packages/strapi-provider-upload-rackspace/lib/index.js diff --git a/packages/strapi-upload-rackspace/package.json b/packages/strapi-provider-upload-rackspace/package.json similarity index 88% rename from packages/strapi-upload-rackspace/package.json rename to packages/strapi-provider-upload-rackspace/package.json index 9422d2f1b7..60ee5cdf14 100644 --- a/packages/strapi-upload-rackspace/package.json +++ b/packages/strapi-provider-upload-rackspace/package.json @@ -1,5 +1,5 @@ { - "name": "strapi-upload-rackspace", + "name": "strapi-provider-upload-rackspace", "version": "3.0.0-alpha.14.3", "description": "Rackspace provider for strapi upload", "main": "./lib", @@ -13,4 +13,4 @@ "pkgcloud": "^1.5.0", "streamifier": "^0.1.1" } -} \ No newline at end of file +} diff --git a/packages/strapi-upload-aws-s3/README.md b/packages/strapi-upload-aws-s3/README.md deleted file mode 100644 index 19635b1d44..0000000000 --- a/packages/strapi-upload-aws-s3/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# strapi-upload-local - -## 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) diff --git a/packages/strapi-upload-cloudinary/README.md b/packages/strapi-upload-cloudinary/README.md deleted file mode 100644 index 1cd02a8d2e..0000000000 --- a/packages/strapi-upload-cloudinary/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# strapi-upload-cloudinary - -## 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) diff --git a/packages/strapi-upload-local/README.md b/packages/strapi-upload-local/README.md deleted file mode 100644 index 19635b1d44..0000000000 --- a/packages/strapi-upload-local/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# strapi-upload-local - -## 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) diff --git a/packages/strapi-upload-rackspace/README.md b/packages/strapi-upload-rackspace/README.md deleted file mode 100644 index 92a3b04d13..0000000000 --- a/packages/strapi-upload-rackspace/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# strapi-upload-rackspace - -## 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) diff --git a/scripts/setup.js b/scripts/setup.js index 3d58c6d9c4..2b04adc32e 100644 --- a/scripts/setup.js +++ b/scripts/setup.js @@ -119,17 +119,17 @@ shell.cd('../strapi-plugin-graphql'); watcher('📦 Linking strapi-plugin-graphql...', 'npm link --no-optional', false); // Plugin services -shell.cd('../strapi-upload-local'); -watcher('📦 Linking strapi-upload-local...', 'npm link --no-optional', false); +shell.cd('../strapi-provider-upload-local'); +watcher('📦 Linking strapi-provider-upload-local...', 'npm link --no-optional', false); -shell.cd('../strapi-email-sendmail'); -watcher('📦 Linking strapi-email-sendmail...', 'npm link --no-optional', false); +shell.cd('../strapi-provider-email-sendmail'); +watcher('📦 Linking strapi-provider-email-sendmail...', 'npm link --no-optional', false); // Plugins with admin shell.cd('../strapi-plugin-email'); shell.rm('-f', 'package-lock.json'); watcher('', 'npm install ../strapi-helper-plugin --no-optional'); -watcher('', 'npm install ../strapi-email-sendmail --no-optional'); +watcher('', 'npm install ../strapi-provider-email-sendmail --no-optional'); watcher('📦 Linking strapi-plugin-email...', 'npm link --no-optional', false); shell.cd('../strapi-plugin-users-permissions'); @@ -151,7 +151,7 @@ watcher('📦 Linking strapi-plugin-settings-manager...', 'npm link --no-option // Plugins with admin and other plugin's dependencies shell.cd('../strapi-plugin-upload'); watcher('', 'npm install ../strapi-helper-plugin --no-optional'); -watcher('', 'npm install ../strapi-upload-local --no-optional'); +watcher('', 'npm install ../strapi-provider-upload-local --no-optional'); shell.rm('-f', 'package-lock.json'); watcher('📦 Linking strapi-plugin-upload...', 'npm link --no-optional', false); From 597e627606e5ff497a6e586018bc3ef5a3abcf3d Mon Sep 17 00:00:00 2001 From: DMehaffy Date: Fri, 9 Nov 2018 15:17:01 -0700 Subject: [PATCH 2/5] Add Product board to feature request --- .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md index e3c12f501d..ff714bcb8b 100644 --- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md +++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md @@ -7,6 +7,16 @@ about: Suggest an idea for this project 💡! -**What is the expected behavior?** + + +- [ ] **I have created my request on the Product Board before I submitted this issue** +- [ ] **I have looked at all the other requests on the Product Board before I submitted this issue** + +**Please describe your feature request:** From 90fba032d4f899e55d00f91ea9132181b2c1f7c6 Mon Sep 17 00:00:00 2001 From: Alberto Maturano Date: Tue, 13 Nov 2018 16:02:25 -0600 Subject: [PATCH 3/5] style: Improves spanish translation issue #1621 --- .../admin/src/translations/es.json | 10 +++++----- .../admin/src/translations/es.json | 20 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/strapi-admin/admin/src/translations/es.json b/packages/strapi-admin/admin/src/translations/es.json index ff056c0055..d12f1837f6 100644 --- a/packages/strapi-admin/admin/src/translations/es.json +++ b/packages/strapi-admin/admin/src/translations/es.json @@ -28,19 +28,19 @@ "app.components.EmptyAttributes.title": "Aún no hay campos", "app.components.HomePage.button.blog": "VER MÁS EN EL BLOG", "app.components.HomePage.button.quickStart": "INICIAR EL TUTORIAL DE INICIO RÁPIDO", - "app.components.HomePage.community": "Encuentra la comunidad en la web", - "app.components.HomePage.community.content": "Discutir con los miembros del equipo, colaboradores y desarrolladores en diferentes canales.", + "app.components.HomePage.community": "Encuentre la comunidad en la web", + "app.components.HomePage.community.content": "Hable con los miembros del equipo, colaboradores y desarrolladores en diferentes canales.", "app.components.HomePage.create": "Crea tu primer Tipo de Contenido", "app.components.HomePage.createBlock.content.first": "El ", - "app.components.HomePage.createBlock.content.second": " le ayudará a definir la estructura de datos de sus modelos. Si eres nuevo aquí, te recomendamos encarecidamente que sigas nuestro ", + "app.components.HomePage.createBlock.content.second": " le ayudará a definir la estructura de datos de sus modelos. Si es nuevo aquí, le recomendamos encarecidamente que siga nuestro ", "app.components.HomePage.createBlock.content.tutorial": " ", "app.components.HomePage.cta": "CONFIRMAR", "app.components.HomePage.newsLetter": "Suscríbase al boletín de noticias para ponerse en contacto con Strapi", "app.components.HomePage.support": "APÓYANOS", "app.components.HomePage.support.content": "¡Al comprar la camiseta, nos permitirá continuar nuestro trabajo en el proyecto para darle la mejor experiencia posible!", - "app.components.HomePage.support.link": "CONSIGUE TU CAMISETA AHORA", + "app.components.HomePage.support.link": "CONSIGA SU CAMISETA AHORA", "app.components.HomePage.welcome": "¡Bienvenido a bordo!", - "app.components.HomePage.welcome.again": "Bienvenido ", + "app.components.HomePage.welcome.again": "¡Bienvenido ", "app.components.HomePage.welcomeBlock.content": "Estamos felices de tenerlo como miembro de la comunidad. Estamos constantemente en busca de comentarios así que no dude en enviarnos un DM en ", "app.components.HomePage.welcomeBlock.content.again": "Esperamos que estés progresando en tu proyecto.... Siéntase libre de leer las últimas novedades sobre Strapi. Estamos dando lo mejor de nosotros mismos para mejorar el producto basándonos en sus comentarios.", "app.components.HomePage.welcomeBlock.content.issues": "problema.", diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/es.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/es.json index bf7fd8cb9d..9519ecf69f 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/translations/es.json +++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/es.json @@ -8,7 +8,7 @@ "attribute.float": "Número flotante", "attribute.integer": "Número entero", "attribute.json": "JSON", - "attribute.media": "Medios", + "attribute.media": "Multimedia", "attribute.password": "Contraseña", "attribute.relation": "Relación", "attribute.string": "Cadena de texto", @@ -28,7 +28,7 @@ "error.validation.minLength": "El valor es demasiado corto.", "error.validation.minSupMax": "No puede ser superior", "error.validation.regex": "El valor no coincide con el valor de regex.", - "error.validation.required": "Esta entrada de valor es obligatoria.", + "error.validation.required": "Es requerido un valor para este registro.", "form.attribute.item.appearance.description": "Si no, el valor será editable a través de un campo textarea básico", "form.attribute.item.appearance.label": "Mostrar como WYSIWYG", "form.attribute.item.appearance.name": "Apariencia", @@ -41,7 +41,7 @@ "form.attribute.item.enumeration.graphql.description": "Le permite redefinir el nombre generado por defecto para GraphQL", "form.attribute.item.enumeration.name": "Nombre", "form.attribute.item.enumeration.placeholder": "Ej: mañana, mediodía, noche", - "form.attribute.item.enumeration.rules": "Valores (sepárelos con una coma)", + "form.attribute.item.enumeration.rules": "Valores (separados con una coma)", "form.attribute.item.json.name": "Nombre", "form.attribute.item.maximum": "Valor máximo", "form.attribute.item.maximumLength": "Longitud máxima", @@ -50,17 +50,17 @@ "form.attribute.item.minimum": "Valor mínimo", "form.attribute.item.minimumLength": "Longitud mínima", "form.attribute.item.number.name": "Nombre", - "form.attribute.item.number.type": "Formato de número", + "form.attribute.item.number.type": "Tipo de número", "form.attribute.item.number.type.decimal": "decimal (ex: 2.22)", "form.attribute.item.number.type.float": "flotante (ex: 3.3333333333)", "form.attribute.item.number.type.integer": "entero (ej: 10)", "form.attribute.item.requiredField": "Campo obligatorio", - "form.attribute.item.requiredField.description": "No podrá crear una entrada si este campo está vacío", + "form.attribute.item.requiredField.description": "No podrá crear un registro si este campo está vacío", "form.attribute.item.settings.name": "Ajustes", "form.attribute.item.string.name": "Nombre", "form.attribute.item.textarea.name": "Nombre", "form.attribute.item.uniqueField": "Campo único", - "form.attribute.item.uniqueField.description": "No podrá crear una entrada si hay una entrada existente con contenido idéntico", + "form.attribute.item.uniqueField.description": "No podrá crear un registro si ya existe otro registro con el mismo contenido", "form.attribute.settings.default": "Valor por defecto", "form.attribute.settings.default.checkboxLabel": "Ajustar a verdadero", "form.button.cancel": "Cancelar", @@ -117,18 +117,18 @@ "popUpForm.attributes.json.description": "Datos en formato JSON", "popUpForm.attributes.json.name": "JSON", "popUpForm.attributes.media.description": "Imágenes, vídeos, PDFs y otros archivos", - "popUpForm.attributes.media.name": "Medios", + "popUpForm.attributes.media.name": "Multimedia", "popUpForm.attributes.number.description": "Todo lo que es número", "popUpForm.attributes.number.name": "Número", "popUpForm.attributes.password.description": "Contraseña de usuario...", "popUpForm.attributes.password.name": "Contraseña", "popUpForm.attributes.relation.description": "Se refiere a un Tipo de Contenido", "popUpForm.attributes.relation.name": "Relación", - "popUpForm.attributes.string.description": "Títulos, nombres, párrafos, lista de nombres", + "popUpForm.attributes.string.description": "Títulos, nombres, enunciados, lista de nombres", "popUpForm.attributes.string.name": "Cadena de texto", - "popUpForm.attributes.text.description": "Descripciones, párrafos de texto, artículos ", + "popUpForm.attributes.text.description": "Descripciones, párrafos de texto, artículos", "popUpForm.attributes.text.name": "Texto", - "popUpForm.choose.attributes.header.title": "Añadir Nuevo Campo", + "popUpForm.choose.attributes.header.title": "Añadir nuevo Campo", "popUpForm.create": "Añadir Nuevo", "popUpForm.create.contentType.header.title": "Añadir nuevo Tipo de Contenido", "popUpForm.edit": "Editar", From 141a7dd58d483fda4db7bbd0943d9d43aafe4a50 Mon Sep 17 00:00:00 2001 From: Alberto Maturano Date: Wed, 14 Nov 2018 18:28:05 -0600 Subject: [PATCH 4/5] refactor: Corrects conditional management The original implementation throws and runtime error if the `host` is not defined making the conditional uselees. Using a try/catch block is the correct implementation of the original intention. --- packages/strapi/lib/core/plugins.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/strapi/lib/core/plugins.js b/packages/strapi/lib/core/plugins.js index 3755c42df7..51893e0f8b 100644 --- a/packages/strapi/lib/core/plugins.js +++ b/packages/strapi/lib/core/plugins.js @@ -12,9 +12,12 @@ module.exports = async function() { const configuratePlugin = (acc, current, source, name) => { switch (source) { case 'host': { - const host = _.get(this.config.environments[current].server, 'admin.build.host').replace(/\/$/, '') || '/'; + let host; - if (!host) { + try { + host = _.get(this.config.environments[current].server, 'admin.build.host').replace(/\/$/, '') || '/'; + + } catch (e) { throw new Error("You can't use `remote` as a source without set the `host` configuration."); } From 86cbd0c1b367b6d1b3bdc6f6d77e30375ac52b12 Mon Sep 17 00:00:00 2001 From: Alberto Maturano Date: Wed, 14 Nov 2018 19:51:05 -0600 Subject: [PATCH 5/5] refactor: Remove unused variable --- .../strapi-plugin-content-manager/services/ContentManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-plugin-content-manager/services/ContentManager.js b/packages/strapi-plugin-content-manager/services/ContentManager.js index 3bf15942e3..082d7c30c3 100644 --- a/packages/strapi-plugin-content-manager/services/ContentManager.js +++ b/packages/strapi-plugin-content-manager/services/ContentManager.js @@ -8,7 +8,7 @@ const _ = require('lodash'); module.exports = { fetchAll: async (params, query) => { - const { limit, skip, sort, query : request, queryAttribute, source, page, populate = [] } = query; // eslint-disable-line no-unused-vars + const { limit, skip, sort, query : request, queryAttribute, source, populate = [] } = query; const filters = strapi.utils.models.convertParams(params.model, query); const where = !_.isEmpty(request) ? request : filters.where;