10077 Commits

Author SHA1 Message Date
Alexandre Bodin
d901b54c2e Support dynamic zones in documentation plugin 2019-12-02 12:00:07 +01:00
cyril lopez
46c32055cf
Merge pull request #4592 from strapi/front/dynamic-zones-ctm-ui
Front/dynamic zones ctm ui
2019-11-29 06:43:58 +01:00
cyril lopez
b78bef7445
Merge branch 'features/dynamic-zones' into front/dynamic-zones-ctm-ui 2019-11-28 22:49:18 +01:00
Virginie Ky
a2e6427749 Merge branch 'front/dynamic-zones-ctm-ui' of github.com:strapi/strapi into front/dynamic-zones-ctm-ui 2019-11-28 19:24:10 +01:00
Virginie Ky
3067bf5e1c design review 2019-11-28 19:23:10 +01:00
Alexandre BODIN
cc5b863c35
Merge pull request #4622 from strapi/dynamic-zone/graphql-support
Support dynamic zones in graphql
2019-11-28 18:18:22 +01:00
Alexandre Bodin
53d02ea443 Support empty dynamic zone 2019-11-28 17:34:27 +01:00
Alexandre Bodin
e4226344ee simplify code 2019-11-28 17:34:27 +01:00
Alexandre Bodin
db08e93cc7 Support dynamic zones in graphql 2019-11-28 17:34:26 +01:00
Alexandre Bodin
05cfd05c10 Merge branch 'develop' into features/dynamic-zones 2019-11-28 17:33:58 +01:00
Alexandre Bodin
ce53715714 Merge branch 'master' into develop 2019-11-28 17:33:40 +01:00
Jim LAURIE
f36a5cf096
Merge pull request #4584 from sulakin/admin-russian-translation
Update Russian translation for admin panel
2019-11-28 16:51:32 +01:00
Jim LAURIE
c7d20d0358
Merge branch 'master' into admin-russian-translation 2019-11-28 16:51:15 +01:00
Aurélien Georget
1400764e73 Apply events to DZ and components 2019-11-28 16:37:38 +01:00
Aurélien Georget
c60975f983 Merge branch 'front/dynamic-zones-ctm-ui' of github.com:strapi/strapi into front/dynamic-zones-ctm-ui 2019-11-28 16:31:07 +01:00
Aurélien Georget
26dbbddaf1 Remove useless events and add new events 2019-11-28 16:30:49 +01:00
Virginie Ky
d83cbb4539 Merge branch 'front/dynamic-zones-ctm-ui' of github.com:strapi/strapi into front/dynamic-zones-ctm-ui 2019-11-28 15:59:45 +01:00
Aurélien Georget
8ca8d9bbc9 Merge branch 'front/dynamic-zones-ctm-ui' of github.com:strapi/strapi into front/dynamic-zones-ctm-ui 2019-11-28 15:58:23 +01:00
Aurélien Georget
367b1a0d1f Apply events to improve the products 2019-11-28 15:57:39 +01:00
Virginie Ky
c47985cf9b Merge branch 'features/dynamic-zones' into front/dynamic-zones-ctm-ui 2019-11-28 15:57:06 +01:00
Virginie Ky
6baa56d9a1 PR review apply 2019-11-28 15:11:57 +01:00
Virginie Ky
0d8eda80bd fortawesome dep 2019-11-28 14:15:04 +01:00
Jim LAURIE
d1326aa35a
Merge pull request #4620 from strapi/docs-ga
Add GA in the docs
2019-11-28 11:53:25 +01:00
Jim LAURIE
2e6d0c7f41 Add GA in the docs 2019-11-28 11:45:45 +01:00
Alexandre BODIN
24fde718db
Merge pull request #4619 from strapi/revert-4614-docs-warning-alpha
Revert "Revert docs update"
2019-11-28 10:47:42 +01:00
Jim LAURIE
e0b96b9738
Revert "Revert docs update" 2019-11-28 10:43:33 +01:00
Alexandre BODIN
a6115daab5
Merge pull request #4600 from strapi/docs-website-link
Fix docs website link in the top menu
2019-11-28 09:00:19 +01:00
Alexandre BODIN
0cc737145e
Merge branch 'master' into docs-website-link 2019-11-28 09:00:11 +01:00
Sulakin Vadim
c516051b3f
Merge branch 'master' into admin-russian-translation 2019-11-28 09:27:14 +03:00
Jim LAURIE
b2e99a3e20
Merge pull request #4614 from strapi/docs-warning-alpha
Revert docs update
2019-11-27 18:14:07 +01:00
Jim LAURIE
fd66ffb337
Merge branch 'master' into docs-warning-alpha 2019-11-27 18:14:00 +01:00
Jim LAURIE
11addd3485 Revert docs update 2019-11-27 18:13:18 +01:00
Jim LAURIE
f0766e5b7f
Merge pull request #4613 from strapi/docs-warning-alpha
Fix docs build
2019-11-27 18:06:22 +01:00
Jim LAURIE
d0563e8d38
Merge branch 'master' into docs-warning-alpha 2019-11-27 18:06:15 +01:00
Jim LAURIE
885f7c63f9 Fix docs build 2019-11-27 18:05:21 +01:00
Alexandre BODIN
56d359fd97
Merge pull request #4612 from strapi/docs-warning-alpha
Display a deprecated message docs alpha
2019-11-27 17:30:09 +01:00
Alexandre BODIN
2f3cd26acc
Merge branch 'master' into docs-warning-alpha 2019-11-27 17:30:00 +01:00
Jim LAURIE
6a2b667b74 Fix ; 2019-11-27 17:28:08 +01:00
Jim LAURIE
93130a1676 Display a deprecated message docs alpha 2019-11-27 17:26:30 +01:00
Alexandre BODIN
ad3cd2ee94
Merge pull request #4611 from strapi/docs-deploy-docker
Add a docker ref in the docs
2019-11-27 16:36:43 +01:00
Alexandre BODIN
1f7688cb77
Merge branch 'master' into docs-deploy-docker 2019-11-27 16:36:34 +01:00
Jim LAURIE
bb2a54525d Add a docker ref in the docs 2019-11-27 16:25:36 +01:00
Alexandre BODIN
a553f08007
Merge pull request #4610 from strapi/dynamic-zone/mongo-fix-morph-relations
Dynamic zone/mongo fix morph relations
2019-11-27 16:09:25 +01:00
Alexandre Bodin
c2a0829811 Fix remove and add morph relation 2019-11-27 15:30:38 +01:00
Alexandre Bodin
24e5aceb44 Fix image being unlinked from entity on entity creation 2019-11-27 15:30:37 +01:00
Alexandre Bodin
713f848f9e Merge branch 'develop' into features/dynamic-zones 2019-11-27 15:30:10 +01:00
Alexandre Bodin
55b7dd620e Remove hook-knex 2019-11-27 15:30:03 +01:00
Alexandre Bodin
63abfc6db9 Merge branch 'develop' into features/dynamic-zones 2019-11-27 15:28:33 +01:00
Alexandre Bodin
49985eca53 Merge branch 'master' into develop 2019-11-27 15:28:06 +01:00
Alexandre BODIN
17c47bafc1
Merge pull request #4599 from strapi/fix-4559
Fix lowercase email in forgot password function
2019-11-27 15:25:42 +01:00