Merge branch 'master' into patch-1

docs/3.0.0-beta.x/content-api/api-endpoints.md

@@ -52,10 +52,10 @@ As an **example** let's consider the following models:
 
 ### `Image With Description` Component
 
-| Fields      | Type   | Description          |
-| :---------- | :----- | :------------------- |
-| image       | media  | The image file       |
-| title       | string | the image title      |
+| Fields      | Type   | Description           |
+| :---------- | :----- | :-------------------- |
+| image       | media  | The image file        |
+| title       | string | the image title       |
 | description | text   | the image description |
 
 :::

docs/3.0.0-beta.x/guides/deployment.md

@@ -491,20 +491,22 @@ sudo nano ecosystem.config.js
 
 ```js
 module.exports = {
-  apps : [{
-    name: 'your-app-name',
-    cwd: '/home/ubuntu/my-strapi-project/my-project',
-    script: 'npm',
-    args: 'start',
-    env: {
-      NODE_ENV: 'production',
-      DATABASE_HOST: 'your-unique-url.rds.amazonaws.com', // database Endpoint under 'Connectivity & Security' tab
-      DATABASE_PORT: '5432',
-      DATABASE_NAME: 'strapi',  // DB name under 'Configuration' tab
-      DATABASE_USERNAME: 'postgres', // default username
-      DATABASE_PASSWORD: 'Password',
+  apps: [
+    {
+      name: 'your-app-name',
+      cwd: '/home/ubuntu/my-strapi-project/my-project',
+      script: 'npm',
+      args: 'start',
+      env: {
+        NODE_ENV: 'production',
+        DATABASE_HOST: 'your-unique-url.rds.amazonaws.com', // database Endpoint under 'Connectivity & Security' tab
+        DATABASE_PORT: '5432',
+        DATABASE_NAME: 'strapi', // DB name under 'Configuration' tab
+        DATABASE_USERNAME: 'postgres', // default username
+        DATABASE_PASSWORD: 'Password',
+      },
     },
-  }],
+  ],
 };
 ```
 

docs/3.0.0-beta.x/migration-guide/migration-guide-beta.17-to-beta.18.md

@@ -496,7 +496,7 @@ RENAME TABLE groups_old_table_name TO components_new_table_name;
 **2. Change the `collectionName` of the component**
 
 **Before**
-`./api/components/category/component.json`
+`./components/component.json`
 
 ```json
 {
@@ -506,7 +506,7 @@ RENAME TABLE groups_old_table_name TO components_new_table_name;
 ```
 
 **After**
-`./api/components/category/component.json`
+`./components/component.json`
 
 ```json
 {
@@ -533,7 +533,6 @@ SET related_type = 'components_new_table_name'
 WHERE related_type = 'groups_old_table_name';
 ```
 
-
 #### Mongo
 
 In `mongo` the relation between a content type and its components is held in an array of references. To know which component type it referes to, the array also contains a `kind` attribute containing the component Schema name.
@@ -566,7 +565,7 @@ db.collection.renameCollection('groups_my_group', 'components_my_component');
 **3. Change the `collectionName` of the component**
 
 **Before**
-`./api/components/category/component.json`
+`./components/component.json`
 
 ```json
 {
@@ -576,7 +575,7 @@ db.collection.renameCollection('groups_my_group', 'components_my_component');
 ```
 
 **After**
-`./api/components/category/component.json`
+`./components/component.json`
 
 ```json
 {

packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/Wrapper.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 const Wrapper = styled.div`
   padding-top: 0.7rem;
   position: absolute;
-  top: 60px;
+  top: 6rem;
   right: 0;
   bottom: 0;
   left: 0;

packages/strapi-connector-bookshelf/lib/relations.js

@@ -270,11 +270,16 @@ module.exports = {
                         : null
                     );
 
-                    const reverseAssoc = model.associations.find(assoc => assoc.alias === obj.field);
+                    const reverseAssoc = model.associations.find(
+                      assoc => assoc.alias === obj.field
+                    );
 
                     // Remove existing relationship because only one file
                     // can be related to this field.
