33691 Commits

Author SHA1 Message Date
Alberto Maturano
ac7aa86658 Fix conditional returning the same 2018-10-04 15:18:56 -05:00
Alberto Maturano
7721f38ee6 Fix defaultProps declaration
Was done in multiple places.
2018-10-04 15:18:56 -05:00
Alberto Maturano
6574ede348 Fix handleClick invocation
`handleClick` declared at line 69 expects 0 arguments, wrong invocation
was done.
2018-10-04 15:18:56 -05: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
c58606e847
Merge branch 'master' into improve-ctm/delete-edit-view 2018-10-04 18:33:48 +02:00
Jim LAURIE
ff003a6b58
Merge pull request #2060 from strapi/fix-error-code
Change error message on reset password page when code is not correct
2018-10-04 17:27:28 +02:00
Jim LAURIE
9de6851aa3
Merge branch 'master' into fix-error-code 2018-10-04 17:27:21 +02:00
Jim LAURIE
870b31ce5c Fix typo update bookshelf service 2018-10-04 17:17:25 +02:00
Jim LAURIE
6009e3278c
Merge pull request #2059 from strapi/fix-count
Fix return 0 for count route
2018-10-04 15:39:33 +02:00
Jim LAURIE
93d0d48341
Merge branch 'master' into fix-count 2018-10-04 15:39:20 +02:00
Jim LAURIE
0537b84233
Merge pull request #2074 from strapi/update/translation_fr
Update FR translations
2018-10-04 14:59:31 +02: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
cyril lopez
12a1a28b94 Update babel-plugin-transform-proptypes 2018-10-04 12:02:24 +02:00
Jim LAURIE
1f3d8bd471
Merge pull request #2052 from strapi/fix/1765
Add plugin prefix to plugins routes.
2018-10-03 20:30:47 +02:00
Jim LAURIE
76aff17780
Merge branch 'master' into fix/1765 2018-10-03 20:29:41 +02:00
Jim LAURIE
d0d63041d1
Merge pull request #2061 from DaanDD/fix/2035
Update NL translations
2018-10-03 19:46:38 +02:00
Jim LAURIE
468c5acd82
Merge branch 'master' into fix/2035 2018-10-03 19:44:25 +02:00
Jim LAURIE
759c92d4bc
Merge pull request #2062 from elitepc/master
Update PT translations
2018-10-03 19:42:11 +02:00
Jim LAURIE
b741507aec
Merge branch 'master' into master 2018-10-03 19:42:05 +02:00
Jim LAURIE
a566a15a84
Merge pull request #2064 from maturanomx/feature/spanishTranslation
Improve spanish translation
2018-10-03 19:37:36 +02:00
Jim LAURIE
d0f3b90524
Merge branch 'master' into feature/spanishTranslation 2018-10-03 19:37:30 +02:00
Jim LAURIE
2b564fa786
Merge pull request #2067 from sennahLessert/fix_Issue1620
Update DE translations
2018-10-03 19:31:05 +02:00
cyril lopez
08eae80563 Add delete button 2018-10-03 17:22:08 +02:00
cyril lopez
4cc41331ce Change button secondary class 2018-10-03 16:19:04 +02:00
Jim LAURIE
dd4fa9b3f7 Update menu for 3.x.x 2018-10-03 14:30:06 +02:00
sennahLessert
4daa7c643f fix_Issue1620 - add some missing translation keys in DE language 2018-10-03 14:22:09 +02:00
cyril lopez
220fb2caf8 Fix font-family 2018-10-03 12:49:43 +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
Jim LAURIE
03b03deca3 Fix #1784 change error message incorrect code 2018-10-02 20:03:58 +02:00
Jim LAURIE
eced058920 Fix #1469 return 0 count route 2018-10-02 19:14:10 +02:00
Jim LAURIE
98bd2d72de
Merge pull request #2056 from strapi/update-prefix-doc
Remove API prefix
2018-10-02 16:52:51 +02:00
Jim LAURIE
fa5489488d Remove API prefix close #1323 2018-10-02 16:48:46 +02:00
Jim LAURIE
6f47c078ec
Merge pull request #2049 from maturanomx/fix/1382
Fix validation for avoid create invalid indexes
2018-10-01 17:01:54 +02:00
Jim LAURIE
4ff7abc91d
Merge branch 'master' into fix/1382 2018-10-01 17:01:37 +02:00
cyril lopez
ad4919ff82 Merge branch 'master' of github.com:strapi/strapi into fix/1765 2018-10-01 14:31:57 +02:00
cyril lopez
d05f936ff5 Add plugin prefix to plugins routes.
Fixes #1765
2018-10-01 14:29:11 +02:00
Martin Muzatko
6ea86fc9ae replaced blockquotes with proper note containers 2018-10-01 12:19:34 +02:00
Jim LAURIE
1fcdbf8e43
Merge pull request #2048 from moersoy/master
Update TR translations 🇹🇷
2018-10-01 11:26:40 +02:00
Alberto Maturano
2fcab8f9d1 Fix validation for avoid create invalid indexes
Fix the validation introduced with #1950
Fix #1382

Add skip eslint rule to avoid error
2018-09-30 12:22:43 -05:00
Özgür ERSOY
98ed66293a update missing #2037 2018-09-30 12:21:06 +03:00
Özgür ERSOY
2bde558e95
Merge pull request #4 from strapi/master
sync
2018-09-30 12:16:04 +03:00
Jim LAURIE
0f4b62a583
Fix spaces 2018-09-29 15:35:10 +02:00
Jim LAURIE
263c8fc127
Remove log 2018-09-29 14:57:52 +02:00
Jim LAURIE
8e7146c62b
Merge pull request #2026 from henrych4/update-doc-requirement
Update node and npm requirement on both Github issue template and documentation
2018-09-29 14:46:23 +02:00
Jim LAURIE
d1721b66f0
Merge branch 'master' into update-doc-requirement 2018-09-29 14:45:43 +02:00
Jim LAURIE
fef8e5afe8
Merge pull request #2037 from moersoy/master
Update TR translations 🇹🇷
2018-09-29 14:29:36 +02:00