Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll

config.example.js

@@ -116,11 +116,46 @@ module.exports = {
         'contact',
     ],
 
-    /*  Domain
-     *  If you want to have enable payments on your CryptPad instance, it has to be able to tell
-     *  our account server what is your domain
+    /*  Limits, Subscriptions and Contact
+     *
+     *  CryptPad limits every registered user to 50MB of storage.
+     *  By default it also allows that limit to be increased by subscribing at accounts.cryptpad.fr
+     *  You can either:
+     *    A: Hide the button for subscribing, so everyone is limited to 50MB
+     *    B: Support cryptpad and share 50% of the revenue earned on your instance
+     * 
+     *  CryptPad is developed by people who need to live and who deserve an equivilent life to
+     *  what they would get at a company which monitizes user data. However, we intend to have
+     *  a mutually positive relationship with every one of our users, including you. If you are
+     *  getting value from CryptPad, you should be giving equal value back.
+     * 
+     *  If you are using CryptPad in a business context, please consider taking a support contract
+     *  by contacting sales@cryptpad.fr
+     * 
+     *  If you choose A, set this variable to true to hide the subscription button.
+     */
+    noSubscriptionButton: false,
+    /*
+     *  If you choose B, set the domain of your cryptpad instance here and then contact
+     *  sales@cryptpad.fr and tell us your domain, we will tell you what is needed to get paid.
+     */
+    myDomain: 'i.did.not.read.my.config.cryptpad.myserver.tld',
+    /*
+     *  If you are using CryptPad internally and you want to increase the per-user storage limit,
+     *  change the following value.
+     *  Please note: Providing a public offer that is better than cryptpad.fr is an attack on
+     *    the project. Please leave this alone if you are providing a public service.
+     */
+    defaultStorageLimit: 50 * 1024 * 1024,
+    /*
+     *  By default, CryptPad contacts our accounts server once a day to check for changes in the
+     *  people who have accounts. This check-in will also send your email and the version of
+     *  CryptPad you run so we can reach you if we are aware of a serious problem with your
+     *  CryptPad instance. We will never sell it or use it for marketing. If you want to block this
+     *  check-in and remain completely private, set this to false and noSubscriptionButton to true.
      */
-    // domain: 'https://cryptpad.fr',
+    adminEmail: 'i.did.not.read.my.config@cryptpad.fr',
+
 
     /*
         You have the option of specifying an alternative storage adaptor.
@@ -211,12 +246,6 @@ module.exports = {
      */
     //restrictUploads: false,
 
