Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167
This commit is contained in:
王怡栋
+1
-1
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
|
||||
if(!function_exists('getWebRoot')){function getWebRoot(){}}
|
||||
|
||||
/* 基本设置。Basic settings. */
|
||||
$config->version = '15.6'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
|
||||
$config->version = '15.7'; // 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.
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,3 +1,35 @@
|
||||
2021-10-18 15.7
|
||||
修复的BUG
|
||||
14487 无用php记录太多拉低禅道整体性能
|
||||
14271 max2.0.beta4升级max2.0，升级sql执行失败
|
||||
15371 关闭有进行中项目的项目集，项目集无法展开显示项目
|
||||
14970 禅道页面加载十几秒
|
||||
11768 在产品下批量创建需求时打开了项目的页面，然后进入产品需求页面保存后二级导航错误
|
||||
14281 向编辑器中复制网页内容的时候html标签不闭合容易界面出现错乱
|
||||
14488 用户反馈漏洞扫描文件
|
||||
14490 15.3 版本 传统模式下 产品项目列表页面 项目预计 消耗工时 进度不展示
|
||||
14751 后台配置的评审拖动后样式问题
|
||||
14784 内网中取消分组后还是显示成了子步骤
|
||||
14949 钉钉机器人群通知无法解析手机号
|
||||
14971 喧喧客户端打开禅道应用右上角按钮很小且不好识别
|
||||
15126 devops(航天信息)-gitlab server下拉无法搜索到需要添加的库(且只能显示100条)，库名显示不全
|
||||
15144 别人给当前用户发送禅道的Bug，显示没有产品
|
||||
15163 新手指导中添加用户提示和添加用户按钮距离过远且需要拖动滑条才能点到
|
||||
15285 全局添加项目，偶尔导航栏错误
|
||||
15383 项目主库无法正常切换
|
||||
15384 全局添加添加项目直接跳转到创建项目-Scrum页面
|
||||
15420 测试单的版本列表会显示已发布版本名称
|
||||
15451 项目选择项目集公开权限不生效
|
||||
14078 功能点没有统计上来
|
||||
14364 项目统计的数据实际上是执行的数据
|
||||
14679 等保三级扫描的pro10.1版本漏洞
|
||||
14977 评审的结果无法自动更新且手动更新不生效
|
||||
15249 新手教程【6.管理项目团队】和【7.添加迭代】无法正常使用
|
||||
15277 旧模式升级到15.5版本后视野维护中没有可访问项目栏
|
||||
15279 邮件中点击测试单跳转禅道页面空白
|
||||
15328 撤销评审后无法选择需求评审人员
|
||||
15461 执行下的需求分解任务时页面有代码报错
|
||||
|
||||
2021-10-12 15.6
|
||||
修复的BUG
|
||||
15263 项目文档库自定义权限问题
|
||||
|
||||
@@ -15,7 +15,7 @@ $lang->action->common = '系統日誌';
|
||||
$lang->action->id = '編號';
|
||||
$lang->action->product = $lang->productCommon;
|
||||
$lang->action->project = '項目';
|
||||
$lang->action->execution = $lang->executionCommon;
|
||||
$lang->action->execution = $lang->execution->common;
|
||||
$lang->action->objectType = '對象類型';
|
||||
$lang->action->objectID = '對象ID';
|
||||
$lang->action->objectName = '對象名稱';
|
||||
|
||||
@@ -333,6 +333,8 @@ $lang->error->equal = "『%s』必須為『%s』。";
|
||||
$lang->error->int = array("『%s』應當是數字。", "『%s』應當介於『%s-%s』之間。");
|
||||
$lang->error->float = "『%s』應當是數字，可以是小數。";
|
||||
$lang->error->email = "『%s』應當為合法的EMAIL。";
|
||||
$lang->error->phone = "『%s』應當為合法的電話號碼。";
|
||||
$lang->error->mobile = "『%s』應當為合法的手機號碼。";
|
||||
$lang->error->URL = "『%s』應當為合法的URL。";
|
||||
$lang->error->date = "『%s』應當為合法的日期。";
|
||||
$lang->error->datetime = "『%s』應當為合法的日期。";
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
* @link http://www.zentao.net
|
||||
*/
|
||||
/* 欄位列表。*/
|
||||
$lang->execution->allExecutions = '所有' . $lang->executionCommon;
|
||||
$lang->execution->allExecutions = '所有' . $lang->execution->common;
|
||||
$lang->execution->allExecutionAB = "{$lang->execution->common}列表";
|
||||
$lang->execution->id = $lang->executionCommon . '編號';
|
||||
$lang->execution->type = $lang->executionCommon . '類型';
|
||||
|
||||
@@ -30,10 +30,12 @@ $lang->group->manageProject = '可管理項目';
|
||||
$lang->group->programList = '可訪問項目集';
|
||||
$lang->group->productList = '可訪問' . $lang->productCommon;
|
||||
$lang->group->projectList = '可訪問項目';
|
||||
$lang->group->executionList = "可訪問{$lang->execution->common}";
|
||||
$lang->group->dynamic = '可查看動態';
|
||||
$lang->group->noticeVisit = '空代表沒有訪問限制';
|
||||
$lang->group->noneProgram = "暫時沒有項目集";
|
||||
$lang->group->noneProduct = "暫時沒有{$lang->productCommon}";
|
||||
$lang->group->noneExecution = "暫時沒有{$lang->execution->common}";
|
||||
$lang->group->project = '項目';
|
||||
$lang->group->group = '分組';
|
||||
|
||||
|
||||
@@ -92,6 +92,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['15.7'] = '2021-10-18';
|
||||
$lang->misc->releaseDate['15.6'] = '2021-10-12';
|
||||
$lang->misc->releaseDate['15.5'] = '2021-09-14';
|
||||
$lang->misc->releaseDate['15.4'] = '2021-08-23';
|
||||
@@ -158,6 +159,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['15.7'][] = array('title' => 'Fix bug.', 'desc' => '');
|
||||
$lang->misc->feature->all['15.6'][] = array('title' => 'Fix bug.', 'desc' => '');
|
||||
$lang->misc->feature->all['15.5'][] = array('title' => 'Add Program / Product / Project Kanban, global addition function and novice guidance. Fix bug.', 'desc' => '');
|
||||
$lang->misc->feature->all['15.4'][] = array('title' => 'Fix bug', 'desc' => '');
|
||||
|
||||
@@ -92,6 +92,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['15.7'] = '2021-10-18';
|
||||
$lang->misc->releaseDate['15.6'] = '2021-10-12';
|
||||
$lang->misc->releaseDate['15.5'] = '2021-09-14';
|
||||
$lang->misc->releaseDate['15.4'] = '2021-08-23';
|
||||
@@ -158,6 +159,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['15.7'][] = array('title' => '修复Bug。', 'desc' => '');
|
||||
$lang->misc->feature->all['15.6'][] = array('title' => '修复Bug。', 'desc' => '');
|
||||
$lang->misc->feature->all['15.5'][] = array('title' => '增加项目集/产品/项目看板视图、全局添加功能、新手引导。 修复Bug。', 'desc' => '');
|
||||
$lang->misc->feature->all['15.4'][] = array('title' => '修复Bug', 'desc' => '');
|
||||
|
||||
@@ -92,6 +92,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['15.7'] = '2021-10-18';
|
||||
$lang->misc->releaseDate['15.6'] = '2021-10-12';
|
||||
$lang->misc->releaseDate['15.5'] = '2021-09-14';
|
||||
$lang->misc->releaseDate['15.4'] = '2021-08-23';
|
||||
@@ -158,6 +159,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['15.7'][] = array('title' => '修復Bug。', 'desc' => '');
|
||||
$lang->misc->feature->all['15.6'][] = array('title' => '修復Bug。', 'desc' => '');
|
||||
$lang->misc->feature->all['15.5'][] = array('title' => '增加項目集/產品/項目看板視圖、全局添加功能、新手引導。 修復Bug。', 'desc' => '');
|
||||
$lang->misc->feature->all['15.4'][] = array('title' => '修復Bug', 'desc' => '');
|
||||
|
||||
@@ -144,3 +144,4 @@ $lang->upgrade->fromVersions['15_2'] = '15.2';
|
||||
$lang->upgrade->fromVersions['15_3'] = '15.3';
|
||||
$lang->upgrade->fromVersions['15_4'] = '15.4';
|
||||
$lang->upgrade->fromVersions['15_5'] = '15.5';
|
||||
$lang->upgrade->fromVersions['15_6'] = '15.6';
|
||||
|
||||
@@ -721,6 +721,9 @@ class upgradeModel extends model
|
||||
$this->saveLogs('Execute 15_5');
|
||||
$this->execSQL($this->getUpgradeFile('15.5'));
|
||||
$this->appendExec('15_5');
|
||||
case '15_6':
|
||||
$this->saveLogs('Execute 15_6');
|
||||
$this->appendExec('15_6');
|
||||
}
|
||||
|
||||
$this->deletePatch();
|
||||
@@ -924,6 +927,7 @@ class upgradeModel extends model
|
||||
$confirmContent .= file_get_contents($xuanxuanSql);
|
||||
}
|
||||
case '15_5': $confirmContent .= file_get_contents($this->getUpgradeFile('15.5'));
|
||||
case '15_6':
|
||||
}
|
||||
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user