SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'main' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m23s
Details
Build Docker Image / Clean-Registry (push) Successful in 4s
Details

Browse Source
This commit is contained in:
Stephan Richter
2026-02-04 10:18:36 +01:00
parent 494ba3ff41 a13b4f40d4
commit a5e2c69afb
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/de/srsoftware/umbrella/core/constants/Constants.java
View File

@@ -12,7 +12,9 @@ public class Constants {
// prevent instantiation // prevent instantiation
} }
public static final String CONFIG_SESSION_DURATION = "umbrella.session.duration";
public static final String COUNT = "COUNT(*)"; public static final String COUNT = "COUNT(*)";
public static final String FALLBACK_LANG = "de"; public static final String FALLBACK_LANG = "de";
public static final String HOME = "home"; public static final String HOME = "home";
public static final String JSONARRAY = "json array"; public static final String JSONARRAY = "json array";
@@ -20,8 +22,10 @@ public class Constants {
public static final String KEEP_ALIVE = "keep-alive"; public static final String KEEP_ALIVE = "keep-alive";
public static final String NO_CACHE = "no-cache"; public static final String NO_CACHE = "no-cache";
public static final String NONE = "none"; public static final String NONE = "none";
public static final String TABLE_SETTINGS = "settings"; public static final String TABLE_SETTINGS = "settings";
public static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); public static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
public static final String UMBRELLA = "Umbrella"; public static final String UMBRELLA = "Umbrella";
public static final String UTF8 = UTF_8.displayName(); public static final String UTF8 = UTF_8.displayName();

1
core/src/main/java/de/srsoftware/umbrella/core/constants/Path.java
View File

@@ -9,7 +9,6 @@ public class Path {
public static final String CSS = "css"; public static final String CSS = "css";
public static final String COMMON_TEMPLATES = "common_templates"; public static final String COMMON_TEMPLATES = "common_templates";
public static final String COMPANY = "company"; public static final String COMPANY = "company";
public static final String CONFIG_SESSION_DURATION = "umbrella.session.duration";
public static final String CONNECTED = "connected"; public static final String CONNECTED = "connected";
public static final String ITEM = "item"; public static final String ITEM = "item";

1
user/src/main/java/de/srsoftware/umbrella/user/UserModule.java
View File

@@ -9,6 +9,7 @@ import static de.srsoftware.umbrella.core.ModuleRegistry.postBox;
import static de.srsoftware.umbrella.core.ResponseCode.*; import static de.srsoftware.umbrella.core.ResponseCode.*;
import static de.srsoftware.umbrella.core.ResponseCode.HTTP_SERVER_ERROR; import static de.srsoftware.umbrella.core.ResponseCode.HTTP_SERVER_ERROR;
import static de.srsoftware.umbrella.core.Util.*; import static de.srsoftware.umbrella.core.Util.*;
import static de.srsoftware.umbrella.core.constants.Constants.CONFIG_SESSION_DURATION;
import static de.srsoftware.umbrella.core.constants.Field.*; import static de.srsoftware.umbrella.core.constants.Field.*;
import static de.srsoftware.umbrella.core.constants.Field.PASSWORD; import static de.srsoftware.umbrella.core.constants.Field.PASSWORD;
import static de.srsoftware.umbrella.core.constants.Field.REDIRECT; import static de.srsoftware.umbrella.core.constants.Field.REDIRECT;