yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-21 22:40:24 +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
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
ELABBASSI Hicham
7484716cd2
Merge pull request #8904 from strapi/rf/front-improvements 
Small ui improvements
 2020-12-16 09:37:27 +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
Pierre Burgy
30ed3985c6
Replace John Doe by Kai Doe (#8738) 
Signed-off-by: Pierre Burgy <pierre.burgy@gmail.com>
 2020-12-14 16:57:18 +01:00
Piers Roberts
3c4e6bd34a
Allow JSON stringify to pretty print the config dump via config (#8631) 
* Allow JSON stringify to prety print the config dump via config

Signed-off-by: Piers Roberts <proberts@nomensa.com>

* The JSON pretty switch is now a command option instead of coming from config

Co-authored-by: Piers Roberts <proberts@nomensa.com>
 2020-12-14 16:50:43 +01:00
EdgyCoder ✌
18cb87a93f
Small changes to 'cognito' case! (#8549) 
Removed comment on Cognito and removed unnecessary variable
 2020-12-14 12:22:20 +01:00
Charles Johannisen
05de9e26b9
adjust condition for subdomain when it is an empty string (#8358) 
Signed-off-by: Charles Johannisen <cjohannisen@gmail.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-12-14 12:15:45 +01:00
Pierre Noël
f8f7a4a89f
fix mongo preview when array is missing (#8887) 2020-12-14 12:01:27 +01:00
Diogo Correia
7585658128
Add ability to disable aggregation on GraphQL (#8119) 
Signed-off-by: Diogo Correia <me@diogotc.com>
 2020-12-14 11:57:13 +01:00
HichamELBSI
f67b519f2f Merge branch 'master' into rbac/decorrelate-crud 2020-12-14 11:17:41 +01:00
HichamELBSI
c7c0a2c894 Fix reset button on Role form 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-14 10:50:17 +01:00
Alexandre BODIN
7fa67d8f62
Merge pull request #8874 from strapi/rf/fix-mongo-many-way-preview 
fix mongo many-way preview
 2020-12-11 18:04:29 +01:00
Pierre Noël
7c347ee5c2 fix mongo many-way preview 2020-12-11 17:28:57 +01:00
Alexandre BODIN
fa5b781b2a
Merge pull request #8790 from strapi/rf/eng-127/migration-script-rf 
Add migration script and guide
 2020-12-11 15:24:50 +01:00
Pierre Noël
a23d856050 Better error handling 2020-12-11 15:19:09 +01:00
ELABBASSI Hicham
baa71f9e10
Merge pull request #8872 from strapi/fix/tooltip-feedback 
Fix tooltip feedback
 2020-12-11 14:29:03 +01:00
HichamELBSI
f09e4e0b56 Add buffet LoadingIndicator 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-11 14:27:03 +01:00
HichamELBSI
d1de45acb8 Merge branch 'feature/relational-fields' into fix/tooltip-feedback 2020-12-11 13:20:31 +01:00
ELABBASSI Hicham
fbd8134798
Merge pull request #8850 from strapi/rf/front-enhancements 
Fix ui bugs in CM
 2020-12-11 13:18:18 +01:00
soupette
719e4693ea Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-11 13:13:41 +01:00
HichamELBSI
f244a27023 Fix tooltip feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-11 13:04:41 +01:00
Pierre Noël
f2f0d96799 fix eslint 2020-12-11 11:09:00 +01:00
dependabot[bot]
fd3bcacfd4
Bump koa-convert from 1.2.0 to 2.0.0 (#8870) 
Bumps [koa-convert](https://github.com/gyson/koa-convert) from 1.2.0 to 2.0.0.
- [Release notes](https://github.com/gyson/koa-convert/releases)
- [Commits](https://github.com/gyson/koa-convert/commits/v2.0.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-11 11:05:05 +01:00
dependabot[bot]
bf0f6d6610
Bump @testing-library/jest-dom from 5.11.4 to 5.11.6 (#8871) 
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.11.4 to 5.11.6.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.11.4...v5.11.6)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-11 10:22:27 +01:00
Pierre Noël
10283c3140 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-12-11 10:14:19 +01:00
Pierre Noël
c5ae0170d5 add step to delete the script 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-12-11 10:14:18 +01:00
Pierre Noël
7591e3e398 add migration script and guide 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-12-11 10:14:18 +01:00
dependabot[bot]
1b15aa37b0
Bump axios-mock-adapter from 1.18.2 to 1.19.0 (#8868) 
Bumps [axios-mock-adapter](https://github.com/ctimmerm/axios-mock-adapter) from 1.18.2 to 1.19.0.
- [Release notes](https://github.com/ctimmerm/axios-mock-adapter/releases)
- [Changelog](https://github.com/ctimmerm/axios-mock-adapter/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ctimmerm/axios-mock-adapter/compare/v1.18.2...v1.19.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-11 09:49:50 +01:00
Alexandre BODIN
e8a016be55
Merge pull request #8866 from strapi/rf/fix-mongo-many-many-preview 
Fix many-many preview with mongo
 2020-12-11 09:47:12 +01:00
soupette
72240c973d Fix ctb allowing relations with single types 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-11 09:20:56 +01:00
soupette
955aa2d014 Fix ui bugs 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-10 19:34:28 +01:00
soupette
9532dbd05f Fix cleanedData helper for relations 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-10 19:19:03 +01:00
soupette
bd3920e884 Merge branch 'feature/relational-fields' of github.com:strapi/strapi into rf/front-enhancements 2020-12-10 18:55:58 +01:00
soupette
0bb2897884 Use carret compo in ML sort picker and admin users list 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-10 18:54:59 +01:00
soupette
efd46a117f Created Carret compo in helper plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-10 18:46:57 +01:00
soupette
25ddf4604c Remove old components 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-10 18:36:43 +01:00
Pierre Noël
2bbb6b1a1f fix many-many preview with mongo 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-12-10 18:30:49 +01:00
HichamELBSI
0f60d4dc85 Fix RBAC CE 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-10 16:28:44 +01:00
Alexandre BODIN
d6f5b0c572
Merge pull request #8829 from strapi/relational-fields/sort-by-relation 
Relational fields/ Sort by relation
 2020-12-10 14:05:56 +01:00
Alexandre Bodin
e630cee0c9 Small refactoring to make the code easier to read 2020-12-10 11:17:41 +01:00
dependabot[bot]
5ea4d54204
Bump cross-env from 5.2.1 to 7.0.3 (#8856) 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 5.2.1 to 7.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v5.2.1...v7.0.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-10 11:12:57 +01:00
Convly
a415638848 mongoose:buildQuery : add the sort operator after the query matches, handle id=>_id, optimize the reorder by ids 2020-12-10 10:02:29 +01:00
dependabot[bot]
eab3592329
Bump grant-koa from 5.2.0 to 5.4.8 (#8857) 
Bumps [grant-koa](https://github.com/simov/grant) from 5.2.0 to 5.4.8.
- [Release notes](https://github.com/simov/grant/releases)
- [Changelog](https://github.com/simov/grant/blob/master/CHANGELOG.md)
- [Commits](https://github.com/simov/grant/compare/v5.2.0...v5.4.8)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-10 09:44:59 +01:00
dependabot[bot]
4dcbd40819
Bump byte-size from 6.2.0 to 7.0.0 (#8858) 
Bumps [byte-size](https://github.com/75lb/byte-size) from 6.2.0 to 7.0.0.
- [Release notes](https://github.com/75lb/byte-size/releases)
- [Commits](https://github.com/75lb/byte-size/compare/v6.2.0...v7.0.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-10 09:43:32 +01:00
dependabot[bot]
a912e96f1c
Bump eslint-plugin-redux-saga from 1.2.0 to 1.2.1 (#8859) 
Bumps [eslint-plugin-redux-saga](https://github.com/pke/eslint-plugin-redux-saga) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/pke/eslint-plugin-redux-saga/releases)
- [Commits](https://github.com/pke/eslint-plugin-redux-saga/compare/1.2.0...1.2.1)

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

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