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

15489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
HichamELBSI
04be3d81ee Remove duplicate components from Upload plugin 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-06 17:35:44 +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]
1f0fc10479
Bump lint-staged from 10.4.0 to 10.5.3 (#9051) 
Bumps [lint-staged](https://github.com/okonet/lint-staged) from 10.4.0 to 10.5.3.
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Commits](https://github.com/okonet/lint-staged/compare/v10.4.0...v10.5.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-06 09:29:00 +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
a6d042a204
Merge pull request #9020 from strapi/fix/graphql-rels 
Refactor graphql association resolvers
 2021-01-05 15:46:55 +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
dependabot[bot]
0bfbb2bf27
Bump @swc-node/jest from 0.3.8 to 1.0.3 (#9037) 
Bumps [@swc-node/jest](https://github.com/Brooooooklyn/node-swc) from 0.3.8 to 1.0.3.
- [Release notes](https://github.com/Brooooooklyn/node-swc/releases)
- [Commits](https://github.com/Brooooooklyn/node-swc/compare/@swc-node/jest@0.3.8...@swc-node/jest@1.0.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-04 16:41:27 +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
ELABBASSI Hicham
95ea7c42ca
Merge pull request #9033 from strapi/fix/upload-filter-picker 
Fix upload filter picker
 2021-01-04 15:48:25 +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
ELABBASSI Hicham
d2c59743c7
Merge pull request #9034 from strapi/front/bugs-fix 
Fix JSON input
 2021-01-04 14:13:19 +01:00
soupette
ed6b206c19 Merge branch 'master' of github.com:strapi/strapi into front/bugs-fix 2021-01-04 12:26:27 +01:00
cyril lopez
ce710a6f00
Merge pull request #9032 from shtelzerartem/bugfix/fix-geo-json 
Fixed removeKeyInObject function
 2021-01-04 12:26:03 +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
Convly
e1181a0ca2 Check that userInfo is defined 2020-12-28 15:05:33 +01:00
Convly
176e1c19c6 Remove useless dependency from getstarted packages.json 2020-12-28 15:05:33 +01:00
Convly
ad3006ba26 Use firstname + lastname combination only if both are defined, use username otherwise 2020-12-28 15:05:33 +01:00
HichamELBSI
fec4ac3f04 Fix react-tooltip install 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:32 +01:00
HichamELBSI
4ec79afa9d import Tooltip and Separator from buffet 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:32 +01:00
soupette
d8a57fe207 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:31 +01:00
soupette
1fc2ee567f Change requestURl helper 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:31 +01:00
soupette
24d6883e59 Add error state 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:31 +01:00
soupette
1f2e5c23c0 Add notification message when delete the default register role 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:30 +01:00
soupette
61ed2ca7f1 Move NotAllowedInput to helper plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:30 +01:00
soupette
ab485fce46 Update permissions object 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:30 +01:00
HichamELBSI
d6ebd5a48b Add customRoutes to login page 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:29 +01:00
HichamELBSI
3810f7c71d Update BuffetJS 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:29 +01:00
HichamELBSI
c4f59a8db0 Handle success and error 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:28 +01:00
HichamELBSI
2790aed2bd Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:28 +01:00
HichamELBSI
a09985706d Add auth providers list and page 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:28 +01:00
HichamELBSI
9432e02843 Add EE to AuthPage for providers 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:27 +01:00
soupette
4bd04e12a0 split permissions between ee and ce 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:27 +01:00
soupette
7484f12026 Rename useUserForm hook 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:27 +01:00
soupette
5660624e93 Apply permissions to page 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:26 +01:00
soupette
7441bca9ef Remove useSettingsMenu/init test 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:26 +01:00
soupette
4000243107 Created sso settings page 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:26 +01:00
soupette
41b1c11bb1 Init sso settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-28 15:05:25 +01:00
Jean-Sébastien Herbaux
0850f81884 Consistency with other API endpoints (#8986) 2020-12-28 15:05:25 +01:00
Jean-Sébastien Herbaux
a0a4131b38 New redirect base route (#8985) 2020-12-28 15:05:25 +01:00
Jean-Sébastien Herbaux
b65686037f SSO Adjustement (server-side) (#8983) 
* Use dynamic admin url for redirections, set sso method as GET instead of POST

* Fix unit tests
 2020-12-28 15:05:24 +01:00