yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-19 06:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 118 Branches 489 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gustav Hansen
ce18f9cb4d
Merge pull request #14422 from strapi/feature/relations-main-view-initial-data-2 
RelationInputDataManager: Simplify initialData assignments
 2022-09-15 15:24:38 +02:00
Gustav Hansen
30d259776b useRelation: Do not clear the cache before each search 2022-09-15 15:23:09 +02:00
Julie Plantey
ecfbd90ba8 refacto Tooltip position 2022-09-15 15:21:28 +02:00
Gustav Hansen
2d8272ad5b
Merge pull request #14430 from strapi/chore/jest-29-0-3 
Chore: Upgrade jest to 29.0.3 and jest-watch-typeahead to 2.x
 2022-09-15 15:20:41 +02:00
markkaylor
baad89e678
Merge pull request #14368 from strapi/custom-fields/types 
[Custom fields] Add customFields typescript interface
 2022-09-15 08:47:13 -04:00
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
Gustav Hansen
af85262931 Chore: Upgrade jest to 29.0.3 and jest-watch-typeahead to 2.x 2022-09-15 14:21:41 +02:00
markkaylor
1d7caa398c
Merge branch 'features/custom-fields' into custom-fields/types 2022-09-15 07:42:02 -04:00
markkaylor
76311ef276
Merge pull request #14393 from strapi/custom-fields/rm-plugin 
[Custom fields] Rename color-picker custom field plugin
 2022-09-15 07:41:12 -04:00
markkaylor
9a85276edb
Merge branch 'features/custom-fields' into custom-fields/rm-plugin 2022-09-15 07:16:00 -04:00
Pierre Noël
f0d4a95bb9
Merge pull request #14418 from strapi/dependabot/npm_and_yarn/aws-sdk-2.1215.0 
Bump aws-sdk from 2.1208.0 to 2.1215.0
 2022-09-15 11:36:43 +02: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
Gustav Hansen
5e4ac5659a
Merge pull request #14423 from strapi/feature/relations-main-view-publish 
EditViewDataManagerProvider: Fix publish button state comparison
 2022-09-14 16:50:38 +02:00
Julie Plantey
ef226d0b82 tooltip for Relation mainField 2022-09-14 16:47:38 +02:00
Simone
6a56072e1e
Merge pull request #14394 from strapi/api-token-v2/select-all-bug 
Select permissions with the "Select all" command
 2022-09-14 15:50:50 +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
dependabot[bot]
950d460ce7
Bump aws-sdk from 2.1208.0 to 2.1215.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1208.0 to 2.1215.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1208.0...v2.1215.0)

---
updated-dependencies:
- dependency-name: aws-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-14 09:25:11 +00:00
Alexandre BODIN
28788e25f3
Merge pull request #14372 from geetsww/main 
Remove outdated Strapi-Docker link from README
 2022-09-14 10:54:59 +02:00
Tim Izzo
23d4a26958
Merge branch 'main' into main 2022-09-14 08:38:33 +02:00
Mark Kaylor
c84e975a94 Add missing dependency causing test to fail 2022-09-13 15:57:56 -04:00
Mark Kaylor
c2062e4096 Update node version 2022-09-13 14:08:59 -04: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
Benjamin Geets
175009554b
Merge branch 'main' into main 2022-09-13 18:14:11 +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
0ebf0e5f88
Merge pull request #14397 from strapi/fix/14395 
[Fix] CM LV custom labels
 2022-09-13 17:36:59 +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
Gustav Hansen
e1de9498aa
Merge pull request #14404 from strapi/feature/relations-main-view-rename-wrapper-component 
Rename RelationInputWrapper to RelationInputDataManager
 2022-09-13 17:22:17 +02:00
markkaylor
4a3ee5ec5b
Update comment 
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2022-09-13 10:57:25 -04:00
Mark Kaylor
062f92cc99 Merge branch 'features/custom-fields' of github.com:strapi/strapi into custom-fields/rm-plugin 2022-09-13 10:56:43 -04:00
markkaylor
95d7fe5a97
Merge branch 'features/custom-fields' into custom-fields/types 2022-09-13 10:46:53 -04:00
Marion Kamoike-Bouguet
fdb82bfd53
Merge branch 'features/custom-fields' into custom-fields/docs 2022-09-13 16:33:13 +02:00