yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-07 00:09:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,246 Commits 112 Branches 488 Tags
Commit Graph

174 Commits

Author SHA1 Message Date
Jean-Sébastien Herbaux
a583d1b859
Fix/#3184/fix server crashs on database change (#5703) 
* Don't set connection field on create/edit operation on content-types & components

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Make sure that every component has a valid connection attribute

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove connection check on components load

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove default connections from core & webhook stores but make sure it's defined in the application lifecycle

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix component's associations that can be undefined instead of empty in populateBareAssociations

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove "default" connection from plugins' models

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove connection attribute from generated models (cli)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Mutate each component instead of reassign

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Build core_store and webhook model based on the current config

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Add connection to templates conditionally (based on args)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Set default value for description to undefined instead of empty string

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove unnecessary complexity

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Update getStarted models

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix attributes parsing for generate:model

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Removed tpl option from generate:model/api

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove tpl option from cli

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-04-07 16:31:44 +02:00
Alexandre Bodin
087920fb47 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-31 11:58:31 +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
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
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
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
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
soupette
d6bc4e1941 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 14:52:29 +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
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
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
4f039b2df8 Clean lint 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-17 10:43:17 +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
cfe625f90e Add polymorphic relation to bare populates 2019-12-17 09:11:49 +01:00
Alexandre Bodin
90db5092b4 populate bare associations to avoid circular populating 2019-12-16 14:10:20 +01:00
Alexandre Bodin
6120c645e3 Fix fk name too long 2019-12-13 11:50:14 +01:00
Alexandre Bodin
46ec41356f Do not run bookshelf populate on non existing model 2019-12-12 15:45:47 +01:00
Alexandre Bodin
b5cceb8760 Cleanup graphql and use model uids 2019-12-10 17:24:55 +01:00
Alexandre Bodin
9b5bc9c367 Fix manyWay deep filtering 2019-12-10 17:24:25 +01:00
Alexandre Bodin
2fa574b061 Fix isComponent on null attributes 2019-12-09 14:01:11 +01:00
Alexandre Bodin
c5d57b32fe Merge branch 'develop' into features/dynamic-zones 2019-12-09 11:48:46 +01:00
Alexandre Bodin
fb5b770ce5 Merge branch 'master' into develop 2019-12-09 10:39:30 +01:00