From fe5866bea043cb5f4829e6c86faa3af7e797003c Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 8 May 2019 16:09:29 +0800 Subject: [PATCH] + add new version and upgrade. --- VERSION | 2 +- config/config.php | 2 +- db/standard/zentao11.5.sql | 910 ++++++++++++++++++++++++++++++++ doc/CHANGELOG | 38 ++ module/action/lang/zh-tw.php | 163 ++++++ module/common/lang/zh-tw.php | 11 +- module/doc/lang/zh-tw.php | 1 + module/entry/lang/zh-tw.php | 1 + module/group/lang/zh-tw.php | 9 +- module/misc/lang/en.php | 5 + module/misc/lang/zh-cn.php | 5 + module/misc/lang/zh-tw.php | 5 + module/story/lang/zh-tw.php | 1 + module/task/lang/zh-tw.php | 5 - module/upgrade/lang/version.php | 1 + module/user/lang/zh-tw.php | 51 +- tools/check.php | 3 + 17 files changed, 1173 insertions(+), 40 deletions(-) create mode 100644 db/standard/zentao11.5.sql diff --git a/VERSION b/VERSION index a6e5b12f92..3833f0f6a2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.4.1 +11.5.stable diff --git a/config/config.php b/config/config.php index b5a81a8646..f0beabeba7 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.4.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '11.5'; // 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/db/standard/zentao11.5.sql b/db/standard/zentao11.5.sql new file mode 100644 index 0000000000..a809afd69f --- /dev/null +++ b/db/standard/zentao11.5.sql @@ -0,0 +1,910 @@ +CREATE TABLE `zt_action` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `objectType` varchar(30) NOT NULL DEFAULT '', + `objectID` mediumint(8) unsigned NOT NULL DEFAULT '0', + `product` varchar(255) NOT NULL, + `project` mediumint(9) NOT NULL, + `actor` varchar(30) NOT NULL DEFAULT '', + `action` varchar(30) NOT NULL DEFAULT '', + `date` datetime NOT NULL, + `comment` text NOT NULL, + `extra` text NOT NULL, + `read` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `date` (`date`), + KEY `actor` (`actor`), + KEY `project` (`project`), + KEY `objectID` (`objectID`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_block` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `account` char(30) NOT NULL, + `module` varchar(20) NOT NULL, + `title` varchar(100) NOT NULL, + `source` varchar(20) NOT NULL, + `block` varchar(20) NOT NULL, + `params` text NOT NULL, + `order` tinyint(3) unsigned NOT NULL DEFAULT '0', + `grid` tinyint(3) unsigned NOT NULL DEFAULT '0', + `height` smallint(5) unsigned NOT NULL DEFAULT '0', + `hidden` tinyint(1) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + UNIQUE KEY `accountModuleOrder` (`account`,`module`,`order`), + KEY `account` (`account`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_branch` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `product` mediumint(8) unsigned NOT NULL, + `name` varchar(255) NOT NULL, + `order` smallint(5) unsigned NOT NULL, + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `product` (`product`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_bug` ( + `id` mediumint(8) NOT NULL AUTO_INCREMENT, + `product` mediumint(8) unsigned NOT NULL DEFAULT '0', + `branch` mediumint(8) unsigned NOT NULL DEFAULT '0', + `module` mediumint(8) unsigned NOT NULL DEFAULT '0', + `project` mediumint(8) unsigned NOT NULL DEFAULT '0', + `plan` mediumint(8) unsigned NOT NULL DEFAULT '0', + `story` mediumint(8) unsigned NOT NULL DEFAULT '0', + `storyVersion` smallint(6) NOT NULL DEFAULT '1', + `task` mediumint(8) unsigned NOT NULL DEFAULT '0', + `toTask` mediumint(8) unsigned NOT NULL DEFAULT '0', + `toStory` mediumint(8) NOT NULL DEFAULT '0', + `title` varchar(255) NOT NULL, + `keywords` varchar(255) NOT NULL, + `severity` tinyint(4) NOT NULL DEFAULT '0', + `pri` tinyint(3) unsigned NOT NULL, + `type` varchar(30) NOT NULL DEFAULT '', + `os` varchar(30) NOT NULL DEFAULT '', + `browser` varchar(30) NOT NULL DEFAULT '', + `hardware` varchar(30) NOT NULL, + `found` varchar(30) NOT NULL DEFAULT '', + `steps` text NOT NULL, + `status` enum('active','resolved','closed') NOT NULL DEFAULT 'active', + `color` char(7) NOT NULL, + `confirmed` tinyint(1) NOT NULL DEFAULT '0', + `activatedCount` smallint(6) NOT NULL, + `activatedDate` datetime NOT NULL, + `mailto` text, + `openedBy` varchar(30) NOT NULL DEFAULT '', + `openedDate` datetime NOT NULL, + `openedBuild` varchar(255) NOT NULL, + `assignedTo` varchar(30) NOT NULL DEFAULT '', + `assignedDate` datetime NOT NULL, + `deadline` date NOT NULL, + `resolvedBy` varchar(30) NOT NULL DEFAULT '', + `resolution` varchar(30) NOT NULL DEFAULT '', + `resolvedBuild` varchar(30) NOT NULL DEFAULT '', + `resolvedDate` datetime NOT NULL, + `closedBy` varchar(30) NOT NULL DEFAULT '', + `closedDate` datetime NOT NULL, + `duplicateBug` mediumint(8) unsigned NOT NULL, + `linkBug` varchar(255) NOT NULL, + `case` mediumint(8) unsigned NOT NULL, + `caseVersion` smallint(6) NOT NULL DEFAULT '1', + `result` mediumint(8) unsigned NOT NULL, + `testtask` mediumint(8) unsigned NOT NULL, + `lastEditedBy` varchar(30) NOT NULL DEFAULT '', + `lastEditedDate` datetime NOT NULL, + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `product` (`product`), + KEY `project` (`project`), + KEY `status` (`status`), + KEY `plan` (`plan`), + KEY `story` (`story`), + KEY `case` (`case`), + KEY `assignedTo` (`assignedTo`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_build` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `product` mediumint(8) unsigned NOT NULL DEFAULT '0', + `branch` mediumint(8) unsigned NOT NULL DEFAULT '0', + `project` mediumint(8) unsigned NOT NULL DEFAULT '0', + `name` char(150) NOT NULL, + `scmPath` char(255) NOT NULL, + `filePath` char(255) NOT NULL, + `date` date NOT NULL, + `stories` text NOT NULL, + `bugs` text NOT NULL, + `builder` char(30) NOT NULL DEFAULT '', + `desc` text NOT NULL, + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `product` (`product`), + KEY `project` (`project`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_burn` ( + `project` mediumint(8) unsigned NOT NULL, + `task` mediumint(8) unsigned NOT NULL DEFAULT '0', + `date` date NOT NULL, + `estimate` float NOT NULL, + `left` float NOT NULL, + `consumed` float NOT NULL, + PRIMARY KEY (`project`,`date`,`task`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_case` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `product` mediumint(8) unsigned NOT NULL DEFAULT '0', + `branch` mediumint(8) unsigned NOT NULL DEFAULT '0', + `lib` mediumint(8) unsigned NOT NULL DEFAULT '0', + `module` mediumint(8) unsigned NOT NULL DEFAULT '0', + `path` mediumint(8) unsigned NOT NULL DEFAULT '0', + `story` mediumint(30) unsigned NOT NULL DEFAULT '0', + `storyVersion` smallint(6) NOT NULL DEFAULT '1', + `title` varchar(255) NOT NULL, + `precondition` text NOT NULL, + `keywords` varchar(255) NOT NULL, + `pri` tinyint(3) unsigned NOT NULL DEFAULT '3', + `type` char(30) NOT NULL DEFAULT '1', + `stage` varchar(255) NOT NULL, + `howRun` varchar(30) NOT NULL, + `scriptedBy` varchar(30) NOT NULL, + `scriptedDate` date NOT NULL, + `scriptStatus` varchar(30) NOT NULL, + `scriptLocation` varchar(255) NOT NULL, + `status` char(30) NOT NULL DEFAULT '1', + `color` char(7) NOT NULL, + `frequency` enum('1','2','3') NOT NULL DEFAULT '1', + `order` tinyint(30) unsigned NOT NULL DEFAULT '0', + `openedBy` char(30) NOT NULL DEFAULT '', + `openedDate` datetime NOT NULL, + `reviewedBy` varchar(255) NOT NULL, + `reviewedDate` date NOT NULL, + `lastEditedBy` char(30) NOT NULL DEFAULT '', + `lastEditedDate` datetime NOT NULL, + `version` tinyint(3) unsigned NOT NULL DEFAULT '0', + `linkCase` varchar(255) NOT NULL, + `fromBug` mediumint(8) unsigned NOT NULL, + `fromCaseID` mediumint(8) unsigned NOT NULL, + `fromCaseVersion` mediumint(8) unsigned NOT NULL, + `deleted` enum('0','1') NOT NULL DEFAULT '0', + `lastRunner` varchar(30) NOT NULL, + `lastRunDate` datetime NOT NULL, + `lastRunResult` char(30) NOT NULL, + PRIMARY KEY (`id`), + KEY `product` (`product`), + KEY `story` (`story`), + KEY `module` (`module`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_casestep` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `parent` mediumint(8) unsigned NOT NULL DEFAULT '0', + `case` mediumint(8) unsigned NOT NULL DEFAULT '0', + `version` smallint(3) unsigned NOT NULL DEFAULT '0', + `type` varchar(10) NOT NULL DEFAULT 'step', + `desc` text NOT NULL, + `expect` text NOT NULL, + PRIMARY KEY (`id`), + KEY `case` (`case`), + KEY `version` (`version`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_company` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `name` char(120) DEFAULT NULL, + `phone` char(20) DEFAULT NULL, + `fax` char(20) DEFAULT NULL, + `address` char(120) DEFAULT NULL, + `zipcode` char(10) DEFAULT NULL, + `website` char(120) DEFAULT NULL, + `backyard` char(120) DEFAULT NULL, + `guest` enum('1','0') NOT NULL DEFAULT '0', + `admins` char(255) DEFAULT NULL, + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_config` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `owner` char(30) NOT NULL DEFAULT '', + `module` varchar(30) NOT NULL, + `section` char(30) NOT NULL DEFAULT '', + `key` char(30) NOT NULL DEFAULT '', + `value` text NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `unique` (`owner`,`module`,`section`,`key`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_cron` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `m` varchar(20) NOT NULL, + `h` varchar(20) NOT NULL, + `dom` varchar(20) NOT NULL, + `mon` varchar(20) NOT NULL, + `dow` varchar(20) NOT NULL, + `command` text NOT NULL, + `remark` varchar(255) NOT NULL, + `type` varchar(20) NOT NULL, + `buildin` tinyint(1) NOT NULL DEFAULT '0', + `status` varchar(20) NOT NULL, + `lastTime` datetime NOT NULL, + PRIMARY KEY (`id`), + KEY `lastTime` (`lastTime`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_dept` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `name` char(60) NOT NULL, + `parent` mediumint(8) unsigned NOT NULL DEFAULT '0', + `path` char(255) NOT NULL DEFAULT '', + `grade` tinyint(3) unsigned NOT NULL DEFAULT '0', + `order` tinyint(3) unsigned NOT NULL DEFAULT '0', + `position` char(30) NOT NULL DEFAULT '', + `function` char(255) NOT NULL DEFAULT '', + `manager` char(30) NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + KEY `parent` (`parent`), + KEY `path` (`path`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_doc` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `product` mediumint(8) unsigned NOT NULL, + `project` mediumint(8) unsigned NOT NULL, + `lib` varchar(30) NOT NULL, + `module` varchar(30) NOT NULL, + `title` varchar(255) NOT NULL, + `keywords` varchar(255) NOT NULL, + `type` varchar(30) NOT NULL, + `views` smallint(5) unsigned NOT NULL, + `collector` text NOT NULL, + `addedBy` varchar(30) NOT NULL, + `addedDate` datetime NOT NULL, + `editedBy` varchar(30) NOT NULL, + `editedDate` datetime NOT NULL, + `acl` varchar(10) NOT NULL DEFAULT 'open', + `groups` varchar(255) NOT NULL, + `users` text NOT NULL, + `version` smallint(5) unsigned NOT NULL DEFAULT '1', + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `product` (`product`), + KEY `project` (`project`), + KEY `lib` (`lib`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_doccontent` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `doc` mediumint(8) unsigned NOT NULL, + `title` varchar(255) NOT NULL, + `digest` varchar(255) NOT NULL, + `content` text NOT NULL, + `files` text NOT NULL, + `type` varchar(10) NOT NULL, + `version` smallint(5) unsigned NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `doc_version` (`doc`,`version`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_doclib` ( + `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT, + `type` varchar(30) NOT NULL, + `product` mediumint(8) unsigned NOT NULL, + `project` mediumint(8) unsigned NOT NULL, + `name` varchar(60) NOT NULL, + `acl` varchar(10) NOT NULL DEFAULT 'open', + `groups` varchar(255) NOT NULL, + `users` text NOT NULL, + `main` enum('0','1') NOT NULL DEFAULT '0', + `collector` text NOT NULL, + `order` tinyint(5) unsigned NOT NULL, + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `product` (`product`), + KEY `project` (`project`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_effort` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `user` char(30) NOT NULL DEFAULT '', + `todo` enum('1','0') NOT NULL DEFAULT '1', + `date` date NOT NULL, + `begin` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `end` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `type` enum('1','2','3') NOT NULL DEFAULT '1', + `idvalue` mediumint(8) unsigned NOT NULL DEFAULT '0', + `name` char(30) NOT NULL DEFAULT '', + `desc` char(255) NOT NULL DEFAULT '', + `status` enum('1','2','3') NOT NULL DEFAULT '1', + PRIMARY KEY (`id`), + KEY `user` (`user`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `zt_entry` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(50) NOT NULL, + `account` varchar(30) NOT NULL DEFAULT '', + `code` varchar(20) NOT NULL, + `key` varchar(32) NOT NULL, + `ip` varchar(100) NOT NULL, + `desc` text NOT NULL, + `createdBy` varchar(30) NOT NULL, + `createdDate` datetime NOT NULL, + `calledTime` int(10) unsigned NOT NULL DEFAULT '0', + `editedBy` varchar(30) NOT NULL, + `editedDate` datetime NOT NULL, + `deleted` enum('0', '1') NOT NULL DEFAULT '0', + PRIMARY KEY `id` (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_extension` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(150) NOT NULL, + `code` varchar(30) NOT NULL, + `version` varchar(50) NOT NULL, + `author` varchar(100) NOT NULL, + `desc` text NOT NULL, + `license` text NOT NULL, + `type` varchar(20) NOT NULL DEFAULT 'extension', + `site` varchar(150) NOT NULL, + `zentaoCompatible` varchar(100) NOT NULL, + `installedTime` datetime NOT NULL, + `depends` varchar(100) NOT NULL, + `dirs` mediumtext NOT NULL, + `files` mediumtext NOT NULL, + `status` varchar(20) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `code` (`code`), + KEY `name` (`name`), + KEY `installedTime` (`installedTime`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_file` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `pathname` char(100) NOT NULL, + `title` char(255) NOT NULL, + `extension` char(30) NOT NULL, + `size` int(10) unsigned NOT NULL DEFAULT '0', + `objectType` char(30) NOT NULL, + `objectID` mediumint(9) NOT NULL, + `addedBy` char(30) NOT NULL DEFAULT '', + `addedDate` datetime NOT NULL, + `downloads` mediumint(8) unsigned NOT NULL DEFAULT '0', + `extra` varchar(255) NOT NULL, + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `objectType` (`objectType`), + KEY `objectID` (`objectID`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_group` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `name` char(30) NOT NULL, + `role` char(30) NOT NULL DEFAULT '', + `desc` char(255) NOT NULL DEFAULT '', + `acl` text, + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_grouppriv` ( + `group` mediumint(8) unsigned NOT NULL DEFAULT '0', + `module` char(30) NOT NULL DEFAULT '', + `method` char(30) NOT NULL DEFAULT '', + UNIQUE KEY `group` (`group`,`module`,`method`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_history` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `action` mediumint(8) unsigned NOT NULL DEFAULT '0', + `field` varchar(30) NOT NULL DEFAULT '', + `old` text NOT NULL, + `new` text NOT NULL, + `diff` mediumtext NOT NULL, + PRIMARY KEY (`id`), + KEY `action` (`action`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_lang` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `lang` varchar(30) NOT NULL, + `module` varchar(30) NOT NULL, + `section` varchar(30) NOT NULL, + `key` varchar(60) NOT NULL, + `value` text NOT NULL, + `system` enum('0','1') NOT NULL DEFAULT '1', + PRIMARY KEY (`id`), + UNIQUE KEY `lang` (`lang`,`module`,`section`,`key`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_log` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `objectType` varchar(30) NOT NULL, + `objectID` mediumint(8) unsigned NOT NULL, + `action` mediumint(8) unsigned NOT NULL, + `date` datetime NOT NULL, + `url` varchar(255) NOT NULL, + `contentType` varchar(30) NOT NULL, + `data` text NOT NULL, + `result` text NOT NULL, + PRIMARY KEY (`id`), + KEY `objectType` (`objectType`), + KEY `obejctID` (`objectID`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_module` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `root` mediumint(8) unsigned NOT NULL DEFAULT '0', + `branch` mediumint(8) unsigned NOT NULL DEFAULT '0', + `name` char(60) NOT NULL DEFAULT '', + `parent` mediumint(8) unsigned NOT NULL DEFAULT '0', + `path` char(255) NOT NULL DEFAULT '', + `grade` tinyint(3) unsigned NOT NULL DEFAULT '0', + `order` smallint(5) unsigned NOT NULL DEFAULT '0', + `type` char(30) NOT NULL, + `owner` varchar(30) NOT NULL, + `collector` text NOT NULL, + `short` varchar(30) NOT NULL, + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `root` (`root`), + KEY `type` (`type`), + KEY `path` (`path`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_notify` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `objectType` varchar(50) NOT NULL, + `objectID` mediumint(8) unsigned NOT NULL, + `action` mediumint(9) NOT NULL, + `toList` varchar(255) NOT NULL, + `ccList` text NOT NULL, + `subject` varchar(255) NOT NULL, + `data` text NOT NULL, + `createdBy` char(30) NOT NULL, + `createdDate` datetime NOT NULL, + `sendTime` datetime NOT NULL, + `status` varchar(10) NOT NULL DEFAULT 'wait', + `failReason` text NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_product` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(90) NOT NULL, + `code` varchar(45) NOT NULL, + `line` mediumint(8) NOT NULL, + `type` varchar(30) NOT NULL DEFAULT 'normal', + `status` varchar(30) NOT NULL DEFAULT '', + `desc` text NOT NULL, + `PO` varchar(30) NOT NULL, + `QD` varchar(30) NOT NULL, + `RD` varchar(30) NOT NULL, + `acl` enum('open','private','custom') NOT NULL DEFAULT 'open', + `whitelist` text NOT NULL, + `createdBy` varchar(30) NOT NULL, + `createdDate` datetime NOT NULL, + `createdVersion` varchar(20) NOT NULL, + `order` mediumint(8) unsigned NOT NULL, + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `order` (`order`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_productplan` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `product` mediumint(8) unsigned NOT NULL, + `branch` mediumint(8) unsigned NOT NULL, + `parent` mediumint(9) NOT NULL DEFAULT '0', + `title` varchar(90) NOT NULL, + `desc` text NOT NULL, + `begin` date NOT NULL, + `end` date NOT NULL, + `order` text NOT NULL, + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `product` (`product`), + KEY `end` (`end`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_project` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `isCat` enum('1','0') NOT NULL DEFAULT '0', + `catID` mediumint(8) unsigned NOT NULL, + `type` varchar(20) NOT NULL DEFAULT 'sprint', + `parent` mediumint(8) unsigned NOT NULL DEFAULT '0', + `name` varchar(90) NOT NULL, + `code` varchar(45) NOT NULL, + `begin` date NOT NULL, + `end` date NOT NULL, + `days` smallint(5) unsigned NOT NULL, + `status` varchar(10) NOT NULL, + `statge` enum('1','2','3','4','5') NOT NULL DEFAULT '1', + `pri` enum('1','2','3','4') NOT NULL DEFAULT '1', + `desc` text NOT NULL, + `openedBy` varchar(30) NOT NULL DEFAULT '', + `openedDate` datetime NOT NULL, + `openedVersion` varchar(20) NOT NULL, + `closedBy` varchar(30) NOT NULL DEFAULT '', + `closedDate` datetime NOT NULL, + `canceledBy` varchar(30) NOT NULL DEFAULT '', + `canceledDate` datetime NOT NULL, + `PO` varchar(30) NOT NULL DEFAULT '', + `PM` varchar(30) NOT NULL DEFAULT '', + `QD` varchar(30) NOT NULL DEFAULT '', + `RD` varchar(30) NOT NULL DEFAULT '', + `team` varchar(90) NOT NULL, + `acl` enum('open','private','custom') NOT NULL DEFAULT 'open', + `whitelist` text NOT NULL, + `order` mediumint(8) unsigned NOT NULL, + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `parent` (`parent`), + KEY `begin` (`begin`), + KEY `end` (`end`), + KEY `status` (`status`), + KEY `order` (`order`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_projectproduct` ( + `project` mediumint(8) unsigned NOT NULL, + `product` mediumint(8) unsigned NOT NULL, + `branch` mediumint(8) unsigned NOT NULL, + `plan` mediumint(8) unsigned NOT NULL, + PRIMARY KEY (`project`,`product`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_projectstory` ( + `project` mediumint(8) unsigned NOT NULL DEFAULT '0', + `product` mediumint(8) unsigned NOT NULL, + `story` mediumint(8) unsigned NOT NULL DEFAULT '0', + `version` smallint(6) NOT NULL DEFAULT '1', + `order` smallint(6) unsigned NOT NULL, + UNIQUE KEY `project` (`project`,`story`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_release` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `product` mediumint(8) unsigned NOT NULL DEFAULT '0', + `branch` mediumint(8) unsigned NOT NULL DEFAULT '0', + `build` mediumint(8) unsigned NOT NULL, + `name` varchar(255) NOT NULL DEFAULT '', + `marker` enum('0','1') NOT NULL DEFAULT '0', + `date` date NOT NULL, + `stories` text NOT NULL, + `bugs` text NOT NULL, + `leftBugs` text NOT NULL, + `desc` text NOT NULL, + `status` varchar(20) NOT NULL DEFAULT 'normal', + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `product` (`product`), + KEY `build` (`build`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_score` ( + `id` bigint(12) unsigned NOT NULL AUTO_INCREMENT, + `account` varchar(30) NOT NULL, + `module` varchar(30) NOT NULL DEFAULT '', + `method` varchar(30) NOT NULL, + `desc` varchar(250) NOT NULL DEFAULT '', + `before` int(11) NOT NULL DEFAULT '0', + `score` int(11) NOT NULL DEFAULT '0', + `after` int(11) NOT NULL DEFAULT '0', + `time` datetime NOT NULL, + PRIMARY KEY (`id`), + KEY `account` (`account`), + KEY `model` (`module`), + KEY `method` (`method`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `zt_story` ( + `id` mediumint(8) unsigned NOT NULL auto_increment, + `product` mediumint(8) unsigned NOT NULL default '0', + `branch` mediumint(8) unsigned NOT NULL default '0', + `module` mediumint(8) unsigned NOT NULL default '0', + `plan` text, + `source` varchar(20) NOT NULL, + `sourceNote` varchar(255) NOT NULL, + `fromBug` mediumint(8) unsigned NOT NULL default '0', + `title` varchar(255) NOT NULL, + `keywords` varchar(255) NOT NULL, + `type` varchar(30) NOT NULL default '', + `pri` tinyint(3) unsigned NOT NULL default '3', + `estimate` float unsigned NOT NULL, + `status` enum('','changed','active','draft','closed') NOT NULL default '', + `color` char(7) NOT NULL, + `stage` enum('','wait','planned','projected','developing','developed','testing','tested','verified','released', 'closed') NOT NULL DEFAULT 'wait', + `stagedBy` char(30) NOT NULL, + `mailto` text, + `openedBy` varchar(30) NOT NULL default '', + `openedDate` datetime NOT NULL, + `assignedTo` varchar(30) NOT NULL default '', + `assignedDate` datetime NOT NULL, + `lastEditedBy` varchar(30) NOT NULL default '', + `lastEditedDate` datetime NOT NULL, + `reviewedBy` varchar(255) NOT NULL, + `reviewedDate` date NOT NULL, + `closedBy` varchar(30) NOT NULL default '', + `closedDate` datetime NOT NULL, + `closedReason` varchar(30) NOT NULL, + `toBug` mediumint(8) unsigned NOT NULL, + `childStories` varchar(255) NOT NULL, + `linkStories` varchar(255) NOT NULL, + `duplicateStory` mediumint(8) unsigned NOT NULL, + `version` smallint(6) NOT NULL default '1', + `deleted` enum('0','1') NOT NULL default '0', + PRIMARY KEY (`id`), + KEY `product` (`product`), + KEY `status` (`status`), + KEY `assignedTo` (`assignedTo`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_storyspec` ( + `story` mediumint(9) NOT NULL, + `version` smallint(6) NOT NULL, + `title` varchar(255) NOT NULL, + `spec` text NOT NULL, + `verify` text NOT NULL, + UNIQUE KEY `story` (`story`,`version`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `zt_storystage` ( + `story` mediumint(8) unsigned NOT NULL, + `branch` mediumint(8) unsigned NOT NULL, + `stage` varchar(50) NOT NULL, + `stagedBy` char(30) NOT NULL, + UNIQUE KEY `story_branch` (`story`,`branch`), + KEY `story` (`story`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_suitecase` ( + `suite` mediumint(8) unsigned NOT NULL, + `product` mediumint(8) unsigned NOT NULL, + `case` mediumint(8) unsigned NOT NULL, + `version` smallint(5) unsigned NOT NULL, + UNIQUE KEY `suitecase` (`suite`,`case`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_task` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `parent` mediumint(8) NOT NULL DEFAULT '0', + `project` mediumint(8) unsigned NOT NULL DEFAULT '0', + `module` mediumint(8) unsigned NOT NULL DEFAULT '0', + `story` mediumint(8) unsigned NOT NULL DEFAULT '0', + `storyVersion` smallint(6) NOT NULL DEFAULT '1', + `fromBug` mediumint(8) unsigned NOT NULL DEFAULT '0', + `name` varchar(255) NOT NULL, + `type` varchar(20) NOT NULL, + `pri` tinyint(3) unsigned NOT NULL DEFAULT '0', + `estimate` float unsigned NOT NULL, + `consumed` float unsigned NOT NULL, + `left` float unsigned NOT NULL, + `deadline` date NOT NULL, + `status` enum('wait','doing','done','pause','cancel','closed') NOT NULL DEFAULT 'wait', + `color` char(7) NOT NULL, + `mailto` text, + `desc` text NOT NULL, + `openedBy` varchar(30) NOT NULL, + `openedDate` datetime NOT NULL, + `assignedTo` varchar(30) NOT NULL, + `assignedDate` datetime NOT NULL, + `estStarted` date NOT NULL, + `realStarted` date NOT NULL, + `finishedBy` varchar(30) NOT NULL, + `finishedDate` datetime NOT NULL, + `finishedList` text NOT NULL, + `canceledBy` varchar(30) NOT NULL, + `canceledDate` datetime NOT NULL, + `closedBy` varchar(30) NOT NULL, + `closedDate` datetime NOT NULL, + `closedReason` varchar(30) NOT NULL, + `lastEditedBy` varchar(30) NOT NULL, + `lastEditedDate` datetime NOT NULL, + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `project` (`project`), + KEY `story` (`story`), + KEY `assignedTo` (`assignedTo`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_taskestimate` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `task` mediumint(8) unsigned NOT NULL DEFAULT '0', + `date` date NOT NULL, + `left` float unsigned NOT NULL DEFAULT '0', + `consumed` float unsigned NOT NULL, + `account` char(30) NOT NULL DEFAULT '', + `work` text, + PRIMARY KEY (`id`), + KEY `task` (`task`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_team` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `root` mediumint(8) unsigned NOT NULL DEFAULT '0', + `type` enum('project','task') NOT NULL DEFAULT 'project', + `account` char(30) NOT NULL DEFAULT '', + `role` char(30) NOT NULL DEFAULT '', + `limited` char(8) NOT NULL DEFAULT 'no', + `join` date NOT NULL DEFAULT '0000-00-00', + `days` smallint(5) unsigned NOT NULL, + `hours` float(2,1) unsigned NOT NULL DEFAULT '0.0', + `estimate` decimal(12,2) unsigned NOT NULL DEFAULT '0.00', + `consumed` decimal(12,2) unsigned NOT NULL DEFAULT '0.00', + `left` decimal(12,2) unsigned NOT NULL DEFAULT '0.00', + `order` tinyint(3) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + UNIQUE KEY `team` (`root`,`type`,`account`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_testreport` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `product` mediumint(8) unsigned NOT NULL, + `project` mediumint(8) unsigned NOT NULL, + `tasks` varchar(255) NOT NULL, + `builds` varchar(255) NOT NULL, + `title` varchar(255) NOT NULL, + `begin` date NOT NULL, + `end` date NOT NULL, + `owner` char(30) NOT NULL, + `members` text NOT NULL, + `stories` text NOT NULL, + `bugs` text NOT NULL, + `cases` text NOT NULL, + `report` text NOT NULL, + `objectType` varchar(20) NOT NULL, + `objectID` mediumint(8) unsigned NOT NULL, + `createdBy` char(30) NOT NULL, + `createdDate` datetime NOT NULL, + `deleted` enum('0','1') NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_testresult` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `run` mediumint(8) unsigned NOT NULL, + `case` mediumint(8) unsigned NOT NULL, + `version` smallint(5) unsigned NOT NULL, + `caseResult` char(30) NOT NULL, + `stepResults` text NOT NULL, + `lastRunner` varchar(30) NOT NULL, + `date` datetime NOT NULL, + PRIMARY KEY (`id`), + KEY `case` (`case`), + KEY `version` (`version`), + KEY `run` (`run`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_testrun` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `task` mediumint(8) unsigned NOT NULL DEFAULT '0', + `case` mediumint(8) unsigned NOT NULL DEFAULT '0', + `version` tinyint(3) unsigned NOT NULL DEFAULT '0', + `assignedTo` char(30) NOT NULL DEFAULT '', + `lastRunner` varchar(30) NOT NULL, + `lastRunDate` datetime NOT NULL, + `lastRunResult` char(30) NOT NULL, + `status` char(30) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `task` (`task`,`case`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_testsuite` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `product` mediumint(8) unsigned NOT NULL, + `name` varchar(255) NOT NULL, + `desc` text NOT NULL, + `type` varchar(20) NOT NULL, + `addedBy` char(30) NOT NULL, + `addedDate` datetime NOT NULL, + `lastEditedBy` char(30) NOT NULL, + `lastEditedDate` datetime NOT NULL, + `deleted` enum('0','1') NOT NULL, + PRIMARY KEY (`id`), + KEY `product` (`product`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_testtask` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `name` char(90) NOT NULL, + `product` mediumint(8) unsigned NOT NULL, + `project` mediumint(8) unsigned NOT NULL DEFAULT '0', + `build` char(30) NOT NULL, + `owner` varchar(30) NOT NULL, + `pri` tinyint(3) unsigned NOT NULL DEFAULT '0', + `begin` date NOT NULL, + `end` date NOT NULL, + `mailto` text, + `desc` text NOT NULL, + `report` text NOT NULL, + `status` enum('blocked','doing','wait','done') NOT NULL DEFAULT 'wait', + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `product` (`product`), + KEY `build` (`build`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_todo` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `account` char(30) NOT NULL, + `date` date NOT NULL, + `begin` smallint(4) unsigned zerofill NOT NULL, + `end` smallint(4) unsigned zerofill NOT NULL, + `type` char(10) NOT NULL, + `cycle` tinyint(3) unsigned NOT NULL DEFAULT '0', + `idvalue` mediumint(8) unsigned NOT NULL DEFAULT '0', + `pri` tinyint(3) unsigned NOT NULL, + `name` char(150) NOT NULL, + `desc` text NOT NULL, + `status` enum('wait','doing','done','closed') NOT NULL DEFAULT 'wait', + `private` tinyint(1) NOT NULL, + `config` varchar(255) NOT NULL, + `assignedTo` varchar(30) NOT NULL DEFAULT '', + `assignedBy` varchar(30) NOT NULL DEFAULT '', + `assignedDate` datetime NOT NULL, + `finishedBy` varchar(30) NOT NULL DEFAULT '', + `finishedDate` datetime NOT NULL, + `closedBy` varchar(30) NOT NULL DEFAULT '', + `closedDate` datetime NOT NULL, + PRIMARY KEY (`id`), + KEY `account` (`account`), + KEY `assignedTo` (`assignedTo`), + KEY `finishedBy` (`finishedBy`), + KEY `date` (`date`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_user` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `dept` mediumint(8) unsigned NOT NULL DEFAULT '0', + `account` char(30) NOT NULL DEFAULT '', + `password` char(32) NOT NULL DEFAULT '', + `role` char(10) NOT NULL DEFAULT '', + `realname` varchar(100) NOT NULL DEFAULT '', + `nickname` char(60) NOT NULL DEFAULT '', + `commiter` varchar(100) NOT NULL, + `avatar` char(30) NOT NULL DEFAULT '', + `birthday` date NOT NULL DEFAULT '0000-00-00', + `gender` enum('f','m') NOT NULL DEFAULT 'f', + `email` char(90) NOT NULL DEFAULT '', + `skype` char(90) NOT NULL DEFAULT '', + `qq` char(20) NOT NULL DEFAULT '', + `mobile` char(11) NOT NULL DEFAULT '', + `phone` char(20) NOT NULL DEFAULT '', + `weixin` varchar(90) NOT NULL DEFAULT '', + `dingding` varchar(90) NOT NULL DEFAULT '', + `slack` varchar(90) NOT NULL DEFAULT '', + `whatsapp` varchar(90) NOT NULL DEFAULT '', + `address` char(120) NOT NULL DEFAULT '', + `zipcode` char(10) NOT NULL DEFAULT '', + `join` date NOT NULL DEFAULT '0000-00-00', + `visits` mediumint(8) unsigned NOT NULL DEFAULT '0', + `ip` char(15) NOT NULL DEFAULT '', + `last` int(10) unsigned NOT NULL DEFAULT '0', + `fails` tinyint(5) NOT NULL DEFAULT '0', + `locked` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `ranzhi` char(30) NOT NULL DEFAULT '', + `score` int(11) NOT NULL DEFAULT '0', + `scoreLevel` int(11) NOT NULL DEFAULT '0', + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + UNIQUE KEY `account` (`account`), + KEY `dept` (`dept`), + KEY `email` (`email`), + KEY `commiter` (`commiter`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_usercontact` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `account` char(30) NOT NULL, + `listName` varchar(60) NOT NULL, + `userList` text NOT NULL, + PRIMARY KEY (`id`), + KEY `account` (`account`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_usergroup` ( + `account` char(30) NOT NULL DEFAULT '', + `group` mediumint(8) unsigned NOT NULL DEFAULT '0', + UNIQUE KEY `account` (`account`,`group`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_userquery` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `account` char(30) NOT NULL, + `module` varchar(30) NOT NULL, + `title` varchar(90) NOT NULL, + `form` text NOT NULL, + `sql` text NOT NULL, + `shortcut` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `account` (`account`), + KEY `module` (`module`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_usertpl` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `account` char(30) NOT NULL, + `type` char(30) NOT NULL, + `title` varchar(150) NOT NULL, + `content` text NOT NULL, + `public` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `account` (`account`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_userview` ( + `account` char(30) NOT NULL, + `products` mediumtext NOT NULL, + `projects` mediumtext NOT NULL, + UNIQUE KEY `account` (`account`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE `zt_webhook` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `type` varchar(10) NOT NULL DEFAULT 'default', + `name` varchar(50) NOT NULL, + `url` varchar(255) NOT NULL, + `domain` varchar(255) NOT NULL, + `contentType` varchar(30) NOT NULL DEFAULT 'application/json', + `sendType` enum('sync','async') NOT NULL DEFAULT 'sync', + `products` text NOT NULL, + `projects` text NOT NULL, + `params` varchar(100) NOT NULL, + `actions` text NOT NULL, + `desc` text NOT NULL, + `createdBy` varchar(30) NOT NULL, + `createdDate` datetime NOT NULL, + `editedBy` varchar(30) NOT NULL, + `editedDate` datetime NOT NULL, + `deleted` enum('0','1') NOT NULL DEFAULT '0', + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 293cc42f50..19c85fcc6c 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,41 @@ +2019-05-08 11.5.stable +完成的需求: +3505 产品和项目增加填写备注功能 +3557 增加动态的显示内容的过滤功能 +3602 xxb代码独立,调整禅道集成喧喧的代码 +3608 优化多平台下面的排版 +3612 打开首次登录修改密码后,使用客户端可以正常登录禅道 +3627 调整接口的调用逻辑 +3637 计划关联需求时弹窗里面的按钮保持居中对齐 +3638 创建需求时的优先级按照1234的顺序排列 +3639 创建操作增加类似提bug页面的模板功能 +3640 创建文档的时候增加动作记录,记录上传附件的动作,记录上传者和文件名 +3650 需求复制页面不要弹窗 +3652 调整Bug添加页面操作系统控件的宽度 +3656 更改禅道登录页的PMS 英文 +3664 多人任务的工时计算逻辑需要调整 +3668 任务详情页面增加创建子任务的链接 +3669 父子任务间关联、取消动作记录到父任务历史记录中 +3672 子任务维护的内容可以在父任务显示 +修复的bug: +2432 官方docker镜像启动问题 +2470 测试管理方式创建项目版本功能异常 +2479 项目激活顺延任务的起止日期不生效 +2489 对客户端中消息直接创建需求,需求来源选择不上 +2490 产品项目编辑修改新负责人无法访问产品项目 +2491 后台下载喧喧服务端和下载配置文件没有反应 +2492 测试单报表统计问题 +2493 禅道无法记录客户端日志信息 +2494 去掉后台"捐助我们"的入口 +2495 源码安装mysql8报错 +2496 取消路线图权限后,还是在可以在产品概况页面看到 +2497 zbox中的数据库adminer访问存在问题 +2501 报表默认显示功能异常 +2505 bug统计报表问题 +2506 版本关联需求页面搜索会显示已经关联的需求页面 +2510 待办添加备注后,窗口关闭按钮消失 +2512 需求批量编辑状态不生效 + 2019-03-25 11.4.1 完善细节,修复bug。 完成相关调整支持专业版里相关功能。 diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php index 11e7d88f13..725b62d782 100755 --- a/module/action/lang/zh-tw.php +++ b/module/action/lang/zh-tw.php @@ -129,6 +129,14 @@ $lang->action->desc->diff2 = '修改了 %s, $lang->action->desc->diff3 = '將檔案名 %s 改為 %s 。' . "\n"; $lang->action->desc->linked2bug = '$date 由 $actor 關聯到版本 $extra'; +/* 子任務修改父任務的歷史操作記錄 */ +$lang->action->desc->createchildren = '$date, 由 $actor 創建子任務 $extra。' . "\n"; +$lang->action->desc->linkchildtask = '$date, 由 $actor 關聯子任務 $extra。' . "\n"; +$lang->action->desc->linkchildtask = '$date, 由 $actor 關聯子任務 $extra。' . "\n"; +$lang->action->desc->unlinkchildrentask = '$date, 由 $actor 移除子任務 $extra。' . "\n"; +$lang->action->desc->linkparenttask = '$date, 由 $actor 關聯到父任務 $extra。' . "\n"; +$lang->action->desc->unlinkparenttask = '$date, 由 $actor 從父任務$extra取消關聯。' . "\n"; + /* 關聯用例和移除用例時的歷史操作記錄。*/ $lang->action->desc->linkrelatedcase = '$date, 由 $actor 關聯相關用例 $extra。' . "\n"; $lang->action->desc->unlinkrelatedcase = '$date, 由 $actor 移除相關用例 $extra。' . "\n"; @@ -193,6 +201,161 @@ $lang->action->label->logout = "退出登錄"; $lang->action->label->deleteestimate = "刪除了工時"; $lang->action->label->linked2build = "關聯了"; $lang->action->label->linked2bug = "關聯了"; +$lang->action->label->linkchildtask = "關聯子任務"; +$lang->action->label->unlinkchildrentask = "取消關聯子任務"; +$lang->action->label->linkparenttask = "關聯到父任務"; +$lang->action->label->unlinkparenttask = "從父任務取消關聯"; +$lang->action->label->batchcreate = "批量創建任務"; +$lang->action->label->createchildren = "創建子任務"; +$lang->action->label->managed = "維護"; + +/* 動態信息按照對象分組 */ +$lang->action->dynamicAction = new stdclass; +$lang->action->dynamicAction->todo['opened'] = '創建待辦'; +$lang->action->dynamicAction->todo['edited'] = '編輯待辦'; +$lang->action->dynamicAction->todo['erased'] = '刪除待辦'; +$lang->action->dynamicAction->todo['finished'] = '完成待辦'; +$lang->action->dynamicAction->todo['activated'] = '激活待辦'; +$lang->action->dynamicAction->todo['closed'] = '關閉待辦'; +$lang->action->dynamicAction->todo['deleted'] = '刪除待辦'; +$lang->action->dynamicAction->todo['assigned'] = '指派待辦'; +$lang->action->dynamicAction->todo['undeleted'] = '還原待辦'; +$lang->action->dynamicAction->todo['hidden'] = '隱藏待辦'; + +$lang->action->dynamicAction->product['opened'] = '創建' . $lang->productCommon; +$lang->action->dynamicAction->product['edited'] = '編輯' . $lang->productCommon; +$lang->action->dynamicAction->product['deleted'] = '刪除' . $lang->productCommon; +$lang->action->dynamicAction->product['closed'] = '關閉' . $lang->productCommon; +$lang->action->dynamicAction->product['undeleted'] = '還原' . $lang->productCommon; +$lang->action->dynamicAction->product['hidden'] = '隱藏' . $lang->productCommon; +$lang->action->dynamicAction->productplan['opened'] = '創建計劃'; +$lang->action->dynamicAction->productplan['edited'] = '編輯計劃'; +$lang->action->dynamicAction->release['opened'] = '創建發佈'; +$lang->action->dynamicAction->release['edited'] = '編輯發佈'; +$lang->action->dynamicAction->release['changestatus'] = '修改發佈狀態'; +$lang->action->dynamicAction->release['undeleted'] = '還原發佈'; +$lang->action->dynamicAction->release['hidden'] = '隱藏發佈'; +$lang->action->dynamicAction->story['opened'] = '創建需求'; +$lang->action->dynamicAction->story['edited'] = '編輯需求'; +$lang->action->dynamicAction->story['activated'] = '激活需求'; +$lang->action->dynamicAction->story['reviewed'] = '評審需求'; +$lang->action->dynamicAction->story['closed'] = '關閉需求'; +$lang->action->dynamicAction->story['assigned'] = '指派需求'; +$lang->action->dynamicAction->story['changed'] = '變更需求'; +$lang->action->dynamicAction->story['linked2plan'] = '需求關聯計劃'; +$lang->action->dynamicAction->story['unlinkedfromplan'] = '計劃移除需求'; +$lang->action->dynamicAction->story['linked2release'] = '需求關聯發佈'; +$lang->action->dynamicAction->story['unlinkedfromrelease'] = '發佈移除需求'; +$lang->action->dynamicAction->story['linked2build'] = '需求關聯版本'; +$lang->action->dynamicAction->story['unlinkedfrombuild'] = '版本移除需求'; +$lang->action->dynamicAction->story['unlinkedfromproject'] = '移除項目'; +$lang->action->dynamicAction->story['undeleted'] = '還原需求'; +$lang->action->dynamicAction->story['hidden'] = '隱藏需求'; + +$lang->action->dynamicAction->project['opened'] = '創建' . $lang->projectCommon; +$lang->action->dynamicAction->project['edited'] = '編輯' . $lang->projectCommon; +$lang->action->dynamicAction->project['deleted'] = '刪除' . $lang->projectCommon; +$lang->action->dynamicAction->project['started'] = '開始' . $lang->projectCommon; +$lang->action->dynamicAction->project['delayed'] = '延期' . $lang->projectCommon; +$lang->action->dynamicAction->project['suspended'] = '掛起' . $lang->projectCommon; +$lang->action->dynamicAction->project['activated'] = '激活' . $lang->projectCommon; +$lang->action->dynamicAction->project['closed'] = '關閉' . $lang->projectCommon; +$lang->action->dynamicAction->project['managed'] = '維護' . $lang->projectCommon; +$lang->action->dynamicAction->project['undeleted'] = '還原' . $lang->projectCommon; +$lang->action->dynamicAction->project['hidden'] = '隱藏' . $lang->projectCommon; +$lang->action->dynamicAction->project['moved'] = '導入任務'; +$lang->action->dynamicAction->task['opened'] = '創建任務'; +$lang->action->dynamicAction->task['edited'] = '編輯任務'; +$lang->action->dynamicAction->task['commented'] = '備註任務'; +$lang->action->dynamicAction->task['assigned'] = '指派任務'; +$lang->action->dynamicAction->task['confirmed'] = '確認需求變更'; +$lang->action->dynamicAction->task['started'] = '開始任務'; +$lang->action->dynamicAction->task['finished'] = '完成任務'; +$lang->action->dynamicAction->task['recordestimate'] = '記錄工時'; +$lang->action->dynamicAction->task['editestimate'] = '編輯工時'; +$lang->action->dynamicAction->task['deleteestimate'] = '刪除工時'; +$lang->action->dynamicAction->task['paused'] = '暫停任務'; +$lang->action->dynamicAction->task['closed'] = '關閉任務'; +$lang->action->dynamicAction->task['canceled'] = '取消任務'; +$lang->action->dynamicAction->task['activated'] = '激活任務'; +$lang->action->dynamicAction->task['createchildren'] = '創建子任務'; +$lang->action->dynamicAction->task['unlinkparenttask'] = '從父任務取消關聯'; +$lang->action->dynamicAction->task['linkparenttask'] = '關聯到父任務'; +$lang->action->dynamicAction->task['linkchildtask'] = '關聯子任務'; +$lang->action->dynamicAction->task['undeleted'] = '還原任務'; +$lang->action->dynamicAction->task['hidden'] = '隱藏任務'; +$lang->action->dynamicAction->task['svncommited'] = 'SVN提交'; +$lang->action->dynamicAction->task['gitcommited'] = 'GIT提交'; +$lang->action->dynamicAction->build['opened'] = '創建版本'; +$lang->action->dynamicAction->build['edited'] = '編輯版本'; + +$lang->action->dynamicAction->bug['opened'] = '創建Bug'; +$lang->action->dynamicAction->bug['edited'] = '編輯Bug'; +$lang->action->dynamicAction->bug['activated'] = '激活Bug'; +$lang->action->dynamicAction->bug['assigned'] = '指派Bug'; +$lang->action->dynamicAction->bug['closed'] = '關閉Bug'; +$lang->action->dynamicAction->bug['bugconfirmed'] = '確認Bug'; +$lang->action->dynamicAction->bug['resolved'] = '解決Bug'; +$lang->action->dynamicAction->bug['undeleted'] = '還原Bug'; +$lang->action->dynamicAction->bug['hidden'] = '隱藏Bug'; +$lang->action->dynamicAction->bug['confirmed'] = '確認需求變更'; +$lang->action->dynamicAction->bug['tostory'] = '轉需求'; +$lang->action->dynamicAction->bug['totask'] = '轉任務'; +$lang->action->dynamicAction->bug['linked2plan'] = 'Bug關聯計劃'; +$lang->action->dynamicAction->bug['unlinkedfromplan'] = '計劃移除Bug'; +$lang->action->dynamicAction->bug['linked2release'] = 'Bug關聯發佈'; +$lang->action->dynamicAction->bug['unlinkedfromrelease'] = '發佈移除Bug'; +$lang->action->dynamicAction->bug['linked2bug'] = 'Bug關聯版本'; +$lang->action->dynamicAction->bug['unlinkedfrombuild'] = '版本移除Bug'; +$lang->action->dynamicAction->testtask['opened'] = '創建測試單'; +$lang->action->dynamicAction->testtask['edited'] = '編輯測試單'; +$lang->action->dynamicAction->testtask['started'] = '啟動測試單'; +$lang->action->dynamicAction->testtask['activated'] = '激活測試單'; +$lang->action->dynamicAction->testtask['closed'] = '完成測試單'; +$lang->action->dynamicAction->testtask['blocked'] = '阻塞測試單'; +$lang->action->dynamicAction->case['opened'] = '創建用例'; +$lang->action->dynamicAction->case['edited'] = '編輯用例'; +$lang->action->dynamicAction->case['deleted'] = '刪除用例'; +$lang->action->dynamicAction->case['undeleted'] = '還原用例'; +$lang->action->dynamicAction->case['hidden'] = '隱藏用例'; +$lang->action->dynamicAction->case['reviewed'] = '評審用例'; +$lang->action->dynamicAction->case['confirmed'] = '確認需求變更'; +$lang->action->dynamicAction->case['fromlib'] = '從用例庫導入'; +$lang->action->dynamicAction->testreport['opened'] = '創建測試報告'; +$lang->action->dynamicAction->testreport['edited'] = '編輯測試報告'; +$lang->action->dynamicAction->testreport['deleted'] = '刪除測試報告'; +$lang->action->dynamicAction->testreport['undeleted'] = '還原測試報告'; +$lang->action->dynamicAction->testreport['hidden'] = '隱藏測試報告'; +$lang->action->dynamicAction->testsuite['opened'] = '創建測試套件'; +$lang->action->dynamicAction->testsuite['edited'] = '編輯測試套件'; +$lang->action->dynamicAction->testsuite['deleted'] = '刪除測試套件'; +$lang->action->dynamicAction->testsuite['undeleted'] = '還原測試套件'; +$lang->action->dynamicAction->testsuite['hidden'] = '隱藏測試套件'; +$lang->action->dynamicAction->caselib['opened'] = '創建用例庫'; +$lang->action->dynamicAction->caselib['edited'] = '編輯用例庫'; +$lang->action->dynamicAction->caselib['deleted'] = '刪除用例庫'; +$lang->action->dynamicAction->caselib['undeleted'] = '還原用例庫'; +$lang->action->dynamicAction->caselib['hidden'] = '隱藏用例庫'; + +$lang->action->dynamicAction->doclib['created'] = '創建文檔庫'; +$lang->action->dynamicAction->doclib['edited'] = '編輯文檔庫'; +$lang->action->dynamicAction->doc['created'] = '創建文檔'; +$lang->action->dynamicAction->doc['edited'] = '編輯文檔'; +$lang->action->dynamicAction->doc['commented'] = '備註文檔'; +$lang->action->dynamicAction->doc['deleted'] = '刪除文檔'; +$lang->action->dynamicAction->doc['undeleted'] = '還原文檔'; +$lang->action->dynamicAction->doc['hidden'] = '隱藏文檔'; + +$lang->action->dynamicAction->user['created'] = '創建用戶'; +$lang->action->dynamicAction->user['edited'] = '編輯用戶'; +$lang->action->dynamicAction->user['login'] = '用戶登錄'; +$lang->action->dynamicAction->user['logout'] = '用戶退出'; +$lang->action->dynamicAction->user['undeleted'] = '還原用戶'; +$lang->action->dynamicAction->user['hidden'] = '隱藏用戶'; +$lang->action->dynamicAction->user['loginxuanxuan'] = '登錄客戶端'; + +$lang->action->dynamicAction->entry['created'] = '添加應用'; +$lang->action->dynamicAction->entry['edited'] = '編輯應用'; /* 用來生成相應對象的連結。*/ $lang->action->label->product = $lang->productCommon . '|product|view|productID=%s'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 84a4325f05..3a62992548 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -94,13 +94,6 @@ $lang->preShortcutKey = '[快捷鍵:←]'; $lang->nextShortcutKey = '[快捷鍵:→]'; $lang->backShortcutKey = '[快捷鍵:Alt+↑]'; -$lang->saveTemplate = '保存模板'; -$lang->setPublic = '設為公共模板'; -$lang->deleteTemplate = '刪除模板'; -$lang->setTemplateTitle = '請輸入模板標題'; -$lang->applyTemplate = '應用模板'; -$lang->confirmDeleteTemplate = '您確認要刪除該模板嗎?'; - $lang->select = '選擇'; $lang->selectAll = '全選'; $lang->selectReverse = '反選'; @@ -454,10 +447,13 @@ $lang->menugroup->user = 'company'; $lang->menugroup->group = 'company'; $lang->menugroup->bug = 'qa'; $lang->menugroup->testcase = 'qa'; +$lang->menugroup->case = 'qa'; +$lang->menugroup->caselib = 'qa'; $lang->menugroup->testtask = 'qa'; $lang->menugroup->testsuite = 'qa'; $lang->menugroup->caselib = 'qa'; $lang->menugroup->testreport = 'qa'; +$lang->menugroup->doclib = 'doc'; $lang->menugroup->people = 'company'; $lang->menugroup->dept = 'company'; $lang->menugroup->todo = 'my'; @@ -866,6 +862,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') /* Adjust menu group. */ $lang->menugroup->bug = 'bug'; $lang->menugroup->testcase = 'testcase'; + $lang->menugroup->case = 'testcase'; $lang->menugroup->testtask = 'testtask'; $lang->menugroup->testsuite = 'testsuite'; $lang->menugroup->testreport = 'testtask'; diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php index 46d24a63fc..ceef327930 100644 --- a/module/doc/lang/zh-tw.php +++ b/module/doc/lang/zh-tw.php @@ -41,6 +41,7 @@ $lang->doc->extension = '類型'; $lang->doc->size = '大小'; $lang->doc->download = '下載'; $lang->doc->acl = '權限'; +$lang->doc->fileName = '附件'; $lang->doc->groups = '分組'; $lang->doc->users = '用戶'; $lang->doc->item = '項'; diff --git a/module/entry/lang/zh-tw.php b/module/entry/lang/zh-tw.php index 7c5a5dd1a4..4a213ef557 100644 --- a/module/entry/lang/zh-tw.php +++ b/module/entry/lang/zh-tw.php @@ -46,3 +46,4 @@ $lang->entry->errmsg['SESSION_VERIFY_FAILED'] = 'session驗證失敗'; $lang->entry->errmsg['IP_DENIED'] = '該IP被限制訪問'; $lang->entry->errmsg['ACCOUNT_UNBOUND'] = '未綁定用戶'; $lang->entry->errmsg['EMPTY_ENTRY'] = '應用不存在'; +$lang->entry->errmsg['CALLED_TIME'] = 'Token已失效'; diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php index 6582b93c40..4b5b4aae4a 100644 --- a/module/group/lang/zh-tw.php +++ b/module/group/lang/zh-tw.php @@ -24,10 +24,11 @@ $lang->group->manageMember = '成員維護'; $lang->group->confirmDelete = '您確定刪除該用戶分組嗎?'; $lang->group->successSaved = '成功保存'; $lang->group->errorNotSaved = '沒有保存,請確認選擇了權限數據。'; -$lang->group->viewList = '允許訪問視圖'; -$lang->group->productList = '允許訪問' . $lang->productCommon; -$lang->group->projectList = '允許訪問' . $lang->projectCommon; -$lang->group->noticeVisit = '空代表訪問沒有訪問限制'; +$lang->group->viewList = '可訪問視圖'; +$lang->group->productList = '可訪問' . $lang->productCommon; +$lang->group->projectList = '可訪問' . $lang->projectCommon; +$lang->group->dynamic = '可查看動態'; +$lang->group->noticeVisit = '空代表沒有訪問限制'; $lang->group->id = '編號'; $lang->group->name = '分組名稱'; diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index a989b9052e..4a6f1d11d2 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.stable'] = '2019-05-08'; $lang->misc->releaseDate['11.4.1'] = '2019-04-08'; $lang->misc->releaseDate['11.4.stable'] = '2019-03-25'; $lang->misc->releaseDate['11.3.stable'] = '2019-02-27'; @@ -101,6 +102,10 @@ $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.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' => ''); + $lang->misc->feature->all['11.4.1'][] = array('title'=>'Optimize details and fix bug.', 'desc' => ''); $lang->misc->feature->all['11.4.stable'][] = array('title'=>'Optimize details and fix bug.', 'desc' => '

