Jim LAURIE
0164b854fd
Merge branch 'master' into master
2018-11-17 13:34:58 +01:00
Jim LAURIE
1d17a43d61
Merge pull request #2329 from BrandonS8/patch-1
...
Gender neutral terms
2018-11-17 13:30:17 +01:00
Brandon Sears
60a36fae56
Gender neutral terms
...
Change "his/he" when referring to a user to "their/they"
2018-11-16 15:42:46 -05:00
soupette
428a9ca62d
Fix schema
...
Force lowerCase on content type name (since it is not supported by the backend)
Clean layout when the model has been removed
2018-11-16 18:34:12 +01:00
soupette
4b26453e0e
Fix schema
2018-11-16 18:32:26 +01:00
Jim LAURIE
19ec6242f9
Merge branch 'master' into feature/allow-filtering-on-a-relation-attribute
2018-11-16 17:38:27 +01:00
soupette
fc7ef829a0
Merge branch 'master' of github.com:strapi/strapi into add-cypress
2018-11-16 17:13:14 +01:00
soupette
d279ae8fa3
Improve logic by removing those fields from the options
2018-11-16 12:30:55 +01:00
soupette
a8773687cf
Fix hidden fields in schema
2018-11-16 12:19:08 +01:00
Jim LAURIE
38da18aec5
Merge pull request #2305 from maturanomx/style/spanishTranslation
...
Update ES translations
2018-11-16 11:36:16 +01:00
Jim LAURIE
eb6d0aa06b
Merge branch 'master' into style/spanishTranslation
2018-11-16 11:36:06 +01:00
Jim LAURIE
578af4e698
Merge pull request #2169 from strapi/update-providers-names
...
Prefix providers
2018-11-16 10:30:12 +01:00
Jim LAURIE
11d192b9ad
Fix version conflicts
2018-11-16 10:25:51 +01:00
soupette
5406b678ac
Add selectors for tests and fix bugs
2018-11-16 09:18:57 +01:00
Amir Reza Dalir
5489dd6338
JSON format fix
2018-11-16 01:39:55 +03:30
Alberto Maturano
f87da6631f
refactor: Remove never executed conditional part
...
Also, the variable should be array type, not numeric...
2018-11-15 15:56:03 -06:00
Amir Reza Dalir
b15e54a0b0
Added flag of Iran
2018-11-16 01:24:15 +03:30
Alberto Maturano
8fcbb1978f
refactor: Fix misuse of map method
...
`map` should create a new Array so a `return` is expected inside the
callback param. `forEach` is the corrent method to use for just iterate
over array elements.
2018-11-15 15:51:23 -06:00
Amir Reza Dalir
599f525f13
Add fa language
2018-11-16 00:56:59 +03:30
Amir Reza Dalir
e9301725f1
Add FA translations
...
add Persian(fa) translations
2018-11-16 00:51:31 +03:30
Jim LAURIE
e539938743
Merge pull request #2283 from derrickmehaffy/frTemplate
...
Add Product board to Feature Request Template
2018-11-15 22:18:14 +01:00
Jim LAURIE
64ce114948
Merge branch 'master' into frTemplate
2018-11-15 22:18:07 +01:00
Jim LAURIE
b0f86ba6ae
Add message to auto close issue
2018-11-15 21:16:49 +01:00
Aurelsicoko
e28b69092d
Use primaryKey to associate correct related entry in manyToOne association
2018-11-15 17:47:17 +01:00
Aurelsicoko
0eeb20e313
Merge branch 'master' of github.com:strapi/strapi into fix/manyToMany
2018-11-15 16:25:55 +01:00
Aurelsicoko
d4a94b363e
Merge branch 'fix/manyToMany' of github.com:g-div/strapi into fix/manyToMany
2018-11-15 16:24:00 +01:00
Aurelsicoko
8fc9d01b46
Fix manyToMany relation when only sending ids
2018-11-15 16:22:13 +01:00
Jim LAURIE
30782638e4
Merge pull request #2313 from maturanomx/refactor/codeQuality
...
Corrects conditional management plugin host
2018-11-15 15:18:27 +01:00
Alberto Maturano
86cbd0c1b3
refactor: Remove unused variable
2018-11-14 19:51:05 -06:00
Alberto Maturano
141a7dd58d
refactor: Corrects conditional management
...
The original implementation throws and runtime error if the `host` is
not defined making the conditional uselees.
Using a try/catch block is the correct implementation of the original
intention.
2018-11-14 18:28:05 -06:00
soupette
d9ee893c8f
Merge branch 'master' of github.com:strapi/strapi into add-cypress
2018-11-14 18:20:40 +01:00
soupette
3cb1291eed
Fix bugs and add ids
2018-11-14 18:19:35 +01:00
Alberto Maturano
90fba032d4
style: Improves spanish translation
...
issue #1621
2018-11-13 16:02:25 -06:00
Amir Reza Dalir
4c92cfc4ee
update template for lifecycle callback
...
add beforeFetchCollection & afterFetchCollection in template file for bookshelf models
2018-11-13 20:11:19 +03:30
Dimitri Nicolas
e18bf9198b
Change containerFluid child margin for better grid alignement
2018-11-13 17:21:31 +01:00
soupette
779f575b47
Access reducer from cypress
2018-11-13 16:53:50 +01:00
Jim LAURIE
20a830d7fa
Merge pull request #2299 from strapi/3.0.0-alpha.14.5
...
3.0.0-alpha.14.5
2018-11-13 15:35:18 +01:00
Jim LAURIE
8fcf2ed8ae
3.0.0-alpha.14.5
2018-11-13 14:50:07 +01:00
Jim LAURIE
042784debd
Merge pull request #2271 from strapi/fix/2253
...
Improve content manager component
2018-11-12 22:35:38 +01:00
Jim LAURIE
ce435184f9
Merge branch 'master' into fix/2253
2018-11-12 22:35:29 +01:00
Jim LAURIE
3970cd75b7
Merge pull request #2290 from misacorn/patch-1
...
Docs typo fix
2018-11-12 21:21:32 +01:00
Jim LAURIE
053ea553c9
Merge pull request #2286 from sidharthv96/master
...
Update username for Google Auth
2018-11-12 20:58:35 +01:00
Jim LAURIE
608fc3b4ab
Merge branch 'master' into master
2018-11-12 20:58:07 +01:00
Jim LAURIE
391f5b31ae
Merge pull request #2279 from strapi/enhancement/auto-open
...
Auto open admin first start
2018-11-12 18:22:19 +01:00
Jim LAURIE
309543324b
Merge branch 'master' into enhancement/auto-open
2018-11-12 18:22:00 +01:00
misacorn
c3f94ff0d8
Docs typo fix
2018-11-11 19:31:24 +02:00
Sidharth Vinod
e3d4708aaa
Update username for Google Auth to fix #2285
2018-11-11 00:26:53 +05:30
Sidharth Vinod
38f0b16058
Merge pull request #1 from strapi/master
...
Merge
2018-11-11 00:24:33 +05:30
Jim LAURIE
005b4ba49a
Merge pull request #2284 from matimendez88/patch-1
...
Fix "Roles & Permissions" section wording
2018-11-10 12:47:08 +01:00
Jim LAURIE
e9c847adbe
Merge branch 'master' into patch-1
2018-11-10 12:47:01 +01:00
