mirror of
https://github.com/suitenumerique/drive.git
synced 2026-09-29 13:05:20 +02:00
# Conflicts: # Makefile # docker/files/development/etc/nginx/conf.d/default.conf # docker/onlyoffice/local-development.json # docs/env.md # src/backend/core/api/serializers.py # src/backend/core/api/utils.py # src/backend/core/api/viewsets.py # src/backend/core/models.py # src/frontend/apps/drive/.env.development # src/frontend/apps/drive/package.json # src/frontend/apps/drive/src/features/drivers/Driver.ts # src/frontend/apps/drive/src/features/drivers/implementations/StandardDriver.ts # src/frontend/apps/drive/src/features/drivers/types.ts # src/frontend/apps/drive/src/features/explorer/components/GlobalExplorerContext.tsx # src/frontend/apps/drive/src/features/explorer/components/embedded-explorer/EmbeddedExplorerGridBreadcrumbs.tsx # src/frontend/apps/drive/src/features/explorer/components/icons/ItemIcon.tsx # src/frontend/apps/drive/src/features/explorer/components/modals/ExplorerCreateFileModal.tsx # src/frontend/apps/drive/src/features/explorer/components/modals/ExplorerCreateFolderModal.tsx # src/frontend/apps/drive/src/features/explorer/components/modals/share/ItemShareModal.tsx # src/frontend/apps/drive/src/features/explorer/hooks/useCreateMenuItems.tsx # src/frontend/apps/drive/src/features/explorer/hooks/useItemActionMenuItems.tsx # src/frontend/apps/drive/src/features/explorer/hooks/useMutations.ts # src/frontend/apps/drive/src/features/explorer/hooks/useUpload.tsx # src/frontend/apps/drive/src/features/explorer/utils/mimeTypes.ts # src/frontend/apps/drive/src/features/i18n/translations.json # src/frontend/apps/drive/src/features/items/hooks/useDownloadItem.tsx # src/frontend/apps/drive/src/features/ui/components/user/UserProfile.tsx # src/frontend/apps/drive/src/features/ui/preview/files-preview/FilesPreview.tsx # src/frontend/apps/drive/src/features/ui/preview/files-preview/files-preview.scss # src/frontend/apps/drive/src/pages/explorer/items/files/[id].tsx # src/frontend/apps/drive/src/styles/globals.scss