972 Commits

Author SHA1 Message Date
cyril lopez
97d20d5315 Created handler for POST role 2017-11-23 11:03:26 +01:00
Jim Laurie
ab62578fac Fix API assign 2017-11-21 10:07:49 +01:00
Jim Laurie
156e21f650 Review Auth response 2017-11-20 16:28:50 +01:00
Jim Laurie
ab6434fb4d Fix plugin email dependencies 2017-11-20 15:10:40 +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
ac5f20a000 Add reset-password view and fix PR feedbacks 2017-11-20 14:21:08 +01:00
Jim Laurie
e45b8c1f94 Update clean pre commit auto generated files 2017-11-20 11:08:57 +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
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
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
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
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
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
cyril lopez
04689919ab Add login dynamic and auth file 2017-11-14 14:27:16 +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
cyril lopez
d7432ec942 Change auth input name 2017-11-14 11:46:18 +01:00
Jim Laurie
5148f10b12 Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions 2017-11-14 11:12:22 +01:00
Jim Laurie
4ad44f016b Init user models and fix api prefix 2017-11-14 11:11:22 +01:00
cyril lopez
797b1c5ccd Fix input design and HeaderNav design 2017-11-14 10:59:57 +01:00