diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f430f4129..61ccb4379 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -51,7 +51,7 @@ updates: - dependencies - package-ecosystem: composer - target-branch: 'stable5.3' + target-branch: 'stable5.4' directories: - '/' - '/vendor-bin/*/' @@ -68,7 +68,7 @@ updates: - dependencies - package-ecosystem: npm - target-branch: 'stable5.3' + target-branch: 'stable5.4' directory: '/' schedule: interval: weekly diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index 95ebdc966..03273863f 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -30,7 +30,7 @@ on: pull_request: branches: - main - - stable5.3 + - stable5.4 permissions: contents: read diff --git a/.github/workflows/playwright.yml.patch b/.github/workflows/playwright.yml.patch index 2563e4c01..d14e79fd1 100644 --- a/.github/workflows/playwright.yml.patch +++ b/.github/workflows/playwright.yml.patch @@ -11,7 +11,7 @@ index c218bffb..1e0028ab 100644 - - stable34 - - stable33 + - main -+ - stable5.3 ++ - stable5.4 permissions: contents: read diff --git a/.github/workflows/sync-workflow-templates.yml b/.github/workflows/sync-workflow-templates.yml index e7094c713..b43db987d 100644 --- a/.github/workflows/sync-workflow-templates.yml +++ b/.github/workflows/sync-workflow-templates.yml @@ -26,7 +26,7 @@ jobs: matrix: branches: - ${{ github.event.repository.default_branch }} - - 'stable5.3' + - 'stable5.4' name: Update workflows in ${{ matrix.branches }} diff --git a/.github/workflows/sync-workflow-templates.yml.patch b/.github/workflows/sync-workflow-templates.yml.patch index acd8db0c6..b2df274a1 100644 --- a/.github/workflows/sync-workflow-templates.yml.patch +++ b/.github/workflows/sync-workflow-templates.yml.patch @@ -9,7 +9,7 @@ index 85090be9..cf08bd3e 100644 - - 'stable34' - - 'stable33' - - 'stable32' -+ - 'stable5.3' ++ - 'stable5.4' name: Update workflows in ${{ matrix.branches }} diff --git a/.tx/backport b/.tx/backport index ffa7ce8bb..6a384e0d4 100644 --- a/.tx/backport +++ b/.tx/backport @@ -1 +1 @@ -stable5.3 +stable5.4 diff --git a/appinfo/info.xml b/appinfo/info.xml index 350e08b51..c979b1b43 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -17,7 +17,7 @@ - **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)! ]]> - 5.4.0 + 5.5.0-dev AGPL-3.0-or-later Affan Hussain diff --git a/package-lock.json b/package-lock.json index 324f272b9..cd6d8ed56 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "@nextcloud/typings": "^1.10.0", "@nextcloud/vue": "^9.8.0", "debounce": "^3.0.0", - "markdown-it": "^15.0.1", + "markdown-it": "^15.0.2", "p-queue": "^9.3.3", "qrcode": "^1.5.4", "vue": "^3.5.22", @@ -7817,9 +7817,9 @@ } }, "node_modules/markdown-it": { - "version": "15.0.1", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-15.0.1.tgz", - "integrity": "sha512-9/7gE95FNPkfUWrjJIoHZza2iLmuJlPD0UNMxPi7bxUrbCR525YZY0r+zyfes0dZI5ZZ/uNIXUJca0pJvtw41g==", + "version": "15.0.2", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-15.0.2.tgz", + "integrity": "sha512-q4IGxMv56jCqT4OCRCADBoDP3LO4MhmTXjFbphHPXs4g3j9Xg5RDnxqN8IF/3vIWEU+VCnUq+7JUg/cfy2E6Qw==", "funding": [ { "type": "github", diff --git a/package.json b/package.json index 9a53a7aa8..7c0d386e3 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@nextcloud/typings": "^1.10.0", "@nextcloud/vue": "^9.8.0", "debounce": "^3.0.0", - "markdown-it": "^15.0.1", + "markdown-it": "^15.0.2", "p-queue": "^9.3.3", "qrcode": "^1.5.4", "vue": "^3.5.22",