aboutsummaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-01-09 17:42:11 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-01-09 17:42:11 +0100
commitc5b2b3a1244400d57b80ecbcfe4a14867bffc184 (patch)
tree77a5d495cef8d44c0720e850114b09fb90911072 /settings
parent72b34575df0dbfe225cc6cd50b8aa7bb1439d5a1 (diff)
parent0161928fc3a472c35fb571c732408f088292052d (diff)
downloadnextcloud-server-c5b2b3a1244400d57b80ecbcfe4a14867bffc184.tar.gz
nextcloud-server-c5b2b3a1244400d57b80ecbcfe4a14867bffc184.zip
Merge pull request #21562 from owncloud/properly-check-for-well-known-redirect
Add check for .well-known URL in the root of the webservers URL
Diffstat (limited to 'settings')
-rw-r--r--settings/js/admin.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/settings/js/admin.js b/settings/js/admin.js
index eb3b756bf0f..644b773d7b1 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -168,6 +168,8 @@ $(document).ready(function(){
// run setup checks then gather error messages
$.when(
OC.SetupChecks.checkWebDAV(),
+ OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav/', oc_defaults.docPlaceholderUrl),
+ OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav/', oc_defaults.docPlaceholderUrl),
OC.SetupChecks.checkSetup(),
OC.SetupChecks.checkGeneric()
).then(function(check1, check2, check3) {