-    /*  Default user storage limit (bytes)
-     *  if you don't want to limit users,
-     *  you can set this to the size of your hard disk
-     */
-    defaultStorageLimit: 50 * 1024 * 1024,
-
     /*  Max Upload Size (bytes)
      *  this sets the maximum size of any one file uploaded to the server.
      *  anything larger than this size will be rejected

customize.dist/application_config.js

@@ -37,8 +37,6 @@ define(function() {
 
     config.enableHistory = true;
 
-    config.enablePinLimit = true;
-
     /*  user passwords are hashed with scrypt, and salted with their username.
         this value will be appended to the username, causing the resulting hash
         to differ from other CryptPad instances if customized. This makes it

customize.dist/translations/messages.fr.js

@@ -389,15 +389,15 @@ define(function () {
     out.main_zeroKnowledge_p = "Vous n'avez pas besoin de croire que nous n'<em>allons</em> pas regarder vos pads. Avec la technologie Zero Knowledge de CryptPad, nous ne <em>pouvons</em> pas le faire. Apprenez-en plus sur notre manière de <a href=\"privacy.html\" title='Protection des données'>protéger vos données</a>.";
     out.main_writeItDown = 'Prenez-en note';
     out.main_writeItDown_p = "Les plus grands projets naissent des plus petites idées. Prenez note de vos moments d'inspiration et de vos idées inattendues car vous ne savez pas lesquels seront des découvertes capitales.";
-    out.main_share = 'Partager le lien, partager le pad';
-    out.main_share_p = "Faites croître vos idées à plusieurs : réalisez des réunions efficaes, collaborez sur vos listes de tâches et réalisez des présentations rapide avec tous vos amis sur tous vos appareils.";
-    out.main_organize = 'Soyez organisés';
-    out.main_organize_p = "Avec le CryptPad Drive, vous pouvez garder vos vues sur ce qui est important. Les dossiers vous permettent de garder la trace de vos projets et d'avoir une vision globale du travail effectué.";
+    out.main_share = 'Partagez le lien, partagez le pad';
+    out.main_share_p = "Faites croître vos idées à plusieurs : réalisez des réunions efficaces, collaborez sur vos listes de tâches et réalisez des présentations rapides avec tous vos amis sur tous vos appareils.";
+    out.main_organize = 'Soyez organisé';
+    out.main_organize_p = "Avec CryptDrive, vous pouvez garder vos vues sur ce qui est important. Les dossiers vous permettent de garder la trace de vos projets et d'avoir une vision globale du travail effectué.";
     out.tryIt = 'Essayez-le !';
     out.main_richText = 'Éditeur de texte';
     out.main_richText_p = 'Éditez des documents texte collaborativement avec notre application <a href="http://ckeditor.com" target="_blank">CkEditor</a> temps-réel et Zero Knowledge.';
     out.main_code = 'Éditeur de code';
-    out.main_code_p = 'Modifier votre code collaborativement grâce à notre application <a href="https://www.codemirror.net" target="_blank">CodeMirror</a> temps-réel et Zero Knowledge.';
+    out.main_code_p = 'Modifiez votre code collaborativement grâce à notre application <a href="https://www.codemirror.net" target="_blank">CodeMirror</a> temps-réel et Zero Knowledge.';
     out.main_slide = 'Présentations';
     out.main_slide_p = 'Créez vos présentations en syntaxe Markdown collaborativement de manière sécurisée et affichez les dans votre navigateur.';
     out.main_poll = 'Sondages';

customize.dist/translations/messages.js

@@ -78,6 +78,7 @@ define(function () {
     out.updated_0_pinLimitReachedAlert = "You've reached your storage limit. New pads won't be stored in your CryptDrive.<br>" +
         'You can either remove pads from your CryptDrive or <a href="https://accounts.cryptpad.fr/#!on={0}" target="_blank">subscribe to a premium offer</a> to increase your limit.';
     out.pinLimitReachedAlert = out.updated_0_pinLimitReachedAlert;
+    out.pinLimitReachedAlertNoAccounts = out.pinLimitReached;
     out.pinAboveLimitAlert = 'As of this release, we are imposing a 50MB limit on free data storage and you are currently using {0}. You will need to either delete some pads or subscribe on <a href="https://accounts.cryptpad.fr/#!on={1}" target="_blank">accounts.cryptpad.fr</a>. Your contribution will help us improve CryptPad and spread Zero Knowledge. Please contact <a href="https://accounts.cryptpad.fr/#/support" target="_blank">support</a> if you have any other questions.';
     out.pinLimitNotPinned = "You've reached your storage limit.<br>"+
                             "This pad is not stored in your CryptDrive.";

customize.dist/translations/messages.ro.js

@@ -274,7 +274,7 @@ define(function () {
     out.main_p2 = "Acest proiect folosește <a href=\"http://ckeditor.com/\">CKEditor</a> Visual Editor, <a href=\"https://codemirror.net/\">CodeMirror</a>, și <a href=\"https://github.com/xwiki-contrib/chainpad\">ChainPad</a> un motor în timp real.";
     out.main_howitworks_p1 = "CryptPad folosește o variantă a algoritmului de <a href=\"https://en.wikipedia.org/wiki/Operational_transformation\">Operational transformation</a> care este capabil să găsescă consens distribuit folosind <a href=\"https://bitcoin.org/bitcoin.pdf\">Nakamoto Blockchain</a>, o construcție popularizată de <a href=\"https://en.wikipedia.org/wiki/Bitcoin\">Bitcoin</a>. Astfel algoritmul poate evita nevoia ca serverul central să rezove conflicte, iar serverul nu este interesat de conținutul care este editat în pad.";
     out.main_about_p2 = "Dacă ai orice fel de întrebare sau comentariu, poți să ne <a href=\"https://twitter.com/cryptpad\">dai un tweet</a>, semnalezi o problemă <a href=\"https://github.com/xwiki-labs/cryptpad/issues/\" title=\"index de probleme\">on github</a>, spui salut pe IRC (<a href=\"http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7\" title=\"freenode webchat\">irc.freenode.net</a>), sau <a href=\"research@xwiki.com\">trimiți un email</a>.";
-    out.main_info = "<h1>Colaborează n siguranță</h1><br> Dezvoltă-ți ideile împreună cu documente partajate în timp ce tehnologia <strong>Zero Knowledge</strong> îți păstrează securitatea; chiar și de noi.";
+    out.main_info = "<h1>Colaborează în siguranță</h1><br> Dezvoltă-ți ideile împreună cu documentele partajate în timp ce tehnologia <strong>Zero Knowledge</strong> îți păstrează securitatea; chiar și de noi.";
     out.main_howitworks = "Cum funcționează";
     out.main_zeroKnowledge = "Zero Knowledge";
     out.main_zeroKnowledge_p = "Nu trebuie să ne crezi că <em>nu ne uităm</em> la pad-urile tale, cu tehnologia revoluționară Zero Knowledge a CryptPad <em>nu putem</em>. Învață mai multe despre cum îți protejăm <a href=\"/privacy.html\" title='Intimitatea'>Intimitate și Securitate</a>.";

package.json

@@ -18,7 +18,7 @@
   "scripts": {
     "lint": "jshint --config .jshintrc --exclude-path .jshintignore .",
     "test": "node TestSelenium.js",
-    "style": "lessc ./customize.dist/src/less/cryptpad.less > ./customize.dist/main.css && lessc ./customize.dist/src/less/toolbar.less > ./customize.dist/toolbar.css && lessc ./www/drive/file.less > ./www/drive/file.css && lessc ./www/settings/main.less > ./www/settings/main.css && lessc ./www/slide/slide.less > ./www/slide/slide.css && lessc ./www/whiteboard/whiteboard.less > ./www/whiteboard/whiteboard.css && lessc ./www/poll/poll.less > ./www/poll/poll.css && lessc ./www/file/file.less > ./www/file/file.css",
+    "style": "lessc ./customize.dist/src/less/cryptpad.less > ./customize.dist/main.css && lessc ./customize.dist/src/less/toolbar.less > ./customize.dist/toolbar.css && lessc ./www/drive/file.less > ./www/drive/file.css && lessc ./www/settings/main.less > ./www/settings/main.css && lessc ./www/slide/slide.less > ./www/slide/slide.css && lessc ./www/whiteboard/whiteboard.less > ./www/whiteboard/whiteboard.css && lessc ./www/poll/poll.less > ./www/poll/poll.css && lessc ./www/file/file.less > ./www/file/file.css && lessc ./www/code/code.less > ./www/code/code.css",
     "template": "cd customize.dist/src && node build.js"
   }
 }

rpc.js

@@ -1,4 +1,5 @@
 /*@flow*/
