From f079f23fa389c406c747fcb2df35f391468d934f Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 11 Jan 2023 12:44:43 +0100
Subject: [PATCH 1/3] Fix invisible calendar in form closing date

---
 www/form/app-form.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 78d0f7665..cde12d66d 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -25,6 +25,10 @@
         }
     }
 
+    .flatpickr-calendar.open {
+        z-index: 100001 !important; // Alertify is 100000
+    }
+
     @palette0: @cp_kanban-color0; // Default bg color for header
     @form-colors: @cp_form-palette;
     .form-colors(@form-colors; @index) when (@index > 0){

From 949a304989b359807d4be5d4888f735d04da6ff5 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Jan 2023 12:59:28 +0100
Subject: [PATCH 2/3] Fix missing secure-fabric.js dependency

---
 www/whiteboard/export.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/whiteboard/export.js b/www/whiteboard/export.js
index 4cdca58f8..1a96cf799 100644
--- a/www/whiteboard/export.js
+++ b/www/whiteboard/export.js
@@ -1,7 +1,7 @@
 // This file is used when a user tries to export the entire CryptDrive.
 // Pads from the code app will be exported using this format instead of plain text.
 define([
-    '/bower_components/secure-fabric.js/dist/fabric.min.js',
+    '/lib/fabric.min.js',
 ], function () {
     var module = {};
 

From 35867df36c36113f4e4f6914c2945c699cdea65e Mon Sep 17 00:00:00 2001
From: ansuz <git@ansuz.xyz>
Date: Thu, 19 Jan 2023 08:58:51 +0530
Subject: [PATCH 3/3] lint compliance

---
 scripts/clear.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/clear.js b/scripts/clear.js
index f9ca46533..4f33aa4c2 100644
--- a/scripts/clear.js
+++ b/scripts/clear.js
@@ -1,18 +1,19 @@
 var prompt = require('prompt-confirm');
 const p = new prompt('Are you sure? This will permanently delete all existing data on your instance.');
 
-const nThen = require("nthen");
+//const nThen = require("nthen");
 const Fs = require("fs");
-const Path = require("path");
+//const Path = require("path");
 
 var config = require("../lib/load-config");
-var Hash = require('../www/common/common-hash');
+//var Hash = require('../www/common/common-hash');
 var Env = require("../lib/env").create(config);
 Env.Log = { error: console.log };
 
+/*
 var keyOrDefaultString = function (key, def) {
     return Path.resolve(typeof(config[key]) === 'string'? config[key]: def);
-};
+}; */
 var paths = Env.paths;
 p.ask(function (answer) {
     if (!answer) {
@@ -20,7 +21,7 @@ p.ask(function (answer) {
         return;
     }
     console.log('Deleting all data...');
-    var n = nThen;
+    //var n = nThen;
     Object.values(paths).forEach(function (path) {
         console.log(`Deleting ${path}`);
         Fs.rmSync(path, { recursive: true, force: true });