Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-01-12 11:53:23 +0300
committerMorris Jobke <hey@morrisjobke.de>2016-01-12 11:53:23 +0300
commit8b6b042ffde9490c24a1689919dbc6678381239c (patch)
tree1b5f30630887c44dcde93beaff08db3d199496ca /settings/js
parent3317dd0a8e2ca265172d53a16f9241f3351aa3b8 (diff)
Add config switch to disable the .well-known URL check
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/admin.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 48dfdc88246..6660bfe9b48 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -168,8 +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.checkWellKnownUrl('/.well-known/caldav/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === 'true'),
+ OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === 'true'),
OC.SetupChecks.checkSetup(),
OC.SetupChecks.checkGeneric()
).then(function(check1, check2, check3, check4, check5) {