+/*jshint esversion: 6 */
 /*  Use Nacl for checking signatures of messages */
 var Nacl = require("tweetnacl");
 
@@ -8,6 +9,7 @@ var Nacl = require("tweetnacl");
 var Fs = require("fs");
 var Path = require("path");
 var Https = require("https");
+const Package = require('./package.json');
 
 var RPC = module.exports;
 
@@ -371,6 +373,7 @@ var getHash = function (Env, publicKey, cb) {
 // To each key is associated an object containing the 'limit' value and a 'note' explaining that limit
 var limits = {};
 var updateLimits = function (config, publicKey, cb) {
+    if (config.adminEmail === false && config.noSubscriptionButton === true) { return; }
     if (typeof cb !== "function") { cb = function () {}; }
 
     var defaultLimit = typeof(config.defaultStorageLimit) === 'number'?
@@ -382,8 +385,10 @@ var updateLimits = function (config, publicKey, cb) {
     }
 
     var body = JSON.stringify({
-        domain: config.domain,
-        subdomain: config.subdomain
+        domain: config.myDomain,
+        subdomain: config.mySubdomain,
+        adminEmail: config.adminEmail,
+        version: Package.version
     });
     var options = {
         host: 'accounts.cryptpad.fr',

server.js

@@ -121,6 +121,7 @@ app.get('/api/config', function(req, res){
             waitSeconds: 60,
             urlArgs: 'ver=' + Package.version + (DEV_MODE? '-' + (+new Date()): ''),
         },
+        noSubscriptionButton: (config.noSubscriptionButton === true),
         websocketPath: config.useExternalWebsocket ? undefined : config.websocketPath,
         websocketURL:'ws' + ((useSecureWebsockets) ? 's' : '') + '://' + host + ':' +
             websocketPort + '/cryptpad_websocket',

www/code/code.css

@@ -0,0 +1,73 @@
+html,
+body {
+  height: 100%;
+  width: 100%;
+  padding: 0px;
+  margin: 0px;
+  overflow: hidden;
+  box-sizing: border-box;
+  position: relative;
+}
+body {
+  display: flex;
+  flex-flow: column;
+  max-height: 100%;
+  min-height: auto;
+}
+.CodeMirror {
+  display: inline-block;
+  height: 100%;
+  width: 50%;
+  min-width: 20%;
+  max-width: 80%;
+  resize: horizontal;
+}
+.CodeMirror.fullPage {
+  min-width: 100%;
+  max-width: 100%;
+  resize: none;
+}
+.CodeMirror-focused .cm-matchhighlight {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);
+  background-position: bottom;
+  background-repeat: repeat-x;
+}
+#editorContainer {
+  flex: 1;
+  display: flex;
+  flex-flow: row;
+  height: 100%;
+  overflow: hidden;
+}
+#previewContainer {
+  flex: 1;
+  padding: 5px 20px;
+  overflow: auto;
+  display: inline-block;
+  height: 100%;
+  border-left: 1px solid black;
+  box-sizing: border-box;
+  font-family: Calibri, Ubuntu, sans-serif;
+  word-wrap: break-word;
+}
+#preview {
+  max-width: 40vw;
+  margin: auto;
+}
+#preview table {
+  border-collapse: collapse;
+}
+#preview table tr th {
+  border: 3px solid black;
+  padding: 15px;
+}
+@media (max-width: 600px) {
+  .CodeMirror {
+    flex: 1;
+    max-width: 100%;
+    resize: none;
+  }
+  #previewContainer {
+    display: none !important;
+  }
+}

