From e414524eab6bfc3f06ed3cd705d67f01c9880d27 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 19 Aug 2021 16:17:59 +0530
Subject: [PATCH 001/125] refactor form results display

* improve table component reusability for the rest of the platform
* display count of empty results at the top of each section
* remove unused styles
* fix incorrect methods for counting empty answers for multi-checkbox questions
---
 customize.dist/src/less2/include/charts.less |  52 ++++++++
 www/form/app-form.less                       |  64 +---------
 www/form/inner.js                            | 120 ++++++++++---------
 3 files changed, 117 insertions(+), 119 deletions(-)

diff --git a/customize.dist/src/less2/include/charts.less b/customize.dist/src/less2/include/charts.less
index c8b983707..ea402094f 100644
--- a/customize.dist/src/less2/include/charts.less
+++ b/customize.dist/src/less2/include/charts.less
@@ -50,4 +50,56 @@
             }
         }
     }
+
+    .cp-charts-cell {
+        border: 1px solid @cp_form-border;
+        display: table-cell;
+        padding: 5px 10px;
+        background: @cp_form-bg2;
+    }
+
+   .cp-form-results-type-radio {
+        .cp-form-results-type-multiradio-data {
+            display: flex;
+            flex-flow: column;
+        }
+        .cp-form-results-type-radio-data {
+            display: table-row;
+            border: 1px solid @cp_form-border;
+            & > span {
+                .cp-charts-cell();
+            }
+        }
+    }
+
+    .cp-charts.cp-bar-table, .cp-charts.cp-text-table {
+        display: table;
+        width: 100%;
+        .cp-charts-row {
+            display: table-row;
+            border: 1px solid @cp_form-border;
+            &.full {
+                display: flex;
+                flex-flow: column;
+            }
+
+            & > span {
+                .cp-charts-cell();
+                display: table-cell;
+                &.cp-value {
+                    min-width: 200px;
+                }
+                &.cp-bar-container {
+                    width: 99%;
+                    padding: 0px;
+                    position: relative;
+                    .cp-bar {
+                        position: absolute;
+                        background: @cryptpad_color_brand;
+                        height: 100%;
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/www/form/app-form.less b/www/form/app-form.less
index 53acb92af..5ef211201 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -519,69 +519,9 @@
                 i { margin-right: 5px; }
                 background: fade(@cryptpad_text_col, 15%);
             }
-            .cp-form-results-type-text {
-                max-height: 300px;
+            .cp-form-results-contained {
+                max-height: 350px; // enough for 10 table entries
                 overflow: auto;
-                .cp-form-results-type-text-data {
-                    padding: 5px 10px;
-                    background: @cp_form-bg2;
-                    &:not(:last-child) { margin-bottom: 1px; }
-                }
-            }
-            .cp-form-results-type-textarea-data {
-                white-space: pre-wrap;
-                padding: 5px 10px;
-                background: @cp_form-bg2;
-                &:not(:last-child) { margin-bottom: 1px; }
-            }
-
-            .cp-form-results-cell() {
-                border: 1px solid @cp_form-border;
-                display: table-cell;
-                padding: 5px 10px;
-                background: @cp_form-bg2;
-            }
-
-            .cp-form-results-type-multiradio-data {
-                .cp-mr-q {
-                    font-weight: bold;
-                    padding: 5px 10px;
-                    .cp-form-results-cell();
-                }
-                &:not(:first-child) {
-                    .cp-mr-q {
-                        margin-top: 15px;
-                    }
-                }
-            }
-
-           .cp-form-results-type-radio {
-                display: table;
-                width: 100%;
-                .cp-form-results-type-multiradio-data {
-                    display: flex;
-                    flex-flow: column;
-                }
-                .cp-form-results-type-radio-data {
-                    display: table-row;
-                    border: 1px solid @cp_form-border;
-                    & > span {
-                        .cp-form-results-cell();
-                        &.cp-value {
-                            min-width: 200px;
-                        }
-                        &.cp-bar-container {
-                            width: 99%;
-                            padding: 0px;
-                            position: relative;
-                            .cp-bar {
-                                position: absolute;
-                                background: @cryptpad_color_brand;
-                                height: 100%;
-                            }
-                        }
-                    }
-                }
             }
             .cp-form-individual {
                 background: @cp_form-bg1;
diff --git a/www/form/inner.js b/www/form/inner.js
index ec329830f..cb85ae29c 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -803,10 +803,31 @@ define([
         return total;
     };
 
-    var getEmpty = function (empty) { // TODO don't include this in the scrollable area
-        if (empty) {
-            return UI.setHTML(h('div.cp-form-results-type-text-empty'), Messages._getKey('form_notAnswered', [empty]));
-        }
+    var multiAnswerSubHeading = function (content) {
+        return h('span.cp-charts-row', h('td.cp-charts-cell', {
+            colspan: 3,
+            style: 'font-weight: bold;',
+        }, content));
+    };
+
+    var getEmpty = function (empty) {
+        if (!empty) { return; }
+        var msg = UI.setHTML(h('span.cp-form-results-empty-text'), Messages._getKey('form_notAnswered', [empty]));
+        return multiAnswerSubHeading(msg);
+    };
+
+    var barGraphic = function (itemScale) {
+        return h('span.cp-bar-container', h('div.cp-bar', {
+            style: 'width: ' + (itemScale * 100) + '%',
+        }, ' '));
+    };
+
+    var barRow = function (value, count, max, showBar) {
+        return h('div.cp-charts-row', [
+            h('span.cp-value', value),
+            h('span.cp-count', count),
+            showBar? barGraphic((count / max)): undefined,
+        ]);
     };
 
     var findItem = function (items, uid) {
@@ -957,27 +978,21 @@ define([
         return Array.isArray(A)? Math.max.apply(null, A): NaN;
     };
 
-    var barGraphic = function (itemScale) {
-        return h('span.cp-bar-container', h('div.cp-bar', {
-            style: 'width: ' + (itemScale * 100) + '%',
-        }, ' '));
-    };
-
     var renderTally = function (tally, empty, showBar) {
         var rows = [];
         var counts = Util.values(tally);
         var max = arrayMax(counts);
+        if (empty) { rows.push(getEmpty(empty)); }
         Object.keys(tally).forEach(function (value) {
             var itemCount = tally[value];
             var itemScale = (itemCount / max);
 
-            rows.push(h('div.cp-form-results-type-radio-data', [
+            rows.push(h('div.cp-charts-row', [
                 h('span.cp-value', value),
                 h('span.cp-count', itemCount),
                 showBar? barGraphic(itemScale): undefined,
             ]));
         });
-        if (empty) { rows.push(getEmpty(empty)); }
         return rows;
     };
 
@@ -1015,34 +1030,35 @@ define([
                     reset: function () { $tag.val(''); }
                 };
             },
-            printResults: function (answers, uid) {
+            printResults: function (answers, uid) { // results text
                 var results = [];
                 var empty = 0;
                 var tally = {};
 
+                var isEmpty = function (answer) {
+                    console.error("EMPTY?", JSON.stringify(answer));
+                    return !answer || !answer.trim();
+                };
+
                 Object.keys(answers).forEach(function (author) {
                     var obj = answers[author];
                     var answer = obj.msg[uid];
-                    if (!answer || !answer.trim()) { return empty++; }
+                    if (isEmpty(answer)) { return empty++; }
                     Util.inc(tally, answer);
                 });
                 //var counts = Util.values(tally);
                 //var max = arrayMax(counts);
 
                 //if (max < 2) { // there are no duplicates, so just return text
+                    results.push(getEmpty(empty));
                     Object.keys(answers).forEach(function (author) {
                         var obj = answers[author];
                         var answer = obj.msg[uid];
                         if (!answer || !answer.trim()) { return empty++; }
-                        results.push(h('div.cp-form-results-type-text-data', answer));
+                        results.push(h('div.cp-charts-row', h('span.cp-value', answer)));
                     });
-                    results.push(getEmpty(empty));
-                    return h('div.cp-form-results-type-text', results);
+                    return h('div.cp-form-results-contained', h('div.cp-charts.cp-text-table', results));
                 //}
-/*
-                var rendered = renderTally(tally, empty);
-                return h('div.cp-form-results-type-text', rendered);
-*/
             },
             icon: h('i.cptools.cptools-form-text')
         },
@@ -1104,11 +1120,11 @@ define([
                     var obj = answers[author];
                     var answer = obj.msg[uid];
                     if (!answer || !answer.trim()) { return empty++; }
-                    results.push(h('div.cp-form-results-type-textarea-data', answer));
+                    results.push(h('div.cp-charts-row', h('span.cp-value', answer)));
                 });
-                results.push(getEmpty(empty));
+                results.unshift(getEmpty(empty));
 
-                return h('div.cp-form-results-type-text', results);
+                return h('div.cp-form-results-contained', h('div.cp-charts.cp-text-table', results));
             },
             icon: h('i.cptools.cptools-form-paragraph')
         },
@@ -1179,7 +1195,7 @@ define([
                 });
 
                 var rendered = renderTally(count, empty, showBars);
-                return h('div.cp-form-results-type-radio', rendered);
+                return h('div.cp-charts.cp-bar-table', rendered);
             },
             icon: h('i.cptools.cptools-form-list-radio')
         },
@@ -1285,26 +1301,17 @@ define([
                     max = arrayMax(counts);
                 });
 
+                results.push(getEmpty(empty));
                 count_keys.forEach(function (q_uid) {
                     var q = findItem(opts.items, q_uid);
                     var c = count[q_uid];
-
-                    var values = Object.keys(c).map(function (res) {
-                        var itemCount = c[res];
-                        return h('div.cp-form-results-type-radio-data', [
-                            h('span.cp-value', res),
-                            h('span.cp-count', itemCount),
-                            showBars? barGraphic((itemCount / max)): undefined,
-                        ]);
+                    results.push(multiAnswerSubHeading(q));
+                    Object.keys(c).forEach(function (res) {
+                        results.push(barRow(res, c[res], max, showBars));
                     });
-                    results.push(h('div.cp-form-results-type-multiradio-data', [
-                        h('span.cp-mr-q', q),
-                        h('span.cp-mr-value', values)
-                    ]));
                 });
-                results.push(getEmpty(empty));
 
-                return h('div.cp-form-results-type-radio', results);
+                return h('div.cp-charts.cp-bar-table', results);
             },
             exportCSV: function (answer, form) {
                 var opts = form.opts || {};
@@ -1401,7 +1408,7 @@ define([
                 });
 
                 var rendered = renderTally(count, empty, showBars);
-                return h('div.cp-form-results-type-radio', rendered);
+                return h('div.cp-charts.cp-bar-table', rendered);
             },
             icon: h('i.cptools.cptools-form-list-check')
         },
@@ -1498,10 +1505,19 @@ define([
                 var empty = 0;
                 var count = {};
                 var showBars = Boolean(content);
+
+                var isEmpty = function (answer) {
+                    if (!answer) { return true; }
+                    return !Object.keys(answer).some(function (k) {
+                        var A = answer[k];
+                        return Array.isArray(A) && A.length;
+                    });
+                };
+
                 Object.keys(answers).forEach(function (author) {
                     var obj = answers[author];
                     var answer = obj.msg[uid];
-                    if (!answer || !Object.keys(answer).length) { return empty++; }
+                    if (isEmpty(answer)) { return empty++; }
                     Object.keys(answer).forEach(function (q_uid) {
                         var c = count[q_uid] = count[q_uid] || {};
                         var res = answer[q_uid];
@@ -1520,26 +1536,17 @@ define([
                     max = arrayMax(counts);
                 });
 
+                results.push(getEmpty(empty));
                 count_keys.forEach(function (q_uid) {
                     var q = findItem(opts.items, q_uid);
                     var c = count[q_uid];
-
-                    var values = Object.keys(c).map(function (res) {
-                        var val = c[res];
-                        return h('div.cp-form-results-type-radio-data', [
-                            h('span.cp-value', res),
-                            h('span.cp-count', val),
-                            showBars? barGraphic(val / max) : undefined,
-                        ]);
+                    results.push(multiAnswerSubHeading(q));
+                    Object.keys(c).forEach(function (res) {
+                        results.push(barRow(res, c[res], max, showBars));
                     });
-                    results.push(h('div.cp-form-results-type-multiradio-data', [
-                        h('span.cp-mr-q', q),
-                        h('span.cp-mr-value', values),
-                    ]));
                 });
-                results.push(getEmpty(empty));
 
-                return h('div.cp-form-results-type-radio', results);
+                return h('div.cp-charts.cp-bar-table', results);
             },
             exportCSV: function (answer, form) {
                 var opts = form.opts || {};
@@ -1658,7 +1665,6 @@ define([
                 // results sort
                 var opts = form[uid].opts || TYPES.sort.defaultOpts;
                 var l = (opts.values || []).length;
-                //var results = [];
                 var empty = 0;
                 var count = {};
                 var showBars = Boolean(content);
@@ -1673,7 +1679,7 @@ define([
                 });
 
                 var rendered = renderTally(count, empty, showBars);
-                return h('div.cp-form-results-type-radio', rendered);
+                return h('div.cp-charts.cp-bar-table', rendered);
             },
             icon: h('i.cptools.cptools-form-list-ordered')
         },

From bfdcf4ec0ce38f9e2930a8d988cc038a4f6f4df9 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 19 Aug 2021 18:20:14 +0530
Subject: [PATCH 002/125] fix user/display name rendering which I accidentally
 broke in the user admin menu

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

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 8bd0fcc32..d103fe410 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -53,6 +53,7 @@ MessengerUI, Messages, Pages) {
     var USERADMIN_CLS = Bar.constants.user = 'cp-toolbar-user-dropdown';
     var USERNAME_CLS = Bar.constants.username = 'cp-toolbar-user-name';
     /*var READONLY_CLS = */Bar.constants.readonly = 'cp-toolbar-readonly';
+    var USERBUTTON_CLS = Bar.constants.changeUsername = "cp-toolbar-user-rename";
 
     // Create the toolbar element
 
@@ -1028,6 +1029,12 @@ MessengerUI, Messages, Pages) {
         var userMenuCfg = {
             $initBlock: $userAdmin,
         };
+        if (!config.hideDisplayName) {
+            $.extend(true, userMenuCfg, {
+                displayNameCls: USERNAME_CLS,
+                changeNameButtonCls: USERBUTTON_CLS,
+            });
+        }
         if (config.readOnly !== 1) {
             userMenuCfg.displayName = 1;
             userMenuCfg.displayChangeName = 1;

From eafe27ffb46a00fa16e4ea9369c0b51e58b30dee Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 19 Aug 2021 18:21:48 +0530
Subject: [PATCH 003/125] reuse cp-charts to visualize server task running time
 as bar charts

---
 www/admin/app-admin.less | 24 +++++++++++++++++++
 www/admin/inner.js       | 52 +++++++++++++++++++++++++---------------
 2 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/www/admin/app-admin.less b/www/admin/app-admin.less
index 227792540..f66eb75f7 100644
--- a/www/admin/app-admin.less
+++ b/www/admin/app-admin.less
@@ -1,12 +1,14 @@
 @import (reference) '../../customize/src/less2/include/framework.less';
 @import (reference) '../../customize/src/less2/include/sidebar-layout.less';
 @import (reference) '../../customize/src/less2/include/support.less';
+@import (reference) '../../customize/src/less2/include/charts.less';
 
 &.cp-app-admin {
 
     .framework_min_main();
     .sidebar-layout_main();
     .support_main();
+    .charts_main();
 
     .cp-hidden {
         display: none !important;
@@ -294,5 +296,27 @@
             }
         }
     }
+    span.cp-bar.profiling-percentage {
+        text-align: center;
+        padding: 5px;
+    }
+    span.profiling-label {
+        position: absolute;
+        z-index: 1;
+        width: 100%;
+        text-align: center;
+        padding: 5px;
+    }
+    #profiling-chart {
+        .cp-bar-container {
+            max-width: 400px;
+        }
+    }
+    .width-constrained {
+        max-width: 800px;
+    }
+    .cp-charts-row.heading {
+        font-weight: bold;
+    }
 }
 
diff --git a/www/admin/inner.js b/www/admin/inner.js
index e8d567d41..63c516614 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -1673,34 +1673,51 @@ define([
         var $div = makeBlock('performance-profiling'); // Msg.admin_performanceProfilingHint, .admin_performanceProfilingTitle
 
         var onRefresh = function () {
-            var body = h('tbody');
+            var createBody = function () {
+                 return h('div#profiling-chart.cp-charts.cp-bar-table', [
+                    h('span.cp-charts-row.heading', [
+                        h('span', Messages.admin_performanceKeyHeading),
+                        h('span', Messages.admin_performanceTimeHeading),
+                        h('span', Messages.admin_performancePercentHeading),
+                        //h('span', ''), //Messages.admin_performancePercentHeading),
+                    ]),
+                ]);
+            };
 
-            var table = h('table#cp-performance-table', [
-                h('thead', [
-                    h('th', Messages.admin_performanceKeyHeading),
-                    h('th', Messages.admin_performanceTimeHeading),
-                    h('th', Messages.admin_performancePercentHeading),
-                ]),
-                body,
-            ]);
-            var appendRow = function (key, time, percent) {
-                console.log("[%s] %ss running time (%s%)", key, time, percent);
-                body.appendChild(h('tr', [ key, time, percent ].map(function (x) {
-                    return h('td', x);
-                })));
+            var body = createBody();
+            var appendRow = function (key, time, percent, scaled) {
+                //console.log("[%s] %ss running time (%s%)", key, time, percent);
+                body.appendChild(h('span.cp-charts-row', [
+                    h('span', key),
+                    h('span', time),
+                    //h('span', percent),
+                    h('span.cp-bar-container', [
+                        h('span.cp-bar.profiling-percentage', {
+                            style: 'width: ' + scaled + '%',
+                        }, ' ' ),
+                        h('span.profiling-label', percent + '%'),
+                    ]),
+                ]));
             };
             var process = function (_o) {
+                $('#profiling-chart').remove();
+                body = createBody();
                 var o = _o[0];
                 var sorted = Object.keys(o).sort(function (a, b) {
                   if (o[b] - o[a] <= 0) { return -1; }
                   return 1;
                 });
+
+                var values = sorted.map(function (k) { return o[k]; });
                 var total = 0;
-                sorted.forEach(function (k) { total += o[k]; });
+                values.forEach(function (value) { total += value; });
+                var max = Math.max.apply(null, values);
+
                 sorted.forEach(function (k) {
                     var percent = Math.floor((o[k] / total) * 1000) / 10;
-                    appendRow(k, o[k], percent);
+                    appendRow(k, o[k], percent, (o[k] / max) * 100);
                 });
+                $div.append(h('div.width-constrained', body));
             };
 
             sFrameChan.query('Q_ADMIN_RPC', {
@@ -1710,10 +1727,7 @@ define([
                     UI.warn(Messages.error);
                     return void console.error(e, data);
                 }
-                //console.info(data);
-                $div.find("table").remove();
                 process(data);
-                $div.append(table);
             });
         };
 

From 82101bcb9b16ee2a7c187f4eab310bc8789ed358 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 19 Aug 2021 21:16:49 +0530
Subject: [PATCH 004/125] use two characters for the default avatar

---
 customize.dist/src/less2/include/avatar.less  |  2 +-
 customize.dist/src/less2/include/toolbar.less |  2 +-
 www/common/inner/common-mediatag.js           | 11 ++++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/customize.dist/src/less2/include/avatar.less b/customize.dist/src/less2/include/avatar.less
index 725c7748f..02abc4050 100644
--- a/customize.dist/src/less2/include/avatar.less
+++ b/customize.dist/src/less2/include/avatar.less
@@ -4,7 +4,7 @@
     @width: 30px
 ) {
     @avatar-width: @width;
-    @avatar-font-size: @width / 1.2;
+    @avatar-font-size: @width / 1.8;
 }
 .avatar_main(@width: 30px) {
     --LessLoader_require: LessLoader_currentFile();
diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index b0f9b5e42..28b513095 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -855,7 +855,7 @@
                     span {
                         text-align: center;
                         width: 100%;
-                        font-size: 48px;
+                        font-size: 40px;
                         display: inline-flex;
                         justify-content: center;
                         align-items: center;
diff --git a/www/common/inner/common-mediatag.js b/www/common/inner/common-mediatag.js
index 1d88e1029..03d85fab0 100644
--- a/www/common/inner/common-mediatag.js
+++ b/www/common/inner/common-mediatag.js
@@ -82,7 +82,16 @@ define([
     MT.displayAvatar = function (common, $container, href, name, _cb) {
         var cb = Util.once(Util.mkAsync(_cb || function () {}));
         var displayDefault = function () {
-            var text = Util.getFirstCharacter(name || Messages.anonymous);
+            name = (name || "").trim() || Messages.anonymous;
+            var parts = name.split(/\s+/);
+            var text;
+            if (parts.length > 1) {
+                text = parts.slice(0, 2).map(Util.getFirstCharacter).join('');
+            } else {
+                text = Util.getFirstCharacter(name);
+                text += Util.getFirstCharacter(name.replace(text, ''));
+            }
+
             var $avatar = $('<span>', {'class': 'cp-avatar-default'}).text(text);
             $container.append($avatar);
             if (cb) { cb(); }

From b8c847bccef0001553cfc09724f38939dd8cd74c Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 19 Aug 2021 22:25:51 +0530
Subject: [PATCH 005/125] prototype animal avatars for guests that haven't set
 a custom name

---
 www/common/inner/common-mediatag.js | 34 ++++++++++++++++++++++++++---
 www/common/toolbar.js               |  5 +++--
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/www/common/inner/common-mediatag.js b/www/common/inner/common-mediatag.js
index 03d85fab0..2dc912e02 100644
--- a/www/common/inner/common-mediatag.js
+++ b/www/common/inner/common-mediatag.js
@@ -79,21 +79,48 @@ define([
         });
     };
 
-    MT.displayAvatar = function (common, $container, href, name, _cb) {
+    // https://emojipedia.org/nature/
+    var ANIMALS = [ '🙈', '🦀', '🐞', '🦋', '🐬', '🐋', '🐢', '🦉', '🦆', '🐧', '🦡', '🦘', '🦨', '🦦', '🦥', '🐼', '🐻', '🦝', '🦄', '🐄', '🐷', '🐐', '🦙', '🦒', '🐘', '🦏', '🐁', '🐹', '🐰', '🦫', '🦔', '🐨'];
+
+    var getRandomAnimal = function () {
+        return ANIMALS[Math.floor(Math.random() * ANIMALS.length)];
+    };
+
+    var getPseudorandomAnimal = function (seed) {
+        if (typeof(seed) !== 'string') { return getRandomAnimal(); }
+        seed = seed.replace(/\D/g, '').slice(0, 10);
+        seed = parseInt(seed);
+        if (!seed) { return getRandomAnimal(); }
+        return ANIMALS[seed % ANIMALS.length];
+    };
+
+    MT.displayAvatar = function (common, $container, href, name, _cb, uid) {
         var cb = Util.once(Util.mkAsync(_cb || function () {}));
         var displayDefault = function () {
+            if (avatars[uid]) {
+                var nodes = $.parseHTML(avatars[uid]);
+                var $el = $(nodes[0]);
+                $container.append($el);
+                return void cb($el);
+            }
+            var animal = false;
+
             name = (name || "").trim() || Messages.anonymous;
             var parts = name.split(/\s+/);
             var text;
-            if (parts.length > 1) {
+            if (name === Messages.anonymous) {
+                text =  getPseudorandomAnimal(uid);
+                animal = true;
+            } else if (parts.length > 1) {
                 text = parts.slice(0, 2).map(Util.getFirstCharacter).join('');
             } else {
                 text = Util.getFirstCharacter(name);
                 text += Util.getFirstCharacter(name.replace(text, ''));
             }
 
-            var $avatar = $('<span>', {'class': 'cp-avatar-default'}).text(text);
+            var $avatar = $('<span>', {'class': 'cp-avatar-default' + (animal? ' animal': '')}).text(text);
             $container.append($avatar);
+            avatars[uid] = $avatar[0].outerHTML;
             if (cb) { cb(); }
         };
         if (!window.Symbol) { return void displayDefault(); } // IE doesn't have Symbol
@@ -106,6 +133,7 @@ define([
             return void cb($el);
         }
 
+
         var centerImage = function ($img, $image) {
             var img = $image[0];
             var w = img.width;
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index d103fe410..791857049 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -361,9 +361,10 @@ MessengerUI, Messages, Pages) {
                     Common.openURL(origin+'/profile/#' + data.profile);
                 });
             }
-            Common.displayAvatar($span, data.avatar, name, function () {
+            console.error("AVATAR", $span, data.uid);
+            Common.displayAvatar($span, data.avatar, name, function () { // XXX pass a little more info so we can display better (pseudo-random) defaults
                 $span.append($rightCol);
-            });
+            }, data.uid);
             $span.data('uid', data.uid);
             $editUsersList.append($span);
         });

From 904e06091da39b6f56ef88382091e2411a30ff0f Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 20 Aug 2021 11:29:16 +0200
Subject: [PATCH 006/125] Fix calendar .ics import (#784)

---
 www/calendar/export.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/www/calendar/export.js b/www/calendar/export.js
index 64775762b..5967e2027 100644
--- a/www/calendar/export.js
+++ b/www/calendar/export.js
@@ -123,6 +123,7 @@ define([
                 var jcalData = ICAL.parse(content);
                 vcalendar = new ICAL.Component(jcalData);
             } catch (e) {
+                console.error(e);
                 return void cb(e);
             }
 
@@ -147,6 +148,18 @@ define([
                 var isAllDay = false;
                 var start = ev.getFirstPropertyValue('dtstart');
                 var end = ev.getFirstPropertyValue('dtend');
+                var duration = ev.getFirstPropertyValue('duration');
+                if (!end && !duration) {
+                    if (start.isDate) {
+                        end = start.clone();
+                        end.adjust(1); // Add one day
+                    } else {
+                        end = start.clone();
+                    }
+                } else if (!end) {
+                    end = start.clone();
+                    end.addDuration(duration);
+                }
                 if (start.isDate && end.isDate) {
                     isAllDay = true;
                     start = String(start);
@@ -175,7 +188,7 @@ define([
                         hidden.push(al.toString());
                     }
                     var trigger = al.getFirstPropertyValue('trigger');
-                    var minutes = -trigger.toSeconds() / 60;
+                    var minutes = trigger ? (-trigger.toSeconds() / 60) : 0;
                     if (reminders.indexOf(minutes) === -1) { reminders.push(minutes); }
                 });
 

From c5e6ca646eb0ab2868f3c2c31602537e6cbfed19 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 20 Aug 2021 15:57:14 +0530
Subject: [PATCH 007/125] adjust animal avatar caching system and adjust size
 in the toolbar

---
 customize.dist/src/less2/include/toolbar.less |  3 +++
 www/common/inner/common-mediatag.js           | 21 ++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 28b513095..d8029f0d2 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -200,6 +200,9 @@
                 .avatar_main(30px);
                 .cp-avatar-default, media-tag {
                     margin-right: 5px;
+                    &.animal {
+                        font-size: 20px;
+                    }
                 }
                 &.cp-userlist-clickable {
                     cursor: pointer;
diff --git a/www/common/inner/common-mediatag.js b/www/common/inner/common-mediatag.js
index 2dc912e02..ece9e3024 100644
--- a/www/common/inner/common-mediatag.js
+++ b/www/common/inner/common-mediatag.js
@@ -80,7 +80,7 @@ define([
     };
 
     // https://emojipedia.org/nature/
-    var ANIMALS = [ '🙈', '🦀', '🐞', '🦋', '🐬', '🐋', '🐢', '🦉', '🦆', '🐧', '🦡', '🦘', '🦨', '🦦', '🦥', '🐼', '🐻', '🦝', '🦄', '🐄', '🐷', '🐐', '🦙', '🦒', '🐘', '🦏', '🐁', '🐹', '🐰', '🦫', '🦔', '🐨'];
+    var ANIMALS = '🙈 🦀 🐞 🦋 🐬 🐋 🐢 🦉 🦆 🐧 🦡 🦘 🦨 🦦 🦥 🐼 🐻 🦝 🦓 🐄 🐷 🐐 🦙 🦒 🐘 🦏 🐁 🐹 🐰 🦫 🦔 🐨 🐱 🐺 👺 👹 👽 👾 🤖'.split(/\s+/);
 
     var getRandomAnimal = function () {
         return ANIMALS[Math.floor(Math.random() * ANIMALS.length)];
@@ -94,14 +94,13 @@ define([
         return ANIMALS[seed % ANIMALS.length];
     };
 
+    var animal_avatars = {};
     MT.displayAvatar = function (common, $container, href, name, _cb, uid) {
         var cb = Util.once(Util.mkAsync(_cb || function () {}));
         var displayDefault = function () {
-            if (avatars[uid]) {
-                var nodes = $.parseHTML(avatars[uid]);
-                var $el = $(nodes[0]);
-                $container.append($el);
-                return void cb($el);
+            var animal_avatar;
+            if (uid && animal_avatars[uid]) {
+                animal_avatar = animal_avatars[uid]
             }
             var animal = false;
 
@@ -109,7 +108,11 @@ define([
             var parts = name.split(/\s+/);
             var text;
             if (name === Messages.anonymous) {
-                text =  getPseudorandomAnimal(uid);
+                if (animal_avatar) {
+                    text = animal_avatar;
+                } else {
+                    text = animal_avatar = getPseudorandomAnimal(uid);
+                }
                 animal = true;
             } else if (parts.length > 1) {
                 text = parts.slice(0, 2).map(Util.getFirstCharacter).join('');
@@ -120,7 +123,9 @@ define([
 
             var $avatar = $('<span>', {'class': 'cp-avatar-default' + (animal? ' animal': '')}).text(text);
             $container.append($avatar);
-            avatars[uid] = $avatar[0].outerHTML;
+            if (uid && animal) {
+                animal_avatars[uid] = animal_avatar;
+            }
             if (cb) { cb(); }
         };
         if (!window.Symbol) { return void displayDefault(); } // IE doesn't have Symbol

From ff1c4c9a65971033f085957ea4c4c8c6f3786005 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 20 Aug 2021 16:02:00 +0530
Subject: [PATCH 008/125] update the calendar list when calendar removal is
 successful

also fall back to team.name when team.displayName is not available
---
 www/calendar/inner.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/www/calendar/inner.js b/www/calendar/inner.js
index 21cb12789..a1fd8c8e8 100644
--- a/www/calendar/inner.js
+++ b/www/calendar/inner.js
@@ -566,7 +566,7 @@ define([
                 attributes: {
                     'class': 'fa fa-trash-o',
                 },
-                content: h('span', Messages.kanban_delete),
+                content: h('span', Messages.kanban_delete), // XXX delete key is misleading... "Remove" ? `poll_remove`, `fc_remove`
                 action: function (e) {
                     e.stopPropagation();
                     var cal = APP.calendars[id];
@@ -586,8 +586,9 @@ define([
                         }, function (err) {
                             if (err) {
                                 console.error(err);
-                                UI.warn(Messages.error);
+                                return void UI.warn(Messages.error);
                             }
+                            renderCalendar();
                         });
                     });
                 }
@@ -722,7 +723,7 @@ define([
                 if (!calendars.length) { return; }
                 var team = privateData.teams[teamId];
                 var avatar = h('span.cp-avatar');
-                common.displayAvatar($(avatar), team.avatar, team.displayName);
+                common.displayAvatar($(avatar), team.avatar, team.displayName || team.name);
                 APP.$calendars.append(h('div.cp-calendar-team', [
                     avatar,
                     h('span.cp-name', {title: team.name}, team.name)

From f0fad8e95c005474f8a9f248d2140ed1e60ea3be Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 20 Aug 2021 16:03:59 +0530
Subject: [PATCH 009/125] avoid unnecessary use of scrollbars on sidebar apps

(settings, admin, support, ...)
---
 customize.dist/src/less2/include/sidebar-layout.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less
index ef93eae4a..1b0c75932 100644
--- a/customize.dist/src/less2/include/sidebar-layout.less
+++ b/customize.dist/src/less2/include/sidebar-layout.less
@@ -69,7 +69,7 @@
             background: @cp_sidebar-right-bg;
             color: @cp_sidebar-right-fg;
             overflow: auto;
-            padding-bottom: 200px;
+            //padding-bottom: 200px; // XXX what was the intent behind this?
 
             // Following rules are only in settings
             .cp-sidebarlayout-element {

From 0fec83b051f3c44e58b0de205b0d927261b1fe8f Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 20 Aug 2021 17:47:54 +0530
Subject: [PATCH 010/125] factor debugging data generation from support ticket
 transmission

and fix two incorrectly set width/height properties which overwrote 'appVersion'
---
 www/support/ui.js | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/www/support/ui.js b/www/support/ui.js
index fac6ef438..2f97ec412 100644
--- a/www/support/ui.js
+++ b/www/support/ui.js
@@ -10,14 +10,12 @@ define([
     '/customize/messages.js',
 ], function ($, ApiConfig, h, UI, Hash, Util, Clipboard, UIElements, Messages) {
 
-    var send = function (ctx, id, type, data, dest) {
+    var getDebuggingData = function (ctx, data) {
         var common = ctx.common;
-        var supportKey = ApiConfig.supportMailbox;
-        var supportChannel = Hash.getChannelIdFromKey(supportKey);
         var metadataMgr = common.getMetadataMgr();
-        var user = metadataMgr.getUserData();
         var privateData = metadataMgr.getPrivateData();
-
+        var user = metadataMgr.getUserData();
+        var teams = privateData.teams || {};
         data = data || {};
 
         data.sender = {
@@ -34,16 +32,12 @@ define([
             data.sender.quota = ctx.pinUsage;
         }
 
-        data.id = id;
-        data.time = +new Date();
-
-        var teams = privateData.teams || {};
         if (!ctx.isAdmin) {
             data.sender.userAgent = Util.find(window, ['navigator', 'userAgent']);
             data.sender.vendor = Util.find(window, ['navigator', 'vendor']);
             data.sender.appVersion = Util.find(window, ['navigator', 'appVersion']);
-            data.sender.appVersion = Util.find(window, ['screen', 'width']);
-            data.sender.appVersion = Util.find(window, ['screen', 'height']);
+            data.sender.screenWidth = Util.find(window, ['screen', 'width']);
+            data.sender.screenHeight = Util.find(window, ['screen', 'height']);
             data.sender.blockLocation = privateData.blockLocation || '';
             data.sender.teams = Object.keys(teams).map(function (key) {
                 var team = teams[key];
@@ -57,7 +51,25 @@ define([
                 }
                 return ret;
             }).filter(Boolean);
+        }
 
+        return data;
+    };
+
+    var send = function (ctx, id, type, data, dest) {
+        var common = ctx.common;
+        var supportKey = ApiConfig.supportMailbox;
+        var supportChannel = Hash.getChannelIdFromKey(supportKey);
+        var metadataMgr = common.getMetadataMgr();
+        var user = metadataMgr.getUserData();
+        var privateData = metadataMgr.getPrivateData();
+
+        data = getDebuggingData(ctx, data);
+
+        data.id = id;
+        data.time = +new Date();
+
+        if (!ctx.isAdmin) {
             // "dest" is the recipient that is not the admin support mailbox.
             // In the support page, make sure dest is always ourselves.
             dest.channel = privateData.support;
@@ -474,6 +486,10 @@ define([
         ui.makeCloseMessage = function (content, hash) {
             return makeCloseMessage(ctx, content, hash);
         };
+        ui.getDebuggingData = function (data) {
+            return getDebuggingData(ctx, data);
+        };
+
         return ui;
     };
 

From aef1b22291d36510ec31c755d8565671442be101 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 23 Aug 2021 16:32:25 +0530
Subject: [PATCH 011/125] console.error instead of throwing when unregistering
 handlers

---
 www/common/common-util.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/common/common-util.js b/www/common/common-util.js
index 3d2a8d0a4..fbed064dc 100644
--- a/www/common/common-util.js
+++ b/www/common/common-util.js
@@ -75,7 +75,9 @@
                 handlers.push(cb);
             },
             unreg: function (cb) {
-                if (handlers.indexOf(cb) === -1) { throw new Error("Not registered"); }
+                if (handlers.indexOf(cb) === -1) {
+                    return void console.error("event handler was already unregistered");
+                }
                 handlers.splice(handlers.indexOf(cb), 1);
             },
             fire: function () {

From 46e545a976ef9312f9aa0018aaca7dca614cedf1 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 23 Aug 2021 16:34:51 +0530
Subject: [PATCH 012/125] lint compliance

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

diff --git a/www/common/inner/common-mediatag.js b/www/common/inner/common-mediatag.js
index ece9e3024..3d4e82caf 100644
--- a/www/common/inner/common-mediatag.js
+++ b/www/common/inner/common-mediatag.js
@@ -100,7 +100,7 @@ define([
         var displayDefault = function () {
             var animal_avatar;
             if (uid && animal_avatars[uid]) {
-                animal_avatar = animal_avatars[uid]
+                animal_avatar = animal_avatars[uid];
             }
             var animal = false;
 

From 4fe19c1ea4f67c41ab4d5fc34df4ac0da47b6dec Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 23 Aug 2021 18:16:32 +0530
Subject: [PATCH 013/125] remove unnecessary example cards from default kanban
 board

---
 www/kanban/inner.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 38e933cf1..585c7c285 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -563,12 +563,12 @@ define([
                 "12": {
                     "id": 12,
                     "title": Messages.kanban_working,
-                    "item": [3, 4]
+                    "item": [],
                 },
                 "13": {
                     "id": 13,
                     "title": Messages.kanban_done,
-                    "item": [5, 6]
+                    "item": [],
                 }
             },
             items: items

From 9f52ec8dc713043cac8a41edc34acbeadb060658 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 23 Aug 2021 18:19:35 +0530
Subject: [PATCH 014/125] add new translation check to find duplicates

and move all translation scripts into a dedicated folder
---
 package.json                                  |  4 +-
 .../find-duplicate-translations.js            | 55 +++++++++++++++++++
 .../{ => translations}/lint-translations.js   |  0
 .../{ => translations}/unused-translations.js |  0
 4 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 scripts/translations/find-duplicate-translations.js
 rename scripts/{ => translations}/lint-translations.js (100%)
 rename scripts/{ => translations}/unused-translations.js (100%)

diff --git a/package.json b/package.json
index a844167f5..2d1c3f626 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
     "lint:js": "jshint --config .jshintrc --exclude-path .jshintignore .",
     "lint:server": "jshint --config .jshintrc lib",
     "lint:less": "./node_modules/lesshint/bin/lesshint -c ./.lesshintrc ./customize.dist/src/less2/",
-    "lint:translations": "node ./scripts/lint-translations.js",
-    "unused-translations": "node ./scripts/unused-translations.js",
+    "lint:translations": "node ./scripts/translations/lint-translations.js",
+    "unused-translations": "node ./scripts/translations/unused-translations.js",
     "test": "node scripts/TestSelenium.js",
     "test-rpc": "cd scripts/tests && node test-rpc",
     "template": "cd customize.dist/src && for page in ../index.html ../privacy.html ../terms.html ../contact.html ../what-is-cryptpad.html ../features.html ../../www/login/index.html ../../www/register/index.html ../../www/user/index.html;do echo $page; cp template.html $page; done;",
diff --git a/scripts/translations/find-duplicate-translations.js b/scripts/translations/find-duplicate-translations.js
new file mode 100644
index 000000000..f8b25497c
--- /dev/null
+++ b/scripts/translations/find-duplicate-translations.js
@@ -0,0 +1,55 @@
+var Util = require("../lib/common-util");
+var EN = Util.clone(require("../www/common/translations/messages.json"));
+var FR = Util.clone(require("../www/common/translations/messages.fr.json"));
+var DE = Util.clone(require("../www/common/translations/messages.de.json"));
+var JP = Util.clone(require("../www/common/translations/messages.ja.json"));
+
+var keys = Object.keys(EN);
+
+var duplicates = {};
+var addIfAbsent = function (A, e) {
+    if (A.includes(e)) { return; }
+    A.push(e);
+};
+var markDuplicate = function  (value, key1, key2) {
+    //console.log("[%s] === [%s] (%s)", key1, key2, value);
+    if (!Array.isArray(duplicates[value])) {
+        duplicates[value] = [];
+    }
+    addIfAbsent(duplicates[value], key1);
+    addIfAbsent(duplicates[value], key2);
+};
+
+keys.forEach(function (key) {
+    var value = EN[key];
+
+    //var duplicates = [];
+    keys.forEach(function (key2) {
+        if (key === key2) { return; }
+        var value2 = EN[key2];
+        if (value === value2) {
+            markDuplicate(value, key, key2);
+        }
+    });
+});
+
+// indicate which strings are duplicated and could potentially be changed to use one key
+Object.keys(duplicates).forEach(function (val) {
+    console.log('\"%s\" => %s', val, JSON.stringify(duplicates[val]));
+});
+
+// TODO iterate over all languages and
+
+// 1) check whether the same mapping exists across languages
+// ie. English has "Open" (verb) and "Open" (adjective)
+// while French has "Ouvrir" and "Ouvert(s)"
+// such keys should not be simplified/deduplicated
+
+
+
+// find instances where
+// one of the duplicated keys is not translated
+// perhaps we could automatically use the translated one everywhere
+// and improve the completeness of translations
+
+
diff --git a/scripts/lint-translations.js b/scripts/translations/lint-translations.js
similarity index 100%
rename from scripts/lint-translations.js
rename to scripts/translations/lint-translations.js
diff --git a/scripts/unused-translations.js b/scripts/translations/unused-translations.js
similarity index 100%
rename from scripts/unused-translations.js
rename to scripts/translations/unused-translations.js

From 385cd4e947aaa0494c21502fa7d92460a5b8ab2a Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 25 Aug 2021 12:05:25 +0530
Subject: [PATCH 015/125] handle single-character usernames when deriving
 initials from usernames

and use emoji avatar in user admin button
---
 www/common/common-ui-elements.js    |  7 +++++--
 www/common/inner/common-mediatag.js | 23 +++++++++++++++++------
 www/common/toolbar.js               |  2 +-
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 8315768f1..a4d84796d 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1993,9 +1993,11 @@ define([
         var loadingAvatar;
         var to;
         var oldUrl = '';
+        var oldUid = undefined;
         var updateButton = function () {
             var myData = metadataMgr.getUserData();
             var privateData = metadataMgr.getPrivateData();
+            var uid = myData.uid;
             if (!priv.plan && privateData.plan) {
                 config.$initBlock.empty();
                 metadataMgr.off('change', updateButton);
@@ -2013,15 +2015,16 @@ define([
             var newName = myData.name;
             var url = myData.avatar;
             $displayName.text(newName || Messages.anonymous);
-            if (accountName && oldUrl !== url) {
+            if ((accountName && oldUrl !== url) || !accountName && uid !== oldUid) {
                 $avatar.html('');
                 Common.displayAvatar($avatar, url,
                         newName || Messages.anonymous, function ($img) {
                     oldUrl = url;
+                    oldUid = uid;
                     $userAdmin.find('> button').removeClass('cp-avatar');
                     if ($img) { $userAdmin.find('> button').addClass('cp-avatar'); }
                     loadingAvatar = false;
-                });
+                }, uid);
                 return;
             }
             loadingAvatar = false;
diff --git a/www/common/inner/common-mediatag.js b/www/common/inner/common-mediatag.js
index 3d4e82caf..bceb314b8 100644
--- a/www/common/inner/common-mediatag.js
+++ b/www/common/inner/common-mediatag.js
@@ -94,6 +94,21 @@ define([
         return ANIMALS[seed % ANIMALS.length];
     };
 
+    var getPrettyInitials = function (name) {
+        var parts = name.split(/\s+/);
+        var text;
+        if (parts.length > 1) {
+            text = parts.slice(0, 2).map(Util.getFirstCharacter).join('');
+        } else {
+            text = Util.getFirstCharacter(name);
+            var second = Util.getFirstCharacter(name.replace(text, ''));
+            if (second && second !== '?') {
+                text += second;
+            }
+        }
+        return text;
+    };
+
     var animal_avatars = {};
     MT.displayAvatar = function (common, $container, href, name, _cb, uid) {
         var cb = Util.once(Util.mkAsync(_cb || function () {}));
@@ -105,20 +120,16 @@ define([
             var animal = false;
 
             name = (name || "").trim() || Messages.anonymous;
-            var parts = name.split(/\s+/);
             var text;
-            if (name === Messages.anonymous) {
+            if (name === Messages.anonymous && uid) {
                 if (animal_avatar) {
                     text = animal_avatar;
                 } else {
                     text = animal_avatar = getPseudorandomAnimal(uid);
                 }
                 animal = true;
-            } else if (parts.length > 1) {
-                text = parts.slice(0, 2).map(Util.getFirstCharacter).join('');
             } else {
-                text = Util.getFirstCharacter(name);
-                text += Util.getFirstCharacter(name.replace(text, ''));
+                text = getPrettyInitials(name);
             }
 
             var $avatar = $('<span>', {'class': 'cp-avatar-default' + (animal? ' animal': '')}).text(text);
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 791857049..7493d9996 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -362,7 +362,7 @@ MessengerUI, Messages, Pages) {
                 });
             }
             console.error("AVATAR", $span, data.uid);
-            Common.displayAvatar($span, data.avatar, name, function () { // XXX pass a little more info so we can display better (pseudo-random) defaults
+            Common.displayAvatar($span, data.avatar, name, function () {
                 $span.append($rightCol);
             }, data.uid);
             $span.data('uid', data.uid);

From 8d579c037645ff3b33bdb4c059b8ba1a90f7ba66 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 25 Aug 2021 12:57:24 +0530
Subject: [PATCH 016/125] Add avatars to rich text comments and mentions

---
 www/common/common-ui-elements.js | 21 ++++++++++++--------
 www/common/sframe-common.js      | 13 ++++++++++---
 www/pad/comments.js              | 33 +++++++++++++++++++++-----------
 3 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index a4d84796d..943050e62 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -3456,7 +3456,8 @@ define([
                 name: f.displayName,
                 curvePublic: f.curvePublic,
                 profile: f.profile,
-                notifications: f.notifications
+                notifications: f.notifications,
+                uid: f.uid,
             };
         });
     };
@@ -3555,7 +3556,7 @@ define([
         };
         // Set the value to receive from the autocomplete
         var toInsert = function (data, key) {
-            var name = data.name.replace(/[^a-zA-Z0-9]+/g, "-");
+            var name = (data.name.replace(/[^a-zA-Z0-9]+/g, "-") || "").trim() || Messages.anonymous; // XXX
             return "[@"+name+"|"+key+"]";
         };
 
@@ -3608,18 +3609,20 @@ define([
                     var avatar = h('span.cp-avatar', {
                         contenteditable: false
                     });
-                    common.displayAvatar($(avatar), data.avatar, data.name);
+
+                    var displayName = (data.name || "").trim() || Messages.anonymous;
+                    common.displayAvatar($(avatar), data.avatar, displayName); // XXX
                     return h('span.cp-mentions', {
                         'data-curve': data.curvePublic,
                         'data-notifications': data.notifications,
                         'data-profile': data.profile,
-                        'data-name': Util.fixHTML(data.name),
+                        'data-name': Util.fixHTML(displayName),
                         'data-avatar': data.avatar || "",
                     }, [
                         avatar,
                         h('span.cp-mentions-name', {
                             contenteditable: false
-                        }, data.name)
+                        }, displayName)
                     ]);
                 };
             }
@@ -3651,7 +3654,7 @@ define([
                     }).map(function (key) {
                         var data = sources[key];
                         return {
-                            label: data.name,
+                            label: (data.name || "").trim() || Messages.anonymous,
                             value: key
                         };
                     });
@@ -3686,10 +3689,12 @@ define([
             var obj = sources[key];
             if (!obj) { return; }
             var avatar = h('span.cp-avatar');
-            common.displayAvatar($(avatar), obj.avatar, obj.name);
+            var displayName = (obj.name || "").trim() || Messages.anonymous;
+
+            common.displayAvatar($(avatar), obj.avatar, displayName, Util.noop, obj.uid); // XXX
             var li = h('li.cp-autocomplete-value', [
                 avatar,
-                h('span', obj.name)
+                h('span', displayName),
             ]);
             return $(li).appendTo(ul);
         };
diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index 206137c86..01c48b540 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -249,11 +249,18 @@ define([
         if (existing.indexOf(n) !== -1) { n = 0; }
         return n;
     };
-    funcs.getAuthorId = function(authors, curve) {
+    funcs.getAuthorId = function(authors, curve, tokenId) {
         var existing = Object.keys(authors || {}).map(Number);
-        if (!funcs.isLoggedIn()) { return authorUid(existing); }
-
         var uid;
+        if (!funcs.isLoggedIn()) {
+            existing.some(function (id) {
+                var author = authors[id] || {};
+                if (author.uid !== tokenId) { return; }
+                uid = Number(id);
+                return true;
+            });
+            return uid || authorUid(existing);
+        }
         existing.some(function(id) {
             var author = authors[id] || {};
             if (author.curvePublic !== curve) { return; }
diff --git a/www/pad/comments.js b/www/pad/comments.js
index 6069aa1d0..6280a72bf 100644
--- a/www/pad/comments.js
+++ b/www/pad/comments.js
@@ -43,18 +43,21 @@ define([
 
     var canonicalize = function(t) { return t.replace(/\r\n/g, '\n'); };
 
-    var getAuthorId = function(Env, curve) {
-        return Env.common.getAuthorId(Env.comments.authors, curve);
+    var getAuthorId = function(Env, curve, uid) {
+        return Env.common.getAuthorId(Env.comments.authors, curve, uid);
     };
 
-    // Return the author ID  and add/update the data for registered users
-    // Return the username for unregistered users
+    // Return the author ID  and add/update user data
+    // associate data with a curvePublic for registered users and the uid otherwise
     var updateAuthorData = function(Env, onChange) {
         var userData = Env.metadataMgr.getUserData();
+        var myAuthorId;
         if (!Env.common.isLoggedIn()) {
-            return userData.name;
+            myAuthorId = getAuthorId(Env, undefined, userData.uid);
+        } else {
+            myAuthorId = getAuthorId(Env, userData.curvePublic);
         }
-        var myAuthorId = getAuthorId(Env, userData.curvePublic);
+
         var data = Env.comments.authors[myAuthorId] = Env.comments.authors[myAuthorId] || {};
         var old = Sortify(data);
         data.name = userData.name;
@@ -62,6 +65,8 @@ define([
         data.profile = userData.profile;
         data.curvePublic = userData.curvePublic;
         data.notifications = userData.notifications;
+        data.uid = userData.uid;
+
         if (typeof(onChange) === "function" && Sortify(data) !== old) {
             onChange();
         }
@@ -82,6 +87,9 @@ define([
         var userData = Env.metadataMgr.getUserData();
         var privateData = Env.metadataMgr.getPrivateData();
         var others = {};
+
+
+        // XXX mentioned users should be excluded from the list of notified recipients to avoid notifying them twice
         // Get all the other registered users with a mailbox
         thread.m.forEach(function(obj) {
             var u = obj.u;
@@ -93,7 +101,8 @@ define([
                 curvePublic: author.curvePublic,
                 comment: obj.m,
                 content: obj.v,
-                notifications: author.notifications
+                notifications: author.notifications,
+                uid: author.uid,
             };
         });
         // Send the notification
@@ -146,7 +155,7 @@ define([
             'aria-required': true,
             contenteditable: true,
         });
-        Env.common.displayAvatar($(avatar), userData.avatar, name);
+        Env.common.displayAvatar($(avatar), userData.avatar, name, Util.noop, userData.uid);
 
         var cancel = h('button.btn.btn-cancel', {
             tabindex: 1
@@ -224,7 +233,9 @@ define([
 
         if (Env.common.isLoggedIn()) {
             var authors = {};
-            Object.keys((Env.comments && Env.comments.authors) ||  {}).forEach(function(id) {
+            Object.keys((Env.comments && Env.comments.authors) ||  {})
+            .filter(function (id) { return Util.find(Env, ['commments', 'authors', id, 'curvePublic']); })
+            .forEach(function(id) {
                 var obj = Util.clone(Env.comments.authors[id]);
                 authors[obj.curvePublic] = obj;
             });
@@ -369,7 +380,7 @@ define([
                 var name = Util.fixHTML(author.name || Messages.anonymous);
                 var date = new Date(msg.t);
                 var avatar = h('span.cp-avatar');
-                Env.common.displayAvatar($(avatar), author.avatar, name);
+                Env.common.displayAvatar($(avatar), author.avatar, name, Util.noop, author.uid);
                 if (author.profile) {
                     $(avatar).click(function(e) {
                         Env.common.openURL(Hash.hashToHref(author.profile, 'profile'));
@@ -393,7 +404,7 @@ define([
                     }
                     cleanMentions($el);
                     var avatar = h('span.cp-avatar');
-                    Env.common.displayAvatar($(avatar), avatarUrl, name);
+                    Env.common.displayAvatar($(avatar), avatarUrl, name, Util.noop, author.uid);
                     $el.append([
                         avatar,
                         h('span.cp-mentions-name', name)

From c630abb3c56abd451c2968800d49e9245557533a Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 25 Aug 2021 12:59:37 +0530
Subject: [PATCH 017/125] refactor animal avatar font-size to automatically
 scale with parents

---
 customize.dist/src/less2/include/avatar.less  | 8 +++++++-
 customize.dist/src/less2/include/toolbar.less | 3 ---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/customize.dist/src/less2/include/avatar.less b/customize.dist/src/less2/include/avatar.less
index 02abc4050..079ceb60d 100644
--- a/customize.dist/src/less2/include/avatar.less
+++ b/customize.dist/src/less2/include/avatar.less
@@ -40,7 +40,13 @@
             color: @cp_avatar-fg;
             font-size: @avatar-font-size;
             font-size: var(--avatar-font-size);
-            text-transform: capitalize;
+            .animal {
+                font-size: 20px;
+                // scale animal avatar to be somewhat larger, because:
+                // 1. emojis are wider than most latin characters
+                // 2. they should occupy the width of two average characters
+                font-size: calc(var(--avatar-width) * (6/5));
+            }
         }
         media-tag {
             min-height: @avatar-width;
diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index d8029f0d2..28b513095 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -200,9 +200,6 @@
                 .avatar_main(30px);
                 .cp-avatar-default, media-tag {
                     margin-right: 5px;
-                    &.animal {
-                        font-size: 20px;
-                    }
                 }
                 &.cp-userlist-clickable {
                     cursor: pointer;

From c4fcc9f732ad3eb2b95c6291dc128d1305707c58 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 25 Aug 2021 13:03:27 +0530
Subject: [PATCH 018/125] WIP comments and non-functional changes

---
 www/common/common-ui-elements.js    | 14 +++++++++-----
 www/common/inner/common-mediatag.js |  9 +++++++--
 www/common/media-tag.js             |  1 +
 www/common/toolbar.js               |  3 ++-
 www/kanban/inner.js                 | 20 ++++++++++----------
 www/profile/inner.js                |  4 ++--
 www/slide/inner.js                  |  2 +-
 7 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 943050e62..6bb409222 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -157,8 +157,10 @@ define([
         var icons = Object.keys(users).map(function (key, i) {
             var data = users[key];
             var name = data.displayName || data.name || Messages.anonymous;
-            var avatar = h('span.cp-usergrid-avatar.cp-avatar');
-            common.displayAvatar($(avatar), data.avatar, name);
+            var avatar = h('span.cp-usergrid-avatar.cp-avatar', {
+                'aria-hidden': true, // XXX aria
+            });
+            common.displayAvatar($(avatar), data.avatar, name); // XXX
             var removeBtn, el;
             if (config.remove) {
                 removeBtn = h('span.fa.fa-times');
@@ -1989,11 +1991,11 @@ define([
 
         var $displayName = $userAdmin.find('.'+displayNameCls);
 
-        var $avatar = $userAdmin.find('> button .cp-dropdown-button-title');
+        var $avatar = $userAdmin.find('> button .cp-dropdown-button-title'); // XXX alt="User menu"
         var loadingAvatar;
         var to;
         var oldUrl = '';
-        var oldUid = undefined;
+        var oldUid;
         var updateButton = function () {
             var myData = metadataMgr.getUserData();
             var privateData = metadataMgr.getPrivateData();
@@ -2024,6 +2026,8 @@ define([
                     $userAdmin.find('> button').removeClass('cp-avatar');
                     if ($img) { $userAdmin.find('> button').addClass('cp-avatar'); }
                     loadingAvatar = false;
+
+                    // XXX alt="User menu"
                 }, uid);
                 return;
             }
@@ -2306,7 +2310,7 @@ define([
             var teams = Object.keys(privateData.teams).map(function (id) {
                 var data = privateData.teams[id];
                 var avatar = h('span.cp-creation-team-avatar.cp-avatar');
-                common.displayAvatar($(avatar), data.avatar, data.name);
+                common.displayAvatar($(avatar), data.avatar, data.name); // XXX
                 return h('div.cp-creation-team', {
                     'data-id': id,
                     title: data.name,
diff --git a/www/common/inner/common-mediatag.js b/www/common/inner/common-mediatag.js
index bceb314b8..54b20784a 100644
--- a/www/common/inner/common-mediatag.js
+++ b/www/common/inner/common-mediatag.js
@@ -132,7 +132,12 @@ define([
                 text = getPrettyInitials(name);
             }
 
-            var $avatar = $('<span>', {'class': 'cp-avatar-default' + (animal? ' animal': '')}).text(text);
+            var $avatar = $('<span>', {
+                'class': 'cp-avatar-default' + (animal? ' animal': ''),
+                // XXX prevents screenreaders from trying to describe this
+                alt: '',
+                'aria-hidden': true,
+            }).text(text);
             $container.append($avatar);
             if (uid && animal) {
                 animal_avatars[uid] = animal_avatar;
@@ -184,7 +189,7 @@ define([
                 var $img = $(mt).appendTo($container);
                 MT.displayMediatagImage(common, $img, function (err, $image) {
                     if (err) { return void console.error(err); }
-                    centerImage($img, $image);
+                    centerImage($img, $image); // XXX add alt="" (unless the media-tag has an alt attr)
                 });
             });
         }
diff --git a/www/common/media-tag.js b/www/common/media-tag.js
index 15b038724..d1a5ebcda 100644
--- a/www/common/media-tag.js
+++ b/www/common/media-tag.js
@@ -73,6 +73,7 @@ var factory = function () {
              * @param {object}   cfg     Object {Plugins, allowed, download, pdf} containing infos about plugins
              * @param {function} cb      Callback function: (err, pluginElement) => {}
              */
+             // XXX add alt attributes if present in metadata
             text: function (metadata, url, content, cfg, cb) {
                 var plainText = document.createElement('div');
                 plainText.className = "plain-text-reader";
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 7493d9996..da8b1dad0 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -356,12 +356,13 @@ MessengerUI, Messages, Pages) {
                 });
             }
             if (data.profile) {
+                // XXX title to visit their profile "Visit {0}'s profile"
+                // Messages.contacts_info3 "Double-click their icon to view their profile",
                 $span.addClass('cp-userlist-clickable');
                 $span.click(function () {
                     Common.openURL(origin+'/profile/#' + data.profile);
                 });
             }
-            console.error("AVATAR", $span, data.uid);
             Common.displayAvatar($span, data.avatar, name, function () {
                 $span.append($rightCol);
             }, data.uid);
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 38e933cf1..42b1e39fa 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -59,7 +59,7 @@ define([
     verbose = function () {}; // comment out to enable verbose logging
     var onRedraw = Util.mkEvent();
     var onCursorUpdate = Util.mkEvent();
-    var remoteCursors = {};
+    var remoteCursors = {}; // XXX
 
     var setValueAndCursor = function (input, val, _cursor) {
         if (!input) { return; }
@@ -95,7 +95,7 @@ define([
 
     var getAvatar = function (cursor, noClear) {
         // Tippy
-        var html = MT.getCursorAvatar(cursor);
+        var html = MT.getCursorAvatar(cursor); // XXX
 
         var l = Util.getFirstCharacter(cursor.name || Messages.anonymous);
 
@@ -103,10 +103,10 @@ define([
         if (cursor.color) {
             text = 'color:'+getTextColor(cursor.color)+';';
         }
-        var avatar = h('span.cp-cursor.cp-tippy-html', {
+        var avatar = h('span.cp-cursor.cp-tippy-html', { // XXX
             style: "background-color: " + (cursor.color || 'red') + ";"+text,
             'data-cptippy-html': true,
-            title: html
+            title: html, // XXX "{0} is editing"
         }, l);
         if (!noClear) {
             cursor.clear = function () {
@@ -852,7 +852,7 @@ define([
             getAvatar: getAvatar,
             openLink: openLink,
             getTags: getExistingTags,
-            cursors: remoteCursors,
+            cursors: remoteCursors, // XXX
             boards: boards,
             _boards: Util.clone(boards),
         });
@@ -1101,7 +1101,7 @@ define([
             $container.find('.kanban-edit-item').remove();
         });
 
-        var getCursor = function () {
+        var getCursor = function () { // XXX
             if (!kanban || !kanban.inEditMode) { return; }
             try {
                 var id = kanban.inEditMode;
@@ -1204,7 +1204,7 @@ define([
             var remoteContent = newContent.content;
 
             if (Sortify(currentContent) !== Sortify(remoteContent)) {
-                var cursor = getCursor();
+                var cursor = getCursor(); // XXX
                 verbose("Content is different.. Applying content");
                 kanban.options.boards = remoteContent;
                 updateBoards(framework, kanban, remoteContent);
@@ -1261,11 +1261,11 @@ define([
         });
 
         var myCursor = {};
-        onCursorUpdate.reg(function (data) {
+        onCursorUpdate.reg(function (data) { // XXX
             myCursor = data;
             framework.updateCursor();
         });
-        framework.onCursorUpdate(function (data) {
+        framework.onCursorUpdate(function (data) { // XXX
             if (!data) { return; }
             if (data.reset) {
                 Object.keys(remoteCursors).forEach(function (id) {
@@ -1293,7 +1293,7 @@ define([
             if (!cursor.item && !cursor.board) { return; }
 
             // Add new cursor
-            var avatar = getAvatar(cursor);
+            var avatar = getAvatar(cursor); // XXX
             var $item = $('.kanban-item[data-eid="'+cursor.item+'"]');
             var $board = $('.kanban-board[data-id="'+cursor.board+'"]');
             if ($item.length) {
diff --git a/www/profile/inner.js b/www/profile/inner.js
index 11abd6ae8..c63b72e99 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -349,7 +349,7 @@ define([
             $('<img>', {
                 src: '/customize/images/avatar.png',
                 title: Messages.profile_avatar,
-                alt: 'Avatar'
+                alt: 'Avatar' // XXX translate this "Default profile picture"
             }).appendTo($span);
             return;
         }
@@ -391,7 +391,7 @@ define([
                 }, function () {
                     sframeChan.query("Q_PROFILE_AVATAR_ADD", data.url, function (err, err2) {
                         if (err || err2) { return void UI.log(err || err2); }
-                        displayAvatar(data.url);
+                        displayAvatar(data.url); // XXX add "Profile picture"
                     });
                 });
             };
diff --git a/www/slide/inner.js b/www/slide/inner.js
index 9c9b9c70b..143165176 100644
--- a/www/slide/inner.js
+++ b/www/slide/inner.js
@@ -511,7 +511,7 @@ define([
                 framework.updateCursor();
             }, 500); // 500ms to make sure it is sent after chainpad sync
         };
-        framework.onCursorUpdate(CodeMirror.setRemoteCursor);
+        framework.onCursorUpdate(CodeMirror.setRemoteCursor); // XXX
         framework.setCursorGetter(CodeMirror.getCursor);
         editor.on('cursorActivity', updateCursor);
 

From 4b0cebb0fd46f0d0339320160407b2859caa42ff Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 25 Aug 2021 13:19:51 +0530
Subject: [PATCH 019/125] animal emojis in the team roster

and fall back to default username in teams when members are unnamed
in various places where it was not handled
---
 www/teams/inner.js | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/www/teams/inner.js b/www/teams/inner.js
index 373a27998..d1e383e44 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -693,6 +693,10 @@ define([
             redrawRoster(common);
         });
     };
+
+    var getDisplayName = function (name) {
+        return (typeof(name) === 'string'? name: "").trim() || Messages.anonymous;
+    };
     var makeMember = function (common, data, me, roster) {
         if (!data.curvePublic) { return; }
 
@@ -701,11 +705,12 @@ define([
             return user.role === "OWNER" && user.curvePublic !== me.curvePublic && !user.pendingOwner;
         });
 
+        var displayName = getDisplayName(data.displayName);
         // Avatar
         var avatar = h('span.cp-avatar.cp-team-member-avatar');
-        common.displayAvatar($(avatar), data.avatar, data.displayName);
+        common.displayAvatar($(avatar), data.avatar, displayName, Util.noop, data.uid);
         // Name
-        var name = h('span.cp-team-member-name', data.displayName);
+        var name = h('span.cp-team-member-name', displayName);
         if (data.pendingOwner) {
             $(name).append(h('em', {
                 title: Messages.team_pendingOwnerTitle
@@ -789,7 +794,7 @@ define([
                 title: Messages.team_rosterKick
             });
             $(remove).click(function () {
-                UI.confirm(Messages._getKey('team_kickConfirm', [Util.fixHTML(data.displayName)]), function (yes) {
+                UI.confirm(Messages._getKey('team_kickConfirm', [Util.fixHTML(displayName)]), function (yes) {
                     if (!yes) { return; }
                     APP.module.execCommand('REMOVE_USER', {
                         pending: data.pending,
@@ -1073,6 +1078,9 @@ define([
                     metadata: obj
                 }, function () {
                     $avatar.empty();
+                    // the UI is not supposed to allow admins to remove team names
+                    // so we expect that it will be there. Failing that the initials
+                    // from the default name will be displayed
                     common.displayAvatar($avatar, data.url);
                 });
             });
@@ -1191,10 +1199,11 @@ define([
 
     var displayUser = function (common, data) {
         var avatar = h('span.cp-teams-invite-from-avatar.cp-avatar');
-        common.displayAvatar($(avatar), data.avatar, data.displayName);
+        var name = getDisplayName(data.displayName);
+        common.displayAvatar($(avatar), data.avatar, name);
         return h('div.cp-teams-invite-from-author', [
             avatar,
-            h('span.cp-teams-invite-from-name', data.displayName)
+            h('span.cp-teams-invite-from-name', name)
         ]);
     };
 
@@ -1319,20 +1328,21 @@ define([
         nThen(function (waitFor) {
             // Get preview content.
             sframeChan.query('Q_ANON_GET_PREVIEW_CONTENT', { seeds: seeds }, waitFor(function (err, json) {
-                if (json && (json.error || !Object.keys(json).length)) {
+                if (json && (json.error || !Object.keys(json).length)) { // XXX team invite links are triggering this every time for me?
                     $(errorBlock).text(Messages.team_inviteInvalidLinkError).show();
                     waitFor.abort();
                     $div.empty();
                     return;
                 }
+                // XXX nothing guarantees that author, teamName, or message exist in json
                 $div.empty();
                 $div.append(h('div.cp-teams-invite-from', [
-                    Messages.team_inviteFrom || 'From:',
+                    Messages.team_inviteFrom,
                     displayUser(common, json.author)
                 ]));
                 $div.append(UI.setHTML(h('p.cp-teams-invite-to'),
                     Messages._getKey('team_inviteFromMsg',
-                    [Util.fixHTML(json.author.displayName),
+                    [Util.fixHTML(getDisplayName(json.author.displayName)),
                     Util.fixHTML(json.teamName)])));
                 if (json.message) {
                     $div.append(h('div.cp-teams-invite-message', json.message));
@@ -1449,10 +1459,10 @@ define([
             // Update the name in the user menu
             var $displayName = $bar.find('.' + Toolbar.constants.username);
             metadataMgr.onChange(function () {
-                var name = metadataMgr.getUserData().name || Messages.anonymous;
+                var name = getDisplayName(metadataMgr.getUserData().name);
                 $displayName.text(name);
             });
-            $displayName.text(user.name || Messages.anonymous);
+            $displayName.text(getDisplayName(user.name));
 
             // Load the Team module
             var onEvent = function (obj) {

From 95869b84c901ce48f69d1ad0fa49e9a6cfe31915 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 25 Aug 2021 13:38:05 +0530
Subject: [PATCH 020/125] emoji avatars in the contacts app

and handling of empty display names
---
 www/common/common-interface.js |  4 ++++
 www/common/common-messaging.js |  3 ++-
 www/common/messenger-ui.js     | 30 ++++++++++++++++++++----------
 www/teams/inner.js             |  4 +---
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 71a1ed8af..5c2431efd 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -41,6 +41,10 @@ define([
         return e;
     };
 
+    UI.getDisplayName = function (name) {
+        return (typeof(name) === 'string'? name: "").trim() || Messages.anonymous;
+    };
+
     // FIXME almost everywhere this is used would also be
     // a good candidate for sframe-common's getMediatagFromHref
     UI.mediaTag = function (src, key) {
diff --git a/www/common/common-messaging.js b/www/common/common-messaging.js
index 65f05961e..4a3eb2a91 100644
--- a/www/common/common-messaging.js
+++ b/www/common/common-messaging.js
@@ -17,7 +17,8 @@ define([
             edPublic: proxy.edPublic,
             curvePublic: proxy.curvePublic,
             notifications: Util.find(proxy, ['mailboxes', 'notifications', 'channel']),
-            avatar: proxy.profile && proxy.profile.avatar
+            avatar: proxy.profile && proxy.profile.avatar,
+            uid: proxy.uid,
         };
         if (hash === false) { delete data.channel; }
         return data;
diff --git a/www/common/messenger-ui.js b/www/common/messenger-ui.js
index 76a756a11..494001624 100644
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -190,9 +190,11 @@ define([
         markup.message = function (msg) {
             if (msg.type !== 'MSG') { return; }
             var curvePublic = msg.author;
+            // FIXME this assignment looks like it has some holes in its logic
+            // but I'm scared to touch it because it looks like it was hacked to fix some bugs
             var name = (typeof msg.name !== "undefined" || !contactsData[msg.author]) ?
                             (msg.name || Messages.anonymous) :
-                            contactsData[msg.author].displayName;
+                            contactsData[msg.author].displayName || Messages.anonymous;
             var d = msg.time ? new Date(msg.time) : undefined;
             var day = d ? d.toLocaleDateString() : '';
             var hour = d ? d.toLocaleTimeString() : '';
@@ -239,7 +241,7 @@ define([
             });
 
             var chan = state.channels[id];
-            var displayName = chan.name;
+            var displayName = UI.getDisplayName(chan.name || chan.displayName);
 
             var fetching = false;
             var $moreHistory = $(moreHistory).click(function () {
@@ -364,7 +366,7 @@ define([
                         avatars[friend.avatar] = $img[0].outerHTML;
                     }
                     $(rightCol).insertAfter($avatar);
-                });
+                }, friend.uid);
             }
 
             var sending = false;
@@ -544,7 +546,7 @@ define([
                 title: Messages.contacts_online
             });
             var rightCol = h('span.cp-app-contacts-right-col', [
-                h('span.cp-app-contacts-name', [room.name]),
+                h('span.cp-app-contacts-name', [room.isFriendChat? UI.getDisplayName(room.name): room.name]),
                 h('span.cp-app-contacts-icons', [
                     room.isFriendChat ? mute : undefined,
                     room.isFriendChat ? unmute : undefined,
@@ -609,7 +611,7 @@ define([
                         avatars[friendData.avatar] = $img[0].outerHTML;
                     }
                     $room.append(rightCol);
-                });
+                }, friendData.uid);
             }
             $room.append(status);
             return $room;
@@ -631,9 +633,9 @@ define([
             var el_message = markup.message(message);
 
             if (message.type === 'MSG') {
-                var name = typeof message.name !== "undefined" ?
-                        (message.name || Messages.anonymous) :
-                        contactsData[message.author].displayName;
+                var name = UI.getDisplayName(typeof message.name !== "undefined" ?
+                        message.name:
+                        contactsData[message.author].displayName);
                 common.notify({
                     title: name,
                     msg: message.text,
@@ -826,6 +828,11 @@ define([
             }
         };
 
+/*  The following block is for a disabled feature which allows users to switch
+    between pad chat (when in the context of a pad) and direct chats with their
+    contacts.
+*/
+/*
         common.getMetadataMgr().onTitleChange(function () {
             var padChat = common.getPadChat();
             var md = common.getMetadataMgr().getMetadata();
@@ -839,11 +846,14 @@ define([
             $lAvatar.find('.cp-avatar-default, media-tag').remove();
 
             var $div = $('<div>');
+            // There should always be a title here (defaultTitle if nothing else)
+            // so we don't ever need to supply a uid for an animal avatar
             common.displayAvatar($div, null, name, function () {
                 $mAvatar.html($div.html());
                 $lAvatar.find('.cp-app-contacts-right-col').before($div.html());
             });
         });
+*/
 
         // TODO room
         // var onJoinRoom
@@ -878,7 +888,7 @@ define([
                         h('i.fa.fa-bell'),
                         Messages.contacts_unmute || 'unmute'
                     ]);
-                    common.displayAvatar($(avatar), data.avatar, data.name);
+                    common.displayAvatar($(avatar), data.avatar, data.name, Util.noop, data.uid);
                     $(button).click(function () {
                         unmuteUser(curve, button);
                         execCommand('UNMUTE_USER', curve, function (e, data) {
@@ -894,7 +904,7 @@ define([
                     });
                     return h('div.cp-contacts-muted-user', [
                         h('span', avatar),
-                        h('span', data.name),
+                        h('span', UI.getDisplayName(data.name)),
                         button
                     ]);
                 });
diff --git a/www/teams/inner.js b/www/teams/inner.js
index d1e383e44..bd7fca5ed 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -694,9 +694,7 @@ define([
         });
     };
 
-    var getDisplayName = function (name) {
-        return (typeof(name) === 'string'? name: "").trim() || Messages.anonymous;
-    };
+    var getDisplayName = UI.getDisplayName;
     var makeMember = function (common, data, me, roster) {
         if (!data.curvePublic) { return; }
 

From 7bb3bc167cdd340ab9bb192031e39fb011b8f247 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 25 Aug 2021 15:12:28 +0530
Subject: [PATCH 021/125] use emoji avatars in share and access modals

---
 www/common/common-ui-elements.js | 36 +++++++++++++++++---------------
 www/common/inner/access.js       |  9 ++++++--
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 6bb409222..d0ef0af3f 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -156,11 +156,11 @@ define([
 
         var icons = Object.keys(users).map(function (key, i) {
             var data = users[key];
-            var name = data.displayName || data.name || Messages.anonymous;
+            var name = UI.getDisplayName(data.displayName || data.name);
             var avatar = h('span.cp-usergrid-avatar.cp-avatar', {
                 'aria-hidden': true, // XXX aria
             });
-            common.displayAvatar($(avatar), data.avatar, name); // XXX
+            common.displayAvatar($(avatar), data.avatar, name, Util.noop, data.uid);
             var removeBtn, el;
             if (config.remove) {
                 removeBtn = h('span.fa.fa-times');
@@ -2014,13 +2014,12 @@ define([
                 return;
             }
             loadingAvatar = true;
-            var newName = myData.name;
+            var newName = UI.getDisplayName(myData.name);
             var url = myData.avatar;
-            $displayName.text(newName || Messages.anonymous);
+            $displayName.text(newName);
             if ((accountName && oldUrl !== url) || !accountName && uid !== oldUid) {
                 $avatar.html('');
-                Common.displayAvatar($avatar, url,
-                        newName || Messages.anonymous, function ($img) {
+                Common.displayAvatar($avatar, url, newName, function ($img) {
                     oldUrl = url;
                     oldUid = uid;
                     $userAdmin.find('> button').removeClass('cp-avatar');
@@ -2310,7 +2309,8 @@ define([
             var teams = Object.keys(privateData.teams).map(function (id) {
                 var data = privateData.teams[id];
                 var avatar = h('span.cp-creation-team-avatar.cp-avatar');
-                common.displayAvatar($(avatar), data.avatar, data.name); // XXX
+                // We assume that teams always have a non-empty name, so we don't need a UID
+                common.displayAvatar($(avatar), data.avatar, data.name);
                 return h('div.cp-creation-team', {
                     'data-id': id,
                     title: data.name,
@@ -3113,7 +3113,7 @@ define([
         var sframeChan = common.getSframeChannel();
         var msg = data.content.msg;
 
-        var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
+        var name = Util.fixHTML(UI.getDisplayName(msg.content.user.displayName));
         var title = Util.fixHTML(msg.content.title);
 
         var text = Messages._getKey('owner_add', [name, title]);
@@ -3245,7 +3245,7 @@ define([
         var sframeChan = common.getSframeChannel();
         var msg = data.content.msg;
 
-        var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
+        var name = Util.fixHTML(UI.getDisplayName(msg.content.user.displayName));
         var title = Util.fixHTML(msg.content.title);
 
         var text = Messages._getKey('owner_team_add', [name, title]);
@@ -3360,13 +3360,15 @@ define([
         var verified = h('p');
         var $verified = $(verified);
 
+        name = UI.getDisplayName(name);
         if (priv.friends && priv.friends[curve]) {
             $verified.addClass('cp-notifications-requestedit-verified');
             var f = priv.friends[curve];
             $verified.append(h('span.fa.fa-certificate'));
             var $avatar = $(h('span.cp-avatar')).appendTo($verified);
-            $verified.append(h('p', Messages._getKey('isContact', [f.displayName])));
-            common.displayAvatar($avatar, f.avatar, f.displayName);
+            name = UI.getDisplayName(f.displayName);
+            $verified.append(h('p', Messages._getKey('isContact', [name])));
+            common.displayAvatar($avatar, f.avatar, name, Util.noop, f.uid);
         } else {
             $verified.append(Messages._getKey('isNotContact', [name]));
         }
@@ -3376,7 +3378,7 @@ define([
     UIElements.displayInviteTeamModal = function (common, data) {
         var msg = data.content.msg;
 
-        var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
+        var name = Util.fixHTML(UI.getDisplayName(msg.content.user.displayName));
         var teamName = Util.fixHTML(Util.find(msg, ['content', 'team', 'metadata', 'name']) || '');
 
         var verified = UIElements.getVerifiedFriend(common, msg.author, name);
@@ -3560,7 +3562,7 @@ define([
         };
         // Set the value to receive from the autocomplete
         var toInsert = function (data, key) {
-            var name = (data.name.replace(/[^a-zA-Z0-9]+/g, "-") || "").trim() || Messages.anonymous; // XXX
+            var name = UI.getDisplayName(data.name.replace(/[^a-zA-Z0-9]+/g, "-"));
             return "[@"+name+"|"+key+"]";
         };
 
@@ -3614,7 +3616,7 @@ define([
                         contenteditable: false
                     });
 
-                    var displayName = (data.name || "").trim() || Messages.anonymous;
+                    var displayName = UI.getDisplayName(data.name);
                     common.displayAvatar($(avatar), data.avatar, displayName); // XXX
                     return h('span.cp-mentions', {
                         'data-curve': data.curvePublic,
@@ -3658,7 +3660,7 @@ define([
                     }).map(function (key) {
                         var data = sources[key];
                         return {
-                            label: (data.name || "").trim() || Messages.anonymous,
+                            label: UI.getDisplayName(data.name),
                             value: key
                         };
                     });
@@ -3693,9 +3695,9 @@ define([
             var obj = sources[key];
             if (!obj) { return; }
             var avatar = h('span.cp-avatar');
-            var displayName = (obj.name || "").trim() || Messages.anonymous;
+            var displayName = UI.getDisplayName(obj.name);
 
-            common.displayAvatar($(avatar), obj.avatar, displayName, Util.noop, obj.uid); // XXX
+            common.displayAvatar($(avatar), obj.avatar, displayName, Util.noop, obj.uid);
             var li = h('li.cp-autocomplete-value', [
                 avatar,
                 h('span', displayName),
diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 3f281dc47..119714de3 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -171,7 +171,7 @@ define([
             if (!Object.keys(_friends).length) {
                 var friendText;
                 if (!friendKeys.length) {
-                    console.error(UIElements.noContactsMessage(common));
+                    //console.error(UIElements.noContactsMessage(common));
                     var findContacts = UIElements.noContactsMessage(common);
                     friendText = h('span.cp-app-prop-content',
                         findContacts.content
@@ -772,7 +772,8 @@ define([
                 if (friend.edPublic !== ed || c === 'me') { return; }
                 _owners[friend.edPublic] = {
                     name: friend.displayName,
-                    avatar: friend.avatar
+                    avatar: friend.avatar,
+                    uid: friend.uid,
                 };
                 return true;
             })) {
@@ -782,6 +783,10 @@ define([
             _owners[ed] = {
                 avatar: '?',
                 name: Messages.owner_unknownUser,
+                // TODO a possible enhancement is to use data from the context
+                // ie. if you have opened the access modal from within the pad
+                // its owner might be present or they might have left some data
+                // in the pad itself (as is the case of the uid in rich text comments)
             };
             strangers++;
         });

From 68efd549177bb5041dabce9170fc0bf8463182ee Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 25 Aug 2021 16:18:09 +0530
Subject: [PATCH 022/125] include uid in cursor data for animal avatars

---
 www/code/inner.js                      | 4 +++-
 www/common/inner/common-mediatag.js    | 9 +++++++--
 www/common/sframe-common-codemirror.js | 1 +
 www/slide/inner.js                     | 4 +++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/www/code/inner.js b/www/code/inner.js
index 4f6c0308e..4328f0d8f 100644
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -388,7 +388,9 @@ define([
     var andThen2 = function (editor, CodeMirror, framework, isPresentMode) {
 
         var common = framework._.sfCommon;
-        var privateData = common.getMetadataMgr().getPrivateData();
+        var metadataMgr = common.getMetadataMgr();
+        var privateData = metadataMgr.getPrivateData();
+        CodeMirror.uid = metadataMgr.getUserData().uid;
 
         var previewPane = mkPreviewPane(editor, CodeMirror, framework, isPresentMode);
         var markdownTb = mkMarkdownTb(editor, framework);
diff --git a/www/common/inner/common-mediatag.js b/www/common/inner/common-mediatag.js
index 54b20784a..5e091a83c 100644
--- a/www/common/inner/common-mediatag.js
+++ b/www/common/inner/common-mediatag.js
@@ -43,9 +43,15 @@ define([
         });
     };
 
+    var animal_avatars = {};
     MT.getCursorAvatar = function (cursor) {
+        var uid = cursor.uid;
         var html = '<span class="cp-cursor-avatar">';
-        html += (cursor.avatar && avatars[cursor.avatar]) || '';
+        if (cursor.avatar && avatars[cursor.avatar]) {
+            html += (cursor.avatar && avatars[cursor.avatar]) || '';
+        } else if (animal_avatars[uid]) {
+            html += animal_avatars[uid] + ' ';
+        }
         html += Util.fixHTML(cursor.name) + '</span>';
         return html;
     };
@@ -109,7 +115,6 @@ define([
         return text;
     };
 
-    var animal_avatars = {};
     MT.displayAvatar = function (common, $container, href, name, _cb, uid) {
         var cb = Util.once(Util.mkAsync(_cb || function () {}));
         var displayDefault = function () {
diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js
index 58475bbed..4e490288d 100644
--- a/www/common/sframe-common-codemirror.js
+++ b/www/common/sframe-common-codemirror.js
@@ -509,6 +509,7 @@ define([
             var cursor = {};
             cursor.selectionStart = cursorToPos(editor.getCursor('from'), doc);
             cursor.selectionEnd = cursorToPos(editor.getCursor('to'), doc);
+            cursor.uid = exp.uid; // FIXME this is inefficient for the network but it's unlikely to trigger errors
             return cursor;
         };
 
diff --git a/www/slide/inner.js b/www/slide/inner.js
index 143165176..9bbfc6e4d 100644
--- a/www/slide/inner.js
+++ b/www/slide/inner.js
@@ -459,7 +459,9 @@ define([
     var andThen2 = function (editor, CodeMirror, framework, isPresentMode) {
 
         var common = framework._.sfCommon;
-        var privateData = common.getMetadataMgr().getPrivateData();
+        var metadataMgr = common.getMetadataMgr();
+        var privateData = metadataMgr.getPrivateData();
+        CodeMirror.uid = metadataMgr.getUserData().uid;
 
         var $contentContainer = $('#cp-app-slide-editor');
         var $modal = $('#cp-app-slide-modal');

From fe03da5bddfc1c5aba03144bf2c8d76854c630bc Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 25 Aug 2021 17:32:10 +0200
Subject: [PATCH 023/125] Conditional answers prototype

---
 www/form/app-form.less |  36 +++
 www/form/inner.js      | 543 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 554 insertions(+), 25 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index e22f3030d..658784297 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -10,6 +10,7 @@
         @bg-color: @colortheme_apps[form]
     );
 
+
     display: flex;
     flex-flow: column;
     font: @colortheme_app-font;
@@ -161,6 +162,41 @@
                         margin-left: 5px;
                     }
                 }
+
+
+                .cp-form-conditional {
+                    .cp-form-condition {
+                        display: flex;
+                        align-items: center;
+                        justify-content: center;
+                        & > *:not(:first-child) {
+                            margin-left: 40px;
+                        }
+                        .cp-dropdown-container button {
+                            max-width: 200px;
+                            overflow: hidden;
+                            text-overflow: ellipsis;
+                            white-space: nowrap;
+                        }
+                    }
+                    .cp-form-condition-rule {
+                        padding-bottom: 20px;
+                        margin-bottom: 20px;
+                        border-bottom: 1px solid @cryptpad_text_col;
+                    }
+                }
+
+                div.cp-form-section-sortable {
+                    min-height: 300px;
+                    border: 4px dotted white; // XXX
+                    padding: 20px;
+                    background: @cp_app-bg;
+                    .cp-form-creator-add-inline {
+                        button[data-type="section"] {
+                            display: none;
+                        }
+                    }
+                }
             }
             div.cp-form-creator-content, div.cp-form-creator-results {
                 max-width: 1000px;
diff --git a/www/form/inner.js b/www/form/inner.js
index 1a776facc..f123f015d 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -74,6 +74,10 @@ define([
     var is24h = UIElements.is24h();
     var dateFormat = "Y-m-d H:i";
     var timeFormat = "H:i";
+
+    var evCheckConditions = Util.mkEvent();
+    var evShowConditions = Util.mkEvent();
+
     if (!is24h) {
         dateFormat = "Y-m-d h:i K";
         timeFormat = "h:i K";
@@ -848,6 +852,7 @@ define([
         }).filter(Boolean);
     };
 
+    Messages.form_type_section = "Conditional section"; // XXX
     var STATIC_TYPES = {
         md: {
             defaultOpts: {
@@ -964,6 +969,55 @@ define([
             printResults: function () { return; },
             icon: h('i.cptools.cptools-form-page-break')
         },
+        section: {
+            defaultOpts: {
+                questions: []
+            },
+            get: function (opts, a, n, ev, block) {
+                var sortable = h('div.cp-form-section-sortable');
+                var tag = h('div.cp-form-section-edit', [
+                    h('i.fa.fa-question'),
+                    h('span', Messages.form_type_section),
+                    h('hr'),
+                    sortable
+                ]);
+                if (APP.isEditor) {
+                    if (!opts) { opts = block.opts = STATIC_TYPES.section.defaultOpts; }
+                    Sortable.create(sortable, {
+                        group: {
+                            name: 'nested',
+                            put: function (to, from, el) {
+                                // Make sure sections dan't be dropped into other sections
+                                return $(el).attr('data-type') !== 'section';
+                            }
+                        },
+                        direction: "vertical",
+                        filter: "input, button, .CodeMirror, .cp-form-type-sort, .cp-form-block-type.editable",
+                        preventOnFilter: false,
+                        draggable: ".cp-form-block",
+                        //forceFallback: true,
+                        fallbackTolerance: 5,
+                        onStart: function () {
+                            var $container = $('div.cp-form-creator-content');
+                            $container.find('.cp-form-creator-add-inline').remove();
+                        },
+                        store: {
+                            set: function (s) {
+                                opts.questions = s.toArray();
+                                setTimeout(APP.framework.localChange);
+                                if (APP.updateAddInline) { APP.updateAddInline(); }
+                            }
+                        }
+                    });
+                }
+                return {
+                    tag: tag,
+                    noViewMode: true
+                };
+            },
+            printResults: function () { return; },
+            icon: h('i.fa.fa-question')
+        },
     };
 
     var arrayMax = function (A) {
@@ -1157,7 +1211,7 @@ define([
                 var cursorGetter;
                 var setCursorGetter = function (f) { cursorGetter = f; };
                 $(tag).find('input[type="radio"]').on('change', function () {
-                    evOnChange.fire();
+                    evOnChange.fire(false, false, true);
                 });
                 return {
                     tag: tag,
@@ -2435,6 +2489,64 @@ define([
             reset, send
         ]);
     };
+    var getSections = function (content) {
+        var uids = Object.keys(content.form).filter(function (uid) {
+            return content.form[uid].type === 'section';
+        });
+        return uids;
+    };
+    var getSectionFromQ = function (content, uid) {
+        var arr = content.order;
+        var idx = content.order.indexOf(uid);
+        if (idx === -1) { // If it's not in the main array, check in sections
+            getSections(content).some(function (_uid) {
+                var block = content.form[_uid];
+                if (!block.opts || !Array.isArray(block.opts.questions)) { return; }
+                var _idx = block.opts.questions.indexOf(uid);
+                if (_idx !== -1) {
+                    arr = block.opts.questions;
+                    idx = _idx;
+                    return true;
+                }
+            });
+        }
+
+        return {
+            arr: arr,
+            idx: idx
+        };
+    };
+    var removeQuestion = function (content, uid) {
+        delete content.form[uid];
+        var idx = content.order.indexOf(uid);
+        if (idx !== -1) {
+            content.order.splice(idx, 1);
+        } else {
+            getSections(content).some(function (_uid) {
+                var block = content.form[_uid];
+                if (!block.opts || !Array.isArray(block.opts.questions)) { return; }
+                var _idx = block.opts.questions.indexOf(uid);
+                if (_idx !== -1) {
+                    block.opts.questions.splice(_idx, 1);
+                    return true;
+                }
+            });
+        }
+    };
+    var getFullOrder = function (content) {
+        var order = content.order.slice();
+        getSections(content).forEach(function (uid) {
+            var block = content.form[uid];
+            if (!block.opts || !Array.isArray(block.opts.questions)) { return; }
+            var idx = order.indexOf(uid);
+            if (idx === -1) { return; }
+            idx++;
+            block.opts.questions.forEach(function (el, i) {
+                order.splice(idx+i, 0, el);
+            });
+        });
+        return order;
+    };
     var updateForm = function (framework, content, editable, answers, temp) {
         var $container = $('div.cp-form-creator-content');
         if (!$container.length) { return; } // Not ready
@@ -2479,28 +2591,45 @@ define([
         }
 
 
-        var getFormCreator = function (uid) {
+        var getFormCreator = function (uid, inSection) {
             if (!APP.isEditor) { return; }
             var full = !uid;
+            var arr = content.order;
             var idx = content.order.indexOf(uid);
+            if (!full) {
+                if (inSection) {
+                    var section = content.form[uid];
+                    section.opts = section.opts || STATIC_TYPES.section.opts;
+                    arr = section.opts.questions;
+                } else {
+                    var obj = getSectionFromQ(content, uid);
+                    arr = obj.arr;
+                    idx = obj.idx;
+                }
+            }
             var addControl = function (type) {
                 var btn = h('button.btn.btn-secondary', {
-                    title: full ? '' : Messages['form_type_'+type]
+                    title: full ? '' : Messages['form_type_'+type],
+                    'data-type': type
                 }, [
                     (TYPES[type] || STATIC_TYPES[type]).icon.cloneNode(),
                     full ? h('span', Messages['form_type_'+type]) : undefined
                 ]);
                 $(btn).click(function () {
                     var uid = Util.uid();
+
+                    // Make sure we can't create a section inside another one
+                    if (type === 'section' && arr !== content.order) { return; }
+
                     content.form[uid] = {
                         //q: Messages.form_default,
                         //opts: opts
                         type: type,
                     };
-                    if (full) {
-                        content.order.push(uid);
+                    if (full || inSection) {
+                        arr.push(uid);
                     } else {
-                        content.order.splice(idx, 0, uid);
+                        arr.splice(idx, 0, uid);
                     }
                     framework.localChange();
                     updateForm(framework, content, true);
@@ -2541,19 +2670,29 @@ define([
 
         };
 
-        var updateAddInline = function () {
+        var updateAddInline = APP.updateAddInline = function () {
             $container.find('.cp-form-creator-add-inline').remove();
+            // Add before existing question
             $container.find('.cp-form-block').each(function (i, el) {
                 var $el = $(el);
                 var uid = $el.attr('data-id');
                 $el.before(getFormCreator(uid));
             });
+            // Add to section
+            $container.find('.cp-form-section-sortable').each(function (i, el) {
+                var $el = $(el);
+                var uid = $el.closest('.cp-form-block').attr('data-id');
+                $el.append(getFormCreator(uid, true));
+            });
         };
 
 
         var elements = [];
         var n = 1; // Question number
-        content.order.forEach(function (uid) {
+
+        var order = getFullOrder(content);
+
+        order.forEach(function (uid, blockIdx) {
             var block = form[uid];
             var type = block.type;
             var model = TYPES[type] || STATIC_TYPES[type];
@@ -2570,7 +2709,7 @@ define([
                 name = user.name;
             }
 
-            var data = model.get(block.opts, _answers, name, evOnChange);
+            var data = model.get(block.opts, _answers, name, evOnChange, block);
             if (!data) { return; }
             data.uid = uid;
             if (answers && answers[uid] && data.setValue) { data.setValue(answers[uid]); }
@@ -2579,7 +2718,10 @@ define([
                 elements.push(data);
                 return;
             }
-
+            if (data.noViewMode && !editable) {
+                elements.push(data);
+                return;
+            }
 
             Messages.form_required = "Required"; // XXX
             var requiredTag;
@@ -2606,7 +2748,7 @@ define([
             Messages.form_required_on = "Required answer";
             Messages.form_required_off = "Optional answer";
             // Required radio displayed only for types that have an "isEmpty" function
-            var requiredDiv;
+            var requiredDiv, conditionalDiv;
             if (APP.isEditor && !isStatic && data.isEmpty) {
                 if (!block.opts) { block.opts = TYPES[type].defaultOpts; }
                 var isRequired = Boolean(block.opts.required);
@@ -2633,6 +2775,272 @@ define([
                 });
             }
 
+            if (APP.isEditor && blockIdx && type === "section") {
+                var getConditionsValues = function () {
+                    order = getFullOrder(content);
+                    var blockIdx = order.indexOf(uid);
+                    var blocks = order.slice(0, blockIdx); // Get all previous questions
+                    var values = blocks.map(function(uid) {
+                        var block = form[uid];
+                        var type = block.type;
+                        if (['radio'].indexOf(type) === -1) { return; }
+                        if (type === 'radio') {
+                            return {
+                                uid: uid,
+                                q: block.q || Messages.form_default,
+                                values: block.opts ? block.opts.values : TYPES.radio.defaultOpts.values
+                            };
+                        }
+                    }).filter(Boolean);
+                    return values;
+                };
+                Messages.form_conditional_add = "Add condition OR";
+                Messages.form_conditional_addAnd = "Add condition AND";
+                var addCondition = h('button.btn.btn-default', [
+                    h('i.fa.fa-plus'),
+                    h('span', Messages.form_conditional_add)
+                ]);
+                var $addC = $(addCondition);
+                var getConditions;
+                var getAddAndButton = function ($container, rules) {
+                    var btn = h('button.btn.btn-default.cp-form-add-and', [
+                        h('i.fa.fa-plus'),
+                        h('span', Messages.form_conditional_addAnd)
+                    ]);
+                    $(btn).click(function () {
+                        getConditions($container, true, rules);
+                    });
+                    $container.append(btn);
+                };
+                getConditions = function ($container, isNew, rules, condition) {
+                    var content = h('div.cp-form-condition');
+                    var $content = $(content);
+                    var values = getConditionsValues();
+                    var qOptions = values.map(function (obj) {
+                        return {
+                            tag: 'a',
+                            attributes: {
+                                'class': 'cp-form-condition-question',
+                                'data-value': obj.uid,
+                                'href': '#',
+                            },
+                            content: obj.q
+                        };
+                    });
+                    var qConfig = {
+                        text: '', // Button initial text
+                        options: qOptions, // Entries displayed in the menu
+                        isSelect: true,
+                        caretDown: true,
+                        buttonCls: 'btn btn-secondary'
+                    };
+                    var qSelect = UIElements.createDropdown(qConfig);
+                    Messages.form_condition_is = 'is'; // XXX
+                    Messages.form_condition_isnot = 'is not'; // XXX
+
+                    var isOn = !condition || condition.is !== 0;
+                    var iOptions = [{
+                        tag: 'a',
+                        attributes: {
+                            'data-value': 1,
+                            'href': '#',
+                        },
+                        content: Messages.form_condition_is
+                    }, {
+                        tag: 'a',
+                        attributes: {
+                            'data-value': 0,
+                            'href': '#',
+                        },
+                        content: Messages.form_condition_isnot
+                    }];
+                    var iConfig = {
+                        options: iOptions, // Entries displayed in the menu
+                        isSelect: true,
+                        caretDown: true,
+                        buttonCls: 'btn btn-secondary'
+                    };
+                    var iSelect = UIElements.createDropdown(iConfig);
+                    iSelect.setValue(isOn ? 1 : 0);
+                    $(iSelect).hide();
+
+                    $content.append(qSelect).append(iSelect);
+                    if ($container.find('button.cp-form-add-and').length) {
+                        $container.find('button.cp-form-add-and').before($content);
+                    } else {
+                        $container.append($content);
+                    }
+
+                    var isChange;
+                    qSelect.onChange.reg(function (prettyVal, val, init) {
+                        $(iSelect).show();
+                        var res;
+                        values.some(function (obj) {
+                            if (String(obj.uid) === String(val)) {
+                                res = obj.values;
+                                return true;
+                            }
+                        });
+                        $content.find('.cp-form-condition-values').remove();
+                        if (!res) { return; }
+                        var vOptions = res.map(function (str) {
+                            return {
+                                tag: 'a',
+                                attributes: {
+                                    'class': 'cp-form-condition-value',
+                                    'data-value': str,
+                                    'href': '#',
+                                },
+                                content: str
+                            };
+                        });
+                        var vConfig = {
+                            text: '', // Button initial text
+                            options: vOptions, // Entries displayed in the menu
+                            //left: true, // Open to the left of the button
+                            //container: $(type),
+                            isSelect: true,
+                            caretDown: true,
+                            buttonCls: 'btn btn-secondary'
+                        };
+                        var vSelect = UIElements.createDropdown(vConfig);
+                        vSelect.addClass('cp-form-condition-values');
+                        if ($content.find('.cp-condition-remove').length) {
+                            $content.find('.cp-condition-remove').before(vSelect);
+                        } else {
+                            $content.append(vSelect);
+                        }
+
+                        var onChange = function () {
+                            var w = block.opts.when = block.opts.when || [];
+
+                            condition = condition || {};
+                            condition.q = val;
+                            condition.is = Number(iSelect.getValue());
+                            condition.v = vSelect.getValue();
+
+                            var wasNew = isNew;
+                            if (isNew) {
+                                if (!Array.isArray(rules)) { // new set of rules (OR)
+                                    rules = [condition];
+                                    w.push(rules);
+                                    getAddAndButton($container, rules);
+                                } else {
+                                    rules.push(condition);
+                                }
+                                isNew = false;
+                            }
+
+                            framework.localChange();
+                            framework._.cpNfInner.chainpad.onSettle(function () {
+                                UI.log(Messages.saved);
+                                if (wasNew) { $addC.show(); }
+                            });
+
+                        };
+
+                        if (isChange) { iSelect.onChange.unreg(isChange); }
+                        isChange = function () {
+                            if (!vSelect.getValue()) { return; }
+                            onChange();
+                        };
+                        iSelect.onChange.reg(isChange);
+
+                        vSelect.onChange.reg(function () {
+                            if (!$content.find('.cp-condition-remove').length) {
+                                var remove = h('button.btn.btn-danger-alt.cp-condition-remove', [
+                                    h('i.fa.fa-times')
+                                ]);
+                                $(remove).click(function () {
+                                    var w = block.opts.when = block.opts.when || [];
+                                    var deleteRule = false;
+                                    if (rules.length === 1) {
+                                        var rIdx = w.indexOf(rules);
+                                        w.splice(rIdx, 1);
+                                        deleteRule = true;
+                                    } else {
+                                        var idx = rules.indexOf(condition);
+                                        rules.splice(idx, 1);
+                                    }
+                                    framework.localChange();
+                                    framework._.cpNfInner.chainpad.onSettle(function () {
+                                        if (deleteRule) {
+                                            $content.closest('.cp-form-condition-rule').remove();
+                                            return;
+                                        }
+                                        $content.remove();
+                                    });
+                                }).appendTo($content);
+                            }
+                            onChange();
+                        });
+
+                        if (condition && condition.v && init) {
+                            vSelect.setValue(condition.v);
+                            vSelect.onChange.fire(condition.v, condition.v);
+                        }
+
+                    });
+                    if (condition && condition.q) {
+                        qSelect.setValue(condition.q); // XXX check if exists? or integrity
+                        qSelect.onChange.fire(condition.q, condition.q, true);
+                    }
+
+
+                };
+                Messages.form_conditional = "Only show this question when:"; // XXX
+
+                conditionalDiv = h('div.cp-form-conditional', [
+                    h('div', Messages.form_conditional),
+                    addCondition
+                ]);
+                var $condition = $(conditionalDiv);
+                var redraw = function () {
+                    var w = block.opts.when = block.opts.when || [];
+                    w.forEach(function (rules) {
+                        var rulesC = h('div.cp-form-condition-rule');
+                        var $rulesC = $(rulesC);
+                        getAddAndButton($rulesC, rules);
+                        rules.forEach(function (obj) {
+                            getConditions($rulesC, false, rules, obj);
+                        });
+                        $addC.before($rulesC); // XXX
+                    });
+                };
+                redraw();
+
+                $addC.click(function () {
+                    $addC.hide();
+                    var rulesC = h('div.cp-form-condition-rule');
+                    var $rulesC = $(rulesC);
+                    getConditions($rulesC, true);
+                    $addC.before($rulesC);
+                });
+                if (getConditionsValues().length) {
+                    $condition.show();
+                } else {
+                    $condition.hide();
+                }
+                evShowConditions.reg(function () {
+                    if (getConditionsValues().length) {
+                        $condition.show();
+                    } else {
+                        $condition.hide();
+                    }
+                });
+                evCheckConditions.reg(function (_uid) {
+                    if (uid !== _uid) { return; }
+                    // If our conditions are invalid, redraw them
+                    if (getConditionsValues().length) {
+                        $condition.show();
+                    } else {
+                        $condition.hide();
+                    }
+                    $condition.find('.cp-form-condition-rule').remove();
+                    redraw();
+                });
+            }
+
             var changeType;
             if (editable) {
                 // Drag handle
@@ -2699,9 +3107,7 @@ define([
                     classes: 'btn-danger',
                     new: true
                 }, function () {
-                    delete content.form[uid];
-                    var idx = content.order.indexOf(uid);
-                    content.order.splice(idx, 1);
+                    removeQuestion(content, uid);
                     $('.cp-form-block[data-id="'+uid+'"]').remove();
                     framework.localChange();
                     updateAddInline();
@@ -2763,7 +3169,6 @@ define([
                         h('span', Messages['form_type_'+type])
                     ]);
 
-                    //Messages.form_changeType = "Change type"; // XXX
                     Messages.form_changeTypeConfirm = "Select the new type of this question and click OK."; // XXX
                     Messages.form_breakAnswers = "Changing the type may corrupt existing answers";
                     if (Array.isArray(model.compatible)) {
@@ -2822,13 +3227,15 @@ define([
             }
             var editableCls = editable ? ".editable" : "";
             elements.push(h('div.cp-form-block'+editableCls, {
-                'data-id':uid
+                'data-id':uid,
+                'data-type':type
             }, [
                 APP.isEditor ? dragHandle : undefined,
                 changeType,
                 isStatic ? undefined : q,
                 h('div.cp-form-block-content', [
                     APP.isEditor && !isStatic ? requiredDiv : undefined,
+                    APP.isEditor ? conditionalDiv : undefined,
                     APP.isEditor && !isStatic ? previewDiv : undefined,
                     data.tag,
                     editButtons
@@ -2896,10 +3303,40 @@ define([
         }
 
         $container.empty().append(_content);
+
+        getSections(content).forEach(function (uid) {
+            var block = content.form[uid];
+            if (!block.opts || !Array.isArray(block.opts.questions)) { return; }
+            var $block = $container.find('.cp-form-block[data-id="'+uid+'"] .cp-form-section-sortable');
+            block.opts.questions.forEach(function (_uid) {
+                $container.find('.cp-form-block[data-id="'+_uid+'"]').appendTo($block);
+            });
+        });
         updateAddInline();
 
+        // In view mode, hide sections when conditions aren't met
+        evOnChange.reg(function (reset, save, condition) {
+            if (!reset && !condition) { return; }
+            var results = getFormResults();
+            getSections(content).forEach(function (uid) {
+                var block = content.form[uid];
+                if (!block.opts || !Array.isArray(block.opts.questions) || !block.opts.when) { return; }
+                var w = block.opts.when;
+                var show = !w.length || w.some(function (rules) {
+                    return rules.every(function (rule) {
+                        return rule.is ? results[rule.q] === rule.v
+                                       : results[rule.q] !== rule.v;
+                    });
+                });
+                block.opts.questions.forEach(function (_uid) {
+                    $container.find('.cp-form-block[data-id="'+_uid+'"]').toggle(show);
+                });
+            });
+        });
+
         if (editable) {
             APP.mainSortable = Sortable.create($container[0], {
+                group: 'nested',
                 direction: "vertical",
                 filter: "input, button, .CodeMirror, .cp-form-type-sort, .cp-form-block-type.editable",
                 preventOnFilter: false,
@@ -2912,7 +3349,7 @@ define([
                 store: {
                     set: function (s) {
                         content.order = s.toArray();
-                        framework.localChange();
+                        setTimeout(framework.localChange);
                         updateAddInline();
                     }
                 }
@@ -2931,7 +3368,7 @@ define([
         // In view mode, add "Submit" and "reset" buttons
         $container.append(makeFormControls(framework, content, Boolean(answers), evOnChange));
 
-        // In view mode, tell the user and answers are forced to be anonymous or authenticated
+        // In view mode, tell the user if answers are forced to be anonymous or authenticated
         if (!APP.isEditor) {
             var infoTxt;
             var loggedIn = framework._.sfCommon.isLoggedIn();
@@ -3313,21 +3750,77 @@ define([
         var checkIntegrity = function (getter) {
             if (!content.order || !content.form) { return; }
             var changed = false;
-            content.order.forEach(function (uid) {
-                if (!content.form[uid]) {
-                    var idx = content.order.indexOf(uid);
-                    content.order.splice(idx, 1);
-                    changed = true;
-                }
+            var deduplicate = [];
+            // Check if the questions in the lists (content.order or sections) exist in
+            // content.form and remove duplicates
+            var check1 = function (arr) {
+                arr.forEach(function (uid) {
+                    if (!content.form[uid] || deduplicate.indexOf(uid) !== -1) {
+                        var idx = arr.indexOf(uid);
+                        arr.splice(idx, 1);
+                        changed = true;
+                        return;
+                    }
+                    deduplicate.push(uid);
+                });
+            };
+            check1(content.order);
+            getSections(content).forEach(function (uid) {
+                var block = content.form[uid];
+                if (!block.opts || !Array.isArray(block.opts.questions)) { return; }
+                check1(block.opts.questions);
             });
+
+            // Make sure all the questions are displayed in the main list or a section and add
+            // the missing ones
             Object.keys(content.form).forEach(function (uid) {
-                var idx = content.order.indexOf(uid);
+                var idx = deduplicate.indexOf(uid);
                 if (idx === -1) {
                     changed = true;
                     content.order.push(uid);
                 }
             });
 
+            // Check if conditions on sections are valid
+            var order = getFullOrder(content);
+            getSections(content).forEach(function (uid) {
+                var block = content.form[uid];
+                if (!block.opts || !Array.isArray(block.opts.when)) { return; }
+                var sectionIdx = order.indexOf(uid);
+                if (sectionIdx === -1) { return; }
+                var available = order.slice(0, sectionIdx);
+                var errors = false;
+                block.opts.when.forEach(function (rules) {
+                    if (!Array.isArray(rules)) {
+                        var idx = block.opts.when.indexOf(rules);
+                        block.opts.when.splice(idx, 1);
+                        errors = true;
+                        return;
+                    }
+                    rules.forEach(function (obj) {
+                        var idx = available.indexOf(obj.q);
+                        // If this question doesn't exist before the section, remove the condition
+                        if (!obj.q || idx === -1) {
+                            var cIdx = rules.indexOf(obj);
+                            rules.splice(cIdx, 1);
+                            errors = true;
+                            return;
+                        }
+                    });
+                    if (!rules.length) {
+                        var rIdx = block.opts.when.indexOf(rules);
+                        block.opts.when.splice(rIdx, 1);
+                        errors = true;
+                    }
+                });
+                if (errors) {
+                    evCheckConditions.fire(uid);
+                    changed = true;
+                }
+            });
+
+            evShowConditions.fire();
+
             if (!getter && changed) { framework.localChange(); }
         };
 

From dd8f70d6f457e2a2afa30a710139ddb16fe26417 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 26 Aug 2021 14:07:03 +0530
Subject: [PATCH 024/125] fix a bug I introduced by not preserving the base
 case of 'getAuthorId'

---
 www/common/sframe-common.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index 01c48b540..000d049b3 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -252,10 +252,12 @@ define([
     funcs.getAuthorId = function(authors, curve, tokenId) {
         var existing = Object.keys(authors || {}).map(Number);
         var uid;
-        if (!funcs.isLoggedIn()) {
+        var loggedIn = funcs.isLoggedIn();
+        if (!loggedIn && !tokenId) { return authorUid(existing); }
+        if (!loggedIn) {
             existing.some(function (id) {
-                var author = authors[id] || {};
-                if (author.uid !== tokenId) { return; }
+                var author = authors[id];
+                if (!author || author.uid !== tokenId) { return; }
                 uid = Number(id);
                 return true;
             });

From 9304d7bb2a1cee58059807edd448255ce9957326 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 26 Aug 2021 10:54:18 +0200
Subject: [PATCH 025/125] Ignore required questions in hidden sections

---
 www/form/inner.js | 183 +++++++++++++++++++++++++++++-----------------
 1 file changed, 115 insertions(+), 68 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index f123f015d..d67c23d3f 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2271,7 +2271,7 @@ define([
     var getFormResults = function () {
         if (!Array.isArray(APP.formBlocks)) { return; }
         var results = {};
-        APP.formBlocks.forEach(function (data) {
+        APP.formBlocks.some(function (data) {
             if (!data.getValue) { return; }
             results[data.uid] = data.getValue();
         });
@@ -2281,6 +2281,104 @@ define([
     Messages.form_anonAnswer = "All answers to this form are anonymous"; // XXX
     Messages.form_authAnswer = "You can't answer anonymously to this form"; // XXX
 
+    var getSections = function (content) {
+        var uids = Object.keys(content.form).filter(function (uid) {
+            return content.form[uid].type === 'section';
+        });
+        return uids;
+    };
+    var getSectionFromQ = function (content, uid) {
+        var arr = content.order;
+        var idx = content.order.indexOf(uid);
+        var sectionUid;
+        if (idx === -1) { // If it's not in the main array, check in sections
+            getSections(content).some(function (_uid) {
+                var block = content.form[_uid];
+                if (!block.opts || !Array.isArray(block.opts.questions)) { return; }
+                var _idx = block.opts.questions.indexOf(uid);
+                if (_idx !== -1) {
+                    arr = block.opts.questions;
+                    sectionUid = _uid;
+                    idx = _idx;
+                    return true;
+                }
+            });
+        }
+
+        return {
+            uid: sectionUid,
+            arr: arr,
+            idx: idx
+        };
+    };
+    var removeQuestion = function (content, uid) {
+        delete content.form[uid];
+        var idx = content.order.indexOf(uid);
+        if (idx !== -1) {
+            content.order.splice(idx, 1);
+        } else {
+            getSections(content).some(function (_uid) {
+                var block = content.form[_uid];
+                if (!block.opts || !Array.isArray(block.opts.questions)) { return; }
+                var _idx = block.opts.questions.indexOf(uid);
+                if (_idx !== -1) {
+                    block.opts.questions.splice(_idx, 1);
+                    return true;
+                }
+            });
+        }
+    };
+    var getFullOrder = function (content) {
+        var order = content.order.slice();
+        getSections(content).forEach(function (uid) {
+            var block = content.form[uid];
+            if (!block.opts || !Array.isArray(block.opts.questions)) { return; }
+            var idx = order.indexOf(uid);
+            if (idx === -1) { return; }
+            idx++;
+            block.opts.questions.forEach(function (el, i) {
+                order.splice(idx+i, 0, el);
+            });
+        });
+        return order;
+    };
+
+    var checkResults = {};
+    var checkCondition = function (block) {
+        if (!block || block.type !== 'section') { return; }
+        if (!block.opts || !Array.isArray(block.opts.questions) || !block.opts.when) {
+            return true;
+        }
+
+        // This function may be called multiple times synchronously to check the conditions
+        // of multiple sections. These sections may require the result of the same question
+        // so we store the results in an object outside.
+        // To make sure the results are cleared on the next change in the form, we
+        // clear it just after the current synchronous actions are done.
+        setTimeout(function () { checkResults = {}; });
+
+        var results = checkResults;
+        var findResult = function (uid) {
+            if (results.hasOwnProperty(uid)) { return results[uid]; }
+            APP.formBlocks.some(function (data) {
+                if (!data.getValue) { return; }
+                if (data.uid === uid) {
+                    results[uid] = data.getValue();
+                    return true;
+                }
+            });
+            return results[uid];
+        };
+        var w = block.opts.when;
+        return !w.length || w.some(function (rules) {
+            return rules.every(function (rule) {
+                var res = findResult(rule.q);
+                return rule.is ? res === rule.v
+                               : res !== rule.v;
+            });
+        });
+    };
+
     var makeFormControls = function (framework, content, update, evOnChange) {
         var loggedIn = framework._.sfCommon.isLoggedIn();
         var metadataMgr = framework._.cpNfInner.metadataMgr;
@@ -2455,6 +2553,17 @@ define([
                     if (!data.isEmpty) { return; }
                     if (!block) { return; }
                     if (!block.opts || !block.opts.required) { return; }
+
+                    // Don't require questions that are in a hidden section
+                    var section = getSectionFromQ(content, uid);
+                    if (section.uid) {
+                        // Check if section is hidden
+                        var sBlock = form[section.uid];
+                        var visible = checkCondition(sBlock);
+                        if (!visible) { return; }
+                    }
+
+
                     var isEmpty = data.isEmpty();
                     var $el = $(data.tag).closest('.cp-form-block');
                     $el.find('.cp-form-required-tag').toggleClass('cp-is-empty', isEmpty);
@@ -2489,64 +2598,6 @@ define([
             reset, send
         ]);
     };
-    var getSections = function (content) {
-        var uids = Object.keys(content.form).filter(function (uid) {
-            return content.form[uid].type === 'section';
-        });
-        return uids;
-    };
-    var getSectionFromQ = function (content, uid) {
-        var arr = content.order;
-        var idx = content.order.indexOf(uid);
-        if (idx === -1) { // If it's not in the main array, check in sections
-            getSections(content).some(function (_uid) {
-                var block = content.form[_uid];
-                if (!block.opts || !Array.isArray(block.opts.questions)) { return; }
-                var _idx = block.opts.questions.indexOf(uid);
-                if (_idx !== -1) {
-                    arr = block.opts.questions;
-                    idx = _idx;
-                    return true;
-                }
-            });
-        }
-
-        return {
-            arr: arr,
-            idx: idx
-        };
-    };
-    var removeQuestion = function (content, uid) {
-        delete content.form[uid];
-        var idx = content.order.indexOf(uid);
-        if (idx !== -1) {
-            content.order.splice(idx, 1);
-        } else {
-            getSections(content).some(function (_uid) {
-                var block = content.form[_uid];
-                if (!block.opts || !Array.isArray(block.opts.questions)) { return; }
-                var _idx = block.opts.questions.indexOf(uid);
-                if (_idx !== -1) {
-                    block.opts.questions.splice(_idx, 1);
-                    return true;
-                }
-            });
-        }
-    };
-    var getFullOrder = function (content) {
-        var order = content.order.slice();
-        getSections(content).forEach(function (uid) {
-            var block = content.form[uid];
-            if (!block.opts || !Array.isArray(block.opts.questions)) { return; }
-            var idx = order.indexOf(uid);
-            if (idx === -1) { return; }
-            idx++;
-            block.opts.questions.forEach(function (el, i) {
-                order.splice(idx+i, 0, el);
-            });
-        });
-        return order;
-    };
     var updateForm = function (framework, content, editable, answers, temp) {
         var $container = $('div.cp-form-creator-content');
         if (!$container.length) { return; } // Not ready
@@ -3317,17 +3368,13 @@ define([
         // In view mode, hide sections when conditions aren't met
         evOnChange.reg(function (reset, save, condition) {
             if (!reset && !condition) { return; }
-            var results = getFormResults();
             getSections(content).forEach(function (uid) {
                 var block = content.form[uid];
-                if (!block.opts || !Array.isArray(block.opts.questions) || !block.opts.when) { return; }
-                var w = block.opts.when;
-                var show = !w.length || w.some(function (rules) {
-                    return rules.every(function (rule) {
-                        return rule.is ? results[rule.q] === rule.v
-                                       : results[rule.q] !== rule.v;
-                    });
-                });
+                if (block.type !== 'section') { return; }
+                if (!block.opts || !Array.isArray(block.opts.questions) || !block.opts.when) {
+                    return;
+                }
+                var show = checkCondition(block);
                 block.opts.questions.forEach(function (_uid) {
                     $container.find('.cp-form-block[data-id="'+_uid+'"]').toggle(show);
                 });

From bf02ec7359bb6dc048bcac928ee47b8d230f8a73 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 26 Aug 2021 14:30:51 +0530
Subject: [PATCH 026/125] animal emojis in color-by-author 'written by'
 tooltips

---
 www/code/markers.js                 | 18 +++++++++++++++---
 www/common/inner/common-mediatag.js |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/www/code/markers.js b/www/code/markers.js
index b070e68fc..b8a53bdd9 100644
--- a/www/code/markers.js
+++ b/www/code/markers.js
@@ -3,7 +3,8 @@ define([
     '/common/sframe-common-codemirror.js',
     '/customize/messages.js',
     '/bower_components/chainpad/chainpad.dist.js',
-], function (Util, SFCodeMirror, Messages, ChainPad) {
+    '/common/inner/common-mediatag.js',
+], function (Util, SFCodeMirror, Messages, ChainPad, MT) {
     var Markers = {};
 
     /* TODO Known Issues
@@ -38,7 +39,17 @@ define([
             });
         }
         uid = Number(uid);
-        var name = Util.fixHTML(author.name || Messages.anonymous);
+        var name = Util.fixHTML((author.name || "").trim());
+        var animal;
+        if ((!name || name === Messages.anonymous) && typeof(author.uid) === 'string') {
+            animal = MT.getPseudorandomAnimal(author.uid);
+            if (animal) {
+                name = animal + ' ' + Messages.anonymous;
+            } else {
+                name = Messages.anonymous;
+            }
+        }
+
         var col = Util.hexToRGB(author.color);
         var rgba = 'rgba('+col[0]+','+col[1]+','+col[2]+','+Env.opacity+');';
         return Env.editor.markText(from, to, {
@@ -520,7 +531,8 @@ define([
         Env.authormarks.authors[Env.myAuthorId] = {
             name: userData.name,
             curvePublic: userData.curvePublic,
-            color: userData.color
+            color: userData.color,
+            uid: userData.uid,
         };
         if (!old || (old.name === userData.name && old.color === userData.color)) { return; }
         return true;
diff --git a/www/common/inner/common-mediatag.js b/www/common/inner/common-mediatag.js
index 5e091a83c..db15d83d4 100644
--- a/www/common/inner/common-mediatag.js
+++ b/www/common/inner/common-mediatag.js
@@ -92,7 +92,7 @@ define([
         return ANIMALS[Math.floor(Math.random() * ANIMALS.length)];
     };
 
-    var getPseudorandomAnimal = function (seed) {
+    var getPseudorandomAnimal = MT.getPseudorandomAnimal = function (seed) {
         if (typeof(seed) !== 'string') { return getRandomAnimal(); }
         seed = seed.replace(/\D/g, '').slice(0, 10);
         seed = parseInt(seed);

From 69e10df9e069ad199aa8e23807b4fe37b13647ec Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 26 Aug 2021 11:19:32 +0200
Subject: [PATCH 027/125] Form condition based on checkbox question

---
 www/common/common-ui-elements.js |  2 +-
 www/form/inner.js                | 46 +++++++++++++++++++++++++-------
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index d8b399851..ac24b1ab9 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1588,7 +1588,7 @@ define([
                 });
             };
             $container.getValue = function () {
-                return value || '';
+                return typeof(value) === "undefined" ? '' : value;
             };
         }
 
diff --git a/www/form/inner.js b/www/form/inner.js
index d67c23d3f..230a6aea7 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1455,7 +1455,7 @@ define([
                 };
                 $tag.find('input').on('change', function () {
                     checkDisabled();
-                    evOnChange.fire();
+                    evOnChange.fire(false, false, true);
                 });
                 var cursorGetter;
                 var setCursorGetter = function (f) { cursorGetter = f; };
@@ -2373,8 +2373,13 @@ define([
         return !w.length || w.some(function (rules) {
             return rules.every(function (rule) {
                 var res = findResult(rule.q);
-                return rule.is ? res === rule.v
-                               : res !== rule.v;
+                // Checkbox
+                if (Array.isArray(res)) {
+                    var idx = res.indexOf(rule.v);
+                    return rule.is ? idx !== -1 : idx === -1;
+                }
+                // Radio
+                return rule.is ? res === rule.v : res !== rule.v;
             });
         });
     };
@@ -2834,14 +2839,21 @@ define([
                     var values = blocks.map(function(uid) {
                         var block = form[uid];
                         var type = block.type;
-                        if (['radio'].indexOf(type) === -1) { return; }
+                        if (['radio', 'checkbox'].indexOf(type) === -1) { return; }
+                        var obj = {
+                            uid: uid,
+                            type: type,
+                            q: block.q || Messages.form_default
+                        };
                         if (type === 'radio') {
-                            return {
-                                uid: uid,
-                                q: block.q || Messages.form_default,
-                                values: block.opts ? block.opts.values : TYPES.radio.defaultOpts.values
-                            };
+                            obj.values = block.opts ? block.opts.values
+                                                    : TYPES.radio.defaultOpts.values
                         }
+                        if (type === 'checkbox') {
+                            obj.values = block.opts ? block.opts.values
+                                                    : TYPES.checkbox.defaultOpts.values
+                        }
+                        return obj;
                     }).filter(Boolean);
                     return values;
                 };
@@ -2888,6 +2900,8 @@ define([
                     var qSelect = UIElements.createDropdown(qConfig);
                     Messages.form_condition_is = 'is'; // XXX
                     Messages.form_condition_isnot = 'is not'; // XXX
+                    Messages.form_condition_has = 'has'; // XXX
+                    Messages.form_condition_hasnot = 'has not'; // XXX
 
                     var isOn = !condition || condition.is !== 0;
                     var iOptions = [{
@@ -2925,13 +2939,25 @@ define([
                     var isChange;
                     qSelect.onChange.reg(function (prettyVal, val, init) {
                         $(iSelect).show();
-                        var res;
+                        var res, type;
                         values.some(function (obj) {
                             if (String(obj.uid) === String(val)) {
                                 res = obj.values;
+                                type = obj.type;
                                 return true;
                             }
                         });
+
+                        var $selDiv = $(iSelect);
+                        if (type === 'checkbox') {
+                            $selDiv.find('[data-value="0"]').text(Messages.form_condition_hasnot);
+                            $selDiv.find('[data-value="1"]').text(Messages.form_condition_has);
+                        } else {
+                            $selDiv.find('[data-value="0"]').text(Messages.form_condition_isnot);
+                            $selDiv.find('[data-value="1"]').text(Messages.form_condition_is);
+                        }
+                        iSelect.setValue(iSelect.getValue());
+
                         $content.find('.cp-form-condition-values').remove();
                         if (!res) { return; }
                         var vOptions = res.map(function (str) {

From a701522c61b822bef3238ae2a0d6be57fed976b2 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 26 Aug 2021 15:03:07 +0530
Subject: [PATCH 028/125] animal avatars for guests in join/part messages

---
 www/common/toolbar.js | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index da8b1dad0..5b359a323 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -1217,18 +1217,31 @@ MessengerUI, Messages, Pages) {
         }
     };
 
+    var getFancyGuestName = function (name, uid) {
+        name = UI.getDisplayName(name);
+        if (name === Messages.anonymous && uid) {
+            var animal = MT.getPseudorandomAnimal(uid);
+            if (animal) {
+                name = animal + ' ' + name;
+            }
+        }
+        return name;
+    };
+
     // Notifications
     var initNotifications = function (toolbar, config) {
         // Display notifications when users are joining/leaving the session
         var oldUserData;
         if (!config.metadataMgr) { return; }
         var metadataMgr = config.metadataMgr;
-        var notify = function(type, name, oldname) {
+        var notify = function(type, name, oldname, uid) {
             if (toolbar.isAlone) { return; }
             // type : 1 (+1 user), 0 (rename existing user), -1 (-1 user)
             if (typeof name === "undefined") { return; }
-            name = name || Messages.anonymous;
             if (Config.disableUserlistNotifications) { return; }
+            name = getFancyGuestName(name, uid);
+            oldname = getFancyGuestName(oldname, uid);
+
             switch(type) {
                 case 1:
                     UI.log(Messages._getKey("notifyJoined", [name]));
@@ -1277,7 +1290,7 @@ MessengerUI, Messages, Pages) {
                         delete oldUserData[u];
                         if (temp && newdata[userNetfluxId] && temp.uid === newdata[userNetfluxId].uid) { return; }
                         if (userPresent(u, temp, newdata || oldUserData) < 1) {
-                            notify(-1, temp.name);
+                            notify(-1, temp.name, undefined, temp.uid);
                         }
                     }
                 }
@@ -1297,10 +1310,10 @@ MessengerUI, Messages, Pages) {
                     if (typeof oldUserData[k] === "undefined") {
                         // if the same uid is already present in the userdata, don't notify
                         if (!userPresent(k, newdata[k], oldUserData)) {
-                            notify(1, newdata[k].name);
+                            notify(1, newdata[k].name, undefined, newdata[k].uid);
                         }
                     } else if (oldUserData[k].name !== newdata[k].name) {
-                        notify(0, newdata[k].name, oldUserData[k].name);
+                        notify(0, newdata[k].name, oldUserData[k].name, newdata[k].uid);
                     }
                 }
             }

From 8a1f6d66cf3e7a12d7ab8b1b3142ecfd7dd1ab82 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 26 Aug 2021 17:04:38 +0530
Subject: [PATCH 029/125] animal avatars in kanban cursors

---
 www/common/inner/common-mediatag.js |  3 ++-
 www/kanban/app-kanban.less          |  8 ++++++
 www/kanban/inner.js                 | 39 ++++++++++++++++++-----------
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/www/common/inner/common-mediatag.js b/www/common/inner/common-mediatag.js
index db15d83d4..e061667ce 100644
--- a/www/common/inner/common-mediatag.js
+++ b/www/common/inner/common-mediatag.js
@@ -46,6 +46,7 @@ define([
     var animal_avatars = {};
     MT.getCursorAvatar = function (cursor) {
         var uid = cursor.uid;
+        // TODO it would be nice to have "{0} is editing" instead of just their name
         var html = '<span class="cp-cursor-avatar">';
         if (cursor.avatar && avatars[cursor.avatar]) {
             html += (cursor.avatar && avatars[cursor.avatar]) || '';
@@ -100,7 +101,7 @@ define([
         return ANIMALS[seed % ANIMALS.length];
     };
 
-    var getPrettyInitials = function (name) {
+    var getPrettyInitials = MT.getPrettyInitials = function (name) {
         var parts = name.split(/\s+/);
         var text;
         if (parts.length > 1) {
diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 69924ef77..098560548 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -159,6 +159,14 @@
             margin-right: 5px;
             .tools_unselectable();
             cursor: default;
+            &.cp-cursor.cp-tippy-html {
+                background-color: var(--red);
+                // XXX figure out how to inherit this from avatar.less
+                font-size: 11px; // 20px / 1.8 as per avatar.less..
+                &.animal {
+                    font-size: 14px; // 20px / 1.8 * (6/5)...
+                }
+            }
         }
     }
     .kanban-item {
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 42b1e39fa..fe80b1007 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -59,7 +59,7 @@ define([
     verbose = function () {}; // comment out to enable verbose logging
     var onRedraw = Util.mkEvent();
     var onCursorUpdate = Util.mkEvent();
-    var remoteCursors = {}; // XXX
+    var remoteCursors = {};
 
     var setValueAndCursor = function (input, val, _cursor) {
         if (!input) { return; }
@@ -95,18 +95,27 @@ define([
 
     var getAvatar = function (cursor, noClear) {
         // Tippy
-        var html = MT.getCursorAvatar(cursor); // XXX
+        var html = MT.getCursorAvatar(cursor);
 
-        var l = Util.getFirstCharacter(cursor.name || Messages.anonymous);
+        var name = UI.getDisplayName(cursor.name);
+
+        var l;
+        var animal = '';
+        if (cursor.name === Messages.anonymous && typeof(cursor.uid) === 'string') {
+            l = MT.getPseudorandomAnimal(cursor.uid);
+            animal = '.animal';
+        } else {
+            l = MT.getPrettyInitials(name);
+        }
 
         var text = '';
         if (cursor.color) {
-            text = 'color:'+getTextColor(cursor.color)+';';
+            text = 'background-color:' + cursor.color + '; color:'+getTextColor(cursor.color)+';';
         }
-        var avatar = h('span.cp-cursor.cp-tippy-html', { // XXX
-            style: "background-color: " + (cursor.color || 'red') + ";"+text,
+        var avatar = h('span.cp-cursor.cp-tippy-html' + animal, {
+            style: text,
             'data-cptippy-html': true,
-            title: html, // XXX "{0} is editing"
+            title: html,
         }, l);
         if (!noClear) {
             cursor.clear = function () {
@@ -852,7 +861,7 @@ define([
             getAvatar: getAvatar,
             openLink: openLink,
             getTags: getExistingTags,
-            cursors: remoteCursors, // XXX
+            cursors: remoteCursors,
             boards: boards,
             _boards: Util.clone(boards),
         });
@@ -1062,6 +1071,7 @@ define([
         var kanban;
         var $container = $('#cp-app-kanban-content');
 
+        var myData = framework._.cpNfInner.metadataMgr.getUserData();
         var privateData = framework._.cpNfInner.metadataMgr.getPrivateData();
         if (!privateData.isEmbed) {
             mkHelpMenu(framework);
@@ -1101,7 +1111,7 @@ define([
             $container.find('.kanban-edit-item').remove();
         });
 
-        var getCursor = function () { // XXX
+        var getCursor = function () {
             if (!kanban || !kanban.inEditMode) { return; }
             try {
                 var id = kanban.inEditMode;
@@ -1204,7 +1214,7 @@ define([
             var remoteContent = newContent.content;
 
             if (Sortify(currentContent) !== Sortify(remoteContent)) {
-                var cursor = getCursor(); // XXX
+                var cursor = getCursor();
                 verbose("Content is different.. Applying content");
                 kanban.options.boards = remoteContent;
                 updateBoards(framework, kanban, remoteContent);
@@ -1261,11 +1271,13 @@ define([
         });
 
         var myCursor = {};
-        onCursorUpdate.reg(function (data) { // XXX
+        onCursorUpdate.reg(function (data) {
+            console.log('onCursorUpdate', data);
             myCursor = data;
+            myCursor.uid = myData.uid;
             framework.updateCursor();
         });
-        framework.onCursorUpdate(function (data) { // XXX
+        framework.onCursorUpdate(function (data) {
             if (!data) { return; }
             if (data.reset) {
                 Object.keys(remoteCursors).forEach(function (id) {
@@ -1293,9 +1305,8 @@ define([
             if (!cursor.item && !cursor.board) { return; }
 
             // Add new cursor
-            var avatar = getAvatar(cursor); // XXX
+            var avatar = getAvatar(cursor);
             var $item = $('.kanban-item[data-eid="'+cursor.item+'"]');
-            var $board = $('.kanban-board[data-id="'+cursor.board+'"]');
             if ($item.length) {
                 remoteCursors[id] = cursor;
                 $item.find('.cp-kanban-cursors').append(avatar);

From 840a16a563c2c1b96c6449db8b2adee398d70f7a Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 26 Aug 2021 17:39:56 +0530
Subject: [PATCH 030/125] add animal emojis to rich text cursors' tooltips

---
 www/pad/cursor.js | 21 ++++++++++++++++++---
 www/pad/inner.js  |  3 ++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/www/pad/cursor.js b/www/pad/cursor.js
index 42569838f..fbca1a9cf 100644
--- a/www/pad/cursor.js
+++ b/www/pad/cursor.js
@@ -3,7 +3,9 @@ define([
     '/common/common-ui-elements.js',
     '/common/common-interface.js',
     '/bower_components/chainpad/chainpad.dist.js',
-], function ($, UIElements, UI, ChainPad) {
+    '/customize/messages.js',
+    '/common/inner/common-mediatag.js',
+], function ($, UIElements, UI, ChainPad, Messages, MT) {
     var Cursor = {};
 
     Cursor.isCursor = function (el) {
@@ -35,13 +37,20 @@ define([
         $(el).remove();
     };
 
-    Cursor.create = function (inner, hjsonToDom, cursorModule) {
+    Cursor.create = function (inner, hjsonToDom, cursorModule, uid) {
         var exp = {};
 
         var cursors = {};
 
+    // XXX despite the name of this function this doesn't actually render as a tippy tooltip
+    // that means that emojis will use the system font that shows up in native tooltips
+    // so this might be of limited value/aesthetic appeal compared to other apps' cursors
         var makeTippy = function (cursor) {
-            return cursor.name;
+            //return cursor.name;
+            if (typeof(cursor.uid) === 'string' && (!cursor.name || cursor.name === Messages.anonymous)) {
+                return MT.getPseudorandomAnimal(cursor.uid) + ' ' + Messages.anonymous;
+            }
+            return cursor.name || Messages.anonymous;
         };
 
         var makeCursor = function (id, cursor) {
@@ -138,6 +147,12 @@ define([
             var cursorObj = data.cursor;
 
             if (!cursorObj.selectionStart) { return; }
+            if (cursorObj.name === Messages.anonymous) {
+                // save a little bit of data from going over the wire...
+                // remote clients will interpret this as Messages.anonymous (in their UI language)
+                cursorObj.name = '';
+                cursorObj.uid = uid;
+            }
 
             // 1. Transform the cursor to get the offset relative to our doc
             // 2. Turn it into a range
diff --git a/www/pad/inner.js b/www/pad/inner.js
index 95e7c1bff..e89cd9a0a 100644
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@@ -678,6 +678,7 @@ define([
 
         var metadataMgr = framework._.sfCommon.getMetadataMgr();
         var privateData = metadataMgr.getPrivateData();
+        var myData = metadataMgr.getUserData();
         var common = framework._.sfCommon;
         var APP = window.APP;
 
@@ -704,7 +705,7 @@ define([
         var cursor = module.cursor = Cursor(inner);
 
         // Display other users cursor
-        var cursors = Cursors.create(inner, hjsonToDom, cursor);
+        var cursors = Cursors.create(inner, hjsonToDom, cursor, myData.uid);
 
         var openLink = function(e) {
             var el = e.currentTarget;

From 1e1890dbe4a4dcaba56c703488ca9dec11c713fb Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 26 Aug 2021 17:42:22 +0530
Subject: [PATCH 031/125] replace a line that I accidentally removed

---
 www/kanban/inner.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index fe80b1007..6934dd210 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -1312,6 +1312,7 @@ define([
                 $item.find('.cp-kanban-cursors').append(avatar);
                 return;
             }
+            var $board = $('.kanban-board[data-id="'+cursor.board+'"]');
             if ($board.length) {
                 remoteCursors[id] = cursor;
                 $board.find('header .cp-kanban-cursors').append(avatar);

From 0ea300638adaa56f3b274611b459014357cd5320 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 26 Aug 2021 19:50:26 +0530
Subject: [PATCH 032/125] generate a report of consistently duplicated
 translation keys

---
 .../find-duplicate-translations.js            | 116 +++++++++++++-----
 1 file changed, 85 insertions(+), 31 deletions(-)

diff --git a/scripts/translations/find-duplicate-translations.js b/scripts/translations/find-duplicate-translations.js
index f8b25497c..8306fc70c 100644
--- a/scripts/translations/find-duplicate-translations.js
+++ b/scripts/translations/find-duplicate-translations.js
@@ -1,55 +1,109 @@
-var Util = require("../lib/common-util");
-var EN = Util.clone(require("../www/common/translations/messages.json"));
-var FR = Util.clone(require("../www/common/translations/messages.fr.json"));
-var DE = Util.clone(require("../www/common/translations/messages.de.json"));
-var JP = Util.clone(require("../www/common/translations/messages.ja.json"));
-
-var keys = Object.keys(EN);
-
-var duplicates = {};
+var Assert = require("assert");
+var Util = require("../../lib/common-util");
 var addIfAbsent = function (A, e) {
     if (A.includes(e)) { return; }
     A.push(e);
 };
-var markDuplicate = function  (value, key1, key2) {
-    //console.log("[%s] === [%s] (%s)", key1, key2, value);
-    if (!Array.isArray(duplicates[value])) {
-        duplicates[value] = [];
-    }
-    addIfAbsent(duplicates[value], key1);
-    addIfAbsent(duplicates[value], key2);
-};
 
-keys.forEach(function (key) {
-    var value = EN[key];
+var findDuplicates = function (map) {
+    var keys = Object.keys(map);
+
 
-    //var duplicates = [];
-    keys.forEach(function (key2) {
-        if (key === key2) { return; }
-        var value2 = EN[key2];
-        if (value === value2) {
-            markDuplicate(value, key, key2);
+    var duplicates = {};
+    var markDuplicate = function  (value, key1, key2) {
+        //console.log("[%s] === [%s] (%s)", key1, key2, value);
+        if (!Array.isArray(duplicates[value])) {
+            duplicates[value] = [];
         }
+        addIfAbsent(duplicates[value], key1);
+        addIfAbsent(duplicates[value], key2);
+    };
+
+    keys.forEach(function (key) {
+        var value = map[key];
+
+        //var duplicates = [];
+        keys.forEach(function (key2) {
+            if (key === key2) { return; }
+            var value2 = map[key2];
+            if (value === value2) {
+                markDuplicate(value, key, key2);
+            }
+        });
     });
-});
 
-// indicate which strings are duplicated and could potentially be changed to use one key
-Object.keys(duplicates).forEach(function (val) {
-    console.log('\"%s\" => %s', val, JSON.stringify(duplicates[val]));
+    var temp = {};
+    // sort keys and construct a new index using the first key in the sorted array
+    Object.keys(duplicates).forEach(function (key) {
+        var val = duplicates[key]; // should be an array
+        val.sort(); // default js sort
+        var new_key = val[0];
+        temp[new_key] = val;
+    });
+
+    var canonical = {};
+    Object.keys(temp).sort().forEach(function (key) {
+        canonical[key] = temp[key];
+    });
+    return canonical;
+};
+
+var logDuplicates = function (duplicates) {
+    // indicate which strings are duplicated and could potentially be changed to use one key
+    Object.keys(duplicates).forEach(function (val) {
+        console.log('\"%s\" => %s', val, JSON.stringify(duplicates[val]));
+    });
+};
+
+var FULL_LANGUAGES = {
+    EN: Util.clone(require("../../www/common/translations/messages.json")),
+    FR: Util.clone(require("../../www/common/translations/messages.fr.json")),
+    DE: Util.clone(require("../../www/common/translations/messages.de.json")),
+    JP: Util.clone(require("../../www/common/translations/messages.ja.json")),
+};
+
+var DUPLICATES = {};
+
+Object.keys(FULL_LANGUAGES).forEach(function (code) {
+    DUPLICATES[code] = findDuplicates(FULL_LANGUAGES[code]);
 });
 
-// TODO iterate over all languages and
+var extraneousKeys = 0;
 
 // 1) check whether the same mapping exists across languages
 // ie. English has "Open" (verb) and "Open" (adjective)
 // while French has "Ouvrir" and "Ouvert(s)"
 // such keys should not be simplified/deduplicated
+Object.keys(DUPLICATES.EN).forEach(function (key) {
+    var reference = DUPLICATES.EN[key];
+    if (!['FR', 'DE', 'JP'].every(function (code) {
+        try {
+            Assert.deepEqual(reference, DUPLICATES[code][key]);
+        } catch (err) {
+            return false;
+        }
+        return true;
+    })) {
+        return;
+    }
+    console.log("The key [%s] (\"%s\") is duplicated identically across all fully supported languages", key, FULL_LANGUAGES.EN[key]);
+    console.log("Values:", JSON.stringify(['EN', 'FR', 'DE', 'JP'].map(function (code) {
+        return FULL_LANGUAGES[code][key];
+    })));
+    console.log("Keys:", JSON.stringify(reference));
+    console.log();
+    extraneousKeys += reference.length - 1;
 
+    //console.log("\n" + code + "\n==\n");
+    //logDuplicates(map);
+});
+
+console.log("Total extraneous keys: %s", extraneousKeys);
 
 
+// TODO
 // find instances where
 // one of the duplicated keys is not translated
 // perhaps we could automatically use the translated one everywhere
 // and improve the completeness of translations
 
-

From 34acded53874b08c5ebe07f3d6be2b4df5deb36f Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 27 Aug 2021 14:07:23 +0530
Subject: [PATCH 033/125] clarify comment in example nginx config

---
 docs/example.nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/example.nginx.conf b/docs/example.nginx.conf
index 8bc47d9f8..14a3d4fc2 100644
--- a/docs/example.nginx.conf
+++ b/docs/example.nginx.conf
@@ -2,7 +2,7 @@
 #   to work with CryptPad. This example WILL NOT WORK AS IS. For best results,
 #   compare the sections of this configuration file against a working CryptPad
 #   installation (http server by the Nodejs process). If you are using CryptPad
-#   in production, contact sales@cryptpad.fr
+#   in production and require professional support please contact sales@cryptpad.fr
 
 server {
     listen 443 ssl http2;

From c416303e1d3f9d9fb74821abedf23141e23b8b44 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 27 Aug 2021 18:23:07 +0530
Subject: [PATCH 034/125] set uid in cursor object in outer scope

rather than within each app that uses cursors
---
 www/code/inner.js                      | 4 +---
 www/code/markers.js                    | 5 +++--
 www/common/outer/cursor.js             | 1 +
 www/common/sframe-common-codemirror.js | 1 -
 www/kanban/inner.js                    | 2 --
 www/pad/cursor.js                      | 8 +-------
 www/pad/inner.js                       | 3 +--
 www/slide/inner.js                     | 6 ++----
 8 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/www/code/inner.js b/www/code/inner.js
index 4328f0d8f..4f6c0308e 100644
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -388,9 +388,7 @@ define([
     var andThen2 = function (editor, CodeMirror, framework, isPresentMode) {
 
         var common = framework._.sfCommon;
-        var metadataMgr = common.getMetadataMgr();
-        var privateData = metadataMgr.getPrivateData();
-        CodeMirror.uid = metadataMgr.getUserData().uid;
+        var privateData = common.getMetadataMgr().getPrivateData();
 
         var previewPane = mkPreviewPane(editor, CodeMirror, framework, isPresentMode);
         var markdownTb = mkMarkdownTb(editor, framework);
diff --git a/www/code/markers.js b/www/code/markers.js
index b8a53bdd9..48e5a25fb 100644
--- a/www/code/markers.js
+++ b/www/code/markers.js
@@ -4,7 +4,8 @@ define([
     '/customize/messages.js',
     '/bower_components/chainpad/chainpad.dist.js',
     '/common/inner/common-mediatag.js',
-], function (Util, SFCodeMirror, Messages, ChainPad, MT) {
+    '/common/common-interface.js',
+], function (Util, SFCodeMirror, Messages, ChainPad, MT, UI) {
     var Markers = {};
 
     /* TODO Known Issues
@@ -39,7 +40,7 @@ define([
             });
         }
         uid = Number(uid);
-        var name = Util.fixHTML((author.name || "").trim());
+        var name = Util.fixHTML(UI.getDisplayName(author.name));
         var animal;
         if ((!name || name === Messages.anonymous) && typeof(author.uid) === 'string') {
             animal = MT.getPseudorandomAnimal(author.uid);
diff --git a/www/common/outer/cursor.js b/www/common/outer/cursor.js
index 95b2b34c6..b1a5e7cd0 100644
--- a/www/common/outer/cursor.js
+++ b/www/common/outer/cursor.js
@@ -187,6 +187,7 @@ define([
         data.color = Util.find(proxy, ['settings', 'general', 'cursor', 'color']);
         data.name = proxy[Constants.displayNameKey] || ctx.store.noDriveName || Messages.anonymous;
         data.avatar = Util.find(proxy, ['profile', 'avatar']);
+        data.uid = Util.find(proxy, ['uid']) || ctx.store.noDriveUid;
         c.cursor = data;
         sendMyCursor(ctx, client);
         cb();
diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js
index 4e490288d..58475bbed 100644
--- a/www/common/sframe-common-codemirror.js
+++ b/www/common/sframe-common-codemirror.js
@@ -509,7 +509,6 @@ define([
             var cursor = {};
             cursor.selectionStart = cursorToPos(editor.getCursor('from'), doc);
             cursor.selectionEnd = cursorToPos(editor.getCursor('to'), doc);
-            cursor.uid = exp.uid; // FIXME this is inefficient for the network but it's unlikely to trigger errors
             return cursor;
         };
 
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 6934dd210..368d18139 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -1272,9 +1272,7 @@ define([
 
         var myCursor = {};
         onCursorUpdate.reg(function (data) {
-            console.log('onCursorUpdate', data);
             myCursor = data;
-            myCursor.uid = myData.uid;
             framework.updateCursor();
         });
         framework.onCursorUpdate(function (data) {
diff --git a/www/pad/cursor.js b/www/pad/cursor.js
index fbca1a9cf..5b4c60ad7 100644
--- a/www/pad/cursor.js
+++ b/www/pad/cursor.js
@@ -37,7 +37,7 @@ define([
         $(el).remove();
     };
 
-    Cursor.create = function (inner, hjsonToDom, cursorModule, uid) {
+    Cursor.create = function (inner, hjsonToDom, cursorModule) {
         var exp = {};
 
         var cursors = {};
@@ -147,12 +147,6 @@ define([
             var cursorObj = data.cursor;
 
             if (!cursorObj.selectionStart) { return; }
-            if (cursorObj.name === Messages.anonymous) {
-                // save a little bit of data from going over the wire...
-                // remote clients will interpret this as Messages.anonymous (in their UI language)
-                cursorObj.name = '';
-                cursorObj.uid = uid;
-            }
 
             // 1. Transform the cursor to get the offset relative to our doc
             // 2. Turn it into a range
diff --git a/www/pad/inner.js b/www/pad/inner.js
index e89cd9a0a..95e7c1bff 100644
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@@ -678,7 +678,6 @@ define([
 
         var metadataMgr = framework._.sfCommon.getMetadataMgr();
         var privateData = metadataMgr.getPrivateData();
-        var myData = metadataMgr.getUserData();
         var common = framework._.sfCommon;
         var APP = window.APP;
 
@@ -705,7 +704,7 @@ define([
         var cursor = module.cursor = Cursor(inner);
 
         // Display other users cursor
-        var cursors = Cursors.create(inner, hjsonToDom, cursor, myData.uid);
+        var cursors = Cursors.create(inner, hjsonToDom, cursor);
 
         var openLink = function(e) {
             var el = e.currentTarget;
diff --git a/www/slide/inner.js b/www/slide/inner.js
index 9bbfc6e4d..9c9b9c70b 100644
--- a/www/slide/inner.js
+++ b/www/slide/inner.js
@@ -459,9 +459,7 @@ define([
     var andThen2 = function (editor, CodeMirror, framework, isPresentMode) {
 
         var common = framework._.sfCommon;
-        var metadataMgr = common.getMetadataMgr();
-        var privateData = metadataMgr.getPrivateData();
-        CodeMirror.uid = metadataMgr.getUserData().uid;
+        var privateData = common.getMetadataMgr().getPrivateData();
 
         var $contentContainer = $('#cp-app-slide-editor');
         var $modal = $('#cp-app-slide-modal');
@@ -513,7 +511,7 @@ define([
                 framework.updateCursor();
             }, 500); // 500ms to make sure it is sent after chainpad sync
         };
-        framework.onCursorUpdate(CodeMirror.setRemoteCursor); // XXX
+        framework.onCursorUpdate(CodeMirror.setRemoteCursor);
         framework.setCursorGetter(CodeMirror.getCursor);
         editor.on('cursorActivity', updateCursor);
 

From cd613f10377c655340d7534c61ee9868f1c81fd2 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 27 Aug 2021 19:38:50 +0530
Subject: [PATCH 035/125] many small improvements for animal avatars

* more consistent scaling for animal avatars relative to the font-size of username's initials
* configurable emoji lists via AppConfig.emojiAvatars
* various comments from code review
* fixed a bug that caused the user admin menu button to not be redrawn on name changes
* guard against empty animal emojis in case the admin sets the list to []
---
 customize.dist/src/less2/include/avatar.less  | 10 ++++----
 customize.dist/src/less2/include/toolbar.less |  7 +++++-
 www/common/application_config_internal.js     |  2 ++
 www/common/common-messaging.js                |  2 +-
 www/common/common-ui-elements.js              |  4 ++-
 www/common/inner/access.js                    |  1 +
 www/common/inner/common-mediatag.js           | 25 ++++++++++---------
 www/kanban/app-kanban.less                    |  5 ++--
 www/kanban/inner.js                           | 10 +++++---
 www/pad/cursor.js                             |  6 +++--
 10 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/customize.dist/src/less2/include/avatar.less b/customize.dist/src/less2/include/avatar.less
index 079ceb60d..acaa13351 100644
--- a/customize.dist/src/less2/include/avatar.less
+++ b/customize.dist/src/less2/include/avatar.less
@@ -5,6 +5,10 @@
 ) {
     @avatar-width: @width;
     @avatar-font-size: @width / 1.8;
+    // scale animal avatar to be somewhat larger, because:
+    // 1. emojis are wider than most latin characters
+    // 2. they should occupy the width of two average characters
+    @avatar-font-size-animal: @avatar-font-size * (6/5);
 }
 .avatar_main(@width: 30px) {
     --LessLoader_require: LessLoader_currentFile();
@@ -41,11 +45,7 @@
             font-size: @avatar-font-size;
             font-size: var(--avatar-font-size);
             .animal {
-                font-size: 20px;
-                // scale animal avatar to be somewhat larger, because:
-                // 1. emojis are wider than most latin characters
-                // 2. they should occupy the width of two average characters
-                font-size: calc(var(--avatar-width) * (6/5));
+                font-size: @avatar-font-size-animal;
             }
         }
         media-tag {
diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 28b513095..2092d72cc 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -855,10 +855,15 @@
                     span {
                         text-align: center;
                         width: 100%;
-                        font-size: 40px;
+                        .avatar_vars(72px);
+                        font-size: @avatar-font-size;
                         display: inline-flex;
                         justify-content: center;
                         align-items: center;
+                        .animal {
+                            font-size: @avatar-font-size-animal;
+
+                        }
                     }
                     &.cp-avatar {
                         .avatar_main(64px);
diff --git a/www/common/application_config_internal.js b/www/common/application_config_internal.js
index 3be979f17..2993edc52 100644
--- a/www/common/application_config_internal.js
+++ b/www/common/application_config_internal.js
@@ -208,5 +208,7 @@ define(function() {
     // the driveless mode by changing the following value to "false"
     AppConfig.allowDrivelessMode = true;
 
+    AppConfig.emojiAvatars = '🙈 🦀 🐞 🦋 🐬 🐋 🐢 🦉 🦆 🐧 🦡 🦘 🦨 🦦 🦥 🐼 🐻 🦝 🦓 🐄 🐷 🐐 🦙 🦒 🐘 🦏 🐁 🐹 🐰 🦫 🦔 🐨 🐱 🐺 👺 👹 👽 👾 🤖'.split(/\s+/);
+
     return AppConfig;
 });
diff --git a/www/common/common-messaging.js b/www/common/common-messaging.js
index 4a3eb2a91..1e6e26ce3 100644
--- a/www/common/common-messaging.js
+++ b/www/common/common-messaging.js
@@ -18,7 +18,7 @@ define([
             curvePublic: proxy.curvePublic,
             notifications: Util.find(proxy, ['mailboxes', 'notifications', 'channel']),
             avatar: proxy.profile && proxy.profile.avatar,
-            uid: proxy.uid,
+            uid: proxy.uid, // XXX test without this and see if it breaks things
         };
         if (hash === false) { delete data.channel; }
         return data;
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index d0ef0af3f..abf45b0bd 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1996,6 +1996,7 @@ define([
         var to;
         var oldUrl = '';
         var oldUid;
+        var oldName;
         var updateButton = function () {
             var myData = metadataMgr.getUserData();
             var privateData = metadataMgr.getPrivateData();
@@ -2017,11 +2018,12 @@ define([
             var newName = UI.getDisplayName(myData.name);
             var url = myData.avatar;
             $displayName.text(newName);
-            if ((accountName && oldUrl !== url) || !accountName && uid !== oldUid) {
+            if ((accountName && oldUrl !== url) || !accountName && uid !== oldUid || oldName !== newName) {
                 $avatar.html('');
                 Common.displayAvatar($avatar, url, newName, function ($img) {
                     oldUrl = url;
                     oldUid = uid;
+                    oldName = newName;
                     $userAdmin.find('> button').removeClass('cp-avatar');
                     if ($img) { $userAdmin.find('> button').addClass('cp-avatar'); }
                     loadingAvatar = false;
diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 119714de3..0ba857a0a 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -787,6 +787,7 @@ define([
                 // ie. if you have opened the access modal from within the pad
                 // its owner might be present or they might have left some data
                 // in the pad itself (as is the case of the uid in rich text comments)
+                // TODO or just implement "Acquaintances"
             };
             strangers++;
         });
diff --git a/www/common/inner/common-mediatag.js b/www/common/inner/common-mediatag.js
index e061667ce..21cb25e82 100644
--- a/www/common/inner/common-mediatag.js
+++ b/www/common/inner/common-mediatag.js
@@ -6,12 +6,13 @@ define([
     '/common/hyperscript.js',
     '/common/media-tag.js',
     '/customize/messages.js',
+    '/customize/application_config.js',
 
     '/bower_components/tweetnacl/nacl-fast.min.js',
     '/bower_components/croppie/croppie.min.js',
     '/bower_components/file-saver/FileSaver.min.js',
     'css!/bower_components/croppie/croppie.css',
-], function ($, Util, Hash, UI, h, MediaTag, Messages) {
+], function ($, Util, Hash, UI, h, MediaTag, Messages, AppConfig) {
     var MT = {};
 
     var Nacl = window.nacl;
@@ -49,7 +50,7 @@ define([
         // TODO it would be nice to have "{0} is editing" instead of just their name
         var html = '<span class="cp-cursor-avatar">';
         if (cursor.avatar && avatars[cursor.avatar]) {
-            html += (cursor.avatar && avatars[cursor.avatar]) || '';
+            html += avatars[cursor.avatar];
         } else if (animal_avatars[uid]) {
             html += animal_avatars[uid] + ' ';
         }
@@ -87,18 +88,20 @@ define([
     };
 
     // https://emojipedia.org/nature/
-    var ANIMALS = '🙈 🦀 🐞 🦋 🐬 🐋 🐢 🦉 🦆 🐧 🦡 🦘 🦨 🦦 🦥 🐼 🐻 🦝 🦓 🐄 🐷 🐐 🦙 🦒 🐘 🦏 🐁 🐹 🐰 🦫 🦔 🐨 🐱 🐺 👺 👹 👽 👾 🤖'.split(/\s+/);
+    var ANIMALS = AppConfig.emojiAvatars || [];
 
-    var getRandomAnimal = function () {
+    var getRandomAnimal = function () { // XXX should never actually happen?
+        if (!ANIMALS.length) { return ''; }
         return ANIMALS[Math.floor(Math.random() * ANIMALS.length)];
     };
 
     var getPseudorandomAnimal = MT.getPseudorandomAnimal = function (seed) {
+        if (!ANIMALS.length) { return ''; }
         if (typeof(seed) !== 'string') { return getRandomAnimal(); }
-        seed = seed.replace(/\D/g, '').slice(0, 10);
+        seed = seed.replace(/\D/g, '').slice(0, 10); // XXX possible optimization for on-wire uid
         seed = parseInt(seed);
         if (!seed) { return getRandomAnimal(); }
-        return ANIMALS[seed % ANIMALS.length];
+        return ANIMALS[seed % ANIMALS.length] || '';
     };
 
     var getPrettyInitials = MT.getPrettyInitials = function (name) {
@@ -123,29 +126,27 @@ define([
             if (uid && animal_avatars[uid]) {
                 animal_avatar = animal_avatars[uid];
             }
-            var animal = false;
 
-            name = (name || "").trim() || Messages.anonymous;
+            name = UI.getDisplayName(name);
             var text;
-            if (name === Messages.anonymous && uid) {
+            if (ANIMALS.length && name === Messages.anonymous && uid) {
                 if (animal_avatar) {
                     text = animal_avatar;
                 } else {
                     text = animal_avatar = getPseudorandomAnimal(uid);
                 }
-                animal = true;
             } else {
                 text = getPrettyInitials(name);
             }
 
             var $avatar = $('<span>', {
-                'class': 'cp-avatar-default' + (animal? ' animal': ''),
+                'class': 'cp-avatar-default' + (animal_avatar? ' animal': ''),
                 // XXX prevents screenreaders from trying to describe this
                 alt: '',
                 'aria-hidden': true,
             }).text(text);
             $container.append($avatar);
-            if (uid && animal) {
+            if (uid && animal_avatar) {
                 animal_avatars[uid] = animal_avatar;
             }
             if (cb) { cb(); }
diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 098560548..5996940e4 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -160,11 +160,12 @@
             .tools_unselectable();
             cursor: default;
             &.cp-cursor.cp-tippy-html {
+                .avatar_vars(20px);
                 background-color: var(--red);
                 // XXX figure out how to inherit this from avatar.less
-                font-size: 11px; // 20px / 1.8 as per avatar.less..
+                font-size: @avatar-font-size; //var(11px; // 20px / 1.8 as per avatar.less..
                 &.animal {
-                    font-size: 14px; // 20px / 1.8 * (6/5)...
+                    font-size: @avatar-font-size-animal; //14px; // 20px / 1.8 * (6/5)...
                 }
             }
         }
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 368d18139..add0ed693 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -99,12 +99,15 @@ define([
 
         var name = UI.getDisplayName(cursor.name);
 
-        var l;
+        var l; // label?
         var animal = '';
         if (cursor.name === Messages.anonymous && typeof(cursor.uid) === 'string') {
             l = MT.getPseudorandomAnimal(cursor.uid);
-            animal = '.animal';
-        } else {
+            if (l) {
+                animal = '.animal';
+            }
+        }
+        if (!l) {
             l = MT.getPrettyInitials(name);
         }
 
@@ -1071,7 +1074,6 @@ define([
         var kanban;
         var $container = $('#cp-app-kanban-content');
 
-        var myData = framework._.cpNfInner.metadataMgr.getUserData();
         var privateData = framework._.cpNfInner.metadataMgr.getPrivateData();
         if (!privateData.isEmbed) {
             mkHelpMenu(framework);
diff --git a/www/pad/cursor.js b/www/pad/cursor.js
index 5b4c60ad7..ae91c80f1 100644
--- a/www/pad/cursor.js
+++ b/www/pad/cursor.js
@@ -46,9 +46,11 @@ define([
     // that means that emojis will use the system font that shows up in native tooltips
     // so this might be of limited value/aesthetic appeal compared to other apps' cursors
         var makeTippy = function (cursor) {
-            //return cursor.name;
             if (typeof(cursor.uid) === 'string' && (!cursor.name || cursor.name === Messages.anonymous)) {
-                return MT.getPseudorandomAnimal(cursor.uid) + ' ' + Messages.anonymous;
+                var animal = MT.getPseudorandomAnimal(cursor.uid);
+                if (animal) {
+                    return animal + ' ' + Messages.anonymous;
+                }
             }
             return cursor.name || Messages.anonymous;
         };

From 45c4765ce00950850dcb1ada86aac1836eae494d Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 27 Aug 2021 20:10:17 +0530
Subject: [PATCH 036/125] update changelog and make a note about a bug in
 getAuthorId

---
 CHANGELOG.md                | 25 +++++++++++++++++++++++--
 www/common/sframe-common.js |  7 ++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 185a9ae29..7325e2d21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,11 +7,32 @@
 ## Features
 
 * unify unregistered/non-registered/anonymous terminology as 'guest'
-* prompt users that need support to subscribe
-* include bar graphs for multiple-answer form questions
+* support
+  * prompt users that need support to subscribe
+  * refactor debugging data generation to easily show users what data is included
+* form improvements
+  * include bar graphs for multiple-answer form questions
+  * move the tally of empty responses to the top of each question's summary (rather than the bottom)
+* bar charts on the admin page's 'Performance' tab
+* enhancements for guest users and registered users without names or avatars
+  * two initials for users with a custom name but no avatar (previously one initial, always capitalized)
+  * animal avatars as defaults instead of indistinguishable initials (A for Anonymous, G for Guest)
+    * configurable via `AppConfig.emojiAvatars = []`
+  * authorship data for guests in rich text comments, code editor author data
+  * emojis in cursor tooltips for guests (rich text, code, slide, kanban)
+  * emojis in the share and access modals for contacts with empty names
+* script to identify unnecessary duplication of translations
+
 
 ## Bug fixes
 
+* fix empty name fields in various places across the platform where we did not fall back to "anonymous/guest"
+  * teams
+  * contacts
+  * ???
+* clarified a comment in the nginx config about _professional support_
+* handled an edge case in ICS import to calendars where DTEND was not defined (use duration or consider it an "all-day" event
+
 
 # 4.10.0
 
diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index 000d049b3..3575c95b0 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -235,7 +235,7 @@ define([
         };
     };
 
-    funcs.getAuthorId = function () {
+    funcs.getAuthorId = function () { // XXX
     };
 
     var authorUid = function(existing) {
@@ -263,6 +263,11 @@ define([
             });
             return uid || authorUid(existing);
         }
+        // XXX this should check for a matching curvePublic / uid if:
+        // 1. you are logged in OR
+        // 2. you have a token
+        // so that users that register recognize comments from before
+        // they registered as their own (same uid)
         existing.some(function(id) {
             var author = authors[id] || {};
             if (author.curvePublic !== curve) { return; }

From 79ca8778e78bdac05e4e3819d55421166623e3c0 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Mon, 30 Aug 2021 03:57:29 +0200
Subject: [PATCH 037/125] Translated using Weblate (Spanish)

Currently translated at 45.9% (636 of 1384 strings)

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

Translated using Weblate (Spanish)

Currently translated at 45.9% (636 of 1384 strings)

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

Translated using Weblate (Spanish)

Currently translated at 45.9% (636 of 1384 strings)

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

diff --git a/www/common/translations/messages.es.json b/www/common/translations/messages.es.json
index 2c6c4e98a..3864ea8a8 100644
--- a/www/common/translations/messages.es.json
+++ b/www/common/translations/messages.es.json
@@ -607,5 +607,44 @@
     "share_linkEdit": "Editar",
     "share_linkAccess": "Permisos de acceso",
     "properties_passwordWarning": "La contraseña ha sido cambiada con éxito pero fue incapaz de actualizar tu CryptDrive con los nuevos datos. Es posible que tenga que eliminar la versión antigua del pad manualmente.<br>Pulse OK para recargar y actualizar sus derechos de acceso.",
-    "properties_passwordSuccess": "La contraseña ha sido cambiada con éxito.<br>Pulsa OK para recargar y actualizar tus derechos de acceso."
+    "properties_passwordSuccess": "La contraseña ha sido cambiada con éxito.<br>Pulsa OK para recargar y actualizar tus derechos de acceso.",
+    "admin_updateLimitTitle": "Actualizar cuotas de usuarios",
+    "admin_registeredHint": "Número de usuarios registrados en tu instancia",
+    "admin_registeredTitle": "Usuarios registrados",
+    "admin_activePadsHint": "Número de documentos únicos que se están viendo o editando ahora",
+    "admin_activePadsTitle": "Blocs activos",
+    "admin_activeSessionsHint": "Número de conexiones websocket activas (y direcciones IP únicas conectadas)",
+    "admin_activeSessionsTitle": "Conexiones activas",
+    "adminPage": "Administración",
+    "admin_cat_stats": "Estadísticas",
+    "admin_cat_general": "General",
+    "admin_authError": "Solo los administradores pueden acceder a esta página.",
+    "markdown_toc": "Contenido",
+    "survey": "Encuesta de CryptPad",
+    "crowdfunding_popup_no": "Ahora no",
+    "crowdfunding_popup_text": "<h3 >¡Necesitamos tu ayuda!</h3>Para garantizar que CryptPad se desarrolle activamente, considera apoyar el proyecto a través de la página OpenCollective, donde puedes ver nuestra <b>Hoja de ruta</b> y <b>Objetivos de financiación</b>.",
+    "autostore_notAvailable": "Tienes que guardar el bloc en tu CryptDrive antes de usar esta función.",
+    "autostore_forceSave": "Guarda el fichero en tu CryptDrive",
+    "autostore_saved": "El bloc se guardó correctamente en tu CryptDrive!",
+    "autostore_error": "Error extraño: No pudimos guardar este bloc, inténtalo otra vez.",
+    "autostore_hide": "No guardar",
+    "autostore_store": "Guardar",
+    "autostore_settings": "Puedes habilitar el almacenamiento automático de blocs en su <a>Página de</a> configuración!",
+    "autostore_notstored": "Este {0} no está en su CryptDrive. ¿Quieres guardarlo ahora?",
+    "autostore_sf": "carpeta",
+    "chrome68": "Parece que estás usando el navegador Chrome o Chromium versión 68. Contiene un error que hace que la página se vuelva completamente blanca después de unos segundos o que la página no responda a los clics. Para solucionar este problema, puede cambiar a otra pestaña y volver, o tratar de desplazarse en la página. Este error debe corregirse en la próxima versión de su navegador.",
+    "convertFolderToSF_confirm": "Esta carpeta debe convertirse a carpeta compartida para que otros la puedan ver. ¿Continuar?",
+    "sharedFolders_create_owned": "Carpeta con propietario",
+    "sharedFolders_create_name": "Nombre de carpeta",
+    "share_embedCategory": "Embeber",
+    "share_linkPresent": "Presentar",
+    "share_linkEmbed": "Modo de inserción (oculta barra de herramientas y lista de usuarios)",
+    "settings_padOpenLinkLabel": "Habilita la apertura directa del enlace",
+    "settings_padOpenLinkHint": "Con esta opción puedes abrir enlaces embebidos haciendo click sin el popup de previsualización",
+    "properties_changePasswordButton": "Enviar",
+    "convertFolderToSF_SFChildren": "Esta carpeta no puede ser convertida a una carpeta compartida porque ya contiene carpetas compartidas. Mueva esas carpetas compartidas a otro lugar para continuar.",
+    "convertFolderToSF_SFParent": "Esta carpeta no puede ser convertida a una carpeta compartida en su actual localización. Mueva la carpeta fuera de la carperta compartida para continuar.",
+    "sharedFolders_share": "Comparte este enlace con otros usuarios registrados para darles accesso a la carpeta compartida. Una vez que ellos/as abran este enlace, la carpeta compartida será añadida a sus CryptDrive.",
+    "sharedFolders_create": "Crear una carpeta compartida",
+    "sharedFolders_duplicate": "Algunos de los documentos que intentaste mover ya estaban compartidos en la carpeta de destino"
 }

From 86c9aaac233755b42a18e59fd8ad11b542dddade Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Mon, 30 Aug 2021 03:57:29 +0200
Subject: [PATCH 038/125] Translated using Weblate (German)

Currently translated at 100.0% (1384 of 1384 strings)

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

Translated using Weblate (German)

Currently translated at 99.9% (1383 of 1384 strings)

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

diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json
index 0b5db20e7..35067f597 100644
--- a/www/common/translations/messages.de.json
+++ b/www/common/translations/messages.de.json
@@ -26,7 +26,7 @@
     "typeError": "Dieses Dokument ist nicht mit der ausgewählten Anwendung kompatibel",
     "onLogout": "Du bist ausgeloggt. {0}Klicke hier{1}, um dich wieder einzuloggen,<br>oder drücke <em>Escape</em>, um dein Pad schreibgeschützt zu benutzen.",
     "padNotPinned": "Dieses Pad wird nach 3 Monaten ohne Aktivität auslaufen, {0}logge dich ein{1} oder {2}registriere dich{3}, um das Auslaufen zu verhindern.",
-    "anonymousStoreDisabled": "Der Webmaster dieses CryptPad-Servers hat die anonyme Verwendung des Speichers deaktiviert. Du musst dich einloggen, um CryptDrive zu verwenden.",
+    "anonymousStoreDisabled": "Der Administrator dieser CryptPad-Instanz hat die Verwendung des Speichers für Gäste deaktiviert. Logge dich ein, um dein persönliches CryptDrive zu verwenden.",
     "expiredError": "Dieses Pad ist abgelaufen und nicht mehr verfügbar.",
     "deletedError": "Dieses Dokument wurde gelöscht und ist nicht mehr verfügbar.",
     "inactiveError": "Dieses Pad ist wegen Inaktivität gelöscht worden. Drücke Esc, um ein neues Pad zu erstellen.",
@@ -50,7 +50,7 @@
     "forgotten": "In den Papierkorb verschoben",
     "errorState": "Kritischer Fehler: {0}",
     "readonly": "schreibgeschützt",
-    "anonymous": "Anonym",
+    "anonymous": "Gast",
     "users": "Nutzer",
     "viewer": "Betrachter",
     "viewers": "Betrachter",
@@ -326,7 +326,7 @@
     "login_invalUser": "Der Benutzername kann nicht leer sein",
     "login_invalPass": "Der Passwort kann nicht leer sein",
     "login_unhandledError": "Ein unerwarteter Fehler ist aufgetreten :(",
-    "register_importRecent": "Dokumente aus deiner nicht-registrierten Sitzung importieren",
+    "register_importRecent": "Dokumente aus deiner Gast-Sitzung importieren",
     "register_acceptTerms": "Ich bin mit den <a>Nutzungsbedingungen</a> einverstanden",
     "register_passwordsDontMatch": "Passwörter stimmen nicht überein!",
     "register_passwordTooShort": "Passwörter müssen mindestens {0} Zeichen haben.",
@@ -498,7 +498,7 @@
     "whatis_drive": "Organisieren mit CryptDrive",
     "features": "Funktionen",
     "features_title": "Funktionen",
-    "features_anon": "Nicht-registriert",
+    "features_anon": "Gast",
     "features_registered": "Registriert",
     "features_premium": "Premium",
     "features_f_apps": "Zugang zu allen Anwendungen",
@@ -510,7 +510,7 @@
     "features_f_cryptdrive0_note": "Du kannst besuchte Dokumente in deinem Browser speichern, damit du sie später öffnen kannst",
     "features_f_storage0": "Speicherung für eine begrenzte Zeit",
     "features_f_storage0_note": "Dokumente werden nach {0} Tagen ohne Aktivität gelöscht",
-    "features_f_anon": "Alle Funktionen für anonyme Benutzer",
+    "features_f_anon": "Alle Funktionen für Gäste",
     "features_f_anon_note": "Mit zusätzlichen Funktionen",
     "features_f_cryptdrive1": "Alle Funktionen des CryptDrives",
     "features_f_cryptdrive1_note": "Ordner, geteilte Ordner, Vorlagen, Tags",
@@ -882,7 +882,7 @@
     "oo_exportInProgress": "Export wird durchgeführt",
     "oo_sheetMigration_loading": "Deine Tabelle wird auf die neueste Version aktualisiert. Bitte warte etwa eine Minute.",
     "oo_sheetMigration_complete": "Eine aktualisierte Version ist verfügbar. Klicke auf OK, um neu zu laden.",
-    "oo_sheetMigration_anonymousEditor": "Die Bearbeitung dieser Tabelle ist für nicht-registrierte Benutzer deaktiviert, bis sie von einem registrierten Benutzer auf die neueste Version aktualisiert wird.",
+    "oo_sheetMigration_anonymousEditor": "Die Bearbeitung dieser Tabelle ist für Gäste deaktiviert, bis sie von einem registrierten Benutzer auf die neueste Version aktualisiert wird.",
     "imprint": "Impressum",
     "isContact": "{0} ist einer deiner Kontakte",
     "isNotContact": "{0} ist <b>nicht</b> einer deiner Kontakte",
@@ -1120,7 +1120,7 @@
     "whatis_apps": "Eine vollständige Anwendungs-Suite",
     "whatis_drive_info": "<p>Speichere und verwalte Dokumente mit CryptDrive. Erstelle Ordner, gemeinsame Ordner und Tags, um Dokumente zu organisieren. Lade Dateien hoch und teile sie (PDFs, Fotos, Video, Audio, etc.). Team-Drives werden zwischen Benutzern geteilt und ermöglichen eine gemeinsame Organisation und detaillierte Zugriffskontrolle.</p>",
     "whatis_apps_info": "<p>CryptPad bietet eine vollwertige Office-Suite mit allen notwendigen Werkzeugen für eine produktive Zusammenarbeit. Die Anwendungen umfassen: Rich Text, Tabellen, Code/Markdown, Kanban, Präsentationen, Whiteboard und Umfragen.</p><p>Die Anwendungen werden ergänzt durch eine Reihe von Funktionen zur Zusammenarbeit wie Chat, Kontakte, Farbe nach Autor (Code/Markdown) und Kommentare mit Erwähnungen (Rich Text).</p>",
-    "register_notes": "<ul class=\"cp-notes-list\"><li>Dein Passwort ist der geheime Schlüssel, der alle deine Dokumente verschlüsselt. <span class=\"red\">Wenn du ihn verlierst, gibt es keine Möglichkeit, deine Daten wiederherzustellen.</span></li><li>Wenn du einen gemeinsam genutzten Computer verwendest, <span class=\"red\">denke daran, dich abzumelden</span>, wenn du fertig bist. Durch bloßes Schließen des Browserfensters bleibt das Konto ungeschützt.</li><li>Um die erstellten und/oder gespeicherten Dokumente zu behalten, ohne eingeloggt zu sein, setze einen Haken bei \"Dokumente aus deiner nicht-registrierten Sitzung importieren\". </li></ul>",
+    "register_notes": "<ul class=\"cp-notes-list\"><li>Dein Passwort ist der geheime Schlüssel, der alle deine Dokumente verschlüsselt. <span class=\"red\">Wenn du ihn verlierst, gibt es keine Möglichkeit, deine Daten wiederherzustellen.</span></li><li>Wenn du einen gemeinsam genutzten Computer verwendest, <span class=\"red\">denke daran, dich abzumelden</span>, wenn du fertig bist. Durch bloßes Schließen des Browserfensters bleibt das Konto ungeschützt.</li><li>Um die Dokumente zu behalten, die du erstellt und/oder gespeichert hast, ohne eingeloggt zu sein, setze einen Haken bei \"Dokumente aus deiner Gast-Sitzung importieren\". </li></ul>",
     "settings_cacheTitle": "Cache",
     "settings_cacheButton": "Cache leeren",
     "settings_cacheCheckbox": "Cache auf diesem Gerät aktivieren",
@@ -1382,5 +1382,7 @@
     "fm_link_new": "Neuer Link",
     "form_totalResponses": "Antworten insgesamt: {0}",
     "ui_expand": "Ausklappen",
-    "ui_collapse": "Einklappen"
+    "ui_collapse": "Einklappen",
+    "support_premiumPriority": "Premium-Benutzer helfen bei der Verbesserung der Benutzerfreundlichkeit von CryptPad und profitieren von priorisierten Antworten auf ihre Support-Tickets.",
+    "support_premiumLink": "Abonnementoptionen ansehen"
 }

From cea38b1ff4c23000ebd5698192a6271f3dd6442c Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Mon, 30 Aug 2021 03:57:30 +0200
Subject: [PATCH 039/125] Translated using Weblate (Japanese)

Currently translated at 100.0% (1384 of 1384 strings)

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

diff --git a/www/common/translations/messages.ja.json b/www/common/translations/messages.ja.json
index 55bb0b8c5..656239dec 100644
--- a/www/common/translations/messages.ja.json
+++ b/www/common/translations/messages.ja.json
@@ -123,7 +123,7 @@
     "login_hashing": "パスワードをハッシュ化しています。この処理には時間がかかる場合があります。",
     "login_invalPass": "パスワードを入力してください",
     "login_invalUser": "ユーザー名を入力してください",
-    "register_importRecent": "匿名セッションのドキュメントをインポート",
+    "register_importRecent": "ゲストセッションのドキュメントをインポート",
     "importButton": "インポート",
     "main_catch_phrase": "コラボレーションスイート<br>端末間暗号化とオープンソース",
     "tos_3rdparties": "私たちは、法令に基づく場合を除き、個人情報を第三者に提供しません。",
@@ -206,7 +206,7 @@
     "reconnecting": "再接続中",
     "synchronizing": "同期中",
     "initializing": "初期化中...",
-    "anonymous": "匿名",
+    "anonymous": "ゲスト",
     "editor": "編集者",
     "typing": "編集中",
     "team_infoLabel": "チームについて",
@@ -265,7 +265,7 @@
     "features_f_cryptdrive1_note": "フォルダ、共有フォルダ、テンプレート、タグ",
     "features_f_cryptdrive1": "CryptDriveの全機能",
     "features_f_anon_note": "追加機能あり",
-    "features_f_anon": "匿名ユーザーの全機能",
+    "features_f_anon": "ゲストユーザーの全機能",
     "features_f_storage0_note": "ドキュメントは{0}日以上利用されないと削除されます",
     "features_f_storage0": "一時的な保存",
     "features_f_cryptdrive0_note": "アクセスしたパッドをブラウザに保存して、後で開くことができます",
@@ -278,7 +278,7 @@
     "features_premium": "プレミアム",
     "features_registered": "登録済",
     "features_title": "機能",
-    "features_anon": "未登録",
+    "features_anon": "ゲスト",
     "register_whyRegister": "登録するメリットをご紹介します",
     "historyText": "履歴",
     "help_button": "ヘルプ",
@@ -481,7 +481,7 @@
     "upload_pending": "保留中",
     "settings_resetTips": "ヒント",
     "chrome68": "バージョン68のChromeもしくはChromiumを使用しているようです。このバージョンには、数秒経過した後でページが白紙になったり、クリックにページが反応しなくなったりするバグがあります。この問題を解決するには、別のタブを表示して改めて表示するか、このページでスクロールを試みてください。このバグは次のバージョンで解決される予定となっています。",
-    "register_notes": "<ul class=\"cp-notes-list\"><li>ドキュメントは、パスワードによって暗号化されます。<span class=\"red\">パスワードを紛失すると、データを復元することはできません。</span></li><li>共有のコンピュータを使用している場合は、作業完了時に<span class=\"red\">忘れずログアウトしてください。</span> ブラウザーのウインドウを閉じても、アカウントからはログアウトされません。</li><li>未ログインで作成、共有したファイルを保存するには、 「匿名セッションのドキュメントをインポート」にチェックをしてください。 </li></ul>",
+    "register_notes": "<ul class=\"cp-notes-list\"><li>ドキュメントは、パスワードによって暗号化されます。<span class=\"red\">パスワードを紛失すると、データを復元することはできません。</span></li><li>共有のコンピュータを使用している場合は、作業完了時に<span class=\"red\">忘れずログアウトしてください。</span> ブラウザーのウインドウを閉じても、アカウントからはログアウトされません。</li><li>未ログインで作成、共有したファイルを保存するには、 「ゲストセッションのドキュメントをインポート」にチェックをしてください。 </li></ul>",
     "poll_commit": "送信",
     "admin_removeDonateButtonTitle": "クラウドファンディングへの参加",
     "mediatag_notReady": "ダウンロードを完了してください",
@@ -774,7 +774,7 @@
     "inactiveError": "このパッドは利用されていなかったため削除されました。Escキーを押すと新しいパッドを作成します。",
     "deletedError": "このドキュメントは削除されたため、利用できなくなりました。",
     "expiredError": "このパッドは利用期限を過ぎてしまったため、利用できなくなりました。",
-    "anonymousStoreDisabled": "このCryptPadのインスタンスの管理者は、匿名ユーザーによる保存を無効に設定しています。CryptDriveを使用するにはログインする必要があります。",
+    "anonymousStoreDisabled": "このCryptPadのインスタンスの管理者は、ゲストによる保存を無効に設定しています。あなたのCryptDriveにアクセスするにはログインが必要です。",
     "padNotPinnedVariable": "このパッドは{4}日間利用しないと有効期限が切れます。{0}ログイン{1}するか{2}登録{3}して保存してください。",
     "padNotPinned": "このパッドは3か月間利用しないと有効期限が切れます。{0}ログイン{1}するか{2}登録{3}して保存してください。",
     "onLogout": "ログアウトしました。{0}ここをクリック{1}するか<br><em>Escape</em>キーを押すと、閲覧モードでパッドにアクセスできます。",
@@ -1095,7 +1095,7 @@
     "trimHistory_getSizeError": "ドライブの履歴のサイズを計算している途中でエラーが発生しました",
     "profile_login": "このユーザーを連絡先に追加するにはログインする必要があります",
     "dontShowAgain": "再び表示しない",
-    "oo_sheetMigration_anonymousEditor": "登録ユーザーが最新のバージョンに更新するまで、このスプレッドシートを未登録ユーザーが編集することはできません。",
+    "oo_sheetMigration_anonymousEditor": "登録ユーザーが最新のバージョンに更新するまで、このスプレッドシートをゲストが編集することはできません。",
     "oo_invalidFormat": "このファイルはインポートできません",
     "burnAfterReading_warningDeleted": "このパッドは削除されました。ウインドウを閉じた後で再びアクセスすることはできません。",
     "burnAfterReading_proceed": "表示して削除",
@@ -1382,5 +1382,7 @@
     "form_answerAs": "名前を記入してください",
     "form_totalResponses": "回答数：{0}",
     "ui_expand": "広げる",
-    "ui_collapse": "折りたたむ"
+    "ui_collapse": "折りたたむ",
+    "support_premiumPriority": "プレミアムユーザーになると、CryptPadの使い勝手を改良する手助けができるほか、サポートチケットに対する優先サポートを受けることができます。",
+    "support_premiumLink": "定額利用のオプションを表示"
 }

From e074b3676120e044b6dde86a0ff7a10d7583c3c9 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 30 Aug 2021 17:48:31 +0530
Subject: [PATCH 040/125] lint compliance

---
 scripts/translations/find-duplicate-translations.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/translations/find-duplicate-translations.js b/scripts/translations/find-duplicate-translations.js
index 8306fc70c..a6bc53613 100644
--- a/scripts/translations/find-duplicate-translations.js
+++ b/scripts/translations/find-duplicate-translations.js
@@ -48,12 +48,14 @@ var findDuplicates = function (map) {
     return canonical;
 };
 
+/*
 var logDuplicates = function (duplicates) {
     // indicate which strings are duplicated and could potentially be changed to use one key
     Object.keys(duplicates).forEach(function (val) {
         console.log('\"%s\" => %s', val, JSON.stringify(duplicates[val]));
     });
 };
+*/
 
 var FULL_LANGUAGES = {
     EN: Util.clone(require("../../www/common/translations/messages.json")),

From 7231fc6926c4d3b1b5a863e454149c976f91afd3 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 30 Aug 2021 17:51:23 +0530
Subject: [PATCH 041/125] media-tag accessibility and UX improvements

* preview content and prompt users to describe media when uploading
* add 'alt' attributes to rendered media-tag content if it is included in the file's encrypted metadata
* add alt attributes to some related UI elements
---
 .../src/less2/include/modals-ui-elements.less |  9 ++++
 www/common/common-ui-elements.js              |  6 ++-
 www/common/media-tag.js                       | 44 ++++++++++++----
 www/common/sframe-common-file.js              | 52 ++++++++++++++-----
 www/profile/inner.js                          |  4 +-
 5 files changed, 92 insertions(+), 23 deletions(-)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 7ec19a699..3e449d495 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -273,4 +273,13 @@
             }
         }
     }
+    #cp-upload-preview-container {
+        max-width: 100%;
+        media-tag {
+            max-width: 100%;
+            & > * {
+                max-width: 100%;
+            }
+        }
+    }
 }
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index abf45b0bd..f77a9d422 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1658,6 +1658,7 @@ define([
         UI.openCustomModal(modal);
     };
 
+    Messages.toolbar_userMenuAlt = "User menu"; // XXX
     UIElements.createUserAdminMenu = function (Common, config) {
         var metadataMgr = Common.getMetadataMgr();
 
@@ -1990,8 +1991,11 @@ define([
         */
 
         var $displayName = $userAdmin.find('.'+displayNameCls);
+        $userAdmin.attr({ // XXX is this on the right element?
+            alt: Messages.toolbar_userMenuAlt,
+        });
 
-        var $avatar = $userAdmin.find('> button .cp-dropdown-button-title'); // XXX alt="User menu"
+        var $avatar = $userAdmin.find('> button .cp-dropdown-button-title');
         var loadingAvatar;
         var to;
         var oldUrl = '';
diff --git a/www/common/media-tag.js b/www/common/media-tag.js
index d1a5ebcda..e8b35a47e 100644
--- a/www/common/media-tag.js
+++ b/www/common/media-tag.js
@@ -73,7 +73,6 @@ var factory = function () {
              * @param {object}   cfg     Object {Plugins, allowed, download, pdf} containing infos about plugins
              * @param {function} cb      Callback function: (err, pluginElement) => {}
              */
-             // XXX add alt attributes if present in metadata
             text: function (metadata, url, content, cfg, cb) {
                 var plainText = document.createElement('div');
                 plainText.className = "plain-text-reader";
@@ -88,6 +87,7 @@ var factory = function () {
             image: function (metadata, url, content, cfg, cb) {
                 var img = document.createElement('img');
                 img.setAttribute('src', url);
+                img.setAttribute('alt', metadata.alt || "");
                 img.blob = content;
                 cb(void 0, img);
             },
@@ -95,15 +95,19 @@ var factory = function () {
                 var video = document.createElement('video');
                 video.setAttribute('src', url);
                 video.setAttribute('controls', true);
+                // https://discuss.codecademy.com/t/can-we-use-an-alt-attribute-with-the-video-tag/300322/4
+                video.setAttribute('title', metadata.alt || "");
                 cb(void 0, video);
             },
             audio: function (metadata, url, content, cfg, cb) {
                 var audio = document.createElement('audio');
                 audio.setAttribute('src', url);
                 audio.setAttribute('controls', true);
+                audio.setAttribute('alt', metadata.alt || "");
                 cb(void 0, audio);
             },
             pdf: function (metadata, url, content, cfg, cb) {
+                // XXX alt text
                 var iframe = document.createElement('iframe');
                 if (cfg.pdf.viewer) { // PDFJS
                     var viewerUrl = cfg.pdf.viewer + '?file=' + url;
@@ -116,6 +120,7 @@ var factory = function () {
             download: function (metadata, url, content, cfg, cb) {
                 var btn = document.createElement('button');
                 btn.setAttribute('class', 'btn btn-default');
+                btn.setAttribute('alt', metadata.alt || "");
                 btn.innerHTML = '<i class="fa fa-save"></i>' + cfg.download.text + '<br>' +
                                 (metadata.name ? '<b>' + fixHTML(metadata.name) + '</b>' : '');
                 btn.addEventListener('click', function () {
@@ -543,7 +548,7 @@ var factory = function () {
 
     // Process
     var process = function (mediaObject, decrypted, cfg, cb) {
-        var metadata = decrypted.metadata;
+        var metadata = decrypted.metadata || {};
         var blob = decrypted.content;
 
         var mediaType = getType(mediaObject, metadata, cfg);
@@ -597,6 +602,15 @@ var factory = function () {
         });
     };
 
+    var initHandlers = function () {
+        return {
+            'progress': [],
+            'complete': [],
+            'metadata': [],
+            'error': []
+        };
+    };
+
     // Initialize a media-tag
     var init = function (el, cfg) {
         cfg = cfg || {};
@@ -614,13 +628,7 @@ var factory = function () {
             };
         }
 
-        var handlers = cfg.handlers || {
-            'progress': [],
-            'complete': [],
-            'metadata': [],
-            'error': []
-        };
-
+        var handlers = cfg.handlers || initHandlers();
         var mediaObject = el._mediaObject = {
             handlers: handlers,
             tag: el
@@ -763,6 +771,24 @@ var factory = function () {
 
     init.fetchDecryptedMetadata = fetchDecryptedMetadata;
 
+    init.preview = function (content, metadata, cfg, cb) {
+        cfg = cfg || {};
+        addMissingConfig(cfg, config);
+        var handlers = cfg.handlers || initHandlers();
+        var el = document.createElement('media-tag');
+        var mediaObject = el._mediaObject = {
+            handlers: handlers,
+            tag: el,
+        };
+        process(mediaObject, {
+            metadata: metadata,
+            content: content
+        }, cfg, function (err) {
+            if (err) { return void cb(err); }
+            cb(void 0, el);
+        });
+    };
+
     return init;
 };
 
diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js
index 1286da14d..a56313444 100644
--- a/www/common/sframe-common-file.js
+++ b/www/common/sframe-common-file.js
@@ -11,10 +11,12 @@ define([
     '/common/hyperscript.js',
     '/customize/messages.js',
     '/customize/pages.js',
+    '/bower_components/nthen/index.js',
+    '/common/media-tag.js',
 
     '/bower_components/file-saver/FileSaver.min.js',
     '/bower_components/tweetnacl/nacl-fast.min.js',
-], function ($, ApiConfig, FileCrypto, MakeBackup, Thumb, UI, UIElements, Util, Hash, h, Messages, Pages) {
+], function ($, ApiConfig, FileCrypto, MakeBackup, Thumb, UI, UIElements, Util, Hash, h, Messages, Pages, nThen, MT) {
     var Nacl = window.nacl;
     var module = {};
 
@@ -312,7 +314,11 @@ define([
             });
             return manualStore;
         };
-        var fileUploadModal = function (defaultFileName, cb) {
+
+        Messages.upload_modal_alt = "Alt text"; // XXX
+        Messages.upload_addOptionalAlt = "Add descriptive text (optional)"; // XXX
+
+        var fileUploadModal = function (defaultFileName, cb, preview) {
             var parsedName = /^(\.?.+?)(\.[^.]+)?$/.exec(defaultFileName) || [];
             var ext = parsedName[2] || "";
 
@@ -321,9 +327,15 @@ define([
             // Ask for name, password and owner
             var content = h('div', [
                 h('h4', Messages.upload_modal_title),
+                (preview? h('div#cp-upload-preview-container', preview): undefined),
                 UIElements.setHTML(h('label', {for: 'cp-upload-name'}),
                                    Messages._getKey('upload_modal_filename', [ext])),
                 h('input#cp-upload-name', {type: 'text', placeholder: defaultFileName, value: defaultFileName}),
+
+                h('label', {for: 'cp-upload-alt'}, Messages.upload_addOptionalAlt), // XXX alt text for uploads
+                h('input#cp-upload-alt', {type: 'text', placeholder: Messages.upload_modal_alt}),
+
+
                 h('label', {for: 'cp-upload-password'}, Messages.addOptionalPassword),
                 UI.passwordInput({id: 'cp-upload-password'}),
                 h('span', {
@@ -335,7 +347,8 @@ define([
                 manualStore
             ]);
 
-            $(content).find('#cp-upload-owned').on('change', function () {
+            var $content = $(content);
+            $content.find('#cp-upload-owned').on('change', function () {
                 var val = Util.isChecked($(content).find('#cp-upload-owned'));
                 if (val) {
                     $(content).find('#cp-upload-store').prop('checked', true).prop('disabled', true);
@@ -348,8 +361,9 @@ define([
                 if (!yes) { return void cb(); }
 
                 // Get the values
-                var newName = $(content).find('#cp-upload-name').val();
-                var password = $(content).find('#cp-upload-password').val() || undefined;
+                var newName = $content.find('#cp-upload-name').val();
+                var password = $content.find('#cp-upload-password').val() || undefined;
+                var alt = $content.find('#cp-upload-alt').val() || undefined;
                 var owned = Util.isChecked($(content).find('#cp-upload-owned'));
                 var forceSave = owned || Util.isChecked($(content).find('#cp-upload-store'));
 
@@ -366,7 +380,8 @@ define([
                     name: newName,
                     password: password,
                     owned: owned,
-                    forceSave: forceSave
+                    forceSave: forceSave,
+                    alt: alt,
                 });
             });
         };
@@ -437,6 +452,8 @@ define([
             }
 
             var thumb;
+            var preview;
+            var alt;
             var file_arraybuffer;
             var name = file.name;
             var password;
@@ -447,6 +464,7 @@ define([
                     var metadata = {
                         name: name,
                         type: type,
+                        alt: alt,
                     };
                     if (thumb) { metadata.thumbnail = thumb; }
                     queue.push({
@@ -486,8 +504,9 @@ define([
                         password = obj.password;
                         owned = obj.owned;
                         forceSave = obj.forceSave;
+                        alt = obj.alt;
                         finish();
-                    });
+                    }, preview);
                 }
             };
 
@@ -495,11 +514,20 @@ define([
                 if (e) { console.error(e); }
                 file_arraybuffer = buffer;
                 if (!Thumb.isSupportedType(file)) { return getName(); }
-                // make a resized thumbnail from the image..
-                Thumb.fromBlob(file, function (e, thumb64) {
-                    if (e) { console.error(e); }
-                    if (!thumb64) { return getName(); }
-                    thumb = thumb64;
+                nThen(function (w) {
+                    // make a resized thumbnail from the image..
+                    Thumb.fromBlob(file, w(function (e, thumb64) {
+                        if (e) { console.error(e); }
+                        if (!thumb64) { return; }
+                        thumb = thumb64;
+                    }));
+                    MT.preview(buffer, {
+                        type: file.type,
+                    }, void 0, w(function (err, el) {
+                        if (err) { return void console.error(err); }
+                        preview = el;
+                    }));
+                }).nThen(function () {
                     getName();
                 });
             });
diff --git a/www/profile/inner.js b/www/profile/inner.js
index c63b72e99..284b19114 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -341,6 +341,8 @@ define([
         });
     };
 
+    Messages.profile_defaultAlt = "Default profile picture"; // XXX
+
     var displayAvatar = function (val) {
         var sframeChan = common.getSframeChannel();
         var $span = APP.$avatar;
@@ -349,7 +351,7 @@ define([
             $('<img>', {
                 src: '/customize/images/avatar.png',
                 title: Messages.profile_avatar,
-                alt: 'Avatar' // XXX translate this "Default profile picture"
+                alt: Messages.profile_defaultAlt,
             }).appendTo($span);
             return;
         }

From 02d9da502d4f376c8a76775da48fdd35f8aa3ddc Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 30 Aug 2021 17:56:53 +0530
Subject: [PATCH 042/125] remove dead code

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

diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less
index 1b0c75932..564067fb7 100644
--- a/customize.dist/src/less2/include/sidebar-layout.less
+++ b/customize.dist/src/less2/include/sidebar-layout.less
@@ -69,7 +69,6 @@
             background: @cp_sidebar-right-bg;
             color: @cp_sidebar-right-fg;
             overflow: auto;
-            //padding-bottom: 200px; // XXX what was the intent behind this?
 
             // Following rules are only in settings
             .cp-sidebarlayout-element {

From 147ddd88bf0aa32e7f144155c9eeadab794ed19a Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 30 Aug 2021 18:40:42 +0530
Subject: [PATCH 043/125] adjust font size for initials and emoji avatar size
 on small screens

---
 customize.dist/src/less2/include/toolbar.less | 9 +++++++--
 www/kanban/app-kanban.less                    | 5 ++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 2092d72cc..6ccec507d 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -532,7 +532,13 @@
                         &> button {
                             height: @toolbar_line-height;
                             width: @toolbar_line-height;
-                            span { font-size: unset; }
+                            span {
+                                .avatar_vars(36px);
+                                font-size: @avatar-font-size;
+                                .animal {
+                                    font-size: @avatar-font-size-animal;
+                                }
+                            }
                         }
                         &> button.cp-avatar.cp-avatar {
                             media-tag {
@@ -862,7 +868,6 @@
                         align-items: center;
                         .animal {
                             font-size: @avatar-font-size-animal;
-
                         }
                     }
                     &.cp-avatar {
diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 5996940e4..79d5a87a3 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -162,10 +162,9 @@
             &.cp-cursor.cp-tippy-html {
                 .avatar_vars(20px);
                 background-color: var(--red);
-                // XXX figure out how to inherit this from avatar.less
-                font-size: @avatar-font-size; //var(11px; // 20px / 1.8 as per avatar.less..
+                font-size: @avatar-font-size;
                 &.animal {
-                    font-size: @avatar-font-size-animal; //14px; // 20px / 1.8 * (6/5)...
+                    font-size: @avatar-font-size-animal;
                 }
             }
         }

From 45d32f2294988f4f9652917c16b13e056b9ab5a9 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 1 Sep 2021 11:36:47 +0200
Subject: [PATCH 044/125] Fix conditions based on the initial question

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

diff --git a/www/form/inner.js b/www/form/inner.js
index 230a6aea7..f281d8452 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -3871,7 +3871,7 @@ define([
                         return;
                     }
                     rules.forEach(function (obj) {
-                        var idx = available.indexOf(obj.q);
+                        var idx = available.indexOf(String(obj.q));
                         // If this question doesn't exist before the section, remove the condition
                         if (!obj.q || idx === -1) {
                             var cIdx = rules.indexOf(obj);

From 0ac34f1030971af15dc92f8be968fa2bc5a6069f Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 1 Sep 2021 12:11:52 +0200
Subject: [PATCH 045/125] Fix UI issues when editing responses is blocked in
 forms

---
 www/form/inner.js | 8 ++++++++
 www/form/main.js  | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index f281d8452..ea2ebd100 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2436,6 +2436,10 @@ define([
                 $cbox.after(h('div.alert.alert-info', Messages.form_authAnswer));
             });
         }
+        if (update && content.answers.cantEdit) {
+            $cbox.hide();
+            anonName = undefined;
+        }
 
         var send = h('button.cp-open.btn.btn-primary', update ? Messages.form_update : Messages.form_submit);
         var reset = h('button.cp-open.cp-reset-button.btn.btn-danger-alt', Messages.form_reset);
@@ -2491,6 +2495,10 @@ define([
                 $send.text(Messages.form_update);
                 APP.hasAnswered = true;
                 showAnsweredPage(framework, content, { '_time': +new Date() });
+                if (content.answers.cantEdit) {
+                    $cbox.hide();
+                    if ($anonName) { $anonName.hide(); }
+                }
             });
         });
 
diff --git a/www/form/main.js b/www/form/main.js
index 7d81b1268..8c794a19a 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -221,8 +221,7 @@ define([
                                 delete results[parsed._proof.key];
                             }
                         }
-                        // XXX If "allow edition" is disabled, don't override here?
-                        // if (data.cantEdit && results[senderCurve]) { return; }
+                        if (data.cantEdit && results[senderCurve]) { return; }
                         results[senderCurve] = {
                             msg: parsed,
                             hash: hash,

From 0ac368a5c9088ccfa274e90b348ce7b2985ae788 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 1 Sep 2021 16:07:16 +0530
Subject: [PATCH 046/125] resolve minor comments and clean up

---
 www/common/common-messaging.js      |  2 +-
 www/common/common-ui-elements.js    |  2 +-
 www/common/inner/common-mediatag.js | 15 +++++----------
 www/common/sframe-common.js         |  5 +----
 www/common/toolbar.js               |  8 +++++---
 www/pad/cursor.js                   |  2 +-
 6 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/www/common/common-messaging.js b/www/common/common-messaging.js
index 1e6e26ce3..4a3eb2a91 100644
--- a/www/common/common-messaging.js
+++ b/www/common/common-messaging.js
@@ -18,7 +18,7 @@ define([
             curvePublic: proxy.curvePublic,
             notifications: Util.find(proxy, ['mailboxes', 'notifications', 'channel']),
             avatar: proxy.profile && proxy.profile.avatar,
-            uid: proxy.uid, // XXX test without this and see if it breaks things
+            uid: proxy.uid,
         };
         if (hash === false) { delete data.channel; }
         return data;
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index abf45b0bd..5bc8bf4f6 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1991,7 +1991,7 @@ define([
 
         var $displayName = $userAdmin.find('.'+displayNameCls);
 
-        var $avatar = $userAdmin.find('> button .cp-dropdown-button-title'); // XXX alt="User menu"
+        var $avatar = $userAdmin.find('> button .cp-dropdown-button-title');
         var loadingAvatar;
         var to;
         var oldUrl = '';
diff --git a/www/common/inner/common-mediatag.js b/www/common/inner/common-mediatag.js
index 21cb25e82..33e5d74f7 100644
--- a/www/common/inner/common-mediatag.js
+++ b/www/common/inner/common-mediatag.js
@@ -90,17 +90,12 @@ define([
     // https://emojipedia.org/nature/
     var ANIMALS = AppConfig.emojiAvatars || [];
 
-    var getRandomAnimal = function () { // XXX should never actually happen?
-        if (!ANIMALS.length) { return ''; }
-        return ANIMALS[Math.floor(Math.random() * ANIMALS.length)];
-    };
-
     var getPseudorandomAnimal = MT.getPseudorandomAnimal = function (seed) {
         if (!ANIMALS.length) { return ''; }
-        if (typeof(seed) !== 'string') { return getRandomAnimal(); }
-        seed = seed.replace(/\D/g, '').slice(0, 10); // XXX possible optimization for on-wire uid
+        if (typeof(seed) !== 'string') { return; }
+        seed = seed.replace(/\D/g, '').slice(0, 10); // TODO possible optimization for on-wire uid
         seed = parseInt(seed);
-        if (!seed) { return getRandomAnimal(); }
+        if (!seed) { return; }
         return ANIMALS[seed % ANIMALS.length] || '';
     };
 
@@ -141,7 +136,7 @@ define([
 
             var $avatar = $('<span>', {
                 'class': 'cp-avatar-default' + (animal_avatar? ' animal': ''),
-                // XXX prevents screenreaders from trying to describe this
+                // this prevents screenreaders from trying to describe this
                 alt: '',
                 'aria-hidden': true,
             }).text(text);
@@ -196,7 +191,7 @@ define([
                 var $img = $(mt).appendTo($container);
                 MT.displayMediatagImage(common, $img, function (err, $image) {
                     if (err) { return void console.error(err); }
-                    centerImage($img, $image); // XXX add alt="" (unless the media-tag has an alt attr)
+                    centerImage($img, $image);
                 });
             });
         }
diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index 3575c95b0..b7efd9f4f 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -235,9 +235,6 @@ define([
         };
     };
 
-    funcs.getAuthorId = function () { // XXX
-    };
-
     var authorUid = function(existing) {
         if (!Array.isArray(existing)) { existing = []; }
         var n;
@@ -263,7 +260,7 @@ define([
             });
             return uid || authorUid(existing);
         }
-        // XXX this should check for a matching curvePublic / uid if:
+        // TODO this should check for a matching curvePublic / uid if:
         // 1. you are logged in OR
         // 2. you have a token
         // so that users that register recognize comments from before
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 5b359a323..5f1c2ece5 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -164,6 +164,7 @@ MessengerUI, Messages, Pages) {
         });
     };
     var showColors = false;
+    Messages.userlist_visitProfile = "Visit {0}'s profile"; // XXX "'s" is incorrect for names that end in "s" in English... don't care?
     var updateUserList = function (toolbar, config, forceOffline) {
         if (!config.displayed || config.displayed.indexOf('userlist') === -1) { return; }
         if (toolbar.isAlone) { return; }
@@ -249,6 +250,7 @@ MessengerUI, Messages, Pages) {
         var friendRequests = Common.getFriendRequests(); // Friend requests received
         editUsersNames.forEach(function (data) {
             var name = data.name || Messages.anonymous;
+            var safeName = Util.fixHTML(name);
             var $span = $('<span>', {'class': 'cp-avatar'});
             if (data.color && showColors) {
                 $span.css('border-color', data.color);
@@ -323,7 +325,7 @@ MessengerUI, Messages, Pages) {
                     $('<button>', {
                         'class': 'fa fa-bell cp-toolbar-userlist-button',
                         'data-cptippy-html': true,
-                        'title': Messages._getKey('friendRequest_received', [Util.fixHTML(name)]),
+                        'title': Messages._getKey('friendRequest_received', [safeName]),
                     }).appendTo($nameSpan).click(function (e) {
                         e.stopPropagation();
                         UIElements.displayFriendRequestModal(Common, friendRequests[data.curvePublic]);
@@ -334,7 +336,7 @@ MessengerUI, Messages, Pages) {
                         'class': 'fa fa-user-plus cp-toolbar-userlist-button',
                         'data-cptippy-html': true,
                         'title': Messages._getKey('userlist_addAsFriendTitle', [
-                            Util.fixHTML(name)
+                            safeName,
                         ])
                     }).appendTo($nameSpan).click(function (e) {
                         e.stopPropagation();
@@ -356,9 +358,9 @@ MessengerUI, Messages, Pages) {
                 });
             }
             if (data.profile) {
-                // XXX title to visit their profile "Visit {0}'s profile"
                 // Messages.contacts_info3 "Double-click their icon to view their profile",
                 $span.addClass('cp-userlist-clickable');
+                $span.attr('title', Messages._getKey('userlist_visitProfile', [name]));
                 $span.click(function () {
                     Common.openURL(origin+'/profile/#' + data.profile);
                 });
diff --git a/www/pad/cursor.js b/www/pad/cursor.js
index ae91c80f1..b0268336b 100644
--- a/www/pad/cursor.js
+++ b/www/pad/cursor.js
@@ -42,7 +42,7 @@ define([
 
         var cursors = {};
 
-    // XXX despite the name of this function this doesn't actually render as a tippy tooltip
+    // FIXME despite the name of this function this doesn't actually render as a tippy tooltip
     // that means that emojis will use the system font that shows up in native tooltips
     // so this might be of limited value/aesthetic appeal compared to other apps' cursors
         var makeTippy = function (cursor) {

From ce302f2142c946aaf40db4abaec7c7710f2e4f95 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 1 Sep 2021 16:30:38 +0530
Subject: [PATCH 047/125] warn that IE isn't supported

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

diff --git a/www/common/boot2.js b/www/common/boot2.js
index ada5b794c..d143da87d 100644
--- a/www/common/boot2.js
+++ b/www/common/boot2.js
@@ -34,6 +34,7 @@ try {
 define([
     '/common/requireconfig.js'
 ], function (RequireConfig) {
+
     require.config(RequireConfig());
 
     // most of CryptPad breaks if you don't support isArray
@@ -91,4 +92,10 @@ define([
     } catch (e) { console.error(e); failStore(); }
 
     require([document.querySelector('script[data-bootload]').getAttribute('data-bootload')]);
+    if (typeof(Promise) !== 'function') {
+        setTimeout(function () {
+            var s = "Internet Explorer is not supported anymore, including by Microsoft.\n\nMost of CryptPad's collaborative functionality requires a modern browser to work.\n\nWe recommend Mozilla Firefox.";
+            window.alert(s);
+        });
+    }
 });

From b4775a0d500fe0d145cd161283fa83998143579d Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 1 Sep 2021 17:35:00 +0530
Subject: [PATCH 048/125] fix file upload preview size

---
 customize.dist/src/less2/include/modals-ui-elements.less | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 3e449d495..94ec06cc0 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -275,8 +275,14 @@
     }
     #cp-upload-preview-container {
         max-width: 100%;
+        max-height: 300px;
+        overflow: auto;
         media-tag {
             max-width: 100%;
+            iframe {
+                // pdfs don't take the full width unless we tell them to
+                width: 100%;
+            }
             & > * {
                 max-width: 100%;
             }

From 418e19e878dcfbf8b941ee63ba1c15ec3ead58a1 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 1 Sep 2021 17:36:47 +0530
Subject: [PATCH 049/125] warn that IE will no longer be supported in changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7325e2d21..45786f8a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 ## Update notes
 
+* warning about lack of support for internet explorer
+  * existing support will get worse over time. please update.
+
 ## Features
 
 * unify unregistered/non-registered/anonymous terminology as 'guest'

From 434e75dc15249a9fa1fabc89b99246a4038d9e06 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 1 Sep 2021 17:36:47 +0530
Subject: [PATCH 050/125] warn that IE will no longer be supported in changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7325e2d21..45786f8a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 ## Update notes
 
+* warning about lack of support for internet explorer
+  * existing support will get worse over time. please update.
+
 ## Features
 
 * unify unregistered/non-registered/anonymous terminology as 'guest'

From 86f23dcfc0df300bc9e20ae7d5efceaf427a9d74 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 1 Sep 2021 18:08:03 +0530
Subject: [PATCH 051/125] guarantee async behaviour when creating thumbnails

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

diff --git a/www/common/common-thumbnail.js b/www/common/common-thumbnail.js
index 01e89e5d1..e3b328dc1 100644
--- a/www/common/common-thumbnail.js
+++ b/www/common/common-thumbnail.js
@@ -196,7 +196,7 @@ define([
         reader.readAsText(blob);
     };
     Thumb.fromBlob = function (blob, _cb) {
-        var cb = Util.once(_cb);
+        var cb = Util.once(Util.mkAsync(_cb));
         // The blob is already in memory, it should be super-fast to make a thumbnail
         // ==> 1s timeout
         setTimeout(function () {

From 727af0ccf5db3f57e9a47c32a68d07eb6691193a Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 1 Sep 2021 18:08:41 +0530
Subject: [PATCH 052/125] update changelog and leave a note

---
 CHANGELOG.md                                             | 4 +++-
 customize.dist/src/less2/include/modals-ui-elements.less | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45786f8a6..822249a4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,9 @@
   * emojis in cursor tooltips for guests (rich text, code, slide, kanban)
   * emojis in the share and access modals for contacts with empty names
 * script to identify unnecessary duplication of translations
-
+* improvements to upload and media-tag UI
+  * support for adding descriptive text at upload time
+  * preview of uploaded media in the upload modal
 
 ## Bug fixes
 
diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 94ec06cc0..7c6e054c5 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -277,6 +277,9 @@
         max-width: 100%;
         max-height: 300px;
         overflow: auto;
+        // XXX these styles yield weird results for tall, thin images
+        // maybe img { object-fit: contain; } or scale-down are options
+        // but they have problems too
         media-tag {
             max-width: 100%;
             iframe {

From 21dca721aad713a30444bf76724115003221ca88 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 1 Sep 2021 19:51:00 +0530
Subject: [PATCH 053/125] override bootstrap colors for link preview in the
 link-shared dialog

---
 customize.dist/src/less2/include/alertify.less | 3 +++
 www/common/common-ui-elements.js               | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index 96b8e7cde..5c829cec4 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -166,6 +166,9 @@
                     color: @cryptpad_text_col;
                     text-decoration: underline;
                 }
+                pre.cp-link-preview {
+                    color: @cryptpad_text_col;
+                }
                 .cp-info-menu-container {
                     .logo-block {
                         text-align: center;
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index f77a9d422..05b27f055 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -3064,7 +3064,7 @@ define([
 
         var content = h('div', [
             UI.setHTML(h('p'), Messages._getKey('notification_openLink', [name, user])),
-            h('pre', url),
+            h('pre.cp-link-preview', url),
             UIElements.getVerifiedFriend(common, data.curve, user)
         ]);
         var clicked = false;

From a6794c5ceeaa4ec00bed2b188d669f2f446ac3d7 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 1 Sep 2021 17:10:50 +0200
Subject: [PATCH 054/125] Improve condition selector in forms

---
 customize.dist/src/less2/include/forms.less |  6 +-
 www/form/inner.js                           | 71 +++++++++++----------
 2 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/customize.dist/src/less2/include/forms.less b/customize.dist/src/less2/include/forms.less
index 4fb799e13..96fe3f761 100644
--- a/customize.dist/src/less2/include/forms.less
+++ b/customize.dist/src/less2/include/forms.less
@@ -112,8 +112,10 @@
         border-radius: 0;
         transition: none;
 
-        .fa, .cptools {
-            margin-right: 5px;
+        i, .fa, .cptools {
+            &:not(:last-child) {
+                margin-right: 5px;
+            }
         }
         .cptools {
             vertical-align: middle;
diff --git a/www/form/inner.js b/www/form/inner.js
index bf624d3b6..e8f2d0f92 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2935,11 +2935,11 @@ define([
                         };
                         if (type === 'radio') {
                             obj.values = block.opts ? block.opts.values
-                                                    : TYPES.radio.defaultOpts.values
+                                                    : TYPES.radio.defaultOpts.values;
                         }
                         if (type === 'checkbox') {
                             obj.values = block.opts ? block.opts.values
-                                                    : TYPES.checkbox.defaultOpts.values
+                                                    : TYPES.checkbox.defaultOpts.values;
                         }
                         return obj;
                     }).filter(Boolean);
@@ -2964,6 +2964,9 @@ define([
                     $container.append(btn);
                 };
                 getConditions = function ($container, isNew, rules, condition) {
+                    Messages.form_condition_q = "Choose a question"; // XXX
+                    Messages.form_condition_v = "Choose a value"; // XXX
+
                     var content = h('div.cp-form-condition');
                     var $content = $(content);
                     var values = getConditionsValues();
@@ -2979,7 +2982,7 @@ define([
                         };
                     });
                     var qConfig = {
-                        text: '', // Button initial text
+                        text: Messages.form_condition_q, // Button initial text
                         options: qOptions, // Entries displayed in the menu
                         isSelect: true,
                         caretDown: true,
@@ -3017,7 +3020,16 @@ define([
                     iSelect.setValue(isOn ? 1 : 0);
                     $(iSelect).hide();
 
-                    $content.append(qSelect).append(iSelect);
+                    var remove = h('button.btn.btn-danger-alt.cp-condition-remove', [
+                        h('i.fa.fa-times')
+                    ]);
+                    $(remove).on('click', function () {
+                        $content.remove();
+                        if ($container.is(':empty')) { $container.remove(); }
+                        $addC.show();
+                    });
+
+                    $content.append(qSelect).append(iSelect).append(remove);
                     if ($container.find('button.cp-form-add-and').length) {
                         $container.find('button.cp-form-add-and').before($content);
                     } else {
@@ -3060,7 +3072,7 @@ define([
                             };
                         });
                         var vConfig = {
-                            text: '', // Button initial text
+                            text: Messages.form_condition_v, // Button initial text
                             options: vOptions, // Entries displayed in the menu
                             //left: true, // Open to the left of the button
                             //container: $(type),
@@ -3070,11 +3082,7 @@ define([
                         };
                         var vSelect = UIElements.createDropdown(vConfig);
                         vSelect.addClass('cp-form-condition-values');
-                        if ($content.find('.cp-condition-remove').length) {
-                            $content.find('.cp-condition-remove').before(vSelect);
-                        } else {
-                            $content.append(vSelect);
-                        }
+                        $content.append(vSelect).append(remove);
 
                         var onChange = function () {
                             var w = block.opts.when = block.opts.when || [];
@@ -3112,31 +3120,26 @@ define([
                         iSelect.onChange.reg(isChange);
 
                         vSelect.onChange.reg(function () {
-                            if (!$content.find('.cp-condition-remove').length) {
-                                var remove = h('button.btn.btn-danger-alt.cp-condition-remove', [
-                                    h('i.fa.fa-times')
-                                ]);
-                                $(remove).click(function () {
-                                    var w = block.opts.when = block.opts.when || [];
-                                    var deleteRule = false;
-                                    if (rules.length === 1) {
-                                        var rIdx = w.indexOf(rules);
-                                        w.splice(rIdx, 1);
-                                        deleteRule = true;
-                                    } else {
-                                        var idx = rules.indexOf(condition);
-                                        rules.splice(idx, 1);
+                            $(remove).off('click').click(function () {
+                                var w = block.opts.when = block.opts.when || [];
+                                var deleteRule = false;
+                                if (rules.length === 1) {
+                                    var rIdx = w.indexOf(rules);
+                                    w.splice(rIdx, 1);
+                                    deleteRule = true;
+                                } else {
+                                    var idx = rules.indexOf(condition);
+                                    rules.splice(idx, 1);
+                                }
+                                framework.localChange();
+                                framework._.cpNfInner.chainpad.onSettle(function () {
+                                    if (deleteRule) {
+                                        $content.closest('.cp-form-condition-rule').remove();
+                                        return;
                                     }
-                                    framework.localChange();
-                                    framework._.cpNfInner.chainpad.onSettle(function () {
-                                        if (deleteRule) {
-                                            $content.closest('.cp-form-condition-rule').remove();
-                                            return;
-                                        }
-                                        $content.remove();
-                                    });
-                                }).appendTo($content);
-                            }
+                                    $content.remove();
+                                });
+                            }).appendTo($content);
                             onChange();
                         });
 

From a9f131f0513f8a1e19f712e7b6638e6742370715 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 1 Sep 2021 17:25:16 +0200
Subject: [PATCH 055/125] Fix reordering questions in forms

---
 www/form/inner.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/form/inner.js b/www/form/inner.js
index e8f2d0f92..ad290df1a 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -3500,6 +3500,7 @@ define([
         });
 
         if (editable) {
+            if (APP.mainSortable) { APP.mainSortable.destroy(); }
             APP.mainSortable = Sortable.create($container[0], {
                 group: 'nested',
                 direction: "vertical",

From e53261bd2dc564aed2a96d6e6b010f43553c31bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Thu, 2 Sep 2021 10:53:16 +0100
Subject: [PATCH 056/125] Improve condition editor UI layout

---
 www/form/app-form.less | 10 +++++++---
 www/form/inner.js      |  5 ++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 8d1cee891..b348411f1 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -179,12 +179,15 @@
 
 
                 .cp-form-conditional {
+                    .cp-form-conditional-hint {
+                        margin-bottom: 10px;
+                    }
                     .cp-form-condition {
                         display: flex;
                         align-items: center;
-                        justify-content: center;
+                        margin-bottom: 10px;
                         & > *:not(:first-child) {
-                            margin-left: 40px;
+                            margin-left: 10px;
                         }
                         .cp-dropdown-container button {
                             max-width: 200px;
@@ -202,8 +205,9 @@
 
                 div.cp-form-section-sortable {
                     min-height: 300px;
-                    border: 4px dotted white; // XXX
+                    border: 2px dashed @cryptpad_text_col; // XXX
                     padding: 20px;
+                    margin-top: 10px;
                     background: @cp_app-bg;
                     .cp-form-creator-add-inline {
                         button[data-type="section"] {
diff --git a/www/form/inner.js b/www/form/inner.js
index ad290df1a..b0dc698ae 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1013,7 +1013,6 @@ define([
                 var tag = h('div.cp-form-section-edit', [
                     h('i.fa.fa-question'),
                     h('span', Messages.form_type_section),
-                    h('hr'),
                     sortable
                 ]);
                 if (APP.isEditor) {
@@ -3156,10 +3155,10 @@ define([
 
 
                 };
-                Messages.form_conditional = "Only show this question when:"; // XXX
+                Messages.form_conditional = "Only show this section when:"; // XXX
 
                 conditionalDiv = h('div.cp-form-conditional', [
-                    h('div', Messages.form_conditional),
+                    h('div.cp-form-conditional-hint', Messages.form_conditional),
                     addCondition
                 ]);
                 var $condition = $(conditionalDiv);

From 600cca564d1a6a949141ebb217c24a94d105a908 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 2 Sep 2021 12:16:01 +0200
Subject: [PATCH 057/125] Fix button icons

---
 customize.dist/src/less2/include/forms.less | 2 +-
 www/form/inner.js                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/customize.dist/src/less2/include/forms.less b/customize.dist/src/less2/include/forms.less
index 96fe3f761..2eace9f29 100644
--- a/customize.dist/src/less2/include/forms.less
+++ b/customize.dist/src/less2/include/forms.less
@@ -113,7 +113,7 @@
         transition: none;
 
         i, .fa, .cptools {
-            &:not(:last-child) {
+            &:not(.nomargin) {
                 margin-right: 5px;
             }
         }
diff --git a/www/form/inner.js b/www/form/inner.js
index fe4482b85..0bc11822a 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -3920,7 +3920,7 @@ define([
                         framework.localChange();
                         refreshEndDate();
                     });
-                    var cancel = h('button.btn.btn-danger', h('i.fa.fa-times'));
+                    var cancel = h('button.btn.btn-danger', h('i.fa.fa-times.nomargin'));
                     $(cancel).click(function () {
                         refreshEndDate();
                     });

From eb1d8478d66563ccc1ffa6b9de3014a49c68bb00 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 2 Sep 2021 12:34:12 +0200
Subject: [PATCH 058/125] Remove Conditional section text in edit mode

---
 www/form/inner.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 0bc11822a..147a9138f 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1011,8 +1011,6 @@ define([
             get: function (opts, a, n, ev, block) {
                 var sortable = h('div.cp-form-section-sortable');
                 var tag = h('div.cp-form-section-edit', [
-                    h('i.fa.fa-question'),
-                    h('span', Messages.form_type_section),
                     sortable
                 ]);
                 if (APP.isEditor) {
@@ -3311,6 +3309,11 @@ define([
 
                 editButtons = h('div.cp-form-edit-buttons-container', [ fakeEdit, del ]);
 
+                    changeType = h('div.cp-form-block-type', [
+                        model.icon.cloneNode(),
+                        h('span', Messages['form_type_'+type])
+                    ]);
+
                 // Values
                 if (data.edit) {
                     var edit = h('button.btn.btn-default.cp-form-edit-button', [
@@ -3364,11 +3367,6 @@ define([
                         onEdit(temp[uid]);
                     }
 
-                    changeType = h('div.cp-form-block-type', [
-                        model.icon.cloneNode(),
-                        h('span', Messages['form_type_'+type])
-                    ]);
-
                     Messages.form_changeTypeConfirm = "Select the new type of this question and click OK."; // XXX
                     Messages.form_corruptAnswers = "Changing the type may corrupt existing answers";
                     if (Array.isArray(model.compatible)) {

From 5f22b00ba5fe0f92247524c60471662d90cad1b2 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 2 Sep 2021 13:42:29 +0200
Subject: [PATCH 059/125] Fix forms editor responsive UI

---
 www/form/app-form.less | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 66f60d37b..3aced5325 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -119,17 +119,24 @@
                         display: flex;
                         justify-content: space-between;
                         flex-wrap: wrap;
-                        div {
+                        & > div {
                             flex-basis: 33.333333%;
                             padding-right: 20px;
                         }
                     }
                 }
-                @media screen and (max-width: 600px) {
-                    .cp-form-creator-settings {
-                        div {
-                            flex-basis: 50%;
-                        }
+            }
+            @media screen and (max-width: 600px) and (min-width: 400px) {
+                .cp-form-creator-settings {
+                    & > div {
+                        flex-basis: 50% !important;
+                    }
+                }
+            }
+            @media screen and (max-width: 400px) {
+                .cp-form-creator-settings {
+                    & > div {
+                        flex-basis: 100% !important;
                     }
                 }
             }

From e9a4416820033bde7c5cc6445df722cbd1a3e5dd Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 2 Sep 2021 13:44:09 +0200
Subject: [PATCH 060/125] Fix text overflow in forms

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

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 3aced5325..031411800 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -193,6 +193,7 @@
                         display: flex;
                         align-items: center;
                         margin-bottom: 10px;
+                        flex-wrap: wrap;
                         & > *:not(:first-child) {
                             margin-left: 10px;
                         }

From 442afe14a4acfc580ec157f65cb92e5dd567c9ad Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 2 Sep 2021 14:18:58 +0200
Subject: [PATCH 061/125] Improve quick poll template

---
 www/form/templates.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/www/form/templates.js b/www/form/templates.js
index ff75f8254..d72c7ecb8 100644
--- a/www/form/templates.js
+++ b/www/form/templates.js
@@ -4,17 +4,21 @@ define([
     Messages.form_type_poll = "Quick poll"; // XXX update key
     var pollValues = [];
     var d8 = new Date();
-    d8.setDate(d8.getDate() - d8.getDay()); // set sunday
+    d8.setDate(d8.getDate() - d8.getDay() + 7); // set sunday
     d8.setHours(8);
     d8.setMinutes(0);
     d8.setSeconds(0);
     d8.setMilliseconds(0);
     var d14 = new Date(d8);
     d14.setHours(14);
-    [0,1,2].forEach(function () {
+    [0,1,2].forEach(function (el) {
         d8.setDate(d8.getDate() + 1);
         d14.setDate(d14.getDate() + 1);
+        if (el === 2) {
+            d8.setHours(10);
+        }
         pollValues.push(+d8);
+        if (el === 2) { return; }
         pollValues.push(+d14);
     });
     return [{

From b964af4da23868dfa7607784342c6950d60481e1 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 2 Sep 2021 14:20:00 +0200
Subject: [PATCH 062/125] Add try..catch in forms main.js

---
 www/form/main.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/www/form/main.js b/www/form/main.js
index 8c794a19a..1a558678c 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -268,16 +268,20 @@ define([
                         var messages = obj.messages;
                         if (!messages.length) { return void cb(); }
                         if (obj.lastKnownHash !== answer.hash) { return void cb(); }
-                        var res = Utils.Crypto.Mailbox.openOwnSecretLetter(messages[0].msg, {
-                            validateKey: data.validateKey,
-                            ephemeral_private: Nacl.util.decodeBase64(answer.curvePrivate),
-                            my_private: Nacl.util.decodeBase64(myKeys.curvePrivate),
-                            their_public: Nacl.util.decodeBase64(data.publicKey)
-                        });
-                        var parsed = JSON.parse(res.content);
-                        parsed._isAnon = answer.anonymous;
-                        parsed._time = messages[0].time;
-                        cb(parsed);
+                        try {
+                            var res = Utils.Crypto.Mailbox.openOwnSecretLetter(messages[0].msg, {
+                                validateKey: data.validateKey,
+                                ephemeral_private: Nacl.util.decodeBase64(answer.curvePrivate),
+                                my_private: Nacl.util.decodeBase64(myKeys.curvePrivate),
+                                their_public: Nacl.util.decodeBase64(data.publicKey)
+                            });
+                            var parsed = JSON.parse(res.content);
+                            parsed._isAnon = answer.anonymous;
+                            parsed._time = messages[0].time;
+                            cb(parsed);
+                        } catch (e) {
+                            cb({error: e});
+                        }
                     });
 
                 });

From 24a21bab8d248b0675684ed27a3c045e205ab393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Thu, 2 Sep 2021 15:12:48 +0100
Subject: [PATCH 063/125] Add conditional section icon

---
 .../fonts/cptools/fonts/cptools.eot           | Bin 0 -> 10608 bytes
 .../fonts/cptools/fonts/cptools.svg           |  43 ++++++-------
 .../fonts/cptools/fonts/cptools.ttf           | Bin 10112 -> 10444 bytes
 .../fonts/cptools/fonts/cptools.woff          | Bin 10188 -> 10520 bytes
 customize.dist/fonts/cptools/style.css        |  57 +++++++++---------
 www/form/inner.js                             |   2 +-
 6 files changed, 53 insertions(+), 49 deletions(-)
 create mode 100644 customize.dist/fonts/cptools/fonts/cptools.eot

diff --git a/customize.dist/fonts/cptools/fonts/cptools.eot b/customize.dist/fonts/cptools/fonts/cptools.eot
new file mode 100644
index 0000000000000000000000000000000000000000..dbfc79bf73c81531115f45317de113d1a8d1d0ac
GIT binary patch
literal 10608
zcmb_i3v`>+eZTj6N}r_f)9aIL*_JFzwvsruCCifHBqoUyoS4K3annE;TOPzOn%G_v
z0-=FrXU&5hXklG}&@N?$C54X131^gU9c6_xI6HKQwV@r1o{n`uU+45}WqmM9-tXQ|
zlI2HYhwhWU@BZ(-|NH*m|LflIrG&h`gb+#uGV`J2e#%m|Tt73N;aX4itvQsO{pjQt
zGER<=G5ijY!^qZ2KN%oH<Tk|jl0!%dkex_5gxnEejgoqjBdw&J<IXOPMAo2#oFF1e
zZu>-AyWv$Dkn#<@du}<ncRaZBJLiE^i};SAy@$sUx)EogZRo(U!TtT`dJw;Zkob<_
zfxY{~w$nEg()c>^v%^SGe<L*$(j*}sA3k{Gjz1CP|3aLN?fwH}x9t6kN58Ni@fQ%k
z?%>`##z~6)5g`eNUq8C{;K0`pEW<1&;%MX4_}Jki=qH{ff6elVD85DSCo&<zS%J0q
zIV+?;BWY@9coh#tw`V?U3HeDxd}-<>vR1^4%+lmDyn6QGt+5tsk!OV>$Eqa~S%Gwo
z*s!<)(&~Q_naWR1u|j|ehw0Rhf)dJA)=LQmmQj%g;>dM!lxe&xr-@kZX7K~@PO=({
zeh~BB(bPtB*U$_LTWPF8F=(O~>eTcHB2+DgVVZ8wuA#wVh%&tJ{Dr2Gs3+=4XQE~r
zA#D+bmKH%21yhhkQ4v~N1w}w;3V4u%#}pJ1iLEUNMHx|1_**L#vB6TRC<tPoRmVv|
zDAW|5>lSY8E<CplNEJorHpiRg&9%0cnj5#;5ru)uzV)%}ldLy?SC}mP?9wG_Qbt`O
z$&z;QpTw=iBuhz}5MP60di;TOv^|^gbTq}Hn80RgrrQI-bc9CR1ISfWdJRphG}_Pv
zoNVspRsH>|gge={@UKbV%Gkw={ssqa^U$7#q|cpSrUhKr3(w^LvLQ*SxV3*}esX1h
z|4Mq_%KkN>@Jg?-rYadN95!PP;a){ulYc1LAV{*t`e!4~secyti5H2Vgh_(zBX^QN
zBTtf-=k%1Xcr+NrGOuFGB!_8)hG{USHYr&3>Aw=ds#|~1N-o=xXvzXuMcY{b+QEpe
ze@w-w!yp`1L9BsgWH8)o=;hMcEL|0TcQ6tO3O^0h2aTtVY@lFx=vO0w5AvP#zg3s`
zw5W*xa@rNr-4VkGIURnR&4DDly~gWZ5)3Xkb)O<DHfpzrJUvd+X0tn-j<C<$T<r|G
zR7I2cqbX(RQ)Ng|99FL5$4HYU{44N&%kX5RR-`H7#Yk}S4DaxXK*s%)5#0DeFp_^&
z+$jqx`sz~ep`su;RGZ)FsL_pxJJMMbYVmn%?RL<e;nJ&}Mp)Mk^wV^PQh{Kj+X$+n
z)QO%{HpDx*VrGxn7-sj<N;@=PY4D|)bhG6u=%qoaW4xn|GD_m))Sm5P{Gy9?G&M5{
zX{L)<xC?fD(5~zDLEYY_l|Zd+;c0wQ*9LU0O>+%ux~>hn0O|vpUa?oJNe8(PjN00q
zl{<C?O<~ife10WX+?}B7^448JJE@#(PhoEZ3*}P4_XmO*wWF!i;+Pn3FvA&ME)@i`
zWJN5b6i;RQBgR-lgQBJq)_zIlkd+d<ikp9$8}ug|@~0Y-$%YDkQ20Krj>oG*ae)p~
zyWbg#OOmbD;|kb@DR`6`@mI$~ek$5Ts#n_wMLdJ{YF+p~SVbl0$bY~p7Nmxx#Xru(
zL!o#)Bs*l<MX73wSKAGh>TbKei&2+D@&@A7fv8Lcmt&RUQf)3}mBYp4)NES$<W<p%
zL1&7TGQofoa2Yc#j}}2RpG8L>VO!5DIasHAyw0%Gd#%hPUY79)G8U$xr)24DMWJiY
zI}O8m{@Ur9<+Bnr2BOT`Cp}~r)TY@|;PSi`Gz4K$;+!BUHIXTE(b(*{0b>R01V05c
z1t(p^e6%DtY)HntoR9~SxK?T30v01Uqxz?xmGRWbPE~Qr&sHb2gQ}*fs@=Zu)O>zJ
zGP%APx`8Um38{8vGnJSSx7i+l)~c?S&C;`4B6Pv7TD8udr{yFC$+`G>@}xa6)l6rs
z&msoyn3%Zq*kj+Fm{@o~7Yh^g5B5z?9=QL0qRv{+4zh}LlZ}h-sq9IcX)~IM;TH|2
z&6pX>R0NqtbiL4f@)Yekd9v{J)O!!?IQjkqpFH{g`wI_abc!4tof;iYb?rSjiud5T
zb4;_G$;YjEUrE-G4W##KMiuq&(PY5UWBemyY}2ttjcb!|L;i`>sZ(D&efot{rwR|0
zpoPbFqL8F-q`u6a)H(iO?+Kuw_0YY#NHrfz6xyf7(ZO(;{J};_bCw-t%vMbLIj=4<
zXeem84D=W5qfAG#llrn9jHxsH{bHBYmnr;bi+4rztGR8O;Mc{j$+tCKXr@%4u8l3i
z?$(V?fOH8Bx`nMBy{oJ1w&mX3qI;7rt?(@>*<}g^j5g<T%Mg+H3uKYHgTy}Xnylh$
zvgjQlv&{ffD}HzsdUb{aiy^YD6BFNk?6FG|6NOz96ZFDF{%ecbD;I9!&*|U8bLOU-
zV1JbK-)hKHCKAiauO&*^g2Ynvwu{qJ%@T8S^jKJ6S<;L3%#je;1U>a4DS$#}ttuC&
zCR^DQ&8=q21O&CBnxa3+R+q0Z1V<FDV}WB_hA^3%QX$V18EBxX42t=pOrg!-HSwlq
z2<ilsRYnFu6i9*PW|}%OES~I0L3=epGbz03j`mKb#xoTF8Umy{<IBm0PMWjS1C~)#
z5o&2LrLuY8qAtyPmWoin!Ux0oKN|<I)l?e=JwgXbq`6YCPYg@fr3=4k_GarJ&ur1C
z-zCNx0`AFQ+jY8(QKNIia$%FR%0Zn`UsEm-K9zr=s!^phF1%SUAlt9vE6J2Hq8v49
zG^dWZgp#tyP6eAsQyg-rp{;?|ab~U2u%Jkarr{$vJycU|nr4$!!R<sHv{qClVSBo#
zv#NG;_S?O>r|`^gP?tO4w9~>HRJKVn$bD%>lAL<3slMIzsoDS)Wb{F#)ctc-h2nFd
zGosD!kZcm-Yc<UtGJqsfyVphqiE4(-yQntTHni>2Y^-C@ZQO#0?x>n5s2Zwc{Zcha
z)Ko|yK@!}eR3VRju(lh)y|=^WA<Q6QbTUny9ZiiT1IGv6#<dPvRs786S%Y<jA)JL3
z4BJOWStf{K{3@`312B7G^Uz=*oAVV>MA$^)YRdvCTO@^#N+!sgut&IAlD}IN@0JXu
zRuQDZK}i5$Nc8XTl69UmFu;>^`7TK+d?ltjg)P*k##9&G0`V&R5GF&V3Gq<TY{;Jw
zcfyj`ctLhb7f`b)8}jMXsM(YS<pNS<6Kx_z2Y?jGDNhlF+HCaOs9HwVg?80R=geJ}
z^uP(U*tuhR40tNj@%c>4m~LhQloGN3X2cgWU$0?lPqSq%9K(t~%)XT=MR=i!*%f0|
z@XzsLh{$IhYMfOUR~?Wg4ssLO0bj@x5{ED39PHyCQx|Qg*U}s4t@Jo%;qpEa&SMzO
zWaQt)ffD^)3I`X{J>CK~!aRPR=`p}*aXIJDG}5AKO2nEHP*Zc+Tv}0~=LTU%Wpj|W
z32?VS5PGZ%Psn1BgfEqyL<5yhqCU$#bP{}FsUTQBoB(qK$s(Ld^Lcl;M+n&n1A>qr
zp6e4@*acO$kOzuhUxC3J6S<SA&w}BjS}32w-^6@h=;md-To)o9)n-#Y5tpi}ir&ux
z)fI8u@VF;`Qv`Uf>MG@0MMUY!E-vN)yK1-D$0_p&>j!h*4ZsyBV2=2Tm0fLD&Mo}1
z<SHC2`|ePpkJWUtV(sV8Jrb%4;#U=_u4X|Mf+_&j)gcxHt3rie)*$2<Jf|webAZW0
zWYxf*Fs)nHk*4`MWg;<0%*^3@#;<2fia9LJeR?Ld2g`!Kq)oj7$MEy;>@9=t)J?Xc
z58PRY{RZ<n7=WGx?;LZ@Vb?*GX`<Y4gr5z{imw9BRlv}DpcGp;^z7#D?vZ%hs9Cz~
z(V^kp*Q9G>*Y|xnyCvQJ#MpS@shY;d8oZ6g@V!}~_`DH|k94oweDCeIUs$%(u-~5B
z@W*}Gqk{wYMk4t`ye!I7Qi4v*0V;j0%x|+AWBfRN8w!go7mS&Ub+bG^*n9kV?}BcV
z!p*OL?|ZMq2eO^46Q2>+K)d&mm}N0GK^S84%|ru-(owUq1hoes8<iOROmGgf56gg6
zZ<WCGGq+P693TPnpwsPkzWXlw($5!oOc-`}JdU^h##z6yQ8&-(rm3Gb^^J!Atl_6_
zw_}CVJ@!Kn3&#JQ2X5yIho`WeBk*E9hWW5zn#RMX!DwmT{uf<%8MP$2Gja(k3VL7J
zp~o^HSmrwYGFRJwVf=Far_Wrr{|Z?T`Te2ThBJ`}X@f1bpWFjVv6PXL9+EK^h~p50
zdFHH9VAEiH3k$<VNlfuWP063(itHUsxt<@+$AX^2o*@6!S|R|)A7v51{49`p?2x1^
zM6QrO$r{?v+C0x8_Bqd@`x$h=T~*~i!al<1=4Yj>ImSv0znVY4#A-o5cCwA^kgCMy
z^89bZ0pnTnBKZ+tg&DJoRhbco+B74MRhkk1SgV3Y{-2g^QOb^Ra(d<HSaD)8yOk?C
zjUoJC8Y6yr-3Iaux=rD}vTTI*Gp*Gy?T2Ah$j-~;7tV58Vsyi42{dCVBxPEn9~G%C
z=%L5U;Dcr8p)#>>is2u6ib-fjB=aAY6@ET1*=%L%&nb*U2wb`Rm2(Mk!b{LAeguDk
zlT<-(Pm(Tj9l3!YZXYLS$e&yOt+IU$1H^K+!q~2a<qDT-umXphG4qy=nH5FA6U)`k
zC~~<r{-$N^+7|ZG14W3gDFT!KYxsPI?(^w$aHg?a46heB-h6HjQn{kSP_ZI0XSG#A
zoesBn4OWrieevUC^!aqF9VSCmz8)W9Js1yOj+5<cajk$^-wSYEaNOw`ten~ztKq4{
z0?S}?U1sc;XRnk0P#W^=sV$|8Ybx2XFdx^XPn70p?yMDlRmxjc=B=2E?y2`AQT!q<
zQbb4#yxken3Hr4BdpQ2afT0<rL5iG9L0hv<TcHgUP39Q9$O&LDCtvCPW}t38eK>5s
zv%xg}%1E0Y#U-2<RpHhAyLAEKH8Z>+zw5qN*1fXs<#o@AUksatL3+<SX86vh%rx-L
zO;94w3ofOw=aLx?o0ndG`Jr{ir>Fz;Lx#4Nc{sZfFmsw`#UUTBm@j_l(<dL*{cxb}
z(S5J_UHKsv5ze~&C;hI;|KK@cm;W`No_~_(?9_eFGy3mlF{-)ze%E>yryBdNXK{eY
z>t=EIAGg!H#SaAmeV#*SGh3(cTJ^GG@OA8(`US>%ABjSv+(LdI_aE-!Hy{$ZObj#L
zo=wABrv|gd<CcWVt>26f4t;(i#m;Ji*KiFDjy$*?)3a%kX`BotmxhLigMc{*P#k8=
z9t}o9si$(TYL};0*WFD)-3V)8Z(H?}l{DK;|1i^7*Y0Xj0=m<ERG{Aw-l?S9eB+AT
z#zqzXB$|6#__xZeN_bOEld`&XTMczLdh4hy;KmVYtJmGyOnd4htt%5t>uMqnpG&WA
z-=ym5C(0Bp<i69rM0MGe$l6H97jRHyDG_wEtYg3)>L$x1N!$ruoC7DW@R_LG0mu9f
zm4|&f%V$#QAmHABD02+NX1EH(8)YRc8>&s03m+W?pc-;k!Sj!bZc}xI-k`{nKaIuK
z_pXaZ8=`AAt&hdTZ^dKXy=xJTc3+3M(23GHSyAM|Z;vW6DpYh<;j643RG_PO9UB?h
zcH_v%*uml9oqfYYM{ge*-m-Ie_~6*c$c@*JjNE}Sx~ATcvf^{t&D~^kaX&M^H`~u@
zPz~l1_@(EAxLcT?fAcLb7kNMw9!G2Mzhs6t2O^QcGrRWeIkvoK&z@c1w4mL)cfGi4
z&+cQ(HzMsQL)m2Q|H2CTV4e9+{$~1?>crLtClH^*wjYlK0`+@_M?RD58yVg+7pM;e
zB9Aeipa(X9KaA5)<6gvh!KpGn&h8JX>GYD^t<}4Y)&D~r>>>#vKiGNtt?3Y!XBL(x
zyJ3P`M*KlJeh-RBxXT5TB3p4g$-;<RHCYi>44AheEh~-^CwnX5Qd(s?%df;i`J0OQ
z?79of+s@w}vL1Qc@NO!;-3YfA-(3h<oF8A~jEvold5OA(<-&tvxA>B@L;8yBmhYC|
zR@N$m>KR*;?Q!izt>8H1c*Plae#W&yzuV|BUUxUSPq@G2>G8baU53H1d5hD#ppCGn
zG%Gw({OIKA;+#-O2&)9cRLP!Vx(K*5ZxZ0!is>>ulx7iDkiNMHYd9<UQ&1(G`$*A|
zW5EL8p&~2-?kd6(;NwMDhHR=Y!V1#+i?9YO`|(@GkBp5SI6U*F;Ld?VheyUn>vOH`
z^Is2~x756e{R2a{9oTzl=DovtF?+^FkJJwhj1C;ydt_jL{k~)My|;|@jg5`A!avQf
rCLX~khH&aW$}cSLMSK9(Up+LBWBB%B2xFuVFT-uctg{<<S9typ^}JP|

literal 0
HcmV?d00001

diff --git a/customize.dist/fonts/cptools/fonts/cptools.svg b/customize.dist/fonts/cptools/fonts/cptools.svg
index 12d2fe9d6..29461075f 100644
--- a/customize.dist/fonts/cptools/fonts/cptools.svg
+++ b/customize.dist/fonts/cptools/fonts/cptools.svg
@@ -7,28 +7,28 @@
 <font-face units-per-em="1024" ascent="960" descent="-64" />
 <missing-glyph horiz-adv-x="1024" />
 <glyph unicode="&#x20;" horiz-adv-x="512" d="" />
-<glyph unicode="&#xe900;" glyph-name="folder-no-color" d="M194.559 846.275c-77.457-0.137-140.211-62.89-140.348-140.334v-515.869c0.137-77.457 62.892-140.211 140.336-140.348h634.893c77.457 0.137 140.211 62.892 140.348 140.336v396.602c0 77.561-62.808 140.453-140.336 140.59h-296.852l-47.104 62.885c-25.923 34.066-66.407 55.898-112 56.139h-178.937zM194.553 787.607h178.906c26.48-0.030 50.004-12.656 64.908-32.207l0.146-0.199 47.104-62.766 17.709-24.094h326.113c45.125-0.069 81.68-36.665 81.68-81.799v-396.471c-0.042-27.788-13.947-52.311-35.156-67.064l-725.621 651.525c12.744 8.239 27.912 13.050 44.211 13.074zM115.25 725.406l687.184-617.014h-607.875c-45.083 0.068-81.61 36.598-81.678 81.674v515.861c0.010 6.714 0.834 13.236 2.369 19.479z" />
-<glyph unicode="&#xe901;" glyph-name="whiteboard" horiz-adv-x="878" d="M65.524 945.762c-29.444 0-53.333-23.889-53.333-53.333v-888.857c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.206 70.54-37.762 91.095l-173.333 173.333c-20.556 20.556-61.698 37.762-91.143 37.762h-497.762zM83.286 874.667h426.667v-231.095c0-29.444 23.889-53.333 53.333-53.333h231.143v-568.905h-711.143v853.333zM581.095 870.238c9.444-3.333 18.873-8.349 22.762-12.238l173.905-173.905c3.889-3.889 8.857-13.317 12.19-22.762h-208.857v208.905zM446.333 524.286c-17.277 0.517-34.937-1.027-52.952-4.571-22.15-4.43-42.984-11.806-62.476-22.143-19.492-10.632-37.062-23.776-52.714-39.429-15.357-15.357-28.321-32.794-38.952-52.286-10.632-19.196-18.189-39.85-22.619-62-7.974-41.346-5.87-79.57 6.238-114.714 12.404-35.144 30.421-65.145 54.048-89.952 23.626-24.512 50.629-42.977 81.048-55.381 30.714-12.108 60.087-15.954 88.143-11.524 18.31 2.658 31.188 12.718 38.571 30.143 7.679 17.72 7.364 34.709-0.905 50.952-10.337 20.082-9.623 39.575 2.19 58.476 11.813 19.196 29.117 28.762 51.857 28.762h70.429c15.948 0 29.539 5.635 40.762 16.857 11.222 11.518 16.81 25.243 16.81 41.19 0 34.849-7.51 67.353-22.571 97.476-14.766 29.828-34.707 55.089-59.809 75.762-24.808 20.673-53.599 35.559-86.381 44.714-16.538 4.578-33.438 7.15-50.714 7.667zM439 467.476c7.974 0 14.636-2.817 19.952-8.429 5.611-5.316 8.429-11.979 8.429-19.952s-2.817-14.77-8.429-20.381c-5.316-5.316-11.978-7.952-19.952-7.952s-14.77 2.636-20.381 7.952c-5.316 5.611-7.952 12.407-7.952 20.381s2.636 14.636 7.952 19.952c5.611 5.611 12.407 8.429 20.381 8.429zM325.619 410.762c7.974 0 14.589-2.817 19.905-8.429 5.611-5.316 8.429-11.979 8.429-19.952s-2.817-14.77-8.429-20.381c-5.316-5.316-11.931-7.952-19.905-7.952s-14.77 2.636-20.381 7.952c-5.316 5.611-8 12.407-8 20.381s2.684 14.636 8 19.952c5.611 5.611 12.407 8.429 20.381 8.429zM552.429 410.762c7.974 0 14.636-2.817 19.952-8.429 5.611-5.316 8.381-11.979 8.381-19.952s-2.77-14.77-8.381-20.381c-5.316-5.316-11.978-7.952-19.952-7.952s-14.77 2.636-20.381 7.952c-5.316 5.611-7.952 12.407-7.952 20.381s2.636 14.636 7.952 19.952c5.611 5.611 12.407 8.429 20.381 8.429zM297.238 297.333c7.974 0 14.636-2.77 19.952-8.381 5.611-5.316 8.429-11.978 8.429-19.952s-2.817-14.77-8.429-20.381c-5.316-5.316-11.979-8-19.952-8s-14.722 2.684-20.333 8c-5.316 5.611-8 12.407-8 20.381s2.684 14.636 8 19.952c5.611 5.611 12.359 8.381 20.333 8.381z" />
-<glyph unicode="&#xe902;" glyph-name="new-template" horiz-adv-x="878" d="M65.524 945.762c-29.444 0-53.333-23.889-53.333-53.333v-888.857c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.206 70.54-37.762 91.095l-173.333 173.333c-20.556 20.556-61.698 37.762-91.143 37.762h-497.762zM83.286 874.667h426.667v-231.095c0-29.444 23.889-53.333 53.333-53.333h231.143v-568.905h-711.143v853.333zM581.095 870.238c9.444-3.333 18.873-8.349 22.762-12.238l173.905-173.905c3.889-3.889 8.857-13.317 12.19-22.762h-208.857v208.905zM414.476 490.857c-12.963 0-23.476-10.514-23.476-23.476v-101.762h-101.762c-12.963 0-23.476-10.514-23.476-23.476v-46.952c0-12.963 10.514-23.476 23.476-23.476h101.762v-101.762c0-12.963 10.514-23.476 23.476-23.476h46.952c12.963 0 23.476 10.514 23.476 23.476v101.762h101.762c12.963 0 23.476 10.514 23.476 23.476v46.952c0 12.963-10.514 23.476-23.476 23.476h-101.762v101.762c0 12.963-10.514 23.476-23.476 23.476h-46.952z" />
-<glyph unicode="&#xe903;" glyph-name="shared-folder" 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 0v0zM614.4 451.132c0.071 0 0.156 0 0.24 0 34.132 0 61.801 27.669 61.801 61.801s-27.669 61.801-61.801 61.801c-34.047 0-61.664-27.532-61.801-61.547v-0.013c0-0.018 0-0.040 0-0.061 0-7.309 1.235-14.33 3.508-20.865l-0.135 0.446-103.966-60.235c-0.474 0.655-1.031 1.213-1.665 1.672l-0.021 0.015c-10.785 9.46-25.010 15.231-40.582 15.231-34.065 0-61.681-27.615-61.681-61.681 0-11.035 2.898-21.393 7.974-30.355l-0.16 0.307c11.046-18 30.619-29.824 52.953-29.824 16.92 0 32.255 6.786 43.431 17.785l-0.008-0.008 103.966-60.235c-2.138-5.921-3.374-12.754-3.374-19.876 0-0.085 0-0.171 0.001-0.256v0.013c-0.003-0.217-0.005-0.474-0.005-0.731 0-7.409 1.417-14.486 3.994-20.977l-0.135 0.384c8.944-23.66 31.407-40.178 57.728-40.178 33.999 0 61.56 27.562 61.56 61.56 0 28.833-19.822 53.036-46.582 59.725l-0.424 0.090c-4.366 1.539-9.418 2.572-14.664 2.884l-0.154 0.007c-19.639 0-37.082-9.398-48.078-23.943l-0.11-0.152-101.798 59.031c3.729 7.764 5.908 16.879 5.908 26.504s-2.179 18.74-6.070 26.88l0.162-0.376 101.798 58.79c11.336-14.332 28.681-23.481 48.167-23.612h0.022z" />
-<glyph unicode="&#xe904;" glyph-name="file-upload" horiz-adv-x="878" d="M65.524 945.762c-29.444 0-53.333-23.889-53.333-53.333v-888.857c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.206 70.54-37.762 91.095l-173.333 173.333c-20.556 20.556-61.698 37.762-91.143 37.762h-497.762zM83.286 874.667h426.667v-231.095c0-29.444 23.889-53.333 53.333-53.333h231.143v-568.905h-711.143v853.333zM581.095 870.238c9.444-3.333 18.873-8.349 22.762-12.238l173.905-173.905c3.889-3.889 8.857-13.317 12.19-22.762h-208.857v208.905zM438.857 487.905c-8.019 0-15.814-3.102-21.238-8.762l-153.524-153.524c-5.66-5.66-8.952-13.457-8.952-21.476s3.292-15.53 8.952-21.19l17.667-17.714c5.424-5.66 13.219-8.952 21.238-8.952s15.814 3.292 21.238 8.952l69.333 69.095v-166c0-16.981 14.153-27.619 30.19-27.619h30.19c16.038 0 30.19 10.638 30.19 27.619v166l69.333-69.095c5.424-5.66 13.219-8.952 21.238-8.952s15.816 3.292 21.476 8.952l17.667 17.714c5.425 5.66 8.714 13.172 8.714 21.19s-3.29 15.816-8.714 21.476l-153.524 153.524c-5.66 5.66-13.457 8.762-21.476 8.762z" />
-<glyph unicode="&#xe905;" glyph-name="template" horiz-adv-x="878" d="M65.524 945.762c-29.444 0-53.333-23.889-53.333-53.333v-888.857c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.206 70.54-37.762 91.095l-173.333 173.333c-20.556 20.556-61.698 37.762-91.143 37.762h-497.762zM83.286 874.667h426.667v-231.095c0-29.444 23.889-53.333 53.333-53.333h231.143v-568.905h-711.143v853.333zM581.095 870.238c9.444-3.333 18.873-8.349 22.762-12.238l173.905-173.905c3.889-3.889 8.857-13.317 12.19-22.762h-208.857v208.905zM535.524 513.905c-63.766 0-115.619-51.901-115.619-115.667s51.854-115.619 115.619-115.619c48.792 0 92.974 31.714 109.238 77.667 2.84 8.261 5.905 18.862 5.905 27.381 0 5.163-3.075 9.048-8.238 9.048s-65.052-37.714-73.571-42.619l-49.857 27.619v57.857l75.667 43.619c2.323 1.549 4.143 4.398 4.143 7.238 0 3.098-1.562 5.431-4.143 7.238-15.748 10.585-40.297 16.238-59.143 16.238zM412.667 349.714l-175.81-175.81c-6.196-6.196-9.81-14.699-9.81-23.476s3.614-17.3 9.81-23.238l27.333-27.905c6.196-5.938 14.746-9.524 23.524-9.524s17.3 3.586 23.238 9.524l176.048 176.095c-33.819 13.424-60.909 40.514-74.333 74.333zM304.238 183.476c9.036 0 16.524-7.488 16.524-16.524s-7.488-16.524-16.524-16.524c-9.036 0-16.524 7.488-16.524 16.524s7.488 16.524 16.524 16.524z" />
-<glyph unicode="&#xe906;" glyph-name="poll" horiz-adv-x="878" d="M65.524 945.762c-29.444 0-53.333-23.889-53.333-53.333v-888.857c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.206 70.54-37.762 91.095l-173.333 173.333c-20.556 20.556-61.698 37.762-91.143 37.762h-497.762zM83.286 874.667h426.667v-231.095c0-29.444 23.889-53.333 53.333-53.333h231.143v-568.905h-711.143v853.333zM581.095 870.238c9.444-3.333 18.873-8.349 22.762-12.238l173.905-173.905c3.889-3.889 8.857-13.317 12.19-22.762h-208.857v208.905zM569.762 482.524v-349.238h162.714v349.238h-162.714zM358.238 385.476v-252.19h162.714v252.19h-162.714zM146.667 277.381v-144.095h162.762v144.095h-162.762z" />
-<glyph unicode="&#xe907;" glyph-name="slide" horiz-adv-x="878" d="M65.524 945.762c-29.444 0-53.333-23.889-53.333-53.333v-888.857c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.206 70.54-37.762 91.095l-173.333 173.333c-20.556 20.556-61.698 37.762-91.143 37.762h-497.762zM83.286 874.667h426.667v-231.095c0-29.444 23.889-53.333 53.333-53.333h231.143v-568.905h-711.143v853.333zM581.095 870.238c9.444-3.333 18.873-8.349 22.762-12.238l173.905-173.905c3.889-3.889 8.857-13.317 12.19-22.762h-208.857v208.905zM142.286 550.714v-255.238h133.19v-109.762h133.143v-109.81h326.809v255.381h-133.143v109.81h-133.143v109.619h-326.857zM191.048 501.905h229.286v-60.81h-144.857v-96.81h-84.429v157.619zM324.238 392.333h229.286v-61.048h-144.905v-96.81h-84.381v157.857zM457.381 282.524h229.286v-157.81h-229.286v157.81z" />
-<glyph unicode="&#xe908;" glyph-name="sheet" horiz-adv-x="878" d="M65.524 945.762c-29.444 0-53.333-23.889-53.333-53.333v-888.857c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.206 70.54-37.762 91.095l-173.333 173.333c-20.556 20.556-61.698 37.762-91.143 37.762h-497.762zM83.286 874.667h426.667v-231.095c0-29.444 23.889-53.333 53.333-53.333h231.143v-568.905h-711.143v853.333zM581.095 870.238c9.444-3.333 18.873-8.349 22.762-12.238l173.905-173.905c3.889-3.889 8.857-13.317 12.19-22.762h-208.857v208.905zM141.286 532.571v-463.81h598.429v463.81h-598.429zM190.048 483.762h134.429v-158.714h-134.429v158.714zM373.286 483.762h134.429v-158.714h-134.429v158.714zM556.524 483.762h134.429v-158.714h-134.429v158.714zM190.048 276.286h134.429v-158.762h-134.429v158.762zM373.286 276.286h134.429v-158.762h-134.429v158.762zM556.524 276.286h134.429v-158.762h-134.429v158.762z" />
-<glyph unicode="&#xe909;" glyph-name="folder-open" d="M100.232 590.035h828.717c-5.175 69.899-63.091 124.668-133.829 124.808h-283.843l-44.936 60.235c-24.766 32.712-63.599 53.649-107.326 53.73h-170.599c-0.036 0-0.078 0-0.121 0-73.968 0-133.946-59.894-134.084-133.83v-213.366l10.12 76.74c2.295 17.95 17.476 31.684 35.865 31.684 0.012 0 0.025 0 0.037 0h-0.002zM929.19 541.606h-805.948c-13.269-0.004-24.238-9.848-26.006-22.632l-0.016-0.137-43.008-317.801c-0.002-0.261-0.003-0.569-0.003-0.877 0-6.111 0.483-12.11 1.413-17.96l-0.085 0.646c0.904-6.888 2.169-12.966 3.837-18.875l-0.223 0.925c16.563-56.812 68.138-97.63 129.257-97.702h606.698c61.093 0.086 112.628 40.906 128.907 96.752l0.237 0.95c1.459 5.065 2.725 11.228 3.544 17.531l0.070 0.66c0.844 5.201 1.327 11.196 1.327 17.304 0 0.227-0.001 0.454-0.002 0.681v-0.035l40.237 295.755c0.219 1.556 0.344 3.354 0.344 5.18 0 21.624-17.529 39.153-39.153 39.153-0.036 0-0.073 0-0.109 0h0.006z" />
-<glyph unicode="&#xe90a;" glyph-name="kanban" horiz-adv-x="878" d="M65.524 945.762c-29.444 0-53.333-23.889-53.333-53.333v-888.857c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.206 70.54-37.762 91.095l-173.333 173.333c-20.556 20.556-61.698 37.762-91.143 37.762h-497.762zM83.286 874.667h426.667v-231.095c0-29.444 23.889-53.333 53.333-53.333h231.143v-568.905h-711.143v853.333zM581.095 870.238c9.444-3.333 18.873-8.349 22.762-12.238l173.905-173.905c3.889-3.889 8.857-13.317 12.19-22.762h-208.857v208.905zM146.667 493.81v-90.143h162.762v90.143h-162.762zM358.238 493.81v-90.143h162.714v90.143h-162.714zM569.762 493.81v-90.143h162.714v90.143h-162.714zM146.667 358.619v-90.143h162.762v90.143h-162.762zM569.762 358.619v-90.143h162.714v90.143h-162.714zM146.667 223.429v-90.143h162.762v90.143h-162.762z" />
-<glyph unicode="&#xe90b;" glyph-name="folder" d="M373.459 846.276h-178.899c-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-296.853l-47.104 62.886c-25.923 34.066-66.406 55.898-111.999 56.139h-0.039z" />
-<glyph unicode="&#xe90c;" glyph-name="shared-folder-open" d="M98.424 593.288h797.274c-4.8 67.457-60.657 120.376-128.894 120.471h-272.876l-43.249 57.705c-23.816 31.47-61.17 51.611-103.232 51.682h-164.213c-0.036 0-0.079 0-0.121 0-71.191 0-128.904-57.712-128.904-128.904 0-0.17 0-0.339 0.001-0.508v0.026-204.8l9.638 73.487c2.062 17.437 16.753 30.833 34.574 30.84h0.001zM900.759 255.608l33.973 248.049c0.196 1.447 0.308 3.12 0.308 4.819 0 20.873-16.906 37.797-37.772 37.828h-776.797c-12.746-0.016-23.272-9.5-24.923-21.796l-0.014-0.129-41.321-304.791c-0.002-0.25-0.003-0.546-0.003-0.843 0-5.87 0.483-11.628 1.412-17.235l-0.083 0.609c0.793-6.689 1.977-12.655 3.576-18.449l-0.203 0.861c15.92-54.648 65.53-93.912 124.319-93.967h583.566c0.061 0 0.133 0 0.205 0 16.48 0 32.227 3.14 46.675 8.853l-0.86-0.3c16.639-15.985 39.283-25.829 64.225-25.829 51.231 0 92.762 41.531 92.762 92.762 0 42.798-28.984 78.827-68.394 89.528l-0.65 0.15zM766.795 148.51h-583.56c-32.265 0.073-59.5 21.523-68.297 50.935l-0.13 0.506c-0.742 2.66-1.376 5.889-1.775 9.19l-0.032 0.327v1.566c0 1.566 0 3.373 0 5.301l36.382 272.023h724.751l-32.407-236.845c-1.82-0.63-3.331-1.281-4.788-2.025l0.21 0.097c-16.682-8.067-30.192-20.454-39.403-35.727l-0.232-0.415c-1.574-2.381-3.028-5.115-4.218-7.987l-0.119-0.325c-5.551-11.368-8.797-24.735-8.797-38.86 0-0.23 0.001-0.46 0.003-0.689v0.035c0-0.017 0-0.037 0-0.057 0-5.166 0.394-10.241 1.154-15.195l-0.070 0.554c-5.405-1.532-11.612-2.412-18.026-2.412-0.228 0-0.455 0.001-0.682 0.003h0.035zM877.026 84.781c-20.129 0.108-38.483 7.622-52.493 19.954l0.089-0.077c-14.994 12.543-25.212 30.362-27.788 50.568l-0.041 0.392c-0.537 3.145-0.844 6.769-0.844 10.463 0 0.091 0 0.182 0.001 0.273v-0.014c-0.001 0.109-0.001 0.239-0.001 0.368 0 12.484 2.89 24.293 8.038 34.794l-0.207-0.466c1.278 2.771 2.523 5.062 3.896 7.265l-0.161-0.278c7.898 12.884 18.884 23.175 31.958 30.024l0.449 0.214c0.692 0.493 1.491 0.902 2.346 1.186l0.064 0.018c10.065 4.991 21.914 7.922 34.445 7.951h0.010c0.046 0 0.1 0 0.154 0 7.802 0 15.336-1.144 22.444-3.275l-0.553 0.142c35.119-9.412 60.555-40.954 60.555-78.437 0-44.777-36.299-81.077-81.077-81.077-0.451 0-0.902 0.004-1.351 0.011l0.068-0.001zM906.059 183.206c9.581 0 17.348 7.767 17.348 17.348s-7.767 17.348-17.348 17.348v0c-0.002 0-0.004 0-0.007 0-9.411 0-17.072-7.495-17.341-16.841l-0.001-0.025c-0.004-0.12-0.006-0.262-0.006-0.404 0-1.849 0.356-3.615 1.003-5.232l-0.034 0.095-29.274-16.986c-3.089 3.105-7.328 5.063-12.025 5.18h-0.022c-9.003-0.772-16.019-8.271-16.019-17.408s7.015-16.636 15.954-17.404l0.065-0.004c4.719 0.117 8.958 2.075 12.046 5.179l0.001 0.001 12.047-7.228 16.504-9.638c-0.536-1.568-0.846-3.375-0.846-5.255 0-0.101 0.001-0.202 0.003-0.302v0.015c0-9.581 7.767-17.348 17.348-17.348s17.348 7.767 17.348 17.348c0 9.581-7.767 17.348-17.348 17.348v0c-5.563-0.038-10.508-2.653-13.705-6.709l-0.028-0.037-16.143 9.397-12.047 7.228c1.007 2.155 1.621 4.672 1.686 7.326v0.023c-0.052 2.758-0.667 5.36-1.736 7.712l0.050-0.122 28.672 16.625c3.116-4.367 8.151-7.19 13.848-7.228h0.006z" />
-<glyph unicode="&#xe90d;" glyph-name="code" horiz-adv-x="878" d="M827.746 734.667l-173.333 173.333c-20.556 20.556-61.667 37.778-91.111 37.778h-497.778c-29.444 0-53.333-23.889-53.333-53.333v-888.889c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.222 70.556-37.778 91.111zM581.079 870.222c9.444-3.333 18.889-8.333 22.778-12.222l173.889-173.889c3.889-3.889 8.889-13.333 12.222-22.778h-208.889zM794.413 21.333h-711.111v853.333h426.667v-231.111c0-29.444 23.889-53.333 53.333-53.333h231.111zM278.857 519.111l-125.556-167.222c-4.444-6.111-4.444-15 0-21.111l125.556-167.222c6.111-7.778 17.222-9.444 25-3.333l28.333 21.111c7.778 6.111 9.444 17.222 3.333 25l-101.111 135 101.111 135c6.111 7.778 4.444 18.889-3.333 25l-28.333 21.111c-7.777 6.111-18.889 4.444-25-3.333zM724.413 351.889l-125.556 167.222c-6.111 7.778-17.222 9.444-25 3.333l-28.333-21.111c-7.777-6.111-9.444-17.222-3.333-25l101.111-135-101.111-135c-6.111-7.778-4.444-18.889 3.333-25l28.333-21.111c7.778-6.111 18.889-4.444 25 3.333l125.556 167.222c4.444 6.111 4.444 15 0 21.111zM379.968 95.778l35-5.556c9.444-1.667 18.889 4.444 20.556 14.444l76.667 461.667c1.667 9.444-4.444 18.889-14.444 20.556l-35 5.556c-9.444 1.667-18.889-4.444-20.556-14.444l-76.667-461.667c-1.667-9.444 4.444-18.889 14.444-20.556z" />
-<glyph unicode="&#xe90e;" glyph-name="richtext" horiz-adv-x="878" d="M827.746 734.667l-173.333 173.333c-20.556 20.556-61.667 37.778-91.111 37.778h-497.778c-29.444 0-53.333-23.889-53.333-53.333v-888.889c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.222 70.556-37.778 91.111zM581.079 870.222c9.444-3.333 18.889-8.333 22.778-12.222l173.889-173.889c3.889-3.889 8.889-13.333 12.222-22.778h-208.889zM794.413 21.333h-711.111v853.333h426.667v-231.111c0-29.444 23.889-53.333 53.333-53.333h231.111zM225.524 501.333v-35.556c0-10 7.778-17.778 17.778-17.778h391.111c10 0 17.778 7.778 17.778 17.778v35.556c0 10-7.778 17.778-17.778 17.778h-391.111c-10 0-17.778-7.778-17.778-17.778zM634.413 376.889h-391.111c-10 0-17.778-7.778-17.778-17.778v-35.556c0-10 7.778-17.778 17.778-17.778h391.111c10 0 17.778 7.778 17.778 17.778v35.556c0 10-7.778 17.778-17.778 17.778zM634.413 234.667h-391.111c-10 0-17.778-7.778-17.778-17.778v-35.556c0-10 7.778-17.778 17.778-17.778h391.111c10 0 17.778 7.778 17.778 17.778v35.556c0 10-7.778 17.778-17.778 17.778z" />
-<glyph unicode="&#xe90f;" glyph-name="file" horiz-adv-x="878" d="M827.745 734.666l-173.333 173.333c-20.556 20.556-61.667 37.778-91.111 37.778h-497.777c-29.444 0-53.333-23.889-53.333-53.333v-888.887c0-29.444 23.889-53.333 53.333-53.333h746.665c29.444 0 53.333 23.889 53.333 53.333v639.999c0 29.444-17.222 70.555-37.778 91.111zM581.079 870.221c9.444-3.333 18.889-8.333 22.778-12.222l173.889-173.889c3.889-3.889 8.889-13.333 12.222-22.778h-208.889zM794.412 21.334h-711.11v853.332h426.666v-231.111c0-29.444 23.889-53.333 53.333-53.333h231.111z" />
+<glyph unicode="&#xe900;" glyph-name="form-conditional" horiz-adv-x="1094" d="M300.535 78.617c0 3.87-1.548 7.739-4.335 10.525l-45.506 45.507 45.507 45.507c2.787 2.786 4.335 6.656 4.335 10.525s-1.548 7.739-4.335 10.525l-21.051 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-45.507-45.507-45.507 45.507c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l45.507-45.507-45.507-45.507c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.74 4.335-10.525l21.051-21.051c2.787-2.787 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l45.507 45.507 45.507-45.507c2.787-2.787 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l21.051 21.051c2.787 2.787 4.335 6.656 4.335 10.525zM999.093 190.682c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.787 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM514.273 890.273v-260.273h-332.955v-277.227h65.364v211.955h600.546v-211.955h65.273v277.227h-332.955v260.273z" />
+<glyph unicode="&#xe901;" glyph-name="folder-no-color" d="M194.559 846.275c-77.457-0.137-140.211-62.89-140.348-140.334v-515.869c0.137-77.457 62.892-140.211 140.336-140.348h634.893c77.457 0.137 140.211 62.892 140.348 140.336v396.602c0 77.561-62.808 140.453-140.336 140.59h-296.852l-47.104 62.885c-25.923 34.066-66.407 55.898-112 56.139h-178.937zM194.553 787.607h178.906c26.48-0.030 50.004-12.656 64.908-32.207l0.146-0.199 47.104-62.766 17.709-24.094h326.113c45.125-0.069 81.68-36.665 81.68-81.799v-396.471c-0.042-27.788-13.947-52.311-35.156-67.064l-725.621 651.525c12.744 8.239 27.912 13.050 44.211 13.074zM115.25 725.406l687.184-617.014h-607.875c-45.083 0.068-81.61 36.598-81.678 81.674v515.861c0.010 6.714 0.834 13.236 2.369 19.479z" />
+<glyph unicode="&#xe902;" glyph-name="whiteboard" horiz-adv-x="878" d="M65.524 945.762c-29.444 0-53.333-23.889-53.333-53.333v-888.857c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.206 70.54-37.762 91.095l-173.333 173.333c-20.556 20.556-61.698 37.762-91.143 37.762h-497.762zM83.286 874.667h426.667v-231.095c0-29.444 23.889-53.333 53.333-53.333h231.143v-568.905h-711.143v853.333zM581.095 870.238c9.444-3.333 18.873-8.349 22.762-12.238l173.905-173.905c3.889-3.889 8.857-13.317 12.19-22.762h-208.857v208.905zM446.333 524.286c-17.277 0.517-34.937-1.027-52.952-4.571-22.15-4.43-42.984-11.806-62.476-22.143-19.492-10.632-37.062-23.776-52.714-39.429-15.357-15.357-28.321-32.794-38.952-52.286-10.632-19.196-18.189-39.85-22.619-62-7.974-41.346-5.87-79.57 6.238-114.714 12.404-35.144 30.421-65.145 54.048-89.952 23.626-24.512 50.629-42.977 81.048-55.381 30.714-12.108 60.087-15.954 88.143-11.524 18.31 2.658 31.188 12.718 38.571 30.143 7.679 17.72 7.364 34.709-0.905 50.952-10.337 20.082-9.623 39.575 2.19 58.476 11.813 19.196 29.117 28.762 51.857 28.762h70.429c15.948 0 29.539 5.635 40.762 16.857 11.222 11.518 16.81 25.243 16.81 41.19 0 34.849-7.51 67.353-22.571 97.476-14.766 29.828-34.707 55.089-59.809 75.762-24.808 20.673-53.599 35.559-86.381 44.714-16.538 4.578-33.438 7.15-50.714 7.667zM439 467.476c7.974 0 14.636-2.817 19.952-8.429 5.611-5.316 8.429-11.979 8.429-19.952s-2.817-14.77-8.429-20.381c-5.316-5.316-11.978-7.952-19.952-7.952s-14.77 2.636-20.381 7.952c-5.316 5.611-7.952 12.407-7.952 20.381s2.636 14.636 7.952 19.952c5.611 5.611 12.407 8.429 20.381 8.429zM325.619 410.762c7.974 0 14.589-2.817 19.905-8.429 5.611-5.316 8.429-11.979 8.429-19.952s-2.817-14.77-8.429-20.381c-5.316-5.316-11.931-7.952-19.905-7.952s-14.77 2.636-20.381 7.952c-5.316 5.611-8 12.407-8 20.381s2.684 14.636 8 19.952c5.611 5.611 12.407 8.429 20.381 8.429zM552.429 410.762c7.974 0 14.636-2.817 19.952-8.429 5.611-5.316 8.381-11.979 8.381-19.952s-2.77-14.77-8.381-20.381c-5.316-5.316-11.978-7.952-19.952-7.952s-14.77 2.636-20.381 7.952c-5.316 5.611-7.952 12.407-7.952 20.381s2.636 14.636 7.952 19.952c5.611 5.611 12.407 8.429 20.381 8.429zM297.238 297.333c7.974 0 14.636-2.77 19.952-8.381 5.611-5.316 8.429-11.978 8.429-19.952s-2.817-14.77-8.429-20.381c-5.316-5.316-11.979-8-19.952-8s-14.722 2.684-20.333 8c-5.316 5.611-8 12.407-8 20.381s2.684 14.636 8 19.952c5.611 5.611 12.359 8.381 20.333 8.381z" />
+<glyph unicode="&#xe903;" glyph-name="new-template" horiz-adv-x="878" d="M65.524 945.762c-29.444 0-53.333-23.889-53.333-53.333v-888.857c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.206 70.54-37.762 91.095l-173.333 173.333c-20.556 20.556-61.698 37.762-91.143 37.762h-497.762zM83.286 874.667h426.667v-231.095c0-29.444 23.889-53.333 53.333-53.333h231.143v-568.905h-711.143v853.333zM581.095 870.238c9.444-3.333 18.873-8.349 22.762-12.238l173.905-173.905c3.889-3.889 8.857-13.317 12.19-22.762h-208.857v208.905zM414.476 490.857c-12.963 0-23.476-10.514-23.476-23.476v-101.762h-101.762c-12.963 0-23.476-10.514-23.476-23.476v-46.952c0-12.963 10.514-23.476 23.476-23.476h101.762v-101.762c0-12.963 10.514-23.476 23.476-23.476h46.952c12.963 0 23.476 10.514 23.476 23.476v101.762h101.762c12.963 0 23.476 10.514 23.476 23.476v46.952c0 12.963-10.514 23.476-23.476 23.476h-101.762v101.762c0 12.963-10.514 23.476-23.476 23.476h-46.952z" />
+<glyph unicode="&#xe904;" glyph-name="shared-folder" 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 0v0zM614.4 451.132c0.071 0 0.156 0 0.24 0 34.132 0 61.801 27.669 61.801 61.801s-27.669 61.801-61.801 61.801c-34.047 0-61.664-27.532-61.801-61.547v-0.013c0-0.018 0-0.040 0-0.061 0-7.309 1.235-14.33 3.508-20.865l-0.135 0.446-103.966-60.235c-0.474 0.655-1.031 1.213-1.665 1.672l-0.021 0.015c-10.785 9.46-25.010 15.231-40.582 15.231-34.065 0-61.681-27.615-61.681-61.681 0-11.035 2.898-21.393 7.974-30.355l-0.16 0.307c11.046-18 30.619-29.824 52.953-29.824 16.92 0 32.255 6.786 43.431 17.785l-0.008-0.008 103.966-60.235c-2.138-5.921-3.374-12.754-3.374-19.876 0-0.085 0-0.171 0.001-0.256v0.013c-0.003-0.217-0.005-0.474-0.005-0.731 0-7.409 1.417-14.486 3.994-20.977l-0.135 0.384c8.944-23.66 31.407-40.178 57.728-40.178 33.999 0 61.56 27.562 61.56 61.56 0 28.833-19.822 53.036-46.582 59.725l-0.424 0.090c-4.366 1.539-9.418 2.572-14.664 2.884l-0.154 0.007c-19.639 0-37.082-9.398-48.078-23.943l-0.11-0.152-101.798 59.031c3.729 7.764 5.908 16.879 5.908 26.504s-2.179 18.74-6.070 26.88l0.162-0.376 101.798 58.79c11.336-14.332 28.681-23.481 48.167-23.612h0.022z" />
+<glyph unicode="&#xe905;" glyph-name="file-upload" horiz-adv-x="878" d="M65.524 945.762c-29.444 0-53.333-23.889-53.333-53.333v-888.857c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.206 70.54-37.762 91.095l-173.333 173.333c-20.556 20.556-61.698 37.762-91.143 37.762h-497.762zM83.286 874.667h426.667v-231.095c0-29.444 23.889-53.333 53.333-53.333h231.143v-568.905h-711.143v853.333zM581.095 870.238c9.444-3.333 18.873-8.349 22.762-12.238l173.905-173.905c3.889-3.889 8.857-13.317 12.19-22.762h-208.857v208.905zM438.857 487.905c-8.019 0-15.814-3.102-21.238-8.762l-153.524-153.524c-5.66-5.66-8.952-13.457-8.952-21.476s3.292-15.53 8.952-21.19l17.667-17.714c5.424-5.66 13.219-8.952 21.238-8.952s15.814 3.292 21.238 8.952l69.333 69.095v-166c0-16.981 14.153-27.619 30.19-27.619h30.19c16.038 0 30.19 10.638 30.19 27.619v166l69.333-69.095c5.424-5.66 13.219-8.952 21.238-8.952s15.816 3.292 21.476 8.952l17.667 17.714c5.425 5.66 8.714 13.172 8.714 21.19s-3.29 15.816-8.714 21.476l-153.524 153.524c-5.66 5.66-13.457 8.762-21.476 8.762z" />
+<glyph unicode="&#xe906;" glyph-name="template" horiz-adv-x="878" d="M65.524 945.762c-29.444 0-53.333-23.889-53.333-53.333v-888.857c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.206 70.54-37.762 91.095l-173.333 173.333c-20.556 20.556-61.698 37.762-91.143 37.762h-497.762zM83.286 874.667h426.667v-231.095c0-29.444 23.889-53.333 53.333-53.333h231.143v-568.905h-711.143v853.333zM581.095 870.238c9.444-3.333 18.873-8.349 22.762-12.238l173.905-173.905c3.889-3.889 8.857-13.317 12.19-22.762h-208.857v208.905zM535.524 513.905c-63.766 0-115.619-51.901-115.619-115.667s51.854-115.619 115.619-115.619c48.792 0 92.974 31.714 109.238 77.667 2.84 8.261 5.905 18.862 5.905 27.381 0 5.163-3.075 9.048-8.238 9.048s-65.052-37.714-73.571-42.619l-49.857 27.619v57.857l75.667 43.619c2.323 1.549 4.143 4.398 4.143 7.238 0 3.098-1.562 5.431-4.143 7.238-15.748 10.585-40.297 16.238-59.143 16.238zM412.667 349.714l-175.81-175.81c-6.196-6.196-9.81-14.699-9.81-23.476s3.614-17.3 9.81-23.238l27.333-27.905c6.196-5.938 14.746-9.524 23.524-9.524s17.3 3.586 23.238 9.524l176.048 176.095c-33.819 13.424-60.909 40.514-74.333 74.333zM304.238 183.476c9.036 0 16.524-7.488 16.524-16.524s-7.488-16.524-16.524-16.524c-9.036 0-16.524 7.488-16.524 16.524s7.488 16.524 16.524 16.524z" />
+<glyph unicode="&#xe907;" glyph-name="poll" horiz-adv-x="878" d="M65.524 945.762c-29.444 0-53.333-23.889-53.333-53.333v-888.857c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.206 70.54-37.762 91.095l-173.333 173.333c-20.556 20.556-61.698 37.762-91.143 37.762h-497.762zM83.286 874.667h426.667v-231.095c0-29.444 23.889-53.333 53.333-53.333h231.143v-568.905h-711.143v853.333zM581.095 870.238c9.444-3.333 18.873-8.349 22.762-12.238l173.905-173.905c3.889-3.889 8.857-13.317 12.19-22.762h-208.857v208.905zM569.762 482.524v-349.238h162.714v349.238h-162.714zM358.238 385.476v-252.19h162.714v252.19h-162.714zM146.667 277.381v-144.095h162.762v144.095h-162.762z" />
+<glyph unicode="&#xe908;" glyph-name="slide" horiz-adv-x="878" d="M65.524 945.762c-29.444 0-53.333-23.889-53.333-53.333v-888.857c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.206 70.54-37.762 91.095l-173.333 173.333c-20.556 20.556-61.698 37.762-91.143 37.762h-497.762zM83.286 874.667h426.667v-231.095c0-29.444 23.889-53.333 53.333-53.333h231.143v-568.905h-711.143v853.333zM581.095 870.238c9.444-3.333 18.873-8.349 22.762-12.238l173.905-173.905c3.889-3.889 8.857-13.317 12.19-22.762h-208.857v208.905zM142.286 550.714v-255.238h133.19v-109.762h133.143v-109.81h326.809v255.381h-133.143v109.81h-133.143v109.619h-326.857zM191.048 501.905h229.286v-60.81h-144.857v-96.81h-84.429v157.619zM324.238 392.333h229.286v-61.048h-144.905v-96.81h-84.381v157.857zM457.381 282.524h229.286v-157.81h-229.286v157.81z" />
+<glyph unicode="&#xe909;" glyph-name="sheet" horiz-adv-x="878" d="M65.524 945.762c-29.444 0-53.333-23.889-53.333-53.333v-888.857c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.206 70.54-37.762 91.095l-173.333 173.333c-20.556 20.556-61.698 37.762-91.143 37.762h-497.762zM83.286 874.667h426.667v-231.095c0-29.444 23.889-53.333 53.333-53.333h231.143v-568.905h-711.143v853.333zM581.095 870.238c9.444-3.333 18.873-8.349 22.762-12.238l173.905-173.905c3.889-3.889 8.857-13.317 12.19-22.762h-208.857v208.905zM141.286 532.571v-463.81h598.429v463.81h-598.429zM190.048 483.762h134.429v-158.714h-134.429v158.714zM373.286 483.762h134.429v-158.714h-134.429v158.714zM556.524 483.762h134.429v-158.714h-134.429v158.714zM190.048 276.286h134.429v-158.762h-134.429v158.762zM373.286 276.286h134.429v-158.762h-134.429v158.762zM556.524 276.286h134.429v-158.762h-134.429v158.762z" />
+<glyph unicode="&#xe90a;" glyph-name="folder-open" d="M100.232 590.035h828.717c-5.175 69.899-63.091 124.668-133.829 124.808h-283.843l-44.936 60.235c-24.766 32.712-63.599 53.649-107.326 53.73h-170.599c-0.036 0-0.078 0-0.121 0-73.968 0-133.946-59.894-134.084-133.83v-213.366l10.12 76.74c2.295 17.95 17.476 31.684 35.865 31.684 0.012 0 0.025 0 0.037 0h-0.002zM929.19 541.606h-805.948c-13.269-0.004-24.238-9.848-26.006-22.632l-0.016-0.137-43.008-317.801c-0.002-0.261-0.003-0.569-0.003-0.877 0-6.111 0.483-12.11 1.413-17.96l-0.085 0.646c0.904-6.888 2.169-12.966 3.837-18.875l-0.223 0.925c16.563-56.812 68.138-97.63 129.257-97.702h606.698c61.093 0.086 112.628 40.906 128.907 96.752l0.237 0.95c1.459 5.065 2.725 11.228 3.544 17.531l0.070 0.66c0.844 5.201 1.327 11.196 1.327 17.304 0 0.227-0.001 0.454-0.002 0.681v-0.035l40.237 295.755c0.219 1.556 0.344 3.354 0.344 5.18 0 21.624-17.529 39.153-39.153 39.153-0.036 0-0.073 0-0.109 0h0.006z" />
+<glyph unicode="&#xe90b;" glyph-name="kanban" horiz-adv-x="878" d="M65.524 945.762c-29.444 0-53.333-23.889-53.333-53.333v-888.857c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.206 70.54-37.762 91.095l-173.333 173.333c-20.556 20.556-61.698 37.762-91.143 37.762h-497.762zM83.286 874.667h426.667v-231.095c0-29.444 23.889-53.333 53.333-53.333h231.143v-568.905h-711.143v853.333zM581.095 870.238c9.444-3.333 18.873-8.349 22.762-12.238l173.905-173.905c3.889-3.889 8.857-13.317 12.19-22.762h-208.857v208.905zM146.667 493.81v-90.143h162.762v90.143h-162.762zM358.238 493.81v-90.143h162.714v90.143h-162.714zM569.762 493.81v-90.143h162.714v90.143h-162.714zM146.667 358.619v-90.143h162.762v90.143h-162.762zM569.762 358.619v-90.143h162.714v90.143h-162.714zM146.667 223.429v-90.143h162.762v90.143h-162.762z" />
+<glyph unicode="&#xe90c;" glyph-name="folder" d="M373.459 846.276h-178.899c-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-296.853l-47.104 62.886c-25.923 34.066-66.406 55.898-111.999 56.139h-0.039z" />
+<glyph unicode="&#xe90d;" glyph-name="shared-folder-open" d="M98.424 593.288h797.274c-4.8 67.457-60.657 120.376-128.894 120.471h-272.876l-43.249 57.705c-23.816 31.47-61.17 51.611-103.232 51.682h-164.213c-0.036 0-0.079 0-0.121 0-71.191 0-128.904-57.712-128.904-128.904 0-0.17 0-0.339 0.001-0.508v0.026-204.8l9.638 73.487c2.062 17.437 16.753 30.833 34.574 30.84h0.001zM900.759 255.608l33.973 248.049c0.196 1.447 0.308 3.12 0.308 4.819 0 20.873-16.906 37.797-37.772 37.828h-776.797c-12.746-0.016-23.272-9.5-24.923-21.796l-0.014-0.129-41.321-304.791c-0.002-0.25-0.003-0.546-0.003-0.843 0-5.87 0.483-11.628 1.412-17.235l-0.083 0.609c0.793-6.689 1.977-12.655 3.576-18.449l-0.203 0.861c15.92-54.648 65.53-93.912 124.319-93.967h583.566c0.061 0 0.133 0 0.205 0 16.48 0 32.227 3.14 46.675 8.853l-0.86-0.3c16.639-15.985 39.283-25.829 64.225-25.829 51.231 0 92.762 41.531 92.762 92.762 0 42.798-28.984 78.827-68.394 89.528l-0.65 0.15zM766.795 148.51h-583.56c-32.265 0.073-59.5 21.523-68.297 50.935l-0.13 0.506c-0.742 2.66-1.376 5.889-1.775 9.19l-0.032 0.327v1.566c0 1.566 0 3.373 0 5.301l36.382 272.023h724.751l-32.407-236.845c-1.82-0.63-3.331-1.281-4.788-2.025l0.21 0.097c-16.682-8.067-30.192-20.454-39.403-35.727l-0.232-0.415c-1.574-2.381-3.028-5.115-4.218-7.987l-0.119-0.325c-5.551-11.368-8.797-24.735-8.797-38.86 0-0.23 0.001-0.46 0.003-0.689v0.035c0-0.017 0-0.037 0-0.057 0-5.166 0.394-10.241 1.154-15.195l-0.070 0.554c-5.405-1.532-11.612-2.412-18.026-2.412-0.228 0-0.455 0.001-0.682 0.003h0.035zM877.026 84.781c-20.129 0.108-38.483 7.622-52.493 19.954l0.089-0.077c-14.994 12.543-25.212 30.362-27.788 50.568l-0.041 0.392c-0.537 3.145-0.844 6.769-0.844 10.463 0 0.091 0 0.182 0.001 0.273v-0.014c-0.001 0.109-0.001 0.239-0.001 0.368 0 12.484 2.89 24.293 8.038 34.794l-0.207-0.466c1.278 2.771 2.523 5.062 3.896 7.265l-0.161-0.278c7.898 12.884 18.884 23.175 31.958 30.024l0.449 0.214c0.692 0.493 1.491 0.902 2.346 1.186l0.064 0.018c10.065 4.991 21.914 7.922 34.445 7.951h0.010c0.046 0 0.1 0 0.154 0 7.802 0 15.336-1.144 22.444-3.275l-0.553 0.142c35.119-9.412 60.555-40.954 60.555-78.437 0-44.777-36.299-81.077-81.077-81.077-0.451 0-0.902 0.004-1.351 0.011l0.068-0.001zM906.059 183.206c9.581 0 17.348 7.767 17.348 17.348s-7.767 17.348-17.348 17.348v0c-0.002 0-0.004 0-0.007 0-9.411 0-17.072-7.495-17.341-16.841l-0.001-0.025c-0.004-0.12-0.006-0.262-0.006-0.404 0-1.849 0.356-3.615 1.003-5.232l-0.034 0.095-29.274-16.986c-3.089 3.105-7.328 5.063-12.025 5.18h-0.022c-9.003-0.772-16.019-8.271-16.019-17.408s7.015-16.636 15.954-17.404l0.065-0.004c4.719 0.117 8.958 2.075 12.046 5.179l0.001 0.001 12.047-7.228 16.504-9.638c-0.536-1.568-0.846-3.375-0.846-5.255 0-0.101 0.001-0.202 0.003-0.302v0.015c0-9.581 7.767-17.348 17.348-17.348s17.348 7.767 17.348 17.348c0 9.581-7.767 17.348-17.348 17.348v0c-5.563-0.038-10.508-2.653-13.705-6.709l-0.028-0.037-16.143 9.397-12.047 7.228c1.007 2.155 1.621 4.672 1.686 7.326v0.023c-0.052 2.758-0.667 5.36-1.736 7.712l0.050-0.122 28.672 16.625c3.116-4.367 8.151-7.19 13.848-7.228h0.006z" />
+<glyph unicode="&#xe90e;" glyph-name="code" horiz-adv-x="878" d="M827.746 734.667l-173.333 173.333c-20.556 20.556-61.667 37.778-91.111 37.778h-497.778c-29.444 0-53.333-23.889-53.333-53.333v-888.889c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.222 70.556-37.778 91.111zM581.079 870.222c9.444-3.333 18.889-8.333 22.778-12.222l173.889-173.889c3.889-3.889 8.889-13.333 12.222-22.778h-208.889zM794.413 21.333h-711.111v853.333h426.667v-231.111c0-29.444 23.889-53.333 53.333-53.333h231.111zM278.857 519.111l-125.556-167.222c-4.444-6.111-4.444-15 0-21.111l125.556-167.222c6.111-7.778 17.222-9.444 25-3.333l28.333 21.111c7.778 6.111 9.444 17.222 3.333 25l-101.111 135 101.111 135c6.111 7.778 4.444 18.889-3.333 25l-28.333 21.111c-7.777 6.111-18.889 4.444-25-3.333zM724.413 351.889l-125.556 167.222c-6.111 7.778-17.222 9.444-25 3.333l-28.333-21.111c-7.777-6.111-9.444-17.222-3.333-25l101.111-135-101.111-135c-6.111-7.778-4.444-18.889 3.333-25l28.333-21.111c7.778-6.111 18.889-4.444 25 3.333l125.556 167.222c4.444 6.111 4.444 15 0 21.111zM379.968 95.778l35-5.556c9.444-1.667 18.889 4.444 20.556 14.444l76.667 461.667c1.667 9.444-4.444 18.889-14.444 20.556l-35 5.556c-9.444 1.667-18.889-4.444-20.556-14.444l-76.667-461.667c-1.667-9.444 4.444-18.889 14.444-20.556z" />
+<glyph unicode="&#xe90f;" glyph-name="richtext" horiz-adv-x="878" d="M827.746 734.667l-173.333 173.333c-20.556 20.556-61.667 37.778-91.111 37.778h-497.778c-29.444 0-53.333-23.889-53.333-53.333v-888.889c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.222 70.556-37.778 91.111zM581.079 870.222c9.444-3.333 18.889-8.333 22.778-12.222l173.889-173.889c3.889-3.889 8.889-13.333 12.222-22.778h-208.889zM794.413 21.333h-711.111v853.333h426.667v-231.111c0-29.444 23.889-53.333 53.333-53.333h231.111zM225.524 501.333v-35.556c0-10 7.778-17.778 17.778-17.778h391.111c10 0 17.778 7.778 17.778 17.778v35.556c0 10-7.778 17.778-17.778 17.778h-391.111c-10 0-17.778-7.778-17.778-17.778zM634.413 376.889h-391.111c-10 0-17.778-7.778-17.778-17.778v-35.556c0-10 7.778-17.778 17.778-17.778h391.111c10 0 17.778 7.778 17.778 17.778v35.556c0 10-7.778 17.778-17.778 17.778zM634.413 234.667h-391.111c-10 0-17.778-7.778-17.778-17.778v-35.556c0-10 7.778-17.778 17.778-17.778h391.111c10 0 17.778 7.778 17.778 17.778v35.556c0 10-7.778 17.778-17.778 17.778z" />
 <glyph unicode="&#xe910;" glyph-name="form-poll" horiz-adv-x="1094" d="M667.572 771.752c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM964.853 659.687c0 3.87-1.548 7.739-4.335 10.525l-45.506 45.507 45.507 45.507c2.787 2.786 4.335 6.656 4.335 10.525s-1.548 7.739-4.335 10.525l-21.051 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-45.507-45.507-45.507 45.507c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l45.507-45.507-45.507-45.507c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l21.051-21.051c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l45.507 45.507 45.507-45.507c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l21.051 21.051c2.787 2.786 4.335 6.656 4.335 10.525zM300.535 659.687c0 3.87-1.548 7.739-4.335 10.525l-45.506 45.507 45.507 45.507c2.787 2.786 4.335 6.656 4.335 10.525s-1.548 7.739-4.335 10.525l-21.051 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-45.507-45.507-45.507 45.507c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l45.507-45.507-45.507-45.507c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l21.051-21.051c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l45.507 45.507 45.507-45.507c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l21.051 21.051c2.787 2.786 4.335 6.656 4.335 10.525zM330.094 505.894c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM665.995 505.894c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM665.995 237.227c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM999.093 237.227c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM832.205 352.915h-31.571q-16.264 26.256-24.024 49.855-7.76 23.705-7.76 46.985t7.76 47.091q7.866 23.918 24.024 49.961h31.571q-13.606-25.193-20.41-49.323-6.803-24.024-6.803-47.516t6.697-47.623q6.803-24.13 20.516-49.43zM913.617 352.915q13.607 25.3 20.41 49.43t6.804 47.623-6.804 47.516q-6.803 24.13-20.41 49.323h31.571q16.158-26.044 23.918-49.961 7.866-23.811 7.866-47.091t-7.76-46.985q-7.76-23.599-24.024-49.855zM169.429 84.249h-31.571q-16.264 26.256-24.024 49.855-7.76 23.705-7.76 46.985t7.76 47.091q7.866 23.918 24.024 49.961h31.571q-13.606-25.193-20.41-49.323-6.803-24.024-6.803-47.516t6.697-47.623q6.803-24.13 20.516-49.43zM250.84 84.249q13.607 25.3 20.41 49.43t6.804 47.623-6.804 47.516q-6.803 24.13-20.41 49.323h31.571q16.158-26.044 23.918-49.961 7.866-23.811 7.866-47.091t-7.76-46.985q-7.76-23.599-24.024-49.855z" />
-<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" />
-<glyph unicode="&#xe915;" glyph-name="destroy" horiz-adv-x="1094" d="M191.671 946.511c-28.024 0-50.742-22.731-50.742-50.756v-399.384h-74.822c-29.561-0.003-53.524-23.966-53.527-53.527 0.025-29.545 23.982-53.484 53.527-53.487h174.773l-88.853-95.929 95.929-104.66-95.835-104.524 121.3-132.182 43.855 55.423-70.369 76.813 95.781 104.471-95.687 104.364 89.122 96.225h190.445l-88.853-95.929 95.929-104.66-95.781-104.524 121.246-132.182 43.855 55.423-70.369 76.813 95.781 104.471-95.687 104.364 89.122 96.225h190.445l-88.853-95.929 95.983-104.66-95.835-104.524 121.286-132.182 43.815 55.423-70.383 76.759 95.835 104.524-95.727 104.417 89.122 96.171h117.318c29.55-0.004 53.515 23.936 53.54 53.487-0.003 29.566-23.974 53.531-53.54 53.527h-71.728v162.501c0 28.024-16.394 67.15-35.958 86.714l-164.966 164.966c-19.564 19.564-58.69 35.958-86.714 35.958zM208.607 878.832h406.073v-219.96c0-28.024 22.745-50.769 50.769-50.769h219.96v-111.732h-676.802zM682.359 874.608c8.989-3.172 17.984-7.936 21.685-11.636l165.505-165.505c3.702-3.7 8.463-12.696 11.636-21.685h-198.826z" />
+<glyph unicode="&#xe911;" glyph-name="file" horiz-adv-x="878" d="M827.745 734.666l-173.333 173.333c-20.556 20.556-61.667 37.778-91.111 37.778h-497.777c-29.444 0-53.333-23.889-53.333-53.333v-888.887c0-29.444 23.889-53.333 53.333-53.333h746.665c29.444 0 53.333 23.889 53.333 53.333v639.999c0 29.444-17.222 70.555-37.778 91.111zM581.079 870.221c9.444-3.333 18.889-8.333 22.778-12.222l173.889-173.889c3.889-3.889 8.889-13.333 12.222-22.778h-208.889zM794.412 21.334h-711.11v853.332h426.666v-231.111c0-29.444 23.889-53.333 53.333-53.333h231.111z" />
+<glyph unicode="&#xe912;" 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="&#xe913;" 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="&#xe914;" 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="&#xe915;" 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" />
 <glyph unicode="&#xe916;" glyph-name="form-list-check" horiz-adv-x="1094" d="M1012.362 763.843c0 8.831-7.792 16.623-16.623 16.623h-631.687c-8.831 0-16.623-7.792-16.623-16.623v-99.74c0-8.831 7.792-16.623 16.623-16.623h631.687c8.831 0 16.623 7.792 16.623 16.623zM1012.362 497.87c0 8.831-7.792 16.623-16.623 16.623h-631.687c-8.831 0-16.623-7.792-16.623-16.623v-99.74c0-8.831 7.792-16.623 16.623-16.623h631.687c8.831 0 16.623 7.792 16.623 16.623zM1012.362 231.897c0 8.831-7.792 16.623-16.623 16.623h-631.687c-8.831 0-16.623-7.792-16.623-16.623v-99.74c0-8.831 7.792-16.623 16.623-16.623h631.687c8.831 0 16.623 7.792 16.623 16.623zM279.136 239.834c0 22.077-17.911 39.988-39.988 39.988h-115.521c-22.077 0-39.988-17.911-39.988-39.988v-115.521c0-22.077 17.911-39.988 39.988-39.988h115.521c22.077 0 39.988 17.911 39.988 39.988zM307.396 779.338c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM307.396 513.228c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525z" />
 <glyph unicode="&#xe917;" glyph-name="form-grid-check" horiz-adv-x="1094" d="M645.063 506.257c0 22.077-17.911 39.988-39.988 39.988h-115.521c-22.077 0-39.988-17.911-39.988-39.988v-115.521c0-22.077 17.911-39.988 39.988-39.988h115.521c22.077 0 39.988 17.911 39.988 39.988zM1011.782 771.036c0 22.077-17.911 39.988-39.988 39.988h-115.521c-22.077 0-39.988-17.911-39.988-39.988v-115.521c0-22.077 17.911-39.988 39.988-39.988h115.521c22.077 0 39.988 17.911 39.988 39.988zM279.090 506.257c0 22.077-17.911 39.988-39.988 39.988h-115.521c-22.077 0-39.988-17.911-39.988-39.988v-115.521c0-22.077 17.911-39.988 39.988-39.988h115.521c22.077 0 39.988 17.911 39.988 39.988zM279.136 239.834c0 22.077-17.911 39.988-39.988 39.988h-115.521c-22.077 0-39.988-17.911-39.988-39.988v-115.521c0-22.077 17.911-39.988 39.988-39.988h115.521c22.077 0 39.988 17.911 39.988 39.988zM1011.753 239.834c0 22.077-17.911 39.988-39.988 39.988h-115.521c-22.077 0-39.988-17.911-39.988-39.988v-115.521c0-22.077 17.911-39.988 39.988-39.988h115.521c22.077 0 39.988 17.911 39.988 39.988zM1047.594 513.673c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM676.789 238.106c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM676.789 771.743c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM318.428 771.743c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525z" />
 <glyph unicode="&#xe918;" glyph-name="form-grid-radio" horiz-adv-x="1094" d="M181.227 823.091c-60.1 0-109.091-48.991-109.091-109.091s48.991-109.091 109.091-109.091c60.1 0 108.955 48.991 108.955 109.091s-48.855 109.091-108.955 109.091zM545.091 823.091c-60.1 0-109.091-48.991-109.091-109.091s48.991-109.091 109.091-109.091c60.1 0 109.091 48.991 109.091 109.091s-48.991 109.091-109.091 109.091zM908.955 823.091c-60.1 0-109.091-48.991-109.091-109.091s48.991-109.091 109.091-109.091c60.1 0 109.091 48.991 109.091 109.091s-48.991 109.091-109.091 109.091zM181.227 747.318c19.623 0 33.364-13.695 33.364-33.318 0-19.583-13.943-33.5-33.364-33.5-19.381 0-33.5 14.119-33.5 33.5 0 19.421 13.917 33.318 33.5 33.318zM181.227 556.955c-60.1 0-109.091-48.809-109.091-108.909s48.991-109.091 109.091-109.091c60.1 0 108.955 48.991 108.955 109.091s-48.855 108.909-108.955 108.909zM545.091 556.955c-60.1 0-109.091-48.809-109.091-108.909s48.991-109.091 109.091-109.091c60.1 0 109.091 48.991 109.091 109.091s-48.991 108.909-109.091 108.909zM908.955 556.955c-60.1 0-109.091-48.809-109.091-108.909s48.991-109.091 109.091-109.091c60.1 0 109.091 48.991 109.091 109.091s-48.991 108.909-109.091 108.909zM909.045 481.364c19.623 0 33.318-13.74 33.318-33.364 0-19.583-13.897-33.5-33.318-33.5-19.381 0-33.5 14.119-33.5 33.5 0 19.421 13.917 33.364 33.5 33.364zM181.227 291.045c-60.1 0-109.091-48.855-109.091-108.955s48.991-109.091 109.091-109.091c60.1 0 108.955 48.991 108.955 109.091s-48.855 108.955-108.955 108.955zM545.091 291.045c-60.1 0-109.091-48.855-109.091-108.955s48.991-109.091 109.091-109.091c60.1 0 109.091 48.991 109.091 109.091s-48.991 108.955-109.091 108.955zM908.955 291.045c-60.1 0-109.091-48.855-109.091-108.955s48.991-109.091 109.091-109.091c60.1 0 109.091 48.991 109.091 109.091s-48.991 108.955-109.091 108.955zM545.318 214c19.623 0 33.318-13.695 33.318-33.318 0-19.583-13.897-33.5-33.318-33.5-19.381 0-33.5 14.119-33.5 33.5 0 19.421 13.917 33.318 33.5 33.318z" />
@@ -38,4 +38,5 @@
 <glyph unicode="&#xe91c;" glyph-name="form-text" horiz-adv-x="1094" d="M1012.362 481.247c0 18.182-15.065 33.247-33.247 33.247h-864.413c-18.182 0-33.247-15.065-33.247-33.247v-66.493c0-18.182 15.065-33.247 33.247-33.247h864.413c18.182 0 33.247 15.065 33.247 33.247z" />
 <glyph unicode="&#xe91d;" glyph-name="form-list-ordered" horiz-adv-x="1094" d="M279.377 71.897c0 35.844-22.857 62.857-57.662 71.169l49.351 59.74v45.714h-172.987v-78.961h55.065v27.532c16.623 0 33.766 1.039 50.389 1.039v-0.52c-22.338-20.259-39.48-46.753-58.182-70.649l13.506-29.091c21.299 1.558 54.545 0 54.545-29.091 0-20.779-19.221-29.61-37.402-29.61-19.74 0-41.039 10.39-55.065 23.376l-29.61-45.714c23.377-23.377 56.623-34.286 89.35-34.286 54.026 0 98.701 32.208 98.701 89.35zM280.416 397.611h-54.545v-31.169h-65.974c1.558 40.519 114.285 57.662 114.285 134.545 0 51.428-41.558 80-89.87 80-39.48 0-74.805-20.26-91.948-56.104l44.156-30.649c8.831 14.545 23.896 30.13 42.078 30.13 17.143 0 28.052-9.351 28.052-27.013 0-43.636-117.402-58.182-117.402-154.285 0-9.351 1.558-18.701 3.117-28.052h188.051zM1012.362 231.897c0 9.351-7.792 16.623-16.623 16.623h-631.687c-9.351 0-16.623-7.273-16.623-16.623v-99.74c0-8.831 7.273-16.623 16.623-16.623h631.687c8.831 0 16.623 7.792 16.623 16.623zM280.936 698.908h-56.104v209.87h-55.065l-70.649-65.974 36.883-39.48c9.87 8.831 20.26 16.623 25.974 28.052h1.039v-6.234c0-42.078-0.52-84.156-0.52-126.233h-55.584v-51.428h174.025zM1012.362 497.87c0 9.351-7.792 16.623-16.623 16.623h-631.687c-9.351 0-16.623-7.273-16.623-16.623v-99.74c0-8.831 7.273-16.623 16.623-16.623h631.687c8.831 0 16.623 7.792 16.623 16.623zM1012.362 763.843c0 8.831-7.792 16.623-16.623 16.623h-631.687c-9.351 0-16.623-7.792-16.623-16.623v-99.74c0-8.831 7.273-16.623 16.623-16.623h631.687c8.831 0 16.623 7.792 16.623 16.623z" />
 <glyph unicode="&#xe91e;" glyph-name="form-poll-maybe" horiz-adv-x="1094" d="M856.492 569.333c0 9.987-3.996 19.973-11.187 27.163l-54.325 54.327c-7.191 7.191-17.175 11.185-27.163 11.185s-19.972-3.995-27.163-11.185l-262.048-262.447-117.442 117.841c-7.191 7.19-17.175 11.185-27.163 11.185s-19.972-3.995-27.163-11.185l-54.327-54.327c-7.191-7.191-11.187-17.177-11.187-27.163s3.995-19.973 11.187-27.163l198.932-198.932c7.191-7.191 17.175-11.185 27.163-11.185s19.972 3.995 27.163 11.185l343.538 343.537c7.192 7.191 11.187 17.177 11.187 27.163zM65.903 444.364q0 120.454 35 225.454 35.454 105 101.818 184.090h73.636q-65.454-87.727-98.636-192.727-32.727-105-32.727-215.908 0-109.091 33.636-213.181t96.818-189.999h-72.727q-66.818 77.273-101.818 180.454t-35 221.818zM1027.916 444.364q0-119.545-35.454-222.727-35-103.182-101.363-179.545h-72.727q63.182 85.454 96.818 189.545 33.636 104.545 33.636 213.636 0 110.909-33.182 215.908-32.727 105-98.182 192.727h73.636q66.818-79.545 101.818-184.999 35-105 35-224.545z" />
+<glyph unicode="&#xe91f;" glyph-name="destroy" horiz-adv-x="1094" d="M191.671 946.511c-28.024 0-50.742-22.731-50.742-50.756v-399.384h-74.822c-29.561-0.003-53.524-23.966-53.527-53.527 0.025-29.545 23.982-53.484 53.527-53.487h174.773l-88.853-95.929 95.929-104.66-95.835-104.524 121.3-132.182 43.855 55.423-70.369 76.813 95.781 104.471-95.687 104.364 89.122 96.225h190.445l-88.853-95.929 95.929-104.66-95.781-104.524 121.246-132.182 43.855 55.423-70.369 76.813 95.781 104.471-95.687 104.364 89.122 96.225h190.445l-88.853-95.929 95.983-104.66-95.835-104.524 121.286-132.182 43.815 55.423-70.383 76.759 95.835 104.524-95.727 104.417 89.122 96.171h117.318c29.55-0.004 53.515 23.936 53.54 53.487-0.003 29.566-23.974 53.531-53.54 53.527h-71.728v162.501c0 28.024-16.394 67.15-35.958 86.714l-164.966 164.966c-19.564 19.564-58.69 35.958-86.714 35.958zM208.607 878.832h406.073v-219.96c0-28.024 22.745-50.769 50.769-50.769h219.96v-111.732h-676.802zM682.359 874.608c8.989-3.172 17.984-7.936 21.685-11.636l165.505-165.505c3.702-3.7 8.463-12.696 11.636-21.685h-198.826z" />
 </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 788b7f881a5c1f34e58560d04b46e5a84eb2ae3d..41ae6ef3732edf23c4ceb2565a0d81787262db46 100644
GIT binary patch
delta 569
zcmXv~O=uHA82x5uHwpRM-L%_k4M}5nV_S{dq_&rc8YBlTlwt_#MVB`1iuqZZ7NXEJ
zQV}nTI_OEkgNTQM=w7Nw$-#qQ5R_gjh!>#;Pl5#xy7+Cyfj4j7d-KhFGp)(a)G`nN
z2tW%M9G*OLC@n=id(nA=xHw%gtlr|MrvN01x-e(dEo2$B%f7ktm07d-t`BtsKr5If
zV<zTnh5_^r=3^!r-e1CgfTVz0Gb;;?6)OHfJ&5{Fxi)>mc=Y)G3>s@_oT?ZN3r5H?
zz&^L2ziL!Uugb$is5QLghE=OCV52w&SKS;K+q~O8M&kF#X%goX<g&a7=hzmz3Ry6q
zf{pNNku1@<6xBmYLdhISs2OCE;@e%Ll)mP-yZgh=9>>nnvpL6JVjjvrbVYlphcS_=
zj8c|LxwA?|X7LwlEJ$xTzn$+J8$>07{gS+w>_5t=z?YPkJ<=0ocB0Sp^P{`J4Y)t+
z&1B+Vhe8*m>^214HvxPpuB87nU)9D{?VrCB0!0$?u*iRE*<H9e&#Dl_4SvKJV#)=d
z(6u6lp`98(bVCf<M5YJm1D0cLp&&dHWw9xK_8j-jdT;uYz9;^5zY~}bybWr>>!Fk3
yrj(aDa#C)|50$*K78%Bq+<rB_u5b0Gp$H|IhdNw>8dUM4$KfEP`NyP+c>WjAd44ef

delta 446
zcmX>T*x+B!z{tSBz|GLWz|3IaAFOZ0FT^GX6xjpB3CX#M1>#|smNGCf$^iKx>50V!
zKw1FE2hkkqIhAP}CF=hG`4tQd$^sdwi7B!sZ)+JCR62n2W*I;M_8%--K>h(BUnL{A
zq@r#QYYmY31jz5n$xn7n?9`eBG)xs_phs?EMFE2WV?B_+1ISm%OUzB(nWd!;<lg{V
z(pHdPTmp0`5U3}B<QbTmuT4B)&nP#E(VJ0jvJYeS=HE=m_$PlAYuJ2H$b@BcsW=bw
z<d-T>HaALTa4Cbl%Fe)W@WSi<cz&C&4BRY00S1OUZ>}`M=*b^c%>|Vq;$TSzCLlH0
zM$JZsIgf#d#f>2fD9HuHW<VSW#%>I}lP9RD_<_}PF^Dk8G2}6JF@9lMz%0kSiG__N
zkL3=l1?xQ4BW%yuTR50FoVa4RE^sSxH*r7W3E>st^WzuepTqx6AV45TP)x7`93{$=
jxzwMF8!&`1q%ssS6f<Np<TK;}eQeI4$6zp-L*obl50Pe-

diff --git a/customize.dist/fonts/cptools/fonts/cptools.woff b/customize.dist/fonts/cptools/fonts/cptools.woff
index f2faf5aa26cbc28c70d2401f6ac251e47c2d56ce..dca533fcdc51d247a2b0f7e129cde18fa85dc986 100644
GIT binary patch
delta 589
zcmX@(KO;z@+~3WOfsp|SG$k0gLA1sh26hIf$s5&0Ch7>+D<$V97BDa{W&mYEKv+EN
z(z5i#VvyJ#AfE$@1=4dW(|}?}7#LK5>Qq8fg66qpq$Z{?FsMlY)tG^>97lUh22c<v
z769a{fH3<H7VV7Ok_w<$36MVlgqxXIKj!2o1J(Jdvj7FWKzQzgsVTXM6+nyCL7El7
z*pRV4FEKY2C<YW~Yy;t)Ia-<p`NcrPG=9L<F#}o5%r__VFxoT9PxfK-29h%vvjs{S
zw3(kXS25TyBr@bOFsM$RAY{X+I=Mkcg^y8CQP9{_QPdbnGwM!u6ft39+BNx>hywRN
z>3^G@m?E71ZT6qsC2GQ0FxgQ~j)!UYzd!$8U%A34%E+?$ALD8M&7MLgER#<PHf*jH
z<6+*ME0w`Dxl{6qGAOj!jg2+Tvn1pBZN4&agS^PVa5t>|CXAl^L&aQF1tJcXWMBeP
zEN%>?lO0rTB!G-4<~#--paL!+HUr{75S~0kRV554$qUxQ#UR2U$8dmAfJujG8nYAg
z0hSP!6|4fRb*#789N5y>J2=!hmT>Lk`o~?weS}Aar-j#rua4i1|BQf|K!d;>K{vr2
sLRvtRK<-tU%%%2R+=wBJA(f$sp_n0)A)g@+7zgGIdJIOBIn<8;0R5kVT>t<8

delta 505
zcmbOcbjDw-+~3WOfsp|S)Xy+*gXsna_Q{NzViR?Q>*bPj6AKs^7&CwpAs{Rsc4=vP
zVlhZ;50K9R#RBO$m1#h+BMc160wBCmqW(`tYGMilgUS`48Z!`<HF;Z`0Tg6lP~`#g
zRX~{i2a8rlZb=1D%mB#m0pYqmtTj3L$v|~}svt`|K)6$DQbBHF1<+zO79d{%j13s;
z^AdAYfnq?z7~4R2XO@<FL4I)w&_8S7>X?BnX69>?c^K^(<tF<udIQNBjM<yrnUC>L
zb`)>e%qwidviYDm5A$SG)hC<JN@Z{<gTjQJf#KkV*ZuMQHeVUILDn)b+<9}Q8AeaG
zQ8O1*hKPeD8JK|7<PJ3(8Rk3&9u_x-D4--45SsyUAQ-zb@J_y?rV;^G&&43ZAjgo$
z*v0sTX#ukw^ClKHmOPd_tQM^ESdXwhV{hSL;&9@M;kv-B#NEXGh$n<sgwKy(jDHUQ
zH-P|w96>R`4shHlGuASIf|P-Q2^e$2lZ(|)i5oD4F{CmSF%&aoGUPMl0Yl83L65;;
Ia)`ze08rj(g#Z8m

diff --git a/customize.dist/fonts/cptools/style.css b/customize.dist/fonts/cptools/style.css
index 874b6068f..7b3227453 100644
--- a/customize.dist/fonts/cptools/style.css
+++ b/customize.dist/fonts/cptools/style.css
@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'cptools';
-  src:  url('fonts/cptools.eot?chd5a1');
-  src:  url('fonts/cptools.eot?chd5a1#iefix') format('embedded-opentype'),
-    url('fonts/cptools.ttf?chd5a1') format('truetype'),
-    url('fonts/cptools.woff?chd5a1') format('woff'),
-    url('fonts/cptools.svg?chd5a1#cptools') format('svg');
+  src:  url('fonts/cptools.eot?6tk5ck');
+  src:  url('fonts/cptools.eot?6tk5ck#iefix') format('embedded-opentype'),
+    url('fonts/cptools.ttf?6tk5ck') format('truetype'),
+    url('fonts/cptools.woff?6tk5ck') format('woff'),
+    url('fonts/cptools.svg?6tk5ck#cptools') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -14,7 +14,7 @@
   /* use !important to prevent issues with browser extensions that change fonts */
   font-family: 'cptools' !important;
   display: inline-block;
-  speak: none;
+  speak: never;
   font-style: normal;
   font-weight: normal;
   font-variant: normal;
@@ -26,6 +26,9 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.cptools-form-conditional:before {
+  content: "\e900";
+}
 .cptools-form-poll:before {
   content: "\e910";
 }
@@ -57,65 +60,65 @@
   content: "\e91d";
 }
 .cptools-folder-no-color:before {
-  content: "\e900";
+  content: "\e901";
 }
 .cptools-whiteboard:before {
-  content: "\e901";
+  content: "\e902";
 }
 .cptools-new-template:before {
-  content: "\e902";
+  content: "\e903";
 }
 .cptools-shared-folder:before {
-  content: "\e903";
+  content: "\e904";
 }
 .cptools-file-upload:before {
-  content: "\e904";
+  content: "\e905";
 }
 .cptools-template:before {
-  content: "\e905";
+  content: "\e906";
 }
 .cptools-poll:before {
-  content: "\e906";
+  content: "\e907";
 }
 .cptools-slide:before {
-  content: "\e907";
+  content: "\e908";
 }
 .cptools-sheet:before {
-  content: "\e908";
+  content: "\e909";
 }
 .cptools-folder-open:before {
-  content: "\e909";
+  content: "\e90a";
 }
 .cptools-kanban:before {
-  content: "\e90a";
+  content: "\e90b";
 }
 .cptools-folder:before {
-  content: "\e90b";
+  content: "\e90c";
 }
 .cptools-shared-folder-open:before {
-  content: "\e90c";
+  content: "\e90d";
 }
 .cptools-code:before {
-  content: "\e90d";
+  content: "\e90e";
 }
 .cptools-richtext:before {
-  content: "\e90e";
+  content: "\e90f";
 }
 .cptools-file:before {
-  content: "\e90f";
+  content: "\e911";
 }
 .cptools-palette:before {
-  content: "\e911";
+  content: "\e912";
 }
 .cptools-folder-upload:before {
-  content: "\e912";
+  content: "\e913";
 }
 .cptools-add-bottom:before {
-  content: "\e913";
+  content: "\e914";
 }
 .cptools-add-top:before {
-  content: "\e914";
+  content: "\e915";
 }
 .cptools-destroy:before {
-  content: "\e915";
+  content: "\e91f";
 }
diff --git a/www/form/inner.js b/www/form/inner.js
index 147a9138f..040f77fa3 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1048,7 +1048,7 @@ define([
                 };
             },
             printResults: function () { return; },
-            icon: h('i.fa.fa-question')
+            icon: h('i.cptools.cptools-form-conditional')
         },
     };
 

From 37430f529419148ac73f71e58eed759ebad33f34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Thu, 2 Sep 2021 15:31:05 +0100
Subject: [PATCH 064/125] Remove margin on icon-only button to remove a
 condition

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

diff --git a/www/form/inner.js b/www/form/inner.js
index 040f77fa3..38ddc35ba 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -3047,7 +3047,7 @@ define([
                     $(iSelect).hide();
 
                     var remove = h('button.btn.btn-danger-alt.cp-condition-remove', [
-                        h('i.fa.fa-times')
+                        h('i.fa.fa-times.nomargin')
                     ]);
                     $(remove).on('click', function () {
                         $content.remove();

From d2db3a5c5a0c85d8d5fb45bd37b43126e11ca9e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Thu, 2 Sep 2021 16:21:10 +0100
Subject: [PATCH 065/125] Review use of primary, secondary, default buttons

---
 www/form/app-form.less |  2 +-
 www/form/inner.js      | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 031411800..6435e6f07 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -215,7 +215,7 @@
                     min-height: 300px;
                     border: 2px dashed @cryptpad_text_col; // XXX
                     padding: 20px;
-                    margin-top: 10px;
+                    margin-top: 20px;
                     background: @cp_app-bg;
                     .cp-form-creator-add-inline {
                         button[data-type="section"] {
diff --git a/www/form/inner.js b/www/form/inner.js
index 38ddc35ba..07da962c3 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2292,7 +2292,7 @@ define([
         var $container = $('div.cp-form-creator-answered').empty().css('display', '');
 
         var viewOnly = content.answers.cantEdit || APP.isClosed;
-        var action = h('button.btn.btn-primary', [
+        var action = h(viewOnly ? 'button.btn.btn-secondary' : 'button.btn.btn-primary', [
             viewOnly ? h('i.fa.fa-bar-chart') : h('i.fa.fa-pencil'),
             h('span', viewOnly ? Messages.form_viewAnswer : Messages.form_editAnswer)
         ]);
@@ -2313,19 +2313,20 @@ define([
 
         if (answers._time) { APP.lastAnswerTime = answers._time; }
 
+        Messages.form_viewAllAnswers = "View all responses ({0})"; // XXX
         // If responses are public, show button to view them
         var responses;
         if (content.answers.privateKey) {
             var l = getAnswersLength(answers);
-            responses = h('button.btn.btn-default', [
+            responses = h('button.btn.btn-secondary', [
                 h('i.fa.fa-bar-chart'),
-                h('span.cp-button-name', Messages._getKey('form_results', [l]))
+                h('span.cp-button-name', Messages._getKey('form_viewAllAnswers', [l]))
             ]);
             var sframeChan = framework._.sfCommon.getSframeChannel();
             sframeChan.query("Q_FORM_FETCH_ANSWERS", content.answers, function (err, obj) {
                 var answers = obj && obj.results;
                 var l = getAnswersLength(answers);
-                $(responses).find('.cp-button-name').text(Messages._getKey('form_results', [l]));
+                $(responses).find('.cp-button-name').text(Messages._getKey('form_viewAllAnswers', [l]));
             });
             $(responses).click(function () {
                 sframeChan.query("Q_FORM_FETCH_ANSWERS", content.answers, function (err, obj) {
@@ -2973,14 +2974,14 @@ define([
                 };
                 Messages.form_conditional_add = "Add condition OR";
                 Messages.form_conditional_addAnd = "Add condition AND";
-                var addCondition = h('button.btn.btn-default', [
+                var addCondition = h('button.btn.btn-secondary', [
                     h('i.fa.fa-plus'),
                     h('span', Messages.form_conditional_add)
                 ]);
                 var $addC = $(addCondition);
                 var getConditions;
                 var getAddAndButton = function ($container, rules) {
-                    var btn = h('button.btn.btn-default.cp-form-add-and', [
+                    var btn = h('button.btn.btn-secondary.cp-form-add-and', [
                         h('i.fa.fa-plus'),
                         h('span', Messages.form_conditional_addAnd)
                     ]);
@@ -3012,7 +3013,7 @@ define([
                         options: qOptions, // Entries displayed in the menu
                         isSelect: true,
                         caretDown: true,
-                        buttonCls: 'btn btn-secondary'
+                        buttonCls: 'btn btn-default'
                     };
                     var qSelect = UIElements.createDropdown(qConfig);
                     Messages.form_condition_is = 'is'; // XXX
@@ -3040,7 +3041,7 @@ define([
                         options: iOptions, // Entries displayed in the menu
                         isSelect: true,
                         caretDown: true,
-                        buttonCls: 'btn btn-secondary'
+                        buttonCls: 'btn btn-default'
                     };
                     var iSelect = UIElements.createDropdown(iConfig);
                     iSelect.setValue(isOn ? 1 : 0);
@@ -3104,7 +3105,7 @@ define([
                             //container: $(type),
                             isSelect: true,
                             caretDown: true,
-                            buttonCls: 'btn btn-secondary'
+                            buttonCls: 'btn btn-default'
                         };
                         var vSelect = UIElements.createDropdown(vConfig);
                         vSelect.addClass('cp-form-condition-values');
@@ -3788,7 +3789,7 @@ define([
             refreshResponse();
 
             // Make answers anonymous
-            Messages.form_makeAnon = "Anonymous responses"; // XXX
+            Messages.form_makeAnon = "Anonymize responses"; // XXX
             var anonContainer = h('div.cp-form-anon-container');
             var $anon = $(anonContainer);
             var refreshAnon = function () {

From 68a3a19bf06885526cc51662824a46a583a68186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Thu, 2 Sep 2021 17:36:05 +0100
Subject: [PATCH 066/125] Use Tags instead of Tools in Kanban toolbar

---
 www/kanban/inner.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 8225ddc86..c3de0e0e8 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -1021,8 +1021,8 @@ define([
             var common = framework._.sfCommon;
             var $button = common.createButton('toggle', true, {
                 element: $(container),
-                //icon: 'fa-tags', // FIXME
-                //text: Messages.fm_tagsName, // FIXME
+                icon: 'fa-tags',
+                text: Messages.fm_tagsName,
             }, function () {
                 $button.toggleClass('cp-toolbar-button-active');
 

From 2d5f6fb883017a3aa9a9ee0c76271bd3624a5aef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Fri, 3 Sep 2021 11:27:38 +0100
Subject: [PATCH 067/125] Temporary text for toolbar collapse/expand button

---
 www/common/toolbar.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 5f1c2ece5..62aa5dc32 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -459,9 +459,11 @@ MessengerUI, Messages, Pages) {
         return $container;
     };
 
+    Messages.toolbar_collapse = "Collapse toolbar"; // XXX 4.11.0
+    Messages.toolbar_expand = "Expand toolbar"; // XXX 4.11.0
     createCollapse = function (toolbar) {
-        var up = h('i.fa.fa-chevron-up', {title: Messages.ui_collapse});
-        var down = h('i.fa.fa-chevron-down', {title: Messages.ui_expand});
+        var up = h('i.fa.fa-chevron-up', {title: Messages.toolbar_collapse});
+        var down = h('i.fa.fa-chevron-down', {title: Messages.toolbar_expand});
 
         var $button = $(h('button.cp-toolbar-collapse',[
             up,

From 8f3a1bf93eb0a4b5338867a653b27231a7fd7be1 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 3 Sep 2021 12:32:48 +0200
Subject: [PATCH 068/125] Fix forms issues with sections

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

diff --git a/www/form/inner.js b/www/form/inner.js
index 147a9138f..f48ba2b83 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2759,19 +2759,6 @@ define([
         var getFormCreator = function (uid, inSection) {
             if (!APP.isEditor) { return; }
             var full = !uid;
-            var arr = content.order;
-            var idx = content.order.indexOf(uid);
-            if (!full) {
-                if (inSection) {
-                    var section = content.form[uid];
-                    section.opts = section.opts || STATIC_TYPES.section.opts;
-                    arr = section.opts.questions;
-                } else {
-                    var obj = getSectionFromQ(content, uid);
-                    arr = obj.arr;
-                    idx = obj.idx;
-                }
-            }
             var addControl = function (type) {
                 var btn = h('button.btn.btn-secondary', {
                     title: full ? '' : Messages['form_type_'+type],
@@ -2781,20 +2768,36 @@ define([
                     full ? h('span', Messages['form_type_'+type]) : undefined
                 ]);
                 $(btn).click(function () {
-                    var uid = Util.uid();
+                    // Get the array in which we want to create the new block
+                    // and the position in this array
+                    var arr = content.order;
+                    var idx = content.order.indexOf(uid);
+                    if (!full) {
+                        if (inSection) {
+                            var section = content.form[uid];
+                            section.opts = section.opts || STATIC_TYPES.section.opts;
+                            arr = section.opts.questions;
+                        } else {
+                            var obj = getSectionFromQ(content, uid);
+                            arr = obj.arr;
+                            idx = obj.idx;
+                        }
+                    }
+
+                    var _uid = Util.uid();
 
                     // Make sure we can't create a section inside another one
                     if (type === 'section' && arr !== content.order) { return; }
 
-                    content.form[uid] = {
+                    content.form[_uid] = {
                         //q: Messages.form_default,
                         //opts: opts
                         type: type,
                     };
                     if (full || inSection) {
-                        arr.push(uid);
+                        arr.push(_uid);
                     } else {
-                        arr.splice(idx, 0, uid);
+                        arr.splice(idx, 0, _uid);
                     }
                     framework.localChange();
                     updateForm(framework, content, true);
@@ -2843,7 +2846,7 @@ define([
                 var uid = $el.attr('data-id');
                 $el.before(getFormCreator(uid));
             });
-            // Add to section
+            // Add to the end of a section
             $container.find('.cp-form-section-sortable').each(function (i, el) {
                 var $el = $(el);
                 var uid = $el.closest('.cp-form-block').attr('data-id');
@@ -2945,7 +2948,7 @@ define([
                 });
             }
 
-            if (APP.isEditor && blockIdx && type === "section") {
+            if (APP.isEditor && type === "section") {
                 var getConditionsValues = function () {
                     order = getFullOrder(content);
                     var blockIdx = order.indexOf(uid);
@@ -3509,22 +3512,6 @@ define([
         });
         updateAddInline();
 
-        // In view mode, hide sections when conditions aren't met
-        evOnChange.reg(function (reset, save, condition) {
-            if (!reset && !condition) { return; }
-            getSections(content).forEach(function (uid) {
-                var block = content.form[uid];
-                if (block.type !== 'section') { return; }
-                if (!block.opts || !Array.isArray(block.opts.questions) || !block.opts.when) {
-                    return;
-                }
-                var show = checkCondition(block);
-                block.opts.questions.forEach(function (_uid) {
-                    $container.find('.cp-form-block[data-id="'+_uid+'"]').toggle(show);
-                });
-            });
-        });
-
         if (editable) {
             if (APP.mainSortable) { APP.mainSortable.destroy(); }
             APP.mainSortable = Sortable.create($container[0], {
@@ -3549,6 +3536,22 @@ define([
             return;
         }
 
+        // In view mode, hide sections when conditions aren't met
+        evOnChange.reg(function (reset, save, condition) {
+            if (!reset && !condition) { return; }
+            getSections(content).forEach(function (uid) {
+                var block = content.form[uid];
+                if (block.type !== 'section') { return; }
+                if (!block.opts || !Array.isArray(block.opts.questions) || !block.opts.when) {
+                    return;
+                }
+                var show = checkCondition(block);
+                block.opts.questions.forEach(function (_uid) {
+                    $container.find('.cp-form-block[data-id="'+_uid+'"]').toggle(show);
+                });
+            });
+        });
+
         // If the form is already submitted, show an info message
         if (APP.hasAnswered) {
             showAnsweredPage(framework, content, answers);
@@ -3568,24 +3571,22 @@ define([
         $container.append(makeFormControls(framework, content, Boolean(answers), evOnChange));
 
         // In view mode, tell the user if answers are forced to be anonymous or authenticated
-        if (!APP.isEditor) {
-            var infoTxt;
-            var loggedIn = framework._.sfCommon.isLoggedIn();
-            if (content.answers.makeAnonymous) {
-                infoTxt = Messages.form_anonAnswer;
-            } else if (!content.answers.anonymous && loggedIn) {
-                infoTxt = Messages.form_authAnswer;
-            }
-            if (infoTxt) {
-                $container.prepend(h('div.alert.alert-info', infoTxt));
-            }
+        var infoTxt;
+        var loggedIn = framework._.sfCommon.isLoggedIn();
+        if (content.answers.makeAnonymous) {
+            infoTxt = Messages.form_anonAnswer;
+        } else if (!content.answers.anonymous && loggedIn) {
+            infoTxt = Messages.form_authAnswer;
+        }
+        if (infoTxt) {
+            $container.prepend(h('div.alert.alert-info', infoTxt));
+        }
 
-            if (!loggedIn && !content.answers.anonymous) {
-                APP.formBlocks.forEach(function (b) {
-                    if (!b.setEditable) { return; }
-                    b.setEditable(false);
-                });
-            }
+        if (!loggedIn && !content.answers.anonymous) {
+            APP.formBlocks.forEach(function (b) {
+                if (!b.setEditable) { return; }
+                b.setEditable(false);
+            });
         }
 
         // Embed mode is enforced so we add the title at the top and a CryptPad logo

From e3ac524aadcbb318941bfd1b05d712fa4f71ce8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Fri, 3 Sep 2021 11:39:03 +0100
Subject: [PATCH 069/125] Mark temporary text with XXX

---
 www/form/inner.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 07da962c3..61c2b8015 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2972,8 +2972,8 @@ define([
                     }).filter(Boolean);
                     return values;
                 };
-                Messages.form_conditional_add = "Add condition OR";
-                Messages.form_conditional_addAnd = "Add condition AND";
+                Messages.form_conditional_add = "Add condition OR"; // XXX
+                Messages.form_conditional_addAnd = "Add condition AND"; // XXX
                 var addCondition = h('button.btn.btn-secondary', [
                     h('i.fa.fa-plus'),
                     h('span', Messages.form_conditional_add)

From 581988240a8b2bc33f44b0981474d2cc7f202fdd Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 3 Sep 2021 12:43:47 +0200
Subject: [PATCH 070/125] Redirect to submit page when updating responses

---
 www/form/inner.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index f48ba2b83..5689500cc 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2069,7 +2069,7 @@ define([
     };
 
     var renderResults = APP.renderResults = function (content, answers, showUser) {
-        var $container = $('div.cp-form-creator-results').empty();
+        var $container = $('div.cp-form-creator-results').empty().css('display', '');
 
         var answerCount = Object.keys(answers || {}).length;
 
@@ -2286,11 +2286,18 @@ define([
     Messages.form_editAnswer = "Edit my responses"; // XXX
     Messages.form_viewAnswer = "View my responses"; // XXX
     var showAnsweredPage = function (framework, content, answers) {
-        if (APP.submitPage) { return; }
-        APP.submitPage = true;
         var $formContainer = $('div.cp-form-creator-content').hide();
+        var $resContainer = $('div.cp-form-creator-results').hide();
         var $container = $('div.cp-form-creator-answered').empty().css('display', '');
 
+        if (APP.answeredInForm) {
+            $container.hide();
+            $formContainer.css('display', '');
+        } else if (APP.answeredInResponses) {
+            $container.hide();
+            $resContainer.css('display', '');
+        }
+
         var viewOnly = content.answers.cantEdit || APP.isClosed;
         var action = h('button.btn.btn-primary', [
             viewOnly ? h('i.fa.fa-bar-chart') : h('i.fa.fa-pencil'),
@@ -2300,6 +2307,7 @@ define([
         $(action).click(function () {
             $formContainer.css('display', '');
             $container.hide();
+            APP.answeredInForm = true;
             if (viewOnly) {
                 $formContainer.find('.cp-form-send-container .cp-open').hide();
                 if (Array.isArray(APP.formBlocks)) {
@@ -2329,6 +2337,7 @@ define([
             });
             $(responses).click(function () {
                 sframeChan.query("Q_FORM_FETCH_ANSWERS", content.answers, function (err, obj) {
+                    APP.answeredInResponses = true;
                     var answers = obj && obj.results;
                     if (answers) { APP.answers = answers; }
                     $('body').addClass('cp-app-form-results');
@@ -2593,6 +2602,7 @@ define([
                 //UI.alert(Messages.form_sent); // XXX not needed anymore?
                 $send.text(Messages.form_update);
                 APP.hasAnswered = true;
+                APP.answeredInForm = false;
                 showAnsweredPage(framework, content, { '_time': +new Date() });
                 if (content.answers.cantEdit) {
                     $cbox.hide();

From 538122d1b6f9607556c224b80ffd076820fb4613 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 3 Sep 2021 12:51:02 +0200
Subject: [PATCH 071/125] Fix submit/update button showing the wrong text

---
 www/form/inner.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 5689500cc..4ffdf3951 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2485,7 +2485,7 @@ define([
         });
     };
 
-    var makeFormControls = function (framework, content, update, evOnChange) {
+    var makeFormControls = function (framework, content, evOnChange) {
         var loggedIn = framework._.sfCommon.isLoggedIn();
         var metadataMgr = framework._.cpNfInner.metadataMgr;
         var user = metadataMgr.getUserData();
@@ -2547,12 +2547,12 @@ define([
                 $cbox.after(h('div.alert.alert-info', Messages.form_authAnswer));
             });
         }
-        if (update && content.answers.cantEdit || APP.isClosed) {
+        if (APP.hasAnswered && content.answers.cantEdit || APP.isClosed) {
             $cbox.hide();
             anonName = undefined;
         }
 
-        var send = h('button.cp-open.btn.btn-primary', update ? Messages.form_update : Messages.form_submit);
+        var send = h('button.cp-open.btn.btn-primary', APP.hasAnswered ? Messages.form_update : Messages.form_submit);
         var reset = h('button.cp-open.cp-reset-button.btn.btn-danger-alt', Messages.form_reset);
         $(reset).click(function () {
             if (!Array.isArray(APP.formBlocks)) { return; }
@@ -2650,10 +2650,10 @@ define([
                 var $container = $('div.cp-form-creator-content');
                 var $inputs = $container.find('input:invalid');
                 if (!$inputs.length) {
-                    $send.text(update ? Messages.form_update : Messages.form_submit);
+                    $send.text(APP.hasAnswered ? Messages.form_update : Messages.form_submit);
                     return void $invalid.empty();
                 }
-                $send.text(update ? Messages.form_updateWarning : Messages.form_submitWarning);
+                $send.text(APP.hasAnswered ? Messages.form_updateWarning : Messages.form_submitWarning);
                 var lis = [];
                 $inputs.each(function (i, el) {
                     lis.push(gotoQuestion(el));
@@ -3578,7 +3578,7 @@ define([
         }
 
         // In view mode, add "Submit" and "reset" buttons
-        $container.append(makeFormControls(framework, content, Boolean(answers), evOnChange));
+        $container.append(makeFormControls(framework, content, evOnChange));
 
         // In view mode, tell the user if answers are forced to be anonymous or authenticated
         var infoTxt;

From 6680293ef13d3fcaf02c9d1d4426723818a59fa0 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 3 Sep 2021 13:13:58 +0200
Subject: [PATCH 072/125] Update response page

---
 www/form/inner.js | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 4ffdf3951..ecadea17c 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1286,7 +1286,10 @@ define([
                 // results radio
                 var empty = 0;
                 var count = {};
-                var showBars = Boolean(content);
+
+                var opts = form[uid].opts || TYPES.radio.defaultOpts;
+                (opts.values || []).forEach(function (v) { count[v] = 0; });
+
                 Object.keys(answers).forEach(function (author) {
                     var obj = answers[author];
                     var answer = obj.msg[uid];
@@ -1294,6 +1297,7 @@ define([
                     Util.inc(count, answer);
                 });
 
+                var showBars = Boolean(content);
                 var rendered = renderTally(count, empty, showBars);
                 return h('div.cp-form-results-type-radio', rendered);
             },
@@ -1393,6 +1397,7 @@ define([
                 var results = [];
                 var empty = 0;
                 var count = {};
+
                 var showBars = Boolean(content);
                 Object.keys(answers).forEach(function (author) {
                     var obj = answers[author];
@@ -1400,7 +1405,11 @@ define([
                     if (!answer || !Object.keys(answer).length) { return empty++; }
                     //count[answer] = count[answer] || {};
                     Object.keys(answer).forEach(function (q_uid) {
-                        var c = count[q_uid] = count[q_uid] || {};
+                        var c = count[q_uid];
+                        if (!c) {
+                            count[q_uid] = c = {};
+                            (opts.values || []).forEach(function (v) { c[v] = 0; });
+                        }
                         var res = answer[q_uid];
                         if (!res || !res.trim || !res.trim()) { return; }
                         Util.inc(c, res);
@@ -1538,6 +1547,10 @@ define([
                 // results checkbox
                 var empty = 0;
                 var count = {};
+
+                var opts = form[uid].opts || TYPES.checkbox.defaultOpts;
+                (opts.values || []).forEach(function (v) { count[v] = 0; });
+
                 var showBars = Boolean(content);
                 Object.keys(answers).forEach(function (author) {
                     var obj = answers[author];
@@ -1674,7 +1687,11 @@ define([
                     var answer = obj.msg[uid];
                     if (!answer || !Object.keys(answer).length) { return empty++; }
                     Object.keys(answer).forEach(function (q_uid) {
-                        var c = count[q_uid] = count[q_uid] || {};
+                        var c = count[q_uid];
+                        if (!c) {
+                            count[q_uid] = c = {};
+                            (opts.values || []).forEach(function (v) { c[v] = 0; });
+                        }
                         var res = answer[q_uid];
                         if (res && typeof(res) === "string") { res = [res]; }
                         if (!Array.isArray(res) || !res.length) { return; }
@@ -1837,6 +1854,7 @@ define([
                 //var results = [];
                 var empty = 0;
                 var count = {};
+                (opts.values || []).forEach(function (v) { count[v] = 0; });
                 var showBars = Boolean(content);
                 Object.keys(answers).forEach(function (author) {
                     var obj = answers[author];

From 9770d034790b92e8a6d7a2933365dfdd48ce21be Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 3 Sep 2021 13:22:15 +0200
Subject: [PATCH 073/125] Disable 'sortable' when editing poll time options

---
 www/form/app-form.less |  6 ++++++
 www/form/inner.js      | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 031411800..d16aa9ce2 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -600,6 +600,12 @@
                     }
                 }
                 .cp-form-edit-block {
+                    &.cp-no-sortable {
+                        .cp-form-handle {
+                            visibility: hidden;
+                            cursor: default;
+                        }
+                    }
                     button.btn-secondary {
                         margin-left: 30px;
                         margin-bottom: 5px;
diff --git a/www/form/inner.js b/www/form/inner.js
index ecadea17c..e3a2021b5 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -374,11 +374,16 @@ define([
         var container = h('div.cp-form-edit-block', inputs);
         var $container = $(container);
 
-        Sortable.create(container, {
+        var sortableOption = Sortable.create(container, {
             direction: "vertical",
             handle: ".cp-form-handle",
             draggable: ".cp-form-edit-block-input",
             forceFallback: true,
+            store: {
+                set: function () {
+                    evOnSave.fire();
+                }
+            }
         });
 
         var containerItems;
@@ -393,6 +398,11 @@ define([
                 handle: ".cp-form-handle",
                 draggable: ".cp-form-edit-block-input",
                 forceFallback: true,
+                store: {
+                    set: function () {
+                        evOnSave.fire();
+                    }
+                }
             });
         }
 
@@ -456,6 +466,8 @@ define([
         var refreshView = function () {
             if (!v.type) { return; }
             var $calendar = $(calendarView);
+            sortableOption.option("disabled", v.type !== "text");
+            $container.toggleClass('cp-no-sortable', v.type !== "text");
             if (v.type !== "day") {
                 $calendar.hide();
                 $container.show();

From 43d43bdcd6e742667bc3626657bafe45f76132a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Fri, 3 Sep 2021 13:47:22 +0100
Subject: [PATCH 074/125] Clean up translations for required questions

---
 temp.md           |  0
 www/form/inner.js | 11 ++++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 temp.md

diff --git a/temp.md b/temp.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/www/form/inner.js b/www/form/inner.js
index c30bc99d1..fdbe2bc54 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2932,10 +2932,14 @@ define([
                 return;
             }
 
-            Messages.form_required = "Required"; // XXX
+            // XXX
+            Messages.form_required_answer = "Answer: ";
+            Messages.form_required_on = "Required";
+            Messages.form_required_off = "Optional";
+
             var requiredTag;
             if (block.opts && block.opts.required) {
-                requiredTag = h('span.cp-form-required-tag', Messages.form_required);
+                requiredTag = h('span.cp-form-required-tag', Messages.form_required_on);
             }
 
             var dragHandle;
@@ -2954,9 +2958,6 @@ define([
             Messages.form_preview = "Preview:"; // XXX
             var previewDiv = h('div.cp-form-preview', Messages.form_preview);
 
-            Messages.form_required_answer = "Answer: ";
-            Messages.form_required_on = "required";
-            Messages.form_required_off = "optional";
             // Required radio displayed only for types that have an "isEmpty" function
             var requiredDiv, conditionalDiv;
             if (APP.isEditor && !isStatic && data.isEmpty) {

From a2ad37a8ad15d2440d64f24edc66547040c1dd90 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 3 Sep 2021 19:59:32 +0530
Subject: [PATCH 075/125] stop supporting IE

1. stop polyfilling promises
2. use named defines for chainpad-listmap and its dependencies while we're at it

use 'bower update' for things to work
---
 bower.json                       | 2 +-
 customize.dist/login.js          | 2 +-
 www/common/cryptget.js           | 4 ++--
 www/common/cryptpad-common.js    | 2 +-
 www/common/outer/async-store.js  | 6 +++---
 www/common/outer/calendar.js     | 2 +-
 www/common/outer/mailbox.js      | 2 +-
 www/common/outer/profile.js      | 2 +-
 www/common/outer/roster.js       | 2 +-
 www/common/outer/sharedfolder.js | 2 +-
 www/common/outer/team.js         | 4 ++--
 www/common/requireconfig.js      | 3 +++
 www/poll/inner.js                | 2 +-
 www/profile/inner.js             | 2 +-
 www/todo/inner.js                | 2 +-
 15 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/bower.json b/bower.json
index efa70c1bb..81acde661 100644
--- a/bower.json
+++ b/bower.json
@@ -30,7 +30,7 @@
     "secure-fabric.js": "secure-v1.7.9",
     "hyperjson": "~1.4.0",
     "chainpad-crypto": "^0.2.0",
-    "chainpad-listmap": "^0.10.0",
+    "chainpad-listmap": "^1.0.0",
     "chainpad": "^5.2.0",
     "file-saver": "1.3.1",
     "alertifyjs": "1.0.11",
diff --git a/customize.dist/login.js b/customize.dist/login.js
index 5cab49934..1ba0eb470 100644
--- a/customize.dist/login.js
+++ b/customize.dist/login.js
@@ -1,6 +1,6 @@
 define([
     'jquery',
-    '/bower_components/chainpad-listmap/chainpad-listmap.js',
+    'chainpad-listmap',
     '/bower_components/chainpad-crypto/crypto.js',
     '/common/common-util.js',
     '/common/outer/network-config.js',
diff --git a/www/common/cryptget.js b/www/common/cryptget.js
index a1d0eef92..c4c17eb70 100644
--- a/www/common/cryptget.js
+++ b/www/common/cryptget.js
@@ -1,7 +1,7 @@
 define([
     '/bower_components/chainpad-crypto/crypto.js',
-    '/bower_components/chainpad-netflux/chainpad-netflux.js',
-    '/bower_components/netflux-websocket/netflux-client.js',
+    'chainpad-netflux',
+    'netflux-client',
     '/common/common-util.js',
     '/common/common-hash.js',
     '/common/common-realtime.js',
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 15234c35e..65839290e 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -161,7 +161,7 @@ define([
 
     common.makeNetwork = function (cb) {
         require([
-            '/bower_components/netflux-websocket/netflux-client.js',
+            'netflux-client',
             '/common/outer/network-config.js'
         ], function (Netflux, NetConfig) {
             var wsUrl = NetConfig.getWebsocketURL();
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 130926e6a..cd8887a15 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -26,9 +26,9 @@ define([
 
     '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/chainpad/chainpad.dist.js',
-    '/bower_components/chainpad-netflux/chainpad-netflux.js',
-    '/bower_components/chainpad-listmap/chainpad-listmap.js',
-    '/bower_components/netflux-websocket/netflux-client.js',
+    'chainpad-netflux',
+    'chainpad-listmap',
+    'netflux-client',
     '/bower_components/nthen/index.js',
     '/bower_components/saferphore/index.js',
 ], function (ApiConfig, Sortify, UserObject, ProxyManager, Migrate, Hash, Util, Constants, Feedback,
diff --git a/www/common/outer/calendar.js b/www/common/outer/calendar.js
index bea22db6b..a0b990e89 100644
--- a/www/common/outer/calendar.js
+++ b/www/common/outer/calendar.js
@@ -6,7 +6,7 @@ define([
     '/common/outer/cache-store.js',
     '/customize/messages.js',
     '/bower_components/nthen/index.js',
-    '/bower_components/chainpad-listmap/chainpad-listmap.js',
+    'chainpad-listmap',
     '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/chainpad/chainpad.dist.js',
 ], function (Util, Hash, Constants, Realtime, Cache, Messages, nThen, Listmap, Crypto, ChainPad) {
diff --git a/www/common/outer/mailbox.js b/www/common/outer/mailbox.js
index a7269c6e5..dbe95e84d 100644
--- a/www/common/outer/mailbox.js
+++ b/www/common/outer/mailbox.js
@@ -7,7 +7,7 @@ define([
     '/common/common-messaging.js',
     '/common/notify.js',
     '/common/outer/mailbox-handlers.js',
-    '/bower_components/chainpad-netflux/chainpad-netflux.js',
+    'chainpad-netflux',
     '/bower_components/chainpad-crypto/crypto.js',
 ], function (Config, BCast, Util, Hash, Realtime, Messaging, Notify, Handlers, CpNetflux, Crypto) {
     var Mailbox = {};
diff --git a/www/common/outer/profile.js b/www/common/outer/profile.js
index 733b2b4c4..7cba963c7 100644
--- a/www/common/outer/profile.js
+++ b/www/common/outer/profile.js
@@ -3,7 +3,7 @@ define([
     '/common/common-hash.js',
     '/common/common-constants.js',
     '/common/common-realtime.js',
-    '/bower_components/chainpad-listmap/chainpad-listmap.js',
+    'chainpad-listmap',
     '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/chainpad/chainpad.dist.js',
 ], function (Util, Hash, Constants, Realtime, Listmap, Crypto, ChainPad) {
diff --git a/www/common/outer/roster.js b/www/common/outer/roster.js
index e395891b7..6aa80e5d8 100644
--- a/www/common/outer/roster.js
+++ b/www/common/outer/roster.js
@@ -918,7 +918,7 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto, Feedback)
         define([
             '/common/common-util.js',
             '/common/common-hash.js',
-            '/bower_components/chainpad-netflux/chainpad-netflux.js',
+            'chainpad-netflux',
             'json.sortify',
             '/bower_components/nthen/index.js',
             '/bower_components/chainpad-crypto/crypto.js',
diff --git a/www/common/outer/sharedfolder.js b/www/common/outer/sharedfolder.js
index 6735330b4..4579492ba 100644
--- a/www/common/outer/sharedfolder.js
+++ b/www/common/outer/sharedfolder.js
@@ -6,7 +6,7 @@ define([
 
     '/bower_components/nthen/index.js',
     '/bower_components/chainpad-crypto/crypto.js',
-    '/bower_components/chainpad-listmap/chainpad-listmap.js',
+    'chainpad-listmap',
     '/bower_components/chainpad/chainpad.dist.js',
 ], function (Hash, Util, UserObject, Cache,
              nThen, Crypto, Listmap, ChainPad) {
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 94f91c807..32ce35f3b 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -14,9 +14,9 @@ define([
     '/common/cryptget.js',
     '/common/outer/cache-store.js',
 
-    '/bower_components/chainpad-listmap/chainpad-listmap.js',
+    'chainpad-listmap',
     '/bower_components/chainpad-crypto/crypto.js',
-    '/bower_components/chainpad-netflux/chainpad-netflux.js',
+    'chainpad-netflux',
     '/bower_components/chainpad/chainpad.dist.js',
     '/bower_components/nthen/index.js',
     '/bower_components/saferphore/index.js',
diff --git a/www/common/requireconfig.js b/www/common/requireconfig.js
index 4e3baf857..7ed772575 100644
--- a/www/common/requireconfig.js
+++ b/www/common/requireconfig.js
@@ -16,6 +16,9 @@ define([
             cm: '/bower_components/codemirror',
             'tui-code-snippet': '/lib/calendar/tui-code-snippet.min',
             'tui-date-picker': '/lib/calendar/date-picker',
+            'netflux-client': '/bower_components/netflux-websocket/netflux-client',
+            'chainpad-netflux': '/bower_components/chainpad-netflux/chainpad-netflux',
+            'chainpad-listmap': '/bower_components/chainpad-listmap/chainpad-listmap',
         },
         map: {
             '*': {
diff --git a/www/poll/inner.js b/www/poll/inner.js
index 53faea7e9..a70ddf648 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -7,7 +7,7 @@ define([
     '/common/sframe-common.js',
     '/common/common-realtime.js',
     '/customize/application_config.js',
-    '/bower_components/chainpad-listmap/chainpad-listmap.js',
+    'chainpad-listmap',
     '/poll/render.js',
     '/poll/export.js',
     '/common/diffMarked.js',
diff --git a/www/profile/inner.js b/www/profile/inner.js
index 284b19114..edf5ce01e 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -1,7 +1,7 @@
 define([
     'jquery',
     '/bower_components/chainpad-crypto/crypto.js',
-    '/bower_components/chainpad-listmap/chainpad-listmap.js',
+    'chainpad-listmap',
     '/common/toolbar.js',
     '/bower_components/nthen/index.js',
     '/common/sframe-common.js',
diff --git a/www/todo/inner.js b/www/todo/inner.js
index 2b69077f3..39cbbf588 100644
--- a/www/todo/inner.js
+++ b/www/todo/inner.js
@@ -1,7 +1,7 @@
 define([
     'jquery',
     '/bower_components/chainpad-crypto/crypto.js',
-    '/bower_components/chainpad-listmap/chainpad-listmap.js',
+    'chainpad-listmap',
     '/common/toolbar.js',
     '/bower_components/nthen/index.js',
     '/common/sframe-common.js',

From ec50d9dc6f47ed750c40c4d1c64efd9ddd393d46 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 3 Sep 2021 17:26:05 +0200
Subject: [PATCH 076/125] Improve condition creation in forms

---
 www/common/common-ui-elements.js |   6 +-
 www/form/inner.js                | 995 +++++++++++++++++--------------
 2 files changed, 548 insertions(+), 453 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index ac24b1ab9..ccd7f139a 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1579,10 +1579,14 @@ define([
                 }, 1000);
             });
 
-            $container.setValue = function (val, name) {
+            $container.setValue = function (val, name, sync) {
                 value = val;
                 var $val = $innerblock.find('[data-value="'+val+'"]');
                 var textValue = name || $val.html() || val;
+                if (sync) {
+                    $button.find('.cp-dropdown-button-title').html(textValue);
+                    return;
+                }
                 setTimeout(function () {
                     $button.find('.cp-dropdown-button-title').html(textValue);
                 });
diff --git a/www/form/inner.js b/www/form/inner.js
index c30bc99d1..9498b3379 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -880,6 +880,21 @@ define([
         return res;
     };
 
+    var getFullOrder = function (content) {
+        var order = content.order.slice();
+        getSections(content).forEach(function (uid) {
+            var block = content.form[uid];
+            if (!block.opts || !Array.isArray(block.opts.questions)) { return; }
+            var idx = order.indexOf(uid);
+            if (idx === -1) { return; }
+            idx++;
+            block.opts.questions.forEach(function (el, i) {
+                order.splice(idx+i, 0, el);
+            });
+        });
+        return order;
+    };
+
     var getBlockAnswers = function (answers, uid, filterCurve) {
         if (!answers) { return; }
         return Object.keys(answers || {}).map(function (user) {
@@ -1020,43 +1035,387 @@ define([
             defaultOpts: {
                 questions: []
             },
-            get: function (opts, a, n, ev, block) {
+            get: function (opts, a, n, ev, data) {
                 var sortable = h('div.cp-form-section-sortable');
                 var tag = h('div.cp-form-section-edit', [
                     sortable
                 ]);
-                if (APP.isEditor) {
-                    if (!opts) { opts = block.opts = STATIC_TYPES.section.defaultOpts; }
-                    Sortable.create(sortable, {
-                        group: {
-                            name: 'nested',
-                            put: function (to, from, el) {
-                                // Make sure sections dan't be dropped into other sections
-                                return $(el).attr('data-type') !== 'section';
+                if (!APP.isEditor) {
+                    return {
+                        tag: tag,
+                        noViewMode: true
+                    };
+                }
+
+                var block = data.block;
+                if (!opts) { opts = block.opts = STATIC_TYPES.section.defaultOpts; }
+                var content = data.content;
+                var uid = data.uid;
+                var form = content.form;
+                var framework = APP.framework;
+                var tmp = data.tmp;
+
+                var getConditionsValues = function () {
+                    var order = getFullOrder(content);
+                    var blockIdx = order.indexOf(uid);
+                    var blocks = order.slice(0, blockIdx); // Get all previous questions
+                    var values = blocks.map(function(uid) {
+                        var block = form[uid];
+                        var type = block.type;
+                        if (['radio', 'checkbox'].indexOf(type) === -1) { return; }
+                        var obj = {
+                            uid: uid,
+                            type: type,
+                            q: block.q || Messages.form_default
+                        };
+                        if (type === 'radio') {
+                            obj.values = block.opts ? block.opts.values
+                                                    : TYPES.radio.defaultOpts.values;
+                        }
+                        if (type === 'checkbox') {
+                            obj.values = block.opts ? block.opts.values
+                                                    : TYPES.checkbox.defaultOpts.values;
+                        }
+                        return obj;
+                    }).filter(Boolean);
+                    return values;
+                };
+                Messages.form_conditional_add = "Add condition OR"; // XXX
+                Messages.form_conditional_addAnd = "Add condition AND"; // XXX
+                var addCondition = h('button.btn.btn-secondary', [
+                    h('i.fa.fa-plus'),
+                    h('span', Messages.form_conditional_add)
+                ]);
+                var $addC = $(addCondition);
+                var getConditions;
+                var getAddAndButton = function ($container, rules) {
+                    var btn = h('button.btn.btn-secondary.cp-form-add-and', [
+                        h('i.fa.fa-plus'),
+                        h('span', Messages.form_conditional_addAnd)
+                    ]);
+                    var $b = $(btn).click(function () {
+                        getConditions($container, true, rules, undefined, $b);
+                    });
+                    $container.append(btn);
+                    return $b;
+                };
+                getConditions = function ($container, isNew, rules, condition, $btn) {
+                    Messages.form_condition_q = "Choose a question"; // XXX
+                    Messages.form_condition_v = "Choose a value"; // XXX
+
+                    condition = condition || {};
+                    condition.uid = condition.uid || Util.uid();
+
+                    var content = h('div.cp-form-condition', {
+                        'data-uid': condition.uid,
+                    });
+                    var $content = $(content);
+
+                    var qSelect, iSelect, vSelect;
+                    var onChange = function (resetV) {
+                        var w = block.opts.when = block.opts.when || [];
+
+                        if (qSelect) { condition.q = qSelect.getValue(); }
+                        if (iSelect) { condition.is = Number(iSelect.getValue()); }
+                        if (resetV) { delete condition.v; }
+                        else if (vSelect) { condition.v = vSelect.getValue(); }
+
+                        if (isNew) {
+                            if (!Array.isArray(rules)) { // new set of rules (OR)
+                                rules = [condition];
+                                w.push(rules);
+                                $btn = getAddAndButton($container, rules);
+                            } else {
+                                rules.push(condition);
                             }
+                            isNew = false;
+                        }
+
+                        framework.localChange();
+                    };
+
+                    onChange();
+
+                    var values = getConditionsValues();
+                    var qOptions = values.map(function (obj) {
+                        return {
+                            tag: 'a',
+                            attributes: {
+                                'class': 'cp-form-condition-question',
+                                'data-value': obj.uid,
+                                'href': '#',
+                            },
+                            content: obj.q
+                        };
+                    });
+                    var qConfig = {
+                        text: Messages.form_condition_q, // Button initial text
+                        options: qOptions, // Entries displayed in the menu
+                        isSelect: true,
+                        caretDown: true,
+                        buttonCls: 'btn btn-secondary'
+                    };
+                    qSelect = UIElements.createDropdown(qConfig);
+                    qSelect[0].dropdown = qSelect;
+                    $(qSelect).attr('data-drop', 'q');
+                    Messages.form_condition_is = 'is'; // XXX
+                    Messages.form_condition_isnot = 'is not'; // XXX
+                    Messages.form_condition_has = 'has'; // XXX
+                    Messages.form_condition_hasnot = 'has not'; // XXX
+
+                    var isOn = !condition || condition.is !== 0;
+                    var iOptions = [{
+                        tag: 'a',
+                        attributes: {
+                            'data-value': 1,
+                            'href': '#',
                         },
-                        direction: "vertical",
-                        filter: "input, button, .CodeMirror, .cp-form-type-sort, .cp-form-block-type.editable",
-                        preventOnFilter: false,
-                        draggable: ".cp-form-block",
-                        //forceFallback: true,
-                        fallbackTolerance: 5,
-                        onStart: function () {
-                            var $container = $('div.cp-form-creator-content');
-                            $container.find('.cp-form-creator-add-inline').remove();
+                        content: Messages.form_condition_is
+                    }, {
+                        tag: 'a',
+                        attributes: {
+                            'data-value': 0,
+                            'href': '#',
                         },
-                        store: {
-                            set: function (s) {
-                                opts.questions = s.toArray();
-                                setTimeout(APP.framework.localChange);
-                                if (APP.updateAddInline) { APP.updateAddInline(); }
+                        content: Messages.form_condition_isnot
+                    }];
+                    var iConfig = {
+                        options: iOptions, // Entries displayed in the menu
+                        isSelect: true,
+                        caretDown: true,
+                        buttonCls: 'btn btn-default'
+                    };
+                    iSelect = UIElements.createDropdown(iConfig);
+                    iSelect[0].dropdown = iSelect;
+                    iSelect.setValue(isOn ? 1 : 0, undefined, true);
+                    $(iSelect).attr('data-drop', 'i').hide();
+                    iSelect.onChange.reg(function () { onChange(); });
+
+                    var remove = h('button.btn.btn-danger-alt.cp-condition-remove', [
+                        h('i.fa.fa-times.nomargin')
+                    ]);
+                    $(remove).on('click', function () {
+                        var w = block.opts.when = block.opts.when || [];
+                        var deleteRule = false;
+                        if (rules.length === 1) {
+                            var rIdx = w.indexOf(rules);
+                            w.splice(rIdx, 1);
+                            deleteRule = true;
+                        } else {
+                            var idx = rules.indexOf(condition);
+                            rules.splice(idx, 1);
+                        }
+                        framework.localChange();
+                        framework._.cpNfInner.chainpad.onSettle(function () {
+                            if (deleteRule) {
+                                $content.closest('.cp-form-condition-rule').remove();
+                                return;
                             }
+                            $content.remove();
+                        });
+                    });
+
+                    $content.append(qSelect).append(iSelect).append(remove);
+                    if ($container.find('button.cp-form-add-and').length) {
+                        $container.find('button.cp-form-add-and').before($content);
+                    } else {
+                        $container.append($content);
+                    }
+
+                    var isChange;
+                    qSelect.onChange.reg(function (prettyVal, val, init) {
+                        qSelect.find('button').removeClass('btn-secondary')
+                            .addClass('btn-default');
+                        onChange(!init);
+                        $(iSelect).show();
+                        var res, type;
+                        values.some(function (obj) {
+                            if (String(obj.uid) === String(val)) {
+                                res = obj.values;
+                                type = obj.type;
+                                return true;
+                            }
+                        });
+
+                        var $selDiv = $(iSelect);
+                        if (type === 'checkbox') {
+                            $selDiv.find('[data-value="0"]').text(Messages.form_condition_hasnot);
+                            $selDiv.find('[data-value="1"]').text(Messages.form_condition_has);
+                        } else {
+                            $selDiv.find('[data-value="0"]').text(Messages.form_condition_isnot);
+                            $selDiv.find('[data-value="1"]').text(Messages.form_condition_is);
+                        }
+                        iSelect.setValue(iSelect.getValue(), undefined, true);
+
+                        $content.find('.cp-form-condition-values').remove();
+                        if (!res) { return; }
+                        var vOptions = res.map(function (str) {
+                            return {
+                                tag: 'a',
+                                attributes: {
+                                    'class': 'cp-form-condition-value',
+                                    'data-value': str,
+                                    'href': '#',
+                                },
+                                content: str
+                            };
+                        });
+                        var vConfig = {
+                            text: Messages.form_condition_v, // Button initial text
+                            options: vOptions, // Entries displayed in the menu
+                            //left: true, // Open to the left of the button
+                            //container: $(type),
+                            isSelect: true,
+                            caretDown: true,
+                            buttonCls: 'btn btn-secondary'
+                        };
+                        vSelect = UIElements.createDropdown(vConfig);
+                        vSelect[0].dropdown = vSelect;
+                        vSelect.addClass('cp-form-condition-values').attr('data-drop', 'v');
+                        $content.append(vSelect).append(remove);
+
+                        vSelect.onChange.reg(function () {
+                            vSelect.find('button').removeClass('btn-secondary')
+                                .addClass('btn-default');
+                            $(remove).off('click').click(function () {
+                                var w = block.opts.when = block.opts.when || [];
+                                var deleteRule = false;
+                                if (rules.length === 1) {
+                                    var rIdx = w.indexOf(rules);
+                                    w.splice(rIdx, 1);
+                                    deleteRule = true;
+                                } else {
+                                    var idx = rules.indexOf(condition);
+                                    rules.splice(idx, 1);
+                                }
+                                framework.localChange();
+                                framework._.cpNfInner.chainpad.onSettle(function () {
+                                    if (deleteRule) {
+                                        $content.closest('.cp-form-condition-rule').remove();
+                                        return;
+                                    }
+                                    $content.remove();
+                                });
+                            }).appendTo($content);
+                            onChange();
+                        });
+
+                        if (condition && condition.v && init) {
+                            vSelect.setValue(condition.v, undefined, true);
+                            vSelect.onChange.fire(condition.v, condition.v);
+                        }
+
+                        if (!tmp || tmp.uid !== condition.uid) { return; }
+                        if (tmp.type === 'v') {
+                            vSelect.click();
+                        }
+                    });
+                    if (condition && condition.q) {
+                        qSelect.setValue(condition.q, undefined, true);
+                        qSelect.onChange.fire(condition.q, condition.q, true);
+                    }
+
+                    if (!tmp || tmp.uid !== condition.uid) { return; }
+
+                    if (tmp.type === 'q') { qSelect.click(); }
+                    else if (tmp.type === 'i') { iSelect.click(); }
+                };
+                Messages.form_conditional = "Only show this section when:"; // XXX
+
+                var conditionalDiv = h('div.cp-form-conditional', [
+                    h('div.cp-form-conditional-hint', Messages.form_conditional),
+                    addCondition
+                ]);
+                var $condition = $(conditionalDiv).prependTo(tag);
+                var redraw = function () {
+                    var w = block.opts.when = block.opts.when || [];
+                    w.forEach(function (rules) {
+                        var rulesC = h('div.cp-form-condition-rule');
+                        var $rulesC = $(rulesC);
+                        var $b = getAddAndButton($rulesC, rules);
+                        rules.forEach(function (obj) {
+                            getConditions($rulesC, false, rules, obj, $b);
+                        });
+                        $addC.before($rulesC); // XXX
+                    });
+                };
+                redraw();
+
+                $addC.click(function () {
+                    var rulesC = h('div.cp-form-condition-rule');
+                    var $rulesC = $(rulesC);
+                    getConditions($rulesC, true);
+                    $addC.before($rulesC);
+                });
+                if (getConditionsValues().length) {
+                    $condition.show();
+                } else {
+                    $condition.hide();
+                }
+                // XXX unreg these 2 events
+                evShowConditions.reg(function () {
+                    if (getConditionsValues().length) {
+                        $condition.show();
+                    } else {
+                        $condition.hide();
+                    }
+                });
+                evCheckConditions.reg(function (_uid) {
+                    if (uid !== _uid) { return; }
+                    // If our conditions are invalid, redraw them
+                    if (getConditionsValues().length) {
+                        $condition.show();
+                    } else {
+                        $condition.hide();
+                    }
+                    $condition.find('.cp-form-condition-rule').remove();
+                    redraw();
+                });
+
+                var cursorGetter = function () {
+                    var $activeDrop = $condition.find('.cp-dropdown-content:visible').first();
+                    if (!$activeDrop.length) { return; }
+                    var uid = $activeDrop.closest('.cp-form-condition').attr('data-uid');
+                    var type = $activeDrop.closest('.cp-dropdown-container').attr('data-drop');
+                    var $btn = $activeDrop.closest('.cp-dropdown-container').find('button');
+                    var y = $btn && $btn.length && $btn[0].getBoundingClientRect().y;
+                    return {
+                        uid: uid,
+                        type: type,
+                        y: y
+                    };
+                };
+
+                Sortable.create(sortable, {
+                    group: {
+                        name: 'nested',
+                        put: function (to, from, el) {
+                            // Make sure sections dan't be dropped into other sections
+                            return $(el).attr('data-type') !== 'section';
                         }
-                    });
-                }
+                    },
+                    direction: "vertical",
+                    filter: "input, button, .CodeMirror, .cp-form-type-sort, .cp-form-block-type.editable",
+                    preventOnFilter: false,
+                    draggable: ".cp-form-block",
+                    //forceFallback: true,
+                    fallbackTolerance: 5,
+                    onStart: function () {
+                        var $container = $('div.cp-form-creator-content');
+                        $container.find('.cp-form-creator-add-inline').remove();
+                    },
+                    store: {
+                        set: function (s) {
+                            opts.questions = s.toArray();
+                            setTimeout(APP.framework.localChange);
+                            if (APP.updateAddInline) { APP.updateAddInline(); }
+                        }
+                    }
+                });
                 return {
                     tag: tag,
-                    noViewMode: true
+                    noViewMode: true,
+                    getCursor: cursorGetter,
                 };
             },
             printResults: function () { return; },
@@ -2460,20 +2819,6 @@ define([
             });
         }
     };
-    var getFullOrder = function (content) {
-        var order = content.order.slice();
-        getSections(content).forEach(function (uid) {
-            var block = content.form[uid];
-            if (!block.opts || !Array.isArray(block.opts.questions)) { return; }
-            var idx = order.indexOf(uid);
-            if (idx === -1) { return; }
-            idx++;
-            block.opts.questions.forEach(function (el, i) {
-                order.splice(idx+i, 0, el);
-            });
-        });
-        return order;
-    };
 
     var checkResults = {};
     var checkCondition = function (block) {
@@ -2857,428 +3202,147 @@ define([
             if (!full) {
                 add = h('button.btn.cp-form-creator-inline-add', {
                     title: Messages.tag_add
-                }, [
-                    h('i.fa.fa-plus.add-open'),
-                    h('i.fa.fa-times.add-close')
-                ]);
-                var $b = $(buttons).hide();
-                $(add).click(function () {
-                    $b.toggle();
-                    $(add).toggleClass('displayed');
-                });
-            }
-            else {
-                $(add).append(h('span', Messages.tag_add));
-            }
-
-            var inlineCls = full ? '-full' : '-inline';
-            return h('div.cp-form-creator-add'+inlineCls, [
-                add,
-                buttons
-            ]);
-
-        };
-
-        var updateAddInline = APP.updateAddInline = function () {
-            $container.find('.cp-form-creator-add-inline').remove();
-            // Add before existing question
-            $container.find('.cp-form-block').each(function (i, el) {
-                var $el = $(el);
-                var uid = $el.attr('data-id');
-                $el.before(getFormCreator(uid));
-            });
-            // Add to the end of a section
-            $container.find('.cp-form-section-sortable').each(function (i, el) {
-                var $el = $(el);
-                var uid = $el.closest('.cp-form-block').attr('data-id');
-                $el.append(getFormCreator(uid, true));
-            });
-        };
-
-
-        var elements = [];
-        var n = 1; // Question number
-
-        var order = getFullOrder(content);
-
-        order.forEach(function (uid, blockIdx) {
-            var block = form[uid];
-            var type = block.type;
-            var model = TYPES[type] || STATIC_TYPES[type];
-            var isStatic = Boolean(STATIC_TYPES[type]);
-            if (!model) { return; }
-
-            var _answers, name;
-            if (type === 'poll') {
-                var metadataMgr = framework._.cpNfInner.metadataMgr;
-                var user = metadataMgr.getUserData();
-                // If we are a participant, our results shouldn't be in the table but in the
-                // editable part: remove them from _answers
-                _answers = getBlockAnswers(APP.answers, uid, !editable && user.curvePublic);
-                name = user.name;
-            }
-
-            var data = model.get(block.opts, _answers, name, evOnChange, block);
-            if (!data) { return; }
-            data.uid = uid;
-            if (answers && answers[uid] && data.setValue) { data.setValue(answers[uid]); }
-
-            if (data.pageBreak && !editable) {
-                elements.push(data);
-                return;
-            }
-            if (data.noViewMode && !editable) {
-                elements.push(data);
-                return;
-            }
-
-            Messages.form_required = "Required"; // XXX
-            var requiredTag;
-            if (block.opts && block.opts.required) {
-                requiredTag = h('span.cp-form-required-tag', Messages.form_required);
-            }
-
-            var dragHandle;
-            var q = h('div.cp-form-block-question', [
-                h('span.cp-form-block-question-number', (n++)+'.'),
-                h('span.cp-form-block-question-text', block.q || Messages.form_default),
-                requiredTag
-            ]);
-            // Static blocks don't have questions ("q" is not used) so we can decrement n
-            if (isStatic) { n--; }
-
-            var editButtons, editContainer;
-
-            APP.formBlocks.push(data);
-
-            Messages.form_preview = "Preview:"; // XXX
-            var previewDiv = h('div.cp-form-preview', Messages.form_preview);
-
-            Messages.form_required_answer = "Answer: ";
-            Messages.form_required_on = "required";
-            Messages.form_required_off = "optional";
-            // Required radio displayed only for types that have an "isEmpty" function
-            var requiredDiv, conditionalDiv;
-            if (APP.isEditor && !isStatic && data.isEmpty) {
-                if (!block.opts) { block.opts = TYPES[type].defaultOpts; }
-                var isRequired = Boolean(block.opts.required);
-                var radioOn = UI.createRadio('cp-form-required-'+uid, 'cp-form-required-on',
-                        Messages.form_required_on, isRequired, {
-                            input: { value: 1 },
-                        });
-                var radioOff = UI.createRadio('cp-form-required-'+uid, 'cp-form-required-off',
-                        Messages.form_required_off, !isRequired, {
-                            input: { value: 0 },
-                        });
-                var radioContainer = h('div.cp-form-required-radio', [
-                    h('span', Messages.form_required_answer),
-                    radioOff,
-                    radioOn
-                ]);
-                requiredDiv = h('div.cp-form-required', [
-                    radioContainer
-                ]);
-                $(radioContainer).find('input[type="radio"]').on('change', function() {
-                    var val = $('input:radio[name="cp-form-required-'+uid+'"]:checked').val();
-                    val = Number(val) || 0;
-                    block.opts.required = Boolean(val);
-                    framework.localChange();
-                    framework._.cpNfInner.chainpad.onSettle(function () {
-                        UI.log(Messages.saved);
-                    });
-                });
-            }
-
-            if (APP.isEditor && type === "section") {
-                var getConditionsValues = function () {
-                    order = getFullOrder(content);
-                    var blockIdx = order.indexOf(uid);
-                    var blocks = order.slice(0, blockIdx); // Get all previous questions
-                    var values = blocks.map(function(uid) {
-                        var block = form[uid];
-                        var type = block.type;
-                        if (['radio', 'checkbox'].indexOf(type) === -1) { return; }
-                        var obj = {
-                            uid: uid,
-                            type: type,
-                            q: block.q || Messages.form_default
-                        };
-                        if (type === 'radio') {
-                            obj.values = block.opts ? block.opts.values
-                                                    : TYPES.radio.defaultOpts.values;
-                        }
-                        if (type === 'checkbox') {
-                            obj.values = block.opts ? block.opts.values
-                                                    : TYPES.checkbox.defaultOpts.values;
-                        }
-                        return obj;
-                    }).filter(Boolean);
-                    return values;
-                };
-                Messages.form_conditional_add = "Add condition OR"; // XXX
-                Messages.form_conditional_addAnd = "Add condition AND"; // XXX
-                var addCondition = h('button.btn.btn-secondary', [
-                    h('i.fa.fa-plus'),
-                    h('span', Messages.form_conditional_add)
-                ]);
-                var $addC = $(addCondition);
-                var getConditions;
-                var getAddAndButton = function ($container, rules) {
-                    var btn = h('button.btn.btn-secondary.cp-form-add-and', [
-                        h('i.fa.fa-plus'),
-                        h('span', Messages.form_conditional_addAnd)
-                    ]);
-                    $(btn).click(function () {
-                        getConditions($container, true, rules);
-                    });
-                    $container.append(btn);
-                };
-                getConditions = function ($container, isNew, rules, condition) {
-                    Messages.form_condition_q = "Choose a question"; // XXX
-                    Messages.form_condition_v = "Choose a value"; // XXX
-
-                    var content = h('div.cp-form-condition');
-                    var $content = $(content);
-                    var values = getConditionsValues();
-                    var qOptions = values.map(function (obj) {
-                        return {
-                            tag: 'a',
-                            attributes: {
-                                'class': 'cp-form-condition-question',
-                                'data-value': obj.uid,
-                                'href': '#',
-                            },
-                            content: obj.q
-                        };
-                    });
-                    var qConfig = {
-                        text: Messages.form_condition_q, // Button initial text
-                        options: qOptions, // Entries displayed in the menu
-                        isSelect: true,
-                        caretDown: true,
-                        buttonCls: 'btn btn-default'
-                    };
-                    var qSelect = UIElements.createDropdown(qConfig);
-                    Messages.form_condition_is = 'is'; // XXX
-                    Messages.form_condition_isnot = 'is not'; // XXX
-                    Messages.form_condition_has = 'has'; // XXX
-                    Messages.form_condition_hasnot = 'has not'; // XXX
-
-                    var isOn = !condition || condition.is !== 0;
-                    var iOptions = [{
-                        tag: 'a',
-                        attributes: {
-                            'data-value': 1,
-                            'href': '#',
-                        },
-                        content: Messages.form_condition_is
-                    }, {
-                        tag: 'a',
-                        attributes: {
-                            'data-value': 0,
-                            'href': '#',
-                        },
-                        content: Messages.form_condition_isnot
-                    }];
-                    var iConfig = {
-                        options: iOptions, // Entries displayed in the menu
-                        isSelect: true,
-                        caretDown: true,
-                        buttonCls: 'btn btn-default'
-                    };
-                    var iSelect = UIElements.createDropdown(iConfig);
-                    iSelect.setValue(isOn ? 1 : 0);
-                    $(iSelect).hide();
-
-                    var remove = h('button.btn.btn-danger-alt.cp-condition-remove', [
-                        h('i.fa.fa-times.nomargin')
-                    ]);
-                    $(remove).on('click', function () {
-                        $content.remove();
-                        if ($container.is(':empty')) { $container.remove(); }
-                        $addC.show();
-                    });
+                }, [
+                    h('i.fa.fa-plus.add-open'),
+                    h('i.fa.fa-times.add-close')
+                ]);
+                var $b = $(buttons).hide();
+                $(add).click(function () {
+                    $b.toggle();
+                    $(add).toggleClass('displayed');
+                });
+            }
+            else {
+                $(add).append(h('span', Messages.tag_add));
+            }
 
-                    $content.append(qSelect).append(iSelect).append(remove);
-                    if ($container.find('button.cp-form-add-and').length) {
-                        $container.find('button.cp-form-add-and').before($content);
-                    } else {
-                        $container.append($content);
-                    }
+            var inlineCls = full ? '-full' : '-inline';
+            return h('div.cp-form-creator-add'+inlineCls, [
+                add,
+                buttons
+            ]);
 
-                    var isChange;
-                    qSelect.onChange.reg(function (prettyVal, val, init) {
-                        $(iSelect).show();
-                        var res, type;
-                        values.some(function (obj) {
-                            if (String(obj.uid) === String(val)) {
-                                res = obj.values;
-                                type = obj.type;
-                                return true;
-                            }
-                        });
+        };
 
-                        var $selDiv = $(iSelect);
-                        if (type === 'checkbox') {
-                            $selDiv.find('[data-value="0"]').text(Messages.form_condition_hasnot);
-                            $selDiv.find('[data-value="1"]').text(Messages.form_condition_has);
-                        } else {
-                            $selDiv.find('[data-value="0"]').text(Messages.form_condition_isnot);
-                            $selDiv.find('[data-value="1"]').text(Messages.form_condition_is);
-                        }
-                        iSelect.setValue(iSelect.getValue());
+        var updateAddInline = APP.updateAddInline = function () {
+            $container.find('.cp-form-creator-add-inline').remove();
+            // Add before existing question
+            $container.find('.cp-form-block').each(function (i, el) {
+                var $el = $(el);
+                var uid = $el.attr('data-id');
+                $el.before(getFormCreator(uid));
+            });
+            // Add to the end of a section
+            $container.find('.cp-form-section-sortable').each(function (i, el) {
+                var $el = $(el);
+                var uid = $el.closest('.cp-form-block').attr('data-id');
+                $el.append(getFormCreator(uid, true));
+            });
+        };
 
-                        $content.find('.cp-form-condition-values').remove();
-                        if (!res) { return; }
-                        var vOptions = res.map(function (str) {
-                            return {
-                                tag: 'a',
-                                attributes: {
-                                    'class': 'cp-form-condition-value',
-                                    'data-value': str,
-                                    'href': '#',
-                                },
-                                content: str
-                            };
-                        });
-                        var vConfig = {
-                            text: Messages.form_condition_v, // Button initial text
-                            options: vOptions, // Entries displayed in the menu
-                            //left: true, // Open to the left of the button
-                            //container: $(type),
-                            isSelect: true,
-                            caretDown: true,
-                            buttonCls: 'btn btn-default'
-                        };
-                        var vSelect = UIElements.createDropdown(vConfig);
-                        vSelect.addClass('cp-form-condition-values');
-                        $content.append(vSelect).append(remove);
 
-                        var onChange = function () {
-                            var w = block.opts.when = block.opts.when || [];
+        var elements = [];
+        var n = 1; // Question number
 
-                            condition = condition || {};
-                            condition.q = val;
-                            condition.is = Number(iSelect.getValue());
-                            condition.v = vSelect.getValue();
+        var order = getFullOrder(content);
 
-                            var wasNew = isNew;
-                            if (isNew) {
-                                if (!Array.isArray(rules)) { // new set of rules (OR)
-                                    rules = [condition];
-                                    w.push(rules);
-                                    getAddAndButton($container, rules);
-                                } else {
-                                    rules.push(condition);
-                                }
-                                isNew = false;
-                            }
+        order.forEach(function (uid, blockIdx) {
+            var block = form[uid];
+            var type = block.type;
+            var model = TYPES[type] || STATIC_TYPES[type];
+            var isStatic = Boolean(STATIC_TYPES[type]);
+            if (!model) { return; }
 
-                            framework.localChange();
-                            framework._.cpNfInner.chainpad.onSettle(function () {
-                                UI.log(Messages.saved);
-                                if (wasNew) { $addC.show(); }
-                            });
+            var _answers, name;
+            if (type === 'poll') {
+                var metadataMgr = framework._.cpNfInner.metadataMgr;
+                var user = metadataMgr.getUserData();
+                // If we are a participant, our results shouldn't be in the table but in the
+                // editable part: remove them from _answers
+                _answers = getBlockAnswers(APP.answers, uid, !editable && user.curvePublic);
+                name = user.name;
+            }
 
-                        };
+            var data = model.get(block.opts, _answers, name, evOnChange, {
+                block: block,
+                content: content,
+                uid: uid,
+                tmp: temp && temp[uid]
+            });
+            if (!data) { return; }
+            data.uid = uid;
+            if (answers && answers[uid] && data.setValue) { data.setValue(answers[uid]); }
 
-                        if (isChange) { iSelect.onChange.unreg(isChange); }
-                        isChange = function () {
-                            if (!vSelect.getValue()) { return; }
-                            onChange();
-                        };
-                        iSelect.onChange.reg(isChange);
+            if (data.pageBreak && !editable) {
+                elements.push(data);
+                return;
+            }
+            if (data.noViewMode && !editable) {
+                elements.push(data);
+                return;
+            }
 
-                        vSelect.onChange.reg(function () {
-                            $(remove).off('click').click(function () {
-                                var w = block.opts.when = block.opts.when || [];
-                                var deleteRule = false;
-                                if (rules.length === 1) {
-                                    var rIdx = w.indexOf(rules);
-                                    w.splice(rIdx, 1);
-                                    deleteRule = true;
-                                } else {
-                                    var idx = rules.indexOf(condition);
-                                    rules.splice(idx, 1);
-                                }
-                                framework.localChange();
-                                framework._.cpNfInner.chainpad.onSettle(function () {
-                                    if (deleteRule) {
-                                        $content.closest('.cp-form-condition-rule').remove();
-                                        return;
-                                    }
-                                    $content.remove();
-                                });
-                            }).appendTo($content);
-                            onChange();
-                        });
+            Messages.form_required = "Required"; // XXX
+            var requiredTag;
+            if (block.opts && block.opts.required) {
+                requiredTag = h('span.cp-form-required-tag', Messages.form_required);
+            }
 
-                        if (condition && condition.v && init) {
-                            vSelect.setValue(condition.v);
-                            vSelect.onChange.fire(condition.v, condition.v);
-                        }
+            var dragHandle;
+            var q = h('div.cp-form-block-question', [
+                h('span.cp-form-block-question-number', (n++)+'.'),
+                h('span.cp-form-block-question-text', block.q || Messages.form_default),
+                requiredTag
+            ]);
+            // Static blocks don't have questions ("q" is not used) so we can decrement n
+            if (isStatic) { n--; }
 
-                    });
-                    if (condition && condition.q) {
-                        qSelect.setValue(condition.q); // XXX check if exists? or integrity
-                        qSelect.onChange.fire(condition.q, condition.q, true);
-                    }
+            var editButtons, editContainer;
 
+            APP.formBlocks.push(data);
 
-                };
-                Messages.form_conditional = "Only show this section when:"; // XXX
+            Messages.form_preview = "Preview:"; // XXX
+            var previewDiv = h('div.cp-form-preview', Messages.form_preview);
 
-                conditionalDiv = h('div.cp-form-conditional', [
-                    h('div.cp-form-conditional-hint', Messages.form_conditional),
-                    addCondition
-                ]);
-                var $condition = $(conditionalDiv);
-                var redraw = function () {
-                    var w = block.opts.when = block.opts.when || [];
-                    w.forEach(function (rules) {
-                        var rulesC = h('div.cp-form-condition-rule');
-                        var $rulesC = $(rulesC);
-                        getAddAndButton($rulesC, rules);
-                        rules.forEach(function (obj) {
-                            getConditions($rulesC, false, rules, obj);
+            Messages.form_required_answer = "Answer: ";
+            Messages.form_required_on = "required";
+            Messages.form_required_off = "optional";
+            // Required radio displayed only for types that have an "isEmpty" function
+            var requiredDiv, conditionalDiv;
+            if (APP.isEditor && !isStatic && data.isEmpty) {
+                if (!block.opts) { block.opts = TYPES[type].defaultOpts; }
+                var isRequired = Boolean(block.opts.required);
+                var radioOn = UI.createRadio('cp-form-required-'+uid, 'cp-form-required-on',
+                        Messages.form_required_on, isRequired, {
+                            input: { value: 1 },
                         });
-                        $addC.before($rulesC); // XXX
+                var radioOff = UI.createRadio('cp-form-required-'+uid, 'cp-form-required-off',
+                        Messages.form_required_off, !isRequired, {
+                            input: { value: 0 },
+                        });
+                var radioContainer = h('div.cp-form-required-radio', [
+                    h('span', Messages.form_required_answer),
+                    radioOff,
+                    radioOn
+                ]);
+                requiredDiv = h('div.cp-form-required', [
+                    radioContainer
+                ]);
+                $(radioContainer).find('input[type="radio"]').on('change', function() {
+                    var val = $('input:radio[name="cp-form-required-'+uid+'"]:checked').val();
+                    val = Number(val) || 0;
+                    block.opts.required = Boolean(val);
+                    framework.localChange();
+                    framework._.cpNfInner.chainpad.onSettle(function () {
+                        UI.log(Messages.saved);
                     });
-                };
-                redraw();
-
-                $addC.click(function () {
-                    $addC.hide();
-                    var rulesC = h('div.cp-form-condition-rule');
-                    var $rulesC = $(rulesC);
-                    getConditions($rulesC, true);
-                    $addC.before($rulesC);
-                });
-                if (getConditionsValues().length) {
-                    $condition.show();
-                } else {
-                    $condition.hide();
-                }
-                evShowConditions.reg(function () {
-                    if (getConditionsValues().length) {
-                        $condition.show();
-                    } else {
-                        $condition.hide();
-                    }
-                });
-                evCheckConditions.reg(function (_uid) {
-                    if (uid !== _uid) { return; }
-                    // If our conditions are invalid, redraw them
-                    if (getConditionsValues().length) {
-                        $condition.show();
-                    } else {
-                        $condition.hide();
-                    }
-                    $condition.find('.cp-form-condition-rule').remove();
-                    redraw();
                 });
             }
 
+            if (APP.isEditor && type === "section") {
+                data.editing = true;
+            }
+
             var changeType;
             if (editable) {
                 // Drag handle
@@ -3474,7 +3538,6 @@ define([
                 isStatic ? undefined : q,
                 h('div.cp-form-block-content', [
                     APP.isEditor && !isStatic ? requiredDiv : undefined,
-                    APP.isEditor ? conditionalDiv : undefined,
                     APP.isEditor && !isStatic ? previewDiv : undefined,
                     data.tag,
                     editContainer,
@@ -3553,6 +3616,31 @@ define([
         });
         updateAddInline();
 
+        // Fix cursor in conditions dropdown
+        // If we had a condition dropdown displayed, we're going to make sure
+        // it doesn't move on the screen after the redraw
+        // To do so, we need to adjust the "scrollTop" value saved before redrawing
+        getSections(content).forEach(function (uid) {
+            var block = content.form[uid];
+            if (!block.opts || !Array.isArray(block.opts.questions)) { return; }
+            var $block = $container.find('.cp-form-block[data-id="'+uid+'"] .cp-form-section-sortable');
+
+            if (temp && temp[uid]) {
+                var tmp = temp[uid];
+                var u = tmp.uid;
+                var t = tmp.type;
+                var $c = $block.closest('.cp-form-block').find('.cp-form-condition[data-uid="'+u+'"]');
+                var $b = $c.find('[data-drop="'+t+'"]').find('button');
+                var pos = $b && $b.length && $b[0].getBoundingClientRect().y;
+                // If we know the old position of the button and the new one, we can fix the scroll
+                // accordingly
+                if (typeof(pos) === "number" && typeof(tmp.y) === "number") {
+                    var diff = pos - tmp.y;
+                    APP.sTop += diff;
+                }
+            }
+        });
+
         if (editable) {
             if (APP.mainSortable) { APP.mainSortable.destroy(); }
             APP.mainSortable = Sortable.create($container[0], {
@@ -4049,9 +4137,10 @@ define([
                         return;
                     }
                     rules.forEach(function (obj) {
+                        if (!obj.q) { return; }
                         var idx = available.indexOf(String(obj.q));
                         // If this question doesn't exist before the section, remove the condition
-                        if (!obj.q || idx === -1) {
+                        if (idx === -1) {
                             var cIdx = rules.indexOf(obj);
                             rules.splice(cIdx, 1);
                             errors = true;
@@ -4317,34 +4406,36 @@ define([
         // If we try to redraw in the first 500ms following a redraw, we'll
         // redraw again when the timer allows it. If we call "redrawRemote"
         // repeatedly, we'll only "redraw" once with the latest content.
-        var _redraw = Util.notAgainForAnother(updateForm, 500);
+        var _redraw = Util.notAgainForAnother(function (framework, content) {
+            var answers, temp;
+            if (!APP.isEditor) { answers = getFormResults(); }
+            else { temp = getTempFields(); }
+            updateForm(framework, content, APP.isEditor, answers, temp);
+        }, 500);
         var redrawTo;
         var redrawRemote = function () {
             var $main = $('.cp-form-creator-container');
             var args = Array.prototype.slice.call(arguments);
-            var sTop = $main.scrollTop();
+            APP.sTop = $main.scrollTop();
             var until = _redraw.apply(null, args);
             if (until) {
                 clearTimeout(redrawTo);
                 redrawTo = setTimeout(function (){
-                    sTop = $main.scrollTop();
+                    APP.sTop = $main.scrollTop();
                     _redraw.apply(null, args);
-                    $main.scrollTop(sTop);
+                    $main.scrollTop(APP.sTop);
                 }, until+1);
                 return;
             }
             // Only restore scroll if we were able to redraw
-            $main.scrollTop(sTop);
+            $main.scrollTop(APP.sTop);
         };
         framework.onContentUpdate(function (newContent) {
             content = newContent;
             evOnChange.fire();
             refreshEndDateBanner();
-            var answers, temp;
-            if (!APP.isEditor) { answers = getFormResults(); }
-            else { temp = getTempFields(); }
 
-            redrawRemote(framework, content, APP.isEditor, answers, temp);
+            redrawRemote(framework, content);
         });
 
         framework.setContentGetter(function () {

From cbbf7df7eef9df05271a3a6465056ca1bffa7999 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 3 Sep 2021 18:25:05 +0200
Subject: [PATCH 077/125] Fix scroll position with flatpickr displayed

---
 www/form/app-form.less |  5 ++++
 www/form/inner.js      | 58 ++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index acf9051dd..8341e190a 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -21,6 +21,11 @@
         margin: 10px !important;
     }
 
+    & > .flatpickr-calendar {
+        animation: none !important;
+        -webkit-animation: none !important;
+    }
+
     #cp-app-form-editor {
         flex: 1;
         display: flex;
diff --git a/www/form/inner.js b/www/form/inner.js
index 9498b3379..e8a0523ec 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -305,7 +305,7 @@ define([
             if (isItem) {
                 if (cursor && cursor.uid === uid && cursor.item) { setCursor(); }
             } else {
-                if (cursor && cursor.el === val && !cursor.item) { setCursor(); }
+                else if (cursor && cursor.el === val && !cursor.item) { setCursor(); }
             }
 
             var del = h('button.btn.btn-danger-outline', h('i.fa.fa-times'));
@@ -493,6 +493,17 @@ define([
                 setTimeout(evOnSave.fire);
                 if (val !== "text") {
                     $container.find('.cp-form-edit-block-input').remove();
+                    if (val === "time") {
+                        var time = new Date();
+                        time.setHours(14);
+                        time.setMinutes(0);
+                        time.setSeconds(0);
+                        time.setMilliseconds(0);
+                        var el = getOption(+time, false, false);
+                        $add.before(el);
+                        $(el).find('input').focus();
+                        return;
+                    }
                     $(add).click();
                     return;
                 }
@@ -550,6 +561,18 @@ define([
                     }
                 });
             }
+            if (v.type === "time") {
+                $container.find('input').each(function (i, el) {
+                    var f = el._flatpickr;
+                    if (!f || !f.isOpen) { return; }
+                    var rect = el.getBoundingClientRect();
+                    cursor = {
+                        flatpickr: true,
+                        val: +f.selectedDates[0],
+                        y: rect && rect.y
+                    }
+                });
+            }
             return {
                 cursor: cursor
             };
@@ -3103,6 +3126,7 @@ define([
         if (!$container.length) { return; } // Not ready
 
         var form = content.form;
+        $('body').find('.flatpickr-calendar').remove();
 
         APP.formBlocks = [];
 
@@ -3620,7 +3644,8 @@ define([
         // If we had a condition dropdown displayed, we're going to make sure
         // it doesn't move on the screen after the redraw
         // To do so, we need to adjust the "scrollTop" value saved before redrawing
-        getSections(content).forEach(function (uid) {
+        getSections(content).some(function (uid) {
+            if (!temp) { return true; }
             var block = content.form[uid];
             if (!block.opts || !Array.isArray(block.opts.questions)) { return; }
             var $block = $container.find('.cp-form-block[data-id="'+uid+'"] .cp-form-section-sortable');
@@ -3638,7 +3663,34 @@ define([
                     var diff = pos - tmp.y;
                     APP.sTop += diff;
                 }
+                return true;
+            }
+        });
+        // Fix cursor with flatpickr
+        APP.formBlocks.some(function (b) {
+            if (!temp) { return true; }
+            var uid = b.uid;
+            var block = form[uid];
+            if (!block) { return; }
+            if (block.type !== "poll") { return; }
+            var opts = block.opts;
+            if (!opts) { return; }
+            if (opts.type !== "time") { return; }
+            var tmp = temp[uid];
+            if (!tmp || !tmp.cursor || !tmp.cursor.flatpickr) { return; }
+            var $block = $container.find('.cp-form-block[data-id="'+uid+'"]');
+            var $i = $block.find('.flatpickr-input[value="'+tmp.cursor.val+'"]');
+            if (!$i.length) { return; }
+            APP.afterScroll = function () {
+                $i[0]._flatpickr.open();
+                delete APP.afterScroll;
+            };
+            var pos = $i && $i.length && $i[0].getBoundingClientRect().y;
+            if (typeof(pos) === "number" && typeof(tmp.cursor.y) === "number") {
+                var diff = pos - tmp.cursor.y;
+                APP.sTop += diff;
             }
+            return true;
         });
 
         if (editable) {
@@ -4424,11 +4476,13 @@ define([
                     APP.sTop = $main.scrollTop();
                     _redraw.apply(null, args);
                     $main.scrollTop(APP.sTop);
+                    if (typeof(APP.afterScroll) === "function") { APP.afterScroll(); }
                 }, until+1);
                 return;
             }
             // Only restore scroll if we were able to redraw
             $main.scrollTop(APP.sTop);
+            if (typeof(APP.afterScroll) === "function") { APP.afterScroll(); }
         };
         framework.onContentUpdate(function (newContent) {
             content = newContent;

From a82481c36da62de40dc44db3e0934dbb0a7cee6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Fri, 3 Sep 2021 20:26:18 +0100
Subject: [PATCH 078/125] Remove background from form result table for grid
 questions

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

diff --git a/www/form/app-form.less b/www/form/app-form.less
index acf9051dd..2673685a2 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -720,6 +720,7 @@
                     font-weight: bold;
                     padding: 5px 10px;
                     .cp-form-results-cell();
+                    background: transparent;
                 }
                 &:not(:first-child) {
                     .cp-mr-q {

From 68c4232eb3d9a4bf38af447ec75714004d40b3cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Fri, 3 Sep 2021 20:26:44 +0100
Subject: [PATCH 079/125] Changes related to translation strings

---
 www/common/common-ui-elements.js | 3 ++-
 www/common/inner/share.js        | 6 +++---
 www/form/templates.js            | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index ac24b1ab9..662e39fc3 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -527,6 +527,7 @@ define([
         var sframeChan = common.getSframeChannel();
         var appType = (common.getMetadataMgr().getMetadata().type || 'pad').toUpperCase();
         data = data || {};
+        Messages.toolbar_preview = "Preview"; // XXX
         switch (type) {
             case 'export':
                 button = $('<button>', {
@@ -753,7 +754,7 @@ define([
                     //title: Messages.previewButtonTitle, // TODO display if the label text is collapsed
                 }, [
                     h('i.fa.fa-eye'),
-                    h('span.cp-toolbar-name', Messages.share_linkOpen)
+                    h('span.cp-toolbar-name', Messages.toolbar_preview)
                 ])).click(common.prepareFeedback(type));
                 break;
             case 'print':
diff --git a/www/common/inner/share.js b/www/common/inner/share.js
index 4bcf0d621..f76c15e28 100644
--- a/www/common/inner/share.js
+++ b/www/common/inner/share.js
@@ -420,12 +420,12 @@ define([
                 embed: Util.isChecked($link.find('#cp-share-embed'))
             }));
         });
-
+        Messages.share_linkOpen = "Open link"; // XXX
         var linkButtons = [
             makeCancelButton(),
             !opts.sharedFolder && {
                 className: 'secondary cp-nobar',
-                name: Messages.share_linkOpen,
+                name: Messages.share_linkOpen, // XXX add fa-eye icon
                 onClick: function () {
                     opts.saveValue();
                     var v = opts.getLinkValue({
@@ -441,7 +441,7 @@ define([
                 keys: [[13, 'ctrl']]
             }, {
                 className: 'primary cp-nobar',
-                name: Messages.share_linkCopy,
+                name: Messages.share_linkCopy, // XXX add fa-link icon
                 onClick: function () {
                     opts.saveValue();
                     var v = opts.getLinkValue({
diff --git a/www/form/templates.js b/www/form/templates.js
index d72c7ecb8..c4eb93912 100644
--- a/www/form/templates.js
+++ b/www/form/templates.js
@@ -1,7 +1,7 @@
 define([
     '/customize/messages.js'
 ], function (Messages) {
-    Messages.form_type_poll = "Quick poll"; // XXX update key
+    Messages.form_template_poll = "Quick poll"; // XXX update key
     var pollValues = [];
     var d8 = new Date();
     d8.setDate(d8.getDate() - d8.getDay() + 7); // set sunday
@@ -24,7 +24,7 @@ define([
     return [{
         id: 'a',
         used: 1,
-        name: Messages.form_type_poll,
+        name: Messages.form_template_poll,
         content: {
             answers: {
                 anonymous: true,

From 7cf52a1c1a22e69a3e9a82fa447f7271206a893e Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Fri, 3 Sep 2021 21:29:15 +0200
Subject: [PATCH 080/125] Translated using Weblate (English)

Currently translated at 100.0% (1423 of 1423 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1422 of 1422 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1421 of 1421 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1420 of 1420 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1419 of 1419 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1418 of 1418 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1417 of 1417 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1416 of 1416 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1415 of 1415 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1414 of 1414 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1413 of 1413 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1412 of 1412 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1411 of 1411 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1410 of 1410 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1409 of 1409 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1408 of 1408 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1407 of 1407 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1406 of 1406 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1406 of 1406 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1405 of 1405 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1405 of 1405 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1404 of 1404 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1404 of 1404 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1403 of 1403 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1402 of 1402 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1401 of 1401 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1400 of 1400 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1399 of 1399 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1398 of 1398 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1397 of 1397 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1396 of 1396 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1395 of 1395 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1394 of 1394 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1393 of 1393 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1392 of 1392 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1391 of 1391 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1390 of 1390 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1389 of 1389 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1388 of 1388 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1387 of 1387 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1386 of 1386 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1385 of 1385 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1384 of 1384 strings)

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

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 1cb85b4f1..67894897f 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -92,7 +92,7 @@
     "shareSuccess": "Copied link to clipboard",
     "userListButton": "User list",
     "chatButton": "Chat",
-    "userAccountButton": "Your account",
+    "userAccountButton": "User menu",
     "newButton": "New",
     "newButtonTitle": "Create a new pad",
     "uploadButton": "Upload files",
@@ -579,7 +579,7 @@
     "creation_expireDays": "Day(s)",
     "creation_expireMonths": "Month(s)",
     "creation_password": "Password\n",
-    "creation_noTemplate": "No template",
+    "creation_noTemplate": "Blank document",
     "creation_newTemplate": "New template",
     "creation_create": "Create",
     "creation_owners": "Owners",
@@ -606,8 +606,8 @@
     "share_linkView": "View",
     "share_linkEmbed": "Embed mode (hide toolbar and user list)",
     "share_linkPresent": "Present",
-    "share_linkOpen": "Preview",
-    "share_linkCopy": "Copy",
+    "share_linkOpen": "Open link",
+    "share_linkCopy": "Copy link",
     "share_contactCategory": "Contacts",
     "share_embedCategory": "Embed",
     "share_mediatagCopy": "Copy mediatag to clipboard",
@@ -1284,7 +1284,7 @@
     "form_updateWarning": "Update anyway",
     "form_cantFindAnswers": "Unable to retrieve your existing answers for this form.",
     "form_answered": "You have already answered this form",
-    "form_results": "Responses",
+    "form_results": "Responses ({0})",
     "form_results_empty": "There are no responses",
     "form_editor": "Editor",
     "form_form": "Form",
@@ -1301,7 +1301,7 @@
     "form_invalidWarning": "There are errors in some answers:",
     "form_invalidQuestion": "Question {0}",
     "form_makePublic": "Publish responses",
-    "form_makePublicWarning": "Are you sure you want to make responses to this form public? This cannot be undone.",
+    "form_makePublicWarning": "Are you sure you want to make responses to this form public? Past and future responses will be visible by participants. This cannot be undone.",
     "form_isPublic": "Responses are public",
     "form_isPrivate": "Responses are private",
     "form_open": "Open",
@@ -1310,7 +1310,7 @@
     "form_isOpen": "This form is open",
     "form_isClosed": "This form was closed on {0}",
     "form_willClose": "This form will close on {0}",
-    "form_anonymous": "Anonymous answers",
+    "form_anonymous": "Guest access (not logged in)",
     "form_anonymous_on": "Allowed",
     "form_anonymous_off": "Blocked",
     "form_defaultOption": "Option {0}",
@@ -1384,5 +1384,44 @@
     "ui_expand": "Expand",
     "form_totalResponses": "Total responses: {0}",
     "support_premiumPriority": "Premium users help support improvements to CryptPad's usability and benefit from prioritized responses to their support tickets.",
-    "support_premiumLink": "View subscription options"
+    "support_premiumLink": "View subscription options",
+    "toolbar_collapse": "Collapse toolbar",
+    "toolbar_expand": "Expand toolbar",
+    "profile_defaultAlt": "Default profile picture",
+    "upload_modal_alt": "Alt text",
+    "upload_addOptionalAlt": "Add descriptive text (optional)",
+    "form_template_poll": "Quick Poll",
+    "form_preview_button": "Preview",
+    "form_alreadyAnswered": "You responded to this form on {0}",
+    "form_editAnswer": "Edit my responses",
+    "form_viewAnswer": "View my responses",
+    "form_viewAllAnswers": "View all responses ({0})",
+    "form_anonAnswer": "Responses to this form are anonymized",
+    "form_authAnswer": "This form cannot be submitted anonymously",
+    "form_requiredWarning": "The following questions require an answer:",
+    "form_required_answer": "Answer: ",
+    "form_required_on": "Required",
+    "form_required_off": "Optional",
+    "form_preview": "Preview form",
+    "form_changeTypeConfirm": "Select the new question type.",
+    "form_corruptAnswers": "This form already has responses. Changing this question type may invalidate previous response data.",
+    "form_geturl": "Copy link",
+    "toolbar_preview": "Preview",
+    "form_updateMsg": "Update submit message",
+    "form_addMsg": "Add submit message",
+    "form_responseMsg": "This message will be displayed after participants submit the form.",
+    "form_makeAnon": "Anonymize responses",
+    "form_editable": "Editing after submission",
+    "form_type_section": "Conditional section",
+    "form_condition_q": "Choose a question",
+    "form_condition_v": "Choose a value",
+    "form_condition_is": "is",
+    "form_condition_isnot": "is not",
+    "form_condition_has": "has",
+    "form_condition_hasnot": "has not",
+    "form_conditional": "Only show this section when:",
+    "form_conditional_add": "Add OR condition",
+    "form_conditional_addAnd": "Add AND condition\n",
+    "userlist_visitProfile": "Visit profile",
+    "form_colors": "Color theme"
 }

From a5c55f1f494461d92092897cb03ed8d59640bb77 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Fri, 3 Sep 2021 21:29:15 +0200
Subject: [PATCH 081/125] Translated using Weblate (Japanese)

Currently translated at 98.9% (1390 of 1405 strings)

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

Translated using Weblate (Japanese)

Currently translated at 99.8% (1384 of 1386 strings)

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

Translated using Weblate (Japanese)

Currently translated at 99.8% (1383 of 1385 strings)

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

diff --git a/www/common/translations/messages.ja.json b/www/common/translations/messages.ja.json
index 656239dec..25323cfa3 100644
--- a/www/common/translations/messages.ja.json
+++ b/www/common/translations/messages.ja.json
@@ -525,7 +525,7 @@
     "crowdfunding_popup_no": "あとで",
     "sharedFolders_create_name": "フォルダ名",
     "creation_newTemplate": "新しいテンプレート",
-    "creation_noTemplate": "テンプレートがありません",
+    "creation_noTemplate": "空のドキュメント",
     "creation_expire": "期限切れのパッド",
     "mdToolbar_list": "箇条書き",
     "uploadFolder_modal_filesPassword": "ファイルのパスワード",
@@ -746,7 +746,7 @@
     "saveTemplatePrompt": "テンプレートのタイトルを入力してください",
     "newButtonTitle": "新しいパッドを作成",
     "newButton": "新規",
-    "userAccountButton": "アカウント",
+    "userAccountButton": "メニュー",
     "userListButton": "ユーザーリスト",
     "movedToTrash": "パッドをゴミ箱に移動しました。<br><a>ドライブにアクセス</a>",
     "forgetPrompt": "OKをクリックするとパッドをゴミ箱へと移動します。よろしいですか？",
@@ -905,7 +905,7 @@
     "form_showSummary": "概要を表示",
     "form_showIndividual": "個々の回答を表示",
     "form_results_empty": "回答がありません",
-    "form_results": "回答",
+    "form_results": "回答（{0}）",
     "form_answered": "このフォームは回答済みです",
     "form_cantFindAnswers": "このフォームの既存の回答を取得できません。",
     "form_duplicates": "重複する項目が削除されました",
@@ -1384,5 +1384,14 @@
     "ui_expand": "広げる",
     "ui_collapse": "折りたたむ",
     "support_premiumPriority": "プレミアムユーザーになると、CryptPadの使い勝手を改良する手助けができるほか、サポートチケットに対する優先サポートを受けることができます。",
-    "support_premiumLink": "定額利用のオプションを表示"
+    "support_premiumLink": "定額利用のオプションを表示",
+    "toolbar_collapse": "ツールバーをたたむ",
+    "toolbar_expand": "ツールバーを広げる",
+    "form_preview": "フォームをプレビュー",
+    "form_geturl": "リンクをコピー",
+    "form_viewAnswer": "回答を表示",
+    "form_editAnswer": "回答を編集",
+    "form_preview_button": "プレビュー",
+    "upload_addOptionalAlt": "説明文を追加（任意）",
+    "upload_modal_alt": "代替テキスト"
 }

From 6b4afa3d314a38cace19f9205161211d29b93c14 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 6 Sep 2021 11:35:55 +0200
Subject: [PATCH 082/125] Fix syntax error

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

diff --git a/www/form/inner.js b/www/form/inner.js
index f291fc916..89a02c791 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -305,7 +305,7 @@ define([
             if (isItem) {
                 if (cursor && cursor.uid === uid && cursor.item) { setCursor(); }
             } else {
-                else if (cursor && cursor.el === val && !cursor.item) { setCursor(); }
+                if (cursor && cursor.el === val && !cursor.item) { setCursor(); }
             }
 
             var del = h('button.btn.btn-danger-outline', h('i.fa.fa-times'));

From 013969569787fe800a567905766c13b3c5c05ece Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 6 Sep 2021 12:41:10 +0200
Subject: [PATCH 083/125] Prepare forms for future update

---
 www/form/inner.js | 47 ++++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 089db8b57..75fe1db3c 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -82,6 +82,14 @@ define([
     var MAX_OPTIONS = 15;
     var MAX_ITEMS = 10;
 
+    var extractValues = function (values) {
+        if (!Array.isArray(values)) { return []; }
+        return values.map(function (obj) {
+            if (typeof(obj) === "string") { return obj; }
+            return obj.v;
+        });
+    };
+
     var saveAndCancelOptions = function (getRes, cb) {
         // Cancel changes
         var cancelBlock = h('button.btn.btn-secondary', Messages.cancel);
@@ -313,7 +321,8 @@ define([
             });
             return el;
         };
-        var inputs = v.values.map(function (val) { return getOption(val, false); });
+        // TODO uid
+        var inputs = extractValues(v.values).map(function (val) { return getOption(val, false); });
         inputs.push(add);
 
         var container = h('div.cp-form-edit-block', inputs);
@@ -346,7 +355,7 @@ define([
         if (v.type) {
             var calendarInput = h('input');
             calendarView = h('div', calendarInput);
-            var calendarDefault = v.type === "day" ? v.values.map(function (time) {
+            var calendarDefault = v.type === "day" ? extractValues(v.values).map(function (time) {
                 if (!time) { return; }
                 var d = new Date(time);
                 if (!isNaN(d)) { return d; }
@@ -597,13 +606,13 @@ define([
     var makePollTable = function (answers, opts, resultsPageObj) {
         // Sort date values
         if (opts.type !== "text") {
-            opts.values.sort(function (a, b) {
+            extractValues(opts.values).sort(function (a, b) { // TODO uid
                 return +new Date(a) - +new Date(b);
             });
         }
         // Create first line with options
         var allDays = getWeekDays(true);
-        var els = opts.values.map(function (data) {
+        var els = extractValues(opts.values).map(function (data) { // TODO uid
             var _date;
             if (opts.type === "day") {
                 _date = new Date(data);
@@ -634,7 +643,7 @@ define([
         if (opts.type === "time") {
             var days = [h('div.cp-poll-cell')];
             var _days = {};
-            opts.values.forEach(function (d) {
+            extractValues(opts.values).forEach(function (d) {
                 var date = new Date(d);
                 var day = date.toLocaleDateString();
                 _days[day] = {
@@ -665,7 +674,7 @@ define([
                 var avatar = h('span.cp-avatar');
                 APP.common.displayAvatar($(avatar), Util.find(answerObj, ['user', 'avatar']), name);
                 var values = answer.values || {};
-                var els = opts.values.map(function (data) {
+                var els = extractValues(opts.values).map(function (data) {
                     var res = values[data] || 0;
                     var v = (Number(res) === 1) ? h('i.fa.fa-check.cp-yes') : undefined;
                     var cell = h('div.cp-poll-cell.cp-form-poll-answer', {
@@ -703,7 +712,7 @@ define([
         var myTotals = {};
         var updateMyTotals = function () {
             if (!myLine) { return; }
-            opts.values.forEach(function (data) {
+            extractValues(opts.values).forEach(function (data) {
                 myLine.some(function (el) {
                     if ($(el).data('option') !== data) { return; }
                     var res = Number($(el).attr('data-value')) || 0;
@@ -726,7 +735,7 @@ define([
 
             });
         };
-        var totalEls = opts.values.map(function (data) {
+        var totalEls = extractValues(opts.values).map(function (data) {
             var y = 0; // Yes
             var m = 0; // Maybe
             answers.forEach(function (answerObj) {
@@ -1122,7 +1131,7 @@ define([
                 if (!opts) { opts = TYPES.radio.defaultOpts; }
                 if (!Array.isArray(opts.values)) { return; }
                 var name = Util.uid();
-                var els = opts.values.map(function (data, i) {
+                var els = extractValues(opts.values).map(function (data, i) {
                     var radio = UI.createRadio(name, 'cp-form-'+name+'-'+i,
                                data, false, { mark: { tabindex:1 } });
                     $(radio).find('input').data('val', data);
@@ -1201,7 +1210,7 @@ define([
                 var lines = opts.items.map(function (itemData) {
                     var name = itemData.uid;
                     var item = itemData.v;
-                    var els = opts.values.map(function (data, i) {
+                    var els = extractValues(opts.values).map(function (data, i) {
                         var radio = UI.createRadio(name, 'cp-form-'+name+'-'+i,
                                    '', false, { mark: { tabindex:1 } });
                         $(radio).find('input').data('uid', name);
@@ -1211,7 +1220,7 @@ define([
                     els.unshift(h('div.cp-form-multiradio-item', item));
                     return h('div.radio-group', {'data-uid':name}, els);
                 });
-                var header = opts.values.map(function (v) { return h('span', v); });
+                var header = extractValues(opts.values).map(function (v) { return h('span', v); });
                 header.unshift(h('span'));
                 lines.unshift(h('div.cp-form-multiradio-header', header));
 
@@ -1353,7 +1362,7 @@ define([
                 if (!opts) { opts = TYPES.checkbox.defaultOpts; }
                 if (!Array.isArray(opts.values)) { return; }
                 var name = Util.uid();
-                var els = opts.values.map(function (data, i) {
+                var els = extractValues(opts.values).map(function (data, i) {
                     var cbox = UI.createCheckbox('cp-form-'+name+'-'+i,
                                data, false, { mark: { tabindex:1 } });
                     $(cbox).find('input').data('val', data);
@@ -1444,7 +1453,7 @@ define([
                 var lines = opts.items.map(function (itemData) {
                     var name = itemData.uid;
                     var item = itemData.v;
-                    var els = opts.values.map(function (data, i) {
+                    var els = extractValues(opts.values).map(function (data, i) {
                         var cbox = UI.createCheckbox('cp-form-'+name+'-'+i,
                                    '', false, { mark: { tabindex:1 } });
                         $(cbox).find('input').data('uid', name);
@@ -1467,7 +1476,7 @@ define([
                     });
                 });
 
-                var header = opts.values.map(function (v) { return h('span', v); });
+                var header = extractValues(opts.values).map(function (v) { return h('span', v); });
                 header.unshift(h('span'));
                 lines.unshift(h('div.cp-form-multiradio-header', header));
 
@@ -1616,7 +1625,7 @@ define([
 */
                     Util.shuffleArray(opts.values);
                 }
-                var els = opts.values.map(function (data) {
+                var els = extractValues(opts.values).map(function (data) {
                     var uid = Util.uid();
                     map[uid] = data;
                     invMap[data] = uid;
@@ -1670,7 +1679,7 @@ define([
                     },
                     reset: function () {
                         Util.shuffleArray(opts.values);
-                        var toSort = (opts.values).map(function (val) {
+                        var toSort = extractValues(opts.values).map(function (val) {
                             return invMap[val];
                         });
                         sortable.sort(toSort);
@@ -1728,7 +1737,7 @@ define([
                 var lines = makePollTable(answers, opts, false);
 
                 // Add form
-                var addLine = opts.values.map(function (data) {
+                var addLine = extractValues(opts.values).map(function (data) {
                     var cell = h('div.cp-poll-cell.cp-form-poll-choice', [
                         h('i.fa.fa-times.cp-no'),
                         h('i.fa.fa-check.cp-yes'),
@@ -1829,7 +1838,7 @@ define([
                 var opts = form.opts || TYPES.poll.defaultOpts;
                 var q = form.q || Messages.form_default;
                 if (answer === false) {
-                    var cols = opts.values.map(function (key) {
+                    var cols = extractValues(opts.values).map(function (key) {
                         return q + ' | ' + key;
                     });
                     cols.unshift(q);
@@ -1845,7 +1854,7 @@ define([
                     if (i !== 0) { str += ';'; }
                     str += k.replace(';', '').replace(':', '') + ':' + answer.values[k];
                 });
-                var res = opts.values.map(function (key) {
+                var res = extractValues(opts.values).map(function (key) {
                     return answer.values[key] || '';
                 });
                 res.unshift(str);

From fc5878079213c53d9089ad37dcc290497a9a1d02 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 6 Sep 2021 12:41:10 +0200
Subject: [PATCH 084/125] Prepare forms for future update

---
 www/form/inner.js | 47 ++++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 89a02c791..a2998e936 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -93,6 +93,14 @@ define([
     var MAX_OPTIONS = 15;
     var MAX_ITEMS = 10;
 
+    var extractValues = function (values) {
+        if (!Array.isArray(values)) { return []; }
+        return values.map(function (obj) {
+            if (typeof(obj) === "string") { return obj; }
+            return obj.v;
+        });
+    };
+
     var saveAndCancelOptions = function (cb) {
         Messages.form_preview_button = "Preview"; // XXX
         var cancelBlock = h('button.btn.btn-default.cp-form-preview-button',[
@@ -368,7 +376,8 @@ define([
 
             return el;
         };
-        var inputs = v.values.map(function (val) { return getOption(val, isDefaultOpts, false); });
+        // TODO uid
+        var inputs = extractValues(v.values).map(function (val) { return getOption(val, isDefaultOpts, false); });
         inputs.push(add);
 
         var container = h('div.cp-form-edit-block', inputs);
@@ -412,7 +421,7 @@ define([
             // Calendar inline for "day" type
             var calendarInput = h('input');
             calendarView = h('div', calendarInput);
-            var calendarDefault = v.type === "day" ? v.values.map(function (time) {
+            var calendarDefault = v.type === "day" ? extractValues(v.values).map(function (time) {
                 if (!time) { return; }
                 var d = new Date(time);
                 if (!isNaN(d)) { return d; }
@@ -679,13 +688,13 @@ define([
     var makePollTable = function (answers, opts, resultsPageObj) {
         // Sort date values
         if (opts.type !== "text") {
-            opts.values.sort(function (a, b) {
+            extractValues(opts.values).sort(function (a, b) { // TODO uid
                 return +new Date(a) - +new Date(b);
             });
         }
         // Create first line with options
         var allDays = getWeekDays(true);
-        var els = opts.values.map(function (data) {
+        var els = extractValues(opts.values).map(function (data) { // TODO uid
             var _date;
             if (opts.type === "day") {
                 _date = new Date(data);
@@ -716,7 +725,7 @@ define([
         if (opts.type === "time") {
             var days = [h('div.cp-poll-cell')];
             var _days = {};
-            opts.values.forEach(function (d) {
+            extractValues(opts.values).forEach(function (d) {
                 var date = new Date(d);
                 var day = date.toLocaleDateString();
                 _days[day] = {
@@ -747,7 +756,7 @@ define([
                 var avatar = h('span.cp-avatar');
                 APP.common.displayAvatar($(avatar), Util.find(answerObj, ['user', 'avatar']), name);
                 var values = answer.values || {};
-                var els = opts.values.map(function (data) {
+                var els = extractValues(opts.values).map(function (data) {
                     var res = values[data] || 0;
                     var v = (Number(res) === 1) ? h('i.fa.fa-check.cp-yes') : undefined;
                     var cell = h('div.cp-poll-cell.cp-form-poll-answer', {
@@ -785,7 +794,7 @@ define([
         var myTotals = {};
         var updateMyTotals = function () {
             if (!myLine) { return; }
-            opts.values.forEach(function (data) {
+            extractValues(opts.values).forEach(function (data) {
                 myLine.some(function (el) {
                     if ($(el).data('option') !== data) { return; }
                     var res = Number($(el).attr('data-value')) || 0;
@@ -808,7 +817,7 @@ define([
 
             });
         };
-        var totalEls = opts.values.map(function (data) {
+        var totalEls = extractValues(opts.values).map(function (data) {
             var y = 0; // Yes
             var m = 0; // Maybe
             answers.forEach(function (answerObj) {
@@ -1627,7 +1636,7 @@ define([
                 if (!opts) { opts = TYPES.radio.defaultOpts; }
                 if (!Array.isArray(opts.values)) { return; }
                 var name = Util.uid();
-                var els = opts.values.map(function (data, i) {
+                var els = extractValues(opts.values).map(function (data, i) {
                     var radio = UI.createRadio(name, 'cp-form-'+name+'-'+i,
                                data, false, {});
                     $(radio).find('input').data('val', data);
@@ -1717,7 +1726,7 @@ define([
                 var lines = opts.items.map(function (itemData) {
                     var name = itemData.uid;
                     var item = itemData.v;
-                    var els = opts.values.map(function (data, i) {
+                    var els = extractValues(opts.values).map(function (data, i) {
                         var radio = UI.createRadio(name, 'cp-form-'+name+'-'+i,
                                    '', false, {});
                         $(radio).find('input').data('uid', name);
@@ -1727,7 +1736,7 @@ define([
                     els.unshift(h('div.cp-form-multiradio-item', item));
                     return h('div.radio-group', {'data-uid':name}, els);
                 });
-                var header = opts.values.map(function (v) { return h('span', v); });
+                var header = extractValues(opts.values).map(function (v) { return h('span', v); });
                 header.unshift(h('span'));
                 lines.unshift(h('div.cp-form-multiradio-header', header));
 
@@ -1868,7 +1877,7 @@ define([
                 if (!opts) { opts = TYPES.checkbox.defaultOpts; }
                 if (!Array.isArray(opts.values)) { return; }
                 var name = Util.uid();
-                var els = opts.values.map(function (data, i) {
+                var els = extractValues(opts.values).map(function (data, i) {
                     var cbox = UI.createCheckbox('cp-form-'+name+'-'+i,
                                data, false, {});
                     $(cbox).find('input').data('val', data);
@@ -1982,7 +1991,7 @@ define([
                 var lines = opts.items.map(function (itemData) {
                     var name = itemData.uid;
                     var item = itemData.v;
-                    var els = opts.values.map(function (data, i) {
+                    var els = extractValues(opts.values).map(function (data, i) {
                         var cbox = UI.createCheckbox('cp-form-'+name+'-'+i,
                                    '', false, {});
                         $(cbox).find('input').data('uid', name);
@@ -2011,7 +2020,7 @@ define([
                     });
                 });
 
-                var header = opts.values.map(function (v) { return h('span', v); });
+                var header = extractValues(opts.values).map(function (v) { return h('span', v); });
                 header.unshift(h('span'));
                 lines.unshift(h('div.cp-form-multiradio-header', header));
 
@@ -2164,7 +2173,7 @@ define([
 */
                     Util.shuffleArray(opts.values);
                 }
-                var els = opts.values.map(function (data) {
+                var els = extractValues(opts.values).map(function (data) {
                     var uid = Util.uid();
                     map[uid] = data;
                     invMap[data] = uid;
@@ -2215,7 +2224,7 @@ define([
                     },
                     reset: function () {
                         Util.shuffleArray(opts.values);
-                        var toSort = (opts.values).map(function (val) {
+                        var toSort = extractValues(opts.values).map(function (val) {
                             return invMap[val];
                         });
                         sortable.sort(toSort);
@@ -2283,7 +2292,7 @@ define([
 
                 var disabled = false;
                 // Add form
-                var addLine = opts.values.map(function (data) {
+                var addLine = extractValues(opts.values).map(function (data) {
                     var cell = h('div.cp-poll-cell.cp-form-poll-choice', [
                         h('i.fa.fa-times.cp-no'),
                         h('i.fa.fa-check.cp-yes'),
@@ -2389,7 +2398,7 @@ define([
                 var opts = form.opts || TYPES.poll.defaultOpts;
                 var q = form.q || Messages.form_default;
                 if (answer === false) {
-                    var cols = opts.values.map(function (key) {
+                    var cols = extractValues(opts.values).map(function (key) {
                         return q + ' | ' + key;
                     });
                     cols.unshift(q);
@@ -2405,7 +2414,7 @@ define([
                     if (i !== 0) { str += ';'; }
                     str += k.replace(';', '').replace(':', '') + ':' + answer.values[k];
                 });
-                var res = opts.values.map(function (key) {
+                var res = extractValues(opts.values).map(function (key) {
                     return answer.values[key] || '';
                 });
                 res.unshift(str);

From 1229b8d4d50ddcee5ffebc99180abc3d3d83dc64 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 6 Sep 2021 13:24:06 +0200
Subject: [PATCH 085/125] Migrate opts.values format

---
 www/form/inner.js | 84 +++++++++++++++++++++++++++++------------------
 1 file changed, 52 insertions(+), 32 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index a2998e936..87e81a3cf 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -93,12 +93,13 @@ define([
     var MAX_OPTIONS = 15;
     var MAX_ITEMS = 10;
 
+    var getOptionValue = function (obj) {
+        if (!Util.isObject(obj)) { return obj; }
+        return obj.v;
+    };
     var extractValues = function (values) {
         if (!Array.isArray(values)) { return []; }
-        return values.map(function (obj) {
-            if (typeof(obj) === "string") { return obj; }
-            return obj.v;
-        });
+        return values.map(getOptionValue);
     };
 
     var saveAndCancelOptions = function (cb) {
@@ -310,10 +311,9 @@ define([
                 input.selectionEnd = cursor.end || 0;
                 setTimeout(function () { input.focus(); });
             };
-            if (isItem) {
-                if (cursor && cursor.uid === uid && cursor.item) { setCursor(); }
-            } else {
-                if (cursor && cursor.el === val && !cursor.item) { setCursor(); }
+
+            if (cursor && cursor.uid === uid && Boolean(cursor.item) === Boolean(isItem)) {
+                setCursor();
             }
 
             var del = h('button.btn.btn-danger-outline', h('i.fa.fa-times'));
@@ -376,8 +376,9 @@ define([
 
             return el;
         };
-        // TODO uid
-        var inputs = extractValues(v.values).map(function (val) { return getOption(val, isDefaultOpts, false); });
+        var inputs = v.values.map(function (data) {
+            return getOption(data.v, isDefaultOpts, false, data.uid);
+        });
         inputs.push(add);
 
         var container = h('div.cp-form-edit-block', inputs);
@@ -553,9 +554,11 @@ define([
             $container.find('input').each(function (i, el) {
                 var val = $(el).val() || el.placeholder || '';
                 if (el === active && !el._flatpickr) {
-                    cursor.el = val;
+                    cursor.item = false;
+                    cursor.uid= $(el).data('uid');
                     cursor.start = el.selectionStart;
                     cursor.end = el.selectionEnd;
+                    cursor.el = val;
                 }
             });
             if (v.items) {
@@ -590,7 +593,6 @@ define([
         var getSaveRes = function () {
             // Get values
             var values = [];
-            var duplicates = false;
             if (v.type === "day") {
                 var dayPickr = $(calendarView).find('input')[0]._flatpickr;
                 values = dayPickr.selectedDates.map(function (date) {
@@ -605,14 +607,15 @@ define([
                             val = +f.selectedDates[0];
                         }
                     }
-                    if (val && values.indexOf(val) === -1) { values.push(val); }
-                    else { duplicates = true; }
+                    var hasUid = values.some(function (i) { return i.uid === uid; });
+                    var uid = hasUid ? Util.uid : $(el).data('uid');
+                    values.push({
+                        uid: uid,
+                        v: val
+                    });
+                    if (hasUid) { $(el).data('uid', uid); }
                 });
             }
-            values = values.filter(Boolean); // Block empty or undefined options
-            if (!values.length) {
-                return;
-            }
             var res = { values: values };
 
             // If multiline block, get items
@@ -621,23 +624,18 @@ define([
                 $(containerItems).find('input').each(function (i, el) {
                     var val = ($(el).val() || el.placeholder || '').trim();
                     var uid = $(el).data('uid');
-                    if (!items.some(function (i) { return i.uid === uid; })) {
-                        items.push({
-                            uid: $(el).data('uid'),
-                            v: val
-                        });
-                    }
-                    else { duplicates = true; }
+                    var hasUid = items.some(function (i) { return i.uid === uid; });
+                    var uid = hasUid ? Util.uid : $(el).data('uid');
+                    items.push({
+                        uid: uid,
+                        v: val
+                    });
+                    if (hasUid) { $(el).data('uid', uid); }
                 });
                 items = items.filter(Boolean);
                 res.items = items;
             }
 
-            // Show duplicates warning
-            if (duplicates) {
-                UI.warn(Messages.form_duplicates); // XXX autosave
-            }
-
             // If checkboxes, get the maximum number of values the users can select
             if (maxInput) {
                 var maxVal = Number($(maxInput).val());
@@ -688,13 +686,15 @@ define([
     var makePollTable = function (answers, opts, resultsPageObj) {
         // Sort date values
         if (opts.type !== "text") {
-            extractValues(opts.values).sort(function (a, b) { // TODO uid
+            opts.values.sort(function (_a, _b) {
+                var a = getOptionValue(_a);
+                var b = getOptionValue(_b);
                 return +new Date(a) - +new Date(b);
             });
         }
         // Create first line with options
         var allDays = getWeekDays(true);
-        var els = extractValues(opts.values).map(function (data) { // TODO uid
+        var els = extractValues(opts.values).map(function (data) {
             var _date;
             if (opts.type === "day") {
                 _date = new Date(data);
@@ -4225,6 +4225,26 @@ define([
 
             evShowConditions.fire();
 
+            // Migrate opts.values from string to object
+            if (!content.version) {
+                Object.keys(content.form).forEach(function (uid) {
+                    var block = content.form[uid];
+                    var values = Util.find(block, ['opts', 'values']);
+                    if (!Array.isArray(values)) { return; }
+                    if (block.opts.type === 'day') { return; }
+                    block.opts.values = values.map(function (data) {
+                        if (Util.isObject(data)) { return data; }
+                        return {
+                            uid: Util.uid(),
+                            v: data || Messages.form_newOption
+                        };
+                    });
+                });
+                content.version = 1;
+                changed = true;
+            }
+
+
             if (!getter && changed) { framework.localChange(); }
         };
 

From 9f2f488c2e967e4eab4229f0186700ba3e2376e1 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 6 Sep 2021 13:33:30 +0200
Subject: [PATCH 086/125] Add missing uid

---
 www/form/inner.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 87e81a3cf..f260e4465 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -459,7 +459,7 @@ define([
             });
             $(addMultipleButton).click(function () {
                 multiplePickr.selectedDates.some(function (date) {
-                    $add.before(getOption(date, false, false));
+                    $add.before(getOption(date, false, false, Util.uid()));
                     var l = $container.find('input').length;
                     $(maxInput).attr('max', l);
                     if (l >= MAX_OPTIONS) {
@@ -509,7 +509,7 @@ define([
                         time.setMinutes(0);
                         time.setSeconds(0);
                         time.setMilliseconds(0);
-                        var el = getOption(+time, false, false);
+                        var el = getOption(+time, false, false, Util.uid());
                         $add.before(el);
                         $(el).find('input').focus();
                         return;
@@ -529,7 +529,7 @@ define([
         // "Add option" button handler
         $add = $(add).click(function () {
             var txt = v.type ? '' : Messages.form_newOption;
-            var el = getOption(txt, true, false);
+            var el = getOption(txt, true, false, Util.uid());
             $add.before(el);
             $(el).find('input').focus();
             var l = $container.find('input').length;

From f28987bce5aaf2bddec9ec3d682482fac8234562 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 6 Sep 2021 13:34:34 +0200
Subject: [PATCH 087/125] Prepare for forms migration

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

diff --git a/www/form/inner.js b/www/form/inner.js
index 75fe1db3c..6e70260c7 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -85,7 +85,7 @@ define([
     var extractValues = function (values) {
         if (!Array.isArray(values)) { return []; }
         return values.map(function (obj) {
-            if (typeof(obj) === "string") { return obj; }
+            if (!Util.isObject(obj)) { return obj; }
             return obj.v;
         });
     };

From 86ff13a4efbf10b9f995b2771610d114c5a72985 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 20 Aug 2021 17:47:54 +0530
Subject: [PATCH 088/125] factor debugging data generation from support ticket
 transmission

and fix two incorrectly set width/height properties which overwrote 'appVersion'
---
 www/support/ui.js | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/www/support/ui.js b/www/support/ui.js
index fac6ef438..2f97ec412 100644
--- a/www/support/ui.js
+++ b/www/support/ui.js
@@ -10,14 +10,12 @@ define([
     '/customize/messages.js',
 ], function ($, ApiConfig, h, UI, Hash, Util, Clipboard, UIElements, Messages) {
 
-    var send = function (ctx, id, type, data, dest) {
+    var getDebuggingData = function (ctx, data) {
         var common = ctx.common;
-        var supportKey = ApiConfig.supportMailbox;
-        var supportChannel = Hash.getChannelIdFromKey(supportKey);
         var metadataMgr = common.getMetadataMgr();
-        var user = metadataMgr.getUserData();
         var privateData = metadataMgr.getPrivateData();
-
+        var user = metadataMgr.getUserData();
+        var teams = privateData.teams || {};
         data = data || {};
 
         data.sender = {
@@ -34,16 +32,12 @@ define([
             data.sender.quota = ctx.pinUsage;
         }
 
-        data.id = id;
-        data.time = +new Date();
-
-        var teams = privateData.teams || {};
         if (!ctx.isAdmin) {
             data.sender.userAgent = Util.find(window, ['navigator', 'userAgent']);
             data.sender.vendor = Util.find(window, ['navigator', 'vendor']);
             data.sender.appVersion = Util.find(window, ['navigator', 'appVersion']);
-            data.sender.appVersion = Util.find(window, ['screen', 'width']);
-            data.sender.appVersion = Util.find(window, ['screen', 'height']);
+            data.sender.screenWidth = Util.find(window, ['screen', 'width']);
+            data.sender.screenHeight = Util.find(window, ['screen', 'height']);
             data.sender.blockLocation = privateData.blockLocation || '';
             data.sender.teams = Object.keys(teams).map(function (key) {
                 var team = teams[key];
@@ -57,7 +51,25 @@ define([
                 }
                 return ret;
             }).filter(Boolean);
+        }
 
+        return data;
+    };
+
+    var send = function (ctx, id, type, data, dest) {
+        var common = ctx.common;
+        var supportKey = ApiConfig.supportMailbox;
+        var supportChannel = Hash.getChannelIdFromKey(supportKey);
+        var metadataMgr = common.getMetadataMgr();
+        var user = metadataMgr.getUserData();
+        var privateData = metadataMgr.getPrivateData();
+
+        data = getDebuggingData(ctx, data);
+
+        data.id = id;
+        data.time = +new Date();
+
+        if (!ctx.isAdmin) {
             // "dest" is the recipient that is not the admin support mailbox.
             // In the support page, make sure dest is always ourselves.
             dest.channel = privateData.support;
@@ -474,6 +486,10 @@ define([
         ui.makeCloseMessage = function (content, hash) {
             return makeCloseMessage(ctx, content, hash);
         };
+        ui.getDebuggingData = function (data) {
+            return getDebuggingData(ctx, data);
+        };
+
         return ui;
     };
 

From aad654e18410f689f86d034d8e74be1d20c0d1e6 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 20 Aug 2021 11:29:16 +0200
Subject: [PATCH 089/125] Fix calendar .ics import (#784)

---
 www/calendar/export.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/www/calendar/export.js b/www/calendar/export.js
index 64775762b..5967e2027 100644
--- a/www/calendar/export.js
+++ b/www/calendar/export.js
@@ -123,6 +123,7 @@ define([
                 var jcalData = ICAL.parse(content);
                 vcalendar = new ICAL.Component(jcalData);
             } catch (e) {
+                console.error(e);
                 return void cb(e);
             }
 
@@ -147,6 +148,18 @@ define([
                 var isAllDay = false;
                 var start = ev.getFirstPropertyValue('dtstart');
                 var end = ev.getFirstPropertyValue('dtend');
+                var duration = ev.getFirstPropertyValue('duration');
+                if (!end && !duration) {
+                    if (start.isDate) {
+                        end = start.clone();
+                        end.adjust(1); // Add one day
+                    } else {
+                        end = start.clone();
+                    }
+                } else if (!end) {
+                    end = start.clone();
+                    end.addDuration(duration);
+                }
                 if (start.isDate && end.isDate) {
                     isAllDay = true;
                     start = String(start);
@@ -175,7 +188,7 @@ define([
                         hidden.push(al.toString());
                     }
                     var trigger = al.getFirstPropertyValue('trigger');
-                    var minutes = -trigger.toSeconds() / 60;
+                    var minutes = trigger ? (-trigger.toSeconds() / 60) : 0;
                     if (reminders.indexOf(minutes) === -1) { reminders.push(minutes); }
                 });
 

From f6eb6d5ca64baabf60a17fc6c38a9f07b3ac2f9f Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 6 Sep 2021 18:25:47 +0530
Subject: [PATCH 090/125] remove some hardcoded translations

---
 www/calendar/inner.js            |  2 +-
 www/common/common-ui-elements.js | 24 +++---------------------
 www/common/sframe-common-file.js |  6 +-----
 www/common/toolbar.js            |  8 ++++----
 www/profile/inner.js             |  4 +---
 www/teams/inner.js               |  2 +-
 6 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/www/calendar/inner.js b/www/calendar/inner.js
index a1fd8c8e8..fbc910bdb 100644
--- a/www/calendar/inner.js
+++ b/www/calendar/inner.js
@@ -566,7 +566,7 @@ define([
                 attributes: {
                     'class': 'fa fa-trash-o',
                 },
-                content: h('span', Messages.kanban_delete), // XXX delete key is misleading... "Remove" ? `poll_remove`, `fc_remove`
+                content: h('span', Messages.poll_remove),
                 action: function (e) {
                     e.stopPropagation();
                     var cal = APP.calendars[id];
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 05b27f055..d9d6324cd 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -158,7 +158,7 @@ define([
             var data = users[key];
             var name = UI.getDisplayName(data.displayName || data.name);
             var avatar = h('span.cp-usergrid-avatar.cp-avatar', {
-                'aria-hidden': true, // XXX aria
+                'aria-hidden': true,
             });
             common.displayAvatar($(avatar), data.avatar, name, Util.noop, data.uid);
             var removeBtn, el;
@@ -1658,7 +1658,6 @@ define([
         UI.openCustomModal(modal);
     };
 
-    Messages.toolbar_userMenuAlt = "User menu"; // XXX
     UIElements.createUserAdminMenu = function (Common, config) {
         var metadataMgr = Common.getMetadataMgr();
 
@@ -1991,9 +1990,6 @@ define([
         */
 
         var $displayName = $userAdmin.find('.'+displayNameCls);
-        $userAdmin.attr({ // XXX is this on the right element?
-            alt: Messages.toolbar_userMenuAlt,
-        });
 
         var $avatar = $userAdmin.find('> button .cp-dropdown-button-title');
         var loadingAvatar;
@@ -2031,8 +2027,6 @@ define([
                     $userAdmin.find('> button').removeClass('cp-avatar');
                     if ($img) { $userAdmin.find('> button').addClass('cp-avatar'); }
                     loadingAvatar = false;
-
-                    // XXX alt="User menu"
                 }, uid);
                 return;
             }
@@ -3049,18 +3043,6 @@ define([
         var name = Util.fixHTML(data.title);
         var url = data.href;
         var user = data.name;
-        //Messages.link_open = "Open URL";
-            // openLinkInNewTab ("Open Link in New Tab")
-            // fc_open ("Open")
-            // share_linkOpen ("Preview")
-            // resources_openInNewTab ("Open it in a new tab")
-        Messages.link_open = Messages.fc_open; // XXX 4.11.0
-
-        //Messages.link_store = "Store link in drive";
-            // toolbar_storeInDrive ? ("Store in CryptDrive")
-            // autostore_store ? ("Store")
-        Messages.link_store = Messages.toolbar_storeInDrive; // XXX 4.11.0
-
 
         var content = h('div', [
             UI.setHTML(h('p'), Messages._getKey('notification_openLink', [name, user])),
@@ -3079,7 +3061,7 @@ define([
             keys: [27]
         }, {
             className: 'primary',
-            name: Messages.link_open,
+            name: Messages.fc_open,
             onClick: function () {
                 if (clicked) { return true; }
                 clicked = true;
@@ -3089,7 +3071,7 @@ define([
             keys: [13]
         }, {
             className: 'primary',
-            name: Messages.link_store,
+            name: Messages.toolbar_storeInDrive,
             onClick: function () {
                 if (clicked) { return; }
                 clicked = true;
diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js
index a56313444..facd27f22 100644
--- a/www/common/sframe-common-file.js
+++ b/www/common/sframe-common-file.js
@@ -315,9 +315,6 @@ define([
             return manualStore;
         };
 
-        Messages.upload_modal_alt = "Alt text"; // XXX
-        Messages.upload_addOptionalAlt = "Add descriptive text (optional)"; // XXX
-
         var fileUploadModal = function (defaultFileName, cb, preview) {
             var parsedName = /^(\.?.+?)(\.[^.]+)?$/.exec(defaultFileName) || [];
             var ext = parsedName[2] || "";
@@ -332,10 +329,9 @@ define([
                                    Messages._getKey('upload_modal_filename', [ext])),
                 h('input#cp-upload-name', {type: 'text', placeholder: defaultFileName, value: defaultFileName}),
 
-                h('label', {for: 'cp-upload-alt'}, Messages.upload_addOptionalAlt), // XXX alt text for uploads
+                h('label', {for: 'cp-upload-alt'}, Messages.upload_addOptionalAlt),
                 h('input#cp-upload-alt', {type: 'text', placeholder: Messages.upload_modal_alt}),
 
-
                 h('label', {for: 'cp-upload-password'}, Messages.addOptionalPassword),
                 UI.passwordInput({id: 'cp-upload-password'}),
                 h('span', {
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 62aa5dc32..c61387f6e 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -164,7 +164,6 @@ MessengerUI, Messages, Pages) {
         });
     };
     var showColors = false;
-    Messages.userlist_visitProfile = "Visit {0}'s profile"; // XXX "'s" is incorrect for names that end in "s" in English... don't care?
     var updateUserList = function (toolbar, config, forceOffline) {
         if (!config.displayed || config.displayed.indexOf('userlist') === -1) { return; }
         if (toolbar.isAlone) { return; }
@@ -459,8 +458,6 @@ MessengerUI, Messages, Pages) {
         return $container;
     };
 
-    Messages.toolbar_collapse = "Collapse toolbar"; // XXX 4.11.0
-    Messages.toolbar_expand = "Expand toolbar"; // XXX 4.11.0
     createCollapse = function (toolbar) {
         var up = h('i.fa.fa-chevron-up', {title: Messages.toolbar_collapse});
         var down = h('i.fa.fa-chevron-down', {title: Messages.toolbar_expand});
@@ -1046,7 +1043,10 @@ MessengerUI, Messages, Pages) {
             userMenuCfg.displayChangeName = 1;
         }
         Common.createUserAdminMenu(userMenuCfg);
-        $userAdmin.find('> button').attr('title', Messages.userAccountButton);
+        $userAdmin.find('> button').attr({
+            title: Messages.userAccountButton,
+            alt: Messages.userAccountButton,
+        });
 
         return $userAdmin;
     };
diff --git a/www/profile/inner.js b/www/profile/inner.js
index edf5ce01e..0b720940b 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -341,8 +341,6 @@ define([
         });
     };
 
-    Messages.profile_defaultAlt = "Default profile picture"; // XXX
-
     var displayAvatar = function (val) {
         var sframeChan = common.getSframeChannel();
         var $span = APP.$avatar;
@@ -350,7 +348,7 @@ define([
         if (!val) {
             $('<img>', {
                 src: '/customize/images/avatar.png',
-                title: Messages.profile_avatar,
+                title: Messages.profile_avatar, // XXX
                 alt: Messages.profile_defaultAlt,
             }).appendTo($span);
             return;
diff --git a/www/teams/inner.js b/www/teams/inner.js
index bd7fca5ed..485923996 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1099,7 +1099,7 @@ define([
             if (!val) {
                 var $img = $('<img>', {
                     src: '/customize/images/avatar.png',
-                    title: Messages.profile_avatar,
+                    title: Messages.profile_avatar, // XXX
                     alt: 'Avatar'
                 });
                 var mt = h('media-tag', $img[0]);

From 7f3dbc606a19eaf4dd236f1fbb90d5f01123665e Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Mon, 6 Sep 2021 14:57:16 +0200
Subject: [PATCH 091/125] Translated using Weblate (French)

Currently translated at 100.0% (1424 of 1424 strings)

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

Translated using Weblate (French)

Currently translated at 100.0% (1423 of 1423 strings)

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

diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index 1c1eafd38..2b2fed3e9 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -26,7 +26,7 @@
     "typeError": "Ce pad n'est pas compatible avec l'application sélectionnée",
     "onLogout": "Vous êtes déconnecté de votre compte utilisateur, {0}cliquez ici{1} pour vous authentifier<br>ou appuyez sur <em>Échap</em> pour accéder au pad en mode lecture seule.",
     "padNotPinned": "Ce pad va expirer après 3 mois d'inactivité, {0}connectez-vous{1} ou {2}enregistrez-vous{3} pour le préserver.",
-    "anonymousStoreDisabled": "L'administrateur de cette instance de CryptPad a désactivé le drive pour les utilisateurs non enregistrés. Vous devez vous connecter pour pouvoir utiliser CryptDrive.",
+    "anonymousStoreDisabled": "L'administrateur de cette instance de CryptPad a désactivé le drive pour les visiteurs. Enregistrez vous ou connectez vous à un compte pour pouvoir utiliser CryptDrive.",
     "expiredError": "Ce pad a atteint sa date d'expiration est n'est donc plus disponible.",
     "deletedError": "Ce document a été supprimé et n'est plus disponible.",
     "inactiveError": "Ce pad a été supprimé en raison de son inactivité. Appuyez sur Échap pour créer un nouveau pad.",
@@ -51,7 +51,7 @@
     "forgotten": "Déplacé vers la corbeille",
     "errorState": "Erreur critique : {0}",
     "readonly": "Lecture seule",
-    "anonymous": "Anonyme",
+    "anonymous": "Visiteur",
     "users": "Utilisateurs",
     "viewer": "lecteur",
     "viewers": "lecteurs",
@@ -89,7 +89,7 @@
     "shareSuccess": "Lien copié dans le presse-papiers",
     "userListButton": "Liste d'utilisateurs",
     "chatButton": "Chat",
-    "userAccountButton": "Votre compte",
+    "userAccountButton": "Menu utilisateur",
     "newButton": "Nouveau",
     "newButtonTitle": "Créer un nouveau pad",
     "uploadButton": "Importer des fichiers",
@@ -333,7 +333,7 @@
     "login_invalUser": "Nom d'utilisateur requis",
     "login_invalPass": "Mot de passe requis",
     "login_unhandledError": "Une erreur inattendue s'est produite :(",
-    "register_importRecent": "Importer les documents de votre session non-enregistrée",
+    "register_importRecent": "Importer les documents de votre session visiteur",
     "register_acceptTerms": "J'accepte <a>les conditions d'utilisation</a>",
     "register_passwordsDontMatch": "Les mots de passe doivent être identiques !",
     "register_passwordTooShort": "Les mots de passe doivent contenir au moins {0} caractères.",
@@ -502,7 +502,7 @@
     "whatis_drive": "Organisation avec CryptDrive",
     "features": "Fonctionnalités",
     "features_title": "Fonctionnalités",
-    "features_anon": "Non-enregistré",
+    "features_anon": "Visiteur",
     "features_registered": "Enregistré",
     "features_premium": "Premium",
     "features_f_apps": "Accès à toutes les applications",
@@ -514,7 +514,7 @@
     "features_f_cryptdrive0_note": "Stockage dans votre navigateur des pads visités afin de pouvoir les retrouver plus tard",
     "features_f_storage0": "Durée de stockage limitée",
     "features_f_storage0_note": "Les documents sont supprimés après {0} jours d'inactivité",
-    "features_f_anon": "Avantages des utilisateurs anonymes",
+    "features_f_anon": "Avantages des visiteurs",
     "features_f_anon_note": "Avec des fonctionnalités supplémentaires",
     "features_f_cryptdrive1": "Accès complet à CryptDrive",
     "features_f_cryptdrive1_note": "Dossiers, dossiers partagés, modèles, tags",
@@ -561,7 +561,7 @@
     "creation_expireDays": "Jour(s)",
     "creation_expireMonths": "Mois",
     "creation_password": "Mot de passe\n",
-    "creation_noTemplate": "Pas de modèle",
+    "creation_noTemplate": "Document vierge",
     "creation_newTemplate": "Nouveau modèle",
     "creation_create": "Créer",
     "creation_owners": "Propriétaires",
@@ -588,8 +588,8 @@
     "share_linkView": "Lecture-seule",
     "share_linkEmbed": "Mode intégration (cache la barre d'outils)",
     "share_linkPresent": "Présenter",
-    "share_linkOpen": "Aperçu",
-    "share_linkCopy": "Copier",
+    "share_linkOpen": "Ouvrir le lien",
+    "share_linkCopy": "Copier le lien",
     "share_embedCategory": "Intégration",
     "share_mediatagCopy": "Copier le mediatag",
     "sharedFolders_forget": "Ce pad est stocké uniquement dans un dossier partagé. Vous ne pouvez pas le déplacer dans votre corbeille. Si vous souhaitez le supprimer, vous pouvez utiliser l'application CryptDrive.",
@@ -879,7 +879,7 @@
     "oo_exportInProgress": "Exportation en cours",
     "oo_sheetMigration_loading": "Mise à jour de la feuille de calcul. Merci de patienter environ 1 minute.",
     "oo_sheetMigration_complete": "Version mise à jour disponible, appuyez sur OK pour recharger.",
-    "oo_sheetMigration_anonymousEditor": "L'édition de cette feuille de calcul est désactivée pour les utilisateurs non-enregistrés jusqu'à ce qu'elle soit mise à jour par un utilisateur enregistré.",
+    "oo_sheetMigration_anonymousEditor": "L'édition de cette feuille de calcul est désactivée pour les visiteurs jusqu'à ce qu'elle soit mise à jour par un utilisateur enregistré.",
     "imprint": "Mentions légales",
     "isContact": "{0} est dans vos contacts",
     "isNotContact": "{0} n'est <b>pas</b> dans vos contacts",
@@ -1108,7 +1108,7 @@
     "whatis_apps": "Une suite complète d'applications",
     "whatis_collaboration_info": "<p>CryptPad est construit pour permettre la collaboration. Les modifications apportées aux documents sont synchronisées en temps réel. Comme toutes les données sont chiffrées, le service et ses administrateurs n'ont aucun moyen de voir le contenu en cours d'édition et de stockage.</p>",
     "register_warning_note": "En raison de la nature chiffrée de CryptPad, les administrateurs du service ne seront pas en mesure de récupérer les données au cas où vous oublieriez votre nom d'utilisateur et/ou votre mot de passe. Veuillez les sauvegarder dans un endroit sûr.",
-    "register_notes": "<ul class=\"cp-notes-list\"><li>Votre mot de passe est la clé secrète utilisée pour chiffrer tous vos documents. <span class=\"red\">Si vous le perdez, nous ne pourrons pas récupérer vos données.</span></li><li>Si vous utilisez un ordinateur partagé, <span class=\"red\">n'oubliez pas de vous déconnecter</span> après avoir terminé. La simple fermeture de la fenêtre du navigateur laisse votre compte exposé.</li><li>Pour conserver les documents que vous avez créés et/ou stockés sans être connecté, cochez \"Importer les documents de votre session anonyme\". </li></ul>",
+    "register_notes": "<ul class=\"cp-notes-list\"><li>Votre mot de passe est la clé secrète utilisée pour chiffrer tous vos documents. <span class=\"red\">Si vous le perdez, nous ne pourrons pas récupérer vos données.</span></li><li>Si vous utilisez un ordinateur partagé, <span class=\"red\">n'oubliez pas de vous déconnecter</span> après avoir terminé. La simple fermeture de la fenêtre du navigateur laisse votre compte exposé.</li><li>Pour conserver les documents que vous avez créés et/ou stockés sans être connecté, cochez \"Importer les documents de votre session visiteur\". </li></ul>",
     "register_notes_title": "Notes importantes",
     "home_support": "<p>L'équipe de développement ne tire aucun profit des données personnelles des utilisateurs. Cela s'inscrit dans une vision pour des services en ligne qui respectent la vie privée. Contrairement aux grandes plateformes qui prétendent être \"gratuites\" tout en tirant profit des informations personnelles, CryptPad vise à construire un modèle durable financé volontairement par les utilisateurs.</p><p>Vous pouvez soutenir le projet en faisant un don unique ou récurrent par le biais de notre Open Collective. Notre budget est transparent et des mises à jour sont publiées régulièrement. Il existe également un certain nombre de <a>moyens non financiers de contribuer</a>.</p>",
     "home_support_title": "Soutenez CryptPad",
@@ -1283,7 +1283,7 @@
     "form_defaultOption": "Option {0}",
     "form_anonymous_off": "Bloquées",
     "form_anonymous_on": "Autorisées",
-    "form_anonymous": "Réponses anonymes",
+    "form_anonymous": "Accès visiteur (non connecté)",
     "form_willClose": "Ce formulaire fermera le {0}",
     "form_isClosed": "Ce formulaire a été fermé le {0}",
     "form_isOpen": "Ce formulaire est ouvert",
@@ -1292,7 +1292,7 @@
     "form_open": "Ouvrir",
     "form_isPrivate": "Les réponses sont privées",
     "form_isPublic": "Les réponses sont publiques",
-    "form_makePublicWarning": "Êtes-vous sûr de vouloir rendre les réponses à ce formulaire publiques ? Cette opération ne peut pas être annulée.",
+    "form_makePublicWarning": "Êtes-vous sûr de vouloir rendre publiques les réponses à ce formulaire ? Les réponses passées et futures seront visibles par les participants. Cette opération ne peut pas être annulée.",
     "form_makePublic": "Publier les réponses",
     "form_invalidQuestion": "Questions {0}",
     "form_invalidWarning": "Certaines résponses contiennent des erreurs :",
@@ -1309,7 +1309,7 @@
     "form_form": "Formulaire",
     "form_editor": "Éditeur",
     "form_results_empty": "Il n'y a pas de réponses",
-    "form_results": "Réponses",
+    "form_results": "Réponses ({0})",
     "form_answered": "Vous avez déjà répondu à ce formulaire",
     "form_cantFindAnswers": "Vos réponses à ce formulaire n'ont pas pu être récupérées.",
     "form_updateWarning": "Mettre à jour avec erreurs",
@@ -1382,5 +1382,47 @@
     "notification_openLink": "Vous avez reçu un lien <b>{0}</b> de {1} :",
     "ui_expand": "Développer",
     "ui_collapse": "Réduire",
-    "form_totalResponses": "Nombre de réponses : {0}"
+    "form_totalResponses": "Nombre de réponses : {0}",
+    "form_colors": "Thème de couleur",
+    "userlist_visitProfile": "Voir le profil",
+    "form_conditional_addAnd": "Ajouter une condition et",
+    "form_conditional_add": "Ajouter une condition ou",
+    "form_conditional": "Cette section ne sera affichée que si :",
+    "form_condition_has": "contient",
+    "form_condition_hasnot": "ne contient pas",
+    "form_condition_is": "est",
+    "form_condition_isnot": "n'est pas",
+    "form_condition_v": "Choisir une réponse",
+    "form_condition_q": "Choisir une question",
+    "form_type_section": "Section conditionelle",
+    "form_editable": "Modifier les réponses après l'envoi",
+    "form_responseMsg": "Ce message s'affichera après l'envoi du formulaire par un participant.",
+    "form_makeAnon": "Anonymiser les résponses",
+    "form_corruptAnswers": "Ce formulaire a déjà reçu des réponses. La modification du type de question risque d'invalider les données des réponses précédentes.",
+    "form_geturl": "Copier le lien",
+    "toolbar_preview": "Aperçu",
+    "form_updateMsg": "Modifier le message de confirmation",
+    "form_addMsg": "Ajouter un message de confirmation",
+    "form_changeTypeConfirm": "Sélectionner le type de question.",
+    "form_preview": "Aperçu",
+    "form_required_off": "Optionelle",
+    "form_required_on": "Requise",
+    "form_required_answer": "Réponse : ",
+    "form_requiredWarning": "Une réponse est requise pour les questions suivantes :",
+    "form_authAnswer": "Ce formulaire ne peut pas être envoyé de manière anonyme",
+    "form_anonAnswer": "Les réponses à ce formulaire sont anonymisées",
+    "form_viewAllAnswers": "Voir toutes les réponses ({0})",
+    "form_viewAnswer": "Voir mes réponses",
+    "form_editAnswer": "Modifier mes réponses",
+    "form_alreadyAnswered": "Vous avez repondu à ce formulaire le {0}",
+    "form_preview_button": "Aperçu",
+    "form_template_poll": "Sondage de disponibilité",
+    "upload_addOptionalAlt": "Ajouter un texte descitpif (optionnel)",
+    "upload_modal_alt": "Texte alternatif",
+    "profile_defaultAlt": "Image de profil par défaut",
+    "toolbar_expand": "Afficher la barre d'outils",
+    "toolbar_collapse": "Cacher la barre d'outils",
+    "support_premiumLink": "Voir les options d'abonnement",
+    "support_premiumPriority": "Les utilisateurs abonnés contribuent à l'amélioration des fonctionnalités de CryptPad et bénéficient de réponses prioritaires à leurs tickets de support.",
+    "form_conditional_hint": "Pour rendre cette section conditionnelle, veuillez ajouter une question choix ou cases à cocher ci-dessus"
 }

From 55571111adc0682835b60fc6c1e5b97b6afea2fc Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Mon, 6 Sep 2021 14:57:16 +0200
Subject: [PATCH 092/125] Translated using Weblate (English)

Currently translated at 100.0% (1424 of 1424 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1424 of 1424 strings)

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

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 67894897f..1894e983e 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1390,7 +1390,7 @@
     "profile_defaultAlt": "Default profile picture",
     "upload_modal_alt": "Alt text",
     "upload_addOptionalAlt": "Add descriptive text (optional)",
-    "form_template_poll": "Quick Poll",
+    "form_template_poll": "Quick Scheduling Poll",
     "form_preview_button": "Preview",
     "form_alreadyAnswered": "You responded to this form on {0}",
     "form_editAnswer": "Edit my responses",
@@ -1421,7 +1421,8 @@
     "form_condition_hasnot": "has not",
     "form_conditional": "Only show this section when:",
     "form_conditional_add": "Add OR condition",
-    "form_conditional_addAnd": "Add AND condition\n",
+    "form_conditional_addAnd": "Add AND condition",
     "userlist_visitProfile": "Visit profile",
-    "form_colors": "Color theme"
+    "form_colors": "Color theme",
+    "form_conditional_hint": "To make this section conditional, please add a choice or checkbox question above it"
 }

From db0fb7d8a4cc64db8de2516969a4f7dcce1a3e2f Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Mon, 6 Sep 2021 14:57:17 +0200
Subject: [PATCH 093/125] Translated using Weblate (Japanese)

Currently translated at 99.0% (1410 of 1423 strings)

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

Translated using Weblate (Japanese)

Currently translated at 98.5% (1402 of 1423 strings)

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

diff --git a/www/common/translations/messages.ja.json b/www/common/translations/messages.ja.json
index 25323cfa3..8ab53c469 100644
--- a/www/common/translations/messages.ja.json
+++ b/www/common/translations/messages.ja.json
@@ -196,7 +196,7 @@
     "contacts_unmute": "ミュート解除",
     "contacts_mute": "ミュート",
     "contacts": "連絡先",
-    "share_linkOpen": "プレビュー",
+    "share_linkOpen": "リンクを開く",
     "share_linkView": "表示",
     "view": "表示",
     "settings_exportError": "表示エラー",
@@ -626,7 +626,7 @@
     "autostore_pad": "パッド",
     "autostore_sf": "フォルダ",
     "autostore_file": "ファイル",
-    "share_linkCopy": "コピー",
+    "share_linkCopy": "リンクをコピー",
     "creation_passwordValue": "パスワード",
     "edit": "編集",
     "features": "機能",
@@ -1393,5 +1393,24 @@
     "form_editAnswer": "回答を編集",
     "form_preview_button": "プレビュー",
     "upload_addOptionalAlt": "説明文を追加（任意）",
-    "upload_modal_alt": "代替テキスト"
+    "upload_modal_alt": "代替テキスト",
+    "form_authAnswer": "このフォームは匿名では送信できません",
+    "form_anonAnswer": "このフォームへの回答は匿名化されています",
+    "form_viewAllAnswers": "全ての回答を表示（{0}）",
+    "form_condition_v": "値を選択",
+    "form_condition_q": "質問を選択",
+    "form_makeAnon": "回答を匿名化",
+    "toolbar_preview": "プレビュー",
+    "form_required_off": "任意",
+    "form_required_on": "必須",
+    "form_colors": "テーマの色",
+    "profile_defaultAlt": "既定のプロフィール画像",
+    "userlist_visitProfile": "プロフィールを表示",
+    "form_addMsg": "送信時のメッセージを追加",
+    "form_updateMsg": "送信時のメッセージを変更",
+    "form_corruptAnswers": "このフォームには既に回答があります。設問の種類を変更すると、回答のデータが無効になる恐れがあります。",
+    "form_changeTypeConfirm": "新しい設問の種類を選択してください。",
+    "form_required_answer": "回答： ",
+    "form_requiredWarning": "以下の設問は回答が必須です：",
+    "form_alreadyAnswered": "このフォームに{0}に回答しました"
 }

From 29c63b52baf4b8390ea83cf8e9f3d9fbd7c822d3 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Mon, 6 Sep 2021 14:57:17 +0200
Subject: [PATCH 094/125] Translated using Weblate (German)

Currently translated at 98.1% (1396 of 1423 strings)

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

diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json
index 35067f597..3d37d8b8c 100644
--- a/www/common/translations/messages.de.json
+++ b/www/common/translations/messages.de.json
@@ -88,7 +88,7 @@
     "shareSuccess": "Die URL wurde in die Zwischenablage kopiert",
     "userListButton": "Benutzerliste",
     "chatButton": "Chat",
-    "userAccountButton": "Dein Account",
+    "userAccountButton": "Benutzermenü",
     "newButton": "Neu",
     "newButtonTitle": "Neues Pad erstellen",
     "uploadButton": "Hochladen",
@@ -557,7 +557,7 @@
     "creation_expireDays": "Tag(e)",
     "creation_expireMonths": "Monat(e)",
     "creation_password": "Passwort\n",
-    "creation_noTemplate": "Keine Vorlage",
+    "creation_noTemplate": "Leeres Dokument",
     "creation_newTemplate": "Neue Vorlage",
     "creation_create": "Erstellen",
     "creation_owners": "Eigentümer",
@@ -584,8 +584,8 @@
     "share_linkView": "Ansehen",
     "share_linkEmbed": "Einbettungsmodus (Werkzeugleiste und Benutzerliste verbergen)",
     "share_linkPresent": "Anzeigemodus",
-    "share_linkOpen": "Vorschau",
-    "share_linkCopy": "Kopieren",
+    "share_linkOpen": "Link öffnen",
+    "share_linkCopy": "Link kopieren",
     "share_embedCategory": "Einbetten",
     "share_mediatagCopy": "Media-Tag in die Zwischenablage kopieren",
     "sharedFolders_forget": "Dieses Pad ist nur in einem geteilten Ordner gespeichert. Du kannst es nicht in den Papierkorb verschieben. Aber du kannst es in deinem CryptDrive löschen.",
@@ -1243,12 +1243,12 @@
     "button_newform": "Neues Formular",
     "form_page": "Seite {0}/{1}",
     "form_anonymous_on": "Erlaubt",
-    "form_anonymous": "Anonyme Antworten",
+    "form_anonymous": "Gastzugriff (nicht eingeloggt)",
     "form_removeEnd": "Enddatum entfernen",
     "form_setEnd": "Enddatum festlegen",
     "form_isPrivate": "Antworten sind privat",
     "form_isPublic": "Antworten sind öffentlich",
-    "form_makePublicWarning": "Bist du sicher, dass du die Antworten veröffentlichen möchtest? Dies kann nicht rückgängig gemacht werden.",
+    "form_makePublicWarning": "Bist du sicher, dass du die Antworten veröffentlichen möchtest? Vergangene und zukünftige Antworten werden für Teilnehmer sichtbar sein. Dies kann nicht rückgängig gemacht werden.",
     "form_makePublic": "Antworten veröffentlichen",
     "form_invalidQuestion": "Frage {0}",
     "form_input_ph_url": "https://example.com",
@@ -1256,7 +1256,7 @@
     "form_backButton": "Zurück",
     "form_showSummary": "Zusammenfassung anzeigen",
     "form_results_empty": "Es gibt keine Antworten",
-    "form_results": "Antworten",
+    "form_results": "Antworten ({0})",
     "form_delete": "Löschen",
     "form_reset": "Zurücksetzen",
     "form_maxOptions": "Maximal {0} Antwort(en)",
@@ -1384,5 +1384,17 @@
     "ui_expand": "Ausklappen",
     "ui_collapse": "Einklappen",
     "support_premiumPriority": "Premium-Benutzer helfen bei der Verbesserung der Benutzerfreundlichkeit von CryptPad und profitieren von priorisierten Antworten auf ihre Support-Tickets.",
-    "support_premiumLink": "Abonnementoptionen ansehen"
+    "support_premiumLink": "Abonnementoptionen ansehen",
+    "form_viewAnswer": "Meine Antworten anzeigen",
+    "form_editAnswer": "Meine Antworten bearbeiten",
+    "form_preview_button": "Vorschau",
+    "form_colors": "Farbschema",
+    "userlist_visitProfile": "Profil aufrufen",
+    "toolbar_preview": "Vorschau",
+    "form_geturl": "Link kopieren",
+    "upload_modal_alt": "Alt-Text",
+    "upload_addOptionalAlt": "Beschreibungstext hinzufügen (optional)",
+    "toolbar_expand": "Werkzeugleiste ausklappen",
+    "toolbar_collapse": "Werkzeugleiste einklappen",
+    "profile_defaultAlt": "Standard-Profilbild"
 }

From 587608c43a191cc7954b88db43848687bfced48d Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 6 Sep 2021 18:31:06 +0530
Subject: [PATCH 095/125] update changelog

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 822249a4d..670d71eca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,14 @@
 * warning about lack of support for internet explorer
   * existing support will get worse over time. please update.
 
+To update from 4.10.0 to 4.11.0:
+
+1. Stop your server
+2. Get the latest code with git
+3. Install the latest dependencies with `bower update` and `npm i`
+4. Restart your server
+5. Confirm that your instance is passing all the tests included on the `/checkup/` page (on whatever devices you intend to support)
+
 ## Features
 
 * unify unregistered/non-registered/anonymous terminology as 'guest'

From f2a1577eca565cc54cf801a7df492d81905ace70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 6 Sep 2021 14:19:09 +0100
Subject: [PATCH 096/125] Edit list of emoji for Guest avatars

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

diff --git a/www/common/application_config_internal.js b/www/common/application_config_internal.js
index 2993edc52..4a58085ab 100644
--- a/www/common/application_config_internal.js
+++ b/www/common/application_config_internal.js
@@ -208,7 +208,7 @@ define(function() {
     // the driveless mode by changing the following value to "false"
     AppConfig.allowDrivelessMode = true;
 
-    AppConfig.emojiAvatars = '🙈 🦀 🐞 🦋 🐬 🐋 🐢 🦉 🦆 🐧 🦡 🦘 🦨 🦦 🦥 🐼 🐻 🦝 🦓 🐄 🐷 🐐 🦙 🦒 🐘 🦏 🐁 🐹 🐰 🦫 🦔 🐨 🐱 🐺 👺 👹 👽 👾 🤖'.split(/\s+/);
+    AppConfig.emojiAvatars = '🙈 🦀 🐞 🦋 🐬 🐋 🐢 🦉 🦆 🐧 🦡 🦘 🦨 🦦 🦥 🐼 🐻 🦝 🦓 🐄 💮️ 🐙️ 🌸️ 🌻️ 🐝️ 🐐 🦙 🦒 🐘 🦏 🐁 🐹 🐰 🦫 🦔 🐨 🐱 🐺 👺 👹 👽 👾 🤖'.split(/\s+/);
 
     return AppConfig;
 });

From 0d4a834d42e68673793eefd9697b46b2553fbc88 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 6 Sep 2021 15:30:34 +0200
Subject: [PATCH 097/125] Fix response page

---
 www/form/inner.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index f260e4465..7404c0a89 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1691,7 +1691,7 @@ define([
                 var count = {};
 
                 var opts = form[uid].opts || TYPES.radio.defaultOpts;
-                (opts.values || []).forEach(function (v) { count[v] = 0; });
+                extractValues(opts.values).forEach(function (v) { count[v] = 0; });
 
                 Object.keys(answers).forEach(function (author) {
                     var obj = answers[author];
@@ -1811,7 +1811,7 @@ define([
                         var c = count[q_uid];
                         if (!c) {
                             count[q_uid] = c = {};
-                            (opts.values || []).forEach(function (v) { c[v] = 0; });
+                            extractValues(opts.values).forEach(function (v) { c[v] = 0; });
                         }
                         var res = answer[q_uid];
                         if (!res || !res.trim || !res.trim()) { return; }
@@ -1952,7 +1952,7 @@ define([
                 var count = {};
 
                 var opts = form[uid].opts || TYPES.checkbox.defaultOpts;
-                (opts.values || []).forEach(function (v) { count[v] = 0; });
+                extractValues(opts.values || []).forEach(function (v) { count[v] = 0; });
 
                 var showBars = Boolean(content);
                 Object.keys(answers).forEach(function (author) {
@@ -2093,7 +2093,7 @@ define([
                         var c = count[q_uid];
                         if (!c) {
                             count[q_uid] = c = {};
-                            (opts.values || []).forEach(function (v) { c[v] = 0; });
+                            extractValues(opts.values || []).forEach(function (v) { c[v] = 0; });
                         }
                         var res = answer[q_uid];
                         if (res && typeof(res) === "string") { res = [res]; }
@@ -2257,7 +2257,7 @@ define([
                 //var results = [];
                 var empty = 0;
                 var count = {};
-                (opts.values || []).forEach(function (v) { count[v] = 0; });
+                extractValues(opts.values || []).forEach(function (v) { count[v] = 0; });
                 var showBars = Boolean(content);
                 Object.keys(answers).forEach(function (author) {
                     var obj = answers[author];

From 8de2a03dc4b7bd14ffb591161774ecea6c266b02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 6 Sep 2021 15:02:56 +0100
Subject: [PATCH 098/125] Fix height of template name that was cropping
 descenders

---
 customize.dist/src/less2/include/creation.less | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/customize.dist/src/less2/include/creation.less b/customize.dist/src/less2/include/creation.less
index f4f4d0193..b15863c57 100644
--- a/customize.dist/src/less2/include/creation.less
+++ b/customize.dist/src/less2/include/creation.less
@@ -364,9 +364,9 @@
                         overflow: hidden;
                         text-overflow: ellipsis;
                         white-space: nowrap;
-                        min-height: 20px;
-                        height: 20px;
-                        line-height: 20px;
+                        min-height: 25px;
+                        height: 25px;
+                        line-height: 25px;
                         max-width: 100%;
                     }
                     .fa, .cptools {

From 899d0b7d13ccc495080929c2e0cab6b93ffb9b13 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 6 Sep 2021 16:54:13 +0200
Subject: [PATCH 099/125] Forms V2

---
 www/common/common-ui-elements.js |  31 +++--
 www/form/inner.js                | 203 +++++++++++++++++++++++--------
 2 files changed, 172 insertions(+), 62 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index fb5b40fc0..cba52ff14 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1438,18 +1438,25 @@ define([
             window.setTimeout(function () { $innerblock.hide(); }, 0);
         };
 
-        config.options.forEach(function (o) {
-            if (!isValidOption(o)) { return; }
-            if (isElement(o)) { return $innerblock.append($(o)); }
-            var $el = $('<' + o.tag + '>', o.attributes || {}).html(o.content || '');
-            $el.appendTo($innerblock);
-            if (typeof(o.action) === 'function') {
-                $el.click(function (e) {
-                    var close = o.action(e);
-                    if (close) { hide(); }
-                });
-            }
-        });
+        var setOptions = function (options) {
+            options.forEach(function (o) {
+                if (!isValidOption(o)) { return; }
+                if (isElement(o)) { return $innerblock.append($(o)); }
+                var $el = $('<' + o.tag + '>', o.attributes || {}).html(o.content || '');
+                $el.appendTo($innerblock);
+                if (typeof(o.action) === 'function') {
+                    $el.click(function (e) {
+                        var close = o.action(e);
+                        if (close) { hide(); }
+                    });
+                }
+            });
+        };
+        setOptions(config.options);
+        $container.setOptions = function (options) {
+            $innerblock.empty();
+            setOptions(options);
+        };
 
         $container.append($button).append($innerblock);
 
diff --git a/www/form/inner.js b/www/form/inner.js
index 7404c0a89..d51b636fe 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -582,7 +582,7 @@ define([
                         flatpickr: true,
                         val: +f.selectedDates[0],
                         y: rect && rect.y
-                    }
+                    };
                 });
             }
             return {
@@ -607,8 +607,9 @@ define([
                             val = +f.selectedDates[0];
                         }
                     }
+                    var uid = $(el).data('uid');
                     var hasUid = values.some(function (i) { return i.uid === uid; });
-                    var uid = hasUid ? Util.uid : $(el).data('uid');
+                    if (hasUid) { uid = Util.uid(); }
                     values.push({
                         uid: uid,
                         v: val
@@ -625,7 +626,7 @@ define([
                     var val = ($(el).val() || el.placeholder || '').trim();
                     var uid = $(el).data('uid');
                     var hasUid = items.some(function (i) { return i.uid === uid; });
-                    var uid = hasUid ? Util.uid : $(el).data('uid');
+                    if (hasUid) { uid = Util.uid(); }
                     items.push({
                         uid: uid,
                         v: val
@@ -912,6 +913,12 @@ define([
         return res;
     };
 
+    var getSections = function (content) {
+        var uids = Object.keys(content.form).filter(function (uid) {
+            return content.form[uid].type === 'section';
+        });
+        return uids;
+    };
     var getFullOrder = function (content) {
         var order = content.order.slice();
         getSections(content).forEach(function (uid) {
@@ -941,6 +948,25 @@ define([
         }).filter(Boolean);
     };
 
+    // When there is a change to the form, we need to check if we can still add
+    // conditions to the different sections
+    evShowConditions.reg(function () {
+        (APP.formBlocks || []).forEach(function (block) {
+            if (!block || !block.updateState) { return; }
+            block.updateState();
+        });
+    });
+    // When a section contains a condition that is now invalid (the question has been moved
+    // or deleted locally), we need to redraw the list of conditions for this section
+    evCheckConditions.reg(function (_uid) {
+        (APP.formBlocks || []).some(function (block) {
+            if (block.uid && block.uid !== _uid) { return; }
+            if (!block || !block.updateState) { return; }
+            return block.updateState(true, _uid);
+        });
+    });
+
+
     Messages.form_type_section = "Conditional section"; // XXX
     var STATIC_TYPES = {
         md: {
@@ -1100,14 +1126,16 @@ define([
                             type: type,
                             q: block.q || Messages.form_default
                         };
+                        var val;
                         if (type === 'radio') {
-                            obj.values = block.opts ? block.opts.values
-                                                    : TYPES.radio.defaultOpts.values;
+                            val = block.opts ? block.opts.values
+                                             : APP.TYPES.radio.defaultOpts.values;
                         }
                         if (type === 'checkbox') {
-                            obj.values = block.opts ? block.opts.values
-                                                    : TYPES.checkbox.defaultOpts.values;
+                            val = block.opts ? block.opts.values
+                                             : APP.TYPES.checkbox.defaultOpts.values;
                         }
+                        obj.values = extractValues(val);
                         return obj;
                     }).filter(Boolean);
                     return values;
@@ -1131,6 +1159,7 @@ define([
                     $container.append(btn);
                     return $b;
                 };
+                var values = getConditionsValues();
                 getConditions = function ($container, isNew, rules, condition, $btn) {
                     Messages.form_condition_q = "Choose a question"; // XXX
                     Messages.form_condition_v = "Choose a value"; // XXX
@@ -1168,7 +1197,6 @@ define([
 
                     onChange();
 
-                    var values = getConditionsValues();
                     var qOptions = values.map(function (obj) {
                         return {
                             tag: 'a',
@@ -1254,7 +1282,6 @@ define([
                         $container.append($content);
                     }
 
-                    var isChange;
                     qSelect.onChange.reg(function (prettyVal, val, init) {
                         qSelect.find('button').removeClass('btn-secondary')
                             .addClass('btn-default');
@@ -1373,36 +1400,18 @@ define([
                 };
                 redraw();
 
+                Messages.form_condition_hint = "To make this section conditional, please add a choice or checkbox question above it."; // XXX
+                var hintDiv = h('div.cp-form-conditional-hint', [
+                    h('div.cp-form-conditional-hint', Messages.form_condition_hint)
+                ]);
+                var $hint = $(hintDiv).prependTo(tag);
+
                 $addC.click(function () {
                     var rulesC = h('div.cp-form-condition-rule');
                     var $rulesC = $(rulesC);
                     getConditions($rulesC, true);
                     $addC.before($rulesC);
                 });
-                if (getConditionsValues().length) {
-                    $condition.show();
-                } else {
-                    $condition.hide();
-                }
-                // XXX unreg these 2 events
-                evShowConditions.reg(function () {
-                    if (getConditionsValues().length) {
-                        $condition.show();
-                    } else {
-                        $condition.hide();
-                    }
-                });
-                evCheckConditions.reg(function (_uid) {
-                    if (uid !== _uid) { return; }
-                    // If our conditions are invalid, redraw them
-                    if (getConditionsValues().length) {
-                        $condition.show();
-                    } else {
-                        $condition.hide();
-                    }
-                    $condition.find('.cp-form-condition-rule').remove();
-                    redraw();
-                });
 
                 var cursorGetter = function () {
                     var $activeDrop = $condition.find('.cp-dropdown-content:visible').first();
@@ -1444,7 +1453,89 @@ define([
                         }
                     }
                 });
+
+                // If "needRedraw" is false, we only want to know if we can add conditions and
+                // if we can't, make sure we delete incomplete conditions before hiding the button
+                // If "needRedraw" is true, it means we ant to redraw a section because some
+                // conditions are invalid
+                var updateState = function (needRedraw, _uid) {
+                    if (needRedraw && uid !== _uid) { return; }
+
+                    values = getConditionsValues();
+                    var available = values.length;
+                    if (available) {
+                        $condition.show();
+                        $hint.hide();
+                    } else {
+                        $condition.hide();
+                        $hint.show();
+                    }
+
+                    if (needRedraw) {
+                        $condition.find('.cp-form-condition-rule').remove();
+                        redraw();
+                        return true;
+                    } else {
+                        if (available) {
+                            // Questions may have moved. We need to redraw our dropdowns
+                            // to make sure we use the correct list
+                            $condition.find('.cp-form-condition').each(function (i, el) {
+                                // Update question dropdown
+                                var $q = $(el).find('.cp-dropdown-container[data-drop="q"]');
+                                var drop = $q[0] && $q[0].dropdown;
+                                if (!drop) { return; }
+                                var qOptions = values.map(function (obj) {
+                                    return {
+                                        tag: 'a',
+                                        attributes: {
+                                            'class': 'cp-form-condition-question',
+                                            'data-value': obj.uid,
+                                            'href': '#',
+                                        },
+                                        content: obj.q
+                                    };
+                                });
+                                drop.setOptions(qOptions);
+
+                                // Update values dropdown
+                                var $v = $(el).find('.cp-dropdown-container[data-drop="v"]');
+                                if (!$v.length) { return; }
+                                var dropV = $v[0] && $v[0].dropdown;
+                                if (!dropV) { return; }
+                                var val = drop.getValue();
+                                var res, type;
+                                values.some(function (obj) {
+                                    if (String(obj.uid) === String(val)) {
+                                        res = obj.values;
+                                        type = obj.type;
+                                        return true;
+                                    }
+                                });
+                                var vOptions = res.map(function (str) {
+                                    return {
+                                        tag: 'a',
+                                        attributes: {
+                                            'class': 'cp-form-condition-value',
+                                            'data-value': str,
+                                            'href': '#',
+                                        },
+                                        content: str
+                                    };
+                                });
+                                dropV.setOptions(vOptions);
+                            });
+                        } else {
+                            // We don't have invalid condition but we may have incomplete
+                            // conditions to delete
+                            block.opts.when = [];
+                            $condition.find('.cp-form-condition-rule').remove();
+                        }
+                    }
+                };
+                updateState();
+
                 return {
+                    updateState: updateState,
                     tag: tag,
                     noViewMode: true,
                     getCursor: cursorGetter,
@@ -1483,7 +1574,7 @@ define([
         return rows;
     };
 
-    var TYPES = {
+    var TYPES = APP.TYPES = {
         input: {
             defaultOpts: {
                 type: 'text'
@@ -1628,7 +1719,10 @@ define([
             compatible: ['radio', 'checkbox', 'sort'],
             defaultOpts: {
                 values: [1,2].map(function (i) {
-                    return Messages._getKey('form_defaultOption', [i]);
+                    return {
+                        uid: Util.uid(),
+                        v: Messages._getKey('form_defaultOption', [i])
+                    };
                 })
             },
             get: function (opts, a, n, evOnChange) {
@@ -1716,7 +1810,10 @@ define([
                     };
                 }),
                 values: [1,2].map(function (i) {
-                    return Messages._getKey('form_defaultOption', [i]);
+                    return {
+                        uid: Util.uid(),
+                        v: Messages._getKey('form_defaultOption', [i])
+                    };
                 })
             },
             get: function (opts, a, n, evOnChange) {
@@ -1869,7 +1966,10 @@ define([
             defaultOpts: {
                 max: 3,
                 values: [1, 2, 3].map(function (i) {
-                    return Messages._getKey('form_defaultOption', [i]);
+                    return {
+                        uid: Util.uid(),
+                        v: Messages._getKey('form_defaultOption', [i])
+                    };
                 })
             },
             get: function (opts, a, n, evOnChange) {
@@ -1981,7 +2081,10 @@ define([
                     };
                 }),
                 values: [1,2,3].map(function (i) {
-                    return Messages._getKey('form_defaultOption', [i]);
+                    return {
+                        uid: Util.uid(),
+                        v: Messages._getKey('form_defaultOption', [i])
+                    };
                 })
             },
             get: function (opts, a, n, evOnChange) {
@@ -2153,7 +2256,10 @@ define([
             compatible: ['radio', 'checkbox', 'sort'],
             defaultOpts: {
                 values: [1,2].map(function (i) {
-                    return Messages._getKey('form_defaultOption', [i]);
+                    return {
+                        uid: Util.uid(),
+                        v: Messages._getKey('form_defaultOption', [i])
+                    };
                 })
             },
             get: function (opts, a, n, evOnChange) {
@@ -2279,7 +2385,10 @@ define([
             defaultOpts: {
                 type: 'text', // Text or Days or Time
                 values: [1, 2, 3].map(function (i) {
-                    return Messages._getKey('form_defaultOption', [i]);
+                    return {
+                        uid: Util.uid(),
+                        v: Messages._getKey('form_defaultOption', [i])
+                    };
                 })
             },
             get: function (opts, answers, username, evOnChange) {
@@ -2804,12 +2913,6 @@ define([
     Messages.form_anonAnswer = "All answers to this form are anonymous"; // XXX
     Messages.form_authAnswer = "You can't answer anonymously to this form"; // XXX
 
-    var getSections = function (content) {
-        var uids = Object.keys(content.form).filter(function (uid) {
-            return content.form[uid].type === 'section';
-        });
-        return uids;
-    };
     var getSectionFromQ = function (content, uid) {
         var arr = content.order;
         var idx = content.order.indexOf(uid);
@@ -2939,7 +3042,7 @@ define([
                 ]);
             }
             if (!APP.cantAnon) {
-                var $anon = $(anonName).hide();
+                $anon = $(anonName).hide();
                 $anonBox.on('change', function () {
                     if (Util.isChecked($anonBox)) { $anon.hide(); }
                     else { $anon.show(); }
@@ -3279,7 +3382,7 @@ define([
 
         var order = getFullOrder(content);
 
-        order.forEach(function (uid, blockIdx) {
+        order.forEach(function (uid) {
             var block = form[uid];
             var type = block.type;
             var model = TYPES[type] || STATIC_TYPES[type];
@@ -3344,7 +3447,7 @@ define([
             Messages.form_required_on = "required";
             Messages.form_required_off = "optional";
             // Required radio displayed only for types that have an "isEmpty" function
-            var requiredDiv, conditionalDiv;
+            var requiredDiv;
             if (APP.isEditor && !isStatic && data.isEmpty) {
                 if (!block.opts) { block.opts = TYPES[type].defaultOpts; }
                 var isRequired = Boolean(block.opts.required);
@@ -4104,7 +4207,7 @@ define([
                     });
                     var save = h('button.btn.btn-primary', Messages.settings_save);
                     $(save).click(function () {
-                        if (dataPicker.value === '') {
+                        if (datePicker.value === '') {
                             return void refreshEndDate();
                         }
                         var d = picker.parseDate(datePicker.value);

From 4072b0451ecf0b8b99e7bc34cb10bc7269feec40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 6 Sep 2021 16:30:58 +0100
Subject: [PATCH 100/125] Fix condition button margin for small screens

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

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 956d49d71..e72458b5b 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -199,8 +199,8 @@
                         align-items: center;
                         margin-bottom: 10px;
                         flex-wrap: wrap;
-                        & > *:not(:first-child) {
-                            margin-left: 10px;
+                        & > * {
+                            margin-right: 10px;
                         }
                         .cp-dropdown-container button {
                             max-width: 200px;

From c141b77efcbf15b44e3ba3ce978faa88529b7635 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 6 Sep 2021 17:44:13 +0200
Subject: [PATCH 101/125] Fix report app

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

diff --git a/www/report/main.js b/www/report/main.js
index f4dd33429..8f39aa232 100644
--- a/www/report/main.js
+++ b/www/report/main.js
@@ -10,7 +10,7 @@ define([
     '/common/cryptpad-common.js',
     '/common/outer/cache-store.js',
     '/common/common-interface.js',
-    '/bower_components/chainpad-netflux/chainpad-netflux.js',
+    'chainpad-netflux',
     '/bower_components/chainpad-crypto/crypto.js',
     '/common/userObject.js',
     '/common/clipboard.js',

From 602c2f26168d2839d341a6da65bca1f0d89f02f7 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 6 Sep 2021 18:05:37 +0200
Subject: [PATCH 102/125] Update responses style

---
 www/form/app-form.less | 38 +++++---------------------------------
 1 file changed, 5 insertions(+), 33 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 6c4cbd9e9..a7a494501 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -734,42 +734,14 @@
                 }
             }
 
-           .cp-form-results-type-radio {
-                display: table;
-                width: 100%;
-                .cp-form-results-type-multiradio-data {
-                    display: flex;
-                    flex-flow: column;
-                }
-                .cp-form-results-type-radio-data {
-                    display: table-row;
-                    border: 1px solid transparent;
-                    & > span {
-                        .cp-form-results-cell();
-                        &.cp-value {
-                            max-width: 200px;
-                            min-width: 200px;
-                            white-space: nowrap;
-                            overflow: hidden;
-                            text-overflow: ellipsis;
-                        }
-                        &.cp-bar-container {
-                            width: 99%;
-                            padding: 0px;
-                            position: relative;
-                            background: transparent;
-                            border-left-width: 15px;
-                            border-right-width: 15px;
-                            .cp-bar {
-                                position: absolute;
-                                background: fade(@cryptpad_text_col, 50%);
-                                height: 50%;
-                                top: 25%;
-                            }
-                        }
+            .cp-charts {
+                .cp-bar-container {
+                    .cp-bar {
+                        background-color: @cryptpad_color_link;
                     }
                 }
             }
+
             .cp-form-results-contained {
                 max-height: 350px; // enough for 10 table entries
                 overflow: auto;

From 652fc6abcdf43eae410166d462e77e9eb55534ee Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 7 Sep 2021 10:23:48 +0200
Subject: [PATCH 103/125] update bower.json

---
 bower.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index 81acde661..0f8337867 100644
--- a/bower.json
+++ b/bower.json
@@ -49,7 +49,8 @@
     "jszip": "Stuk/jszip#^3.1.5",
     "requirejs-plugins": "^1.0.3",
     "dragula.js": "3.7.2",
-    "MathJax": "3.0.5"
+    "MathJax": "3.0.5",
+    "es6-promise ": "4.2.4"
   },
   "resolutions": {
     "bootstrap": "^v4.0.0",

From 0af9047b64b305776a2f8287b83079f9faef3290 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 7 Sep 2021 10:46:59 +0200
Subject: [PATCH 104/125] Fix conditional sections

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

diff --git a/www/form/inner.js b/www/form/inner.js
index c245ed42b..f106c335e 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2980,7 +2980,7 @@ define([
             if (results.hasOwnProperty(uid)) { return results[uid]; }
             APP.formBlocks.some(function (data) {
                 if (!data.getValue) { return; }
-                if (data.uid === uid) {
+                if (data.uid === String(uid)) {
                     results[uid] = data.getValue();
                     return true;
                 }

From 39049b71c2c09dcd11a63fb22e7b52d154457750 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 7 Sep 2021 11:30:45 +0200
Subject: [PATCH 105/125] Fix condition dropdown when the selected question is
 modified

---
 www/form/inner.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index f106c335e..44f7dbd11 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1516,14 +1516,15 @@ define([
                                         content: obj.q
                                     };
                                 });
+                                var val = drop.getValue();
                                 drop.setOptions(qOptions);
+                                drop.setValue(val);
 
                                 // Update values dropdown
                                 var $v = $(el).find('.cp-dropdown-container[data-drop="v"]');
                                 if (!$v.length) { return; }
                                 var dropV = $v[0] && $v[0].dropdown;
                                 if (!dropV) { return; }
-                                var val = drop.getValue();
                                 var res, type;
                                 values.some(function (obj) {
                                     if (String(obj.uid) === String(val)) {
@@ -1543,7 +1544,14 @@ define([
                                         content: str
                                     };
                                 });
+                                var valV = dropV.getValue();
                                 dropV.setOptions(vOptions);
+                                if (valV && res.indexOf(valV) === -1) {
+                                    dropV.setValue('', Messages.form_condition_v);
+                                    dropV.onChange.fire();
+                                    dropV.find('button').removeClass('btn-default')
+                                        .addClass('btn-secondary');
+                                }
                             });
                         } else {
                             // We don't have invalid condition but we may have incomplete

From 7472f8cc0e8b1065f3828ec451e281e5216e5e48 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 7 Sep 2021 11:38:18 +0200
Subject: [PATCH 106/125] Remove translation XXX

---
 www/form/inner.js | 41 -----------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 44f7dbd11..4582dd9ad 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -103,7 +103,6 @@ define([
     };
 
     var saveAndCancelOptions = function (cb) {
-        Messages.form_preview_button = "Preview"; // XXX
         var cancelBlock = h('button.btn.btn-default.cp-form-preview-button',[
                             h('i.fa.fa-eye'),
                             Messages.form_preview_button
@@ -988,7 +987,6 @@ define([
     });
 
 
-    Messages.form_type_section = "Conditional section"; // XXX
     var STATIC_TYPES = {
         md: {
             defaultOpts: {
@@ -1161,8 +1159,6 @@ define([
                     }).filter(Boolean);
                     return values;
                 };
-                Messages.form_conditional_add = "Add condition OR"; // XXX
-                Messages.form_conditional_addAnd = "Add condition AND"; // XXX
                 var addCondition = h('button.btn.btn-secondary', [
                     h('i.fa.fa-plus'),
                     h('span', Messages.form_conditional_add)
@@ -1182,9 +1178,6 @@ define([
                 };
                 var values = getConditionsValues();
                 getConditions = function ($container, isNew, rules, condition, $btn) {
-                    Messages.form_condition_q = "Choose a question"; // XXX
-                    Messages.form_condition_v = "Choose a value"; // XXX
-
                     condition = condition || {};
                     condition.uid = condition.uid || Util.uid();
 
@@ -1239,10 +1232,6 @@ define([
                     qSelect = UIElements.createDropdown(qConfig);
                     qSelect[0].dropdown = qSelect;
                     $(qSelect).attr('data-drop', 'q');
-                    Messages.form_condition_is = 'is'; // XXX
-                    Messages.form_condition_isnot = 'is not'; // XXX
-                    Messages.form_condition_has = 'has'; // XXX
-                    Messages.form_condition_hasnot = 'has not'; // XXX
 
                     var isOn = !condition || condition.is !== 0;
                     var iOptions = [{
@@ -1400,7 +1389,6 @@ define([
                     if (tmp.type === 'q') { qSelect.click(); }
                     else if (tmp.type === 'i') { iSelect.click(); }
                 };
-                Messages.form_conditional = "Only show this section when:"; // XXX
 
                 var conditionalDiv = h('div.cp-form-conditional', [
                     h('div.cp-form-conditional-hint', Messages.form_conditional),
@@ -1421,7 +1409,6 @@ define([
                 };
                 redraw();
 
-                Messages.form_condition_hint = "To make this section conditional, please add a choice or checkbox question above it."; // XXX
                 var hintDiv = h('div.cp-form-conditional-hint', [
                     h('div.cp-form-conditional-hint', Messages.form_condition_hint)
                 ]);
@@ -2775,7 +2762,6 @@ define([
             return key && key.slice(0,1) !== "_";
         }).length;
     };
-    Messages.form_results = "Responses ({0})"; // XXX update key
     var addResultsButton = function (framework, content, answers) {
         var $container = $('.cp-forms-results-participant');
         var l = getAnswersLength(answers);
@@ -2826,9 +2812,6 @@ define([
         return logo;
     };
 
-    Messages.form_alreadyAnswered = "You've responded to this form on {0}"; // XXX
-    Messages.form_editAnswer = "Edit my responses"; // XXX
-    Messages.form_viewAnswer = "View my responses"; // XXX
     var showAnsweredPage = function (framework, content, answers) {
         var $formContainer = $('div.cp-form-creator-content').hide();
         var $resContainer = $('div.cp-form-creator-results').hide();
@@ -2865,7 +2848,6 @@ define([
 
         if (answers._time) { APP.lastAnswerTime = answers._time; }
 
-        Messages.form_viewAllAnswers = "View all responses ({0})"; // XXX
         // If responses are public, show button to view them
         var responses;
         if (content.answers.privateKey) {
@@ -2924,9 +2906,6 @@ define([
         return results;
     };
 
-    Messages.form_anonAnswer = "All answers to this form are anonymous"; // XXX
-    Messages.form_authAnswer = "You can't answer anonymously to this form"; // XXX
-
     var getSectionFromQ = function (content, uid) {
         var arr = content.order;
         var idx = content.order.indexOf(uid);
@@ -3141,7 +3120,6 @@ define([
             reset = undefined;
         }
 
-        Messages.form_requiredWarning = "These questions need an answer:"; // XXX
         var errors = h('div.cp-form-invalid-warning');
         var $errors = $(errors);
         var invalid = h('div.cp-form-invalid-warning');
@@ -3432,10 +3410,6 @@ define([
                 return;
             }
 
-            // XXX
-            Messages.form_required_answer = "Answer: ";
-            Messages.form_required_on = "Required";
-            Messages.form_required_off = "Optional";
             var requiredTag;
             if (block.opts && block.opts.required) {
                 requiredTag = h('span.cp-form-required-tag', Messages.form_required_on);
@@ -3454,12 +3428,8 @@ define([
 
             APP.formBlocks.push(data);
 
-            Messages.form_preview = "Preview:"; // XXX
             var previewDiv = h('div.cp-form-preview', Messages.form_preview);
 
-            Messages.form_required_answer = "Answer: ";
-            Messages.form_required_on = "required";
-            Messages.form_required_off = "optional";
             // Required radio displayed only for types that have an "isEmpty" function
             var requiredDiv;
             if (APP.isEditor && !isStatic && data.isEmpty) {
@@ -3628,8 +3598,6 @@ define([
                         onEdit(temp[uid]);
                     }
 
-                    Messages.form_changeTypeConfirm = "Select the new type of this question and click OK."; // XXX
-                    Messages.form_corruptAnswers = "Changing the type may corrupt existing answers";
                     if (Array.isArray(model.compatible)) {
                         changeType = h('div.cp-form-block-type.editable', [
                             model.icon.cloneNode(),
@@ -3972,8 +3940,6 @@ define([
         }
 
         var makeFormSettings = function () {
-            Messages.form_preview = "Preview form"; // XXX
-            Messages.form_geturl = "Copy link"; // XXX
             var previewBtn = h('button.btn.btn-primary', [
                 h('i.fa.fa-eye'),
                 Messages.form_preview
@@ -3993,7 +3959,6 @@ define([
                 });
             });
 
-            Messages.form_makePublicWarning = "Are you sure you want to make responses to this form public? Past and future responses will be visible by participants. This cannot be undone."; // XXX existing key
             // Private / public status
             var resultsType = h('div.cp-form-results-type-container');
             var $results = $(resultsType);
@@ -4025,9 +3990,6 @@ define([
             var $responseMsg = $(responseMsg);
             var refreshResponse = function () {
                 $responseMsg.empty();
-                Messages.form_updateMsg = "Update submit message"; // XXX 4.11.0
-                Messages.form_addMsg = "Add submit message"; // XXX 4.11.0
-                Messages.form_responseMsg = "This message will be displayed after participants submit the form."; // XXX 4.11.0
                 var text = content.answers.msg ? Messages.form_updateMsg : Messages.form_addMsg;
                 var btn = h('button.btn.btn-secondary', text);
                 $(btn).click(function () {
@@ -4099,7 +4061,6 @@ define([
             refreshResponse();
 
             // Make answers anonymous
-            Messages.form_makeAnon = "Anonymize responses"; // XXX
             var anonContainer = h('div.cp-form-anon-container');
             var $anon = $(anonContainer);
             var refreshAnon = function () {
@@ -4121,7 +4082,6 @@ define([
             refreshAnon();
 
             // XXX UPDATE KEYS "form_anonyous_on", "form_anonymous_off" and "form_anonymous"
-            Messages.form_anonymous = "Guest access (not logged in)"; // XXX existing key
             // Allow guest(anonymous) answers
             var privacyContainer = h('div.cp-form-privacy-container');
             var $privacy = $(privacyContainer);
@@ -4152,7 +4112,6 @@ define([
             refreshPrivacy();
 
             // Allow responses edition
-            Messages.form_editable = "Editing after submit"; // XXX
             var editableContainer = h('div.cp-form-editable-container');
             var $editable = $(editableContainer);
             var refreshEditable = function () {

From 77d3f037cd1f4de1c80c93ad99d791bc47bc419b Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 7 Sep 2021 11:41:58 +0200
Subject: [PATCH 107/125] Add title to response page

---
 www/form/inner.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/www/form/inner.js b/www/form/inner.js
index 4582dd9ad..8c41caa48 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2602,6 +2602,10 @@ define([
     var renderResults = APP.renderResults = function (content, answers, showUser) {
         var $container = $('div.cp-form-creator-results').empty().css('display', '');
 
+        var framework = APP.framework;
+        var title = framework._.title.title || framework._.title.defaultTitle;
+        $container.append(h('h1.cp-form-view-title', title));
+
         var answerCount = Object.keys(answers || {}).length;
 
         if (!answerCount) {

From ff70abae11785b2a5064a921ac593d4eb857fa2c Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 7 Sep 2021 11:54:49 +0200
Subject: [PATCH 108/125] Improve UI

---
 www/form/inner.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 8c41caa48..8b19f575c 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -3052,8 +3052,13 @@ define([
             $anonBox.attr('disabled', 'disabled').prop('checked', false);
             setTimeout(function () {
                 // We need to wait for cbox to be added into the DOM before using .after()
+                if (content.answers.cantEdit) { return; }
                 $cbox.after(h('div.alert.alert-info', Messages.form_authAnswer));
             });
+            anonName = h('div.cp-form-anon-answer-input', [
+                Messages.form_answerAs,
+                h('span.cp-form-anon-answer-registered', user.name || Messages.anonymous)
+            ]);
         }
         if (APP.hasAnswered && content.answers.cantEdit || APP.isClosed) {
             $cbox.hide();
@@ -3857,7 +3862,7 @@ define([
         var loggedIn = framework._.sfCommon.isLoggedIn();
         if (content.answers.makeAnonymous) {
             infoTxt = Messages.form_anonAnswer;
-        } else if (!content.answers.anonymous && loggedIn) {
+        } else if (!content.answers.anonymous && loggedIn && !content.answers.cantEdit) {
             infoTxt = Messages.form_authAnswer;
         }
         if (infoTxt) {

From 3722d260d01fd438fdd39ab1bda2b756be475959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 7 Sep 2021 10:58:27 +0100
Subject: [PATCH 109/125] Hide background for grid sub-questions responses

---
 www/form/app-form.less | 18 +++++++++++++++---
 www/form/inner.js      |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index a7a494501..31b6a12ed 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -735,9 +735,21 @@
             }
 
             .cp-charts {
-                .cp-bar-container {
-                    .cp-bar {
-                        background-color: @cryptpad_color_link;
+                .cp-charts-row {
+                    .cp-grid-sub-question {
+                        background: transparent;
+                    }
+                    .cp-value {
+                        min-width: 200px;
+                        max-width: 200px;
+                        white-space: nowrap;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                    }
+                    .cp-bar-container {
+                        .cp-bar {
+                            background-color: fade(@cryptpad_color_link, 75%);
+                        }
                     }
                 }
             }
diff --git a/www/form/inner.js b/www/form/inner.js
index 8c41caa48..25b887ff4 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -895,7 +895,7 @@ define([
     };
 
     var multiAnswerSubHeading = function (content) {
-        return h('span.cp-charts-row', h('td.cp-charts-cell', {
+        return h('span.cp-charts-row', h('td.cp-charts-cell.cp-grid-sub-question', {
             colspan: 3,
             style: 'font-weight: bold;',
         }, content));

From a61c83174870a2de1b079e452ef6b3f55ebfe04a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 7 Sep 2021 11:03:24 +0100
Subject: [PATCH 110/125] Fix margin at the bottom of Required alert

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

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 31b6a12ed..d57ee1a22 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -360,6 +360,7 @@
                         color: @cp_form-invalid;
                         ul {
                             list-style-type: disclosure-closed;
+                            margin-bottom: 5px;
                         }
                         li {
                             text-align: left;

From e9de9bc9aa95776eedf2e7a5f4d809d2d7f5a1e3 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 7 Sep 2021 12:13:38 +0200
Subject: [PATCH 111/125] Add icons in the share modal

---
 www/common/inner/share.js        | 10 ++++++++--
 www/secureiframe/app-secure.less |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/www/common/inner/share.js b/www/common/inner/share.js
index f76c15e28..fce74fdda 100644
--- a/www/common/inner/share.js
+++ b/www/common/inner/share.js
@@ -76,6 +76,7 @@ define([
         var shareButton = {
             className: 'primary cp-share-with-friends',
             name: Messages.share_withFriends,
+            iconClass: '.fa.fa-shhare-alt',
             onClick: function () {
                 var href;
                 nThen(function (waitFor) {
@@ -425,7 +426,8 @@ define([
             makeCancelButton(),
             !opts.sharedFolder && {
                 className: 'secondary cp-nobar',
-                name: Messages.share_linkOpen, // XXX add fa-eye icon
+                name: Messages.share_linkOpen,
+                iconClass: '.fa.fa-eye',
                 onClick: function () {
                     opts.saveValue();
                     var v = opts.getLinkValue({
@@ -441,7 +443,8 @@ define([
                 keys: [[13, 'ctrl']]
             }, {
                 className: 'primary cp-nobar',
-                name: Messages.share_linkCopy, // XXX add fa-link icon
+                name: Messages.share_linkCopy,
+                iconClass: '.fa.fa-link',
                 onClick: function () {
                     opts.saveValue();
                     var v = opts.getLinkValue({
@@ -496,6 +499,7 @@ define([
             {
                 className: 'primary',
                 name: Messages.share_linkCopy,
+                iconClass: '.fa.fa-link',
                 onClick: function () {
                     Feedback.send('SHARE_EMBED');
                     var v = opts.getEmbedValue();
@@ -870,6 +874,7 @@ define([
             {
                 className: 'primary',
                 name: Messages.share_linkCopy,
+                iconClass: '.fa.fa-link',
                 onClick: function () {
                     var v = opts.getLinkValue();
                     var success = Clipboard.copy(v);
@@ -915,6 +920,7 @@ define([
         }, {
             className: 'primary',
             name: Messages.share_mediatagCopy,
+            iconClass: '.fa.fa-link',
             onClick: function () {
                 var v = common.getMediatagFromHref(opts.fileData);
                 var success = Clipboard.copy(v);
diff --git a/www/secureiframe/app-secure.less b/www/secureiframe/app-secure.less
index e1b9a1a16..76956019b 100644
--- a/www/secureiframe/app-secure.less
+++ b/www/secureiframe/app-secure.less
@@ -22,6 +22,8 @@
     .usergrid_main();
     .forms_main();
 
+    .fa-shhare-alt:before { content: "\f1e0"; }
+
     #cp-filepicker-dialog {
         display: none;
         .cp-modal {

From 3738ae9b99d1bf596fef751c25e99e353b030f9d Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 7 Sep 2021 15:48:51 +0530
Subject: [PATCH 112/125] remove hardcoded translations and invalid XXX notes

---
 www/form/app-form.less | 2 +-
 www/form/inner.js      | 4 +---
 www/form/templates.js  | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index d57ee1a22..24253b93b 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -218,7 +218,7 @@
 
                 div.cp-form-section-sortable {
                     min-height: 300px;
-                    border: 2px dashed @cryptpad_text_col; // XXX
+                    border: 2px dashed @cryptpad_text_col;
                     padding: 20px;
                     margin-top: 20px;
                     background: @cp_app-bg;
diff --git a/www/form/inner.js b/www/form/inner.js
index cf7d4e661..04d6db359 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1404,7 +1404,7 @@ define([
                         rules.forEach(function (obj) {
                             getConditions($rulesC, false, rules, obj, $b);
                         });
-                        $addC.before($rulesC); // XXX
+                        $addC.before($rulesC);
                     });
                 };
                 redraw();
@@ -3112,7 +3112,6 @@ define([
                 window.onbeforeunload = undefined;
 
                 $send.removeAttr('disabled');
-                //UI.alert(Messages.form_sent); // XXX not needed anymore?
                 $send.text(Messages.form_update);
                 APP.hasAnswered = true;
                 APP.answeredInForm = false;
@@ -4090,7 +4089,6 @@ define([
             };
             refreshAnon();
 
-            // XXX UPDATE KEYS "form_anonyous_on", "form_anonymous_off" and "form_anonymous"
             // Allow guest(anonymous) answers
             var privacyContainer = h('div.cp-form-privacy-container');
             var $privacy = $(privacyContainer);
diff --git a/www/form/templates.js b/www/form/templates.js
index c4eb93912..2aef99c24 100644
--- a/www/form/templates.js
+++ b/www/form/templates.js
@@ -1,7 +1,6 @@
 define([
     '/customize/messages.js'
 ], function (Messages) {
-    Messages.form_template_poll = "Quick poll"; // XXX update key
     var pollValues = [];
     var d8 = new Date();
     d8.setDate(d8.getDate() - d8.getDay() + 7); // set sunday

From e8502cee0c9609775735015e0234dd4f53f5d3cb Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Tue, 7 Sep 2021 12:21:53 +0200
Subject: [PATCH 113/125] Translated using Weblate (French)

Currently translated at 100.0% (1424 of 1424 strings)

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

diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index 2b2fed3e9..d3125fb13 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -1274,7 +1274,7 @@
     "form_clear": "Effacer",
     "form_addMultipleHint": "Ajouter plusieurs dates et heures",
     "form_addMultiple": "Tout ajouter",
-    "form_anonymous_blocked": "Les réponses anonymes sont bloquées pour ce formulaire. Merci de vous <a href=\"/login/\">connecter</a> ou de vous <a href=\"/register/\">enregistrer</a> pour répondre.",
+    "form_anonymous_blocked": "Les réponses de visiteurs sont bloquées pour ce formulaire. Merci de vous <a href=\"/login/\">connecter</a> ou de vous <a href=\"/register/\">enregistrer</a> pour répondre.",
     "form_add_item": "Ajouter un objet",
     "form_add_option": "Ajouter une option",
     "form_newItem": "Nouvel objet",

From c6dc3fbc037751d8cc587cc0b8034d33117e6a06 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Tue, 7 Sep 2021 12:21:53 +0200
Subject: [PATCH 114/125] Translated using Weblate (English)

Currently translated at 100.0% (1424 of 1424 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 1894e983e..ad8e165df 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1319,7 +1319,7 @@
     "form_newItem": "New item",
     "form_add_option": "Add option",
     "form_add_item": "Add item",
-    "form_anonymous_blocked": "Anonymous responses are blocked for this form. You must <a href=\"/login/\">log in</a> or <a href=\"/register/\">register</a> to submit answers.",
+    "form_anonymous_blocked": "Guest responses are blocked for this form. You must <a href=\"/login/\">log in</a> or <a href=\"/register/\">register</a> to submit answers.",
     "form_addMultiple": "Add all",
     "form_addMultipleHint": "Add multiple dates and times",
     "form_clear": "Clear",

From c89f4f555bea3b32e9e965b8f4457823cac2860f Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 7 Sep 2021 15:55:36 +0530
Subject: [PATCH 115/125] more hardcoded translations

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

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 54d5c3101..ea0edf9a5 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -529,7 +529,6 @@ define([
         var sframeChan = common.getSframeChannel();
         var appType = (common.getMetadataMgr().getMetadata().type || 'pad').toUpperCase();
         data = data || {};
-        Messages.toolbar_preview = "Preview"; // XXX
         switch (type) {
             case 'export':
                 button = $('<button>', {
@@ -2459,7 +2458,6 @@ define([
                 });
             }*/
             if (!privateData.newTemplate) {
-                Messages.creation_noTemplate = "Blank document"; // XXX update key
                 allData.unshift({
                     name: Messages.creation_noTemplate,
                     id: 0,

From f2153614acad29f3881f95ad68f73459fb23172f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 7 Sep 2021 11:46:31 +0100
Subject: [PATCH 116/125] Fix clickable area of logo on participant view

---
 www/form/app-form.less | 23 +++++++++++++----------
 www/form/inner.js      |  3 ++-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 24253b93b..035d83dec 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -91,19 +91,22 @@
         .cp-form-view-title {
             margin-bottom: 20px;
         }
-        div.cp-form-view-logo {
+        div.cp-form-view-footer {
+            display: flex;
             align-items: center;
             justify-content: center;
-            font-size: 40px;
-            display: flex;
-            font-family: "IBM Plex Mono";
-            .tools_unselectable();
-            color: @cryptpad_color_grey_500;
             padding: 20px 20px 150px 20px;
-            cursor: pointer;
-            img {
-                max-height: 60px;
-                margin: 0px 20px;
+            div.cp-form-view-logo {
+                padding: 10px;
+                font-size: 40px;
+                font-family: "IBM Plex Mono";
+                .tools_unselectable();
+                color: @cryptpad_color_grey_500;
+                cursor: pointer;
+                img {
+                    max-height: 60px;
+                    margin: 0px 20px;
+                }
             }
         }
 
diff --git a/www/form/inner.js b/www/form/inner.js
index 04d6db359..e029476d6 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2813,7 +2813,8 @@ define([
         $(logo).click(function () {
             APP.framework._.sfCommon.gotoURL('/');
         });
-        return logo;
+        var footer = h('div.cp-form-view-footer', [logo])
+        return footer;
     };
 
     var showAnsweredPage = function (framework, content, answers) {

From f2f6136208062ca31075e377582b4b21bc9496bd Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 7 Sep 2021 17:03:34 +0530
Subject: [PATCH 117/125] add 'invalid' styles to link creation modal

---
 customize.dist/src/less2/include/modals-ui-elements.less | 6 ++++++
 www/common/drive-ui.js                                   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 7c6e054c5..e8d9695c5 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -291,4 +291,10 @@
             }
         }
     }
+    input#cp-app-drive-link-url {
+        &.cp-input-invalid {
+            border: 2px solid @cryptpad_color_red;
+            color: @cp_form-invalid;
+        }
+    }
 }
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index fe87e23da..d2f76ef8d 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -2759,6 +2759,7 @@ define([
             var $warning = $(warning).hide();
             var $url = $(url).on('change keypress keyup keydown', function () {
                 var v = $url.val().trim();
+                $url.toggleClass('cp-input-invalid', !Util.isValidURL(v));
                 if (v.length > 200) {
                     $warning.show();
                     return;
@@ -2783,7 +2784,6 @@ define([
                     var u = $url.val().trim();
                     if (!n || !u) { return true; }
                     if (!Util.isValidURL(u)) {
-                        // XXX 4.11.0 add style for invalid input? input:invalid
                         UI.warn(Messages.fm_link_invalid);
                         return true;
                     }

From 1a1213d45ecfa2fd157ff70e51b81f1bdf0cb4e3 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 7 Sep 2021 17:03:50 +0530
Subject: [PATCH 118/125] remove old notes

---
 www/common/inner/share.js | 1 -
 www/common/media-tag.js   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/www/common/inner/share.js b/www/common/inner/share.js
index fce74fdda..73d736346 100644
--- a/www/common/inner/share.js
+++ b/www/common/inner/share.js
@@ -421,7 +421,6 @@ define([
                 embed: Util.isChecked($link.find('#cp-share-embed'))
             }));
         });
-        Messages.share_linkOpen = "Open link"; // XXX
         var linkButtons = [
             makeCancelButton(),
             !opts.sharedFolder && {
diff --git a/www/common/media-tag.js b/www/common/media-tag.js
index e8b35a47e..6b5735294 100644
--- a/www/common/media-tag.js
+++ b/www/common/media-tag.js
@@ -107,7 +107,6 @@ var factory = function () {
                 cb(void 0, audio);
             },
             pdf: function (metadata, url, content, cfg, cb) {
-                // XXX alt text
                 var iframe = document.createElement('iframe');
                 if (cfg.pdf.viewer) { // PDFJS
                     var viewerUrl = cfg.pdf.viewer + '?file=' + url;

From 38370328ddf4fd77bc28e4023e9b0a9163fddc22 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 7 Sep 2021 17:06:00 +0530
Subject: [PATCH 119/125] lint compliance

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

diff --git a/www/form/inner.js b/www/form/inner.js
index e029476d6..c2aaf9126 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2813,7 +2813,7 @@ define([
         $(logo).click(function () {
             APP.framework._.sfCommon.gotoURL('/');
         });
-        var footer = h('div.cp-form-view-footer', [logo])
+        var footer = h('div.cp-form-view-footer', [logo]);
         return footer;
     };
 

From 84e7a021d9a57698f0ecffacbe7430f8de5eee20 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 7 Sep 2021 17:47:16 +0530
Subject: [PATCH 120/125] bump version to 4.11

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

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index fa183f90c..7a520c3c0 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -105,7 +105,7 @@ define([
     var imprintUrl = AppConfig.imprint && (typeof(AppConfig.imprint) === "boolean" ?
                         '/imprint.html' : AppConfig.imprint);
 
-    Pages.versionString = "v4.10.0";
+    Pages.versionString = "v4.11.0";
 
 
     // used for the about menu
diff --git a/package-lock.json b/package-lock.json
index 790052c6e..c795956c9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cryptpad",
-  "version": "4.10.0",
+  "version": "4.11.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2d1c3f626..26fbc968a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "4.10.0",
+  "version": "4.11.0",
   "license": "AGPL-3.0+",
   "repository": {
     "type": "git",

From b55e3cac52a460b8a2850e32b3428f4869267c66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 7 Sep 2021 13:39:14 +0100
Subject: [PATCH 121/125] Fix wrong "Preview" key being used in Form editor

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

diff --git a/www/form/inner.js b/www/form/inner.js
index c2aaf9126..d331800c2 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -3437,7 +3437,7 @@ define([
 
             APP.formBlocks.push(data);
 
-            var previewDiv = h('div.cp-form-preview', Messages.form_preview);
+            var previewDiv = h('div.cp-form-preview', Messages.form_preview_button);
 
             // Required radio displayed only for types that have an "isEmpty" function
             var requiredDiv;

From 897b0bb5b694d048896c0ed4d8f29feb21f5f22b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 7 Sep 2021 14:19:13 +0100
Subject: [PATCH 122/125] Use the same color for timeline and bar charts on
 Form response page

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

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 035d83dec..5c51d2887 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -10,6 +10,7 @@
         @bg-color: @colortheme_apps[form]
     );
 
+    @cp_form_bar_color: fade(@cryptpad_color_link, 75%); // Color for the response chart bars
 
     display: flex;
     flex-flow: column;
@@ -242,6 +243,10 @@
                     margin-bottom: 20px;
                     table.cp-charts.column {
                         overflow-x: initial;
+                        td {
+                            background-color: @cp_form_bar_color;
+                            border-color: @cp_form_bar_color;
+                        }
                     }
                 }
             }
@@ -752,7 +757,7 @@
                     }
                     .cp-bar-container {
                         .cp-bar {
-                            background-color: fade(@cryptpad_color_link, 75%);
+                            background-color: @cp_form_bar_color;
                         }
                     }
                 }

From ae7e5e063624d4682eaa7df15518644f447db51f Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 7 Sep 2021 18:59:01 +0530
Subject: [PATCH 123/125] remove more XXX notes, add stricter team invite link
 content validation

---
 www/common/common-ui-elements.js |  2 +-
 www/profile/inner.js             |  4 ++--
 www/teams/inner.js               | 15 +++++++++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index ea0edf9a5..08e0bcf07 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -3616,7 +3616,7 @@ define([
                     });
 
                     var displayName = UI.getDisplayName(data.name);
-                    common.displayAvatar($(avatar), data.avatar, displayName); // XXX
+                    common.displayAvatar($(avatar), data.avatar, displayName);
                     return h('span.cp-mentions', {
                         'data-curve': data.curvePublic,
                         'data-notifications': data.notifications,
diff --git a/www/profile/inner.js b/www/profile/inner.js
index 0b720940b..2d63d2957 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -348,7 +348,7 @@ define([
         if (!val) {
             $('<img>', {
                 src: '/customize/images/avatar.png',
-                title: Messages.profile_avatar, // XXX
+                title: Messages.profile_defaultAlt,
                 alt: Messages.profile_defaultAlt,
             }).appendTo($span);
             return;
@@ -391,7 +391,7 @@ define([
                 }, function () {
                     sframeChan.query("Q_PROFILE_AVATAR_ADD", data.url, function (err, err2) {
                         if (err || err2) { return void UI.log(err || err2); }
-                        displayAvatar(data.url); // XXX add "Profile picture"
+                        displayAvatar(data.url);
                     });
                 });
             };
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 485923996..0a524a824 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1099,8 +1099,8 @@ define([
             if (!val) {
                 var $img = $('<img>', {
                     src: '/customize/images/avatar.png',
-                    title: Messages.profile_avatar, // XXX
-                    alt: 'Avatar'
+                    title: Messages.profile_defaultAlt,
+                    alt: Messages.profile_defaultAlt,
                 });
                 var mt = h('media-tag', $img[0]);
                 $avatar.append(mt);
@@ -1323,16 +1323,23 @@ define([
             });
         };
 
+        var isValidInvitationLinkContent = function (json) {
+            if (!json) { return false; }
+            if (json.error || !Object.keys(json).length) { return false; }
+            if (!json.author) { return false; }
+            return true;
+        };
+
         nThen(function (waitFor) {
             // Get preview content.
             sframeChan.query('Q_ANON_GET_PREVIEW_CONTENT', { seeds: seeds }, waitFor(function (err, json) {
-                if (json && (json.error || !Object.keys(json).length)) { // XXX team invite links are triggering this every time for me?
+                if (!isValidInvitationLinkContent(json)) {
                     $(errorBlock).text(Messages.team_inviteInvalidLinkError).show();
                     waitFor.abort();
                     $div.empty();
                     return;
                 }
-                // XXX nothing guarantees that author, teamName, or message exist in json
+                // FIXME nothing guarantees that teamName or author.displayName exist in json
                 $div.empty();
                 $div.append(h('div.cp-teams-invite-from', [
                     Messages.team_inviteFrom,

From 4f196270ce63fc74d1d59be27b777548deeab251 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 7 Sep 2021 19:12:46 +0530
Subject: [PATCH 124/125] fix some path issues for translation review scripts

---
 scripts/translations/lint-translations.js   | 4 ++--
 scripts/translations/unused-translations.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/translations/lint-translations.js b/scripts/translations/lint-translations.js
index 5e7f81b17..e02bca46a 100644
--- a/scripts/translations/lint-translations.js
+++ b/scripts/translations/lint-translations.js
@@ -1,4 +1,4 @@
-var EN = require("../www/common/translations/messages.json");
+var EN = require("../../www/common/translations/messages.json");
 
 var simpleTags = [
     '<br>',
@@ -118,7 +118,7 @@ processLang(EN, 'en', true);
   'zh',
 ].forEach(function (lang) {
     try {
-        var map = require("../www/common/translations/messages." + lang + ".json");
+        var map = require("../../www/common/translations/messages." + lang + ".json");
         if (!Object.keys(map).length) { return; }
         processLang(map, lang);
     } catch (err) {
diff --git a/scripts/translations/unused-translations.js b/scripts/translations/unused-translations.js
index 26156cd03..941835cba 100644
--- a/scripts/translations/unused-translations.js
+++ b/scripts/translations/unused-translations.js
@@ -1,4 +1,4 @@
-var Messages = require("../www/common/translations/messages.json");
+var Messages = require("../../www/common/translations/messages.json");
 var Exec = require("child_process").exec;
 
 var ignoreLines = function (source, pattern) {

From c072a399329c2b96d357d7c3e004746adc0afd2f Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Tue, 7 Sep 2021 15:43:16 +0200
Subject: [PATCH 125/125] Translated using Weblate (Spanish)

Currently translated at 44.3% (632 of 1424 strings)

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

diff --git a/www/common/translations/messages.es.json b/www/common/translations/messages.es.json
index 3864ea8a8..f185ea637 100644
--- a/www/common/translations/messages.es.json
+++ b/www/common/translations/messages.es.json
@@ -622,7 +622,7 @@
     "markdown_toc": "Contenido",
     "survey": "Encuesta de CryptPad",
     "crowdfunding_popup_no": "Ahora no",
-    "crowdfunding_popup_text": "<h3 >¡Necesitamos tu ayuda!</h3>Para garantizar que CryptPad se desarrolle activamente, considera apoyar el proyecto a través de la página OpenCollective, donde puedes ver nuestra <b>Hoja de ruta</b> y <b>Objetivos de financiación</b>.",
+    "crowdfunding_popup_text": "<h3>¡Necesitamos tu ayuda!</h3>Para garantizar que CryptPad se desarrolle activamente, considera apoyar el proyecto a través de la página OpenCollective, donde puedes ver nuestra <b>Hoja de ruta</b> y <b>Objetivos de financiación</b>.",
     "autostore_notAvailable": "Tienes que guardar el bloc en tu CryptDrive antes de usar esta función.",
     "autostore_forceSave": "Guarda el fichero en tu CryptDrive",
     "autostore_saved": "El bloc se guardó correctamente en tu CryptDrive!",