Merge branch 'master' into master

README.md

@@ -17,7 +17,7 @@
     <img src="https://travis-ci.org/strapi/strapi.svg?branch=master" alt="Travis Build Status" />
   </a>
   <a href="http://slack.strapi.io">
-    <img src="https://strapi-slack.herokuapp.com/badge.svg" alt="Strapi on Slack" />
+    <img src="https://slack.strapi.io/badge.svg" alt="Strapi on Slack" />
   </a>
 </p>
 

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);

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 {
             <TableDelete
               colspan={this.props.headers.length + 1}
               number={entriesToDeleteNumber}
+              total={this.props.records.length}
               onToggleDeleteAll={this.props.onToggleDeleteAll}
             />
           )}

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 (
     <tr className={styles.tableDelete}>
@@ -23,9 +24,17 @@ function TableDelete({ colspan, number, onToggleDeleteAll }) {
           {message => <span className={styles.tableDeleteSpan}>{message}</span>}
         </FormattedMessage>
         <FormattedMessage
-          id="content-manager.components.TableDelete.delete"
+          id={`content-manager.components.TableDelete.${deleteMessageId}`}
         >
-          {message => <span className={styles.deleteAll} id="deleteAllData" onClick={onToggleDeleteAll}>{message}</span>}
+          {message => (
+            <span
+              className={styles.deleteAll}
+              id="deleteAllData"
+              onClick={onToggleDeleteAll}
+            >
+              {message}
+            </span>
+          )}
         </FormattedMessage>
       </td>
     </tr>

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} مع المرشحات المطبق...",

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...",

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...",

packages/strapi-plugin-content-manager/admin/src/translations/es.json

@@ -24,6 +24,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...",

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...",

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...",

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}はありません...",

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} 목록이 없습니다.",

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...",

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...",

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...",

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...",

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} с примененными фильтрами...",

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...",

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} 依照套用的過濾器...",

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 {