yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 11:25:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,306 Commits 121 Branches 507 Tags
Commit Graph

10774 Commits

Author SHA1 Message Date
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
Kim, Harim
ac3d10006c
Add session option to Strapi query for Mongo Multi-Document transaction (#6447) 
* add session option to mongo queries for transaction

Signed-off-by: harimkims <harimkims@gmail.com>

* seperate session parameter in buildQuery functions

Signed-off-by: harimkims <harimkims@gmail.com>

* clarify comment about mongoose create requirement

Signed-off-by: harimkims <harimkims@gmail.com>

Co-authored-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-13 10:37:23 +01:00
dependabot[bot]
5f87279894
Bump markdown-it-mark from 3.0.0 to 3.0.1 
Bumps [markdown-it-mark](https://github.com/markdown-it/markdown-it-mark) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/markdown-it/markdown-it-mark/releases)
- [Changelog](https://github.com/markdown-it/markdown-it-mark/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/markdown-it-mark/compare/3.0.0...3.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-13 06:28:26 +00:00
Aurélien GEORGET
e296140640
Improvement/telemetry (#9061) 
* Send database client to telemetry

* Only send database property on didServerStart event

* Send the array of databases instead of default one

* pr feedback

Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>

* Revert "pr feedback"

This reverts commit 3b9fcb30b3ddc3efc3de53a311b5e0084ce58e34.

* refactor

Co-authored-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2021-01-12 18:20:10 +01:00
Franklin Lee
9c6b460c7f
feat(middleware-cors): allow setting cors origin with a method (#8545) 
* feat(middleware-cors): allow setting cors origin with a method

Signed-off-by: Franklin Lee <lee.frankliny@gmail.com>

* updated method to take in ctx

Signed-off-by: Franklin Lee <lee.frankliny@gmail.com>

* removed if else conditional

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-01-12 14:52:55 +01:00
dependabot[bot]
f711a56929
Bump markdown-it-emoji from 1.4.0 to 2.0.0 (#9097) 
Bumps [markdown-it-emoji](https://github.com/markdown-it/markdown-it-emoji) from 1.4.0 to 2.0.0.
- [Release notes](https://github.com/markdown-it/markdown-it-emoji/releases)
- [Changelog](https://github.com/markdown-it/markdown-it-emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/markdown-it-emoji/compare/1.4.0...2.0.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-12 09:24:26 +01:00
Jozef Cipa
0f5a93268a
Configurable default _limit parameter (#8377) 
* Fix wrong fields order in object destruct for limit

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

* Make default _limit configurable

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

* Fix some things according to the review

* Improve limit tests
 2021-01-11 17:28:24 +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
Jean-Sébastien Herbaux
1d3576c729
Fix count method w/ D&P filters on MongoDB (#9094) 
* Fix the count method not working with publication state on mongodb by passing all the filters to the query instead of only the where clauses

* Add test for the count api method w/ publication state filter

* Remove sort limit and start from the filters for the count method

* Handle publicationState params in countSearch too
 2021-01-11 17:01:27 +01:00
Jerod Fritz
da1277e90a
Update en.json is->are (#8922) 
When no results are returned in the admin the collections are referred to in the plural however the english references a singular.  For example There is no Restaurants should be There are no Restaurants
 2021-01-11 16:55:03 +01:00
Davide Rossi
e268b0bd6b
Improves Italian translation (#8961) 
* Fixes italian translations for filter function

* Fixes some inconsistencies and adds some missing strings to italian translation of content-type-builder plugin

* Adds all the missing strings in IT translation for content-type-builder plugin

* Fixes and updates italian translation of content-manager plugin

* Updates italian translation of content-type-builder plugin

* Updates italian translation for users-permissions and documentation plugin

* Updates italian translations of admin UI and various plugins

* Minor style fixes on italian translation of users-permissions plugin
 2021-01-11 16:54:17 +01:00
Christian Sandven
e825232dd5
check that model and model.privateAttributes is not undefined (#8669) 
Signed-off-by: csandven <christian@recheckit.com>

Co-authored-by: csandven <christian@recheckit.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-01-11 16:53:13 +01:00
dependabot[bot]
fc325b4d91
Bump axios from 0.21.0 to 0.21.1 (#9086) 
Bumps [axios](https://github.com/axios/axios) from 0.21.0 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.0...v0.21.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-11 09:48:19 +01:00
Convly
dd0f8f0d56 Fix typo in load-plugins file pattern 2021-01-08 16:45:28 +01:00
Alexandre BODIN
58a28145b7
Merge pull request #8673 from strapi/e2e-rework 
New integration tests
 2021-01-08 15:46:59 +01:00
RJ Perias
dd27a567e0
merge arrays in createDocObject and changed object equality function (#7420) 
* merge arrays in createDocObject and changed object equality function

Signed-off-by: gh0stsh0t <rjperias0213@gmail.com>

* added custom comparator for array of objects

Signed-off-by: gh0stsh0t <rjperias0213@gmail.com>

* recursive compare to remove sort
 2021-01-08 15:38:25 +01:00
Convly
579e4c32e9 Reworked the test builder 2021-01-08 10:09:10 +01:00
Convly
c3a2c7024d PR review adjustments 2021-01-08 10:09:10 +01:00
Convly
2431149912 Lint fixes 2021-01-08 10:09:09 +01:00
Convly
9748d702ad Merge & fix 2021-01-08 10:09:09 +01:00
Pierre Noël
8b088f323c Fix test auth-admin 2021-01-08 10:09:09 +01:00
Convly
2a483ba958 Cleanup 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 10:09:08 +01:00
Convly
ecbe3bd1b0 Fix tests 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 10:09:08 +01:00
Convly
823070df9d Fix mongoose destroy function & re-add strapi.stop calls 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 10:09:07 +01:00
Convly
987a7c1022 Fix ci 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 10:09:07 +01:00
Convly
c8a3d29e9c Reimplements register checks / Clear the maps on admin destroy 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 10:09:07 +01:00
Convly
2f7615092a Fix snapshots 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 10:09:06 +01:00
Convly
44b213dc6d Fix memory leak (causing heap overflow) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 10:09:06 +01:00
Convly
44659fc43e heap out of memory 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 09:52:22 +01:00
Convly
857a78e252 Add all missing e2e tests (draft) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 09:52:22 +01:00
Convly
831519672d Rework tests for the ctb 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 09:52:21 +01:00
Convly
abda7e674a TestBuilder v1 + impl in packages/strapi 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 09:52:21 +01:00
Convly
5bf9375381 First impl (wip) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 09:52:21 +01:00
Convly
375e967a80 Init rework, add example with supertest 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 09:52:20 +01:00
p_0g_8mm3_
cbc337585f add missing German translations to content type builder 2021-01-07 21:47:34 +01:00
p_0g_8mm3_
cac2550c2b add missing content manager translations 2021-01-07 20:09:05 +01:00
Jean-Sébastien Herbaux
a77928d8ed
Fix deep query sort when using pagination operators (start, limit) (#9046) 2021-01-06 14:25:26 +01:00
dependabot[bot]
cd09adbaa6
Bump file-loader from 6.1.0 to 6.2.0 (#9050) 
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v6.1.0...v6.2.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-06 09:28:28 +01:00
Alexandre BODIN
63a34cf3c5
Merge branch 'master' into fix/graphql-rels 2021-01-05 13:58:44 +01:00
dependabot[bot]
3610f8c6c1
Bump graphql-playground-middleware-koa from 1.6.20 to 1.6.21 (#9041) 
Bumps [graphql-playground-middleware-koa](https://github.com/graphcool/graphql-playground) from 1.6.20 to 1.6.21.
- [Release notes](https://github.com/graphcool/graphql-playground/releases)
- [Commits](https://github.com/graphcool/graphql-playground/compare/graphql-playground-middleware-koa@1.6.20...graphql-playground-middleware-koa@1.6.21)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-05 10:08:04 +01:00
Alexandre Bodin
b08bc9ef48 Removed unused code & fix some typo 2021-01-05 09:38:12 +01:00
jonmol
819f244498
if there are files (#9030) 
* if there are files

* added back undefined check

Co-authored-by: jon <jon.molin@ticmate.com>
 2021-01-04 17:01:50 +01:00
Alexandre Bodin
2a6e1e0b84 Add tests to data-loaders 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2021-01-04 15:55:07 +01:00
HichamELBSI
0f33931d28 Update buffetjs 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-04 14:47:54 +01:00
HichamELBSI
937b002a1e Fix upload filter picker 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-04 14:47:54 +01:00
soupette
ed6b206c19 Merge branch 'master' of github.com:strapi/strapi into front/bugs-fix 2021-01-04 12:26:27 +01:00
soupette
e074574761 Fixes #8994 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-04 11:46:58 +01:00
soupette
f166ce0b72 Fixes #9016 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-04 11:43:10 +01:00
Artem Shteltser
bde6f93925 Fixed removeKeyInObject 2021-01-04 11:19:47 +02:00
dependabot[bot]
c6f0902c30
Bump hosted-git-info from 3.0.5 to 3.0.7 (#9021) 
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 3.0.5 to 3.0.7.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/latest/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v3.0.5...v3.0.7)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-31 14:41:24 +01:00