Sync dev with master

2024-07-05 21:55:28 +02:00
parent 9b2e724c63 6e702b3ad3
commit dba58d9a83
369 changed files with 1421 additions and 408 deletions
--- a/static/admin/config/index.js
+++ b/static/admin/config/index.js
@ -50,11 +50,12 @@ const config = {
    sanitize_replacement: "-",
  },
  theme: {
+    default_theme: "GCG.Dark",
    include_built_in_themes: false,
    themes: [
      GCGThemeDark,
      GCGThemeLight
-    ]    
+    ],  
  },
  collections: [
    SettingsCollection,
--- a/static/admin/config/props.js
+++ b/static/admin/config/props.js
@ -69,7 +69,7 @@ const MarkdownProps = {
 const DateFormat = {
  date_format: "dd.MM.yyyy",
  time_format: false,
-  format: "yyyy-MM-dd'T'HH:mm:ss.SSSXXX",
+  format: "yyyy-MM-dd",
 };

 const DataObject = {
--- a/static/admin/config/schulchronik.js
+++ b/static/admin/config/schulchronik.js
@ -40,11 +40,12 @@ const config = {
    sanitize_replacement: "-",
  },
  theme: {
+    default_theme: "GCG.Dark",
    include_built_in_themes: false,
    themes: [
      GCGThemeDark,
      GCGThemeLight
-    ]    
+    ],
  },
  collections: [
    ChronikjahreCollection,
--- a/static/admin/index.html
+++ b/static/admin/index.html
@ -191,7 +191,8 @@
            "cschapitz",
            "bgorsler",
            "tmesse",
-            "spflug"
+            "spflug",
+            "fberner"
          ];
          if (login && !adminUsers.includes(login)) {
            alert(