From 431626404484fa35c943c56851c1a3830bcf302e Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 19 Feb 2021 13:12:35 +0530
Subject: [PATCH 1/3] fix incomplete unowned file upload

---
 lib/commands/upload.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/commands/upload.js b/lib/commands/upload.js
index 346262716..5d0c8740b 100644
--- a/lib/commands/upload.js
+++ b/lib/commands/upload.js
@@ -75,19 +75,18 @@ Upload.upload = function (Env, safeKey, chunk, cb) {
     Env.blobStore.upload(safeKey, chunk, cb);
 };
 
-Upload.complete = function (Env, safeKey, arg, cb) {
-    Env.blobStore.closeBlobstage(safeKey);
-    Env.completeUpload(safeKey, arg, false, cb);
-};
-
 Upload.cancel = function (Env, safeKey, arg, cb) {
     Env.blobStore.cancel(safeKey, arg, cb);
 };
 
-Upload.complete_owned = function (Env, safeKey, arg, cb) {
-    Env.blobStore.closeBlobstage(safeKey);
-    var user = Core.getSession(Env.Sessions, safeKey);
-    var size = user.pendingUploadSize;
-    Env.completeUpload(safeKey, arg, true, size, cb);
+var completeUpload = function (owned) {
+    return function (Env, safeKey, arg, cb) {
+        Env.blobStore.closeBlobstage(safeKey);
+        var user = Core.getSession(Env.Sessions, safeKey);
+        var size = user.pendingUploadSize;
+        Env.completeUpload(safeKey, arg, Boolean(owned), size, cb);
+    };
 };
 
+Upload.complete = completeUpload(false);
+Upload.complete_owned = completeUpload(true);

From 5a87388a8afa040b6a2803c7e4e817ac44dd0a3e Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 19 Feb 2021 13:46:28 +0530
Subject: [PATCH 2/3] update changelog with latest review

---
 CHANGELOG.md | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8d4d8a9b..0b441eeff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@
 * OnlyOffice sheets
   * use configured language from CryptPad
   * fix a sorting issue caused by the overly eager suppression of a modal
+  * support multiple locks per-user
+    * not backwards compatible... restart server when updating!
 * rich text
   * use white background for rich text documents even in dark mode
   * display button to adjust document width inline instead of in toolbar
@@ -32,17 +34,23 @@
   * autocomplete dropdown styles weren't applied
   * notifications bell now uses same text color as toolbar title
   * filepicker background color
-* chat colors
-  * in pads
-  * in the contacts app
+* chat:
+  * colors
+    * in pads
+    * in the contacts app
+  * spinner
+    * correctly hidden when the chat finishes initializing
+      * caused by insufficient selector specificity
 * server updates
   * `npm i` to get latest dependencies
   * messages are not acknowledged or broadcast until they have been validated and written to the disk
     * see [#553](https://github.com/xwiki-labs/cryptpad/issues/553)
-  * optimized GET_OLDER_HISTORY
+  * ~~optimized GET_OLDER_HISTORY~~
+    * removed, presumably due to a bug
 * debugging app
   * serverHash is included in the history of decrypted messages
 * link to the docs from the support page's ticket creation interface
+* completion of unowned uploads was broken by a change introduced in late december
 
 # 4.1.0 (B)
 

From 1785f79f7f137bc5273b943623b019dbbf6f20ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 22 Feb 2021 15:13:23 +0000
Subject: [PATCH 3/3] Fix tippy arrow color

---
 customize.dist/src/less2/include/tippy.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/tippy.less b/customize.dist/src/less2/include/tippy.less
index 5cb7c2f59..5450d3114 100644
--- a/customize.dist/src/less2/include/tippy.less
+++ b/customize.dist/src/less2/include/tippy.less
@@ -14,7 +14,7 @@
         }
     }
     .tippy-popper {
-        @arrow-color: @cp_tooltip-bg;
+        @arrow-color: @cp_tooltip-bg !important;
         &[x-placement^='top'] .tippy-arrow {
           border-top-color: @arrow-color;
         }