diff --git a/VERSION b/VERSION index e20da793b8..0c7b82c8ce 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.5 +16.5.beta1 diff --git a/config/config.php b/config/config.php index 6271d1a45d..c3344b02bd 100644 --- a/config/config.php +++ b/config/config.php @@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}} if(!function_exists('getWebRoot')){function getWebRoot(){}} /* 基本设置。Basic settings. */ -$config->version = '16.5'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '16.5.beta1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. $config->liteVersion = '1.0'; // 迅捷版版本。 The version of Lite. $config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP. $config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time. diff --git a/db/standard/zentao16.5.sql b/db/standard/zentao16.5.beta1.sql similarity index 100% rename from db/standard/zentao16.5.sql rename to db/standard/zentao16.5.beta1.sql diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 9d3f90dd7a..4d9a52d117 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -94,7 +94,7 @@ $lang->misc->feature->downloadFile = 'Download introduction'; $lang->misc->feature->tutorialDesc = '

ZenTao 15.0 has new functions, and you know how to use it through the "Tutorial".

Click your [Avatar-Theme-Young Blue] to set it.

'; $lang->misc->feature->themeDesc = '

ZenTao 15.0+ a new "Youth Blue" theme, the pages are more beautiful and the experience is more friendly.

Click your [Avatar-Theme-Young Blue] to set it.

'; -$lang->misc->releaseDate['16.5'] = '2022-02-22'; +$lang->misc->releaseDate['16.5.beta1'] = '2022-03-16'; $lang->misc->releaseDate['16.4'] = '2022-02-15'; $lang->misc->releaseDate['16.3'] = '2022-01-26'; $lang->misc->releaseDate['16.2'] = '2022-01-17'; @@ -169,7 +169,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22'; $lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; $lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; -$lang->misc->feature->all['16.5'][] = array('title' => 'Fix bug, merge all code to one package', 'desc' => ''); +$lang->misc->feature->all['16.5.beta1'][] = array('title' => 'Fix bug, merge all code to one package', 'desc' => ''); $lang->misc->feature->all['16.4'][] = array('title' => 'Implement JIRA import function and improve plug-in extension mechanism.', 'desc' => ''); $lang->misc->feature->all['16.3'][] = array('title' => 'Kanban adds related plan/release/version/iteration functions, and the detail experience is optimized, fix bugs.', 'desc' => ''); $lang->misc->feature->all['16.2'][] = array('title' => 'Add kanban model project, fix bugs.', 'desc' => ''); diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 8180645d27..bc12420f9f 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -94,7 +94,7 @@ $lang->misc->feature->downloadFile = '下载新版本功能介绍文档'; $lang->misc->feature->tutorialDesc = "

禅道15系列新增了多项功能，您可以通过“新手引导教程”快速了解禅道的基本使用方法。

通过鼠标经过 [头像-新手引导]，点击新手引导，即可进入新手引导教程。

"; $lang->misc->feature->themeDesc = "

禅道15系列上线了全新的“青春蓝”主题，页面呈现更加美观，体验更加友好。

通过鼠标经过 [头像-主题-青春蓝]，点击青春蓝，即可设置成功。

"; -$lang->misc->releaseDate['16.5'] = '2022-02-22'; +$lang->misc->releaseDate['16.5.beta1'] = '2022-03-16'; $lang->misc->releaseDate['16.4'] = '2022-02-15'; $lang->misc->releaseDate['16.3'] = '2022-01-26'; $lang->misc->releaseDate['16.2'] = '2022-01-17'; @@ -169,7 +169,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22'; $lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; $lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; -$lang->misc->feature->all['16.5'][] = array('title' => '实现一码多面，多个禅道版本集成到一个包中。', 'desc' => ''); +$lang->misc->feature->all['16.5.beta1'][] = array('title' => '将禅道收费版和开源版集成到一个包中，优化升级步骤。', 'desc' => ''); $lang->misc->feature->all['16.4'][] = array('title' => '实现JIRA导入功能，完善插件扩展机制。', 'desc' => ''); $lang->misc->feature->all['16.3'][] = array('title' => '看板增加关联计划/发布/版本/迭代功能，细节体验优化。', 'desc' => ''); $lang->misc->feature->all['16.2'][] = array('title' => '新增专业研发看板，可以创建看板模型项目，修复Bug。', 'desc' => ''); diff --git a/module/upgrade/config.php b/module/upgrade/config.php index 1e9162f845..30b0ea3b09 100644 --- a/module/upgrade/config.php +++ b/module/upgrade/config.php @@ -13,7 +13,7 @@ $config->upgrade->maxVersion['max2_5'] = '16_1'; $config->upgrade->maxVersion['max2_6'] = '16_2'; $config->upgrade->maxVersion['max2_7'] = '16_3'; $config->upgrade->maxVersion['max2_8'] = '16_4'; -$config->upgrade->maxVersion['max2_9'] = '16_5'; +$config->upgrade->maxVersion['max3_0_beta1'] = '16_5_beta1'; $config->upgrade->bizVersion = array(); $config->upgrade->bizVersion['biz1_0'] = '9_5_1'; @@ -65,7 +65,7 @@ $config->upgrade->bizVersion['biz6_1'] = '16_1'; $config->upgrade->bizVersion['biz6_2'] = '16_2'; $config->upgrade->bizVersion['biz6_3'] = '16_3'; $config->upgrade->bizVersion['biz6_4'] = '16_4'; -$config->upgrade->bizVersion['biz6_5'] = '16_5'; +$config->upgrade->bizVersion['biz6_5_beta1'] = '16_5_beta1'; $config->upgrade->proVersion = array(); $config->upgrade->proVersion['pro1_0'] = '3_1'; diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php index b5eac52a6e..8ed577b112 100644 --- a/module/upgrade/lang/version.php +++ b/module/upgrade/lang/version.php @@ -154,7 +154,7 @@ $lang->upgrade->fromVersions['16_1'] = '16.1'; $lang->upgrade->fromVersions['16_2'] = '16.2'; $lang->upgrade->fromVersions['16_3'] = '16.3'; $lang->upgrade->fromVersions['16_4'] = '16.4'; -$lang->upgrade->fromVersions['16_5'] = '16.5'; +$lang->upgrade->fromVersions['16_5_beta1'] = '16.5.beta1'; /* Pro. */ $lang->upgrade->fromVersions['pro1_0'] = 'Pro1.0'; @@ -307,7 +307,7 @@ $lang->upgrade->fromVersions['biz6_1'] = 'Biz6.1'; $lang->upgrade->fromVersions['biz6_2'] = 'Biz6.2'; $lang->upgrade->fromVersions['biz6_3'] = 'Biz6.3'; $lang->upgrade->fromVersions['biz6_4'] = 'Biz6.4'; -$lang->upgrade->fromVersions['biz6_5'] = 'Biz6.5'; +$lang->upgrade->fromVersions['biz6_5_beta1'] = 'Biz6.5.beta1'; /* Max. */ $lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4';