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

98 Commits

Author SHA1 Message Date
soupette
2e525a7f65 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-27 07:47:17 +01:00
Pierre Noël
af1636b301 fix bad singular form of column name 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-26 11:21:17 +01:00
Alexandre Bodin
cfdbf5423a Add file search and create simple sqlite search 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-25 17:34:39 +01:00
Alexandre Bodin
fa276b2447 Do not set where clause if none present. Avoids using distinct 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-23 17:47:27 +01:00
soupette
818927f7b5 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-23 14:33:17 +01:00
Pierre Noël
0c7029c2b1 lint 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-23 12:00:13 +01:00
Pierre Noël
ff1fbcdfba small refacto 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-20 16:44:25 +01:00
Pierre Noël
5ffe33c530 fix manyWay deep filtering when the relation is self 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-20 13:18:51 +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
Alexandre Bodin
df14b08618 Add file ordering 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 11:04:22 +01:00
Alexandre Bodin
3187c08087 Fix uploadTopEntity and delete file relations on fie delete 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 11:04:22 +01:00
Alexandre Bodin
ed2b973b99 Merge branch 'develop' into features/media-lib 2020-03-20 11:04:10 +01:00
Pierre Noël
8aa50cd80c Fix deep filtering for manyWay 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-18 17:15:24 +01:00
Pierre Noël
c3f011ddba Merge branch 'master' into fix/#4556/nullWhenRequiringAComponentInRelationGraphQl 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-16 15:49:59 +01:00
Pierre Noël
9990759dd5 always populate with components 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-16 15:43:03 +01:00
Alexandre Bodin
243085dae1 Merge branch 'develop' into features/media-lib 2020-03-13 15:40:11 +01:00
Pierre Noël
65a3e83ee3 Change error message when bookshelf db connection fails at start 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-13 12:20:06 +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
Derrick Mehaffy
cd87f0ed22
Fix enumeration on SQL databases 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-02 07:30:33 -07: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
3b41eb6230 Add uid type to bookshelf column generator and init tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-13 11:36:26 +01:00
Alexandre Bodin
9012e7a0ca Add UID in CTB validators 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-12 09:06:38 +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
Alexandre Bodin
8a970562c9 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 19:15:20 +01:00
Alexandre BODIN
c52966f4e1 Merge branch 'master' into fix/self-referencing-many-way 2020-02-10 09:02:47 +01:00
HichamELBSI
98871fcb46 Merge branch 'develop' into features/single-types 2020-02-05 16:41:30 +01:00
Alexandre Bodin
283a0db1ed Upgrade rimraf 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-31 16:56:50 +01:00
Alexandre Bodin
761ad68392 v3.0.0-beta.18.7 2020-01-30 16:15:25 +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
e8f5d46d06 Create realted_col for self referencing many ways 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-23 23:34:28 +01:00
Alexandre Bodin
1106c07795 v3.0.0-beta.18.6 2020-01-23 08:13:13 +01:00
Alexandre Bodin
9c96b180fe Merge branch 'develop' into features/single-types 2020-01-22 10:39:42 +01:00