yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-19 06:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,041 Commits 118 Branches 489 Tags
Commit Graph

545 Commits

Author SHA1 Message Date
Aurélien Georget
8170d061c3 Fix conflicts 2019-02-12 17:01:36 +01:00
Aurelsicoko
39c4f558ec Using cross-env and rimraf as direct devDependencies 2019-02-12 14:40:55 +01:00
Jim LAURIE
42b4a56c0a 3.0.0-alpha.23.1 2019-02-07 13:08:41 +01:00
Jim LAURIE
ff84a82466 3.0.0-alpha.23 2019-02-07 10:40:33 +01:00
soupette
b11e099cd8 Merge branch 'master' of github.com:strapi/strapi into fix/front-generators 2019-02-06 12:09:00 +01:00
Jim LAURIE
7555cc5952 3.0.0-alpha.22 2019-02-04 18:21:48 +01:00
soupette
807ca3bce8 Fix front generators 2019-01-30 17:08:41 +01:00
Jim LAURIE
4ce2da5dc0
Merge branch 'master' into master 2019-01-29 16:27:04 +01:00
Jim LAURIE
72183f299b Use shelljs for every exec command 2019-01-28 16:23:47 +01:00
Jim LAURIE
ee8c94f09f 3.0.0-alpha.21 2019-01-23 16:27:46 +01:00
Jesús Pérez
48b6ac7368 Styling the new response setup in the admin 2019-01-23 16:15:04 +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
Jim LAURIE
25f21fae42 3.0.0-alpha.20 2019-01-22 14:31:49 +01:00
Jim LAURIE
c3c24ca7ad 3.0.0-alpha.19 2019-01-16 11:49:16 +01:00
invader
9fe2f358d4 admin: update Russian translations for settings manager plugin 2019-01-12 02:22:45 +03:00
Jim LAURIE
09530e9cd9 3.0.0-alpha.18 2019-01-04 11:23:15 +01:00
Jim LAURIE
fd3ae96498 3.0.0-alpha.17 2018-12-18 14:37:15 +01:00
soupette
636cb54c29 Add snyk 2018-12-05 15:42:58 +01:00
Jim LAURIE
a75e0c5485 3.0.0-alpha.16 2018-12-04 18:31:19 +01:00
Jim LAURIE
03c1e04d87 Revert filter PR 2018-12-04 17:05:03 +01:00
Jim LAURIE
f2ec28907e
Merge branch 'master' into master 2018-11-29 11:45:42 +01:00
Jim LAURIE
c126b94325
Merge branch 'master' into fixNodeVersions 2018-11-29 11:21:55 +01:00
Jim LAURIE
fb03d4f18c 3.0.0-alpha.15 2018-11-28 14:55:41 +01:00
DMehaffy
ecb6baaea5 Update all the packages and generated json 2018-11-28 00:14:12 -07:00
Jim LAURIE
8fcf2ed8ae 3.0.0-alpha.14.5 2018-11-13 14:50:07 +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
a0216e12a4 Remove @alpha from code 2018-10-29 18:34:31 +01:00
Jim LAURIE
01a2442e7d 3.0.0-alpha.14.4.0 2018-10-25 17:18:26 +02:00
Jim LAURIE
379331f822 3.0.0-alpha.14.4 2018-10-25 16:41:07 +02: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
e42e532f1a
Merge branch 'master' into revert-1928-master 2018-10-18 10:41:38 +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
cyril lopez
5c391f49e4 Merge branch 'master' of github.com:strapi/strapi into improve/admin-auth 2018-10-08 17:50:13 +02:00
Jim LAURIE
4dd93f4b78
Merge branch 'master' into split-admin-dev 2018-10-08 17:44:35 +02:00
Jim LAURIE
87c3af3d1e 3.0.0-alpha.14.3 2018-10-08 17:14:19 +02: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
Jim LAURIE
d0f3b90524
Merge branch 'master' into feature/spanishTranslation 2018-10-03 19:37:30 +02:00