yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-09 10:02:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,041 Commits 120 Branches 483 Tags
Commit Graph

214 Commits

Author SHA1 Message Date
soupette
e7357e025c Handle delete many with models from users-permissions 2018-06-06 16:20:52 +02:00
soupette
c95be9312d Merge branch 'fix/graphql' of github.com:strapi/strapi into content-manager-filters 2018-05-25 13:33:52 +02:00
soupette
3847fd8c67 Fix filter for decimal 2018-05-25 13:21:57 +02:00
Aurelsicoko
c111aaba13 Fixes #1247 2018-05-24 17:20:32 +02:00
soupette
87d70a8d34 Fix count query bookshelf in ctm & users-permissions 2018-05-23 10:29:04 +02:00
soupette
cc1669faf5 Fix sort query bookshelf users-permissions 2018-05-22 18:27:07 +02:00
Jim Laurie
4fe7b6176e Fix conflicts & lint 2018-05-16 12:07:02 +02:00
Jim LAURIE
f4905a9b2e
Merge branch 'master' into enhance/relations 2018-05-14 17:33:37 +02:00
cyril lopez
1f019c60c3
Merge branch 'master' into eslint 2018-05-14 11:50:32 +02:00
Konstantin Tsabolov
9e897bcfda Return HTTP 403 if user is not allowed to perform an operation 2018-05-10 19:36:15 +02:00
Aurelsicoko
c7f871745a Fix findOne user, many-to-many relationship loss and remove relation business logic from CM 2018-05-09 16:57:16 +02:00
Aurelsicoko
02a2e087cc Remove warning where clause 2018-05-09 15:11:55 +02:00
Jim LAURIE
c09f5138a2
Merge branch 'master' into eslint 2018-05-07 16:03:35 +02:00
Aurelsicoko
451ad266fb Keep first set permissions & remove duplicate 2018-05-03 16:26:57 +02:00
soupette
68504fbe16 Add eslint to users-permissions backend 2018-04-30 18:26:56 +02:00
soupette
611dfb32eb Merge branch 'master' of github.com:strapi/strapi into sql-xp 2018-04-26 10:26:09 +02:00
Jim LAURIE
d94be998a4
Fix prevGrantConfig equal undefined when config not exist in db 2018-04-25 14:12:24 +02:00
Jim Laurie
29dab8fbb5 Fix #1013 2018-04-25 12:17:45 +02:00
Jim Laurie
8d2a46cd0c Fix conflict timestamp 2018-04-25 11:06:12 +02:00
Zhuang
d23ebfeaf0 merge the previous provider config 2018-04-24 22:18:21 +08:00
Jim Laurie
79ddc27cb1 U&P setup in bookshelf and handle oneToMany relation 2018-04-24 14:29:28 +02:00
Zhuang
e69dcc433b reload grant value to db when add/delete provider 2018-04-21 12:29:00 +08:00
Jim LAURIE
c0ea8fa807
Merge branch 'master' into graphql 2018-04-16 16:39:50 +02:00
Jim LAURIE
ab238dca61
Remove space 2018-04-16 09:48:43 +02:00
cece95
32aefbe5be fixed issue #923 2018-04-16 08:49:41 +02:00
Aurelsicoko
78e69cebd5 Add description to explain specificities of the roles query 2018-04-12 15:57:25 +02:00
Aurelsicoko
17c46b331d Make GraphQL polymorphic relationships working with Bookshelf 2018-04-11 12:53:07 +02:00
Aurelsicoko
3daf7523c8 Apply policy for each query and use generated API business logic 2018-04-10 11:47:01 +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
9b7a216411 Add default role in advanced settings 2018-03-12 15:56:25 +01:00
Aurelsicoko
d7aa3eef7e Resolve conflicts 2018-03-02 14:21:51 +01:00
Aurelsicoko
85fb0f5919 Fix non-polymorphic relations in strapi-bookshelf 2018-02-28 18:10:30 +01:00
Adrien Lepoutre
1110fe7df2 ISSUE 689 - Fix /user/me and ctx.state.user doesn't return OneToMany relations properly 2018-02-28 10:35:28 -05:00
Jim Laurie
957e7a08cb Environment agnostic for users-permissions configs 2018-02-13 15:04:21 +01:00
Jim Laurie
5bf1e51422 Fix conflicts 2018-02-12 13:25:43 +01:00
Jim Laurie
244b280919 New format store constructor 
strapi.store(source).get(params)
strapi.store(source).set({params, value})

Co-authored-by: Aurelsicoko <aurelsicoko@gmail.com>
 2018-02-06 13:10:43 +01:00
cyril lopez
cc4166e683 Add new input in users-permissions plugin Advanced settings 2018-02-05 17:24:15 +01:00
Jim Laurie
29af75cc51 Use database config for users-permissions plugin 
Delete advanced, grant and email json files
Update setter to update data
 2018-02-01 18:12:38 +01:00
Kristian Frølund
28cd762009 Rephrased error-text 2018-01-29 19:30:56 +01:00
Kristian Frølund
280109c034 Moved user validation logic from JWT service to permissions policy 2018-01-29 19:26:28 +01:00
cyril lopez
54a4f33371
Merge branch 'master' into fix/users-front 2018-01-26 17:37:01 +01:00
cyril lopez
6e23c90434 Fix css and wording 
As seen in the demo I removed the test transform capitalize in the ListRow component.
Add width to the iconContainer so it s now perfectly aligned.
Add missing trad key and change wording for the toggle label
 2018-01-26 17:31:52 +01:00
Jim LAURIE
6ac7692214
Merge branch 'master' into update-email-template 2018-01-26 11:30:58 +01:00
Jim Laurie
7f78cc9f84 Change data format email template 2018-01-26 10:18:36 +01:00
Aurelsicoko
8a66873405 Display better error message & lock fields 2018-01-25 18:12:29 +01:00
Aurelsicoko
1ac6a56ce0 Resolve conflicts 2018-01-25 15:26:25 +01:00
cyril lopez
c4dac29bf6 Fix conflict 2018-01-25 13:43:07 +01:00
Aurelsicoko
add54f8ecb Remove variables.json file 2018-01-25 13:38:18 +01:00
Aurelsicoko
fc21d5f30a Resolve conflicts 2018-01-25 13:25:09 +01:00