Merge branch '7.0'

frontend/package-lock.json

@@ -14901,17 +14901,6 @@
         "babel-runtime": "6.x",
         "prop-types": "^15.5.10",
         "react-lifecycles-compat": "^3.0.4",
-<<<<<<< HEAD
-        "shallowequal": "^0.2.2"
-      },
-      "dependencies": {
-        "shallowequal": {
-          "version": "0.2.2",
-          "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-0.2.2.tgz",
-          "integrity": "sha1-HjL9W8q2rWiKSBLLDMBO/HXHAU4=",
-          "requires": {
-            "lodash.keys": "^3.1.2"
-=======
         "shallowequal": "^0.2.2",
         "warning": "^4.0.3"
       },
@@ -14922,7 +14911,6 @@
           "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
           "requires": {
             "loose-envify": "^1.0.0"
->>>>>>> 7.0
           }
         }
       }
@@ -15145,20 +15133,9 @@
       }
     },
     "react-is": {
-<<<<<<< HEAD
-      "version": "16.8.6",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
-      "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA=="
-    },
-    "react-is-deprecated": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/react-is-deprecated/-/react-is-deprecated-0.1.2.tgz",
-      "integrity": "sha1-MBFI+G6kKP6OZz7KejchYLdXnb0="
-=======
       "version": "16.9.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz",
       "integrity": "sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw=="
->>>>>>> 7.0
     },
     "react-lifecycles-compat": {
       "version": "3.0.4",
@@ -15166,26 +15143,17 @@
       "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
     },
     "react-mentions": {
-<<<<<<< HEAD
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/react-mentions/-/react-mentions-3.0.2.tgz",
-      "integrity": "sha512-xwyNEBV45lC2inf1Eqf/EdkX5GiVUP25/7m7pfIpfm1mV8iGFOpWJUBX0mFH83PDsmMBjTQIqsZ5XHKzYfwQWg==",
-      "requires": {
-=======
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/react-mentions/-/react-mentions-3.1.1.tgz",
       "integrity": "sha512-bU/gc3JBHNYBwMHPY1qQxUjkfq2+pufeBldtEhBJz+dbmdxzY+PWiNZfs1o/jSZHWAJjPxXXeXX0oFovse90Rw==",
       "requires": {
         "@babel/runtime": "7.4.5",
->>>>>>> 7.0
         "invariant": "^2.2.4",
         "lodash": "^4.5.1",
         "prop-types": "^15.5.8",
         "substyle": "^6.3.1"
       },
       "dependencies": {
-<<<<<<< HEAD
-=======
         "@babel/runtime": {
           "version": "7.4.5",
           "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz",
@@ -15194,7 +15162,6 @@
             "regenerator-runtime": "^0.13.2"
           }
         },
->>>>>>> 7.0
         "invariant": {
           "version": "2.2.4",
           "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
@@ -15202,14 +15169,11 @@
           "requires": {
             "loose-envify": "^1.0.0"
           }
-<<<<<<< HEAD
-=======
         },
         "regenerator-runtime": {
           "version": "0.13.3",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
           "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
->>>>>>> 7.0
         }
       }
     },
@@ -16321,9 +16285,9 @@
       }
     },
     "seafile-js": {
-      "version": "0.2.113",
+      "version": "0.2.118",
-      "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.113.tgz",
+      "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.118.tgz",
-      "integrity": "sha512-Y3zAe+r6XzMPY8yTzkc426+S46jAdOy7sEFYbC9QcCz1pN2UYBY9u0s188zg0Vwci6z+fFRX/WX0vy2U1k0yGA==",
+      "integrity": "sha512-0PDLMsCPx5W80Gb1R+4eSCica4/trJdZ1ZHfdaeb1ponTwOk34froPbLI6zT+VimLDwT5FCLWqkehQhi4E0N8g==",
       "requires": {
         "axios": "^0.18.0",
         "form-data": "^2.3.2",

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.117",
+    "seafile-js": "^0.2.118",
     "socket.io-client": "^2.2.0",
     "sw-precache-webpack-plugin": "0.11.4",
     "unified": "^7.0.0",