93 Commits

Author SHA1 Message Date
Convly
8a69d187d0 Update models attributes & get models from the database manager
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
2020-07-08 10:21:24 +02:00
Convly
1f3506710d Handle special scenarios where pluginName === 'admin' when retrieving models
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
2020-07-08 10:21:16 +02:00
Pierre Noël
10092f5a57 refacto
Signed-off-by: Pierre Noël <petersg83@gmail.com>
2020-07-01 11:59:33 +02:00
Pierre Noël
950a21469f add filtering to search route
Signed-off-by: Pierre Noël <petersg83@gmail.com>
2020-06-30 15:50:52 +02:00
Abel Soares
af634b7f32
Remove options pool for non sqlite3 clients (#6469)
Signed-off-by: abelsoares <abelbarbosasoares@gmail.com>
2020-06-11 12:04:41 +02:00
Pierre Noël
57d7d876b7
Fix/#4513/ability to use a sub path behind a proxy (#5833)
* add possibility to use strapi on a non-root base url path

* fix documentation password form

* use server.url and admin.url in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update doc proxy

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* move server.url location in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* add possibility to put relative urls

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* allow '/' as an admin url + refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update yarn.lock

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* refacto

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove default proxy option

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* fix github provider

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* fix github login

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove files that should be here

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-05-08 13:50:00 +02:00
Alexandre Bodin
1edc581864 Remove lifecycles from connectors
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-05-04 10:55:08 +02:00
Alexandre Bodin
ebee707ec4 Add basic proto of lifecycles
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-05-04 10:55:06 +02:00
Alexandre Bodin
3b40bcee59 Merge branch 'master' into develop 2020-05-04 10:49:30 +02:00
Pierre Noël
7c837cde6c refacto
Signed-off-by: Pierre Noël <petersg83@gmail.com>
2020-04-30 19:47:03 +02:00
Pierre Noël
015480b1b5 Change search logic
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
2020-04-30 19:47:02 +02:00
kabaros
149c1f7737 Preserve pool setttings when there is a schema
In the case where this is a schema defined, `options.pool` is reassigned ignoring the object constructed in a previous step (only preserving min and max, but not the other values such as `createTimeoutMillis` etc...  This change is to keep the other values intact.

Signed-off-by: mozafar <kabaros@gmail.com>
2020-04-30 14:35:14 +01:00
Alexandre Bodin
431715138a Init restricted-names API
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-04-30 13:55:15 +02:00
Alexandre Bodin
45f1a1ffbe Remove idAttribute and idAttributeType options because breaks strapi
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-04-28 15:44:05 +02:00
Pierre Noël
17e8cba03e remove useless async
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
2020-04-20 16:49:36 +02:00
Pierre Noël
555dbda454 fix count() result not a number
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
2020-04-20 16:43:00 +02:00
soupette
a38c6738e1 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-04-09 09:13:10 +02:00
Alexandre BODIN
574a61de2f
Update sqlite table migration query to escape column names (#5746)
Fix #4983

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-04-08 17:25:31 +02:00
Alexandre Bodin
cc9d23c3ac Merge branch 'develop' into features/media-lib
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-04-07 20:24:39 +02:00
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