360 Commits

Author	SHA1	Message	Date
Jim Laurie	5bf1e51422	Fix conflicts	2018-02-12 13:25:43 +01:00
Aurelsicoko	21893dc8e6	Optimize SVG icons	2018-02-09 17:22:18 +01:00
Aurelsicoko	5cbfc6f050	Update logo	2018-02-09 17:01:04 +01:00
Jim LAURIE	82b8361229	Merge branch 'master' into add/inputs-to-ctb	2018-02-09 12:18:11 +01:00
Jim LAURIE	8510e5852f	Merge branch 'master' into master	2018-02-09 11:23:13 +01:00
cyril lopez	f8b8faefcf	Use the new input library in content type builder	2018-02-07 18:32:03 +01:00
Pierre Burgy	7f6e5ba5a8	3.0.0-alpha.9.3	2018-02-07 14:22:27 +01:00
Inder	56f63cbb89	Merge branch 'master' into master	2018-02-06 16:10:18 +01:00
Inder	621b70c9ea	Generating | Model name ... Names added with a space/dot different variations, etc. did not work by badly generating the model name. Reference to #328 #444 #505	2018-02-06 16:09:00 +01:00
Jim Laurie	b784c32be1	Add tag column	2018-02-06 15:08:25 +01:00
Jim Laurie	1f3efc6416	3.0.0-alpha.9.2	2018-02-05 16:36:33 +01:00
Jim Laurie	0e739d8e32	Hide config model in content type builder and content manager	2018-02-02 14:50:10 +01:00
Jim Laurie	f9a818e49c	3.0.0-alpha.9.1	2018-02-01 11:08:15 +01:00
Jim Laurie	8825f2fe2c	3.0.0-alpha.9	2018-01-29 17:24:10 +01:00
AdrianGunia	ad2a455466	fix bug(save user via gui)	2018-01-28 19:45:48 +01:00
cyril lopez	a80b0e18b7	Fix ctb and user-permission list item spacing	2018-01-25 17:39:56 +01:00
cyril lopez	32ca068afb	Fixes #498	2018-01-23 16:26:04 +01:00
Jim LAURIE	e6eff3b98e	Merge branch 'master' into add-repo-link	2018-01-22 16:04:37 +01:00
Jim LAURIE	bf69ea7de9	Merge branch 'master' into alpha.8.3	2018-01-19 17:55:24 +01:00
Aurelsicoko	5b93cc5242	3.0.0-alpha.8.3	2018-01-19 16:49:57 +01:00
Aurelsicoko	086b42f079	Improve deployment workflow and fix setup	2018-01-19 14:50:34 +01:00
Jim Laurie	19ee51376b	Add repo location in plugins package	2018-01-19 12:06:08 +01:00
Jim LAURIE	2e55706fdb	Merge branch 'master' into alpha.8.1	2018-01-19 09:15:28 +01:00
Jim Laurie	7b0a106cb2	3.0.0-alpha.8.2	2018-01-19 08:52:34 +01:00
Jim LAURIE	77b068ef07	Merge branch 'master' into add-overlay-blocker	2018-01-18 09:33:00 +01:00
Jim Laurie	03643bfb13	3.0.0-alpha.8	2018-01-17 16:59:28 +01:00
cyril lopez	5d92accfab	Remove OverlayBlocker from ctb	2018-01-17 14:28:41 +01:00
cyril lopez	967f3e6725	Add OverlayBlocker in all actions that require restart server in ctb, comment ModelPage willUpdate lifecycle that redirects the user to /404 when updating a content type name	2018-01-12 17:20:19 +01:00
cyril lopez	7ae1cc944e	Freeze app when add/modifying a field in ctb	2018-01-12 14:42:47 +01:00
cyril lopez	696fe5b836	Add OverlayBlocker to ctb when deleting a model	2018-01-12 14:17:29 +01:00
cyril lopez	5b7c65e3ea	Redo OverlayBlocker design	2018-01-12 12:51:39 +01:00
cyril lopez	4dabad9c65	Add server restart watcher to ctb when deleting content type	2018-01-12 10:56:16 +01:00
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