137 Commits

Author	SHA1	Message	Date
cyril lopez	b1779a53fd	Refacto login redirect	2017-12-12 15:48:09 +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
Jim Laurie	9831cbe393	Fix eslint	2017-12-11 14:44:58 +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
cyril lopez	87bbe8c210	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-05 14:52:59 +01:00
cyril lopez	563923bb36	Fix css	2017-12-05 14:44:32 +01:00
cyril lopez	ed05d62653	Fix loadOrder plugins in FIREFOX and SAFARI	2017-12-05 13:49:31 +01:00
cyril lopez	65264cf938	Fix design	2017-12-04 17:32:45 +01:00
cyril lopez	6be459cf33	Fix css	2017-12-04 15:50:46 +01:00
cyril lopez	4cb45e48be	Fix design	2017-12-04 15:03:53 +01:00
cyril lopez	a838a704c0	Design InstallPluginPage	2017-12-02 18:46:22 +01:00
cyril lopez	521b627fd8	Created plugin card component	2017-12-02 16:10:18 +01:00
cyril lopez	046574fb45	Created InstallPluginPage container	2017-12-02 13:37:58 +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
Aurelsicoko	77f7dda9b1	Increase font-weight link section	2017-11-29 17:10:28 +01:00
Aurelsicoko	1b4670b719	Make design sharp	2017-11-29 17:08:27 +01:00
cyril lopez	9df31150d2	Fix design	2017-11-29 10:29:12 +01:00
cyril lopez	341561006c	Fix conflict	2017-11-28 15:46:53 +01:00
cyril lopez	2a27b915f8	Fix design	2017-11-28 15:04:02 +01:00
cyril lopez	19b06da90e	Add logout	2017-11-28 13:24:26 +01:00
Aurelsicoko	703223687f	Remove URL attributes and try new load attempt if plugin fails to load	2017-11-28 12:40:39 +01:00
Aurelsicoko	eceede450b	Handle plugin model in Content Manager	2017-11-27 17:27:16 +01:00