resolve silly conflict and merge staging

CHANGELOG.md

@@ -1,3 +1,50 @@
+# PigFootedBandicoot release (3.15.0)
+
+## Goals
+
+Our plan for this release was to allow our server's code to stabilize after a prologued period of major changes. The massive surge of new users on cryptpad.fr forced us to change our plans and focus instead on increasing performance and scalability of our serverside code and its supporting infrastructure. Most of this release's changes have been thoroughly tested as they've been deployed to our instance on an ongoing basis, however, we're still looking forward to stabilizing as planned.
+
+We also ended up making significant improvements to our clientside code, since the increased load on the server seemed to exacerbate a few race conditions which occurred less frequently under the previous circumstances.
+
+## Update notes
+
+Updating from version 3.14.0 should follow the usual process:
+
+1. stop your server
+2. fetch the latest code with git
+3. install clientside dependencies with `bower update`
+4. install serverside dependencies with `npm i`
+5. start your server
+
+You may notice that the server now launches a number of child processes named `crypto-worker.js` and `db-worker.js`. These worker processes make use of however many cores your server has available to perform more CPU-intensive tasks in parallel.
+
+## Features
+
+* As noted above, the server uses an multi-process architecture and parallelizes more routines. This improvement will be the most noticeable when the server is run on ARM processors which validate cryptographic signatures particularly slowly.
+* The admin panel available to instance administrators now displays a list of "Open files". We added this to help us diagnose a "file descriptor leak" which will be described in the _Bug fixes_ section.
+* We received a large number of contributions from translators via our [weblate instance](https://weblate.cryptpad.fr/projects/cryptpad/app/). Most notably, Italian is the fourth language to be fully translated with Finnish and Spanish seemingly in line to take the fifth and sixth spots.
+* We've addressed some usability issues in our whiteboard app in response to increased interest. Its canvas now automatically resizes according to the size of your screen and the content you've drawn. Unfortunately, we noticed that the "embed image" functionality was imposing some additional strain on our server, so we decided to implement an admittedly arbitrary limit of 1MB on the size of images embedded in whiteboards. We'll consider removing this restriction when we have time to design a more efficient embedding system.
+* We've removed the per-user setting which previously allowed registered users to skip the "pad creation screen" which is displayed before creating a document. This setting has not been the default for some time and was not actively tested, so this "feature" is our way of guaranteeing no future regressions in its behaviour.
+* As a part of our effort to improve the server's scalability we evaluated which clientside requests could be sent less often. One such request came from the "usage bar" found in users' drives, teams, and settings pages. Previously it would update every 30 seconds no matter what. Now it only updates if that tab is focused.
+* Most actions that an administrator can take with regard to a user's account require the "public key" which is used to identify their account. This key is available on the user's settings page, but many users share their profile URL instead. We've added a button to profile pages which copies the user's public key to the clipboard, so now either page will be sufficient.
+* We've updated our [mermaidjs](https://mermaid-js.github.io/mermaid/#/) dependency. For those that don't know, Mermaid is a powerful markup syntax for producing a variety of charts. It's integrated into our code editor. This updated version supports GANTT chart tasks with multiple dependencies, pie charts, and a variety of other useful formats.
+* We found that in practice our mermaid charts and other embedded media were sufficiently detailed that they became difficult to read on some screens. In response we've added the ability to view these elements in a "lightbox UI" which is nearly full-screen. This interface is can be used to view media contained in the "preview pane" of the code editor as well as within user and team drives, as well as a few other places where Markdown is used.
+
+## Bug fixes
+
+This release contains fixes for a lot of bugs. We'll provide a brief overview, but in the interest of putting more time towards development I'll just put my strong recommendation that you update.
+
+* The server process didn't always close file descriptors that it opened, resulting in an EMFILE error when the system ran out of available file descriptors. Now it closes them.
+* The server also kept an unbounded amount of data in an in-memory cache under certain circumstances. Now it doesn't.
+* A simple check to ignore the `premiumUploadSize` config value if it was less than `maxUploadSize` incorrectly compared against `defaultStorageLimit`. Premium upload sizes were disabled on our instance when we increased the default storage limit to 1GB. It's fixed now.
+* We accepted a [PR](https://github.com/xwiki-labs/cryptpad/pull/513) to prevent a typeError when logging to disk was entirely disabled.
+* We identified and fixed the cause of [This issue](https://github.com/xwiki-labs/cryptpad/issues/518) which caused spreadsheets not to load.
+* Emojis at the start of users display names were not displayed correctly in the Kanban's "cursor"
+* We (once again) believe we've fixed the [duplicated text bug](https://github.com/xwiki-labs/cryptpad/issues/352). Time will tell.
+* Our existing Mermaidjs integration supported the special syntax to make elements clickable, but the resulting links don't work within CryptPad. We now remove them.
+* Rather than having messages time out if they are not received by the server within a certain timeframe we now wait until the client reconnects, at which point we can check whether those messages exist in the document's history. On a related note we now detect when the realtime system is in a bad state and recreate it.
+* Finally, we've fixed a variety of errors in spreadsheets.
+
 # OrienteCaveRat release (3.14.0)
 
 ## Goals

customize.dist/pages.js

@@ -107,7 +107,7 @@ define([
                     ])*/
                 ])
             ]),
-            h('div.cp-version-footer', "CryptPad v3.14.0 (OrienteCaveRat)")
+            h('div.cp-version-footer', "CryptPad v3.15.0 (PigFootedBandicoot)")
         ]);
     };
 

customize.dist/src/less2/include/modal.less

@@ -1,5 +1,8 @@
 @import (reference) "./colortheme-all.less";
 @import (reference) "./variables.less";
+@import (reference) './buttons.less';
+
+
 
 .modal_base() {
     font-family: @colortheme_font;
@@ -36,6 +39,8 @@
         background-color: @colortheme_modal-dim;
 
         .cp-modal {
+            .buttons_main();
+
             background-color: @colortheme_modal-bg;
             color: @colortheme_modal-fg;
             box-shadow: @variables_shadow;
@@ -75,6 +80,7 @@
                     background-color: @colortheme_modal-input-fg;
                     color: @cryptpad_text_col;
                     border: 1px solid @colortheme_modal-input;
+                    width: auto;
                 }
             }
 

customize.dist/src/less2/include/modals-ui-elements.less

@@ -125,6 +125,9 @@
                     video, iframe {
                         margin-bottom: -5px;
                     }
+                    button {
+                        line-height: 1.5;
+                    }
                     & > iframe {
                         width: 100%;
                         height: 100%;

docs/example.nginx.conf

@@ -54,6 +54,7 @@ server {
     add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
     add_header X-XSS-Protection "1; mode=block";
     add_header X-Content-Type-Options nosniff;
+    add_header Access-Control-Allow-Origin "*";
     # add_header X-Frame-Options "SAMEORIGIN";
 
     # Insert the path to your CryptPad repository root here

lib/commands/channel.js

@@ -54,16 +54,8 @@ Channel.clearOwnedChannel = function (Env, safeKey, channelId, cb, Server) {
     });
 };
 
