yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-27 19:10:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 111 Branches 486 Tags
Commit Graph

1705 Commits

Author SHA1 Message Date
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
Simone Taeggi
7dea3803e7 update snapshots 2022-12-01 15:17:42 +01:00
Simone
fcee6194e3
Merge branch 'main' into enhancement/date-time-picker-ds-in-strapi 2022-11-30 17:01:39 +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
Simone Taeggi
4391d8b56d Merge branch 'main' into enhancement/date-time-picker-ds-in-strapi 2022-11-30 11:45:30 +01: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
Pierre Noël
78b8319070 remove unecessary checks in tests breaking with mysql 5 2022-11-28 10:45:30 +01:00
Simone Taeggi
81f10690b9 update snapshots and DS beta version 2022-11-28 10:44:09 +01:00
Simone Taeggi
6a327f9d34 update snapshots 2022-11-27 23:19:11 +01:00
Simone Taeggi
60d5fd8b6b Merge branch 'main' into enhancement/date-time-picker-ds-in-strapi 2022-11-27 22:32:31 +01:00
Julie Plantey
dd66604b8a edit asset/folder always accessible, form disabled if no permissions 2022-11-25 18:17:32 +01:00
Julie Plantey
4c31d1eda3 isSelectable doc and small refactor 2022-11-25 17:34:39 +01:00
Julie Plantey
501454edb8 Merge branch 'ML-listview/modals' of https://github.com/strapi/strapi into ML-listview/is-selectable-refactor 2022-11-25 16:27:15 +01:00
Julie Plantey
61c8c05365 (chore): updated folder name and count separator 2022-11-25 16:17:03 +01:00
Julie Plantey
1093cb0021 chore feedback temp 2022-11-25 12:37:44 +01:00
Julie Plantey
d36aaed17e (chore): update tertianary with null 2022-11-25 11:05:47 +01:00
Julie Plantey
1824d5f8be refactor isSelectable usage + fix grid view selection 2022-11-24 19:47:56 +01:00
Julie Plantey
36cf9ea857 tests for isSelectable util 2022-11-24 18:13:21 +01:00
Julie Plantey
5098641d23 chore: remove .only BrowseStep tests 2022-11-24 17:31:05 +01:00
Julie Plantey
da676b2c4c fix folder navigation being link or button + tests 2022-11-24 16:52:35 +01:00
Julie Plantey
16e5a8d706 Merge branch 'features/MediaLibrary-listview' of https://github.com/strapi/strapi into ML-listview/modals 2022-11-24 15:04:42 +01:00
Julie Plantey
375d0b003f make TableList compatible with ML modal 2022-11-24 15:02:45 +01:00
Julie Plantey
7c4b0e1bd1
Merge pull request #14974 from strapi/ML-listview/permissions 
[features][ML listview] Permissions checboxes
 2022-11-23 21:29:10 +01:00
Jamie Howard
298d823d3f
Merge pull request #14975 from strapi/MediaLibrary-listview/rename-FolderList 
[upload] rename folderlist to foldergrid
 2022-11-23 16:09:12 +00:00
Jamie Howard
dd7ab6a447 chore(upload): rename folderlist to foldergridlist 2022-11-23 15:56:25 +00:00
Julie Plantey
3ace59cc36 chore: another test typo 2022-11-23 16:21:53 +01:00
Jamie Howard
da98e64839
Merge pull request #14952 from strapi/MediaLibrary-listview/view-switch 
Add toggle switch in ML and ML modal
 2022-11-23 15:20:10 +00:00
Julie Plantey
03d6b3b8cd chore: feedback tests typos 2022-11-23 15:50:52 +01:00
Julie Plantey
47a569112d fixed selecting element only with can update permission 2022-11-23 15:28:52 +01:00
Nathan Pichon
4e6a8bf672
Merge branch 'main' into fix/file-upload-components 2022-11-23 15:00:44 +01:00
Julie Plantey
63d00fd8b7 Merge branch 'features/MediaLibrary-listview' of https://github.com/strapi/strapi into ML-listview/row-navigation 2022-11-23 13:50:10 +01:00