Skip to content

feat(deps): Add Nextcloud 32 support on main #6873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 1 commit into from
Jan 23, 2025
Merged

feat(deps): Add Nextcloud 32 support on main #6873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/npm-audit-fix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branches: ['main', 'master', 'stable30', 'stable29']
branches: ['main', 'master', 'stable31', 'stable30', 'stable29']

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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-nextcloud-ocp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branches: ['main', 'master', 'stable30', 'stable29']
branches: ['main', 'master', 'stable31', 'stable30', 'stable29']

name: update-nextcloud-ocp-${{ matrix.branches }}

Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
- **💾 Open format:** Files are saved as [Markdown](https://en.wikipedia.org/wiki/Markdown), so you can edit them from any other text app too.
- **✊ Strong foundation:** We use [🐈 tiptap](https://tiptap.scrumpy.io) which is based on [🦉 ProseMirror](https://prosemirror.net) – huge thanks to them!
]]></description>
<version>5.0.0</version>
<version>6.0.0-dev.0</version>
<licence>agpl</licence>
<author mail="[email protected]">Julius Härtl</author>
<namespace>Text</namespace>
Expand All @@ -31,7 +31,7 @@
<screenshot>https://raw.githubusercontent.com/nextcloud/text/main/img/screenshots/screenshot2.png</screenshot>
<screenshot>https://raw.githubusercontent.com/nextcloud/text/main/img/screenshots/screenshot3.gif</screenshot>
<dependencies>
<nextcloud min-version="31" max-version="31" />
<nextcloud min-version="32" max-version="32" />
</dependencies>
<background-jobs>
<job>OCA\Text\Cron\Cleanup</job>
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "text",
"description": "Collaborative document editing",
"version": "5.0.0",
"version": "6.0.0-dev.0",
"authors": [
{
"name": "Julius Härtl",
Expand Down
3 changes: 3 additions & 0 deletions renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"ignoreUnstable": false,
"baseBranches": [
"main",
"stable31",
"stable30",
"stable29"
],
Expand Down Expand Up @@ -94,6 +95,7 @@
"major"
],
"matchBaseBranches": [
"stable31",
"stable30",
"stable29",
"stable28",
Expand Down Expand Up @@ -125,6 +127,7 @@
"@cypress/{/,}**"
],
"matchBaseBranches": [
"stable31",
"stable30",
"stable29",
"stable28",
Expand Down
Loading