154 Commits

Author SHA1 Message Date
cyril lopez
1084e88826 Catch register errors and handle it in front 2017-12-06 12:19:43 +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
Jim Laurie
d5d08e16f9 Identify admin by headers and send custom error response 2017-12-06 11:38:00 +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
87350ef2f1 Fix babel-polyfill dependencies and improve email appearance 2017-12-05 12:10:08 +01:00
cyril lopez
4bab690f5c Fix conflict 2017-12-04 15:52:44 +01:00
Jim Laurie
6eb4a5cb77 Fix user update encrypted password 2017-12-04 15:35:45 +01:00
cyril lopez
4cb45e48be Fix design 2017-12-04 15:03:53 +01:00
Jim Laurie
f852a732a3 Review email reset password template 2017-12-04 14:11:00 +01:00
Jim Laurie
2c43a856ce Catch email error forgot password 2017-12-04 14:00:09 +01:00
Jim Laurie
74164aa38a Remove log and fix email reset password 404 2017-12-04 13:40:07 +01:00
Jim Laurie
034207a326 Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-12-01 11:16:08 +01:00
Jim Laurie
7dc3dd9cde Get role with users 2017-11-30 16:52:28 +01:00
cyril lopez
ad9b39e164 Add handler to get the plugins routes 2017-11-30 16:34:43 +01:00
cyril lopez
f923a46177 Fetch policies for EditPage container 2017-11-30 11:07:54 +01:00
cyril lopez
a7b56b484f Fix conflict 2017-11-29 19:00:51 +01:00
Jim Laurie
72d4ebf3a9 Add get policy functions 2017-11-29 18:45:51 +01:00
cyril lopez
6596e42e0b Handle search user with bookshelf 2017-11-29 16:24:11 +01:00
Aurelsicoko
191092fca9 Redirect CM action to plugin's controller for User plugin 2017-11-29 16:10:13 +01:00
cyril lopez
7afb425688 Fix query bookshelf and modify init role file 2017-11-29 15:42:11 +01:00
cyril lopez
2a27b915f8 Fix design 2017-11-28 15:04:02 +01:00
cyril lopez
c7b8dec855 Update branch
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
2017-11-27 17:51:46 +01:00
cyril lopez
01af64d709 Handle update role 2017-11-27 17:50:51 +01:00
cyril lopez
1177b1a343 Handle delete role 2017-11-27 17:02:45 +01:00
cyril lopez
b3574dee6e Handle create role 2017-11-27 16:49:56 +01:00
Jim Laurie
637fb86670 Fix conflict 2017-11-27 16:48:49 +01:00
Jim Laurie
ee1ece28d8 Use request route to detect current action 2017-11-27 16:47:16 +01:00
cyril lopez
1fe2ffdbf8 Get roles (frontend and backend) 2017-11-27 16:04:57 +01:00
cyril lopez
baee801941 Add searchUsers and created mongoose query 2017-11-27 12:19:36 +01:00
cyril lopez
b00087c157 Delete dynamic (front end) 2017-11-23 18:08:14 +01:00
cyril lopez
38e6df838f Edit role 2017-11-23 17:13:46 +01:00
cyril lopez
97d20d5315 Created handler for POST role 2017-11-23 11:03:26 +01:00
Jim Laurie
156e21f650 Review Auth response 2017-11-20 16:28:50 +01:00
Jim Laurie
a0af2cdd4c Fix PR feedback 2017-11-20 14:35:24 +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
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
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
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
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
Jim Laurie
83050fcaa6 Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-11-16 10:46:45 +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