29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Styles	c6d333e2f0	minor fix to translation	2017-11-21 15:38:05 +00:00
Jim Laurie	ab62578fac	Fix API assign	2017-11-21 10:07:49 +01:00
Aurelsicoko	a10fc2ee0d	Fix setup	2017-11-20 17:04:48 +01:00
Jim LAURIE	1f29fde51a	Merge pull request #346 from strapi/user-permissions ... User permissions	2017-11-20 17:02:16 +01:00
Aurélien GEORGET	9f6533e1a0	Merge pull request #345 from strapi/config/no-locales ... Ensure server start where there are no locales	2017-11-20 16:36:43 +01:00
Jim Laurie	156e21f650	Review Auth response	2017-11-20 16:28:50 +01:00
Jim Laurie	fa329a05a7	Fix npm scripts	2017-11-20 15:36:37 +01:00
Jim Laurie	ab6434fb4d	Fix plugin email dependencies	2017-11-20 15:10:40 +01:00
Aurelsicoko	47f75f601b	Fix run setup	2017-11-20 15:01:49 +01:00
cyril lopez	b4539df31f	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-11-20 14:48:01 +01:00
cyril lopez	cff3a2df29	Ignore roles.json file	2017-11-20 14:47:17 +01:00
cyril lopez	be3c4bd812	Refacto login werification	2017-11-20 14:45:27 +01:00
Jim Laurie	7b84df6fbc	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-11-20 14:38:09 +01:00
Jim Laurie	a0af2cdd4c	Fix PR feedback	2017-11-20 14:35:24 +01:00
cyril lopez	659f3a52c8	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-11-20 14:23:06 +01:00
cyril lopez	f182189217	Remove log	2017-11-20 14:22:18 +01:00
cyril lopez	ac5f20a000	Add reset-password view and fix PR feedbacks	2017-11-20 14:21:08 +01:00
Jim Laurie	e8a5b76b23	Fix conflicts	2017-11-20 13:17:47 +01:00
Jim Laurie	e45b8c1f94	Update clean pre commit auto generated files	2017-11-20 11:08:57 +01:00
Aurélien GEORGET	c7a7cf21d0	Merge branch 'master' into config/no-locales	2017-11-20 10:11:35 +01:00
Aurélien GEORGET	5d2c914432	Merge pull request #344 from strapi/config/no-cache ... Clear cache before loading configuration files	2017-11-20 10:11:21 +01:00
cyril lopez	804adb93ef	Add admin folder to email plugin to majke the admin works (TEMPORARY FIX)	2017-11-17 17:49:50 +01:00
cyril lopez	51194f28b5	Fix conflict	2017-11-17 17:22:41 +01:00
Aurelsicoko	2050c3ec8f	Ensure server start where there are no locales	2017-11-17 17:20:59 +01:00
cyril lopez	31523b3f5d	Update branch ... Merge branch 'master' of github.com:strapi/strapi into user-permissions	2017-11-17 17:18:28 +01:00
Aurelsicoko	bcc9a652aa	Clear cache before loading configuration files	2017-11-17 17:12:55 +01:00
Jim Laurie	4d91111890	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-11-17 16:48:11 +01:00
cyril lopez	a6cecb0e3e	Algo diff between objects	2017-11-17 16:36:57 +01:00
Aurelsicoko	3ccef3e3ba	Fix symlink creation on Windows and .gitignore update	2017-11-17 16:35:52 +01:00
Aurelsicoko	d844fe6374	Fix development workflow	2017-11-17 16:23:11 +01:00
Aurelsicoko	622bde4301	Use relative path to share dependencies	2017-11-17 16:18:23 +01:00
Aurelsicoko	b2603aab4d	Update path to use local strapi-helper-plugin	2017-11-17 16:05:47 +01:00
Jim Laurie	cf4a506ed1	Encrypt password on user update	2017-11-17 16:05:02 +01:00
cyril lopez	1e5fa88e54	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-11-17 14:24:31 +01:00
Jim Laurie	24e4dd9bbc	Load db hook if plugin model exist	2017-11-17 14:23:26 +01:00
cyril lopez	1b9250f511	Write roles.sjon file	2017-11-17 14:22:59 +01:00
cyril lopez	d33341d0dc	Fix design and generatePermissions service	2017-11-17 12:14:12 +01:00
Jim Laurie	45da41ce11	Update user generated API	2017-11-17 12:05:03 +01:00
Jim Laurie	304a5bbb72	Reset password	2017-11-17 11:41:23 +01:00
Jim Laurie	3a1bb20f59	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-11-17 11:18:01 +01:00
Jim Laurie	f539eb0e10	Add bootstrap function in plugins	2017-11-17 11:17:20 +01:00
Jim Laurie	cd834d6828	Change email node module	2017-11-16 18:00:15 +01:00
cyril lopez	c17adfe0d8	Change permissions data format	2017-11-16 17:59:41 +01:00
Jim Laurie	a512d232d3	Add plugin send email	2017-11-16 16:58:45 +01:00
cyril lopez	3fc44a3877	Finish register	2017-11-16 15:51:12 +01:00
cyril lopez	76ca6a819e	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-11-16 15:14:50 +01:00
cyril lopez	5bc725ed38	Finish design EditPage	2017-11-16 15:13:46 +01:00
Jim Laurie	f10bd4a936	Use db users for login	2017-11-16 14:29:49 +01:00
Jim Laurie	b0a2b61be4	Register new user with hashed password	2017-11-16 14:12:03 +01:00
cyril lopez	99d8a57f8c	Design EditPage and created needed components, add inputChange dynamic	2017-11-16 13:43:55 +01:00