-                    if (reverseAssoc && reverseAssoc.nature === 'oneToManyMorph') {
+                    if (
+                      reverseAssoc &&
+                      reverseAssoc.nature === 'oneToManyMorph'
+                    ) {
                       relationUpdates.push(
                         module.exports.removeRelationMorph
                           .call(

packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/DragWrapper.js

@@ -14,7 +14,7 @@ const DragWrapper = styled.div`
   }
   > div > div {
     overflow-x: auto;
-    overflow-y: hidden;
+    overflow-y: scroll;
   }
 `;
 

packages/strapi-plugin-upload/admin/src/translations/ar.json

@@ -26,5 +26,7 @@
   "notification.dropFile.success": "تم تحميل ملفك",
   "notification.dropFiles.success": "{number} ملفات تم تحميلها",
   "Upload.status.sizeLimit": "{file} أكبر من حجم الحد الذي تمت تهيئته",
-  "Upload.status.disabled" : "تم تعطيل تحميل الملف"
+  "Upload.status.disabled" : "تم تعطيل تحميل الملف",
+  "plugin.description.long": "إدارة ملفات الوسائط المتعددة.",
+  "plugin.description.short": "إدارة ملفات الوسائط المتعددة."
 }

packages/strapi-plugin-upload/admin/src/translations/de.json

@@ -26,5 +26,7 @@
   "notification.dropFile.success": "Deine Datei wurde hochgeladen",
   "notification.dropFiles.success": "{number} Dateien wurden hochgeladen",
   "Upload.status.sizeLimit": "{file} ist größer als die konfigurierte Begrenzungsgröße",
-  "Upload.status.disabled" : "Das Hochladen von Dateien ist deaktiviert"
+  "Upload.status.disabled" : "Das Hochladen von Dateien ist deaktiviert",
+  "plugin.description.long": "Multimedia-Dateiverwaltung.",
+  "plugin.description.short": "Multimedia-Dateiverwaltung."
 }

packages/strapi-plugin-upload/admin/src/translations/en.json

@@ -27,5 +27,7 @@
   "notification.config.success": "The settings has been updated",
   "notification.delete.success": "The file has been deleted",
   "notification.dropFile.success": "Your file has been uploaded",
-  "notification.dropFiles.success": "{number} files have been uploaded"
+  "notification.dropFiles.success": "{number} files have been uploaded",
+  "plugin.description.long": "Media file management.",
+  "plugin.description.short": "Media file management."
 }

packages/strapi-plugin-upload/admin/src/translations/es.json

@@ -27,5 +27,7 @@
   "notification.dropFiles.success": "{number} archivos han sido cargados",
   "Upload.status.sizeLimit": "{file} es más grande que el tamaño límite configurado",
   "Upload.status.disabled" : "La carga de archivos está deshabilitada",
-  "Upload.status.empty": "Los archivos están vacíos"
+  "Upload.status.empty": "Los archivos están vacíos",
+  "plugin.description.long": "Gestión de archivos multimedia.",
+  "plugin.description.short": "Gestión de archivos multimedia."
 }

packages/strapi-plugin-upload/admin/src/translations/fr.json

@@ -26,5 +26,7 @@
   "notification.dropFile.success": "Votre fichier a été téléchargé",
   "notification.dropFiles.success": "{number} fichiers ont été téléchargées",
   "Upload.status.sizeLimit": "{file} est plus grand que la taille limite configurée",
-  "Upload.status.disabled" : "Le téléchargement de fichier est désactivé"
+  "Upload.status.disabled" : "Le téléchargement de fichier est désactivé",
+  "plugin.description.long": "Gestion de fichiers multimédia.",
+  "plugin.description.short": "Gestion de fichiers multimédia."
 }

packages/strapi-plugin-upload/admin/src/translations/it.json

@@ -26,5 +26,7 @@
   "notification.dropFile.success": "Il file è stato caricato",
   "notification.dropFiles.success": "{number} file sono stati caricati",
   "Upload.status.sizeLimit": "{file} è più grande della dimensione limite configurata",
-  "Upload.status.disabled" : "Il caricamento del file è disabilitato"
+  "Upload.status.disabled" : "Il caricamento del file è disabilitato",
+  "plugin.description.long": "Gestione dei file multimediali.",
+  "plugin.description.short": "Gestione dei file multimediali."
 }

packages/strapi-plugin-upload/admin/src/translations/ja.json

@@ -26,5 +26,7 @@
   "notification.dropFile.success": "ファイルがアップロードされました",
   "notification.dropFiles.success": "{number}個のファイルがアップロードされました",
   "Upload.status.sizeLimit": "{file}は設定された制限サイズよりも大きいです",
