yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 09:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,860 Commits 115 Branches 488 Tags
Commit Graph

1455 Commits

Author SHA1 Message Date
Jamie Howard
e380a66c93
Merge pull request #14700 from strapi/feature/media-library-ctv 2022-12-19 15:39:30 +00:00
Jamie Howard
d2abb0899a Merge remote-tracking branch 'origin/main' into feature/media-library-ctv 2022-12-19 09:47:05 +00:00
GitStart
d829a49733
Merge branch 'main' into fix/application-crash-on-filter-delete 2022-12-19 05:56:24 +01:00
GitStart
602c6eddca
Merge branch 'main' into fix/application-crash-on-filter-delete 2022-12-16 16:02:15 +01:00
Jamie Howard
07febfa69e Merge remote-tracking branch 'origin/main' into feature/media-library-ctv 2022-12-16 13:57:57 +00:00
Julie Plantey
80626a65c8 fixed table displayed without assets or folders in BrowseStep + added a test case 2022-12-16 14:54:13 +01:00
Julie Plantey
775777fae2 Merge branch 'main' of https://github.com/strapi/strapi into features/MediaLibrary-listview 2022-12-16 14:35:24 +01:00
Julie Plantey
3e01e639d3
Merge pull request #15069 from radoslavzeman/radoslavzeman/improve-sk-translations 
improve SK translations
 2022-12-16 08:25:05 +01:00
GitStart
2297b70a5b
Merge branch 'main' into fix/application-crash-on-filter-delete 2022-12-14 16:22:45 +01:00
Convly
8716ecc920 v4.5.4 2022-12-14 15:39:30 +01:00
Jamie Howard
f9adde4ef3 chore(upload): CTV icon color 2022-12-14 11:20:21 +00:00
ivanThePleasant
809b380be6
Merge branch 'main' into chore/user-level-data 2022-12-14 11:27:39 +02:00
ivanThePleasant
5f499b8011
Merge branch 'main' into chore/user-level-data 2022-12-13 16:46:11 +02:00
Jamie Howard
892f9963e8 chore(upload): pr feedback 2022-12-13 14:33:05 +00:00
Julie Plantey
dc055b4371 removed unnecessary comment, fixed formatDate, aria-label for empty fields 2022-12-13 15:22:46 +01:00
Josh
e0b2048d67
Merge branch 'main' into fix/select-all-media-library-assets 2022-12-13 11:30:49 +00:00
ivanThePleasant
b95d6e3f28 Merge branch 'main' into chore/user-level-data 2022-12-13 12:17:31 +02:00
gitstart
32972b0433 chore: removes optional chaining 2022-12-13 10:03:59 +00:00
Barış Can Daylık
226a462b7a Add Turkish translation 2022-12-13 00:44:27 +03:00
Jamie Howard
4f7f672a7a chore(upload): revert test value 2022-12-12 10:17:35 +00:00
Jamie Howard
1853606d7d test(upload): update snapshots 2022-12-12 10:15:59 +00:00
Jamie Howard
12eb6ceb69 Merge remote-tracking branch 'origin/main' into feature/media-library-ctv 2022-12-12 10:07:23 +00:00
Jamie Howard
268efc629f chore(upload): review feedback 2022-12-12 10:05:22 +00:00
gitstart
664b5a8245 chore: set default value for undefined folders 2022-12-09 16:26:08 +00:00
gitstart
1ae2671f4c fix: select all when page is greater than one 2022-12-08 16:22:35 +00:00
Julie Plantey
dadcc9a2b5
Merge pull request #15112 from strapi/fix/MediaLibraryInput-localized-icon 
[Fix] MediaLibraryInput localized icon
 2022-12-08 10:06:31 +01:00
