diff --git a/core/js/dist/main.js b/core/js/dist/main.js index bdec8718573f4ece1e4d8775dce94c639518944a..1cf051e0eae6c301638167dec267386bb503f1da 100644 Binary files a/core/js/dist/main.js and b/core/js/dist/main.js differ diff --git a/core/js/dist/main.js.map b/core/js/dist/main.js.map index 09378951e94a7529854feb5ecd8ea8c221545f7a..03e291049087f21610d7c256a907012c61b960f4 100644 Binary files a/core/js/dist/main.js.map and b/core/js/dist/main.js.map differ diff --git a/core/js/tests/specs/files/clientSpec.js b/core/js/tests/specs/files/clientSpec.js index 113e5b546d054f1a4bd9f390ceb53d994f463aaa..6c15857c57d963334d52f1ea39bc710d6d5201cd 100644 --- a/core/js/tests/specs/files/clientSpec.js +++ b/core/js/tests/specs/files/clientSpec.js @@ -227,7 +227,7 @@ describe('OC.Files.Client tests', function() { expect(requestStub.calledOnce).toEqual(true); expect(requestStub.lastCall.args[0]).toEqual('PROPFIND'); expect(requestStub.lastCall.args[1]).toEqual(baseUrl + 'path/to%20space/%E6%96%87%E4%BB%B6%E5%A4%B9'); - expect(requestStub.lastCall.args[2].Depth).toEqual(1); + expect(requestStub.lastCall.args[2].Depth).toEqual('1'); var props = getRequestedProperties(requestStub.lastCall.args[3]); expect(props).toContain('{DAV:}getlastmodified'); @@ -519,7 +519,7 @@ describe('OC.Files.Client tests', function() { expect(requestStub.calledOnce).toEqual(true); expect(requestStub.lastCall.args[0]).toEqual('PROPFIND'); expect(requestStub.lastCall.args[1]).toEqual(baseUrl + 'path/to%20space/%E6%96%87%E4%BB%B6%E5%A4%B9'); - expect(requestStub.lastCall.args[2].Depth).toEqual(0); + expect(requestStub.lastCall.args[2].Depth).toEqual('0'); var props = getRequestedProperties(requestStub.lastCall.args[3]); expect(props).toContain('{DAV:}getlastmodified'); diff --git a/package-lock.json b/package-lock.json index 508d66fe9349c52e006b899c49c5577a4494b9a7..9da2341b5c02a2ec1d8c88c5c8e640010e395b4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1144,7 +1144,7 @@ }, "Select2": { "version": "git+https://github.com/select2/select2.git#b5f3b2839c48c53f9641d6bb1bccafc5260c7620", - "from": "git+https://github.com/select2/select2.git#b5f3b2839c48c53f9641d6bb1bccafc5260c7620" + "from": "git+https://github.com/select2/select2.git#3.4.8" }, "acorn": { "version": "6.0.5", @@ -1282,7 +1282,7 @@ }, "async": { "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz", "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" }, "async-each": { @@ -2083,8 +2083,8 @@ "dev": true }, "davclient.js": { - "version": "git+https://github.com/owncloud/davclient.js.git#f7fc96b66d4e34489b1ffc6395fd40c02863b0fd", - "from": "git+https://github.com/owncloud/davclient.js.git#f7fc96b66d4e34489b1ffc6395fd40c02863b0fd" + "version": "git+https://github.com/owncloud/davclient.js.git#0e5ef1af5d174d9ec10dbe889a415b8f481d5094", + "from": "git+https://github.com/owncloud/davclient.js.git#0.1.3" }, "debug": { "version": "2.6.9", @@ -3370,7 +3370,7 @@ "dependencies": { "async": { "version": "2.6.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", + "resolved": "http://registry.npmjs.org/async/-/async-2.6.1.tgz", "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "requires": { "lodash": "^4.17.10" @@ -3796,7 +3796,7 @@ }, "jcrop": { "version": "git+https://github.com/ChristophWurst/Jcrop.git#d4caad5fd7b2d032f05e91b4bc2a6f09dbf7d29e", - "from": "git+https://github.com/ChristophWurst/Jcrop.git#d4caad5fd7b2d032f05e91b4bc2a6f09dbf7d29e", + "from": "git+https://github.com/ChristophWurst/Jcrop.git#v0.9.12-npm", "requires": { "http-server": "^0.11.1", "resize-observer-polyfill": "^1.5.0" diff --git a/package.json b/package.json index d8b5fab981b771b9c24722e69b8478e26b11c732..a6eaf44f452070015378522b30c5811e3e998575 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "bootstrap": "^3.4.0", "clipboard": "^2.0.4", "css-vars-ponyfill": "^1.16.2", - "davclient.js": "git+https://github.com/owncloud/davclient.js.git#0.1.2", + "davclient.js": "git+https://github.com/owncloud/davclient.js.git#0.1.3", "dompurify": "^1.0.9", "handlebars": "^4.0.12", "jcrop": "git+https://github.com/ChristophWurst/Jcrop.git#v0.9.12-npm",