-  "Upload.status.disabled" : "ファイルのアップロードが無効になっています"
+  "Upload.status.disabled" : "ファイルのアップロードが無効になっています",
+  "plugin.description.long": "マルチメディアファイル管理.",
+  "plugin.description.short": "マルチメディアファイル管理."
 }

packages/strapi-plugin-upload/admin/src/translations/ko.json

@@ -27,5 +27,7 @@
   "notification.config.success": "설정을 업데이트했습니다.",
   "notification.delete.success": "파일을 삭제했습니다.",
   "notification.dropFile.success": "파일을 업로드했습니다.",
-  "notification.dropFiles.success": "{number}개의 파일을 업로드 했습니다."
+  "notification.dropFiles.success": "{number}개의 파일을 업로드 했습니다.",
+  "plugin.description.long": "멀티미디어 파일 관리.",
+  "plugin.description.short": "멀티미디어 파일 관리."
 }

packages/strapi-plugin-upload/admin/src/translations/nl.json

@@ -26,5 +26,7 @@
   "notification.dropFile.success": "Je bestand is geüpload",
   "notification.dropFiles.success": "{number} bestanden zijn geüpload",
   "Upload.status.sizeLimit": "{file} is groter dan de geconfigureerde limietgrootte",
-  "Upload.status.disabled" : "Bestand uploaden is uitgeschakeld"
+  "Upload.status.disabled" : "Bestand uploaden is uitgeschakeld",
+  "plugin.description.long": "Multimediabestandsbeheer.",
+  "plugin.description.short": "Multimediabestandsbeheer."
 }

packages/strapi-plugin-upload/admin/src/translations/pl.json

@@ -26,5 +26,7 @@
   "notification.dropFile.success": "Plik został przesłany",
   "notification.dropFiles.success": "{number} plików zostało przesłanych",
   "Upload.status.sizeLimit": "{plik} jest większy niż skonfigurowany rozmiar limitu",
-  "Upload.status.disabled" : "Przesyłanie plików jest wyłączone"
+  "Upload.status.disabled" : "Przesyłanie plików jest wyłączone",
+  "plugin.description.long": "Zarządzanie plikami multimedialnymi.",
+  "plugin.description.short": "Zarządzanie plikami multimedialnymi."
 }

packages/strapi-plugin-upload/admin/src/translations/pt-BR.json

@@ -24,5 +24,7 @@
   "notification.config.success": "As configurações foram atualizadas",
   "notification.delete.success": "O arquivo foi removido",
   "notification.dropFile.success": "Seu arquivo foi enviado com sucesso",
-  "notification.dropFiles.success": "{number} arquivos foram enviados com sucesso"
+  "notification.dropFiles.success": "{number} arquivos foram enviados com sucesso",
+  "plugin.description.long": "Gerenciamento de arquivos multimídia.",
+  "plugin.description.short": "Gerenciamento de arquivos multimídia."
 }

packages/strapi-plugin-upload/admin/src/translations/pt.json

@@ -26,5 +26,7 @@
   "notification.dropFile.success": "Seu arquivo foi transferido com sucesso",
   "notification.dropFiles.success": "{number} arquivos foram transferidos com sucesso",
   "Upload.status.sizeLimit": "{file} é maior que o tamanho limite configurado",
-  "Upload.status.disabled" : "O upload de arquivos está desativado"
+  "Upload.status.disabled" : "O upload de arquivos está desativado",
+  "plugin.description.long": "Gerenciamento de arquivos multimídia.",
+  "plugin.description.short": "Gerenciamento de arquivos multimídia."
 }

packages/strapi-plugin-upload/admin/src/translations/ru.json

@@ -26,5 +26,7 @@
   "notification.dropFile.success": "Ваш файл загружен",
   "notification.dropFiles.success": "Файлов загружено: {number}",
   "Upload.status.sizeLimit": "{file} больше настроенного предельного размера",
-  "Upload.status.disabled" : "Загрузка файла отключена"
+  "Upload.status.disabled" : "Загрузка файла отключена",
+  "plugin.description.long": "Управление мультимедийными файлами.",
+  "plugin.description.short": "Управление мультимедийными файлами."
 }

packages/strapi-plugin-upload/admin/src/translations/tr.json