www/code/code.less

@@ -0,0 +1,81 @@
+@import "../../customize.dist/src/less/variables.less";
+@import "../../customize.dist/src/less/mixins.less";
+
+html, body{
+    height: 100%;
+    width: 100%;
+    padding: 0px;
+    margin: 0px;
+    overflow: hidden;
+    box-sizing: border-box;
+    position: relative;
+}
+body {
+    display: flex;
+    flex-flow: column;
+    max-height: 100%;
+    min-height: auto;
+}
+.CodeMirror {
+    display: inline-block;
+    height: 100%;
+    width: 50%;
+    min-width: 20%;
+    max-width: 80%;
+    resize: horizontal;
+}
+.CodeMirror.fullPage {
+    min-width: 100%;
+    max-width: 100%;
+    resize: none;
+}
+.CodeMirror-focused .cm-matchhighlight {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);
+    background-position: bottom;
+    background-repeat: repeat-x;
+}
+#editorContainer {
+    flex: 1;
+    display: flex;
+    flex-flow: row;
+    height: 100%;
+    overflow: hidden;
+}
+#previewContainer {
+    flex: 1;
+    padding: 5px 20px;
+    overflow: auto;
+    display: inline-block;
+    height: 100%;
+    border-left: 1px solid black;
+    box-sizing: border-box;
+    font-family: Calibri,Ubuntu,sans-serif;
+    word-wrap: break-word;
+}
+
+#preview {
+    max-width: 40vw;
+    margin: auto;
+
+    table {
+        border-collapse: collapse;
+        tr {
+            th {
+                border: 3px solid black;
+                padding: 15px;
+            }
+        }
+    }
+}
+
+@media (max-width: @media-medium-screen) {
+    .CodeMirror {
+        flex: 1;
+        max-width: 100%;
+        resize: none;
+    }
+    #previewContainer {
+        display: none !important;
+    }
+}
+

www/code/inner.html

@@ -8,6 +8,7 @@
     <link rel="stylesheet" href="/bower_components/codemirror/lib/codemirror.css">
     <link rel="stylesheet" href="/bower_components/codemirror/addon/dialog/dialog.css">
     <link rel="stylesheet" href="/bower_components/codemirror/addon/fold/foldgutter.css" />
+    <link rel="stylesheet" href="/code/code.css" />
     <script src="/bower_components/codemirror/mode/javascript/javascript.js"></script>
     <script src="/bower_components/codemirror/addon/mode/loadmode.js"></script>
     <script src="/bower_components/codemirror/mode/meta.js"></script>
@@ -31,69 +32,6 @@
     <script src="/bower_components/codemirror/addon/fold/markdown-fold.js"></script>
     <script src="/bower_components/codemirror/addon/fold/comment-fold.js"></script>
     <script src="/bower_components/codemirror/addon/display/placeholder.js"></script>
