From be0bd011c3811df5ec3d81832d1c274cd0fc8fa0 Mon Sep 17 00:00:00 2001
From: Alexandros <alexaf+github@grnet.gr>
Date: Sun, 2 Jul 2017 20:56:13 +0300
Subject: [PATCH 1/7] Fix readme cryptpad-docker doc link

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

diff --git a/readme.md b/readme.md
index 4ed335c9e..586463af0 100644
--- a/readme.md
+++ b/readme.md
@@ -129,7 +129,7 @@ Still there are other low-lives in the world so using CryptPad over HTTPS is pro
 
 ## Setup using Docker
 
-See [Cryptpad-Docker](cryptpad-docker.md)
+See [Cryptpad-Docker](docs/cryptpad-docker.md)
 
 ## Translations
 

From 56ed1dd4571613f1a3e9244d6b5dbf870b68a043 Mon Sep 17 00:00:00 2001
From: Pierre Bondoerffer <pierre@bondoer.fr>
Date: Thu, 6 Jul 2017 10:13:56 +0200
Subject: [PATCH 2/7] spanish update

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

diff --git a/customize.dist/translations/messages.es.js b/customize.dist/translations/messages.es.js
index ae82b0052..01623ccb0 100644
--- a/customize.dist/translations/messages.es.js
+++ b/customize.dist/translations/messages.es.js
@@ -485,5 +485,32 @@ define(function () {
     out.canvas_opacityLabel = "Opacidad: {0}";
     out.canvas_widthLabel = "Talla: {0}";
 
+    // 1.10.0 - Kraken
+
+    out.moreActions = "Más acciones";
+    out.importButton = "Importar";
+    out.exportButton = "Exportar";
+    out.saveTitle = "Guardar título (enter)";
+    out.forgetButton = "Eliminar";
+    out.printText = "Imprimir";
+    out.slideOptionsText = "Opciones";
+    out.historyText = "Historial";
+    out.openLinkInNewTab = "Abrir enlace en pestaña nueva";
+    out.profileButton = "Perfíl";
+    out.profile_urlPlaceholder = "URL";
+    out.profile_namePlaceholder = "Nombre mostrado en su perfíl";
+    out.profile_avatar = "Imágen";
+    out.profile_upload = "Subir una imágen";
+    out.profile_error = "Error al crear tu perfíl: {0}";
+    out.profile_register = "Tienes que registrarte para crear perfíl";
+    out.profile_create = "Crear perfíl";
+    out.profile_description = "Descripción";
+    out.profile_fieldSaved = "Guardado: {0}";
+    out.download_mt_button = "Descargar";
+    out.updated_0_header_logoTitle = "Volver a tu CryptDrive";
+    out.header_logoTitle = out.updated_0_header_logoTitle;
+
+
+
     return out;
 });

From de420de02125ae7e0a1431d36433c2054ff4a8b6 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 6 Jul 2017 10:40:21 +0200
Subject: [PATCH 3/7] Fix the folder's path in the search results page

---
 www/drive/file.less |  5 +++++
 www/drive/main.js   | 17 ++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/www/drive/file.less b/www/drive/file.less
