609 Commits

Author	SHA1	Message	Date
Aurelsicoko	6d8b81ecbd	Resolve conflicts	2017-12-16 17:08:58 +01:00
cyril lopez	4726c52a9c	Change install plugin design	2017-12-16 16:51:23 +01:00
cyril lopez	f43d7e75cc	Update branch ... Merge branch 'master' of github.com:strapi/strapi into install-plugins	2017-12-16 14:57:19 +01:00
cyril lopez	93c32d17c1	Add plugin icons	2017-12-16 13:56:52 +01:00
cyril lopez	769200f60f	Add icons to list plugins	2017-12-16 13:50:57 +01:00
cyril lopez	9132d64dda	Fix design	2017-12-14 17:37:33 +01:00
cyril lopez	8774f365aa	Display info box when downkloading a plugin	2017-12-12 20:17:41 +01:00
cyril lopez	9fe1480a26	Created OverlayBlocker that prevents any action on the app and add download plugin dynamic	2017-12-12 19:53:04 +01:00
cyril lopez	43bfb8593e	Connect container to real data	2017-12-12 18:30:09 +01:00
cyril lopez	f32ecc6828	Created StarsContainer component	2017-12-12 17:49:06 +01:00
cyril lopez	54034bba6f	Add nav links	2017-12-12 17:05:43 +01:00
cyril lopez	01dcc8dada	Finish design install plugin pop up	2017-12-12 16:18:48 +01:00
cyril lopez	b1779a53fd	Refacto login redirect	2017-12-12 15:48:09 +01:00
cyril lopez	2a739aa6bc	Design popup navlink	2017-12-12 15:44:04 +01:00
cyril lopez	02e2016a7a	Prevent user from going to login page id no user is registered	2017-12-12 15:12:08 +01:00
cyril lopez	af627acfec	Init popupup install plugin design	2017-12-12 14:30:24 +01:00
cyril lopez	92e8f82fa0	Finish install plugin card design	2017-12-11 20:19:22 +01:00
cyril lopez	a062802a0f	Fix install plugin design	2017-12-11 19:04:27 +01:00
Aurelsicoko	8db92c22fd	Split Content-Manager logic into service & allow CRUD and associations w/ plugin's models w/ Mongoose	2017-12-11 18:23:15 +01:00
Jim Laurie	9831cbe393	Fix eslint	2017-12-11 14:44:58 +01:00
Aurelsicoko	d53287362a	Fix source parameters to switch between content-type	2017-12-11 14:18:40 +01:00
Aurelsicoko	88fb2ee89c	Fix default middleware configurations & allowed headers	2017-12-11 12:26:16 +01:00
Jim LAURIE	80be255f4b	Delete plugins.json file	2017-12-08 10:50:45 +01:00
Aurelsicoko	bbde1dc125	Resolve conflicts	2017-12-07 19:15:24 +01:00
Aurelsicoko	f9cc9b504c	Delay admin load and handle relation between plugin and main models	2017-12-07 19:12:20 +01:00
Jim Laurie	eec1dcff84	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-07 17:26:05 +01:00
Jim Laurie	b7712cf512	Fix conflicts	2017-12-07 17:04:24 +01:00
Jim LAURIE	015405df0d	Delete plugins.json file admin	2017-12-07 16:31:44 +01:00
Aurelsicoko	94c153dd5f	Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-07 14:31:13 +01:00
Aurelsicoko	3056736ca9	Use get default value in LeftMenuLinkContainer	2017-12-07 14:30:31 +01:00
cyril lopez	d09b3e3312	Pass object to redirect the user	2017-12-07 14:07:37 +01:00
cyril lopez	2b82bdf388	Remove 404 in AdminPage container	2017-12-07 13:50:43 +01:00
cyril lopez	f352a27e8f	Fix admin notification id	2017-12-07 13:17:39 +01:00
cyril lopez	768aeed0bf	Created Row Component to handle listPlugin PopUpWarning bug	2017-12-07 10:57:39 +01:00
cyril lopez	63c5c73aee	Handle Admin page 404	2017-12-06 16:40:32 +01:00
cyril lopez	ac102e88e5	Fix conflict	2017-12-06 15:15:43 +01:00
cyril lopez	59872ac890	Handle backend errors in ctm	2017-12-06 15:11:55 +01:00
cyril lopez	1084e88826	Catch register errors and handle it in front	2017-12-06 12:19:43 +01:00
Aurelsicoko	ff5d5e2839	Fix register permissions	2017-12-06 11:58:24 +01:00
cyril lopez	642bee0085	Init auth errors	2017-12-06 11:47:39 +01:00
cyril lopez	6da0cdcb6a	Fix login bug in admin	2017-12-06 11:08:49 +01:00
cyril lopez	98c54e27f4	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-05 16:31:23 +01:00
cyril lopez	25b0c532cd	Remove useless comments and fix uninstall plugin	2017-12-05 16:29:46 +01:00
Jim LAURIE	748e11ae41	Merge pull request #361 from strapi/fix/content-manager ... Fix/content manager	2017-12-05 16:24:18 +01:00
cyril lopez	de8253a2e2	fix Install plugins design and Controller design	2017-12-05 16:08:17 +01:00
cyril lopez	f3ffab4ed8	Fix listPlugins design hide email and ctm plugins from menu and fix Editrole css	2017-12-05 15:50:24 +01:00
Aurélien GEORGET	209d1dfa28	Merge branch 'master' into fix/release	2017-12-05 15:35:14 +01:00
Aurelsicoko	c216771adb	Resolve conflicts	2017-12-05 15:30:16 +01:00
Aurelsicoko	110c209431	Be able to create an user from the Content Manager	2017-12-05 15:28:31 +01:00
cyril lopez	8920fda350	fix login bug	2017-12-05 15:16:33 +01:00