diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-06-26 12:55:05 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-06-26 12:55:05 +0200 |
| commit | 7a9d60d87eb8e4414e5fe05830b088d426ff810d (patch) | |
| tree | 0fc97a7eacfd071475afd8bc6d4372babacb5740 /core/js | |
| parent | 5387b942c44e05b87ba2a0fd54168f5278a31344 (diff) | |
| parent | 52eab2a61a5d27b64fcd0440b91f854c052933a9 (diff) | |
| download | nextcloud-server-7a9d60d87eb8e4414e5fe05830b088d426ff810d.tar.gz nextcloud-server-7a9d60d87eb8e4414e5fe05830b088d426ff810d.zip | |
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/files/iedavclient.js | 1 | ||||
| -rw-r--r-- | core/js/setupchecks.js | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/js/files/iedavclient.js b/core/js/files/iedavclient.js index 9e83f5b9a22..a0185fb3bec 100644 --- a/core/js/files/iedavclient.js +++ b/core/js/files/iedavclient.js @@ -29,6 +29,7 @@ var self = this; var xhr = this.xhrProvider(); + headers = headers || {}; if (this.userName) { headers['Authorization'] = 'Basic ' + btoa(this.userName + ':' + this.password); diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index f987c9f04e6..280c8d08c99 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -76,7 +76,8 @@ $.ajax({ type: 'PROPFIND', url: url, - complete: afterCall + complete: afterCall, + allowAuthErrors: true }); return deferred.promise(); }, @@ -209,7 +210,8 @@ $.ajax({ type: 'GET', url: OC.linkTo('', oc_dataURL+'/htaccesstest.txt?t=' + (new Date()).getTime()), - complete: afterCall + complete: afterCall, + allowAuthErrors: true }); return deferred.promise(); }, |