From 0ec5ed42ed60710e88d6159bbbdfd9fb9a506f46 Mon Sep 17 00:00:00 2001 From: Thomas Meerpohl Date: Tue, 16 Apr 2019 15:47:16 +0200 Subject: [PATCH 1/5] Fixed #3136 --- packages/strapi-provider-email-amazon-ses/lib/index.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/strapi-provider-email-amazon-ses/lib/index.js b/packages/strapi-provider-email-amazon-ses/lib/index.js index 5b0532820a..adaa120c22 100644 --- a/packages/strapi-provider-email-amazon-ses/lib/index.js +++ b/packages/strapi-provider-email-amazon-ses/lib/index.js @@ -30,6 +30,10 @@ module.exports = { amazon_ses_secret: { label: 'Amazon Secret access key', type: 'text' + }, + amazon_ses_endpoint: { + label: 'Amazon end-point uri', + type: 'text' } }, @@ -37,7 +41,8 @@ module.exports = { var client = nodeSES.createClient({ key: config.amazon_ses_api_key, - secret: config.amazon_ses_secret + secret: config.amazon_ses_secret, + amazon: config.amazon_ses_endpoint }); return { From fb004eb2729f0e2b458ea8dd615677643fd96fb3 Mon Sep 17 00:00:00 2001 From: Joseph Schultz Date: Tue, 18 Jun 2019 08:01:16 -0500 Subject: [PATCH 2/5] Fixes #3470 Caveats: - Missing translations - "Delete All" only counts for what is on the current page as opposed to total records in the database. I've seen this rendered both ways out in the wild --- .../admin/src/components/Table/index.js | 3 ++- .../admin/src/components/TableDelete/index.js | 15 ++++++++++++--- .../admin/src/translations/en.json | 1 + .../admin/src/translations/es.json | 1 + 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Table/index.js b/packages/strapi-plugin-content-manager/admin/src/components/Table/index.js index 62df7a3c15..f2c1534373 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/Table/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/Table/index.js @@ -38,7 +38,7 @@ class Table extends React.Component { key={key} destination={`${this.props.route.path.replace( ':slug', - this.props.routeParams.slug, + this.props.routeParams.slug )}/${record[this.props.primaryKey]}`} headers={this.props.headers} record={record} @@ -71,6 +71,7 @@ class Table extends React.Component { )} diff --git a/packages/strapi-plugin-content-manager/admin/src/components/TableDelete/index.js b/packages/strapi-plugin-content-manager/admin/src/components/TableDelete/index.js index facc3fff7c..60dc7846f9 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/TableDelete/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/TableDelete/index.js @@ -10,8 +10,9 @@ import { FormattedMessage } from 'react-intl'; import styles from './styles.scss'; -function TableDelete({ colspan, number, onToggleDeleteAll }) { +function TableDelete({ colspan, number, total, onToggleDeleteAll }) { const suffix = number > 1 ? 'plural' : 'singular'; + const deleteMessageId = number === total ? 'delete' : 'deleteSelected'; return ( @@ -23,9 +24,17 @@ function TableDelete({ colspan, number, onToggleDeleteAll }) { {message => {message}} - {message => {message}} + {message => ( + + {message} + + )} diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/en.json b/packages/strapi-plugin-content-manager/admin/src/translations/en.json index 146e577c60..e49410eee1 100644 --- a/packages/strapi-plugin-content-manager/admin/src/translations/en.json +++ b/packages/strapi-plugin-content-manager/admin/src/translations/en.json @@ -24,6 +24,7 @@ "components.LimitSelect.itemsPerPage": "Items per page", "components.Search.placeholder": "Search for an entry...", "components.TableDelete.delete": "Delete all", + "components.TableDelete.deleteSelected": "Delete selected", "components.TableDelete.entries.plural": "{number} entries selected", "components.TableDelete.entries.singular": "{number} entry selected", "components.TableEmpty.withFilters": "There is no {contentType} with the applied filters...", diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/es.json b/packages/strapi-plugin-content-manager/admin/src/translations/es.json index eeb7010fdc..8f2d01fe22 100644 --- a/packages/strapi-plugin-content-manager/admin/src/translations/es.json +++ b/packages/strapi-plugin-content-manager/admin/src/translations/es.json @@ -22,6 +22,7 @@ "components.LimitSelect.itemsPerPage": "registros por página", "components.Search.placeholder": "Buscar un registro...", "components.TableDelete.delete": "Eliminar todo", + "components.TableDelete.deleteSelected": "Eliminar seleccionados", "components.TableDelete.entries.plural": "{number} registros seleccionados", "components.TableDelete.entries.singular": "{number} registro seleccionado", "components.TableEmpty.withFilters": "No hay {contentType} con los filtros aplicados...", From 4965d277845610d9dca931102073fbc69519e5fd Mon Sep 17 00:00:00 2001 From: Joseph Schultz Date: Wed, 19 Jun 2019 08:46:37 -0500 Subject: [PATCH 3/5] Add missing translations --- .../strapi-plugin-content-manager/admin/src/translations/ar.json | 1 + .../strapi-plugin-content-manager/admin/src/translations/de.json | 1 + .../strapi-plugin-content-manager/admin/src/translations/fr.json | 1 + .../strapi-plugin-content-manager/admin/src/translations/it.json | 1 + .../strapi-plugin-content-manager/admin/src/translations/ja.json | 1 + .../strapi-plugin-content-manager/admin/src/translations/ko.json | 1 + .../strapi-plugin-content-manager/admin/src/translations/nl.json | 1 + .../strapi-plugin-content-manager/admin/src/translations/pl.json | 1 + .../admin/src/translations/pt-BR.json | 1 + .../strapi-plugin-content-manager/admin/src/translations/pt.json | 1 + .../strapi-plugin-content-manager/admin/src/translations/ru.json | 1 + .../strapi-plugin-content-manager/admin/src/translations/tr.json | 1 + .../strapi-plugin-content-manager/admin/src/translations/zh.json | 1 + 13 files changed, 13 insertions(+) diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/ar.json b/packages/strapi-plugin-content-manager/admin/src/translations/ar.json index 9cadbe8af6..95d69958e2 100644 --- a/packages/strapi-plugin-content-manager/admin/src/translations/ar.json +++ b/packages/strapi-plugin-content-manager/admin/src/translations/ar.json @@ -22,6 +22,7 @@ "components.LimitSelect.itemsPerPage": "عنصر بالصفحة", "components.Search.placeholder": "البحث عن مدخل...", "components.TableDelete.delete": "حذف الكل", + "components.TableDelete.deleteSelected": "احذف المختار", "components.TableDelete.entries.plural": "{number} مدخلات محددة", "components.TableDelete.entries.singular": "{number} مدخل محدد", "components.TableEmpty.withFilters": "لا يوجد {contentType} مع المرشحات المطبق...", diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/de.json b/packages/strapi-plugin-content-manager/admin/src/translations/de.json index a3ef17dbed..34ae731b17 100644 --- a/packages/strapi-plugin-content-manager/admin/src/translations/de.json +++ b/packages/strapi-plugin-content-manager/admin/src/translations/de.json @@ -22,6 +22,7 @@ "components.LimitSelect.itemsPerPage": "Einträge pro Seite", "components.Search.placeholder": "Suche nach einem Eintrag....", "components.TableDelete.delete": "Alle löschen", + "components.TableDelete.deleteSelected": "Ausgewählte löschen", "components.TableDelete.entries.plural": "{number} ausgewählte Einträge", "components.TableDelete.entries.singular": "{number} ausgewählter Eintrag", "components.TableEmpty.withFilters": "Es gibt keinen {contentType} mit den verwendeten Filtern...", diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/fr.json b/packages/strapi-plugin-content-manager/admin/src/translations/fr.json index daf6d3b046..127f2de11d 100644 --- a/packages/strapi-plugin-content-manager/admin/src/translations/fr.json +++ b/packages/strapi-plugin-content-manager/admin/src/translations/fr.json @@ -22,6 +22,7 @@ "components.LimitSelect.itemsPerPage": "Éléments par page", "components.Search.placeholder": "Rechercher une entrée...", "components.TableDelete.delete": "Tout supprimer", + "components.TableDelete.deleteSelected": "Supprimer les éléments sélectionnés", "components.TableDelete.entries.plural": "{number} entrées sélectionnées", "components.TableDelete.entries.singular": "{number} entrée sélectionnée", "components.TableEmpty.withFilters": "Aucun {contentType} n'a été trouvé avec ces filtres...", diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/it.json b/packages/strapi-plugin-content-manager/admin/src/translations/it.json index fcc6d8143d..5513459056 100644 --- a/packages/strapi-plugin-content-manager/admin/src/translations/it.json +++ b/packages/strapi-plugin-content-manager/admin/src/translations/it.json @@ -22,6 +22,7 @@ "components.LimitSelect.itemsPerPage": "Elementi per pagina", "components.Search.placeholder": "Ricerca di una voce...", "components.TableDelete.delete": "Eliminare tutti", + "components.TableDelete.deleteSelected": "Elimina selezionato", "components.TableDelete.entries.plural": "{number} voci selezionate", "components.TableDelete.entries.singular": "{number} voce selezionata", "components.TableEmpty.withFilters": "Non vi è alcun {contentType} con l'applicazione di filtri...", diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/ja.json b/packages/strapi-plugin-content-manager/admin/src/translations/ja.json index a0abe5e7f9..17dcaeab98 100644 --- a/packages/strapi-plugin-content-manager/admin/src/translations/ja.json +++ b/packages/strapi-plugin-content-manager/admin/src/translations/ja.json @@ -22,6 +22,7 @@ "components.LimitSelect.itemsPerPage": "ページあたりのアイテム数", "components.Search.placeholder": "エントリを検索する...", "components.TableDelete.delete": "すべて削除", + "components.TableDelete.deleteSelected": "選択を削除します", "components.TableDelete.entries.plural": "{number} 個のエントリが選択されました", "components.TableDelete.entries.singular": "{number} 個のエントリが選択されました", "components.TableEmpty.withFilters": "適用されたフィルタには{contentType}はありません...", diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/ko.json b/packages/strapi-plugin-content-manager/admin/src/translations/ko.json index 7a7b91e204..3fe50f8186 100644 --- a/packages/strapi-plugin-content-manager/admin/src/translations/ko.json +++ b/packages/strapi-plugin-content-manager/admin/src/translations/ko.json @@ -20,6 +20,7 @@ "components.LimitSelect.itemsPerPage": "항목 수 / 페이지", "components.Search.placeholder": "검색 중입니다...", "components.TableDelete.delete": "모두 삭제", + "components.TableDelete.deleteSelected": "선택된 것을 지워 라", "components.TableDelete.entries.plural": "{number}개 항목 선택 됨", "components.TableDelete.entries.singular": "{number}개 항목 선택 됨", "components.TableEmpty.withFilters": "필터 조건에 맞는 {contentType} 목록이 없습니다.", diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/nl.json b/packages/strapi-plugin-content-manager/admin/src/translations/nl.json index 2e7deb95a3..865dde88ab 100644 --- a/packages/strapi-plugin-content-manager/admin/src/translations/nl.json +++ b/packages/strapi-plugin-content-manager/admin/src/translations/nl.json @@ -22,6 +22,7 @@ "components.LimitSelect.itemsPerPage": "Items per pagina", "components.Search.placeholder": "Zoek naar een item...", "components.TableDelete.delete": "Alles verwijderen", + "components.TableDelete.deleteSelected": "Verwijder geselecteerde", "components.TableDelete.entries.plural": "{number} items geselecteerd", "components.TableDelete.entries.singular": "{number} item geselecteerd", "components.TableEmpty.withFilters": "Er is geen {contentType} met de gekozen filters...", diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/pl.json b/packages/strapi-plugin-content-manager/admin/src/translations/pl.json index b007403c5b..5d67c91fc5 100644 --- a/packages/strapi-plugin-content-manager/admin/src/translations/pl.json +++ b/packages/strapi-plugin-content-manager/admin/src/translations/pl.json @@ -22,6 +22,7 @@ "components.LimitSelect.itemsPerPage": "Elementów na stronę", "components.Search.placeholder": "Szukaj elementu...", "components.TableDelete.delete": "Usuń", + "components.TableDelete.deleteSelected": "Usuń zaznaczone", "components.TableDelete.entries.plural": "{number} wybrane elementy", "components.TableDelete.entries.singular": "{number} wybrany element", "components.TableEmpty.withFilters": "Nie istnieją elementy {contentType} zgodne z zastosowanymi filtrami...", diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/pt-BR.json b/packages/strapi-plugin-content-manager/admin/src/translations/pt-BR.json index 87f540ecc9..df564e150f 100644 --- a/packages/strapi-plugin-content-manager/admin/src/translations/pt-BR.json +++ b/packages/strapi-plugin-content-manager/admin/src/translations/pt-BR.json @@ -22,6 +22,7 @@ "components.LimitSelect.itemsPerPage": "Registros por página", "components.Search.placeholder": "Buscar registro...", "components.TableDelete.delete": "Remove tudo", + "components.TableDelete.deleteSelected": "Excluir selecionado", "components.TableDelete.entries.plural": "{number} registros selecionados", "components.TableDelete.entries.singular": "{number} registro selecionado", "components.TableEmpty.withFilters": "Nenhum {contentType} com os filtros aplicados...", diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/pt.json b/packages/strapi-plugin-content-manager/admin/src/translations/pt.json index fbb0064794..72e7961332 100644 --- a/packages/strapi-plugin-content-manager/admin/src/translations/pt.json +++ b/packages/strapi-plugin-content-manager/admin/src/translations/pt.json @@ -22,6 +22,7 @@ "components.LimitSelect.itemsPerPage": "Itens por página", "components.Search.placeholder": "Procurar por uma entrada...", "components.TableDelete.delete": "Apagar tudo", + "components.TableDelete.deleteSelected": "Excluir selecionado", "components.TableDelete.entries.plural": "{number} entradas selecionadas", "components.TableDelete.entries.singular": "{number} entrada selecionada", "components.TableEmpty.withFilters": "Não há {contentType} com os filtros aplicados...", diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/ru.json b/packages/strapi-plugin-content-manager/admin/src/translations/ru.json index d5302849e4..64794b6507 100644 --- a/packages/strapi-plugin-content-manager/admin/src/translations/ru.json +++ b/packages/strapi-plugin-content-manager/admin/src/translations/ru.json @@ -30,6 +30,7 @@ "containers.SettingPage.editSettings.title": "Редактирование — Настройки", "containers.SettingPage.relations": "Связанные поля", "components.TableDelete.delete": "Удалить все", + "components.TableDelete.deleteSelected": "Удалить выбранное", "components.TableDelete.entries.plural": "Выбрано {number} записей", "components.TableDelete.entries.singular": "Выбрана {number} запись", "components.TableEmpty.withFilters": "Нет {contentType} с примененными фильтрами...", diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/tr.json b/packages/strapi-plugin-content-manager/admin/src/translations/tr.json index 0b83785ce1..a5efc61485 100644 --- a/packages/strapi-plugin-content-manager/admin/src/translations/tr.json +++ b/packages/strapi-plugin-content-manager/admin/src/translations/tr.json @@ -22,6 +22,7 @@ "components.LimitSelect.itemsPerPage": "Sayfa başı", "components.Search.placeholder": "Kayıt aramak için...", "components.TableDelete.delete": "Hepsini sil", + "components.TableDelete.deleteSelected": "Silme seçildi", "components.TableDelete.entries.plural": "{number} kayıt seçildi", "components.TableDelete.entries.singular": "{number} kayıt seçildi", "components.TableEmpty.withFilters": "Uygulanan filtrelerle {contentType} yoktur...", diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/zh.json b/packages/strapi-plugin-content-manager/admin/src/translations/zh.json index edbfecfb91..83950cc866 100644 --- a/packages/strapi-plugin-content-manager/admin/src/translations/zh.json +++ b/packages/strapi-plugin-content-manager/admin/src/translations/zh.json @@ -22,6 +22,7 @@ "components.LimitSelect.itemsPerPage": "每個頁面檔案數量", "components.Search.placeholder": "搜尋...", "components.TableDelete.delete": "刪除", + "components.TableDelete.deleteSelected": "删除所选", "components.TableDelete.entries.plural": "已選取 {number} 個項目", "components.TableDelete.entries.singular": "已選取 {number} 個項目", "components.TableEmpty.withFilters": "找不到 {contentType} 依照套用的過濾器...", From 796d311bd58a49003a95ab0f8f2113b5c16764f3 Mon Sep 17 00:00:00 2001 From: Jim LAURIE Date: Sat, 22 Jun 2019 12:04:17 +0200 Subject: [PATCH 4/5] Update Slack badge URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 958fc1e933..75282fd34d 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Travis Build Status - Strapi on Slack + Strapi on Slack

From 73667dec7c5f4c82d89e915c34433f83a94d0b3f Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Thu, 27 Jun 2019 17:46:52 +0200 Subject: [PATCH 5/5] Fix admin pwd persisted in plaintext on edit --- packages/strapi-admin/controllers/Admin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-admin/controllers/Admin.js b/packages/strapi-admin/controllers/Admin.js index 17458f428c..38cf4ac2ec 100644 --- a/packages/strapi-admin/controllers/Admin.js +++ b/packages/strapi-admin/controllers/Admin.js @@ -256,7 +256,7 @@ module.exports = { ); } - const data = await adminQueries.update(ctx.params, values); + const data = await adminQueries.update(ctx.params, user); // Send 200 `ok` ctx.send(data);