From 733d8071fc69fa7bcaf20d39470cae849e4f16d4 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 19 Nov 2020 13:29:48 +0530
Subject: [PATCH 1/8] display document ids in the properties modal

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

diff --git a/www/common/inner/properties.js b/www/common/inner/properties.js
index 58f10e738..143c32d81 100644
--- a/www/common/inner/properties.js
+++ b/www/common/inner/properties.js
@@ -12,6 +12,8 @@ define([
              Messages, nThen) {
     var Properties = {};
 
+    Messages.documentID = Messages.documentID || 'Document identifier'; // XXX
+
     var getPadProperties = function (Env, data, opts, _cb) {
         var cb = Util.once(Util.mkAsync(_cb));
         var common = Env.common;
@@ -19,6 +21,13 @@ define([
         var $d = $('<div>');
         if (!data) { return void cb(void 0, $d); }
 
+        if (data.channel) {
+            $('<label>', { 'for': 'cp-app-prop-id'}).text(Messages.documentID).appendTo($d);
+            $d.append(UI.dialog.selectable(data.channel, {
+                id: 'cp-app-prop-id',
+            }));
+        }
+
         if (data.href) {
             $('<label>', {'for': 'cp-app-prop-link'}).text(Messages.editShare).appendTo($d);
             $d.append(UI.dialog.selectable(data.href, {

From 3181db155ef3aa51cfafacd1891cd8e3a39bdbe4 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 19 Nov 2020 10:46:42 +0100
Subject: [PATCH 2/8] Fix XDR error

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

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 6d682afa7..7a39afae2 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -980,6 +980,11 @@ define([
         setTimeout(cb, 750);
     };
     UI.errorLoadingScreen = function (error, transparent, exitable) {
+        if (error === 'Error: XDR encoding failure') {
+            console.warn(err);
+            return;
+        }
+
         var $loading = $('#' + LOADING);
         if (!$loading.is(':visible') || $loading.hasClass('cp-loading-hidden')) {
             UI.addLoadingScreen();

From ab98895b0533271de00b8303fed31d50c44786af Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 19 Nov 2020 10:49:08 +0100
Subject: [PATCH 3/8] Fix typo

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

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 7a39afae2..9fae121dc 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -981,7 +981,7 @@ define([
     };
     UI.errorLoadingScreen = function (error, transparent, exitable) {
         if (error === 'Error: XDR encoding failure') {
-            console.warn(err);
+            console.warn(error);
             return;
         }
 

From 99ef72a6fdf726f4d0f6207214c609183aca23e9 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 19 Nov 2020 10:46:42 +0100
Subject: [PATCH 4/8] Fix XDR error

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

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 6d682afa7..7a39afae2 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -980,6 +980,11 @@ define([
         setTimeout(cb, 750);
     };
     UI.errorLoadingScreen = function (error, transparent, exitable) {
+        if (error === 'Error: XDR encoding failure') {
+            console.warn(err);
+            return;
+        }
+
         var $loading = $('#' + LOADING);
         if (!$loading.is(':visible') || $loading.hasClass('cp-loading-hidden')) {
             UI.addLoadingScreen();

From d8781dbafffe918553e19e75317899d43752373c Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 19 Nov 2020 10:49:08 +0100
Subject: [PATCH 5/8] Fix typo

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

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 7a39afae2..9fae121dc 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -981,7 +981,7 @@ define([
     };
     UI.errorLoadingScreen = function (error, transparent, exitable) {
         if (error === 'Error: XDR encoding failure') {
-            console.warn(err);
+            console.warn(error);
             return;
         }
 

From b79f85afc4c49b20719eb77db3db2e1772ed94d7 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Thu, 19 Nov 2020 12:27:07 +0100
Subject: [PATCH 6/8] Translated using Weblate (English)

Currently translated at 100.0% (1373 of 1373 strings)

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

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index c76b9a7c1..f57abe24e 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1468,5 +1468,6 @@
     "loading_state_5": "Reconstruct document",
     "tag_add": "Add",
     "tag_edit": "Edit",
-    "error_unhelpfulScriptError": "Script Error: See browser console for details"
+    "error_unhelpfulScriptError": "Script Error: See browser console for details",
+    "documentID": "Document identifier"
 }

From 1361dc810e363e0ffdcc0ee15be4c1837b12cb93 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Thu, 19 Nov 2020 12:27:07 +0100
Subject: [PATCH 7/8] Translated using Weblate (French)

Currently translated at 100.0% (1373 of 1373 strings)

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

diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index 1d1779035..431faa767 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -1468,5 +1468,6 @@
     "loading_state_0": "Construction de l'interface",
     "tag_edit": "Modifier",
     "tag_add": "Ajouter",
-    "error_unhelpfulScriptError": "Erreur de script : consultez la console du navigateur pour plus de détails"
+    "error_unhelpfulScriptError": "Erreur de script : consultez la console du navigateur pour plus de détails",
+    "documentID": "Référence du document"
 }

From 9bb465bbcee1c49545881aeb26f634aeb6e5d600 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 24 Nov 2020 17:00:48 +0100
Subject: [PATCH 8/8] Fix style conflict

---
 customize.dist/loading.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/customize.dist/loading.js b/customize.dist/loading.js
index b0d66981c..5b916a0e5 100644
--- a/customize.dist/loading.js
+++ b/customize.dist/loading.js
@@ -241,7 +241,7 @@ p.cp-password-info{
     animation-timing-function: cubic-bezier(.6,0.15,0.4,0.85);
 }
 
-button.primary{
+button:not(.btn).primary{
     border: 1px solid #4591c4;
     padding: 8px 12px;
     text-transform: uppercase;
@@ -250,7 +250,7 @@ button.primary{
     font-weight: bold;
 }
 
-button.primary:hover{
+button:not(.btn).primary:hover{
     background-color: rgb(52, 118, 162);
 }