From 0a18e0944077cdcfc9ca1a7f3533b1d3d79e7428 Mon Sep 17 00:00:00 2001
From: Genma <genma@free.fr>
Date: Mon, 18 Sep 2017 15:11:17 +0200
Subject: [PATCH 01/31] Cryptad version in Readme.md added

Because this information was lacking and I need to find it quickly (and probably other people).
Don't forget to update this part at each new released.
---
 readme.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/readme.md b/readme.md
index 956077d15..5d88db1c8 100644
--- a/readme.md
+++ b/readme.md
@@ -16,6 +16,10 @@ Installing CryptPad is pretty straightforward. You can read all about it in the
 
 It also contains information on keeping your instance of CryptPad up to date.
 
+## Current version
+
+CryptPad v1.15.0 (Poukai) released the 12th September 2017
+
 ## Setup using Docker
 
 See [Cryptpad-Docker](docs/cryptpad-docker.md)

From 2ceb925d9bcf28ffca8e2cf48bff5cf3758374ac Mon Sep 17 00:00:00 2001
From: Genma <genma@free.fr>
Date: Mon, 18 Sep 2017 16:11:40 +0200
Subject: [PATCH 02/31] Link to cryptad releases documentation added.

---
 readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/readme.md b/readme.md
index 5d88db1c8..2d46155af 100644
--- a/readme.md
+++ b/readme.md
@@ -19,6 +19,7 @@ It also contains information on keeping your instance of CryptPad up to date.
 ## Current version
 
 CryptPad v1.15.0 (Poukai) released the 12th September 2017
+See [Cryptad-Releases](docs/releases)
 
 ## Setup using Docker
 

From 0a99478d9f12cd4fc1218e0b4e23a1ef4905c7e1 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 28 Sep 2017 11:50:35 +0200
Subject: [PATCH 03/31] catch diffdom errors and plow through

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

