yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2026-01-08 13:17:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,246 Commits 145 Branches 517 Tags
Commit Graph

10729 Commits

Author SHA1 Message Date
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
dependabot[bot]
487170788e
Bump nodemailer from 6.4.16 to 6.4.17 (#9022) 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.4.16 to 6.4.17.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.4.16...v6.4.17)

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:00 +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
soupette
8b9c3f2052 v3.4.1 2020-12-22 16:52:46 +01:00
soupette
babecc8705 Fixes #8951 
Also fix filters fetching

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-22 11:41:28 +01:00
soupette
19f61f4b79 Fix wysiwyg lifecycle 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-22 10:24:36 +01:00
soupette
c85eb46a43 Fix input display 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-21 14:20:03 +01:00
soupette
46ac2782f1 Merge branch 'master' of github.com:strapi/strapi into fix/inputs-display 2020-12-21 10:51:25 +01:00
soupette
43d476660a Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-21 10:50:49 +01:00
Alexandre BODIN
8a9d648177
Merge pull request #8937 from strapi/rf/addTelemetry 
Add telemetry on the relational field feature
 2020-12-21 09:53:55 +01:00
dependabot[bot]
7d44de36b2
Bump codemirror from 5.58.1 to 5.59.0 (#8958) 
Bumps [codemirror](https://github.com/codemirror/CodeMirror) from 5.58.1 to 5.59.0.
- [Release notes](https://github.com/codemirror/CodeMirror/releases)
- [Changelog](https://github.com/codemirror/CodeMirror/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codemirror/CodeMirror/compare/5.58.1...5.59.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-21 09:49:41 +01:00
cyril lopez
5f7992f7b3
Merge branch 'master' into fix/inputs-display 2020-12-21 09:38:00 +01:00
Pierre Noël
ae5edd3d4c add test for sendDidConfigureListView 2020-12-18 18:17:02 +01:00
Pierre Noël
355888a5e7 add unit test for getRelationalFields 2020-12-18 17:53:52 +01:00
soupette
97e33908a0 Fix input uid 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-18 16:44:24 +01:00
Pierre Noël
674b1c19fa rename variables 2020-12-18 16:28:54 +01:00
Pierre Noël
23dcde6d90 add didConfigureListView 2020-12-18 16:19:39 +01:00
Moritz Eck
171a56b0e6
strapi-provider-email-mailgun: updates documentation (#8891) 
* adds MAILGUN_HOST env to documentation

Signed-off-by: Moritz Eck <moritz.eck@gmail.com>

* make documentation fit on oneline

Signed-off-by: Moritz Eck <moritz.eck@gmail.com>

* use env() instead of hard-coded value

Signed-off-by: Moritz Eck <moritz.eck@gmail.com>

Co-authored-by: DMehaffy <derrickmehaffy@gmail.com>
 2020-12-18 15:55:30 +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
dependabot[bot]
58fc7084d6
Bump @babel/plugin-proposal-class-properties from 7.10.4 to 7.12.1 (#8902) 
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-class-properties) from 7.10.4 to 7.12.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.1/packages/babel-plugin-proposal-class-properties)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-18 15:24:27 +01:00
Pierre Noël
febfd12b6d
fix test migration draft & publish (#8939) 2020-12-18 12:59:07 +01:00
soupette
0365d36a3b Fixes #8930 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-18 10:27:15 +01:00
dependabot[bot]
9423ec50be
Bump whatwg-fetch from 3.4.1 to 3.5.0 (#8932) 
Bumps [whatwg-fetch](https://github.com/github/fetch) from 3.4.1 to 3.5.0.
- [Release notes](https://github.com/github/fetch/releases)
- [Commits](https://github.com/github/fetch/compare/v3.4.1...v3.5.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-18 09:54:16 +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
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
p_0g_8mm3_
3304ae3e11
[admin, translations] Translate documentation plugin and add German translations to index of upload plugin (#8803) 
* add German translations of upload plugin to index

* Translate the documentation plugin
 2020-12-17 12:54:14 +01:00
Alexandre BODIN
d81104b651
Merge pull request #8912 from strapi/rf/clean-and-tests 
Rf/clean and tests
 2020-12-17 12:51:48 +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
d050a1f0f4 small refactor 2020-12-17 12:11:45 +01:00
soupette
55e147423e Add property to sort and filter events 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-17 11:19:56 +01:00
Pierre Noël
cc978bd999 cast count to number 2020-12-17 11:14:22 +01:00
dependabot[bot]
9f1b38c627
Bump react-select from 3.1.0 to 3.1.1 (#8917) 
Bumps [react-select](https://github.com/JedWatson/react-select) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.1.0...react-select@3.1.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-17 11:02:05 +01:00
Pierre Noël
7d4be48e07 fix populate findWithCountRelations 2020-12-17 10:17:56 +01:00
Pierre Noël
c3f903269d add tests count many relations 2020-12-16 17:54:54 +01:00
Pierre Noël
885dc5a138 refacto findWithRelationCounts 2020-12-16 17:44:43 +01:00
Alexandre Bodin
df3a40c84b Merge branch 'master' into feature/relational-fields 2020-12-16 16:39:58 +01:00
HichamELBSI
5d886b97ed shouldUpdateStrapi in Admin reducer 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-16 16:01:19 +01:00
HichamELBSI
9f627008fe Add semver to check Strapi version 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-16 14:48:50 +01:00
HichamELBSI
c9951290b2 Fix UI bugs RF and CM 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-16 11:35:09 +01:00
dependabot[bot]
e6e228314e
Bump graphql from 15.3.0 to 15.4.0 (#8903) 
Bumps [graphql](https://github.com/graphql/graphql-js) from 15.3.0 to 15.4.0.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v15.3.0...v15.4.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-16 11:18:47 +01:00
HichamELBSI
53231b5833 Merge branch 'master' into feature/relational-fields 2020-12-16 10:17:47 +01:00
ELABBASSI Hicham
7a851d9183
Merge pull request #8572 from strapi/rbac/decorrelate-crud 
RBAC : Decorrelate create action, fix bugs, some refacto
 2020-12-16 10:01:19 +01:00
soupette
cd058e55fe Fix scrollbar alignment in left menu 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-16 08:39:48 +01:00
soupette
6ef73edec1 Fix inner border focus on firefox 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-16 08:07:25 +01:00
dependabot[bot]
44eaeb74c5
Bump @apollo/federation from 0.20.2 to 0.20.7 (#8895) 
Bumps [@apollo/federation](https://github.com/apollographql/federation/tree/HEAD/federation-js) from 0.20.2 to 0.20.7.
- [Release notes](https://github.com/apollographql/federation/releases)
- [Changelog](https://github.com/apollographql/federation/blob/main/federation-js/CHANGELOG.md)
- [Commits](https://github.com/apollographql/federation/commits/@apollo/federation@0.20.7/federation-js)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-15 10:26:42 +01:00