From 4fc713e7e65e12de9d45ba4f4ac77b7e6586f651 Mon Sep 17 00:00:00 2001 From: Mickael Dacosta Date: Fri, 15 Nov 2019 17:49:01 +0100 Subject: [PATCH 1/5] fix(#4537): add support for Mailgun templates and variables --- .../strapi-provider-email-mailgun/README.md | 2 +- .../lib/index.js | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/strapi-provider-email-mailgun/README.md b/packages/strapi-provider-email-mailgun/README.md index 6f219e1ac0..8e9970583e 100644 --- a/packages/strapi-provider-email-mailgun/README.md +++ b/packages/strapi-provider-email-mailgun/README.md @@ -1,4 +1,4 @@ -# strapi-provider-email-sendmail +# strapi-provider-email-mailgun ## Resources diff --git a/packages/strapi-provider-email-mailgun/lib/index.js b/packages/strapi-provider-email-mailgun/lib/index.js index 4be997a1eb..edce0f03f7 100644 --- a/packages/strapi-provider-email-mailgun/lib/index.js +++ b/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) { From b6335efa401f42f0c9572c932ff785b154dfaf1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=BA=91=E9=BE=99?= Date: Tue, 3 Dec 2019 12:32:02 +0800 Subject: [PATCH 2/5] Adjust the LeftMenuLinkContainer height Avoid overlaying header in the sidebar while scrolling --- .../admin/src/components/LeftMenuLinkContainer/Wrapper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/Wrapper.js b/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/Wrapper.js index d8a8e61e96..e720936aea 100644 --- a/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/Wrapper.js +++ b/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; From 8b30105588f0277492aa75fbe96f86a917afc8b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Rubio?= Date: Fri, 13 Dec 2019 15:37:07 +0100 Subject: [PATCH 3/5] Fix plugin upload UI description --- packages/strapi-plugin-upload/admin/src/translations/ar.json | 4 +++- packages/strapi-plugin-upload/admin/src/translations/de.json | 4 +++- packages/strapi-plugin-upload/admin/src/translations/en.json | 4 +++- packages/strapi-plugin-upload/admin/src/translations/es.json | 4 +++- packages/strapi-plugin-upload/admin/src/translations/fr.json | 4 +++- packages/strapi-plugin-upload/admin/src/translations/it.json | 4 +++- packages/strapi-plugin-upload/admin/src/translations/ja.json | 4 +++- packages/strapi-plugin-upload/admin/src/translations/ko.json | 4 +++- packages/strapi-plugin-upload/admin/src/translations/nl.json | 4 +++- packages/strapi-plugin-upload/admin/src/translations/pl.json | 4 +++- .../strapi-plugin-upload/admin/src/translations/pt-BR.json | 4 +++- packages/strapi-plugin-upload/admin/src/translations/pt.json | 4 +++- packages/strapi-plugin-upload/admin/src/translations/ru.json | 4 +++- packages/strapi-plugin-upload/admin/src/translations/tr.json | 4 +++- packages/strapi-plugin-upload/admin/src/translations/vi.json | 4 +++- .../strapi-plugin-upload/admin/src/translations/zh-Hans.json | 4 +++- packages/strapi-plugin-upload/admin/src/translations/zh.json | 4 +++- packages/strapi-plugin-upload/package.json | 2 +- 18 files changed, 52 insertions(+), 18 deletions(-) diff --git a/packages/strapi-plugin-upload/admin/src/translations/ar.json b/packages/strapi-plugin-upload/admin/src/translations/ar.json index 9bd4f7d527..36ef336ccc 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/ar.json +++ b/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": "إدارة ملفات الوسائط المتعددة." } diff --git a/packages/strapi-plugin-upload/admin/src/translations/de.json b/packages/strapi-plugin-upload/admin/src/translations/de.json index 773bdfc2d2..197bddc551 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/de.json +++ b/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." } diff --git a/packages/strapi-plugin-upload/admin/src/translations/en.json b/packages/strapi-plugin-upload/admin/src/translations/en.json index 04094015eb..105c04892d 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/en.json +++ b/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." } diff --git a/packages/strapi-plugin-upload/admin/src/translations/es.json b/packages/strapi-plugin-upload/admin/src/translations/es.json index 86fd4ef16a..bac2a26940 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/es.json +++ b/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." } diff --git a/packages/strapi-plugin-upload/admin/src/translations/fr.json b/packages/strapi-plugin-upload/admin/src/translations/fr.json index 00012dc6f0..0eb9b6811c 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/fr.json +++ b/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." } diff --git a/packages/strapi-plugin-upload/admin/src/translations/it.json b/packages/strapi-plugin-upload/admin/src/translations/it.json index 2ed81f53bf..a96f198e70 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/it.json +++ b/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." } diff --git a/packages/strapi-plugin-upload/admin/src/translations/ja.json b/packages/strapi-plugin-upload/admin/src/translations/ja.json index a7f14a98b3..b194032653 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/ja.json +++ b/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": "マルチメディアファイル管理." } diff --git a/packages/strapi-plugin-upload/admin/src/translations/ko.json b/packages/strapi-plugin-upload/admin/src/translations/ko.json index 5a8efa23a1..45cb261bb6 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/ko.json +++ b/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": "멀티미디어 파일 관리." } diff --git a/packages/strapi-plugin-upload/admin/src/translations/nl.json b/packages/strapi-plugin-upload/admin/src/translations/nl.json index ab93b6c898..5b98b96ec0 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/nl.json +++ b/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." } diff --git a/packages/strapi-plugin-upload/admin/src/translations/pl.json b/packages/strapi-plugin-upload/admin/src/translations/pl.json index 33f3d9017b..520506e663 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/pl.json +++ b/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." } diff --git a/packages/strapi-plugin-upload/admin/src/translations/pt-BR.json b/packages/strapi-plugin-upload/admin/src/translations/pt-BR.json index 9b9a886e8c..cb62ea21cc 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/pt-BR.json +++ b/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." } diff --git a/packages/strapi-plugin-upload/admin/src/translations/pt.json b/packages/strapi-plugin-upload/admin/src/translations/pt.json index a8522c1b25..a675d46174 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/pt.json +++ b/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." } diff --git a/packages/strapi-plugin-upload/admin/src/translations/ru.json b/packages/strapi-plugin-upload/admin/src/translations/ru.json index 66e63b0e06..4b19e462d8 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/ru.json +++ b/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": "Управление мультимедийными файлами." } diff --git a/packages/strapi-plugin-upload/admin/src/translations/tr.json b/packages/strapi-plugin-upload/admin/src/translations/tr.json index 6c426edab4..9412197859 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/tr.json +++ b/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." } diff --git a/packages/strapi-plugin-upload/admin/src/translations/vi.json b/packages/strapi-plugin-upload/admin/src/translations/vi.json index bd18770440..5c061fc28d 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/vi.json +++ b/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." } diff --git a/packages/strapi-plugin-upload/admin/src/translations/zh-Hans.json b/packages/strapi-plugin-upload/admin/src/translations/zh-Hans.json index 74e9bae7d2..e18a8f9bfe 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/zh-Hans.json +++ b/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": "多媒体档案管理." } diff --git a/packages/strapi-plugin-upload/admin/src/translations/zh.json b/packages/strapi-plugin-upload/admin/src/translations/zh.json index e864eca7ab..83a02db58a 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/zh.json +++ b/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": "多媒體檔案管理." } diff --git a/packages/strapi-plugin-upload/package.json b/packages/strapi-plugin-upload/package.json index c89d24c312..96717232e7 100644 --- a/packages/strapi-plugin-upload/package.json +++ b/packages/strapi-plugin-upload/package.json @@ -5,7 +5,7 @@ "strapi": { "name": "Files Upload", "icon": "cloud-upload", - "description": "Description of upload plugin." + "description": "upload.plugin.description" }, "scripts": { "test": "echo \"no tests yet\"" From d17344211c64d4ef214b04ae0be19f23479e41ea Mon Sep 17 00:00:00 2001 From: Jim LAURIE Date: Tue, 31 Dec 2019 15:02:00 +0100 Subject: [PATCH 4/5] fix: fix scroll content type fields On the page to customize the fileds displayed in the entry list. The dopdown to display available fields doesn't scroll. fix #4843 --- .../admin/src/containers/ListSettingsView/DragWrapper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/DragWrapper.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/DragWrapper.js index e687d02b0b..213287ce66 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/DragWrapper.js +++ b/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; } `; From cb7e24da2a146b832c30c636f8ab8df4f635195b Mon Sep 17 00:00:00 2001 From: Jim LAURIE Date: Thu, 2 Jan 2020 12:06:58 +0100 Subject: [PATCH 5/5] Fix compo file path Update the path of component file for the database collection update. fix #4866 --- .../migration-guide-beta.17-to-beta.18.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/3.0.0-beta.x/migration-guide/migration-guide-beta.17-to-beta.18.md b/docs/3.0.0-beta.x/migration-guide/migration-guide-beta.17-to-beta.18.md index efdfd29fc2..85484fb607 100644 --- a/docs/3.0.0-beta.x/migration-guide/migration-guide-beta.17-to-beta.18.md +++ b/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 {