yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 04:08:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,264 Commits 116 Branches 489 Tags
Commit Graph

72 Commits

Author SHA1 Message Date
soupette
38b7823b34 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-26 08:01:22 +01:00
Diogo Correia
400893fd6a Prevent error when content type doesn't have searchable fields 
Signed-off-by: Diogo Correia <me@diogotc.com>
 2020-03-23 14:36:58 +00:00
Diogo Correia
684c65ab2e Add 'UID' field search to Mongoose 
Signed-off-by: Diogo Correia <me@diogotc.com>
 2020-03-23 14:36:58 +00:00
Alexandre Bodin
be24f640d9 some cleanup 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 11:06:47 +01:00
Alexandre Bodin
c7f10bfede Update populate to keep array order 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 11:04:24 +01:00
Alexandre Bodin
01fe498407 Delete fk for oneToOne and oneToMany mongo 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 11:04:24 +01:00
Alexandre Bodin
c8de166051 Add deleteRelations logic in connectors 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 11:04:23 +01:00
Alexandre Bodin
0c395eef7e Support order bookshelf 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 11:04:23 +01:00
soupette
f99f83af02 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-13 11:04:45 +01:00
Alexandre BODIN
9ab43d2c42
Merge branch 'master' into fix/#4901/findOneCantHaveMultipleParametersWhenThereIsAPK 2020-03-12 16:10:56 +01:00
Pierre Noël
a1774db410 return null instead of promise 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-09 17:22:36 +01:00
Pierre Noël
b5f9795dbc small refacto of findOne + fix deleteMany of connector-mongoose 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-09 12:09:43 +01:00
Pierre Noël
b5ec9cb1c8 handle unexpected params from koa-router 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-06 19:16:51 +01:00
soupette
bdc2758613 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-06 11:44:20 +01:00
soupette
8a8929e97c v3.0.0-beta.19.3 2020-03-06 10:02:36 +01:00
Pierre Noël
c0d9dd26d1 Fix findOne with PK as one of the params 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-06 09:08:20 +01:00
Alexandre Bodin
e1a7074a4e Merge branch 'develop' into features/media-lib 2020-03-05 14:39:29 +01:00
Alexandre Bodin
b3e18e1de6 v3.0.0-beta.19.2 2020-03-05 14:32:42 +01:00
soupette
f1de079d77 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 10:22:49 +01:00
Alexandre Bodin
8e91e5abaf v3.0.0-beta.19.1 2020-03-04 18:42:31 +01:00
soupette
d6bc4e1941 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 14:52:29 +01:00
Alexandre Bodin
e222792181 v3.0.0-beta.19 2020-03-04 14:24:23 +01:00
HichamELBSI
b5947621fc Merge branch 'master' into develop 2020-03-04 09:32:13 +01:00
Alexandre Bodin
7a8c865051 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 15:18:08 +01:00
Alexandre Bodin
3bcbde8f0b v3.0.0-beta.18.8 2020-02-26 12:01:37 +01:00
Alexandre Bodin
77b1a2944b Add mongoose uid type 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-13 16:46:37 +01:00
Alexandre Bodin
de9521ce6b Merge branch 'develop' into features/single-types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:09:50 +01:00
Jim LAURIE
489d2e33fd feat: expose mongoose connections 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-02-10 15:09:59 +01:00
HichamELBSI
98871fcb46 Merge branch 'develop' into features/single-types 2020-02-05 16:41:30 +01:00
Alexandre Bodin
761ad68392 v3.0.0-beta.18.7 2020-01-30 16:15:25 +01:00
Jelmer Visser
66d9971d1b Check if ref is set before checking toJSON 
Signed-off-by: Jelmer Visser <jelmer@weflycheap.nl>
 2020-01-30 15:08:22 +01:00
Alexandre Bodin
576279626b Merge branch 'develop' into features/single-types 2020-01-29 11:59:53 +01:00
Hicham EL ABBASSI
81c5537d7f Merge branch 'develop' into features/single-types 2020-01-29 10:09:46 +01:00
Alexandre Bodin
4f5a0e7679 Cleanup eslint configs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-27 10:49:57 +01:00
Alexandre Bodin
1106c07795 v3.0.0-beta.18.6 2020-01-23 08:13:13 +01:00
Alexandre Bodin
77e5b8233d Fix mongoose dz delete query 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-22 17:54:59 +01:00
Alexandre Bodin
9c96b180fe Merge branch 'develop' into features/single-types 2020-01-22 10:39:42 +01:00
Alexandre Bodin
2ee13c0a12 v3.0.0-beta.18.5 2020-01-21 15:44:44 +01:00
Alexandre Bodin
4f039b2df8 Clean lint 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-17 10:43:17 +01:00
Jim LAURIE
df1fed99ec docs: update copyright date to 2020 2020-01-08 15:41:08 +01:00
Alexandre Bodin
f0028241c8 v3.0.0-beta.18.4 2020-01-07 17:00:28 +01:00
Alexandre Bodin
2886bb7acb Add manyWay lookup match expr and fix conversion of id and _id type for mongoose match 2020-01-07 12:51:21 +01:00
Alexandre BODIN
cccf256bf7
Merge branch 'master' into fix/enumeration 2020-01-06 12:18:37 +01:00
Alexandre Bodin
27e6975c4a Do not overwritten morphAssoc populates 2020-01-06 11:51:03 +01:00
Alexandre Bodin
252941d589 Allow null value in mongo enums 2020-01-06 11:15:00 +01:00
Alexandre Bodin
c2650b085c v3.0.0-beta.18.3 2019-12-23 10:17:40 +01:00
Alexandre Bodin
8586b3dd39 v3.0.0-beta.18.2 2019-12-19 11:17:14 +01:00
Alexandre Bodin
eda218d37b Populate component relations 2019-12-19 11:05:54 +01:00
Alexandre Bodin
8e2fb1ff1a v3.0.0-beta.18.1 2019-12-18 09:05:32 +01:00
Alexandre Bodin
09629c11e8 v3.0.0-beta.18 2019-12-17 14:55:58 +01:00