diff --git a/.woodpecker.env b/.woodpecker.env index 7d3d51bdd91..f18ee8b40f1 100644 --- a/.woodpecker.env +++ b/.woodpecker.env @@ -1,3 +1,3 @@ # The version of OpenCloud to use in pipelines -OPENCLOUD_COMMITID=cd9095833af0ba1dc7449194e62799931d38a7b1 +OPENCLOUD_COMMITID=81536bbd0e10edfe7fc7ce8a7cee7fadf09c3316 OPENCLOUD_BRANCH=main diff --git a/.woodpecker.star b/.woodpecker.star index 931e991021d..52dfcdc4473 100644 --- a/.woodpecker.star +++ b/.woodpecker.star @@ -2,7 +2,7 @@ repo_slug = "opencloud-eu/web" docker_repo_slug = "opencloudeu/web" ALPINE_GIT = "alpine/git:latest" -APACHE_TIKA = "apache/tika:2.8.0.0" +APACHE_TIKA = "apache/tika:4.1.0-SNAPSHOT" # renovate: datasource=docker depName=collabora/code COLLABORA_CODE = "collabora/code:26.04.2.4.1" diff --git a/dev/docker/opencloud/csp.yaml b/dev/docker/opencloud/csp.yaml index d4aac0e6787..7feeada6692 100644 --- a/dev/docker/opencloud/csp.yaml +++ b/dev/docker/opencloud/csp.yaml @@ -35,6 +35,7 @@ directives: - '''self''' media-src: - '''self''' + - 'blob:' object-src: - '''self''' - 'blob:' diff --git a/docker-compose.yml b/docker-compose.yml index 9cdf7503036..3cad59ad1c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -304,7 +304,7 @@ services: - traefik tika: - image: apache/tika:3.3.1.0 + image: apache/tika:4.1.0-SNAPSHOT container_name: web_tika ports: - 9998:9998 diff --git a/packages/design-system/src/assets/icons/motion-pause-line.svg b/packages/design-system/src/assets/icons/motion-pause-line.svg new file mode 100644 index 00000000000..a0b6b07504d --- /dev/null +++ b/packages/design-system/src/assets/icons/motion-pause-line.svg @@ -0,0 +1 @@ + diff --git a/packages/design-system/src/assets/icons/motion-play-line.svg b/packages/design-system/src/assets/icons/motion-play-line.svg new file mode 100644 index 00000000000..e0e8555f1d5 --- /dev/null +++ b/packages/design-system/src/assets/icons/motion-play-line.svg @@ -0,0 +1 @@ + diff --git a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue index 66db32e9cf7..6a528c1002d 100644 --- a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue +++ b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue @@ -5,13 +5,20 @@ class="relative flex items-center justify-center bg-role-surface-container rounded-xl p-4 mb-4" >
- + + +
+ ('preview') +const motionPlayer = useTemplateRef<{ isPlaying: boolean; toggle: () => void }>('motionPlayer') const keyBindings: string[] = [] let loadPreviewImageController: AbortController = null @@ -233,6 +246,7 @@ const buildMediaFiles = () => { isVideo: isFileTypeVideo(file), isImage: isFileTypeImage(file), isAudio: isFileTypeAudio(file), + isMotionPhoto: isFileTypeImage(file) && !isEmpty(file.motionPhoto), isLoading: true, isError: false, resource: file diff --git a/packages/web-app-preview/src/components/MediaControls.vue b/packages/web-app-preview/src/components/MediaControls.vue index 9e209eddbae..5fd793f78f4 100644 --- a/packages/web-app-preview/src/components/MediaControls.vue +++ b/packages/web-app-preview/src/components/MediaControls.vue @@ -110,6 +110,17 @@ /> + + +