From 3f2e6b0611669285f127f8875def861f51b668cc Mon Sep 17 00:00:00 2001
From: Paul Libbrecht <paul.libbrecht@dipf.de>
Date: Tue, 6 Nov 2018 13:01:17 +0100
Subject: [PATCH 1/3] completion

---
 www/common/translations/messages.de.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.de.js b/www/common/translations/messages.de.js
index 3e6506575..33ffcc0c2 100644
--- a/www/common/translations/messages.de.js
+++ b/www/common/translations/messages.de.js
@@ -457,7 +457,8 @@ define(function () {
                              "Wir haben fortgeschrittene Aktionen aus dem anonymen CryptDrive entfernt, weil wir klar machen wollen, dass es kein sicherer Platz ist, Dinge zu lagern." + 
                              'Du kannst <a href="https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/" target="_blank">lesen</a>, weshalb wir das machen und weshalb du wirklich ' +
                              '<a href="/register/">registrieren</a> oder <a href="/login/">einloggen</a> solltest.';
-    out.fm_info_sharedFolder = "Dieser Ordner ist verteilt. Da du aber nicht eingeloggt bist, hast du nur einen schreibgeschützen Zugang.<br>";
+    out.fm_info_sharedFolder = 'Dieser Ordner ist verteilt. Da du aber nicht eingeloggt bist, hast du nur einen schreibgeschützen Zugang.<br>' +
+                               '<a href="/register/">Registriere</a> oder <a href="/login/">logge ich ein</a>, damit du dieses Ordner in dein CryptDrive importieren und bearbeiten kannst.';
     out.fm_backup_title = 'Backup link';
     out.fm_nameFile = 'Wie soll diese Datei heissen?';
     out.fm_error_cantPin = "Interner Serverfehler. Bitte lade die Seite neu und versuche es wieder.";

From 8bbd4e2086921fe036e6986d3087d76b882a5785 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 20 Nov 2018 11:14:26 +0100
Subject: [PATCH 2/3] bump version and release codename

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

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 795ff37be..0343bf8a0 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -91,7 +91,7 @@ define([
                     ])
                 ])
             ]),
-            h('div.cp-version-footer', "CryptPad v2.11.0 (Lemur)")
+            h('div.cp-version-footer', "CryptPad v2.12.0 (Manatee)")
         ]);
     };
 
diff --git a/package.json b/package.json
index 4a28f8e68..0468d50f2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "license": "AGPL-3.0+",
   "repository": {
     "type": "git",

From 04d96d5d0ed7570c423e52d159807c691f2b293e Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 20 Nov 2018 11:23:31 +0100
Subject: [PATCH 3/3] remove outdated comments

---
 www/contacts/messenger-ui.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/www/contacts/messenger-ui.js b/www/contacts/messenger-ui.js
index dfb77b09b..7afbf9df9 100644
--- a/www/contacts/messenger-ui.js
+++ b/www/contacts/messenger-ui.js
@@ -257,12 +257,6 @@ define([
                         if (msg.type !== 'MSG') { return; }
 
                     // FIXME Schlameil the painter (performance does not scale well)
-                        // XXX trust the server?
-                        /*
-                        if (channel.messages.some(function (old) {
-                            return msg.sig === old.sig;
-                        })) { return; }*/
-
                         channel.messages.unshift(msg);
                         var el_message = markup.message(msg);
                         $messagebox.prepend(el_message);
@@ -285,7 +279,7 @@ define([
                             UI.alert(Messages.contacts_removeHistoryServerError);
                             return;
                         }
-                        // XXX clear the UI?
+                        // TODO clear the UI
                     });
                 });
             });
@@ -451,7 +445,7 @@ define([
             $messages.find('div.cp-app-contacts-chat[data-key]').hide();
             if ($chat.length) {
                 var $chat_messages = $chat.find('div.cp-app-contacts-message');
-                if ($chat_messages.length < 10) { //|| channel.needMoreHistory) { XXX
+                if ($chat_messages.length < 10) {
                     delete channel.needMoreHistory;
                     var $more = $chat.find('.cp-app-contacts-more-history');
                     $more.click();