235 Commits

Author	SHA1	Message	Date
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
Jim Laurie	6e44e2e274	Add provider connection	2018-01-12 15:20:13 +01:00
Jim LAURIE	09e7f0fc67	Merge branch 'master' into user-schema-logs	2018-01-11 15:01:47 +01:00
Luca Perret	7cf77a9d57	fix(plugin-users-permissions): Config layout - ... Duplicate key email	2018-01-11 00:23:28 +01:00
Luca Perret	5035170424	feat(plugin-users-permissions): add /user/me to fetch authenticated user model	2018-01-10 20:29:34 +01:00
Jim LAURIE	502b101598	Fix PR feedback	2018-01-10 13:39:42 +01:00
Jim Laurie	ff46faf306	Execute controller action out of authorization try	2018-01-09 13:53:52 +01:00
Jim Laurie	1a1b083436	Add logs if missing thing in user table	2018-01-04 16:36:56 +01:00
Jim Laurie	2715f2693f	Check if token user still exist	2017-12-14 16:12:39 +01:00
Jim Laurie	c7ef225238	Replace id to _id for fetch user mongoose	2017-12-14 15:14:53 +01:00
Jim Laurie	832617159d	Fix auto set config if doent exist	2017-12-12 15:13:27 +01:00
cyril lopez	3da6faac05	Fix feedback PR	2017-12-08 14:40:42 +01:00
cyril lopez	1d64d827be	Add roles key to permissions	2017-12-08 12:03:37 +01:00
Jim Laurie	5b4f91dcff	Fix some PR feedback	2017-12-07 18:16:15 +01:00
cyril lopez	4d15c74a21	Fix feedback PR	2017-12-07 16:53:30 +01:00
Jim Laurie	3f15a5b618	Fix bookshelf fetch for auth	2017-12-07 14:56:25 +01:00
cyril lopez	a19e6eaf15	Fix roles.json bug	2017-12-07 10:16:36 +01:00
cyril lopez	9b5be00115	Add 404 in content type builder	2017-12-06 17:23:14 +01:00
cyril lopez	95d87cfb35	Clean roles.json	2017-12-06 16:01:12 +01:00
cyril lopez	a2ebbfab9e	Handle any api errors in ctm	2017-12-06 15:58:20 +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	15e4f9985f	Remove password and token from fetchable data USER API / AUTH	2017-12-06 14:15:27 +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
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