yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-22 14:59:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,488 Commits 125 Branches 496 Tags
Commit Graph

15488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dependabot[bot]
68f10448a2
Bump @testing-library/react from 11.0.4 to 11.2.2 (#8758) 
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 11.0.4 to 11.2.2.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v11.0.4...v11.2.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-08 14:22:35 +01:00
dependabot[bot]
601bb32278
Bump node-ses from 3.0.2 to 3.0.3 (#8826) 
Bumps [node-ses](https://github.com/aheckmann/node-ses) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/aheckmann/node-ses/releases)
- [Changelog](https://github.com/aheckmann/node-ses/blob/master/History.md)
- [Commits](https://github.com/aheckmann/node-ses/compare/v3.0.2...v3.0.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-08 14:07:08 +01:00
cyril lopez
a00c8607f8
Merge pull request #8820 from strapi/fix/tooltip-update-position 
Fix updatePosition uncaught error
 2020-12-07 17:57:14 +01:00
HichamELBSI
f814f8e2ed Fix updatePosition uncaught error 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-07 17:17:49 +01:00
Alexandre BODIN
02e6f77ac3
Merge pull request #8819 from strapi/rf/fix-mainfield 
Use correct mainField
 2020-12-07 16:10:38 +01:00
Pierre Noël
ab98afe80d use correct mainField 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-12-07 15:50:46 +01:00
cyril lopez
0a754813b2
Merge pull request #8784 from strapi/relational-fields/many-values-tooltip 
Display x-to-many relation preview values in content manager list
 2020-12-07 14:06:26 +01:00
HichamELBSI
21488a7a91 Remove mockData and call API 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-07 13:53:31 +01:00
HichamELBSI
86600562ec Merge branch 'feature/relational-fields' into relational-fields/many-values-tooltip 2020-12-07 12:20:48 +01:00
HichamELBSI
23a6d5b581 Merge branch 'feature/relational-fields' into relational-fields/many-values-tooltip 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-07 12:15:04 +01:00
Alexandre BODIN
7b9834c9a6
Merge pull request #8783 from strapi/rf/eng-120/preview-x-to-many 
Relation fields preview x to many
 2020-12-07 09:56:48 +01:00
dependabot[bot]
8dfba3bb89
Bump @purest/providers from 1.0.1 to 1.0.2 (#8817) 
Bumps [@purest/providers](https://github.com/simov/purest-providers) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/simov/purest-providers/releases)
- [Commits](https://github.com/simov/purest-providers/commits/v1.0.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-07 09:36:31 +01:00
dependabot[bot]
f83aacefe1
Bump semver from 7.3.2 to 7.3.4 (#8816) 
Bumps [semver](https://github.com/npm/node-semver) from 7.3.2 to 7.3.4.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/master/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v7.3.2...v7.3.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-07 09:36:01 +01:00
HichamELBSI
d8e71a2771 Fix relations queryInfos 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-04 22:22:01 +01:00
Pierre Noël
dce8f7c6fa refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-12-04 16:07:18 +01:00
P
9fbdae244a
Change validateEntity to validateEntityCreation (#8429) 
Fix bug strapi.entityValidator.validateEntity is not a function

Signed-off-by: pntech20 <pntech20@gmail.com>
 2020-12-04 14:37:15 +01:00
Antoine
623dea49fc
[Unit testing doc] add runtime fix (#8082) 
I just changed the `note` for a `tip` because is not showing in the docs.
More info about the modification at https://github.com/strapi/strapi/discussions/7549

Signed-off-by: Antoine-LB <antoine.stc25@gmail.com>
 2020-12-04 14:24:48 +01:00
Rémi de Juvigny
b0f3024b07
Improved create-strapi-app's templates (#8627) 
* Allow template configs as functions

Signed-off-by: Rémi de Juvigny <remi@hey.com>

* Allow template shorthands

Signed-off-by: Rémi de Juvigny <remi@hey.com>

* Restore strapi-generate-new import

Signed-off-by: Rémi de Juvigny <remi@hey.com>

* New shorthand system and updated docs

Signed-off-by: Rémi de Juvigny <remi@hey.com>

* Improved docs

Signed-off-by: Rémi de Juvigny <remi@hey.com>

* Remove duplicate merge-template file

Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-12-04 11:22:20 +01:00
ELABBASSI Hicham
f946e52f7f
Merge pull request #8778 from strapi/core/cm-fix-effects 
Fix cleanup effect
 2020-12-04 11:11:05 +01:00
Robin Simonklein
e01d287e8f
Add some admin french translations (#8665) 
* v3.3.3

Signed-off-by: Robin Simonklein <rsimonklein@gmail.com>

* Add french translations for draft/publish feature

Signed-off-by: Robin Simonklein <rsimonklein@gmail.com>

* Add french translations for media library

Signed-off-by: Robin Simonklein <rsimonklein@gmail.com>

* Fix typo

Signed-off-by: Robin Simonklein <rsimonklein@gmail.com>

* Add some missing french translations

Signed-off-by: Robin Simonklein <rsimonklein@gmail.com>

* Content-manager actions french translations

Signed-off-by: Robin Simonklein <rsimonklein@gmail.com>

* Add missing french translations for users settings & auth

Signed-off-by: Robin Simonklein <rsimonklein@gmail.com>

* Add "select all" french translation

Signed-off-by: Robin Simonklein <rsimonklein@gmail.com>

Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-12-04 11:06:45 +01:00
Akhil Mohan
96db1488bc
Bug/collection type sort asc (#8706) 
* fixed leftmenu sorting bug in content-types-builder

Signed-off-by: akhilmhdh <akhilmhdh@gmail.com>

* changed js toLowerCase to lodash toLower

Signed-off-by: akhilmhdh <akhilmhdh@gmail.com>

Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2020-12-04 11:03:55 +01:00
dependabot[bot]
bbff091b88
Bump react-test-renderer from 16.13.1 to 17.0.1 (#8717) 
Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer) from 16.13.1 to 17.0.1.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v17.0.1/packages/react-test-renderer)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-04 11:03:17 +01:00
Jorrit Schippers
c4b039a3e7
Fix strapi -v and strapi --version options (#8740) 
Signed-off-by: Jorrit Schippers <jorrit@ncode.nl>
 2020-12-04 10:59:01 +01:00
Fadhil Ahmad
b84aa2f056
Docs fix type singleType findOne (#8764) 
* fix: typo find instead of findone for singleType

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* refactor: remove query obj for single type

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>
 2020-12-04 09:59:04 +01:00
Convly
75d007526e Fix mongo test 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-12-03 16:02:44 +01:00
DMehaffy
57d956fb87
Add manyWay relation example (#8777) 2020-12-03 07:10:24 -07:00
HichamELBSI
a4f0bdecc8 Add x-to-many relation preview tooltip 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-02 18:00:06 +01:00
Convly
008dba0ac4 Add e2e tests for RF 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-12-02 15:48:01 +01:00
Pierre Noël
0d9812db95 add many relations preview route 2020-12-02 15:48:00 +01:00
Pierre Noël
66dd23deab
Enable the configuration of RF in list view (#8770) 
* enable the configuration of RF in list view

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* fix test db unique

Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-12-02 15:28:58 +01:00
soupette
16c7d2123f Fix cleanup in useeffect 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-01 17:23:12 +01:00
Maxime Castres
e2b6b9706e
Add academy link to the README (#8776) 2020-12-01 07:56:32 -08:00
Joris W
87ad2f73c8
Clarify some of the template creation steps (#8482) 
* Clarify some of the template creation steps

* Update docs/v3.x/concepts/templates.md

Co-authored-by: Rémi de Juvigny <remi@hey.com>

* Update templates.md

* Update templates.md

Signed-off-by: Joris Witteman <joris@jor.is>

Co-authored-by: Rémi de Juvigny <remi@hey.com>
 2020-11-30 10:33:09 -08:00