yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,099 Commits 127 Branches 497 Tags
Commit Graph

15099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
ELABBASSI Hicham
f946e52f7f
Merge pull request #8778 from strapi/core/cm-fix-effects 
Fix cleanup effect
 2020-12-04 11:11:05 +01:00
Convly
75d007526e Fix mongo test 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-12-03 16:02:44 +01: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
cyril lopez
62bb0bbae1
Merge pull request #8751 from strapi/relational-field/filter-on-relations 
Enable filter on the relation fields
 2020-11-30 13:55:29 +01:00
HichamELBSI
655c17c254 Add util and tests 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-11-30 12:07:34 +01:00
HichamELBSI
0506f38769 Fix filter displayed format 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-11-30 11:29:50 +01:00
HichamELBSI
303e041a03 Fix PR feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-11-27 15:07:24 +01:00
Alexandre Bodin
6d39f0e772 Fix sanitize input not using the right subject 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-27 11:52:00 +01:00
HichamELBSI
7c827d9f06 Add rf in filters 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-11-26 15:51:25 +01:00
ELABBASSI Hicham
0ba3f0746d
Merge pull request #8749 from strapi/rf/enable-sort 
Enable sort on relation
 2020-11-26 12:15:19 +01:00
soupette
6c9955d210 Apply PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-26 11:56:24 +01:00
soupette
2bba46ffc5 Fix sort 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-26 10:41:01 +01:00
soupette
a57329d9c6 Enable sort on relations 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-26 10:11:20 +01:00
cyril lopez
3c9686f986
Merge pull request #8727 from strapi/relational-fields/display-in-list 
Display relational fields in the list view
 2020-11-26 09:46:38 +01:00
HichamELBSI
7498da6c4e Fix relationType 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-11-26 09:37:41 +01:00
HichamELBSI
08fa129884 Fix PR feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-11-25 18:56:31 +01:00
Alexandre Bodin
c9c936ba41 Merge branch 'master' into feature/relational-fields 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-25 16:37:32 +01:00
Alexandre Bodin
9b28991d8a v3.3.4 v3.3.4 2020-11-25 16:22:45 +01:00
Yanuar Aditia
62231043ed
Add indonesian translations (#8384) 
* Add indonesian lang for strapi-admin & strapi-plugin-users-permission

* Add indonesian language for strapi-generate-plugin, strapi-plugin-content-manager, strapi-plugin-content-type, strapi-plugin-documentation, strapi-plugin-email

* Update Platform.sh button image URL (#8300)

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
Signed-off-by: Yanuar Aditia <yanuaraditia@outlook.com>

* Add indonesian lang for strapi-admin & strapi-plugin-users-permission

Signed-off-by: Yanuar Aditia <yanuaraditia@outlook.com>

* Add indonesian language for strapi-generate-plugin, strapi-plugin-content-manager, strapi-plugin-content-type, strapi-plugin-documentation, strapi-plugin-email

Signed-off-by: Yanuar Aditia <yanuaraditia@outlook.com>

* Add indonesian translations

Signed-off-by: Yanuar Aditia <yanuaraditia@outlook.com>

Co-authored-by: yvesdo <yves@strapi.io>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-11-25 13:56:51 +01:00
dependabot[bot]
44b312a325
Bump nodemailer from 6.3.0 to 6.4.16 (#8704) 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.3.0 to 6.4.16.
- [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.3.0...v6.4.16)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-25 13:55:36 +01:00
DMehaffy
bac867c816
Add support for columnType in Mongoose (#8723) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-11-25 13:54:44 +01:00