From a19ad0358419fd28e4842339c745f55f625ace95 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 21 Jun 2019 14:37:19 +0800 Subject: [PATCH] * Add package info. --- VERSION | 2 +- config/config.php | 2 +- doc/CHANGELOG | 22 ++++++++++++++++++++++ module/entry/lang/en.php | 4 ++++ module/entry/lang/zh-tw.php | 5 +++++ module/misc/lang/en.php | 3 +++ module/misc/lang/zh-cn.php | 3 +++ module/misc/lang/zh-tw.php | 3 +++ module/upgrade/lang/version.php | 1 + module/upgrade/model.php | 3 +++ 10 files changed, 46 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 3833f0f6a2..326ba189b4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.5.stable +11.5.1 diff --git a/config/config.php b/config/config.php index f0beabeba7..6a1c4c5b54 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 = '11.5'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '11.5.1'; // 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 19c85fcc6c..f2be3c4db4 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,25 @@ +2019-05-08 11.5.1 +完成的需求： +3708 一键安装包存在漏洞 +3901 增加免密登录的功能 +修复的bug: +2514 用例覆盖率计算错误 +2518 webhook中提示触发动作的用户错误 +2522 创建连接类型的文档功能异常 +2524 燃尽图导出后的图片不够清晰 +2530 php无用日志记录太多 +2541 取消父任务下子任务，父任务无法维护工时 +2554 安装新版本插件后到期日期没有更新 +2555 后台备份显示的备份文件大小错误 +2557 定时页面汉字乱码 +2569 zbox配置https报错 +2575 我的地盘--所有待办，未完待办统计数量不对。 +2576 导出搜索后的任务列表，子任务无法导出 +2580 用例覆盖率统计错误 +2584 按条件搜索任务后，父子任务统计不准确 +2588 编辑器会自动出现2个超链接网址 +2597 使用网络图片时，保存后不显示图片 + 2019-05-08 11.5.stable 完成的需求： 3505 产品和项目增加填写备注功能 diff --git a/module/entry/lang/en.php b/module/entry/lang/en.php index 3e28b185c3..64ecf7d288 100644 --- a/module/entry/lang/en.php +++ b/module/entry/lang/en.php @@ -16,6 +16,7 @@ $lang->entry->id = 'ID'; $lang->entry->name = 'Name'; $lang->entry->account = 'Account'; $lang->entry->code = 'Code'; +$lang->entry->freePasswd = 'Free Password Login'; $lang->entry->key = 'Key'; $lang->entry->ip = 'IP'; $lang->entry->desc = 'Description'; @@ -37,6 +38,9 @@ $lang->entry->note->ip = "Use comma to seperate IPs. IP segment is supporte $lang->entry->note->allIP = 'All IPs'; $lang->entry->note->account = 'Entry Account'; +$lang->entry->freePasswdList[0] = 'Off'; +$lang->entry->freePasswdList[1] = 'On'; + $lang->entry->errmsg['PARAM_CODE_MISSING'] = 'Parameter code is missing.'; $lang->entry->errmsg['PARAM_TOKEN_MISSING'] = 'Parameter token is missing.'; $lang->entry->errmsg['SESSION_CODE_MISSING'] = 'Session code is missing.'; diff --git a/module/entry/lang/zh-tw.php b/module/entry/lang/zh-tw.php index 4a213ef557..04334a691b 100644 --- a/module/entry/lang/zh-tw.php +++ b/module/entry/lang/zh-tw.php @@ -16,6 +16,7 @@ $lang->entry->id = 'ID'; $lang->entry->name = '名稱'; $lang->entry->account = '賬號'; $lang->entry->code = '代號'; +$lang->entry->freePasswd = '免密登錄'; $lang->entry->key = '密鑰'; $lang->entry->ip = 'IP'; $lang->entry->desc = '描述'; @@ -37,6 +38,9 @@ $lang->entry->note->ip = "允許訪問API的應用ip，多個ip用逗號隔 $lang->entry->note->allIP = '無限制'; $lang->entry->note->account = '授權應用賬號'; +$lang->entry->freePasswdList[0] = '關閉'; +$lang->entry->freePasswdList[1] = '開啟'; + $lang->entry->errmsg['PARAM_CODE_MISSING'] = '缺少code參數'; $lang->entry->errmsg['PARAM_TOKEN_MISSING'] = '缺少token參數'; $lang->entry->errmsg['SESSION_CODE_MISSING'] = '缺少session code'; @@ -45,5 +49,6 @@ $lang->entry->errmsg['INVALID_TOKEN'] = '無效的token參數'; $lang->entry->errmsg['SESSION_VERIFY_FAILED'] = 'session驗證失敗'; $lang->entry->errmsg['IP_DENIED'] = '該IP被限制訪問'; $lang->entry->errmsg['ACCOUNT_UNBOUND'] = '未綁定用戶'; +$lang->entry->errmsg['INVALID_ACCOUNT'] = '用戶不存在'; $lang->entry->errmsg['EMPTY_ENTRY'] = '應用不存在'; $lang->entry->errmsg['CALLED_TIME'] = 'Token已失效'; diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 4a6f1d11d2..6f610977c9 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -75,6 +75,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = 'Latest Version'; $lang->misc->feature->detailed = 'Details'; +$lang->misc->releaseDate['11.5.1'] = '2019-06-21'; $lang->misc->releaseDate['11.5.stable'] = '2019-05-08'; $lang->misc->releaseDate['11.4.1'] = '2019-04-08'; $lang->misc->releaseDate['11.4.stable'] = '2019-03-25'; @@ -102,6 +103,8 @@ $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['11.5.1'][] = array('title'=>'Add free password login and fix bug.', 'desc' => ''); + $lang->misc->feature->all['11.5.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => ''); $lang->misc->feature->all['11.5.stable'][] = array('title'=>'Added filters to Dynamics', 'desc' => ''); $lang->misc->feature->all['11.5.stable'][] = array('title'=>'Integrated the latest ZenTao client', 'desc' => ''); diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 2a59180a14..6c08c58a2a 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -75,6 +75,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = '最新版本'; $lang->misc->feature->detailed = '详情'; +$lang->misc->releaseDate['11.5.1'] = '2019-06-21'; $lang->misc->releaseDate['11.5.stable'] = '2019-05-08'; $lang->misc->releaseDate['11.4.1'] = '2019-04-08'; $lang->misc->releaseDate['11.4.stable'] = '2019-03-25'; @@ -102,6 +103,8 @@ $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['11.5.1'][] = array('title'=>'新增第三方应用免密登录，修复Bug', 'desc' => ''); + $lang->misc->feature->all['11.5.stable'][] = array('title'=>'完善细节，修复Bug', 'desc' => ''); $lang->misc->feature->all['11.5.stable'][] = array('title'=>'新增动态过滤机制', 'desc' => ''); $lang->misc->feature->all['11.5.stable'][] = array('title'=>'集成新版本客户端', 'desc' => ''); diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php index f009e51d57..a764fac631 100644 --- a/module/misc/lang/zh-tw.php +++ b/module/misc/lang/zh-tw.php @@ -75,6 +75,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = '最新版本'; $lang->misc->feature->detailed = '詳情'; +$lang->misc->releaseDate['11.5.1'] = '2019-06-21'; $lang->misc->releaseDate['11.5.stable'] = '2019-05-08'; $lang->misc->releaseDate['11.4.1'] = '2019-04-08'; $lang->misc->releaseDate['11.4.stable'] = '2019-03-25'; @@ -102,6 +103,8 @@ $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['11.5.1'][] = array('title'=>'新增第三方應用免密登錄，修復Bug', 'desc' => ''); + $lang->misc->feature->all['11.5.stable'][] = array('title'=>'完善細節，修復Bug', 'desc' => ''); $lang->misc->feature->all['11.5.stable'][] = array('title'=>'新增動態過濾機制', 'desc' => ''); $lang->misc->feature->all['11.5.stable'][] = array('title'=>'整合新版本客戶端', 'desc' => ''); diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php index 492f645ab0..d6edcadd35 100644 --- a/module/upgrade/lang/version.php +++ b/module/upgrade/lang/version.php @@ -106,3 +106,4 @@ $lang->upgrade->fromVersions['11_2'] = '11.2'; $lang->upgrade->fromVersions['11_3'] = '11.3'; $lang->upgrade->fromVersions['11_4'] = '11.4'; $lang->upgrade->fromVersions['11_4_1'] = '11.4.1'; +$lang->upgrade->fromVersions['11_5'] = '11.5'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index ff14f04057..684c85ad2b 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -389,6 +389,9 @@ class upgradeModel extends model } $this->updateXX_11_5(); } + case '11_4': + $this->saveLogs('Execute 11_4'); + $this->execSQL($this->getUpgradeFile('11.5')); } $this->deletePatch();