Enhanced test management.

Optimized the UI of Plan, Release, and Build linked stories and bugs.

Customize the feature whether to display files in child category.

Optimize details and fix bug.

'); diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 5ad7e19b89..2a59180a14 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.stable'] = '2019-05-08'; $lang->misc->releaseDate['11.4.1'] = '2019-04-08'; $lang->misc->releaseDate['11.4.stable'] = '2019-03-25'; $lang->misc->releaseDate['11.3.stable'] = '2019-02-27'; @@ -101,6 +102,10 @@ $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.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' => ''); + $lang->misc->feature->all['11.4.1'][] = array('title'=>'完善细节,修复Bug', 'desc' => ''); $lang->misc->feature->all['11.4.stable'][] = array('title'=>'完善细节,修复Bug', 'desc' => '

增强测试任务管理

优化计划、发布、版本关联需求和bug的交互

文档库可以自定义是否显示子分类里的文档

修复bug,完善细节

'); diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php index a2dd2544cc..f009e51d57 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.stable'] = '2019-05-08'; $lang->misc->releaseDate['11.4.1'] = '2019-04-08'; $lang->misc->releaseDate['11.4.stable'] = '2019-03-25'; $lang->misc->releaseDate['11.3.stable'] = '2019-02-27'; @@ -101,6 +102,10 @@ $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.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' => ''); + $lang->misc->feature->all['11.4.1'][] = array('title'=>'完善細節,修復Bug', 'desc' => ''); $lang->misc->feature->all['11.4.stable'][] = array('title'=>'完善細節,修復Bug', 'desc' => '

