6241 Commits

Author SHA1 Message Date
Alexandre BODIN
ad1cee6469
Merge branch 'master' into develop 2019-08-22 16:06:05 +02:00
Alexandre BODIN
788b3ff7e7
Merge branch 'master' into master 2019-08-22 16:05:38 +02:00
Alexandre Bodin
7c5f1484ba Use koa-router and fix graphql-uploads 2019-08-22 15:04:27 +02:00
Alexandre BODIN
3569f8fdee
Merge pull request #3814 from strapi/ctm/edit-group-update
Ctm/edit group update
2019-08-22 12:13:15 +02:00
soupette
6ed682fb43 Fix errors 2019-08-21 18:07:58 +02:00
soupette
492ff5b3c1 Update design and fix yup validations 2019-08-21 17:35:13 +02:00
cyril lopez
66794e9b5b
Merge branch 'develop' into admin/hp-update 2019-08-21 13:27:17 +02:00
soupette
14157f73b9 Update trads and add links to terms and privacy policy 2019-08-21 10:06:09 +02:00
soupette
93a3e0a1e2 Remove google analytics 2019-08-21 09:32:19 +02:00
soupette
eef4939415 Update homepage design 2019-08-21 09:28:30 +02:00
soupette
6604147ba4 Merge branch 'develop' of github.com:strapi/strapi into group/front-qa 2019-08-20 16:07:20 +02:00
soupette
fd7f004da9 Fix ctb design QA 2019-08-20 16:06:52 +02:00
Alexandre Bodin
774f95a5a7 Refactor mongoose deepfiltering to populate infos correctly 2019-08-20 12:07:45 +02:00
soupette
7f067c8f6a Fix ctm qa 2019-08-20 11:00:48 +02:00
Vladislav Umrikhin
ea42bf1e63 fix capital letter in word email 2019-08-20 16:51:08 +10:00
Alexandre Bodin
a62a09e67e Change mongo connection error message 2019-08-19 17:32:33 +02:00
Alexandre Bodin
048a071c79 Default mainField string 2019-08-19 16:13:24 +02:00
cyril lopez
13f3f2db4d
Merge branch 'develop' into ctm/tests 2019-08-19 12:03:48 +02:00
Alexandre Bodin
99dbd21e0b Fix self-referencing many-to-many sql 2019-08-19 11:44:53 +02:00
cyril lopez
695a633309
Merge branch 'develop' into ctm/tests 2019-08-19 10:42:21 +02:00
Alexandre Bodin
80989ee8ec Make hook loading async 2019-08-19 09:37:37 +02:00
Alexandre BODIN
350f9ba352
Merge branch 'develop' into chore/parsemutlipart-in-proto 2019-08-19 09:30:53 +02:00
Vladislav Umrikhin
58ae4dd340 Update RU translation in strapi-plugin-content-type-builder
Removed unnecessary capital letters
2019-08-19 04:53:28 +10:00
Vladislav Umrikhin
a9ba7039c4 Update RU translation in strapi-plugin-email 2019-08-19 04:41:54 +10:00
Vladislav Umrikhin
ff5c091c2b Fixed context of paper letters 2019-08-19 04:38:18 +10:00
Vladislav Umrikhin
f4d5317264 Update RU translation in strapi-plugin-users-permissions 2019-08-19 04:35:18 +10:00
Vladislav Umrikhin
e146d2dee1 Update RU translation in admin 2019-08-19 03:48:12 +10:00
soupette
7b3269c2c9 Display server errors 2019-08-14 10:35:59 +02:00
Alexandre Bodin
f8d3ca0274 Fix bug when new attributes are added to an empty layout 2019-08-14 09:23:44 +02:00
soupette
02522c14b6 Merge branch 'develop' of github.com:strapi/strapi into ctm/tests 2019-08-13 23:35:40 +02:00
soupette
d7404346d5 Add tests to setting model view 2019-08-13 19:19:13 +02:00
Alexandre Bodin
3ae664f403 Make parseMultipart part of the controller prototype to avoid having it in the permissions 2019-08-13 17:41:52 +02:00
Alexandre Bodin
2a780ea10a Clear _id now that queries return an id everytime 2019-08-13 17:40:31 +02:00
soupette
88a0241e38 Merge branch 'develop' of github.com:strapi/strapi into ctm/tests 2019-08-13 17:37:52 +02:00
soupette
3b15e257d2 Add test to main reducer 2019-08-13 17:35:05 +02:00
cyril lopez
435b3a9d24
Merge branch 'develop' into front/upgrade-react 2019-08-13 17:10:36 +02:00
soupette
a09ec8467b Fix filters related bugs and add tests 2019-08-13 16:41:15 +02:00
Alexandre Bodin
c54efe7bbb Do not put empty row in edit layout if not necessary 2019-08-13 15:25:19 +02:00
soupette
dabf6ca462 Add tests for utils/layouts.js 2019-08-13 15:12:32 +02:00
soupette
857ec1ca70 Rename lifecycle hooks 2019-08-13 11:31:10 +02:00
soupette
d52d4f603f Upgrade react deps 2019-08-13 11:22:36 +02:00
Alexandre Bodin
6e48232c85 Merge branch 'master' into develop 2019-08-13 10:55:37 +02:00
Jelmer Visser
f0e8df63c5 Fix custom mutation returning null and not executing policies (#3735)
Fix custom mutation returning null and not executing policies
2019-08-13 10:55:12 +02:00
Alexandre Bodin
5a4b588ea2 Make model accessible through query to simplify usage 2019-08-12 17:35:54 +02:00
Alexandre Bodin
d9f1f39ee4 Add documentation 2019-08-12 17:08:22 +02:00
Alexandre Bodin
ac95603a12 Update strapi-generate-new boostrapi function template 2019-08-12 15:45:35 +02:00
Alexandre Bodin
3b47457f4f make boostrap functions async only 2019-08-12 15:35:40 +02:00
Alexandre BODIN
f63f2f6273
Merge branch 'develop' into chore/unique-indexes 2019-08-12 11:43:13 +02:00
Alexandre Bodin
902d3a0a89 Add clear messages on unique constraint failure. make them non blocking for now 2019-08-12 11:08:10 +02:00
soupette
5b578a861c Fix bug when editing an existing entry that did not have a group 2019-08-12 10:40:58 +02:00