116 Commits

Author	SHA1	Message	Date
Virginie Ky	336902384e	Merge branch 'develop' into front/repeatable-field-create	2019-08-01 17:51:47 +02:00
Virginie Ky	e6589ce6c6	merge develop and regex validation	2019-08-01 17:42:20 +02:00
virginieky	49aa6954f2	Merge branch 'develop' into ctm/repeatable-edit-view	2019-08-01 16:52:23 +02:00
Virginie Ky	ef74880a6b	prompt	2019-07-31 19:08:29 +02:00
soupette	e30d2be60d	Change ctb menu link with uid instead of destination	2019-07-31 16:31:35 +02:00
Alexandre Bodin	ca5629e4f7	clean Article.settings.json	2019-07-31 16:13:00 +02:00
Alexandre Bodin	c530afa8a3	Validate content-type-buildeer group schema	2019-07-31 16:10:24 +02:00
soupette	0a3b692a87	Fixes #2866	2019-07-31 15:22:37 +02:00
soupette	2da64c084f	Remove useless content types	2019-07-31 14:07:20 +02:00
soupette	87ddd2980b	Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view	2019-07-30 16:18:31 +02:00
soupette	91609cd713	Handle upload and send data	2019-07-30 16:18:11 +02:00
Virginie Ky	cb19e1e240	Add and edit new group attribute from ModelPage	2019-07-30 14:18:08 +02:00
Alexandre Bodin	f722348749	clean up	2019-07-30 13:06:43 +02:00
Alexandre Bodin	fd54e71baf	bookshelf clean populate	2019-07-30 13:06:43 +02:00
Alexandre Bodin	72c7203e18	Init populate cleanup	2019-07-30 13:06:28 +02:00
Virginie Ky	dc8278fd1a	merge develop	2019-07-30 11:15:47 +02:00
soupette	5e94cf56f7	Fix layout update from ctb	2019-07-30 09:08:10 +02:00
Alexandre Bodin	8e8433662b	rename wysiwyg type to richtext for future plans	2019-07-29 18:05:18 +02:00
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
Alexandre Bodin	8f642c0201	Update repeatables	2019-07-11 13:52:21 +02:00
Alexandre Bodin	1b130f7a7b	Init group inserts	2019-07-11 13:52:21 +02:00
Alexandre Bodin	8ece6eaa22	Merge branch 'master' into feature/groups	2019-07-09 16:11:01 +02:00
Alexandre Bodin	d30f0ca173	Fix content manager json parsing strategy	2019-07-09 14:45:52 +02:00
Alexandre Bodin	343648988c	Add manyWay support to mongoose hook	2019-07-09 09:18:06 +02:00
Alexandre Bodin	d7e9509a45	Init manWay relation	2019-07-09 09:18:05 +02:00
Alexandre Bodin	ba5fc12ff9	Add group relation example	2019-07-08 18:35:39 +02:00
soupette	832abba48a	Init sort	2019-07-05 14:59:31 +02:00
Alexandre Bodin	c8a509a223	Add group constraints	2019-07-02 13:28:18 +02:00
Alexandre Bodin	5777d0de35	v1 bookshelf	2019-07-02 13:28:16 +02:00
Alexandre Bodin	0fc01f5a40	Load groups	2019-07-02 13:28:15 +02:00
Alexandre Bodin	3a1b85de82	Init groups	2019-07-02 13:28:15 +02:00
Virginie Ky	8bd089b821	GroupPage ViewContainer and models clean	2019-06-21 17:06:49 +02:00