33691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
cyril lopez	c2fd6468b4	Add 404 in settings manager	2017-12-06 17:05:03 +01:00
cyril lopez	63c5c73aee	Handle Admin page 404	2017-12-06 16:40:32 +01:00
cyril lopez	9a2e051361	Fix input email error css	2017-12-06 16:21:12 +01:00
cyril lopez	95d87cfb35	Clean roles.json	2017-12-06 16:01:12 +01:00
cyril lopez	d995d4feef	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-06 15:59:26 +01:00
cyril lopez	a2ebbfab9e	Handle any api errors in ctm	2017-12-06 15:58:20 +01:00
Jim Laurie	23b7537914	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-06 15:22:19 +01:00
Jim Laurie	dce9c3f232	Fix set load middleware function	2017-12-06 15:21:26 +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
Jim Laurie	29e25686d1	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-06 14:16:44 +01:00
Jim Laurie	15e4f9985f	Remove password and token from fetchable data USER API / AUTH	2017-12-06 14:15:27 +01:00
Aurelsicoko	4444d806d6	Replace PNG logo to SVG & handle email/password type in Content Manager list	2017-12-06 13:44:58 +01:00
Jim Laurie	8ab44d86af	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-06 12:26:09 +01:00
Jim Laurie	427b4b3903	Reverse fetchable data	2017-12-06 12:25:08 +01:00
cyril lopez	1084e88826	Catch register errors and handle it in front	2017-12-06 12:19:43 +01:00
Aurelsicoko	0383bfded2	Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-06 12:00:25 +01:00
Aurelsicoko	ff5d5e2839	Fix register permissions	2017-12-06 11:58:24 +01:00
Jim Laurie	bef37d0cec	Remove password and token from fetchable data	2017-12-06 11:54:19 +01:00
cyril lopez	ec09ee6a28	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-12-06 11:51:36 +01:00
cyril lopez	642bee0085	Init auth errors	2017-12-06 11:47:39 +01:00
Jim Laurie	ce00536663	Fix conflict	2017-12-06 11:44:48 +01:00
Jim Laurie	d5d08e16f9	Identify admin by headers and send custom error response	2017-12-06 11:38:00 +01:00
Aurelsicoko	47e33c8e63	Build user plugin during setup	2017-12-06 11:28:12 +01:00
cyril lopez	6da0cdcb6a	Fix login bug in admin	2017-12-06 11:08:49 +01:00
Jim LAURIE	839008b080	Merge pull request #353 from strapi/fix/release ... Fix setup and apply design changes	2017-12-05 18:47:48 +01:00
Aurélien GEORGET	006d9f6f03	Merge pull request #360 from strapi/fix/refresh ... Fix/refresh	2017-12-05 16:56:41 +01:00
Jim Laurie	bdb5f50eab	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-05 16:45:58 +01:00
Jim Laurie	4e6339da1e	Fix delete user from group	2017-12-05 16:44:54 +01:00
Aurelsicoko	95409464a4	Enable init on every role$	2017-12-05 16:41:16 +01:00
Aurelsicoko	b2204e533c	Resolve conflicts	2017-12-05 16:35:28 +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
Aurelsicoko	10e509b0dd	Allow refresh in administration page	2017-12-05 14:55:08 +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
Jim LAURIE	a4dbc278a7	Merge pull request #359 from strapi/load-order-plugin ... Fix loadOrder plugins in FIREFOX and SAFARI	2017-12-05 14:21:32 +01:00
Jim LAURIE	66fc7c0701	Merge pull request #358 from strapi/fix/webpack ... Fix babel-polyfill dependencies and improve email appearance	2017-12-05 14:20:56 +01:00
cyril lopez	ed05d62653	Fix loadOrder plugins in FIREFOX and SAFARI	2017-12-05 13:49:31 +01:00
Aurelsicoko	87350ef2f1	Fix babel-polyfill dependencies and improve email appearance	2017-12-05 12:10:08 +01:00
Jim Laurie	80e4c1087c	Fix conflict	2017-12-05 10:28:53 +01:00
Jim Laurie	28e1094b86	Update modules version	2017-12-05 10:27:05 +01:00
cyril lopez	48d4150df2	Fix notif ctm	2017-12-04 17:52:16 +01:00