238 Commits

Author SHA1 Message Date
cyril lopez
13383d9f7c Open the application s permissions section if there are APIs 2017-12-13 13:43:36 +01:00
cyril lopez
09d4183f1e Update branch
Merge branch 'master' of github.com:strapi/strapi into fix-login-redirect
2017-12-13 10:41:06 +01:00
Jim Laurie
832617159d Fix auto set config if doent exist 2017-12-12 15:13:27 +01:00
cyril lopez
02e2016a7a Prevent user from going to login page id no user is registered 2017-12-12 15:12:08 +01:00
Jim Laurie
6d39c26568 3.0.0-alpha.7 2017-12-11 15:11:29 +01:00
Jim Laurie
a5ef1aa0ca Fix user fetch service with id 2017-12-11 12:31:26 +01:00
Jim Laurie
5f4a5971d7 Last fix PR 2017-12-11 11:14:07 +01:00
Jim Laurie
62925b9864 Add npmignore 2017-12-08 17:32:34 +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
cyril lopez
96506e5643 Fix middleware usp .policies of undefined 2017-12-08 11:21:51 +01:00
cyril lopez
4074846b5b Refacto service 2017-12-08 10:42:45 +01:00
cyril lopez
3ebd86b2e1 Update branch
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
2017-12-07 18:42:40 +01:00
cyril lopez
f471a98f90 Fix manage user role bookshelf 2017-12-07 18:40:55 +01:00
cyril lopez
8d6cace469 Refacto InputSearch 2017-12-07 18:31:19 +01:00
Jim Laurie
729eea32c7 Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-12-07 18:31:16 +01:00
cyril lopez
b01abf91f1 Add apiRoutes and fix feedback PR 2017-12-07 18:16:18 +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
cyril lopez
957b92692a Sort functions by name 2017-12-07 15:27:11 +01:00
cyril lopez
cba9cac629 Delete useless request file in ctm and order Auth controller by function s name 2017-12-07 15:21:54 +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
6474841abc Handle 404 in users-permissions 2017-12-06 17:45:38 +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
29e25686d1 Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-12-06 14:16:44 +01:00
Jim Laurie
15e4f9985f Remove password and token from fetchable data USER API / AUTH 2017-12-06 14:15:27 +01:00
Aurelsicoko
4444d806d6 Replace PNG logo to SVG & handle email/password type in Content Manager list 2017-12-06 13:44:58 +01:00
Jim Laurie
8ab44d86af Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-12-06 12:26:09 +01:00
Jim Laurie
427b4b3903 Reverse fetchable data 2017-12-06 12:25:08 +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
Jim Laurie
ce00536663 Fix conflict 2017-12-06 11:44:48 +01:00
Jim Laurie
d5d08e16f9 Identify admin by headers and send custom error response 2017-12-06 11:38:00 +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
Jim Laurie
bdb5f50eab Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-12-05 16:45:58 +01:00
Jim Laurie
4e6339da1e Fix delete user from group 2017-12-05 16:44:54 +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
98c54e27f4 Update branch
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
2017-12-05 16:31:23 +01:00