yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-16 04:34:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,273 Commits 117 Branches 489 Tags
Commit Graph

654 Commits

Author SHA1 Message Date
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
sennahLessert
4daa7c643f fix_Issue1620 - add some missing translation keys in DE language 2018-10-03 14:22:09 +02:00
Alberto Maturano
bb66b76087 Improve spanish translation 
fix #1621
 2018-10-02 22:44:14 -05:00
Pedro Caseiro
403c5d0567 issue #1626: pt translations 2018-10-02 22:53:00 +01:00
Daan De Deckere
a805567c43 Add missing translation keys for NL language. Fixes #2035 2018-10-02 20:41:40 +02:00
Özgür ERSOY
0994b05142 Update TR translations - 2 #1634 2018-09-27 22:53:39 +03:00
Jim LAURIE
1f56c823e9
Merge branch 'master' into order-translation-key 2018-09-27 18:39:22 +02:00
Jim LAURIE
29409f9531
Merge branch 'master' into master 2018-09-27 18:32:03 +02:00
Jim LAURIE
070f398044 Reorder translation keys 2018-09-26 15:15:48 +02:00
Jim LAURIE
46c9b0f966 3.0.0-alpha.14.2 2018-09-26 11:08:10 +02:00
cyril lopez
989b867714 Split admin entry point between dev and prod 2018-09-25 15:01:06 +02:00
Alberto Maturano
154fc28a57 Normalize to standar file permissions 
As a result of taking a look on PR #1967 I realized there is 819
executable files in this repository. It is obvious this is an error.
 2018-09-24 12:33:09 -05:00
Miloslav Voloskov
1cd3fe3c5c
Merge branch 'master' into master 2018-09-23 08:04:20 +03:00
Anthony Guimard
e7ccdbd4c3 Update lanagues list label break on multi-line. 
Center vertically label with flexbox and decrease line-height
in order to increase render of language name.
 2018-09-18 01:11:07 -04:00
Jim LAURIE
4d8ace2db7 3.0.0-alpha.14.1.1 2018-09-13 18:39:37 +02:00
Jim LAURIE
f10335d717 3.0.0-alpha.14.1 2018-09-12 12:41:11 +02:00
uyouthe
2f2ad51804 Font-family declarations fixed 2018-09-10 20:59:33 +03:00
DMehaffy
bfadb3f914 Adjust Proxy Settings layout in Admin 
Cleaning it up and moving SSL to the end.
 2018-08-29 23:35:44 -07:00
DMehaffy
873ec86cd5 add section header name 2018-08-29 08:24:18 -07:00
DMehaffy
1991857842 Update per PR Feedback 2018-08-29 08:01:55 -07:00
Jim LAURIE
4d5a285cde
Merge branch 'master' into fix1551 2018-08-29 14:30:37 +02:00
Jim LAURIE
d56d75b05b
Merge branch 'master' into fix/autoReload 2018-08-29 11:02:44 +02:00
DMehaffy
53fb70cdda Fix missing title in adminUI 2018-08-28 03:08:41 -07:00
DMehaffy
4ae6722674 Testing fix for adminui 2018-08-28 02:45:52 -07:00
DMehaffy
1b20de5f6f Add en names 2018-08-28 01:23:08 -07:00
DMehaffy
8160b730b4 Merge branch 'master' into fix1551 2018-08-27 08:23:33 -07:00
Jim LAURIE
cecef7385f 3.0.0-alpha.14 2018-08-27 16:30:16 +02:00
DMehaffy
38c4a528e2 Add proxy config to Settings-Manager 2018-08-27 07:06:24 -07:00
Luca
e90791ef4c
Merge branch 'master' into fix/autoReload 2018-08-17 16:04:19 +02:00
Jim LAURIE
b4d97fb9db 3.0.0-alpha.13.1 2018-08-09 13:39:34 +02:00
Luca
942cfece7d
fix(settings-manager): autoReload payload 2018-08-08 00:24:39 +02:00
Luca
a2a6ff88cb
fix(plugin-settings-manager): autoReload response 2018-08-08 00:18:58 +02:00
Jim LAURIE
90041a5fba
Merge branch 'master' into master 2018-08-06 09:43:14 +02:00
Jim LAURIE
1dbbea458d
Merge branch 'master' into translation/fr 2018-08-06 09:27:28 +02:00
Jim LAURIE
4dc4db24bf
Merge branch 'master' into security-patch 2018-08-01 10:21:51 +02:00
Chris
78e8cb96ea Added the Dutch (NL) language 2018-08-01 09:17:53 +02:00
Basile Bong
260a9bf69b Add > FR translation keys 2018-07-31 19:26:51 +02:00
Jim LAURIE
a66c3d8eb0
Merge branch 'master' into translation/de 2018-07-31 13:42:51 +02:00
Jim LAURIE
a912976282
Merge branch 'master' into translation-keys-ru 2018-07-31 13:41:23 +02:00
Jim LAURIE
ba99e0f24d
Merge branch 'master' into feature/spanishTranslation 2018-07-31 13:38:18 +02:00
Jim LAURIE
b29e03d032 Patch security command injection 2018-07-29 19:30:55 +02:00
Jim LAURIE
3e956670a9
Merge branch 'master' into fix/1609 2018-07-29 14:25:49 +02:00