Merge branch 'dev' into modules/stock

markdown/src/main/java/de/srsoftware/umbrella/markdown/MarkdownApi.java

@@ -28,8 +28,7 @@ public class MarkdownApi extends BaseHandler implements MarkdownService {
 	public boolean doPost(Path path, HttpExchange ex) throws IOException {
 		try {
 			addCors(ex);
-			Optional<Token> token = SessionToken.from(ex).map(Token::of);
-			var user = userService().loadUser(token);
+			var user = userService().refreshSession(ex);
 
 			if (user.isEmpty()) throw UmbrellaException.forbidden("You must be logged in to use the markdown renderer!");
 			var rendered = Util.markdown(body(ex));

translations/src/main/resources/en.json

@@ -91,6 +91,7 @@
 
   "failed": "failed",
   "failed_login_attempts" : "account locked until {release_time} after {attempts} failed login attempts",
+  "family_name": "family name",
   "file": "file",
   "files": "files",
   "filter": "filter",
@@ -100,6 +101,7 @@
   "formatted_name": "display name",
   "fulltext": "full text search",
 
+  "given_name": "given name",
   "go": "go!",
   "go_to_url_to_reset_password": "To receive a new password, open the following link: {url}",
   "gross_sum": "gross sum",
@@ -167,6 +169,7 @@
   "name": "Name",
   "net_price": "net price",
   "net_sum": "net sum",
+  "new_contact": "new contact",
   "new_password": "new password",
   "new_document_from": "{number} / new {type} document from {sender}",
   "no_company": "no company",
@@ -290,6 +293,7 @@
   "user_module" : "Umbrella user management",
   "users": "users",
 
+  "website": "website",
   "welcome" : "Welcome, {0}",
   "wiki": "Wiki",
   "wikis": "wiki pages",

web/src/main/resources/web/css/bloodshed-color.css

@@ -21,6 +21,10 @@ fieldset {
     border-color: red;
 }
 
+footer{
+    background-color: black;
+}
+
 input{
     background-color: black;
     border-color: red;
@@ -112,6 +116,11 @@ textarea{
     border-color: orange;
 }
 
+.start_end button.join{
+    background-color: none;
+    color: red;
+}
+
 .taglist .tag{
     border-color: red;
 }
@@ -155,6 +164,13 @@ textarea{
     color: orange;
 }
 
+.warn {
+    background-color: yellow;
+    color: black;
+}
+
+
+
 /** priority colors **/
 
 

web/src/main/resources/web/css/bloodshed.css

@@ -419,4 +419,8 @@ fieldset.vcard{
     border-width: 1px;
     vertical-align: top;
     padding: 2px;
+}
+
+.vcard td button.symbol{
+    float: right;
 }

web/src/main/resources/web/css/winter-color.css

@@ -119,12 +119,15 @@ textarea{
 .task.cancelled > a {
     color: gray;
 }
+
 .task.started > a {
     color: green;
 }
+
 .task.pending > a {
     color: #606060;
 }
+
 .task.complete > a {
    color: green;
 }

web/src/main/resources/web/css/winter.css

@@ -419,4 +419,8 @@ fieldset.vcard{
     border-width: 1px;
     vertical-align: top;
     padding: 2px;
+}
+
+.vcard td button.symbol{
+    float: right;
 }