-Channel.removeOwnedChannel = function (Env, safeKey, channelId, cb, Server) {
-    if (typeof(channelId) !== 'string' || !Core.isValidId(channelId)) {
-        return cb('INVALID_ARGUMENTS');
-    }
+var archiveOwnedChannel = function (Env, safeKey, channelId, cb, Server) {
     var unsafeKey = Util.unescapeKeyCharacters(safeKey);
-
-    if (Env.blobStore.isFileId(channelId)) {
-        return void Env.removeOwnedBlob(channelId, safeKey, cb);
-    }
-
     Metadata.getMetadata(Env, channelId, function (err, metadata) {
         if (err) { return void cb(err); }
         if (!Core.hasOwners(metadata)) { return void cb('E_NO_OWNERS'); }
@@ -124,6 +116,24 @@ Channel.removeOwnedChannel = function (Env, safeKey, channelId, cb, Server) {
     });
 };
 
+Channel.removeOwnedChannel = function (Env, safeKey, channelId, __cb, Server) {
+    var _cb = Util.once(Util.mkAsync(__cb));
+
+    if (typeof(channelId) !== 'string' || !Core.isValidId(channelId)) {
+        return _cb('INVALID_ARGUMENTS');
+    }
+
+    // archiving large channels or files can be expensive, so do it one at a time
+    // for any given user to ensure that nobody can use too much of the server's resources
+    Env.queueDeletes(safeKey, function (next) {
+        var cb = Util.both(_cb, next);
+        if (Env.blobStore.isFileId(channelId)) {
+            return void Env.removeOwnedBlob(channelId, safeKey, cb);
+        }
+        archiveOwnedChannel(Env, safeKey, channelId, cb, Server);
+    });
+};
+
 Channel.trimHistory = function (Env, safeKey, data, cb) {
     if (!(data && typeof(data.channel) === 'string' && typeof(data.hash) === 'string' && data.hash.length === 64)) {
         return void cb('INVALID_ARGS');

lib/commands/pin-rpc.js

@@ -49,16 +49,19 @@ var loadUserPins = function (Env, safeKey, cb) {
                 // only put this into the cache if it completes
                 session.channels = value;
             }
-            session.channels = value;
             done(value);
         });
     });
 };
 
 var truthyKeys = function (O) {
-    return Object.keys(O).filter(function (k) {
-        return O[k];
-    });
+    try {
+        return Object.keys(O).filter(function (k) {
+            return O[k];
+        });
+    } catch (err) {
+        return [];
+    }
 };
 
 var getChannelList = Pinning.getChannelList = function (Env, safeKey, _cb) {

lib/historyKeeper.js

@@ -38,6 +38,7 @@ module.exports.create = function (config, cb) {
         metadata_cache: {},
         channel_cache: {},
         queueStorage: WriteQueue(),
+        queueDeletes: WriteQueue(),
 
         batchIndexReads: BatchRead("HK_GET_INDEX"),
         batchMetadata: BatchRead('GET_METADATA'),

lib/pins.js

@@ -7,6 +7,9 @@ const Path = require("path");
 const Util = require("./common-util");
 const Plan = require("./plan");
 
+const Semaphore = require('saferphore');
+const nThen = require('nthen');
+
 /*  Accepts a reference to an object, and...
     either a string describing which log is being processed (backwards compatibility),
     or a function which will log the error with all relevant data
@@ -194,3 +197,63 @@ Pins.list = function (_done, config) {
         }).start();
     });
 };
+
+Pins.load = function (cb, config) {
+    const sema = Semaphore.create(config.workers || 5);
+
+    let dirList;
+    const fileList = [];
+    const pinned = {};
+
+    var pinPath = config.pinPath || './pins';
+    var done = Util.once(cb);
+
+    nThen((waitFor) => {
+        // recurse over the configured pinPath, or the default
+        Fs.readdir(pinPath, waitFor((err, list) => {
+            if (err) {
+                if (err.code === 'ENOENT') {
+                    dirList = [];
+                    return; // this ends up calling back with an empty object
+                }
+                waitFor.abort();
+                return void done(err);
+            }
+            dirList = list;
+        }));
+    }).nThen((waitFor) => {
+        dirList.forEach((f) => {
+            sema.take((returnAfter) => {
+                // iterate over all the subdirectories in the pin store
+                Fs.readdir(Path.join(pinPath, f), waitFor(returnAfter((err, list2) => {
+                    if (err) {
+                        waitFor.abort();
+                        return void done(err);
+                    }
+                    list2.forEach((ff) => {
+                        if (config && config.exclude && config.exclude.indexOf(ff) > -1) { return; }
+                        fileList.push(Path.join(pinPath, f, ff));
+                    });
+                })));
+            });
+        });
+    }).nThen((waitFor) => {
+        fileList.forEach((f) => {
+            sema.take((returnAfter) => {
+                Fs.readFile(f, waitFor(returnAfter((err, content) => {
+                    if (err) {
+                        waitFor.abort();
+                        return void done(err);
+                    }
+                    const hashes = Pins.calculateFromLog(content.toString('utf8'), f);
+                    hashes.forEach((x) => {
+                        (pinned[x] = pinned[x] || {})[f.replace(/.*\/([^/]*).ndjson$/, (x, y)=>y)] = 1;
+                    });
+                })));
+            });
+        });
+    }).nThen(() => {
+        done(void 0, pinned);
+    });
+};
+

lib/storage/file.js

@@ -14,6 +14,28 @@ const readFileBin = require("../stream-file").readFileBin;
 const BatchRead = require("../batch-read");
 
 const Schedule = require("../schedule");
+
+/*  Each time you write to a channel it will either use an open file descriptor
+    for that channel or open a new descriptor if one is not available. These are
+    automatically closed after this window to prevent a file descriptor leak, so
+    writes that take longer than this time may be dropped! */
+const CHANNEL_WRITE_WINDOW = 300000;
+
+/*  Each time you read a channel it will have this many milliseconds to complete
+    otherwise it will be closed to prevent a file descriptor leak. The server will
+    lock up if it uses all available file descriptors, so it's important to close
+    them. The tradeoff with this timeout is that some functions, the stream, and
+    and the timeout itself are stored in memory. A longer timeout uses more memory
+    and running out of memory will also kill the server. */
+const STREAM_CLOSE_TIMEOUT = 300000;
+
+/*  The above timeout closes the stream, but apparently that doesn't always work.
+    We set yet another timeout to allow the runtime to gracefully close the stream
+    (flushing all pending writes/reads and doing who knows what else). After this timeout
+    it will be MERCILESSLY DESTROYED. This isn't graceful, but again, file descriptor
+    leaks are bad. */
+const STREAM_DESTROY_TIMEOUT = 30000;
+
 const isValidChannelId = function (id) {
     return typeof(id) === 'string' &&
         id.length >= 32 && id.length < 50 &&
@@ -64,7 +86,7 @@ const destroyStream = function (stream) {
     try { stream.close(); } catch (err) { console.error(err); }
     setTimeout(function () {
         try { stream.destroy(); } catch (err) { console.error(err); }
-    }, 15000);
+    }, STREAM_DESTROY_TIMEOUT);
 };
 
 const ensureStreamCloses = function (stream, id, ms) {
@@ -74,7 +96,7 @@ const ensureStreamCloses = function (stream, id, ms) {
             // this can only be a timeout error...
             console.log("stream close error:", err, id);
         }
-    }), ms || 45000), []);
+    }), ms || STREAM_CLOSE_TIMEOUT), []);
 };
 
 // readMessagesBin asynchronously iterates over the messages in a channel log
