yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-13 03:07:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,364 Commits 116 Branches 488 Tags
Commit Graph

282 Commits

Author SHA1 Message Date
Alexandre Bodin
3098309369 Use mongoose.find on simple queries for a perf boost 2019-03-26 14:57:02 +01:00
Alexandre Bodin
d2db6b633f Mongo + graphql v1 2019-03-21 09:07:36 +01:00
Kamal Bennani
e8c92fc3d7 Adapt Services to the new Mongoose API 2019-03-21 09:06:06 +01:00
Kamal Bennani
c93311557e Adapt Services to the new Bookshelf API 2019-03-21 09:05:42 +01:00
Jim LAURIE
720bb53858
Merge branch 'master' into fix/users-count-role-sql 2019-03-02 13:48:53 +01:00
Jim LAURIE
cca2ea98dc Fix user count per role on SQL database 2019-03-01 10:52:52 +01:00
EpicUsaMan
32361e2949
Fix for SQLite 2019-02-28 19:22:01 +02:00
Sajjad Shirazy
a9606b6eae Supporintg IN and NOT IN as a filter type 2019-02-03 15:08:36 +03:30
Aurélien Georget
2115124931 Remove Mongoose warning logs 2019-01-23 16:56:04 +01:00
Jim LAURIE
f90255bb75
Merge branch 'master' into issue/2327 2019-01-22 13:52:13 +01:00
Aurélien Georget
b501e8bb1b Resolve conflicts 2019-01-05 20:33:47 +01:00
soupette
2ab9be48ee Fixes #2555 2019-01-03 17:24:06 +01:00
Jim LAURIE
f87ebea759
Merge branch 'master' into plugin-documentation 2018-12-17 16:22:03 +01:00
Jim LAURIE
596d4dd791
Merge branch 'master' into add-cypress 2018-12-12 20:18:57 +01:00
soupette
43966b8416 Fix conflicts 2018-12-12 14:25:44 +01:00
DMehaffy
fb845792ab Fix to allow provider to be shown in the content manager 2018-12-11 17:40:57 +01:00
soupette
27df580edb Merge branch 'master' of github.com:strapi/strapi into add-cypress 2018-12-11 12:12:53 +01:00
Aurélien Georget
e1ce257d2f Revert codebase and apply limit, skip, start and sort parameters 2018-12-06 18:11:53 +01:00
soupette
0916c4e018 Fix conflicts 2018-12-06 16:39:20 +01:00
Jim LAURIE
03c1e04d87 Revert filter PR 2018-12-04 17:05:03 +01:00
soupette
d60b5c5b34 Fix conflicts 2018-11-27 20:22:41 +01:00
Aurélien Georget
b0aaae9f12 Resolve conflicts 2018-11-27 18:48:37 +01:00
Jim LAURIE
00d6284552 Fix fetch user mongoose 2018-11-27 16:44:20 +01:00
Aurélien Georget
540e1bccf8 Allow private attribute into input definition 2018-11-27 14:59:28 +01:00
Aurélien Georget
9e0faf9b5c Fix deleteUser mutation for Mongoose and Bookshelf 2018-11-27 14:54:34 +01:00
Aurélien Georget
143f92a338 Follow generated GraphQL input to return data 2018-11-26 18:32:35 +01:00
soupette
80adfdfde8 Merge branch 'master' of github.com:strapi/strapi into add-cypress 2018-11-22 19:45:31 +01:00
Kamal Bennani
511ca55461
fix 1st level deep filter 2018-11-19 00:10:48 +01:00
Jim LAURIE
19ec6242f9
Merge branch 'master' into feature/allow-filtering-on-a-relation-attribute 2018-11-16 17:38:27 +01:00
soupette
d9ee893c8f Merge branch 'master' of github.com:strapi/strapi into add-cypress 2018-11-14 18:20:40 +01:00
soupette
2a5f0c95d2 Fix conflict 2018-11-08 17:54:45 +01:00
Aurelsicoko
f5eda8df3c Improve permissions policy to avoid security breach with GraphQL 2018-11-06 18:58:40 +01:00
Jim LAURIE
02d935188d Fix test launch 2018-10-31 17:20:09 +01:00
Kamal Bennani
957368b8b2
Add a support of deep filter in bookshelf 2018-10-28 23:44:38 +01:00
Kamal Bennani
0ed9b7643a
Merge where and relation payload 2018-10-28 23:42:22 +01:00
Kamal Bennani
5bdb5c25e0
use stage functions from the relation file 2018-10-28 23:42:22 +01:00
Kamal Bennani
ce534cf568
Take into account user model 2018-10-28 23:42:21 +01:00
Kamal Bennani
f8d844a48a
Update user-permissions query logic for both bookshelf/mongoose 2018-10-28 23:42:18 +01:00
NickBolles
b23bbff6a1 Use the UserPermissionsMeRole 2018-10-15 11:03:00 -05:00
NickBolles
fc8931bb39 Add a special return type for the me graphql query 
This helps avoid returning roles and permissions that the user doesn't have access to.
 2018-10-14 21:14:02 -05:00
NickBolles
df9f6d6aee add graphql query for the current user 2018-10-09 21:05:13 -05:00
Jim LAURIE
a09e88f567
Merge branch 'master' into graphql/mutations-aggregations-decimals 2018-09-24 19:42:57 +02:00
cyril lopez
59961edf44 Merge branch 'master' of github.com:strapi/strapi into add-description-to-plugins-routes 2018-09-19 17:36:59 +02:00
cyril lopez
f002a0d144 Add override documentation to upload and users-permissions 2018-09-18 20:39:31 +02:00
Jim LAURIE
6c897555a0
Merge branch 'master' into improvement/pluralize-routes 2018-09-18 13:47:13 +02:00
Jason Lei
3378403954 GraphQL Mutations, Aggregations, Decimals 
Merging Mutations and Aggregations. Fixed Mongoose Hook to use Decimals (2 decimal places) and Floats (20 decimal places).
 2018-09-10 16:05:00 +08:00
soupette
e46567db42 Add description to missing routes 2018-09-07 12:23:13 +02:00
soupette
f572780930 Update users-perm routes actionTypes 2018-09-07 10:33:40 +02:00
soupette
aa22123917 Add default doc in users-permissions plugin 2018-09-06 19:06:19 +02:00
soupette
6b922b1c05 Add descriptions to u-p routes 2018-09-06 10:08:29 +02:00