Merged branch 'master' of https://github.com/fguillot/kanboard

only imports conflicted

1 files changed, 9 insertions, 0 deletions

diff --git a/assets/js/src/base.js b/assets/js/src/base.js
index 2540f084..531488c9 100644
--- a/assets/js/src/base.js
+++ b/assets/js/src/base.js
@@ -277,6 +277,15 @@ var Kanboard = (function() {
                 constrainInput: false
             });
 
+            // Datetime picker
+            $(".form-datetime").datetimepicker({
+                controlType: 'select',
+                oneLine: true,
+                dateFormat: 'yy-mm-dd',
+                // timeFormat: 'h:mm tt',
+                constrainInput: false
+            });
+
             // Markdown Preview for textareas
             $("#markdown-preview").click(Kanboard.MarkdownPreview);
             $("#markdown-write").click(Kanboard.MarkdownWriter);