@@ -729,7 +751,7 @@ var getChannel = function (env, id, _callback) {
                 delete env.channels[id];
                 destroyStream(channel.writeStream, path);
                 //console.log("closing writestream");
-            }, 120000);
+            }, CHANNEL_WRITE_WINDOW);
             channel.delayClose();
             env.channels[id] = channel;
             done(void 0, channel);

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptpad",
-  "version": "3.14.0",
+  "version": "3.15.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "3.14.0",
+  "version": "3.15.0",
   "license": "AGPL-3.0+",
   "repository": {
     "type": "git",

scripts/compare-pin-methods.js

@@ -0,0 +1,42 @@
+/* jshint esversion: 6, node: true */
+const nThen = require("nthen");
+const Pins = require("../lib/pins");
+const Assert = require("assert");
+
+const config = require("../lib/load-config");
+
+var compare = function () {
+    console.log(config);
+    var conf = {
+        pinPath: config.pinPath,
+    };
+
+    var list, load;
+
+    nThen(function (w) {
+        Pins.list(w(function (err, p) {
+            if (err) { throw err; }
+            list = p;
+            console.log(p);
+            console.log(list);
+            console.log();
+        }), conf);
+    }).nThen(function (w) {
+        Pins.load(w(function (err, p) {
+            if (err) { throw err; }
+            load = p;
+            console.log(load);
+            console.log();
+        }), conf);
+    }).nThen(function () {
+        console.log({
+            listLength: Object.keys(list).length,
+            loadLength: Object.keys(load).length,
+        });
+
+        Assert.deepEqual(list, load);
+        console.log("methods are equivalent");
+    });
+};
+
+compare();

scripts/evict-inactive.js

@@ -42,7 +42,7 @@ nThen(function (w) {
         store = _;
     })); // load the list of pinned files so you know which files
     // should not be archived or deleted
