maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

set new beta version for the new major release this year

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-08-25 21:49:26 +02:00
parent e5620b22e0
commit 8f64460647
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
install/froxlor.sql.php
View File

@@ -701,7 +701,7 @@ opcache.validate_timestamps'),
('system', 'distribution', ''), ('system', 'distribution', ''),
('system', 'update_channel', 'stable'), ('system', 'update_channel', 'stable'),
('system', 'updatecheck_data', ''), ('system', 'updatecheck_data', ''),
('system', 'update_notify_last', '0.11.0-dev1'), ('system', 'update_notify_last', '2.0.0-beta1'),
('api', 'enabled', '0'), ('api', 'enabled', '0'),
('2fa', 'enabled', '1'), ('2fa', 'enabled', '1'),
('panel', 'decimal_places', '4'), ('panel', 'decimal_places', '4'),
@@ -743,7 +743,7 @@ opcache.validate_timestamps'),
('panel', 'logo_overridetheme', '0'), ('panel', 'logo_overridetheme', '0'),
('panel', 'logo_overridecustom', '0'), ('panel', 'logo_overridecustom', '0'),
('panel', 'settings_mode', '0'), ('panel', 'settings_mode', '0'),
('panel', 'version', '0.11.0-dev1'), ('panel', 'version', '2.0.0-beta1'),
('panel', 'db_version', '202112310'); ('panel', 'db_version', '202112310');

2
install/updates/froxlor/update_0.11.inc.php → install/updates/froxlor/update_2.x.inc.php
View File

@@ -39,7 +39,7 @@ if (!defined('_CRON_UPDATE')) {
// last 0.10.x release // last 0.10.x release
if (Froxlor::isFroxlorVersion('0.10.99')) { if (Froxlor::isFroxlorVersion('0.10.99')) {
$update_to = '0.11.0-dev1'; $update_to = '2.0.0-beta1';
Update::showUpdateStep("Updating from 0.10.99 to ".$update_to, false); Update::showUpdateStep("Updating from 0.10.99 to ".$update_to, false);

4
install/updates/preconfig/preconfig_0.11.inc.php → install/updates/preconfig/preconfig_2.x.inc.php
View File

@@ -29,12 +29,12 @@ use Froxlor\Config\ConfigParser;
use Froxlor\Install\Update; use Froxlor\Install\Update;
$preconfig = [ $preconfig = [
'title' => '0.11.x updates', 'title' => '2.x updates',
'fields' => [] 'fields' => []
]; ];
$return = []; $return = [];
if (Update::versionInUpdate($current_version, '0.11.0-dev1')) { if (Update::versionInUpdate($current_version, '2.0.0-beta1')) {
$description = 'We have rearranged the settings and split them into basic and advanced categories. This makes it easier for users who do not need all the detailed or very specific settings and options and gives a better overview of the basic/mostly used settings.'; $description = 'We have rearranged the settings and split them into basic and advanced categories. This makes it easier for users who do not need all the detailed or very specific settings and options and gives a better overview of the basic/mostly used settings.';
$return['panel_settings_mode_note'] = ['type' => 'infotext', 'value' => $description]; $return['panel_settings_mode_note'] = ['type' => 'infotext', 'value' => $description];
$question = '<strong>Chose settings mode (you can change that at any time)</strong>'; $question = '<strong>Chose settings mode (you can change that at any time)</strong>';

2
install/updatesql.php
View File

@@ -52,7 +52,7 @@ try {
if (Froxlor::isFroxlor()) { if (Froxlor::isFroxlor()) {
include_once(FileDir::makeCorrectFile(dirname(__FILE__) . '/updates/froxlor/update_0.10.inc.php')); include_once(FileDir::makeCorrectFile(dirname(__FILE__) . '/updates/froxlor/update_0.10.inc.php'));
include_once(FileDir::makeCorrectFile(dirname(__FILE__) . '/updates/froxlor/update_0.11.inc.php')); include_once(FileDir::makeCorrectFile(dirname(__FILE__) . '/updates/froxlor/update_2.x.inc.php'));
// Check Froxlor - database integrity (only happens after all updates are done, so we know the db-layout is okay) // Check Froxlor - database integrity (only happens after all updates are done, so we know the db-layout is okay)
Update::showUpdateStep("Checking database integrity"); Update::showUpdateStep("Checking database integrity");

2
lib/Froxlor/Froxlor.php
View File

@@ -31,7 +31,7 @@ final class Froxlor
{ {
// Main version variable // Main version variable
const VERSION = '0.11.0-dev1'; const VERSION = '2.0.0-beta1';
// Database version (YYYYMMDDC where C is a daily counter) // Database version (YYYYMMDDC where C is a daily counter)
const DBVERSION = '202112310'; const DBVERSION = '202112310';

2
lib/init.php
View File

@@ -154,7 +154,7 @@ UI::setLinker($linker);
/** /**
* Global Theme-variable * Global Theme-variable
*/ */
if (Update::versionInUpdate(Settings::Get('panel.version'), '0.11.0-dev1')) { if (Update::versionInUpdate(Settings::Get('panel.version'), '2.0.0-beta1')) {
$theme = $_deftheme; $theme = $_deftheme;
} else { } else {
$theme = (Settings::Get('panel.default_theme') !== null) ? Settings::Get('panel.default_theme') : $_deftheme; $theme = (Settings::Get('panel.default_theme') !== null) ? Settings::Get('panel.default_theme') : $_deftheme;