Skip to content

Commit 6f44915

Browse files
lgorzitzecesmarvin
authored andcommitted
Merge branch 'release/v1.20.0-3'
2 parents cbb3bc9 + 3b05e9b commit 6f44915

File tree

9 files changed

+18
-6
lines changed

9 files changed

+18
-6
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [v1.20.0-3] - 2025-02-21
10+
### Changed
11+
- Renamed table headline key from "Date" to "Date of import" (en/de)
12+
913
## [v1.20.0-2] - 2025-02-13
1014
### Added
1115
- [#193] Add missing keys to dogu descriptor

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ FROM registry.cloudogu.com/official/java:8u432-1
7575
ARG TOMCAT_VERSION
7676

7777
LABEL NAME="official/usermgt" \
78-
VERSION="1.20.0-2" \
78+
VERSION="1.20.0-3" \
7979
maintainer="hello@cloudogu.com"
8080

8181
# mark as webapp for nginx

Makefile

Lines changed: 1 addition & 1 deletion
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.20.0-2
3+
VERSION=1.20.0-3
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/ui/src/i18n/de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"summaries.table.function.details": "Details",
103103
"summaries.table.function.download": "Herunterladen",
104104
"summaries.table.functions": "Funktionen",
105-
"summaries.table.headline.date": "Datum",
105+
"summaries.table.headline.date": "Importdatum",
106106
"summaries.table.headline.functions": "Funktionen",
107107
"summaries.table.headline.name": "Name der CSV-Datei",
108108
"summaries.table.headline.result": "Ergebnis",

app/src/main/ui/src/i18n/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"summaries.table.function.details": "Details",
103103
"summaries.table.function.download": "Download",
104104
"summaries.table.functions": "Functions",
105-
"summaries.table.headline.date": "Date",
105+
"summaries.table.headline.date": "Date of import",
106106
"summaries.table.headline.functions": "Functions",
107107
"summaries.table.headline.name": "Name of the CSV-File",
108108
"summaries.table.headline.result": "Result",

docs/gui/release_notes_de.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https
66

77
## [Unreleased]
88

9+
## [v1.20.0-3] - 2025-02-21
10+
### Changed
11+
- Der Tabellenheader "Datum" wurde in "Importdatum" umbenannt
12+
913
## [v1.20.0-2] - 2025-02-13
1014
Wir haben nur technische Änderungen vorgenommen. Näheres finden Sie in den Changelogs.
1115

docs/gui/release_notes_en.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ Technical details on a release can be found in the corresponding [Changelog](htt
66

77
## [Unreleased]
88

9+
## [v1.20.0-3] - 2025-02-21
10+
### Changed
11+
- Renamed table headline key "from" Date to "Date of import"
12+
913
## [v1.20.0-2] - 2025-02-13
1014
We have only made technical changes. You can find more details in the changelogs.
1115

dogu.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"cypress": "^13.13.1",
44
"yarn": "^1.22.22"
55
},
6-
"version": "1.20.0-2"
6+
"version": "1.20.0-3"
77
}

0 commit comments

Comments
 (0)