-    <style>
-        html, body{
-            height: 100%;
-            width: 100%;
-            padding: 0px;
-            margin: 0px;
-            overflow: hidden;
-            box-sizing: border-box;
-            position: relative;
-        }
-        body {
-            display: flex;
-            flex-flow: column;
-            max-height: 100%;
-            min-height: auto;
-        }
-        .CodeMirror {
-            display: inline-block;
-            height: 100%;
-            width: 50%;
-            min-width: 20%;
-            max-width: 80%;
-            resize: horizontal;
-        }
-        .CodeMirror.fullPage {
-            min-width: 100%;
-            max-width: 100%;
-            resize: none;
-        }
-        .CodeMirror-focused .cm-matchhighlight {
-            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);
-            background-position: bottom;
-            background-repeat: repeat-x;
-        }
-        #editorContainer {
-            flex: 1;
-            display: flex;
-            flex-flow: row;
-            height: 100%;
-            overflow: hidden;
-        }
-        #previewContainer {
-            flex: 1;
-            padding: 5px 20px;
-            overflow: auto;
-            display: inline-block;
-            height: 100%;
-            border-left: 1px solid black;
-            box-sizing: border-box;
-            font-family: Calibri,Ubuntu,sans-serif;
-        }
-        #preview {
-            max-width: 40vw;
-            margin: auto;
-        }
-        #preview table tr td, #preview table tr th {
-            border: 1px solid black;
-            padding: 15px;
-        }
-        #preview table tr th {
-            border: 3px solid black;
-        }
-    </style>
 </head>
 <body>
   <div id="cme_toolbox" class="toolbar-container"></div>

www/code/main.js

@@ -243,9 +243,16 @@ define([
                     }
                     $previewContainer.toggle();
                     if ($previewContainer.is(':visible')) {
+                        forceDrawPreview();
                         $codeMirror.removeClass('fullPage');
+                        Cryptpad.setPadAttribute('previewMode', true, function (e) {
+                            if (e) { return console.log(e); }
+                        });
                     } else {
                         $codeMirror.addClass('fullPage');
+                        Cryptpad.setPadAttribute('previewMode', false, function (e) {
+                            if (e) { return console.log(e); }
+                        });
                     }
                 });
                 $rightside.append($previewButton);
@@ -259,6 +266,7 @@ define([
                     CodeMirror.configureTheme();
                 }
 
+
                 // set the hash
                 if (!readOnly) { Cryptpad.replaceHash(editHash); }
             };
@@ -310,6 +318,13 @@ define([
                     Title.updateTitle(Cryptpad.initialName);
                 }
 
+                Cryptpad.getPadAttribute('previewMode', function (e, data) {
+                    if (e) { return void console.error(e); }
+                    if (data === false && APP.$previewButton) {
+                        APP.$previewButton.click();
+                    }
+                });
+
                 Cryptpad.removeLoadingScreen();
                 setEditable(true);
                 initializing = false;

www/common/common-util.js

@@ -131,5 +131,9 @@ define([], function () {
         return g;
     };
 
+    Util.createRandomInteger = function () {
+        return Math.floor(Math.random() * Number.MAX_SAFE_INTEGER);
+    };
+
     return Util;
 });

www/common/cryptpad-common.js

