diff --git a/VERSION b/VERSION index 8aea167e72..03621c112a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.2.5 +7.3.stable diff --git a/config/config.php b/config/config.php index 5e4101e190..f8a7993985 100644 --- a/config/config.php +++ b/config/config.php @@ -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 diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 7a81aa9e34..dc1635974f 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -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'; diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index 3cef17dc38..17693217ff 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -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'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index b100b724db..6df2966897 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -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';