Merge branch 'master' into fix/1077

This commit is contained in:
Jim LAURIE 2018-10-08 11:54:46 +02:00 committed by GitHub
commit 9f67701183
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 45 additions and 36 deletions

View File

@ -38,14 +38,14 @@ Then, please follow the instructions below:
[Go to the repository](https://github.com/strapi/strapi) and fork it to your own GitHub account.
#### 2. 💿 Clone the repository
#### 2. 💿 Clone from your repository
```bash
git clone git@github.com:strapi/strapi.git
git clone git@github.com:YOUR_USERNAME/strapi.git
```
#### 3. ⏳ Installation
Go to the root of the repository.
```bash
cd strapi

View File

@ -1,12 +1,12 @@
const shell = require('shelljs');
const path = require('path');
const _ = require('lodash');
shell.echo('');
shell.echo('🕓 The setup process can take few minutes.');
shell.echo('');
shell.echo('🔸 Administration Panel');
shell.echo('📦 Installing packages...');
shell.echo(`
🕓 The setup process can take few minutes.
🔸 Administration Panel
📦 Installing packages...
`);
const pwd = shell.pwd();

View File

@ -120,7 +120,7 @@ module.exports = {
const data = _.omit(values, <%= globalID %>.associations.map(ast => ast.alias));
// Create entry with no-relational data.
const entry = <%= globalID %>.forge(params).save(data, { path: true });
const entry = <%= globalID %>.forge(params).save(data);
// Create relational data and return the entry.
return <%= globalID %>.updateRelations(Object.assign(params, { values: relations }));

View File

@ -1,26 +1,17 @@
/**
* WEBPACK DLL GENERATOR
*
* This profile is used to cache webpack's module
* contexts for external library and framework type
* dependencies which will usually not change often enough
* to warrant building them from scratch every time we use
* the webpack process.
* This profile is used to cache webpack's module contexts for external library and framework type dependencies which
* will usually not change often enough to warrant building them from scratch every time we use the webpack process.
*/
const path = require('path');
const webpack = require('webpack');
const isAdmin = process.env.IS_ADMIN === 'true';
const appPath = (() => {
if (process.env.APP_PATH) {
return process.env.APP_PATH;
}
return isAdmin ? path.resolve(process.env.PWD, '..') : path.resolve(process.env.PWD, '..', '..');
})();
// const isSetup = path.resolve(process.env.PWD, '..', '..') === path.resolve(process.env.INIT_CWD);
const isSetup = process.env.IS_MONOREPO;
const appPath = process.env.APP_PATH || path.resolve(process.env.PWD, '..', ( isAdmin ? '' : '..' ));
const rootAdminpath = (() => {
if (isSetup) {

View File

@ -513,8 +513,6 @@ module.exports = function(strapi) {
if (existTable) {
await StrapiConfigs.forge({id: existTable.id}).save({
value: JSON.stringify(attributes)
}, {
path: true
});
} else {
await StrapiConfigs.forge({

View File

@ -74,7 +74,7 @@ class TableRow extends React.Component {
<td key='action' className={styles.actions}>
<IcoContainer
icons={[
{ icoType: 'pencil', onClick: () => this.handleClick(this.props.destination) },
{ icoType: 'pencil', onClick: this.handleClick },
{ id: this.props.record.id, icoType: 'trash', onClick: this.props.onDelete },
]}
/>
@ -119,7 +119,7 @@ class TableRow extends React.Component {
render() {
return (
<tr className={cn(styles.tableRow, this.props.enableBulkActions && styles.tableRowWithBulk)} onClick={() => this.handleClick(this.props.destination)}>
<tr className={cn(styles.tableRow, this.props.enableBulkActions && styles.tableRowWithBulk)} onClick={this.handleClick}>
{this.renderCells()}
</tr>
);
@ -130,11 +130,6 @@ TableRow.contextTypes = {
router: PropTypes.object.isRequired,
};
TableRow.defaultProps = {
enableBulkActions: true,
value: false,
};
TableRow.propTypes = {
destination: PropTypes.string.isRequired,
enableBulkActions: PropTypes.bool,
@ -147,7 +142,9 @@ TableRow.propTypes = {
};
TableRow.defaultProps = {
enableBulkActions: true,
onDelete: () => {},
value: false,
};
export default TableRow;

View File

@ -43,9 +43,12 @@
"containers.List.pluginHeaderDescription": "{label} elementów znalezionych",
"containers.List.pluginHeaderDescription.singular": "{label} element znaleziony",
"containers.ListPage.displayedFields": "Wyświetlone atrybuty",
"containers.SettingPage.attributes.description": "Zdefiniuj kolejność atrybutów",
"containers.SettingPage.listSettings.title": "Lista - Ustawienia",
"containers.SettingsPage.Block.generalSettings.title": "Ogólne",
"containers.SettingPage.addField": "Dodaj nowy atrybut",
"containers.SettingPage.editSettings.description": "Drag & drop the fields to build the layout",
"containers.SettingPage.editSettings.title": "Edit — Settings",
"containers.SettingPage.editSettings.description": "Przeciągnij i upuś pola by zbudować układ",
"containers.SettingPage.editSettings.title": "Edycja - Ustawienia",
"containers.SettingPage.relations": "Relational fields",
"emptyAttributes.button": "Przejdź do konstruktora modeli",
"emptyAttributes.description": "Dodaj swoje pierwszy atrybut do modelu",
@ -70,16 +73,27 @@
"error.validation.minSupMax": "Nie może być większa",
"error.validation.regex": "Wartość nie jest zgodna z wymaganym wzorcem.",
"error.validation.required": "Wpisanie wartości dla tego atrybutu jest wymagane.",
"form.Input.description": "Description",
"form.Input.description": "Opis",
"form.Input.description.placeholder": "Display name in the profile",
"form.Input.disabled": "Editable field",
"form.Input.disabled": "Edytowalne pole",
"form.Input.label": "Etykieta",
"form.Input.placeholder": "Placeholder",
"form.Input.placeholder.placeholder": "Moja wartość",
"form.Input.bulkActions": "Włącz akcje masowe",
"form.Input.defaultSort": "Domyślny atrybut sortowania",
"form.Input.filters": "Włącz filtry",
"form.Input.label.inputDescription": "Ta wartość nadpisuje etykietę wyświetlaną w nagłówku tabeli",
"form.Input.pageEntries": "Wpisy per strona",
"form.Input.search": "Włącz wyszukiwanie",
"form.Input.search.field": "Włącz wyszukiwanie po tym polu",
"form.Input.sort.field": "Włącz sortowanie po tym polu",
"notification.error.relationship.fetch": "Wystąpił błąd podczas pobierania relacji.",
"pageNotFound": "Strona nie znaleziona",
"plugin.description.long": "Szybki sposób na przeglądanie, zmianę i usuwanie elementów z twojej bazy danych.",
"plugin.description.short": "Szybki sposób na przeglądanie, zmianę i usuwanie elementów z twojej bazy danych.",
"notification.error.displayedFields": "Co najmniej jedno pole musi być wyświetlane",
"notification.info.SettingPage.disableSort": "Co najmniej jeden atrybut musi mieć włączoną możliwość sortowania",
"popUpWarning.bodyMessage.contentType.delete.all": "Czy na pewno chcesz usunąć te wpisy?",
"popUpWarning.bodyMessage.contentType.delete": "Czy na pewno chcesz usunąć ten wpis?",
"popUpWarning.button.cancel": "Nie",
"popUpWarning.button.confirm": "Tak",

View File

@ -2,7 +2,11 @@
"ConfigPage.description": "Skonfiguruj plugin email",
"ConfigPage.title": "Email - Ustawienia",
"EditForm.Input.number.label": "Maksymalny dozwolony rozmiar (w MB)",
"EditForm.Input.select.inputDescription": "E-maile mogą być wysyłane z wykorzystaniem domyślnego (Sendmail) albo zewnętrznego dostawcy",
"EditForm.Input.select.label": "Dostawcy",
"EditForm.Input.toggle.label": "Włącz wysyłkę e-maili",
"notification.config.success": "Ustawienia zostały zaktualizowane",
"plugin.description.long": "Wysyłaj E-maile",
"plugin.description.short": "Wysyłaj E-maile"
}

View File

@ -79,6 +79,11 @@
"form.server.item.host": "Host",
"form.server.item.port": "Port",
"form.server.name": "Serwer",
"form.server.item.proxy": "Ustawienia Proxy",
"form.server.item.proxy.enable": "Włącz Proxy",
"form.server.item.proxy.host": "Host Proxy",
"form.server.item.proxy.port": "Port Proxy",
"form.server.item.proxy.ssl": "SSL Proxy",
"language.af": "Afrikaans",
"language.af_NA": "Afrikaans (Namibië)",
"language.af_ZA": "Afrikaans (Suid-Afrika)",

View File

@ -38,7 +38,7 @@ const generateListTitle = (data, settingType) => {
const disabledProviders = size(data) - enabledProvidersSize > 1 ?
<FormattedMessage id="users-permissions.List.title.providers.disabled.plural" values={{ number: size(data) - enabledProvidersSize }} />
: <FormattedMessage id="users-permissions.List.title.providers.disabled.plural" values={{ number: size(data) - enabledProvidersSize }} />;
: <FormattedMessage id="users-permissions.List.title.providers.disabled.singular" values={{ number: size(data) - enabledProvidersSize }} />;
return <div>{enabledProviders}&nbsp;{disabledProviders}</div>;