Bump version to 3.0.0 RC 1
This commit is contained in:
parent
63e969c0b6
commit
7fe7fa5450
@ -36,8 +36,8 @@
|
||||
if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
|
||||
|
||||
// We will be installing this HESK version:
|
||||
define('HESK_NEW_VERSION','2.7.0');
|
||||
define('MODS_FOR_HESK_NEW_VERSION','3.0.0');
|
||||
define('HESK_NEW_VERSION','2.7.1');
|
||||
define('MODS_FOR_HESK_NEW_VERSION','3.0.0 RC 1');
|
||||
define('REQUIRE_PHP_VERSION','5.3.0');
|
||||
define('REQUIRE_MYSQL_VERSION','5.0.7');
|
||||
|
||||
|
@ -71,7 +71,7 @@ if ($version == 2) {
|
||||
} elseif ($version == 32) {
|
||||
execute300Beta1Scripts();
|
||||
} elseif ($version == 33) {
|
||||
execute300Scripts();
|
||||
execute300RC1Scripts();
|
||||
} else {
|
||||
$response = 'The version "' . $version . '" was not recognized. Check the value submitted and try again.';
|
||||
print $response;
|
||||
|
@ -41,7 +41,7 @@ $buildToVersionMap = array(
|
||||
30 => '2.6.3',
|
||||
31 => '2.6.4',
|
||||
32 => '3.0.0 beta 1',
|
||||
33 => '3.0.0',
|
||||
33 => '3.0.0 RC 1',
|
||||
);
|
||||
|
||||
function echoInitialVersionRows($version, $build_to_version_map)
|
||||
|
@ -93,8 +93,8 @@ function processUpdates(startingVersion) {
|
||||
startVersionUpgrade('300b1');
|
||||
executeUpdate(32, '300b1', '3.0.0 beta 1');
|
||||
} else if (startingVersion < 33) {
|
||||
startVersionUpgrade('300');
|
||||
executeUpdate(33, '300', '3.0.0');
|
||||
startVersionUpgrade('300rc1');
|
||||
executeUpdate(33, '300rc1', '3.0.0 RC 1');
|
||||
} else {
|
||||
installationFinished();
|
||||
}
|
||||
|
@ -111,12 +111,13 @@ hesk_dbConnect();
|
||||
<hr>
|
||||
<div class="row">
|
||||
<form class="form-horizontal">
|
||||
<input type="hidden" name="current-version" value="<?php echo $version != NULL && $version != MODS_FOR_HESK_NEW_VERSION ? $version : 0; ?>">
|
||||
<input type="hidden" name="current-version-hidden" value="<?php echo $version != NULL && $version != MODS_FOR_HESK_NEW_VERSION ? $version : 0; ?>">
|
||||
<label for="current-version" class="col-sm-3 control-label">Current Version</label>
|
||||
<div class="col-md-9">
|
||||
<div class="col-md-8">
|
||||
<select name="current-version" class="form-control">
|
||||
<optgroup label="Mods for HESK 3">
|
||||
<optgroup label="Mods for HESK 3 (Pre-release Builds)">
|
||||
<option value="33">3.0.0 RC 1</option>
|
||||
<option value="32">3.0.0 beta 1</option>
|
||||
</optgroup>
|
||||
<optgroup label="Mods for HESK 2">
|
||||
@ -217,7 +218,7 @@ if ($disableAllExcept !== NULL) {
|
||||
var dropdown = $('select[name="current-version"]');
|
||||
dropdown.change(updateLink);
|
||||
|
||||
var currentVersion = $('input[name="current-version"]').val();
|
||||
var currentVersion = $('input[name="current-version-hidden"]').val();
|
||||
dropdown.find('option').each(function() {
|
||||
var $that = $(this);
|
||||
|
||||
|
@ -891,9 +891,11 @@ function execute300Beta1Scripts() {
|
||||
updateVersion('3.0.0 beta 1');
|
||||
}
|
||||
|
||||
function execute300Scripts() {
|
||||
function execute300RC1Scripts() {
|
||||
global $hesk_settings;
|
||||
hesk_dbConnect();
|
||||
|
||||
updateVersion('3.0.0');
|
||||
executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` DROP COLUMN `autorefresh`");
|
||||
|
||||
updateVersion('3.0.0 RC 1');
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user