summaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2019-02-20 15:32:38 +0100
committerGitHub <noreply@github.com>2019-02-20 15:32:38 +0100
commitbeba18224898777b559f3a657d890c0e9bdd7864 (patch)
tree6172de82eb66d11bfa10cd5da1204391b11d2dff /settings/js
parent0becd88feb63de6ac02b495ad1440d8bd7cdcbd2 (diff)
parentfaef05730a2fca6ca019f645685ad6a08839d71c (diff)
downloadnextcloud-server-beba18224898777b559f3a657d890c0e9bdd7864.tar.gz
nextcloud-server-beba18224898777b559f3a657d890c0e9bdd7864.zip
Merge pull request #14255 from nextcloud/fix-ocm-discovery
Fix ocm end-point discovery discovery
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/admin.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 1c9b5460eab..0ca9b6162e2 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -251,12 +251,14 @@ $(document).ready(function(){
OC.SetupChecks.checkWellKnownUrl('/.well-known/webfinger', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true && !!oc_appconfig.core.public_webfinger, [200, 501]),
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.checkProviderUrl('/ocm-provider/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true),
+ OC.SetupChecks.checkProviderUrl('/ocs-provider/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true),
OC.SetupChecks.checkSetup(),
OC.SetupChecks.checkGeneric(),
OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/Nunito-Regular.woff2'), oc_defaults.docPlaceholderUrl),
OC.SetupChecks.checkDataProtected()
- ).then(function (check1, check2, check3, check4, check5, check6, check7, check8) {
- var messages = [].concat(check1, check2, check3, check4, check5, check6, check7, check8);
+ ).then(function (check1, check2, check3, check4, check5, check6, check7, check8, check9, check10) {
+ var messages = [].concat(check1, check2, check3, check4, check5, check6, check7, check8, check9, check10);
var $el = $('#postsetupchecks');
$('#security-warning-state-loading').addClass('hidden');