index 9bb4eccf4..c9e36e7b2 100644
--- a/www/drive/file.less
+++ b/www/drive/file.less
@@ -416,6 +416,11 @@ span {
                     }
                     .path {
                         font-style: italic;
+                        direction: rtl;
+                        .element {
+                            display: inline-block;
+                            margin-right: 5px;
+                        }
                     }
                     .title {
                         font-weight: bold;
diff --git a/www/drive/main.js b/www/drive/main.js
index d31c701a6..050e9ab8d 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1250,12 +1250,11 @@ define([
         };
 
         // Create the title block with the "parent folder" button
-        var createTitle = function (path, noStyle) {
+        var createTitle = function ($container, path, noStyle) {
             if (!path || path.length === 0) { return; }
             var isTrash = filesOp.isPathIn(path, [TRASH]);
-            var $title = $driveToolbar.find('.path');
-            if (APP.mobile()) {
-                return $title;
+            if (APP.mobile() && !noStyle) { // noStyle means title in search result
+                return $container;
             }
             var el = path[0] === SEARCH ? undefined : filesOp.find(path);
             path = path[0] === SEARCH ? path.slice(0,1) : path;
@@ -1281,12 +1280,11 @@ define([
                 if (idx === 0) { name = getPrettyName(p); }
                 else {
                     var $span2 = $('<span>', {'class': 'element separator'}).text(' / ');
-                    $title.prepend($span2);
+                    $container.prepend($span2);
                 }
 
-                $span.text(name).prependTo($title);
+                $span.text(name).prependTo($container);
             });
-            return $title;
         };
 
         var createInfoBox = function (path) {
@@ -1764,7 +1762,8 @@ define([
                         path.pop();
                         path.push(r.data.title);
                     }
-                    var $path = $('<td>', {'class': 'col1 path'}).html(createTitle(path, true).html());
+                    var $path = $('<td>', {'class': 'col1 path'});
+                    createTitle($path, path, true);
                     var parentPath = path.slice();
                     var $a;
                     if (parentPath) {
@@ -1859,7 +1858,7 @@ define([
             // NewButton can be undefined if we're in read only mode
             createNewButton(isInRoot, $toolbar.find('.leftside'));
 
-            createTitle(path).appendTo($toolbar.find('.path'));
+            createTitle($toolbar.find('.path'), path);
 
             if (APP.mobile()) {
                 var $context = $('<button>', {'class': 'element right dropdown-bar', id: 'contextButton'});

From 5d96c68ad74d590138a5f8a5df63b17f59b764e2 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 6 Jul 2017 10:43:14 +0200
Subject: [PATCH 4/7] fix profile app display on chrome

---
 www/profile/main.less | 2 --
 1 file changed, 2 deletions(-)

diff --git a/www/profile/main.less b/www/profile/main.less
index abdcf8d0d..d3d3f2e07 100644
--- a/www/profile/main.less
+++ b/www/profile/main.less
@@ -4,8 +4,6 @@
         width: 1000px;
         max-width: 90%;
         margin: auto;
-        display: flex;
-        justify-content: center;
         #container {
             font-size: 25px;
             width: 100%;

From f02285d103265d7c44cec87aaf04260bc2a8cd8a Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 6 Jul 2017 10:49:33 +0200
Subject: [PATCH 5/7] fix lowercased p

---
 customize.dist/about.html        | 2 +-
 customize.dist/contact.html      | 2 +-
 customize.dist/index.html        | 2 +-
 customize.dist/privacy.html      | 2 +-
 customize.dist/src/template.html | 2 +-
 customize.dist/terms.html        | 2 +-
 www/login/index.html             | 2 +-
 www/register/index.html          | 2 +-
 www/settings/index.html          | 2 +-
 www/user/index.html              | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/customize.dist/about.html b/customize.dist/about.html
index 5593e41b9..03032969b 100644
--- a/customize.dist/about.html
+++ b/customize.dist/about.html
@@ -2,7 +2,7 @@
 <html class="cp">
 <!-- If this file is not called customize.dist/src/template.html, it is generated -->
 <head>
-    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
+    <title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
diff --git a/customize.dist/contact.html b/customize.dist/contact.html
index 5593e41b9..03032969b 100644
--- a/customize.dist/contact.html
+++ b/customize.dist/contact.html
@@ -2,7 +2,7 @@
 <html class="cp">
 <!-- If this file is not called customize.dist/src/template.html, it is generated -->
 <head>
-    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
+    <title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
diff --git a/customize.dist/index.html b/customize.dist/index.html
index 5593e41b9..03032969b 100644
--- a/customize.dist/index.html
+++ b/customize.dist/index.html
@@ -2,7 +2,7 @@
 <html class="cp">
 <!-- If this file is not called customize.dist/src/template.html, it is generated -->
 <head>
-    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
+    <title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
diff --git a/customize.dist/privacy.html b/customize.dist/privacy.html
index 5593e41b9..03032969b 100644
--- a/customize.dist/privacy.html
+++ b/customize.dist/privacy.html
@@ -2,7 +2,7 @@
 <html class="cp">
 <!-- If this file is not called customize.dist/src/template.html, it is generated -->
 <head>
-    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
+    <title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
diff --git a/customize.dist/src/template.html b/customize.dist/src/template.html
index 5593e41b9..03032969b 100644
--- a/customize.dist/src/template.html
+++ b/customize.dist/src/template.html
@@ -2,7 +2,7 @@
 <html class="cp">
 <!-- If this file is not called customize.dist/src/template.html, it is generated -->
 <head>
-    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
+    <title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
diff --git a/customize.dist/terms.html b/customize.dist/terms.html
index 5593e41b9..03032969b 100644
--- a/customize.dist/terms.html
+++ b/customize.dist/terms.html
@@ -2,7 +2,7 @@
 <html class="cp">
 <!-- If this file is not called customize.dist/src/template.html, it is generated -->
 <head>
-    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
+    <title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
diff --git a/www/login/index.html b/www/login/index.html
index 5593e41b9..03032969b 100644
--- a/www/login/index.html
+++ b/www/login/index.html
@@ -2,7 +2,7 @@
 <html class="cp">
 <!-- If this file is not called customize.dist/src/template.html, it is generated -->
 <head>
-    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
+    <title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
diff --git a/www/register/index.html b/www/register/index.html
index 5593e41b9..03032969b 100644
--- a/www/register/index.html
+++ b/www/register/index.html
@@ -2,7 +2,7 @@
 <html class="cp">
 <!-- If this file is not called customize.dist/src/template.html, it is generated -->
 <head>
-    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
+    <title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
diff --git a/www/settings/index.html b/www/settings/index.html
index 5593e41b9..03032969b 100644
--- a/www/settings/index.html
+++ b/www/settings/index.html
@@ -2,7 +2,7 @@
 <html class="cp">
 <!-- If this file is not called customize.dist/src/template.html, it is generated -->
 <head>
-    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
+    <title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
diff --git a/www/user/index.html b/www/user/index.html
index 5593e41b9..03032969b 100644
--- a/www/user/index.html
+++ b/www/user/index.html
@@ -2,7 +2,7 @@
 <html class="cp">
 <!-- If this file is not called customize.dist/src/template.html, it is generated -->
 <head>
-    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
+    <title data-localization="main_title">CryptPad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>

From fc065a04849d0271247fe55416a76c8bf6818654 Mon Sep 17 00:00:00 2001
From: "Ecaterina Moraru (Valica)" <valicac@gmail.com>
Date: Fri, 7 Jul 2017 17:04:26 +0300
Subject: [PATCH 6/7] Issue #151: Spacing between "Log-in" and "Register"
 buttons

- Removed ".first" class from Register button
- Increase spacing between buttons
---
 customize.dist/pages.js               | 4 ++--
 customize.dist/src/less/cryptpad.less | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 5e26bbe83..5ddbb27c9 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -162,7 +162,7 @@ define([
                 ])
             ]),
             h('button.btn.btn-secondary.login.half.first', Msg.login_login),
-            h('button.btn.btn-success.register.half.first', Msg.login_register),
+            h('button.btn.btn-success.register.half', Msg.login_register),
             h('p.separator', Msg.login_orNoLogin),
             h('p#buttons.buttons'),
             h('p.driveLink', [
@@ -363,7 +363,7 @@ define([
                         h('button.btn.btn-primary.login.first', Msg.login_login),
                         h('div.extra', [
                             h('p', Msg.login_notRegistered),
-                            h('button#register.btn.btn-success.register.first', Msg.login_register)
+                            h('button#register.btn.btn-success.register', Msg.login_register)
                         ])
                     ])
                 ])
diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less
index 106c57ab2..4d6b2a564 100644
--- a/customize.dist/src/less/cryptpad.less
+++ b/customize.dist/src/less/cryptpad.less
@@ -428,7 +428,7 @@ noscript {
             width: 100%;
             cursor: pointer;
             &.half {
-                width: ~"calc(50% - 2px)";
+                width: ~"calc(50% - 10px)";
                 &:not(.first) {
                     float: right;
                 }

From e8e8858e4406b691a51db60ce65c989b49dbb633 Mon Sep 17 00:00:00 2001
From: "Ecaterina Moraru (Valica)" <valicac@gmail.com>
Date: Fri, 7 Jul 2017 17:26:34 +0300
Subject: [PATCH 7/7] Issue #153: On Register, add spacing between checkboxes
 and labels

---
 customize.dist/src/less/cryptpad.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less
index 106c57ab2..49f1a4512 100644
--- a/customize.dist/src/less/cryptpad.less
+++ b/customize.dist/src/less/cryptpad.less
@@ -421,6 +421,8 @@ noscript {
 
         label {
             margin-bottom: 0;
+            margin-left: 5px;
+            vertical-align: middle;
         }
 
         button {