mirror of https://github.com/nextcloud/server
Add config and fix selenium
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
This commit is contained in:
parent
a6684da737
commit
2d98cd1daf
|
@ -2182,6 +2182,16 @@ $CONFIG = [
|
|||
|
||||
'login_form_autocomplete' => true,
|
||||
|
||||
/**
|
||||
* If your user is using an outdated browser, a warning will be shown
|
||||
* to offer some guidance to upgrade and ensure a proper Nextcloud experience.
|
||||
* They can still bypass it after they have read the warning.
|
||||
*
|
||||
* Simply set this property to "true", if you want to turn this feature off.
|
||||
*/
|
||||
|
||||
'no_unsupported_browser_warning' => false,
|
||||
|
||||
/**
|
||||
* Disable background scanning of files
|
||||
*
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -38,7 +38,7 @@ import { initCore } from './init.js'
|
|||
import { registerAppsSlideToggle } from './OC/apps.js'
|
||||
import { testSupportedBrowser } from './utils/RedirectUnsupportedBrowsers.js'
|
||||
|
||||
if (window.TESTING === undefined) {
|
||||
if (!window.TESTING && !OC?.config?.no_unsupported_browser_warning) {
|
||||
testSupportedBrowser()
|
||||
}
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*
|
||||
* @author John Molakvoæ <skjnldsv@protonmail.com>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
* @license AGPL-3.0-or-later
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
|
@ -22,7 +22,7 @@
|
|||
|
||||
import { getBuilder } from '@nextcloud/browser-storage'
|
||||
|
||||
export default getBuilder('nextcloud')
|
||||
export default getBuilder('core')
|
||||
.clearOnLogout()
|
||||
.persist()
|
||||
.build()
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*
|
||||
* @author John Molakvoæ <skjnldsv@protonmail.com>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
* @license AGPL-3.0-or-later
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
|
|
|
@ -1,28 +0,0 @@
|
|||
/**
|
||||
* @copyright 2021 John Molakvoæ <skjnldsv@protonmail.com>
|
||||
*
|
||||
* @author John Molakvoæ <skjnldsv@protonmail.com>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
import { getLoggerBuilder } from '@nextcloud/logger'
|
||||
|
||||
export default getLoggerBuilder()
|
||||
.setApp('core')
|
||||
.detectUser()
|
||||
.build()
|
|
@ -3,7 +3,7 @@
|
|||
*
|
||||
* @author John Molakvoæ <skjnldsv@protonmail.com>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
* @license AGPL-3.0-or-later
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*
|
||||
* @author John Molakvoæ <skjnldsv@protonmail.com>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
* @license AGPL-3.0-or-later
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
|
@ -23,10 +23,10 @@ import { generateUrl } from '@nextcloud/router'
|
|||
|
||||
import { supportedBrowsersRegExp } from '../services/BrowsersListService.js'
|
||||
import browserStorage from '../services/BrowserStorageService.js'
|
||||
import logger from '../services/LoggerService.js'
|
||||
import logger from '../logger.js'
|
||||
|
||||
const redirectPath = '/unsupported'
|
||||
export const browserStorageKey = 'unsupported-browser-ignore'
|
||||
const redirectPath = '/unsupported'
|
||||
|
||||
const isBrowserOverridden = browserStorage.getItem(browserStorageKey) === 'true'
|
||||
|
||||
|
|
|
@ -57,7 +57,7 @@ import Web from 'vue-material-design-icons/Web'
|
|||
import { browserStorageKey } from '../utils/RedirectUnsupportedBrowsers.js'
|
||||
import { supportedBrowsers } from '../services/BrowsersListService.js'
|
||||
import browserStorage from '../services/BrowserStorageService.js'
|
||||
import logger from '../services/LoggerService.js'
|
||||
import logger from '../logger.js'
|
||||
|
||||
logger.debug('Supported browsers', { supportedBrowsers })
|
||||
|
||||
|
@ -159,13 +159,15 @@ export default {
|
|||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
$spacing: 30px;
|
||||
|
||||
.content-unsupported-browser {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
width: 400px;
|
||||
max-width: 90vw;
|
||||
max-width: calc(90vw - 2 * $spacing);
|
||||
margin: auto;
|
||||
padding: 30px;
|
||||
padding: $spacing;
|
||||
|
||||
.empty-content {
|
||||
margin: 0;
|
||||
|
@ -176,12 +178,12 @@ export default {
|
|||
|
||||
&__continue {
|
||||
display: block;
|
||||
margin: 20px auto;
|
||||
margin: $spacing auto;
|
||||
}
|
||||
|
||||
&__list {
|
||||
margin-top: 60px;
|
||||
margin-bottom: 30px;
|
||||
margin-top: 2 * $spacing;
|
||||
margin-bottom: $spacing;
|
||||
li {
|
||||
text-align: left;
|
||||
}
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -166,20 +166,20 @@ class JSConfigHelper {
|
|||
$capabilities = $this->capabilitiesManager->getCapabilities(false, true);
|
||||
|
||||
$config = [
|
||||
'session_lifetime' => min($this->config->getSystemValue('session_lifetime', $this->iniWrapper->getNumeric('session.gc_maxlifetime')), $this->iniWrapper->getNumeric('session.gc_maxlifetime')),
|
||||
'session_keepalive' => $this->config->getSystemValue('session_keepalive', true),
|
||||
'auto_logout' => $this->config->getSystemValue('auto_logout', false),
|
||||
'version' => implode('.', Util::getVersion()),
|
||||
'versionstring' => \OC_Util::getVersionString(),
|
||||
'enable_avatars' => true, // here for legacy reasons - to not crash existing code that relies on this value
|
||||
'lost_password_link' => $this->config->getSystemValue('lost_password_link', null),
|
||||
'modRewriteWorking' => $this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true',
|
||||
'sharing.maxAutocompleteResults' => max(0, $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT)),
|
||||
'sharing.minSearchStringLength' => $this->config->getSystemValueInt('sharing.minSearchStringLength', 0),
|
||||
'blacklist_files_regex' => FileInfo::BLACKLIST_FILES_REGEX,
|
||||
'loglevel' => $this->config->getSystemValue('loglevel_frontend',
|
||||
$this->config->getSystemValue('loglevel', ILogger::WARN)
|
||||
),
|
||||
'lost_password_link' => $this->config->getSystemValue('lost_password_link', null),
|
||||
'modRewriteWorking' => $this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true',
|
||||
'no_unsupported_browser_warning' => $this->config->getSystemValue('no_unsupported_browser_warning', false),
|
||||
'session_keepalive' => $this->config->getSystemValue('session_keepalive', true),
|
||||
'session_lifetime' => min($this->config->getSystemValue('session_lifetime', $this->iniWrapper->getNumeric('session.gc_maxlifetime')), $this->iniWrapper->getNumeric('session.gc_maxlifetime')),
|
||||
'sharing.maxAutocompleteResults' => max(0, $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT)),
|
||||
'sharing.minSearchStringLength' => $this->config->getSystemValueInt('sharing.minSearchStringLength', 0),
|
||||
'version' => implode('.', Util::getVersion()),
|
||||
'versionstring' => \OC_Util::getVersionString()
|
||||
];
|
||||
|
||||
$array = [
|
||||
|
|
|
@ -39,8 +39,12 @@ OC_PASS=123456acb php occ user:add --password-from-env user1
|
|||
OC_PASS=123456acb php occ user:add --password-from-env disabledUser
|
||||
php occ user:disable disabledUser
|
||||
|
||||
# Redirect to files after login for acceptance tests
|
||||
php occ app:disable dashboard
|
||||
|
||||
# Disable browser warning as selenium is old
|
||||
php occ config:system:set no_unsupported_browser_warning --value=true --type=boolean
|
||||
|
||||
if [ "$NEXTCLOUD_SERVER_DOMAIN" != "" ]; then
|
||||
# Default first trusted domain is "localhost"; replace it with given domain.
|
||||
php occ config:system:set trusted_domains 0 --value="$NEXTCLOUD_SERVER_DOMAIN"
|
||||
|
|
|
@ -72,19 +72,19 @@ module.exports = {
|
|||
federatedfilesharing: {
|
||||
'vue-settings-admin': path.join(__dirname, 'apps/federatedfilesharing/src', 'main-admin.js'),
|
||||
'vue-settings-personal': path.join(__dirname, 'apps/federatedfilesharing/src', 'main-personal.js'),
|
||||
},
|
||||
},
|
||||
settings: {
|
||||
apps: path.join(__dirname, 'apps/settings/src', 'apps.js'),
|
||||
'legacy-admin': path.join(__dirname, 'apps/settings/src', 'admin.js'),
|
||||
'vue-settings-admin-basic-settings': path.join(__dirname, 'apps/settings/src', 'main-admin-basic-settings.js'),
|
||||
'vue-settings-admin-delegation': path.join(__dirname, 'apps/settings/src', 'main-admin-delegation.js'),
|
||||
'vue-settings-admin-security': path.join(__dirname, 'apps/settings/src', 'main-admin-security.js'),
|
||||
'vue-settings-apps-users-management': path.join(__dirname, 'apps/settings/src', 'main-apps-users-management.js'),
|
||||
'vue-settings-nextcloud-pdf': path.join(__dirname, 'apps/settings/src', 'main-nextcloud-pdf.js'),
|
||||
'vue-settings-personal-info': path.join(__dirname, 'apps/settings/src', 'main-personal-info.js'),
|
||||
'vue-settings-personal-password': path.join(__dirname, 'apps/settings/src', 'main-personal-password.js'),
|
||||
'vue-settings-personal-security': path.join(__dirname, 'apps/settings/src', 'main-personal-security.js'),
|
||||
'vue-settings-personal-webauthn': path.join(__dirname, 'apps/settings/src', 'main-personal-webauth.js'),
|
||||
'vue-settings-personal-password': path.join(__dirname, 'apps/settings/src', 'main-personal-password.js'),
|
||||
'legacy-admin': path.join(__dirname, 'apps/settings/src', 'admin.js'),
|
||||
'apps': path.join(__dirname, 'apps/settings/src', 'apps.js'),
|
||||
},
|
||||
sharebymail: {
|
||||
'vue-settings-admin-sharebymail': path.join(__dirname, 'apps/sharebymail/src', 'main-admin.js'),
|
||||
|
|
Loading…
Reference in New Issue