145 Commits

Author SHA1 Message Date
Aurelsicoko
cf1cb7050b Resolve conflicts and disallow to edit and remove default roles 2018-01-24 11:52:09 +01:00
Aurelsicoko
f2bff7f17d Return an error if a non-admin user try to connect to the admin 2018-01-24 11:38:42 +01:00
Aurelsicoko
0b771f425d Fix delete role with Bookshelf 2018-01-23 19:08:36 +01:00
Aurelsicoko
8f85d85349 Improve roles in database to work with Bookshelf 2018-01-23 18:54:17 +01:00
Aurelsicoko
187f6cb748 Display logs for every missing tables or attributes & update delete/add role feature 2018-01-23 15:38:43 +01:00
Jim LAURIE
eb1d1645fd
Merge branch 'master' into auth-provider/update-user-models 2018-01-23 10:45:26 +01:00
Jim Laurie
6b418b1460 Fix PR feedback and add twitter provider 2018-01-23 09:30:25 +01:00
Aurelsicoko
a06336cdbb Update permissions from UI in database 2018-01-22 18:19:44 +01:00
Aurelsicoko
9daf29be78 Be able to retrieve role data with populate 2018-01-19 17:57:10 +01:00
Jim Laurie
5accaf30e3 Hot fix permission detection 2018-01-19 07:38:30 +01:00
Aurelsicoko
fa8976c98f Fix infinite login 2018-01-18 11:13:44 +01:00
Aurelsicoko
b84976fbbd Improve init action to check if there is an administrator 2018-01-17 19:22:35 +01:00
Aurelsicoko
4aa28a196e [WIP] Read and update roles & permissions using database 2018-01-17 18:50:12 +01:00
Jim Laurie
82d85d781c Fix grant file creation 2018-01-12 16:07:21 +01:00
Jim Laurie
1eb7b12934 Omit grant.json config file 2018-01-12 16:04:01 +01:00
Jim Laurie
6e44e2e274 Add provider connection 2018-01-12 15:20:13 +01:00
Jim LAURIE
09e7f0fc67
Merge branch 'master' into user-schema-logs 2018-01-11 15:01:47 +01:00
Luca Perret
7cf77a9d57 fix(plugin-users-permissions): Config layout -
Duplicate key email
2018-01-11 00:23:28 +01:00
Luca Perret
5035170424 feat(plugin-users-permissions): add /user/me to fetch authenticated user model 2018-01-10 20:29:34 +01:00
Jim LAURIE
502b101598
Fix PR feedback 2018-01-10 13:39:42 +01:00
Jim Laurie
ff46faf306 Execute controller action out of authorization try 2018-01-09 13:53:52 +01:00
Jim Laurie
1a1b083436 Add logs if missing thing in user table 2018-01-04 16:36:56 +01:00
Jim Laurie
2715f2693f Check if token user still exist 2017-12-14 16:12:39 +01:00
Jim Laurie
c7ef225238 Replace id to _id for fetch user mongoose 2017-12-14 15:14:53 +01:00
Jim Laurie
832617159d Fix auto set config if doent exist 2017-12-12 15:13:27 +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
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
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
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
15e4f9985f Remove password and token from fetchable data USER API / AUTH 2017-12-06 14:15:27 +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
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
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
25b0c532cd Remove useless comments and fix uninstall plugin 2017-12-05 16:29:46 +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