Skip to content

Commit

Permalink
Merge pull request #727 from nextcloud/backport/717/stable31
Browse files Browse the repository at this point in the history
[stable31] feat: Allow to configure different policies per password context
  • Loading branch information
AndyScherzinger authored Feb 4, 2025
2 parents 542d96f + e6da3be commit ccd4d4b
Show file tree
Hide file tree
Showing 47 changed files with 1,150 additions and 2,598 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"appName": true
},
"extends": [
"@nextcloud"
"@nextcloud/eslint-config/typescript"
]
}
10 changes: 9 additions & 1 deletion REUSE.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,16 @@ SPDX-PackageName = "external"
SPDX-PackageSupplier = "Nextcloud <[email protected]>"
SPDX-PackageDownloadLocation = "https://github.com/nextcloud/external"

# Dependency management
[[annotations]]
path = ["package-lock.json", "package.json", ".l10nignore", "composer.json", "composer.lock", "vendor-bin/**/composer.json", "vendor-bin/**/composer.lock", ".tx/config", "js/vendor.LICENSE.txt", ".github/CODEOWNERS", ".eslintrc.json", "tests/psalm-baseline.xml"]
path = ["package-lock.json", "package.json", "composer.json", "composer.lock", "vendor-bin/**/composer.json", "vendor-bin/**/composer.lock", "js/vendor.LICENSE.txt"]
precedence = "aggregate"
SPDX-FileCopyrightText = "none"
SPDX-License-Identifier = "CC0-1.0"

# Build config files
[[annotations]]
path = [".l10nignore", "tsconfig.json", ".tx/config", ".github/CODEOWNERS", ".eslintrc.json", "tests/psalm-baseline.xml"]
precedence = "aggregate"
SPDX-FileCopyrightText = "none"
SPDX-License-Identifier = "CC0-1.0"
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
</dependencies>

<settings>
<admin>OCA\Password_Policy\Settings</admin>
<admin>OCA\Password_Policy\Settings\Settings</admin>
</settings>
</info>
2 changes: 1 addition & 1 deletion css/password_policy-settings.css
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/* extracted by css-entry-points-plugin */
@import './settings-Bm9V54dt.chunk.css';
@import './settings-rj0ps52C.chunk.css';
1 change: 0 additions & 1 deletion css/settings-Bm9V54dt.chunk.css

This file was deleted.

Loading

0 comments on commit ccd4d4b

Please sign in to comment.