21 Commits

Author	SHA1	Message	Date
soupette	fdb0f86fcc	Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view	2019-07-29 13:53:13 +02:00
Alexandre Bodin	59523d47e7	Rename content manager configuration key an model uid changes	2019-07-26 17:53:03 +02:00
soupette	fbf5bd851f	Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view	2019-07-25 18:07:52 +02:00
Alexandre Bodin	89f07bf37a	Update content types when groups are updated	2019-07-25 14:05:06 +02:00
soupette	8a5361813a	Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view	2019-07-24 16:55:26 +02:00
Alexandre Bodin	2efaa08394	Use wysiwyg in example article type	2019-07-24 14:37:50 +02:00
Alexandre Bodin	9876c339ce	Recompute layout sizes	2019-07-24 14:35:21 +02:00
soupette	b790cb098d	Fix conflicts	2019-07-24 11:16:40 +02:00
soupette	cef035a3ca	Add trads	2019-07-19 09:40:14 +02:00
Alexandre Bodin	fbfe41e1d1	Create group type	2019-07-18 19:37:29 +02:00
Alexandre Bodin	a62f73fe5f	Merge branch 'develop' into feature/groups	2019-07-18 19:37:09 +02:00
Alexandre Bodin	da5d02fb7c	Merge branch 'master' into develop	2019-07-18 19:28:52 +02:00
soupette	1157f6ae75	Created React select one	2019-07-16 19:00:00 +02:00
Alexandre Bodin	45e6533941	Cleanup and remove upload plugin queries	2019-07-16 17:23:37 +02:00
Alexandre Bodin	cd19e04d6d	Init queryManager	2019-07-16 17:23:24 +02:00
Alexandre Bodin	04f8632d3d	fix models	2019-07-16 17:01:15 +02:00
Alexandre Bodin	63a6452830	Merge branch 'develop' into feature/groups	2019-07-15 10:21:22 +02:00
soupette	8662bce3a2	Display fields	2019-07-12 15:39:18 +02:00
soupette	02493109f5	Change layout data	2019-07-12 14:15:56 +02:00
soupette	832abba48a	Init sort	2019-07-05 14:59:31 +02:00
Virginie Ky	8bd089b821	GroupPage ViewContainer and models clean	2019-06-21 17:06:49 +02:00