From 5d4fba04ddad66eb9ba1a8284bd21570cdfb3b60 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 16 Jul 2019 11:17:12 +0200
Subject: [PATCH 1/2] update lodash versions

---
 package-lock.json | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 30b43f03e..a5d8ef41b 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": {
@@ -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": {
@@ -709,10 +709,9 @@
       "dev": true
     },
     "lodash.merge": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
-      "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==",
-      "dev": true
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
     },
     "lodash.sortby": {
       "version": "4.7.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];