From e6ab3c3fa077fa1feabb97c843151228f7f1c24c Mon Sep 17 00:00:00 2001 From: pengjiangxiu Date: Mon, 24 Jul 2017 14:04:36 +0800 Subject: [PATCH] * Change upgrade to V9.4 --- VERSION | 2 +- config/config.php | 2 +- doc/CHANGELOG | 15 +++++++++++++++ module/upgrade/lang/en.php | 1 + module/upgrade/lang/zh-cn.php | 1 + module/upgrade/lang/zh-tw.php | 1 + module/upgrade/model.php | 3 +++ 7 files changed, 23 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index ecb002acb7..0359f24328 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -9.3.beta +9.4 diff --git a/config/config.php b/config/config.php index 7f1cf14041..997c8eb030 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 = '9.3.beta'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '9.4'; // 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 ab4197f72f..0de231abec 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,18 @@ +2017-07-24 9.4 +3078 将跳回然之框架的功能默认设置为关闭 +3077 bug导出增加对 截止日期 字段的支持 +3076 把禅道数据库中所有的mailto字段都修改成 text 类型 +3075 增加bug提交和编辑表单编辑器的高度 +3074 数据库受损修复增加超级管理员验证 +3073 计划列表默认显示全部。 +3071 集成到然之之后右上角个人中心的菜单向左展开 +3070 批量操作的滚动条将选择和编辑按钮的边框去掉 +3069 测试-版本关联用例的时候过滤掉未评审的用例 +3068 发布关联需求的时候给默认的推荐列表 +3067 调整产品发布关联需求页面的排版 +3066 创建计划时提示之前的计划名称 +3065 附件库继承产品或者项目的访问权限 + 2017-06-21 9.3.beta 3038 修改loadModel改为单例模式,提升性能 3040 增加过滤文件白名单模式 diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index ca687bd6d2..4668c3ec59 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -122,3 +122,4 @@ $lang->upgrade->fromVersions['9_1_1'] = '9.1.1'; $lang->upgrade->fromVersions['9_1_2'] = '9.1.2'; $lang->upgrade->fromVersions['9_2'] = '9.2'; $lang->upgrade->fromVersions['9_2_1'] = '9.2.1'; +$lang->upgrade->fromVersions['9_3_beta'] = '9.3.beta'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 416468d776..97aef5f586 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -122,3 +122,4 @@ $lang->upgrade->fromVersions['9_1_1'] = '9.1.1'; $lang->upgrade->fromVersions['9_1_2'] = '9.1.2'; $lang->upgrade->fromVersions['9_2'] = '9.2'; $lang->upgrade->fromVersions['9_2_1'] = '9.2.1'; +$lang->upgrade->fromVersions['9_3_beta'] = '9.3.beta'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index 6ecf6441d7..dc42dd61f0 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -122,3 +122,4 @@ $lang->upgrade->fromVersions['9_1_1'] = '9.1.1'; $lang->upgrade->fromVersions['9_1_2'] = '9.1.2'; $lang->upgrade->fromVersions['9_2'] = '9.2'; $lang->upgrade->fromVersions['9_2_1'] = '9.2.1'; +$lang->upgrade->fromVersions['9_3_beta'] = '9.3.beta'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 98b4646fdd..9fd4c1bb75 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -180,6 +180,8 @@ class upgradeModel extends model $this->adjustPriv9_2(); case '9_2': case '9_2_1': + case '9_3_beta': + $this->execSQL($this->getUpgradeFile('9.3.beta')); } $this->deletePatch(); @@ -274,6 +276,7 @@ class upgradeModel extends model case '9_1_2': $confirmContent .= file_get_contents($this->getUpgradeFile('9.1.2')); case '9_2': case '9_2_1': + case '9_3_beta': $confirmContent .= file_get_contents($this->getUpgradeFile('9.3.beta')); } return str_replace('zt_', $this->config->db->prefix, $confirmContent); }