Merge branch '7.0'

frontend/package-lock.json

@@ -2897,41 +2897,139 @@
         }
       }
     },
-    "browser-sync": {
+    "browserify-aes": {
-      "version": "2.26.7",
+      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.26.7.tgz",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz",
-      "integrity": "sha512-lY3emme0OyvA2ujEMpRmyRy9LY6gHLuTr2/ABxhIm3lADOiRXzP4dgekvnDrQqZ/Ec2Fz19lEjm6kglSG5766w==",
+      "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==",
+      "dev": true,
       "requires": {
-        "browser-sync-client": "^2.26.6",
+        "buffer-xor": "^1.0.3",
-        "browser-sync-ui": "^2.26.4",
+        "cipher-base": "^1.0.0",
-        "bs-recipes": "1.3.4",
+        "create-hash": "^1.1.0",
-        "bs-snippet-injector": "^2.0.1",
+        "evp_bytestokey": "^1.0.3",
-        "chokidar": "^2.0.4",
+        "inherits": "^2.0.1",
-        "connect": "3.6.6",
+        "safe-buffer": "^5.0.1"
-        "connect-history-api-fallback": "^1",
+      }
-        "dev-ip": "^1.0.1",
+    },
-        "easy-extender": "^2.3.4",
+    "browserify-cipher": {
-        "eazy-logger": "^3",
+      "version": "1.0.0",
-        "etag": "^1.8.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
-        "fresh": "^0.5.2",
+      "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
-        "fs-extra": "3.0.1",
+      "dev": true,
-        "http-proxy": "1.15.2",
+      "requires": {
-        "immutable": "^3",
+        "browserify-aes": "^1.0.4",
-        "localtunnel": "1.9.2",
+        "browserify-des": "^1.0.0",
-        "micromatch": "^3.1.10",
+        "evp_bytestokey": "^1.0.0"
-        "opn": "5.3.0",
+      }
-        "portscanner": "2.1.1",
+    },
-        "qs": "6.2.3",
+    "browserify-des": {
-        "raw-body": "^2.3.2",
+      "version": "1.0.0",
-        "resp-modifier": "6.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
-        "rx": "4.1.0",
+      "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
-        "send": "0.16.2",
+      "dev": true,
-        "serve-index": "1.9.1",
+      "requires": {
-        "serve-static": "1.13.2",
+        "cipher-base": "^1.0.1",
-        "server-destroy": "1.0.1",
+        "des.js": "^1.0.0",
-        "socket.io": "2.1.1",
+        "inherits": "^2.0.1"
-        "ua-parser-js": "0.7.17",
+      }
-        "yargs": "6.4.0"
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
+    "browserslist": {
+      "version": "2.11.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
+      "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
+      "requires": {
+        "caniuse-lite": "^1.0.30000792",
+        "electron-to-chromium": "^1.3.30"
+      }
+    },
+    "bser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz",
+      "integrity": "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=",
+      "requires": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "dev": true,
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "buffer-indexof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
+      "dev": true
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+      "dev": true
+    },
+    "caller-callsite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+      "requires": {
+        "callsites": "^2.0.0"
       },
       "dependencies": {
         "anymatch": {
@@ -6441,7 +6539,7 @@
     },
     "events": {
       "version": "1.1.1",
-      "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
       "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
       "dev": true
     },
@@ -16274,9 +16372,9 @@
       }
     },
     "seafile-js": {
-      "version": "0.2.112",
+      "version": "0.2.113",
-      "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.112.tgz",
+      "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.113.tgz",
-      "integrity": "sha512-l91Vpsu7BAeGL1a0oOT6Tj0hPMYXPRoQy1sd70bGb/wc//W6JqqUMJ9sW7Gkb39sJF8BzqVIECTVNIDzOZ/7OQ==",
+      "integrity": "sha512-Y3zAe+r6XzMPY8yTzkc426+S46jAdOy7sEFYbC9QcCz1pN2UYBY9u0s188zg0Vwci6z+fFRX/WX0vy2U1k0yGA==",
       "requires": {
         "axios": "^0.18.0",
         "form-data": "^2.3.2",
@@ -17710,7 +17808,7 @@
         },
         "yargs": {
           "version": "3.10.0",
-          "resolved": "http://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
           "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
           "dev": true,
           "requires": {
@@ -18335,7 +18433,7 @@
         },
         "load-json-file": {
           "version": "2.0.0",
-          "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
           "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
           "dev": true,
           "requires": {
@@ -18625,7 +18723,7 @@
         },
         "yargs": {
           "version": "6.6.0",
-          "resolved": "http://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
           "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
           "dev": true,
           "requires": {

frontend/package.json

@@ -38,7 +38,7 @@
     "react-responsive": "^6.1.2",
     "react-select": "^2.4.1",
     "reactstrap": "^6.4.0",
-    "seafile-js": "^0.2.112",
+    "seafile-js": "^0.2.113",
     "socket.io-client": "^2.2.0",
     "sw-precache-webpack-plugin": "0.11.4",
     "unified": "^7.0.0",

seahub/role_permissions/settings.py

@@ -74,11 +74,6 @@ ENABLED_ROLE_PERMISSIONS = merge_roles(
     DEFAULT_ENABLED_ROLE_PERMISSIONS, custom_role_permissions
 )
 
-if settings.DEBUG and custom_role_permissions:
-    from pprint import pprint
-    print('=== ENABLED ROLE PERMISSIONS ===')
-    pprint(ENABLED_ROLE_PERMISSIONS)
-
 # role permission for administraror
 
 # 1, Admin without a role or with a role of `default_admin` can view ALL pages.