Skip to content

Commit

Permalink
Merge pull request #3554 from nextcloud/update-main-version
Browse files Browse the repository at this point in the history
  • Loading branch information
juliusknorr authored Mar 29, 2024
2 parents 76a6fdb + 73f96bf commit f915c88
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 12 deletions.
5 changes: 0 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ updates:
time: "03:00"
timezone: Europe/Paris
open-pull-requests-limit: 10
ignore:
- dependency-name: christophwurst/nextcloud
versions:
- ">= 18.a"
- "< 19"
- package-ecosystem: composer
directory: "/tests"
schedule:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-nextcloud-ocp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branches: ['main', 'master', 'stable28', 'stable27', 'stable26']
branches: ['main', 'master', 'stable29', 'stable28', 'stable27']

name: update-nextcloud-ocp-${{ 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 @@ -6,7 +6,7 @@
<description><![CDATA[This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.
You can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.]]></description>
<version>8.4.0-beta.2</version>
<version>8.5.0-dev.0</version>
<licence>agpl</licence>
<author>Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk</author>
<types>
Expand All @@ -25,7 +25,7 @@ You can also edit your documents off-line with the Collabora Office app from the
<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-spreadsheet.png</screenshot>
<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-presentation.png</screenshot>
<dependencies>
<nextcloud min-version="29" max-version="29"/>
<nextcloud min-version="30" max-version="30"/>
</dependencies>
<background-jobs>
<job>OCA\Richdocuments\Backgroundjobs\ObtainCapabilities</job>
Expand Down
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.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "richdocuments",
"description": "Collabora online integration",
"version": "8.4.0-beta.2",
"version": "8.5.0-dev.0",
"authors": [
{
"name": "Julius Härtl",
Expand Down Expand Up @@ -85,4 +85,4 @@
],
"globalSetup": "<rootDir>/src/tests/setup.js"
}
}
}

0 comments on commit f915c88

Please sign in to comment.