Merge branch 'hotfix/fix_expenditures_approve' into develop

Merge branch 'hotfix/fix_login' into develop
fixes
2025-05-16 17:18:27 +02:00 · 2025-05-16 17:11:10 +02:00 · 2025-02-23 17:46:42 +01:00 · 2025-02-19 19:44:00 +01:00 · 2025-02-19 16:49:56 +01:00 · 2025-02-19 15:37:36 +01:00
2 changed files with 2 additions and 2 deletions
--- a/client/scripts/strings.js.php
+++ b/client/scripts/strings.js.php
@@ -54,5 +54,5 @@ const strings = {
 		'Donnerstag',
 		'Freitag',
 		'Samstag'
-	],
+	]
 }
--- a/server/page/menus.php
+++ b/server/page/menus.php
@@ -260,7 +260,7 @@
 		<div class="input-style input-style-2 has-icon input-required">
 			<i class="input-icon fa fa-user color-theme"></i>
 			<span class="color-highlight">Benutzername</span>
-			<input id="input-login-username" class="form-control" type="name" placeholder="Benutzername" />
+			<input id="input-login-username" class="form-control" type="text" placeholder="Benutzername" />
 		</div>
 		<div class="input-style input-style-2 has-icon input-required">
 			<i class="input-icon fa fa-lock color-theme"></i>
Author	SHA1	Message	Date
Timon Ostertun	0c69abcc43	Merge branch 'hotfix/fix_expenditures_approve' into develop	2025-05-16 17:18:27 +02:00
Timon Ostertun	65fc9d7163	Merge branch 'hotfix/fix_login' into develop	2025-05-16 17:11:10 +02:00
Timon Ostertun	2df193c6d5	fixes	2025-02-23 17:46:42 +01:00
Timon Ostertun	8b9f845a37	Merge branch 'hotfix/fix_login_loop' into develop	2025-02-19 19:44:00 +01:00
Timon Ostertun	af4c826322	Merge branch 'hotfix/debug_info_on_push_subscription' into develop	2025-02-19 16:49:56 +01:00
Timon Ostertun	2282bbf13d	Merge branch 'hotfix/menu-more-size' into develop	2025-02-19 15:37:36 +01:00
Timon Ostertun	7e8cbeb392	Merge branch 'hotfix/expenditures_dark_mode' into develop	2025-02-19 15:35:19 +01:00
Timon Ostertun	960761d729	Merge branch 'release/v1.13' into develop	2025-02-19 15:21:09 +01:00