* add 7.3 version and change for upgrade.

This commit is contained in:
wangyidong
2015-09-11 10:28:41 +08:00
parent a9184b79e3
commit feae0d7598
5 changed files with 7 additions and 2 deletions
+1 -1
View File
@@ -1 +1 @@
7.2.5
7.3.stable
+1 -1
View File
@@ -17,7 +17,7 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* Basic settings. */
$config = new config();
$config->version = '7.2.5'; // The version of zentaopms. Don't change it.
$config->version = '7.3'; // The version of zentaopms. Don't change it.
$config->charset = 'UTF-8'; // The charset of zentaopms.
$config->cookieLife = time() + 2592000; // The cookie life time.
$config->timezone = 'Asia/Shanghai'; // The time zone setting, for more see http://www.php.net/manual/en/timezones.php
+3
View File
@@ -548,6 +548,7 @@ $lang->resource->mail->reset = 'reset';
$lang->resource->mail->browse = 'browse';
$lang->resource->mail->delete = 'delete';
$lang->resource->mail->batchDelete = 'batchDelete';
$lang->resource->mail->sendCloud = 'sendCloud';
$lang->mail->methodOrder[5] = 'index';
$lang->mail->methodOrder[10] = 'detect';
@@ -558,6 +559,7 @@ $lang->mail->methodOrder[30] = 'reset';
$lang->mail->methodOrder[35] = 'browse';
$lang->mail->methodOrder[40] = 'delete';
$lang->mail->methodOrder[45] = 'batchDelete';
$lang->mail->methodOrder[50] = 'sendCloud';
/* custom. */
$lang->resource->custom = new stdclass();
@@ -1088,3 +1090,4 @@ $lang->changelog['7.3'][] = 'project-fixFirst';
$lang->changelog['7.3'][] = 'productplan-batchEdit';
$lang->changelog['7.3'][] = 'admin-sso';
$lang->changelog['7.3'][] = 'cron-openProcess';
$lang->changelog['7.3'][] = 'mail-sendCloud';
+1
View File
@@ -93,3 +93,4 @@ $lang->upgrade->fromVersions['7_0'] = '7.0';
$lang->upgrade->fromVersions['7_1'] = '7.1';
$lang->upgrade->fromVersions['7_2'] = '7.2';
$lang->upgrade->fromVersions['7_2_4'] = '7.2.4';
$lang->upgrade->fromVersions['7_2_5'] = '7.2.5';
+1
View File
@@ -93,3 +93,4 @@ $lang->upgrade->fromVersions['7_0'] = '7.0';
$lang->upgrade->fromVersions['7_1'] = '7.1';
$lang->upgrade->fromVersions['7_2'] = '7.2';
$lang->upgrade->fromVersions['7_2_4'] = '7.2.4';
$lang->upgrade->fromVersions['7_2_5'] = '7.2.5';