yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-30 03:33:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,106 Commits 113 Branches 491 Tags
Commit Graph

9373 Commits

Author SHA1 Message Date
Gustav Hansen
6b7b297322 Merge branch 'feature/relations-main-view' into feature/relations-main-view-initial-data-2 2022-09-15 14:45:49 +02:00
Gustav Hansen
3682f5201f RelationInputDataManager: Simplify initialData assignments 2022-09-15 14:44:48 +02:00
Julie Plantey
bac89b8730 fix tests RelationInput 2022-09-15 14:28:09 +02:00
markkaylor
1d7caa398c
Merge branch 'features/custom-fields' into custom-fields/types 2022-09-15 07:42:02 -04:00
GitStart
1642c18734
Merge branch 'main' into STRAP-54 2022-09-15 07:31:52 +01:00
Julie Plantey
b75bf93533 Merge branch 'feature/relations-main-view' of https://github.com/strapi/strapi into relations/mainField-tooltip 2022-09-14 17:02:12 +02:00
Gustav Hansen
9151dac427
Merge pull request #14408 from strapi/feature/relations-main-view-remove-bg 
RelationInput: Remove background color and padding
 2022-09-14 16:51:14 +02:00
Gustav Hansen
ef1a005663
Merge pull request #14410 from strapi/relations/normalizeRelations-filter 
[Relations] Filter refacto & UI fixes
 2022-09-14 16:50:58 +02:00
Julie Plantey
ef226d0b82 tooltip for Relation mainField 2022-09-14 16:47:38 +02:00
markkaylor
16cab06908
Merge pull request #14232 from strapi/chore/custom-fields-docs-link 
Update documentation link for custom fields
 2022-09-14 09:33:13 -04:00
Julie Plantey
69cbe2cae2 improve filter 2022-09-14 15:28:13 +02:00
Gustav Hansen
0c248d0b3a EditViewDataManagerProvider: Fix publish button state comparison 2022-09-14 15:10:33 +02:00
Simone Taeggi
a1ce4d8fa6 Merge branch 'features/api-token-v2' into api-token-v2/select-all-bug 2022-09-14 14:48:04 +02:00
Simone Taeggi
8753fae8ff Merge branch 'main' into features/api-token-v2 2022-09-14 14:47:38 +02:00
Julie Plantey
ca8aea9fcd fix RelationInput snapshots 2022-09-14 14:41:31 +02:00
Pierre Noël
b601daa36b Merge branch 'main' into feature/relations-main-view 2022-09-14 11:36:44 +02:00
Tim Izzo
23d4a26958
Merge branch 'main' into main 2022-09-14 08:38:33 +02:00
Julie Plantey
4fb409a2b5 filter relations & ui fixes 2022-09-13 19:49:08 +02:00
Julie Plantey
1425dc1d2d
Merge pull request #14405 from strapi/relations/clean-connect-disconnect 
[Relations] Clean connect/disconnect on update
 2022-09-13 19:28:38 +02:00
Gustav Hansen
f4299faed7 RelationInputDataManager: Pass down required and labelAction props 2022-09-13 18:59:57 +02:00
Gustav Hansen
6bc839db06 chore: Update snapshot tests 2022-09-13 18:59:56 +02:00
Gustav Hansen
1ef08e443f RelationInput: Add missing default input props 2022-09-13 18:59:56 +02:00
Gustav Hansen
c85282b9af RelationInput: Remove background-color and padding 2022-09-13 18:59:56 +02:00
Pierre Noël
5b56324ac8
Merge pull request #14170 from strapi/fix/upload-new-file-to-entity 
Fix relations not correctly set when uploading a new file to an entity
 2022-09-13 17:55:06 +02:00
Gustav Hansen
cf1caa7c11 RelationInputDataManager: Send idsToInclude param 2022-09-13 17:45:18 +02:00
Marc-Roig
2f0380fb16 local provider transform file size to kb 2022-09-13 17:42:50 +02:00
Julie Plantey
7921a8e465 remove normalizeRelations tests 2022-09-13 17:26:54 +02:00
Julie Plantey
bd939c9112 check if existsInDisconnect before updating draftState 2022-09-13 17:25:29 +02:00
markkaylor
4a3ee5ec5b
Update comment 
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2022-09-13 10:57:25 -04:00
markkaylor
95d7fe5a97
Merge branch 'features/custom-fields' into custom-fields/types 2022-09-13 10:46:53 -04:00
Mark Kaylor
21fd40e243 Merge branch 'main' of github.com:strapi/strapi into features/custom-fields 2022-09-13 10:30:19 -04:00
Julie Plantey
f6bc1a7a05 clean connect/disconnect on update 2022-09-13 16:20:11 +02:00
Gustav Hansen
01f08a2575 Rename RelationInputWrapper to RelationInputDataManager 2022-09-13 16:19:06 +02:00
Marc-Roig
36e237f394 leave verify size function inside local provider 2022-09-13 16:14:34 +02:00
Gustav Hansen
a72197c78a
Merge pull request #14402 from strapi/feature/relations-main-view-components 
RelationInputWrapper: Fix and properly transform query params for components
 2022-09-13 16:11:02 +02:00
Gustav Hansen
5710491285
Merge pull request #14400 from strapi/relations/proptypes-fix 
[RelationInput] fix proptypes
 2022-09-13 16:08:20 +02:00
Mark Kaylor
23d9adbfef Convert type in register function 2022-09-13 10:04:39 -04:00
Pierre Noël
72eec1fb7c Merge branch 'main' into fix/upload-new-file-to-entity 2022-09-13 16:00:05 +02:00
Gustav Hansen
5c839678cd RelationInputWrapper: Fix and properly transform query params for components 2022-09-13 15:24:40 +02:00
Gustav Hansen
ef3ff83c6b
Merge branch 'feature/relations-main-view' into feature/relations-main-view-empty-overfetch 2022-09-13 14:04:50 +02:00
Mark Kaylor
22727a5779 Add custom fields description 2022-09-13 07:56:51 -04:00
Gustav Hansen
0fb9a7f525 useRelation: Update tests 2022-09-13 13:51:53 +02:00
Gustav Hansen
147c7efc27
Merge pull request #14399 from strapi/feature/relations-main-view-draft-warning 
EditView: Remove warning for relations with publicationstate = draft
 2022-09-13 13:08:56 +02:00
Gustav Hansen
bcbae4e599 Merge branch 'main' into feature/relations-main-view 2022-09-13 13:08:05 +02:00
Gustav Hansen
843778eb5a EditView: Remove legacy translations 2022-09-13 12:50:38 +02:00
Gustav Hansen
8f089ca397 EditView: Move test mock-data 2022-09-13 12:50:23 +02:00
Julie Plantey
93123eb978 fixed Option warning id + overflow passed to ShadowBox 2022-09-13 12:39:37 +02:00
Julie Plantey
f7b51cd2f2 fix RelationInput proptypes issues 2022-09-13 12:25:50 +02:00
Gustav Hansen
f8784891e8 EditView: Remove warning for relations with publicationstate = draft 2022-09-13 12:16:02 +02:00
Marc-Roig
91cb0fba9b Merge remote-tracking branch 'origin/feature/provider-size-limit' into feature/provider-size-limit 2022-09-13 11:34:39 +02:00