From eac9e1d8d647809fec19d8d4752db376b3955d28 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Tue, 29 Oct 2024 13:58:40 +0800 Subject: [PATCH] * [release] update version. --- VERSION | 2 +- config/config.php | 2 +- db/standard/{zentao20.9.sql => zentao21.0.sql} | 0 doc/CHANGELOG | 2 +- module/misc/lang/de.php | 2 +- module/misc/lang/en.php | 2 +- module/misc/lang/fr.php | 2 +- module/misc/lang/zh-cn.php | 4 ++-- module/upgrade/config.php | 6 +++--- module/upgrade/lang/version.php | 6 +++--- 10 files changed, 14 insertions(+), 14 deletions(-) rename db/standard/{zentao20.9.sql => zentao21.0.sql} (100%) diff --git a/VERSION b/VERSION index 914d1a73f6..74623ac8d7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -20.9 \ No newline at end of file +21.0 \ No newline at end of file diff --git a/config/config.php b/config/config.php index 09e8a4b8c0..4492008fab 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 = '20.9'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '21.0'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. $config->liteVersion = '1.2'; // 迅捷版版本。 The version of Lite. $config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP. $config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time. diff --git a/db/standard/zentao20.9.sql b/db/standard/zentao21.0.sql similarity index 100% rename from db/standard/zentao20.9.sql rename to db/standard/zentao21.0.sql diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 23957ca784..38fcda0fec 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,4 +1,4 @@ -2024-11-01 20.9 +2024-11-01 21.0 完成的需求 修复的Bug diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php index 97acc2d267..79949bf946 100644 --- a/module/misc/lang/de.php +++ b/module/misc/lang/de.php @@ -114,7 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ -$lang->misc->releaseDate['20.9'] = '2024-11-01'; +$lang->misc->releaseDate['21.0'] = '2024-11-01'; $lang->misc->releaseDate['20.8'] = '2024-10-21'; $lang->misc->releaseDate['20.7.1'] = '2024-09-30'; $lang->misc->releaseDate['20.7'] = '2024-09-14'; diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 3406ec6ce8..decac72ecd 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -114,7 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ -$lang->misc->releaseDate['20.9'] = '2024-11-01'; +$lang->misc->releaseDate['21.0'] = '2024-11-01'; $lang->misc->releaseDate['20.8'] = '2024-10-21'; $lang->misc->releaseDate['20.7.1'] = '2024-09-30'; $lang->misc->releaseDate['20.7'] = '2024-09-14'; diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php index 0e38ebc3e1..90ab079c7b 100644 --- a/module/misc/lang/fr.php +++ b/module/misc/lang/fr.php @@ -114,7 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ -$lang->misc->releaseDate['20.9'] = '2024-11-01'; +$lang->misc->releaseDate['21.0'] = '2024-11-01'; $lang->misc->releaseDate['20.8'] = '2024-10-21'; $lang->misc->releaseDate['20.7.1'] = '2024-09-30'; $lang->misc->releaseDate['20.7'] = '2024-09-14'; diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 904f723536..8d222fb3db 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -114,7 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec $lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html'; /* Release Date. */ -$lang->misc->releaseDate['20.9'] = '2024-11-01'; +$lang->misc->releaseDate['21.0'] = '2024-11-01'; $lang->misc->releaseDate['20.8'] = '2024-10-21'; $lang->misc->releaseDate['20.7.1'] = '2024-09-30'; $lang->misc->releaseDate['20.7'] = '2024-09-14'; @@ -239,7 +239,7 @@ $lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; $lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; /* Release Detail. */ -$lang->misc->feature->all['20.9'][] = array('title' => '', 'desc' => ''); +$lang->misc->feature->all['21.0'][] = array('title' => '', 'desc' => ''); $lang->misc->feature->all['20.8'][] = array('title' => '文档优化：优化任务关系，修复Bug。', 'desc' => ''); $lang->misc->feature->all['20.7.1'][] = array('title' => '修复已知Bug。', 'desc' => ''); $lang->misc->feature->all['20.7'][] = array('title' => '新手引导优化；菜单自定义；工作流优化；OR界面增加贡献模块。', 'desc' => ''); diff --git a/module/upgrade/config.php b/module/upgrade/config.php index 1c7b70c372..385abc81f6 100644 --- a/module/upgrade/config.php +++ b/module/upgrade/config.php @@ -58,7 +58,7 @@ $config->upgrade->maxVersion['max5_5'] = '20_6'; $config->upgrade->maxVersion['max5_6'] = '20_7'; $config->upgrade->maxVersion['max5_6_1'] = '20_7_1'; $config->upgrade->maxVersion['max5_7'] = '20_8'; -$config->upgrade->maxVersion['max5_8'] = '20_9'; // max insert position. +$config->upgrade->maxVersion['max6_0'] = '21_0'; // max insert position. $config->upgrade->bizVersion = array(); $config->upgrade->bizVersion['biz1_0'] = '9_5_1'; @@ -155,7 +155,7 @@ $config->upgrade->bizVersion['biz10_5'] = '20_6'; $config->upgrade->bizVersion['biz10_6'] = '20_7'; $config->upgrade->bizVersion['biz10_6_1'] = '20_7_1'; $config->upgrade->bizVersion['biz10_7'] = '20_8'; -$config->upgrade->bizVersion['biz10_8'] = '20_9'; // biz insert position. +$config->upgrade->bizVersion['biz11_0'] = '21_0'; // biz insert position. $config->upgrade->proVersion = array(); $config->upgrade->proVersion['pro1_0'] = '3_1'; @@ -289,7 +289,7 @@ $config->upgrade->ipdVersion['ipd2_5'] = '20_6'; $config->upgrade->ipdVersion['ipd2_6'] = '20_7'; $config->upgrade->ipdVersion['ipd2_6_1'] = '20_7_1'; $config->upgrade->ipdVersion['ipd2_7'] = '20_8'; -$config->upgrade->ipdVersion['ipd2_8'] = '20_9'; // ipd insert position. +$config->upgrade->ipdVersion['ipd3_0'] = '21_0'; // ipd insert position. $config->upgrade->lowerTables = array(); $config->upgrade->lowerTables[$config->db->prefix . 'caseStep'] = $config->db->prefix . 'casestep'; diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php index bcfcb27ad7..bf6d6fc5e0 100644 --- a/module/upgrade/lang/version.php +++ b/module/upgrade/lang/version.php @@ -203,7 +203,7 @@ $lang->upgrade->fromVersions['20_6'] = '20.6'; $lang->upgrade->fromVersions['20_7'] = '20.7'; $lang->upgrade->fromVersions['20_7_1'] = '20.7.1'; $lang->upgrade->fromVersions['20_8'] = '20.8'; -$lang->upgrade->fromVersions['20_9'] = '20.9'; // pms insert position. +$lang->upgrade->fromVersions['21_0'] = '21.0'; // pms insert position. global $config; /* Lite. */ @@ -407,7 +407,7 @@ $lang->upgrade->fromVersions['biz10_5'] = 'Biz10.5'; $lang->upgrade->fromVersions['biz10_6'] = 'Biz10.6'; $lang->upgrade->fromVersions['biz10_6_1'] = 'Biz10.6.1'; $lang->upgrade->fromVersions['biz10_7'] = 'Biz10.7'; -$lang->upgrade->fromVersions['biz10_8'] = 'Biz10.8'; // biz insert position. +$lang->upgrade->fromVersions['biz11_0'] = 'Biz11.0'; // biz insert position. /* Max. */ $lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4'; @@ -469,7 +469,7 @@ $lang->upgrade->fromVersions['max5_5'] = 'Max5.5'; $lang->upgrade->fromVersions['max5_6'] = 'Max5.6'; $lang->upgrade->fromVersions['max5_6_1'] = 'Max5.6.1'; $lang->upgrade->fromVersions['max5_7'] = 'Max5.7'; -$lang->upgrade->fromVersions['max5_8'] = 'Max5.8'; // max insert position. +$lang->upgrade->fromVersions['max6_0'] = 'Max6.0'; // max insert position. /* Ipd */ $lang->upgrade->fromVersions['ipd1_0_beta1'] = 'Ipd1.0.beta1';