-    Pins.list(w(function (err, _) {
+    Pins.load(w(function (err, _) {
         if (err) {
             w.abort();
             return void console.error(err);

www/auth/main.js

@@ -71,7 +71,7 @@ define([
             // Get contacts and extract their avatar channel and key
             var getData = function (obj, href) {
                 var parsed = Hash.parsePadUrl(href);
-                if (parsed.type !== "file") { return; }
+                if (!parsed || parsed.type !== "file") { return; }
                 var secret = Hash.getSecrets('file', parsed.hash);
                 if (!secret.keys || !secret.channel) { return; }
                 obj.avatarKey = Hash.encodeBase64(secret.keys && secret.keys.cryptKey);
@@ -81,6 +81,7 @@ define([
             contacts.friends = proxy.friends || {};
             Object.keys(contacts.friends).map(function (key) {
                 var friend = contacts.friends[key];
+                if (!friend) { return; }
                 var ret = {
                     edPublic: friend.edPublic,
                     name: friend.displayName,
@@ -90,6 +91,7 @@ define([
             });
             Object.keys(contacts.teams).map(function (key) {
                 var team = contacts.teams[key];
+                if (!team) { return; }
                 var avatar = team.metadata && team.metadata.avatar;
                 var ret = {
                     edPublic: team.keys && team.keys.drive && team.keys.drive.edPublic,

www/common/common-ui-elements.js

@@ -2557,18 +2557,6 @@ define([
 
         var $advanced;
 
-        var $advancedContainer = $('<div>');
-        var priv = common.getMetadataMgr().getPrivateData();
-        var c = (priv.settings.general && priv.settings.general.creation) || {};
-        if (AppConfig.displayCreationScreen && common.isLoggedIn() && c.skip) {
-            var $cboxLabel = $(UI.createCheckbox('cp-app-toolbar-creation-advanced',
-                                                 Messages.creation_newPadModalAdvanced, true))
-                                 .appendTo($advancedContainer);
-            $advanced = $cboxLabel.find('input');
-            $description.append('<br>');
-            $description.append(Messages.creation_newPadModalDescriptionAdvanced);
-        }
-
         var $container = $('<div>');
         var i = 0;
         var types = AppConfig.availablePadTypes.filter(function (p) {
@@ -2633,7 +2621,7 @@ define([
         });
 
 
-        $modal.find('.cp-modal').append($container).append($advancedContainer);
+        $modal.find('.cp-modal').append($container);
         window.setTimeout(function () {
             modal.show();
             $modal.focus();
@@ -2878,15 +2866,6 @@ define([
             right
         ]);
 
-        var settings = h('div.cp-creation-remember', [
-            UI.createCheckbox('cp-creation-remember', Messages.dontShowAgain, false),
-            createHelper('/settings/#creation', Messages.creation_settings),
-            h('div.cp-creation-remember-help.cp-creation-slider', [
-                h('span.fa.fa-exclamation-circle.cp-creation-warning'),
-                Messages.creation_rememberHelp
-            ])
-        ]);
-
         var createDiv = h('div.cp-creation-create');
         var $create = $(createDiv);
 
@@ -2895,7 +2874,6 @@ define([
             owned,
             expire,
             password,
-            settings,
             templates,
             createDiv
         ])).appendTo($creation);
@@ -3043,16 +3021,6 @@ define([
             $creation.focus();
         });
 
-        // Display settings help when checkbox checked
-        $creation.find('#cp-creation-remember').on('change', function () {
-            if ($(this).is(':checked')) {
-                $creation.find('.cp-creation-remember-help:not(.active)').addClass('active');
-                return;
-            }
-            $creation.find('.cp-creation-remember-help').removeClass('active');
-            $creation.focus();
-        });
-
         // Keyboard shortcuts
         $creation.find('#cp-creation-expire-val').keydown(function (e) {
             if (e.which === 9) {
@@ -3070,9 +3038,6 @@ define([
         if (!cfg.owned && typeof cfg.owned !== "undefined") {
             $creation.find('#cp-creation-owned').prop('checked', false);
         }
-        if (cfg.skip) {
-            $creation.find('#cp-creation-remember').prop('checked', true).trigger('change');
-        }
         UIElements.setExpirationValue(cfg.expire, $creation);
 
         // Create the pad
@@ -3115,14 +3080,6 @@ define([
         var create = function () {
             var val = getFormValues();
 
-            var skip = $('#cp-creation-remember').is(':checked');
-            common.setAttribute(['general', 'creation', 'skip'], skip, function (e) {
-                if (e) { return void console.error(e); }
-            });
-            common.setAttribute(['general', 'creation', 'noTemplate'], skip, function (e) {
-                if (e) { return void console.error(e); }
-            });
-
             common.setAttribute(['general', 'creation', 'owned'], val.owned, function (e) {
                 if (e) { return void console.error(e); }
             });

www/common/inner/access.js

@@ -309,7 +309,7 @@ define([
             called = true;
             nThen(function (waitFor) {
                 if (!reload) { return; }
-                Modal.loadMetadata(common, data, waitFor, "owner");
+                Modal.loadMetadata(Env, data, waitFor, "owner");
             }).nThen(function () {
                 owners = data.owners || [];
                 pending_owners = data.pending_owners || [];
@@ -617,7 +617,7 @@ define([
             called = true;
             nThen(function (waitFor) {
                 if (!reload) { return; }
-                Modal.loadMetadata(common, data, waitFor, "allow");
+                Modal.loadMetadata(Env, data, waitFor, "allow");
             }).nThen(function () {
                 owners = data.owners || [];
                 restricted = data.restricted || false;

www/common/inner/common-mediatag.js

@@ -7,6 +7,7 @@ define([
     '/common/media-tag.js',
     '/customize/messages.js',
 
+    '/bower_components/tweetnacl/nacl-fast.min.js',
     '/bower_components/croppie/croppie.min.js',
     '/bower_components/file-saver/FileSaver.min.js',
     'css!/bower_components/croppie/croppie.css',
@@ -28,7 +29,7 @@ define([
     MT.getCursorAvatar = function (cursor) {
         var html = '<span class="cp-cursor-avatar">';
         html += (cursor.avatar && avatars[cursor.avatar]) || '';
-        html += cursor.name + '</span>';
+        html += Util.fixHTML(cursor.name) + '</span>';
         return html;
     };
 

www/common/onlyoffice/inner.js

@@ -1091,12 +1091,12 @@ define([
 
         var x2tSaveAndConvertData = function(data, filename, extension, finalFilename) {
             // Perform the x2t conversion
-            require(['/common/onlyoffice/x2t/x2t.js'], function() {
+            require(['/common/onlyoffice/x2t/x2t.js'], function() { // XXX why does this fail without an access-control-allow-origin header?
                 var x2t = window.Module;
                 x2t.run();
                 if (x2tInitialized) {
                     debug("x2t runtime already initialized");
-                    x2tSaveAndConvertDataInternal(x2t, data, filename, extension, finalFilename);
+                    x2tSaveAndConvertDataInternal(x2t, data, filename, extension, finalFilename); // XXX shouldn't this return ?
                 }
 
                 x2t.onRuntimeInitialized = function() {

www/common/outer/roster.js

@@ -481,7 +481,9 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) {
         if (!config.anon_rpc) { return void cb("EXPECTED_ANON_RPC"); }
 
 
-        var response = Util.response();
+        var response = Util.response(function (label, info) {
+            console.error('ROSTER_RESPONSE__' + label, info);
+        });
         var anon_rpc = config.anon_rpc;
         var keys = config.keys;
         var me = keys.myCurvePublic;

www/common/sframe-app-framework.js

@@ -402,12 +402,6 @@ define([
                         Thumb.initPadThumbnails(common, options.thumbnail);
                     }
                 }
-
-                var skipTemp = Util.find(privateDat, ['settings', 'general', 'creation', 'noTemplate']);
-                var skipCreation = Util.find(privateDat, ['settings', 'general', 'creation', 'skip']);
-                if (newPad && (!AppConfig.displayCreationScreen || (!skipTemp && skipCreation))) {
-                    common.openTemplatePicker();
-                }
             });
         };
         var onConnectionChange = function (info) {

www/common/sframe-common-file.js

@@ -32,7 +32,9 @@ define([
     module.create = function (common, config) {
         var File = {};
         var origin = common.getMetadataMgr().getPrivateData().origin;
-        var response = Util.response();
+        var response = Util.response(function (label, info) {
+            console.error('COMMON_UPLOAD__' + label, info);
+        });
 
         var teamId = config.teamId;
 

www/common/sframe-common.js

@@ -296,10 +296,9 @@ define([
         var priv = ctx.metadataMgr.getPrivateData();
         if (priv.isNewFile) {
             var c = (priv.settings.general && priv.settings.general.creation) || {};
-            var skip = !AppConfig.displayCreationScreen || (c.skip && !priv.forceCreationScreen);
             // If this is a new file but we have a hash in the URL and pad creation screen is
             // not displayed, then display an error...
-            if (priv.isDeleted && (!funcs.isLoggedIn() || skip)) {
+            if (priv.isDeleted && !funcs.isLoggedIn()) {
                 UI.errorLoadingScreen(Messages.inactiveError, false, function () {
                     UI.addLoadingScreen();
                     return void funcs.createPad({}, waitFor());
@@ -308,7 +307,7 @@ define([
             }
             // Otherwise, if we don't display the screen, it means it is not a deleted pad
             // so we can continue and start realtime...
-            if (!funcs.isLoggedIn() || skip) {
+            if (!funcs.isLoggedIn()) {
                 return void funcs.createPad(c, waitFor());
             }
             // If we display the pad creation screen, it will handle deleted pads directly

www/common/translations/messages.ca.json

@@ -350,7 +350,7 @@
     "fm_info_root": "Creeu aquí tantes carpetes imbrincades com vulgueu per ordenar els vostres fitxers.",
     "fm_info_unsorted": "Conté tots els fitxers que heu visitat i que encara no estan ordenats, a \"Documents\" o desplaçats a la \"Paperera\".",
     "fm_info_template": "Conté tots els documents desats com plantilles i que podeu reutilitzar quan vulgueu crear un nou document.",
-    "fm_info_recent": "Llista els documents modificats o oberts recentment.",
+    "fm_info_recent": "Aquests documents s'han modificat o obert darrerament, per vós o per alguna persona col·laboradora.",
     "fm_info_trash": "Buideu la paperera per alliberar espai al vostre CryptDrive.",
     "fm_info_allFiles": "Conté tots els fitxers de \"Documents\", \"Desordenats\" i \"Paperera\". No podeu desplaçar o suprimir fitxers des d'aquí.",
     "fm_info_anonymous": "No heu iniciat la sessió, per tant, els vostres documents caducaran d'aquí a 3 mesos (<a href=\"https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/\" target=\"_blank\">saber-ne més</a>). Es desen al vostre navegador, per tant, si netegeu el vostre historial podríeu perdre'ls.<br><a href=\"/register/\">Registreu-vos</a> o <a href=\"/login/\">Inicieu la sessió</a> per mantenir-los accessibles.<br>",
@@ -515,7 +515,7 @@
     "settings_pinningError": "Alguna cosa no ha funcionat correctament",
     "settings_usageAmount": "Els vostres documents fixats ocupen {0} MB",
     "settings_logoutEverywhereButton": "Tanca la sessió",
-    "settings_logoutEverywhereTitle": "Tanca la sessió arreu",
+    "settings_logoutEverywhereTitle": "Tanca les sessions remotes",
     "settings_logoutEverywhere": "Tanca totes les altres sessions",
     "settings_logoutEverywhereConfirm": "De debò? Haureu de tornar a iniciar la vostra sessió a tots els dispositius.",
     "settings_driveDuplicateTitle": "Documents propis duplicats",
@@ -573,7 +573,7 @@
     "upload_success": "El fitxer ({0}) ha estat carregat correctament i afegit al vostre CryptDrive.",
     "upload_notEnoughSpace": "No hi ha prou espai al CryptDrive per aquest fitxer.",
     "upload_notEnoughSpaceBrief": "No hi ha prou espai",
-    "upload_tooLarge": "Aquest fitxer supera la mida màxima permesa.",
+    "upload_tooLarge": "Aquest fitxer supera la mida màxima permesa pel vostre compte",
     "upload_tooLargeBrief": "El fitxer és massa gran",
     "upload_choose": "Trieu un fitxer",
     "upload_pending": "Pendent",
@@ -619,5 +619,20 @@
     "download_resourceNotAvailable": "El recurs sol·licitat no estava disponible... Premeu Esc per continuar.",
     "about_contributors": "Col·laboracions clau",
     "about_core": "Desenvolupament principal",
-    "about_intro": "CryptPad s'ha creat dins l'Equip de Recerca de <a href=\"http://xwiki.com\">XWiki SAS</a>, una petita empresa de París, França i Iasi, Romania. Hi ha 3 membres de l'equip central treballant amb CryptPad més una quantitat de persones col·laboradores, dins i fora d'XWiki SAS."
+    "about_intro": "CryptPad s'ha creat dins l'Equip de Recerca de <a href=\"http://xwiki.com\">XWiki SAS</a>, una petita empresa de París, França i Iasi, Romania. Hi ha 3 membres de l'equip central treballant amb CryptPad més una quantitat de persones col·laboradores, dins i fora d'XWiki SAS.",
+    "main_catch_phrase": "El Núvol Coneixement Zero",
+    "main_footerText": "Amb Cryptpad, podeu crear documents col·laboratius per prendre notes i posar en ordre idees de forma conjunta de forma ràpida.",
+    "footer_applications": "Aplicacions",
+    "footer_contact": "Contacte",
+    "footer_aboutUs": "Sobre nosaltres",
+    "about": "Sobre",
+    "contact": "Contacte",
+    "blog": "Bloc",
+    "topbar_whatIsCryptpad": "Què és CryptPad",
+    "whatis_collaboration": "Col·laboració fàcil i ràpida",
+    "whatis_title": "Què és CryptPad",
+    "terms": "Condicions d'ús",
+    "main_info": "<h2>Col·laboreu amb Confiança</h2>\nFeu créixer les vostres idees conjuntament amb documents compartits mentre la tecnologia <strong>Coneixement Zero</strong> assegura la vostra privacitat; <strong>fins i tot per nosaltres</strong>.",
+    "whatis_collaboration_p1": "Amb CryptPad, podeu crear de forma ràpida, documents col·laboratius per prendre notes i posar en ordre idees conjuntament. Quan us registreu i inicieu la vostra sessió, teniu la capacitat de carregar fitxers i un CryptDrive on podeu organitzar tots els vostres documents. Com a persona registrada disposeu de 50MB d'espai gratuït.",
+    "privacy": "Privacitat"
 }

www/common/translations/messages.de.json

@@ -938,7 +938,7 @@
     "creation_expiration": "Ablaufdatum",
     "creation_passwordValue": "Passwort",
     "creation_propertiesTitle": "Verfügbarkeit",
-    "creation_appMenuName": "Fortgeschrittener Modus (Strg + E)",
+    "creation_appMenuName": "Neues Pad (Strg + E)",
     "creation_newPadModalDescription": "Klicke auf einen Pad-Typ, um das entsprechende Pad zu erstellen. Du kannst auch die <b>Tab</b>-Taste für die Auswahl und die <b>Enter</b>-Taste zum Bestätigen benutzen.",
     "creation_newPadModalDescriptionAdvanced": "Du kannst das Kästchen markieren (oder den Wert mit der Leertaste ändern), um den Dialog bei der Pad-Erstellung anzuzeigen (für eigene oder auslaufende Dokumente etc.).",
     "creation_newPadModalAdvanced": "Dialog bei der Pad-Erstellung anzeigen",

www/common/translations/messages.fi.json

@@ -281,7 +281,7 @@
     "profile_description": "Kuvaus",
     "profile_fieldSaved": "Uusi arvo tallennettu: {0}",
     "profile_viewMyProfile": "Näytä oma profiili",
-    "userlist_addAsFriendTitle": "Lähetä ystäväpyyntö käyttäjälle \"{0}\"",
+    "userlist_addAsFriendTitle": "Lähetä kontaktipyyntö käyttäjälle \"{0}\"",
     "contacts_title": "Yhteystiedot",
     "contacts_addError": "Virhe lisätessä yhteystietoa listaan",
     "contacts_added": "Yhteystietopyyntö hyväksytty.",
@@ -301,7 +301,7 @@
     "contacts_confirmRemoveHistory": "Oletko varma, että haluat tyhjentää keskusteluhistorian pysyvästi? Tietoja ei voida palauttaa",
     "contacts_removeHistoryServerError": "Keskusteluhistorian poistamisessa tapahtui virhe. Yritä myöhemmin uudelleen",
     "contacts_fetchHistory": "Hae vanhempia viestejä",
-    "contacts_friends": "Kaverit",
+    "contacts_friends": "Kontaktit",
     "contacts_rooms": "Keskusteluhuoneet",
     "contacts_leaveRoom": "Lähde keskusteluhuoneesta",
     "contacts_online": "Toinen käyttäjä tästä keskusteluhuoneesta on online-tilassa",
@@ -354,7 +354,7 @@
     "fm_info_root": "Voit luoda haluamasi määrän sisäkkäisiä kansioita tiedostojesi järjestämiseen.",
     "fm_info_unsorted": "Sisältää kaikki käyttämäsi tiedostot, joita ei ole vielä lajiteltu \"Tiedostot\"-näkymässä tai siirretty roskakoriin.",
     "fm_info_template": "Sisältää kaikki mallipohjiksi tallennetut padit, joita voit käyttää uudelleen luodessasi uuden padin.",
-    "fm_info_recent": "Näytä viimeksi muokatut tai avatut padit.",
+    "fm_info_recent": "Tässä näytetään sinun tai yhteistyökumppaniesi äskettäin avaamat tai muokkaamat padit.",
     "fm_info_trash": "Tyhjennä roskakorisi vapauttaaksesi CryptDrive-tallennustilaa.",
     "fm_info_allFiles": "Sisältää kaikki tiedostot \"Dokumentit\"- \"Lajittelemattomat\"- ja \"Roskakori\"-näkymistä. Et voi siirtää tai poistaa tiedostoja täältä.",
     "fm_info_anonymous": "Et ole kirjautunut sisään. Padisi vanhenevat kolmen kuukauden kuluttua (<a href=\"https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/\" target=\"_blank\">(lue lisää)</a>). Padit säilytetään paikallisesti selaimessasi, joten selaimen historiatietojen tyhjentäminen saattaa hävittää ne.<br><a href=\"/register/\">Rekisteröidy</a>  tai  <a href=\"/login/\">kirjaudu sisään</a> säilyttääksesi padisi palvelimella.<br>",
@@ -513,7 +513,7 @@
     "settings_pinningError": "Jokin meni pieleen",
     "settings_usageAmount": "Kiinnitetyt padisi käyttävät {0}Mt",
     "settings_logoutEverywhereButton": "Kirjaudu ulos",
-    "settings_logoutEverywhereTitle": "Kirjaudu ulos kaikkialta",
+    "settings_logoutEverywhereTitle": "Sulje etäistunnot",
     "settings_logoutEverywhere": "Pakota uloskirjautuminen kaikista web-sessioista",
     "settings_logoutEverywhereConfirm": "Oletko varma? Joudut kirjautumaan kaikilla laitteillasi uudelleen sisään.",
     "settings_driveDuplicateTitle": "Omistettujen padien kaksoiskappaleet",
@@ -534,8 +534,8 @@
     "settings_creationSkipFalse": "Näytä",
     "settings_templateSkip": "Ohita mallipohjan valinta-dialogi",
     "settings_templateSkipHint": "Luodessasi uutta padia sinulta kysytään, haluatko käyttää mallipohjaa, jos sinulla on tallennettuja mallipohjia tälle padityypille. Tällä asetuksella voit valita, ettei mallipohjan valinta-dialogia näytetä ja siten mallipohjia ei koskaan käytetä.",
-    "settings_ownDriveTitle": "Ota käyttöön viimeisimmät tiliominaisuudet",
-    "settings_ownDriveHint": "Teknisistä syistä vanhemmilla käyttäjätileillä ei suoraan ole pääsyä CryptPadin uusimpiin ominaisuuksiin. Ilmainen päivitys uuteen käyttäjätiliin valmistelee CryptDrivesi tulevia ominaisuuksia varten häiritsemättä tavanomaista toimintaasi.",
+    "settings_ownDriveTitle": "Päivitä käyttäjätili",
+    "settings_ownDriveHint": "Vanhemmilla käyttäjätileillä ei ole teknisistä syistä pääsyä CryptPadin uusimpiin ominaisuuksiin. Ilmainen päivitys uuteen käyttäjätiliin valmistelee CryptDrivesi tulevia ominaisuuksia varten häiritsemättä tavanomaista toimintaasi.",
     "settings_ownDriveButton": "Päivitä käyttäjätilisi",
     "settings_ownDriveConfirm": "Käyttäjätilin päivitykseen voi mennä jonkin aikaa. Joudut kirjautumaan uudelleen sisään kaikilla laitteillasi. Oletko varma, että haluat aloittaa päivityksen?",
     "settings_ownDrivePending": "Käyttäjätiliäsi päivitetään. Ole hyvä, äläkä sulje tai lataa tätä sivua uudelleen, ennen kuin toimenpide on valmis.",
@@ -850,7 +850,7 @@
     "features_f_social": "Sosiaaliset sovellukset",
     "features_f_social_note": "Luo käyttäjäprofiili, käytä avatar-kuvaa, keskustele yhteystietojen kanssa",
     "features_f_file1": "Lataa ja jaa tiedostoja",
-    "features_f_file1_note": "Jaa tiedostoja kavereidesi kanssa tai upota ne padeihisi",
+    "features_f_file1_note": "Jaa tiedostoja kontaktiesi kanssa tai upota ne padeihisi",
     "features_f_storage1": "Pysyvä tallennustila (50Mt)",
     "features_f_storage1_note": "CryptDriveen tallennettuja padeja ei koskaan poisteta käyttämättömyyden takia",
     "features_f_register": "Rekisteröidy ilmaiseksi",
@@ -953,7 +953,7 @@
                 "a": "Rekisteröityneille käyttäjille on tarjolla joitakin toimintoja, jotka eivät ole saatavilla rekisteröitymättömille käyttäjille. Löydät nämä toiminnot <a href='/features.html' target='_blank'>luomastamme kaaviosta</a>."
             },
             "share": {
-                "q": "Miten jaan salattuja padeja kavereideni kanssa?",
+                "q": "Miten jaan salattuja padeja kontaktieni kanssa?",
                 "a": "CryptPad laittaa URL-osoitteessa padisi salaisen salausavaimen <em>#</em>-merkin jälkeen. Tämän merkin jälkeen laitettuja tietoja ei lähetetä palvelimelle, joten emme pääse koskaan käyttämään salausavaimiasi. Jakaessasi linkin padiin jaat oikeuden lukea ja käyttää sitä."
             },
             "remove": {
@@ -985,7 +985,7 @@
             "title": "Muita kysymyksiä",
             "pay": {
                 "q": "Miksi minun täytyisi maksaa, kun niin monet toiminnot ovat ilmaisia?",
-                "a": "Annamme tukijoillemme lisätallennustilaa ja mahdollisuuden kasvattaa kavereiden tallennustilakiintiöitä (<a href='https://accounts.cryptpad.fr/#/faq' target='_blank'>lue lisää</a>).<br><br>Näiden lyhytaikaisten etujen lisäksi premium-tilaus auttaa rahoittamaan CryptPadin jatkuvaa, aktiivista kehitystyötä. Tähän kuuluu bugien korjaamista, uusien ominaisuuksien lisäämistä ja CryptPad-instanssien pystyttämisen ja ylläpidon helpottamista. Lisäksi autat näyttämään muille palveluntarjoajille, että ihmiset ovat valmiita tukemaan yksityisyyttä parantavia teknologioita. Toivomme, että käyttäjätietojen myymiseen perustuvat liiketoimintamallit jäävät lopulta menneeseen.<br><br>Lopuksi, tarjoamme suurimman osan CryptPadin toiminnallisuudesta ilmaiseksi, koska uskomme yksityisyyden kuuluvan kaikille - ei vain niille, joilla on varaa maksaa siitä. Tukemalla meitä autat tarjoamaan heikommassa asemassa oleville väestöille pääsyn näihin peruspalveluihin."
+                "a": "Annamme tukijoillemme lisätallennustilaa ja mahdollisuuden kasvattaa kontaktien tallennustilakiintiöitä (<a href='https://accounts.cryptpad.fr/#/faq' target='_blank'>lue lisää</a>).<br><br>Näiden lyhytaikaisten etujen lisäksi premium-tilaus auttaa rahoittamaan CryptPadin jatkuvaa, aktiivista kehitystyötä. Tähän kuuluu bugien korjaamista, uusien ominaisuuksien lisäämistä ja CryptPad-instanssien pystyttämisen ja ylläpidon helpottamista. Lisäksi autat näyttämään muille palveluntarjoajille, että ihmiset ovat valmiita tukemaan yksityisyyttä parantavia teknologioita. Toivomme, että käyttäjätietojen myymiseen perustuvat liiketoimintamallit jäävät lopulta menneeseen.<br><br>Lopuksi, tarjoamme suurimman osan CryptPadin toiminnallisuudesta ilmaiseksi, koska uskomme yksityisyyden kuuluvan kaikille - ei vain niille, joilla on varaa maksaa siitä. Tukemalla meitä autat tarjoamaan heikommassa asemassa oleville väestöille pääsyn näihin peruspalveluihin."
             },
             "goal": {
                 "q": "Mitkä ovat tavoitteenne?",
@@ -1047,7 +1047,7 @@
             "colors": "Vaihda tekstin ja taustan väriä <span class=\"fa fa-i-cursor\"></span> ja <span class=\"fa fa-square\"></span> -painikkeilla"
         },
         "poll": {
-            "decisions": "Tee päätöksiä luotettujen ystävien kesken",
+            "decisions": "Tee päätöksiä luotettujen kontaktien kesken",
             "options": "Ehdota vaihtoehtoja ja tuo ilmi mielipiteesi",
             "choices": "Napsauta sarakkeesi soluja valitaksesi kyllä- (<strong>✔</strong>), ehkä- (<strong>~</strong>), tai ei (<strong>✖</strong>) -vaihtoehdon",
             "submit": "Napsauta <strong>Lähetä</strong> tehdäksesi valintasi näkyviksi muille"
@@ -1058,12 +1058,12 @@
             "embed": "Upota kuvia kovalevyltäsi <span class=\"fa fa-file-image-o\"></span> tai CryptDrivestasi <span class=\"fa fa-image\"></span> ja vie ne PNG-tiedostomuodossa kovalevyllesi <span class=\"fa fa-download\"></span> tai CryptDriveesi <span class=\"fa fa-cloud-upload\"></span>"
         },
         "kanban": {
-            "add": "Lisää uusia tauluja oikeassa yläkulmassa olevalla <span class=\"fa fa-plus\"></span> -painikkeella",
-            "task": "Siirrä kohtia raahaamalla ja pudottamalla ne yhdestä taulusta toiseen",
-            "color": "Vaihda värejä napsauttamalla taulun otsikon vieressä olevaa värillistä osaa"
+            "add": "Lisää uusia kortteja ja  tauluja <span class=\"fa fa-plus\"></span> -painikkeella",
+            "task": "Siirrä kohtia raahaamalla ja pudottamalla, raahaa <span class=\"fa fa-trash\"></span> roskakoriin poistaaksesi",
+            "color": "Muokkaa otsikoita, sisältöä, tunnisteita ja värejä korttien ja taulujen otsikoiden vieressä olevalla  span class=\"fa fa-pencil\"></span> -painikkeella"
         }
     },
     "driveReadmeTitle": "Mikä on CryptPad?",
     "readme_welcome": "Tervetuloa CryptPadiin!",
-    "readme_p1": "Tervetuloa CryptPadiin, täällä voit tehdä muistiinpanoja yksin tai ystäviesi kanssa."
+    "readme_p1": "Tervetuloa CryptPadiin, täällä voit tehdä muistiinpanoja yksin tai kontaktiesi kanssa."
 }

www/filepicker/app-filepicker.less

@@ -27,8 +27,6 @@
             }
 
             .cp-filepicker-content-element {
-                @darker: darken(@colortheme_modal-fg, 30%);
-
                 width: 125px;
                 //min-width: 200px;
                 //height: 1em;
@@ -45,8 +43,9 @@
                 cursor: pointer;
 
                 background-color: @colortheme_modal-bg;
-                box-shadow: 2px 2px 5px #000;
-                color: @darker;
+
+                border: 1px solid @colortheme_logo-2;
+                color: @colortheme_logo-2;
 
                 transition: all 0.1s;
 

www/poll/inner.js

@@ -1066,13 +1066,6 @@ define([
         common.openPadChat(function () {});
 
         UI.removeLoadingScreen();
-        var privateDat = metadataMgr.getPrivateData();
-        var skipTemp = Util.find(privateDat,
-            ['settings', 'general', 'creation', 'noTemplate']);
-        var skipCreation = Util.find(privateDat, ['settings', 'general', 'creation', 'skip']);
-        if (isNew && (!AppConfig.displayCreationScreen || (!skipTemp && skipCreation))) {
-            common.openTemplatePicker();
-        }
     };
 
     var onError = function (info) {

www/settings/inner.js

@@ -62,12 +62,6 @@ define([
             'cp-settings-safe-links',
             'cp-settings-userfeedback',
         ],
-        'creation': [
-            'cp-settings-creation-owned',
-            'cp-settings-creation-expire',
-            'cp-settings-creation-skip',
-            'cp-settings-creation-template'
-        ],
         'drive': [
             'cp-settings-drive-duplicate',
             'cp-settings-thumbnails',
@@ -101,9 +95,6 @@ define([
         }
     };
 
-    if (!AppConfig.displayCreationScreen) {
-        delete categories.creation;
-    }
     if (AppConfig.disableFeedback) {
         var feedbackIdx = categories.account.indexOf('cp-settings-userfeedback');
         categories.account.splice(feedbackIdx, 1);
@@ -610,242 +601,6 @@ define([
         cb($cbox);
     }, true);
 
-    // Pad Creation settings
-
-    var setHTML = function (e, html) {
-        e.innerHTML = html;
-        return e;
-    };
-    create['creation-owned'] = function () {
-        if (!common.isLoggedIn()) { return; }
-        var owned = h('div.cp-settings-creation-owned.cp-sidebarlayout-element', [
-            h('label', [
-                Messages.creation_ownedTitle
-            ]),
-            setHTML(h('p.cp-sidebarlayout-description'),
-                    Messages.creation_owned1 + '<br>' + Messages.creation_owned2),
-            h('input#cp-creation-owned-true.cp-creation-owned-value', {
-                type: 'radio',
-                name: 'cp-creation-owned',
-                value: 1,
-                checked: 'checked'
-            }),
-            h('label', { 'for': 'cp-creation-owned-true' }, Messages.creation_ownedTrue),
-            h('input#cp-creation-owned-false.cp-creation-owned-value', {
-                type: 'radio',
-                name: 'cp-creation-owned',
-                value: 0,
-            }),
-            h('label', { 'for': 'cp-creation-owned-false' }, Messages.creation_ownedFalse),
-            h('span.fa.fa-check', {title: Messages.saved}),
-            h('span.fa.fa-spinner.fa-pulse'),
-        ]);
-
-        var $owned = $(owned);
-
-        var $ok = $owned.find('.fa-check').hide();
-        var $spinner = $owned.find('.fa-spinner').hide();
-
-        $owned.find('input').change(function () {
-            $spinner.show();
-            $ok.hide();
-            var val = parseInt($owned.find('[name="cp-creation-owned"]:checked').val());
-            common.setAttribute(['general', 'creation', 'owned'], val, function (e) {
-                if (e) { return void console.error(e); }
-                $spinner.hide();
-                $ok.show();
-            });
-        });
-        common.getAttribute(['general', 'creation', 'owned'], function (e, val) {
-            if (!val && typeof val !== "undefined") {
-                $owned.find('#cp-creation-owned-false').attr('checked', true);
-            }
-        });
-
-        return $owned;
-    };
-    create['creation-expire'] = function () {
-        if (!common.isLoggedIn()) { return; }
-        var expire = h('div.cp-settings-creation-expire.cp-sidebarlayout-element', [
-            h('label', [
-                Messages.creation_expireTitle
-            ]),
-            setHTML(h('p.cp-sidebarlayout-description'),
-                    Messages.creation_expire1 + '<br>' + Messages.creation_expire2),
-            h('input#cp-creation-expire-false.cp-creation-expire-value', {
-                type: 'radio',
-                name: 'cp-creation-expire',
-                value: 0,
-                checked: 'checked'
-            }),
-            h('label', { 'for': 'cp-creation-expire-false' }, Messages.creation_expireFalse),
-            h('input#cp-creation-expire-true.cp-creation-expire-value', {
-                type: 'radio',
-                name: 'cp-creation-expire',
-                value: 1
-            }),
-            h('label', { 'for': 'cp-creation-expire-true' }, [
-                Messages.creation_expireTrue,
-                h('span.cp-creation-expire-picker', [
-                    h('input#cp-creation-expire-val', {
-                        type: "number",
-                        min: 1,
-                        max: 100,
-                        value: 3
-                    }),
-                    h('select#cp-creation-expire-unit', [
-                        h('option', { value: 'hour' }, Messages.creation_expireHours),
-                        h('option', { value: 'day' }, Messages.creation_expireDays),
-                        h('option', {
-                            value: 'month',
-                            selected: 'selected'
-                        }, Messages.creation_expireMonths)
-                    ])
-                ])
-            ]),
-            h('span.fa.fa-check', {title: Messages.saved}),
-            h('span.fa.fa-spinner.fa-pulse'),
-        ]);
-
-        var $expire = $(expire);
-
-        var $ok = $expire.find('.fa-check').hide();
-        var $spinner = $expire.find('.fa-spinner').hide();
-
-        var getValue = function () {
-            if(!parseInt($expire.find('[name="cp-creation-expire"]:checked').val())) { return 0; }
-            var unit = 0;
-            switch ($expire.find('#cp-creation-expire-unit').val()) {
-                case "hour" : unit = 3600;           break;
-                case "day"  : unit = 3600 * 24;      break;
-                case "month": unit = 3600 * 24 * 30; break;
-                default: unit = 0;
-            }
-            return ($expire.find('#cp-creation-expire-val').val() || 0) * unit;
-        };
-        $expire.find('input, select').change(function () {
-            $spinner.show();
-            $ok.hide();
-            common.setAttribute(['general', 'creation', 'expire'], getValue(), function (e) {
-                if (e) { return void console.error(e); }
-                $spinner.hide();
-                $ok.show();
-            });
-        });
-        common.getAttribute(['general', 'creation', 'expire'], function (e, val) {
-            UIElements.setExpirationValue(val, $expire);
-        });
-
-        return $expire;
-    };
-    create['creation-skip'] = function () {
-        if (!common.isLoggedIn()) { return; }
-        var skip = h('div.cp-settings-creation-skip.cp-sidebarlayout-element', [
-            h('label', [
-                Messages.settings_creationSkip
-            ]),
-            setHTML(h('p.cp-sidebarlayout-description'), Messages.settings_creationSkipHint),
-            h('input#cp-creation-skip-true.cp-creation-skip-value', {
-                type: 'radio',
-                name: 'cp-creation-skip',
-                value: 1,
-            }),
-            h('label', { 'for': 'cp-creation-skip-true' }, Messages.settings_creationSkipTrue),
-            h('input#cp-creation-skip-false.cp-creation-skip-value', {
-                type: 'radio',
-                name: 'cp-creation-skip',
-                value: 0,
-                checked: 'checked'
-            }),
-            h('label', { 'for': 'cp-creation-skip-false' }, Messages.settings_creationSkipFalse),
-            h('span.fa.fa-check', {title: Messages.saved}),
-            h('span.fa.fa-spinner.fa-pulse'),
-        ]);
-
-        var $div = $(skip);
-
-        var $ok = $div.find('.fa-check').hide();
-        var $spinner = $div.find('.fa-spinner').hide();
-
-        $div.find('input').change(function () {
-            $spinner.show();
-            $ok.hide();
-            var val = parseInt($div.find('[name="cp-creation-skip"]:checked').val());
-            // If we don't skip the pad creation screen, we dont' need settings to hide the templates
-            // modal
-            if (!val) {
-                $('.cp-settings-creation-template').addClass('cp-settings-creation-skipped');
-            } else {
-                $('.cp-settings-creation-template').removeClass('cp-settings-creation-skipped');
-            }
-            common.setAttribute(['general', 'creation', 'skip'], val, function (e) {
-                if (e) { return void console.error(e); }
-                $spinner.hide();
-                $ok.show();
-            });
-        });
-        common.getAttribute(['general', 'creation', 'skip'], function (e, val) {
-            if (val) {
-                $div.find('#cp-creation-skip-true').attr('checked', true);
-                return;
-            }
-            // If we don't skip the pad creation screen, we dont' need settings to hide the templates
-            // modal
-            $('.cp-settings-creation-template').addClass('cp-settings-creation-skipped');
-        });
-
-        return $div;
-    };
-    create['creation-template'] = function () {
-        var skip = h('div.cp-settings-creation-template.cp-sidebarlayout-element', [
-            h('label', [
-                Messages.settings_templateSkip
-            ]),
-            setHTML(h('p.cp-sidebarlayout-description'), Messages.settings_templateSkipHint),
-            h('input#cp-creation-template-true.cp-creation-template-value', {
-                type: 'radio',
-                name: 'cp-creation-template',
-                value: 1,
-            }),
-            h('label', { 'for': 'cp-creation-template-true' }, Messages.settings_creationSkipTrue),
-            h('input#cp-creation-template-false.cp-creation-template-value', {
-                type: 'radio',
-                name: 'cp-creation-template',
-                value: 0,
-                checked: 'checked'
-            }),
-            h('label', { 'for': 'cp-creation-template-false' }, Messages.settings_creationSkipFalse),
-            h('span.fa.fa-check', {title: Messages.saved}),
-            h('span.fa.fa-spinner.fa-pulse'),
-        ]);
-
-        var $div = $(skip);
-
-        var $ok = $div.find('.fa-check').hide();
-        var $spinner = $div.find('.fa-spinner').hide();
-
-        $div.find('input').change(function () {
-            $spinner.show();
-            $ok.hide();
-            var val = parseInt($div.find('[name="cp-creation-template"]:checked').val());
-            common.setAttribute(['general', 'creation', 'noTemplate'], val, function (e) {
-                if (e) { return void console.error(e); }
-                $spinner.hide();
-                $ok.show();
-            });
-        });
-        common.getAttribute(['general', 'creation', 'noTemplate'], function (e, val) {
-            if (val) {
-                $div.find('#cp-creation-template-true').attr('checked', true);
-            }
-        });
-
-        return $div;
-    };
-
-
-
-
     // Drive settings
 
     create['drive-duplicate'] = function () {
@@ -1720,7 +1475,6 @@ define([
             if (key === 'cursor') { $category.append($('<span>', {'class': 'fa fa-i-cursor' })); }
             if (key === 'code') { $category.append($('<span>', {'class': 'fa fa-file-code-o' })); }
             if (key === 'pad') { $category.append($('<span>', {'class': 'fa fa-file-word-o' })); }
-            if (key === 'creation') { $category.append($('<span>', {'class': 'fa fa-plus-circle' })); }
             if (key === 'security') { $category.append($('<span>', {'class': 'fa fa-lock' })); }
             if (key === 'subscription') { $category.append($('<span>', {'class': 'fa fa-star-o' })); }