@@ -72,6 +72,7 @@ define([
     common.bytesToKilobytes = Util.bytesToKilobytes;
     common.fetch = Util.fetch;
     common.throttle = Util.throttle;
+    common.createRandomInteger = Util.createRandomInteger;
 
     // import hash utilities for export
     var createRandomHash = common.createRandomHash = Hash.createRandomHash;
@@ -598,7 +599,7 @@ define([
                 var data = makePad(href, name);
                 getStore().pushData(data, function (e) {
                     if (e) {
-                        if (e === 'E_OVER_LIMIT' && AppConfig.enablePinLimit) {
+                        if (e === 'E_OVER_LIMIT') {
                             common.alert(Messages.pinLimitNotPinned, null, true);
                             return;
                         }
@@ -760,7 +761,7 @@ define([
     };
 
     common.isOverPinLimit = function (cb) {
-        if (!common.isLoggedIn() || !AppConfig.enablePinLimit) { return void cb(null, false); }
+        if (!common.isLoggedIn()) { return void cb(null, false); }
         var usage;
         var andThen = function (e, limit, plan) {
             if (e) { return void cb(e); }
@@ -816,7 +817,10 @@ define([
             var width = Math.floor(Math.min(quota, 1)*200); // the bar is 200px width
             var $usage = $('<span>', {'class': 'usage'}).css('width', width+'px');
 
-            if ((quota >= 0.8 || alwaysDisplayUpgrade) && data.plan !== "power") {
+            if (Config.noSubscriptionButton !== true &&
+                (quota >= 0.8 || alwaysDisplayUpgrade) &&
+                data.plan !== "power")
+            {
                 var origin = encodeURIComponent(window.location.hostname);
                 var $upgradeLink = $('<a>', {
                     href: "https://accounts.cryptpad.fr/#!on=" + origin,
@@ -844,7 +848,7 @@ define([
             else if (quota < 1) { $usage.addClass('warning'); }
             else {
                 $usage.addClass('above');
-                if (!limitReachedDisplayed) {
+                if (!limitReachedDisplayed && Config.noSubscriptionButton === true) {
                     limitReachedDisplayed = true;
                     common.alert(Messages._getKey('pinAboveLimitAlert', [prettyUsage, encodeURIComponent(window.location.hostname)]), null, true);
                 }

www/common/fsStore.js

@@ -172,7 +172,11 @@ define([
             if (typeof(proxy.loginToken) !== 'number') {
                 proxy[tokenKey] = Math.floor(Math.random()*Number.MAX_SAFE_INTEGER);
             }
+
+            // copy User_hash into sessionStorage because cross-domain iframes
+            // on safari replaces localStorage with sessionStorage or something
             if (sessionStorage) { sessionStorage.setItem('User_hash', localStorage.getItem('User_hash')); }
+
             var localToken = tryParsing(localStorage.getItem(tokenKey));
             if (localToken === null) {
                 // if that number hasn't been set to localStorage, do so.

www/common/toolbar.js

@@ -500,8 +500,12 @@ define([
             var todo = function (e, overLimit) {
                 if (e) { return void console.error("Unable to get the pinned usage"); }
                 if (overLimit) {
+                    var message = Messages.pinLimitReachedAlert;
+                    if (ApiConfig.noSubscriptionButton === true) {
+                        message = Messages.pinLimitReachedAlertNoAccounts;
+                    }
                     $limit.show().click(function () {
-                        Cryptpad.alert(Messages.pinLimitReachedAlert, null, true);
+                        Cryptpad.alert(message, null, true);
                     });
                 }
             };

www/common/toolbar2.js

@@ -616,8 +616,12 @@ define([
         var todo = function (e, overLimit) {
             if (e) { return void console.error("Unable to get the pinned usage"); }
             if (overLimit) {
+                var key = 'pinLimitReachedAlert';
+                if (ApiConfig.noSubscriptionButton === true) {
+                    key = 'pinLimitReachedAlertNoAccounts';
+                }
                 $limit.show().click(function () {
-                    Cryptpad.alert(Messages._getKey('pinLimitReachedAlert', [encodeURIComponent(window.location.hostname)]), null, true);
+                    Cryptpad.alert(Messages._getKey(key, [encodeURIComponent(window.location.hostname)]), null, true);
                 });
             }
         };

www/drive/main.js

@@ -1771,7 +1771,8 @@ define([
                     if (parentPath) {
                         $a = $('<a>').text(Messages.fm_openParent).click(function (e) {
                             e.preventDefault();
-                            parentPath.pop();
+                            if (filesOp.isInTrashRoot(parentPath)) { parentPath = [TRASH]; }
+                            else { parentPath.pop(); }
                             module.displayDirectory(parentPath);
                         });
                     }
@@ -1823,6 +1824,7 @@ define([
                 displayDirectory(parentPath, true);
                 return;
             }
+            if (!isSearch) { delete APP.Search.oldLocation; }
 
             module.resetTree();
 
@@ -2710,13 +2712,11 @@ define([
             }
 
             /* add the usage */
-            if (AppConfig.enablePinLimit) {
-                Cryptpad.createUsageBar(function (err, $limitContainer) {
-                    if (err) { return void logError(err); }
-                    $leftside.html('');
-                    $leftside.append($limitContainer);
-                });
-            }
+            Cryptpad.createUsageBar(function (err, $limitContainer) {
+                if (err) { return void logError(err); }
+                $leftside.html('');
+                $leftside.append($limitContainer);
+            });
 
             /* add a history button */
             var histConfig = {