yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-20 14:00:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,488 Commits 123 Branches 496 Tags
Commit Graph

15488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Convly
45c0152820 Fix tests, update snapshots 2021-01-12 17:25:48 +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
Convly
5228236246 Merge branch 'master' into features/sso 2021-01-12 11:36:11 +01:00
Artem Shteltser
76479a9567 Test to check if removeKeyInObject not corrupt moment objects 2021-01-12 12:14:33 +02:00
Artem Shteltser
54350200eb Fixed removeKeyInObject.js which have been breaking moment objects 2021-01-12 12:14:32 +02:00
Thew Dhanat
2362b215d7
Merge branch 'master' into Validate-boolean-is-not-null-when-required 2021-01-12 15:44:21 +07: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
dependabot[bot]
9bdcebf799
Bump pg from 8.4.0 to 8.5.1 (#9098) 
Bumps [pg](https://github.com/brianc/node-postgres) from 8.4.0 to 8.5.1.
- [Release notes](https://github.com/brianc/node-postgres/releases)
- [Changelog](https://github.com/brianc/node-postgres/blob/master/CHANGELOG.md)
- [Commits](https://github.com/brianc/node-postgres/compare/pg@8.4.0...pg@8.5.1)

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:09 +01:00
Thew Dhanat
47e9da89e5
Merge branch 'master' into Validate-boolean-is-not-null-when-required 2021-01-12 07:15:54 +07: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
Thew Dhanat
a14155022f
Merge branch 'master' into Validate-boolean-is-not-null-when-required 2021-01-11 16:29:04 +07: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
ThewBear
d2eba6655d Validate boolean is not null when required 2021-01-10 23:44:54 +07:00
Alexandre BODIN
331fdd866f
Merge pull request #9070 from strapi/fix-load-plugins-users-permissions 
Fix typo in load-plugins file pattern preventing the app to start
 2021-01-08 17:04:51 +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
9b3fa33418 Update yarn.lock 2021-01-08 10:12:13 +01:00
Convly
28b5ed87f2 Remove node/no-extraneous comment 2021-01-08 10:09:11 +01:00
Convly
b9edf6ba56 Take pr review into account 2021-01-08 10:09:10 +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
dependabot[bot]
1e65de6c7a
Bump eslint from 6.8.0 to 7.17.0 (#9066) 
Bumps [eslint](https://github.com/eslint/eslint) from 6.8.0 to 7.17.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.8.0...v7.17.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-08 09:43:00 +01:00
cyril lopez
40e1ae8837
Merge pull request #9063 from pr0gr8mm3r/master 
Add missing German translations
 2021-01-08 09:15:59 +01:00
cyril lopez
ba031c8088
Merge pull request #9060 from strapi/fix/sso-ui 
Fix UI review on SSO
 2021-01-08 08:59:54 +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
HichamELBSI
47d641d8c0 Fix UI review on SSO 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-07 17:37:12 +01:00
cyril lopez
e9c93530e3
Merge pull request #9055 from strapi/refacto/remove-duplicate-components 
Remove duplicate components from Upload plugin
 2021-01-06 17:54:45 +01:00