308 Commits

Author	SHA1	Message	Date
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
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
Aurélien GEORGET	006d9f6f03	Merge pull request #360 from strapi/fix/refresh ... Fix/refresh	2017-12-05 16:56:41 +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	25b0c532cd	Remove useless comments and fix uninstall plugin	2017-12-05 16:29:46 +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
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
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	ea8b7a8c5c	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-04 17:41:39 +01:00
cyril lopez	65264cf938	Fix design	2017-12-04 17:32:45 +01:00
Jim Laurie	b54a2e087c	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-04 16:51:32 +01:00
Jim Laurie	df25e9dd2a	Generate uuid for jwt encryption	2017-12-04 16:43:24 +01:00
cyril lopez	4bab690f5c	Fix conflict	2017-12-04 15:52:44 +01:00
cyril lopez	6be459cf33	Fix css	2017-12-04 15:50:46 +01:00
Aurelsicoko	2b86bde1b4	Fix build due to layout	2017-12-04 14:29:16 +01:00
cyril lopez	046574fb45	Created InstallPluginPage container	2017-12-02 13:37:58 +01:00
cyril lopez	86a5401680	Fix deleting users associated to a role	2017-12-01 16:21:13 +01:00
Jim Laurie	fab65fdd0b	Fix conflict	2017-12-01 16:08:27 +01:00
Jim Laurie	a1ea5a2777	Link user to role	2017-12-01 16:06:16 +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
Jim Laurie	034207a326	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-12-01 11:16:08 +01:00
Jim Laurie	75ca6fa713	Fix conflicts	2017-11-30 16:41:39 +01:00
cyril lopez	ad9b39e164	Add handler to get the plugins routes	2017-11-30 16:34:43 +01:00
cyril lopez	6478d87a6f	Fix conflict	2017-11-30 15:51:19 +01:00
cyril lopez	0c127fa555	Fix design	2017-11-30 15:46:34 +01:00
cyril lopez	0866a5e484	Finish select policy dynamic	2017-11-30 15:01:19 +01:00
Jim Laurie	95607dc7ed	Load bookshelf plugin model if not apis	2017-11-30 13:57:47 +01:00
Jim Laurie	0655833da9	Add users count by role	2017-11-30 12:27:04 +01:00
cyril lopez	f923a46177	Fetch policies for EditPage container	2017-11-30 11:07:54 +01:00
cyril lopez	a7b56b484f	Fix conflict	2017-11-29 19:00:51 +01:00
Jim Laurie	72d4ebf3a9	Add get policy functions	2017-11-29 18:45:51 +01:00
Jim Laurie	4543fd017d	Update user API with queries	2017-11-29 17:09:19 +01:00
cyril lopez	6596e42e0b	Handle search user with bookshelf	2017-11-29 16:24:11 +01:00
Aurelsicoko	191092fca9	Redirect CM action to plugin's controller for User plugin	2017-11-29 16:10:13 +01:00
cyril lopez	7afb425688	Fix query bookshelf and modify init role file	2017-11-29 15:42:11 +01:00
Aurelsicoko	c971f9c054	Allow redirect action in CM & harmonize pre/post event with Promises	2017-11-29 15:00:50 +01:00
cyril lopez	47dccaa26b	Fix request helper	2017-11-29 12:48:58 +01:00
Aurelsicoko	904484df37	Use state for source and fix create form	2017-11-29 12:24:23 +01:00
cyril lopez	f6d243a4df	Fix add header to request helper	2017-11-29 11:43:38 +01:00