From 7970f5026bac74817cd6b1f2246e716ae9045d83 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 14 May 2020 18:53:14 -0400
Subject: [PATCH 01/66] add support for displaying languages that
 administrators understand on the support panel

---
 customize.dist/application_config.js |  2 ++
 www/support/inner.js                 | 29 +++++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/customize.dist/application_config.js b/customize.dist/application_config.js
index a7ad90f11..0187cf74b 100644
--- a/customize.dist/application_config.js
+++ b/customize.dist/application_config.js
@@ -9,5 +9,7 @@ define(['/common/application_config_internal.js'], function (AppConfig) {
     // Example: If you want to remove the survey link in the menu:
     // AppConfig.surveyURL = "";
 
+    AppConfig.supportLanguages = [ 'en', 'fr' ]; // XXX
+
     return AppConfig;
 });
diff --git a/www/support/inner.js b/www/support/inner.js
index 701d01817..48bb1c4ef 100644
--- a/www/support/inner.js
+++ b/www/support/inner.js
@@ -11,6 +11,7 @@ define([
     '/common/hyperscript.js',
     '/support/ui.js',
     '/api/config',
+    '/customize/application_config.js',
 
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
     'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
@@ -27,7 +28,8 @@ define([
     Messages,
     h,
     Support,
-    ApiConfig
+    ApiConfig,
+    AppConfig
     )
 {
     var APP = window.APP = {};
@@ -41,6 +43,7 @@ define([
             'cp-support-list',
         ],
         'new': [
+            'cp-support-language',
             'cp-support-form',
         ],
     };
@@ -132,6 +135,30 @@ define([
         return $div;
     };
 
+    create['language'] = function () {
+        if (!Array.isArray(AppConfig.supportLanguages)) { return $(h('div')); }
+        var languages = AppConfig.supportLanguages;
+
+        var list = h('li', languages
+            .map(function (lang) {
+                return Messages._languages[lang];
+            })
+            .filter(Boolean)
+            .map(function (lang) {
+                return h('li', lang);
+            })
+        );
+
+        var preamble = "This server's administrators speak the following languages:"; // XXX
+        var $div = $(
+            h('div.cp-support-language', [
+                preamble,
+                list,
+            ])
+        );
+        return $div;
+    };
+
     // Create a new tickets
     create['form'] = function () {
         var key = 'form';

From 704557fb2e75e50a5d1da3b7120b05349b29e6a0 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 3 Jun 2020 13:29:38 -0400
Subject: [PATCH 02/66] prototype info menu

---
 www/common/common-ui-elements.js | 114 +++++++++++++++++++++++--------
 1 file changed, 85 insertions(+), 29 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 0caa39c92..9b15659d6 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2255,6 +2255,80 @@ define([
         return $container;
     };
 
+    UIElements.displayInfoMenu = function (Common, metadataMgr) {
+        var padType = metadataMgr.getMetadata().type;
+        var priv = metadataMgr.getPrivateData();
+        var origin = priv.origin;
+
+        Messages.help_faq = "Review our list of frequently asked questions"; // XXX
+        var faqLine = h('p',
+            h('a', {
+                target: '_blank',
+                rel: 'noreferrer noopener',
+                href: origin + '/faq.html',
+            }, Messages.help_faq)
+        );
+
+        var supportLine;
+        if (padType === 'support' || !Config.supportMailbox) {
+            // do nothing
+        } else if (priv.accountName) {
+            // registered users can submit support tickets
+            Messages.help_support = "Submit a support ticket"; // XXX
+            supportLine = h('p', [
+                h('a', {
+                    target: '_blank',
+                    rel: 'noreferrer noopener',
+                    href: origin + '/support/',
+                }, Messages.help_support)
+            ]);
+        } else {
+            // register to submit support tickets
+            Messages.help_supportRegisteredOnly = "Registered users can submit support tickets"; // XXX
+            var login = h('button', Messages.login_login);
+            $(login).click(function () {
+                Common.setLoginRedirect(function () {
+                    Common.gotoURL('/login/');
+                });
+            });
+            var register = h('button', Messages.login_register);
+            $(register).click(function () {
+                Common.setLoginRedirect(function () {
+                    Common.gotoURL('/register/');
+                });
+            });
+            supportLine = h('span', [
+                Messages.help_supportRegisteredOnly,
+                h('div', [
+                    login,
+                    register,
+                ])
+            ]);
+        }
+
+        var content = h('div', [
+            // CryptPad version number
+            h('h6', Pages.versionString),
+            // First point users to our FAQ
+            faqLine,
+            // Link to the support ticket form in case their
+            // question isn't answered by the FAQ
+            supportLine,
+        ]);
+
+        var buttons = [
+            {
+                className: 'primary',
+                name: Messages.filePicker_close,
+                onClick: function () {},
+                keys: [27],
+            },
+        ];
+
+        var modal = UI.dialog.customModal(content, {buttons: buttons });
+        UI.openCustomModal(modal);
+    };
+
     UIElements.createUserAdminMenu = function (Common, config) {
         var metadataMgr = Common.getMetadataMgr();
 
@@ -2366,7 +2440,6 @@ define([
                 },
             });
         }
-        options.push({ tag: 'hr' });
         // Add administration panel link if the user is an admin
         if (priv.edPublic && Array.isArray(Config.adminKeys) && Config.adminKeys.indexOf(priv.edPublic) !== -1) {
             options.push({
@@ -2382,20 +2455,6 @@ define([
                 },
             });
         }
-        if (padType !== 'support' && accountName && Config.supportMailbox) {
-            options.push({
-                tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-support fa fa-life-ring'},
-                content: h('span', Messages.supportPage || 'Support'),
-                action: function () {
-                    if (padType) {
-                        window.open(origin+'/support/');
-                    } else {
-                        window.parent.location = origin+'/support/';
-                    }
-                },
-            });
-        }
         options.push({ tag: 'hr' });
         if (Config.allowSubscriptions) {
             options.push({
@@ -2435,20 +2494,17 @@ define([
                 },
             });
         }
-        if (Pages.versionString) {
-            Messages.user_about = Messages.about; // XXX "About CryptPad"
-            options.push({
-                tag: 'a',
-                attributes: {
-                    'class': 'cp-toolbar-about fa fa-info',
-                },
-                content: h('span', Messages.user_about),
-                action: function () {
-                    // XXX UIElements.createHelpButton
-                    UI.alert(Pages.versionString);
-                },
-            });
-        }
+        Messages.user_about = 'About CryptPad'; // XXX
+        options.push({
+            tag: 'a',
+            attributes: {
+                'class': 'cp-toolbar-about fa fa-info',
+            },
+            content: h('span', Messages.user_about),
+            action: function () {
+                UIElements.displayInfoMenu(Common, metadataMgr);
+            },
+        });
 
         options.push({ tag: 'hr' });
         // Add login or logout button depending on the current status

From 26f861f3be1a2953713ce7e3db38d497135cdfce Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 4 Jun 2020 12:17:21 +0200
Subject: [PATCH 03/66] Add Turkish translation

---
 www/common/translations/messages.tr.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 www/common/translations/messages.tr.json

diff --git a/www/common/translations/messages.tr.json b/www/common/translations/messages.tr.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/www/common/translations/messages.tr.json
@@ -0,0 +1 @@
+{}

From a62ea391223e5d1b5e347899a0632b0b082c884c Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 5 Jun 2020 13:49:18 +0200
Subject: [PATCH 04/66] Fix colors and reload bugs in slides

---
 www/common/sframe-common-outer.js |  6 ++++++
 www/slide/inner.js                | 34 +++++++++++++++----------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 4c240a2ec..b5baf6301 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -1115,7 +1115,13 @@ define([
                 if (parsed.hashData) { currentPad.hash = parsed.hashData.getHash(opts); }
                 // Rendered (maybe hidden) hash
                 var hiddenParsed = Utils.Hash.parsePadUrl(window.location.href);
+
+                // Update the hash in the address bar
+                var ohc = window.onhashchange;
+                window.onhashchange = function () {};
                 window.location.href = hiddenParsed.getUrl(opts);
+                window.onhashchange = ohc;
+                ohc({reset: true});
             });
 
 
diff --git a/www/slide/inner.js b/www/slide/inner.js
index b051724e2..71f25f4e7 100644
--- a/www/slide/inner.js
+++ b/www/slide/inner.js
@@ -348,7 +348,7 @@ define([
             }
             if (back) {
                 backColor = back;
-                //$modal.css('background-color', back);
+                $modal.find('.cp-app-slide-frame').css('background-color', back);
                 $('#' + SLIDE_BACKCOLOR_ID).find('i').css('color', back);
                 slideOptions.bgColor = back;
             }
@@ -362,6 +362,10 @@ define([
             framework.localChange();
         };
 
+        var $check = $("#cp-app-slide-colorpicker");
+        var $backgroundPicker = $('<input>', { type: 'color', value: backColor })
+            .css({ display: 'none', })
+            .on('change', function() { updateLocalColors(undefined, this.value); });
         var $back = framework._.sfCommon.createButton(null, true, {
             icon: 'fa-square',
             text: Messages.slide_backCol,
@@ -369,7 +373,14 @@ define([
             hiddenReadOnly: true,
             name: 'background',
             id: SLIDE_BACKCOLOR_ID
+        }, function () {
+            $backgroundPicker.val(backColor);
+            $backgroundPicker.click();
         });
+
+        var $foregroundPicker = $('<input>', { type: 'color', value: textColor })
+            .css({ display: 'none', })
+            .on('change', function() { updateLocalColors(this.value, undefined); });
         var $text = framework._.sfCommon.createButton(null, true, {
             icon: 'fa-i-cursor',
             text: Messages.slide_textCol,
@@ -377,28 +388,15 @@ define([
             hiddenReadOnly: true,
             name: 'color',
             id: SLIDE_COLOR_ID
+        }, function () {
+            $foregroundPicker.val(textColor);
+            $foregroundPicker.click();
         });
         var $testColor = $('<input>', { type: 'color', value: '!' });
-        var $check = $("#cp-app-slide-colorpicker");
         if ($testColor.attr('type') !== "color" || $testColor.val() === '!') { return; }
 
-        var $backgroundPicker = $('<input>', { type: 'color', value: backColor })
-            .css({ display: 'none', })
-            .on('change', function() { updateLocalColors(undefined, this.value); });
         $check.append($backgroundPicker);
-        $back.on('click', function() {
-            $backgroundPicker.val(backColor);
-            $backgroundPicker.click();
-        });
-
-        var $foregroundPicker = $('<input>', { type: 'color', value: textColor })
-            .css({ display: 'none', })
-            .on('change', function() { updateLocalColors(this.value, undefined); });
         $check.append($foregroundPicker);
-        $text.on('click', function() {
-            $foregroundPicker.val(textColor);
-            $foregroundPicker.click();
-        });
 
         framework._.toolbar.$theme.append($text).append($back);
 
@@ -524,6 +522,8 @@ define([
 
             if (newPad) {
                 colors.updateLocalColors('#000', '#FFF');
+            } else {
+                colors.updateLocalColors('#FFF', '#000');
             }
 
             CodeMirror.setMode('markdown', function () { });

From 5d111c623755dca34251a8794dd11abf959ab719 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 5 Jun 2020 15:14:26 +0200
Subject: [PATCH 05/66] Update tags for multiple pads at once

---
 www/common/common-ui-elements.js | 63 ++++++++++++++++++++++++++------
 www/common/drive-ui.js           | 13 +++----
 2 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 278e8dda8..70b0d25ed 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -46,28 +46,69 @@ define([
         return mB + Messages.MB;
     };
 
-    UIElements.updateTags = function (common, href) {
+    UIElements.updateTags = function (common, hrefs) {
         var existing, tags;
+        var allTags = {};
+        if (!hrefs || typeof (hrefs) === "string") {
+            hrefs = [hrefs];
+        }
         NThen(function(waitFor) {
             common.getSframeChannel().query("Q_GET_ALL_TAGS", null, waitFor(function(err, res) {
                 if (err || res.error) { return void console.error(err || res.error); }
                 existing = Object.keys(res.tags).sort();
             }));
         }).nThen(function (waitFor) {
-            common.getPadAttribute('tags', waitFor(function (err, res) {
-                if (err) {
-                    if (err === 'NO_ENTRY') {
-                        UI.alert(Messages.tags_noentry);
+            var _err;
+            hrefs.forEach(function (href) {
+                common.getPadAttribute('tags', waitFor(function (err, res) {
+                    if (err) {
+                        if (err === 'NO_ENTRY') {
+                            UI.alert(Messages.tags_noentry);
+                        }
+                        waitFor.abort();
+                        _err = err;
+                        return void console.error(err);
                     }
-                    waitFor.abort();
-                    return void console.error(err);
-                }
-                tags = res || [];
-            }), href);
+                    allTags[href] = res || [];
+
+                    if (tags) {
+                        // Intersect with tags from previous pads
+                        tags = (res || []).filter(function (tag) {
+                            return tags.indexOf(tag) !== -1;
+                        });
+                    } else {
+                        tags = res || [];
+                    }
+                }), href);
+            });
         }).nThen(function () {
             UI.dialog.tagPrompt(tags, existing, function (newTags) {
                 if (!Array.isArray(newTags)) { return; }
-                common.setPadAttribute('tags', newTags, null, href);
+                var added = [];
+                var removed = [];
+                newTags.forEach(function (tag) {
+                    if (tags.indexOf(tag) === -1) {
+                        added.push(tag);
+                    }
+                });
+                tags.forEach(function (tag) {
+                    if (newTags.indexOf(tag) === -1) {
+                        removed.push(tag);
+                    }
+                });
+                var update = function (oldTags) {
+                    Array.prototype.push.apply(oldTags, added);
+                    removed.forEach(function (tag) {
+                        var idx = oldTags.indexOf(tag);
+                        oldTags.splice(idx, 1);
+                    });
+                };
+
+                hrefs.forEach(function (href) {
+                    var oldTags = allTags[href] || [];
+                    update(oldTags);
+                    common.setPadAttribute('tags', Util.deduplicateString(oldTags), null, href);
+                });
             });
         });
     };
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index a92e383d1..413b2624f 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1294,7 +1294,6 @@ define([
                     hide.push('properties', 'access');
                     hide.push('rename');
                     hide.push('openparent');
-                    hide.push('hashtag');
                     hide.push('download');
                     hide.push('share');
                     hide.push('savelocal');
@@ -4370,12 +4369,12 @@ define([
                 });
             }
             else if ($this.hasClass("cp-app-drive-context-hashtag")) {
-                if (paths.length !== 1) { return; }
-                el = manager.find(paths[0].path);
-                data = manager.getFileData(el);
-                if (!data) { return void console.error("Expected to find a file"); }
-                var href = data.href || data.roHref;
-                common.updateTags(href);
+                var hrefs = paths.map(function (p) {
+                    var el = manager.find(p.path);
+                    var data =  manager.getFileData(el);
+                    return data.href || data.roHref;
+                }).filter(Boolean);
+                common.updateTags(hrefs);
             }
             else if ($this.hasClass("cp-app-drive-context-empty")) {
                 if (paths.length !== 1 || !paths[0].element

From c8f7c96cfc1527386d54a9dd1d2caf513edfc7da Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 5 Jun 2020 13:25:22 -0400
Subject: [PATCH 06/66] preserve formatting when displaying multi-line team
 invite messages

---
 www/teams/app-team.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/teams/app-team.less b/www/teams/app-team.less
index eb49ec21f..c59d0dcb9 100644
--- a/www/teams/app-team.less
+++ b/www/teams/app-team.less
@@ -220,6 +220,7 @@
                 width: 100%;
                 padding: 12px;
                 margin-bottom: 20px;
+                white-space: pre;
             }
             .cp-teams-invite-password {
                 margin-bottom: 20px;

From 154a0b1e6e8ff0c6d4e82745df368a3f212815e8 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 5 Jun 2020 13:32:56 -0400
Subject: [PATCH 07/66] hide the drive's contextmenu when you hit escape

---
 www/common/drive-ui.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 413b2624f..8c8d7f5f1 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -526,6 +526,8 @@ define([
                 }
             });
         });
+
+
         return $(menu);
     };
 
@@ -919,6 +921,11 @@ define([
             if (e.ctrlKey) { ev.ctrlKey = true; }
             if (e.shiftKey) { ev.shiftKey = true; }
 
+            // ESC
+            if (e.which === 27) {
+                 return void APP.hideMenu();
+            }
+
             // Enter
             if (e.which === 13) {
                 var $allSelected = $content.find('.cp-app-drive-element.cp-app-drive-element-selected');

From b419ead7fefdb2891f99dc915be19f3220041457 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 5 Jun 2020 14:25:24 -0400
Subject: [PATCH 08/66] implement more intuitive keyboard controls for the tag
 prompt

---
 www/common/common-interface.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 79951c3c5..6ddf0a320 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -377,6 +377,14 @@ define([
             field.focus();
         });
 
+        var $field = field.tokenfield.closest('.tokenfield').find('.token-input');
+        $field.on('keypress', function (e) {
+            if (!$field.val() && e.which === 13) { return void $ok.click(); }
+        });
+        $field.on('keydown', function (e) {
+            if (!$field.val() && e.which === 27) { return void $cancel.click(); }
+        });
+
         return tagger;
     };
 

From 1ef79d44b4312f76148ec29d3e31b4b4e75f3d35 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 8 Jun 2020 11:47:09 -0400
Subject: [PATCH 09/66] display a disabled upload button to logged out users in
 the filepicker modal

---
 www/secureiframe/inner.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/www/secureiframe/inner.js b/www/secureiframe/inner.js
index a42cd5e7a..1aa94d9cd 100644
--- a/www/secureiframe/inner.js
+++ b/www/secureiframe/inner.js
@@ -177,7 +177,7 @@ define([
             });
 
             // If file, display the upload button
-            if (types.indexOf('file') !== -1 && common.isLoggedIn()) {
+            if (types.indexOf('file') !== -1) {
                 var f = (filters && filters.filter) || {};
                 delete data.accept;
                 if (Array.isArray(f.fileType)) {
@@ -188,7 +188,13 @@ define([
                         return val;
                     });
                 }
-                $filter.append(common.createButton('upload', false, data));
+            }
+
+            var $uploadButton = common.createButton('upload', false, data);
+            $filter.append($uploadButton);
+            if (!common.isLoggedIn()) {
+                $uploadButton.prop('disabled', true)
+                    .prop('title', Messages.upload_mustLogin);
             }
 
             var $container = $(h('span.cp-filepicker-content', [

From ce5bcc0022bc840fecb6e33d0b9c5275725f68cd Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 8 Jun 2020 11:57:05 -0400
Subject: [PATCH 10/66] add an XXX for the upload button's tooltip

---
 www/common/common-ui-elements.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 70b0d25ed..3a032b36f 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1364,6 +1364,7 @@ define([
             case 'import':
                 button = $('<button>', {
                     'class': 'fa fa-upload cp-toolbar-icon-import',
+                    // XXX text is weird anywhere other than the drive
                     title: Messages.importButtonTitle,
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.importButton));
                 /*if (data.types) {

From 4454740f5b790571bb46c93d958dbb379e732edd Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 8 Jun 2020 12:03:28 -0400
Subject: [PATCH 11/66] leave a note to update the text on the print button

---
 www/common/common-ui-elements.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 3a032b36f..91dd5a403 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1570,6 +1570,7 @@ define([
                 button = $('<button>', {
                     title: Messages.printButtonTitle2,
                     'class': "fa fa-print cp-toolbar-icon-print",
+                // XXX people don't realize this does PDF (https://github.com/xwiki-labs/cryptpad/issues/357#issuecomment-640711724)
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.printText));
                 break;
             case 'history':

From 259b3bca65ca5133122f2012bed7c0a522e9db9a Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 8 Jun 2020 15:34:20 -0400
Subject: [PATCH 12/66] use safe links by default

---
 www/common/drive-ui.js               |  2 +-
 www/common/inner/access.js           |  2 +-
 www/common/migrate-user-object.js    | 36 ++++++++++++++++++++++++++--
 www/common/notifications.js          | 15 ++++++++++++
 www/common/outer/mailbox-handlers.js |  6 +++++
 www/common/sframe-common-outer.js    |  5 ++--
 6 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 8c8d7f5f1..b86da80ec 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1097,7 +1097,7 @@ define([
 
             var priv = metadataMgr.getPrivateData();
             var useUnsafe = Util.find(priv, ['settings', 'security', 'unsafeLinks']);
-            if (useUnsafe !== false) { // true of undefined: use unsafe links
+            if (useUnsafe === true) {
                 return void window.open(APP.origin + href);
             }
 
diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 55a4dbbe9..190af4279 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -874,7 +874,7 @@ define([
                                 // Use hidden hash if needed (we're an owner of this pad so we know it is stored)
                                 var useUnsafe = Util.find(priv, ['settings', 'security', 'unsafeLinks']);
                                 var href = (priv.readOnly && data.roHref) ? data.roHref : data.href;
-                                if (useUnsafe === false) {
+                                if (useUnsafe !== true) {
                                     var newParsed = Hash.parsePadUrl(href);
                                     var newSecret = Hash.getSecrets(newParsed.type, newParsed.hash, newPass);
                                     var newHash = Hash.getHiddenHashFromKeys(parsed.type, newSecret, {});
diff --git a/www/common/migrate-user-object.js b/www/common/migrate-user-object.js
index 18bc9c61b..231c39ebd 100644
--- a/www/common/migrate-user-object.js
+++ b/www/common/migrate-user-object.js
@@ -7,9 +7,10 @@ define([
     '/common/cryptget.js',
     '/common/outer/mailbox.js',
     '/customize/messages.js',
+    '/common/common-realtime.js',
     '/bower_components/nthen/index.js',
     '/bower_components/chainpad-crypto/crypto.js',
-], function (AppConfig, Feedback, Hash, Util, Messaging, Crypt, Mailbox, Messages, nThen, Crypto) {
+], function (AppConfig, Feedback, Hash, Util, Messaging, Crypt, Mailbox, Messages, Realtime, nThen, Crypto) {
     // Start migration check
     // Versions:
     // 1: migrate pad attributes
@@ -456,6 +457,37 @@ define([
             if (version < 10) {
                 fixTodo();
             }
+        }).nThen(function (waitFor) {
+            if (version >= 11) { return; }
+            // Migration 11: alert users of safe links as the new default
+
+            var done = function () {
+                Feedback.send('Migrate-11', true);
+                userObject.version = version = 11;
+            };
+
+            /*  userObject.settings.security.unsafeLinks
+                    undefined => the user has never touched it
+                    false => the user has explicitly enabled "safe links"
+                    true => the user has explicitly disabled "safe links"
+            */
+            var unsafeLinks = Util.find(userObject, [ 'settings', 'security', 'unsafeLinks' ]);
+            if (unsafeLinks !== undefined) { return void done(); }
+
+            var ctx = {
+                store: store,
+            };
+            var myData = Messaging.createData(userObject);
+
+            Mailbox.sendTo(ctx, 'SAFE_LINKS_DEFAULT', {
+                user: myData,
+            }, {
+                channel: myData.notifications,
+                curvePublic: myData.curvePublic
+            }, waitFor(function (obj) {
+                if (obj && obj.error) { return void console.error(obj); }
+                done();
+            }));
         /*}).nThen(function (waitFor) {
             // Test progress bar in the loading screen
             var i = 0;
@@ -467,7 +499,7 @@ define([
             }, 500);
             progress(0, 0);*/
         }).nThen(function () {
-            setTimeout(cb);
+            Realtime.whenRealtimeSyncs(store.realtime, Util.bake(cb));
         });
     };
 });
diff --git a/www/common/notifications.js b/www/common/notifications.js
index 3abc40ca8..94c2dcb15 100644
--- a/www/common/notifications.js
+++ b/www/common/notifications.js
@@ -387,6 +387,21 @@ define([
         }
     };
 
+    handlers['SAFE_LINKS_DEFAULT'] = function (common, data) {
+        Messages.settings_safeLinkDefault = "SAFE LINKS ARE NOW DEFAULT"; // XXX
+
+        var content = data.content;
+        content.getFormatText = function () {
+            return Messages.settings_safeLinkDefault;
+        };
+
+        content.handler = function () {
+            common.openURL('/settings/#security');
+        };
+        if (!content.archived) {
+            content.dismissHandler = defaultDismiss(common, data);
+        }
+    };
 
     // NOTE: don't forget to fixHTML everything returned by "getFormatText"
 
diff --git a/www/common/outer/mailbox-handlers.js b/www/common/outer/mailbox-handlers.js
index a55a2d63d..6d10b089f 100644
--- a/www/common/outer/mailbox-handlers.js
+++ b/www/common/outer/mailbox-handlers.js
@@ -515,6 +515,12 @@ define([
         cb();
     };
 
+    handlers["SAFE_LINKS_DEFAULT"] = function (ctx, box, data, cb) { // XXX
+        var curve = ctx.store.proxy.curvePublic;
+        if (data.msg.author !== curve) { return void cb(true); }
+        cb();
+    };
+
     // Hide duplicates when receiving a SHARE_PAD notification:
     // Keep only one notification per channel: the stronger and more recent one
     var comments = {};
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index b5baf6301..71ecd6dcf 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -823,7 +823,7 @@ define([
                         var opts = parsed.getOptions();
                         var hash = Utils.Hash.getHiddenHashFromKeys(parsed.type, secret, opts);
                         var useUnsafe = Utils.Util.find(settings, ['security', 'unsafeLinks']);
-                        if (useUnsafe === false && window.history && window.history.replaceState) {
+                        if (useUnsafe !== true && window.history && window.history.replaceState) {
                             if (!/^#/.test(hash)) { hash = '#' + hash; }
                             window.history.replaceState({}, window.document.title, hash);
                         }
@@ -854,6 +854,7 @@ define([
                     path: initialPathInDrive, // Where to store the pad if we don't have it in our drive
                     forceSave: true
                 };
+                // XXX copypaste from above...
                 Cryptpad.setPadTitle(data, function (err) {
                     if (!err && !(obj && obj.notStored)) {
                         // No error and the pad was correctly stored
@@ -861,7 +862,7 @@ define([
                         var opts = parsed.getOptions();
                         var hash = Utils.Hash.getHiddenHashFromKeys(parsed.type, secret, opts);
                         var useUnsafe = Utils.Util.find(settings, ['security', 'unsafeLinks']);
-                        if (useUnsafe === false && window.history && window.history.replaceState) {
+                        if (useUnsafe !== true && window.history && window.history.replaceState) {
                             if (!/^#/.test(hash)) { hash = '#' + hash; }
                             window.history.replaceState({}, window.document.title, hash);
                         }

From 607deeaf24d9413c44c7900969e2eb8657304f1c Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 8 Jun 2020 16:31:11 -0400
Subject: [PATCH 13/66] remove the usual 'upload' tooltip from avatars upload
 buttons

---
 www/profile/inner.js | 1 +
 www/teams/inner.js   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/www/profile/inner.js b/www/profile/inner.js
index 535da563e..12ab5e607 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -376,6 +376,7 @@ define([
             todo();
         });
         var $upButton = common.createButton('upload', false, data);
+        $upButton.removeProp('title');
         $upButton.text(Messages.profile_upload);
         $upButton.prepend($('<span>', {'class': 'fa fa-upload'}));
         $block.append($upButton);
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 1c376962b..86b8acf47 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -987,6 +987,7 @@ define([
             });
         });
         var $upButton = common.createButton('upload', false, data);
+        $upButton.removeProp('title');
         $upButton.text(Messages.profile_upload);
         $upButton.prepend($('<span>', {'class': 'fa fa-upload'}));
 

From a8eb554f6d388f8b1bf0540990fd1e695f6b1676 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 8 Jun 2020 16:31:38 -0400
Subject: [PATCH 14/66] remove an XXX note that has been addressed

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

diff --git a/www/support/ui.js b/www/support/ui.js
index ac61bfe7f..04330734e 100644
--- a/www/support/ui.js
+++ b/www/support/ui.js
@@ -173,7 +173,7 @@ define([
             classes: 'btn-danger'
         }, function() {
             if (typeof(onHide) !== "function") { return; }
-            onHide(hide); // XXX
+            onHide(hide);
         });
 
         $(answer).click(function () {

From 03e8d161ab6338818a7ed0bf976d6b93bf0b481b Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 9 Jun 2020 10:40:47 +0200
Subject: [PATCH 15/66] Redirect to the team invitation link on login/register

---
 www/teams/main.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www/teams/main.js b/www/teams/main.js
index 6c780a8fd..65292b1f6 100644
--- a/www/teams/main.js
+++ b/www/teams/main.js
@@ -104,6 +104,8 @@ define([
         };
         SFCommonO.start({
             getSecrets: getSecrets,
+            hash: hash,
+            href: href,
             noHash: true,
             noRealtime: true,
             //driveEvents: true,

From 9737224281021fd29177106ded29997a2d42d4c2 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 9 Jun 2020 10:44:37 +0200
Subject: [PATCH 16/66] Use safe links by defaults for new users

---
 www/common/outer/async-store.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 885bc1131..df2e2a710 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -41,6 +41,9 @@ define([
         pad: {
             width: true
         },
+        security: {
+            unsafeLinks: false
+        },
         general: {
             allowUserFeedback: true
         }

From bd5a8ba3fb8b8bbcf16f73231db3701a3973da81 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 9 Jun 2020 11:05:37 +0200
Subject: [PATCH 17/66] Remove the (not working) option to rename a pad in an
 anonymous drive

---
 www/common/drive-ui.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 8c8d7f5f1..f12bf665b 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1315,6 +1315,7 @@ define([
 
                 if (!APP.loggedIn) {
                     hide.push('openparent');
+                    hide.push('rename');
                 }
 
                 filter = function ($el, className) {

From 88edea95c8ad53cbb6378d5b782e3441d201b0ee Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 9 Jun 2020 13:24:18 +0200
Subject: [PATCH 18/66] Fix type error in ooslide

---
 www/common/onlyoffice/inner.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js
index 19adc46b2..6218681c2 100644
--- a/www/common/onlyoffice/inner.js
+++ b/www/common/onlyoffice/inner.js
@@ -271,7 +271,7 @@ define([
 
         var checkDrawings = function () {
             var editor = getEditor();
-            if (!editor) { return false; }
+            if (!editor || !editor.GetSheets) { return false; }
             var s = editor.GetSheets();
             return s.some(function (obj) {
                 return obj.worksheet.Drawings.length;
@@ -775,6 +775,7 @@ define([
             }
 
             // Send the changes
+            content.locks = content.locks || {};
             rtChannel.sendMsg({
                 type: "saveChanges",
                 changes: parseChanges(obj.changes),

From b240d85c3e49901ed31b52aa9402c0514a4758dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 9 Jun 2020 13:10:31 +0100
Subject: [PATCH 19/66] add kanban icons to cptools font

---
 .../fonts/cptools/fonts/cptools.svg           |   2 ++
 .../fonts/cptools/fonts/cptools.ttf           | Bin 6124 -> 6520 bytes
 .../fonts/cptools/fonts/cptools.woff          | Bin 6200 -> 6596 bytes
 customize.dist/fonts/cptools/style.css        |  13 ++++++++++---
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/customize.dist/fonts/cptools/fonts/cptools.svg b/customize.dist/fonts/cptools/fonts/cptools.svg
index 93eef8d38..3540c5d06 100644
--- a/customize.dist/fonts/cptools/fonts/cptools.svg
+++ b/customize.dist/fonts/cptools/fonts/cptools.svg
@@ -26,4 +26,6 @@
 <glyph unicode="&#xe910;" glyph-name="new-template" d="M840.764 886.152h-655.119c-35.33 0-63.97-28.64-63.97-63.97v0-787.637c0-35.33 28.64-63.97 63.97-63.97v0h655.119c35.33 0 63.97 28.64 63.97 63.97v0 787.637c0 35.33-28.64 63.97-63.97 63.97v0zM844.499 34.545c0-2.063-1.672-3.735-3.735-3.735v0h-655.119c-2.063 0-3.735 1.672-3.735 3.735v0 787.637c0 2.063 1.672 3.735 3.735 3.735h655.119c2.063 0 3.735-1.672 3.735-3.735v0zM643.915 466.071h-93.365v93.003c0 10.313-8.36 18.673-18.673 18.673v0h-37.346c-0.036 0-0.078 0-0.121 0-10.246 0-18.552-8.306-18.552-18.552 0-0.042 0-0.085 0-0.127v0.006-93.003h-93.365c-0.036 0-0.078 0-0.121 0-10.246 0-18.552-8.306-18.552-18.552 0-0.042 0-0.085 0-0.127v0.006-37.346c0-10.313 8.36-18.673 18.673-18.673v0h93.365v-93.967c0-0.036 0-0.078 0-0.121 0-10.246 8.306-18.552 18.552-18.552 0.042 0 0.085 0 0.127 0h37.34c10.313 0 18.673 8.36 18.673 18.673v0 93.606h93.365c10.285 0.068 18.605 8.388 18.673 18.666v37.352c0.002 0.108 0.003 0.234 0.003 0.361 0 10.313-8.36 18.673-18.673 18.673-0.001 0-0.002 0-0.004 0v0z" />
 <glyph unicode="&#xe911;" glyph-name="palette" d="M408.6 950c-198.8-38.8-359-198.6-398.2-396.8-74-374 263.4-652.8 517.6-613.4 82.4 12.8 122.8 109.2 85 183.4-46.2 90.8 19.8 196.8 121.8 196.8h159.4c71.6 0 129.6 59.2 129.8 130.6-1 315.2-287.8 563.2-615.4 499.4zM192 320c-35.4 0-64 28.6-64 64s28.6 64 64 64 64-28.6 64-64-28.6-64-64-64zM256 576c-35.4 0-64 28.6-64 64s28.6 64 64 64 64-28.6 64-64-28.6-64-64-64zM512 704c-35.4 0-64 28.6-64 64s28.6 64 64 64 64-28.6 64-64-28.6-64-64-64zM768 576c-35.4 0-64 28.6-64 64s28.6 64 64 64 64-28.6 64-64-28.6-64-64-64z" />
 <glyph unicode="&#xe912;" glyph-name="folder-upload" d="M829.44 727.251h-296.84l-47.104 62.886c-25.923 34.066-66.406 55.898-111.999 56.139h-178.938c-77.457-0.137-140.211-62.891-140.348-140.335v-515.868c0.137-77.457 62.891-140.211 140.335-140.348h634.893c77.457 0.137 140.211 62.891 140.348 140.335v396.482c0 0.036 0 0.078 0 0.121 0 77.561-62.807 140.452-140.335 140.589h-0.013zM911.119 190.072c-0.068-45.083-36.597-81.611-81.673-81.679h-634.887c-45.083 0.068-81.611 36.597-81.679 81.673v515.862c0.068 45.083 36.597 81.611 81.673 81.679h178.906c26.48-0.030 50.004-12.656 64.908-32.207l0.146-0.199 47.104-62.765 17.709-24.094h326.114c45.125-0.069 81.679-36.665 81.679-81.799 0 0 0 0 0 0v0zM562.838 166.883h-102.039v203.957h-72.523l123.723 214.076 123.723-214.076h-72.885v-203.957z" />
+<glyph unicode="&#xe913;" glyph-name="add-bottom" d="M108.793 271.501c-15.312 0-27.996 12.684-27.996 27.996v55.992c0 15.312 12.684 28.006 27.996 28.006h225.414v-111.993zM108.793 495.478c-15.312 0-27.996 12.694-27.996 28.006v55.992c0 15.312 12.684 27.996 27.996 27.996h403.491v-111.993zM108.793 719.465c-15.312 0-27.996 12.694-27.996 28.006v55.992c0 15.312 12.684 27.996 27.996 27.996h615.968c15.312 0 27.996-12.684 27.996-27.996v-55.992c0-15.312-12.684-28.006-27.996-28.006zM943.202 287.839c0-19.465-15.792-35.257-35.258-35.257h-152.782v-152.782c0-19.465-15.792-35.257-35.258-35.257h-70.515c-19.465 0-35.257 15.792-35.257 35.257v152.782h-152.782c-19.465 0-35.257 15.792-35.257 35.257v70.515c0 19.465 15.792 35.258 35.257 35.258h152.782v152.782c0 19.465 15.792 35.258 35.257 35.258h70.515c19.465 0 35.258-15.792 35.258-35.258v-152.782h152.782c19.465 0 35.258-15.792 35.258-35.258z" />
+<glyph unicode="&#xe914;" glyph-name="add-top" d="M108.793 624.499c-15.312 0-27.996-12.684-27.996-27.996v-55.992c0-15.312 12.684-28.006 27.996-28.006h225.414v111.993zM108.793 400.522c-15.312 0-27.996-12.694-27.996-28.006v-55.992c0-15.312 12.684-27.996 27.996-27.996h403.491v111.993zM108.793 176.535c-15.312 0-27.996-12.694-27.996-28.006v-55.992c0-15.312 12.684-27.996 27.996-27.996h615.968c15.312 0 27.996 12.684 27.996 27.996v55.992c0 15.312-12.684 28.006-27.996 28.006zM943.202 608.161c0 19.465-15.792 35.257-35.258 35.257h-152.782v152.782c0 19.465-15.792 35.257-35.258 35.257h-70.515c-19.465 0-35.257-15.792-35.257-35.257v-152.782h-152.782c-19.465 0-35.257-15.792-35.257-35.257v-70.515c0-19.465 15.792-35.258 35.257-35.258h152.782v-152.782c0-19.465 15.792-35.258 35.257-35.258h70.515c19.465 0 35.258 15.792 35.258 35.258v152.782h152.782c19.465 0 35.258 15.792 35.258 35.258z" />
 </font></defs></svg>
\ No newline at end of file
diff --git a/customize.dist/fonts/cptools/fonts/cptools.ttf b/customize.dist/fonts/cptools/fonts/cptools.ttf
index 18338a9ee52ce2984e55859361c7740d8b91cac9..2788cf01026a97bee4a62115f3ae41021e5de048 100644
GIT binary patch
delta 675
zcmaE(|HG)BfsuiMft#U$ftkU;KUm+0Ux-Z|D6$8L6OwZi3&g`N&1PU=lmYTX(i4jd
zfV2RR5288Jb1Ks&K54ZE@+%k^L|rmc6H_ELORh68h=KH*WdH@(4>8{Y^1lH2DjB&Y
z6;TZAK&H3^kVwhNPj*Z+dtq}3C{P0wFv(4<C}7ZJ1UgB41CXzfmzbNnGfPVv$iD!z
zq^%&oxCH1>Adrjz$ulrBznpl$o>62Hqc@|-W*^3n!u2c+feen!>zVBtI2nW)lo{L^
z7=)G7Y#B|=tQkesAuMA>QB@erNKBSdgiTpkgiV`K6hwd|lwmqdLE1n{jE%%Zb9n>=
zcpg3kk&Ki7fq6_B+=7DKw?z17itxMhiO%G!7Zv53Daz;0FEW!~gi%0%+k!_R|GprI
zDtG{<1b8gC1^)$t6@c}*@r%yj7Zv57A<7T(8deXm0Uar3&1lN51ZEj4nzF)JMrJ_I
zsVNJasA)5rn$!bHkc=`!8t7+`K9Cw?BQsNCe1Pl$rUG0ZU|f&g18P7YfRYpte>?X2
zemuX;R|aktkiQsivq~7i=*bD9=8Te)XNbmd03`!Kc=8uf11>Hnu0>$|lAE=}4lx1%
D2X}sT

delta 289
zcmexi^hUp)fsuiMft#U$ftkU;KUm+0Ux-Z!D6$8L6OwZi3&g`N&17I;lmYTX(i4jd
zfV2RR5288Jb1Ktn10A0N`4tQd!bdVv6H`P_WOXtyh}r<<%`$)j?1z|d0Qn_AzDh=J
zNktF?TO5!-1IUlb$xn7n)LCYv02KHF6fnq5tSDemX9PM)Oa;hS$V<#k-I=8&4dlB3
zEom#rFD?N(6bQu6faDpNnV(HOV9zKtiP4);XtNLFM`2}<e}LHAeC5x0ew(ih+$<pV
v3^zk2bHeD!55&wF#V1RM$4ssfHxK{^fjGl|27a(grpbwt!kaIPFJ%M($<{w`

diff --git a/customize.dist/fonts/cptools/fonts/cptools.woff b/customize.dist/fonts/cptools/fonts/cptools.woff
index d8f56ba86d4b8da18c3e0b7ccfbf8e9b67c5d96a..64b641b9db4bf84e70a24c65bde2425fd26de2f9 100644
GIT binary patch
delta 734
zcma)4KWGzS6n`(*Cbf6uF5G>W1QkqAQ))YeT<$ES(khY+iV~0xBFIr|59u|52AWQp
zbT79gxQT8;hb{_EC5W?&P={LRpg1|`B-Qu68gZ!L!SDU~z2D>ee#iH+G;r;WTeTV>
z(3c;8Dsu-gF68X38M8aN6a_5+3~6wikzIWEWF=T<?ltvezhSJbZayGx03fb0whkXv
z!{y*UK$bN=BR|!C9}-F20`=z^sa<6+jM^RINDC5oAO)+<CDPr@z9q84@ITG%MnQ)T
z&i<hOoWvC3S`aM*<j&CHj~TBXUOe4uuD8k0vp+h8Dn<DmYdDWqd;_newbR3|W_JV{
za7Ecx=HV2W;6NR~oG4z#ieE)Bd0e>#abZ}M?Xzel9n(rqqu{^;XSm_<8cW==Eh5b@
zw1WeV7$3<l5vrMtx@YNqORuLzKiw4~-52S)ZuNBw4MUyPjOKoZQ|qHlhBm8ajv7)R
z_iDQ6=|bo|p_3^%(Lj<eX;;xpO~}eEc%#Fr?31~oV^)gO=vBHDdEy+8$usY<#x48a
z|2X*DK%(_81Gs&%fg(BJw@3K?=F9#)eeN5mBkT)4jOI$i9KR5kFdrX^yJIwLFyaNf
ZWQ|`Pe=7I$@Dt?kfCRl<b0@Z+<1gg~geL$1

delta 334
zcmX?Nyu(1O+~3WOfsp|SBrF)XLA3ZA2FA%7C50zyiq$J6=Oz{~Ffe8S#X~??JnYiU
z^u%J2*d8FC1BwOGb1Kt-Vn-Mlgu%Er(D7+TYGMilgJ=g(jTs1wp2+IV015)d4gmQo
zAk2P<`9?-=Nd-{s36LKH!a)pdaXI<PKy`j%4nP3|5Y|~{q>!6f0kl{Qh#3^XSe=nE
zFEKY2C^i9Tc^e4t%+iuB$S*Dd`bPq;jv2^eW_~uAhtZx<XtEEZH>1$z8H^u=l|dc{
zVsG=6KjZmrzA|vL00kHrZiY<egwd0A#LXGSC#Q(VOg<rQAOH?4afbg4{9u(#ppe=u
IFR_#n05M=hUH||9

diff --git a/customize.dist/fonts/cptools/style.css b/customize.dist/fonts/cptools/style.css
index 349b62f2b..85ed350f5 100644
--- a/customize.dist/fonts/cptools/style.css
+++ b/customize.dist/fonts/cptools/style.css
@@ -1,11 +1,12 @@
 @font-face {
   font-family: 'cptools';
   src:
-    url('fonts/cptools.ttf?cljhos') format('truetype'),
-    url('fonts/cptools.woff?cljhos') format('woff'),
-    url('fonts/cptools.svg?cljhos#cptools') format('svg');
+    url('fonts/cptools.ttf?da4x1y') format('truetype'),
+    url('fonts/cptools.woff?da4x1y') format('woff'),
+    url('fonts/cptools.svg?da4x1y#cptools') format('svg');
   font-weight: normal;
   font-style: normal;
+  font-display: block;
 }
 
 .cptools {
@@ -24,6 +25,12 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.cptools-add-bottom:before {
+  content: "\e913";
+}
+.cptools-add-top:before {
+  content: "\e914";
+}
 .cptools-folder-upload:before {
   content: "\e912";
 }

From e9772b22617ed1b2f264c282207d331f3ccf9ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 9 Jun 2020 13:27:04 +0100
Subject: [PATCH 20/66] add kanban icons

---
 www/kanban/app-kanban.less | 12 ++++++++++--
 www/kanban/jkanban_cp.js   |  8 +++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index e83ef3a29..a5eca13f4 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -277,13 +277,19 @@
                 border: 1px solid fade(@cryptpad_text_col, 70%);
                 color: fade(@cryptpad_text_col, 70%);
                 border-radius: 0px;
-                font-size: 20px;
+                font-size: 25px;
                 display: inline-flex;
                 justify-content: center;
                 align-items: center;
                 line-height: 1;
                 cursor: pointer;
                 height: 40px;
+                &:first-child {
+                    margin-right: 5px;
+                }
+                &:last-child {
+                    margin-left: 5px;
+                }
                 &:hover {
                     background-color: rgba(0,0,0,0.1);
                 }
@@ -460,12 +466,14 @@
             width: 300px;
             margin: 10px 5px;
             border: 1px solid @cryptpad_text_col;
+            color: @cryptpad_text_col;
             height: 40px;
             display: inline-flex;
             justify-content: center;
             align-items: center;
             align-self: flex-start;
-            font-size: 40px;
+            font-size: 25px;
+            line-height: 100%;
             cursor: pointer;
             .tools_unselectable();
             &:hover {
diff --git a/www/kanban/jkanban_cp.js b/www/kanban/jkanban_cp.js
index 7967fa5e4..54fb71f46 100644
--- a/www/kanban/jkanban_cp.js
+++ b/www/kanban/jkanban_cp.js
@@ -107,7 +107,7 @@ define([
             boardContainerOuter.appendChild(boardContainer);
             var addBoard = document.createElement('div');
             addBoard.id = 'kanban-addboard';
-            addBoard.innerText = '+';
+            addBoard.innerHTML = '<i class="fa fa-plus"></i>';
             boardContainer.appendChild(addBoard);
             var trash = self.trashContainer = document.createElement('div');
             trash.setAttribute('id', 'kanban-trash');
@@ -675,17 +675,15 @@ define([
             var footerBoard = document.createElement('footer');
             footerBoard.classList.add('kanban-board-footer');
             //add button
-            Messages.kanban_addTopButton = '<i class="fa fa-plus"></i> (top)'; // XXX
-            Messages.kanban_addBottomButton = '<i class="fa fa-plus"></i> (bottom)'; // XXX
             var addTopBoardItem = document.createElement('span');
             addTopBoardItem.classList.add('kanban-title-button');
             addTopBoardItem.setAttribute('data-top', "1");
-            addTopBoardItem.innerHTML = Messages.kanban_addTopButton;
+            addTopBoardItem.innerHTML = '<i class="cptools cptools-add-top">';
             footerBoard.appendChild(addTopBoardItem);
             __onAddItemClickHandler(addTopBoardItem);
             var addBoardItem = document.createElement('span');
             addBoardItem.classList.add('kanban-title-button');
-            addBoardItem.innerHTML = Messages.kanban_addBottomButton;
+            addBoardItem.innerHTML = '<i class="cptools cptools-add-bottom">';
             footerBoard.appendChild(addBoardItem);
             __onAddItemClickHandler(addBoardItem);
 

From c514471c2e56328cfd280bb609ab695d833fa0ba Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Tue, 9 Jun 2020 15:14:32 +0200
Subject: [PATCH 21/66] Translated using Weblate (Romanian)

Currently translated at 44.0% (564 of 1281 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ro/
---
 www/common/translations/messages.ro.json | 48 ++++++++++++++++++++----
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/www/common/translations/messages.ro.json b/www/common/translations/messages.ro.json
index 5b744e4a7..6572c00e4 100644
--- a/www/common/translations/messages.ro.json
+++ b/www/common/translations/messages.ro.json
@@ -14,7 +14,7 @@
     "error": "Eroare",
     "saved": "Salvat",
     "synced": "Totul a fost salvat",
-    "deleted": "Pad șters din CryptDrive-ul tău",
+    "deleted": "Șters",
     "disconnected": "Deconectat",
     "synchronizing": "Se sincronizează",
     "reconnecting": "Reconectare...",
@@ -239,7 +239,7 @@
     "settings_pinningNotAvailable": "Pad-urile fixate sunt disponibile doar utilizatorilor înregistrați.",
     "settings_pinningError": "Ceva nu a funcționat",
     "settings_usageAmount": "Pad-urile tale fixate ocupă {0}MB",
-    "settings_logoutEverywhereTitle": "Deloghează-te peste tot",
+    "settings_logoutEverywhereTitle": "Închide sesiunile remote",
     "settings_logoutEverywhere": "Deloghează-te din toate sesiunile web",
     "settings_logoutEverywhereConfirm": "Ești sigur? Va trebui să te loghezi, din nou, pe toate device-urile tale.",
     "upload_serverError": "Eroare de server: fișierele tale nu pot fi încărcate la momentul acesta.",
@@ -317,7 +317,8 @@
         "todo": "De facut",
         "contacts": "Contacte",
         "sheet": "Foaie de calcul",
-        "kanban": "Foaie Kanban"
+        "kanban": "Foaie Kanban",
+        "teams": "Echipe"
     },
     "button_newkanban": "Kanban nou",
     "padNotPinned": "Aceasta filă va expira după 3 luni de inactivitate, {0}autentifică-te{1} sau {2}înregistrează-te{3} pentru a o păstra.",
@@ -455,7 +456,7 @@
     "profile_create": "Crează un profil",
     "profile_description": "Descriere",
     "profile_fieldSaved": "Valoare nouă salvată: {0}",
-    "userlist_addAsFriendTitle": "Adaugă \"{0}\" în lista de contacte",
+    "userlist_addAsFriendTitle": "Trimite o cerere de contact către \"{0}\"",
     "canvas_currentBrush": "Culoarea curentă",
     "profile_viewMyProfile": "Vezi profilul tău",
     "contacts_title": "Contacte",
@@ -477,7 +478,7 @@
     "contacts_confirmRemoveHistory": "Ești sigur că vrei să ștergi definitiv istoricul chat-ului? Datele nu vor putea fi recuperate",
     "contacts_removeHistoryServerError": "A apărut o eroare în timpul ștergerii istoricului chat-ului. Te rugăm să încerci mai târziu",
     "contacts_fetchHistory": "Recuperează istoricul mai vechi",
-    "contacts_friends": "Prieteni",
+    "contacts_friends": "Persoane de contact",
     "contacts_rooms": "Camere",
     "contacts_leaveRoom": "Părăsește această cameră",
     "contacts_online": "Un alt utilizator din această cameră este online",
@@ -492,7 +493,7 @@
     "fm_removePermanentlyNote": "Pad-urile tale vor fi șterse de pe server dacă vei continua",
     "fm_deleteOwnedPad": "Ești sigur că vrei să ștergi definitiv acest pad de pe server?",
     "fm_deleteOwnedPads": "Ești sigur că vrei să ștergi definitiv aceste pad-uri de pe server?",
-    "fm_info_recent": "Listează pad-urile deschise sau modificate recent",
+    "fm_info_recent": "Aceste documente au fost deschise sau modificate recent de către tine sau de către colaboratorii tăi.",
     "fm_info_sharedFolder": "Acesta este un dosar partajat. Deoarece nu ești logat, îl poți vizualiza doar în modul citire.<br><a href=\"/register/\">Înscrie-te</a> sau <a href=\"/loghează-te/\">Log in</a> pentru a-l putea importa in CryptDrive-ul tău si a-l modifica.",
     "fm_info_owned": "Ești proprietarul pad-urilor afișate aici. Acest lucru înseamna că le poți șterge definitiv de pe server oricând vei dori. Dacă decizi să le ștergi, alți utilizatori nu le vor mai putea accesa.",
     "fm_error_cantPin": "O eroare internă de server a apărut. Te rugăm să reîncarci pagina și să încerci din nou.",
@@ -510,7 +511,7 @@
     "fm_tags_used": "Numărul de utilizări",
     "fm_restoreDrive": "Drive-ul tău va fi setat la o versiune aneterioară. Pentru a obține cele mai bune rezultate, te rugăm să eviți să aduci modificări în drive-ul tău până când procesul va fi terminat.",
     "fm_moveNestedSF": "Nu poti plasa un folder partajat în interiorul altuia. Folderul {0} nu a fost mutat.",
-    "fm_passwordProtected": "Acest document este protejat cu o parolă",
+    "fm_passwordProtected": "Parolă protejată",
     "fc_newsharedfolder": "Folder partajat nou",
     "fc_delete_owned": "Șterge de pe server",
     "fc_remove_sharedfolder": "Șterge",
@@ -547,5 +548,36 @@
     "settings_resetNewTitle": "Curățare CryptDrive",
     "settings_resetButton": "Șterge",
     "settings_resetTipsAction": "Resetează",
-    "settings_thumbnails": "Miniaturi"
+    "settings_thumbnails": "Miniaturi",
+    "settings_padWidth": "Lățimea maximă a editorului",
+    "settings_codeFontSize": "Dimensiunea font-ului in editorul de cod",
+    "settings_codeUseTabs": "Indentarea prin etichete (în loc de spații)",
+    "settings_codeIndentation": "Indentarea editorului de cod (spații)",
+    "settings_driveDuplicateLabel": "Ascunde duplicatele",
+    "settings_driveDuplicateHint": "Când deplasezi documentele tale într-un dosar comun, o copie este păstrată în CryptDrive-ul tău pentru asigura păstrarea drepturilor tale de control asupra lui. Poți ascunde fișierele duplicate. Doar versiunea partajata va fi vizibilă, dacă nu este ștearsă, în acest ultim caz originalul va fi afișat în locația precedentă.",
+    "settings_driveDuplicateTitle": "Documentele tale duplicate",
+    "register_emailWarning3": "Dacă înțelegeți aceste aspecte și dorești totuși să utilizezi adresa ta de e-mail ca și nume de utilizator, apasă OK.",
+    "padNotPinnedVariable": "Acest document va expira dupa {4} zile de inactivitate, {0}autentifică-te{1} sau {2}creează-ți un cont{3} pentru a-l pastra.",
+    "settings_logoutEverywhereButton": "Deconectează-te",
+    "settings_deleted": "Contul tău de utilizator este șters. Apasă OK pentru a reveni la pagina principală.",
+    "settings_deleteConfirm": "Dacă apeși OK, contul tău va fi șters permanent. Ești sigur?",
+    "settings_deleteModal": "Furnizează aceste informații administratorului CryptPad-ului tău astfel încât acestea să fie șterse de pe server.",
+    "settings_deleteButton": "Șterge contul tău",
+    "settings_deleteHint": "Ștergerea contului este permanentă. Cryptdrive-ul tău și lista ta de documente vor fi șterse de pe server. Restul documentelor vor fi șterse în timp de 90 de zile dacă nimeni nu le stochează în CryptDrive-ul său.",
+    "settings_deleteTitle": "Ștergere cont",
+    "settings_userFeedbackTitle": "Feedback",
+    "settings_autostoreMaybe": "Manual (întreabă întotdeauna)",
+    "settings_autostoreNo": "Manual (nu mai întreba)",
+    "settings_autostoreYes": "Automat",
+    "settings_autostoreHint": "<b>Automat</b> Toate documentele accesate sunt stocate în CryptDrive-ul dumneavoastră.<br><b>Manual (întreabă întotdeauna)</b> Dacă nu ai stocat încă un document, vei fi întrebat dacă dorești să îl stochezi în Cryptdrive-ul tău.<br><b>Manual (nu mai întreba)</b> Documentele nu sunt stocate automat în Cryptpad-ul tău. Opțiunea de a le stoca ulterior va fi ascunsă.",
+    "settings_autostoreTitle": "Capacitatea de stocare a documentului în CryptDrive",
+    "register_emailWarning2": "Nu vei putea reseta parola utilizând adresa ta de e-mail.",
+    "register_emailWarning1": "Poți proceda astfel dacă doreşti, însă nici o notificare nu va fi transmisă server-ului nostru.",
+    "register_emailWarning0": "Se pare că ai adăugat adresa ta de e-mail în loc de numele tău de utilizator.",
+    "fc_expandAll": "Extinde",
+    "fc_openInCode": "Deschide in editorul de cod",
+    "fc_color": "Schimbă culoarea",
+    "fm_morePads": "Mai mult",
+    "uploadFolderButton": "Încarcă dosar",
+    "storageStatus": "Capacitate de stocare:<br /><b>{0}</b> utilizat din <b>{1}</b>"
 }

From c9ed27c65201c32a6322efab181832ca75310aeb Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 9 Jun 2020 13:11:52 -0400
Subject: [PATCH 22/66] display the admin's supported languages inline in the
 support ticket form

---
 www/support/app-support.less | 8 ++++++++
 www/support/inner.js         | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/www/support/app-support.less b/www/support/app-support.less
index c033332eb..7684c054e 100644
--- a/www/support/app-support.less
+++ b/www/support/app-support.less
@@ -17,5 +17,13 @@
 
     display: flex;
     flex-flow: column;
+
+    .cp-support-language-list {
+        .cp-support-language {
+            margin-left: 5px;
+            background-color: rgba(0, 0, 0, 0.1);
+            padding: 0 5px;
+        }
+    }
 }
 
diff --git a/www/support/inner.js b/www/support/inner.js
index de1164344..3d907421d 100644
--- a/www/support/inner.js
+++ b/www/support/inner.js
@@ -139,20 +139,20 @@ define([
         if (!Array.isArray(AppConfig.supportLanguages)) { return $(h('div')); }
         var languages = AppConfig.supportLanguages;
 
-        var list = h('li', languages
+        var list = h('span.cp-support-language-list', languages
             .map(function (lang) {
                 return Messages._languages[lang];
             })
             .filter(Boolean)
             .map(function (lang) {
-                return h('li', lang);
+                return h('span.cp-support-language', lang);
             })
         );
 
-        var preamble = "This server's administrators speak the following languages:"; // XXX
+        Messages.support_languagesPreamble = "This server's administrators speak the following languages:"; // XXX
         var $div = $(
             h('div.cp-support-language', [
-                preamble,
+                Messages.support_languagesPreamble,
                 list,
             ])
         );

From e763f8792aa1602dc30d0e6e65613891bffa2d0e Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 9 Jun 2020 13:28:42 -0400
Subject: [PATCH 23/66] keep the support button visible, broaden the scope of
 the info menu

---
 www/common/common-ui-elements.js | 60 ++++++++++++--------------------
 1 file changed, 22 insertions(+), 38 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index b3ab9ee53..f09f3e621 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2300,7 +2300,7 @@ define([
     };
 
     UIElements.displayInfoMenu = function (Common, metadataMgr) {
-        var padType = metadataMgr.getMetadata().type;
+        //var padType = metadataMgr.getMetadata().type;
         var priv = metadataMgr.getPrivateData();
         var origin = priv.origin;
 
@@ -2313,42 +2313,11 @@ define([
             }, Messages.help_faq)
         );
 
-        var supportLine;
-        if (padType === 'support' || !Config.supportMailbox) {
-            // do nothing
-        } else if (priv.accountName) {
-            // registered users can submit support tickets
-            Messages.help_support = "Submit a support ticket"; // XXX
-            supportLine = h('p', [
-                h('a', {
-                    target: '_blank',
-                    rel: 'noreferrer noopener',
-                    href: origin + '/support/',
-                }, Messages.help_support)
-            ]);
-        } else {
-            // register to submit support tickets
-            Messages.help_supportRegisteredOnly = "Registered users can submit support tickets"; // XXX
-            var login = h('button', Messages.login_login);
-            $(login).click(function () {
-                Common.setLoginRedirect(function () {
-                    Common.gotoURL('/login/');
-                });
-            });
-            var register = h('button', Messages.login_register);
-            $(register).click(function () {
-                Common.setLoginRedirect(function () {
-                    Common.gotoURL('/register/');
-                });
-            });
-            supportLine = h('span', [
-                Messages.help_supportRegisteredOnly,
-                h('div', [
-                    login,
-                    register,
-                ])
-            ]);
-        }
+        // XXX link to the most recent changelog/release notes
+        // XXX FAQ
+        // XXX GitHub
+        // XXX privacy policy
+        // XXX legal notice
 
         var content = h('div', [
             // CryptPad version number
@@ -2357,7 +2326,7 @@ define([
             faqLine,
             // Link to the support ticket form in case their
             // question isn't answered by the FAQ
-            supportLine,
+            //supportLine,
         ]);
 
         var buttons = [
@@ -2484,6 +2453,7 @@ define([
                 },
             });
         }
+        options.push({ tag: 'hr' });
         // Add administration panel link if the user is an admin
         if (priv.edPublic && Array.isArray(Config.adminKeys) && Config.adminKeys.indexOf(priv.edPublic) !== -1) {
             options.push({
@@ -2499,6 +2469,20 @@ define([
                 },
             });
         }
+        if (padType !== 'support' && accountName && Config.supportMailbox) {
+            options.push({
+                tag: 'a',
+                attributes: {'class': 'cp-toolbar-menu-support fa fa-life-ring'},
+                content: h('span', Messages.supportPage || 'Support'),
+                action: function () {
+                    if (padType) {
+                        window.open(origin+'/support/');
+                    } else {
+                        window.parent.location = origin+'/support/';
+                    }
+                },
+            });
+        }
         options.push({ tag: 'hr' });
         if (Config.allowSubscriptions) {
             options.push({

From 3fa7a09b68413babe551b8ca2a4229de2e993623 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 9 Jun 2020 13:42:41 -0400
Subject: [PATCH 24/66] remove hardcoded supportLanguage config value

---
 customize.dist/application_config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/customize.dist/application_config.js b/customize.dist/application_config.js
index 0187cf74b..4a8820682 100644
--- a/customize.dist/application_config.js
+++ b/customize.dist/application_config.js
@@ -9,7 +9,8 @@ define(['/common/application_config_internal.js'], function (AppConfig) {
     // Example: If you want to remove the survey link in the menu:
     // AppConfig.surveyURL = "";
 
-    AppConfig.supportLanguages = [ 'en', 'fr' ]; // XXX
+    // To inform users of the support ticket panel which languages your admins speak:
+    //AppConfig.supportLanguages = [ 'en', 'fr' ];
 
     return AppConfig;
 });

From 85d75cd0ff5727cccb184a8081ff0744fdb04f77 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 9 Jun 2020 13:56:36 -0400
Subject: [PATCH 25/66] factor out a bit of duplicated code

---
 www/common/sframe-common-outer.js | 41 ++++++++++++-------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 71ecd6dcf..ef983503c 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -806,16 +806,8 @@ define([
                 var title = currentTabTitle.replace(/\{title\}/g, currentTitle || 'CryptPad');
                 document.title = title;
             };
-            sframeChan.on('Q_SET_PAD_TITLE_IN_DRIVE', function (newData, cb) {
-                var newTitle = newData.title || newData.defaultTitle;
-                currentTitle = newTitle;
-                setDocumentTitle();
-                var data = {
-                    password: password,
-                    title: newTitle,
-                    channel: secret.channel,
-                    path: initialPathInDrive // Where to store the pad if we don't have it in our drive
-                };
+
+            var setPadTitle = function (data, cb) {
                 Cryptpad.setPadTitle(data, function (err, obj) {
                     if (!err && !(obj && obj.notStored)) {
                         // No error and the pad was correctly stored
@@ -830,6 +822,19 @@ define([
                     }
                     cb({error: err});
                 });
+            };
+
+            sframeChan.on('Q_SET_PAD_TITLE_IN_DRIVE', function (newData, cb) {
+                var newTitle = newData.title || newData.defaultTitle;
+                currentTitle = newTitle;
+                setDocumentTitle();
+                var data = {
+                    password: password,
+                    title: newTitle,
+                    channel: secret.channel,
+                    path: initialPathInDrive // Where to store the pad if we don't have it in our drive
+                };
+                setPadTitle(data, cb);
             });
             sframeChan.on('EV_SET_TAB_TITLE', function (newTabTitle) {
                 currentTabTitle = newTabTitle;
@@ -854,21 +859,7 @@ define([
                     path: initialPathInDrive, // Where to store the pad if we don't have it in our drive
                     forceSave: true
                 };
-                // XXX copypaste from above...
-                Cryptpad.setPadTitle(data, function (err) {
-                    if (!err && !(obj && obj.notStored)) {
-                        // No error and the pad was correctly stored
-                        // hide the hash
-                        var opts = parsed.getOptions();
-                        var hash = Utils.Hash.getHiddenHashFromKeys(parsed.type, secret, opts);
-                        var useUnsafe = Utils.Util.find(settings, ['security', 'unsafeLinks']);
-                        if (useUnsafe !== true && window.history && window.history.replaceState) {
-                            if (!/^#/.test(hash)) { hash = '#' + hash; }
-                            window.history.replaceState({}, window.document.title, hash);
-                        }
-                    }
-                    cb({error: err});
-                });
+                setPadTitle(data, cb);
             });
             sframeChan.on('Q_IS_PAD_STORED', function (data, cb) {
                 Cryptpad.getPadAttribute('title', function (err, data) {

From c14cb9fa2a2e43a80316101bd1709ee11e689783 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 9 Jun 2020 13:57:06 -0400
Subject: [PATCH 26/66] remove some XXX notes that have been addressed

---
 www/common/common-ui-elements.js     | 1 -
 www/common/outer/mailbox-handlers.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index f09f3e621..4393d1201 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1364,7 +1364,6 @@ define([
             case 'import':
                 button = $('<button>', {
                     'class': 'fa fa-upload cp-toolbar-icon-import',
-                    // XXX text is weird anywhere other than the drive
                     title: Messages.importButtonTitle,
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.importButton));
                 /*if (data.types) {
diff --git a/www/common/outer/mailbox-handlers.js b/www/common/outer/mailbox-handlers.js
index 6d10b089f..4f0543885 100644
--- a/www/common/outer/mailbox-handlers.js
+++ b/www/common/outer/mailbox-handlers.js
@@ -515,7 +515,7 @@ define([
         cb();
     };
 
-    handlers["SAFE_LINKS_DEFAULT"] = function (ctx, box, data, cb) { // XXX
+    handlers["SAFE_LINKS_DEFAULT"] = function (ctx, box, data, cb) {
         var curve = ctx.store.proxy.curvePublic;
         if (data.msg.author !== curve) { return void cb(true); }
         cb();

From d3e417a98488239367f383f44b26394e0ddf35e1 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 9 Jun 2020 16:10:20 -0400
Subject: [PATCH 27/66] guard against a type error when downloading the content
 of a media-tag

---
 www/common/inner/common-mediatag.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/www/common/inner/common-mediatag.js b/www/common/inner/common-mediatag.js
index 3c1f340af..9009d2557 100644
--- a/www/common/inner/common-mediatag.js
+++ b/www/common/inner/common-mediatag.js
@@ -399,14 +399,16 @@ define([
             e.stopPropagation();
             m.hide();
             var $mt = $menu.data('mediatag');
-            if ($(this).hasClass("cp-app-code-context-saveindrive")) {
+            var $this = $(this);
+            if ($this.hasClass("cp-app-code-context-saveindrive")) {
                 common.importMediaTag($mt);
             }
-            else if ($(this).hasClass("cp-app-code-context-download")) {
-                var media = $mt[0]._mediaObject;
+            else if ($this.hasClass("cp-app-code-context-download")) {
+                var media = Util.find($mt, [0, '_mediaObject']);
+                if (!(media && media._blob)) { return void console.error($mt); }
                 window.saveAs(media._blob.content, media.name);
             }
-            else if ($(this).hasClass("cp-app-code-context-open")) {
+            else if ($this.hasClass("cp-app-code-context-open")) {
                 $mt.trigger('preview');
             }
         });

From 60c19e0746c5c3c9bf8937de23a5ed4ae9677a55 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 10 Jun 2020 12:50:18 +0200
Subject: [PATCH 28/66] Fix tippy html issue

---
 www/common/common-interface.js | 1 +
 www/drive/inner.js             | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 6ddf0a320..4ed2f413e 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -807,6 +807,7 @@ define([
 
     UI.createHelper = function (href, text) {
         var q = h('a.fa.fa-question-circle', {
+            'data-cptippy-html': true,
             style: 'text-decoration: none !important;',
             title: text,
             href: href,
diff --git a/www/drive/inner.js b/www/drive/inner.js
index d5380b8d0..5d60e9a4c 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -283,13 +283,13 @@ define([
             var onDisconnect = function (noAlert) {
                 setEditable(false);
                 if (drive.refresh) { drive.refresh(); }
-                APP.toolbar.failed();
+                toolbar.failed();
                 if (!noAlert) { UIElements.disconnectAlert(); }
             };
             var onReconnect = function () {
                 setEditable(true);
                 if (drive.refresh) { drive.refresh(); }
-                APP.toolbar.reconnecting();
+                toolbar.reconnecting();
                 UIElements.reconnectAlert();
             };
 

From e755f88b6ae44a3e17248f0d6221499113c818db Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Wed, 10 Jun 2020 12:50:35 +0200
Subject: [PATCH 29/66] Translated using Weblate (English)

Currently translated at 100.0% (1283 of 1283 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1282 of 1282 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
---
 www/common/translations/messages.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 637b05bef..4d47b3c7c 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1377,5 +1377,7 @@
     "code_editorTheme": "Editor theme",
     "toolbar_file": "File",
     "slide_backCol": "Background color",
-    "slide_textCol": "Text color"
+    "slide_textCol": "Text color",
+    "support_languagesPreamble": "This server's administrators speak the following languages:",
+    "settings_safeLinkDefault": "Safe Links are now turned on by default. Please use the <i class=\"fa fa-shhare-alt\"></i> <b>Share</b> menu to copy links rather than your browser's address bar."
 }

From c01f62177f01500e484d1693b925d167e4f0c74e Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 10 Jun 2020 06:57:40 -0400
Subject: [PATCH 30/66] remove some hardcoded translations

---
 www/common/notifications.js | 2 --
 www/support/inner.js        | 1 -
 2 files changed, 3 deletions(-)

diff --git a/www/common/notifications.js b/www/common/notifications.js
index 94c2dcb15..fc72517fd 100644
--- a/www/common/notifications.js
+++ b/www/common/notifications.js
@@ -388,8 +388,6 @@ define([
     };
 
     handlers['SAFE_LINKS_DEFAULT'] = function (common, data) {
-        Messages.settings_safeLinkDefault = "SAFE LINKS ARE NOW DEFAULT"; // XXX
-
         var content = data.content;
         content.getFormatText = function () {
             return Messages.settings_safeLinkDefault;
diff --git a/www/support/inner.js b/www/support/inner.js
index 3d907421d..d956914c6 100644
--- a/www/support/inner.js
+++ b/www/support/inner.js
@@ -149,7 +149,6 @@ define([
             })
         );
 
-        Messages.support_languagesPreamble = "This server's administrators speak the following languages:"; // XXX
         var $div = $(
             h('div.cp-support-language', [
                 Messages.support_languagesPreamble,

From 30f6e92312c2bc7b3a7d89024033ccdd63d402cb Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 10 Jun 2020 10:49:29 -0400
Subject: [PATCH 31/66] export customizable footer links for use in the 'about
 menu'

---
 customize.dist/pages.js          | 38 +++++++-------------
 www/common/common-ui-elements.js | 60 +++++++++++++++++++++-----------
 2 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 6ba39e49a..b65faffc2 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -64,6 +64,12 @@ define([
 
     Pages.versionString = "CryptPad v3.18.1 (Smilodon's revenge)";
 
+    // used for the about menu
+    Pages.imprintLink = AppConfig.imprint ? footLink(imprintUrl, 'imprint') : undefined;
+    Pages.privacyLink = footLink(AppConfig.privacy, 'privacy');
+    Pages.githubLink = footLink('https://github.com/xwiki-labs/cryptpad', null, 'GitHub');
+    Pages.faqLink = footLink('/faq.html', 'faq_link');
+
     Pages.infopageFooter = function () {
         return h('footer', [
             h('div.container', [
@@ -74,24 +80,14 @@ define([
                             languageSelector()
                         ])
                     ], ''),
-                    /*footerCol('footer_applications', [
-                        footLink('/drive/', 'main_drive'),
-                        footLink('/pad/', 'main_richText'),
-                        footLink('/code/', 'main_code'),
-                        footLink('/slide/', 'main_slide'),
-                        footLink('/poll/', 'main_poll'),
-                        footLink('/kanban/', 'main_kanban'),
-                        footLink('/whiteboard/', null, Msg.type.whiteboard)
-                    ]),*/
                     footerCol('footer_product', [
-                        footLink('https://cryptpad.fr/what-is-cryptpad.html', 'topbar_whatIsCryptpad'),
-                        footLink('/faq.html', 'faq_link'),
-                        footLink('https://github.com/xwiki-labs/cryptpad', null, 'GitHub'),
+                        footLink('/what-is-cryptpad.html', 'topbar_whatIsCryptpad'),
+                        Pages.faqLink,
+                        Pages.githubLink,
                         footLink('https://opencollective.com/cryptpad/contribute/', 'footer_donate'),
                     ]),
                     footerCol('footer_aboutUs', [
-                        /*footLink('https://blog.cryptpad.fr', 'blog'),
-                        footLink('https://labs.xwiki.com', null, 'XWiki Labs'),*/
+                        /*footLink('https://blog.cryptpad.fr', 'blog'), */
                         footLink('http://www.xwiki.com', null, 'XWiki SAS'),
                         footLink('https://www.open-paas.org', null, 'OpenPaaS'),
                         footLink('/about.html', 'footer_team'),
@@ -99,15 +95,9 @@ define([
                     ]),
                     footerCol('footer_legal', [
                         footLink('/terms.html', 'footer_tos'),
-                        footLink(AppConfig.privacy, 'privacy'),
-                        AppConfig.imprint ? footLink(imprintUrl, 'imprint') : undefined,
+                        Pages.privacyLink,
+                        Pages.imprintLink,
                     ]),
-                    /*footerCol('footer_contact', [
-                        footLink('https://riot.im/app/#/room/#cryptpad:matrix.org', null, 'Chat'),
-                        footLink('https://twitter.com/cryptpad', null, 'Twitter'),
-                        footLink('https://github.com/xwiki-labs/cryptpad', null, 'GitHub'),
-                        footLink('/contact.html', null, 'Email')
-                    ])*/
                 ])
             ]),
             h('div.cp-version-footer', Pages.versionString)
@@ -150,13 +140,9 @@ define([
             h('a.navbar-brand', { href: '/index.html'}),
             button,
             h('div.collapse.navbar-collapse.justify-content-end#menuCollapse', [
-                //h('a.nav-item.nav-link', { href: '/what-is-cryptpad.html'}, Msg.topbar_whatIsCryptpad), // Moved the FAQ
-                //h('a.nav-item.nav-link', { href: '/faq.html'}, Msg.faq_link),
                 h('a.nav-item.nav-link', { href: 'https://blog.cryptpad.fr/'}, Msg.blog),
                 h('a.nav-item.nav-link', { href: '/features.html'}, Msg.pricing),
                 h('a.nav-item.nav-link', { href: '/privacy.html'}, Msg.privacy),
-                //h('a.nav-item.nav-link', { href: '/contact.html'}, Msg.contact),
-                //h('a.nav-item.nav-link', { href: '/about.html'}, Msg.about),
             ].concat(rightLinks))
         );
     };
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 4393d1201..6b433c805 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2303,29 +2303,47 @@ define([
         var priv = metadataMgr.getPrivateData();
         var origin = priv.origin;
 
-        Messages.help_faq = "Review our list of frequently asked questions"; // XXX
-        var faqLine = h('p',
-            h('a', {
-                target: '_blank',
-                rel: 'noreferrer noopener',
-                href: origin + '/faq.html',
-            }, Messages.help_faq)
-        );
-
-        // XXX link to the most recent changelog/release notes
-        // XXX FAQ
-        // XXX GitHub
-        // XXX privacy policy
-        // XXX legal notice
-
-        var content = h('div', [
-            // CryptPad version number
+        // TODO link to the most recent changelog/release notes
+        // https://github.com/xwiki-labs/cryptpad/releases/latest/ ?
+
+        var note = function (content) {
+            return h('span.cp-info-menu-description', content);
+        };
+
+        Messages.info_imprintFlavour = "Legally mandated information about this service's operators can be found <a>here</a>."; // XXX
+        Messages.info_privacyFlavour = "Our <a>privacy policy</a> describes how we treat your data."; // XXX
+        Messages.info_faqFlavour = "Consult our <a>FAQ</a> for answers to common questions."; // XXX
+
+        var template = function (line, link) {
+            if (!line || !link) { return; }
+            var p = $('<p>').html(line)[0];
+            var model = link.cloneNode(true);
+            var sub = link.cloneNode(true);
+
+/*  This is a hack to make relative URLs point to the main domain
+    instead of the sandbox domain. It will break if the admins have specified
+    some less common URL formats for their customizable links, such as if they've
+    used a protocal-relative absolute URL. The URL API isn't quite safe to use
+    because of IE (thanks, Bill).  */
+            var href = sub.getAttribute('href');
+            if (/^\//.test(href)) { sub.setAttribute('href', origin + href); }
+            var a = p.querySelector('a');
+            if (!a) { return; }
+            sub.innerText = a.innerText;
+            p.replaceChild(sub, a);
+            return p;
+        };
+
+        var legalLine = template(Messages.info_imprintFlavour, Pages.imprintLink);
+        var privacyLine = template(Messages.info_privacyFlavour, Pages.privacyLink);
+        var faqLine = template(Messages.info_faqFlavour, Pages.faqLink);
+
+        var content = h('div.cp-info-menu-container', [
             h('h6', Pages.versionString),
-            // First point users to our FAQ
+            h('hr'),
+            legalLine,
+            privacyLine,
             faqLine,
-            // Link to the support ticket form in case their
-            // question isn't answered by the FAQ
-            //supportLine,
         ]);
 
         var buttons = [

From 40d5acbd86500ef0ff8135b27caabd20593ebf0e Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 10 Jun 2020 11:22:00 -0400
Subject: [PATCH 32/66] remove the change display name option from the user
 admin menu

---
 www/common/common-ui-elements.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 6b433c805..f01bea6eb 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2306,10 +2306,6 @@ define([
         // TODO link to the most recent changelog/release notes
         // https://github.com/xwiki-labs/cryptpad/releases/latest/ ?
 
-        var note = function (content) {
-            return h('span.cp-info-menu-description', content);
-        };
-
         Messages.info_imprintFlavour = "Legally mandated information about this service's operators can be found <a>here</a>."; // XXX
         Messages.info_privacyFlavour = "Our <a>privacy policy</a> describes how we treat your data."; // XXX
         Messages.info_faqFlavour = "Consult our <a>FAQ</a> for answers to common questions."; // XXX
@@ -2317,7 +2313,6 @@ define([
         var template = function (line, link) {
             if (!line || !link) { return; }
             var p = $('<p>').html(line)[0];
-            var model = link.cloneNode(true);
             var sub = link.cloneNode(true);
 
 /*  This is a hack to make relative URLs point to the main domain
@@ -2435,13 +2430,14 @@ define([
         }
         options.push({ tag: 'hr' });
         // Add the change display name button if not in read only mode
+        /*
         if (config.changeNameButtonCls && config.displayChangeName && !AppConfig.disableProfile) {
             options.push({
                 tag: 'a',
                 attributes: {'class': config.changeNameButtonCls + ' fa fa-user'},
                 content: h('span', Messages.user_rename)
             });
-        }
+        }*/
         if (accountName && !AppConfig.disableProfile) {
             options.push({
                 tag: 'a',

From 85f85a38032d1851b4d0336df44c348d931a7893 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 10 Jun 2020 11:37:39 -0400
Subject: [PATCH 33/66] reorder admin menu items

---
 www/common/common-ui-elements.js | 116 ++++++++++++++++---------------
 1 file changed, 59 insertions(+), 57 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index f01bea6eb..b469dcb9b 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2386,15 +2386,21 @@ define([
                 content: $userAdminContent.html()
             });
         }
-        options.push({
-            tag: 'a',
-            attributes: {
-                'target': '_blank',
-                'href': origin+'/index.html',
-                'class': 'fa fa-home'
-            },
-            content: h('span', Messages.homePage)
-        });
+
+        if (accountName && !AppConfig.disableProfile) {
+            options.push({
+                tag: 'a',
+                attributes: {'class': 'cp-toolbar-menu-profile fa fa-user-circle'},
+                content: h('span', Messages.profileButton),
+                action: function () {
+                    if (padType) {
+                        window.open(origin+'/profile/');
+                    } else {
+                        window.parent.location = origin+'/profile/';
+                    }
+                },
+            });
+        }
         if (padType !== 'drive' || (!accountName && priv.newSharedFolder)) {
             options.push({
                 tag: 'a',
@@ -2428,30 +2434,6 @@ define([
                 content: h('span', Messages.type.contacts)
             });
         }
-        options.push({ tag: 'hr' });
-        // Add the change display name button if not in read only mode
-        /*
-        if (config.changeNameButtonCls && config.displayChangeName && !AppConfig.disableProfile) {
-            options.push({
-                tag: 'a',
-                attributes: {'class': config.changeNameButtonCls + ' fa fa-user'},
-                content: h('span', Messages.user_rename)
-            });
-        }*/
-        if (accountName && !AppConfig.disableProfile) {
-            options.push({
-                tag: 'a',
-                attributes: {'class': 'cp-toolbar-menu-profile fa fa-user-circle'},
-                content: h('span', Messages.profileButton),
-                action: function () {
-                    if (padType) {
-                        window.open(origin+'/profile/');
-                    } else {
-                        window.parent.location = origin+'/profile/';
-                    }
-                },
-            });
-        }
         if (padType !== 'settings') {
             options.push({
                 tag: 'a',
@@ -2466,6 +2448,7 @@ define([
                 },
             });
         }
+
         options.push({ tag: 'hr' });
         // Add administration panel link if the user is an admin
         if (priv.edPublic && Array.isArray(Config.adminKeys) && Config.adminKeys.indexOf(priv.edPublic) !== -1) {
@@ -2496,30 +2479,6 @@ define([
                 },
             });
         }
-        options.push({ tag: 'hr' });
-        if (Config.allowSubscriptions) {
-            options.push({
-                tag: 'a',
-                attributes: {
-                    'target': '_blank',
-                    'href': priv.plan ? priv.accounts.upgradeURL : origin+'/features.html',
-                    'class': 'fa fa-star-o'
-                },
-                content: h('span', priv.plan ? Messages.settings_cat_subscription : Messages.pricing)
-            });
-        }
-        if (!priv.plan && !Config.removeDonateButton) {
-            options.push({
-                tag: 'a',
-                attributes: {
-                    'target': '_blank',
-                    'rel': 'noopener',
-                    'href': priv.accounts.donateURL,
-                    'class': 'fa fa-gift'
-                },
-                content: h('span', Messages.crowdfunding_button2)
-            });
-        }
         if (AppConfig.surveyURL) {
             options.push({
                 tag: 'a',
@@ -2547,6 +2506,49 @@ define([
             },
         });
 
+        options.push({
+            tag: 'a',
+            attributes: {
+                'target': '_blank',
+                'href': origin+'/index.html',
+                'class': 'fa fa-home'
+            },
+            content: h('span', Messages.homePage)
+        });
+        // Add the change display name button if not in read only mode
+        /*
+        if (config.changeNameButtonCls && config.displayChangeName && !AppConfig.disableProfile) {
+            options.push({
+                tag: 'a',
+                attributes: {'class': config.changeNameButtonCls + ' fa fa-user'},
+                content: h('span', Messages.user_rename)
+            });
+        }*/
+        options.push({ tag: 'hr' });
+        if (Config.allowSubscriptions) {
+            options.push({
+                tag: 'a',
+                attributes: {
+                    'target': '_blank',
+                    'href': priv.plan ? priv.accounts.upgradeURL : origin+'/features.html',
+                    'class': 'fa fa-star-o'
+                },
+                content: h('span', priv.plan ? Messages.settings_cat_subscription : Messages.pricing)
+            });
+        }
+        if (!priv.plan && !Config.removeDonateButton) {
+            options.push({
+                tag: 'a',
+                attributes: {
+                    'target': '_blank',
+                    'rel': 'noopener',
+                    'href': priv.accounts.donateURL,
+                    'class': 'fa fa-gift'
+                },
+                content: h('span', Messages.crowdfunding_button2)
+            });
+        }
+
         options.push({ tag: 'hr' });
         // Add login or logout button depending on the current status
         if (priv.loggedIn) {

From 9aafd5f3c5594522b681b608386852e6625bbea8 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 10 Jun 2020 18:42:46 +0200
Subject: [PATCH 34/66] Add category and attachments to support tickets

---
 customize.dist/src/less2/include/support.less |   3 +
 www/support/inner.js                          |   3 +-
 www/support/ui.js                             | 135 +++++++++++++++++-
 3 files changed, 132 insertions(+), 9 deletions(-)

diff --git a/customize.dist/src/less2/include/support.less b/customize.dist/src/less2/include/support.less
index 890ba810d..1d62157de 100644
--- a/customize.dist/src/less2/include/support.less
+++ b/customize.dist/src/less2/include/support.less
@@ -4,6 +4,9 @@
     @msg-bg: #eee;
     @fromme-bg: #ddd;
     .cp-support-form-container {
+        div {
+            margin-bottom: 10px;
+        }
         [type="text"] {
             width: @sidebar_button-width;
             margin-bottom: 10px;
diff --git a/www/support/inner.js b/www/support/inner.js
index 3d907421d..089af5230 100644
--- a/www/support/inner.js
+++ b/www/support/inner.js
@@ -166,8 +166,6 @@ define([
 
         var form = APP.support.makeForm();
 
-        $div.find('button').before(form);
-
         var id = Util.uid();
 
         $div.find('button').click(function () {
@@ -183,6 +181,7 @@ define([
                 $('.cp-sidebarlayout-category[data-category="tickets"]').click();
             }
         });
+        $div.find('button').before(form);
         return $div;
     };
 
diff --git a/www/support/ui.js b/www/support/ui.js
index 04330734e..e95a8e8cf 100644
--- a/www/support/ui.js
+++ b/www/support/ui.js
@@ -6,8 +6,9 @@ define([
     '/common/common-hash.js',
     '/common/common-util.js',
     '/common/clipboard.js',
+    '/common/common-ui-elements.js',
     '/customize/messages.js',
-], function ($, ApiConfig, h, UI, Hash, Util, Clipboard, Messages) {
+], function ($, ApiConfig, h, UI, Hash, Util, Clipboard, UIElements, Messages) {
 
     var send = function (ctx, id, type, data, dest) {
         var common = ctx.common;
@@ -61,9 +62,14 @@ define([
     };
 
     var sendForm = function (ctx, id, form, dest) {
-        var $title = $(form).find('.cp-support-form-title');
-        var $content = $(form).find('.cp-support-form-msg');
+        var $form = $(form);
+        var $cat = $form.find('.cp-support-form-category');
+        var $title = $form.find('.cp-support-form-title');
+        var $content = $form.find('.cp-support-form-msg');
+        var $attachments = $form.find('.cp-support-form-attachments');
 
+
+        var category = $cat.val().trim();
         var title = $title.val().trim();
         if (!title) {
             return void UI.alert(Messages.support_formTitleError);
@@ -72,18 +78,38 @@ define([
         if (!content) {
             return void UI.alert(Messages.support_formContentError);
         }
+        $cat.val('');
         $content.val('');
         $title.val('');
 
+        var attachments = [];
+        $attachments.find('> span').each(function (i, el) {
+            var $el = $(el);
+            attachments.push({
+                href: $el.attr('data-href'),
+                name: $el.attr('data-name')
+            });
+        });
+
         send(ctx, id, 'TICKET', {
+            category: category,
             title: title,
+            attachments: attachments,
             message: content,
         }, dest);
 
         return true;
     };
 
-    var makeForm = function (cb, title) {
+Messages.support_cat_account = "User account"; // XXX
+Messages.support_cat_data = "Loss of content"; // XXX
+Messages.support_cat_bug = "Bug report"; // XXX
+Messages.support_cat_other = "Other"; // XXX
+Messages.support_category = "Category"; // XXX
+Messages.support_attachments = "Attachments"; // XXX
+Messages.support_addAttachment = "Add attachment"; // XXX
+
+    var makeForm = function (ctx, cb, title) {
         var button;
 
         if (typeof(cb) === "function") {
@@ -93,8 +119,34 @@ define([
 
         var cancel = title ? h('button.btn.btn-secondary', Messages.cancel) : undefined;
 
+        var category = h('input.cp-support-form-category', {
+            type: 'hidden',
+            value: ''
+        });
+        var categories = ['account', 'data', 'bug', 'other'].map(function (key) {
+            return {
+                tag: 'a',
+                content: h('span', Messages['support_cat_'+key]),
+                action: function () {
+                    $(category).val(key);
+                }
+            };
+        });
+        var catContainer = h('div.cp-dropdown-container' + (title ? '.cp-hidden': ''));
+        var dropdownCfg = {
+            text: Messages.support_category,
+            options: categories,
+            container: $(catContainer),
+            isSelect: true
+        };
+        var $drop = UIElements.createDropdown(dropdownCfg);
+
+        var attachments, addAttachment;
+
         var content = [
             h('hr'),
+            category,
+            catContainer,
             h('input.cp-support-form-title' + (title ? '.cp-hidden' : ''), {
                 placeholder: Messages.support_formTitle,
                 type: 'text',
@@ -104,11 +156,51 @@ define([
             h('textarea.cp-support-form-msg', {
                 placeholder: Messages.support_formMessage
             }),
+            h('label', Messages.support_attachments),
+            attachments = h('div.cp-support-form-attachments'),
+            addAttachment = h('button', Messages.support_addAttachment),
             h('hr'),
             button,
             cancel
         ];
 
+        $(addAttachment).click(function () {
+            var $input = $('<input>', {
+                'type': 'file',
+                'style': 'display: none;',
+                'multiple': 'multiple',
+                'accept': 'image/*'
+            }).on('change', function (e) {
+                var files = Util.slice(e.target.files);
+                files.forEach(function (file) {
+                    var ev = {};
+                    ev.callback = function (data) {
+                        var x, a;
+                        var span = h('span', {
+                            'data-name': data.name,
+                            'data-href': data.url
+                        }, [
+                            x = h('i.fa.fa-times'),
+                            a = h('a', {
+                                href: '#'
+                            }, data.name)
+                        ]);
+                        $(x).click(function () {
+                            $(span).remove();
+                        });
+                        $(a).click(function (e) {
+                            e.preventDefault();
+                            ctx.common.openURL(data.url);
+                        });
+
+                        $(attachments).append(span);
+                    };
+                    ctx.FM.handleFile(file, ev);
+                });
+            });
+            $input.click();
+        });
+
         var form = h('div.cp-support-form-container', content);
 
         $(cancel).click(function () {
@@ -125,6 +217,7 @@ define([
         var privateData = metadataMgr.getPrivateData();
 
         var ticketTitle = content.title + ' (#' + content.id + ')';
+        var ticketCategory;
         var answer = h('button.btn.btn-primary.cp-support-answer', Messages.support_answer);
         var close = h('button.btn.btn-danger.cp-support-close', Messages.support_close);
         var hide = h('button.btn.btn-danger.cp-support-hide', Messages.support_remove);
@@ -137,6 +230,7 @@ define([
 
         var url;
         if (ctx.isAdmin) {
+            ticketCategory = Messages['support_cat_'+(content.category || 'other')] + ' - ';
             url = h('button.btn.btn-primary.fa.fa-clipboard');
             $(url).click(function () {
                 var link = privateData.origin + privateData.pathname + '#' + 'support-' + content.id;
@@ -148,7 +242,7 @@ define([
         var $ticket = $(h('div.cp-support-list-ticket', {
             'data-id': content.id
         }, [
-            h('h2', [ticketTitle, url]),
+            h('h2', [ticketCategory, ticketTitle, url]),
             actions
         ]));
 
@@ -179,7 +273,7 @@ define([
         $(answer).click(function () {
             $ticket.find('.cp-support-form-container').remove();
             $(actions).hide();
-            var form = makeForm(function () {
+            var form = makeForm(ctx, function () {
                 var sent = sendForm(ctx, content.id, form, content.sender);
                 if (sent) {
                     $(actions).show();
@@ -215,6 +309,20 @@ define([
             ev.stopPropagation();
         });
 
+        var attachments = (content.attachments || []).map(function (obj) {
+            if (!obj || !obj.name || !obj.href) { return; }
+            var a = h('a', {
+                href: '#'
+            }, obj.name)
+            $(a).click(function (e) {
+                e.preventDefault();
+                ctx.common.openURL(obj.href);
+            });
+            return h('span', [
+                a
+            ]);
+        });
+
         var adminClass = (fromAdmin? '.cp-support-fromadmin': '');
         var premiumClass = (fromPremium && !fromAdmin? '.cp-support-frompremium': '');
         var name = Util.fixHTML(content.sender.name) || Messages.anonymous;
@@ -226,6 +334,7 @@ define([
                 h('span.cp-support-message-time', content.time ? new Date(content.time).toLocaleString() : '')
             ]),
             h('pre.cp-support-message-content', content.message),
+            h('div', attachments),
             isAdmin ? userData : undefined,
         ]);
     };
@@ -257,10 +366,22 @@ define([
             adminKeys: Array.isArray(ApiConfig.adminKeys)?  ApiConfig.adminKeys.slice(): [],
         };
 
+        var fmConfig = {
+            body: $('body'),
+            onUploaded: function (ev, data) {
+                if (ev.callback) {
+                    ev.callback(data);
+                }
+            }
+        };
+        ctx.FM = common.createFileManager(fmConfig);
+
         ui.sendForm = function (id, form, dest) {
             return sendForm(ctx, id, form, dest);
         };
-        ui.makeForm = makeForm;
+        ui.makeForm = function (cb, title) {
+            return makeForm(ctx, cb, title);
+        };
         ui.makeTicket = function ($div, content, onHide) {
             return makeTicket(ctx, $div, content, onHide);
         };

From 54b5b5eae7beef4ae8eb56f5aca951a9cd88cb35 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 11 Jun 2020 13:30:52 +0200
Subject: [PATCH 35/66] Add dev button to delete last cp in oo

---
 www/common/onlyoffice/inner.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js
index 6218681c2..c4008052d 100644
--- a/www/common/onlyoffice/inner.js
+++ b/www/common/onlyoffice/inner.js
@@ -462,6 +462,20 @@ define([
                 });
             }
         };
+        var deleteLastCp = function () {
+            var hashes = content.hashes;
+            if (!hashes || !Object.keys(hashes).length) { return; }
+            i = i || 0;
+            var idx = Object.keys(hashes).map(Number).sort(function (a, b) {
+                return a-b;
+            });
+            var lastIndex = idx[idx.length - 1 - i];
+            delete content.hashes[lastIndex];
+            APP.onLocal();
+            APP.realtime.onSettle(function () {
+                UI.log(Messages.saved);
+            });
+        };
         var restoreLastCp = function () {
             content.saveLock = myOOId;
             APP.onLocal();
@@ -1584,6 +1598,14 @@ define([
                 $save.appendTo(toolbar.$bottomM);
             }
             if (window.CP_DEV_MODE || DISPLAY_RESTORE_BUTTON) {
+                common.createButton('', true, {
+                    name: 'delete',
+                    icon: 'fa-trash',
+                    hiddenReadOnly: true
+                }).click(function () {
+                    if (initializing) { return void console.error('initializing'); }
+                    deleteLastCp();
+                }).attr('title', 'Delete last checkpoint').appendTo(toolbar.$bottomM);
                 common.createButton('', true, {
                     name: 'restore',
                     icon: 'fa-history',
@@ -1609,6 +1631,7 @@ define([
             }
 
             if (common.isLoggedIn()) {
+                window.CryptPad_deleteLastCp = deleteLastCp;
                 var $importXLSX = common.createButton('import', true, {
                     accept: accept,
                     binary : ["ods", "xlsx", "odt", "docx", "odp", "pptx"]

From bba1706ac5611574fb22077881a9baf8da739523 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 11 Jun 2020 13:34:00 +0200
Subject: [PATCH 36/66] lint compliance

---
 www/common/onlyoffice/inner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js
index c4008052d..6f9c74f27 100644
--- a/www/common/onlyoffice/inner.js
+++ b/www/common/onlyoffice/inner.js
@@ -465,7 +465,7 @@ define([
         var deleteLastCp = function () {
             var hashes = content.hashes;
             if (!hashes || !Object.keys(hashes).length) { return; }
-            i = i || 0;
+            var i = 0;
             var idx = Object.keys(hashes).map(Number).sort(function (a, b) {
                 return a-b;
             });

From e7a6397084f5da42f27aeeab02384aac73b62533 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 11 Jun 2020 14:49:59 +0200
Subject: [PATCH 37/66] Add category filter and improve UI

---
 customize.dist/src/less2/include/support.less | 12 +++++
 www/admin/inner.js                            | 17 +++++++
 www/common/common-ui-elements.js              |  4 +-
 www/support/app-support.less                  |  9 ++++
 www/support/ui.js                             | 51 ++++++++++++-------
 5 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/customize.dist/src/less2/include/support.less b/customize.dist/src/less2/include/support.less
index 1d62157de..d83746b51 100644
--- a/customize.dist/src/less2/include/support.less
+++ b/customize.dist/src/less2/include/support.less
@@ -18,6 +18,18 @@
             height: 300px;
         }
     }
+    .cp-support-attachments {
+        display: flex;
+        .fa {
+            cursor: pointer;
+            margin-right: 10px;
+        }
+        &> span {
+            border: 1px solid #ddd;
+            margin-right: 5px;
+            padding: 10px;
+        }
+    }
     .cp-support-container {
         .cp-support-list-ticket {
             display: flex;
diff --git a/www/admin/inner.js b/www/admin/inner.js
index 2ff62cf1f..90048e76d 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -185,6 +185,20 @@ define([
         var $container = makeBlock('support-list');
         var $div = $(h('div.cp-support-container')).appendTo($container);
 
+        var catContainer = h('div.cp-dropdown-container');
+        $div.append(catContainer);
+        var category = 'all';
+        var $drop = APP.support.makeCategoryDropdown(catContainer, function (key) {
+            category = key;
+            if (key === 'all') {
+                $div.find('.cp-support-list-ticket').show();
+                return;
+            }
+            $div.find('.cp-support-list-ticket').hide();
+            $div.find('.cp-support-list-ticket[data-cat="'+key+'"]').show();
+        }, true);
+        $drop.setValue('all');
+
         var metadataMgr = common.getMetadataMgr();
         var privateData = metadataMgr.getPrivateData();
         var cat = privateData.category || '';
@@ -277,6 +291,9 @@ define([
                             UI.alert(Messages.error);
                         });
                     });
+                    if (category !== 'all' && $ticket.attr('data-cat') !== category) {
+                        $ticket.hide();
+                    }
                 }
                 $ticket.append(APP.support.makeMessage(content, hash));
                 reorder();
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 4393d1201..4d2f8b3c7 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2204,7 +2204,9 @@ define([
             if (config.isSelect && value) {
                 var $val = $innerblock.find('[data-value="'+value+'"]');
                 setActive($val);
-                $innerblock.scrollTop($val.position().top + $innerblock.scrollTop());
+                try {
+                    $innerblock.scrollTop($val.position().top + $innerblock.scrollTop());
+                } catch (e) {}
             }
             if (config.feedback) { Feedback.send(config.feedback); }
         };
diff --git a/www/support/app-support.less b/www/support/app-support.less
index 7684c054e..41af016fd 100644
--- a/www/support/app-support.less
+++ b/www/support/app-support.less
@@ -18,6 +18,15 @@
     display: flex;
     flex-flow: column;
 
+            .cp-support-form-attachments {
+                .fa {
+                    cursor: pointer;
+                }
+                &> span {
+                    padding: 10px;
+                }
+            }
+
     .cp-support-language-list {
         .cp-support-language {
             margin-left: 5px;
diff --git a/www/support/ui.js b/www/support/ui.js
index e95a8e8cf..e4d60e919 100644
--- a/www/support/ui.js
+++ b/www/support/ui.js
@@ -66,7 +66,7 @@ define([
         var $cat = $form.find('.cp-support-form-category');
         var $title = $form.find('.cp-support-form-title');
         var $content = $form.find('.cp-support-form-msg');
-        var $attachments = $form.find('.cp-support-form-attachments');
+        var $attachments = $form.find('.cp-support-attachments');
 
 
         var category = $cat.val().trim();
@@ -105,10 +105,32 @@ Messages.support_cat_account = "User account"; // XXX
 Messages.support_cat_data = "Loss of content"; // XXX
 Messages.support_cat_bug = "Bug report"; // XXX
 Messages.support_cat_other = "Other"; // XXX
+Messages.support_cat_all = "All"; // XXX
 Messages.support_category = "Category"; // XXX
 Messages.support_attachments = "Attachments"; // XXX
 Messages.support_addAttachment = "Add attachment"; // XXX
 
+    var makeCategoryDropdown = function (ctx, container, onChange, all) {
+        var categories = ['account', 'data', 'bug', 'other'];
+        if (all) { categories.push('all'); }
+        categories = categories.map(function (key) {
+            return {
+                tag: 'a',
+                content: h('span', Messages['support_cat_'+key]),
+                action: function () {
+                    onChange(key);
+                }
+            };
+        });
+        var dropdownCfg = {
+            text: Messages.support_category,
+            options: categories,
+            container: $(container),
+            isSelect: true
+        };
+        return UIElements.createDropdown(dropdownCfg);
+    };
+
     var makeForm = function (ctx, cb, title) {
         var button;
 
@@ -123,23 +145,10 @@ Messages.support_addAttachment = "Add attachment"; // XXX
             type: 'hidden',
             value: ''
         });
-        var categories = ['account', 'data', 'bug', 'other'].map(function (key) {
-            return {
-                tag: 'a',
-                content: h('span', Messages['support_cat_'+key]),
-                action: function () {
-                    $(category).val(key);
-                }
-            };
-        });
         var catContainer = h('div.cp-dropdown-container' + (title ? '.cp-hidden': ''));
-        var dropdownCfg = {
-            text: Messages.support_category,
-            options: categories,
-            container: $(catContainer),
-            isSelect: true
-        };
-        var $drop = UIElements.createDropdown(dropdownCfg);
+        makeCategoryDropdown(ctx, catContainer, function (key) {
+            $(category).val(key);
+        });
 
         var attachments, addAttachment;
 
@@ -157,7 +166,7 @@ Messages.support_addAttachment = "Add attachment"; // XXX
                 placeholder: Messages.support_formMessage
             }),
             h('label', Messages.support_attachments),
-            attachments = h('div.cp-support-form-attachments'),
+            attachments = h('div.cp-support-attachments'),
             addAttachment = h('button', Messages.support_addAttachment),
             h('hr'),
             button,
@@ -240,6 +249,7 @@ Messages.support_addAttachment = "Add attachment"; // XXX
         }
 
         var $ticket = $(h('div.cp-support-list-ticket', {
+            'data-cat': content.category,
             'data-id': content.id
         }, [
             h('h2', [ticketCategory, ticketTitle, url]),
@@ -334,7 +344,7 @@ Messages.support_addAttachment = "Add attachment"; // XXX
                 h('span.cp-support-message-time', content.time ? new Date(content.time).toLocaleString() : '')
             ]),
             h('pre.cp-support-message-content', content.message),
-            h('div', attachments),
+            h('div.cp-support-attachments', attachments),
             isAdmin ? userData : undefined,
         ]);
     };
@@ -382,6 +392,9 @@ Messages.support_addAttachment = "Add attachment"; // XXX
         ui.makeForm = function (cb, title) {
             return makeForm(ctx, cb, title);
         };
+        ui.makeCategoryDropdown = function (container, onChange, all) {
+            return makeCategoryDropdown(ctx, container, onChange, all);
+        };
         ui.makeTicket = function ($div, content, onHide) {
             return makeTicket(ctx, $div, content, onHide);
         };

From 9fbaa8f2a18d842dbf539a67f432ad6767e084ca Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Thu, 11 Jun 2020 16:33:30 +0200
Subject: [PATCH 38/66] Translated using Weblate (German)

Currently translated at 99.9% (1282 of 1283 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
---
 www/common/translations/messages.de.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json
index 8b0638aac..691e54aa4 100644
--- a/www/common/translations/messages.de.json
+++ b/www/common/translations/messages.de.json
@@ -1377,5 +1377,7 @@
     "toolbar_insert": "Einfügen",
     "toolbar_savetodrive": "Als Bild speichern",
     "slide_backCol": "Hintergrundfarbe",
-    "slide_textCol": "Textfarbe"
+    "slide_textCol": "Textfarbe",
+    "support_languagesPreamble": "Die Administratoren dieses Servers sprechen die folgenden Sprachen:",
+    "settings_safeLinkDefault": "Sichere Links sind nun standardmäßig aktiviert. Bitte verwende zum Kopieren von Links das Menü <i class=\"fa fa-shhare-alt\"></i> <b>Teilen</b> und nicht die Adressleiste des Browsers."
 }

From 15174a4cf36fadd30d3cb7a3206688aeee072511 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Thu, 11 Jun 2020 16:33:30 +0200
Subject: [PATCH 39/66] Translated using Weblate (French)

Currently translated at 100.0% (1283 of 1283 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
---
 www/common/translations/messages.fr.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index e1c72098c..aa8d9eda7 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -1377,5 +1377,7 @@
     "toolbar_savetodrive": "Sauvegarder image",
     "toolbar_insert": "Insérer",
     "toolbar_theme": "Thème",
-    "todo_move": "Votre liste de tâches est désormais dans le kanban <b>{0}</b> dans votre Drive."
+    "todo_move": "Votre liste de tâches est désormais dans le kanban <b>{0}</b> dans votre Drive.",
+    "settings_safeLinkDefault": "Les liens sécurisés sont désormais activés par défaut. Veuillez utiliser le menu <i class=\"fa fa-shhare-alt\"></i> <b>Partager</b> pour copier les liens plutôt que la barre d'adresse de votre navigateur.",
+    "support_languagesPreamble": "L'équipe de support parle les langues suivantes :"
 }

From eed14750edfd320c473342cba1f05f93135055ee Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Thu, 11 Jun 2020 16:33:30 +0200
Subject: [PATCH 40/66] Translated using Weblate (Romanian)

Currently translated at 44.1% (566 of 1283 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ro/
---
 www/common/translations/messages.ro.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.ro.json b/www/common/translations/messages.ro.json
index 6572c00e4..190f3250a 100644
--- a/www/common/translations/messages.ro.json
+++ b/www/common/translations/messages.ro.json
@@ -579,5 +579,6 @@
     "fc_color": "Schimbă culoarea",
     "fm_morePads": "Mai mult",
     "uploadFolderButton": "Încarcă dosar",
-    "storageStatus": "Capacitate de stocare:<br /><b>{0}</b> utilizat din <b>{1}</b>"
+    "storageStatus": "Capacitate de stocare:<br /><b>{0}</b> utilizat din <b>{1}</b>",
+    "fc_collapseAll": "Restrânge"
 }

From aa50352e1743e3ea18ca9e38ef3611d1b5b380b1 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Thu, 11 Jun 2020 16:33:30 +0200
Subject: [PATCH 41/66] Translated using Weblate (English)

Currently translated at 100.0% (1283 of 1283 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
---
 www/common/translations/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 4d47b3c7c..bce3ebd69 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1378,6 +1378,6 @@
     "toolbar_file": "File",
     "slide_backCol": "Background color",
     "slide_textCol": "Text color",
-    "support_languagesPreamble": "This server's administrators speak the following languages:",
+    "support_languagesPreamble": "The support team speaks the following languages:",
     "settings_safeLinkDefault": "Safe Links are now turned on by default. Please use the <i class=\"fa fa-shhare-alt\"></i> <b>Share</b> menu to copy links rather than your browser's address bar."
 }

From caac97df66649895b87ba6570a6b63479a12b7de Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 11 Jun 2020 11:47:36 -0400
Subject: [PATCH 42/66] update changelog, footer, and package.json for the
 3.19.0 release

---
 CHANGELOG.md            | 44 +++++++++++++++++++++++++++++++++++++++++
 customize.dist/pages.js |  2 +-
 package-lock.json       |  2 +-
 package.json            |  2 +-
 4 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfa69006a..89c9ca5f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,47 @@
+# Thylacine release (3.19.0)
+
+## Goals
+
+The intent of this release was to catch up on our backlog of bug fixes and minor usability improvements.
+
+## Update notes
+
+This release features an update to our clientside dependencies.
+
+To update to 3.19.0 from 3.18.1:
+
+1. Stop your server
+2. Get the latest code with git
+3. Get the latest clientside dependencies with `bower update`
+4. Restart your server
+
+## Features
+
+* The most notable change in this release is that the use of "safe links" (introduced in our 3.11.0 release) has been made the new default for documents. This means that when you open a document that is stored in your drive your browser's address bar will not contain the encryption keys for the document, only an identifier used to look up those encryption keys which are stored in your drive. This makes it less likely that you'll leak access to your documents during video meetings, when sharing screenshots, or when using shared computers that store the history of pages you've viewed.
+  * To share access to documents with links, you'll need to use the _share menu_ which has recently been made more prominent in the platform's toolbars
+  * This setting is configurable, so you can still choose to disable the use of safe links via your settings page.
+* We've updated the layout of the "user admin menu" which can be found in the top-right corner by clicking your avatar. It features an "About CryptPad" menu which displays the version of the instance you're using as well as some resources which are otherwise only available via the footer of static pages.
+* We often receive support tickets in languages that we don't speak, which forces us to use translation services in order to answer questions. To address this issue, we've made it possible for admins to display a notice indicating which languages they speak. An example configuration is provided in `customize.dist/application_config.js`.
+* We've integrated two PRs:
+  1. [Only list premium features when subscriptions are enabled](https://github.com/xwiki-labs/cryptpad/pull/538)
+  2. [Add privacy policy option](https://github.com/xwiki-labs/cryptpad/pull/537)
+* We found it cumbersome to add new cards to the top of our Kanban columns, since we had to create a new card at the bottom and then drag it to the top. In response, we've broken up the rather large "new card" button into two buttons, one which adds a card at the top, and another which adds a new card at the bottom.
+* We've made it easier to use tags for files in the drive:
+  1. You can now select multiple files and apply a set of tags to all of them
+  2. Hitting "enter" in an empty tag prompt field will submit the current list of tags
+* Unregistered users were able to open up the "filepicker modal" in spreadsheets. It was already possible to embed an image which they'd already stored in their drive, but it was not clear why they were not able to upload a new image. We now display a disabled upload button with a tooltip to log in or register in order to upload images.
+* Finally, we've updated the styles in our presentation editor to better match our recent toolbar redesign and the mermaidjs integration.
+
+## Bug fixes
+
+* We now preserve formatting in multi-line messages in team invitations.
+* The slide editor exhibited some strange behaviour where the page would reload the first time you entered "present mode" after creating the document. We've also fixed some issues with printing.
+* We now prevent the local resizing of images in the rich text editor while it is locked due to disconnection or the lack of edit rights.
+* We've updated our marked.js dependency to the latest version in order to correct some minor rendering bugs.
+* Unregistered users are now redirected to the login page when they visit the support page.
+* We've removed the unsupported "rename" entry from the right-click menu in unregistered users drives.
+* Lastly, we've added a "Hind" font to the spreadsheet editor which introduces basic support for Devanagari characters.
+
 # Smilodon's revenge (3.18.1)
 
 Our next major release (3.19.0) is still a few weeks away.
diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index b65faffc2..0e42b9a3a 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -62,7 +62,7 @@ define([
     var imprintUrl = AppConfig.imprint && (typeof(AppConfig.imprint) === "boolean" ?
                         '/imprint.html' : AppConfig.imprint);
 
-    Pages.versionString = "CryptPad v3.18.1 (Smilodon's revenge)";
+    Pages.versionString = "CryptPad v3.19.0 (Thylacine)";
 
     // used for the about menu
     Pages.imprintLink = AppConfig.imprint ? footLink(imprintUrl, 'imprint') : undefined;
diff --git a/package-lock.json b/package-lock.json
index 9840bd099..ed2097eff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cryptpad",
-  "version": "3.18.1",
+  "version": "3.19.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 56e512b22..be6f77978 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "3.18.1",
+  "version": "3.19.0",
   "license": "AGPL-3.0+",
   "repository": {
     "type": "git",

From 3bd7742d20f295cbfb7204792ae00a1a24662aeb Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 11 Jun 2020 12:44:12 -0400
Subject: [PATCH 43/66] hide the kanban trash bar when it isn't in use

---
 www/kanban/app-kanban.less | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index a5eca13f4..880b1dd0b 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -421,14 +421,21 @@
             }
         }
         #kanban-trash {
-            height: 60px;
-            font-size: 40px;
+            height: 0px;
+            font-size: 0px;
+            transition: height 400ms, font-size 400ms;
+
             display: flex;
             align-items: center;
             justify-content: center;
             position: relative;
             width: 100%;
             //pointer-events: none;
+
+            &.kanban-trash-active, &.kanban-trash-suggest {
+                height: 60px;
+                font-size: 40px;
+            }
             i {
                 position: fixed;
             }

From b7daa636bf9ed03fd5fa196595b80d2a694ec2ca Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 11 Jun 2020 13:06:51 -0400
Subject: [PATCH 44/66] fix a horizontal scrollbar issue I just introduced and
 explain why

---
 www/kanban/app-kanban.less | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 880b1dd0b..3777fa0a6 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -421,11 +421,17 @@
             }
         }
         #kanban-trash {
-            height: 0px;
+            height: 1px;
             font-size: 0px;
-            transition: height 400ms, font-size 400ms;
+/*  CSS transitions are nice to look at, but it seems some interaction of "display: flex" here
+    makes the horizontal scrollbar stop working, so we need "display: none" for this state, but
+    CSS transitions are disabled when one state has "display: none". We can accomplish this in
+    js, but js animations are more prone to bugs and I'd rather live with a slight jank than
+    have the trash get stuck in some intermediary animation state under heavy use. --ansuz
+*/
+            display: none; // flex;
+            //transition: opacity 400ms, height 400ms, font-size 400ms;
 
-            display: flex;
             align-items: center;
             justify-content: center;
             position: relative;
@@ -433,6 +439,7 @@
             //pointer-events: none;
 
             &.kanban-trash-active, &.kanban-trash-suggest {
+                display: flex;
                 height: 60px;
                 font-size: 40px;
             }

From 9b750cfc1bde05fc0485745e72f89ea172b77263 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Fri, 12 Jun 2020 00:49:46 +0200
Subject: [PATCH 45/66] Translated using Weblate (German)

Currently translated at 100.0% (1283 of 1283 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
---
 www/common/translations/messages.de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json
index 691e54aa4..01f06a9d4 100644
--- a/www/common/translations/messages.de.json
+++ b/www/common/translations/messages.de.json
@@ -1378,6 +1378,6 @@
     "toolbar_savetodrive": "Als Bild speichern",
     "slide_backCol": "Hintergrundfarbe",
     "slide_textCol": "Textfarbe",
-    "support_languagesPreamble": "Die Administratoren dieses Servers sprechen die folgenden Sprachen:",
+    "support_languagesPreamble": "Das Support-Team spricht die folgenden Sprachen:",
     "settings_safeLinkDefault": "Sichere Links sind nun standardmäßig aktiviert. Bitte verwende zum Kopieren von Links das Menü <i class=\"fa fa-shhare-alt\"></i> <b>Teilen</b> und nicht die Adressleiste des Browsers."
 }

From 86e733c620e270ee048ae9908699916986486e41 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Fri, 12 Jun 2020 15:27:17 +0200
Subject: [PATCH 46/66] Translated using Weblate (English)

Currently translated at 100.0% (1286 of 1286 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1286 of 1286 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1285 of 1285 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1284 of 1284 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
---
 www/common/translations/messages.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index bce3ebd69..4f3a9d157 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -856,7 +856,7 @@
     "help": {
         "title": "Getting started",
         "generic": {
-            "more": "Learn more about how CryptPad can work for you by reading our <a href=\"/faq.html\" target=\"_blank\">FAQ</a>",
+            "more": "Learn more about how CryptPad can work for you by reading our <a href=\"/faq.html\" target=\"_blank\">FAQ</a>.",
             "share": "Share this document with the  <i class=\"fa fa-shhare-alt\"></i> <b>Share</b> button, and manage access rights with <i class=\"fa fa-unlock-alt\"></i> <b>Access</b>.",
             "save": "All your changes are synced automatically so you never need to save"
         },
@@ -1379,5 +1379,8 @@
     "slide_backCol": "Background color",
     "slide_textCol": "Text color",
     "support_languagesPreamble": "The support team speaks the following languages:",
-    "settings_safeLinkDefault": "Safe Links are now turned on by default. Please use the <i class=\"fa fa-shhare-alt\"></i> <b>Share</b> menu to copy links rather than your browser's address bar."
+    "settings_safeLinkDefault": "Safe Links are now turned on by default. Please use the <i class=\"fa fa-shhare-alt\"></i> <b>Share</b> menu to copy links rather than your browser's address bar.",
+    "info_imprintFlavour": "<a>Legal information about the administrators of this instance</a>.",
+    "user_about": "About CryptPad",
+    "info_privacyFlavour": "Our <a>privacy policy</a> describes how we treat your data."
 }

From e91997fe843af56fee55ca3d643d47609bfd710b Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 12 Jun 2020 09:39:41 -0400
Subject: [PATCH 47/66] remove some hardcoded translations

---
 www/common/common-ui-elements.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index b469dcb9b..da66b0976 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2306,10 +2306,6 @@ define([
         // TODO link to the most recent changelog/release notes
         // https://github.com/xwiki-labs/cryptpad/releases/latest/ ?
 
-        Messages.info_imprintFlavour = "Legally mandated information about this service's operators can be found <a>here</a>."; // XXX
-        Messages.info_privacyFlavour = "Our <a>privacy policy</a> describes how we treat your data."; // XXX
-        Messages.info_faqFlavour = "Consult our <a>FAQ</a> for answers to common questions."; // XXX
-
         var template = function (line, link) {
             if (!line || !link) { return; }
             var p = $('<p>').html(line)[0];
@@ -2331,7 +2327,7 @@ define([
 
         var legalLine = template(Messages.info_imprintFlavour, Pages.imprintLink);
         var privacyLine = template(Messages.info_privacyFlavour, Pages.privacyLink);
-        var faqLine = template(Messages.info_faqFlavour, Pages.faqLink);
+        var faqLine = template(Messages.help.generic.more, Pages.faqLink);
 
         var content = h('div.cp-info-menu-container', [
             h('h6', Pages.versionString),
@@ -2494,7 +2490,6 @@ define([
                 },
             });
         }
-        Messages.user_about = 'About CryptPad'; // XXX
         options.push({
             tag: 'a',
             attributes: {

From b022f7cd8004414d63cd4bc2d26d5b5a75174dba Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Fri, 12 Jun 2020 15:53:23 +0200
Subject: [PATCH 48/66] Translated using Weblate (French)

Currently translated at 100.0% (1286 of 1286 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
---
 www/common/translations/messages.fr.json | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index aa8d9eda7..f38f3f5ef 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -111,7 +111,7 @@
     "newButtonTitle": "Créer un nouveau pad",
     "uploadButton": "Importer des fichiers",
     "uploadFolderButton": "Importer un dossier",
-    "uploadButtonTitle": "Importer un nouveau fichier dans le dossier actuel",
+    "uploadButtonTitle": "Importer un nouveau fichier dans votre CryptDrive",
     "saveTemplateButton": "Sauver en tant que modèle",
     "saveTemplatePrompt": "Choisir un titre pour ce modèle",
     "templateSaved": "Modèle enregistré !",
@@ -147,7 +147,7 @@
     "filePicker_filter": "Filtrez les fichiers par leur nom",
     "or": "ou",
     "tags_title": "Mots-clés du pad (pour vous uniquement)",
-    "tags_add": "Modifier les mots-clés du pad",
+    "tags_add": "Modifier les mots-clés de la sélection",
     "tags_searchHint": "Commencez une recherche par # dans votre CryptDrive pour retrouver vos pads par mot-clé.",
     "tags_notShared": "Vos mots-clés ne sont pas partagés avec les autres utilisateurs",
     "tags_duplicate": "Mot-clé déjà présent : {0}",
@@ -838,7 +838,7 @@
     "help": {
         "title": "Pour bien démarrer",
         "generic": {
-            "more": "Apprenez-en davantage sur le fonctionnement de CryptPad en lisant notre <a href=\"/faq.html\" target=\"_blank\">FAQ</a>",
+            "more": "Apprenez-en davantage sur le fonctionnement de CryptPad en lisant notre <a href=\"/faq.html\" target=\"_blank\">FAQ</a>.",
             "share": "Partagez ce document avec le bouton <i class=\"fa fa-shhare-alt\"></i> <b>Partager</b> et gérez les droits d'accès avec le bouton <i class=\"fa fa-unlock-alt\"></i> <b>Accès</b>.",
             "save": "Tous les changements effectués sont enregistrés automatiquement"
         },
@@ -1379,5 +1379,8 @@
     "toolbar_theme": "Thème",
     "todo_move": "Votre liste de tâches est désormais dans le kanban <b>{0}</b> dans votre Drive.",
     "settings_safeLinkDefault": "Les liens sécurisés sont désormais activés par défaut. Veuillez utiliser le menu <i class=\"fa fa-shhare-alt\"></i> <b>Partager</b> pour copier les liens plutôt que la barre d'adresse de votre navigateur.",
-    "support_languagesPreamble": "L'équipe de support parle les langues suivantes :"
+    "support_languagesPreamble": "L'équipe de support parle les langues suivantes :",
+    "info_privacyFlavour": "<a>Description de la confidentialité</a> de vos données.",
+    "user_about": "À propos de CryptPad",
+    "info_imprintFlavour": "<a>Informations légales sur les administateurs de cette instance</a>."
 }

From 120a16ebbcf9e4222f2e50d89d913b9d53b718d0 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Fri, 12 Jun 2020 15:53:23 +0200
Subject: [PATCH 49/66] Translated using Weblate (English)

Currently translated at 100.0% (1286 of 1286 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
---
 www/common/translations/messages.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 4f3a9d157..5cad912da 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -114,7 +114,7 @@
     "newButtonTitle": "Create a new pad",
     "uploadButton": "Upload files",
     "uploadFolderButton": "Upload folder",
-    "uploadButtonTitle": "Upload a new file to the current folder",
+    "uploadButtonTitle": "Upload a new file to your CryptDrive",
     "saveTemplateButton": "Save as template",
     "saveTemplatePrompt": "Choose a title for the template",
     "templateSaved": "Template saved!",
@@ -150,7 +150,7 @@
     "filePicker_filter": "Filter files by name",
     "or": "or",
     "tags_title": "Tags (for you only)",
-    "tags_add": "Update this page's tags",
+    "tags_add": "Update the tags for selected pads",
     "tags_searchHint": "Start a search with # in your CryptDrive to find your tagged pads.",
     "tags_notShared": "Your tags are not shared with other users",
     "tags_duplicate": "Duplicate tag: {0}",

From 3bc3c45485edd4ffc37f57020607a903c8ace33b Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 12 Jun 2020 14:09:16 -0400
Subject: [PATCH 50/66] use more space for tags in the kanban UI

---
 www/kanban/app-kanban.less | 12 +++++++-----
 www/kanban/inner.js        | 34 ++++++++++++++++++++--------------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 3777fa0a6..83d66e232 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -312,22 +312,24 @@
             display: inline-flex;
             align-items: baseline;
             flex: 1;
-            max-width: 80%;
+            //max-width: 80%;
             min-width: 150px;
-
+            .cp-kanban-filterTags-toggle {
+                min-width: 100px;
+            }
             .cp-kanban-filterTags-reset {
                 cursor: pointer;
-                margin-left: 10px;
-                flex-shrink: 0;
                 .tools_unselectable();
+                font-weight: bold;
                 i {
                     margin-right: 5px;
                 }
             }
-            .cp-kanban-filterTags-name {
+            .cp-kanban-filterTags-reset, .cp-kanban-filterTags-name {
                 flex-shrink: 0;
             }
             .cp-kanban-filterTags-list {
+                margin-right: 10px;
                 margin-left: 10px;
                 display: flex;
                 flex-wrap: wrap;
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 84b7ea762..f845af6c7 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -874,14 +874,27 @@ define([
             // Tags filter
             var existing = getExistingTags(kanban.options.boards);
             var list = h('div.cp-kanban-filterTags-list');
-            var reset = h('span.cp-kanban-filterTags-reset', [h('i.fa.fa-times'), Messages.kanban_clearFilter]);
+            var reset = h('span.cp-kanban-filterTags-reset', [
+                //h('i.fa.fa-times'), // XXX creates vertical alignment issues
+                Messages.kanban_clearFilter
+            ]);
+            var hint = h('span.cp-kanban-filterTags-name', Messages.kanban_tags);
             var tags = h('div.cp-kanban-filterTags', [
-                h('span.cp-kanban-filterTags-name', Messages.kanban_tags),
+                h('span.cp-kanban-filterTags-toggle', [
+                    hint,
+                    reset,
+                ]),
                 list,
-                reset
             ]);
             var $reset = $(reset);
             var $list = $(list);
+            var $hint = $(hint);
+
+            var setTagFilterState = function (bool) {
+                $hint.css('display', bool? 'none': 'inherit');
+                $reset.css('display', bool? 'inherit': 'none');
+            };
+            setTagFilterState();
 
             var getTags = function () {
                 return $list.find('span.active').map(function () {
@@ -890,11 +903,7 @@ define([
             };
             var commitTags = function () {
                 var t = getTags();
-                if (t.length) {
-                    $reset.css('visibility', '');
-                } else {
-                    $reset.css('visibility', 'hidden');
-                }
+                setTagFilterState(t.length);
                 //framework._.sfCommon.setPadAttribute('tagsFilter', t);
                 kanban.options.tags = t;
                 kanban.setBoards(kanban.options.boards);
@@ -938,14 +947,11 @@ define([
                         return $(this).data('tag') === t;
                     }).addClass('active');
                 });
-                if (tags.length) {
-                    $reset.css('visibility', '');
-                } else {
-                    $reset.css('visibility', 'hidden');
-                }
+                setTagFilterState(tags.length);
                 //framework._.sfCommon.setPadAttribute('tagsFilter', tags);
             };
-            $reset.css('visibility', 'hidden').click(function () {
+            setTagFilterState();
+            $reset.click(function () {
                 setTags([]);
                 commitTags();
             });

From 3d4821c7a219611bbe435d9eed1bad3e3d119df4 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Fri, 12 Jun 2020 23:13:48 +0200
Subject: [PATCH 51/66] Added translation using Weblate (Arabic)

---
 www/common/translations/messages.ar.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 www/common/translations/messages.ar.json

diff --git a/www/common/translations/messages.ar.json b/www/common/translations/messages.ar.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/www/common/translations/messages.ar.json
@@ -0,0 +1 @@
+{}

From f32cb251c78b38298edc8ee277844a64d24a20ce Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Fri, 12 Jun 2020 23:13:48 +0200
Subject: [PATCH 52/66] Translated using Weblate (German)

Currently translated at 100.0% (1286 of 1286 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
---
 www/common/translations/messages.de.json | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json
index 01f06a9d4..0ed8f0f91 100644
--- a/www/common/translations/messages.de.json
+++ b/www/common/translations/messages.de.json
@@ -109,7 +109,7 @@
     "newButton": "Neu",
     "newButtonTitle": "Neues Pad erstellen",
     "uploadButton": "Hochladen",
-    "uploadButtonTitle": "Eine neue Datei in den aktuellen Ordner hochladen",
+    "uploadButtonTitle": "Eine neue Datei zum CryptDrive hochladen",
     "saveTemplateButton": "Als Vorlage speichern",
     "saveTemplatePrompt": "Bitte gib einen Titel für die Vorlage ein",
     "templateSaved": "Vorlage gespeichert!",
@@ -145,7 +145,7 @@
     "filePicker_filter": "Dateien nach Namen filtern",
     "or": "oder",
     "tags_title": "Tags (nur für dich)",
-    "tags_add": "Die Tags dieser Seite bearbeiten",
+    "tags_add": "Tags der ausgewählten Pads bearbeiten",
     "tags_searchHint": "Beginne die Suche in deinem CryptDrive mit #, um getaggte Dokumente zu finden.",
     "tags_notShared": "Deine Tags werden nicht mit anderen Benutzern geteilt",
     "tags_duplicate": "Doppeltes Tag: {0}",
@@ -831,7 +831,7 @@
     "help": {
         "title": "Mit CryptPad anfangen",
         "generic": {
-            "more": "Erfahre mehr über die Nutzung von CryptPad, indem du unsere <a href=\"/faq.html\" target=\"_blank\">FAQ</a> liest",
+            "more": "Erfahre mehr über die Nutzung von CryptPad, indem du unsere <a href=\"/faq.html\" target=\"_blank\">FAQ</a> liest.",
             "share": "Teile dieses Dokument mit der Schaltfläche  <i class=\"fa fa-shhare-alt\"></i> <b>Teilen</b> und verwalte die Zugriffsrechte mit <i class=\"fa fa-unlock-alt\"></i> <b>Zugriff</b>.",
             "save": "Alle Änderungen werden automatisch synchronisiert. Du musst sie also nicht selbst speichern"
         },
@@ -1379,5 +1379,8 @@
     "slide_backCol": "Hintergrundfarbe",
     "slide_textCol": "Textfarbe",
     "support_languagesPreamble": "Das Support-Team spricht die folgenden Sprachen:",
-    "settings_safeLinkDefault": "Sichere Links sind nun standardmäßig aktiviert. Bitte verwende zum Kopieren von Links das Menü <i class=\"fa fa-shhare-alt\"></i> <b>Teilen</b> und nicht die Adressleiste des Browsers."
+    "settings_safeLinkDefault": "Sichere Links sind nun standardmäßig aktiviert. Bitte verwende zum Kopieren von Links das Menü <i class=\"fa fa-shhare-alt\"></i> <b>Teilen</b> und nicht die Adressleiste des Browsers.",
+    "info_imprintFlavour": "<a>Rechtliche Informationen über die Administratoren dieses Servers</a>.",
+    "info_privacyFlavour": "Unsere <a>Datenschutzerklärung</a> beschreibt, wie wir deine Daten verarbeiten.",
+    "user_about": "Über CryptPad"
 }

From 3936eed1af79a1c09661ac5ea0993aa1c605b51f Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 15 Jun 2020 08:44:28 -0400
Subject: [PATCH 53/66] remove some extraneous text from the tagPrompt

---
 www/common/common-interface.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 4ed2f413e..4eba3755c 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -328,11 +328,7 @@ define([
         var input = dialog.textInput();
 
         var tagger = dialog.frame([
-            dialog.message([
-                Messages.tags_add,
-                h('br'),
-                Messages.tags_searchHint,
-            ]),
+            dialog.message([ Messages.tags_add ]),
             input,
             h('center', h('small', Messages.tags_notShared)),
             dialog.nav(),

From c6348f64198a5c49e8fb596b86d6b9bbd6473c1a Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 15 Jun 2020 09:13:17 -0400
Subject: [PATCH 54/66] remove a non-critical XXX note

---
 www/common/common-ui-elements.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index da66b0976..4f8ee71c5 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1569,7 +1569,6 @@ define([
                 button = $('<button>', {
                     title: Messages.printButtonTitle2,
                     'class': "fa fa-print cp-toolbar-icon-print",
-                // XXX people don't realize this does PDF (https://github.com/xwiki-labs/cryptpad/issues/357#issuecomment-640711724)
                 }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.printText));
                 break;
             case 'history':

From 9cb9362187cab1f806341dabdb9cb199e32fc60c Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 15 Jun 2020 15:16:33 +0200
Subject: [PATCH 55/66] Kanban filter UI

---
 www/kanban/app-kanban.less | 29 +++++++++++++++++++++++------
 www/kanban/inner.js        |  8 ++++----
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 83d66e232..663e295f1 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -3,6 +3,7 @@
 @import (reference) "../../customize/src/less2/include/tools.less";
 @import (reference) "../../customize/src/less2/include/markdown.less";
 @import (reference) "../../customize/src/less2/include/avatar.less";
+@import (reference) "../../customize/src/less2/include/buttons.less";
 
 // body
 &.cp-app-kanban {
@@ -309,30 +310,46 @@
         position: relative;
         min-height: 50px;
         .cp-kanban-filterTags {
+            .buttons_main();
             display: inline-flex;
-            align-items: baseline;
+            align-items: center;
             flex: 1;
             //max-width: 80%;
             min-width: 150px;
             .cp-kanban-filterTags-toggle {
                 min-width: 100px;
+                display: flex;
+                flex-flow: column;
+                flex-shrink: 0;
+                & > * {
+                    visibility: hidden;
+                }
+                & > span {
+                    display: inline-block;
+                    height: 38px;
+                    line-height: 38px;
+                }
+                & > button {
+                    margin-top: -38px;
+                }
             }
-            .cp-kanban-filterTags-reset {
+            button.cp-kanban-filterTags-reset {
                 cursor: pointer;
-                .tools_unselectable();
+                white-space: normal !important;
                 font-weight: bold;
+                .tools_unselectable();
                 i {
                     margin-right: 5px;
                 }
             }
-            .cp-kanban-filterTags-reset, .cp-kanban-filterTags-name {
-                flex-shrink: 0;
-            }
             .cp-kanban-filterTags-list {
                 margin-right: 10px;
                 margin-left: 10px;
                 display: flex;
                 flex-wrap: wrap;
+                &:not(:empty) {
+                    margin-top: -5px;
+                }
                 em {
                     font-size: 14px;
                     color: lighten(@cryptpad_text_col, 10%);
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index f845af6c7..56b4356c4 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -874,8 +874,8 @@ define([
             // Tags filter
             var existing = getExistingTags(kanban.options.boards);
             var list = h('div.cp-kanban-filterTags-list');
-            var reset = h('span.cp-kanban-filterTags-reset', [
-                //h('i.fa.fa-times'), // XXX creates vertical alignment issues
+            var reset = h('button.btn.btn-secondary.cp-kanban-filterTags-reset', [
+                h('i.fa.fa-times'),
                 Messages.kanban_clearFilter
             ]);
             var hint = h('span.cp-kanban-filterTags-name', Messages.kanban_tags);
@@ -891,8 +891,8 @@ define([
             var $hint = $(hint);
 
             var setTagFilterState = function (bool) {
-                $hint.css('display', bool? 'none': 'inherit');
-                $reset.css('display', bool? 'inherit': 'none');
+                $hint.css('visibility', bool? 'hidden': 'visible');
+                $reset.css('visibility', bool? 'visible': 'hidden');
             };
             setTagFilterState();
 

From d166e6b481dca20ed8ad35400f7d72f4f428573a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 15 Jun 2020 14:26:40 +0100
Subject: [PATCH 56/66] style Clear Filter button

---
 www/kanban/app-kanban.less | 1 -
 www/kanban/inner.js        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 663e295f1..f0af6eeca 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -336,7 +336,6 @@
             button.cp-kanban-filterTags-reset {
                 cursor: pointer;
                 white-space: normal !important;
-                font-weight: bold;
                 .tools_unselectable();
                 i {
                     margin-right: 5px;
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 56b4356c4..10db6261b 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -874,7 +874,7 @@ define([
             // Tags filter
             var existing = getExistingTags(kanban.options.boards);
             var list = h('div.cp-kanban-filterTags-list');
-            var reset = h('button.btn.btn-secondary.cp-kanban-filterTags-reset', [
+            var reset = h('button.btn.btn-cancel.cp-kanban-filterTags-reset', [
                 h('i.fa.fa-times'),
                 Messages.kanban_clearFilter
             ]);

From 48deced8593512fa4fdb7538ab07d029081f81c2 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 16 Jun 2020 03:51:37 -0400
Subject: [PATCH 57/66] fix serverside index corruption

---
 lib/hk-util.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/hk-util.js b/lib/hk-util.js
index ccf8c4465..ed5f43297 100644
--- a/lib/hk-util.js
+++ b/lib/hk-util.js
@@ -325,6 +325,9 @@ const storeMessage = function (Env, channel, msg, isCp, optionalMessageHash) {
                 }
             }));
         }).nThen((waitFor) => {
+/*  TODO we can skip updating the index if there's nobody in the channel.
+    Populating it might actually be the cause of a memory leak.
+*/
             getIndex(Env, id, waitFor((err, index) => {
                 if (err) {
                     Log.warn("HK_STORE_MESSAGE_INDEX", err.stack);
@@ -340,7 +343,12 @@ const storeMessage = function (Env, channel, msg, isCp, optionalMessageHash) {
                         line: ((index.line || 0) + 1)
                     });
                 }
-                if (optionalMessageHash) {
+/*  This 'getIndex' call will construct a new index if one does not already exist.
+    If that is the case then our message will already be present and updating our offset map
+    can actually cause it to become incorrect, leading to incorrect behaviour when clients connect
+    with a lastKnownHash. We avoid this by only assigning new offsets to the map.
+*/
+                if (optionalMessageHash && typeof(index.offsetByHash[optionalMessageHash]) === 'undefined') {
                     index.offsetByHash[optionalMessageHash] = index.size;
                     index.offsets++;
                 }

From f6c6ad886348dd451dbc5fe485b6b9adca8ea685 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 16 Jun 2020 04:13:32 -0400
Subject: [PATCH 58/66] test that GET_HISTORY with a lastKnownHash includes the
 message with the specified hash

---
 scripts/tests/test-lkh.js | 116 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 scripts/tests/test-lkh.js

diff --git a/scripts/tests/test-lkh.js b/scripts/tests/test-lkh.js
new file mode 100644
index 000000000..bf6ba12bb
--- /dev/null
+++ b/scripts/tests/test-lkh.js
@@ -0,0 +1,116 @@
+/* globals process */
+var Client = require("../../lib/client");
+var Nacl = require("tweetnacl/nacl-fast");
+var nThen = require("nthen");
+var CPNetflux = require("../../www/bower_components/chainpad-netflux/chainpad-netflux");
+var Hash = require("../../www/common/common-hash");
+var Rpc = require("../../www/common/rpc");
+var HK = require("../../lib/hk-util");
+
+
+var identity = function (x) {
+    return x;
+};
+var crypto = {
+    encrypt: identity,
+    decrypt: identity,
+};
+
+var N = 2;
+var BREAK;
+
+BREAK = 1;
+
+var client;
+nThen(function (w) {
+    //console.log("Creating client");
+    Client.create(w(function (err, _client) {
+        if (err) {
+            console.error(err);
+            process.exit(1);
+        }
+        client = _client;
+    }));
+}).nThen(function (w) {
+    //console.log("Creating RPC module");
+    Rpc.createAnonymous(client.config.network, w(function (err, rpc) {
+        if (err) {
+            w.abort();
+            return void console.error('ANON_RPC_CONNECT_ERR');
+        }
+        client.anonRpc = rpc;
+    }));
+}).nThen(function (w) {
+    var done = w();
+
+    //console.log("sending random messages");
+
+    client.channel = Hash.createChannelId();
+
+    if (BREAK) {
+        CPNetflux.start({
+            //lastKnownHash: HK.getHash(client.sent[0]),
+            network: client.config.network,
+            channel: client.channel,
+            crypto: crypto,
+            noChainPad: true,
+            onReady: w(),
+            //onMessage: onMessage,
+        });
+    }
+
+    // send a few random messages to a channel
+    client.sent = [];
+    var i = N;
+    var send = function () {
+        //console.log(i);
+        if (i-- <= 0) { return void done(); }
+
+        var ciphertext = Nacl.util.encodeBase64(Nacl.randomBytes(256));
+
+        client.anonRpc.send('WRITE_PRIVATE_MESSAGE', [
+            client.channel,
+            ciphertext
+        ], function (err) {
+            if (err) { 
+                console.error(err);
+                process.exit(1);
+            }
+            client.sent.push(ciphertext);
+            console.log("sent: %s", ciphertext);
+            //setTimeout(send, 500);
+            send();
+        });
+    };
+    send();
+}).nThen(function () {
+    //process.exit(1);
+    // connect to that channel with a lastKnownHash
+    // check if the first message received has the hash that you asked for
+
+    console.log();
+
+    var lkh = HK.getHash(client.sent[0]);
+
+    var i = 0;
+    var onMessage = function (msg, user, vKey, isCp, hash /*, author */) {
+        if (i === 0 && hash !== lkh) {
+            console.error('incorrect hash: [%s]', hash);
+            process.exit(1);
+        }
+        console.log(msg);
+        if (++i >= N) {
+            process.exit(1);
+        }
+    };
+
+    CPNetflux.start({
+        lastKnownHash: lkh,
+        network: client.config.network,
+        channel: client.channel,
+        crypto: crypto,
+        noChainPad: true,
+        onMessage: onMessage,
+    });
+});
+

From 4e2fc277e0eaad5033610bd08e8eda3b09832776 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 16 Jun 2020 07:11:54 -0400
Subject: [PATCH 59/66] remove XXX notes

---
 www/common/outer/async-store.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index df2e2a710..c87edc17d 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -751,8 +751,7 @@ define([
                             force: true
                         }, waitFor());
                     }).nThen(function () {
-                        // XXX users need to login after registration if they register after account deletion (token issue?)
-                        // XXX delete block
+                        // TODO delete block
                         // Log out current worker
                         postMessage(clientId, "DELETE_ACCOUNT", token, function () {});
                         store.network.disconnect();

From 525979c5f95c9eb535803b19af7c9ca87fb1b152 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 16 Jun 2020 13:23:57 +0200
Subject: [PATCH 60/66] Fix line-height in leftside menu

---
 customize.dist/src/less2/include/leftside-menu.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/customize.dist/src/less2/include/leftside-menu.less b/customize.dist/src/less2/include/leftside-menu.less
index 4ffd2c4b8..1cf84e41b 100644
--- a/customize.dist/src/less2/include/leftside-menu.less
+++ b/customize.dist/src/less2/include/leftside-menu.less
@@ -10,7 +10,6 @@
     margin: 15px 0;
     cursor: pointer;
     height: @variables_bar-height;
-    line-height: @variables_bar-height - 10px;
     .fa, .cptools {
         display: inline-flex;
         justify-content: center;

From 07038045f3fc42bea7cb74c1b7fb713430617d91 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 16 Jun 2020 13:24:20 +0200
Subject: [PATCH 61/66] Prompt the user to refresh OO in readonly mode

---
 www/common/onlyoffice/inner.js | 49 +++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 4 deletions(-)

diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js
index 6f9c74f27..2b10e9916 100644
--- a/www/common/onlyoffice/inner.js
+++ b/www/common/onlyoffice/inner.js
@@ -506,6 +506,33 @@ define([
             }, to);
         };
 
+Messages.oo_refresh = "Refresh"; // XXX read-only corner popup when receiving remote updates
+        var refreshReadOnly = function () {
+            var cancel = h('button.cp-corner-cancel', Messages.cancel);
+            var reload = h('button.cp-corner-primary', [
+                h('i.fa.fa-refresh'),
+                Messages.oo_refresh
+            ]);
+
+            var actions = h('div', [cancel, reload]);
+            var m = UI.cornerPopup("out of date", actions, '');
+            $(reload).click(function () {
+                console.error('todo');
+                ooChannel.ready = false;
+                var lastCp = getLastCp();
+                loadLastDocument(lastCp, function () {
+                    // On error, do nothing
+                }, function (blob, type) {
+                    resetData(blob, type);
+                });
+                delete APP.refreshPopup;
+                m.delete();
+            });
+            $(cancel).click(function () {
+                delete APP.refreshPopup;
+                m.delete();
+            });
+        };
 
         var openRtChannel = function (cb) {
             if (rtChannel.ready) { return void cb(); }
@@ -529,6 +556,18 @@ define([
                         break;
                     case 'MESSAGE':
                         if (ooChannel.ready) {
+                            // In read-only mode, push the message to the queue and prompt
+                            // the user to refresh OO (without reloading the page)
+                            if (readOnly) {
+                                ooChannel.queue.push(obj.data);
+                                if (APP.refreshPopup) { return; }
+                                APP.refreshPopup = true;
+
+                                // Don't "spam" the user instantly and no more than
+                                // 1 popup every 30s
+                                setTimeout(refreshReadOnly, 30000);
+                                return;
+                            }
                             ooChannel.send(obj.data.msg);
                             ooChannel.lastHash = obj.data.hash;
                             ooChannel.cpIndex++;
@@ -986,8 +1025,10 @@ define([
                         ooChannel.queue.forEach(function (data) {
                             ooChannel.send(data.msg);
                         });
-                        var last = ooChannel.queue.pop();
-                        if (last) { ooChannel.lastHash = last.hash; }
+                        if (!readOnly) {
+                            var last = ooChannel.queue.pop();
+                            if (last) { ooChannel.lastHash = last.hash; }
+                        }
                         ooChannel.cpIndex += ooChannel.queue.length;
                         // Apply existing locks
                         deleteOfflineLocks();
@@ -1018,7 +1059,7 @@ define([
                             UI.openCustomModal(UI.dialog.customModal(div, {buttons: []}));
                             setTimeout(function () {
                                 makeCheckpoint(true);
-                            }, 1000);
+                            }, 5000);
                         }
                     }
                 }
@@ -1788,10 +1829,10 @@ define([
                 var latest = getLastCp(true);
                 var newLatest = getLastCp();
                 if (newLatest.index > latest.index) {
+                    ooChannel.queue = [];
                     var hasDrawings = checkDrawings();
                     if (hasDrawings) {
                         ooChannel.ready = false;
-                        ooChannel.queue = [];
                     }
                     // New checkpoint
                     sframeChan.query('Q_OO_SAVE', {

From 3e31d0b83e838d68d096b6075295502e9c49b7a4 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 16 Jun 2020 08:34:49 -0400
Subject: [PATCH 62/66] update changelog with latest fixes for 3.19.0

---
 CHANGELOG.md | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89c9ca5f7..a47f5e760 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,12 +23,20 @@ To update to 3.19.0 from 3.18.1:
 * We've updated the layout of the "user admin menu" which can be found in the top-right corner by clicking your avatar. It features an "About CryptPad" menu which displays the version of the instance you're using as well as some resources which are otherwise only available via the footer of static pages.
 * We often receive support tickets in languages that we don't speak, which forces us to use translation services in order to answer questions. To address this issue, we've made it possible for admins to display a notice indicating which languages they speak. An example configuration is provided in `customize.dist/application_config.js`.
 * We've integrated two PRs:
-  1. [Only list premium features when subscriptions are enabled](https://github.com/xwiki-labs/cryptpad/pull/538)
-  2. [Add privacy policy option](https://github.com/xwiki-labs/cryptpad/pull/537)
+  1. [Only list premium features when subscriptions are enabled](https://github.com/xwiki-labs/cryptpad/pull/538).
+  2. [Add privacy policy option](https://github.com/xwiki-labs/cryptpad/pull/537).
 * We found it cumbersome to add new cards to the top of our Kanban columns, since we had to create a new card at the bottom and then drag it to the top. In response, we've broken up the rather large "new card" button into two buttons, one which adds a card at the top, and another which adds a new card at the bottom.
 * We've made it easier to use tags for files in the drive:
-  1. You can now select multiple files and apply a set of tags to all of them
-  2. Hitting "enter" in an empty tag prompt field will submit the current list of tags
+  1. You can now select multiple files and apply a set of tags to all of them.
+  2. Hitting "enter" in an empty tag prompt field will submit the current list of tags.
+* We've also made a few tweaks to the kanban layout:
+  1. The "trash bar" only appears while you are actively dragging a card.
+  2. The "tag list" now takes up more of the available width, while the button to clear the currently applied tag filter has been moved to the left, replacing the "filter by tag" hint text.
+* We've received requests to enable translations for a number of languages over the last few months. The following languages are enabled on [our weblate instance](https://weblate.cryptpad.fr/projects/cryptpad/app/), but have yet to be translated.
+  * Arabic
+  * Hindi
+  * Telugu
+  * Turkish
 * Unregistered users were able to open up the "filepicker modal" in spreadsheets. It was already possible to embed an image which they'd already stored in their drive, but it was not clear why they were not able to upload a new image. We now display a disabled upload button with a tooltip to log in or register in order to upload images.
 * Finally, we've updated the styles in our presentation editor to better match our recent toolbar redesign and the mermaidjs integration.
 
@@ -40,6 +48,7 @@ To update to 3.19.0 from 3.18.1:
 * We've updated our marked.js dependency to the latest version in order to correct some minor rendering bugs.
 * Unregistered users are now redirected to the login page when they visit the support page.
 * We've removed the unsupported "rename" entry from the right-click menu in unregistered users drives.
+* After a deep investigation we found and fixed the cause of a bug in which user accounts spontaneously removed themselves from teams. A flaw in the serverside cache caused clients to load an incomplete account of the team's membership which caused the team to appear to have been deleted. Unfortunately, the client responded by removing the corrupt team credentials from their account. Our fix will prevent future corruptions, but does not restore unintentionally removed teams.
 * Lastly, we've added a "Hind" font to the spreadsheet editor which introduces basic support for Devanagari characters.
 
 # Smilodon's revenge (3.18.1)

From 38c3d05f9483897f0abc51111cb432f88045eb2a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 17 Jun 2020 15:43:33 +0200
Subject: [PATCH 63/66] Fix refresh issue with no cp in readonly onlyoffice

---
 www/common/onlyoffice/inner.js | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js
index 2b10e9916..93a49e892 100644
--- a/www/common/onlyoffice/inner.js
+++ b/www/common/onlyoffice/inner.js
@@ -122,7 +122,6 @@ define([
             if (!state && !readOnly) {
                 $('#cp-app-oo-editor').append(h('div#cp-app-oo-offline'));
             }
-            debug(state);
         };
 
         var deleteOffline = function () {
@@ -507,6 +506,7 @@ define([
         };
 
 Messages.oo_refresh = "Refresh"; // XXX read-only corner popup when receiving remote updates
+Messages.oo_refreshText = "out of date"; // XXX read-only corner popup when receiving remote updates
         var refreshReadOnly = function () {
             var cancel = h('button.cp-corner-cancel', Messages.cancel);
             var reload = h('button.cp-corner-primary', [
@@ -515,15 +515,17 @@ Messages.oo_refresh = "Refresh"; // XXX read-only corner popup when receiving re
             ]);
 
             var actions = h('div', [cancel, reload]);
-            var m = UI.cornerPopup("out of date", actions, '');
+            var m = UI.cornerPopup(Messages.oo_refreshText, actions, '');
             $(reload).click(function () {
-                console.error('todo');
                 ooChannel.ready = false;
                 var lastCp = getLastCp();
                 loadLastDocument(lastCp, function () {
-                    // On error, do nothing
-                }, function (blob, type) {
-                    resetData(blob, type);
+                    var file = getFileType();
+                    var type = common.getMetadataMgr().getPrivateData().ooType;
+                    var blob = loadInitDocument(type, true);
+                    resetData(blob, file);
+                }, function (blob, file) {
+                    resetData(blob, file);
                 });
                 delete APP.refreshPopup;
                 m.delete();
@@ -1488,6 +1490,23 @@ Messages.oo_refresh = "Refresh"; // XXX read-only corner popup when receiving re
             }, 100);
         };
 
+        var loadInitDocument = function (type, useNewDefault) {
+            var newText;
+            switch (type) {
+                case 'sheet' :
+                    newText = EmptyCell(useNewDefault);
+                    break;
+                case 'oodoc':
+                    newText = EmptyDoc();
+                    break;
+                case 'ooslide':
+                    newText = EmptySlide();
+                    break;
+                default:
+                    newText = '';
+            }
+            return new Blob([newText], {type: 'text/plain'});
+        };
         var loadLastDocument = function (lastCp, onCpError, cb) {
             ooChannel.cpIndex = lastCp.index || 0;
             var parsed = Hash.parsePadUrl(lastCp.file);
@@ -1552,7 +1571,7 @@ Messages.oo_refresh = "Refresh"; // XXX read-only corner popup when receiving re
                 default:
                     newText = '';
             }
-            var blob = new Blob([newText], {type: 'text/plain'});
+            var blob = loadInitDocument(type, useNewDefault);
             startOO(blob, file);
         };
 

From 89f1320ee3ba6ac29a24c13ad0db8839e69f3480 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 17 Jun 2020 15:45:13 +0200
Subject: [PATCH 64/66] lint compliance

---
 www/common/onlyoffice/inner.js | 105 +++++++++++++++++----------------
 1 file changed, 53 insertions(+), 52 deletions(-)

diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js
index 93a49e892..7534b552b 100644
--- a/www/common/onlyoffice/inner.js
+++ b/www/common/onlyoffice/inner.js
@@ -505,6 +505,59 @@ define([
             }, to);
         };
 
+        var loadInitDocument = function (type, useNewDefault) {
+            var newText;
+            switch (type) {
+                case 'sheet' :
+                    newText = EmptyCell(useNewDefault);
+                    break;
+                case 'oodoc':
+                    newText = EmptyDoc();
+                    break;
+                case 'ooslide':
+                    newText = EmptySlide();
+                    break;
+                default:
+                    newText = '';
+            }
+            return new Blob([newText], {type: 'text/plain'});
+        };
+        var loadLastDocument = function (lastCp, onCpError, cb) {
+            ooChannel.cpIndex = lastCp.index || 0;
+            var parsed = Hash.parsePadUrl(lastCp.file);
+            var secret = Hash.getSecrets('file', parsed.hash);
+            if (!secret || !secret.channel) { return; }
+            var hexFileName = secret.channel;
+            var fileHost = privateData.fileHost || privateData.origin;
+            var src = fileHost + Hash.getBlobPathFromHex(hexFileName);
+            var key = secret.keys && secret.keys.cryptKey;
+            var xhr = new XMLHttpRequest();
+            xhr.open('GET', src, true);
+            xhr.responseType = 'arraybuffer';
+            xhr.onload = function () {
+                if (/^4/.test('' + this.status)) {
+                    onCpError();
+                    return void console.error('XHR error', this.status);
+                }
+                var arrayBuffer = xhr.response;
+                if (arrayBuffer) {
+                    var u8 = new Uint8Array(arrayBuffer);
+                    FileCrypto.decrypt(u8, key, function (err, decrypted) {
+                        if (err) { return void console.error(err); }
+                        var blob = new Blob([decrypted.content], {type: 'plain/text'});
+                        if (cb) {
+                            return cb(blob, getFileType());
+                        }
+                        startOO(blob, getFileType());
+                    });
+                }
+            };
+            xhr.onerror = function () {
+                onCpError();
+            };
+            xhr.send(null);
+        };
+
 Messages.oo_refresh = "Refresh"; // XXX read-only corner popup when receiving remote updates
 Messages.oo_refreshText = "out of date"; // XXX read-only corner popup when receiving remote updates
         var refreshReadOnly = function () {
@@ -1490,58 +1543,6 @@ Messages.oo_refreshText = "out of date"; // XXX read-only corner popup when rece
             }, 100);
         };
 
-        var loadInitDocument = function (type, useNewDefault) {
-            var newText;
-            switch (type) {
-                case 'sheet' :
-                    newText = EmptyCell(useNewDefault);
-                    break;
-                case 'oodoc':
-                    newText = EmptyDoc();
-                    break;
-                case 'ooslide':
-                    newText = EmptySlide();
-                    break;
-                default:
-                    newText = '';
-            }
-            return new Blob([newText], {type: 'text/plain'});
-        };
-        var loadLastDocument = function (lastCp, onCpError, cb) {
-            ooChannel.cpIndex = lastCp.index || 0;
-            var parsed = Hash.parsePadUrl(lastCp.file);
-            var secret = Hash.getSecrets('file', parsed.hash);
-            if (!secret || !secret.channel) { return; }
-            var hexFileName = secret.channel;
-            var fileHost = privateData.fileHost || privateData.origin;
-            var src = fileHost + Hash.getBlobPathFromHex(hexFileName);
-            var key = secret.keys && secret.keys.cryptKey;
-            var xhr = new XMLHttpRequest();
-            xhr.open('GET', src, true);
-            xhr.responseType = 'arraybuffer';
-            xhr.onload = function () {
-                if (/^4/.test('' + this.status)) {
-                    onCpError();
-                    return void console.error('XHR error', this.status);
-                }
-                var arrayBuffer = xhr.response;
-                if (arrayBuffer) {
-                    var u8 = new Uint8Array(arrayBuffer);
-                    FileCrypto.decrypt(u8, key, function (err, decrypted) {
-                        if (err) { return void console.error(err); }
-                        var blob = new Blob([decrypted.content], {type: 'plain/text'});
-                        if (cb) {
-                            return cb(blob, getFileType());
-                        }
-                        startOO(blob, getFileType());
-                    });
-                }
-            };
-            xhr.onerror = function () {
-                onCpError();
-            };
-            xhr.send(null);
-        };
         var loadDocument = function (noCp, useNewDefault, i) {
             if (ooLoaded) { return; }
             var type = common.getMetadataMgr().getPrivateData().ooType;

From 62dabc0afc15e39b55c79639a5d8e66d1ff8acce Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 17 Jun 2020 10:20:03 -0400
Subject: [PATCH 65/66] add some XXX notes to address before the next release

---
 www/support/ui.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/www/support/ui.js b/www/support/ui.js
index e4d60e919..7449e2e07 100644
--- a/www/support/ui.js
+++ b/www/support/ui.js
@@ -66,10 +66,11 @@ define([
         var $cat = $form.find('.cp-support-form-category');
         var $title = $form.find('.cp-support-form-title');
         var $content = $form.find('.cp-support-form-msg');
+        // XXX block submission until pending uploads are complete?
         var $attachments = $form.find('.cp-support-attachments');
 
 
-        var category = $cat.val().trim();
+        var category = $cat.val().trim(); // XXX make category a required field?
         var title = $title.val().trim();
         if (!title) {
             return void UI.alert(Messages.support_formTitleError);
@@ -182,6 +183,8 @@ Messages.support_addAttachment = "Add attachment"; // XXX
             }).on('change', function (e) {
                 var files = Util.slice(e.target.files);
                 files.forEach(function (file) {
+                    // XXX validate that the href is hosted on the same instance
+                    // use relative URLs or compare it against a list or allowed domains?
                     var ev = {};
                     ev.callback = function (data) {
                         var x, a;
@@ -324,6 +327,7 @@ Messages.support_addAttachment = "Add attachment"; // XXX
             var a = h('a', {
                 href: '#'
             }, obj.name)
+            // XXX disallow remote URLs
             $(a).click(function (e) {
                 e.preventDefault();
                 ctx.common.openURL(obj.href);

From f5c710e80ae639182c9360550fd652f6489a6318 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 18 Jun 2020 06:58:28 -0400
Subject: [PATCH 66/66] lint compliance

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

diff --git a/www/support/ui.js b/www/support/ui.js
index 7449e2e07..8451cf55c 100644
--- a/www/support/ui.js
+++ b/www/support/ui.js
@@ -326,7 +326,7 @@ Messages.support_addAttachment = "Add attachment"; // XXX
             if (!obj || !obj.name || !obj.href) { return; }
             var a = h('a', {
                 href: '#'
-            }, obj.name)
+            }, obj.name);
             // XXX disallow remote URLs
             $(a).click(function (e) {
                 e.preventDefault();