Skip to content

Commit

Permalink
Merge pull request #2072 from nextcloud/update-master-version
Browse files Browse the repository at this point in the history
feat(deps): Add Nextcloud 29 support on master
  • Loading branch information
szaimen authored Nov 24, 2023
2 parents b5d50ba + adee14d commit 1bbbbfd
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/npm-audit-fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branches: ["main", "master", "stable27", "stable26"]
branches: ["main", "master", "stable28", "stable27", "stable26"]

name: npm-audit-fix-${{ matrix.branches }}

Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<name>Viewer</name>
<summary>Simple file viewer with slideshow for media</summary>
<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>
<version>2.2.0</version>
<version>2.3.0</version>
<licence>agpl</licence>
<author mail="[email protected]">John Molakvoæ</author>
<namespace>Viewer</namespace>
<category>tools</category>
<bugs>https://github.com/nextcloud/viewer</bugs>
<screenshot>https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Viewer/viewer.png</screenshot>
<dependencies>
<nextcloud min-version="28" max-version="28" />
<nextcloud min-version="29" max-version="29" />
</dependencies>
<default_enable />
</info>
7 changes: 7 additions & 0 deletions cypress/e2e/sharing/download-share-disabled.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,13 @@ describe(`Download ${fileName} in viewer`, function() {
})

it('Share the Photos folder with a share link and access the share link', function() {
cy.on('uncaught:exception', (err) => {
// This can happen because of blink engine handling animation, its not a bug just engine related.
if (err.message.includes('ResizeObserver loop limit exceeded')) {
return false
}
})

cy.createLinkShare('/Photos').then(token => {
// Open the sidebar
cy.visit('/apps/files')
Expand Down
Binary file modified cypress/snapshots/base/visual-regression.cy.ts/image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cypress/snapshots/base/visual-regression.cy.ts/image2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cypress/snapshots/base/visual-regression.cy.ts/non-dav.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cypress/snapshots/base/visual-regression.cy.ts/video.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "viewer",
"description": "Simple file viewer with slideshow for media",
"version": "2.2.0",
"version": "2.3.0",
"author": "John Molakvoæ <[email protected]>",
"contributors": [
"John Molakvoæ <[email protected]>"
Expand Down
2 changes: 2 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"ignoreUnstable": false,
"baseBranches": [
"master",
"stable28",
"stable27",
"stable26"
],
Expand Down Expand Up @@ -62,6 +63,7 @@
"major"
],
"matchBaseBranches": [
"stable28",
"stable27",
"stable26"
],
Expand Down

0 comments on commit 1bbbbfd

Please sign in to comment.