diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-12 12:40:09 +0100 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-12 12:40:09 +0100 |
commit | 0c0829fbc73ce10ea1a951989c20973b6b5faa16 (patch) | |
tree | 768243c98f76fa7d687ac4d56ad9fe0a074e7b2d | |
parent | 3317dd0a8e2ca265172d53a16f9241f3351aa3b8 (diff) | |
parent | a6c7cdd75e900cf4f241eaacdb85b260995833c7 (diff) | |
download | nextcloud-server-0c0829fbc73ce10ea1a951989c20973b6b5faa16.tar.gz nextcloud-server-0c0829fbc73ce10ea1a951989c20973b6b5faa16.zip |
Merge pull request #21638 from owncloud/degrade-well-known-url-check
Show the well-known URL check as info instead of error
-rw-r--r-- | core/js/setupchecks.js | 2 | ||||
-rw-r--r-- | core/js/tests/specs/setupchecksSpec.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index b1b8dd358d2..7940e7e30a6 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -61,7 +61,7 @@ var docUrl = placeholderUrl.replace('PLACEHOLDER', 'admin-setup-well-known-URL'); messages.push({ msg: t('core', 'Your web server is not set up properly to resolve "{url}". Further information can be found in our <a target="_blank" href="{docLink}">documentation</a>.', { docLink: docUrl, url: url }), - type: OC.SetupChecks.MESSAGE_TYPE_ERROR + type: OC.SetupChecks.MESSAGE_TYPE_INFO }); } deferred.resolve(messages); diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js index 18ba44ac61b..434b30a41b7 100644 --- a/core/js/tests/specs/setupchecksSpec.js +++ b/core/js/tests/specs/setupchecksSpec.js @@ -69,7 +69,7 @@ describe('OC.SetupChecks tests', function() { async.done(function( data, s, x ){ expect(data).toEqual([{ msg: 'Your web server is not set up properly to resolve "/.well-known/caldav/". Further information can be found in our <a target="_blank" href="http://example.org/admin-setup-well-known-URL">documentation</a>.', - type: OC.SetupChecks.MESSAGE_TYPE_ERROR + type: OC.SetupChecks.MESSAGE_TYPE_INFO }]); done(); }); |