328 Commits

Author	SHA1	Message	Date
Aurelsicoko	b0fc115cd7	Use i18n when there is no description available for a plugin	2018-01-10 16:55:12 +01:00
Jim Laurie	f5a5fac5f1	Fix CTB get model to plugins	2018-01-09 14:25:47 +01:00
Jim Laurie	ff46faf306	Execute controller action out of authorization try	2018-01-09 13:53:52 +01:00
Jim Laurie	6a59946f71	Fix CTB if one API has no model file	2018-01-09 13:42:19 +01:00
Aurélien GEORGET	8a1b95f2b5	Merge branch 'master' into enhancement/one-way	2018-01-08 12:12:01 +01:00
Aurelsicoko	10db375825	Fix #379 - Support one-way relationship	2018-01-08 12:10:48 +01:00
Jim Laurie	cc4973b65b	3.0.0-alpha.7.3	2018-01-05 12:10:41 +01:00
Aurelsicoko	12d1357d36	Update behavior on plugin card and retrieve logo & description from API	2018-01-04 19:04:22 +01:00
Aurelsicoko	127690c6bb	Fix globalId on Mongoose and CT creation with plugin's model	2018-01-04 11:24:27 +01:00
cyril lopez	cbe4202742	Add tab nav to popuprelation	2017-12-18 12:05:52 +01:00
cyril lopez	09f9805680	Fix ctb notification error	2017-12-18 11:48:52 +01:00
cyril lopez	5b84b38d74	Update branch ... Merge branch 'relation/users' of github.com:strapi/strapi into relation/users	2017-12-18 11:46:09 +01:00
cyril lopez	788894cf3a	Prevent user from editing not configurable attr	2017-12-18 11:45:02 +01:00
Aurelsicoko	b632e4e17c	Fix API creation with new configurable key	2017-12-18 11:40:26 +01:00
Aurelsicoko	92c891e341	Improve error when association fail and handle configurable key in models	2017-12-16 18:26:04 +01:00
Aurelsicoko	6d8b81ecbd	Resolve conflicts	2017-12-16 17:08:58 +01:00
Aurelsicoko	6ac1bca417	Update algorithm to correctly add, edit and delete relationships between models and plugins' models	2017-12-16 17:03:34 +01:00
Aurelsicoko	1f55ca1d04	Merge branch 'relation/users' of github.com:strapi/strapi into relation/users	2017-12-15 18:11:41 +01:00
Aurelsicoko	975d24ec9a	Remove unnecessary directory read to define model's path	2017-12-15 18:10:48 +01:00
Aurelsicoko	0230184619	Apply same algorithm to clearRelation method	2017-12-15 18:04:56 +01:00
cyril lopez	4f3ab874dd	Created email and password attributes	2017-12-15 18:03:20 +01:00
cyril lopez	9d8daec9fb	Update branch ... Merge branch 'relation/users' of github.com:strapi/strapi into relation/users	2017-12-15 17:37:34 +01:00
cyril lopez	5148987589	Prevent from editing or deleting models from a plugin	2017-12-15 17:36:21 +01:00
cyril lopez	a4638c26ad	Handle ctb post/put actions for plugin s models	2017-12-15 17:30:23 +01:00
Aurelsicoko	1ec7c988f2	Merge branch 'relation/users' of github.com:strapi/strapi into relation/users	2017-12-15 16:37:11 +01:00
Aurelsicoko	492c688344	Remove unnecessary directory read when building relations	2017-12-15 16:36:21 +01:00
cyril lopez	d87a273196	Display plugin model in ctb relation box	2017-12-15 16:36:06 +01:00
Jim Laurie	5b6127876d	3.0.0-alpha.7.2	2017-12-15 15:04:31 +01:00
cyril lopez	8d74849d9c	Display plugin source in ctb attributerow	2017-12-15 14:21:28 +01:00
cyril lopez	b260ebd9d7	Display model source in ctb homepage and ctb left menu	2017-12-15 13:58:53 +01:00
Jim Laurie	1ab6ae71d8	3.0.0-alpha.7.1	2017-12-14 10:27:08 +01:00
cyril lopez	1ef46dffea	Get plugins models and adapt from to display plugins models	2017-12-13 16:41:49 +01:00
cyril lopez	c6d74d58f0	Add plugins models to ctb and fix navigation	2017-12-13 15:22:16 +01:00
Jim Laurie	6d39c26568	3.0.0-alpha.7	2017-12-11 15:11:29 +01:00
cyril lopez	cb1dbc8333	Fix PopUpForm close button position	2017-12-07 13:41:02 +01:00
cyril lopez	4b71c2b140	Fix ctb notification id	2017-12-07 13:31:32 +01:00
cyril lopez	9b5be00115	Add 404 in content type builder	2017-12-06 17:23:14 +01:00
Jim Laurie	80e4c1087c	Fix conflict	2017-12-05 10:28:53 +01:00
Aurelsicoko	b195ae0ef8	Merge branch 'alpha.7' of github.com:strapi/strapi into user-permissions	2017-12-04 11:43:53 +01:00
cyril lopez	eed26aeef7	Prevent plugins to execute the bootstrap file (frontend) if the plugin users-permissions is in the project or if the user is not logged in	2017-12-01 15:45:11 +01:00
Luca Perret	c8933f69d5	Fix content-type-builder typo	2017-11-23 18:25:21 +01:00
Jim Laurie	f719d7f1fb	Fix conflict	2017-11-23 15:05:05 +01:00
Rob Styles	e7b3eb8cbb	minor translation fixes	2017-11-21 15:39:56 +00:00
cyril lopez	ac5f20a000	Add reset-password view and fix PR feedbacks	2017-11-20 14:21:08 +01:00
cyril lopez	51194f28b5	Fix conflict	2017-11-17 17:22:41 +01:00
Aurelsicoko	bcc9a652aa	Clear cache before loading configuration files	2017-11-17 17:12:55 +01:00
Aurelsicoko	b2603aab4d	Update path to use local strapi-helper-plugin	2017-11-17 16:05:47 +01:00
cyril lopez	1b9250f511	Write roles.sjon file	2017-11-17 14:22:59 +01:00
Jim Laurie	7a0d05346b	Fix conflict	2017-11-15 12:16:27 +01:00
cyril lopez	d9e3d80a22	Update content type builder storeData.js file for adapting with login	2017-11-14 13:27:25 +01:00