yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-16 03:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,973 Commits 118 Branches 494 Tags
Commit Graph

380 Commits

Author SHA1 Message Date
Alexandre Bodin
c57b3be1eb Merge branch 'master' into features/i18n 2021-03-12 09:45:51 +01:00
Alexandre Bodin
33552e43b8 v3.5.3 2021-03-11 14:25:37 +01:00
DMehaffy
ba0637e26b
Update all documentation links in the code-base and readmes (#9643) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2021-03-09 09:13:15 +01:00
dependabot[bot]
efe6007487
Bump swagger-ui-dist from 3.43.0 to 3.44.1 (#9633) 
Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 3.43.0 to 3.44.1.
- [Release notes](https://github.com/swagger-api/swagger-ui/releases)
- [Commits](https://github.com/swagger-api/swagger-ui/compare/v3.43.0...v3.44.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-03-08 14:09:12 +01:00
cyril lopez
068a31c3e5
Merge pull request #9597 from strapi/i18n/cm-layout-enhancement 
[I18n] CM add icons indicator
 2021-03-08 10:58:15 +01:00
Alexandre Bodin
e9b4bf5616 Merge branch 'master' into features/i18n 2021-03-05 12:22:18 +01:00
soupette
cf2bd304cf Upgrade buffet.js. Add icon to inputs label 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-04 11:59:26 +01:00
dependabot[bot]
bda0c89aaa
Bump react-router from 5.1.2 to 5.2.0 
Bumps [react-router](https://github.com/ReactTraining/react-router) from 5.1.2 to 5.2.0.
- [Release notes](https://github.com/ReactTraining/react-router/releases)
- [Changelog](https://github.com/ReactTraining/react-router/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ReactTraining/react-router/compare/v5.1.2...v5.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-04 08:11:47 +00:00
Alexandre Bodin
1a472c98a7 v3.5.2 2021-03-01 11:24:44 +01:00
dependabot[bot]
0903d5b04d
Bump react-redux from 7.2.0 to 7.2.2 (#9528) 
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.2.0 to 7.2.2.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v7.2.0...v7.2.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-26 09:28:10 +01:00
dependabot[bot]
dd98ae8d85
Bump react-copy-to-clipboard from 5.0.2 to 5.0.3 
Bumps [react-copy-to-clipboard](https://github.com/nkbt/react-copy-to-clipboard) from 5.0.2 to 5.0.3.
- [Release notes](https://github.com/nkbt/react-copy-to-clipboard/releases)
- [Commits](https://github.com/nkbt/react-copy-to-clipboard/compare/v5.0.2...v5.0.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-25 05:37:53 +00:00
Convly
3cc49c4ea8 v3.5.1 2021-02-23 11:23:21 +01:00
Alexandre Bodin
469991f9f2 Merge branch 'master' into features/i18n 2021-02-18 14:36:32 +01:00
Alexandre Bodin
d02a7ba2fa v3.5.0 2021-02-18 11:28:28 +01:00
HichamELBSI
1a42da3007 Merge branch 'master' into features/sso 2021-02-17 11:43:34 +01:00
dependabot[bot]
11005176ca
Bump swagger-ui-dist from 3.41.1 to 3.43.0 (#9413) 
Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 3.41.1 to 3.43.0.
- [Release notes](https://github.com/swagger-api/swagger-ui/releases)
- [Commits](https://github.com/swagger-api/swagger-ui/compare/v3.41.1...v3.43.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-16 09:42:51 +01:00
alexey
e29483bb09
plugin-documentation: added missed manyWay relation (#9379) 2021-02-15 09:34:12 +01:00
alexey
b2d73ccefc
plugin-documentation: added enum for associations (#9381) 2021-02-15 09:32:24 +01:00
ngjoni
92ba4efb2b
Translation Update (german) (#9387) 
* update german translation

* Additional german translation
 2021-02-15 09:21:10 +01:00
Convly
4369af5361 Merge branch 'master' of github.com:strapi/strapi into features/sso 2021-02-09 15:26:28 +01:00
Alexandre Bodin
544f98b8ee v3.4.6 2021-02-03 19:32:36 +01:00
Alexandre Bodin
8287e2ea21 Merge branch 'master' into features/sso 2021-02-03 12:11:03 +01:00
Bobby Glidwell
76b2dfedbb
fix typo "to access to" (#9303) 2021-02-03 09:51:11 +01:00
Alexandre Bodin
4c3bd90ec0 Merge branch 'develop' into features/sso 2021-02-02 10:51:28 +01:00
soupette
88919eb84c Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-01 14:32:58 +01:00
dependabot[bot]
58716287cf
Bump swagger-ui-dist from 3.39.0 to 3.41.1 (#9253) 
Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 3.39.0 to 3.41.1.
- [Release notes](https://github.com/swagger-api/swagger-ui/releases)
- [Commits](https://github.com/swagger-api/swagger-ui/compare/v3.39.0...v3.41.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-29 10:32:05 +01:00
Alexandre Bodin
5524d72396 Merge branch 'master' into features/i18n 2021-01-28 11:35:17 +01:00
Convly
bd91f748d8 Merge master into features/sso 2021-01-27 16:34:43 +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
Pierre Noël
3729f69e08 init i18n plugin 2021-01-22 17:57:15 +01:00
Alexandre Bodin
542786f263 v3.4.4 2021-01-20 17:31:59 +01:00
Alexandre Bodin
553d64cafd 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
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
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
Convly
5228236246 Merge branch 'master' into features/sso 2021-01-12 11:36:11 +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
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
HichamELBSI
47d641d8c0 Fix UI review on SSO 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-07 17:37:12 +01:00
HichamELBSI
0f33931d28 Update buffetjs 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-04 14:47:54 +01:00
dependabot[bot]
24ddb69bc0
Bump cheerio from 1.0.0-rc.3 to 1.0.0-rc.5 (#9014) 
Bumps [cheerio](https://github.com/cheeriojs/cheerio) from 1.0.0-rc.3 to 1.0.0-rc.5.
- [Release notes](https://github.com/cheeriojs/cheerio/releases)
- [Changelog](https://github.com/cheeriojs/cheerio/blob/main/History.md)
- [Commits](https://github.com/cheeriojs/cheerio/compare/1.0.0-rc.3...v1.0.0-rc.5)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-29 09:01:02 +01:00
HichamELBSI
3810f7c71d Update BuffetJS 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:29 +01:00
soupette
8b9c3f2052 v3.4.1 2020-12-22 16:52:46 +01:00
soupette
43d476660a Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-21 10:50:49 +01:00
cyril lopez
5f7992f7b3
Merge branch 'master' into fix/inputs-display 2020-12-21 09:38:00 +01:00
soupette
97e33908a0 Fix input uid 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-18 16:44:24 +01:00
DMehaffy
aad1c2fa03
Cleaning up codebase for doc repo move (#8892) 
* [WIP] Cleaning up codebase for doc repo move

WIP

* Fix deleted files, add links to doc repo issues

* Add repo note to readme
 2020-12-18 15:50:37 +01:00
Christopher Wray
99d39f5d4c
cwray-tech/update plugin descriptions (#8921) 
* Changed plugin description-more helpful text

The marketplace area in the cms shows this text, so I thought this would be a little more helpful than the default text.

Signed-off-by: Christopher Wray <53663762+cwray-tech@users.noreply.github.com>

* updated Graphql description text

* Update email description

* update upload description
 2020-12-18 09:53:46 +01:00