yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 19:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,893 Commits 122 Branches 507 Tags
Commit Graph

88 Commits

Author SHA1 Message Date
Alexandre Bodin
ff15757685 Merge tag 'v3.0.0-beta.19.5' 
v3.0.0-beta.19.5
 2020-04-01 11:31:04 +02:00
Alexandre Bodin
8d56e0c12f v3.0.0-beta.19.5 2020-04-01 11:27:56 +02:00
Pierre Noël
1535735eb6 Merge branch 'master' into fix/#3409/relationTablesCantHaveLongNames 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-30 15:42:08 +02:00
Pierre Noël
ab79327577 move function checkDuplicatedTableNames in its own file 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-30 14:39:31 +02:00
Alexandre Bodin
24bd311678 v3.0.0-beta.19.4 2020-03-30 09:57:05 +02:00
Pierre Noël
f2663eb1f7 improve joinTable customization + test collectionName duplicates 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-27 15:51:23 +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
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
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
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
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
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
b3e18e1de6 v3.0.0-beta.19.2 2020-03-05 14:32:42 +01:00
Alexandre Bodin
8e91e5abaf v3.0.0-beta.19.1 2020-03-04 18:42:31 +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
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
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
Veit Bjarsch
31e6d08b66 fixed entry deletion if params contains associations 2020-01-06 02:29:47 +01:00
Jim LAURIE
91c15a8e5c Merge branch 'master' of github.com:strapi/strapi into pr/4723 2020-01-02 14:00:44 +01:00
Alexandre Bodin
d45b350013 Add morph rel on populate compo relation 2019-12-23 10:45:34 +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
8e2fb1ff1a v3.0.0-beta.18.1 2019-12-18 09:05:32 +01:00