yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-24 01:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,271 Commits 114 Branches 485 Tags
Commit Graph

69 Commits

Author SHA1 Message Date
Jim LAURIE
d0b9233b17
Merge branch 'master' into fix/736 2018-05-07 15:27:41 +02:00
Aurelsicoko
451ad266fb Keep first set permissions & remove duplicate 2018-05-03 16:26:57 +02:00
Aurelsicoko
f62c5f52fc Remove duplicate permissions 2018-05-02 11:40:42 +02:00
Aurelsicoko
dffbf3bbb3 Concat promise to return a single array 2018-04-27 15:48:52 +02:00
Jim Laurie
79ddc27cb1 U&P setup in bookshelf and handle oneToMany relation 2018-04-24 14:29:28 +02:00
Jim Laurie
8191c43ce5 Create tables is not exist instead of log queries 2018-04-23 16:09:01 +02:00
Aurelsicoko
7149cfa36e Avoid badRequest when an API hasn't routes 2018-04-23 14:39:27 +02:00
Aurelsicoko
61fb2dec45 Avoid random restart on permission update 2018-04-23 14:21:24 +02:00
Jim Laurie
489aefba06 Rename role registered to authenticated 2018-03-14 16:56:12 +01:00
Jim Laurie
72877c3074 Rename Guest to Public role 2018-03-12 16:37:20 +01:00
Jim Laurie
2b0ab41a66 Add registered role and fix update role name & description 2018-03-12 14:04:43 +01:00
Jim Laurie
443d6b81fb Fix remove user on role update 2018-02-24 17:42:33 +01:00
Aurelsicoko
a07663afe4 Populate type field when creating a role #553 2018-02-06 14:43:26 +01:00
Aurelsicoko
7862899ed6 Lowercase action to avoid bug with permission 2018-01-25 17:08:39 +01:00
Aurelsicoko
717b2d07c4 Only create permissions for controller's functions 2018-01-25 15:46:15 +01:00
Aurelsicoko
a60e13799f Open route /connect 2018-01-25 14:36:12 +01:00
Aurelsicoko
fc21d5f30a Resolve conflicts 2018-01-25 13:25:09 +01:00
Aurelsicoko
462b44a759 Fix PG queries 2018-01-25 11:19:53 +01:00
Jim Laurie
a2d7ffce74 User service to template email 2018-01-25 08:38:46 +01:00
Aurelsicoko
0a62003af6 Fix plugin load due to autoReload 2018-01-24 11:06:24 +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
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
Aurelsicoko
4b9923b574 Fix typo 2018-01-17 19:00:36 +01:00
Aurelsicoko
d5390fd4aa Merge branch 'master' of github.com:strapi/strapi into update-roles-models 2018-01-17 18:52:51 +01:00
Aurelsicoko
4aa28a196e [WIP] Read and update roles & permissions using database 2018-01-17 18:50:12 +01:00
Jim Laurie
ef2be5c6ee Fix postgres and mysql logs user table creation 2018-01-17 14:32:38 +01:00
cyril lopez
5d470d890d Update branch 
Merge branch 'master' of https://github.com/strapi/strapi into verify/user-jwtToken
 2018-01-11 17:28:08 +01:00
cyril lopez
1a07c2caad Enable /user/me route for guest users 2018-01-11 17:13:09 +01:00
Jim LAURIE
09e7f0fc67
Merge branch 'master' into user-schema-logs 2018-01-11 15:01:47 +01:00
Jim Laurie
f545f373aa Fix PR feedback 2018-01-11 15:00:34 +01:00
Aurelsicoko
c9d47b1fed Retrieve plugins' icons URL from API and name Redux store 2018-01-05 16:19:53 +01:00
Jim Laurie
e563131536 Fix variable name 2018-01-04 16:40:09 +01:00
Jim Laurie
1a1b083436 Add logs if missing thing in user table 2018-01-04 16:36:56 +01:00
Jim Laurie
832617159d Fix auto set config if doent exist 2017-12-12 15:13:27 +01:00
Jim Laurie
5f4a5971d7 Last fix PR 2017-12-11 11:14:07 +01:00
cyril lopez
3da6faac05 Fix feedback PR 2017-12-08 14:40:42 +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
a19e6eaf15 Fix roles.json bug 2017-12-07 10:16:36 +01:00
Jim Laurie
4e6339da1e Fix delete user from group 2017-12-05 16:44:54 +01:00
Jim Laurie
a098244281 Fix permission on bootstrap 2017-12-04 17:45:58 +01:00
cyril lopez
65264cf938 Fix design 2017-12-04 17:32:45 +01:00
Jim Laurie
74164aa38a Remove log and fix email reset password 404 2017-12-04 13:40:07 +01:00