diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2019-05-14 11:14:29 +0200 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2019-05-14 11:14:29 +0200 |
| commit | 0f3e438f7cab87514be3896bb8acdc05defdef14 (patch) | |
| tree | 75e44065584f0d169e63d61711e6816412f17133 /settings | |
| parent | c41aa7a20929118ce1092c603f709d06aef1da57 (diff) | |
| download | nextcloud-server-0f3e438f7cab87514be3896bb8acdc05defdef14.tar.gz nextcloud-server-0f3e438f7cab87514be3896bb8acdc05defdef14.zip | |
Move OC.theme to the bundle and deprecate oc_defaults
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/js/admin.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/settings/js/admin.js b/settings/js/admin.js index ac95e401346..6074a3ae2c9 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -248,14 +248,14 @@ $(document).ready(function(){ // run setup checks then gather error messages $.when( OC.SetupChecks.checkWebDAV(), - 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(OC.getRootPath() + '/ocm-provider/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), - OC.SetupChecks.checkProviderUrl(OC.getRootPath() + '/ocs-provider/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), + OC.SetupChecks.checkWellKnownUrl('/.well-known/webfinger', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true && !!OC.appConfig.core.public_webfinger, [200, 501]), + OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), + OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), + OC.SetupChecks.checkProviderUrl(OC.getRootPath() + '/ocm-provider/', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), + OC.SetupChecks.checkProviderUrl(OC.getRootPath() + '/ocs-provider/', OC.theme.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.checkWOFF2Loading(OC.filePath('core', '', 'fonts/Nunito-Regular.woff2'), OC.theme.docPlaceholderUrl), OC.SetupChecks.checkDataProtected() ).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); |