增強測試任務管理

優化計劃、發佈、版本關聯需求和bug的交互

文檔庫可以自定義是否顯示子分類裡的文檔

修復bug,完善細節

'); diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php index 9045312fea..7a2e547ace 100644 --- a/module/story/lang/zh-tw.php +++ b/module/story/lang/zh-tw.php @@ -68,6 +68,7 @@ $lang->story->hour = '小時'; $lang->story->status = '當前狀態'; $lang->story->stage = '所處階段'; $lang->story->stageAB = '階段'; +$lang->story->stagedBy = '設置階段者'; $lang->story->mailto = '抄送給'; $lang->story->openedBy = '由誰創建'; $lang->story->openedDate = '創建日期'; diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php index 15df952193..9b1a00a93f 100644 --- a/module/task/lang/zh-tw.php +++ b/module/task/lang/zh-tw.php @@ -274,8 +274,3 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = '關閉原因'; $lang->task->report->finishedTasksPerDay->type = 'bar'; $lang->task->report->finishedTasksPerDay->graph->xAxisName = '日期'; - -$lang->task->action = new stdclass(); -$lang->task->action->batchcreate = array('main' => '$date, 由 $actor 創建子任務 。'); -$lang->task->action->unlink = array('main' => '$date, 由 $actor 取消關聯父任務 。'); -$lang->task->action->linkto = array('main' => '$date, 由 $actor 關聯到父任務 。'); diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php index 16d0fe75a2..492f645ab0 100644 --- a/module/upgrade/lang/version.php +++ b/module/upgrade/lang/version.php @@ -105,3 +105,4 @@ $lang->upgrade->fromVersions['11_1'] = '11.1'; $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'; diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php index 08ab754eda..41a4043c81 100644 --- a/module/user/lang/zh-tw.php +++ b/module/user/lang/zh-tw.php @@ -48,28 +48,35 @@ $lang->user->originalPassword = '原密碼'; $lang->user->verifyPassword = '您的系統登錄密碼'; $lang->user->resetPassword = '忘記密碼'; -$lang->user->index = "用戶視圖首頁"; -$lang->user->view = "用戶詳情"; -$lang->user->create = "添加用戶"; -$lang->user->batchCreate = "批量添加用戶"; -$lang->user->edit = "編輯用戶"; -$lang->user->batchEdit = "批量編輯"; -$lang->user->unlock = "解鎖用戶"; -$lang->user->delete = "刪除用戶"; -$lang->user->unbind = "解除然之綁定"; -$lang->user->login = "用戶登錄"; -$lang->user->mobileLogin = "手機訪問"; -$lang->user->editProfile = "修改檔案"; -$lang->user->deny = "訪問受限"; -$lang->user->confirmDelete = "您確定刪除該用戶嗎?"; -$lang->user->confirmUnlock = "您確定解除該用戶的鎖定狀態嗎?"; -$lang->user->confirmUnbind = "您確定解除該用戶跟然之的綁定嗎?"; -$lang->user->relogin = "重新登錄"; -$lang->user->asGuest = "遊客訪問"; -$lang->user->goback = "返回前一頁"; -$lang->user->deleted = '(已刪除)'; -$lang->user->search = '搜索'; -$lang->user->setPublicTemplate = '設為公共模板'; +$lang->user->index = "用戶視圖首頁"; +$lang->user->view = "用戶詳情"; +$lang->user->create = "添加用戶"; +$lang->user->batchCreate = "批量添加用戶"; +$lang->user->edit = "編輯用戶"; +$lang->user->batchEdit = "批量編輯"; +$lang->user->unlock = "解鎖用戶"; +$lang->user->delete = "刪除用戶"; +$lang->user->unbind = "解除然之綁定"; +$lang->user->login = "用戶登錄"; +$lang->user->mobileLogin = "手機訪問"; +$lang->user->editProfile = "修改檔案"; +$lang->user->deny = "訪問受限"; +$lang->user->confirmDelete = "您確定刪除該用戶嗎?"; +$lang->user->confirmUnlock = "您確定解除該用戶的鎖定狀態嗎?"; +$lang->user->confirmUnbind = "您確定解除該用戶跟然之的綁定嗎?"; +$lang->user->relogin = "重新登錄"; +$lang->user->asGuest = "遊客訪問"; +$lang->user->goback = "返回前一頁"; +$lang->user->deleted = '(已刪除)'; +$lang->user->search = '搜索'; + +$lang->user->saveTemplate = '保存模板'; +$lang->user->setPublic = '設為公共模板'; +$lang->user->deleteTemplate = '刪除模板'; +$lang->user->setTemplateTitle = '請輸入模板標題'; +$lang->user->applyTemplate = '應用模板'; +$lang->user->confirmDeleteTemplate = '您確認要刪除該模板嗎?'; +$lang->user->setPublicTemplate = '設為公共模板'; $lang->user->profile = '檔案'; $lang->user->project = $lang->projectCommon; diff --git a/tools/check.php b/tools/check.php index 3723ba30f9..a74228fa09 100755 --- a/tools/check.php +++ b/tools/check.php @@ -111,6 +111,9 @@ $whiteList[] = 'webhook-edit'; $whiteList[] = 'webhook-delete'; $whiteList[] = 'webhook-log'; $whiteList[] = 'webhook-asyncsend'; +$whiteList[] = 'testreport-setchartdatas'; +$whiteList[] = 'chat-login'; +$whiteList[] = 'entry-visit'; /* checking actions of every module. */ echo '-------------action checking-----------------' . "\n";