33691 Commits

Author SHA1 Message Date
Jim LAURIE
68dd02ba6f
Merge branch 'master' into patch-1 2020-01-09 12:06:36 +01:00
Virginie Ky
4aeb5399ee Merge branch 'features/webhooks' of github.com:strapi/strapi into front/webhooks-editview 2020-01-09 11:11:32 +01:00
Alexandre Bodin
f28292b384 Merge branch 'develop' into features/webhooks 2020-01-09 11:09:26 +01:00
Virginie Ky
d0650f1884 Conflicts resolved 2020-01-09 11:05:46 +01:00
Alexandre BODIN
a427c27cfd
Merge pull request #4947 from strapi/fix/use-strapi-service
Use strapi.services instead of requires to allow overrides
2020-01-09 10:13:05 +01:00
Alexandre BODIN
c5cef7dcbb fix - keep autoPopulate:false options on edit 2020-01-08 19:00:12 +01:00
Thomas Baxter
37dbd955e2 feat(purest): upgrading purest to 3.x 2020-01-08 12:55:16 -05:00
Virginie Ky
1b39898f66 errors states 2020-01-08 18:28:52 +01:00
Alexandre Bodin
7c94a2316d Init strapi.service and use it where services where required 2020-01-08 17:57:53 +01:00
soupette
60cd11624a Add test for adding a common attribute 2020-01-08 17:57:25 +01:00
soupette
c259377bd2 Merge branch 'master' of github.com:strapi/strapi into chore/ctb-front-end-tests 2020-01-08 17:20:06 +01:00
Alexandre BODIN
e6155814f0
Merge pull request #4928 from kuldipem/master
package.json name property must be in lowercase
2020-01-08 17:13:18 +01:00
Alexandre BODIN
28e00a80d3
Merge pull request #4941 from strapi/enhancement-2020
Update copyright date to 2020
2020-01-08 17:12:56 +01:00
Alexandre BODIN
260758f368
Merge branch 'master' into enhancement-2020 2020-01-08 17:12:30 +01:00
Alexandre BODIN
e974dfc9ca
Merge pull request #4945 from strapi/hotfix/ctb-date-edit
Fix edit date types
2020-01-08 17:11:23 +01:00
soupette
c7a83a9687 Merge branch 'master' of github.com:strapi/strapi into hotfix/ctb-date-edit 2020-01-08 17:10:34 +01:00
Alexandre BODIN
7dbb0f9283
Merge pull request #4944 from strapi/fix/datetime-ctb
Add datetime and time validators in ctb
2020-01-08 17:09:05 +01:00
soupette
af2c2a1841 Fix edit date types 2020-01-08 17:09:04 +01:00
Alexandre BODIN
521d11be1f
Merge branch 'master' into fix/datetime-ctb 2020-01-08 17:08:57 +01:00
Alexandre Bodin
4965846d36 Add datetiem and time validators in ctb 2020-01-08 17:03:03 +01:00
jozefcipa
9940f221f0 Add option to specify custom files to ignore 2020-01-08 16:54:20 +01:00
soupette
253fcff5da Merge branch 'master' of github.com:strapi/strapi into chore/ctb-front-end-tests 2020-01-08 16:42:17 +01:00
soupette
8a570964c6 Add tests for simple actions 2020-01-08 16:42:01 +01:00
Alexandre BODIN
b7999d4774
Merge pull request #4942 from strapi/fix-slug
Udpate steps to access to the view config page
2020-01-08 16:11:54 +01:00
Virginie Ky
47e1031e29 Reviex apply in progress 2020-01-08 16:08:58 +01:00
Jim LAURIE
44fa8399a0 docs: udpate steps to access to the view config page
Since we removed the Content Manager link - I have to update the path to access to this page.
2020-01-08 16:04:57 +01:00
Jim LAURIE
2eea8e9d9b
Merge pull request #4926 from MightySCollins/patch-1
Fixed error impossible message grammar
2020-01-08 15:44:50 +01:00
Jim LAURIE
636e1fa8d8
Merge branch 'master' into patch-1 2020-01-08 15:44:42 +01:00
Jim LAURIE
df1fed99ec docs: update copyright date to 2020 2020-01-08 15:41:08 +01:00
Jim LAURIE
433ea3bcc5
Merge pull request #4930 from cebreus/feature/adminTranslationCs
Update of the Czech translation
2020-01-08 15:34:26 +01:00
Jim LAURIE
2b2295ee78
Merge branch 'master' into feature/adminTranslationCs 2020-01-08 15:34:16 +01:00
Alexandre BODIN
4ae0f94a3d
Merge pull request #4940 from strapi/docs-dz-graphql
Add example GraphQL query dynamic zone
2020-01-08 15:29:15 +01:00
Jim LAURIE
acf4c1dece docs: example graphql query dynamic zone
Following the issue #4849 - I add an example about the query to do to fetch DZ data.
2020-01-08 15:23:09 +01:00
Alexandre BODIN
f1e7288db7
Merge pull request #4939 from strapi/fix/issue-delete-relation
Dont break on attribute not found
2020-01-08 15:07:11 +01:00
Alexandre BODIN
c2caad9d87
Merge branch 'master' into fix/issue-delete-relation 2020-01-08 15:07:03 +01:00
Alexandre Bodin
1ee6e62329 Dont break on attribute not found 2020-01-08 14:57:33 +01:00
Virginie Ky
8ba3e462e4 Review apply ip 2020-01-08 14:55:37 +01:00
Alexandre BODIN
15c7f41096
Merge pull request #4934 from strapi/webhooks/entity-service
Create entity service
2020-01-08 14:18:58 +01:00
Saint Asky
e3e28db031
Update auth-request.md
Change axios.get to axios.post
2020-01-08 21:07:02 +08:00
Alexandre Bodin
a0718d7643 Fix delete many 2020-01-08 13:25:44 +01:00
soupette
9526b0510b Merge branch 'master' of github.com:strapi/strapi into chore/ctb-front-end-tests 2020-01-08 13:25:42 +01:00
soupette
aa9d4e2d7a Add basics tests for reducer 2020-01-08 13:25:11 +01:00
soupette
c62dad2140 Improve eslint config fron front-end files 2020-01-08 12:21:47 +01:00
soupette
73214e7237 Add eslint rule 2020-01-08 12:02:22 +01:00
Alexandre BODIN
05b00151f9
Merge pull request #4818 from strapi/ctb/improve-stepper
Improve ctb modal stepper
2020-01-08 11:40:49 +01:00
soupette
d9a81c7011 Fix naming 2020-01-08 11:38:23 +01:00
Alexandre Bodin
2607b38bcc Add url validation 2020-01-08 11:33:59 +01:00
virginieky
860c2e0789
Merge branch 'master' into ctb/improve-stepper 2020-01-08 11:31:43 +01:00
soupette
d4f5eabe80 Merge branch 'master' of github.com:strapi/strapi into chore/ctb-front-end-tests 2020-01-08 11:22:56 +01:00
Alexandre Bodin
fb25e33383 Create an entity service to share between core service and content manager 2020-01-08 11:13:38 +01:00