Merge pull request #594 from scireum/meg/SIRI-57

Replaces bootstrap-datepicker with bootstrap-datetimepicker
scireum · Mar 6, 2019 · 18080aa · 18080aa
2 parents 2e062d8 + 2678c2b
commit 18080aa
Show file tree

Hide file tree

Showing 66 changed files with 2,662 additions and 2,986 deletions.
diff --git a/src/main/java/sirius/web/templates/DefaultGlobalContextExtender.java b/src/main/java/sirius/web/templates/DefaultGlobalContextExtender.java
@@ -64,8 +64,6 @@ public void collectTemplate(BiConsumer<String, Object> parameterCollector) {
         parameterCollector.accept("wondergemRoot", wondergemRoot);
         parameterCollector.accept("tagLine", tagLine);
         parameterCollector.accept("contentSecurityPolicy", contentSecurityPolicy);
-        parameterCollector.accept("dateFormat", NLS.get("RythmConfig.jsDateFormat"));
-        parameterCollector.accept("timeFormat", NLS.get("RythmConfig.jsTimeFormat"));
         parameterCollector.accept("saml", saml);
         parameterCollector.accept("csrf", csrfHelper);
     }