Francesco Sansalvadore ba941e9712 fix merge conflicts

2026-04-08 17:27:24 +02:00

..

ConfirmDeleteModal.tsx

style: require sorted imports in studio/components (#44408)

2026-04-01 10:22:37 +02:00

CustomExpiryModal.tsx

style: require sorted imports in studio/components (#44408)

2026-04-01 10:22:37 +02:00

FileExplorer.tsx

fix merge conflicts

2026-04-08 17:27:24 +02:00

FileExplorerColumn.tsx

fix merge conflicts

2026-04-08 17:27:24 +02:00

FileExplorerHeader.test.tsx

chore(studio}: enforce import order, remove bare import specifiers (#44585)

2026-04-07 20:34:10 -04:00

FileExplorerHeader.tsx

merge conflicts

2026-04-08 17:01:30 +02:00

FileExplorerHeaderSelection.tsx

style: require sorted imports in studio/components (#44408)

2026-04-01 10:22:37 +02:00

FileExplorerRow.tsx

fix merge conflicts

2026-04-08 17:27:24 +02:00

FileExplorerRowContextMenu.tsx

refactor(studio): migrate all react-contexify usage to ContextMenu_Shadcn_ (#44520)

2026-04-07 13:46:29 +02:00

FileExplorerRowEditing.tsx

style: require sorted imports in studio/components (#44408)

2026-04-01 10:22:37 +02:00

MoveItemsModal.tsx

style: require sorted imports in studio/components (#44408)

2026-04-01 10:22:37 +02:00

PreviewPane.tsx

merge conflicts

2026-04-08 17:01:30 +02:00

StorageExplorer.tsx

merge conflicts

2026-04-08 17:01:30 +02:00

StorageExplorer.utils.test.ts

fix: storage explorer column infinite loading loads the wrong column (#44275)

2026-03-27 16:55:15 +01:00

StorageExplorer.utils.tsx

feat(studio): add app id and installation id to private apps metadata (#44126)

2026-03-24 16:52:58 +01:00

StorageExplorerPickerContext.tsx

prettier

2026-03-26 12:03:35 +01:00

StorageFilePicker.tsx

merge conflicts

2026-04-08 17:01:30 +02:00

useCopyUrl.tsx

style: require sorted imports in studio/components (#44408)

2026-04-01 10:22:37 +02:00

useFetchFileUrlQuery.tsx

style: require sorted imports in studio/components (#44408)

2026-04-01 10:22:37 +02:00

useStoragePreference.ts

refactor(studio): extract storage preferences into useStoragePreference hook (#44519)

2026-04-03 17:28:56 +02:00