Merge branch 'sgm_upgrade' into 'master'

* Change version.

See merge request easycorp/zentaopms!2283
This commit is contained in:
朱金勇
2022-03-16 00:40:49 +00:00
7 changed files with 10 additions and 10 deletions

View File

@@ -1 +1 @@
16.5
16.5.beta1

View File

@@ -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.

View File

@@ -94,7 +94,7 @@ $lang->misc->feature->downloadFile = 'Download introduction';
$lang->misc->feature->tutorialDesc = '<p>ZenTao 15.0 has new functions, and you know how to use it through the "<strong>Tutorial</strong>".</p><p>Click your [<span style="color: #0c60e1">Avatar-Theme-Young Blue</span>] to set it.</p>';
$lang->misc->feature->themeDesc = '<p>ZenTao 15.0+ a new "Youth Blue" theme, the pages are more beautiful and the experience is more friendly.</p><p>Click your [<span style="color: #0c60e1">Avatar-Theme-Young Blue</span>] to set it.</p>';
$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' => '');

View File

@@ -94,7 +94,7 @@ $lang->misc->feature->downloadFile = '下载新版本功能介绍文档';
$lang->misc->feature->tutorialDesc = "<p>禅道15系列新增了多项功能您可以通过“<strong>新手引导教程</strong>”快速了解禅道的基本使用方法。</p><p>通过鼠标经过 [<span style='color: #0c60e1'>头像-新手引导</span>],点击新手引导,即可进入新手引导教程。</p>";
$lang->misc->feature->themeDesc = "<p>禅道15系列上线了全新的“青春蓝”主题页面呈现更加美观体验更加友好。</p><p>通过鼠标经过 [<span style='color: #0c60e1'>头像-主题-青春蓝</span>],点击青春蓝,即可设置成功。</p>";
$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' => '');

View File

@@ -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';

View File

@@ -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';