From b1f0ca366413a6e11037c8c456ef4471f67ed14a Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 11 Jul 2019 10:27:08 +0200
Subject: [PATCH 1/2] update jshint

---
 package-lock.json | 16 ++++++++--------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 30b43f03e..bb7701b84 100644
--- a/package-lock.json
+++ b/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": {
diff --git a/package.json b/package.json
index 1a6462d84..585e8b8fc 100644
--- a/package.json
+++ b/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"

From f5c8d8566dfe47f9f89f1ed40d0960a02a94b3ea Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 16 Jul 2019 11:24:29 +0200
Subject: [PATCH 2/2] Fix pads and files not displayed in the drive when
 logging in

---
 www/drive/inner.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/drive/inner.js b/www/drive/inner.js
index f393cac3f..f69c36060 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -512,13 +512,14 @@ define([
         // Tags used: display Tags category
         if (Object.keys(manager.getTagsList()).length) { displayedCategories.push(TAGS); }
 
-        var virtualCategories = [SEARCH, RECENT, OWNED, TAGS, SHARED_FOLDER];
+        var virtualCategories = [SEARCH, RECENT, OWNED, TAGS];
 
         if (!APP.loggedIn) {
             $tree.hide();
             if (APP.newSharedFolder) {
                 // ANON_SHARED_FOLDER
                 displayedCategories = [SHARED_FOLDER];
+                virtualCategories.push(SHARED_FOLDER);
                 currentPath = [SHARED_FOLDER, ROOT];
             } else {
                 displayedCategories = [FILES_DATA];