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

15371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dependabot[bot]
c0d2f890fb
Bump cross-spawn from 6.0.5 to 7.0.3 (#8855) 
Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 6.0.5 to 7.0.3.
- [Release notes](https://github.com/moxystudio/node-cross-spawn/releases)
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v6.0.5...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 09:37:05 +01:00
soupette
698181eaab Created fields picker 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-09 18:28:21 +01:00
soupette
bff450688b Use picker from buffet in ML 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-09 16:39:37 +01:00
soupette
7cdb688cd7 Fix DZ alignement 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-09 16:25:59 +01:00
soupette
954852fac6 always display component s name in DZ 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-09 15:56:58 +01:00
soupette
9a8c567ebd Auto open the first category collapse in the DZ picker 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-09 15:49:46 +01:00
Alexandre BODIN
84f9808472
Merge pull request #8834 from strapi/rf/eng-84/populateWithCount 
Add counters in relation fields
 2020-12-08 17:30:18 +01:00
Pierre Noël
4b25c36739 Add count 2020-12-08 17:27:02 +01:00
Convly
0096024de6 Fix deep filtering / sort on mongodb 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-12-08 16:56:21 +01:00
Convly
92451db825 Add deep sort to mongoose, fix sort order on both connectors, cleanup 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-12-08 16:56:21 +01:00
Convly
95784438ce Add nested sort to bookshelf queries 2020-12-08 16:56:21 +01:00
Jean-Sébastien Herbaux
40b31da75c
Relational fields - Get mainField from configuration's metadata (#8789) 
* Returns the mainField for the list view

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Use lodash fp

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Move helpers functions outside of the controller

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-12-08 16:55:27 +01:00
ELABBASSI Hicham
709602bb72
Merge pull request #8832 from strapi/relational-fields/fix-layout 
CM Fix layout shape
 2020-12-08 16:42:41 +01:00
soupette
2e4a0d0bb8 Fix filters 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-08 16:35:00 +01:00
dependabot[bot]
aa26bd95cd
Bump axios from 0.20.0 to 0.21.0 (#8825) 
Bumps [axios](https://github.com/axios/axios) from 0.20.0 to 0.21.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.20.0...v0.21.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-08 15:49:08 +01:00
soupette
8401308e6a Use getdisplayed value in the relation selects 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-08 15:33:19 +01:00
soupette
79ef4315a0 Fix layout shape 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-08 14:57:25 +01:00