Julie Plantey
b81486c8c9 (chore): feedback fix jsdoc + removed comments 2022-12-07 18:16:14 +01:00
Julie Plantey
2d64474728 labelAction for MediaLibrabryInput component & CarousselAssets tests 2022-12-07 17:37:46 +01:00
dependabot[bot]
472e72fe44
chore(deps): bump sharp from 0.31.0 to 0.31.2 
Bumps [sharp](https://github.com/lovell/sharp) from 0.31.0 to 0.31.2.
- [Release notes](https://github.com/lovell/sharp/releases)
- [Changelog](https://github.com/lovell/sharp/blob/main/docs/changelog.md)
- [Commits](https://github.com/lovell/sharp/compare/v0.31.0...v0.31.2)

---
updated-dependencies:
- dependency-name: sharp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-07 09:06:36 +00:00
gitstart
552f8b5056 fix: application crash when deleting a filter 2022-12-06 16:08:15 +00:00
Julie Plantey
5a6529ab8d Merge branch 'main' of https://github.com/strapi/strapi into features/MediaLibrary-listview 2022-12-06 16:32:38 +01:00
Julie Plantey
c4ddaa7538 add formDisabled test for EditFolderDialog 2022-12-06 15:26:59 +01:00
Gustav Hansen
fafdaa4e11
Merge pull request #14359 from GitStartHQ/STRAP-63 
ML: Empty state is shown after deleting all assets from a page
 2022-12-06 13:29:07 +01:00
Gustav Hansen
acada6047e
Merge pull request #15090 from strapi/dependabot/npm_and_yarn/jest-styled-components-7.1.1 
chore(deps-dev): bump jest-styled-components from 7.0.2 to 7.1.1
 2022-12-06 13:10:01 +01:00
Gustav Hansen
4cf4638a01
Merge pull request #15092 from strapi/fix/upload-crop-folders 
Preserve folder id when cropping images
 2022-12-06 12:56:59 +01:00
Gustav Hansen
67ad079472 Chore: Update snapshot tests 2022-12-06 12:35:31 +01:00
Gustav Hansen
851425e82b
Merge pull request #14988 from strapi/dependabot/npm_and_yarn/react-router-dom-5.3.4 
chore(deps): bump react-router-dom from 5.2.0 to 5.3.4
 2022-12-06 12:31:38 +01:00
Julie Plantey
89cda31a8d expend MediaLibrary and BrowseStep tests coverage for listview 2022-12-06 12:27:39 +01:00
Gustav Hansen
eabf3ebc0e EditAssetDialog: Create cropped image in the same folder as the original 2022-12-06 12:13:32 +01:00
Gustav Hansen
a19579634c useEditAsset: Send folder.id instead of full folder object 2022-12-06 12:12:58 +01:00
Julie Plantey
3835a29126 Merge branch 'main' of https://github.com/strapi/strapi into features/MediaLibrary-listview 2022-12-05 17:32:52 +01:00
Josh
ac978ad6ed
Merge branch 'main' into dependabot/npm_and_yarn/msw-0.49.1 2022-12-05 11:20:48 +00:00
gitstart
c1faa543ef chore: updates implementation logic 2022-12-05 05:17:58 +00:00
gitstart
37440bb814 Merge commit 'e3c273cf36d7d12547fcc4bea1778df513aedb46' of https://github.com/GitStartHQ/strapi into STRAP-63 2022-12-05 05:17:54 +00:00
Radoslav Zeman
4bf11a59a8 improve SK translations 2022-12-03 23:08:54 +01:00
Convly
5453885f7a v4.5.3 2022-11-30 16:27:25 +01:00
dependabot[bot]
d8a02ca9b8
chore(deps): bump msw from 0.42.3 to 0.49.1 
Bumps [msw](https://github.com/mswjs/msw) from 0.42.3 to 0.49.1.
- [Release notes](https://github.com/mswjs/msw/releases)
- [Changelog](https://github.com/mswjs/msw/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mswjs/msw/compare/v0.42.3...v0.49.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-30 14:53:50 +00:00
dependabot[bot]
e49ee71ce2
chore(deps): bump react-router-dom from 5.2.0 to 5.3.4 
Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 5.2.0 to 5.3.4.
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/v5.3.4/packages/react-router-dom)

---
updated-dependencies:
- dependency-name: react-router-dom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-30 10:45:09 +00:00
Simone
a39b999359
Merge branch 'main' into chore/ds-140 2022-11-30 09:10:23 +01:00
Simone Taeggi
3e7d720046 upgrade ds version and tests 2022-11-28 18:02:23 +01:00