yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-31 21:09:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,371 Commits 106 Branches 487 Tags
Commit Graph

15371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
2eab3f2cfb
Bump markdown-it from 11.0.1 to 12.0.4 (#9087) 
Bumps [markdown-it](https://github.com/markdown-it/markdown-it) from 11.0.1 to 12.0.4.
- [Release notes](https://github.com/markdown-it/markdown-it/releases)
- [Changelog](https://github.com/markdown-it/markdown-it/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/markdown-it/compare/11.0.1...12.0.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-14 10:53:20 +01:00
Alexandre Bodin
553d64cafd v3.4.3 v3.4.3 2021-01-14 10:46:50 +01:00
dependabot[bot]
5423f36781
Bump swagger-ui-dist from 3.35.0 to 3.39.0 (#9122) 
Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 3.35.0 to 3.39.0.
- [Release notes](https://github.com/swagger-api/swagger-ui/releases)
- [Commits](https://github.com/swagger-api/swagger-ui/compare/v3.35.0...v3.39.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-14 10:12:50 +01:00
dependabot[bot]
2a79cd57c5
Bump apollo-server-koa from 2.18.2 to 2.19.1 (#9123) 
Bumps [apollo-server-koa](https://github.com/apollographql/apollo-server/tree/HEAD/packages/apollo-server-koa) from 2.18.2 to 2.19.1.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/commits/apollo-server-koa@2.19.1/packages/apollo-server-koa)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-14 10:00:35 +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
cyril lopez
74933d57c4
Merge pull request #9095 from shtelzerartem/bugfix/fix-remove-key-in-object 
Fixed removeKeyInObject.js which has been breaking moment objects
 2021-01-13 17:28:35 +01:00
Artem Shtelzer
df33626751
Merge branch 'master' into bugfix/fix-remove-key-in-object 2021-01-13 13:29:51 +02:00
Alexandre Bodin
7505de6ad9 v3.4.2 v3.4.2 2021-01-13 12:16:44 +01:00
Mateusz Derks
fcbc36605f
Fix typo in Polish translation (#8996) 2021-01-13 12:09:38 +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
Maxime Castres
a63901d205
Update README to include a section for the live demo (#9089) 2021-01-13 12:07:11 +01:00
Marvin Frachet
176c033471
Adding documentation for M1 users (#9106) 
Co-authored-by: mfrachet <marvin@gatsbyjs.com>
Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2021-01-13 12:05:50 +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
cyril lopez
368a789e06
Merge pull request #9110 from strapi/dependabot/npm_and_yarn/markdown-it-mark-3.0.1 
Bump markdown-it-mark from 3.0.0 to 3.0.1
 2021-01-13 09:00:04 +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
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