6761 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
d8a2c9a833
Merge pull request #2091 from endymion1818/patch-1
Add instructions for cloning locally from Heroku
2018-10-07 17:30:09 +02:00
Jim LAURIE
6dd38bc732
Merge branch 'master' into patch-1 2018-10-07 17:29:19 +02:00
Jim LAURIE
d1ae57a7cb
Merge pull request #2085 from devaublanc/master
Fix error on fetch permissions
2018-10-07 17:00:50 +02:00
Jim LAURIE
5684700a72
Merge branch 'master' into master 2018-10-07 17:00:42 +02:00
Ben Read
a6756a447d
you can't have 2 "origin"s - renaming 2018-10-07 15:29:34 +01:00
Ben Read
3e940d76db
Add instructions for cloning locally from Heroku
This took me ages of trial & error effort when I first started investigating Strapi. I nearly gave up several times. The only available instructions are a bit difficult to follow (https://help.heroku.com/XOBUHLKQ/why-do-i-see-a-message-you-appear-to-have-cloned-an-empty-repository-when-using-heroku-git-clone).

I think this addition would help new adopters to get a more useful instance of Strapi running that would help them more easily evaluate the benefits of the content builder.
2018-10-06 17:29:59 +01:00
Jim LAURIE
367e510121
Merge pull request #2077 from maturanomx/bug/codeQuality
Fix conditional logic
2018-10-06 12:05:35 +02:00
Jim LAURIE
ff1013448d
Merge branch 'master' into bug/codeQuality 2018-10-06 12:04:44 +02:00
Jim LAURIE
0893775b07
Merge pull request #2089 from IdaszakDaniel/PL-missing-translation-keys
Update PL translations
2018-10-06 11:22:12 +02:00
IdaszakDaniel
207676e123 PL missing translation keys 2018-10-05 21:40:27 +02:00
Jim LAURIE
25ab8e7bef Add base /documentation 2018-10-05 17:24:17 +02:00
Jim LAURIE
b59487c838
Merge pull request #2078 from segush11/translation-keys-ru
Update RU translations
2018-10-05 14:45:03 +02:00
Benjamin Devaublanc
507ab8b922 Fix error on fetch permissions
Can't fetch permissions if we have an api that contain a service with no
controllers
2018-10-05 13:07:56 +02:00
Marianelli Michele
76d333a523
Update translations 2018-10-05 00:48:58 +02:00
Marianelli Michele
a3563f2f5b
Update translations 2018-10-05 00:37:57 +02:00
Alberto Maturano
bdde29eba8 Use the personal repository for contributions
Or, the fork step should not be there...
2018-10-04 17:05:29 -05:00
Alberto Maturano
2410d5ab9d Simplify logic 2018-10-04 15:22:10 -05:00
Alberto Maturano
e4f60a26ab Use just one call system 2018-10-04 15:21:05 -05:00
Alberto Maturano
017e713ec4 Remove unused imported library 2018-10-04 15:19:56 -05:00
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