diff --git a/VERSION b/VERSION index c32b0ec5ab..f6eb05e3c6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.1 +16.2 diff --git a/config/config.php b/config/config.php index 73e4870133..53923cebbd 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.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '16.2'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. $config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP. $config->cookieLife = time() + 2592000; // Cookie的生存时间。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/doc/CHANGELOG b/doc/CHANGELOG index 209a5bdb1a..9db5160ab9 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,34 @@ +2022-01-17 16.2 +28397 选择项目管理方式弹窗中增加专业研发看板 +28398 实现专业研发看板项目的创建功能 +28403 实现研发看板的新建按钮组功能 +28405 实现专业研发看板在项目列表中的展示方式 +28406 实现专业研发看板的默认视图功能 +28420 打印研发看板的设置下拉菜单 +28421 实现看板新增区域功能 +29708 实现专业研发看板项目的看板视图 +29709 实现研发看板卡片的更多设置菜单 +29710 实现专业研发看板创建功能 +29714 实现专业研发看板设置功能 +29715 研发看板中实现区域的展开/收起功能 +29717 研发看板中打印区域更多设置下拉菜单 +29719 研发看板中实现区域的编辑功能 +29720 研发看板中实现删除区域功能 +29721 实现专业看板的全屏查看功能 +29723 研发看板中实现泳道拖动排序功能 +29724 研发看板中实现泳道组拖动排序功能 +29725 研发看板中需求不支持拆分子需求 +29726 研发看板中任务不支持拆分子任务 +29728 研发看板中实现新增泳道功能 +29729 研发看板中实现删除泳道功能 +29730 研发看板中实现看板的开始/延期/挂起/关闭/删除操作 +29732 鼠标悬浮到卡片头像上时显示人员姓名 +29767 执行列表中增加看板icon标识 +29890 看板的相关操作要记历史记录 +30042 实现通用看板设置泳道高度功能 +30043 实现执行看板设置泳道高度功能 +30053 实现研发看板设置泳道高度功能 +30068 通用看板中默认的模版横向不要有滚动条 2022-01-11 16.1 46672 实现计划卡片的更多设置功能 46671 计划看板中实现卡片的排序功能 diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 2e8451e94f..c6ceca2235 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -94,6 +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.2'] = '2022-01-17'; $lang->misc->releaseDate['16.1'] = '2022-01-11'; $lang->misc->releaseDate['16.0'] = '2021-12-24'; $lang->misc->releaseDate['16.0.beta1'] = '2021-12-06'; @@ -165,6 +166,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.2'][] = array('title' => 'Add kanban model project, fix bugs.', 'desc' => ''); $lang->misc->feature->all['16.1'][] = array('title' => 'Plan to add status management and Kanban view, upgrade process optimization, fix bugs.', 'desc' => ''); $lang->misc->feature->all['16.0'][] = array('title' => 'New general board, improve branch management, fix bugs.', 'desc' => ''); $lang->misc->feature->all['16.0.beta1'][] = array('title' => 'Add waterfall model project, add task kanban, improved branch management, and fixed bugs.', 'desc' => ''); diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 34db384127..ea787d429d 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -94,6 +94,7 @@ $lang->misc->feature->downloadFile = '下载新版本功能介绍文档'; $lang->misc->feature->tutorialDesc = "

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

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

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

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

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

"; +$lang->misc->releaseDate['16.2'] = '2022-01-17'; $lang->misc->releaseDate['16.1'] = '2022-01-11'; $lang->misc->releaseDate['16.0'] = '2021-12-24'; $lang->misc->releaseDate['16.0.beta1'] = '2021-12-06'; @@ -165,6 +166,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.2'][] = array('title' => '新增专业研发看板，可以创建看板模型项目，修复Bug。', 'desc' => ''); $lang->misc->feature->all['16.1'][] = array('title' => '计划增加状态管理和看板视图，升级流程优化，修复Bug。', 'desc' => ''); $lang->misc->feature->all['16.0'][] = array('title' => '新增通用看板，完善分支管理，修复Bug。', 'desc' => ''); $lang->misc->feature->all['16.0.beta1'][] = array('title' => '新增瀑布模型项目，新增任务看板，完善分支管理和细节，修复Bug。', 'desc' => ''); diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php index 524d749ae5..5d7d0b2f98 100644 --- a/module/upgrade/lang/version.php +++ b/module/upgrade/lang/version.php @@ -149,3 +149,4 @@ $lang->upgrade->fromVersions['15_7'] = '15.7'; $lang->upgrade->fromVersions['15_7_1'] = '15.7.1'; $lang->upgrade->fromVersions['16_0_beta1'] = '16.0.beta1'; $lang->upgrade->fromVersions['16_0'] = '16.0'; +$lang->upgrade->fromVersions['16_1'] = '16.1'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 7d71e03399..e438b2d71a 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -958,6 +958,7 @@ class upgradeModel extends model case '15_7_1': $confirmContent .= file_get_contents($this->getUpgradeFile('15.7.1')); case '16_0_beta1': $confirmContent .= file_get_contents($this->getUpgradeFile('16.0.beta1')); case '16_0': $confirmContent .= file_get_contents($this->getUpgradeFile('16.0')); + case '16_1': $confirmContent .= file_get_contents($this->getUpgradeFile('16.1')); } return str_replace('zt_', $this->config->db->prefix, $confirmContent); }