yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-25 17:19:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,846 Commits 121 Branches 490 Tags
Commit Graph

12157 Commits

Author SHA1 Message Date
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
Marc-Roig
32e321fc42 account for empty providerOptions 2022-09-13 11:34:28 +02:00
Marc
11a804a39e
Merge branch 'main' into feature/provider-size-limit 2022-09-13 11:18:04 +02:00
Julie Plantey
150f697bc8 use custom label for CM LV headers 2022-09-13 10:53:33 +02:00
Marc-Roig
df28f7026e checkFileSize in provider upload 2022-09-13 10:21:30 +02:00
Gustav Hansen
2766b93940
Merge pull request #14387 from strapi/feature/relations-main-view-progressive-state 
EditViewDataManagerProvider: Progressively enhance relations state
 2022-09-13 10:13:34 +02:00
Julie Plantey
d398c6b4f1
Merge pull request #14392 from strapi/relations/ui-fixes 
[RelationInput] UI fixes
 2022-09-13 09:36:08 +02:00
Gustav Hansen
e1c4310bc5 EditViewDataManagerProvider: Fix and improve tests 2022-09-13 09:32:35 +02:00
Gustav Hansen
1a1e95c928 EditViewDataManagerProvider: Improve code comments 2022-09-13 09:14:11 +02:00
David Lüder
4ea9d481a9
Merge branch 'main' into filter-translation-neq-removal 2022-09-13 02:29:59 +02:00
Simone Taeggi
4907cbb36b update test 2022-09-12 23:32:27 +02:00
Simone Taeggi
f3ef246013 fix select all bug 2022-09-12 22:57:04 +02:00
Simone Taeggi
961a3cb202 merge main branch 2022-09-12 22:56:52 +02:00
Mark Kaylor
c4197573cd Lint fix 2022-09-12 14:53:13 -04:00
Alexandre Bodin
7352dd2b36 Fix transaction lock finding the currently editing entry 2022-09-12 20:47:16 +02:00
Mark Kaylor
923d87fdbf Move customField to content-type and component valid types 2022-09-12 11:22:10 -04:00
Julie Plantey
92c9feb79c updated snapshots 2022-09-12 17:19:59 +02:00