yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-24 17:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,832 Commits 114 Branches 486 Tags
Commit Graph

300 Commits

Author SHA1 Message Date
soupette
857ec1ca70 Rename lifecycle hooks 2019-08-13 11:31:10 +02:00
Alexandre Bodin
da5d02fb7c Merge branch 'master' into develop 2019-07-18 19:28:52 +02:00
Louis Augry
08e2f47800
Merge branch 'master' into fix-documentation-typo 2019-07-10 15:11:52 +02:00
Louis Augry
a3fe9d5a38 Fix documention typo 2019-07-08 15:10:17 +02:00
soupette
9b5dd83117 Fix conflicts 2019-07-04 18:50:31 +02:00
Alexandre Bodin
6cad390d97 Merge branch 'master' into chore/strapi-new-improvments 2019-07-02 15:09:59 +02:00
soupette
6d7c1b90ac Fix lint 2019-07-02 14:44:13 +02:00
soupette
28c9339ace Finish Homepage 2019-06-13 18:20:51 +02:00
Alexandre Bodin
918fc8b05d Fix test:front 2019-05-03 16:49:10 +02:00
soupette
ff31c75c47 Add watch mode to rollup 2019-04-19 00:14:50 +02:00
soupette
a7aef8b243 Prefix entire stm scss with stm until migrating to styled-compo. 2019-04-18 23:42:08 +02:00
soupette
b84c0954fc load plugins build 2019-04-18 20:47:57 +02:00
soupette
5dd8106aa0 Move css import to admin and build ctm 2019-04-18 19:54:21 +02:00
soupette
8fb7608226 Use build for ctb upload us but not stm 2019-04-18 17:50:23 +02:00
soupette
fb11c9a466 Use cdn for flags 2019-04-17 14:18:26 +02:00
soupette
554fc7654a Clean files 2019-04-17 11:45:55 +02:00
soupette
6d31833a58 Load stm 2019-04-16 18:16:44 +02:00
soupette
59587d02cd Fix forgot password views 2019-04-03 17:26:31 +02:00
soupette
be95294bdc Add lifecycles to all plugins 2019-04-02 14:17:01 +02:00
soupette
55ac5d5179 Add initializer container to all plugins 2019-04-02 14:06:44 +02:00
Jim LAURIE
ae097ab2a2
Remove console.log 2019-03-29 10:19:30 +01:00
soupette
003b9a7ef8 Fixes #1325 2019-03-27 19:30:47 +01:00
Hugo Torzuoli
d2aa8bd8a5
Update fr.json 
Fix typo
 2019-03-11 23:45:27 +01:00
Aurélien Georget
03d212d10f Fix conflicts 2019-02-28 14:44:01 +01:00
Aurélien Georget
76efe64591 Add events in the settings-manager 2019-02-25 15:41:12 +01:00
soupette
8907261260 Change paths in doc and settings email 2019-02-22 11:11:25 +01:00
soupette
928971b1e3 Fix PR feedback and change stores name with <pluginId>_<containerName> 2019-02-14 09:48:39 +01:00
soupette
9e1084ed04 Harmonize pluginId between plugins 2019-02-11 18:56:17 +01:00
soupette
d81fba0488 Update tests with the single store 2019-02-11 18:13:14 +01:00
soupette
46e13f71c6 Remove single store documentation and settings manager 2019-02-11 14:57:20 +01:00
Jesús Pérez
5ee76aca73 Allowing to change the header powered by from the admin 2019-01-23 14:35:10 +01:00
Jesús Pérez
b2a59ba4a4 Fix X-Powered-By header setup and panel support for it 2019-01-22 16:47:17 +01:00
invader
9fe2f358d4 admin: update Russian translations for settings manager plugin 2019-01-12 02:22:45 +03:00
Jim LAURIE
f2ec28907e
Merge branch 'master' into master 2018-11-29 11:45:42 +01:00
cyril lopez
de89b3156f Fix redux-sagas deprecation warnings 2018-11-06 09:56:27 +01:00
Leo
b160fdf79e Translations final fix 2018-11-03 15:03:31 +08:00
Leo
6dc594217c Translations for ZH completed 2018-11-03 14:30:22 +08:00
Jim LAURIE
32b7db465d
Merge branch 'master' into japanese_localization 2018-10-25 13:54:50 +02:00
Jan Brachhold
1e7696861e #1620 - Translation keys missing in DE language 2018-10-21 14:50:19 +02:00
Jim LAURIE
bcb71242a8
Revert "Font-family declarations fixed" 2018-10-09 12:31:16 +02:00
takeshi_matsushita
930d0170f9 Add ja.json 2018-10-09 07:49:55 +09:00
Daniel Król
d2beb2732d Merge branch 'master' into translate/pl-email-and-settings-manager 2018-10-07 19:12:43 +02:00
Daniel Król
540d5571ab Add missing translations for 2 plugins 2018-10-07 19:03:05 +02:00
Jim LAURIE
ff1013448d
Merge branch 'master' into bug/codeQuality 2018-10-06 12:04:44 +02:00
Alberto Maturano
d7ffb9e50e Fix conditional logic 
Original code:

```js
const listTitle = this.props.match.params.slug === 'languages' || 'databases' ? this.renderListTitle() : '';
```

Is interpreted as:

```js
const listTitle = ( this.props.match.params.slug === 'languages' || 'databases' ) ? this.renderListTitle() : '' ;
```

Been `databases` always been evaluate as `true`, this is the same that:

```js
const listTitle = this.renderListTitle();
```

Clearly is not the intention. I refactor this peace of code with what I think was the real intention; looking just
the code, not knowing is this is the desire behavior
 2018-10-04 14:54:05 -05:00
segush11
2c72115088 Add missing translation keys in RU language 2018-10-05 00:48:05 +05:00
Jim LAURIE
807b511751
Merge branch 'master' into update/translation_fr 2018-10-04 14:59:05 +02:00
aDeve
c461629b3b Fix #1622 
Update Translation FR
 2018-10-04 14:52:05 +02:00
Jim LAURIE
468c5acd82
Merge branch 'master' into fix/2035 2018-10-03 19:44:25 +02:00
Jim LAURIE
b741507aec
Merge branch 'master' into master 2018-10-03 19:42:05 +02:00