diff --git a/bin/check.php b/bin/check.php index 59bebd72e4..f9fb4fc3e2 100755 --- a/bin/check.php +++ b/bin/check.php @@ -30,6 +30,7 @@ $whiteList[] = 'project-sendmail'; $whiteList[] = 'release-commonaction'; $whiteList[] = 'task-commonaction'; $whiteList[] = 'task-sendmail'; +$whiteList[] = 'testtask-sendmail'; $whiteList[] = 'user-login'; $whiteList[] = 'user-deny'; $whiteList[] = 'user-logout'; diff --git a/db/zentao.sql b/db/zentao.sql index 6c5fa3fda5..a1add4577f 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -640,6 +640,15 @@ CREATE TABLE IF NOT EXISTS `zt_user` ( UNIQUE KEY `account` (`account`), KEY `company` (`company`,`dept`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +-- DROP TABLE IF EXISTS `zt_userContact`; +CREATE TABLE IF NOT EXISTS `zt_userContact` ( + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `company` mediumint(8) unsigned NOT NULL, + `account` char(30) NOT NULL, + `listName` varchar(60) NOT NULL, + `userList` text NOT NULL, + PRIMARY KEY (`id`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_userGroup`; CREATE TABLE IF NOT EXISTS `zt_userGroup` ( `company` mediumint(8) unsigned NOT NULL, diff --git a/module/svn/config.php b/module/svn/config.php index 43ed023788..0099c1e402 100644 --- a/module/svn/config.php +++ b/module/svn/config.php @@ -15,6 +15,7 @@ * $config->svn->repos['pms']['password'] = 'pass'; * */ +$config->svn = new stdClass(); $config->svn->encodings = 'utf-8, gbk'; $config->svn->client = ''; diff --git a/module/webapp/config.php b/module/webapp/config.php index df36ea57a9..d125eb2392 100644 --- a/module/webapp/config.php +++ b/module/webapp/config.php @@ -1,5 +1,7 @@ webapp = new stdClass(); $config->webapp->url = 'http://www.zentao.com'; $config->webapp->apiRoot = $config->webapp->url . '/webapp-'; +$config->webapp->create = new stdClass(); $config->webapp->create->requiredFields = 'name,url,target';