180 Commits

Author	SHA1	Message	Date
Jim Laurie	957e7a08cb	Environment agnostic for users-permissions configs	2018-02-13 15:04:21 +01:00
Jim Laurie	5bf1e51422	Fix conflicts	2018-02-12 13:25:43 +01:00
Jim Laurie	244b280919	New format store constructor ... strapi.store(source).get(params) strapi.store(source).set({params, value}) Co-authored-by: Aurelsicoko <aurelsicoko@gmail.com>	2018-02-06 13:10:43 +01:00
cyril lopez	cc4166e683	Add new input in users-permissions plugin Advanced settings	2018-02-05 17:24:15 +01:00
Jim Laurie	29af75cc51	Use database config for users-permissions plugin ... Delete advanced, grant and email json files Update setter to update data	2018-02-01 18:12:38 +01:00
Kristian Frølund	28cd762009	Rephrased error-text	2018-01-29 19:30:56 +01:00
Kristian Frølund	280109c034	Moved user validation logic from JWT service to permissions policy	2018-01-29 19:26:28 +01:00
cyril lopez	54a4f33371	Merge branch 'master' into fix/users-front	2018-01-26 17:37:01 +01:00
cyril lopez	6e23c90434	Fix css and wording ... As seen in the demo I removed the test transform capitalize in the ListRow component. Add width to the iconContainer so it s now perfectly aligned. Add missing trad key and change wording for the toggle label	2018-01-26 17:31:52 +01:00
Jim LAURIE	6ac7692214	Merge branch 'master' into update-email-template	2018-01-26 11:30:58 +01:00
Jim Laurie	7f78cc9f84	Change data format email template	2018-01-26 10:18:36 +01:00
Aurelsicoko	8a66873405	Display better error message & lock fields	2018-01-25 18:12:29 +01:00
Aurelsicoko	1ac6a56ce0	Resolve conflicts	2018-01-25 15:26:25 +01:00
cyril lopez	c4dac29bf6	Fix conflict	2018-01-25 13:43:07 +01:00
Aurelsicoko	add54f8ecb	Remove variables.json file	2018-01-25 13:38:18 +01:00
Aurelsicoko	fc21d5f30a	Resolve conflicts	2018-01-25 13:25:09 +01:00
Aurelsicoko	04c3518dbc	Remove unnecessary actions.json file from repository	2018-01-25 10:51:12 +01:00
Jim Laurie	2b57c3e6de	Move grant middleware in controller action	2018-01-25 09:59:24 +01:00
Aurelsicoko	cc1e8e20aa	Don't execute the action again if there is a policy	2018-01-24 19:00:12 +01:00
Aurelsicoko	cf1cb7050b	Resolve conflicts and disallow to edit and remove default roles	2018-01-24 11:52:09 +01:00
Aurelsicoko	f2bff7f17d	Return an error if a non-admin user try to connect to the admin	2018-01-24 11:38:42 +01:00
Aurelsicoko	0b771f425d	Fix delete role with Bookshelf	2018-01-23 19:08:36 +01:00
Aurelsicoko	8f85d85349	Improve roles in database to work with Bookshelf	2018-01-23 18:54:17 +01:00
cyril lopez	06ab6ba8cd	Add translations for twitter	2018-01-23 16:43:16 +01:00
cyril lopez	db23c22ee4	Update branch ... Merge branch 'auth-provider/configs' of github.com:strapi/strapi into auth-provider/configs-front	2018-01-23 15:58:48 +01:00
Aurelsicoko	187f6cb748	Display logs for every missing tables or attributes & update delete/add role feature	2018-01-23 15:38:43 +01:00
Jim Laurie	9ddd7f12a8	Fix missing save conflict	2018-01-23 11:32:40 +01:00
Jim Laurie	a6e78f023b	Fix conflicts	2018-01-23 10:55:57 +01:00
Jim LAURIE	eb1d1645fd	Merge branch 'master' into auth-provider/update-user-models	2018-01-23 10:45:26 +01:00
Jim Laurie	6b418b1460	Fix PR feedback and add twitter provider	2018-01-23 09:30:25 +01:00
Aurelsicoko	a06336cdbb	Update permissions from UI in database	2018-01-22 18:19:44 +01:00
cyril lopez	1ffedf9726	Update branch ... Merge branch 'master' of github.com:strapi/strapi into auth-provider/configs-front	2018-01-22 13:12:16 +01:00
cyril lopez	e425125f82	Put providers	2018-01-22 10:23:04 +01:00
Aurelsicoko	9daf29be78	Be able to retrieve role data with populate	2018-01-19 17:57:10 +01:00
cyril lopez	630e06d7fa	Get providers	2018-01-19 15:14:51 +01:00
cyril lopez	11c5905d25	form to edit email templates	2018-01-19 13:34:55 +01:00
Jim Laurie	5accaf30e3	Hot fix permission detection	2018-01-19 07:38:30 +01:00
cyril lopez	f6497639e7	List email-templates	2018-01-18 18:21:49 +01:00
Jim Laurie	5e8259af73	Can disable a provider	2018-01-18 15:45:02 +01:00
Aurelsicoko	fa8976c98f	Fix infinite login	2018-01-18 11:13:44 +01:00
Aurelsicoko	b84976fbbd	Improve init action to check if there is an administrator	2018-01-17 19:22:35 +01:00
Aurelsicoko	4aa28a196e	[WIP] Read and update roles & permissions using database	2018-01-17 18:50:12 +01:00
Jim Laurie	1b2897bd83	Get and update advanced settings	2018-01-15 16:23:54 +01:00
Jim Laurie	02a89fbb5b	Generate advanced configs	2018-01-15 15:01:21 +01:00
Jim Laurie	3a9cb9b453	Use email templte config reset password	2018-01-15 14:50:53 +01:00
Jim Laurie	7ab44d4b0f	Update email template config	2018-01-15 12:05:01 +01:00
Jim Laurie	24d5a5116f	Get email template	2018-01-15 11:59:10 +01:00
Jim Laurie	eb64d8fe7d	Create email template config file	2018-01-15 11:29:38 +01:00
Jim Laurie	82d85d781c	Fix grant file creation	2018-01-12 16:07:21 +01:00
Jim Laurie	1eb7b12934	Omit grant.json config file	2018-01-12 16:04:01 +01:00