diff --git a/www/slide/slide.js b/www/slide/slide.js
index 3477a6a32..4bfcacc4f 100644
--- a/www/slide/slide.js
+++ b/www/slide/slide.js
@@ -83,7 +83,7 @@ define([
         var c = Slide.content;
         var m = '<span class="cp-app-slide-container"><span class="'+slideClass+'">'+DiffMd.render(c).replace(separatorReg, '</span></span><span class="cp-app-slide-container"><span class="'+slideClass+'">')+'</span></span>';
 
-        DiffMd.apply(m, $content);
+        try { DiffMd.apply(m, $content); } catch (e) { return console.error(e); }
 
         var length = getNumberOfSlides();
         $modal.find('style.cp-app-slide-style').remove();

From aa744567ed8aaa853e30886ce5af2dbe3f4eaeb0 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 9 Oct 2017 11:52:34 +0200
Subject: [PATCH 04/31] Fix thumbnails in sframe apps

---
 www/common/common-file.js        |  1 +
 www/common/cryptpad-common.js    |  4 +--
 www/common/sframe-common-file.js | 43 ++++++++++++++++++++++----------
 www/file/inner.js                |  2 +-
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/www/common/common-file.js b/www/common/common-file.js
index 0c3eadd36..6b1f33505 100644
--- a/www/common/common-file.js
+++ b/www/common/common-file.js
@@ -76,6 +76,7 @@ define([
                 common.renamePad(title || "", href, function (err) {
                     if (err) { return void console.error(err); }
                     onComplete(href);
+                    common.setPadAttribute('fileType', metadata.type, null, href);
                 });
             });
         };
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 863d97d07..a6f830354 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -489,8 +489,8 @@ define([
     };
 
     // STORAGE
-    common.setPadAttribute = function (attr, value, cb) {
-        var href = getRelativeHref(window.location.href);
+    common.setPadAttribute = function (attr, value, cb, href) {
+        href = getRelativeHref(href || window.location.href);
         getStore().setPadAttribute(href, attr, value, cb);
     };
     common.setDisplayName = function (value, cb) {
diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js
index 10bb8fbac..a2abd006a 100644
--- a/www/common/sframe-common-file.js
+++ b/www/common/sframe-common-file.js
@@ -1,8 +1,9 @@
 define([
     'jquery',
     '/file/file-crypto.js',
+    '/common/common-thumbnail.js',
     '/bower_components/tweetnacl/nacl-fast.min.js',
-], function ($, FileCrypto) {
+], function ($, FileCrypto, Thumb) {
     var Nacl = window.nacl;
     var module = {};
 
@@ -220,30 +221,46 @@ define([
 
         var handleFile = File.handleFile = function (file, e, thumbnail) {
             var thumb;
-            var finish = function (arrayBuffer) {
+            var file_arraybuffer;
+            var finish = function () {
                 var metadata = {
                     name: file.name,
                     type: file.type,
                 };
                 if (thumb) { metadata.thumbnail = thumb; }
                 queue.push({
-                    blob: arrayBuffer,
+                    blob: file_arraybuffer,
                     metadata: metadata,
                     dropEvent: e
                 });
             };
 
-            var processFile = function () {
-                blobToArrayBuffer(file, function (e, buffer) {
-                    finish(buffer);
-                });
-            };
-
-            if (!thumbnail) { return void processFile(); }
-            blobToArrayBuffer(thumbnail, function (e, buffer) {
+            blobToArrayBuffer(file, function (e, buffer) {
                 if (e) { console.error(e); }
-                thumb = arrayBufferToString(buffer);
-                processFile();
+                file_arraybuffer = buffer;
+                if (thumbnail) { // there is already a thumbnail
+                    return blobToArrayBuffer(thumbnail, function (e, buffer) {
+                        if (e) { console.error(e); }
+                        thumb = arrayBufferToString(buffer);
+                        finish();
+                    });
+                }
+
+                if (!Thumb.isSupportedType(file.type)) { return finish(); }
+                // make a resized thumbnail from the image..
+                Thumb.fromImageBlob(file, function (e, thumb_blob) {
+                    if (e) { console.error(e); }
+                    if (!thumb_blob) { return finish(); }
+
+                    blobToArrayBuffer(thumb_blob, function (e, buffer) {
+                        if (e) {
+                            console.error(e);
+                            return finish();
+                        }
+                        thumb = arrayBufferToString(buffer);
+                        finish();
+                    });
+                });
             });
         };
 
diff --git a/www/file/inner.js b/www/file/inner.js
index 55e7487a1..df5ba854f 100644
--- a/www/file/inner.js
+++ b/www/file/inner.js
@@ -77,7 +77,7 @@ define([
             sfCommon: common,
         };
         if (uploadMode) {
-            displayed.push('pageTitle'); //TODO in toolbar
+            displayed.push('pageTitle');
             configTb.pageTitle = Messages.upload_title;
         }
         var toolbar = APP.toolbar = Toolbar.create(configTb);

From dd141b5c9f087747bdc1e6e44ac01d62629d9c88 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 9 Oct 2017 14:08:54 +0200
Subject: [PATCH 05/31] Disable comments when a poll is not published

---
 customize.dist/pages.js                    |  3 +-
 customize.dist/translations/messages.fr.js |  2 ++
 customize.dist/translations/messages.js    |  2 ++
 www/poll/app-poll.less                     | 32 ++++++++++++++++------
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 5fac0939b..f120a628f 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -679,7 +679,8 @@ define([
                             ]),
                             h('h2#cp-app-poll-comments-list-title', Msg.poll_comment_list),
                             h('div#cp-app-poll-comments-list')
-                        ])
+                        ]),
+                        h('div#cp-app-poll-nocomments', Msg.poll_comment_disabled)
                     ])
                 ])
             ])
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 91bba1fbf..c33616a40 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -267,6 +267,8 @@ define(function () {
     out.poll_comment_submit = "Envoyer";
     out.poll_comment_remove = "Supprimer ce commentaire";
 
+    out.poll_comment_disabled = "Publiez ce sondage en utilisant le bouton ✓ afin d'activer les commentaires.";
+
     // Canvas
     out.canvas_clear = "Nettoyer";
     out.canvas_delete = "Supprimer la sélection";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index f7bb3ffca..2d41b4dc2 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -271,6 +271,8 @@ define(function () {
     out.poll_comment_submit = "Send";
     out.poll_comment_remove = "Delete this comment";
 
+    out.poll_comment_disabled = "Publish this poll using the ✓ button to enable the comments.";
+
     // Canvas
     out.canvas_clear = "Clear";
     out.canvas_delete = "Delete selection";
diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
index 1b58841e3..526d1b2af 100644
--- a/www/poll/app-poll.less
+++ b/www/poll/app-poll.less
@@ -125,6 +125,7 @@ table#cp-app-poll-table {
         min-width: 80%;
         width: 80%;
         min-height: 200px;
+        height: 200px;
         border: 1px solid black;
         .CodeMirror-placeholder {
             color: #777;
@@ -149,18 +150,26 @@ table#cp-app-poll-table {
         max-height: 20em;
     }
 }
-.cp-app-poll-published {
-    #cp-app-poll-description {
-        display: none;
-        &~ .CodeMirror {
+div.cp-app-poll-published {
+    div.cp-app-poll-realtime {
+        #cp-app-poll-description {
             display: none;
+            &~ .CodeMirror {
+                display: none;
+            }
         }
-    }
-    #cp-app-poll-description-published {
-        display: block;
-        &:empty {
+        #cp-app-poll-description-published {
+            display: block;
+            &:empty {
+                display: none;
+            }
+        }
+        #cp-app-poll-nocomments {
             display: none;
         }
+        #cp-app-poll-comments {
+            display: block;
+        }
     }
 }
 
@@ -490,11 +499,18 @@ div.cp-app-poll-realtime {
             display: none;
         }
     }
+    #cp-app-poll-nocomments {
+        color: #999;
+        text-align: center;
+        margin: 20px;
+        font: @colortheme_app-font;
+    }
     #cp-app-poll-comments {
         width: 50%;
         margin: 20px auto;
         min-width: 400px;
         padding-bottom: 5px;
+        display: none;
         button {
             border-radius: 0;
         }

From a12239405bcbc80edf84d41ffe1608b3f2900804 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 9 Oct 2017 15:10:38 +0200
Subject: [PATCH 06/31] fix toolbar 'home link' to visit home page from drive

---
 www/common/toolbar3.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index 6433906d6..69429f760 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -657,9 +657,10 @@ define([
         // We need to override the "a" tag action here because it is inside the iframe!
         var inDrive = /^\/drive/;
 
-        var origin = config.metadataMgr.getPrivateData().origin;
-
-        var href = inDrive.test(origin) ? origin+'/index.html' : origin+'/drive/';
+        var privateData = config.metadataMgr.getPrivateData();
+        var origin = privateData.origin;
+        var pathname = privateData.pathname;
+        var href = inDrive.test(pathname) ? origin+'/index.html' : origin+'/drive/';
         var buttonTitle = inDrive ? Messages.header_homeTitle : Messages.header_logoTitle;
 
         var $aTag = $('<a>', {

From 4c19375f4dfdc9646a39b4badef7ec17ea967878 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 9 Oct 2017 15:11:02 +0200
Subject: [PATCH 07/31] Avoid missing characters in poll's inputs

---
 www/poll/inner.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/www/poll/inner.js b/www/poll/inner.js
index 5586beb04..c2da2e8ea 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -464,11 +464,13 @@ define([
             Render.updateTable(table, displayedObj, conf);
             // Fix autocomplete bug:
             displayedObj.content.rowsOrder.forEach(function (rowId) {
+                if (f.id === rowId) { return; }
                 $('input[data-rt-id="' + rowId +'"]').val(displayedObj.content.rows[rowId] || '');
             });
-            displayedObj.content.colsOrder.forEach(function (rowId) {
-                $('input[data-rt-id="' + rowId +'"]')
-                    .val(displayedObj.content.cols[rowId] || '');
+            displayedObj.content.colsOrder.forEach(function (colId) {
+                if (f.id === colId) { return; }
+                $('input[data-rt-id="' + colId +'"]')
+                    .val(displayedObj.content.cols[colId] || '');
             });
             updateDisplayedTable();
             setFocus(f);
@@ -512,7 +514,7 @@ define([
             case 'text':
                 debug("text[rt-id='%s'] [%s]", id, input.value);
                 Render.setValue(object, id, input.value);
-                change(null, null, null, 250);
+                change(null, null, null, 1000);
                 break;
             case 'number':
                 debug("checkbox[tr-id='%s'] %s", id, input.value);
@@ -630,6 +632,7 @@ define([
 
         switch (nodeName) {
             case 'INPUT':
+                if ($(target).is('[type="text"]') && !isKeyup) { return; }
                 if (isKeyup && (e.keyCode === 13 || e.keyCode === 27)) {
                     var id = target.getAttribute('data-rt-id');
                     if ($(target).parents('.cp-app-poll-table-uncommitted').length

From f751554f8226409f6ca838f19e1aa021920b213e Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 9 Oct 2017 15:15:04 +0200
Subject: [PATCH 08/31] update footer and package.json for upcoming version

---
 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 f120a628f..588358851 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -76,7 +76,7 @@ define([
                     ])
                 ])
             ]),
-            h('div.cp-version-footer', "CryptPad v1.16.0 (Qalupalik)")
+            h('div.cp-version-footer', "CryptPad v1.17.0 (Ratatoskr)")
         ]);
     };
 
diff --git a/package.json b/package.json
index 3dc9fca3b..df7b3bd79 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "dependencies": {
     "chainpad-server": "^1.0.1",
     "express": "~4.10.1",

From 484e216054d21cf54c76d28732beca2f454e649d Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 9 Oct 2017 15:37:37 +0200
Subject: [PATCH 09/31] Fix hashtag button in the toolbar

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

diff --git a/www/common/sframe-common-interface.js b/www/common/sframe-common-interface.js
index 0a128b31d..6e6b4539d 100644
--- a/www/common/sframe-common-interface.js
+++ b/www/common/sframe-common-interface.js
@@ -216,7 +216,7 @@ define([
                     title: Messages.tags_title,
                 })
                 .click(common.prepareFeedback(type))
-                .click(function () { UI.updateTags(null); });
+                .click(function () { UI.updateTags(common, null); });
                 break;
             default:
                 button = $('<button>', {

From 3f181fa3702e47d066db27ce20f46db66fa79e86 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 9 Oct 2017 15:38:33 +0200
Subject: [PATCH 10/31] update loading screen tip for tags

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

diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 2d41b4dc2..3bf37b51c 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -159,7 +159,7 @@ define(function () {
     out.filePicker_filter = "Filter files by name";
     out.or = 'or';
 
-    out.tags_title = "Tags";
+    out.tags_title = "Tags (for you only)";
     out.tags_add = "Update this page's tags";
     out.tags_searchHint = "Find files by their tags by searching in your CryptDrive";
 
@@ -739,7 +739,7 @@ define(function () {
     out.tips.drive = "Logged in users can organize their files in their CryptDrive, accessible from the CryptPad icon at the top left of all pads.";
     out.tips.profile = "Registered users can create a profile from the user menu in the top right.";
     out.tips.avatars = "You can upload an avatar in your profile. People will see it when you collaborate in a pad.";
-    out.tips.tags = "You can hashtag pads, and then search by tag in your CryptDrive.";
+    out.tips.tags = "Tag your pads and start a search with # in your CryptDrive to find them";
 
     out.feedback_about = "If you're reading this, you were probably curious why CryptPad is requesting web pages when you perform certain actions";
     out.feedback_privacy = "We care about your privacy, and at the same time we want CryptPad to be very easy to use.  We use this file to figure out which UI features matter to our users, by requesting it along with a parameter specifying which action was taken.";

From d3d6940b692664f1883c132db2d4ad211b3f04ba Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 9 Oct 2017 15:47:28 +0200
Subject: [PATCH 11/31] Update french translation for tags

---
 customize.dist/translations/messages.fr.js | 4 +++-
 customize.dist/translations/messages.js    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index c33616a40..b6f4f93fc 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -157,8 +157,9 @@ define(function () {
     out.filePicker_filter = "Filtrez les fichiers par leur nom";
     out.or = 'ou';
 
-    out.tags_title = "Mots-clés du pad";
+    out.tags_title = "Mots-clés du pad (pour vous uniquement)";
     out.tags_add = "Modifier les mots-clés du pad";
+    out.tags_searchHint = "Commencez une recherche par # dans votre CryptDrive pour retrouver vos pads par mot-clé.";
     out.tags_duplicate = "Mot-clé déjà présent : {0}";
 
     out.slideOptionsText = "Options";
@@ -700,6 +701,7 @@ define(function () {
     out.tips.drive = "Les utilisateurs enregistrés peuvent organiser leurs fichiers dans leur CryptDrive, accessible depuis l'icône CryptPad dans le coin supérieur gauche des pads.";
     out.tips.profile = "Les utilisateurs enregistrés peuvent créer un profil depuis le menu utilisateur, dans le coin supérieur droit.";
     out.tips.avatars = "Vous pouvez uploader un avatar dans votre profil. Les autres personnes le verront dans la liste d'utilisateurs des pads.";
+    out.tips.tags = "Ajoutez des mots-clés aux pads et effectuer une recherche commençant par # dans votre CryptDrive pour les retrouver.";
 
     out.feedback_about = "Si vous lisez ceci, vous vous demandez probablement pourquoi CryptPad envoie des requêtes vers des pages web quand vous realisez certaines actions.";
     out.feedback_privacy = "Nous prenons au sérieux le respect de votre vie privée, et en même temps nous souhaitons rendre CryptPad très simple à utiliser. Nous utilisons cette page pour comprendre quelles fonctionnalités dans l'interface comptent le plus pour les utilisateurs, en l'appelant avec un paramètre spécifiant quelle action a été réalisée.";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 3bf37b51c..9eca03504 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -161,7 +161,7 @@ define(function () {
 
     out.tags_title = "Tags (for you only)";
     out.tags_add = "Update this page's tags";
-    out.tags_searchHint = "Find files by their tags by searching in your CryptDrive";
+    out.tags_searchHint = "Start a search with # in your CryptDrive to find your tagged pads.";
 
     out.tags_duplicate = "Duplicate tag: {0}";
 

From 21f1a48380ee480088e59c1a1d49a391b9bee031 Mon Sep 17 00:00:00 2001
From: CatalinScr <catalin.scr@gmail.com>
Date: Mon, 9 Oct 2017 17:17:33 +0300
Subject: [PATCH 12/31] changed the login in button

---
 customize.dist/pages.js                        |  3 +--
 customize.dist/src/less2/pages/page-login.less | 16 ++++------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 55945ccd2..a50201f2d 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -558,8 +558,7 @@ define([
                             placeholder: Msg.login_password,
                         }),
                         h('div.extra', [
-                            h('button.login.first.btn', Msg.login_login),
-                            h('button#register.btn.register.cp-login-register', Msg.login_register)
+                            h('button.login.first.btn', Msg.login_login)
                         ])
                     ])
                 ]),
diff --git a/customize.dist/src/less2/pages/page-login.less b/customize.dist/src/less2/pages/page-login.less
index 3e5e4e77f..2b8064486 100644
--- a/customize.dist/src/less2/pages/page-login.less
+++ b/customize.dist/src/less2/pages/page-login.less
@@ -54,19 +54,11 @@
     }
     .extra {
     	margin-top: 1em;
-    	.cp-login-register {
-    		color: @cryptpad_color_blue;
-	        background: #fff;
-	        border: 2px solid @cryptpad_color_blue;
-	        border-radius: 0;
-	        &:hover {
-	            transform: scale(1.05);
-	        }
-    	}
     	.login {
-    		background: transparent;
-    		color: @cryptpad_color_blue;
-    		padding: 0;
+    		background: @cryptpad_color_blue;
+    		color: #fff;
+    		padding: 10px;
+            border-radius: 0;
     		&:hover {
 	            transform: scale(1.05);
 	        } 

From d50a6929866c448119a0282cd35ee5236470dc51 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 9 Oct 2017 16:51:57 +0200
Subject: [PATCH 13/31] add note about tags to prompt

---
 customize.dist/translations/messages.js | 1 +
 www/common/common-interface.js          | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 3bf37b51c..42266c1fb 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -162,6 +162,7 @@ define(function () {
     out.tags_title = "Tags (for you only)";
     out.tags_add = "Update this page's tags";
     out.tags_searchHint = "Find files by their tags by searching in your CryptDrive";
+    out.tags_notShared = "Your tags are not shared with other users";
 
     out.tags_duplicate = "Duplicate tag: {0}";
 
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index badfa4e57..da50c3c01 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -178,10 +178,14 @@ define([
 
         var tagger = dialog.frame([
             dialog.message([
-                Messages.tags_add,
-                h('p', Messages.tags_searchHint)
+                h('ul', [
+                    Messages.tags_add,
+                    h('br'),
+                    Messages.tags_searchHint,
+                ]),
             ]),
             input,
+            h('center', h('small', Messages.tags_notShared)),
             dialog.nav(),
         ]);
 

From d046b9ce3314de6bb50a1cbde2fffbd0886be8d5 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 9 Oct 2017 17:16:48 +0200
Subject: [PATCH 14/31] add missing French key

---
 customize.dist/translations/messages.fr.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index b6f4f93fc..89bc6cdde 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -160,6 +160,7 @@ define(function () {
     out.tags_title = "Mots-clés du pad (pour vous uniquement)";
     out.tags_add = "Modifier les mots-clés du pad";
     out.tags_searchHint = "Commencez une recherche par # dans votre CryptDrive pour retrouver vos pads par mot-clé.";
+    out.tags_notShared = "Vos mots-clés ne sont pas partagés avec les autres utilisateurs";
     out.tags_duplicate = "Mot-clé déjà présent : {0}";
 
     out.slideOptionsText = "Options";
@@ -396,6 +397,9 @@ define(function () {
     out.fc_remove = "Supprimer définitivement";
     out.fc_empty = "Vider la corbeille";
     out.fc_prop = "Propriétés";
+    out.fc_hashtag = "Mots-clés";
+    // File - Context menu
+
     out.fc_sizeInKilobytes = "Taille en kilo-octets";
     // fileObject.js (logs)
     out.fo_moveUnsortedError = "La liste des éléments non triés ne peut pas contenir de dossiers.";

From f4189f883eeb4ba56e5e24c0b19402a207833e76 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 9 Oct 2017 17:28:56 +0200
Subject: [PATCH 15/31] Add missing french translation keys

---
 customize.dist/pages.js                    |  4 ++--
 customize.dist/translations/messages.fr.js | 26 ++++++++++++++++++++++
 customize.dist/translations/messages.js    |  2 --
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 588358851..d821fc953 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -524,8 +524,8 @@ define([
                 h('div.row.cp-register-test',[
                     h('hr'),
                     h('div.col-12', [
-                        setHTML(h('p.test-details'), Msg.register_testimonial),
-                        h('a.cp-test-source.pull-right', { href : 'http://boingboing.net/2016/09/26/cryptpad-a-freeopen-end-to.html'}, Msg.register_testimonial_name)
+                        setHTML(h('p.test-details'), " \"Tools like Etherpad and Google Docs [...] all share a weakness, which is that whomever owns the document server can see everything you're typing. Cryptpad is a free/open project that uses some of the ideas behind blockchain to implement a \"zero-knowledge\" version of a collaborative document editor, ensuring that only the people working on a document can see it.\" "),
+                        h('a.cp-test-source.pull-right', { href : 'http://boingboing.net/2016/09/26/cryptpad-a-freeopen-end-to.html'}, "Cory Doctorow")
                     ])
                 ])
             ]),
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index b6f4f93fc..cd0560e9f 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -396,6 +396,7 @@ define(function () {
     out.fc_remove = "Supprimer définitivement";
     out.fc_empty = "Vider la corbeille";
     out.fc_prop = "Propriétés";
+    out.fc_hashtag = "Mots-clés";
     out.fc_sizeInKilobytes = "Taille en kilo-octets";
     // fileObject.js (logs)
     out.fo_moveUnsortedError = "La liste des éléments non triés ne peut pas contenir de dossiers.";
@@ -543,6 +544,12 @@ define(function () {
     out.main_howitworks_p1 = 'CryptPad utilise une variante de l\'algorithme d\'<a href="https://en.wikipedia.org/wiki/Operational_transformation">Operational transformation</a> qui est capable de trouver un consensus distribué en utilisant <a href="https://bitcoin.org/bitcoin.pdf">une chaîne de bloc Nakamoto</a>, un outil popularisé par le <a href="https://fr.wikipedia.org/wiki/Bitcoin">Bitcoin</a>. De cette manière, l\'algorithme évite la nécessité d\'utiliser un serveur central pour résoudre les conflits d\'édition de l\'Operational Transformation, et sans ce besoin de résolution des conflits le serveur peut rester ignorant du contenu qui est édité dans le pad.';
     //contact.html
     out.main_about_p2 = 'Si vous avez des questions ou commentaires, vous pouvez <a href="https://twitter.com/cryptpad"><i class="fa fa-twitter"></i>nous tweeter</a>, ouvrir une issue sur <a href="https://github.com/xwiki-labs/cryptpad/issues/" title="our issue tracker"><i class="fa fa-github"></i>GitHub</a>, venir dire bonjour sur <a href="https://riot.im/app/#/room/#cryptpad:matrix.org" title="Matrix">notre <i class="fa fa-comment"></i>salle Matrix</a> ou IRC (#cryptpad sur irc.freenode.net), ou bien encore <a href="mailto:research@xwiki.com"><i class="fa fa-envelope"></i>nous envoyer un email</a>.';
+    out.main_about_p22 = 'Tweetez nous';
+    out.main_about_p23 = 'Ouvrez un ticket (GitHub)';
+    out.main_about_p24 = 'Dites Bonjour (Matrix)';
+    out.main_about_p25 = 'Envoyez-nous un email';
+    out.main_about_p26 = 'Si vous avez une question ou des remarques, n\'hésitez pas à nous contacter !';
+
 
     out.main_info = "<h2>Collaborez avec confiance</h2><br>Développez vos idées en groupe avec des documents partagés; la technologie <strong>Zero Knowledge</strong> sécurise vos données.";
     out.main_catch_phrase = "Le Cloud Zero Knowledge";
@@ -588,6 +595,25 @@ define(function () {
 
     out.topbar_whatIsCryptpad = "Qu'est-ce que CryptPad";
 
+    // what-is-cryptpad.html
+
+    out.whatis_title = "Qu'est-ce que CryptPad";
+    out.whatis_collaboration = 'Collaboration rapide, facile';
+    out.whatis_collaboration_p1 = "Avec CryptPad, vous pouvez créer rapidement des documents collaboratifs pour prendre des notes à plusieurs. Quand vous vous enregistrez et vous vous connectez, vous obtenez la possibilité d'importer des fichiers dans un CryptDrive où vous pouvez organiser tous vos pads (documents). En tant qu'utilisateur enregistré, vous possédez 50 Mo de stockage gratuit.";
+    out.whatis_collaboration_p2 = "Vous pouvez partager l'accès à un document simplement en partageant le lien. Vous pouvez aussi partager un lien spécial fournissant un accès <em>en lecture seule</em> au pad, permettant du publier des travaux collaboratifs tout en restant maître de l'édition.";
+    out.whatis_collaboration_p3 = "Vous pouvez créer des documents de texte avec <a href=\"http://ckeditor.com/\">CKEditor</a> tout comme des documents Markdown qui sont rendus en temps-réel pendant que vous tapez. Vous pouvez aussi utiliser l'application de sondage pour planifier des évènements avec plusieurs participants.";
+    out.whatis_zeroknowledge = 'Zero Knowledge';
+    out.whatis_zeroknowledge_p1 = "Nous ne souhaitons pas connaître ce que vous tapez et grâce à la cryptographie moderne, vous pouvez être assuré que nous ne le <b>pouvons</b> pas. CryptPad utilise <b>un chiffrement à 100% côté client</b> pour protéger le contenu que vous tapez de nous, les personnes contrôlant le serveur.";
+    out.whatis_zeroknowledge_p2 = "Quand vous vous enregistrez et vous vous connectez, votre nom d'utilisateur et votre mot de passe sont transformés en une clé secrète grâce à la <a href=\"https://fr.wikipedia.org/wiki/Scrypt\">fonction de dérivation de clé Scrypt</a>. Ni cette clé, ni le nom d'utilisateur ou le mot de passe, ne sont envoyés au serveur. À la place, elle est utilisée côté client pour chiffrer et déchiffrer le contenu de votre CryptDrive, qui contient toutes les clés permettant d'accéder à vos pads.";
+    out.whatis_zeroknowledge_p3 = "Quand vous partagez le lien vers un document, vous partagez la clé cryptographique permettant de déchiffrer le document, mais puisque cette clé se trouve dans l'<a href=\"https://en.wikipedia.org/wiki/Fragment_identifier\">identificateur de fragment</a>, elle n'est jamais envoyée au serveur. Venez lire notre <a href=\"https://blog.cryptpad.fr/2017/07/07/cryptpad-analytics-what-we-cant-know-what-we-must-know-what-we-want-to-know/\">article de blog sur la vie privée</a> pour en apprendre davantage sur le type de métadonnées auxquelles nous avons ou n'avons pas accès.";
+    out.whatis_drive = "Organisation avec CryptDrive";
+    out.whatis_drive_p1 = "Dés que vous accédez à un pad dans CryptPad, celui-ci est automatiquement ajouté à votre CryptDrive, dans le dossier principal. Vous pouvez alors ranger ce pad dans un dossier ou le déplacer vers la corbeille. CryptDrive vous permet de rechercher parmi vos pads et de les organiser quand vous le souaitez, comme vous le souhaitez.";
+    out.whatis_drive_p2 = "Avec le glisser-déposer intuitif, vous pouvez déplacer vos pads dans votre drive tout en conservant les liens vers ces pads pour que vos collaborateurs n'en perdent pas l'accès";
+    out.whatis_drive_p3 = "Vous pouvez également importer des fichier dans votre CryptDrive et les partager avec des collègues. Les fichiers importés peuvent être rangés de la même manière que vos pads collaboratifs.";
+    out.whatis_business = 'CryptPad for Business';
+    out.whatis_business_p1 = "Le chiffrement Zero Knowledge de CryptPad excelle pour multiplier l'efficacité des protocoles de sécurité existants en recréant les contrôles d'accès organisationnels de manière cryptographique. Puisque les données sensibles ne peuvent être déchiffrées qu'en utilisant les identifiants d'un employé, CryptPad empêche d'éventuels hackers ayant réussi à s'introduire dans le serveur d'avoir accès en clair à ces données. Découvrez-en plus sur la manière dont CryptPad peut aider votre entreprise en lisant le <a href=\"https://blog.cryptpad.fr/images/CryptPad-Whitepaper-v1.0.pdf\">CryptPad Whitepaper</a>.";
+    out.whatis_business_p2 = "CryptPad est déployable sur site et les <a href=\"https://cryptpad.fr/about.html\">développeurs CryptPad</a> chez XWiki SAS peuvent effectuer du développement, des personnalisations et du support commercial. Contactez-nous à <a href=\"mailto:sales@cryptpad.fr\">sales@cryptpad.fr</a> pour plus d'informations.";
+
     // privacy.html
 
     out.policy_title = 'Politique de confidentialité de CryptPad';
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 9eca03504..2239385ba 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -451,8 +451,6 @@ define(function () {
             "<li><i class='fa fa-info-circle'> </i> If you are using a shared computer, you need to log out when you are done, closing the tab is not enough.</li>",
         "</ul>"
     ].join('');
-    out.register_testimonial =" \"Tools like Etherpad and Google Docs [...] all share a weakness, which is that whomever owns the document server can see everything you're typing. Cryptpad is a free/open project that uses some of the ideas behind blockchain to implement a \"zero-knowledge\" version of a collaborative document editor, ensuring that only the people working on a document can see it.\"  ";
-    out.register_testimonial_name = "Cory Doctorow";
 
     out.register_writtenPassword = "I have written down my username and password, proceed";
     out.register_cancel = "Go back";

From c46280d032219ab49a12fa7058056f6dc4f3d95d Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 10 Oct 2017 11:32:52 +0200
Subject: [PATCH 16/31] Fix style issues for Edge

---
 www/poll/app-poll.less | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
index 526d1b2af..8fb0327a1 100644
--- a/www/poll/app-poll.less
+++ b/www/poll/app-poll.less
@@ -63,10 +63,6 @@ overflow-x: hidden;
     }
 }
 
-.cp-app-poll-table-text-cell input[type="text"] {
-    width: 400px;
-}
-
 input[type="text"], textarea {
     background-color: white;
     color: black;
@@ -238,11 +234,21 @@ div.cp-app-poll-realtime {
                 background-color: @poll-uncommitted-cell !important;
             }
             div.cp-app-poll-table-text-cell {
+                display: flex;
+                align-items: center;
                 background-color: @poll-uncommitted-bg !important;
                 color: @poll-uncommitted-text !important;
                 input {
-                    width: ~"calc(100% - 80px)" !important;
-                    vertical-align: middle;
+                    order: 2;
+                    flex: 1;
+                    //width: ~"calc(100% - 80px)" !important;
+                    //vertical-align: middle;
+                }
+                .cp-app-poll-table-remove {
+                    order: 1;
+                }
+                .cp-app-poll-table-edit {
+                    order: 3;
                 }
             }
             text-align: center;
@@ -384,6 +390,9 @@ div.cp-app-poll-realtime {
         }
         thead {
             height: 52px;
+            tr {
+                height: 52px;
+            }
             td {
                 padding: 0px 5px;
                 background: @poll-th-bg;

From 75b3ff9c60e5e164b78d6ff8175d4a67c949c297 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 10 Oct 2017 11:35:24 +0200
Subject: [PATCH 17/31] CSS issue in polls

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

diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
index 8fb0327a1..dd3b3b91f 100644
--- a/www/poll/app-poll.less
+++ b/www/poll/app-poll.less
@@ -102,6 +102,7 @@ table#cp-app-poll-table {
     overflow: hidden;
 }
 #cp-app-poll-create-option {
+    order: 3;
     display: inline-flex;
     width: 50px;
     height: 24px;

From d4cd67f7a769e12a80039c71badaaef01eca4506 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 10 Oct 2017 13:26:31 +0200
Subject: [PATCH 18/31] update current version of readme

---
 readme.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index 2d46155af..04d4e2ef2 100644
--- a/readme.md
+++ b/readme.md
@@ -18,8 +18,7 @@ It also contains information on keeping your instance of CryptPad up to date.
 
 ## Current version
 
-CryptPad v1.15.0 (Poukai) released the 12th September 2017
-See [Cryptad-Releases](docs/releases)
+The most recent version and all past release notes can be found [here](https://github.com/xwiki-labs/cryptpad/releases/).
 
 ## Setup using Docker
 

From ecb537ac7fd5d74066a37af439a20852e5d5a38a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 10 Oct 2017 18:19:49 +0200
Subject: [PATCH 19/31] Move code to render.js in poll

---
 customize.dist/pages.js |   2 +-
 www/poll/app-poll.less  |  14 ++++
 www/poll/inner.js       | 153 +++++++---------------------------------
 www/poll/render.js      | 117 +++++++++++++++++++++++++++++-
 4 files changed, 155 insertions(+), 131 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 2c26acc35..6b1e4a62f 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -656,7 +656,7 @@ define([
                             h('br')
                         ]),
                         h('div#cp-app-poll-table-container', [
-                            h('div#cp-app-poll-table-scroll'),
+                            h('div#cp-app-poll-table-scroll', [h('table')]),
                             h('button#cp-app-poll-create-user.btn.btn-secondary', {
                                 title: Msg.poll_create_user
                             }, h('span.fa.fa-plus')),
diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
index dd3b3b91f..276267963 100644
--- a/www/poll/app-poll.less
+++ b/www/poll/app-poll.less
@@ -224,6 +224,15 @@ div.cp-app-poll-realtime {
     padding: 0px;
     margin: 0px;
 
+    .cp-app-poll-table-scrolled {
+        tr td:last-child {
+            right: 0;
+        }
+        tr td:nth-last-child(2) {
+            right: 100px;
+        }
+    }
+
     table {
         border-collapse: collapse;
         width: ~"calc(100% - 1px)";
@@ -401,6 +410,11 @@ div.cp-app-poll-realtime {
                 &:not(:last-child) {
                     border-right: 1px solid rgba(255,255,255,0.2);
                 }
+                &:last-child {
+                    height: 52px;
+                    line-height: 52px;
+                    text-align: center;
+                }
                 &:nth-last-child(2) {
                     border-right: 1px solid @poll-border-color;
                 }
diff --git a/www/poll/inner.js b/www/poll/inner.js
index c2da2e8ea..bf4b4003e 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -46,9 +46,7 @@ define([
     var Messages = Cryptpad.Messages;
     var saveAs = window.saveAs;
 
-    var Render = Renderer(Cryptpad);
     var APP = window.APP = {
-        Render: Render,
         unlocked: {
             row: [],
             col: []
@@ -57,6 +55,7 @@ define([
         Cryptpad: Cryptpad,
         mobile: function () { return $('body').width() <= 600; } // Menu and content area are not inline-block anymore for mobiles
     };
+    var Render = Renderer(Cryptpad, APP);
 
     var debug = $.noop; //console.log;
 
@@ -221,11 +220,12 @@ define([
         return newObj;
     };
 
-    var enableColumn = function (id) {
-        var $input = $('input[disabled="disabled"][data-rt-id^="' + id + '"]')
+    var enableColumn  = APP.enableColumn = function (id, table) {
+        table = table || $('body');
+        var $input = $(table).find('input[disabled="disabled"][data-rt-id^="' + id + '"]')
             .removeAttr('disabled');
         $input.closest('td').addClass('cp-app-poll-table-editing');
-        $('.cp-app-poll-table-lock[data-rt-id="' + id + '"]').addClass('fa-unlock')
+        $(table).find('.cp-app-poll-table-lock[data-rt-id="' + id + '"]').addClass('fa-unlock')
             .removeClass('fa-lock').attr('title', Messages.poll_unlocked);
     };
     var disableColumn = function (id) {
@@ -235,10 +235,13 @@ define([
         $('.cp-app-poll-table-lock[data-rt-id="' + id + '"]').addClass('fa-lock')
             .removeClass('fa-unlock').attr('title', Messages.poll_locked);
     };
-    var enableRow = function (id) {
-        var $input = $('input[type="text"][disabled="disabled"][data-rt-id="' + id + '"]').removeAttr('disabled');
+    var enableRow = APP.enableRow = function (id, table) {
+        table = table || $('body');
+        var $input = $(table).find('input[disabled="disabled"][data-rt-id="' + id + '"]')
+            .removeAttr('disabled');
         $input.closest('td').addClass('cp-app-poll-table-editing');
-        $('span.cp-app-poll-table-edit[data-rt-id="' + id + '"]').css('visibility', 'hidden');
+        $(table).find('span.cp-app-poll-table-edit[data-rt-id="' + id + '"]')
+            .css('visibility', 'hidden');
     };
     var disableRow = function (id) {
         var $input = $('input[type="text"][data-rt-id="' + id + '"]')
@@ -247,77 +250,10 @@ define([
         $('span.cp-app-poll-table-edit[data-rt-id="' + id + '"]').css('visibility', 'visible');
     };
 
-    var styleUserColumn = function () {
-        var userid = APP.userid;
-        if (!userid) { return; }
-
-        // Enable input for the userid column
-        enableColumn(userid);
-        $('input[disabled="disabled"][data-rt-id^="' + userid + '"]')
-            .attr('placeholder', Messages.poll_userPlaceholder);
-        $('.cp-app-poll-table-lock[data-rt-id="' + userid + '"]').remove();
-        $('[data-rt-id^="' + userid + '"]').closest('td')
-            .addClass("cp-app-poll-table-own");
-        $('.cp-app-poll-table-bookmark[data-rt-id="' + userid + '"]').css('visibility', '')
-            .addClass('cp-app-poll-table-bookmark-full')
-            .attr('title', Messages.poll_bookmarked_col);
-    };
-    var styleUncommittedColumn = function () {
-        var $scroll = $('#cp-app-poll-table-scroll');
-        var hasScroll = $scroll.width() < $scroll[0].scrollWidth;
-        APP.uncommitted.content.colsOrder.forEach(function(id) {
-            // Enable the checkboxes for the uncommitted column
-            enableColumn(id);
-            $('.cp-app-poll-table-lock[data-rt-id="' + id + '"]').remove();
-            $('.cp-app-poll-table-remove[data-rt-id="' + id + '"]').remove();
-            $('.cp-app-poll-table-bookmark[data-rt-id="' + id + '"]').remove();
-
-            $('td.cp-app-poll-table-uncommitted .cover').addClass("cp-app-poll-table-uncommitted");
-            var $uncommittedCol = $('[data-rt-id^="' + id + '"]').closest('td');
-            $uncommittedCol.addClass("cp-app-poll-table-uncommitted");
-
-            if (hasScroll) {
-                $uncommittedCol.css('right', '100px');
-            }
-        });
-        APP.uncommitted.content.rowsOrder.forEach(function(id) {
-            // Enable the checkboxes for the uncommitted column
-            enableRow(id);
-            $('.cp-app-poll-table-edit[data-rt-id="' + id + '"]').remove();
-            $('.cp-app-poll-table-remove[data-rt-id="' + id + '"]').remove();
-
-            $('[data-rt-id="' + id + '"]').closest('tr').addClass("cp-app-poll-table-uncommitted");
-        });
-    };
     var unlockElements = function () {
         APP.unlocked.row.forEach(enableRow);
         APP.unlocked.col.forEach(enableColumn);
     };
-    var updateTableButtons = function () {
-        var uncomColId = APP.uncommitted.content.colsOrder[0];
-        var uncomRowId = APP.uncommitted.content.rowsOrder[0];
-        var $createOption = APP.$table.find('tbody input[data-rt-id="' + uncomRowId+'"]')
-                                .closest('td').find('> div');
-        $createOption.append(APP.$createRow);
-        var $createUser = APP.$table.find('thead input[data-rt-id="' + uncomColId + '"]')
-                                .closest('td');
-        $createUser.prepend(APP.$createCol);
-
-        if (APP.proxy.content.colsOrder.indexOf(APP.userid) === -1) {
-            APP.$table.find('.cp-app-poll-table-bookmark').css('visibility', '');
-        }
-
-        //$('#cp-app-poll-create-user, #cp-app-poll-create-option').css('display', 'inline-flex');
-        if (!APP.proxy ||
-            !APP.proxy.content.rowsOrder ||
-            APP.proxy.content.rowsOrder.length === 0) {
-            //$('#create-user').hide();
-        }
-        var width = $('#cp-app-poll-table').outerWidth();
-        if (width) {
-            //$('#create-user').css('left', width + 30 + 'px');
-        }
-    };
     var setTablePublished = function (bool) {
         if (bool) {
             if (APP.$publish) { APP.$publish.hide(); }
@@ -329,59 +265,19 @@ define([
             $('#cp-app-poll-form').removeClass('cp-app-poll-published');
         }
     };
-    var addCount = function () {
+    var addScrollClass = function () {
         var $scroll = $('#cp-app-poll-table-scroll');
         var hasScroll = $scroll.width() < $scroll[0].scrollWidth;
-        var $countCol = $('tr td:last-child');
         if (hasScroll) {
-            $countCol.css('right', '0');
+            $scroll.addClass('cp-app-poll-table-scrolled');
+            return;
         }
-        var $thead = APP.$table.find('thead');
-        var $tr = APP.$table.find('tbody tr').first();
-        $thead.find('tr td').last()
-            .css({
-                'height': $thead.height()+'px',
-                'text-align': 'center',
-                'line-height': $thead.height()+'px'
-            })
-            .text(Messages.poll_total);
-        var winner = {
-            v: 0,
-            ids: []
-        };
-        APP.count = {};
-        APP.proxy.content.rowsOrder.forEach(function (rId) {
-            var count = Object.keys(APP.proxy.content.cells)
-                .filter(function (k) {
-                    return k.indexOf(rId) !== -1 && APP.proxy.content.cells[k] === 1;
-                }).length;
-            if (count > winner.v) {
-                winner.v = count;
-                winner.ids = [rId];
-            } else if (count && count === winner.v) {
-                winner.ids.push(rId);
-            }
-            APP.count[rId] = count;
-            APP.$table.find('[data-rt-count-id="' + rId + '"]')
-                .text(count)
-                .css({
-                    'height': $tr.height()+'px',
-                    'line-height': $tr.height()+'px'
-                });
-        });
-        winner.ids.forEach(function (rId) {
-            $('[data-rt-id="' + rId + '"]').closest('td').addClass('cp-app-poll-table-winner');
-            $('[data-rt-count-id="' + rId + '"]').addClass('cp-app-poll-table-winner');
-        });
+        $scroll.removeClass('cp-app-poll-table-scrolled');
     };
 
     var updateDisplayedTable = function () {
-        styleUserColumn();
-        styleUncommittedColumn();
-        unlockElements();
-        updateTableButtons();
         setTablePublished(APP.proxy.published);
-        addCount();
+        addScrollClass();
     };
 
     var unlockColumn = function (id, cb) {
@@ -941,12 +837,6 @@ define([
             unlockRow(rowuid);
         }
 
-        var displayedObj = mergeUncommitted(proxy, uncommitted, false);
-
-        var colsOrder = sortColumns(displayedObj.content.colsOrder, userid);
-
-        var $table = APP.$table = $(Render.asHTML(displayedObj, null, colsOrder, APP.readOnly));
-
         /*
             Extract uncommitted data (row or column) and create a new uncommitted row or column
         */
@@ -1007,6 +897,15 @@ define([
             });
         });
 
+        var displayedObj = mergeUncommitted(proxy, uncommitted, false);
+
+        var colsOrder = sortColumns(displayedObj.content.colsOrder, userid);
+
+        Render.updateTable($('#cp-app-poll-table-scroll').find('table')[0], displayedObj, {
+            cols: colsOrder,
+            readOnly: APP.readOnly
+        });
+
         // Description
         APP.editor.on('change', function () {
             var val = APP.editor.getValue();
@@ -1015,7 +914,7 @@ define([
         APP.$addComment.find('.cp-app-poll-comments-add-submit').click(addComment);
         APP.$addComment.find('.cp-app-poll-comments-add-cancel').click(resetComment);
 
-        $('#cp-app-poll-table-scroll').html('').prepend($table);
+        var $table = APP.$table = $('#cp-app-poll-table-scroll').find('table');
         updateDisplayedTable();
         updateDescription(null, APP.proxy.description || '');
 
diff --git a/www/poll/render.js b/www/poll/render.js
index 6ca527292..ba0a07c77 100644
--- a/www/poll/render.js
+++ b/www/poll/render.js
@@ -30,7 +30,7 @@ by maintaining indexes in rowsOrder and colsOrder
         }
     };
 
-var Renderer = function (Cryptpad) {
+var Renderer = function (Cryptpad, APP) {
 
     var Render = {
         Example: Example
@@ -222,7 +222,9 @@ var Renderer = function (Cryptpad) {
                         disabled: 'disabled'
                     };
                     return result;
-                })).concat([null]);
+                })).concat([{
+                    content: Cryptpad.Messages.poll_total
+                }]);
             }
             if (i === rows.length) {
                 return [null].concat(cols.map(function () {
@@ -307,7 +309,7 @@ var Renderer = function (Cryptpad) {
             }
             return ['TD', {}, elements];
         }
-        return ['TD', cell, []];
+        return ['TD', cell, [cell.content]];
     };
 
     var clone = function (o) {
@@ -444,6 +446,112 @@ var Renderer = function (Cryptpad) {
         }
     };
 
+    var styleUserColumn = function (table) {
+        var userid = APP.userid;
+        if (!userid) { return; }
+
+
+        // Enable input for the userid column
+        APP.enableColumn(userid, table);
+        $(table).find('input[disabled="disabled"][data-rt-id^="' + userid + '"]')
+            .attr('placeholder', Cryptpad.Messages.poll_userPlaceholder);
+        $(table).find('.cp-app-poll-table-lock[data-rt-id="' + userid + '"]').remove();
+        $(table).find('[data-rt-id^="' + userid + '"]').closest('td')
+            .addClass("cp-app-poll-table-own");
+        $(table).find('.cp-app-poll-table-bookmark[data-rt-id="' + userid + '"]')
+            .css('visibility', '')
+            .addClass('cp-app-poll-table-bookmark-full')
+            .attr('title', Cryptpad.Messages.poll_bookmarked_col);
+    };
+    var styleUncommittedColumn = function (table) {
+        APP.uncommitted.content.colsOrder.forEach(function(id) {
+            // Enable the checkboxes for the uncommitted column
+            APP.enableColumn(id, table);
+            $(table).find('.cp-app-poll-table-lock[data-rt-id="' + id + '"]').remove();
+            $(table).find('.cp-app-poll-table-remove[data-rt-id="' + id + '"]').remove();
+            $(table).find('.cp-app-poll-table-bookmark[data-rt-id="' + id + '"]').remove();
+
+            $(table).find('td.cp-app-poll-table-uncommitted .cover')
+                .addClass("cp-app-poll-table-uncommitted");
+            var $uncommittedCol = $(table).find('[data-rt-id^="' + id + '"]').closest('td');
+            $uncommittedCol.addClass("cp-app-poll-table-uncommitted");
+        });
+        APP.uncommitted.content.rowsOrder.forEach(function(id) {
+            // Enable the checkboxes for the uncommitted column
+            APP.enableRow(id, table);
+            $(table).find('.cp-app-poll-table-edit[data-rt-id="' + id + '"]').remove();
+            $(table).find('.cp-app-poll-table-remove[data-rt-id="' + id + '"]').remove();
+
+            $(table).find('[data-rt-id="' + id + '"]').closest('tr')
+                .addClass("cp-app-poll-table-uncommitted");
+        });
+    };
+    var unlockElements = function (table) {
+        APP.unlocked.row.forEach(function (id) { APP.enableRow(id, table); });
+        APP.unlocked.col.forEach(function (id) { APP.enableColumn(id, table); });
+    };
+    var updateTableButtons = function (table) {
+        var uncomColId = APP.uncommitted.content.colsOrder[0];
+        var uncomRowId = APP.uncommitted.content.rowsOrder[0];
+        var $createOption = $(table).find('tbody input[data-rt-id="' + uncomRowId+'"]')
+                                .closest('td').find('> div');
+        $createOption.append(APP.$createRow);
+        var $createUser = $(table).find('thead input[data-rt-id="' + uncomColId + '"]')
+                                .closest('td');
+        $createUser.prepend(APP.$createCol);
+
+        if (APP.proxy.content.colsOrder.indexOf(APP.userid) === -1) {
+            $(table).find('.cp-app-poll-table-bookmark').css('visibility', '');
+        }
+
+        if (!APP.proxy ||
+            !APP.proxy.content.rowsOrder ||
+            APP.proxy.content.rowsOrder.length === 0) {
+        }
+    };
+    var addCount = function (table) {
+        var $tr = $(table).find('tbody tr').first();
+        var winner = {
+            v: 0,
+            ids: []
+        };
+        APP.count = {};
+        APP.proxy.content.rowsOrder.forEach(function (rId) {
+            var count = Object.keys(APP.proxy.content.cells)
+                .filter(function (k) {
+                    return k.indexOf(rId) !== -1 && APP.proxy.content.cells[k] === 1;
+                }).length;
+            if (count > winner.v) {
+                winner.v = count;
+                winner.ids = [rId];
+            } else if (count && count === winner.v) {
+                winner.ids.push(rId);
+            }
+            APP.count[rId] = count;
+            var h = $tr.height() || 28;
+            $(table).find('[data-rt-count-id="' + rId + '"]')
+                .text(count)
+                .css({
+                    'height': h+'px',
+                    'line-height': h+'px'
+                });
+        });
+        winner.ids.forEach(function (rId) {
+            $(table).find('[data-rt-id="' + rId + '"]').closest('td')
+                .addClass('cp-app-poll-table-winner');
+            $(table).find('[data-rt-count-id="' + rId + '"]')
+                .addClass('cp-app-poll-table-winner');
+        });
+    };
+
+    var styleTable = function (table) {
+        styleUserColumn(table);
+        styleUncommittedColumn(table);
+        unlockElements(table);
+        updateTableButtons(table);
+        addCount(table);
+    };
+
     Render.updateTable = function (table, obj, conf) {
         var DD = new DiffDOM(diffOptions);
 
@@ -457,6 +565,9 @@ var Renderer = function (Cryptpad) {
         if (!hj) { throw new Error("Expected Hyperjson!"); }
 
         var table2 = Hyperjson.toDOM(hj);
+
+        styleTable(table2);
+
         var patch = DD.diff(table, table2);
         DD.apply(table, patch);
     };

From fe3bea877d9fb9fe22b207aa4c2c534edbc5e49a Mon Sep 17 00:00:00 2001
From: Emil Suleymanov <suleymanovemil8@gmail.com>
Date: Wed, 11 Oct 2017 00:47:03 +0200
Subject: [PATCH 20/31] Add dots

Yep, just dots.
---
 readme.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/readme.md b/readme.md
index 04d4e2ef2..9d32288ce 100644
--- a/readme.md
+++ b/readme.md
@@ -22,11 +22,11 @@ The most recent version and all past release notes can be found [here](https://g
 
 ## Setup using Docker
 
-See [Cryptpad-Docker](docs/cryptpad-docker.md)
+See [Cryptpad-Docker](docs/cryptpad-docker.md).
 
 ## Setup using Ansible
 
-See [Ansible Role for Cryptpad](https://github.com/systemli/ansible-role-cryptpad)
+See [Ansible Role for Cryptpad](https://github.com/systemli/ansible-role-cryptpad).
 
 # Security
 
@@ -79,7 +79,7 @@ If you have any questions or comments, or if you're interested in contributing t
 This software is and will always be available under the GNU Affero General Public License as
 published by the Free Software Foundation, either version 3 of the License, or (at your option)
 any later version. If you wish to use this technology in a proprietary product, please contact
-sales@xwiki.com
+sales@xwiki.com.
 
 [ChainPad]: https://github.com/xwiki-contrib/chainpad
 [active attack]: https://en.wikipedia.org/wiki/Attack_(computing)#Types_of_attacks

From b110e1b8daba0a6cbb514a9eb7e57fd0e8d520ba Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 11 Oct 2017 15:37:11 +0200
Subject: [PATCH 21/31] Fix style issues in poll for Edge

---
 www/poll/app-poll.less | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
index 276267963..eb8c964a4 100644
--- a/www/poll/app-poll.less
+++ b/www/poll/app-poll.less
@@ -83,6 +83,7 @@ input[type="text"][disabled]::placeholder {
 
 table#cp-app-poll-table {
     margin: 0px;
+    overflow: hidden;
 }
 #cp-app-poll-table-container {
     position: relative;
@@ -244,22 +245,8 @@ div.cp-app-poll-realtime {
                 background-color: @poll-uncommitted-cell !important;
             }
             div.cp-app-poll-table-text-cell {
-                display: flex;
-                align-items: center;
                 background-color: @poll-uncommitted-bg !important;
                 color: @poll-uncommitted-text !important;
-                input {
-                    order: 2;
-                    flex: 1;
-                    //width: ~"calc(100% - 80px)" !important;
-                    //vertical-align: middle;
-                }
-                .cp-app-poll-table-remove {
-                    order: 1;
-                }
-                .cp-app-poll-table-edit {
-                    order: 3;
-                }
             }
             text-align: center;
             background-color: @poll-uncommitted-bg !important;
@@ -301,9 +288,17 @@ div.cp-app-poll-realtime {
                     margin: 0px;
                     height: 100%;
 
+                    display: flex;
+                    align-items: center;
+                    .cp-app-poll-table-remove {
+                        order: 1;
+                    }
+                    .cp-app-poll-table-edit {
+                        order: 3;
+                    }
                     input {
-                        width: 80%;
-                        width: 90%;
+                        order: 2;
+                        flex: 1;
                         height: 100%;
                         border: 0px;
                         margin: 2px;

From 00e8d32d607f78a65b39c96033231d0d607bd07a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 11 Oct 2017 15:37:47 +0200
Subject: [PATCH 22/31] Fix column position in poll for Chrome

---
 www/poll/inner.js  | 17 ++++++++++++++++-
 www/poll/render.js |  5 -----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/www/poll/inner.js b/www/poll/inner.js
index bf4b4003e..9e3114ef0 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -254,6 +254,7 @@ define([
         APP.unlocked.row.forEach(enableRow);
         APP.unlocked.col.forEach(enableColumn);
     };
+
     var setTablePublished = function (bool) {
         if (bool) {
             if (APP.$publish) { APP.$publish.hide(); }
@@ -268,16 +269,30 @@ define([
     var addScrollClass = function () {
         var $scroll = $('#cp-app-poll-table-scroll');
         var hasScroll = $scroll.width() < $scroll[0].scrollWidth;
-        if (hasScroll) {
+        var noColumn = $scroll.width() < 100;
+        if (hasScroll && !noColumn) {
             $scroll.addClass('cp-app-poll-table-scrolled');
             return;
         }
         $scroll.removeClass('cp-app-poll-table-scrolled');
     };
+    var updateTableButtons = function () {
+        var uncomColId = APP.uncommitted.content.colsOrder[0];
+        var uncomRowId = APP.uncommitted.content.rowsOrder[0];
+        var $createOption = $('tbody input[data-rt-id="' + uncomRowId+'"]')
+                                .closest('td').find('> div');
+        $createOption.find('#cp-app-poll-create-option').remove();
+        $createOption.append(APP.$createRow);
+        var $createUser = $('thead input[data-rt-id="' + uncomColId + '"]')
+                                .closest('td');
+        $createUser.find('#cp-app-poll-create-user').remove();
+        $createUser.prepend(APP.$createCol);
+    };
 
     var updateDisplayedTable = function () {
         setTablePublished(APP.proxy.published);
         addScrollClass();
+        updateTableButtons();
     };
 
     var unlockColumn = function (id, cb) {
diff --git a/www/poll/render.js b/www/poll/render.js
index ba0a07c77..a92f222b4 100644
--- a/www/poll/render.js
+++ b/www/poll/render.js
@@ -503,11 +503,6 @@ var Renderer = function (Cryptpad, APP) {
         if (APP.proxy.content.colsOrder.indexOf(APP.userid) === -1) {
             $(table).find('.cp-app-poll-table-bookmark').css('visibility', '');
         }
-
-        if (!APP.proxy ||
-            !APP.proxy.content.rowsOrder ||
-            APP.proxy.content.rowsOrder.length === 0) {
-        }
     };
     var addCount = function (table) {
         var $tr = $(table).find('tbody tr').first();

From 86767184daca9afee86fe583b089cef3cff45098 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 11 Oct 2017 15:37:11 +0200
Subject: [PATCH 23/31] Fix style issues in poll for Edge

---
 www/poll/app-poll.less | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
index dd3b3b91f..5ee093b3e 100644
--- a/www/poll/app-poll.less
+++ b/www/poll/app-poll.less
@@ -83,6 +83,7 @@ input[type="text"][disabled]::placeholder {
 
 table#cp-app-poll-table {
     margin: 0px;
+    overflow: hidden;
 }
 #cp-app-poll-table-container {
     position: relative;
@@ -235,22 +236,8 @@ div.cp-app-poll-realtime {
                 background-color: @poll-uncommitted-cell !important;
             }
             div.cp-app-poll-table-text-cell {
-                display: flex;
-                align-items: center;
                 background-color: @poll-uncommitted-bg !important;
                 color: @poll-uncommitted-text !important;
-                input {
-                    order: 2;
-                    flex: 1;
-                    //width: ~"calc(100% - 80px)" !important;
-                    //vertical-align: middle;
-                }
-                .cp-app-poll-table-remove {
-                    order: 1;
-                }
-                .cp-app-poll-table-edit {
-                    order: 3;
-                }
             }
             text-align: center;
             background-color: @poll-uncommitted-bg !important;
@@ -292,9 +279,17 @@ div.cp-app-poll-realtime {
                     margin: 0px;
                     height: 100%;
 
+                    display: flex;
+                    align-items: center;
+                    .cp-app-poll-table-remove {
+                        order: 1;
+                    }
+                    .cp-app-poll-table-edit {
+                        order: 3;
+                    }
                     input {
-                        width: 80%;
-                        width: 90%;
+                        order: 2;
+                        flex: 1;
                         height: 100%;
                         border: 0px;
                         margin: 2px;

From 54b5a2d6544af9691d019aa2a7e7d75e24d71fad Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 11 Oct 2017 16:01:26 +0200
Subject: [PATCH 24/31] Fix style issues in poll (Chrome)

---
 www/poll/app-poll.less | 10 +++++-----
 www/poll/inner.js      |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
index 5ee093b3e..7d2cf1216 100644
--- a/www/poll/app-poll.less
+++ b/www/poll/app-poll.less
@@ -28,7 +28,7 @@
 @poll-uncommitted-bg: #ddd; //lighten(@poll-th-bg, 50%);
 @poll-uncommitted-text: black;
 
-@poll-placeholder: #666;
+@poll-placeholder: #fff;
 @poll-border-color: #555;
 @poll-cover-color: #000;
 @poll-fg: #000;
@@ -77,7 +77,7 @@ input[type="text"][disabled], textarea[disabled] {
 // The placeholder color only seems to effect Safari when not set
 
 input[type="text"][disabled]::placeholder {
-    //color: @poll-placeholder;
+    color: @poll-placeholder;
     opacity: 1;
 }
 
@@ -275,10 +275,9 @@ div.cp-app-poll-realtime {
                 margin: 0px;
 
                 div.cp-app-poll-table-text-cell {
+                    height: 28px;
                     padding: 0px;
                     margin: 0px;
-                    height: 100%;
-
                     display: flex;
                     align-items: center;
                     .cp-app-poll-table-remove {
@@ -288,9 +287,10 @@ div.cp-app-poll-realtime {
                         order: 3;
                     }
                     input {
+                        min-width: 0;
                         order: 2;
                         flex: 1;
-                        height: 100%;
+                        height: 24px;
                         border: 0px;
                         margin: 2px;
                         &[disabled] {
diff --git a/www/poll/inner.js b/www/poll/inner.js
index c2da2e8ea..b6811dc80 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -264,7 +264,7 @@ define([
     };
     var styleUncommittedColumn = function () {
         var $scroll = $('#cp-app-poll-table-scroll');
-        var hasScroll = $scroll.width() < $scroll[0].scrollWidth;
+        var hasScroll = $scroll.width() < $scroll[0].scrollWidth && $scroll.width() > 100;
         APP.uncommitted.content.colsOrder.forEach(function(id) {
             // Enable the checkboxes for the uncommitted column
             enableColumn(id);
@@ -331,7 +331,7 @@ define([
     };
     var addCount = function () {
         var $scroll = $('#cp-app-poll-table-scroll');
-        var hasScroll = $scroll.width() < $scroll[0].scrollWidth;
+        var hasScroll = $scroll.width() < $scroll[0].scrollWidth && $scroll.width() > 100;
         var $countCol = $('tr td:last-child');
         if (hasScroll) {
             $countCol.css('right', '0');

From b31bbebf7b664e14cc67a623066148b45c45d7b6 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 11 Oct 2017 17:11:38 +0200
Subject: [PATCH 25/31] Buttons are missing in whiteboard when zoomed in

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

diff --git a/www/whiteboard/app-whiteboard.less b/www/whiteboard/app-whiteboard.less
index b2bd789fc..1b1ac30c9 100644
--- a/www/whiteboard/app-whiteboard.less
+++ b/www/whiteboard/app-whiteboard.less
@@ -46,6 +46,7 @@
     // contains user tools
     #cp-app-whiteboard-controls {
         display: flex;
+        flex-wrap: wrap;
         align-items: center;
         justify-content: center;
 

From 620ba4ed5db4b25b6f170b65a80ca4467de2a4a9 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 11 Oct 2017 17:15:56 +0200
Subject: [PATCH 26/31] Fix fouc in drive

---
 www/drive/inner.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/drive/inner.html b/www/drive/inner.html
index 9761de93c..8f5a884ae 100644
--- a/www/drive/inner.html
+++ b/www/drive/inner.html
@@ -6,6 +6,7 @@
     <style>
         .loading-hidden { display: none; }
         #editor1 { display: none; }
+        .cp-app-drive-context { display: none; }
     </style>
 </head>
 <body class="cp-app-drive">

From b28c1537e85d8ec99a6335ba3cb3bf296961e046 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 12 Oct 2017 10:59:23 +0200
Subject: [PATCH 27/31] Fix history in readonly mode

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

diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 6913f7ef5..d06ffd4b5 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -262,7 +262,7 @@ define([
                     msg = parsed[1][4];
                     if (msg) {
                         msg = msg.replace(/^cp\|/, '');
-                        var decryptedMsg = crypto.decrypt(msg, secret.keys.validateKey);
+                        var decryptedMsg = crypto.decrypt(msg, true);
                         msgs.push(decryptedMsg);
                     }
                 };

From 95ad25973e25f847405c1df19a8bc7c3ad6b2712 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 12 Oct 2017 11:41:53 +0200
Subject: [PATCH 28/31] Ability to delete a stronger pad from readonly mode

---
 www/common/cryptpad-common.js         | 4 ++--
 www/common/sframe-common-interface.js | 3 ---
 www/common/sframe-common-outer.js     | 6 ++++++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index a6f830354..4962bd072 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1204,8 +1204,8 @@ define([
     };
 
     // Forget button
-    var moveToTrash = common.moveToTrash = function (cb) {
-        var href = window.location.href;
+    var moveToTrash = common.moveToTrash = function (cb, href) {
+        href = href || window.location.href;
         common.forgetPad(href, function (err) {
             if (err) {
                 console.log("unable to forget pad");
diff --git a/www/common/sframe-common-interface.js b/www/common/sframe-common-interface.js
index 6e6b4539d..52d95b040 100644
--- a/www/common/sframe-common-interface.js
+++ b/www/common/sframe-common-interface.js
@@ -150,9 +150,6 @@ define([
                     'class': "fa fa-trash cryptpad-forget",
                     style: 'font:'+size+' FontAwesome'
                 });
-                if (!common.isStrongestStored()) {
-                    button.addClass('cp-toolbar-hidden');
-                }
                 if (callback) {
                     button
                     .click(common.prepareFeedback(type))
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index d06ffd4b5..46534fe9d 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -216,6 +216,12 @@ define([
             });
 
             sframeChan.on('Q_MOVE_TO_TRASH', function (data, cb) {
+                cb = cb || $.noop;
+                if (readOnly && hashes.editHash) {
+                    var appPath = window.location.pathname;
+                    Cryptpad.moveToTrash(cb, appPath + '#' + hashes.editHash);
+                    return;
+                }
                 Cryptpad.moveToTrash(cb);
             });
 

From 50090a3af6a6c5c37a66c8c0f0ef149539b4d2d2 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 12 Oct 2017 12:18:32 +0200
Subject: [PATCH 29/31] Add placeholders for the comment form in poll

---
 customize.dist/pages.js                    |  7 +++++--
 customize.dist/translations/messages.fr.js |  1 +
 customize.dist/translations/messages.js    |  1 +
 www/poll/inner.js                          | 13 ++++++++-----
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 6b1e4a62f..4a3f37b8c 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -668,9 +668,12 @@ define([
                             h('h2#cp-app-poll-comments-add-title', Msg.poll_comment_add),
                             h('div#cp-app-poll-comments-add', [
                                 h('input.cp-app-poll-comments-add-name', {
-                                    type: 'text'
+                                    type: 'text',
+                                    placeholder: Msg.anonymous
+                                }),
+                                h('textarea.cp-app-poll-comments-add-msg', {
+                                    placeholder: Msg.poll_comment_placeholder
                                 }),
-                                h('textarea.cp-app-poll-comments-add-msg'),
                                 h('button.cp-app-poll-comments-add-submit.btn.btn-secondary',
                                     Msg.poll_comment_submit),
                                 h('button.cp-app-poll-comments-add-cancel.btn.btn-secondary',
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 78a1d349c..0dedf52ef 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -268,6 +268,7 @@ define(function () {
     out.poll_comment_add = "Ajouter un commentaire";
     out.poll_comment_submit = "Envoyer";
     out.poll_comment_remove = "Supprimer ce commentaire";
+    out.poll_comment_placeholder = "Votre commentaire";
 
     out.poll_comment_disabled = "Publiez ce sondage en utilisant le bouton ✓ afin d'activer les commentaires.";
 
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 86c21ea6f..a3e254fbe 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -272,6 +272,7 @@ define(function () {
     out.poll_comment_add = "Add a comment";
     out.poll_comment_submit = "Send";
     out.poll_comment_remove = "Delete this comment";
+    out.poll_comment_placeholder = "Your comment";
 
     out.poll_comment_disabled = "Publish this poll using the ✓ button to enable the comments.";
 
diff --git a/www/poll/inner.js b/www/poll/inner.js
index 066e2360d..16a9d2e07 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -697,6 +697,7 @@ define([
             return comments[a].time > comments[b].time;
         }).forEach(function (k) {
             var c = comments[k];
+            var name = c.name || Messages.anonymous;
             var $c = $('<div>', {
                 'class': 'cp-app-poll-comments-list-el'
             }).prependTo($comments);
@@ -708,7 +709,7 @@ define([
             if (c.avatar && avatars[c.avatar]) {
                 $avatar.append(avatars[c.avatar]);
             } else {
-                common.displayAvatar($avatar, c.avatar, c.name, function ($img) {
+                common.displayAvatar($avatar, c.avatar, name, function ($img) {
                     if (c.avatar && $img.length) { avatars[c.avatar] = $img[0].outerHTML; }
                 });
             }
@@ -717,11 +718,11 @@ define([
                     'href': APP.origin + '/profile/#' + c.profile,
                     'target': '_blank',
                     'class': 'cp-app-poll-comments-list-data-name'
-                }).appendTo($data).text(c.name);
+                }).appendTo($data).text(name);
             } else {
                 $('<span>', {
                     'class': 'cp-app-poll-comments-list-data-name'
-                }).appendTo($data).text(c.name);
+                }).appendTo($data).text(name);
             }
             $('<span>', {
                 'class': 'cp-app-poll-comments-list-data-time'
@@ -759,10 +760,12 @@ define([
     };
     var addComment = function () {
         if (!APP.proxy.comments) { APP.proxy.comments = {}; }
-        var name = APP.$addComment.find('.cp-app-poll-comments-add-name').val();
-        var msg = APP.$addComment.find('.cp-app-poll-comments-add-msg').val();
+        var name = APP.$addComment.find('.cp-app-poll-comments-add-name').val().trim();
+        var msg = APP.$addComment.find('.cp-app-poll-comments-add-msg').val().trim();
         var time = +new Date();
 
+        if (!msg) { return; }
+
         var profile, avatar;
         if (common.isLoggedIn()) {
             profile = metadataMgr.getUserData().profile;

From 91381ca77d1bedd235a43c5d56c146568b026479 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 12 Oct 2017 12:20:27 +0200
Subject: [PATCH 30/31] Fix lint errors

---
 www/poll/inner.js  | 1 -
 www/poll/render.js | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/poll/inner.js b/www/poll/inner.js
index 16a9d2e07..7e2cf9763 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -269,7 +269,6 @@ define([
     var addScrollClass = function () {
         var $scroll = $('#cp-app-poll-table-scroll');
         var hasScroll = $scroll.width() < $scroll[0].scrollWidth && $scroll.width() > 100;
-        var $countCol = $('tr td:last-child');
         if (hasScroll) {
             $scroll.addClass('cp-app-poll-table-scrolled');
             return;
diff --git a/www/poll/render.js b/www/poll/render.js
index a92f222b4..f8dd298b9 100644
--- a/www/poll/render.js
+++ b/www/poll/render.js
@@ -1,9 +1,10 @@
 define([
     //'/common/cryptpad-common.js',
+    'jquery',
     '/bower_components/hyperjson/hyperjson.js',
     '/bower_components/textpatcher/TextPatcher.js',
     '/bower_components/diff-dom/diffDOM.js',
-], function (Hyperjson, TextPatcher) {
+], function ($, Hyperjson, TextPatcher) {
     var DiffDOM = window.diffDOM;
 
     var Example = {

From 8e1f15e88d1c7a29881b199b8eba2b6d9719c0d7 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 12 Oct 2017 14:12:26 +0200
Subject: [PATCH 31/31] Get title suggestion based on poll's description

---
 www/common/sframe-common-codemirror.js | 78 ++++++++++++++------------
 www/poll/inner.js                      |  8 ++-
 2 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js
index 098972161..c3a49703f 100644
--- a/www/common/sframe-common-codemirror.js
+++ b/www/common/sframe-common-codemirror.js
@@ -61,6 +61,46 @@ define([
         editor.scrollTo(scroll.left, scroll.top);
     };
 
+    module.getHeadingText = function (editor) {
+        var lines = editor.getValue().split(/\n/);
+
+        var text = '';
+        lines.some(function (line) {
+            // lines including a c-style comment are also valuable
+            var clike = /^\s*(\/\*|\/\/)(.*)?(\*\/)*$/;
+            if (clike.test(line)) {
+                line.replace(clike, function (a, one, two) {
+                    if (!(two && two.replace)) { return; }
+                    text = two.replace(/\*\/\s*$/, '').trim();
+                });
+                return true;
+            }
+
+            // lisps?
+            var lispy = /^\s*(;|#\|)+(.*?)$/;
+            if (lispy.test(line)) {
+                line.replace(lispy, function (a, one, two) {
+                    text = two;
+                });
+                return true;
+            }
+
+            // lines beginning with a hash are potentially valuable
+            // works for markdown, python, bash, etc.
+            var hash = /^#+(.*?)$/;
+            if (hash.test(line)) {
+                line.replace(hash, function (a, one) {
+                    text = one;
+                });
+                return true;
+            }
+
+            // TODO make one more pass for multiline comments
+        });
+
+        return text.trim();
+    };
+
     module.create = function (Common, defaultMode, CMeditor) {
         var exp = {};
         var Messages = Cryptpad.Messages;
@@ -151,43 +191,7 @@ define([
         }());
 
         exp.getHeadingText = function () {
-            var lines = editor.getValue().split(/\n/);
-
-            var text = '';
-            lines.some(function (line) {
-                // lines including a c-style comment are also valuable
-                var clike = /^\s*(\/\*|\/\/)(.*)?(\*\/)*$/;
-                if (clike.test(line)) {
-                    line.replace(clike, function (a, one, two) {
-                        if (!(two && two.replace)) { return; }
-                        text = two.replace(/\*\/\s*$/, '').trim();
-                    });
-                    return true;
-                }
-
-                // lisps?
-                var lispy = /^\s*(;|#\|)+(.*?)$/;
-                if (lispy.test(line)) {
-                    line.replace(lispy, function (a, one, two) {
-                        text = two;
-                    });
-                    return true;
-                }
-
-                // lines beginning with a hash are potentially valuable
-                // works for markdown, python, bash, etc.
-                var hash = /^#+(.*?)$/;
-                if (hash.test(line)) {
-                    line.replace(hash, function (a, one) {
-                        text = one;
-                    });
-                    return true;
-                }
-
-                // TODO make one more pass for multiline comments
-            });
-
-            return text.trim();
+            return module.getHeadingText(editor);
         };
 
         exp.configureLanguage = function (cb, onModeChanged) {
diff --git a/www/poll/inner.js b/www/poll/inner.js
index 7e2cf9763..2ea839e69 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -998,6 +998,11 @@ define([
         Cryptpad.findOKButton().click();
     };
 
+    var getHeadingText = function () {
+        if (!APP.editor) { return; }
+        return SframeCM.getHeadingText(APP.editor);
+    };
+
     var onCreate = function (info) {
         APP.myID = info.myID;
 
@@ -1011,7 +1016,8 @@ define([
 
         metadataMgr = common.getMetadataMgr();
 
-        Title = common.createTitle();
+        var titleCfg = { getHeadingText: getHeadingText };
+        Title = common.createTitle(titleCfg);
 
         var configTb = {
             displayed: ['title', 'useradmin', 'spinner', 'share', 'userlist', 'newpad', 'limit'],