Skip to content

Commit 771d276

Browse files
CloudFlo2312cesmarvin
authored andcommitted
Merge branch 'release/v1.6.1-2'
2 parents bfebe10 + 67f28a0 commit 771d276

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

CHANGELOG.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9-
## [v1.6.1-1] - 2022-05-11
9+
## [v1.6.1-2] - 2022-07-05
10+
### Changed
11+
- Increase max username length to 64 characters (was 32 before) (#61)
1012

13+
## [v1.6.1-1] - 2022-05-11
1114
### Security
1215
- java base image
1316
- updated some maven dependencies
1417

1518
## [v1.6.0-2] - 2022-04-29
16-
1719
### Fixed
1820
- Fixed a bug where the pwd-reset checkbox was checked without any effect (#55)
1921

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN set -x \
88
FROM registry.cloudogu.com/official/java:8u302-3
99

1010
LABEL NAME="official/usermgt" \
11-
VERSION="1.6.1-1" \
11+
VERSION="1.6.1-2" \
1212
maintainer="[email protected]"
1313

1414
# mark as webapp for nginx

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Set these to the desired values
22
ARTIFACT_ID=usermgt
3-
VERSION=1.6.1-1
3+
VERSION=1.6.1-2
44
# overwrite ADDITIONAL_LDFLAGS to disable static compilation
55
# this should fix https://github.com/golang/go/issues/13470
66
ADDITIONAL_LDFLAGS=""

app/src/main/webapp/views/user/edit.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h1>{{create ? 'New user' : 'Account'}}</h1>
1919
placeholder="Enter username"
2020
ng-model="user.username"
2121
ng-minlength="2"
22-
ng-maxlength="32"
22+
ng-maxlength="64"
2323
ng-required="true"
2424
unique-constraint-checker
2525
ng-disabled="!create"
@@ -40,7 +40,7 @@ <h1>{{create ? 'New user' : 'Account'}}</h1>
4040
Username must have at least 2 characters
4141
</strong>
4242
<strong ng-show="form.username.$error.maxlength" class="text-danger help-block">
43-
Username exceeds the maximum length of 32 characters.
43+
Username exceeds the maximum length of 64 characters.
4444
</strong>
4545
<strong ng-show="form.username.$error.uniqueConstraint" class="text-danger help-block">
4646
A user with that username already exists.

dogu.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Name": "official/usermgt",
3-
"Version": "1.6.1-1",
3+
"Version": "1.6.1-2",
44
"DisplayName": "User Management",
55
"Description": "User and Group Management.",
66
"Category": "Administration Apps",

0 commit comments

Comments
 (0)