Merge branch 'soon' into staging

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

@@ -44,6 +44,7 @@
                 }
                 pre {
                     margin-bottom: 0;
+                    white-space: pre-wrap;
                     &.cp-support-message-content {
                         margin-top: 10px;
                         margin-bottom: 10px;

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptpad",
-  "version": "2.23.0",
+  "version": "2.25.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -573,16 +573,16 @@
       "dev": true
     },
     "jshint": {
-      "version": "2.9.7",
-      "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.7.tgz",
-      "integrity": "sha512-Q8XN38hGsVQhdlM+4gd1Xl7OB1VieSuCJf+fEJjpo59JH99bVJhXRXAh26qQ15wfdd1VPMuDWNeSWoNl53T4YA==",
+      "version": "2.10.2",
+      "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz",
+      "integrity": "sha512-e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==",
       "dev": true,
       "requires": {
         "cli": "~1.0.0",
         "console-browserify": "1.1.x",
         "exit": "0.1.x",
         "htmlparser2": "3.8.x",
-        "lodash": "~4.17.10",
+        "lodash": "~4.17.11",
         "minimatch": "~3.0.2",
         "shelljs": "0.3.x",
         "strip-json-comments": "1.0.x"
@@ -697,9 +697,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+      "version": "4.17.14",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+      "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
       "dev": true
     },
     "lodash.clonedeep": {

package.json

@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "flow-bin": "^0.59.0",
-    "jshint": "~2.9.1",
+    "jshint": "^2.10.2",
     "less": "2.7.1",
     "lesshint": "^4.5.0",
     "selenium-webdriver": "^3.6.0"

www/common/outer/userObject.js

@@ -506,8 +506,14 @@ define([
             var fixRoot = function (elem) {
                 if (typeof(files[ROOT]) !== "object") { debug("ROOT was not an object"); files[ROOT] = {}; }
                 var element = elem || files[ROOT];
+                if (!element) { return console.error("Invalid element in root"); }
                 var nbMetadataFolders = 0;
                 for (var el in element) {
+                    if (element[el] === null) {
+                        console.error('element[%s] is null', el);
+                        delete element[el];
+                        continue;
+                    }
                     if (exp.isFolderData(element[el])) {
                         if (nbMetadataFolders !== 0) {
                             debug("Multiple metadata files in folder");

www/profile/inner.js

@@ -559,7 +559,7 @@ define([
         lm.proxy.on('ready', function () {
             updateValues(lm.proxy);
             UI.removeLoadingScreen();
-            common.mailbox.subscribe({
+            common.mailbox.subscribe(["notifications"], {
                 onMessage: function () {
                     refreshFriendRequest(lm.proxy);
                 },