yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 00:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,395 Commits 129 Branches 498 Tags
Commit Graph

243 Commits

Author SHA1 Message Date
Jorrit Schippers
175422d760
Update .npmignore files (#8865) 
Add .editorconfig, .snyk, __tests__, jest.config.js
Remove .npmignore and .gitignore from admin subdirectories

Signed-off-by: Jorrit Schippers <jorrit@ncode.nl>
 2021-01-28 16:57:29 +01:00
Jorrit Schippers
3f63902d4b
Use https:// in package.json and README.md files (#9227) 
Signed-off-by: Jorrit Schippers <jorrit@ncode.nl>
 2021-01-26 17:06:25 +01:00
Alexandre Bodin
4f9cc8a22c v3.4.5 2021-01-26 11:59:47 +01:00
Jozef Cipa
808b2a464f
Handle duplicate entry error (#8367) 
* Handle duplicate entry error message in bookshelf connector

Signed-off-by: jozefcipa <jozef.cipa@strv.com>

* Handle duplicate error message in mongoose connector

Signed-off-by: jozefcipa <jozef.cipa@strv.com>

* Apply changes from review

* Fix wrapping transactions in bookshelf adapter

* Add missing await to wrapErrors

* Call findOne without this
 2021-01-25 14:03:48 +01:00
Jozef Cipa
a48f9f3327
Fix lower() error when running on non-string column (#8419) 
Signed-off-by: jozefcipa <jozef.cipa@strv.com>
 2021-01-21 11:36:17 +01:00
Alexandre Bodin
542786f263 v3.4.4 2021-01-20 17:31:59 +01:00
Anthony Nguyen
b4f75fd7a6
Add min:0 to templates of Bookshelf DBs. Issue #8436 (#9155) 
* Add min:0 to templates of Bookshelf DBs. Issue #8436

* Moving default property from db template to knex.js

* Move min to pool
 2021-01-18 14:14:39 +01:00
Alexandre Bodin
553d64cafd v3.4.3 2021-01-14 10:46:50 +01:00
Pierre Noël
70ffd7c65b
Fix CM limited to show only 100 entries (#9118) 
* fix mongo count

* harmonize code between mongoose and bookshelf

* refacto
 2021-01-13 20:15:45 +01:00
Alexandre Bodin
7505de6ad9 v3.4.2 2021-01-13 12:16:44 +01:00
Jorrit Schippers
8d88f5e97f
Consolidate lodash dependency to 4.17.20 (#8861) 
Signed-off-by: Jorrit Schippers <jorrit@ncode.nl>

Co-authored-by: Pierre Noël <petersg83@users.noreply.github.com>
 2021-01-13 12:08:13 +01:00
Pierre Noël
08f9b05d21
Fix query when filtering and sorting on a relational field (#9045) 
* fix query when filtering and sorting on a relational field

* add tests + refacto

* remove useless code
 2021-01-11 17:21:01 +01:00
Convly
c3a2c7024d PR review adjustments 2021-01-08 10:09:10 +01:00
Convly
5bf9375381 First impl (wip) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 09:52:21 +01:00
soupette
8b9c3f2052 v3.4.1 2020-12-22 16:52:46 +01:00
Alexandre Bodin
ea636b4d31 v3.4.0 2020-12-17 13:18:50 +01:00
Alexandre Bodin
aa3d7eb2e0 Merge branch 'master' into feature/relational-fields 2020-12-17 12:58:34 +01:00
Pierre Noël
4a02c158b9
Fix migration when disabling dp on sqlite (#8768) 
* fix migration disable dp on sqlite

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

* fix mongo test

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

* use context instead of migrationInfos

* refacto

* remove useless if
 2020-12-17 12:33:00 +01:00
Alexandre BODIN
d6f5b0c572
Merge pull request #8829 from strapi/relational-fields/sort-by-relation 
Relational fields/ Sort by relation
 2020-12-10 14:05:56 +01:00
Pierre Noël
4b25c36739 Add count 2020-12-08 17:27:02 +01:00
Convly
92451db825 Add deep sort to mongoose, fix sort order on both connectors, cleanup 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-12-08 16:56:21 +01:00
Convly
95784438ce Add nested sort to bookshelf queries 2020-12-08 16:56:21 +01:00
Alexandre Bodin
c9c936ba41 Merge branch 'master' into feature/relational-fields 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-25 16:37:32 +01:00
Alexandre Bodin
9b28991d8a v3.3.4 2020-11-25 16:22:45 +01:00
soupette
61a3740c06 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-23 14:43:07 +01:00
Alexandre Bodin
5fe7fa2f79 v3.3.3 2020-11-16 16:47:16 +01:00
Alexandre Bodin
17ea510715 v3.3.2 2020-11-10 19:02:11 +01:00
Alexandre Bodin
98bb6a3d31 v3.3.1 2020-11-09 19:22:52 +01:00
Alexandre BODIN
6558161227
Fix ML (#8604) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-09 19:21:08 +01:00
Pierre Noël
ec1c2a22c3 v3.3.0 2020-11-09 17:55:10 +01:00
Pierre Noël
60bf24ce8b
Fix query when populating morph relations (#8548) 
* change query when populating morph relations

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

* refacto

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

* refacto

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

* refacto

Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-11-06 14:35:36 +01:00
Pierre Noël
ff5307e8b6
fix altercolumns db migration (#8565) 
* fix alter-column db migration

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

* refacto of data migration + fix sqlite dp migration

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

* refacto create-migration-runner

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

* fix migration

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

* refacto

Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-11-06 14:27:57 +01:00
Alexandre Bodin
4a32691c07 fix lint 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-03 16:14:31 +01:00
Alexandre Bodin
08a603623b Cleanup tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:46 +01:00
Alexandre Bodin
07e7cfc0bd Make lint stricter and fix the errors 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:42 +01:00
Alexandre Bodin
c78591553f v3.2.5 2020-10-22 17:40:58 +02:00
Alexandre BODIN
81c684d7b4
Merge pull request #8314 from strapi/fix/dpMigration 
fix d&p regressions
 2020-10-20 14:08:49 +02:00
Convly
03f5342123 Fix deepFiltering with draft & publish 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-19 15:39:56 +02:00
Pierre Noël
d84284faf2 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-10-16 18:54:10 +02:00
Pierre Noël
e2341e9b06 run creation/update of the database even if the model hasnt changed 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-10-16 18:54:10 +02:00
Pierre Noël
025eed964c dont run d&p migration at CT creation + rebuild tables if there were deleted in DB 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-10-16 18:54:09 +02:00
Alexandre Bodin
e8153d99c0 v3.2.4 2020-10-16 18:22:15 +02:00
Alexandre Bodin
71a2657ed8 test node v14 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:14 +02:00
Alexandre Bodin
7485de2fdf v3.2.3 2020-10-09 17:12:50 +02:00
Alexandre BODIN
b91059a522
Fix undefined pk (#8260) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-09 17:08:37 +02:00
Convly
b3d0b72198 v3.2.2 2020-10-09 11:52:09 +02:00
dependabot[bot]
efa530e933
Bump rimraf from 3.0.0 to 3.0.2 (#8257) 
Bumps [rimraf](https://github.com/isaacs/rimraf) from 3.0.0 to 3.0.2.
- [Release notes](https://github.com/isaacs/rimraf/releases)
- [Changelog](https://github.com/isaacs/rimraf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/isaacs/rimraf/compare/v3.0.0...v3.0.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-09 10:31:59 +02:00
Alexandre BODIN
e87af3f6c6
do not set id to undefined (#8232) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-07 23:11:00 +02:00
Jean-Sébastien Herbaux
e7861232d0
Fix wrong query generation with bookshelf (#8228) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-07 23:10:38 +02:00
Alexandre Bodin
5a77b560e3 v3.2.1 2020-10-07 14:50:47 +02:00