Skip to content

Commit dc89995

Browse files
Merge remote-tracking branch 'origin/master' into fix/noid/reference-widget-image-sizing-compile
# Conflicts: # css/init-BD3WReu1.chunk.css # css/init-BdwAyrMk.chunk.css # css/init-Pfn7QR6a.chunk.css # css/viewer-init.css # js/viewer-init.mjs # js/viewer-init.mjs.map # js/viewer-main.mjs # js/viewer-main.mjs.map Co-authored-by: jospoortvliet <551757+jospoortvliet@users.noreply.github.com>
2 parents a8abfc8 + 78132c2 commit dc89995

35 files changed

Lines changed: 616 additions & 97 deletions

.github/workflows/npm-audit-fix.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
matrix:
2727
branches:
2828
- ${{ github.event.repository.default_branch }}
29+
- 'stable35'
2930
- 'stable34'
3031
- 'stable33'
3132
- 'stable32'

.github/workflows/update-nextcloud-ocp.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
matrix:
3030
branches:
3131
- ${{ github.event.repository.default_branch }}
32+
- 'stable35'
3233
- 'stable34'
3334
- 'stable33'
3435
- 'stable32'

.nextcloudignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
2+
# SPDX-License-Identifier: AGPL-3.0-or-later
3+
4+
/playwright

appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
<name>Viewer</name>
1010
<summary>Simple file viewer with slideshow for media</summary>
1111
<description><![CDATA[Show your latest holiday photos and videos like in the movies, show a glimpse of your latest novel directly from your Nextcloud, choose the best GIF of your collection thanks to the direct preview of your favorites files and many more!]]></description>
12-
<version>8.0.0-dev.0</version>
12+
<version>9.0.0-dev.0</version>
1313
<licence>agpl</licence>
1414
<author mail="skjnldsv@protonmail.com">John Molakvoæ</author>
1515
<namespace>Viewer</namespace>
1616
<category>tools</category>
1717
<bugs>https://github.com/nextcloud/viewer</bugs>
1818
<screenshot>https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Viewer/viewer.png</screenshot>
1919
<dependencies>
20-
<nextcloud min-version="35" max-version="35" />
20+
<nextcloud min-version="36" max-version="36" />
2121
</dependencies>
2222
<default_enable />
2323
</info>

0 commit comments

Comments
 (0)