yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-29 11:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,761 Commits 116 Branches 486 Tags
Commit Graph

184 Commits

Author SHA1 Message Date
Jason Lei
9cb5b08db1 Updated package deps. 2018-09-17 16:31:45 +08:00
Jason Lei
a3bdd9b3fb
Merge branch 'master' into graphql/mutations-aggregations-decimals 2018-09-15 19:53:48 +08:00
Jim LAURIE
4d8ace2db7 3.0.0-alpha.14.1.1 2018-09-13 18:39:37 +02:00
Jim LAURIE
67112e92cd
Merge branch 'master' into graphql/mutations-aggregations-decimals 2018-09-13 15:00:02 +02:00
Jim LAURIE
f10335d717 3.0.0-alpha.14.1 2018-09-12 12:41:11 +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
Nick Verwymeren
bd840d709e
Change comparison operator for array of id's 
When there's an array of ID's present it looks like the Content Manager uses the '=' comparison which ends up returning an empty set. I think maybe the issue lies with the Content Manager plugin in that it should be using a 'IN' comparison if it detects an array. This is a workaround that seems to fix the issue. Although I'll be honest, I don't have enough knowledge of this plugin or the system to know if this will work for all edge cases.
 2018-08-28 14:30:05 -04:00
Jim LAURIE
cecef7385f 3.0.0-alpha.14 2018-08-27 16:30:16 +02:00
soupette
8003982b08 Fix conflicts 2018-08-22 14:17:09 +02:00
Jim LAURIE
4bf88f8792
Merge branch 'master' into feature/graphql-aggregation 2018-08-21 10:36:09 +02:00
Jim LAURIE
d4341797a0
Merge branch 'master' into fix-relation 2018-08-20 16:32:13 +02:00
Jim LAURIE
b4d97fb9db 3.0.0-alpha.13.1 2018-08-09 13:39:34 +02:00
Jakub Skořepa
b7edcffff8
Fix the fix 
It turns out that in some situations it actually is only the id instead of object (nested queries).
 2018-08-08 00:05:33 +02:00
Jakub Skořepa
3645cc15f4
Fix one to many relation querying in the other direction 2018-08-07 14:42:33 +02:00
Aurelsicoko
120f515e5e Better design many-to-many and add jump link 2018-07-31 16:57:16 +02:00
Kamal Bennani
c729b8381f
send method doesn't get copied when using object.assign 2018-07-29 15:01:54 +02:00
Kamal Bennani
0514521707
Make sure that the aggregation queries are only generated for models that uses Mongoose as ORM 2018-07-29 13:24:20 +02:00
Jim LAURIE
a0c49e3340 Fix package conflicts 2018-07-26 16:19:28 +02:00
Jim LAURIE
09a2a4b73d 3.0.0-alpha.13.0.1 2018-07-26 16:12:17 +02:00
Jim LAURIE
927a900f5b 3.0.0-alpha.13 2018-07-25 17:31:16 +02:00
Jim LAURIE
e7a8659f44
Merge branch 'master' into gitignore 2018-07-23 16:06:22 +02:00
Jim LAURIE
d116fabd16
Merge branch 'master' into patch-1 2018-07-23 12:26:56 +02:00
Leon Kyneur
92b045f647 Include yarn.lock in packages .gitignore 2018-07-22 09:26:48 +08:00
Jim LAURIE
f8febb5b8b
Merge branch 'master' into graphql-type-datetime 2018-07-17 12:28:37 +02:00
Erin Dachtler
c0554e8571
Fix for JSON attribute types in GraphQL 
Fixes #1476
 2018-07-12 12:37:19 -07:00
Jim LAURIE
fa94d12e4f 3.0.0-alpha.12.7.1 2018-07-10 18:10:42 +02:00
Jim LAURIE
a6d48caad9 3.0.0-alpha.12.7 2018-07-10 15:37:47 +02:00
Jim LAURIE
74adea6a40
Merge branch 'master' into yarn-install 2018-07-03 17:10:00 +02:00
Johann Pinson
ffaa3fb92a fix(graphql): add time attribute type to DateTime scalar 2018-07-03 16:31:25 +02:00
Jim LAURIE
534b17f77f 3.0.0-alpha.12.6 2018-06-26 18:23:36 +02:00
Kamal Bennani
25eab80f64
Correctly detect an enum field 2018-06-26 18:23:18 +02:00
Kamal Bennani
aedf09bdcb
Add Enum and DateTime support in aggregation and drop lodash 2018-06-25 06:50:16 +02:00
cyril lopez
f056c44dd6 Fix conflicts 2018-06-22 14:17:32 +02:00
Johann Pinson
6bbc5c8993 fix(datetime): add datetime and timestamp detection 2018-06-20 19:09:37 +02:00
Johann Pinson
34aef5bbc6 fix(datetime): update npm dependencies 2018-06-20 10:09:34 +02:00
Jim LAURIE
684a90ca56
Merge branch 'master' into bug/graphql-do-not-formatted-values-of-type-object 2018-06-19 16:28:56 +02:00
Jim LAURIE
a7d8a3c566
Merge branch 'master' into patch-graphql-playground-prod 2018-06-19 16:19:00 +02:00
Johann Pinson
1d4a193f7e feat(graphql): add DateTime support instead of String 2018-06-19 11:13:32 +02:00
Kamal Bennani
fecf5c8ac4
Avoid using ctx.query because it causes all the object values to turn to a string 2018-06-18 23:10:46 +02:00
Kamal Bennani
f0af912825
Implement Graphql Aggregation Feature 2018-06-18 21:50:55 +02:00
Jim LAURIE
92bdb4e758 3.0.0-alpha.12.5 2018-06-18 16:49:28 +02:00
Johann Pinson
295aef53b0 feat(graphql): add option to enable playground anywhere 2018-06-18 11:22:52 +02:00
Jim LAURIE
4a2452a55b
Merge branch 'master' into master 2018-06-14 16:06:11 +02:00
Johann Pinson
bdd1dc9e0d
fix(graphql): update enumeration detection 2018-06-13 22:23:48 +02:00
Jim Laurie
69157dbba2 3.0.0-alpha.12.4 2018-06-13 17:39:37 +02:00
Jim LAURIE
30ccd14ff6
Merge branch 'master' into fix-count 2018-06-12 14:32:50 +02:00
Jim Laurie
cedfe83150 Add test count route 2018-06-12 14:28:37 +02:00
Daan De Deckere
732038593f Use type ID for primary key instead of String. 
Fixes #1356.
 2018-06-09 22:03:53 +02:00
Kamal Bennani
4920c1fa76
Set the entry type only when the value is defined 2018-06-08 20:27:45 +02:00
Johann Pinson
e215c70bbc
Merge branch 'master' into patch-graphql-enum 2018-06-08 19:43:29 +02:00