33691 Commits

Author SHA1 Message Date
soupette
2f1aa08084 Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data 2019-12-11 14:27:32 +01:00
soupette
d2e0999217 Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into admin/webpack-config 2019-12-11 14:23:59 +01:00
Alexandre Bodin
a9cef57687 Lower case policy controller name 2019-12-11 14:23:45 +01:00
Alexandre Bodin
1791c19155 Fix globalPolicy controller key 2019-12-11 14:22:53 +01:00
soupette
02600b4b31 Merge branch 'front/dz-post-data' of github.com:strapi/strapi into admin/webpack-config 2019-12-11 14:14:35 +01:00
soupette
a8f593aeb9 Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data 2019-12-11 13:52:11 +01:00
soupette
4eaff16858 Fix max on repeatable fields 2019-12-11 12:48:52 +01:00
soupette
667fea4b99 Update webpack config 2019-12-11 12:43:07 +01:00
Alexandre Bodin
780c35a14a Add category info in content-manager 2019-12-11 12:19:48 +01:00
Jim LAURIE
3e737f928b Guide API token 2019-12-11 12:14:06 +01:00
soupette
9d72d7373e Fix left menu link on safari 2019-12-11 11:13:53 +01:00
soupette
87c4de9183 Fix injected compos from ctb in ctm 2019-12-11 10:57:10 +01:00
Alexandre BODIN
793d2dbfe9
Merge pull request #4702 from strapi/dynamic-zone/cleanup
Dynamic zone/cleanup
2019-12-11 10:40:44 +01:00
soupette
92ecb3eccd Fix leftmenu count span 2019-12-11 10:31:19 +01:00
Alexandre Bodin
a503c20353 Cleanup strapi-utils 2019-12-11 10:22:47 +01:00
soupette
9dc685ced5 Made some fixes for safari 2019-12-10 17:27:34 +01:00
Alexandre Bodin
bdd0a08ecb Prevent creation of special keys 2019-12-10 17:24:55 +01:00
Alexandre Bodin
5b01448dac Return __contentType field in morph related fields 2019-12-10 17:24:55 +01:00
Alexandre Bodin
b5cceb8760 Cleanup graphql and use model uids 2019-12-10 17:24:55 +01:00
Alexandre Bodin
9b5bc9c367 Fix manyWay deep filtering 2019-12-10 17:24:25 +01:00
Alexandre Bodin
0ba3d9d7de Merge branch 'develop' into features/dynamic-zones 2019-12-10 16:50:07 +01:00
Alexandre Bodin
e7444474f0 Merge branch 'master' into develop 2019-12-10 16:49:54 +01:00
Alexandre BODIN
f822a4d279
Merge pull request #4697 from strapi/fix/administrator-no-role-relation
Remove populate role on non existing relation breaking mongoose
2019-12-10 16:49:24 +01:00
Alexandre Bodin
03193acf4f Remove populate role on non existing relation breaking mongoose 2019-12-10 16:45:53 +01:00
soupette
98519d4f97 Remove commented code 2019-12-10 16:31:54 +01:00
soupette
875173cd00 Fix baseline 2019-12-10 15:54:36 +01:00
soupette
465fbea87f Fix icons edition 2019-12-10 14:26:12 +01:00
Alexandre Bodin
3446b7f577 wip 2019-12-10 14:21:20 +01:00
Alexandre Bodin
7c3f781081 Merge branch 'develop' into features/dynamic-zones 2019-12-10 13:51:00 +01:00
Alexandre Bodin
93ea08cc96 Merge branch 'master' into develop 2019-12-10 13:50:45 +01:00
Alexandre BODIN
b3f0eed9bf
Merge pull request #4696 from CKGrafico/patch-1
Fix environment typo
2019-12-10 13:49:40 +01:00
Quique Fdez Guerra
deb011dee1
Fix environment typo 2019-12-10 12:46:56 +01:00
soupette
15c6ec86d2 Update en trads 2019-12-10 12:27:17 +01:00
soupette
56826e4d3b Clean translations files 2019-12-10 12:19:56 +01:00
Olli Rautiainen
f2d53bf078 change admin UI's default language to english 2019-12-10 12:49:07 +02:00
soupette
14b28843a0 Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data 2019-12-10 11:28:04 +01:00
soupette
923aa6ceac Fix icon color 2019-12-10 11:26:18 +01:00
soupette
0e83b1ad1d Fix administrators and design 2019-12-10 11:11:55 +01:00
soupette
d9f75cb39c Change injected components api and fix prod mod 2019-12-09 23:10:05 +01:00
soupette
4136019d5f Fix line background for dz 2019-12-09 22:39:50 +01:00
soupette
034070cc4c Clean models 2019-12-09 19:10:27 +01:00
soupette
51d7a317bb Clean code 2019-12-09 18:53:15 +01:00
soupette
207ddb54a0 Fix prod mode 2019-12-09 18:33:43 +01:00
soupette
ce22ca993c Fix links to the ctm 2019-12-09 18:18:55 +01:00
soupette
456e36c1ce Fix input file 2019-12-09 18:09:48 +01:00
soupette
959d45febf Add warning before delete 2019-12-09 17:47:13 +01:00
soupette
d1d97e1751 Fix components baseline 2019-12-09 17:33:50 +01:00
soupette
fdc5f069bf Fix baseline 2019-12-09 17:13:16 +01:00
Alexandre BODIN
8c3b5c2eaf
Merge pull request #4688 from strapi/docs/dynamic-zones
Update documentation with dynamic zone feature
2019-12-09 16:40:09 +01:00
Jim LAURIE
679a928674 Fix typo 2019-12-09 16:38:41 +01:00