@@ -26,5 +26,7 @@
   "notification.dropFile.success": "Dosyanız yüklendi",
   "notification.dropFiles.success": "{number} dosyalar yüklendi",
   "Upload.status.sizeLimit": "{file} yapılandırılmış sınır boyutundan daha büyük",
-  "Upload.status.disabled" : "Dosya yükleme devre dışı"
+  "Upload.status.disabled" : "Dosya yükleme devre dışı",
+  "plugin.description.long": "Multimedya Dosya Yönetimi.",
+  "plugin.description.short": "Multimedya Dosya Yönetimi."
 }

packages/strapi-plugin-upload/admin/src/translations/vi.json

@@ -27,5 +27,7 @@
   "notification.config.success": "Các cấu hình đã được cập nhật",
   "notification.delete.success": "Tập tin đã được xoá",
   "notification.dropFile.success": "Các tập tin của bạn đã được tải lên",
-  "notification.dropFiles.success": "{number} tập tin đã được tải lên"
+  "notification.dropFiles.success": "{number} tập tin đã được tải lên",
+  "plugin.description.long": "Quản lý tập tin đa phương tiện.",
+  "plugin.description.short": "Quản lý tập tin đa phương tiện."
 }

packages/strapi-plugin-upload/admin/src/translations/zh-Hans.json

@@ -26,5 +26,7 @@
   "notification.dropFile.success": "您的文件已上传",
   "notification.dropFiles.success": "{number} 个文件已上传",
   "Upload.status.sizeLimit": "{file}大于配置的限制大小",
-  "Upload.status.disabled" : "文件上传已禁用"
+  "Upload.status.disabled" : "文件上传已禁用",
+  "plugin.description.long": "多媒体档案管理.",
+  "plugin.description.short": "多媒体档案管理."
 }

packages/strapi-plugin-upload/admin/src/translations/zh.json

@@ -26,5 +26,7 @@
   "notification.dropFile.success": "您的檔案已上傳",
   "notification.dropFiles.success": "{number} 個檔案已上傳",
   "Upload.status.sizeLimit": "{file}大於配置的限制大小",
-  "Upload.status.disabled" : "文件上傳已禁用"
+  "Upload.status.disabled" : "文件上傳已禁用",
+  "plugin.description.long": "多媒體檔案管理.",
+  "plugin.description.short": "多媒體檔案管理."
 }

packages/strapi-plugin-upload/package.json

@@ -5,7 +5,7 @@
   "strapi": {
     "name": "Files Upload",
     "icon": "cloud-upload-alt",
-    "description": "Description of upload plugin."
+    "description": "upload.plugin.description"
   },
   "scripts": {
     "test": "echo \"no tests yet\""

packages/strapi-provider-email-mailgun/README.md

@@ -1,4 +1,4 @@
-# strapi-provider-email-sendmail
+# strapi-provider-email-mailgun
 
 ## Resources
 

packages/strapi-provider-email-mailgun/lib/index.js

@@ -6,7 +6,7 @@
 
 /* eslint-disable prefer-template */
 // Public node modules.
-const _ = require('lodash');
+const isObject = require('lodash/isObject');
 const mailgunFactory = require('mailgun-js');
 
 /* eslint-disable no-unused-vars */
@@ -47,21 +47,21 @@ module.exports = {
       send: (options, cb) => {
         return new Promise((resolve, reject) => {
           // Default values.
-          options = _.isObject(options) ? options : {};
-          options.from = options.from || config.mailgun_default_from;
-          options.replyTo = options.replyTo || config.mailgun_default_replyto;
-          options.text = options.text || options.html;
-          options.html = options.html || options.text;
+          options = isObject(options) ? options : {};
 
           let msg = {
-            from: options.from,
+            from: options.from || config.mailgun_default_from,
             to: options.to,
             subject: options.subject,
-            text: options.text,
-            html: options.html,
+            ...(options.text && { text: options.text }),
+            ...(options.html && { html: options.html }),
+            ...(options.template && { template: options.template }),
+            ...(options['h:X-Mailgun-Variables'] && {
+              'h:X-Mailgun-Variables': options['h:X-Mailgun-Variables'],
+            }),
             ...(options.attachment && { attachment: options.attachment }),
           };
-          msg['h:Reply-To'] = options.replyTo;
+          msg['h:Reply-To'] = options.replyTo || config.mailgun_default_replyto;
 
           mailgun.messages().send(msg, function(err) {
             if (err) {