33691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Jim Laurie	83050fcaa6	Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions	2017-11-16 10:46:45 +01:00
cyril lopez	e2a9037460	Created custom InputCheckbox	2017-11-15 17:48:30 +01:00
cyril lopez	59b76ca53d	Created components for EditPage container	2017-11-15 17:35:32 +01:00
Jim Laurie	8cf8c24ee7	Load bookshelf plugins models	2017-11-15 17:27:07 +01:00
Jim Laurie	4bd0427ba6	Fix mongoose collection prefix plugin	2017-11-15 16:59:12 +01:00
cyril lopez	3f29551b75	Get role and format data with immutable	2017-11-15 15:11:10 +01:00
Jim Laurie	77ea9fb7d2	Mount mongoose instance in plugins models	2017-11-15 15:06:09 +01:00
cyril lopez	3d66f18e1a	Change frontend routing and prepare for edit	2017-11-15 14:00:51 +01:00
Aurélien GEORGET	9245c7e71e	Merge pull request #340 from strapi/installation/admin ... Installation/admin	2017-11-15 13:40:29 +01:00
Jim Laurie	7a0d05346b	Fix conflict	2017-11-15 12:16:27 +01:00
Jim LAURIE	7f3702d742	Merge pull request #325 from strapi/detach/admin ... Detach/admin	2017-11-15 11:58:34 +01:00
Aurelsicoko	034b6df310	Fix pluginID	2017-11-14 18:06:20 +01:00
cyril lopez	20c436303a	Add fake route to check if admin user exists	2017-11-14 17:09:13 +01:00
cyril lopez	b40ee0c5ef	Set protected urls from plugin	2017-11-14 16:42:08 +01:00
cyril lopez	a60f5ca9f0	Add bootstrap file to check if rootAdmin exists	2017-11-14 16:05:06 +01:00
Aurelsicoko	b4e6421aff	Add documentation and fix setup	2017-11-14 15:27:56 +01:00
cyril lopez	50cbeb5486	Fix showLeftMenu bug in admin plugin	2017-11-14 15:26:12 +01:00
cyril lopez	b1d2ad7472	Add auth dynamic in admin	2017-11-14 15:19:48 +01:00
cyril lopez	04689919ab	Add login dynamic and auth file	2017-11-14 14:27:16 +01:00
cyril lopez	d9e3d80a22	Update content type builder storeData.js file for adapting with login	2017-11-14 13:27:25 +01:00
Aurelsicoko	6f4086be2e	Merge from master	2017-11-14 11:53:51 +01:00
cyril lopez	bffa54a384	Merge pull request #338 from strapi/fix/ctm-editView ... Fix ctm enter key press bug	2017-11-14 11:52:34 +01:00
cyril lopez	c3ee5575c9	Update branch ... Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-11-14 11:51:34 +01:00
Jim Laurie	5ca1076179	Add static login for fontend	2017-11-14 11:49:19 +01:00