Merge branch 'anonsf' into staging

2018-10-01 16:21:53 +02:00
parent e1329b7d46 62880e8cd9
commit 930677750c
9 changed files with 144 additions and 22 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -89,6 +89,12 @@ define([
            cb(obj);
        });
    };
+    common.loadSharedFolder = function (id, data, cb) {
+        postMessage("LOAD_SHARED_FOLDER", {
+            id: id,
+            data: data
+        }, cb);
+    };
    // Settings and ready
    common.mergeAnonDrive = function (cb) {
        var data = {