33691 Commits

Author SHA1 Message Date
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 v3.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
Jim LAURIE
b850b6d446
Merge pull request #1833 from greatwitenorth/fix-graphql-many-to-many-relations
Change comparison operator for array of id's
2018-11-10 11:46:38 +01:00
Jim LAURIE
08ababab42 Fix lint 2018-11-10 11:37:02 +01:00
Jim LAURIE
e99ee6ec5c
Merge branch 'master' into fix-graphql-many-to-many-relations 2018-11-10 10:30:04 +01:00
Matías Manuel Méndez
8ce79726ed
Fix section wording
the name of the section `Roles & Permissions`
2018-11-10 02:10:42 -03:00
DMehaffy
597e627606 Add Product board to feature request 2018-11-09 15:17:01 -07:00
Jim LAURIE
06fd627968
Merge pull request #2221 from g-div/fix/manyToMany
Avoid duplicate entries in manyToMany relations
2018-11-09 17:20:06 +01:00
Jim LAURIE
dd85922c63
Merge branch 'master' into fix/manyToMany 2018-11-09 17:19:59 +01:00
soupette
69ae95726f Prevent all bugs from strings 2018-11-09 14:36:17 +01:00
soupette
8bb2007387 Add selectors 2018-11-09 14:28:48 +01:00
Jim LAURIE
fb2a259197
Merge pull request #2273 from strapi/fix/depreaction-warnings-admin
Fix redux-sagas deprecation warnings
2018-11-09 14:24:40 +01:00
Jim LAURIE
41e217674b
Merge branch 'master' into fix/depreaction-warnings-admin 2018-11-09 14:24:22 +01:00
Jim LAURIE
5188d70d91
Merge branch 'master' into fix-graphql-many-to-many-relations 2018-11-09 12:07:52 +01:00
Jim LAURIE
63666a1ab2 Auto open admin first start 2018-11-08 21:07:33 +01:00
Jim LAURIE
5a6df750ac
Merge pull request #2275 from strapi/fix/1317
Improve permissions policy to avoid security breach with GraphQL
2018-11-08 18:37:53 +01:00
Jim LAURIE
61dd06c742
Merge branch 'master' into fix/1317 2018-11-08 18:37:45 +01:00
soupette
2a5f0c95d2 Fix conflict 2018-11-08 17:54:45 +01:00
soupette
7a66850aa6 Add ids to buttons in ctb 2018-11-08 16:32:34 +01:00
Jim LAURIE
03d3db014f
Merge branch 'master' into fix/manyToMany 2018-11-08 15:53:07 +01:00
Jim LAURIE
38a61d176b
Merge pull request #2217 from entwicklerfr/fix/#1787
Fix set provider to 'local' during user creation
2018-11-08 15:27:55 +01:00
Jim LAURIE
d677fa89ff
Merge branch 'master' into fix/#1787 2018-11-08 15:11:35 +01:00