From 4e84e5cbd71258d7ec62af8e6a084430f7dbc330 Mon Sep 17 00:00:00 2001 From: zhangzilong Date: Thu, 17 Feb 2022 17:35:11 +0800 Subject: [PATCH 1/6] * Finish task #49284. --- db/update16.4.sql | 2 ++ db/zentao.sql | 3 ++- module/bug/config.php | 2 ++ module/bug/model.php | 2 +- module/execution/config.php | 2 ++ module/product/config.php | 2 ++ module/story/config.php | 5 +++++ module/story/lang/zh-cn.php | 1 + module/story/model.php | 1 + module/task/config.php | 5 +++++ module/task/lang/zh-cn.php | 1 + module/task/model.php | 1 + module/upgrade/model.php | 26 ++++++++++++++++++++++++++ 13 files changed, 51 insertions(+), 2 deletions(-) diff --git a/db/update16.4.sql b/db/update16.4.sql index 1868e6b66c..b3d36f62ff 100644 --- a/db/update16.4.sql +++ b/db/update16.4.sql @@ -16,3 +16,5 @@ ALTER TABLE `zt_block` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `ac ALTER TABLE `zt_block` DROP INDEX `account_module_type_order`, ADD UNIQUE `account_vision_module_type_order` (`account`, `vision`, `module`, `type`, `order`); ALTER TABLE `zt_effort` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`; ALTER TABLE `zt_story` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`; +ALTER TABLE `zt_story` ADD `activatedDate` datetime NOT NULL DEFAULT '0000-00-00' AFTER `deleted`; +ALTER TABLE `zt_task` MODIFY `activatedDate` datetime NOT NULL; diff --git a/db/zentao.sql b/db/zentao.sql index 0b860bcaca..287a433090 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1293,6 +1293,7 @@ CREATE TABLE IF NOT EXISTS `zt_story` ( `closedBy` varchar(30) NOT NULL default '', `closedDate` datetime NOT NULL, `closedReason` varchar(30) NOT NULL, + `activatedDate` datetime NOT NULL, `toBug` mediumint(8) unsigned NOT NULL, `childStories` varchar(255) NOT NULL, `linkStories` varchar(255) NOT NULL, @@ -1395,7 +1396,7 @@ CREATE TABLE IF NOT EXISTS `zt_task` ( `closedReason` varchar(30) NOT NULL, `lastEditedBy` varchar(30) NOT NULL, `lastEditedDate` datetime NOT NULL, - `activatedDate` date NOT NULL, + `activatedDate` datetime NOT NULL, `repo` mediumint(8) unsigned NOT NULL, `mr` mediumint(8) unsigned NOT NULL, `entry` varchar(255) NOT NULL, diff --git a/module/bug/config.php b/module/bug/config.php index 034f24bc42..4d51c0c15b 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -105,6 +105,7 @@ $config->bug->search['fields']['resolvedDate'] = $lang->bug->resolvedDate; $config->bug->search['fields']['closedDate'] = $lang->bug->closedDate; $config->bug->search['fields']['lastEditedDate'] = $lang->bug->lastEditedDateAB; $config->bug->search['fields']['deadline'] = $lang->bug->deadline; +$config->bug->search['fields']['activatedDate'] = $lang->bug->activatedDate; $config->bug->search['params']['title'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->bug->search['params']['keywords'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); @@ -149,6 +150,7 @@ $config->bug->search['params']['resolvedDate'] = array('operator' => '=', $config->bug->search['params']['closedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); $config->bug->search['params']['lastEditedDate']= array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); $config->bug->search['params']['deadline'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->bug->search['params']['activatedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); $config->bug->datatable = new stdclass(); $config->bug->datatable->defaultField = array('id', 'severity', 'pri', 'confirmed', 'title', 'status', 'openedBy', 'openedDate', 'assignedTo', 'resolution', 'actions'); diff --git a/module/bug/model.php b/module/bug/model.php index 65a8a45bcb..fc0121c831 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -1365,7 +1365,7 @@ class bugModel extends model if($browseType == 'bySearch') { $bug = $this->getById($bugID); - $bugIDList = $bug->id . ',' . $bug->linkBug; + $bugIDList = $bug->id . ',' . $bug->linkBug; $bugs2Link = $this->getBySearch($bug->product, 'all', $queryID, 'id', $bugIDList, $pager); return $bugs2Link; } diff --git a/module/execution/config.php b/module/execution/config.php index 69eeeb5f7d..0c20808ff2 100644 --- a/module/execution/config.php +++ b/module/execution/config.php @@ -78,6 +78,7 @@ $config->execution->search['fields']['finishedDate'] = $lang->task->finishedDa $config->execution->search['fields']['closedDate'] = $lang->task->closedDate; $config->execution->search['fields']['canceledDate'] = $lang->task->canceledDate; $config->execution->search['fields']['lastEditedDate'] = $lang->task->lastEditedDate; +$config->execution->search['fields']['activatedDate'] = $lang->task->activatedDate; $config->execution->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->execution->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->statusList); @@ -112,6 +113,7 @@ $config->execution->search['params']['finishedDate'] = array('operator' => '=' $config->execution->search['params']['closedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); $config->execution->search['params']['canceledDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); $config->execution->search['params']['lastEditedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->execution->search['params']['activatedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); $config->printKanban = new stdClass(); $config->printKanban->col['story'] = 1; diff --git a/module/product/config.php b/module/product/config.php index 2e04f57f05..16854ff7a3 100644 --- a/module/product/config.php +++ b/module/product/config.php @@ -51,6 +51,7 @@ $config->product->search['fields']['reviewedDate'] = $lang->story->reviewedDat $config->product->search['fields']['assignedDate'] = $lang->story->assignedDate; $config->product->search['fields']['closedDate'] = $lang->story->closedDate; $config->product->search['fields']['lastEditedDate'] = $lang->story->lastEditedDate; +$config->product->search['fields']['activatedDate'] = $lang->story->activatedDate; $config->product->search['params']['title'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->product->search['params']['keywords'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); @@ -84,6 +85,7 @@ $config->product->search['params']['reviewedDate'] = array('operator' => '=', $config->product->search['params']['assignedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); $config->product->search['params']['closedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); $config->product->search['params']['lastEditedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->product->search['params']['activatedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); $config->product->create = new stdclass(); $config->product->edit = new stdclass(); diff --git a/module/story/config.php b/module/story/config.php index 67bec65085..6c6dc77ffb 100644 --- a/module/story/config.php +++ b/module/story/config.php @@ -166,6 +166,11 @@ $config->story->datatable->fieldList['lastEditedDate']['fixed'] = 'no'; $config->story->datatable->fieldList['lastEditedDate']['width'] = '90'; $config->story->datatable->fieldList['lastEditedDate']['required'] = 'no'; +$config->story->datatable->fieldList['activatedDate']['title'] = 'activatedDate'; +$config->story->datatable->fieldList['activatedDate']['fixed'] = 'no'; +$config->story->datatable->fieldList['activatedDate']['width'] = '90'; +$config->story->datatable->fieldList['activatedDate']['required'] = 'no'; + $config->story->datatable->fieldList['feedbackBy']['title'] = 'feedbackBy'; $config->story->datatable->fieldList['feedbackBy']['fixed'] = 'no'; $config->story->datatable->fieldList['feedbackBy']['width'] = '100'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 21ae4f5184..4a704cff40 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -126,6 +126,7 @@ $lang->story->rejectedReason = '拒绝原因'; $lang->story->reviewedBy = '由谁评审'; $lang->story->reviewers = '评审人员'; $lang->story->reviewedDate = '评审时间'; +$lang->story->activatedDate = '激活日期'; $lang->story->version = '版本号'; $lang->story->feedbackBy = '反馈者'; $lang->story->notifyEmail = '通知邮箱'; diff --git a/module/story/model.php b/module/story/model.php index b5a9453a7a..170873cb62 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1968,6 +1968,7 @@ class storyModel extends model ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) ->setDefault('assignedDate', $now) + ->setDefault('activatedDate', $now) ->remove('comment') ->get(); $this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq($storyID)->exec(); diff --git a/module/task/config.php b/module/task/config.php index 17bb90c08f..317f4b44a3 100644 --- a/module/task/config.php +++ b/module/task/config.php @@ -189,6 +189,11 @@ $config->task->datatable->fieldList['lastEditedDate']['fixed'] = 'no'; $config->task->datatable->fieldList['lastEditedDate']['width'] = '120'; $config->task->datatable->fieldList['lastEditedDate']['required'] = 'no'; +$config->task->datatable->fieldList['activatedDate']['title'] = 'activatedDate'; +$config->task->datatable->fieldList['activatedDate']['fixed'] = 'no'; +$config->task->datatable->fieldList['activatedDate']['width'] = '90'; +$config->task->datatable->fieldList['activatedDate']['required'] = 'no'; + $config->task->datatable->fieldList['actions']['title'] = 'actions'; $config->task->datatable->fieldList['actions']['fixed'] = 'right'; $config->task->datatable->fieldList['actions']['width'] = '180'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 4fb358e04c..12aa712844 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -40,6 +40,7 @@ $lang->task->cancel = "取消"; $lang->task->cancelAction = "取消任务"; $lang->task->activateAction = "激活任务"; $lang->task->activate = "激活"; +$lang->task->activatedDate = "激活日期"; $lang->task->export = "导出数据"; $lang->task->exportAction = "导出任务"; $lang->task->reportChart = "报表统计"; diff --git a/module/task/model.php b/module/task/model.php index a3bd1a75d9..c81c045d3a 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1906,6 +1906,7 @@ class taskModel extends model ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', helper::now()) ->setDefault('assignedDate', helper::now()) + ->setDefault('activatedDate', helper::now()) ->remove('comment') ->get(); diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 318d31f635..76efcbf94c 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -760,6 +760,11 @@ class upgradeModel extends model $this->saveLogs('Execute 16_3'); $this->execSQL($this->getUpgradeFile('16.3')); $this->appendExec('16_3'); + case '16_4': + $this->saveLogs('Execute 16_4'); + $this->execSQL($this->getUpgradeFile('16.4')); + $this->updateActivatedDate(); + $this->appendExec('16_4'); } $this->deletePatch(); @@ -5608,4 +5613,25 @@ class upgradeModel extends model } return true; } + + /** + * updateActivatedDate + * + * @access public + * @return bool + */ + public function updateActivatedDate() + { + $actions = $this->dao->select('*')->from(TABLE_ACTION)->where('action')->eq('activated')->andWhere('objectType')->in('story, task, bug')->fetchAll('id'); + foreach($actions as $action) + { + $objectType = $action->objectType; + $date = $action->date; + $objectID = $action->objectID; + if($objectType == "story") $this->dao->update(TABLE_STORY)->set('activatedDate')->eq($date)->where('id')->eq($objectID)->exec(); + if($objectType == "task") $this->dao->update(TABLE_TASK)->set('activatedDate')->eq($date)->where('id')->eq($objectID)->exec(); + if($objectType == "bug") $this->dao->update(TABLE_BUG)->set('activatedDate')->eq($date)->where('id')->eq($objectID)->exec(); + } + return true; + } } From 0c4035711f30f058a91ce7705427c260d7055f15 Mon Sep 17 00:00:00 2001 From: zhangzilong Date: Fri, 18 Feb 2022 13:15:48 +0800 Subject: [PATCH 2/6] * Finish task #49284. --- db/update16.4.sql | 4 ++-- module/common/view/kanban.html.php | 1 + module/upgrade/model.php | 16 ++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/db/update16.4.sql b/db/update16.4.sql index b3d36f62ff..1927ac68d7 100644 --- a/db/update16.4.sql +++ b/db/update16.4.sql @@ -16,5 +16,5 @@ ALTER TABLE `zt_block` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `ac ALTER TABLE `zt_block` DROP INDEX `account_module_type_order`, ADD UNIQUE `account_vision_module_type_order` (`account`, `vision`, `module`, `type`, `order`); ALTER TABLE `zt_effort` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`; ALTER TABLE `zt_story` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`; -ALTER TABLE `zt_story` ADD `activatedDate` datetime NOT NULL DEFAULT '0000-00-00' AFTER `deleted`; -ALTER TABLE `zt_task` MODIFY `activatedDate` datetime NOT NULL; +ALTER TABLE `zt_story` ADD `activatedDate` datetime NOT NULL AFTER `closedReason`; +ALTER TABLE `zt_task` MODIFY `activatedDate` datetime NOT NULL AFTER `lastEditedDate`; diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php index e314ecee49..5b3fb9cb63 100644 --- a/module/common/view/kanban.html.php +++ b/module/common/view/kanban.html.php @@ -170,6 +170,7 @@ function renderProjectItem(item, $item) $item.addClass('link-block'); $title = $('') .attr('href', $.createLink('project', 'index', 'projectID=' + item._id)); + console.log(item); } else { diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 76efcbf94c..361c256f00 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -5615,23 +5615,23 @@ class upgradeModel extends model } /** - * updateActivatedDate + * Update activated date by history action. * * @access public * @return bool */ public function updateActivatedDate() { - $actions = $this->dao->select('*')->from(TABLE_ACTION)->where('action')->eq('activated')->andWhere('objectType')->in('story, task, bug')->fetchAll('id'); + $actions = $this->dao->select('objectID, objectType, date')->from(TABLE_ACTION)->where('action')->eq('activated')->andWhere('objectType')->in('story, task, bug')->orderBy('date')->fetchAll('id'); + $dates = array('bug' => array(), 'story' => array(), 'task' => array()); foreach($actions as $action) { - $objectType = $action->objectType; - $date = $action->date; - $objectID = $action->objectID; - if($objectType == "story") $this->dao->update(TABLE_STORY)->set('activatedDate')->eq($date)->where('id')->eq($objectID)->exec(); - if($objectType == "task") $this->dao->update(TABLE_TASK)->set('activatedDate')->eq($date)->where('id')->eq($objectID)->exec(); - if($objectType == "bug") $this->dao->update(TABLE_BUG)->set('activatedDate')->eq($date)->where('id')->eq($objectID)->exec(); + $dates[$action->objectType][$action->objectID] = $action->date; } + + foreach($dates['bug'] as $objectID => $date) $this->dao->update(TABLE_BUG)->set('activatedDate')->eq($date)->where('id')->eq($objectID)->exec(); + foreach($dates['story'] as $objectID => $date) $this->dao->update(TABLE_STORY)->set('activatedDate')->eq($date)->where('id')->eq($objectID)->exec(); + foreach($dates['task'] as $objectID => $date) $this->dao->update(TABLE_TASK)->set('activatedDate')->eq($date)->where('id')->eq($objectID)->exec(); return true; } } From 504e7738b20eb72012458759b79d3b9aacfe40ad Mon Sep 17 00:00:00 2001 From: zhangzilong Date: Fri, 18 Feb 2022 13:56:17 +0800 Subject: [PATCH 3/6] * Finish task #49284. --- module/upgrade/model.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 361c256f00..b13679c792 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -5622,16 +5622,15 @@ class upgradeModel extends model */ public function updateActivatedDate() { - $actions = $this->dao->select('objectID, objectType, date')->from(TABLE_ACTION)->where('action')->eq('activated')->andWhere('objectType')->in('story, task, bug')->orderBy('date')->fetchAll('id'); - $dates = array('bug' => array(), 'story' => array(), 'task' => array()); + $actions = $this->dao->select('objectID, objectType, max(date) as date')->from(TABLE_ACTION)->where('action')->eq('activated')->andWhere('objectType')->in('story, task, bug')->groupBy('objectID, objectType')->fetchAll(); foreach($actions as $action) { - $dates[$action->objectType][$action->objectID] = $action->date; - } + $table = TABLE_BUG; + if($action->objectType == 'story') $table = TABLE_STORY; + if($action->objectType == 'task') $table = TABLE_TASK; - foreach($dates['bug'] as $objectID => $date) $this->dao->update(TABLE_BUG)->set('activatedDate')->eq($date)->where('id')->eq($objectID)->exec(); - foreach($dates['story'] as $objectID => $date) $this->dao->update(TABLE_STORY)->set('activatedDate')->eq($date)->where('id')->eq($objectID)->exec(); - foreach($dates['task'] as $objectID => $date) $this->dao->update(TABLE_TASK)->set('activatedDate')->eq($date)->where('id')->eq($objectID)->exec(); + $this->dao->update($table)->set('activatedDate')->eq($action->date)->where('id')->eq($action->objectID)->exec(); + } return true; } } From fede832aa2a813eb2ff1b1b5e615dbd6d863b311 Mon Sep 17 00:00:00 2001 From: zhangzilong Date: Fri, 18 Feb 2022 14:00:53 +0800 Subject: [PATCH 4/6] * Finish task #49284. --- module/common/view/kanban.html.php | 1 - module/upgrade/model.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php index 5b3fb9cb63..e314ecee49 100644 --- a/module/common/view/kanban.html.php +++ b/module/common/view/kanban.html.php @@ -170,7 +170,6 @@ function renderProjectItem(item, $item) $item.addClass('link-block'); $title = $('') .attr('href', $.createLink('project', 'index', 'projectID=' + item._id)); - console.log(item); } else { diff --git a/module/upgrade/model.php b/module/upgrade/model.php index b13679c792..458aa13d3b 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -5627,7 +5627,7 @@ class upgradeModel extends model { $table = TABLE_BUG; if($action->objectType == 'story') $table = TABLE_STORY; - if($action->objectType == 'task') $table = TABLE_TASK; + if($action->objectType == 'task') $table = TABLE_TASK; $this->dao->update($table)->set('activatedDate')->eq($action->date)->where('id')->eq($action->objectID)->exec(); } From 6dbeb7fe4087c0ee4aed7d630b310e1f1cab8d99 Mon Sep 17 00:00:00 2001 From: zhangzilong Date: Fri, 18 Feb 2022 14:17:20 +0800 Subject: [PATCH 5/6] * Finish task #49284. --- git show | 215643 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 215643 insertions(+) create mode 100644 git show diff --git a/git show b/git show new file mode 100644 index 0000000000..5dfc50c599 --- /dev/null +++ b/git show @@ -0,0 +1,215643 @@ +commit cebf6da3725e972aa48ec9f4e9bc212a75c0aa74 (HEAD -> devops21_zhangzilong_19249, origin/devops21_zhangzilong_19249) +Author: zhangzilong +Date: Fri Feb 11 09:07:54 2022 +0800 + + * Fix bug #19249. + +commit 442a53005ae01d7d4934c2773c810d9f629d0e82 +Merge: f7f52f101e a90d17abc7 +Author: 李玉春 <563917701@qq.com> +Date: Thu Feb 10 02:53:39 2022 +0000 + + Merge branch 'devops21_48603' into 'devops21' + + zg:任务48603,48609,48610 + + See merge request easycorp/zentaopms!1747 + +commit a90d17abc7aa42522073589f5a7da86a5339017a +Author: zenggang +Date: Thu Feb 10 02:50:56 2022 +0000 + + * Adjust code + +commit 03ba748afd0983f65e8bb72b1aa950844359e1e2 +Author: zenggang +Date: Thu Feb 10 02:38:00 2022 +0000 + + * Adjust code + +commit 5927cd62ad1ac20da58a47f331f43c16a57cc93e +Author: zenggang +Date: Thu Feb 10 02:20:02 2022 +0000 + + * Finish task#48603,48609,48610 + +commit f7f52f101e5cd39c8a9c81515b98b074d759a091 (origin/devops21_zhangzilong_17336, devops21_zhangzilong_17336) +Merge: 8d3e9fe0eb 1f6d15cc7d +Author: 李玉春 <563917701@qq.com> +Date: Thu Feb 10 00:07:23 2022 +0000 + + Merge branch 'devops21_sunhuawei_fixbug_48663_48664' into 'devops21' + + Devops21 sunhuawei fixbug 48663 48664 + + See merge request easycorp/zentaopms!1741 + +commit 1f6d15cc7df56ec7b76517adb8711de84fb4c4b2 +Author: 孙华伟 +Date: Wed Feb 9 16:52:13 2022 +0800 + + *Code for bug #48664. + +commit 3795f99be6a2d53145cbfdd818121ec5b4bfd955 +Author: 孙华伟 +Date: Wed Feb 9 16:49:02 2022 +0800 + + *Code for bug #48664. + +commit 8e206e12e0c1208c72044017f7a159a57abdf0ae +Author: 孙华伟 +Date: Wed Feb 9 16:47:09 2022 +0800 + + *Code for bug #48664. + +commit 8d3e9fe0eb226b2cf298aa69ab2d98e274405b4e +Merge: 0202f6333d 8d62f55bcf +Author: 李玉春 <563917701@qq.com> +Date: Wed Feb 9 08:46:19 2022 +0000 + + Merge branch 'devops21_zhangzilong_19161' into 'devops21' + + * Fix bug #19161 + + See merge request easycorp/zentaopms!1744 + +commit 8d62f55bcfd486a21bd9a2f7f7501af15cfb56cc (origin/devops21_zhangzilong_19161, devops21_zhangzilong_19161) +Author: zhangzilong +Date: Wed Feb 9 16:42:59 2022 +0800 + + * Code for bug #19161. + +commit e3c814d41dd157065d19b89f6fca7359d84758c0 +Author: 孙华伟 +Date: Wed Feb 9 16:13:43 2022 +0800 + + *Code for bug #48664. + +commit 0202f6333d776b003f2f947e414f482a487e2477 +Merge: 4de6f91004 51d376d4f3 +Author: 李玉春 <563917701@qq.com> +Date: Wed Feb 9 08:02:14 2022 +0000 + + Merge branch 'devops21_zhangzilong_19255' into 'devops21' + + * Code for bug #19255. + + See merge request easycorp/zentaopms!1743 + +commit 51d376d4f3bd0c092212d7b1765de1bfaef2918e +Author: zhangzilong +Date: Wed Feb 9 16:01:28 2022 +0800 + + * Code for bug #19255. + +commit 9d88bfccfb8510cf729b5035180adf3a018ec77f +Author: 孙华伟 +Date: Wed Feb 9 15:58:14 2022 +0800 + + *Code for bug #48664. + +commit 4de6f9100462fe603870ba05d3d1be265a241c34 +Merge: ab5ddcf710 21faf4f026 +Author: 李玉春 <563917701@qq.com> +Date: Wed Feb 9 07:51:17 2022 +0000 + + Merge branch 'devops21_zhangzilong_19161' into 'devops21' + + * Fix bug #19161 + + See merge request easycorp/zentaopms!1742 + +commit 21faf4f026508f361a42a7019f94ade2a6e11c19 +Author: zhangzilong +Date: Wed Feb 9 15:41:23 2022 +0800 + + * Add update16.3.sql for bug #19161. + +commit cc92cac012e3b9a05bf938cd6c209ac06b9675a0 +Author: 孙华伟 +Date: Wed Feb 9 15:33:45 2022 +0800 + + *Code for bug #48664. + +commit cad3583170c90eb08e783331755ffd3e59774ec2 +Author: 孙华伟 +Date: Wed Feb 9 15:19:10 2022 +0800 + + * Code for bug #48664. + +commit ab5ddcf710c98fd515470797f8b817983d130916 (origin/devops21_zhangzilong_17338, devops21_zhangzilong_17338) +Merge: ea2d66f7de 583dd0bcd8 +Author: 李玉春 <563917701@qq.com> +Date: Wed Feb 9 07:07:20 2022 +0000 + + Merge branch 'devops_caoyanyi_gitlab' into 'devops21' + + Devops caoyanyi gitlab + + See merge request easycorp/zentaopms!1736 + +commit ddbfc3770dbc92b07b79c77853a43d76f92b0c37 +Author: zhangzilong +Date: Wed Feb 9 15:05:51 2022 +0800 + + * Code for bug #19161. + +commit a4e02734f6b5e6e20153ce64ace40c5f0d81e7d0 +Author: zhangzilong +Date: Wed Feb 9 15:03:33 2022 +0800 + + * Code for bug 19255. + +commit 583dd0bcd8b6158483b10f550d8c46f35a72dcf6 +Author: caoyanyi +Date: Wed Feb 9 05:28:26 2022 +0000 + + * Modify data type. + +commit 8b2dfe101ba181960f6170e7fe759ef771d01f10 +Author: caoyanyi +Date: Wed Feb 9 05:26:27 2022 +0000 + + * Modify config data. + +commit ea2d66f7deb19564772a91278b698d6d21c9c7a6 +Merge: c476667d96 04edbef345 +Author: 王怡栋 +Date: Wed Feb 9 05:04:48 2022 +0000 + + Merge branch 'devops21_liyuchun' into 'devops21' + + Finish task #48616,#48617. + + See merge request easycorp/zentaopms!1735 + +commit c476667d96966b695b78f247c35e086b46c36399 +Merge: e54cadfb50 a27c922f05 +Author: 孙广明 +Date: Wed Feb 9 03:54:09 2022 +0000 + + Merge branch 'devops21_liyuchun_48618' into 'devops21' + + * Finish task #48618. + + See merge request easycorp/zentaopms!1731 + +commit 805dd01dc7e43c9784c85dc6cad8fe9b2a0dbd02 +Author: zhangzilong +Date: Wed Feb 9 11:35:27 2022 +0800 + + * Code for bug #19161. + +commit 29a08fae7d5c76c1faf59863b64dfeadd8c042e5 (origin/devops_caoyanyi_gitlab) +Author: caoyanyi +Date: Wed Feb 9 03:11:47 2022 +0000 + + * Modify version compare. + +commit 04edbef345f51c5527f3ec8223b691b83d6e7ef4 +Author: liyuchun +Date: Wed Feb 9 10:31:02 2022 +0800 + + * Finish task #48616. + +commit dff60a8c7daa14c73d6054d3b5aed72c0543bb70 +Author: 孙华伟 +Date: Wed Feb 9 10:26:41 2022 +0800 + + Fix bug #48664 + +commit 845b7a64170891090c6b8fe862fcbcf91052acf4 +Author: liyuchun +Date: Wed Feb 9 10:21:05 2022 +0800 + + * Finish task #48617. + +commit a27c922f05c96f2c4b54fd12478b5f3f03ca3f02 (origin/devops21_liyuchun_48618) +Author: liyuchun +Date: Wed Feb 9 10:00:57 2022 +0800 + + * Adjsut code style. + +commit e54cadfb501449cce8449011e090b1bdc2ef3887 +Merge: f10948fa80 3c8b864a94 +Author: 李玉春 <563917701@qq.com> +Date: Wed Feb 9 01:57:02 2022 +0000 + + Merge branch 'devops21_zhangzilong_19255' into 'devops21' + + * Fix bug #19255. + + See merge request easycorp/zentaopms!1730 + +commit 3c8b864a946628104090a91447029d0724127e61 +Author: zhangzilong +Date: Wed Feb 9 09:52:58 2022 +0800 + + * Code for bug #19255. + +commit f10948fa8028409bf3f18fb6a23475ea7081fc24 +Merge: 11f82e3db8 ca4bab2feb +Author: 李玉春 <563917701@qq.com> +Date: Wed Feb 9 01:48:13 2022 +0000 + + Merge branch 'devops21_48605' into 'devops21' + + zg:任务48605 + + See merge request easycorp/zentaopms!1728 + +commit ca4bab2feb7ccbc3b3986e73e77ce4a0abde9f0a +Author: zenggang +Date: Wed Feb 9 01:45:58 2022 +0000 + + * Adjust code + +commit 23cb9b41ef989898f3d26613ded5485798ba6251 +Author: liyuchun +Date: Wed Feb 9 09:38:47 2022 +0800 + + * Finish task #48618. + +commit 9c63fb1542223e6d8979ec78dd79465f522daab2 +Author: caoyanyi +Date: Wed Feb 9 01:20:08 2022 +0000 + + * Adjust code. + +commit 2262ae20c2653e6ec902b837eaf6b28af6170abe +Author: caoyanyi +Date: Wed Feb 9 00:44:26 2022 +0000 + + * Modify jenkins locate. + +commit a8db9fe1cda26c4645e9ab037f24b45755c648a7 +Author: liyuchun +Date: Tue Feb 8 17:44:02 2022 +0800 + + * Finish task #48618. + +commit ec4003a9a0a77e25e7eb81265dac12cf64a49cbc +Author: zhangzilong +Date: Tue Feb 8 15:50:12 2022 +0800 + + * Fix bug #19255. + +commit 1c667f6e63227db9acb48a864ccdc99373963776 (origin/devops21_48605) +Author: zenggang +Date: Tue Feb 8 07:44:24 2022 +0000 + + * Finish task#48605 + +commit 11f82e3db821ded8dcaabd5d96266de0435f1d51 +Merge: d64b74b285 aaf21f178d +Author: 李玉春 <563917701@qq.com> +Date: Tue Feb 8 06:56:31 2022 +0000 + + Merge branch 'devops_caoyanyi_48607' into 'devops21' + + * Finish task #48607. + + See merge request easycorp/zentaopms!1723 + +commit d64b74b285b6e3835a8efd1bfe37f85104d92ba7 +Merge: 1657a135f1 bfca373bca +Author: 李玉春 <563917701@qq.com> +Date: Tue Feb 8 06:30:56 2022 +0000 + + Merge branch 'devops21_caoyanyi' into 'devops21' + + * Finish task #48606. + + See merge request easycorp/zentaopms!1717 + +commit bfca373bcacf952714c7823eb8305d1bfc796828 +Author: caoyanyi +Date: Tue Feb 8 06:29:36 2022 +0000 + + * Modify url create. + +commit 0043fe9a8feb8bf63085babe772840ce9c2e9917 +Author: caoyanyi +Date: Tue Feb 8 06:22:20 2022 +0000 + + * Add param to url. + +commit 13f86ba2bff7b2734192418dc0039f54a013738b +Author: caoyanyi +Date: Tue Feb 8 06:13:26 2022 +0000 + + * Modify null data. + +commit 1657a135f1d525be11989517a7806e4be17b5f06 +Merge: 395d380c05 590c56d6fc +Author: 李玉春 <563917701@qq.com> +Date: Tue Feb 8 06:13:24 2022 +0000 + + Merge branch 'devops21_zhangzilong_18305' into 'devops21' + + * Fix bug #18305. + + See merge request easycorp/zentaopms!1721 + +commit cd560f74b3d2837e1d558bb78ebf6e2f9c5c917b +Author: caoyanyi +Date: Tue Feb 8 05:39:57 2022 +0000 + + * Finish task #48614. + +commit 372ca9b390c0b4f9b3ea7a0e9b6570a1156714fa +Author: caoyanyi +Date: Tue Feb 8 05:21:35 2022 +0000 + + * Finish task #48619. + +commit a5f4950d37566e5e42f1a8b0c1b2555ba9c92ee4 +Author: caoyanyi +Date: Tue Feb 8 05:20:49 2022 +0000 + + * Finish task #48615. + +commit b4766914bc931ec9993f2f80d0b24a8c18747d6a (origin/devops21_caoyanyi) +Author: caoyanyi +Date: Tue Feb 8 03:21:20 2022 +0000 + + * Finish task #48608. + +commit 590c56d6fcbb5047f310302fa82cbff35c9368fa (origin/devops21_zhangzilong_18305) +Author: zhangzilong +Date: Tue Feb 8 09:43:38 2022 +0800 + + * Fix bug #18305. + +commit aaf21f178df1c1824ef414ad32e04c3e80be1739 (origin/devops_caoyanyi_48607) +Author: caoyanyi +Date: Tue Feb 8 01:32:33 2022 +0000 + + * Finish task #48607. + +commit 395d380c05e485a8c6846973ff0f4ad7d80ec0d6 +Merge: 2ed24b51d6 fb8708557d +Author: 李玉春 <563917701@qq.com> +Date: Tue Feb 8 00:48:13 2022 +0000 + + Merge branch 'devops21_zhangzilong_19161' into 'devops21' + + * Fix bug #19161. + + See merge request easycorp/zentaopms!1718 + +commit fb8708557d8c0af035d5f05b228b79b209387e1c +Author: zhangzilong +Date: Tue Feb 8 08:42:16 2022 +0800 + + * Fix bug #19161. + +commit eb93210a0ae8fadfd1d3873cf8d58ccd1ac6d727 +Author: caoyanyi +Date: Mon Feb 7 09:09:42 2022 +0000 + + * Finish task #48606. + +commit 2ed24b51d6a11e74978af7dd830483f22d1a3955 (origin/devops21_liyuchun_48607, master) +Merge: 9a328b689f e02d0152fe +Author: 孙广明 +Date: Mon Feb 7 06:35:11 2022 +0000 + + Merge branch 'sprint/fixbug_13636' into 'master' + + Sprint/fixbug 13636 + + See merge request easycorp/zentaopms!1713 + +commit e02d0152fea428c92ffc32a6395ec83f21f2da7c +Author: zhouxudong +Date: Mon Feb 7 14:30:21 2022 +0800 + + *Fix bug #13636. + +commit 9a328b689f8ce6e5c79920dc5f6ff0fb36767dfa +Merge: c8ce766f83 9ac6ee3697 +Author: 孙广明 +Date: Mon Feb 7 03:13:32 2022 +0000 + + Merge branch 'liyuchun_fixbug' into 'master' + + * Adjsut style. + + See merge request easycorp/zentaopms!1708 + +commit c8ce766f83778ac31b2007b748bf45cff6600540 +Merge: b173facd13 2cc103e46f +Author: 孙广明 +Date: Mon Feb 7 03:13:06 2022 +0000 + + Merge branch 'fix_bug_18308' into 'master' + + * Fix bug #18308. + + See merge request easycorp/zentaopms!1711 + +commit 5ec1d31b76b5fc03b5599adde60b9476d46043b2 +Author: zhouxudong +Date: Mon Feb 7 11:11:48 2022 +0800 + + *Fix bug #13636. + +commit b173facd131735258b7fe4bf8f15d1532860eae7 +Merge: bc1fd93036 3070a90a6b +Author: 李玉春 <563917701@qq.com> +Date: Mon Feb 7 03:11:37 2022 +0000 + + Merge branch 'sprint/sunhuawei_fixbug_19092' into 'master' + + * Fix bug #19092. + + See merge request easycorp/zentaopms!1710 + +commit 2cc103e46f940702f5e5874fd41d69b2257363e1 +Author: mayue +Date: Mon Feb 7 11:10:43 2022 +0800 + + * Fix bug #18308. + +commit 3070a90a6b4214fea5d61d97081434b1e89eed3c +Author: sunhuawei +Date: Mon Feb 7 11:05:59 2022 +0800 + + * Fix bug #19092. + +commit bc1fd93036b45af9de96b37dafe76e36ec0ab4de +Merge: 6036aa18e6 34cbc58264 +Author: 王怡栋 +Date: Mon Feb 7 02:59:23 2022 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix bug #19236. + + See merge request easycorp/zentaopms!1709 + +commit 34cbc5826420ee4f1a37022288bb2cd73d206ac8 +Author: 孙广明 +Date: Mon Feb 7 10:53:44 2022 +0800 + + * Fix bug #19236. + +commit 9ac6ee36975d8f6fd5da057fa8b9e930ee713866 +Author: liyuchun +Date: Mon Feb 7 10:38:38 2022 +0800 + + * Adjsut style. + +commit 6036aa18e68e658d2f89bf057acc6d5e326d6827 +Merge: cf3ed8984c 47a5831e84 +Author: 孙广明 +Date: Mon Feb 7 02:03:44 2022 +0000 + + Merge branch 'fix_bug_19108' into 'master' + + * Fix bug #19108. + + See merge request easycorp/zentaopms!1707 + +commit 47a5831e84583163edcbc201d9ca20348fdc5bf0 +Author: mayue +Date: Mon Feb 7 09:42:19 2022 +0800 + + * Fix bug #19108. + +commit cf3ed8984c5fd4386258a7be77382606e5480c88 (tag: zentaopms_16.3) +Merge: e7936ef95a cb14ef28d5 +Author: 李玉春 <563917701@qq.com> +Date: Sat Jan 29 08:45:37 2022 +0000 + + Merge branch 'tianshujie_18175' into 'master' + + * Fix bug #18175. + + See merge request easycorp/zentaopms!1706 + +commit cb14ef28d5e70b0df5c86a074fd34da45ca000f5 +Author: tianshujie +Date: Sat Jan 29 15:51:21 2022 +0800 + + * Fix bug #18175. + +commit e7936ef95a8248b1c9751c625056498cfde49ad6 +Merge: bc7d190e69 5847d90351 +Author: 李玉春 <563917701@qq.com> +Date: Sat Jan 29 05:40:22 2022 +0000 + + Merge branch 'sprint/scx_xuanxuan_title' into 'master' + + *Xuanxuan title. + + See merge request easycorp/zentaopms!1705 + +commit 5847d90351ec24d079ed7045b8109587bfff629c +Author: songchenxuan +Date: Sat Jan 29 13:38:26 2022 +0800 + + *Xuanxuan title. + +commit bc7d190e69a3dd07a4f8965fa44383d77adc1616 +Merge: a109c294c6 b767d5cbeb +Author: 李玉春 <563917701@qq.com> +Date: Sat Jan 29 01:02:12 2022 +0000 + + Merge branch 'sprint/bug_zhouxudong_19158' into 'master' + + *Fix bug #19158. + + See merge request easycorp/zentaopms!1704 + +commit b767d5cbeba763131185c0dbbc4bbeb623aa924e +Author: zhouxudong +Date: Sat Jan 29 08:52:31 2022 +0800 + + *Fix bug #19158. + +commit a109c294c6ae2b175041a6651f24a5b691b4eeed +Merge: 58f51b83cb ca5d15f13f +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 28 09:10:23 2022 +0000 + + Merge branch 'kanban' into 'master' + + * Modify create execution error. + + See merge request easycorp/zentaopms!1703 + +commit ca5d15f13f3386f87d4812dad1d21032ed7e5771 +Author: tianshujie +Date: Fri Jan 28 17:06:43 2022 +0800 + + * Modify create execution error. + +commit 58f51b83cb425aa889de422bace1ecad8e549fc3 +Merge: 18cd24f4e2 2de963346e +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 28 08:38:02 2022 +0000 + + Merge branch 'tianshujie_kanban' into 'master' + + * Modify the problem of creating a kanban error. + + See merge request easycorp/zentaopms!1702 + +commit 2de963346e14f6495597b770a72e257686d2d3bb +Author: tianshujie +Date: Fri Jan 28 16:31:03 2022 +0800 + + * Modify the problem of creating a kanban error. + +commit 18cd24f4e29010d295a7acfe33657be510bf093b +Merge: 9c75dbe856 7b09b6daab +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 28 06:56:19 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug for view kanban. + + See merge request easycorp/zentaopms!1701 + +commit 7b09b6daaba611db4adefeacbd05a124e1b193da +Author: liumengyi +Date: Fri Jan 28 14:50:15 2022 +0800 + + * Fix bug for view kanban. + +commit 9c75dbe8564340a446c6a434b6a608340731da63 +Merge: 59a33f6d1e 4394d09195 +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 28 06:37:25 2022 +0000 + + Merge branch 'tianshujie_kanban' into 'master' + + * Solve the problem of getting regional data. + + See merge request easycorp/zentaopms!1700 + +commit 4394d09195dfb03bef80d7b82fb77c378c8ac631 +Author: tianshujie +Date: Fri Jan 28 14:31:35 2022 +0800 + + * Solve the problem of getting regional data. + +commit 59a33f6d1e543b0de811b0ef4ebca2f0de4e7e56 +Merge: e2634f7dc0 06275780d2 +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 28 05:30:53 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug #19126. + + See merge request easycorp/zentaopms!1699 + +commit 06275780d2f9720bf5023a5a857ea805940a2f32 +Author: liumengyi +Date: Fri Jan 28 13:29:19 2022 +0800 + + * Modify code format. + +commit 4c26d325642c3781bba5b7f0be557fc952009da5 +Author: liumengyi +Date: Fri Jan 28 13:20:14 2022 +0800 + + * Fix bug #19126. + +commit e2634f7dc09f2fdc199a47ab143be111a45003e9 +Merge: 0c7403ec9d 8382aa2ddc +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 28 05:10:02 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug #19119. + + See merge request easycorp/zentaopms!1698 + +commit 8382aa2ddc03c68334068eca7e5870999d799ee1 +Author: liumengyi +Date: Fri Jan 28 13:07:54 2022 +0800 + + * Fix bug #19119. + +commit 0c7403ec9d623f46692455b5536c1d25a3f25d0d +Merge: 5097cb0029 8c063b581c +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 28 05:04:18 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug #19119,#19121. + + See merge request easycorp/zentaopms!1697 + +commit 8c063b581c50f013c85be63dc3ec80389be71681 +Author: liumengyi +Date: Fri Jan 28 11:58:20 2022 +0800 + + * Fix bug #19119,#19121. + +commit 5097cb00297d628767d96b3c3ffd09e23ca1919b +Merge: 732a1b410b 99f995709e +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 28 02:53:57 2022 +0000 + + Merge branch 'tianshujie_kanban' into 'master' + + * Fix work in process quantity issue. + + See merge request easycorp/zentaopms!1696 + +commit 99f995709e5d4ff6f21b42d0f32e9f9d903d4aa6 +Author: tianshujie +Date: Fri Jan 28 10:51:06 2022 +0800 + + * Fix work in process quantity issue. + +commit 732a1b410b5cda40c5f0111ff4f9f3d27234d2e3 +Merge: b7c97339c2 b2875e7c20 +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 28 02:46:07 2022 +0000 + + Merge branch 'devops20_zenggang' into 'master' + + zg:编辑合并请求按钮无权限改为置灰 + + See merge request easycorp/zentaopms!1693 + +commit b7c97339c21695d326bdc8808ac6a8d956a99aec +Merge: 816a3d27de e0b4902248 +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 28 02:45:10 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug for kanban space view. + + See merge request easycorp/zentaopms!1695 + +commit 816a3d27de00e259e0281a1a4d2f8843b86942a8 +Merge: 82a5aa5bd7 716b055fbf +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 28 02:44:32 2022 +0000 + + Merge branch 'sprint/183_zhouxin_fix' into 'master' + + Fix bugs. + + See merge request easycorp/zentaopms!1694 + +commit e0b490224859b87e9bb8b3a1cb0b4643c4e21b83 +Author: liumengyi +Date: Fri Jan 28 10:27:21 2022 +0800 + + * Fix bug for kanban space view. + +commit 716b055fbf3da98fbd5f73c7ac495e944af9ebf3 +Author: zhouxin +Date: Fri Jan 28 02:20:42 2022 +0000 + + Fix bugs. + +commit b2875e7c208964822c9afadb9d7a428cbce7add1 +Author: zenggang +Date: Fri Jan 28 01:17:50 2022 +0000 + + * Adjust code + +commit 82a5aa5bd778da64c80a813bef5e8e90cbd4d042 +Merge: d0154387a8 05e3d863bc +Author: 孙广明 +Date: Thu Jan 27 08:59:15 2022 +0000 + + Merge branch 'sprint/183_zhouxin_fixbugs' into 'master' + + Add title for batchcreatecard page. + + See merge request easycorp/zentaopms!1692 + +commit d0154387a8370bc0eae10f8dbee9848838fe2c78 +Merge: 782d56e068 5ba0b40b0e +Author: 孙广明 +Date: Thu Jan 27 08:57:30 2022 +0000 + + Merge branch 'sprint/183_leiyong' into 'master' + + * Adjusted to obtain department data through the interface. + + See merge request easycorp/zentaopms!1691 + +commit 05e3d863bc5818a1393fd0df9821fed1607eeafa +Author: zhouxin +Date: Thu Jan 27 08:56:08 2022 +0000 + + Add title for batchcreatecard page. + +commit 5ba0b40b0e841c985eb1dc153f967f268e65f680 +Author: leiyong <1549684884@qq.com> +Date: Thu Jan 27 16:54:30 2022 +0800 + + * Adjusted to obtain department data through the interface. + +commit 782d56e0680e0c4b6275f55d216feeee42241759 +Merge: 0ec3700200 cb68227989 +Author: 孙广明 +Date: Thu Jan 27 08:44:09 2022 +0000 + + Merge branch 'tianshujie_19109' into 'master' + + * Fix bug #19109. + + See merge request easycorp/zentaopms!1690 + +commit 0ec3700200178a10837473cdebb73cae3ad666bf +Merge: afc4c18584 8efd4a500b +Author: 孙广明 +Date: Thu Jan 27 08:42:21 2022 +0000 + + Merge branch 'sprint/183_xieqiyu_fixbug' into 'master' + + * Fix bug: activatecard and finishcard add to openmethods. + + See merge request easycorp/zentaopms!1689 + +commit cb682279899e44160dc71c4e8305b3310ad566b1 +Author: tianshujie +Date: Thu Jan 27 16:42:07 2022 +0800 + + * Fix bug #19109. + +commit afc4c1858462852e710b58d7ee36d86f9123a5e9 +Merge: 9b35f1080a 5e7c254161 +Author: 孙广明 +Date: Thu Jan 27 08:41:55 2022 +0000 + + Merge branch 'sprint/183_hufangzhou_PROtoBIZ' into 'master' + + * Change the PRO to BIZ. + + See merge request easycorp/zentaopms!1687 + +commit 8efd4a500b65ea6cdc1eeca860639b78eaeb362e +Author: xieqiyu +Date: Thu Jan 27 16:39:34 2022 +0800 + + * Fix bug: activatecard and finishcard add to openmethods. + +commit 9b35f1080ada04b04292e8cfecf6e483c8f81bda +Merge: 96af22c4a2 0ef9b12a2c +Author: 孙广明 +Date: Thu Jan 27 08:20:07 2022 +0000 + + Merge branch 'tianshujie_19070' into 'master' + + * Fix bug #19070. + + See merge request easycorp/zentaopms!1688 + +commit 0ef9b12a2c76f49065a186102434a4d94856ebf9 +Author: tianshujie +Date: Thu Jan 27 16:13:13 2022 +0800 + + * Fix bug #19070. + +commit 96af22c4a2403493c5ed5e88d50f4dc135e1d88d +Merge: e2e6d45dbc c6e92fb035 +Author: 孙广明 +Date: Thu Jan 27 07:47:48 2022 +0000 + + Merge branch 'Fixbug_zhengrunyu_' into 'master' + + *add padding for finish label. + + See merge request easycorp/zentaopms!1686 + +commit 5e7c25416118a69ea9bc741576e3ad1f8a2bed5d +Author: hufangzhou +Date: Thu Jan 27 15:47:22 2022 +0800 + + * Change the PRO to BIZ. + +commit c6e92fb03507e716f7dbfc5a595a117b4cbf5485 +Author: zhengrunyu +Date: Thu Jan 27 15:45:49 2022 +0800 + + *add padding for finish label. + +commit e2e6d45dbc232135184b4ecb30de0d441729e9d0 +Merge: f0c7c87228 81849859ca +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 27 07:45:46 2022 +0000 + + Merge branch 'devops20_zenggang' into 'master' + + 优化合并请求列表api请求数 + + See merge request easycorp/zentaopms!1680 + +commit f0c7c87228addd6f8d1c35839c3053fd1fe53c89 +Merge: d7f34c2187 827308efe2 +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 27 07:44:03 2022 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix bug. + + See merge request easycorp/zentaopms!1683 + +commit 81849859caec38c99d01b3972948b67017929b3c +Author: zenggang +Date: Thu Jan 27 07:43:46 2022 +0000 + + * Adjust code + +commit d7f34c2187f4ec9f40e87f931441a911a6df13ff +Merge: 0b53e7efb2 fe653f6438 +Author: 孙广明 +Date: Thu Jan 27 07:43:39 2022 +0000 + + Merge branch 'sprint/183_hufangzhou_19105' into 'master' + + * Fix bug #19105. + + See merge request easycorp/zentaopms!1684 + +commit 0b53e7efb268f64865d9693b3fc79fc903694ea7 +Merge: a0baeb33c5 aa36dc65fc +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 27 07:43:32 2022 +0000 + + Merge branch 'devops_cyy_case' into 'master' + + * Modify param and check value. + + See merge request easycorp/zentaopms!1672 + +commit fe653f643868c153ea8898941ebf252f1031ef09 +Author: hufangzhou +Date: Thu Jan 27 15:42:53 2022 +0800 + + * Fix bug #19105. + +commit 827308efe2e731926655077a388c516bc9bfa52a +Author: 孙广明 +Date: Thu Jan 27 15:39:14 2022 +0800 + + * Fix bug. + +commit a0baeb33c512fc080e7f07380d0377bc08ff3615 +Merge: ab273f5720 57c6204cab +Author: 孙广明 +Date: Thu Jan 27 07:37:02 2022 +0000 + + Merge branch 'devops20_liyuchun_unitcase' into 'master' + + Add unit cases. + + See merge request easycorp/zentaopms!1681 + +commit ab273f57203022c60abecda65a8b37eb5d5279e0 +Merge: c120d1c85f cbaffa5ea9 +Author: 孙广明 +Date: Thu Jan 27 07:36:25 2022 +0000 + + Merge branch 'sprint/183_xieqiyu_fixbug' into 'master' + + Sprint/183 xieqiyu fixbug + + See merge request easycorp/zentaopms!1677 + +commit c120d1c85f5d8d2ad967e0932e2932c2d95d65f6 +Merge: 5625fd1152 45cbb3d9d6 +Author: 孙广明 +Date: Thu Jan 27 07:36:01 2022 +0000 + + Merge branch 'sprint/183_tianshujie_19065' into 'master' + + * Fix bug #19065. + + See merge request easycorp/zentaopms!1682 + +commit 45cbb3d9d6405fe9836e2d15d55d027309afb865 +Author: tianshujie +Date: Thu Jan 27 15:34:49 2022 +0800 + + * Fix bug #19065. + +commit 57c6204cab09b7d03a19027247908f1667c35fd4 +Author: liyuchun +Date: Thu Jan 27 15:32:28 2022 +0800 + + * Adjsut code style. + +commit 63121f68105983e596e431ddd4a54b34756214b2 +Author: liyuchun +Date: Thu Jan 27 15:29:50 2022 +0800 + + * Add unit cases. + +commit f4729ec42978bea6fe1a6d6f73e5c4ad882356e8 +Author: zenggang +Date: Thu Jan 27 07:23:52 2022 +0000 + + * Adjust code + +commit 5625fd1152dbb6e4f7b7b67f963cc392ca1d84a0 +Merge: 0ada39cc38 3f9410f28c +Author: 孙广明 +Date: Thu Jan 27 07:09:30 2022 +0000 + + Merge branch 'Fixbug_zhengrunyu_' into 'master' + + *Fix bug for card. + + See merge request easycorp/zentaopms!1678 + +commit 0ada39cc38e7547eca2fba1f52effd77db693650 +Merge: bfc0888e77 60f1fd01d5 +Author: 孙广明 +Date: Thu Jan 27 07:09:11 2022 +0000 + + Merge branch 'sprint/183_mayue_47996' into 'master' + + * Optimize code. + + See merge request easycorp/zentaopms!1679 + +commit 60f1fd01d5329ce0cb0432bc9adee6202195c014 +Author: mayue +Date: Thu Jan 27 14:59:10 2022 +0800 + + * Optimize code. + +commit 3f9410f28c61d581b4749c97ebdf6c0f75009214 +Author: zhengrunyu +Date: Thu Jan 27 14:58:08 2022 +0800 + + *Fix bug for card. + +commit cbaffa5ea95b7a2813fc5295c9ce9b7dd583cbc4 +Author: xieqiyu +Date: Thu Jan 27 14:28:06 2022 +0800 + + * Fix bug#19096. + +commit bfc0888e77113373c85cb6a7527b15ba10b78849 +Merge: 0491f40fcd 269907c13a +Author: 孙广明 +Date: Thu Jan 27 06:21:10 2022 +0000 + + Merge branch 'sprint/183_hufangzhou_18707' into 'master' + + * Fix bug #18707, #18706. + + See merge request easycorp/zentaopms!1676 + +commit 0491f40fcd60d20611d78c419c185d60f7e89349 +Merge: 2cb945ddea 9d9b2b1c2b +Author: 孙广明 +Date: Thu Jan 27 06:19:34 2022 +0000 + + Merge branch 'sprint/183_zhouxin_fixbugs' into 'master' + + Adjust code. + + See merge request easycorp/zentaopms!1674 + +commit 269907c13aae03640a6e64cb8754f002a83d3023 +Author: hufangzhou +Date: Thu Jan 27 14:17:59 2022 +0800 + + * Fix bug #18707, #18706. + +commit 475fc0cf655764909a0dbbb7206163019a4429f8 +Author: xieqiyu +Date: Thu Jan 27 14:16:56 2022 +0800 + + * Fix bug#19089. + +commit 2cb945ddea92e890d74219cbf537bc7e7c558151 +Merge: 5ec7f42fb0 28a481e82d +Author: 孙广明 +Date: Thu Jan 27 06:08:46 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug #19090. + + See merge request easycorp/zentaopms!1675 + +commit 28a481e82d082ce11aa0edd63188972ea5ce30b8 +Author: liumengyi +Date: Thu Jan 27 14:05:23 2022 +0800 + + * Fix bug #19090. + +commit 5ec7f42fb0c61d5a85fbb3d542969f2605d64605 +Merge: 307184ea77 4e54d16ccf +Author: 孙广明 +Date: Thu Jan 27 05:55:48 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Modify batch create card assignedto users. + + See merge request easycorp/zentaopms!1673 + +commit 4e54d16ccfb14c8036211aca3634a6e58e60e579 +Author: liumengyi +Date: Thu Jan 27 13:53:44 2022 +0800 + + * Modify batch create card assignedto users. + +commit 9d9b2b1c2bf118933dd8ef1e64b010967deb33e3 +Author: zhouxin +Date: Thu Jan 27 05:31:35 2022 +0000 + + Adjust code. + +commit aa36dc65fccc56691453f523ce6a2497d4028822 +Author: caoyanyi +Date: Thu Jan 27 05:28:52 2022 +0000 + + * Modify param and check value. + +commit 307184ea7748c682aa8abdf368db113dd09c9517 +Merge: d1cc0d0161 4b9ee0cc3c +Author: 孙广明 +Date: Thu Jan 27 05:04:51 2022 +0000 + + Merge branch 'devops20_liyuchun' into 'master' + + * Adjsut unit cases. + + See merge request easycorp/zentaopms!1669 + +commit d1cc0d01617d2ca66c0a1f0c2b7990123ef59531 +Merge: 906f6eadd2 221909550d +Author: 孙广明 +Date: Thu Jan 27 05:01:27 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Kanban whitelist can only be selected from space whitelist. + + See merge request easycorp/zentaopms!1671 + +commit 221909550dee7d909dd8c271b56a9694d99ed4c1 +Author: liumengyi +Date: Thu Jan 27 12:58:12 2022 +0800 + + * Kanban whitelist can only be selected from space whitelist. + +commit 906f6eadd25f075a0cecd57c9d22ab89bdf70ec3 +Merge: f75a7f592d 2c8cf29161 +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 27 03:28:06 2022 +0000 + + Merge branch 'devops_cyy_test' into 'master' + + * Modify test case. + + See merge request easycorp/zentaopms!1670 + +commit 2c8cf2916168afd757b3728260f31bdb44b1eacb +Author: caoyanyi +Date: Thu Jan 27 03:26:34 2022 +0000 + + * Modify test case. + +commit f75a7f592d6f1af1de078a840873e0542233afef +Merge: 49bf993b35 894237885c +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 27 03:21:33 2022 +0000 + + Merge branch 'devops_cyy_test' into 'master' + + * Add testcase. + + See merge request easycorp/zentaopms!1668 + +commit 894237885cd7714061fbde567e9f6c07d927d51c +Author: caoyanyi +Date: Thu Jan 27 03:20:43 2022 +0000 + + * Adjust code. + +commit 49bf993b3549e29b9da8b9e3b134fc9fb1f0a9a1 +Merge: 141a2c3aa8 e48be0c1db +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 27 03:20:33 2022 +0000 + + Merge branch 'sprint/183_zhouxin_19057' into 'master' + + Fix s bug. + + See merge request easycorp/zentaopms!1667 + +commit 4b9ee0cc3c745c50da5b8350476c48dd3ff506b2 +Author: liyuchun +Date: Thu Jan 27 11:16:10 2022 +0800 + + * Adjsut unit cases. + +commit 8e2db7b2cb37dc5525c58331eeac633c55bf0f25 +Author: caoyanyi +Date: Thu Jan 27 03:15:48 2022 +0000 + + * Add testcase. + +commit e48be0c1db8ee98fdec1338cf837a1a5c2bf5a6b +Author: zhouxin +Date: Thu Jan 27 03:11:36 2022 +0000 + + Fix s bug. + +commit 141a2c3aa84935f45be173f940892f1ad5dc3379 +Merge: 541ccdeecb 2993776ce2 +Author: sgm0422 <976204163@qq.com> +Date: Thu Jan 27 11:03:17 2022 +0800 + + Merge branch 'Fixbug' + +commit 2993776ce23a3db3e23103bc2b36de37f925d900 +Merge: 162cf32280 9820fd1e1e +Author: 孙广明 +Date: Thu Jan 27 03:02:56 2022 +0000 + + Merge branch 'master' into 'Fixbug' + + # Conflicts: + # module/kanban/js/view.js + +commit 162cf32280e0494daab15ebeb693ccfecd4b8414 +Author: zhengrunyu +Date: Thu Jan 27 11:00:17 2022 +0800 + + *change name. + +commit b13ae6cbd41e5407abaebef3d530780ee76b3fba +Author: zhengrunyu +Date: Thu Jan 27 10:51:28 2022 +0800 + + *change finish card and add status default. + +commit 9820fd1e1e9d9a18031b5cee186659b07866348e +Merge: 5520423d87 8d4ee4d242 +Author: 孙广明 +Date: Thu Jan 27 02:45:30 2022 +0000 + + Merge branch 'sprint/183_mayue_47996' into 'master' + + * Modify permissions. + + See merge request easycorp/zentaopms!1666 + +commit 5520423d8790d6c947557c91fd24b91238a424ab +Merge: 2c659ad107 6ca88e549e +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 27 02:43:47 2022 +0000 + + Merge branch 'tianshujie_bug_19046' into 'master' + + * Fix bug #19046. + + See merge request easycorp/zentaopms!1663 + +commit 8d4ee4d242674a55fe87a0bb1defcb12a7d0f089 +Author: mayue +Date: Thu Jan 27 10:39:17 2022 +0800 + + * Modify permissions. + +commit 2c659ad107e765a6897bd50f866d899adac8aaf4 +Merge: 59ce246424 a7cae5e57f +Author: 孙广明 +Date: Thu Jan 27 02:35:48 2022 +0000 + + Merge branch 'sprint/183_liumengyi_19060' into 'master' + + * Fix bug #19060. + + See merge request easycorp/zentaopms!1664 + +commit 5b1a0f4b87d9896c0430607b3b0087fccd1f88d8 +Author: zhengrunyu +Date: Thu Jan 27 10:35:33 2022 +0800 + + *change finished card and add status default + +commit a7cae5e57f6b4024ef2d79c3b0a4a2b585c443b3 +Author: liumengyi +Date: Thu Jan 27 10:32:29 2022 +0800 + + * Fix bug #19060. + +commit 6ca88e549e463ab5966fd719fcd89cc36a4a60d4 +Author: tianshujie +Date: Thu Jan 27 10:25:44 2022 +0800 + + * Fix bug #19046. + +commit 59ce246424eb17f545d8db1cc8ff242f898148bf +Merge: 1bc6ce4832 56be31302b +Author: 孙广明 +Date: Thu Jan 27 02:20:23 2022 +0000 + + Merge branch 'sprint/183_liumengyi_19060' into 'master' + + * Fix bug #19063. + + See merge request easycorp/zentaopms!1662 + +commit 56be31302b7b3ad1dd1520cf8fa7260f45287b3b +Author: liumengyi +Date: Thu Jan 27 10:18:07 2022 +0800 + + * Fix bug #19063. + +commit 1bc6ce4832d7514732777b7fed901755bd2ad357 +Merge: c96da59391 655b067c0b +Author: 孙广明 +Date: Thu Jan 27 02:04:20 2022 +0000 + + Merge branch 'sprint/183_liumengyi_19060' into 'master' + + * Fix bug #19060. + + See merge request easycorp/zentaopms!1661 + +commit 655b067c0bb8c0195c9a763197a8d791b3c492fe +Author: liumengyi +Date: Thu Jan 27 10:02:21 2022 +0800 + + * Fix bug #19060. + +commit c96da593918871a6cc7829ed2137e49c06480a0e +Merge: d15e1dbf15 d9389586db +Author: 孙广明 +Date: Thu Jan 27 01:12:14 2022 +0000 + + Merge branch 'sprint/183_xieqiyu_fixbug' into 'master' + + Sprint/183 xieqiyu fixbug + + See merge request easycorp/zentaopms!1660 + +commit d9389586dbb8560644253375760407466f44e102 +Author: xieqiyu +Date: Thu Jan 27 09:09:16 2022 +0800 + + * Fix bug#19038. + +commit d15e1dbf1531b89822e73b3b7ad51987d991970c +Merge: f3b82a01e2 169ce62b4a +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 27 01:08:37 2022 +0000 + + Merge branch 'sprint/183_tianshujie_19055' into 'master' + + * Fix bug #19055. + + See merge request easycorp/zentaopms!1659 + +commit 169ce62b4ae83acdf563d792c506668158bf51e5 +Author: tianshujie +Date: Thu Jan 27 09:06:58 2022 +0800 + + * Fix bug #19055. + +commit 6022f599a9b4eebddc4eadd5c18a802f57994476 +Author: xieqiyu +Date: Thu Jan 27 08:58:07 2022 +0800 + + * Fix bug#19043. + +commit f3b82a01e2f4da8ef12ae8e51ac369f609aaeb4a +Merge: f9568b59ba 423b7dd303 +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 27 00:40:22 2022 +0000 + + Merge branch 'devops20_caoyanyi' into 'master' + + * Modify mr view style. + + See merge request easycorp/zentaopms!1653 + +commit 423b7dd3034396c11dd397a5322620668c0033e5 +Author: caoyanyi +Date: Thu Jan 27 00:39:43 2022 +0000 + + * Modify access check. + +commit f9568b59badf4adc53411670732cf54e847cbaf9 +Merge: 723d5e8601 049c3ceaf2 +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 27 00:37:31 2022 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix bug. + + See merge request easycorp/zentaopms!1654 + +commit 723d5e86013210ec77957ef1c75dcc7f83a76014 +Merge: d17fa1029d 4f3c4dbdae +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 27 00:37:12 2022 +0000 + + Merge branch 'sgm_colwidth' into 'master' + + * Fix bug #19048. + + See merge request easycorp/zentaopms!1658 + +commit 4f3c4dbdae3df0601fe589c4a48d124c414e8c69 +Author: sgm0422 <976204163@qq.com> +Date: Thu Jan 27 08:32:36 2022 +0800 + + * Fix bug #19048. + +commit d17fa1029de4c73c9483efff7dfba844f540db59 +Merge: 541ccdeecb dce9ca9f0e +Author: 孙广明 +Date: Thu Jan 27 00:27:50 2022 +0000 + + Merge branch 'sprint/183_hufangzhou_modalMinHeight' into 'master' + + * Set the min height of import modal. + + See merge request easycorp/zentaopms!1657 + +commit dce9ca9f0e1cf41c31011673c5b3d1c241dda97d +Author: hufangzhou +Date: Wed Jan 26 18:14:22 2022 +0800 + + * Set the min height of import modal. + +commit 541ccdeecb014e05a2bbfc23fee676b9bd78f910 +Merge: 27fe8dc420 e398afaf88 +Author: 孙广明 +Date: Wed Jan 26 09:30:22 2022 +0000 + + Merge branch 'sprint/183_xieqiyu_fixbug' into 'master' + + Sprint/183 xieqiyu fixbug + + See merge request easycorp/zentaopms!1655 + +commit 27fe8dc4203298a208165f078453335461c4042e +Merge: 8e4e9f6328 5f445bc7d5 +Author: 孙广明 +Date: Wed Jan 26 09:26:55 2022 +0000 + + Merge branch 'sprint/183_zhouxin_19040' into 'master' + + Fix bug. + + See merge request easycorp/zentaopms!1656 + +commit 5f445bc7d54f38048988f02793488d1910020141 +Author: zhouxin +Date: Wed Jan 26 09:25:08 2022 +0000 + + Fix bug. + +commit e398afaf884f0c57eb2ff7a67af4a2a7a50651cd +Author: xieqiyu +Date: Wed Jan 26 17:18:54 2022 +0800 + + * Modify pop-up style. + +commit 049c3ceaf2172a2efa249344b21e5de75502db30 +Author: 孙广明 +Date: Wed Jan 26 17:03:31 2022 +0800 + + * Fix bug. + +commit 9b8743c4945fc1fc27e029fc175fddade7285f48 +Author: caoyanyi +Date: Wed Jan 26 08:40:55 2022 +0000 + + * Modify mr view style. + +commit 341e3c5cddfbe2bb8b90eba4c8ea6618fbad6efc +Author: xieqiyu +Date: Wed Jan 26 16:35:35 2022 +0800 + + * Fix bug#19039. + +commit 8e4e9f6328fb45ec2003083bdc4af6aeb8e95931 +Merge: 9a05945cf0 dd0ae6c80f +Author: 孙广明 +Date: Wed Jan 26 06:21:02 2022 +0000 + + Merge branch 'sprint/183_liumengyi_19020' into 'master' + + * Fix bug #19028, #19030. + + See merge request easycorp/zentaopms!1651 + +commit dd0ae6c80ff6d258ec7b39ede0957d032ebdcbfe +Author: liumengyi +Date: Wed Jan 26 14:19:17 2022 +0800 + + * Fix bug #19028, #19030. + +commit 9a05945cf044421e3f1f5b457dc9e875bcc01a32 +Merge: 73e61e84f7 927ff878a5 +Author: 孙广明 +Date: Wed Jan 26 06:07:12 2022 +0000 + + Merge branch 'sprint/183_tianshujie_icon' into 'master' + + * Fix execution icon. + + See merge request easycorp/zentaopms!1650 + +commit 927ff878a5fba0b23e03c90a3a3483029c976fdd +Author: tianshujie +Date: Wed Jan 26 14:06:01 2022 +0800 + + * Fix execution icon. + +commit 73e61e84f7b2a3a8685741616057e1e640ee3544 +Merge: 5eede9c40a 0f12cdd8aa +Author: 孙广明 +Date: Wed Jan 26 06:00:49 2022 +0000 + + Merge branch 'sprint/183_tianshujie_bug' into 'master' + + * Adjust style pager. + + See merge request easycorp/zentaopms!1649 + +commit 0f12cdd8aa452345b6a5cfee81ad9b23758da0bc +Author: tianshujie +Date: Wed Jan 26 13:59:24 2022 +0800 + + * Adjust style pager. + +commit 5eede9c40a50f743c93a50c0507bdc21225a56ab +Merge: 45043790ee 52cbfc7451 +Author: 孙广明 +Date: Wed Jan 26 05:59:10 2022 +0000 + + Merge branch 'sprint/183_hufangzhou_newVersion' into 'master' + + * Rename the function. + + See merge request easycorp/zentaopms!1648 + +commit 52cbfc7451a063ebd886e5694b3ea08ce738be38 +Author: hufangzhou +Date: Wed Jan 26 13:58:22 2022 +0800 + + * Rename the function. + +commit 45043790eef843812927affa363498cba387d4ae +Merge: 94ddacd400 b0ab0f8ae4 +Author: 孙广明 +Date: Wed Jan 26 05:53:27 2022 +0000 + + Merge branch 'sprint/183_hufangzhou_newVersion' into 'master' + + * Add the new version. + + See merge request easycorp/zentaopms!1647 + +commit 94ddacd4000e5247e3c587975da4c05649c0d3c1 +Merge: d22e4e4b83 e19003ba64 +Author: 孙广明 +Date: Wed Jan 26 05:53:04 2022 +0000 + + Merge branch 'sprint/183_xieqiyu_fixbug' into 'master' + + Sprint/183 xieqiyu fixbug + + See merge request easycorp/zentaopms!1639 + +commit d22e4e4b839c7819669f370a918dc3e408711fe2 +Merge: 7234b58c3f aba10f0435 +Author: 孙广明 +Date: Wed Jan 26 05:51:50 2022 +0000 + + Merge branch 'sprint/183_liumengyi_19020' into 'master' + + * Fix bug #19020. + + See merge request easycorp/zentaopms!1645 + +commit e19003ba6498539bc5f1cafae6da99ada5f2f0c1 +Author: xieqiyu +Date: Wed Jan 26 13:50:14 2022 +0800 + + * Fix bug#18995. + +commit b0ab0f8ae42863c375ccea09aa2328c4b16c3aed +Author: hufangzhou +Date: Wed Jan 26 13:47:00 2022 +0800 + + * Add the new version. + +commit 7234b58c3f4a4ed64d724de5b6cf69b19478a9ac +Merge: 7217d5baea fb7369ce46 +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 26 05:38:14 2022 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix details. + + See merge request easycorp/zentaopms!1646 + +commit aba10f04350a2f320ec4483fd42763ef22ff100a +Author: liumengyi +Date: Wed Jan 26 13:36:12 2022 +0800 + + * Fix bug #19020. + +commit fb7369ce46aa29315645548997b334c5da8b7854 +Author: 孙广明 +Date: Wed Jan 26 13:35:48 2022 +0800 + + * Fix details. + +commit 7217d5baea0f8153d8e9158b49ed9059d88096cd +Merge: fbaace7761 12859c9e8d +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 26 05:25:24 2022 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix en lang for set column width. + + See merge request easycorp/zentaopms!1644 + +commit fbaace7761dde6a380b38af3667bbb611609e127 +Merge: 42667ed40b 95ca9fbc52 +Author: 孙广明 +Date: Wed Jan 26 05:12:38 2022 +0000 + + Merge branch 'sprint/183_tianshujie_bug' into 'master' + + * Fix bug #19003. + + See merge request easycorp/zentaopms!1642 + +commit 12859c9e8d9d1a084afef03be2482bd82a93d54a +Author: 孙广明 +Date: Wed Jan 26 13:11:47 2022 +0800 + + * Fix en lang for set column width. + +commit 42667ed40bc2cd27c709fe8ecb08ece7073f3325 +Merge: edf6d49b46 0cade87855 +Author: 孙广明 +Date: Wed Jan 26 05:06:53 2022 +0000 + + Merge branch 'sprint/183_liumengyi_18999' into 'master' + + * Fix bug #18999. + + See merge request easycorp/zentaopms!1643 + +commit 0cade87855c277714d2970807ba7e205b9d75dc9 +Author: liumengyi +Date: Wed Jan 26 11:59:58 2022 +0800 + + * Fix bug #18999. + +commit edf6d49b46cb381c0b304c3155062949f3b9d1c4 +Merge: 687d036e77 74a714bd52 +Author: 孙广明 +Date: Wed Jan 26 03:29:36 2022 +0000 + + Merge branch 'devops20_liyuchun' into 'master' + + * Fix error in mr view. + + See merge request easycorp/zentaopms!1640 + +commit 74a714bd5231fc7300037d5d71861156155380a7 +Author: liyuchun +Date: Wed Jan 26 11:28:20 2022 +0800 + + * Fix error. + +commit 687d036e77fdc130d830a3bfbef50b30656b8d30 +Merge: 5e5ccf0e5b 5d10caf48f +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 26 03:04:59 2022 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix bug. + + See merge request easycorp/zentaopms!1641 + +commit 95ca9fbc527b05f23c0d361b1845f4ee87f4a69f +Author: tianshujie +Date: Wed Jan 26 11:02:48 2022 +0800 + + * Fix bug #19003. + +commit 5d10caf48f5e6c4b6b01f0d98a2d818fe38ca5fb +Author: 孙广明 +Date: Wed Jan 26 11:02:13 2022 +0800 + + * Fix bug. + +commit 5e5ccf0e5bc1adc13b49932f0a58a4d0bee1f1ac +Merge: 24e404cde0 7aa6a292d4 +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 26 02:51:30 2022 +0000 + + Merge branch 'devops_zenggang' into 'master' + + zg:合并请求已删除项目展示id + + See merge request easycorp/zentaopms!1638 + +commit b6bf9f253d6d64d3baaf9c6a5b5bd6e853b3aa83 +Author: liyuchun +Date: Wed Jan 26 10:49:57 2022 +0800 + + * Fix error in mr view. + +commit 7aa6a292d4f4664b54533393d4a8be860ffcd23c +Author: zenggang +Date: Wed Jan 26 02:47:19 2022 +0000 + + * Adjust code for deleted project + +commit 24e404cde079bdd1ea0c175179a954ec5fbf25b1 +Merge: 8bff3489c8 4284a2331f +Author: 孙广明 +Date: Wed Jan 26 02:41:03 2022 +0000 + + Merge branch 'sprint/183_zhouxin_18843' into 'master' + + Sprint/183 zhouxin 18843 + + See merge request easycorp/zentaopms!1636 + +commit 4284a2331fa8ffcdf6df83897dee352cd6266246 +Author: zhouxin +Date: Wed Jan 26 02:40:18 2022 +0000 + + Change blackButton to btnColor. + +commit 8bff3489c8c57a3ae0c575cd1a99d8a1897d7143 +Merge: f8a7b87bb8 7f6a737d82 +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 26 02:39:03 2022 +0000 + + Merge branch 'sgm_47983' into 'master' + + * Fix bug #18972. + + See merge request easycorp/zentaopms!1633 + +commit f8a7b87bb84645f45a88df5ecb3ba1104a3bff50 +Merge: 3317e04ce6 a596a19a98 +Author: 孙广明 +Date: Wed Jan 26 02:37:27 2022 +0000 + + Merge branch 'sprint/183_liumengyi_18987' into 'master' + + * Fix bug #18993. + + See merge request easycorp/zentaopms!1634 + +commit 3317e04ce63c24f7ea9c0774576e2c7eeba846f7 +Merge: 4237ad1b7b cf8da1955d +Author: 孙广明 +Date: Wed Jan 26 02:37:02 2022 +0000 + + Merge branch 'sprint/183_mayue_18961' into 'master' + + * Fix bug #18961. + + See merge request easycorp/zentaopms!1635 + +commit 5df559c0dc105187eec0656fa4ddefe6edf0eac6 +Author: xieqiyu +Date: Wed Jan 26 10:34:18 2022 +0800 + + * Fix bug#18991. + +commit 0b9e65b245e4968ef66966332a8fae9ec22f296f +Author: xieqiyu +Date: Wed Jan 26 10:27:50 2022 +0800 + + * Fix bug#18983. + +commit 7f6a737d8287d32fe062787dacf2962c98dd5064 +Author: 孙广明 +Date: Wed Jan 26 10:26:52 2022 +0800 + + * Fix details. + +commit 6cf044da20992a0acc64e83ad44a6e71a9ae6b37 +Author: 孙广明 +Date: Wed Jan 26 10:26:18 2022 +0800 + + * Fix details. + +commit cf8da1955df0df8770f65e54313a1a0879f9be38 +Author: mayue +Date: Wed Jan 26 10:21:28 2022 +0800 + + * Fix bug #18961. + +commit 4237ad1b7b3beb04a044cd37dab3597549d806bb +Merge: 8e0a9247d3 03563c3887 +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 26 02:21:21 2022 +0000 + + Merge branch 'devops_caoyanyi' into 'master' + + * Modify user bind style. + + See merge request easycorp/zentaopms!1632 + +commit 8e0a9247d3b592d653846cc3d4eb96ecca309561 +Merge: 42238429ce 9d35e580eb +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 26 02:21:06 2022 +0000 + + Merge branch 'devops_18978' into 'master' + + zg:修复bug18978 + + See merge request easycorp/zentaopms!1631 + +commit 967553b646270ca5340f6f8607c36c651b6361d9 +Author: 孙广明 +Date: Wed Jan 26 10:16:53 2022 +0800 + + * Fix code details. + +commit a596a19a988503c22eab5e2e5bb4992d769dd271 +Author: liumengyi +Date: Wed Jan 26 10:15:06 2022 +0800 + + * Fix bug #18993. + +commit 2530d27f0bdc3ee2133922480f7db8818e377098 +Author: 孙广明 +Date: Wed Jan 26 10:13:46 2022 +0800 + + * Fix bug #18972. + +commit 8f843697f2449c78f7cf3361b35dd39d77dd065e +Author: xieqiyu +Date: Wed Jan 26 10:11:59 2022 +0800 + + * Fix bug#18989. + +commit 03563c3887bc062a9a0fcbb46c9a319f66b31881 +Author: caoyanyi +Date: Wed Jan 26 02:11:24 2022 +0000 + + * Modify page error. + +commit 0cebd0982ea19a614f64d63394b6387461a694e6 +Author: caoyanyi +Date: Wed Jan 26 02:05:33 2022 +0000 + + * Modify user bind style. + +commit 9d35e580eb7103d825acdd969ce3cda75c573cdd +Author: zenggang +Date: Wed Jan 26 02:03:36 2022 +0000 + + *Adjust code + +commit 2b284939d5d6a9ee4adce7e7354b377996e7b342 +Author: zhouxin +Date: Wed Jan 26 01:59:31 2022 +0000 + + Fix bug #18845. + +commit ce37bf9985da591b13f3e525400a66125bd9beb1 +Author: zenggang +Date: Wed Jan 26 01:58:00 2022 +0000 + + * Fix bug#18978 + +commit 42238429ce77ad35670ca7a65bb4e70767ab18f9 +Merge: 24a5707ce3 e079baf12a +Author: 孙广明 +Date: Wed Jan 26 01:52:14 2022 +0000 + + Merge branch 'sprint/183_liumengyi_18987' into 'master' + + * Fix bug #18987. + + See merge request easycorp/zentaopms!1630 + +commit 24a5707ce3a65f02a98b6c0d826d10c0cdc1d26f +Merge: 47eecdcc5a 11a69d6206 +Author: 孙广明 +Date: Wed Jan 26 01:51:47 2022 +0000 + + Merge branch 'sprint/183_xieqiyu_fixbug' into 'master' + + * Adjust classic mode. + + See merge request easycorp/zentaopms!1629 + +commit e079baf12ac070227d059efa80737c14a193975e +Author: liumengyi +Date: Wed Jan 26 09:49:49 2022 +0800 + + * Fix bug #18987. + +commit deb452fb011ba36617752eb4c12247655aba6c0d +Author: zhouxin +Date: Wed Jan 26 01:49:27 2022 +0000 + + Fix bug #18843. + +commit 47eecdcc5a81db44728b289f3736d79caaed6135 +Merge: 98c438c2e3 c824ae4267 +Author: 孙广明 +Date: Wed Jan 26 01:48:46 2022 +0000 + + Merge branch 'sprint/183_tianshujie_18808' into 'master' + + Fix bug #18808,18893,18558. + + See merge request easycorp/zentaopms!1628 + +commit 11a69d6206b0571496eec62d02acfe618c120c70 +Author: xieqiyu +Date: Wed Jan 26 09:47:01 2022 +0800 + + * Adjust classic mode. + +commit c824ae426704e3d1a9633867663ccd64afb9db77 +Author: tianshujie +Date: Wed Jan 26 09:45:50 2022 +0800 + + * Fix bug #18893,18808,18558. + +commit a9603fe3902f1527de89fec81242204c854bc961 +Author: tianshujie +Date: Wed Jan 26 09:23:01 2022 +0800 + + * Fix bug #18808. + +commit 98c438c2e3bd363ceb311e7a9862f665677b221a +Merge: 3891d5a6cd 1b021e1f24 +Author: 朱金勇 +Date: Wed Jan 26 01:15:50 2022 +0000 + + Merge branch 'ztf_zhouxin' into 'master' + + add ztf testcases. + + See merge request easycorp/zentaopms!1559 + +commit 3891d5a6cd94faf71b5989540ef8cf62bca5650b +Merge: c1d398dff5 146e0dff60 +Author: 朱金勇 +Date: Wed Jan 26 01:15:35 2022 +0000 + + Merge branch 'ztf_zhouxin_02' into 'master' + + Add testcase. + + See merge request easycorp/zentaopms!1576 + +commit c1d398dff5695d612d5b02da40e3701997f9a339 +Merge: 141a624806 82ba5ca80b +Author: 朱金勇 +Date: Wed Jan 26 01:15:17 2022 +0000 + + Merge branch 'liwenrui_fix_xuan_web_client' into 'master' + + * fix xuan web client, do not append web client related stuff if disabled, and use correct login url. + + See merge request easycorp/zentaopms!1627 + +commit 82ba5ca80b917a59f2e69d495f7c4bce74c054e8 +Author: Wenrui LI +Date: Wed Jan 26 09:11:43 2022 +0800 + + * fix xuan web client, do not append web client related stuff if disabled, and use correct login url. + +commit 141a62480640a40fe9045ba633307f3271e3cd5f +Merge: 88d6a327c4 065bea5ddd +Author: 孙广明 +Date: Wed Jan 26 01:08:41 2022 +0000 + + Merge branch 'sprint/183_xieqiyu_fixbug' into 'master' + + Sprint/183 xieqiyu fixbug + + See merge request easycorp/zentaopms!1621 + +commit 88d6a327c40d52a32b5f61cfb9c21dd549b741c5 +Merge: 708e5c909c d0b9a47318 +Author: 孙广明 +Date: Wed Jan 26 01:05:13 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug #18970. + + See merge request easycorp/zentaopms!1626 + +commit 708e5c909c24524afbe7fb2cb60e70d7c60235a2 +Merge: 8dc2be0395 8dcd1a0e4c +Author: 孙广明 +Date: Wed Jan 26 01:04:33 2022 +0000 + + Merge branch 'sprint/183_tianshujie_error' into 'master' + + * Fix the problem of error reporting and button dividing line. + + See merge request easycorp/zentaopms!1625 + +commit 8dc2be0395e6fa7821c759db845a93731fe73264 +Merge: e0ad5fe9af d95187f42b +Author: 孙广明 +Date: Wed Jan 26 01:03:15 2022 +0000 + + Merge branch 'devops20_liyuchun' into 'master' + + * Fix error. + + See merge request easycorp/zentaopms!1624 + +commit d0b9a4731818548d370bfc2f5e11563dd55fcbf7 +Author: liumengyi +Date: Wed Jan 26 09:02:54 2022 +0800 + + * Fix bug #18970. + +commit 8dcd1a0e4c938889f9dee9c713197f157b449645 +Author: tianshujie +Date: Wed Jan 26 09:02:16 2022 +0800 + + * Fix the problem of error reporting and button dividing line. + +commit d95187f42b49c3680e67392d54c940a1b817cab2 +Author: liyuchun +Date: Wed Jan 26 09:01:40 2022 +0800 + + * Fix error. + +commit e0ad5fe9af05cd4a5dffee354ba2da58ee3c3b0c +Merge: 6884481bc1 efbb0fa13e +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 26 00:49:07 2022 +0000 + + Merge branch 'devops_caoyanyi' into 'master' + + * Modify gitlab group access. + + See merge request easycorp/zentaopms!1623 + +commit efbb0fa13e2b11706cb95d7b32a61cb32f1a3a41 +Author: caoyanyi +Date: Wed Jan 26 00:46:20 2022 +0000 + + * Modify gitlab group access. + +commit 6884481bc12459fc740d253bc95de47f7430904e +Merge: 7f60810003 cf313182f4 +Author: 孙广明 +Date: Wed Jan 26 00:35:31 2022 +0000 + + Merge branch 'sprint/183_hufangzhou_importLanguage' into 'master' + + * Change the import object language items. + + See merge request easycorp/zentaopms!1622 + +commit 7f60810003491604115519322b3e113cb7ea4b9e +Merge: 5769183328 46a1da1935 +Author: 孙广明 +Date: Wed Jan 26 00:34:16 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug #18949. + + See merge request easycorp/zentaopms!1618 + +commit 576918332898b39baf64f915f57c7ed1af409224 +Merge: 9db830389b 69f5a4bab6 +Author: 孙广明 +Date: Wed Jan 26 00:30:37 2022 +0000 + + Merge branch 'sprint/scx_automation' into 'master' + + *Automation css. + + See merge request easycorp/zentaopms!1617 + +commit 9db830389b37dc3b5ed7b43a5934d6f9c971608f +Merge: 560730db3e 03d3855aae +Author: 孙广明 +Date: Wed Jan 26 00:29:08 2022 +0000 + + Merge branch 'sprint/183_tianshujie_kanban' into 'master' + + * Fix kanban style issues. + + See merge request easycorp/zentaopms!1620 + +commit cf313182f4b2ee539af1df121aa0fd5226794ec4 +Author: hufangzhou +Date: Tue Jan 25 18:25:05 2022 +0800 + + * Change the import object language items. + +commit 560730db3e4ded4baff09ba4ab8a00500a4ac21a +Merge: a8ca8429ca 0d44addd30 +Author: 孙广明 +Date: Tue Jan 25 09:47:07 2022 +0000 + + Merge branch 'sprint/183_hufangzhou_importObject' into 'master' + + * Change the import object to plural. + + See merge request easycorp/zentaopms!1619 + +commit 065bea5ddd2e212cc84a4c6dc42828eea3b7af57 +Author: xieqiyu +Date: Tue Jan 25 17:27:25 2022 +0800 + + * Fix bug#18968. + +commit 03d3855aae741fad701fa78bf02bdc736060f2bc +Author: tianshujie +Date: Tue Jan 25 17:26:55 2022 +0800 + + * Fix kanban style issues. + +commit f2296b64b6f1d11cc46003681cea95ff55b25753 +Author: xieqiyu +Date: Tue Jan 25 17:21:05 2022 +0800 + + * Fix bug#18964. + +commit c7e52521e3b40887790d0bc498e6f3db8d760f99 +Author: xieqiyu +Date: Tue Jan 25 17:20:19 2022 +0800 + + * Fix bug#18962. + +commit 0d44addd3016ddc9dd86ddb4b28ff05c208d8a8c +Author: hufangzhou +Date: Tue Jan 25 17:17:16 2022 +0800 + + * Change the import object to plural. + +commit a8ca8429cae55f11a4f36ed468792d0e3d5f1ed3 +Merge: d243960742 bde3d0ef34 +Author: liyuchun +Date: Tue Jan 25 17:16:17 2022 +0800 + + Merge branch 'sgm_47983' + +commit bde3d0ef34c7e7860f81c9151878ad7a0a9be388 +Merge: 8207c2b2a7 e19ca18d37 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 25 09:16:04 2022 +0000 + + Merge branch 'master' into 'sgm_47983' + + # Conflicts: + # module/kanban/css/common.css + # module/kanban/css/view.css + +commit 46a1da1935565b9a4e58b9b4f2ad6968f32c080f +Author: liumengyi +Date: Tue Jan 25 17:15:45 2022 +0800 + + * Fix bug #18949. + +commit e19ca18d3744c4cd731d5b1758eb38b8c6ff006b +Merge: d243960742 7c2443dc66 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 25 09:15:37 2022 +0000 + + Merge branch 'devops20_18969' into 'master' + + 修复bug 18969 + + See merge request easycorp/zentaopms!1613 + +commit 69f5a4bab6474085c063088b4507d09e82b74cb1 +Author: songchenxuan +Date: Tue Jan 25 17:14:07 2022 +0800 + + *Automation css. + +commit 8207c2b2a70188580470bf2f126c7769077a8729 +Author: 孙广明 +Date: Tue Jan 25 17:12:39 2022 +0800 + + * Fix code style. + +commit 287920c08fc64eb8f665a64472f55df28c98f382 +Author: 孙广明 +Date: Tue Jan 25 17:02:23 2022 +0800 + + * Fix bug #18943. + +commit d24396074200ccff0371772a3607fe989a9e47dd +Merge: bc4d1b14ac 1bc4f4c408 +Author: 孙广明 +Date: Tue Jan 25 08:57:58 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug #18804. + + See merge request easycorp/zentaopms!1615 + +commit bc4d1b14ac02987896e07acca7b11b51069b797f +Merge: 555fbaddef 9550c947ef +Author: 孙广明 +Date: Tue Jan 25 08:57:06 2022 +0000 + + Merge branch 'sprint/183_tianshujie_18773' into 'master' + + * Fix bug #18773. + + See merge request easycorp/zentaopms!1614 + +commit 555fbaddef699a24591ad50c7c880c737cf7509d +Merge: 48dc595192 48146100f6 +Author: liyuchun +Date: Tue Jan 25 16:55:51 2022 +0800 + + Merge branch 'devops20' + +commit 1bc4f4c4088fa39157f9cda83d83745688b1c21b +Author: liumengyi +Date: Tue Jan 25 16:55:19 2022 +0800 + + * Fix bug #18804. + +commit 9550c947ef8d703216f78a013415160fa757114f +Author: tianshujie +Date: Tue Jan 25 16:54:37 2022 +0800 + + * Fix bug #18773. + +commit 7c2443dc66cc2e43b38c34fa4459069182ec99a5 +Author: zenggang +Date: Tue Jan 25 08:53:55 2022 +0000 + + * Fix bug#18969 + +commit 48146100f6baadfa9e8f825263936bf8e829afec (origin/devops20) +Merge: 2e1ec1a10b 5f83afb622 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 25 08:44:59 2022 +0000 + + Merge branch 'devops_zenggang_unit' into 'devops20' + + zg:单元测试用例 + + See merge request easycorp/zentaopms!1612 + +commit 48dc59519223473ccd9331c0341b52cfe2dbd994 +Merge: 00a31730c5 644f0fe851 +Author: 孙广明 +Date: Tue Jan 25 08:44:14 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug #18890. + + See merge request easycorp/zentaopms!1607 + +commit 644f0fe851027326073b8a22844bae2801fbe417 +Author: liumengyi +Date: Tue Jan 25 16:43:15 2022 +0800 + + * Fix bug #18890. + +commit 2e1ec1a10bf46619b7478b1a8d47251b75a4c218 +Merge: 4b7bdb5d6e d1f12dc1a5 +Author: liyuchun +Date: Tue Jan 25 16:42:14 2022 +0800 + + Merge branch 'devops20' of https://gitlab.zcorp.cc/easycorp/zentaopms into devops20 + +commit d1f12dc1a5839f47a1f97c78585563f517fb115c +Merge: 6766cbe5f0 e9f36e078b +Author: 孙广明 +Date: Tue Jan 25 08:38:42 2022 +0000 + + Merge branch 'devops20_liyuchun_48094' into 'devops20' + + * Fix error. + + See merge request easycorp/zentaopms!1611 + +commit e9f36e078bc07fc1eadc9add1532674e1955c8f3 +Author: liyuchun +Date: Tue Jan 25 16:36:43 2022 +0800 + + * Add auth. + +commit e797653a34cc2766b55de4d4b1e210eea3a71f8c +Author: 孙广明 +Date: Tue Jan 25 16:35:42 2022 +0800 + + * Finish task #47983. + +commit 4b7bdb5d6e3fbd0e98cf28a9d0952dfada07b52e +Merge: 9e6ad38c52 6766cbe5f0 +Author: liyuchun +Date: Tue Jan 25 16:33:41 2022 +0800 + + Merge branch 'devops20' of https://gitlab.zcorp.cc/easycorp/zentaopms into devops20 + +commit 5f83afb622f89f0cfaaa375ed5a1a3729c3bee8d +Author: zenggang +Date: Tue Jan 25 08:33:21 2022 +0000 + + * Unit test and adjust code + +commit 9e6ad38c5233be491ebc7c8417ace83a0b06ae32 +Author: liyuchun +Date: Tue Jan 25 16:32:49 2022 +0800 + + * Fix error. + +commit 00a31730c542b6c010f9db879320aa5269698b62 +Merge: 8e17ce6eff 03936d7b29 +Author: 孙广明 +Date: Tue Jan 25 08:32:34 2022 +0000 + + Merge branch 'sprint/183_xieqiyu_fixbug' into 'master' + + * Modify product plan view problem. + + See merge request easycorp/zentaopms!1609 + +commit 8e17ce6eff9b711aa0c82fa46b633b133be74cd9 +Merge: 81b210500d 7115724593 +Author: 孙广明 +Date: Tue Jan 25 08:31:55 2022 +0000 + + Merge branch 'sprint/183_hufangzhou_18958' into 'master' + + * Fix bug #18958. + + See merge request easycorp/zentaopms!1610 + +commit 7115724593c99c43ebf8423c38ee7bd1aa1a0dd7 +Author: hufangzhou +Date: Tue Jan 25 16:30:01 2022 +0800 + + * Fix bug #18958. + +commit 03936d7b29f2ffecbc99cce8dd3b6985a487390e +Author: xieqiyu +Date: Tue Jan 25 16:27:51 2022 +0800 + + * Modify product plan view problem. + +commit 6766cbe5f0cc826a07fba73dffeedab701802af2 +Merge: 3fee6f256d 4e1b20e9c8 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 25 08:27:00 2022 +0000 + + Merge branch 'devops_caoyanyi' into 'devops20' + + * Modify root token check. + + See merge request easycorp/zentaopms!1608 + +commit 4e1b20e9c85e141d0ba277e75fbeeadb65789341 +Author: caoyanyi +Date: Tue Jan 25 08:25:40 2022 +0000 + + * Adjust code. + +commit 42c0a2f1151d27eece815f3bf42fc43175669b57 +Author: caoyanyi +Date: Tue Jan 25 08:23:28 2022 +0000 + + * Modify root token check. + +commit 980facb4516877779663223a3d59c1b82ddd0f84 +Author: liumengyi +Date: Tue Jan 25 16:20:25 2022 +0800 + + * Fix bug #18890. + +commit 81b210500d08e8dab9189fad4c9851ab1bfb375a +Merge: 6faf406eb4 3fc288c9a6 +Author: 孙广明 +Date: Tue Jan 25 07:54:58 2022 +0000 + + Merge branch 'sprint/scx_statistic_lang' into 'master' + + *Statistic Lang. + + See merge request easycorp/zentaopms!1606 + +commit 6faf406eb433001e466f17d4862040dc0f242c64 +Merge: 73f9642ec4 f79aa8806f +Author: 孙广明 +Date: Tue Jan 25 07:54:22 2022 +0000 + + Merge branch 'sprint/183_zhouxin_18909' into 'master' + + fix bug. + + See merge request easycorp/zentaopms!1604 + +commit 3fc288c9a600aabdf47dff9dbcc271a18b9329a1 +Author: songchenxuan +Date: Tue Jan 25 15:40:44 2022 +0800 + + *Statistic Lang. + +commit 73f9642ec48c211aa36dd13a9e35f9604d54e240 +Merge: 475c854018 9667299ce4 +Author: 孙广明 +Date: Tue Jan 25 07:03:00 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug #18952, #18904. + + See merge request easycorp/zentaopms!1602 + +commit 475c85401845d7d4297c0a8bc0d186e824fe3d3a +Merge: 3e977c6cc6 e8cf4abf9a +Author: 孙广明 +Date: Tue Jan 25 07:02:06 2022 +0000 + + Merge branch 'sprint/183_tianshujie_bug' into 'master' + + * Fix bug #18910,18762. + + See merge request easycorp/zentaopms!1603 + +commit 3e977c6cc66a88d25e4df68b61e4038a411d4a07 +Merge: 7167046722 7feffbdcfa +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 25 07:00:52 2022 +0000 + + Merge branch 'sprint/183_xieqiyu_fixbug' into 'master' + + * Modify test problem. + + See merge request easycorp/zentaopms!1605 + +commit 7feffbdcfa4b6fc97819ab8702937755a9a5c09c +Author: xieqiyu +Date: Tue Jan 25 14:57:15 2022 +0800 + + * Modify test problem. + +commit e8cf4abf9a812b492e1dff1b9faa9383b1658056 +Author: tianshujie +Date: Tue Jan 25 14:51:10 2022 +0800 + + * Fix bug. + +commit f79aa8806f41ec067a4c2ee419b1a1747047772e +Author: zhouxin +Date: Tue Jan 25 06:50:11 2022 +0000 + + fix bug. + +commit c56ecee79585f923f1fe6a4e2292cfc5a1c71152 +Author: tianshujie +Date: Tue Jan 25 14:47:51 2022 +0800 + + * Fix bug #18910,18762. + +commit 9667299ce45e9cabfd511d66d7949a5cf9e110be +Author: liumengyi +Date: Tue Jan 25 14:41:27 2022 +0800 + + * Fix bug #18952, #18904. + +commit 7167046722ad4f6751c89605d1872ea23849d612 +Merge: 3c4a40b439 ae4620917e +Author: 孙广明 +Date: Tue Jan 25 06:28:02 2022 +0000 + + Merge branch 'sprint/183_hufangzhou_fixbug' into 'master' + + * Fix bug #17993. + + See merge request easycorp/zentaopms!1586 + +commit 3c4a40b43996f21fa81606b536e6e3041fadac74 +Merge: 5eadae0143 b6901081a7 +Author: 孙广明 +Date: Tue Jan 25 06:23:45 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug#18903. + + See merge request easycorp/zentaopms!1600 + +commit 3fee6f256d6f75b36c8454c4c32e46f75d436c8a +Merge: 2b71ad28de 7fefd88c06 +Author: liyuchun +Date: Tue Jan 25 14:23:15 2022 +0800 + + Merge branch 'devops20' of https://gitlab.zcorp.cc/easycorp/zentaopms into devops20 + +commit 2b71ad28de8ec766f05964f12e3ebbe0d7360f15 +Author: liyuchun +Date: Tue Jan 25 14:19:24 2022 +0800 + + * Finish task #48094. + +commit b6901081a747fef280ddd5cf93d1e867654cb2ba +Author: liumengyi +Date: Tue Jan 25 14:18:35 2022 +0800 + + * Remove empty line. + +commit fbeac8b6ca3513bf1dfb506b80e1276d85afd518 +Author: liumengyi +Date: Tue Jan 25 14:17:05 2022 +0800 + + * Fix bug#18903. + +commit 5eadae01439e0b9bf29a79ea3fb98cb75395740d +Merge: ad3b7bfdbd 2141537a36 +Author: 孙广明 +Date: Tue Jan 25 06:09:12 2022 +0000 + + Merge branch 'sprint/183_zhouxin_18950' into 'master' + + Fix bug. + + See merge request easycorp/zentaopms!1599 + +commit ad3b7bfdbd86e25264647b2d5d235080b520a62c +Merge: 4b1731dac0 f7d58603fa +Author: 孙广明 +Date: Tue Jan 25 06:08:39 2022 +0000 + + Merge branch 'sprint/183_tianshujie_bug' into 'master' + + * Fix bug #18944,18947,18946. + + See merge request easycorp/zentaopms!1598 + +commit 2141537a36fece518399a045e2a6186c249f8e90 +Author: zhouxin +Date: Tue Jan 25 06:06:41 2022 +0000 + + Fix bug. + +commit f7d58603fa0de75f0659c67f36162e30d8e20763 +Author: tianshujie +Date: Tue Jan 25 14:05:23 2022 +0800 + + * Fix bug #18944,18947,18946. + +commit 4b1731dac0459b66a05932ae2bc433ed9754ff3c +Merge: 24a4746f8a 929f8ebcc0 +Author: 孙广明 +Date: Tue Jan 25 05:52:18 2022 +0000 + + Merge branch 'sprint/183_sunhao/new_icons' into 'master' + + * Add new icons: "icon-ver" and "icon-publish". + + See merge request easycorp/zentaopms!1582 + +commit 24a4746f8ae674edfaa60588ece5898d3e86b67f +Merge: cac8eaa104 dd15b07346 +Author: 孙广明 +Date: Tue Jan 25 05:39:37 2022 +0000 + + Merge branch 'sprint/183_xieqiyu_fixbug' into 'master' + + * Modify product plan desc. + + See merge request easycorp/zentaopms!1597 + +commit cac8eaa10478d896bb19795d1a61647d1db46842 +Merge: 5fec7d3964 363af0483b +Author: 孙广明 +Date: Tue Jan 25 05:38:26 2022 +0000 + + Merge branch 'sprint/183_tianshujie_bug' into 'master' + + Sprint/183 tianshujie bug + + See merge request easycorp/zentaopms!1596 + +commit dd15b073464093e6ef70852df57bb64875891229 +Author: xieqiyu +Date: Tue Jan 25 13:37:44 2022 +0800 + + * Modify product plan desc. + +commit 363af0483b696c26426a7b3e1d2371728f1c0d39 +Author: tianshujie +Date: Tue Jan 25 13:37:33 2022 +0800 + + * Remove useless code. + +commit 428f613968a99d01072f16f3aa8d37a4d1eb5eab +Author: tianshujie +Date: Tue Jan 25 13:31:55 2022 +0800 + + * Modify icon. + +commit 4185f88f29774dbebe53609756799d7f082c9431 +Author: tianshujie +Date: Tue Jan 25 13:27:38 2022 +0800 + + * Fix bug #18948,18836,18804. + +commit 5fec7d3964b7f07b6c9673ab1e6c841838403197 +Merge: 703b4c713b 5ee2825c26 +Author: 孙广明 +Date: Tue Jan 25 05:20:04 2022 +0000 + + Merge branch 'sprint/183_mayue_18875' into 'master' + + * Fix bug #18875. + + See merge request easycorp/zentaopms!1595 + +commit 703b4c713bc46e527c38ce783420b3cc6ff531cc +Merge: d9fade1caa bf807ad822 +Author: 孙广明 +Date: Tue Jan 25 05:19:26 2022 +0000 + + Merge branch 'Fixbug' into 'master' + + *Add finishCard and activateCard's history and dynamic. + + See merge request easycorp/zentaopms!1594 + +commit 5ee2825c263ba066e3cf3dddcd277fba8e8dc5c6 +Author: mayue +Date: Tue Jan 25 13:15:18 2022 +0800 + + * Fix bug #18875. + +commit bf807ad822dda878c652329edf0e47684cbd4ac9 +Author: zhengrunyu +Date: Tue Jan 25 13:14:25 2022 +0800 + + *Add finishCard and activateCard's history and dynamic. + +commit d9fade1caa9d9e52bc3d4ae9a7ecdc6698a9aef2 +Merge: 7d49af3c39 5d0f26bb46 +Author: 孙广明 +Date: Tue Jan 25 05:12:06 2022 +0000 + + Merge branch 'sprint/183_xieqiyu_fixbug' into 'master' + + * Modify the mutual test problem. + + See merge request easycorp/zentaopms!1593 + +commit 7d49af3c39a7486b9b0bad1cecb854c10a47033f +Merge: 2ec4e43353 9828cad357 +Author: 孙广明 +Date: Tue Jan 25 05:05:43 2022 +0000 + + Merge branch 'sprint/183_liumengyi_18945' into 'master' + + * Fix bug #18945. + + See merge request easycorp/zentaopms!1592 + +commit 5d0f26bb46ed22fe4cbbfa138c5f5fcab10f2a85 +Author: xieqiyu +Date: Tue Jan 25 13:04:32 2022 +0800 + + * Modify the mutual test problem. + +commit 9828cad357c67d07402cd73f71540f69537d5edf +Author: liumengyi +Date: Tue Jan 25 11:24:06 2022 +0800 + + * Fix bug #18945. + +commit 2ec4e4335381b2e16ef3c19d882cd6870f7f613c +Merge: df75841d5b 7001f6c2d5 +Author: 孙广明 +Date: Tue Jan 25 03:20:31 2022 +0000 + + Merge branch 'sprint/183_tianshujie_18838' into 'master' + + * Fix bug #18838. + + See merge request easycorp/zentaopms!1591 + +commit df75841d5b5daf05a61ebfa08d6b248a45f1ec8d +Merge: 7a77064493 a0306d6c6b +Author: 孙广明 +Date: Tue Jan 25 03:19:35 2022 +0000 + + Merge branch 'sprint/183_xt_card' into 'master' + + Sprint/183 xt card + + See merge request easycorp/zentaopms!1587 + +commit 7001f6c2d5ff7db21a0701c8e81b45ebb5517384 +Author: tianshujie +Date: Tue Jan 25 11:16:14 2022 +0800 + + * Fix bug #18838. + +commit 7a770644934ed08930f02484b7b443fba0026c20 +Merge: 5af5b98a3c a5343e7d36 +Author: 孙广明 +Date: Tue Jan 25 03:12:57 2022 +0000 + + Merge branch 'sprint/183_zhouxin_fixbugs' into 'master' + + Adjust code. + + See merge request easycorp/zentaopms!1588 + +commit 5af5b98a3c6f7d43cfb772a93737fd848c6c812d +Merge: 771f5fb087 b3ebd6f98b +Author: 孙广明 +Date: Tue Jan 25 03:12:35 2022 +0000 + + Merge branch 'Fixbug' into 'master' + + *Fix bug18942. + + See merge request easycorp/zentaopms!1589 + +commit b3ebd6f98b581197f4992a242a283e7071b8cddc +Author: zhengrunyu +Date: Tue Jan 25 11:11:16 2022 +0800 + + *Fixbug18942. + +commit 771f5fb0879cc5fb67d1c5e9dabff511819b8522 +Merge: 3883262c0e 571f530460 +Author: 孙广明 +Date: Tue Jan 25 03:06:41 2022 +0000 + + Merge branch 'sprint/183_liumengyi_18935' into 'master' + + * Fix bug #18936, #18924. + + See merge request easycorp/zentaopms!1590 + +commit 8e470d86a4edbc91a83281c72a89cbe47966533c +Author: zhengrunyu +Date: Tue Jan 25 11:03:05 2022 +0800 + + *Fix bug18942. + +commit 571f5304600e1b5ab0c0b0b501ff2995bc0d173b +Author: liumengyi +Date: Tue Jan 25 11:03:05 2022 +0800 + + * Fix bug #18936, #18924. + +commit a5343e7d3696dc33851e33a53ee620e955e4e040 +Author: zhouxin +Date: Tue Jan 25 02:52:07 2022 +0000 + + Adjust code. + +commit 7fefd88c062117c30ce6a965375c0a10a961729a +Merge: 6507742185 7ad4810e93 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 25 02:44:10 2022 +0000 + + Merge branch 'devops_caoyanyi_bug' into 'devops20' + + * Modify job edit. + + See merge request easycorp/zentaopms!1585 + +commit 650774218521278d5df7fc1dc99454bb5cb12cf3 +Merge: 2f35d4f734 5183b24bd0 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 25 02:43:47 2022 +0000 + + Merge branch 'devops20_zenggang' into 'devops20' + + zg:Finish task#48107,48106,48105,48103 and adjust code + + See merge request easycorp/zentaopms!1580 + +commit a0306d6c6b105f6f4e8fc5be8efa3f436216806f +Author: xieqiyu +Date: Tue Jan 25 10:42:03 2022 +0800 + + * Delete space line. + +commit a0f307452a40aecc0664c3661a6951b0e1518c10 +Merge: 8b0bd45bf6 f010d79708 +Author: tianshujie +Date: Tue Jan 25 10:39:44 2022 +0800 + + Merge branch 'sprint/183_xt_card' of https://gitlab.zcorp.cc/easycorp/zentaopms into card + +commit 8b0bd45bf6661ae8a32d4bb4c1af5c0d36861725 +Author: tianshujie +Date: Tue Jan 25 10:39:17 2022 +0800 + + * Build add delete flag. + +commit 5183b24bd0d78fc28f40001df54092481bf7c363 +Author: zenggang +Date: Tue Jan 25 02:37:51 2022 +0000 + + * Adjust code + +commit ae4620917eb7edc0c671b8177f0e3181c835ac14 +Author: hufangzhou +Date: Tue Jan 25 10:34:29 2022 +0800 + + * Fix bug #17993. + +commit f010d79708414cf0482f1b86fba8335d25ac3e41 +Author: xieqiyu +Date: Tue Jan 25 10:34:12 2022 +0800 + + * Add color. + +commit eae8f49e94d5ef58ab4391ef6bb7c5973b4d0b47 +Author: xieqiyu +Date: Tue Jan 25 10:14:32 2022 +0800 + + * Modify error. + +commit 3883262c0e8e476f2f8c2ae5857adb6f5009086a +Merge: 520e09914f 47b110a388 +Author: 孙广明 +Date: Tue Jan 25 02:13:55 2022 +0000 + + Merge branch 'sprint/scx_international_lang' into 'master' + + *International lang. + + See merge request easycorp/zentaopms!1584 + +commit a182d706286a3e633e9cd34a1860ff6495ced91e +Author: xieqiyu +Date: Tue Jan 25 10:11:41 2022 +0800 + + * Display duplicate imported cards. + +commit 7ad4810e93ed1af32e0bbe7371acd12ae8ebda72 +Author: caoyanyi +Date: Tue Jan 25 02:06:43 2022 +0000 + + * Modify job edit. + +commit a8334bed66a8650eb98d403fefe62e4fae404f5d +Author: tianshujie +Date: Tue Jan 25 10:02:59 2022 +0800 + + * Modify details. + +commit 47b110a3883c889aeef2d1124cf805b55a0c7a6f +Author: songchenxuan +Date: Tue Jan 25 09:55:10 2022 +0800 + + *International lang. + +commit 73207475aec114df5d2829ec28ce29cc6995809c +Author: songchenxuan +Date: Tue Jan 25 09:54:31 2022 +0800 + + *International lang. + +commit 2f35d4f7341ad8a7bd31a11d8479cc0aed7a6a1c +Merge: fe32b74a27 642145cc16 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 25 01:44:51 2022 +0000 + + Merge branch 'devops_caoyanyi_bug' into 'devops20' + + * Fix bug #18932. + + See merge request easycorp/zentaopms!1583 + +commit 642145cc16361434c203047bb03b542b9cb765c0 +Author: caoyanyi +Date: Tue Jan 25 01:44:02 2022 +0000 + + * Modify die to return print. + +commit 929f8ebcc0cc60a2854139a4bd0bac88f05348a0 +Author: Hao Sun +Date: Tue Jan 25 09:39:22 2022 +0800 + + * add new icons: "icon-ver" and "icon-publish". + +commit 7eb79b625680e53ef71671a45bdfe437e5b7e9e5 +Author: caoyanyi +Date: Tue Jan 25 01:38:24 2022 +0000 + + * Fix bug #18932. + +commit 14c68e0cf72090497529aae9a1876bd60aa33ee2 +Author: tianshujie +Date: Tue Jan 25 09:29:43 2022 +0800 + + * Modify card style. + +commit 216be433d4eba9fbc144a166e880d6fe11a91254 +Author: zenggang +Date: Tue Jan 25 01:28:07 2022 +0000 + + * Adjust code + +commit 62d7380d6e5ecc4a52022883bc5bbe6dccaddd02 +Merge: 590715c6d4 1801b1e783 +Author: tianshujie +Date: Tue Jan 25 09:26:10 2022 +0800 + + Merge branch 'sprint/183_xt_card' of https://gitlab.zcorp.cc/easycorp/zentaopms into card + +commit 590715c6d4f4f6656c16e4df4f76e0e9206a2927 +Author: tianshujie +Date: Tue Jan 25 09:25:35 2022 +0800 + + * Query plan and version creator. + +commit 520e09914f18e335f2a2247245309c49d846703c +Merge: 2c350e6ad6 b2d1125ff9 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 25 01:22:30 2022 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix delete kanban column bug. + + See merge request easycorp/zentaopms!1581 + +commit fe32b74a27e0588b3a1536232df4c444abe194e8 +Merge: 461940c671 44e0b5c2b8 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 25 01:14:22 2022 +0000 + + Merge branch 'devops_caoyanyi_gitlab' into 'devops20' + + * Incomplete display of the number of modified files. + + See merge request easycorp/zentaopms!1579 + +commit 4ab46cb2ea4edc305ea112d854c089c5399a0fa7 +Author: zenggang +Date: Tue Jan 25 01:13:49 2022 +0000 + + *Finish task#48107,48106,48105,48103 and adjust code + +commit 44e0b5c2b8dee4595de449a34d7356faaf843f36 +Author: caoyanyi +Date: Tue Jan 25 01:11:54 2022 +0000 + + * Incomplete display of the number of modified files. + +commit 1801b1e783b273ad1f83d8d760c2f0365468b122 +Author: xieqiyu +Date: Tue Jan 25 09:10:26 2022 +0800 + + * Add pending future to the product plan. + +commit b2d1125ff994f562b7e21cb4305df49ca8321067 +Author: 孙广明 +Date: Tue Jan 25 08:47:57 2022 +0800 + + * Fix delete kanban column bug. + +commit 2c350e6ad6a0ba2f3417c9bc0f4eb581532ba705 +Merge: 8730efa7e7 077df631ac +Author: 孙广明 +Date: Tue Jan 25 00:20:26 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug #18907. + + See merge request easycorp/zentaopms!1577 + +commit 8730efa7e7d6256ca3117a47129edf6ba55459df +Merge: c48452ae1a 0105b70258 +Author: 孙广明 +Date: Tue Jan 25 00:20:10 2022 +0000 + + Merge branch 'sprint/183_hufangzhou_48000' into 'master' + + * Finish task #48000. + + See merge request easycorp/zentaopms!1578 + +commit 0105b7025871bed21c3fa91f8ad83cf0d8c2be3b +Author: hufangzhou +Date: Tue Jan 25 08:19:04 2022 +0800 + + * Finish task #48000. + +commit d5210fdc57ea4413d96d9307c9b4fa033c95fd87 +Author: xieqiyu +Date: Tue Jan 25 07:58:57 2022 +0800 + + * Modify writing error. + +commit 053985fb05b418545477cc793fffd1be112d5c88 +Author: xieqiyu +Date: Mon Jan 24 23:12:40 2022 +0800 + + * Code for task#47988. + +commit c1faac726f59a71b0d6fd18577dd184a51455c41 +Author: tianshujie +Date: Mon Jan 24 18:26:16 2022 +0800 + + * Finish task #47992. + +commit e1bf31d73b6d826f8fc4456015294862dbf6f3a5 +Merge: 7a7ad37f3c c4fffd292e +Author: tianshujie +Date: Mon Jan 24 18:16:51 2022 +0800 + + Merge branch 'sprint/183_xt_card' of https://gitlab.zcorp.cc/easycorp/zentaopms into card + +commit 7a7ad37f3cbf871d0c9ffa43e04ea530a7d0f7a5 +Author: tianshujie +Date: Mon Jan 24 18:16:28 2022 +0800 + + * Finish task #47990. + +commit 077df631ac087f2986e601fe2ea68cc14ff5b226 +Author: liumengyi +Date: Mon Jan 24 17:31:35 2022 +0800 + + * Fix bug #18907. + +commit 146e0dff606383e9dbd6cc9dcecb8ee4ffa729d1 +Author: zhouxin +Date: Mon Jan 24 09:27:53 2022 +0000 + + Add testcase. + +commit c48452ae1ab7cfd740769dd9c59342707eb08835 +Merge: 0ff2692de7 b6b895bb87 +Author: 孙广明 +Date: Mon Jan 24 09:25:29 2022 +0000 + + Merge branch 'sprint/183_liumengyi_18883' into 'master' + + * Finish task 18883,add project team. + + See merge request easycorp/zentaopms!1575 + +commit 461940c6717125dc8464a1e22aa06f97e2020347 +Merge: 8558dde080 eba799b60f +Author: 孙广明 +Date: Mon Jan 24 09:23:16 2022 +0000 + + Merge branch 'devops20_liyuchun' into 'devops20' + + * Finish task #48096. + + See merge request easycorp/zentaopms!1567 + +commit 8558dde08040acda4d53269d6421cb203ec26930 +Merge: 39022c7ef3 5de03afa3a +Author: 李玉春 <563917701@qq.com> +Date: Mon Jan 24 09:21:59 2022 +0000 + + Merge branch 'devops_caoyanyi_bug' into 'devops20' + + cyy: Fix bug. + + See merge request easycorp/zentaopms!1574 + +commit b6b895bb872d3da9d5aa6babf6a3093aef89c12f +Author: liumengyi +Date: Mon Jan 24 17:20:38 2022 +0800 + + * Modify how the creator is appended to team members. + +commit eba799b60f0fc34d6ea3c3ac52b4d851f87a5ed1 +Author: liyuchun +Date: Mon Jan 24 17:20:19 2022 +0800 + + * Fix bug #18492. + +commit 30236e6a94d6899e8c131d0f322d3dceb55e23a8 +Author: liumengyi +Date: Mon Jan 24 17:11:25 2022 +0800 + + * Remove empty line. + +commit 5de03afa3a8807b3062c3370203905eabe827fe4 +Author: caoyanyi +Date: Mon Jan 24 09:06:10 2022 +0000 + + * fix bug #18922. + +commit c4fffd292ed1e28368a639d291179622b522efc4 +Author: xieqiyu +Date: Mon Jan 24 17:04:10 2022 +0800 + + * Modify iframe class. + +commit 331e00ab2bdef027922a90685726e744659d4e25 +Author: tianshujie +Date: Mon Jan 24 17:04:07 2022 +0800 + + * Modify area style. + +commit bffc71132dead146c65c8732e186dc3a2c820e6b +Author: tianshujie +Date: Mon Jan 24 16:58:14 2022 +0800 + + * Add permission judgment. + +commit 113a50f462edba67aa2dfc0c765d85d93843c864 +Author: liumengyi +Date: Mon Jan 24 16:56:08 2022 +0800 + + * Modify sql file. + +commit ecc9e22867017c82defb3ab793da55d0d4d6a209 +Author: liumengyi +Date: Mon Jan 24 16:54:30 2022 +0800 + + * Finish task 18883,add project team. + +commit 0ff2692de78313de477bdcf29d7ed9b9e630d8c0 +Merge: 050897d304 86649bcad9 +Author: 孙广明 +Date: Mon Jan 24 08:39:34 2022 +0000 + + Merge branch 'sprint/183_tianshjie_18861' into 'master' + + * Fix bug #18861. + + See merge request easycorp/zentaopms!1573 + +commit 86649bcad9fcf42b3f610618932543b715720a67 +Author: tianshujie +Date: Mon Jan 24 16:38:52 2022 +0800 + + * Modify the format. + +commit 050897d304cd694539125d7c5be46bc2fc8d35c2 +Merge: 46a66b038d 2838e9dc76 +Author: 孙广明 +Date: Mon Jan 24 08:37:47 2022 +0000 + + Merge branch 'sprint/183_xieqiyu_importdropmenu' into 'master' + + * Modify import drop menu. + + See merge request easycorp/zentaopms!1572 + +commit 7234d6bc9b9d2d448319566d0f618b6cdcf07533 +Author: tianshujie +Date: Mon Jan 24 16:37:46 2022 +0800 + + * Fix bug #18861. + +commit da20e9dfa81aea57868b2ff2f73e8c20fff49cac +Author: caoyanyi +Date: Mon Jan 24 08:36:47 2022 +0000 + + * Fix bug #18920,18919,18918. + +commit 46a66b038dc0a3d8c31803766a3b3b233b12a413 +Merge: 693798fae2 67e57e26b7 +Author: 孙广明 +Date: Mon Jan 24 08:28:39 2022 +0000 + + Merge branch 'sprint/183_tianshujie_18848' into 'master' + + * Fix bug #18848. + + See merge request easycorp/zentaopms!1571 + +commit 2838e9dc7669ab8e9bc256861b919cdf65d3a80c +Author: xieqiyu +Date: Mon Jan 24 16:28:00 2022 +0800 + + * Modify import drop menu. + +commit 67e57e26b722f7513040f4ef097d1905386e4dea +Author: tianshujie +Date: Mon Jan 24 16:27:57 2022 +0800 + + * Modify the format. + +commit 281885f59839cb642bfbf75a84acf5ee34093f0b +Author: tianshujie +Date: Mon Jan 24 16:24:52 2022 +0800 + + * Fix bug #18848. + +commit 693798fae20efd70292934c0bf763a8482c73aab +Merge: 6bcb09a6d9 81ce7460b4 +Author: 李玉春 <563917701@qq.com> +Date: Mon Jan 24 08:22:21 2022 +0000 + + Merge branch 'kanban_bug' into 'master' + + * Fix kanban bug. + + See merge request easycorp/zentaopms!1569 + +commit 39022c7ef3564af47842a0e3e3b39d753484f3c5 +Merge: 4bc28cb62f c077f9ff4d +Author: 李玉春 <563917701@qq.com> +Date: Mon Jan 24 08:21:47 2022 +0000 + + Merge branch 'devops_caoyanyi' into 'devops20' + + * Modify auth check. + + See merge request easycorp/zentaopms!1570 + +commit c077f9ff4def539e30ac5b6e975c6c1cd4d478e6 +Author: caoyanyi +Date: Mon Jan 24 08:20:40 2022 +0000 + + * Modify auth check. + +commit 81ce7460b42db0f8c69e390a718e3415c30e1fb4 +Author: 孙广明 +Date: Mon Jan 24 16:13:36 2022 +0800 + + * Fix kanban bug. + +commit 4bc28cb62faf30d2ba693aa7cdd7a8dd18914b1d +Merge: 480e08f2d0 a2a1df2b9e +Author: 李玉春 <563917701@qq.com> +Date: Mon Jan 24 08:12:54 2022 +0000 + + Merge branch 'devops_caoyanyi' into 'devops20' + + * Modify isset check. + + See merge request easycorp/zentaopms!1568 + +commit a2a1df2b9e1502b07f60a6c0cc12794a26ed3f64 +Author: caoyanyi +Date: Mon Jan 24 08:08:24 2022 +0000 + + * Modify isset check. + +commit 480e08f2d08dec9b4c4a10e8e833eb6d9aca018a +Merge: f0907d2f11 d0b289ed21 +Author: 李玉春 <563917701@qq.com> +Date: Mon Jan 24 08:03:00 2022 +0000 + + Merge branch 'devops_caoyanyi' into 'devops20' + + Devops caoyanyi + + See merge request easycorp/zentaopms!1566 + +commit acbb9574845c1063de0f89405d6e7a9235746aae +Author: liyuchun +Date: Mon Jan 24 15:54:27 2022 +0800 + + * Finish task #48096. + +commit d0b289ed219b5fe93e0081a3aebbc593ccf5f7c2 +Author: caoyanyi +Date: Mon Jan 24 07:46:22 2022 +0000 + + * Finish task #48108. + +commit 6e567482e26d1a0e22fd1388e03c388c9b041455 +Author: caoyanyi +Date: Mon Jan 24 07:46:08 2022 +0000 + + * Modify group access. + +commit 6bcb09a6d9b4a219c33d5d7647e0b6ce669936b6 (origin/sprint/183_mrfz_columnWidth) +Merge: d61db00a54 c3b7172f24 +Author: 孙广明 +Date: Mon Jan 24 07:30:40 2022 +0000 + + Merge branch 'sprint/183_liumengyi_18883' into 'master' + + Sprint/183 liumengyi 18883 + + See merge request easycorp/zentaopms!1565 + +commit d61db00a54b8993a7c31b1b8b4e1bf95b6a44951 +Merge: bdf0e65bcd 72de0a1b9c +Author: 孙广明 +Date: Mon Jan 24 15:29:27 2022 +0800 + + Merge branch 'sprint/183_xieqiyu_47995new' + +commit 72de0a1b9c916fc6589dc7aff4c1e23299b474a8 (origin/sprint/183_xieqiyu_47995new) +Merge: dfa075beb7 e60e590ba8 +Author: 孙广明 +Date: Mon Jan 24 07:28:48 2022 +0000 + + Merge branch 'master' into 'sprint/183_xieqiyu_47995new' + + # Conflicts: + # db/update16.2.sql + # module/group/lang/resource.php + # module/kanban/js/view.js + # module/kanban/model.php + +commit c3b7172f24b83b9e859af2d430ecbd2065bf7fdc +Author: liumengyi +Date: Mon Jan 24 15:23:17 2022 +0800 + + * Fix bug #18883. + +commit dfa075beb73e434f9b80252fb4ee66176c92e1a0 +Author: tianshujie +Date: Mon Jan 24 15:16:29 2022 +0800 + + * Edit view link. + +commit 78427e12c6c52311a78b9b76343d13b63f657ffb +Author: xieqiyu +Date: Mon Jan 24 14:41:36 2022 +0800 + + * Modify date. + +commit 41d4d5a13225b1c0648e663bb6770a570b0f0877 +Author: xieqiyu +Date: Mon Jan 24 14:38:52 2022 +0800 + + * Modify the duplicate name function. + +commit 7570801b1d0cc8e8f086b5b9dd8ce982539a55c1 +Author: xieqiyu +Date: Mon Jan 24 14:34:05 2022 +0800 + + * Modify the review code. + +commit f0907d2f11d5c5c3ed816cfcfd5e5488dae99701 +Author: liyuchun +Date: Mon Jan 24 14:32:31 2022 +0800 + + * Fix error. + +commit 033763cceb230928f3cc436ffee187c04b135a50 +Merge: ddc2cee664 b20110ba68 +Author: 李玉春 <563917701@qq.com> +Date: Mon Jan 24 06:31:27 2022 +0000 + + Merge branch 'devops20_caoyanyi' into 'devops20' + + Devops20 caoyanyi + + See merge request easycorp/zentaopms!1563 + +commit b20110ba68e0bf85f1288de7b821a74d86758e63 +Author: caoyanyi +Date: Mon Jan 24 06:31:00 2022 +0000 + + * Adjust code. + +commit f86c3f5b8c8b0fff9c5b1510d2da3b8e3acb7883 +Author: tianshujie +Date: Mon Jan 24 14:28:24 2022 +0800 + + * Modify the code. + +commit e60e590ba89ac7e6ad7bd3c59399ab14a35a8d85 +Merge: 881367f7bd cc299e0b45 +Author: 孙广明 +Date: Mon Jan 24 06:27:05 2022 +0000 + + Merge branch 'Fixbug' into 'master' + + Fix bug 18885. + + See merge request easycorp/zentaopms!1564 + +commit 9f23e540d93451f8db8cf46a2d529222ab203cfb +Author: caoyanyi +Date: Mon Jan 24 06:26:54 2022 +0000 + + * Modify config data. + +commit cc299e0b452d7244497b2df7d6a6ea4e79c582ea +Author: zhengrunyu +Date: Mon Jan 24 14:24:19 2022 +0800 + + Fix bug 18885. + +commit 49f393a6844465827286a4bcf6d66d86760f0342 +Author: caoyanyi +Date: Mon Jan 24 06:23:17 2022 +0000 + + * Remove unused param. + +commit 1353d674c7162a54f54474eb4f72076aa0cd154b +Author: liumengyi +Date: Mon Jan 24 14:19:35 2022 +0800 + + * Fix bug #18883 and #18891. + +commit 19af621cdd48634046d388cac71b249fe6316144 +Author: caoyanyi +Date: Mon Jan 24 06:19:34 2022 +0000 + + * Fix bug #18867. + +commit 881367f7bd4fe8f48a56a609cf6fa69d314715d7 +Merge: 081f5a969e 0530d95aac +Author: 孙广明 +Date: Mon Jan 24 06:13:16 2022 +0000 + + Merge branch 'sprint/183_hufangzhou_columnCreateMenu' into 'master' + + * Code for task #47991. + + See merge request easycorp/zentaopms!1561 + +commit 0530d95aac3b433a04df0fd91f2a451dcc4c554d +Author: hufangzhou +Date: Mon Jan 24 14:11:52 2022 +0800 + + * Rename the importObject to object. + +commit ddc2cee66479dcceb722e7d4c84a0be4668f2d40 +Merge: a887a9edc3 e673ccf33f +Author: 李玉春 <563917701@qq.com> +Date: Mon Jan 24 06:07:03 2022 +0000 + + Merge branch 'devops20_caoyanyi' into 'devops20' + + Devops20 caoyanyi + + See merge request easycorp/zentaopms!1560 + +commit b9ab4c5326584d7277cd891f1b4ed703a75e465d +Author: hufangzhou +Date: Mon Jan 24 14:03:02 2022 +0800 + + * Delete the unused code. + +commit 081f5a969ec65a0a4a017fc1dde8b3636930d5b1 +Merge: 3550c592ad 565be797cd +Author: 孙广明 +Date: Mon Jan 24 06:00:39 2022 +0000 + + Merge branch 'sprint/183_liumengyi_47973' into 'master' + + * When sorting columns, the card is hidden. + + See merge request easycorp/zentaopms!1558 + +commit 3550c592adf3016c08b9e67bf85c24979435cbfc +Merge: babfd88f2d 7633710cfa +Author: 孙广明 +Date: Mon Jan 24 06:00:27 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug#18841, #18865, #18876, #18877, #18879 and #18891. + + See merge request easycorp/zentaopms!1556 + +commit a887a9edc34d11e452b02544df22fc0b3be39c88 +Merge: 5d32bccec8 a567a2e6ea +Author: 孙广明 +Date: Mon Jan 24 05:59:45 2022 +0000 + + Merge branch 'devops20_liyuchun' into 'devops20' + + * Finish task #48098. + + See merge request easycorp/zentaopms!1557 + +commit e673ccf33f6eee35466b9e0e0b3224827b9ebb2b +Author: caoyanyi +Date: Mon Jan 24 05:53:16 2022 +0000 + + * Finish task #48099,48097. + +commit 7cd0246265fb018d1631eeea871719249ee2be98 +Author: hufangzhou +Date: Mon Jan 24 13:52:49 2022 +0800 + + * Code for task #47991. + +commit 1b021e1f24328cdb0809b5c11e180448f1d96867 +Author: zhouxin +Date: Mon Jan 24 05:50:56 2022 +0000 + + add ztf testcases. + +commit 565be797cdb101217e28348f7b7c5e94c3b2c262 +Author: liumengyi +Date: Mon Jan 24 13:47:02 2022 +0800 + + * When sorting columns, the card is hidden. + +commit 11a30ec207de1c53a6021cbc0e085a15dce2c066 +Author: caoyanyi +Date: Mon Jan 24 05:40:40 2022 +0000 + + * Finish task #48100,48102. + +commit a567a2e6ea00bf18e3e4fcec0793b217eefc1686 +Author: liyuchun +Date: Mon Jan 24 13:37:46 2022 +0800 + + * Finish task #48098. + +commit babfd88f2df4f085b889b0815536189173dfbef1 +Merge: bdf0e65bcd 8e4b8477c4 +Author: 孙广明 +Date: Mon Jan 24 05:32:14 2022 +0000 + + Merge branch 'sprint/183_zhouxin_fixbugs' into 'master' + + Fix bug #18840. + + See merge request easycorp/zentaopms!1555 + +commit b72893bd91648cf67a671299d8f756f62b6cdc53 +Merge: 51a69f3af9 780d82971f +Author: tianshujie +Date: Mon Jan 24 13:31:31 2022 +0800 + + Merge branch 'sprint/183_xieqiyu_47995new' of https://gitlab.zcorp.cc/easycorp/zentaopms into xieqiyu + +commit 7633710cfa651f8b3107bf98686e6ccb090f4727 +Author: liumengyi +Date: Mon Jan 24 13:31:12 2022 +0800 + + * Fix bug#18841, #18865, #18876, #18877, #18879 and #18891. + +commit 51a69f3af9e39493757790a41dc29b2290ec9bb3 +Author: tianshujie +Date: Mon Jan 24 13:30:09 2022 +0800 + + * Fix drag style issue. + +commit 8e4b8477c43bb086da8dc507406d36e22163a943 +Author: zhouxin +Date: Mon Jan 24 05:27:30 2022 +0000 + + Fix bug #18840. + +commit bdf0e65bcd68717040cc03cad10324610200b776 +Merge: 9dc7763593 c502091bf5 +Author: 李玉春 <563917701@qq.com> +Date: Mon Jan 24 05:26:39 2022 +0000 + + Merge branch 'sgm_48001' into 'master' + + * Finish task #48001. + + See merge request easycorp/zentaopms!1554 + +commit 9dc7763593f7239a6273e3dd256519f13c7df681 +Merge: e3da935f16 363605fd15 +Author: 孙广明 +Date: Mon Jan 24 05:25:42 2022 +0000 + + Merge branch 'sprint/183_zhouxin_fixbugs' into 'master' + + Fix bug #18847#18846 and add ditto for batchcreatecard.html.php. + + See merge request easycorp/zentaopms!1553 + +commit 780d82971f6678e2aaab743b7e99028ccfbf6078 +Author: xieqiyu +Date: Mon Jan 24 13:23:38 2022 +0800 + + * Add sql. + +commit 363605fd15482b01f329d88fd3eb9eb74a79deed +Author: zhouxin +Date: Mon Jan 24 05:22:58 2022 +0000 + + Change code format. + +commit 2fe1b4b7441524524299fb46e67bdc498174d161 +Author: tianshujie +Date: Mon Jan 24 13:22:25 2022 +0800 + + * Encapsulate the method for obtaining card data. + +commit c502091bf51295baad4e1400337dfcb492b3b28f +Author: 孙广明 +Date: Mon Jan 24 13:19:13 2022 +0800 + + * Finish task #48001. + +commit b519ac86074bb2517cb6b5dcd6a95dacdea5bb31 +Author: zhouxin +Date: Mon Jan 24 05:12:33 2022 +0000 + + Fix bug #18847#18846 and add ditto for batchcreatecard.html.php. + +commit f8062df4dc0d3f69b6a2152f8e4321455f695a99 +Author: xieqiyu +Date: Mon Jan 24 13:07:30 2022 +0800 + + * Adjust the code structure. + +commit 5d32bccec8ef154ee9424517929f8dfe08422e2b +Merge: c95b928a54 58a692337a +Author: 孙广明 +Date: Mon Jan 24 05:02:51 2022 +0000 + + Merge branch 'devops20_liyuchun' into 'devops20' + + * Check user access. + + See merge request easycorp/zentaopms!1552 + +commit 32b459570be86aae4f64da0e568043373cb0aa29 +Merge: 0b8535a885 8959feba2a +Author: tianshujie +Date: Mon Jan 24 12:31:04 2022 +0800 + + Merge branch 'sprint/183_xieqiyu_47995new' of https://gitlab.zcorp.cc/easycorp/zentaopms into xieqiyu + +commit 0b8535a885b0ff97a99d46721901b556c77f1ae4 +Author: tianshujie +Date: Mon Jan 24 12:30:30 2022 +0800 + + * Finish task #47994. + +commit 8959feba2a0b310a9078959bef6b79556ead5cf8 +Author: xieqiyu +Date: Mon Jan 24 12:07:16 2022 +0800 + + * Optimize the code. + +commit 58a692337ace6d76f9de8dd6d894eda3c0571c6b +Author: liyuchun +Date: Mon Jan 24 10:59:21 2022 +0800 + + * Check user access. + +commit e3da935f167b6957e2dbd118215615b0bb689d13 +Merge: 782df170ea d550b6ac58 +Author: 孙广明 +Date: Mon Jan 24 02:48:50 2022 +0000 + + Merge branch 'sprint/183_liumengyi_47973' into 'master' + + * Finish task #47973. + + See merge request easycorp/zentaopms!1551 + +commit d550b6ac586dc851c09633d02f6e0cee66a91500 +Author: liumengyi +Date: Mon Jan 24 10:47:47 2022 +0800 + + * Modify code format. + +commit bc9f51c63de83ecf183ad36f683ad4ed9eefba23 +Author: liumengyi +Date: Mon Jan 24 10:36:33 2022 +0800 + + * Finish task #47973. + +commit 782df170eaf03e3a94c3e464b4a9746400fa72a4 +Merge: 3730b5b80a b4d294c395 +Author: 李玉春 <563917701@qq.com> +Date: Mon Jan 24 02:20:38 2022 +0000 + + Merge branch 'sgm_48004' into 'master' + + Sgm 48004 + + See merge request easycorp/zentaopms!1550 + +commit 895d34577568c04c99068a03f74ee94e31676ae5 +Author: xieqiyu +Date: Mon Jan 24 09:59:49 2022 +0800 + + * Code for task#47991. + +commit b4d294c395e5ee1731edc7a21c718878dcc1c8b1 +Author: 孙广明 +Date: Mon Jan 24 09:53:33 2022 +0800 + + * Finish task #48004. + +commit 3730b5b80a3ab0ada9d5a34c612fa753592163cf +Merge: e9776236d4 9fd9fcceb1 +Author: 孙广明 +Date: Mon Jan 24 01:39:28 2022 +0000 + + Merge branch 'Fixbug' into 'master' + + *Fix bug + + See merge request easycorp/zentaopms!1548 + +commit 9fd9fcceb1927e727d162e135c5fc9dfb3d07a35 +Author: zhengrunyu +Date: Mon Jan 24 09:38:26 2022 +0800 + + *Fix bug + +commit cff61e144ddd92cb92c30d560b405cf1443d82d2 +Author: zhengrunyu +Date: Mon Jan 24 09:32:24 2022 +0800 + + *Fix bug + +commit e9776236d4bd294ec0b9c1254f9f70c7559271ab +Merge: 9e50180887 3b100b47d2 +Author: 孙广明 +Date: Mon Jan 24 09:27:10 2022 +0800 + + Merge branch 'sprint/183_zhengrunyu_48003' + +commit 3b100b47d243e5989685e161ea79a9272f1e7a16 +Merge: 18b70fac64 6d13f60223 +Author: 孙广明 +Date: Mon Jan 24 01:26:45 2022 +0000 + + Merge branch 'master' into 'sprint/183_zhengrunyu_48003' + + # Conflicts: + # module/kanban/lang/en.php + # module/kanban/lang/zh-cn.php + # module/kanban/model.php + +commit 18b70fac641508584d890ff1d7aeebd30654f65d +Author: zhengrunyu +Date: Mon Jan 24 09:22:56 2022 +0800 + + *Finish task 47997 48003. + +commit c582ffed5ba1c8b55f07b2609dbfdc9fdd2e1ce8 +Author: xieqiyu +Date: Mon Jan 24 09:20:26 2022 +0800 + + * Code for task#47989. + +commit ea3c1dd61ba48774cf53df8c4879fed5f1509477 +Author: zhengrunyu +Date: Mon Jan 24 09:12:19 2022 +0800 + + *Finish task 47997 48003. + +commit 87463359ec508d5681017bbd05a309566ba987e1 +Author: zhengrunyu +Date: Mon Jan 24 09:02:29 2022 +0800 + + *Finish task 47997 48003. + +commit b323508a0b73aea4bd0567b60ac50abfd30de93d +Author: zhengrunyu +Date: Mon Jan 24 08:56:29 2022 +0800 + + *Finish task 47997 48003. + +commit 6d13f6022322ab50b63805acf5e016cb595bdaa9 +Merge: b2342fd7fb 3c7f9cf529 +Author: 孙广明 +Date: Mon Jan 24 00:56:05 2022 +0000 + + Merge branch 'sprint/183_tianshujie_privilege' into 'master' + + * Add import permission. + + See merge request easycorp/zentaopms!1547 + +commit 3c7f9cf5299843b5d4c637595e888871740a3e9a +Author: tianshujie +Date: Mon Jan 24 08:54:03 2022 +0800 + + * Add import permission. + +commit 38f3b30b4e643867ebc7c3eea8d825dc186559a7 +Author: zhengrunyu +Date: Mon Jan 24 08:53:14 2022 +0800 + + *Finish task 47997 48003. + +commit 23c9ebab657e28fe020cd1a4e208c898d13957b5 +Author: zhengrunyu +Date: Mon Jan 24 08:47:23 2022 +0800 + + *Finish task 47997 48003. + +commit f06c5c5e30f8c5d864b0f9e1daa4068d4728d96e +Author: zhengrunyu +Date: Mon Jan 24 08:36:25 2022 +0800 + + *Finish task 47997 48003. + +commit 6e5e5f96f62c533c8c058356839fdf267657c41a +Author: xieqiyu +Date: Sun Jan 23 20:34:31 2022 +0800 + + * Code for task#47993. + +commit 71b287e1fad77efb6006c14120324c0cd7c51701 +Author: xieqiyu +Date: Sun Jan 23 19:37:44 2022 +0800 + + * Code for task#47987. + +commit 1f79e9e7dd40437dde8654edc30b16cb2e86380c +Author: xieqiyu +Date: Sat Jan 22 22:24:49 2022 +0800 + + * Code for task#47995. + +commit b2342fd7fb21cfa86b958fc554665a6464623da8 +Merge: 50592ea096 e34ea32b16 +Author: 孙广明 +Date: Fri Jan 21 09:28:59 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug for task#47976. + + See merge request easycorp/zentaopms!1545 + +commit e34ea32b169f94a3e8654c61bca208a0b9b73367 +Author: liumengyi +Date: Fri Jan 21 17:27:40 2022 +0800 + + * Fix bug for task#47976. + +commit 50592ea096f6872e0e01e54cbff154ce950eec3c +Merge: 9e50180887 78dc1af6bd +Author: 孙广明 +Date: Fri Jan 21 09:24:33 2022 +0000 + + Merge branch 'sprint/182_tianshujie_18806' into 'master' + + Sprint/182 tianshujie 18806 + + See merge request easycorp/zentaopms!1543 + +commit c95b928a54bb48c330a09fcc218915c6ef11781c +Merge: 80134fd1bb a0209a41da +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 21 09:20:51 2022 +0000 + + Merge branch 'devops20_48097' into 'devops20' + + * Modify project access check. + + See merge request easycorp/zentaopms!1544 + +commit 78dc1af6bdde87178f0de241a6024be3a4ff29b3 +Author: tianshujie +Date: Fri Jan 21 15:40:56 2022 +0800 + + * Modify the format. + +commit a514a2bb0755b3a7d70129fdfbf2cb26ac31c369 +Author: 孙广明 +Date: Fri Jan 21 15:05:00 2022 +0800 + + * Finish one version. + +commit a0209a41da33d926369a629da4b938ebaf8ae57d +Author: caoyanyi +Date: Fri Jan 21 07:04:33 2022 +0000 + + * Modify project access check. + +commit 3f15a1e01603b06f17adb4c41bcf53a5bd5e7c33 +Author: tianshujie +Date: Fri Jan 21 15:04:25 2022 +0800 + + * Fix bug #18806. + +commit 2e030b874c18d9783acca3687230bdc68d635011 +Author: tianshujie +Date: Fri Jan 21 14:59:21 2022 +0800 + + * Fix bug #18806. + +commit 9e5018088750523e2da62b477631c7e05c00b6c5 +Merge: 7e250dfaee a2477a59bf +Author: 王怡栋 +Date: Fri Jan 21 06:36:02 2022 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Delete unused lang. + + See merge request easycorp/zentaopms!1541 + +commit 80134fd1bb3ba5d6bab6bad848a6dda88a34828d +Merge: 0f4d22a7a5 47e13757a8 +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 21 06:35:19 2022 +0000 + + Merge branch 'devops20_48104' into 'devops20' + + zg:任务48104 + + See merge request easycorp/zentaopms!1525 + +commit 7e250dfaeecbaff891b856767eea656094a5d910 +Merge: cfb595e987 795d691e8d +Author: 孙广明 +Date: Fri Jan 21 06:35:15 2022 +0000 + + Merge branch 'xieqiyu_fixbug_18792' into 'master' + + * Fix bug#18792. + + See merge request easycorp/zentaopms!1520 + +commit a2477a59bf27c95f27e98ed11027a6d99b4792e3 +Author: 孙广明 +Date: Fri Jan 21 14:33:58 2022 +0800 + + * Delete unused lang. + +commit 446f6e59d3349547d4b34eec616bf4c93283fc94 +Author: zhengrunyu +Date: Fri Jan 21 14:30:13 2022 +0800 + + *Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003. + +commit 9d6cd1f50d2a0e1b785506b7a1de285465aa3f61 +Author: xieqiyu +Date: Fri Jan 21 14:27:37 2022 +0800 + + * Modify return type. + +commit 0ffb6f3f8d45e20cbed972b3438f192e3539d18a +Author: xieqiyu +Date: Fri Jan 21 14:24:54 2022 +0800 + + * Code for task#47995. + +commit cfb595e9870c36084f55346e5cb4822fb2e5dde7 +Merge: ea05b6185c ecef85b7f7 +Author: 孙广明 +Date: Fri Jan 21 06:00:56 2022 +0000 + + Merge branch 'sprint/183_mayue_47998' into 'master' + + * Finish task #47998. + + See merge request easycorp/zentaopms!1529 + +commit ea05b6185cebde65218a0eada00b9579e3484336 +Merge: a82d786dde c40034f942 +Author: 孙广明 +Date: Fri Jan 21 13:57:34 2022 +0800 + + Merge branch 'sprint/183_liumengyi_fixbug' + +commit c40034f942bccb1591ffa15425141cc719a60122 +Merge: 80da12fc7d a82d786dde +Author: 孙广明 +Date: Fri Jan 21 05:57:10 2022 +0000 + + Merge branch 'master' into 'sprint/183_liumengyi_fixbug' + + # Conflicts: + # module/execution/js/kanban.js + +commit ecef85b7f7395871adca092598079e83d217e2b8 +Author: mayue +Date: Fri Jan 21 13:54:33 2022 +0800 + + * Add a file. + +commit 6ba1e7212d3a2b3dda2f8a588d0d20719fe5968d +Author: mayue +Date: Fri Jan 21 13:50:56 2022 +0800 + + * Optimize code. + +commit 80da12fc7db3600b69d73cd163e558c9f22eb150 +Author: liumengyi +Date: Fri Jan 21 13:49:47 2022 +0800 + + * Finish task#48008 and fix bug for 48011. + +commit a82d786dde379eba65766fd2d82f55942644af5e +Merge: 262c93b714 1a136248ba +Author: 孙广明 +Date: Fri Jan 21 13:47:35 2022 +0800 + + Merge branch 'sprint/183_zhouxin_47982' + +commit 1a136248baf5abb33585cbfac6b8afb775856be0 (origin/sprint/183_zhouxin_47982) +Merge: 6041f71d99 262c93b714 +Author: 孙广明 +Date: Fri Jan 21 05:47:16 2022 +0000 + + Merge branch 'master' into 'sprint/183_zhouxin_47982' + + # Conflicts: + # module/group/lang/resource.php + # module/kanban/js/view.js + # module/kanban/lang/en.php + # module/kanban/lang/zh-cn.php + +commit 6041f71d99b8f160492ee245edebec5a15e99944 +Author: zhouxin +Date: Fri Jan 21 05:44:18 2022 +0000 + + Adjust code. + +commit 2d6115537fbada23ed01f77e1fb3f64cfc91cc1c +Author: zhouxin +Date: Fri Jan 21 05:35:35 2022 +0000 + + Fix bug. + +commit aaaefa509ce9228c7d82782d09ee358e16555185 +Author: mayue +Date: Fri Jan 21 13:32:58 2022 +0800 + + * Optimize code. + +commit 262c93b71444885dcf2716c653b0aab85d84b857 +Merge: 47b2a35290 d0739e40e3 +Author: 孙广明 +Date: Fri Jan 21 05:28:30 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug for task #47976. + + See merge request easycorp/zentaopms!1536 + +commit 47b2a35290df725a04d47df59f62a67862ed33c4 +Merge: 8c2bd2386d dfddd4e48b +Author: 孙广明 +Date: Fri Jan 21 05:21:17 2022 +0000 + + Merge branch 'sprint/183_tianshujie_js' into 'master' + + * Finish task #48012. + + See merge request easycorp/zentaopms!1537 + +commit dfddd4e48be837b9ea25cf398f39be5c96fa2a22 +Author: tianshujie +Date: Fri Jan 21 13:19:02 2022 +0800 + + * Modify the code. + +commit fdaf47943ee35a713a2b9c5bb07d2ccb193680b5 +Author: xieqiyu +Date: Fri Jan 21 13:17:56 2022 +0800 + + * Code for task#47995. + +commit 47e13757a89b7cf378980d6c403c14a45bcdea9f +Author: zenggang +Date: Fri Jan 21 05:11:52 2022 +0000 + + * Adjust code + +commit fe23db621876f654f0d59866ae2b3f5dbe64d73d +Author: tianshujie +Date: Fri Jan 21 12:23:38 2022 +0800 + + * Finish task #48012. + +commit d0739e40e37d5b725315663f11c434148b1d71bd +Author: liumengyi +Date: Fri Jan 21 12:16:16 2022 +0800 + + * Fix bug for task #47976. + +commit 9b500daa08064bab611a7188e60b66bc1f4b7f48 +Author: zhengrunyu +Date: Fri Jan 21 11:21:52 2022 +0800 + + *Finish task 47997 48003. + +commit 2bfd25b61054394b543ab1d99d2255bdf0a9c7bb +Author: xieqiyu +Date: Fri Jan 21 11:15:54 2022 +0800 + + * Add function of removeKanbanCell. + +commit 0f4d22a7a565f7398601c9671762fff32a6d108d +Merge: dc6461a00d 13a49268e7 +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 21 03:07:40 2022 +0000 + + Merge branch 'devops_caoyanyi' into 'devops20' + + * Finish task #48109. + + See merge request easycorp/zentaopms!1534 + +commit 13a49268e740ee05eeb1daa4ee3b3ccdda0fdf80 +Author: liyuchun +Date: Fri Jan 21 11:06:58 2022 +0800 + + * Adjust check is bind user. + +commit 1a26aeba04532bcbe606b654e97a0b9b205cbc62 +Author: liyuchun +Date: Fri Jan 21 10:54:14 2022 +0800 + + * Define gitlab access level. + +commit 8c2bd2386df3b48006403686ffe26fad6c7eb118 +Merge: 58c0c34a65 039437a741 +Author: 孙广明 +Date: Fri Jan 21 02:52:33 2022 +0000 + + Merge branch 'sprint/183_liumengyi_48012_bug' into 'master' + + * Finish task #48012. + + See merge request easycorp/zentaopms!1535 + +commit 039437a7413ddcb6f7b91710b13022a44c26c63f +Author: liumengyi +Date: Fri Jan 21 10:49:54 2022 +0800 + + * Modify bug smooth refresh variable. + +commit 7cb49dd86bd24f9426f7d3097ae8eea2b975981c +Author: zhouxin +Date: Fri Jan 21 02:46:05 2022 +0000 + + Fix bug. + +commit 58c0c34a65cc9c83763a098269486c284f981efe +Merge: d2d48c063a d980d5132d +Author: 孙广明 +Date: Fri Jan 21 02:44:31 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug for edit kanban. + + See merge request easycorp/zentaopms!1527 + +commit 02c47ead7c30dace84321b090a9bef77bf47f572 +Author: liumengyi +Date: Fri Jan 21 10:39:54 2022 +0800 + + * Finish task #48012. + +commit e315a624400466747ee3fb19283ec3ba71e171c0 +Author: zenggang +Date: Fri Jan 21 02:38:51 2022 +0000 + + * Adjust code + +commit dc6461a00d4b337846eab75370d2d822147359e2 +Merge: ff88318735 bb7e0b9fc6 +Author: 王怡栋 +Date: Fri Jan 21 01:54:57 2022 +0000 + + Merge branch 'devops20_liyuchun' into 'devops20' + + lyc:完成任务48095 + + See merge request easycorp/zentaopms!1533 + +commit bb7e0b9fc6709d04ee8ad06b6238f5a46fca722a +Author: liyuchun +Date: Fri Jan 21 09:52:27 2022 +0800 + + * Finish task #48095. + +commit d2d48c063a2fa484306dce957496899d7b49c93a +Merge: bcd35e6ca6 9da1c180f2 +Author: 朱金勇 +Date: Fri Jan 21 01:45:34 2022 +0000 + + Merge branch 'sprint/scx_xuanxuan_lang' into 'master' + + *Xuanxuan lang. + + See merge request easycorp/zentaopms!1532 + +commit bcd35e6ca6613fcc654f32cb96f32abd1cf1f646 +Merge: 7531adfb82 1993f8ec27 +Author: 朱金勇 +Date: Fri Jan 21 01:44:39 2022 +0000 + + Merge branch 'sprint/scx_reportlang' into 'master' + + *Report lang. + + See merge request easycorp/zentaopms!1530 + +commit 7531adfb8279f63630cba49b52316df36d5095d2 +Merge: 9011d2f61b d19df00d0b +Author: 朱金勇 +Date: Fri Jan 21 01:44:08 2022 +0000 + + Merge branch 'sprint/183_zhouxudong_trans47958' into 'master' + + *Finish task #47958. + + See merge request easycorp/zentaopms!1531 + +commit 19be4266e877f5b24daf3cc55791025cce5f3b20 +Author: zhouxin +Date: Fri Jan 21 01:30:39 2022 +0000 + + Fix lang. + +commit ac00d73a20a7f254de17a55df40a126dcdef4374 +Author: zhouxin +Date: Fri Jan 21 01:23:30 2022 +0000 + + Finish task #47982. + +commit 9da1c180f21f32e1ff29a95f6f7a973d89c4435d +Author: songchenxuan +Date: Fri Jan 21 09:21:16 2022 +0800 + + *Xuanxuan lang. + +commit 9011d2f61bf87b922261a644fae16ea53dcf838c +Merge: 8583027a92 d38bb533b9 +Author: 孙广明 +Date: Fri Jan 21 01:16:16 2022 +0000 + + Merge branch 'sprint/183_tianshujie_48012' into 'master' + + Sprint/183 tianshujie 48012 + + See merge request easycorp/zentaopms!1528 + +commit 1993f8ec278a0c081241217e8a0338e313c36160 +Author: songchenxuan +Date: Fri Jan 21 09:08:45 2022 +0800 + + *Report lang. + +commit d19df00d0b9f735c2ddd70ab9af391f7ae267da7 +Author: zhouxudong +Date: Fri Jan 21 09:07:28 2022 +0800 + + *Finish task #47958. + +commit d38bb533b95d896ce8389ab23b68075ece6ec136 +Author: tianshujie +Date: Fri Jan 21 09:02:16 2022 +0800 + + * Restore code. + +commit c3ca6cf37047e1e889618eba2a3c44d4828e5939 +Author: tianshujie +Date: Fri Jan 21 08:48:59 2022 +0800 + + * Remove useless code. + +commit d980d5132d87c1de9deec98c7561fa42093de568 +Author: 刘梦艺 +Date: Fri Jan 21 00:46:28 2022 +0000 + + Update control.php + +commit 04f89dd9bab6f4960ae392655d74c4f162c6993b +Author: liumengyi +Date: Fri Jan 21 08:44:11 2022 +0800 + + * Fix bug for edit kanban. + +commit 8583027a928063cee61e783066321b84f1a623e6 +Merge: 07107f982f ec1f0876aa +Author: 孙广明 +Date: Fri Jan 21 00:41:10 2022 +0000 + + Merge branch 'sprint/183_liumengyi_fixbug' into 'master' + + * Fix bug for create kanban. + + See merge request easycorp/zentaopms!1526 + +commit ec1f0876aaa56b42ac81e64fa7d6ec6c6a3f1920 +Author: liumengyi +Date: Fri Jan 21 08:38:38 2022 +0800 + + * Fix bug for create kanban. + +commit 7b0694844cd92b8973a3fedb693f7a825ae6fd53 +Author: mayue +Date: Fri Jan 21 08:32:21 2022 +0800 + + * Finish task #47998. + +commit dde34eb36f61e6dc93b7958b5a7dac778c5d9971 +Author: xieqiyu +Date: Thu Jan 20 18:03:28 2022 +0800 + + * Code for task#47995. + +commit bd99d3def9695318458a368d8c710acac0b5c92e +Author: tianshujie +Date: Thu Jan 20 17:35:49 2022 +0800 + + * Realize the partial refresh function of the story card. + +commit 36c97752b487eee8b6df045d6c5a01860d82d10c +Author: zenggang +Date: Thu Jan 20 09:25:44 2022 +0000 + + * Finish task#48104 + +commit 07107f982f16dafeacc0ae686c2fef66cde492f1 +Merge: 01a746992d 445a26f81e +Author: 王怡栋 +Date: Thu Jan 20 09:23:32 2022 +0000 + + Merge branch 'sprint/183_liumengyi_48012_bug' into 'master' + + * Finish task #48012.Add the bug smooth refresh of create, batchcreate, confiremBug,resolve. + + See merge request easycorp/zentaopms!1524 + +commit 445a26f81e731c02f45f03d873ff144b11c07a8b +Author: liumengyi +Date: Thu Jan 20 17:22:10 2022 +0800 + + * Modify code format. + +commit 3ec206f626c1a604a399c08c90b19c6e9d808cbc +Author: liumengyi +Date: Thu Jan 20 17:07:03 2022 +0800 + + * Finish task #48012.Add the bug smooth refresh of create, batchcreate, confiremBug,resolve. + +commit 01a746992db38a7237da98038790ec49ed5fa481 +Merge: 6f024ee236 a6e3dbc371 +Author: 王怡栋 +Date: Thu Jan 20 08:07:21 2022 +0000 + + Merge branch 'sprint/183_liumengyi_48008' into 'master' + + * Fix bug for move card. + + See merge request easycorp/zentaopms!1522 + +commit 6f024ee2364ad26e960160942372460bee118a0b +Merge: 7d45eb3383 a8457f1665 +Author: 王怡栋 +Date: Thu Jan 20 16:06:10 2022 +0800 + + Merge branch 'sprint/183_hufangzhou_47986' + +commit a8457f1665000df821f7d3c680023d19906712dd (origin/sprint/183_hufangzhou_47986) +Merge: 9aee0590c5 fc7302c5ce +Author: 王怡栋 +Date: Thu Jan 20 08:04:32 2022 +0000 + + Merge branch 'master' into 'sprint/183_hufangzhou_47986' + + # Conflicts: + # db/update16.2.sql + # module/group/lang/resource.php + # module/kanban/lang/en.php + # module/kanban/lang/zh-cn.php + +commit 9aee0590c5f9efeee676cc56a1dd052995ecf156 +Author: hufangzhou +Date: Thu Jan 20 15:52:18 2022 +0800 + + * Finish task #47986. + +commit 220e149107026aa7e1e58a133d3e9abeb22aa996 +Author: caoyanyi +Date: Thu Jan 20 07:40:33 2022 +0000 + + * Finish task #48109. + +commit a6e3dbc3712b45cd531e66f0f5f4d08d494da508 +Author: liumengyi +Date: Thu Jan 20 15:39:47 2022 +0800 + + * Fix bug for mova card. + +commit fc7302c5ced942b6aa0643dda45433941b63dfa3 +Merge: 1ce16c8e3a f49dc4541c +Author: 朱金勇 +Date: Thu Jan 20 07:38:21 2022 +0000 + + Merge branch 'sprint/183_zhouxudong_trans47956' into 'master' + + *Finish task #47956. + + See merge request easycorp/zentaopms!1502 + +commit 1ce16c8e3a962d0bef6f0ec7fcbfbbdccdd2f121 +Merge: 399fac5edc f458304c06 +Author: 朱金勇 +Date: Thu Jan 20 07:38:04 2022 +0000 + + Merge branch 'sprint/scx_international' into 'master' + + Sprint/scx international + + See merge request easycorp/zentaopms!1499 + +commit 399fac5edc12c5f09197b54d8cf1cdd4ad4e7b98 +Merge: beaed8f006 4ce9f83f06 +Author: 朱金勇 +Date: Thu Jan 20 07:37:10 2022 +0000 + + Merge branch 'sprint/scx_lang' into 'master' + + *Code lang for international ZenTao. + + See merge request easycorp/zentaopms!1521 + +commit 4ce9f83f0622a72a03a8262c6521e2f7004e1305 +Author: songchenxuan +Date: Thu Jan 20 15:33:12 2022 +0800 + + *Code lang for international ZenTao. + +commit 25ee419afc307c43dc6bb2c0f3b9348598fe7a9e +Author: tianshujie +Date: Thu Jan 20 15:31:10 2022 +0800 + + * Implement the partial refresh function of the task card. + +commit 795d691e8d046de9fc8ff65ee3090e126204461e +Author: xieqiyu +Date: Thu Jan 20 15:00:16 2022 +0800 + + * Fix bug#18792. + +commit beaed8f006d888326bbf2ce7e8e2709ffb8a7435 +Merge: 6cf1ba1cf4 df8366e1ad +Author: 王怡栋 +Date: Thu Jan 20 06:56:11 2022 +0000 + + Merge branch 'sprint/183_liumengyi_48011' into 'master' + + * Finish task #48011. + + See merge request easycorp/zentaopms!1519 + +commit df8366e1adcc8ec90d083fbd26dfc13f41a439d2 +Author: liumengyi +Date: Thu Jan 20 14:55:06 2022 +0800 + + * Modify code format. + +commit e2e794c27f5a783418794e276fbc6e3dad517e98 +Author: liumengyi +Date: Thu Jan 20 14:49:16 2022 +0800 + + * Finish task #48011. + +commit ff8831873571b1b0c1c417d8bdaa4eb3558d49f9 +Merge: 7e96eb9f68 7942d9a886 +Author: liyuchun +Date: Thu Jan 20 14:11:22 2022 +0800 + + Merge branch 'devops_caoyanyi' into devops20 + +commit 7942d9a8864dd33e7ac9bfc7505c477214157e9f +Merge: f87294adf7 03cc2f1346 +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 20 06:10:57 2022 +0000 + + Merge branch 'devops20' into 'devops_caoyanyi' + + # Conflicts: + # module/gitlab/model.php + +commit 6cf1ba1cf4b4f4177b2e8d5414d7296e74b56f77 +Merge: 49cf88b669 39e8a3fae7 +Author: 王怡栋 +Date: Thu Jan 20 06:07:56 2022 +0000 + + Merge branch 'revert-98d5844e' into 'master' + + Revert "Merge branch 'devops_caoyanyi' into 'master'" + + See merge request easycorp/zentaopms!1517 + +commit 49cf88b66997268e69d24178b99fd1ae1a39f619 +Merge: 98d5844e64 7383bb566d +Author: 王怡栋 +Date: Thu Jan 20 05:50:27 2022 +0000 + + Merge branch 'sprint/183_tianshujie_48012' into 'master' + + * Achieve smooth refresh of completed tasks. + + See merge request easycorp/zentaopms!1516 + +commit 7383bb566da31a8a6f6d51a761617813cedb8854 +Author: tianshujie +Date: Thu Jan 20 13:49:21 2022 +0800 + + * Modify the question. + +commit 39e8a3fae77d082e946afeec7100cc2d67495bd6 +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 20 05:42:05 2022 +0000 + + Revert "Merge branch 'devops_caoyanyi' into 'master'" + + This reverts merge request !1515 + +commit 98d5844e64d1c0fe88b969c9f2a30b390660e92f +Merge: 438f0348a6 f87294adf7 +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 20 05:41:54 2022 +0000 + + Merge branch 'devops_caoyanyi' into 'master' + + * Modify page error. + + See merge request easycorp/zentaopms!1515 + +commit ee15a96157f95b60edb2180ff8c0768ca80ee419 +Author: tianshujie +Date: Thu Jan 20 13:41:20 2022 +0800 + + * Achieve smooth refresh of completed tasks. + +commit f87294adf7c109eaf60e428c66819d00e76ae5a0 +Author: caoyanyi +Date: Thu Jan 20 05:37:33 2022 +0000 + + * Modify page error. + +commit 03cc2f13463bd2f1385f8c8bd430471e2c6fde1f +Merge: 7e96eb9f68 b9c90fcd25 +Author: 王怡栋 +Date: Thu Jan 20 05:28:26 2022 +0000 + + Merge branch 'devops20_liyuchun' into 'devops20' + + * Add sudo in gitlab api url. + + See merge request easycorp/zentaopms!1514 + +commit b9c90fcd252f2f1264e8aeadf555e116bb70710d +Author: liyuchun +Date: Thu Jan 20 13:27:31 2022 +0800 + + * Adjust bind user. + +commit c561a9b666214caa3c8fc54b68be061d70bc797b +Author: liyuchun +Date: Thu Jan 20 13:11:40 2022 +0800 + + * Add sudo in gitlab api url. + +commit 438f0348a6153ee25452523f96b0e9bce3254841 +Merge: abf1d172a6 00f08fc3cd +Author: 王怡栋 +Date: Thu Jan 20 05:03:54 2022 +0000 + + Merge branch 'sprint/183_liumengyi_47977' into 'master' + + * Remove acl icon. + + See merge request easycorp/zentaopms!1513 + +commit abf1d172a6efce062206b722d14c6b6006644992 +Merge: 2f6dc0b378 2d6226093e +Author: 王怡栋 +Date: Thu Jan 20 03:22:28 2022 +0000 + + Merge branch 'sprint/183_liumengyi_47977' into 'master' + + * Finish task #48006, #48007. + + See merge request easycorp/zentaopms!1512 + +commit 00f08fc3cdd3746a17670c3544eab3bc3fe9df33 +Author: liumengyi +Date: Thu Jan 20 11:22:14 2022 +0800 + + * Remove acl icon. + +commit 2d6226093e73e8ff50da0908aa67c2d183d02e59 +Author: liumengyi +Date: Thu Jan 20 11:19:27 2022 +0800 + + * Modify involved kanban judgment. + +commit 2f6dc0b378105e9e89e49dd3726a8bbcd1181a31 +Merge: 3a972c69eb b22eed4a6d +Author: 王怡栋 +Date: Thu Jan 20 03:18:00 2022 +0000 + + Merge branch 'sprint/183_tianshujie_bug' into 'master' + + * Fix bug #18783,18780. + + See merge request easycorp/zentaopms!1511 + +commit b22eed4a6d641d2b139933c04bfb3d1b41cbc151 +Author: tianshujie +Date: Thu Jan 20 11:15:33 2022 +0800 + + * Fix bug #18783,18780. + +commit 083e006c3826f3dd262e4e5e6d5a3a1bb9bafa03 +Author: liumengyi +Date: Thu Jan 20 11:11:08 2022 +0800 + + * Remove empty line. + +commit b371c2284295bc6527d6367351f91498978ae9fc +Author: liumengyi +Date: Thu Jan 20 11:05:35 2022 +0800 + + * Finish task #48006, #48007. + +commit 3a972c69ebadd8e32abb3b2db03ac2be145712d0 +Merge: 5b4fd4c456 bc20febdb0 +Author: 王怡栋 +Date: Thu Jan 20 02:56:09 2022 +0000 + + Merge branch 'sprint/183_mayue_48002' into 'master' + + * Optimize style. + + See merge request easycorp/zentaopms!1510 + +commit bc20febdb0799d2869f240c8d7c3a06e01eef7d3 +Author: mayue +Date: Thu Jan 20 10:39:38 2022 +0800 + + * Optimize style. + +commit 5b4fd4c4560c3101a83951cd99b44fc94598ae5d +Merge: 278e4bcb0c 65df68d61e +Author: 王怡栋 +Date: Thu Jan 20 02:06:37 2022 +0000 + + Merge branch 'sprint/183_mayue_48002' into 'master' + + * Finish task. + + See merge request easycorp/zentaopms!1509 + +commit 65df68d61eacbb3a761ca4b518f48623351ed8ba +Author: mayue +Date: Thu Jan 20 10:04:44 2022 +0800 + + * Finish task. + +commit 278e4bcb0cd2a9ae281f2da3b560f8670b25d34f +Merge: f30562f520 d7be6b0af2 +Author: 王怡栋 +Date: Thu Jan 20 01:11:35 2022 +0000 + + Merge branch 'sprint/183_tianshujie_18747' into 'master' + + * Fix bug #18747. + + See merge request easycorp/zentaopms!1508 + +commit d7be6b0af2ec9737bd8fe875a2d53bda229209e1 +Author: tianshujie +Date: Thu Jan 20 09:07:19 2022 +0800 + + * Fix bug #18747. + +commit f30562f520442236d773fb7324f6b635f62413c5 +Merge: 6d2212e7e0 919e91b029 +Author: 孙广明 +Date: Wed Jan 19 09:32:28 2022 +0000 + + Merge branch 'sprint/183_zhouxin_47980' into 'master' + + Finish task #47980. + + See merge request easycorp/zentaopms!1496 + +commit 6d2212e7e0f374766343f073e00cc22fb6e113f5 +Merge: 8ac4e2e2c5 9ef522cc46 +Author: 孙广明 +Date: Wed Jan 19 09:32:12 2022 +0000 + + Merge branch 'sprint/183_liumengyi_47977' into 'master' + + * Finish task #47977. + + See merge request easycorp/zentaopms!1503 + +commit 8ac4e2e2c55375e304dfc2b1539d8e2eb6cd490f +Merge: 74acc10e1c 93fa4d0468 +Author: 孙广明 +Date: Wed Jan 19 09:30:57 2022 +0000 + + Merge branch 'xieqiyu_fixbug' into 'master' + + * Fix bug: click work sort error. + + See merge request easycorp/zentaopms!1506 + +commit 74acc10e1c0c383dd3801dcdbb695c78efed0048 +Merge: e535b6a423 aaa112c33b +Author: 孙广明 +Date: Wed Jan 19 17:27:09 2022 +0800 + + Merge branch 'sprint/183_mayue_47996' + +commit aaa112c33b124449480bc8cfb909217d8daf9eb0 +Merge: 7cb8fa1912 f1dd5b30d0 +Author: 孙广明 +Date: Wed Jan 19 09:29:23 2022 +0000 + + Merge branch 'master' into 'sprint/183_mayue_47996' + + # Conflicts: + # db/update16.2.sql + +commit 93fa4d046868d2765cd129b5bf6b98184741048a +Author: xieqiyu +Date: Wed Jan 19 17:25:20 2022 +0800 + + * Fix bug: click work sort error. + +commit 9ef522cc467ba4efac4ecbffe5d376922392c710 +Author: liumengyi +Date: Wed Jan 19 17:24:15 2022 +0800 + + * Modify code format. + +commit 7cb8fa191282a38a93cbd3cd4638ffd859114851 +Author: mayue +Date: Wed Jan 19 17:23:27 2022 +0800 + + * Optimize code. + +commit f1dd5b30d08e0b6e889dc74a3943a87b04c0b4e2 +Merge: 7e96eb9f68 9150697408 +Author: 孙广明 +Date: Wed Jan 19 09:12:52 2022 +0000 + + Merge branch 'sprint/183_mayue_47979' into 'master' + + * Finish task #47979. + + See merge request easycorp/zentaopms!1505 + +commit 29bedc7b1f9004f6621d952cc3e64dd17ac7e358 +Author: mayue +Date: Wed Jan 19 17:10:09 2022 +0800 + + * Optimize code. + +commit e02ec415c432bfbdabc20d8e6a337c7b7aa09d89 +Author: liumengyi +Date: Wed Jan 19 17:04:54 2022 +0800 + + * Remove useless code. + +commit 5fa4c30accdfd15c6bb39d4a4d379fb0fc9004aa +Author: liumengyi +Date: Wed Jan 19 17:01:21 2022 +0800 + + * Remove useless file. + +commit 91506974087b68de807b5f148a351a61684b549b +Author: mayue +Date: Wed Jan 19 16:59:00 2022 +0800 + + * Finish task #47979. + +commit c8b5ceed871ab25b9a295ccc3bb88478a86b1587 +Author: liumengyi +Date: Wed Jan 19 16:58:34 2022 +0800 + + * Finish task #47977. + +commit 7e96eb9f6888971d4c6e5044886260ac72844e4d +Merge: 68fb902692 a8564108dd +Author: liyuchun +Date: Wed Jan 19 16:55:57 2022 +0800 + + Merge branch 'devops19' + +commit 39b7da73554e05d20382547c1ae97d6ca89cd37f +Author: mayue +Date: Wed Jan 19 16:50:40 2022 +0800 + + * Finish task #47996. + +commit 68fb902692077245c00a8d52208093c0bc1a53bb +Merge: 74a9fedbd2 5bd18ec761 +Author: 孙广明 +Date: Wed Jan 19 08:44:06 2022 +0000 + + Merge branch 'sprint/183_tianshujie_48005' into 'master' + + * Finish task #48005. + + See merge request easycorp/zentaopms!1501 + +commit f458304c06f908b413ae82a79f3cd196a6bd7436 +Author: songchenxuan +Date: Wed Jan 19 16:43:20 2022 +0800 + + *Finish task #47951,47952,47953,47954. + +commit 5bd18ec7612b4d3659b7eb3bf01dbed086e7dc99 +Author: tianshujie +Date: Wed Jan 19 16:43:00 2022 +0800 + + * Add conditional judgment. + +commit 638e65114b142b8496f98be53391fb38f21e2b0b +Author: songchenxuan +Date: Wed Jan 19 16:36:28 2022 +0800 + + *Finish task #47951,47952,47953,47954. + +commit 131cdb614c2aab5790b79df6daee3a2abc321aa1 +Author: tianshujie +Date: Wed Jan 19 16:33:57 2022 +0800 + + * Modify card query logic. + +commit f49dc4541cbf94520426478dc783b4a5e06c9792 +Author: zhouxudong +Date: Wed Jan 19 16:29:40 2022 +0800 + + *Finish task #47956. + +commit 74a9fedbd2488fe835f896c23a7052c551c94412 +Author: zhujinyong +Date: Wed Jan 19 16:22:44 2022 +0800 + + * Fix install function. + +commit 1c60beb471cdfd5b5d42effe0d79c3ae42c77d2b +Author: tianshujie +Date: Wed Jan 19 16:02:34 2022 +0800 + + * Finish task #48005. + +commit 2b08d2f07aa77510430f8c487fe87b44877b37ab +Merge: 0adde5be67 4665190e43 +Author: tianshujie +Date: Wed Jan 19 16:02:27 2022 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/183_tianshujie_48005 + +commit 4665190e43e931502403474323c6779543d9695a +Merge: 4cb8d68e80 09ade37ec6 +Author: 朱金勇 +Date: Wed Jan 19 07:57:39 2022 +0000 + + Merge branch 'sprint/183_zhouxudong_trans47955' into 'master' + + Sprint/183 zhouxudong trans47955 + + See merge request easycorp/zentaopms!1500 + +commit 09ade37ec667d52822d8305e19a7d0169945da2e +Author: 周旭东 +Date: Wed Jan 19 07:52:31 2022 +0000 + + Update index.en.css + +commit 93aafabf4ffcea4d435a901843fade5ea4f33a71 +Author: zhouxudong +Date: Wed Jan 19 15:50:41 2022 +0800 + + *Finish task #47955 #47957. + +commit cb0b0747174503fd3b3409c9c33590577e20b8eb +Author: zhouxudong +Date: Wed Jan 19 15:43:28 2022 +0800 + + *Finish task #47955 #47957. + +commit 84d17ed2492eb873e9b3b07512fff211fd091713 +Author: songchenxuan +Date: Wed Jan 19 15:43:11 2022 +0800 + + *Finish task #47951,47952,47953,47954. + +commit d3c427182ee32d8372c4bfc0568ff314b4fe1469 +Author: songchenxuan +Date: Wed Jan 19 15:32:43 2022 +0800 + + *Finish task #47951,47952,47953,47954. + +commit 8b511a77699469152c39e5993f91ce046966bea9 +Author: songchenxuan +Date: Wed Jan 19 15:28:00 2022 +0800 + + *Finish task #47951,47952,47953,47954. + +commit 4cb8d68e805b5d4f3df32b3f0eab2bc7f16f4bf1 +Merge: e535b6a423 a7fa427b91 +Author: 朱金勇 +Date: Wed Jan 19 06:51:01 2022 +0000 + + Merge branch 'sprint/183_zhouxudong_trans47958' into 'master' + + *Finish task #47958. + + See merge request easycorp/zentaopms!1497 + +commit a7fa427b912b7d5bd342f2b42532fcd73854aff1 +Author: zhouxudong +Date: Wed Jan 19 14:29:23 2022 +0800 + + *Finish task #47958. + +commit 0adde5be6763f65a1a8cdc97cade67251b7d3023 +Author: tianshujie +Date: Wed Jan 19 13:56:50 2022 +0800 + + * Remove useless code. + +commit 919e91b0293e7668c36e415ad293ab2b526a6ce4 +Author: zhouxin +Date: Wed Jan 19 05:51:01 2022 +0000 + + Finish task #47980. + +commit e535b6a4231aababc9fd13340dcdda2394608b84 +Merge: daf0d59227 caf4e77f84 +Author: 王怡栋 +Date: Wed Jan 19 05:48:00 2022 +0000 + + Merge branch 'sprint/183_tianshujie_47981' into 'master' + + * Finish task #47981. + + See merge request easycorp/zentaopms!1495 + +commit caf4e77f84203d463a3be27b79932a2e9ed1e4f0 +Author: tianshujie +Date: Wed Jan 19 13:32:39 2022 +0800 + + * Finish task #47981. + +commit daf0d592273e36378432c95423450d40c57b8d78 +Merge: fdac2458cb cca28df709 +Author: 孙广明 +Date: Wed Jan 19 05:16:34 2022 +0000 + + Merge branch 'sprint/183_liumengyi_47977' into 'master' + + * Fix bug and add sql file. + + See merge request easycorp/zentaopms!1494 + +commit cca28df70918fcc60a30c3af35caaf7ca255c84d +Author: liumengyi +Date: Wed Jan 19 13:13:08 2022 +0800 + + * Fix bug and add sql file. + +commit fdac2458cb3d0f5008eb5b9fc3997a3ac77e2260 +Merge: 0c17431df8 361d245ac6 +Author: 孙广明 +Date: Wed Jan 19 03:17:59 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'master' + + * Fix bug #18481. + + See merge request easycorp/zentaopms!1490 + +commit 2b55df71abe4fba91d240f5fef693b8ae97c485d +Author: songchenxuan +Date: Wed Jan 19 11:17:35 2022 +0800 + + *Finish task #47951,47952,47953,47954. + +commit 361d245ac638f74215034da16416f0f728f18105 +Author: liumengyi +Date: Wed Jan 19 11:13:43 2022 +0800 + + * Remove useless variables. + +commit 2cc7870623aa1bbaa29b70c9261e494693dad373 +Author: songchenxuan +Date: Wed Jan 19 10:22:02 2022 +0800 + + *Finish task #47951,47952,47953. + +commit 2d10aedf4b40b77afa946b0dfc1a53297986f5ef +Author: liumengyi +Date: Wed Jan 19 09:04:11 2022 +0800 + + * Remove useless code. + +commit 0c17431df8a9303825d33e0a3d668d5c1aef707a +Merge: f3a6122cbe bb1d4c3839 +Author: 孙广明 +Date: Wed Jan 19 01:02:24 2022 +0000 + + Merge branch 'sprint/182_tianshujie_18692' into 'master' + + * Fix bug #18692. + + See merge request easycorp/zentaopms!1491 + +commit f3a6122cbeb165500ffaa1413cf44f756db7caf0 +Merge: 7d45eb3383 66a5f99982 +Author: 王怡栋 +Date: Wed Jan 19 01:01:42 2022 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix bug. + + See merge request easycorp/zentaopms!1492 + +commit a1c6cfadccf9274fcd8b5f179c985ec053c76b3e +Author: liumengyi +Date: Wed Jan 19 09:01:29 2022 +0800 + + * Modify required item judgment method. + +commit bb1d4c383931e68384145e45a744a6fcd249e3e2 +Author: tianshujie +Date: Wed Jan 19 09:01:12 2022 +0800 + + * Adjust code of kanban. + +commit 66a5f9998245b79ae3f5735baadb6dcac64faa6a +Author: 孙广明 +Date: Wed Jan 19 09:00:07 2022 +0800 + + * Fix bug. + +commit f7d97ebe333b5b5fc04f488bc4bf6da6be125fb0 +Author: tianshujie +Date: Wed Jan 19 08:49:09 2022 +0800 + + * Fix bug #18692. + +commit 7d45eb33830780b384cc5aaf7018328e274e0efd (tag: zentaopms_16.2) +Merge: 50755210a3 e7e01ddecd +Author: zhujinyong +Date: Wed Jan 19 08:33:08 2022 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 50755210a3444ff3875abe1347cae41dcf094b9b +Merge: 62ac473b45 3a45f1c746 +Author: zhujinyong +Date: Wed Jan 19 08:30:44 2022 +0800 + + Merge branch 'sprint/songchenxuan_testcase' + +commit eb31aac6a1da02670a68d58822e0a2b7efd8c559 +Author: liumengyi +Date: Tue Jan 18 17:29:52 2022 +0800 + + * Encapsulation function for bug #18481. + +commit 8f924a7f0571126b8d213d8d820ed702221bcf62 +Author: liumengyi +Date: Tue Jan 18 17:23:54 2022 +0800 + + * Fix bug #18481. + +commit e7e01ddecd5fccf16726ef461ea5580e926170b3 +Merge: 51b913511b 9b139eb1a9 +Author: 孙广明 +Date: Tue Jan 18 08:24:56 2022 +0000 + + Merge branch 'sprint/182_hufangzhou_18687' into 'master' + + * Fix bug #18687. + + See merge request easycorp/zentaopms!1489 + +commit 9b139eb1a9245b52696f2d64bdba04bb28252a04 +Author: hufangzhou +Date: Tue Jan 18 16:24:18 2022 +0800 + + * Fix bug #18687. + +commit 51b913511ba407a55342f663a16523763b9f8f80 +Merge: 3954c3469d 29e8966c33 +Author: 孙广明 +Date: Tue Jan 18 08:19:51 2022 +0000 + + Merge branch 'sprint/182_tianshujie_bug' into 'master' + + * Fix drag sort issue. + + See merge request easycorp/zentaopms!1488 + +commit 29e8966c3332e3765bd231a1ab7c5ad554e389e8 +Author: tianshujie +Date: Tue Jan 18 16:18:15 2022 +0800 + + * Fix drag sort issue. + +commit 3954c3469d9abb99e2162b0220f55f284288ad91 +Merge: fa40efcc30 7299915e89 +Author: 王怡栋 +Date: Tue Jan 18 08:11:01 2022 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix bug. + + See merge request easycorp/zentaopms!1487 + +commit fa40efcc3061c63bda38393eaded860147f0b9c0 +Merge: 1a3020201f daf29be42b +Author: 孙广明 +Date: Tue Jan 18 08:08:58 2022 +0000 + + Merge branch 'sprint/182_tianshujie_18666' into 'master' + + * Fix bug #18666. + + See merge request easycorp/zentaopms!1485 + +commit 7299915e89a5c07db02daf4e6c29c9573e3945bd +Author: 孙广明 +Date: Tue Jan 18 16:08:13 2022 +0800 + + * Fix bug. + +commit a8564108dd0f8992c71b7da89cba56fbc737458e +Merge: 7aa62e81ba 1f9d135210 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 18 08:01:41 2022 +0000 + + Merge branch 'devops_caoyanyi_testcase' into 'devops19' + + cyy:Fix bug. + + See merge request easycorp/zentaopms!1472 + +commit daf29be42b193eaab8a09f3ba4d3fea393a8292b +Author: tianshujie +Date: Tue Jan 18 16:01:25 2022 +0800 + + * Fix bug #18520. + +commit 1a3020201f299b5f57a75e21aed1104e66ad8832 +Merge: 62c0cd2ed0 a376617fc6 +Author: 朱金勇 +Date: Tue Jan 18 08:01:10 2022 +0000 + + Merge branch 'ztf_zhouxin_01' into 'master' + + Add testcase for create and update method for productModel. + + See merge request easycorp/zentaopms!1462 + +commit 62c0cd2ed04d91c95b4073280573dcd465336cb6 +Merge: 628de03897 0525582e25 +Author: 朱金勇 +Date: Tue Jan 18 08:00:21 2022 +0000 + + Merge branch 'autoTest_xieqiyu' into 'master' + + Auto test xieqiyu + + See merge request easycorp/zentaopms!1480 + +commit 628de038978826d75fc3d6d3f393e63bdc880685 +Merge: 2ff884df0a aa79ce443c +Author: 朱金勇 +Date: Tue Jan 18 07:59:08 2022 +0000 + + Merge branch 'autotest_zhengrunyu' into 'master' + + Autotest zhengrunyu + + See merge request easycorp/zentaopms!1484 + +commit aa79ce443cec7815730c83973bdc5b628f3b33b5 +Author: zhengrunyu +Date: Tue Jan 18 15:42:44 2022 +0800 + + *autotest case. + +commit 236ffe6056aa262a7bd84afd17a82e28f6e7079d +Author: tianshujie +Date: Tue Jan 18 15:40:54 2022 +0800 + + * Fix bug #18666. + +commit a376617fc6d86129b6115d055b30f7b949d46e94 +Author: zhouxin +Date: Tue Jan 18 07:38:15 2022 +0000 + + Add testcase for getList and getPairs method for productModel. + +commit 2ff884df0ae6c6a1b76bfe0b13d48ccf8f4a170c +Merge: 0ea97815a5 0f9fa42664 +Author: 孙广明 +Date: Tue Jan 18 07:32:10 2022 +0000 + + Merge branch 'sprint/182_hufangzhou_18673' into 'master' + + * Fix bug #18673. + + See merge request easycorp/zentaopms!1483 + +commit 0f9fa42664cc9a0fc91887264cdc244e31530704 +Author: hufangzhou +Date: Tue Jan 18 15:31:10 2022 +0800 + + * Fix bug #18673. + +commit 0ea97815a5f3ac1397b83d714b62bec3fd92c2fc +Merge: 535340e47d 7f278b4c79 +Author: 王怡栋 +Date: Tue Jan 18 07:12:25 2022 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix bug. + + See merge request easycorp/zentaopms!1482 + +commit 7f278b4c796e39d6157a813bfa4ccbd551f932f2 +Author: 孙广明 +Date: Tue Jan 18 15:10:57 2022 +0800 + + * Fix bug. + +commit 535340e47df71cce73dadfa2b0becbef79157b56 +Merge: 6a87394ddf c587ac5863 +Author: 王怡栋 +Date: Tue Jan 18 07:04:39 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'master' + + * Fix bug #18671. + + See merge request easycorp/zentaopms!1479 + +commit 6a87394ddf01e1d2edf0634b295a743794d1a235 +Merge: 7ad2f4569c eee8de32a9 +Author: 王怡栋 +Date: Tue Jan 18 07:04:03 2022 +0000 + + Merge branch 'sprint/182_tianshujie_18469' into 'master' + + * Fix bug #18469. + + See merge request easycorp/zentaopms!1481 + +commit eee8de32a92b0f901f8a8828be86c2b099045229 +Author: tianshujie +Date: Tue Jan 18 15:01:38 2022 +0800 + + * Fix bug #18469. + +commit 0525582e2536a17017a7d196d0bfcafdc9346116 +Author: xieqiyu +Date: Tue Jan 18 14:56:51 2022 +0800 + + * Delete unused code. + +commit 7ad2f4569c389b547f8fa3ba1b8a3f01e37b8bf3 +Merge: e3a56327e4 50f042f29d +Author: 王怡栋 +Date: Tue Jan 18 06:49:05 2022 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix tutorial bug. + + See merge request easycorp/zentaopms!1476 + +commit c587ac5863c0a415d372cde8ac793bef9c005dc1 +Author: liumengyi +Date: Tue Jan 18 14:46:38 2022 +0800 + + * Fix bug #18671. + +commit 7077a85277dfb49fe5850defe03da21affd669b5 +Author: xieqiyu +Date: Tue Jan 18 14:27:58 2022 +0800 + + * Add auto test case. + +commit e3a56327e42c5bd470e7402a8742cf81803fe3e3 +Merge: b4438d5b5a f579b6c7b2 +Author: 孙广明 +Date: Tue Jan 18 06:24:06 2022 +0000 + + Merge branch 'sprint/182_tianshujie_18664' into 'master' + + * Fix bug #18664. + + See merge request easycorp/zentaopms!1478 + +commit f579b6c7b2e6a1eb7d023fff0af3d0db8485c842 +Author: tianshujie +Date: Tue Jan 18 14:23:06 2022 +0800 + + * Fix bug #18664. + +commit b4438d5b5a08e827cc8b6453e9c51bd0f6313bb2 +Merge: 431f7d100e 18bafcb49d +Author: 孙广明 +Date: Tue Jan 18 06:20:06 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'master' + + * Fix bug #18665. + + See merge request easycorp/zentaopms!1477 + +commit 18bafcb49d22e16520dba21df9740aa408f9cfbe +Author: liumengyi +Date: Tue Jan 18 14:19:10 2022 +0800 + + * Fix bug #18665. + +commit 431f7d100e3d692c7c75bd061767ba5661930d0e +Merge: b09d6a161b e35fa62b97 +Author: 孙广明 +Date: Tue Jan 18 06:05:48 2022 +0000 + + Merge branch 'xieqiyu_fixbug' into 'master' + + * Fix bug: Branch error when click header. + + See merge request easycorp/zentaopms!1474 + +commit b09d6a161b520aa75c5bbfb7b4005fa7756f2ae1 +Merge: 3c16c97cd7 0c1ebe9beb +Author: 孙广明 +Date: Tue Jan 18 06:05:34 2022 +0000 + + Merge branch 'sprint/182_tianshujie_18663' into 'master' + + * Fix bug #18663. + + See merge request easycorp/zentaopms!1475 + +commit 50f042f29dbb3518e508717e41ab885b08835ba1 +Author: 孙广明 +Date: Tue Jan 18 14:04:46 2022 +0800 + + * Fix tutorial bug. + +commit 0c1ebe9beb477bea08efc4e84fcf5cd4d30cc075 +Author: tianshujie +Date: Tue Jan 18 14:04:42 2022 +0800 + + * Fix bug #18663. + +commit 3a45f1c746564e9ad625c6d998841413104aab4e (origin/sprint/songchenxuan_testcase) +Author: songchenxuan +Date: Tue Jan 18 14:03:33 2022 +0800 + + *Case. + +commit e35fa62b977355625b4802eb120b12553cb98478 +Author: xieqiyu +Date: Tue Jan 18 14:01:46 2022 +0800 + + * Fix bug: Branch error when click header. + +commit 3c16c97cd7693a458d1ba964b5f85ee1f8fa00c0 +Merge: 9b20857b8b 1b7f4cd8c7 +Author: 王怡栋 +Date: Tue Jan 18 05:59:54 2022 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix tutorial bug. + + See merge request easycorp/zentaopms!1473 + +commit 4153218cb9916b4b6febabd56c1125212f5a10ef +Author: songchenxuan +Date: Tue Jan 18 13:59:53 2022 +0800 + + *Case. + +commit 1b7f4cd8c783d0e0abb8bd1d1fff0edb404bcf5a +Author: 孙广明 +Date: Tue Jan 18 13:56:05 2022 +0800 + + * Fix tutorial bug. + +commit 9b20857b8ba402b207045b38f47b37fc5d3530b2 +Merge: d19fa0e6ef 0f26e7d982 +Author: 孙广明 +Date: Tue Jan 18 05:41:01 2022 +0000 + + Merge branch 'sprint/182_tianshujie_18643' into 'master' + + * Fix bug #18643. + + See merge request easycorp/zentaopms!1471 + +commit 1f9d135210d781c3a64ee7b2bbcc4cc9c7590fa1 +Author: caoyanyi +Date: Tue Jan 18 05:39:54 2022 +0000 + + * Modify tips label style. + +commit 0f26e7d9825a6425b28c4d404f74509c99e9a58a +Author: tianshujie +Date: Tue Jan 18 13:38:46 2022 +0800 + + * Fix bug #18643. + +commit d19fa0e6ef141c0fd8674ad57e562f7e9c9eef2f +Merge: 3f370bad4c c9948abdec +Author: 王怡栋 +Date: Tue Jan 18 05:37:41 2022 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix bug. + + See merge request easycorp/zentaopms!1470 + +commit c9948abdec491d9c642dc65caf29eab647d5e856 +Author: 孙广明 +Date: Tue Jan 18 13:35:06 2022 +0800 + + * Fix bug. + +commit 3f370bad4cbc9db53cfdc8d61d8ba86fefe56aee +Merge: 266341191b 625f3e6d59 +Author: 王怡栋 +Date: Tue Jan 18 05:25:33 2022 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix kanban bug. + + See merge request easycorp/zentaopms!1469 + +commit 625f3e6d59a0ddac0e34ed6fb240486473187aa0 +Author: 孙广明 +Date: Tue Jan 18 13:24:11 2022 +0800 + + * Fix kanban bug. + +commit 266341191b6e4f8dc568e06dbca33a04fb6eb9d8 +Merge: 5e5f833acf 42a352dc20 +Author: 孙广明 +Date: Tue Jan 18 05:21:16 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'master' + + * Fix bug #18629. + + See merge request easycorp/zentaopms!1468 + +commit 42a352dc201138afad2110cd403ab6c465db0daf +Author: liumengyi +Date: Tue Jan 18 13:18:44 2022 +0800 + + * Fix bug #18629. + +commit a7c944d3e52affb49110b1f2b411782db355550e +Author: liumengyi +Date: Tue Jan 18 13:16:20 2022 +0800 + + * Fix bug #18629. + +commit 5e5f833acf0ae757c2a12955e38e3c6081481bbd +Merge: 1935c26418 8092c5be0a +Author: 孙广明 +Date: Tue Jan 18 05:13:19 2022 +0000 + + Merge branch 'xieqiyu_fixbug' into 'master' + + * Fix bug: normal product can not batch change module. + + See merge request easycorp/zentaopms!1467 + +commit 1935c26418e9c46514a838e9a0fa9b56a578a97f +Merge: 5d5521ecfc 5d042bcbea +Author: 孙广明 +Date: Tue Jan 18 05:12:30 2022 +0000 + + Merge branch 'sprint/182_tianshujie_18646' into 'master' + + * Fix bug #18640,18646. + + See merge request easycorp/zentaopms!1464 + +commit 5d042bcbea8367c790087c1064af4ebecadad1da +Author: tianshujie +Date: Tue Jan 18 13:11:52 2022 +0800 + + * Modify the code. + +commit 8092c5be0ad0443db566a305b0ee7cfc5e22c802 +Author: xieqiyu +Date: Tue Jan 18 13:11:22 2022 +0800 + + * Fix bug: normal product can not batch change module. + +commit 7aa62e81bade6ffa442207714cf26cb5a7c74053 +Merge: 87738e8de3 c886988d62 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 18 05:09:07 2022 +0000 + + Merge branch 'devops19_18327' into 'devops19' + + 修复bug 18327 + + See merge request easycorp/zentaopms!1466 + +commit 545d7f2e2434f7a1287cff0fb4505c968b42ece9 +Author: tianshujie +Date: Tue Jan 18 13:06:50 2022 +0800 + + * Modify the code. + +commit 5d5521ecfc92905a55ad900f4be621d2f5d73faa +Merge: 5e285ba992 676db0bbb2 +Author: 朱金勇 +Date: Tue Jan 18 05:06:23 2022 +0000 + + Merge branch 'sprint/zhouxudong_18321' into 'master' + + *Fix bug #18321. + + See merge request easycorp/zentaopms!1437 + +commit 5e285ba9924eddafc7beb4eb90729d64e7122974 +Merge: 34a41b82d1 ac318de175 +Author: 朱金勇 +Date: Tue Jan 18 05:06:01 2022 +0000 + + Merge branch 'sprint/zhouxudong_fixbug_13636' into 'master' + + *Fix bug #13636. + + See merge request easycorp/zentaopms!1384 + +commit 61900dd6cff4743fc39befa3c8451ea6f13e8e4b +Author: songchenxuan +Date: Tue Jan 18 11:30:46 2022 +0800 + + *Case. + +commit f257fe3e5a74c410223eaf8eda333ec6aa1e6894 +Author: tianshujie +Date: Tue Jan 18 11:26:31 2022 +0800 + + * Fix bug #18633. + +commit 1ebf1c48277bf33e5336e6ff716cfd98db468357 +Author: tianshujie +Date: Tue Jan 18 11:21:49 2022 +0800 + + * Restore code. + +commit 34a41b82d1fcb88a0baf2506ead97adda3732018 +Merge: f66996c675 b27b06929c +Author: 孙广明 +Date: Tue Jan 18 03:21:04 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'master' + + * Fix bug #18644. + + See merge request easycorp/zentaopms!1465 + +commit c886988d62b505cb3decc761f605abeaa4f138ed +Author: zenggang +Date: Tue Jan 18 03:20:14 2022 +0000 + + * Fix bug#18327 + +commit 93ef9baf9fc547632b4bc0eadb240a2a4268cf54 +Author: tianshujie +Date: Tue Jan 18 11:19:35 2022 +0800 + + * Fix bug #18646. + +commit b27b06929c48469103ccd9f3c27e901af505dbc0 +Author: liumengyi +Date: Tue Jan 18 11:19:04 2022 +0800 + + * Fix bug #18644. + +commit 470801b6aaf57348e608eb3fe33bc90a8ef55c91 +Author: tianshujie +Date: Tue Jan 18 11:09:01 2022 +0800 + + * Fix bug #18640,18646. + +commit f66996c6751da884caf3c3c17b09819a9a392b79 +Merge: 24de4b423c afe5025006 +Author: 孙广明 +Date: Tue Jan 18 03:00:33 2022 +0000 + + Merge branch 'sprint/182_hufangzhou_47308' into 'master' + + * Finish task #47308. + + See merge request easycorp/zentaopms!1463 + +commit afe5025006da8733415c2bd32e69fd0def683a85 +Author: hufangzhou +Date: Tue Jan 18 10:59:28 2022 +0800 + + * Finish task #47308. + +commit 721e3baaa3a34ff2b9bb66a18694c75bdd7c5a4c +Author: zhouxin +Date: Tue Jan 18 02:56:20 2022 +0000 + + Add testcase for create and update method for productModel. + +commit 24de4b423c078bff0b29c1233881069f9819ac6b +Merge: d39aa0ecbb a0921f1c7d +Author: 孙广明 +Date: Tue Jan 18 02:52:44 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'master' + + * Fix bug #18638, #18644. + + See merge request easycorp/zentaopms!1461 + +commit a0921f1c7d4f978fd83bc20643cab11736dc2170 +Author: liumengyi +Date: Tue Jan 18 10:49:53 2022 +0800 + + * Fix bug #18638, #18644. + +commit f7682bf7a2d5e888a9bb113dfcef6c3a85559608 +Author: zhengrunyu +Date: Tue Jan 18 10:41:40 2022 +0800 + + * Autotest program. + +commit d39aa0ecbb9617e27ca2dd80308f4c282751b42a +Merge: 172b4ade25 49745fa258 +Author: 朱金勇 +Date: Tue Jan 18 02:33:01 2022 +0000 + + Merge branch 'zentao_client_fix' into 'master' + + Zentao client fix + + See merge request easycorp/zentaopms!1460 + +commit 49745fa2587665ebae6792925155ff068df22522 +Author: chaideqing +Date: Tue Jan 18 10:27:36 2022 +0800 + + * refactor window size and productID executionID -1 to 0, at task #47399 + +commit 8ebdc2a3b621bb5828439567beecddcaf54e800f +Author: zhengrunyu +Date: Tue Jan 18 10:22:42 2022 +0800 + + * Autotest program case. + +commit 2259cfc05b1b7704dd72fef72a4b58aad1a302f3 +Author: songchenxuan +Date: Tue Jan 18 10:04:03 2022 +0800 + + *Case. + +commit 172b4ade258e79b6675dc5c0b4ade720413e1559 +Merge: caede6d5e9 a66f16dae6 +Author: 孙广明 +Date: Tue Jan 18 02:03:09 2022 +0000 + + Merge branch 'sprint/182_tianshujie_bug' into 'master' + + Sprint/182 tianshujie bug + + See merge request easycorp/zentaopms!1458 + +commit a66f16dae6ded443215e72c0a368761e324c8470 +Author: tianshujie +Date: Tue Jan 18 10:02:40 2022 +0800 + + * Modify the code. + +commit 80ce2a3d03bc4fa9948022ac4e26c797480350a5 +Author: songchenxuan +Date: Tue Jan 18 09:59:54 2022 +0800 + + *Case. + +commit 1642b2b63fa3a2ac1f89a3721b9a1a680fc6d085 +Author: tianshujie +Date: Tue Jan 18 09:57:19 2022 +0800 + + * Fixed the error of creating sub-columns and the update of task cards. + +commit caede6d5e9e1a9a99c515c5c5a91b4a00db5c259 +Merge: fb8fd8b7de cc3abb1c0b +Author: 孙广明 +Date: Tue Jan 18 01:56:54 2022 +0000 + + Merge branch 'sprint/182_hufangzhou_parentColumn' into 'master' + + * Add the data-contextmenu to parent column. + + See merge request easycorp/zentaopms!1457 + +commit cc3abb1c0b9296991719b3d073f223de7d24414d +Author: hufangzhou +Date: Tue Jan 18 09:55:19 2022 +0800 + + * Add the data-contextmenu to parent column. + +commit fb8fd8b7de2913d1c7f80174a7a63424c851f767 +Merge: 17320cae16 098622ffae +Author: 孙广明 +Date: Tue Jan 18 01:32:19 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'master' + + * Fix bug #18584, #18594. + + See merge request easycorp/zentaopms!1453 + +commit e03ce5b6771240cfd67bd8ce5079b3e640c2f35c +Author: tianshujie +Date: Tue Jan 18 09:32:07 2022 +0800 + + * Fix bug #18575. + +commit 098622ffae44ccef2de058015ff5a6b7f6796cf4 +Author: liumengyi +Date: Tue Jan 18 09:29:04 2022 +0800 + + * Fix bug #18619. + +commit 17320cae163c30b1c634dc9d30f87f1cf4f4d90c +Merge: 1f501ade0d 139f1dbcac +Author: 王怡栋 +Date: Tue Jan 18 01:24:26 2022 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix delay bug. + + See merge request easycorp/zentaopms!1456 + +commit 139f1dbcac19be2af7c444b849fb6d40419c16bd +Author: 孙广明 +Date: Tue Jan 18 09:17:47 2022 +0800 + + * Fix delay bug. + +commit 87738e8de3ee94d4e83bd60334019ec5bc760e66 +Merge: f9c0d30c03 fbc3d00e7d +Author: 王怡栋 +Date: Tue Jan 18 01:17:56 2022 +0000 + + Merge branch 'devops19_liyuchun' into 'devops19' + + * Fix bug #18437. + + See merge request easycorp/zentaopms!1455 + +commit fbc3d00e7d5eda3d9e0e19ae387629cd0c42dc89 +Author: liyuchun +Date: Tue Jan 18 09:14:41 2022 +0800 + + * Fix bug #18437. + +commit f9c0d30c03f2430d19d6bad93e900b5fd01eac7b +Merge: 8465087b2a 27b848d6f8 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 18 01:10:08 2022 +0000 + + Merge branch 'devops19_zenggang' into 'devops19' + + zg:单元测试 + + See merge request easycorp/zentaopms!1447 + +commit 8465087b2aa1e2a2c7d7d7a46b95883bc9d6872b +Merge: 9bf831ee67 223ae8be3d +Author: 王怡栋 +Date: Tue Jan 18 01:06:25 2022 +0000 + + Merge branch 'devops19_liyuchun' into 'devops19' + + lyc:修改单元测试用例 + + See merge request easycorp/zentaopms!1454 + +commit 223ae8be3d46defd65fd417b3b42ac42ee033cc9 +Author: liyuchun +Date: Tue Jan 18 09:06:07 2022 +0800 + + * Adjust comment. + +commit c377f3b54c9853e0d394dce4746488b87be2d485 +Author: liumengyi +Date: Tue Jan 18 09:03:30 2022 +0800 + + * Fix bug #18584, #18594. + +commit 72d551598b66ed2aea9fa0dba2d2e1ff5360ac07 +Author: liyuchun +Date: Tue Jan 18 09:03:24 2022 +0800 + + * Adjsut unit case. + +commit 1f501ade0d912d8aa87a4cbcdc78d3bd1e9fe701 +Merge: dda972beee 5ef6718a93 +Author: 王怡栋 +Date: Tue Jan 18 08:57:18 2022 +0800 + + Merge branch 'sgm_fixbug' + +commit 5ef6718a93ccb6bbc6392cda8969d10a0f2b8993 +Merge: 820993a452 07c98e7e1a +Author: 王怡栋 +Date: Tue Jan 18 00:56:32 2022 +0000 + + Merge branch 'master' into 'sgm_fixbug' + + # Conflicts: + # module/kanban/model.php + +commit 820993a4521e9acc7563750c34c7aec9bd785e86 +Author: 孙广明 +Date: Tue Jan 18 08:52:13 2022 +0800 + + * Add delay. + +commit 07c98e7e1aa124031acf6c23f41dab7a430e9dbb +Merge: 4eee56ce53 e427e235fa +Author: 孙广明 +Date: Tue Jan 18 00:50:11 2022 +0000 + + Merge branch 'sprint/182_tianshujie_kanban' into 'master' + + * Fix bug #18578,18536. + + See merge request easycorp/zentaopms!1450 + +commit e427e235fa89dfb58958d16a6ab44b59b06d9a28 +Author: tianshujie +Date: Tue Jan 18 08:45:58 2022 +0800 + + * Modify the code logic. + +commit b7d74b1131d594dc0e120f3ce85cda60307fe88b +Author: tianshujie +Date: Tue Jan 18 08:36:18 2022 +0800 + + * Fix the problem of demand status flow. + +commit 4eee56ce5386d2da0e0b2952ea72d4858fe3bbf4 +Merge: 62ac473b45 dd99e46107 +Author: 孙广明 +Date: Tue Jan 18 00:29:35 2022 +0000 + + Merge branch 'sprint/182_liumengyi_18619' into 'master' + + * Fix bug #18619. + + See merge request easycorp/zentaopms!1451 + +commit dd99e4610702d086b7f1c7955dce1fec78242d2f +Author: liumengyi +Date: Tue Jan 18 08:17:21 2022 +0800 + + * Fix bug #18619. + +commit cb1f7a634e05c88b93be8dfc9ab70070e0685ff2 +Author: tianshujie +Date: Mon Jan 17 23:49:54 2022 +0800 + + * Fix bug #18578,18536. + +commit 62ac473b45c810068cc6e6ba4f5ca4daef3baf87 +Merge: 9965fc388d deb8ca0142 +Author: 孙广明 +Date: Mon Jan 17 11:09:11 2022 +0000 + + Merge branch 'sprint/182_liumengyi_groupby' into 'master' + + * Code for execution kanban grouping. + + See merge request easycorp/zentaopms!1449 + +commit 9965fc388ddddbbd56c37e417deba0f73e3f3cdd +Merge: c29afeee58 79813a2166 +Author: 孙广明 +Date: Mon Jan 17 11:08:43 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'master' + + * Fix bug #18625. + + See merge request easycorp/zentaopms!1448 + +commit deb8ca014263e6d6a50c85a28ee4c7d18311d8e8 +Author: liumengyi +Date: Mon Jan 17 19:07:23 2022 +0800 + + * Code for execution kanban grouping. + +commit 79813a21662fbf29bcd8784f3a0744ad04026d7f +Author: liumengyi +Date: Mon Jan 17 18:53:45 2022 +0800 + + * Modify judgment. + +commit c11615933a1b52bf17256c10010997501385896b +Author: liumengyi +Date: Mon Jan 17 18:51:50 2022 +0800 + + * Fix bug #18625. + +commit 47e7cd7f107b467e2a82a35e6bc5c92be43b9b3d +Author: liumengyi +Date: Mon Jan 17 18:46:58 2022 +0800 + + * Fix bug #18625. + +commit 842ca076182093e94f7e672c8166b8a93112ecab +Author: liumengyi +Date: Mon Jan 17 18:25:39 2022 +0800 + + * Fix bug #18625. + +commit c29afeee584d3f3734d8c0dad9ef5091599b0b9e +Merge: 48b4ae13dc 97a4fb7cc9 +Author: 孙广明 +Date: Mon Jan 17 09:25:52 2022 +0000 + + Merge branch 'sprint/182_tianshujie_18496' into 'master' + + * Fix bug #18496. + + See merge request easycorp/zentaopms!1446 + +commit 97a4fb7cc95d2638e3bea524fac3f015684ffef2 +Author: tianshujie +Date: Mon Jan 17 17:24:42 2022 +0800 + + * Adjust code of kanban and bug model. + +commit 27b848d6f8a4ae2d9ed483538ce7d648001f36b5 +Author: zenggang +Date: Mon Jan 17 09:12:17 2022 +0000 + + * unit test + +commit 3ee399a75c1f1d9df8960c8e1e9c9e0493f304e0 +Author: tianshujie +Date: Mon Jan 17 16:58:56 2022 +0800 + + * Fix bug #18496. + +commit 48b4ae13dc43c102f1a64fda64997b2b3c63c5b2 +Merge: 48473a63dc 05ae6c9c06 +Author: 王怡栋 +Date: Mon Jan 17 08:45:03 2022 +0000 + + Merge branch 'sgm_upgrade' into 'master' + + * Fix upgrade bug. + + See merge request easycorp/zentaopms!1445 + +commit 05ae6c9c06cbe82983adaa73035575b873020750 +Author: 孙广明 +Date: Mon Jan 17 16:43:08 2022 +0800 + + * Fix upgrade bug. + +commit 48473a63dc78332993d0c2d0e012944bf4f82ff7 +Merge: 596866a633 8246a600e9 +Author: 孙广明 +Date: Mon Jan 17 08:31:47 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'master' + + * Fix bug #18598, #18592, #18589, #18584, #18569, #18533, #18462. + + See merge request easycorp/zentaopms!1444 + +commit 8246a600e9d4eeec491eeaebbdf62e412309916a +Author: liumengyi +Date: Mon Jan 17 16:27:46 2022 +0800 + + * Fix bug of move card. + +commit 00f85a4ee8dfaa1664d3ccb649ac243bc09b4af3 +Author: liumengyi +Date: Mon Jan 17 16:13:45 2022 +0800 + + * Fix bug #18598, #18592, #18589, #18584, #18569, #18533, #18462. + +commit 596866a633989f126dd386bf979baedeb083ab9a +Merge: 54ec9e1429 f82881b592 +Author: 王怡栋 +Date: Mon Jan 17 07:40:00 2022 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix bugs. + + See merge request easycorp/zentaopms!1443 + +commit f82881b592eecfe6b598922047ec05e3c57f8fdb +Author: 孙广明 +Date: Mon Jan 17 15:37:52 2022 +0800 + + * Fix bugs. + +commit 54ec9e14295e2ffe0844f018c61800d6e87e435b +Merge: b0f8dabcca 9cea290feb +Author: 孙广明 +Date: Mon Jan 17 07:30:36 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'master' + + * Fix bug of execution kanban. + + See merge request easycorp/zentaopms!1442 + +commit 9cea290feb816aa2b0492324e520cf66426fb890 +Author: liumengyi +Date: Mon Jan 17 15:26:19 2022 +0800 + + * Fix bug of execution kanban. + +commit b0f8dabcca9a2dfce69bb92ca2653e2fbd78b88f +Merge: 1252ac617b 9b5fa61141 +Author: 孙广明 +Date: Mon Jan 17 07:23:01 2022 +0000 + + Merge branch 'sprint/182_tianshujie_18496' into 'master' + + * Filter out cards from other swimlanes when updating cards. + + See merge request easycorp/zentaopms!1434 + +commit 9b5fa6114109346ff6276ce642732792f03eb0b2 +Author: tianshujie +Date: Mon Jan 17 15:20:17 2022 +0800 + + * Modify the code logic. + +commit 1252ac617b480781033caf44960a9d2cc380ade7 +Merge: d5d14d697c b24cdc32ae +Author: 孙广明 +Date: Mon Jan 17 07:15:44 2022 +0000 + + Merge branch 'sprint/182_hufangzhou_18568' into 'master' + + * Fix bug #18568. + + See merge request easycorp/zentaopms!1441 + +commit b24cdc32ae671323bf79d7488cff06ca0f74df3e +Author: hufangzhou +Date: Mon Jan 17 15:11:06 2022 +0800 + + * Fix bug #18568. + +commit 9bf831ee67465a1f40d0e6a9373eb6ffcc0a4ac1 +Merge: 48b004b503 f82a59604b +Author: 李玉春 <563917701@qq.com> +Date: Mon Jan 17 07:00:16 2022 +0000 + + Merge branch 'devops_caoyanyi_testcase' into 'devops19' + + cyy:Modify common function. + + See merge request easycorp/zentaopms!1440 + +commit 48b004b503878979e7e460fd32de2bbd041bd55f +Merge: be580b4e29 4b0d2e842a +Author: 李玉春 <563917701@qq.com> +Date: Mon Jan 17 06:58:11 2022 +0000 + + Merge branch 'devops19_zenggang' into 'devops19' + + zg:修复bug + + See merge request easycorp/zentaopms!1439 + +commit 103f9b8935be83f943436826700e65b030112192 +Author: tianshujie +Date: Mon Jan 17 14:54:08 2022 +0800 + + * Refactored update swimlane code. + +commit f82a59604bad943d4e23ac6fc85ed394c9114f4f +Author: caoyanyi +Date: Mon Jan 17 06:53:53 2022 +0000 + + * Modify common function. + +commit d5d14d697cfd715c1b97653e7137efb0d0f4730f +Merge: 5895f29aff 39a8882626 +Author: 孙广明 +Date: Mon Jan 17 06:50:39 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'master' + + * Fix bug of RD kanban creation and associating story. + + See merge request easycorp/zentaopms!1438 + +commit 4b0d2e842a8ccbea8f8081d5f45c628c11ce50aa +Author: zenggang +Date: Mon Jan 17 06:49:36 2022 +0000 + + * Fix bug#18456,18393,18392 + +commit 39a8882626a2b137e788feb5e0d53ecd01427f29 +Author: liumengyi +Date: Mon Jan 17 14:44:47 2022 +0800 + + * Modify language item. + +commit 0d3ed88c1db8bf38ccf0dca48226be8619d89916 +Author: liumengyi +Date: Mon Jan 17 14:40:40 2022 +0800 + + * Delete useless code. + +commit 250d944b73c413129d33596b2210bd86e61ce955 +Author: chaideqing +Date: Mon Jan 17 14:40:39 2022 +0800 + + * fix bug #18039,task #47399, show html page when in client create bug/story/task/doc/todo + +commit a36a74eb7d86fa1413f7b00c21bdb12a114409e6 +Author: liumengyi +Date: Mon Jan 17 14:35:15 2022 +0800 + + * Fix bug of RD kanban creation and associating story. + +commit be580b4e29fabe919f0dcf17c4e6d42cdca76cc4 +Merge: 03683c4119 5724bd4fc5 +Author: 王怡栋 +Date: Mon Jan 17 06:29:47 2022 +0000 + + Merge branch 'devops19_liyuchun' into 'devops19' + + Fix bug #18435,#18437. + + See merge request easycorp/zentaopms!1435 + +commit 676db0bbb219eb416ea1c75f7c247ae82167e796 +Author: zhouxudong +Date: Mon Jan 17 14:22:31 2022 +0800 + + *Fix bug #18321. + +commit 5895f29aff245854756fea0af30e2ec9289524e1 +Merge: 0293738acf be717d3937 +Author: 孙广明 +Date: Mon Jan 17 06:20:52 2022 +0000 + + Merge branch '182_Modify_code' into 'master' + + * Optimize code. + + See merge request easycorp/zentaopms!1436 + +commit be717d39373f26aea05ac7956c8acf87bc430694 +Author: mayue +Date: Mon Jan 17 14:18:39 2022 +0800 + + * Optimize code. + +commit 0293738acf140a356e5a39a34789cfd56fb28266 +Author: zhujinyong +Date: Mon Jan 17 13:40:17 2022 +0800 + + + Add productline. + +commit 5724bd4fc5c6733b88af7999ad6f2d9793b98ea6 +Author: liyuchun +Date: Mon Jan 17 13:37:11 2022 +0800 + + * Fix bug #18435,#18437. + +commit ac318de17560f26a0cac210dc070fe38f3ac25df +Author: zhouxudong +Date: Mon Jan 17 13:12:02 2022 +0800 + + *Fix bug #13636. + +commit ef66f1418ce635611bf00b2337226fe49886a33f +Author: tianshujie +Date: Mon Jan 17 12:23:21 2022 +0800 + + * Filter out cards from other swimlanes when updating cards. + +commit 02bace4f99af3c71cf95ade86d4600477fc81f16 +Author: chaideqing +Date: Mon Jan 17 11:26:33 2022 +0800 + + * fix bug #18039,task #47399, keep close button is 32px in bug/story/task assignTo page + +commit 10d8a74cc4277af507a581706aed9871a6b5d663 +Merge: 0a02b86617 451042f0a4 +Author: 孙广明 +Date: Mon Jan 17 03:13:47 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'master' + + * Fix bug #18491. + + See merge request easycorp/zentaopms!1432 + +commit 451042f0a4b01b0b8f38ffe41b1129936f235c35 +Author: liumengyi +Date: Mon Jan 17 11:12:26 2022 +0800 + + * Fix bug #18491. + +commit 0a02b866172d9d49e953c13b1aa7d7673b7ce30f +Merge: 5f4d85fbca 7240a4c53e +Author: 孙广明 +Date: Mon Jan 17 03:11:51 2022 +0000 + + Merge branch 'sprint/182_hufangzhou_upgradeTip' into 'master' + + * Change the upgrade tip to biz. + + See merge request easycorp/zentaopms!1431 + +commit 5f4d85fbcac321c6d17ed788338139c349faae72 +Merge: 97ba199eeb a9a5384241 +Author: 孙广明 +Date: Mon Jan 17 03:05:16 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'master' + + * Finish bug #18491. + + See merge request easycorp/zentaopms!1430 + +commit 7240a4c53eefa05846144b84c759764ac191cf17 +Author: hufangzhou +Date: Mon Jan 17 10:58:00 2022 +0800 + + * Change the upgrade tip to biz. + +commit 97ba199eeb7e57f16ad134db124d85a90ab20591 +Merge: dce7ddc20c fff984acf4 +Author: 王怡栋 +Date: Mon Jan 17 02:44:01 2022 +0000 + + Merge branch 'sgm_upgrade' into 'master' + + * Add upgrade logic. + + See merge request easycorp/zentaopms!1429 + +commit a9a538424113cf38203264426e697f82de4be04d +Author: liumengyi +Date: Mon Jan 17 10:42:40 2022 +0800 + + * Finish bug #18491. + +commit fff984acf4df6ff812f743d0cfe22c7da3443275 +Author: 孙广明 +Date: Mon Jan 17 10:42:02 2022 +0800 + + * Add upgrade logic. + +commit dce7ddc20c450d9e74847e30a47ebdf5f073252f +Merge: b01b6a90eb 809d34a266 +Author: 朱金勇 +Date: Mon Jan 17 02:35:38 2022 +0000 + + Merge branch 'autoTest_xieqiyu' into 'master' + + Auto test xieqiyu + + See merge request easycorp/zentaopms!1426 + +commit b01b6a90eb332fbc1d5fcd27bd040e357c6b3c6c +Merge: 1383c34cd5 94e62d0a55 +Author: 孙广明 +Date: Mon Jan 17 10:34:08 2022 +0800 + + Merge branch 'kanban' + +commit 94e62d0a5517ad55de15fad24039e8785882e105 +Merge: 7b7d9f545d a42faa10f1 +Author: 孙广明 +Date: Mon Jan 17 02:27:20 2022 +0000 + + Merge branch 'sprint/182_tianshujie_18496' into 'kanban' + + * Fix bug. + + See merge request easycorp/zentaopms!1428 + +commit 7b7d9f545de1f99049d8dc80086b04452140f6b6 +Merge: fd288aafc4 5f58ada861 +Author: 王怡栋 +Date: Mon Jan 17 02:23:56 2022 +0000 + + Merge branch 'sgm_upgrade' into 'kanban' + + * Fix locate bug. + + See merge request easycorp/zentaopms!1427 + +commit a42faa10f1cc014cad9f082c0ba85c84d969616f +Author: tianshujie +Date: Mon Jan 17 10:22:51 2022 +0800 + + * Fix bug. + +commit fd288aafc446d173f6b2604a57b00bc26acf2023 +Merge: 6f02c1e384 b2324c3406 +Author: 孙广明 +Date: Mon Jan 17 02:22:05 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban' + + * Fix bug #18485,#18474. + + See merge request easycorp/zentaopms!1424 + +commit 5f58ada8611719a94a90a791947cfa662cba0158 +Author: 孙广明 +Date: Mon Jan 17 10:20:06 2022 +0800 + + * Fix locate bug. + +commit 6f02c1e384ba751d45dfab35419496b7e65d189d +Merge: 717ebf0004 a49076b0d8 +Author: 孙广明 +Date: Mon Jan 17 02:17:06 2022 +0000 + + Merge branch 'sprint/182_hufangzhou_18407' into 'kanban' + + * Fix bug #18407. + + See merge request easycorp/zentaopms!1425 + +commit a49076b0d8a6c1caf56b75d74bde3917f4cfdf6d +Author: hufangzhou +Date: Mon Jan 17 10:14:50 2022 +0800 + + * Fix bug #18407. + +commit 809d34a2667915061d1fed45a96921f4175b16de +Author: xieqiyu +Date: Mon Jan 17 10:14:10 2022 +0800 + + * example. + +commit b2324c3406a107c05987b03d9d8b0c9491eb5cd8 +Author: liumengyi +Date: Mon Jan 17 10:13:31 2022 +0800 + + * Fix bug #18485,#18474. + +commit 03683c4119fcdac3239eee5a9413eb2ef3165254 +Merge: dcd292115b 3630c5f718 +Author: 李玉春 <563917701@qq.com> +Date: Mon Jan 17 02:01:09 2022 +0000 + + Merge branch 'devops19_zenggang' into 'devops19' + + zg:单元测试 + + See merge request easycorp/zentaopms!1419 + +commit dcd292115b75dfca13a764e9e7ccc31bd01d8ce6 +Merge: 7c981830b6 959560f680 +Author: liyuchun +Date: Mon Jan 17 10:00:18 2022 +0800 + + Merge branch 'devops_caoyanyi_bug' into devops19 + +commit 959560f6807e3cc6326a8cd7f4e7c81e058dda0a +Merge: 46fda60647 7c981830b6 +Author: 李玉春 <563917701@qq.com> +Date: Mon Jan 17 01:59:45 2022 +0000 + + Merge branch 'devops19' into 'devops_caoyanyi_bug' + + # Conflicts: + # module/job/control.php + +commit 46fda606475e236124637e5bf27efec9f7de0df3 +Author: caoyanyi +Date: Mon Jan 17 01:57:23 2022 +0000 + + * Modify return value. + +commit 07ba811bc2597e5ed4585152b46a11f3a87ec768 +Author: caoyanyi +Date: Mon Jan 17 01:22:51 2022 +0000 + + * Modify trash data tips. + +commit 717ebf000452821807223b8a051a4620d1f88c14 +Merge: 66515d7ed8 fd20384534 +Author: 孙广明 +Date: Mon Jan 17 01:22:44 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban' + + * Fix bug #18470. + + See merge request easycorp/zentaopms!1423 + +commit fd20384534d0a2130ed4bb30e49e6355151e70b3 +Author: liumengyi +Date: Mon Jan 17 09:21:11 2022 +0800 + + * Fix bug #18470. + +commit 66515d7ed8be291637e5ede4aec85fa6e0ead6f9 +Merge: e177702c23 cdba989f91 +Author: 孙广明 +Date: Mon Jan 17 00:57:03 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban' + + * FIx bug #18489,#18478,#18466. + + See merge request easycorp/zentaopms!1420 + +commit cdba989f91a79d06d62bb462457619dfe439a5e0 +Author: liumengyi +Date: Mon Jan 17 08:54:22 2022 +0800 + + * Fix bug #18458,#18473. + +commit e177702c237cb1a2c09bd12be2628afe648510f0 +Merge: a5459c40ed 58c2fe04af +Author: 孙广明 +Date: Mon Jan 17 00:50:20 2022 +0000 + + Merge branch 'sprint/182_tianshujie_18475' into 'kanban' + + *Fix bug #18475. + + See merge request easycorp/zentaopms!1422 + +commit 58c2fe04af93b87721100fb303aae45beb16ac65 +Author: tianshujie +Date: Mon Jan 17 08:48:42 2022 +0800 + + *Fix bug #18475. + +commit a5459c40ed45ab379e1f7d3349287da7396b43fb +Merge: 30b2d61c71 758c03968f +Author: 王怡栋 +Date: Mon Jan 17 00:44:13 2022 +0000 + + Merge branch 'sgm_kanban' into 'kanban' + + * Add kanban type in query. + + See merge request easycorp/zentaopms!1421 + +commit 758c03968fce5bac737bd463990779346d8f7332 +Author: 孙广明 +Date: Mon Jan 17 08:41:59 2022 +0800 + + * Add kanban type in query. + +commit 30b2d61c716277c3e083c7e93b00f696fb74546c +Merge: 4d174414d3 53fbf25f17 +Author: 孙广明 +Date: Mon Jan 17 00:35:57 2022 +0000 + + Merge branch 'sprint/182_tianshujie_18475' into 'kanban' + + * Fix bug #18475. + + See merge request easycorp/zentaopms!1416 + +commit d45ff40e16d523e3be719a9e04c119b0d653e425 +Author: liumengyi +Date: Sun Jan 16 19:33:52 2022 +0800 + + * Add code annotation. + +commit fc5ad0f8931de980d32e777a8e322cb8c614a1e9 +Author: liumengyi +Date: Sun Jan 16 17:11:40 2022 +0800 + + * FIx bug #18489,#18478,#18466. + +commit 3630c5f718594e5b3237e1f276c97a0bbe6cbf9d +Author: zenggang +Date: Fri Jan 14 09:09:25 2022 +0000 + + * Unit test + +commit 4d174414d3547680b0bf5a03edd7718d6caf8b1e +Merge: 8707d80112 59df7f51f6 +Author: 孙广明 +Date: Fri Jan 14 07:30:08 2022 +0000 + + Merge branch 'sprint/182_hufangzhou_47307' into 'kanban' + + * Finish task #47307. + + See merge request easycorp/zentaopms!1417 + +commit 59df7f51f63311b991d3eeb481479d1820c8d696 +Author: hufangzhou +Date: Fri Jan 14 15:29:07 2022 +0800 + + * Finish task #47307. + +commit 53fbf25f17d418057a83e3fbc7ca3f0d003fa35d +Author: tianshujie +Date: Fri Jan 14 15:18:56 2022 +0800 + + * Adjust css of kanban view. + +commit 1097e61db8e041a12dabe1d454b732047552b233 +Author: tianshujie +Date: Fri Jan 14 15:14:53 2022 +0800 + + * Adjust css of kanban view. + +commit a838e6225729ba75bd0582fe55b87d701729361d +Author: tianshujie +Date: Fri Jan 14 15:12:29 2022 +0800 + + * Fix bug #18475. + +commit 8707d801122b26b4d770c849339ab80968cf599b +Merge: af155a32f1 947c9586f5 +Author: 孙广明 +Date: Fri Jan 14 07:07:40 2022 +0000 + + Merge branch 'sprint/182_tianshujie_47350' into 'kanban' + + * Finish task #47350. + + See merge request easycorp/zentaopms!1414 + +commit af155a32f19d52559a5a4c95b64b0275c9a07473 +Merge: d36e3212e1 b01e1901a0 +Author: 孙广明 +Date: Fri Jan 14 15:06:32 2022 +0800 + + Merge branch 'sprint/182_liumengyi_movecard' into kanban + +commit 947c9586f5814684a2a9b6116b08b9aa210fd6e9 +Author: tianshujie +Date: Fri Jan 14 15:06:22 2022 +0800 + + * Finish task #47350. + +commit b01e1901a04a87982f157c638a36c2fd81b87eb8 (origin/sprint/182_liumengyi_movecard) +Merge: 0167541bb4 d36e3212e1 +Author: 孙广明 +Date: Fri Jan 14 07:06:18 2022 +0000 + + Merge branch 'kanban' into 'sprint/182_liumengyi_movecard' + + # Conflicts: + # module/execution/control.php + +commit 0167541bb4e8166816b964064bf9c293fc836f16 +Author: liumengyi +Date: Fri Jan 14 15:00:36 2022 +0800 + + * Add move card for execution-kanban. + +commit 20f291b9b2c4ea1fcdbb8cd02ced6092cac8349e +Author: caoyanyi +Date: Fri Jan 14 06:52:35 2022 +0000 + + * Fix bug #18448. + +commit a241dc5b118e2ba586094cee2fca2df97a68fd4b +Author: tianshujie +Date: Fri Jan 14 14:51:48 2022 +0800 + + * Finish task #47350. + +commit 1383c34cd5a08d7abe218ca92fb99f70dc50e2f4 +Merge: 3e7d58df4b bf119b5cb8 +Author: 王怡栋 +Date: Fri Jan 14 06:50:15 2022 +0000 + + Merge branch 'sprint/182_hufangzhou_hideOtherProduct' into 'master' + + * Hide the other products. + + See merge request easycorp/zentaopms!1413 + +commit bf119b5cb80e4f476a0583171eee5f4279b1c63c +Author: hufangzhou +Date: Fri Jan 14 14:48:24 2022 +0800 + + * Hide the other products. + +commit d36e3212e12507e39e8a19d1c468154e6a4f5692 +Merge: 25d152f63d 8399a61753 +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 14 06:44:35 2022 +0000 + + Merge branch 'sprint/182_tianshujie_column' into 'kanban' + + * Modify the problem of creating a bug lane and reporting an error. + + See merge request easycorp/zentaopms!1412 + +commit 8399a617534742b0e0c84e083fd90d5cb4b04cd1 +Author: tianshujie +Date: Fri Jan 14 14:41:13 2022 +0800 + + * Modify the problem of creating a bug lane and reporting an error. + +commit 25d152f63d615b733d89c8c48944b233f9789e92 +Merge: 31492d118b 19aaf9740c +Author: 王怡栋 +Date: Fri Jan 14 06:37:28 2022 +0000 + + Merge branch 'sgm_kanban' into 'kanban' + + * Fix details and add upgrade logic. + + See merge request easycorp/zentaopms!1411 + +commit 19aaf9740c4e7b65936bcfdcc8bf6e69d186e571 +Author: 孙广明 +Date: Fri Jan 14 14:31:59 2022 +0800 + + * Fix details and add upgrade logic. + +commit 31492d118b1decc8a7f97319d4c61b62a1e17aff +Merge: b7b03e641f 62b9d82679 +Author: 孙广明 +Date: Fri Jan 14 05:53:56 2022 +0000 + + Merge branch 'sprint/182_tianshujie_kanban' into 'kanban' + + * Finish task #47359,47360. + + See merge request easycorp/zentaopms!1410 + +commit 62b9d826794cf72bba0a4cbe2cf1f9ba326d203b +Author: tianshujie +Date: Fri Jan 14 13:53:04 2022 +0800 + + * Modify default value. + +commit 61590215c147c11a67b3a6e60ff5888cb2c39755 +Author: tianshujie +Date: Fri Jan 14 13:47:30 2022 +0800 + + * Finish task #47359,47360. + +commit b7b03e641f5a169eed929800b7eee5b330d89f1f +Merge: 5ecba2a5da 13e653f600 +Author: 王怡栋 +Date: Fri Jan 14 05:38:14 2022 +0000 + + Merge branch 'sgm_kanban' into 'kanban' + + * Process kanban execution. + + See merge request easycorp/zentaopms!1408 + +commit 3e7d58df4bc3a3cdc1ba7470beea83ca591e3d62 +Merge: dda972beee eb71ea3d2d +Author: 王怡栋 +Date: Fri Jan 14 05:37:02 2022 +0000 + + Merge branch 'sprint/182_hufangzhou_bug' into 'master' + + * Fix the bugs of upgrade. + + See merge request easycorp/zentaopms!1409 + +commit eb71ea3d2da7ace081910b43ca32e8af559f3c21 +Author: hufangzhou +Date: Fri Jan 14 13:35:35 2022 +0800 + + * Fix the bugs of upgrade. + +commit 13e653f6009cfcfaa9c18cd105daefcf128ab186 +Author: 孙广明 +Date: Fri Jan 14 13:34:47 2022 +0800 + + * Process kanban execution. + +commit 5ecba2a5da7a5000dceb4e4868575239c427bdc7 +Merge: 855d954383 15db546ff1 +Author: 孙广明 +Date: Fri Jan 14 05:11:33 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban' + + * Fix bug for task#47355 #47346. + + See merge request easycorp/zentaopms!1407 + +commit 15db546ff18ba678405d28386b26b1b34c2db5dd +Author: liumengyi +Date: Fri Jan 14 13:09:01 2022 +0800 + + * Fix bug for task#47355 #47346. + +commit 855d95438343cd108eeb3e9730bf5269fb97210a +Merge: d3ad68b4ce c03939c7e7 +Author: 孙广明 +Date: Fri Jan 14 05:08:05 2022 +0000 + + Merge branch 'sprint/182_hufangzhou_independLane' into 'kanban' + + * Modify the create independent lane of common signboard. + + See merge request easycorp/zentaopms!1406 + +commit c03939c7e7ad7673a22df9f0778466c60c4d68f1 +Author: hufangzhou +Date: Fri Jan 14 13:06:12 2022 +0800 + + * Modify the create independent lane of common signboard. + +commit 7c981830b60bca9050e72b41245e39daa99b514c +Merge: 7318cf470c 19905f7eda +Author: 王怡栋 +Date: Fri Jan 14 03:28:21 2022 +0000 + + Merge branch 'devops19_liyuchun' into 'devops19' + + * Fix bug #18450,18447. + + See merge request easycorp/zentaopms!1405 + +commit 19905f7edac054c45914eaf250e95dfef78f92b2 +Author: liyuchun +Date: Fri Jan 14 11:26:28 2022 +0800 + + * Fix bug #18450,18447. + +commit 0be41abb83249c05a69792fd8749a30adcd5fe12 +Author: caoyanyi +Date: Fri Jan 14 03:22:47 2022 +0000 + + * Fix bug #18442. + +commit 41b7d853d354858962a3f6f546667babe6d494e1 +Author: caoyanyi +Date: Fri Jan 14 03:16:55 2022 +0000 + + * Fix bug #18454. + +commit 7318cf470c571c28ba2aebae1033a4dceda45dba +Merge: f7ce008031 b60de3ae39 +Author: 王怡栋 +Date: Fri Jan 14 10:58:25 2022 +0800 + + Merge branch 'devops_liyuchun_47233' into devops19 + +commit b60de3ae39a68c33d0bd01957163e20d765cffc8 +Merge: 48bdba2a96 e515ed44a0 +Author: 王怡栋 +Date: Fri Jan 14 02:57:36 2022 +0000 + + Merge branch 'devops19' into 'devops_liyuchun_47233' + + # Conflicts: + # module/sonarqube/control.php + +commit d3ad68b4ce0bac6e5fb6328c22931030a39ee6fb +Merge: b663433971 b9aa4a0d0d +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 14 02:54:41 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban' + + * FInish task #47346. + + See merge request easycorp/zentaopms!1401 + +commit b663433971e80639d47b26778c44c04bfd3f527e +Merge: f214890ac1 6992338a0e +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 14 02:52:39 2022 +0000 + + Merge branch 'sprint/182_tianshujie_47358' into 'kanban' + + * Finish task #47358. + + See merge request easycorp/zentaopms!1402 + +commit 48bdba2a968ae1bedbc4eaa007cc989522fb996a +Author: liyuchun +Date: Fri Jan 14 10:47:41 2022 +0800 + + * Fix error. + +commit 6992338a0e264eaf73b7a6ac06e73760c6e39cc6 +Author: tianshujie +Date: Fri Jan 14 10:46:54 2022 +0800 + + * Finish task #47358. + +commit b9aa4a0d0d263a53ebfb1f4d436cae9a2a45005d +Author: liumengyi +Date: Fri Jan 14 10:45:53 2022 +0800 + + * FInish task #47346. + +commit f214890ac1a136e9058c54a425613484420e5d5e +Merge: 899bd99653 582ddf2a06 +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 14 02:17:05 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban' + + * Fix bug #18436.Finish task #47361. + + See merge request easycorp/zentaopms!1400 + +commit 582ddf2a063452b110efd407d98cce656c6b4cb8 +Author: liumengyi +Date: Fri Jan 14 10:14:40 2022 +0800 + + * Fix bug #18436.Finish task #47361. + +commit e515ed44a0eed57bbad1764cb3c85b92b3376bd8 +Merge: 644c0afe08 f8ef544d94 +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 14 02:09:00 2022 +0000 + + Merge branch 'devops19_zenggang' into 'devops19' + + 去掉创建sonarqube项目和修复bugs + + See merge request easycorp/zentaopms!1399 + +commit 899bd996532fcf62d44d9e8dbd6d44283575585a +Merge: bf0722144f 9093dc8fdd +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 14 01:56:14 2022 +0000 + + Merge branch 'sgm_kanban' into 'kanban' + + * Adjust code. + + See merge request easycorp/zentaopms!1393 + +commit f8ef544d94d276d8c4d441eac1913fbd6376642e +Author: zenggang +Date: Fri Jan 14 01:54:48 2022 +0000 + + * Adjust code and fix bugs + +commit dda972beeef2f5c61db2d7238a3b2e1e4c892998 +Author: 王怡栋 +Date: Fri Jan 14 09:50:09 2022 +0800 + + * adjust for get trashes. + +commit 644c0afe08a615d20d987ce7fe5157e6b9278b24 +Merge: afd1662c19 f8f71f59af +Author: 王怡栋 +Date: Fri Jan 14 01:37:33 2022 +0000 + + Merge branch 'devops_liyuchun_47233' into 'devops19' + + lyc完成任务：在禅道SonarQube项目列表页面中添加执行SonarQube按钮 + + See merge request easycorp/zentaopms!1397 + +commit bf0722144f8dbb9c6b8306c5b9681d2fdd1ddbd9 +Merge: 9fbd47597e f9d299efd2 +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 14 01:33:34 2022 +0000 + + Merge branch 'sprint/182_liumengyi_47332' into 'kanban' + + * Finish task #47332. + + See merge request easycorp/zentaopms!1398 + +commit 9093dc8fdde12160bebb2a387fe29310d2e770ce +Author: tianshujie +Date: Fri Jan 14 09:31:58 2022 +0800 + + * Modify the code. + +commit 5fbffbac3a953f951977902516676f8b5e5ead83 +Author: tianshujie +Date: Fri Jan 14 09:30:42 2022 +0800 + + * Fix drop down button bug. + +commit f9d299efd2318ce75d336c52684c743c7b03de63 +Author: liumengyi +Date: Fri Jan 14 09:29:50 2022 +0800 + + * Finish task #47332. + +commit afd1662c19a57c5e86e557e4fe5cce860ff42631 +Merge: f7ce008031 770bba7719 +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 14 01:23:34 2022 +0000 + + Merge branch 'devops_caoyanyi_bug' into 'devops19' + + cyy:Fix bug. + + See merge request easycorp/zentaopms!1396 + +commit f8f71f59af0aefc6eaea7456e0d842ad3826b55d +Author: liyuchun +Date: Fri Jan 14 09:21:04 2022 +0800 + + * Finish task #47233. + +commit 770bba77191548efeab60395d5959050e020c428 +Author: caoyanyi +Date: Fri Jan 14 01:19:40 2022 +0000 + + * Modify trash locate. + +commit 9fbd47597e0ae28fec4f6ee59752e0ebaefa4f1f +Merge: 7ec3fcf19a da89583f19 +Author: 王怡栋 +Date: Fri Jan 14 01:09:32 2022 +0000 + + Merge branch 'sprint/182_hufangzhou_moveCard' into 'kanban' + + * Adjust the moveCards function. + + See merge request easycorp/zentaopms!1394 + +commit da89583f198c150a8dac32ff391737fa5701d380 +Author: hufangzhou +Date: Fri Jan 14 09:06:44 2022 +0800 + + * Adjust the format code. + +commit df1dabef270bdfa933f1b6316195bd85259618e8 +Author: hufangzhou +Date: Fri Jan 14 09:03:30 2022 +0800 + + * Splice comma when use the instr function. + +commit f7ce0080317c5c71f38f39534e8a3480e05c4c0c +Merge: d174b7889b f991a29236 +Author: 王怡栋 +Date: Fri Jan 14 08:50:25 2022 +0800 + + Merge branch 'devops19_liyuchun_47232' into devops19 + +commit f991a29236c3bd17b04dfe099603eda797e51d21 +Merge: e0b65585d7 d174b7889b +Author: 王怡栋 +Date: Fri Jan 14 00:48:58 2022 +0000 + + Merge branch 'devops19' into 'devops19_liyuchun_47232' + + # Conflicts: + # module/sonarqube/lang/en.php + # module/sonarqube/lang/zh-cn.php + # module/sonarqube/view/browseproject.html.php + +commit a73e08d4cbb04f799a8f6f520b3ce5d4a3fe73a7 +Author: zhouxudong +Date: Fri Jan 14 08:46:14 2022 +0800 + + *Fix bug #13636. + +commit d4365afb0b057a072cbb30b5c2770d298b3d9604 +Author: xieqiyu +Date: Fri Jan 14 08:32:53 2022 +0800 + + * Add project test case. + +commit dd600d30065746d472debb21adfe17126f56d017 +Merge: 1025716534 ef97c04743 +Author: 朱金勇 +Date: Fri Jan 14 00:28:22 2022 +0000 + + Merge branch 'sprint/zhouxudong_fixbug_13888' into 'master' + + *Fix bug #13888. + + See merge request easycorp/zentaopms!1389 + +commit 7ec3fcf19aa9e05f13a22de23d0f7ff68ea48351 +Merge: 297fd2d674 fa29706187 +Author: 朱金勇 +Date: Fri Jan 14 00:27:58 2022 +0000 + + Merge branch 'sprint/182_sunhao/task47358' into 'kanban' + + * Task #47358, support for setting kanban lane height with option "displayCards". + + See merge request easycorp/zentaopms!1380 + +commit d174b7889b45456ea663fb335fcaf86fd4f0b2ae +Merge: dc42b886bc 0fc8a059b8 +Author: 李玉春 <563917701@qq.com> +Date: Fri Jan 14 00:21:53 2022 +0000 + + Merge branch 'devops19_zenggang' into 'devops19' + + 调整删除sonarqube项目按钮代码 + + See merge request easycorp/zentaopms!1391 + +commit 97308d9d0985c014ba9d60c62a763b76886dced5 +Author: hufangzhou +Date: Fri Jan 14 08:14:54 2022 +0800 + + * Adjust the moveCards function. + +commit 907f96ecfd7cea1e39038bfb793214bc6b98b4c4 +Author: sgm0422 <976204163@qq.com> +Date: Thu Jan 13 22:56:11 2022 +0800 + + * Adjust code. + +commit 297fd2d674f07dc7d7594772a0e0fda610bcc165 +Merge: a051880d2d b22160b3c7 +Author: 孙广明 +Date: Thu Jan 13 13:50:07 2022 +0000 + + Merge branch 'sprint/182_tianshujie_kanban' into 'kanban' + + * Refactoring task kanban to view logic by group. + + See merge request easycorp/zentaopms!1392 + +commit b22160b3c7dabb02c240f6671e832b0140286bdc +Author: tianshujie +Date: Thu Jan 13 21:21:49 2022 +0800 + + * Add set swimlane height button. + +commit 2261371010c500c6edcd6735e68ca9023d50dd93 +Author: tianshujie +Date: Thu Jan 13 21:11:23 2022 +0800 + + * Refactoring task kanban to view logic by group. + +commit 0fc8a059b8b64754bce9bc9e11343b0ae2ce4668 +Author: zenggang +Date: Thu Jan 13 09:32:02 2022 +0000 + + * Adjust code + +commit a051880d2da652238f9c2c96341459f56a4a9a42 +Merge: 76dc816b2c 92c3693650 +Author: 孙广明 +Date: Thu Jan 13 09:23:36 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban' + + * Fix bug #18419, #18414, #18411. + + See merge request easycorp/zentaopms!1390 + +commit e0b65585d769283f4e8c09ee5127fb7805c29c59 +Author: liyuchun +Date: Thu Jan 13 17:22:05 2022 +0800 + + * Finish task #47232. + +commit 92c36936505edc8bb808dd577b432b499ac036bc +Author: liumengyi +Date: Thu Jan 13 17:20:21 2022 +0800 + + * Fix bug #18419, #18414, #18411. + +commit ef97c047430c12617d4d33a75017773d5c2abdaa +Author: zhouxudong +Date: Thu Jan 13 17:11:21 2022 +0800 + + *Fix bug #13888. + +commit dc42b886bcd18dca2c3e732ee1a71c0bbe7b0aaa +Merge: 23b367ceb3 2263ecf9a4 +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 13 09:09:12 2022 +0000 + + Merge branch 'devops19_47222' into 'devops19' + + 任务47222 + + See merge request easycorp/zentaopms!1383 + +commit 2263ecf9a4e48e0f91cd884dbc7c9b8e68495743 +Author: zenggang +Date: Thu Jan 13 09:02:59 2022 +0000 + + * Adjust code + +commit 23b367ceb32ebe73135218ef6d9d7f628bd13e63 +Merge: 5ed3a7cede 3fcc07af28 +Author: liyuchun +Date: Thu Jan 13 16:55:36 2022 +0800 + + Merge branch 'devops_caoyanyi_47221' into devops19 + +commit 3fcc07af28f3cc3f4478f5411d21c42c24c72a61 +Author: liyuchun +Date: Thu Jan 13 16:55:22 2022 +0800 + + * Adjsut code. + +commit 10f77479256f48edf7325c27753b43cdc61b5599 +Merge: c2d30bc92f 73db658809 +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 13 08:53:45 2022 +0000 + + Merge branch 'devops19' into 'devops_caoyanyi_47221' + + # Conflicts: + # module/sonarqube/model.php + +commit 76dc816b2cfd19e18886aeb73383748b0d2b9244 +Merge: 276a00b126 85f2917fe7 +Author: 王怡栋 +Date: Thu Jan 13 08:52:33 2022 +0000 + + Merge branch 'sgm_upgradekanban' into 'kanban' + + * Add upgrade logic. + + See merge request easycorp/zentaopms!1387 + +commit 85f2917fe70351b2fb09fc04ddc89469db0f6245 +Author: 孙广明 +Date: Thu Jan 13 16:43:35 2022 +0800 + + * Fix upgrade logic. + +commit 4bf49c5da7cdb7a20da0eb86301e9c08b1a3899d +Author: liyuchun +Date: Thu Jan 13 16:25:56 2022 +0800 + + * Finish task #47232. + +commit 2e4e8a104333b51ceac63190c72ae800f1ff346b +Author: 孙广明 +Date: Thu Jan 13 16:24:26 2022 +0800 + + * Add upgrade logic. + +commit 276a00b1267783b0feb3b894545e1fe42f79112d +Merge: 1d30c7f7f5 6c1754423c +Author: 孙广明 +Date: Thu Jan 13 08:07:27 2022 +0000 + + Merge branch 'sprint/182_liumengyi_47339' into 'kanban' + + * Fix bug for RD Kanban. + + See merge request easycorp/zentaopms!1386 + +commit 6c1754423cd3906f4ba564bc028e6ef6243a869f +Author: liumengyi +Date: Thu Jan 13 16:06:41 2022 +0800 + + * Fix bug for RD Kanban. + +commit 5d40963b8a45896ec32ca27ae1f795322145288e +Author: liumengyi +Date: Thu Jan 13 16:00:42 2022 +0800 + + * Fix bug for RD Kanban. + +commit c2d30bc92faceeb4b954fd0a7c61ef30d4aa5b11 +Author: caoyanyi +Date: Thu Jan 13 07:43:16 2022 +0000 + + * Modify project param. + +commit 1d30c7f7f5964bc522d129f916d82c9af346d009 +Merge: 9451a6b9f5 0f49102886 +Author: 孙广明 +Date: Thu Jan 13 07:30:51 2022 +0000 + + Merge branch 'sprint/182_liumengyi_47339' into 'kanban' + + * Finish task #47339. + + See merge request easycorp/zentaopms!1382 + +commit 6eed68f446d079db84949fd4bf798266baed62bb +Author: zhouxudong +Date: Thu Jan 13 15:17:54 2022 +0800 + + *Fix bug #13636. + +commit 0f062c84ee362a50f54d2333261feeb9a150d7c8 +Author: chaideqing +Date: Thu Jan 13 15:04:13 2022 +0800 + + * Fix the right-click bug when ZenTao client has no product + +commit 0f491028860dfe3e4dea6c81644ea1d0829fb192 +Author: liumengyi +Date: Thu Jan 13 14:36:05 2022 +0800 + + * Fix bug for execution kanban view. + +commit 49ead9553572b68f4c4408a2e5514fc272f4f31c +Author: zenggang +Date: Thu Jan 13 06:17:17 2022 +0000 + + * Finish task#47222 + +commit 8850815c58477e70a4a2d468f1b3072df1fb894d +Author: liumengyi +Date: Thu Jan 13 14:13:03 2022 +0800 + + * Finish task #47339. + +commit d5a6841365ea2be026e0ff0cf9f9e241727c7235 +Author: caoyanyi +Date: Thu Jan 13 05:58:51 2022 +0000 + + * Midify construct function. + +commit 384a29b657a3c550312c3144feba1ddc68074770 +Author: caoyanyi +Date: Thu Jan 13 05:38:19 2022 +0000 + + * Modify submit error when sonarqube project is empty. + +commit 73db65880931b4204d016558f739b2ada88ef2b1 +Merge: 5ed3a7cede 5d2892e415 +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 13 05:24:19 2022 +0000 + + Merge branch 'devops_caoyanyi_bug' into 'devops19' + + cyy:Fix bug. + + See merge request easycorp/zentaopms!1379 + +commit 5d2892e415aa1653a8db20dc4bc1e5f7a272ba20 +Author: caoyanyi +Date: Thu Jan 13 05:22:04 2022 +0000 + + * Modify actionID return. + +commit fa29706187cff010637bc7301259fb8063bff074 +Author: Hao Sun +Date: Thu Jan 13 13:10:15 2022 +0800 + + * Task #47358, support for setting kanban lane height with option "displayCards". + +commit e2d8d506b35dc960e515e95c918726a2ff408c97 +Author: caoyanyi +Date: Thu Jan 13 05:08:08 2022 +0000 + + * Fix bug #18370,18371,18372,18379. + +commit 102571653450bde800e56d48c699b8a9634ab2ec +Merge: 91e9aeaf20 0b86002428 +Author: 朱金勇 +Date: Thu Jan 13 05:06:12 2022 +0000 + + Merge branch 'sprint/zhouxudong_fixbug_17257' into 'master' + + *Fix bug #17257. + + See merge request easycorp/zentaopms!1373 + +commit 9451a6b9f567ecbcd20189d5dac7780539e3b971 +Merge: 745264b6d4 c15fb8dd6f +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 13 05:04:17 2022 +0000 + + Merge branch 'sgm_kanban' into 'kanban' + + Sgm kanban + + See merge request easycorp/zentaopms!1378 + +commit 91e9aeaf20dbea2b3ba8e7a90b914bee129cf89d +Merge: ee2fc5b7c6 0230675445 +Author: 朱金勇 +Date: Thu Jan 13 05:01:47 2022 +0000 + + Merge branch 'roadrunner-zhangrunyu' into 'master' + + Add roadrunner cron + + See merge request easycorp/zentaopms!1359 + +commit ee2fc5b7c65d2285e9202f0f93279698bbad5f37 +Merge: 973eff4a6e 39e30fc64f +Author: 朱金勇 +Date: Thu Jan 13 04:28:02 2022 +0000 + + Merge branch 'phpcs-zhanrunyu' into 'master' + + Fix compatibility with PHP 5.4 + + See merge request easycorp/zentaopms!1371 + +commit 745264b6d4a1239c7467cf173e6948b3065e9e89 +Merge: ca9daac505 e68161620c +Author: 孙广明 +Date: Thu Jan 13 04:19:53 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban' + + * Fix bug for create RD column. + + See merge request easycorp/zentaopms!1377 + +commit e68161620c1e7961634916ad9acddde6fdfa03bc +Author: liumengyi +Date: Thu Jan 13 12:19:10 2022 +0800 + + * Remove empty space. + +commit 1cb7c2e75a6c27b73f824459a4aff6f25ebb8862 +Author: liumengyi +Date: Thu Jan 13 12:17:56 2022 +0800 + + * Remove menu when create kanban execution/ + +commit 1902ea4539a0802d5a698e31c3572d84e09919e4 +Author: liumengyi +Date: Thu Jan 13 12:04:24 2022 +0800 + + * Fix bug for create RD column. + +commit 973eff4a6ef503358bd5ab77df28bab9046a407c +Merge: b3d88ef83c d7998c8b99 +Author: 朱金勇 +Date: Thu Jan 13 04:00:32 2022 +0000 + + Merge branch 'sprint/182_sunhao/bug18315' into 'master' + + * Bug #18315, fix wrap lines not show in roadmap. + + See merge request easycorp/zentaopms!1360 + +commit ca9daac50598409a33c304dd77b85ca648b9fe31 +Merge: e82f0f5655 0aba204fbf +Author: 孙广明 +Date: Thu Jan 13 04:00:00 2022 +0000 + + Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban' + + * Fix bug for kanban execution. + + See merge request easycorp/zentaopms!1376 + +commit 0aba204fbf258b7a3afe2bf4583da517bd73d9a2 +Author: liumengyi +Date: Thu Jan 13 11:58:28 2022 +0800 + + * Fix bug for kanban execution. + +commit c15fb8dd6f9ad9b47a7f35d8708dd3d84d2059cb +Author: 孙广明 +Date: Thu Jan 13 11:56:21 2022 +0800 + + * Fix details. + +commit c4abe9461683ae1ba19d921cf77592b52e87d6bc +Author: 孙广明 +Date: Thu Jan 13 11:45:17 2022 +0800 + + * Code for kanban. + +commit b3d88ef83c99335893af735da9a5be31f73668e5 +Merge: 5b84af7f49 59b210c0a8 +Author: 孙广明 +Date: Thu Jan 13 03:32:56 2022 +0000 + + Merge branch 'tianshujie_bug' into 'master' + + * Fix the problem that the related story project ID is wrong. + + See merge request easycorp/zentaopms!1375 + +commit 59b210c0a8393df9dafd4306a8ac8996a0b2aa36 +Author: tianshujie +Date: Thu Jan 13 11:31:12 2022 +0800 + + * Fix the problem that the related story project ID is wrong. + +commit e82f0f565521b9283b8d38d474fb5b216eab1ed7 +Merge: 021d9d8b9a bc265f9364 +Author: 孙广明 +Date: Thu Jan 13 03:18:01 2022 +0000 + + Merge branch 'sprint/182_tianshujie_47313' into 'kanban' + + * Finish task #47333,47313. + + See merge request easycorp/zentaopms!1374 + +commit 021d9d8b9a9e8534b84a60a3b3ecbc37ba700fbd +Merge: c417a1d14d 0403bb58d1 +Author: 孙广明 +Date: Thu Jan 13 03:06:47 2022 +0000 + + Merge branch 'sprint/182_liumengyi_kanban' into 'kanban' + + * Finish task #47334.Add card view. + + See merge request easycorp/zentaopms!1372 + +commit 0403bb58d16a8c97b267cccdfc85b15110ea3562 +Author: liumengyi +Date: Thu Jan 13 11:03:21 2022 +0800 + + * Modify the opening method of link story. + +commit bc265f93645923ba92b4fc7e43054bc7af11c119 +Author: tianshujie +Date: Thu Jan 13 11:02:07 2022 +0800 + + * Finish task #47333,47313. + +commit fa461923423824c18584b6e5c33ee0b23537ae62 +Author: liumengyi +Date: Thu Jan 13 10:39:59 2022 +0800 + + * Modify execution kanban view. + +commit 0b860024285a44acd97d6a7842236e8561eee8bf +Author: zhouxudong +Date: Thu Jan 13 10:39:56 2022 +0800 + + *Fix bug #17257. + +commit 1ea0bb47607b3da3e2823ce4c6231919f667af32 +Author: liumengyi +Date: Thu Jan 13 10:35:04 2022 +0800 + + * Finish task #47334.Add card view. + +commit e00b854154fb4953ff5a87673250cb6963874428 +Author: tianshujie +Date: Thu Jan 13 10:20:51 2022 +0800 + + * Finish task #47313. + +commit 39e30fc64fd08bc8be5ec1c5a247e2da8349494c +Author: zhangrunyu +Date: Thu Jan 13 10:14:15 2022 +0800 + + Fix compatibility with PHP 5.4 + +commit c417a1d14dfa721550db89a4fd20ae5437c853f1 +Merge: ff650dd8fb b8321c127a +Author: 孙广明 +Date: Thu Jan 13 02:12:45 2022 +0000 + + Merge branch 'sprint/182_tianshujie_47353' into 'kanban' + + * Finish task #47353. + + See merge request easycorp/zentaopms!1370 + +commit b8321c127a20e960631e86a0a2eef06a3f7cdb64 +Author: tianshujie +Date: Thu Jan 13 10:10:30 2022 +0800 + + * Finish task #47353. + +commit d0b3979347080232c775a6545fd1cb493b923872 +Author: caoyanyi +Date: Thu Jan 13 01:58:15 2022 +0000 + + * Modify sonarqube frame for job create. + +commit ff650dd8fbbecc30ef18b3e4416507a3093a7de4 +Merge: 69ca909802 940587e1ca +Author: 孙广明 +Date: Thu Jan 13 01:47:50 2022 +0000 + + Merge branch 'sprint/182_tianshujie_47352' into 'kanban' + + * Finish task #47352. + + See merge request easycorp/zentaopms!1369 + +commit 940587e1ca9a2e49a2cf6c70384119b5e3963848 +Author: tianshujie +Date: Thu Jan 13 09:44:07 2022 +0800 + + * Finish task #47352. + +commit 5b84af7f496f9d7c17ae9a3eb662b5d0e0e6073a +Author: zhujinyong +Date: Thu Jan 13 09:42:43 2022 +0800 + + + Add status of project for testing. + +commit d98024d18f2b2cd4e18e9dc64e39c6cfee78ddd0 +Author: zhujinyong +Date: Thu Jan 13 09:38:23 2022 +0800 + + + Add relationship of projectproduct. + +commit 0230675445ab1b4dd1d9d6ae9c1ef158549dff53 +Author: zhangrunyu +Date: Thu Jan 13 09:25:59 2022 +0800 + + Remove server and http in roadrunner + +commit 5ed3a7cedead21d6539a820cb9ccc80b3e71f318 +Merge: 3a156ec3a5 bfea1ccb16 +Author: liyuchun +Date: Thu Jan 13 08:51:52 2022 +0800 + + Merge branch 'devops19_47229' into devops19 + +commit bfea1ccb164562faa06719ccb21544242c25a411 (origin/devops19_47229) +Merge: 7679a54e9e 3a156ec3a5 +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 13 00:51:36 2022 +0000 + + Merge branch 'devops19' into 'devops19_47229' + + # Conflicts: + # module/sonarqube/control.php + # module/sonarqube/model.php + +commit 73c86d3ae110a7967a8c0247b855aaf836bea3f2 +Author: chaideqing +Date: Wed Jan 12 17:22:53 2022 +0800 + + * fix bug incomplete right click in zentao client when zentao is black, bug #18042 + +commit 7679a54e9e069d13af264a754fc5edb6600c67ce +Author: zenggang +Date: Wed Jan 12 09:22:12 2022 +0000 + + * Adjust code + +commit 3a156ec3a55f7b31747cb95cf0118d793bfd73cb +Merge: 176053fca2 e0fa6d7017 +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 12 09:20:18 2022 +0000 + + Merge branch 'devops_caoyanyi_47227' into 'devops19' + + cyy:Finish task 47227. + + See merge request easycorp/zentaopms!1368 + +commit e0fa6d70179c262d8a680be675fa0d8ceaf433b6 +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 12 09:19:54 2022 +0000 + + Update model.php + +commit ff23d0118b48fdca07ba0778632492f61c9e1d89 +Author: zenggang +Date: Wed Jan 12 09:18:50 2022 +0000 + + * Adjust code + +commit 1b64b9a888811e0caabe3f3879e428c591ddf46c +Merge: 4bed0991e1 cc9aae99c7 +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 12 09:14:53 2022 +0000 + + Merge branch 'sprint/zhouxudong_fixnbug_18036' into 'master' + + *Fix bug #18036. + + See merge request easycorp/zentaopms!1366 + +commit eb500460e505d7eee19e0ac044a9be09853d61b7 +Author: zenggang +Date: Wed Jan 12 09:04:38 2022 +0000 + + * Finish task#47229,47231 + +commit 69ca909802a859982a7beb8905a337938378c088 +Merge: 091a64c634 f0d1c51bfe +Author: 王怡栋 +Date: Wed Jan 12 08:50:10 2022 +0000 + + Merge branch 'sgm_kanban' into 'kanban' + + Sgm kanban + + See merge request easycorp/zentaopms!1365 + +commit f0d1c51bfec14e3dd6674e9e67cfc2c47758cb7d +Author: 孙广明 +Date: Wed Jan 12 16:49:29 2022 +0800 + + * Add comment. + +commit 3706a60032c0ffb83aa33e960c22597085258e77 +Author: 孙广明 +Date: Wed Jan 12 16:47:48 2022 +0800 + + * Add comment. + +commit 4f346b46708236c11841a81a7cb078006f880e58 +Author: 孙广明 +Date: Wed Jan 12 16:35:10 2022 +0800 + + * Fix a bug. + +commit 16b6264a751d245b6c4008557d82c40907eac543 +Author: 孙广明 +Date: Wed Jan 12 16:34:01 2022 +0800 + + * Refactor kanban code. + +commit 091a64c634ca8aa08f9f71620e8df0c508bc3d6c +Merge: 5d2cfa4c1e 8b22fdcabc +Author: 孙广明 +Date: Wed Jan 12 08:32:23 2022 +0000 + + Merge branch 'sprint/182_tianshujie_47336' into 'kanban' + + * Finish task #47336,47344,47345. + + See merge request easycorp/zentaopms!1364 + +commit 8b22fdcabcda8344130c8edcae7eb8c5fbd0e00d +Author: tianshujie +Date: Wed Jan 12 16:28:16 2022 +0800 + + * Finish task #47336,47344,47345. + +commit cc9aae99c7a5d2cf436503dfe627b62786e94a05 +Author: zhouxudong +Date: Wed Jan 12 15:55:25 2022 +0800 + + *Fix bug #18036. + +commit 5d2cfa4c1e444d538d83cd7949099ccf695bfff4 +Merge: dad8b2f970 5a8c11cb6e +Author: 孙广明 +Date: Wed Jan 12 15:53:32 2022 +0800 + + Merge branch 'sprint/182_tianshujie_47336' into kanban + +commit 5a8c11cb6e8794f1798fbadec71c86ec9a7dc3bc +Merge: c5bf8afbc2 dad8b2f970 +Author: 孙广明 +Date: Wed Jan 12 07:53:04 2022 +0000 + + Merge branch 'kanban' into 'sprint/182_tianshujie_47336' + + # Conflicts: + # module/execution/control.php + +commit c5bf8afbc291f23ff8d2bb596c1ef805926566f9 +Author: tianshujie +Date: Wed Jan 12 15:50:44 2022 +0800 + + * Modify the link judgment method. + +commit dad8b2f970416a0ac8936afb1c4ade4f86d32a61 (origin/kanban) +Merge: cfc6e37281 ddc5b0cf1d +Author: 孙广明 +Date: Wed Jan 12 15:45:35 2022 +0800 + + Merge branch 'sprint/182_liumengyi_kanban' into kanban + +commit ddc5b0cf1dce84fc6fd89408ad23c0165280f883 (origin/sprint/182_liumengyi_kanban) +Merge: 0b334a246f cfc6e37281 +Author: 孙广明 +Date: Wed Jan 12 07:45:15 2022 +0000 + + Merge branch 'kanban' into 'sprint/182_liumengyi_kanban' + + # Conflicts: + # module/kanban/model.php + +commit 4bca0680ab417ba46e19a7490e63661af24562b4 (origin/sprint/182_tianshujie_47336) +Author: tianshujie +Date: Wed Jan 12 15:44:44 2022 +0800 + + * Finish task #47335. + +commit 8d303e4db19d49990fc250cb1093e87e3d379a94 (origin/devops_caoyanyi_47227) +Author: caoyanyi +Date: Wed Jan 12 07:44:16 2022 +0000 + + * Finish task #47227. + +commit 0b334a246f91a2cd54082c0bc5c7b6a80971f00a +Author: liumengyi +Date: Wed Jan 12 15:39:33 2022 +0800 + + * Add column menu. + +commit 176053fca28ec3197cb372e89852643e961d5c2c +Author: liyuchun +Date: Wed Jan 12 15:26:20 2022 +0800 + + * Fix error. + +commit edfa7ea24877b2f3c20bfc8df9908a88b446acbb +Merge: 5de5226e39 e50bb1f221 +Author: liyuchun +Date: Wed Jan 12 15:03:05 2022 +0800 + + Merge branch 'devops19_caoyanyi_47221' into devops19 + +commit e50bb1f221c43d8af2d4ab19c3e142353e1a1dbb +Merge: 0046f0289e 3260e91a12 +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 12 07:02:42 2022 +0000 + + Merge branch 'devops19' into 'devops19_caoyanyi_47221' + + # Conflicts: + # module/sonarqube/control.php + # module/sonarqube/model.php + +commit 0046f0289e7c7e4ba45b9d6027eaac8dc5cbd61e +Author: caoyanyi +Date: Wed Jan 12 07:00:14 2022 +0000 + + * Adjust codes. + +commit 9da6e4b9c04e110f94d7dd907bd80057ea719816 +Author: caoyanyi +Date: Wed Jan 12 06:44:54 2022 +0000 + + * Finish task #47221. + +commit 3260e91a1208bbea7b9f022a2ce5c6ef9f897051 +Merge: 5de5226e39 b3ff9202a2 +Author: 王怡栋 +Date: Wed Jan 12 06:40:36 2022 +0000 + + Merge branch 'devops_liyuchun_47233' into 'devops19' + + * Finish task #47233. + + See merge request easycorp/zentaopms!1361 + +commit b3ff9202a22e65c2a18f46c3afa812afd3f51f58 +Author: liyuchun +Date: Wed Jan 12 14:38:06 2022 +0800 + + * Finish task #47233. + +commit 4bed0991e121f3e4aaefd21de601d501e5730452 +Author: zhujinyong +Date: Wed Jan 12 14:28:28 2022 +0800 + + + Support ';' for print. + +commit c5aaae3eb8235f3c145cca120408ce087f66c858 +Author: liyuchun +Date: Wed Jan 12 14:16:34 2022 +0800 + + * Finish task #47233. + +commit d7998c8b9909e23cbb8f0e9d7fff8101aeb4690d (origin/sprint/182_sunhao/bug18315) +Author: Hao Sun +Date: Wed Jan 12 14:08:55 2022 +0800 + + * Bug #18315, fix wrap lines not show in roadmap. + +commit 0a0653191202b76df184bb07bae05c23d30b69f7 (origin/zentao_client_fix) +Merge: fef8e440df 8ab6050b34 +Author: zhujinyong +Date: Wed Jan 12 13:32:02 2022 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit fef8e440df99d06c5b01970dccb53fff5d80fb3d +Author: zhujinyong +Date: Wed Jan 12 13:31:47 2022 +0800 + + * Compatability for PHP8. + +commit debd83264f7ab81183def79ae94021a9f7d354c3 (origin/roadrunner-zhangrunyu) +Author: zhangrunyu +Date: Wed Jan 12 13:20:48 2022 +0800 + + clean code + +commit 80d6389aaf21aa3b31a5a84f0cbae31fe82844eb +Author: zhangrunyu +Date: Wed Jan 12 13:10:52 2022 +0800 + + Add roadrunner cron + +commit 8ab6050b349c43fc864f2afb4486f5e8bf13bebd +Merge: b006972821 919a355220 +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 12 03:58:25 2022 +0000 + + Merge branch 'sprint/zhouxudong_fixnbug_17257' into 'master' + + Sprint/zhouxudong fixnbug 17257 + + See merge request easycorp/zentaopms!1358 + +commit 919a355220d43a83471076ce5917b2cae18e6a93 +Author: zhouxudong +Date: Wed Jan 12 11:38:39 2022 +0800 + + *Code for language. + +commit cfc6e37281315e5d5b38a6ed53c40f20d6cd9f12 +Merge: 2ed55b0c68 aa0faea270 +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 12 03:33:08 2022 +0000 + + Merge branch 'sgm_refactor' into 'kanban' + + * Refactor kanban code. + + See merge request easycorp/zentaopms!1357 + +commit aa0faea2708f5ef837eb3c135ef0043770fd697b +Author: 孙广明 +Date: Wed Jan 12 11:32:25 2022 +0800 + + * Adjust code. + +commit 0afb843ef5dfee45724783174970f82eabcd3874 +Author: 孙广明 +Date: Wed Jan 12 11:23:05 2022 +0800 + + * Refactor kanban code. + +commit 5de5226e39c772cb6a0a84fc51624e865f9f8722 +Merge: 2bc152e80c 5359525b4c +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 12 03:18:42 2022 +0000 + + Merge branch 'devops19_47228' into 'devops19' + + 任务47228 + + See merge request easycorp/zentaopms!1355 + +commit 7870309514558c35c8b155f6e53479ac730a76ec +Author: tianshujie +Date: Wed Jan 12 11:13:16 2022 +0800 + + * Modify create and execute jump app error. + +commit 5359525b4ccbd49384fc33ac7f36679a030c8dfb +Author: zenggang +Date: Wed Jan 12 03:12:38 2022 +0000 + + * Adjust code + +commit b80539559522ad94a6b19193be9614823fefff0f +Author: zenggang +Date: Wed Jan 12 03:11:22 2022 +0000 + + * Adjust code + +commit a0d61f9d2fac8f8e7cfcf3b8fbd303ed59a1e0ea +Author: tianshujie +Date: Wed Jan 12 11:07:02 2022 +0800 + + * Working with Kanban Data. + +commit 8f5032d898e461240b58e573b9783af763d01a81 +Author: zenggang +Date: Wed Jan 12 02:41:27 2022 +0000 + + * Finish task#47228 + +commit e19602194ac8493add9ae51d33689b559f451b8b +Author: tianshujie +Date: Wed Jan 12 10:30:55 2022 +0800 + + * Modify the editing project error problem. + +commit 2ed55b0c68035da755c4359c3a250dbb287c6b09 +Merge: cc68da4d37 ac91316068 +Author: 孙广明 +Date: Wed Jan 12 02:21:19 2022 +0000 + + Merge branch 'sprint/182_liumengyi_47334' into 'kanban' + + * Finish task #47334.Add default view of professional RD Kanban. + + See merge request easycorp/zentaopms!1354 + +commit ac913160686bc7f52cd7020a3e8da1c815a12029 +Author: liumengyi +Date: Wed Jan 12 10:17:35 2022 +0800 + + * Modify code format of kanban model. + +commit adf53d8754ac199d9212e5d4665ba35e6c24d79d +Author: liumengyi +Date: Wed Jan 12 10:08:15 2022 +0800 + + * Finish task #47334.Add default view of professional RD Kanban. + +commit 2bc152e80c78f1aed5417d306c429273fa8c205c +Merge: 9fcf956b5a e69be078a3 +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 12 01:59:26 2022 +0000 + + Merge branch 'devops19_47226' into 'devops19' + + * Finish task#47226 + + See merge request easycorp/zentaopms!1351 + +commit a25933c371b0ef98d4e06c00ab79ec940da32c18 (origin/sprint/zhouxudong_fixnbug_17419) +Author: zhouxudong +Date: Wed Jan 12 09:54:31 2022 +0800 + + *Fix buf #17419. + +commit e69be078a35765f5ef6bcf8d39aa3274dfd80f78 +Author: zenggang +Date: Wed Jan 12 01:46:35 2022 +0000 + + * Adjust code + +commit b006972821db4cafb4bb731889565eee398000de +Merge: 4b17d8a8a4 96fdc4465a +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 12 01:33:33 2022 +0000 + + Merge branch 'sprint/zhouxudong_fixbug_17388' into 'master' + + Sprint/zhouxudong fixbug 17388 + + See merge request easycorp/zentaopms!1352 + +commit 8285477ef15a8ddbd1dd8f80a7eee41ec5c87e30 +Author: zenggang +Date: Wed Jan 12 01:11:35 2022 +0000 + + * Adjust language + +commit 96fdc4465a6be3512520bbd444ebce0a83f19cdf +Author: zhouxudong +Date: Wed Jan 12 09:10:47 2022 +0800 + + *Fix bug #17388. + +commit cc68da4d375b87140eee057d829d5f5c5b51e661 +Merge: 48e9171569 8206d239cc +Author: 孙广明 +Date: Wed Jan 12 01:09:59 2022 +0000 + + Merge branch 'sprint/182_tianshujie_47358' into 'kanban' + + * Finish task #47358. + + See merge request easycorp/zentaopms!1350 + +commit 8206d239cc5b7ac3958ab3b3008438b416154792 +Author: tianshujie +Date: Wed Jan 12 09:08:56 2022 +0800 + + * Recalculate area height. + +commit 0f958a378df6eec3d191d8dc7cf736a023d4896e +Author: zhouxudong +Date: Wed Jan 12 09:07:01 2022 +0800 + + *Fix bug #17388. + +commit 82f0cd2fd634ea5f6298204490eda89ad5ce70d6 +Author: zhouxudong +Date: Wed Jan 12 08:41:15 2022 +0800 + + *Fix bug #17388. + +commit 6b4c03f5a4d4310bb45818ccb57b6c5e2d7b34f4 +Author: tianshujie +Date: Wed Jan 12 08:35:17 2022 +0800 + + * Add sql statement. + +commit 84c9e3aa58c5cba12157d6e0606912068843a03c +Author: zhouxudong +Date: Wed Jan 12 08:34:41 2022 +0800 + + *Fix bug #17388. + +commit 89dc868c3c0a70ead0b024bb7b1c1e74e5473cc6 +Author: tianshujie +Date: Wed Jan 12 08:19:34 2022 +0800 + + * Modify the code. + +commit 4b17d8a8a42c0e2291c13cad1468862cf3a49b3d +Author: zhujinyong +Date: Wed Jan 12 07:25:41 2022 +0800 + + + Add su function. + +commit d20ba7265b227a4d20bbfeb802571fd2782f395a +Author: tianshujie +Date: Tue Jan 11 21:23:16 2022 +0800 + + * Modify the code logic. + +commit ca95618c5c773c11976f9c55e57e1f8a2d60fe4d +Author: zenggang +Date: Tue Jan 11 10:10:52 2022 +0000 + + * Adjust code + +commit e2988a12120a007346f93165b8939211ba527ee7 +Author: zenggang +Date: Tue Jan 11 09:48:18 2022 +0000 + + * Adjust code + +commit 322dcddfabfda1c7bc2fd4bd6ff91426446ede9a +Author: zenggang +Date: Tue Jan 11 09:44:13 2022 +0000 + + * Finish task#47226 + +commit cf829b4731e8b234d1834039ebcb9ede603a3c26 +Author: tianshujie +Date: Tue Jan 11 17:14:27 2022 +0800 + + * Add new icons: "size-height" and "inherit-space". + +commit 9faee43d47f4e2789bf79b335cd2be77cc02dd54 +Author: tianshujie +Date: Tue Jan 11 17:07:40 2022 +0800 + + * Modify default value. + +commit 80e0f37c8305ac1ba409e487e577900b8701627a +Author: zhujinyong +Date: Tue Jan 11 17:06:22 2022 +0800 + + + Add projectproduct for testing. + +commit aca23db3461549a12f47bfa3fd3fc0762a362a16 +Author: tianshujie +Date: Tue Jan 11 17:02:17 2022 +0800 + + * Finish task #47358. + +commit 234a1ac91281dd5928130cca3549966751714a4e +Merge: a47085a683 893d1856e0 +Author: zhujinyong +Date: Tue Jan 11 16:38:55 2022 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit a47085a68344786d7999d1aded6d748cea95b35e +Author: zhujinyong +Date: Tue Jan 11 16:38:09 2022 +0800 + + + Add execution for testing. + +commit 48e91715698a9bdfc5ae23908177bbd1cab74dac +Merge: 62b7f5eac1 b3681c395a +Author: 王怡栋 +Date: Tue Jan 11 08:20:29 2022 +0000 + + Merge branch 'sgm_kanban' into 'kanban' + + * Refactor kanban. + + See merge request easycorp/zentaopms!1349 + +commit b3681c395a7d557ea09e651013c8027971abbdd6 +Author: 孙广明 +Date: Tue Jan 11 16:18:07 2022 +0800 + + * Refactor kanban. + +commit 893d1856e00b862c6ee3ac3f73a97f8d33e41c7c +Merge: 4db0fc5643 edf96f4485 +Author: 朱金勇 +Date: Tue Jan 11 08:06:02 2022 +0000 + + Merge branch 'sprint/183_zhouxudong_firstmerge' into 'master' + + *Fix bug #18037. + + See merge request easycorp/zentaopms!1347 + +commit 4db0fc5643ea3169fc901b921fa78d60439d5b07 +Merge: 1cfe4d69e6 be43bf7f3a +Author: 朱金勇 +Date: Tue Jan 11 08:05:28 2022 +0000 + + Merge branch 'sprint/182_sunhao/new_icon' into 'master' + + * Add new icons: "size-height" and "inherit-space". + + See merge request easycorp/zentaopms!1340 + +commit 9fcf956b5a50254a33d6c89dd7b450e9461067c6 (origin/devops19_liyuchun) +Merge: 6cadd42eec a0669db9be +Author: 王怡栋 +Date: Tue Jan 11 08:00:15 2022 +0000 + + Merge branch 'devops19_liyuchun' into 'devops19' + + 修复Z工具预合并失败问题 + + See merge request easycorp/zentaopms!1346 + +commit a0669db9beeb063112c80f714eb7e5282ad249cf +Author: liyuchun +Date: Tue Jan 11 15:55:32 2022 +0800 + + * Fix error when pre merge. + +commit 62b7f5eac16586cd8b91b5964a34fc8339db2d65 +Merge: 8cf613ac6b ec74445096 +Author: 孙广明 +Date: Tue Jan 11 07:53:14 2022 +0000 + + Merge branch 'sprint/182_liumengyi_47340' into 'kanban' + + * Finish task #47340.When adding kanban execution, create region, group, lanes and columns. + + See merge request easycorp/zentaopms!1344 + +commit edf96f44855d221479440f69b1052a45d0ffeca0 +Author: zhouxudong +Date: Tue Jan 11 15:52:59 2022 +0800 + + *Fix bug #18037. + +commit ec74445096500e8036849fbfb1f38847541386f1 +Author: liumengyi +Date: Tue Jan 11 15:38:50 2022 +0800 + + * Finish task #47340.When adding kanban execution, create region, group, lanes and columns. + +commit 1cfe4d69e6acf15e43d59d679386c18679ead9c5 +Merge: 891686e8f9 6667a3c19a +Author: 王怡栋 +Date: Tue Jan 11 06:49:58 2022 +0000 + + Merge branch 'sprint/182_songchenxuan_fix_reactive_bug' into 'master' + + *Fix reactive bug. + + See merge request easycorp/zentaopms!1342 + +commit 6667a3c19afbad0b7c9fbd34e0b1b93aee64a7f1 +Author: songchenxuan +Date: Tue Jan 11 14:45:19 2022 +0800 + + *Fix reactive bug. + +commit 6cadd42eec90540b838ab22af2bd78bc19b58861 +Merge: 9f778e38b5 1e80904680 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 11 06:16:12 2022 +0000 + + Merge branch 'devops_caoyanyi_47224' into 'devops19' + + 新增SonarQube入口及列表 + + See merge request easycorp/zentaopms!1341 + +commit 8cf613ac6bfe2063254dd514a20a685bfd6bc1d2 +Merge: 95e9f324ee 54fc83b0fc +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 11 06:14:15 2022 +0000 + + Merge branch 'sgm_kanbanmodel' into 'kanban' + + Add kanban to execution. + + See merge request easycorp/zentaopms!1339 + +commit 891686e8f97f3e18f26c60ff1d0739404bc455b4 +Author: zhujinyong +Date: Tue Jan 11 13:55:01 2022 +0800 + + * Fix ztest init. + +commit 1e80904680bb0ac0f10fce64f527f040cc25e6cc +Author: caoyanyi +Date: Tue Jan 11 05:20:18 2022 +0000 + + * Modify page btn. + +commit 4ae737da92cba505d317e5697928f855b037eb59 +Merge: 7599836f3b aa1a28a20c +Author: zhujinyong +Date: Tue Jan 11 12:33:22 2022 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 7599836f3bc64d978af949bd63fcd64c1e62437b +Author: zhujinyong +Date: Tue Jan 11 12:32:57 2022 +0800 + + + Add processor of zentao test. + +commit be43bf7f3a05a67b78af42c2e43d119450fd6ace +Author: Hao Sun +Date: Tue Jan 11 11:27:39 2022 +0800 + + * Add new icons: "size-height" and "inherit-space". + +commit aa1a28a20c711d74d1d1454e99129ab03d0433f8 +Merge: 770e577102 919ea9d8d0 +Author: 孙广明 +Date: Tue Jan 11 03:18:33 2022 +0000 + + Merge branch 'Fixbug_zhengrunyu' into 'master' + + *Fix bug 18290. + + See merge request easycorp/zentaopms!1338 + +commit 54fc83b0fcebadb2265cea97c3ed8d099e17ac6f +Author: 孙广明 +Date: Tue Jan 11 11:17:41 2022 +0800 + + * Add execution kanban list. + +commit 8dff489e72346a17ffafb9c239c0f254f2534593 +Author: caoyanyi +Date: Tue Jan 11 02:50:35 2022 +0000 + + * Finish task #47224. + +commit 919ea9d8d073ed20d8e0a8d9b060c10cc865fec0 +Author: zhengrunyu +Date: Tue Jan 11 10:28:33 2022 +0800 + + *Fix bug 18290. + +commit 95e9f324eee0239c7ae844ba75a6afee28a5a8ab +Merge: b904bc3c58 759841b3a5 +Author: 孙广明 +Date: Tue Jan 11 02:19:00 2022 +0000 + + Merge branch 'sprint/182_liumengyi_47340' into 'kanban' + + * Finish task #47340, #47341. + + See merge request easycorp/zentaopms!1337 + +commit 759841b3a50767e908febc741075dbcb1b8e874b +Author: liumengyi +Date: Tue Jan 11 10:16:13 2022 +0800 + + * Fix bug for create execution. + +commit 203b97de5f32e7a6b976375dc285635084c7d11e +Author: liumengyi +Date: Tue Jan 11 10:14:49 2022 +0800 + + * Finish task #47340. + +commit ddb8a4037dff81bb1d7e2ec8b27fb6ccd377341b +Author: liumengyi +Date: Tue Jan 11 10:11:59 2022 +0800 + + * Finish task #47340, #47341. + +commit 770e577102e3563a981cfdf72fa23c1229d5fe81 +Merge: db61688b9f 378abd8527 +Author: 孙广明 +Date: Tue Jan 11 02:10:43 2022 +0000 + + Merge branch 'sprint/182_tianshujie_47314' into 'master' + + * Fix bug #47314. + + See merge request easycorp/zentaopms!1335 + +commit 378abd852794fc130c4476b58d4621bb4dcab4cf +Author: tianshujie +Date: Tue Jan 11 10:09:40 2022 +0800 + + * Modify variable name. + +commit 4a5ec8d84b46a01b97388f3d6683ebd61dcc4dae +Author: tianshujie +Date: Tue Jan 11 10:06:47 2022 +0800 + + * Modify variable name. + +commit 0c50201fa61556be2f8f53f68667bd69b3175ba6 +Author: tianshujie +Date: Tue Jan 11 10:04:48 2022 +0800 + + * Modify the code logic. + +commit fc081f1d216cd2b77f3dd4fe45ea7897e64930dd +Author: tianshujie +Date: Tue Jan 11 10:03:22 2022 +0800 + + * Modify the code logic. + +commit db61688b9fb5977e733dd7255c255c7b28c6c5bf +Merge: 0abf6e40db d68eb433fe +Author: 孙广明 +Date: Tue Jan 11 01:59:49 2022 +0000 + + Merge branch '180_mayue_js' into 'master' + + * Fix compatibility issues. + + See merge request easycorp/zentaopms!1336 + +commit d68eb433fecbdcff69bf9c741b49e697d2a6c64a +Author: mayue +Date: Tue Jan 11 09:57:03 2022 +0800 + + * Fix compatibility issues. + +commit 353d85ed86cef1e6b10cf30c0bf44a1f3ccd6c9b +Author: tianshujie +Date: Tue Jan 11 09:42:11 2022 +0800 + + * Delete code. + +commit 0755e5a4af581e91e2b77c20a94550357bdf7560 +Author: tianshujie +Date: Tue Jan 11 09:39:40 2022 +0800 + + * Add comment of kanban model file. + +commit eac960afe5e217c9ca97574622c81438438b1880 +Author: tianshujie +Date: Tue Jan 11 09:38:21 2022 +0800 + + * Fix bug #47314. + +commit 0abf6e40db3b25a1fb7c172e9e61b9b152a8d967 +Merge: 76b750f955 d0cfa7531e +Author: 孙广明 +Date: Tue Jan 11 01:21:03 2022 +0000 + + Merge branch '180_hufangzhou_package' into 'master' + + * Add the new version. + + See merge request easycorp/zentaopms!1334 + +commit d0cfa7531e981b8daead98d20a9a65884d337f75 +Author: hufangzhou +Date: Tue Jan 11 09:19:47 2022 +0800 + + * Add the new version. + +commit 76b750f955e7bd5e8052280c72c5c1061c189ef8 +Merge: cf15aa2f19 dc8da347b6 +Author: 孙广明 +Date: Tue Jan 11 00:56:24 2022 +0000 + + Merge branch 'sprint/182_liumengyi_18293' into 'master' + + * Fix bug #18293. + + See merge request easycorp/zentaopms!1333 + +commit dc8da347b600cbda860507432f0c1a6e2522397d +Author: liumengyi +Date: Tue Jan 11 08:54:15 2022 +0800 + + * Fix bug #18293. + +commit cf15aa2f19930f78fb1afb51c3709ebbe83a31dc +Merge: 3598466d9b 1c28a0462f +Author: 孙广明 +Date: Tue Jan 11 00:50:39 2022 +0000 + + Merge branch 'sprint/182_tianshujie_bugmodule' into 'master' + + * Change the die of the bug module to return print. + + See merge request easycorp/zentaopms!1330 + +commit 3598466d9bfbcb20fab27cc602a061d68fa0f4ad +Merge: 9f778e38b5 0176c8689a +Author: 孙广明 +Date: Tue Jan 11 00:48:28 2022 +0000 + + Merge branch 'sprint/182_tianshujie_47309' into 'master' + + * Fix bug #47309. + + See merge request easycorp/zentaopms!1332 + +commit 0176c8689a8e20b9cbcc59b6fe08ddb2cd72a39c +Author: tianshujie +Date: Tue Jan 11 08:47:17 2022 +0800 + + * Fix bug #47309. + +commit 9f778e38b516ebe8dbdeb9314e66bae71c16cfff +Merge: 19fc483611 b57562e99e +Author: 王怡栋 +Date: Tue Jan 11 00:43:35 2022 +0000 + + Merge branch 'revert-3e9bcdb8' into 'master' + + Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'" + + See merge request easycorp/zentaopms!1328 + +commit 19fc483611ba8cec10b9023a9996a211a056b89f +Merge: 1e50b1b3e4 9a744f651a +Author: 王怡栋 +Date: Tue Jan 11 00:41:01 2022 +0000 + + Merge branch 'revert-b904bc3c' into 'master' + + Revert "Merge branch 'sgm_182db' into 'master'" + + See merge request easycorp/zentaopms!1329 + +commit 1e50b1b3e48e4fd5ba99b239b7423ef20ddc2bdf +Merge: 3ab13aa61e 1cae18380b +Author: 王怡栋 +Date: Tue Jan 11 00:40:34 2022 +0000 + + Merge branch 'revert-db968165' into 'master' + + Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'" + + See merge request easycorp/zentaopms!1331 + +commit 1cae18380bd83bed81ce4267d818a7470e15f98d +Author: 孙广明 +Date: Tue Jan 11 00:39:37 2022 +0000 + + Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'" + + This reverts merge request !1324 + +commit 9a744f651a27f5b9d5c9190adaf0d7e9fe24dd38 +Author: 孙广明 +Date: Tue Jan 11 00:38:36 2022 +0000 + + Revert "Merge branch 'sgm_182db' into 'master'" + + This reverts merge request !1325 + +commit 3ab13aa61e49c5300364c615df7d982b4ad226ba +Merge: b904bc3c58 bb13431274 +Author: 孙广明 +Date: Tue Jan 11 00:36:32 2022 +0000 + + Merge branch 'sprint/182_songchenxuan_action_lang' into 'master' + + *Case action lang. + + See merge request easycorp/zentaopms!1322 + +commit b57562e99e5ac352c9cd38778c57636946589d0a +Author: 孙广明 +Date: Tue Jan 11 00:35:04 2022 +0000 + + Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'" + + This reverts merge request !1326 + +commit bb134312747c721b7e4abef202bc2dd9c25b4a3f +Author: songchenxuan +Date: Tue Jan 11 08:34:55 2022 +0800 + + *Fix bug 18074. + +commit b904bc3c58f6cb661ff3debf0907af0900fda354 +Merge: 80765f894d ff6b122f3a +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 11 00:11:48 2022 +0000 + + Merge branch 'sgm_182db' into 'master' + + * Add upgrade.sql. + + See merge request easycorp/zentaopms!1325 + +commit 1c28a0462f485bad0c052d34f86ee5be6e1d00be +Author: tianshujie +Date: Tue Jan 11 08:09:13 2022 +0800 + + * Change the die of the bug module to return print. + +commit 80765f894d51c8242e1484de3367227b1ac8da62 +Merge: f3e681c99f 714471e03b +Author: zhujinyong +Date: Mon Jan 10 21:13:52 2022 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f3e681c99fc2d18a5023af4f4353dbb947279023 +Author: zhujinyong +Date: Mon Jan 10 21:12:04 2022 +0800 + + * Add testTask table for update0.sql. + +commit 714471e03b50f24ec1abceb64600a535a20ad3e6 +Merge: 3e9bcdb892 cc3c90291d +Author: 孙广明 +Date: Mon Jan 10 09:40:44 2022 +0000 + + Merge branch 'sprint/182_liumengyi_47483' into 'master' + + * Finish task #47483. + + See merge request easycorp/zentaopms!1327 + +commit cc3c90291d33979de1a6f926a3cb7acf2ef8c861 +Author: liumengyi +Date: Mon Jan 10 17:32:31 2022 +0800 + + * Finish task #47483. + +commit 3e9bcdb8923be032c7a31c78193c6e7b62d758fe +Merge: db9681654b 0b9e2c0fa3 +Author: 孙广明 +Date: Mon Jan 10 09:21:23 2022 +0000 + + Merge branch 'sprint/182_hufangzhou_47331' into 'master' + + * Finish task #47331. + + See merge request easycorp/zentaopms!1326 + +commit 0b9e2c0fa3ec7543af92be77da98c60d253280d6 +Author: hufangzhou +Date: Mon Jan 10 17:18:18 2022 +0800 + + * Finish task #47331. + +commit ff6b122f3a7120a0a22e91f107dd487a69693c09 +Author: 孙广明 +Date: Mon Jan 10 16:46:02 2022 +0800 + + * Add upgrade.sql. + +commit db9681654b61688451d49c5cb414d26d112267d9 +Merge: 489c06ddb3 075ac6efc5 +Author: 孙广明 +Date: Mon Jan 10 08:36:39 2022 +0000 + + Merge branch 'sprint/182_hufangzhou_47330' into 'master' + + * Finish task #47330. + + See merge request easycorp/zentaopms!1324 + +commit 075ac6efc50a3f2ab7486e0a1f6daa65201e2141 +Author: hufangzhou +Date: Mon Jan 10 15:58:01 2022 +0800 + + * Adjust the lang item order. + +commit 63226a2e846bec2dab62cc4db8ed5c3497240396 +Author: hufangzhou +Date: Mon Jan 10 15:45:24 2022 +0800 + + * Finish task #47330. + +commit 489c06ddb38a83200b5c8f01cb54878d5d05fd93 +Merge: 3c2fe9e87f 0601474a78 +Author: 孙广明 +Date: Mon Jan 10 07:43:45 2022 +0000 + + Merge branch 'sprint/182_tianshujie_18289' into 'master' + + * Fix bug #18289. + + See merge request easycorp/zentaopms!1323 + +commit 0601474a78097ad66ed82c8e95532cb6d36bc03b +Author: tianshujie +Date: Mon Jan 10 15:41:24 2022 +0800 + + * Fix bug #18289. + +commit 721cdba3d3e1f0de8240caf743c101057453cc96 +Author: songchenxuan +Date: Mon Jan 10 14:11:28 2022 +0800 + + *Case action lang. + +commit 3c2fe9e87f3ef3626212575c93bb92eb330a78ca +Merge: f08514b544 1ee5fb522f +Author: 孙广明 +Date: Mon Jan 10 05:35:22 2022 +0000 + + Merge branch 'tianshujie_fixBug' into 'master' + + * Fix bug #18287. + + See merge request easycorp/zentaopms!1321 + +commit 1ee5fb522f601cf737e4ac5b2a3ea6a76ce65dca +Author: tianshujie +Date: Mon Jan 10 12:15:19 2022 +0800 + + * Fix bug #18287. + +commit f08514b5444c975ff501347fc2ac50196dc3036a (tag: zentaopms_16.1_20220110) +Merge: 6ef3c5018e a87d365a09 +Author: 李玉春 <563917701@qq.com> +Date: Mon Jan 10 00:46:09 2022 +0000 + + Merge branch 'devops18_18277' into 'master' + + * Fix bug#18277 + + See merge request easycorp/zentaopms!1316 + +commit 6ef3c5018ed170b4e2495bd414635abf56bde063 +Merge: 07014ed347 ab097f3a61 +Author: 孙广明 +Date: Mon Jan 10 00:44:48 2022 +0000 + + Merge branch 'sprint/liyuchun_devops18' into 'master' + + * Fix bug #18264. + + See merge request easycorp/zentaopms!1319 + +commit ab097f3a61e3420e609664d5747f9d04a13b81b7 +Author: liyuchun +Date: Mon Jan 10 08:39:41 2022 +0800 + + * Fix bug #18264. + +commit 07014ed347d0a987d8a43d180b91e636b7901f81 +Merge: 8626f5385f b1db4e4bd1 +Author: 孙广明 +Date: Fri Jan 7 03:20:46 2022 +0000 + + Merge branch 'sprint/180_hufangzhou_18281' into 'master' + + # Fix bug #18281. + + See merge request easycorp/zentaopms!1317 + +commit b1db4e4bd131c5b16d42e21a71f2b7ea685792d9 +Author: hufangzhou +Date: Fri Jan 7 11:20:02 2022 +0800 + + # Fix bug #18281. + +commit 8626f5385f435583410ed87494ee04f45464b763 +Merge: 8bbafaa21c 85773e58cd +Author: 孙广明 +Date: Fri Jan 7 03:04:41 2022 +0000 + + Merge branch 'sprint/180_tianshujie_18280' into 'master' + + * Fix bug #18280. + + See merge request easycorp/zentaopms!1315 + +commit a87d365a09491045abf2f478c2774c0eeefb76b1 +Author: zenggang +Date: Fri Jan 7 03:03:44 2022 +0000 + + * Fix bug#18277 + +commit 85773e58cd424c506f29ae4b5a2f92c998cffe81 +Author: tianshujie +Date: Fri Jan 7 11:01:47 2022 +0800 + + * Fix bug #18280. + +commit 8bbafaa21c1990581b3c0b62db5b2aec40fa9d9c +Merge: 7514d5d2fa 1f78499a4a +Author: 孙广明 +Date: Fri Jan 7 02:43:35 2022 +0000 + + Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master' + + *Fix bug for write valiable name. + + See merge request easycorp/zentaopms!1314 + +commit 1f78499a4ab0a6291bc26c4efe601ccc7e7207a3 +Author: zhengrunyu +Date: Fri Jan 7 10:28:30 2022 +0800 + + *Fix bug for write valiable name. + +commit 7514d5d2fa6523a098a16c27f5103d118b409e05 +Merge: ba53ac9f5b 7aee562fea +Author: 孙广明 +Date: Fri Jan 7 02:27:50 2022 +0000 + + Merge branch 'sprint/181_tianshujie_17790' into 'master' + + * Fix bug #17790. + + See merge request easycorp/zentaopms!1313 + +commit 7aee562fea2e3df0d058f305505c9347bbb015ef +Author: tianshujie +Date: Fri Jan 7 10:26:27 2022 +0800 + + * Fix bug #17790. + +commit ba53ac9f5b346fc0a96a15e2595dad42115ab1cf +Merge: 236b790dca 5475eeab94 +Author: 孙广明 +Date: Fri Jan 7 02:15:47 2022 +0000 + + Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master' + + *Fix bug for start and end time when edit it. + + See merge request easycorp/zentaopms!1312 + +commit 5475eeab9405c4ac0a372615bb3854cb157d8b2f +Author: zhengrunyu +Date: Fri Jan 7 10:11:36 2022 +0800 + + *Fix bug for start and end time when edit it. + +commit 236b790dcaeea58a58b066034651d1aaf5629d00 +Merge: cc6c2af0c1 412d143578 +Author: 孙广明 +Date: Fri Jan 7 01:42:13 2022 +0000 + + Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master' + + *Code bug + + See merge request easycorp/zentaopms!1311 + +commit 412d143578822c7c795049bda84d82ccbe34b48f +Author: zhengrunyu +Date: Fri Jan 7 09:39:54 2022 +0800 + + *Code bug + +commit cc6c2af0c1640fbabaea0b2a71648e6876ef381b +Merge: 021b08995f 003db31341 +Author: 孙广明 +Date: Fri Jan 7 01:34:36 2022 +0000 + + Merge branch 'sprint/180_hufangzhou_bug' into 'master' + + * Fix bug #16624. + + See merge request easycorp/zentaopms!1310 + +commit 021b08995fcd7b22819c4c2d38570b46071c213b +Merge: c5bcbbb9ea 0d9b03dbfb +Author: 孙广明 +Date: Fri Jan 7 01:33:48 2022 +0000 + + Merge branch 'sprint/180_xieqiyu_18241' into 'master' + + * Fix bug#18241. + + See merge request easycorp/zentaopms!1308 + +commit c5bcbbb9ea134adf059882ab96e0dfc739f5c7ee +Merge: bddf81b2f7 325a57c292 +Author: 孙广明 +Date: Fri Jan 7 01:29:44 2022 +0000 + + Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master' + + *Code edit and batchedit. + + See merge request easycorp/zentaopms!1309 + +commit 003db31341c9e41da46a2466acf4b098227b584c +Author: hufangzhou +Date: Fri Jan 7 09:29:37 2022 +0800 + + * Fix bug #16624. + +commit bddf81b2f725d6d010b9cd96503bf8ddfb773040 +Merge: 069f119566 c755ce356a +Author: 孙广明 +Date: Fri Jan 7 01:28:21 2022 +0000 + + Merge branch 'sprint/181_tianshujie_18276' into 'master' + + * Fix bug #18276. + + See merge request easycorp/zentaopms!1307 + +commit 0d9b03dbfbc2ddc9a384320a9bf22a7f575775cb +Author: xieqiyu +Date: Fri Jan 7 09:27:48 2022 +0800 + + * Fix bug#18241. + +commit 325a57c292ca4adfe89a2d9510948a6587720dbb +Author: zhengrunyu +Date: Fri Jan 7 09:27:39 2022 +0800 + + *Code edit and batchedit. + +commit c755ce356ae92bbab104d1447ac2d5d3ca0cb4db +Author: tianshujie +Date: Fri Jan 7 09:26:15 2022 +0800 + + * Fix bug #18276. + +commit 069f1195662002661f7c90ed60195ef135d3ed76 +Merge: 2bc556c3ce 7e3e42edaa +Author: 孙广明 +Date: Fri Jan 7 01:20:56 2022 +0000 + + Merge branch 'code_review/001_mayue' into 'master' + + * Optimize code. + + See merge request easycorp/zentaopms!1302 + +commit 7e3e42edaa706da95568f1be5558ca2dc6944018 +Author: mayue +Date: Fri Jan 7 09:19:26 2022 +0800 + + * Optimize code format. + +commit 91ff44d32e9d1b9cf130cb7a5f86905c04ab6a48 +Author: mayue +Date: Fri Jan 7 09:14:27 2022 +0800 + + * Optimize code. + +commit 2bc556c3ce660009bdd02c6b0469333d97fd68c7 +Merge: 94cf4fcb73 3186827004 +Author: 孙广明 +Date: Fri Jan 7 00:55:53 2022 +0000 + + Merge branch 'sprint/180_xieqiyu_modifyName' into 'master' + + * Modify name. + + See merge request easycorp/zentaopms!1306 + +commit 3186827004af5144a270caa3ca8d7cb5de2b66d4 +Author: xieqiyu +Date: Fri Jan 7 08:53:18 2022 +0800 + + * Modify name. + +commit 94cf4fcb734479815b670e94a17a543610e6b4bc +Merge: e6cfd6b900 16670c5483 +Author: 孙广明 +Date: Fri Jan 7 00:50:23 2022 +0000 + + Merge branch 'sprint/180_songchenxuan_18074' into 'master' + + Sprint/180 songchenxuan 18074 + + See merge request easycorp/zentaopms!1304 + +commit e6cfd6b9008d369052afe0f3ebba321ceb840da1 +Merge: 15a142af8a d5efab2baf +Author: 孙广明 +Date: Fri Jan 7 08:48:31 2022 +0800 + + Merge branch 'sprint/180_xieqiyu_18166' + +commit d5efab2baf3e4481c7f18b90daedf4dc36b9a58c +Merge: af54ab16c6 15a142af8a +Author: 孙广明 +Date: Fri Jan 7 00:46:43 2022 +0000 + + Merge branch 'master' into 'sprint/180_xieqiyu_18166' + + # Conflicts: + # module/project/config.php + +commit af54ab16c64c34e634d4686cf165f889f8eedfb4 +Author: xieqiyu +Date: Fri Jan 7 08:35:18 2022 +0800 + + * Fix bug#18242,18241,18240,18239. + +commit 16670c5483a8c8bf6aeed5332a4a29a512876a81 +Author: songchenxuan +Date: Thu Jan 6 17:36:55 2022 +0800 + + *Fix bug #18074. + +commit 3e5df731bc78e441992e0694c922d181816ce298 +Author: songchenxuan +Date: Thu Jan 6 17:32:48 2022 +0800 + + *Fix bug #18074. + +commit 15a142af8a7ead41f818c4bd8ee1abc156cefe0d +Merge: bff2f36c90 a390fe4b6f +Author: 孙广明 +Date: Thu Jan 6 09:26:55 2022 +0000 + + Merge branch 'sprint/180_songchenxuan_realname' into 'master' + + Sprint/180 songchenxuan realname + + See merge request easycorp/zentaopms!1300 + +commit bff2f36c906eac92a6c87636164853000e22d96f +Merge: 05ec5dad47 b6ea0afcb4 +Author: 孙广明 +Date: Thu Jan 6 09:25:15 2022 +0000 + + Merge branch 'sprint/181_liumengyi_fixbug' into 'master' + + * Finish task #47090 #47098. + + See merge request easycorp/zentaopms!1303 + +commit b6ea0afcb46567c81f0e016f869ea2173fb38c30 +Author: liumengyi +Date: Thu Jan 6 16:56:27 2022 +0800 + + * Finish task #47090 #47098. + +commit 82fd1dac5654693285ab403450029cffcf525985 +Author: mayue +Date: Thu Jan 6 16:43:53 2022 +0800 + + * Optimize code. + +commit 05ec5dad47baed496a97037152bf2444736ea065 +Merge: bfc0897887 1980e18d38 +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 6 08:01:30 2022 +0000 + + Merge branch 'code_review/001_mayue' into 'master' + + * Optimize code. + + See merge request easycorp/zentaopms!1301 + +commit 1980e18d3891460045e78479d6668ea4a35c0f22 +Author: mayue +Date: Thu Jan 6 16:00:28 2022 +0800 + + * Optimize code. + +commit f151953a49a09cd1a6e24a5ce971dcf3bcf74672 +Author: mayue +Date: Thu Jan 6 15:55:49 2022 +0800 + + * Optimize code. + +commit bfc08978872e6e52d4ffb292b74b9325bb63a4eb +Merge: f3e2bfde8a 16aa3247a0 +Author: 孙广明 +Date: Thu Jan 6 07:54:02 2022 +0000 + + Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master' + + *Fix bug. + + See merge request easycorp/zentaopms!1299 + +commit 16aa3247a0d79ea06900a71ff2ed686542cf8ea8 +Author: zhengrunyu +Date: Thu Jan 6 15:45:45 2022 +0800 + + *Fix bug. + +commit a390fe4b6fc229c85d6ee597013886b6275cfea8 +Author: songchenxuan +Date: Thu Jan 6 15:33:15 2022 +0800 + + *Code review realname. + +commit f3e2bfde8af0374a77254b28823d050de8584f2f +Merge: 6117c14d9f 6613dc493f +Author: 孙广明 +Date: Thu Jan 6 07:30:22 2022 +0000 + + Merge branch 'sprint/181_liumengyi_fixbug' into 'master' + + * Finish task #47081 #47092 #47093 #47111. + + See merge request easycorp/zentaopms!1298 + +commit 6613dc493f825b061b7fdc2941eb04b27f7d601f +Author: liumengyi +Date: Thu Jan 6 15:29:45 2022 +0800 + + * Finish task #47092. + +commit 6117c14d9f6a129600e1e7d1bb32b3344d052e90 +Merge: 77c4ca007d 8539bc7883 +Author: 孙广明 +Date: Thu Jan 6 07:25:35 2022 +0000 + + Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master' + + *Unset required. + + See merge request easycorp/zentaopms!1297 + +commit 42e9076e66dc971165fb8632ffccf8374f008838 +Author: liumengyi +Date: Thu Jan 6 15:25:09 2022 +0800 + + * Finish task #47081 #47092 #47093 #47111. + +commit 8539bc788381c42e6f9c6c11e53ac0ac1ad14184 +Author: zhengrunyu +Date: Thu Jan 6 15:19:51 2022 +0800 + + *Unset required. + +commit 9cae04c917a70a27ecd57e0a2058bf5de6fb638e +Author: songchenxuan +Date: Thu Jan 6 14:59:14 2022 +0800 + + *Code review realname. + +commit 77c4ca007dc976d991a5ee82102529c9a8ccf127 +Merge: a33420c74b ea5a484019 +Author: 孙广明 +Date: Thu Jan 6 06:39:00 2022 +0000 + + Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master' + + *Fix bug. + + See merge request easycorp/zentaopms!1296 + +commit ea5a48401930bff8a7d67eed382a9824f5b1d7ea +Author: zhengrunyu +Date: Thu Jan 6 14:31:08 2022 +0800 + + *Fix bug. + +commit a33420c74b69e9c62f7d4a108f3dca8ae5c28fd6 +Merge: 1ec9dcb113 411d284d43 +Author: 孙广明 +Date: Thu Jan 6 06:20:51 2022 +0000 + + Merge branch 'spirint/32_tianshujie_error' into 'master' + + * Fix bug #18095. + + See merge request easycorp/zentaopms!1295 + +commit 1ec9dcb11373b69a63285255bb8c04160465ef97 +Merge: 1534b0a2b1 038b8b01c2 +Author: 孙广明 +Date: Thu Jan 6 06:20:21 2022 +0000 + + Merge branch 'sprint/181_liumengyi_fixbug' into 'master' + + * Fix bug for batch edit. + + See merge request easycorp/zentaopms!1294 + +commit 1534b0a2b19106d058aee91c2f55a8b2f8386dad +Merge: e94c1128e1 27e9e40cb9 +Author: 孙广明 +Date: Thu Jan 6 14:19:44 2022 +0800 + + Merge branch 'sprint/181_zhengrunyu_Fixbug' + +commit 27e9e40cb92cf052fefa8d5422ad092f84c1b440 +Merge: f2874479c2 e94c1128e1 +Author: 孙广明 +Date: Thu Jan 6 06:19:17 2022 +0000 + + Merge branch 'master' into 'sprint/181_zhengrunyu_Fixbug' + + # Conflicts: + # module/productplan/control.php + +commit 038b8b01c2425922268e9baea896522c70236512 +Author: liumengyi +Date: Thu Jan 6 14:19:08 2022 +0800 + + * Fix bug for batch edit. + +commit 411d284d435634f0d73c5d066ca941d525e8b3fe +Author: tianshujie +Date: Thu Jan 6 14:19:05 2022 +0800 + + * Fix bug #18095. + +commit e94c1128e1244ee210cb3bc9aab731f3297eebc3 +Merge: db0e90f53e 2de429b441 +Author: 孙广明 +Date: Thu Jan 6 06:18:23 2022 +0000 + + Merge branch 'sprint/180_songchenxuan_fix_code_review' into 'master' + + *Code for code review. + + See merge request easycorp/zentaopms!1287 + +commit f2874479c27c094292f1405ca9172e9ac2b2b7d6 +Author: zhengrunyu +Date: Thu Jan 6 14:16:18 2022 +0800 + + *Adjust code. + +commit b28777ecfdeff8dacf519bd4fb7c789a3109b78a +Author: liumengyi +Date: Thu Jan 6 14:04:18 2022 +0800 + + * Fix bug for batch edit. + +commit 133316ba45e1a42dcadfc56a66ac3bc896557e23 +Author: zhengrunyu +Date: Thu Jan 6 14:03:25 2022 +0800 + + *Adjust code. + +commit 2de429b441feba3e849b5678700be129808a152b +Author: songchenxuan +Date: Thu Jan 6 14:01:21 2022 +0800 + + *Code for code review. + +commit 8a0448c99d74c30833cd5a56e28a45e468ffb992 +Author: songchenxuan +Date: Thu Jan 6 13:56:06 2022 +0800 + + *Code for code review. + +commit db0e90f53e509f416335e09a09d0cde61958525e +Merge: 8745c6ded0 a2765b7427 +Author: 孙广明 +Date: Thu Jan 6 05:55:04 2022 +0000 + + Merge branch 'sprint/180_mayue_bug18147,18149' into 'master' + + * Fix bug #18147,18149. + + See merge request easycorp/zentaopms!1290 + +commit 8745c6ded0d8b9b7e0c0e409ff0ae21aebf56903 +Merge: b85d9d224d 127b69d4c7 +Author: 孙广明 +Date: Thu Jan 6 05:53:48 2022 +0000 + + Merge branch 'sprint/32_tianshujie_18095' into 'master' + + * Fix bug #18095. + + See merge request easycorp/zentaopms!1292 + +commit e51d0283e98287de3a78062af31b620e10b315bf +Author: songchenxuan +Date: Thu Jan 6 13:51:33 2022 +0800 + + *Code for code review. + +commit a2765b742725df9a57130d1eab61846df3abf5f6 +Author: mayue +Date: Thu Jan 6 13:50:43 2022 +0800 + + * Optimize code. + +commit b85d9d224dac7730bc0f8697adf79ad6feef7d01 +Merge: 0325b07527 b5de7cebfa +Author: 孙广明 +Date: Thu Jan 6 05:48:24 2022 +0000 + + Merge branch 'sprint/max_tanghucheng_fixbug' into 'master' + + * Fix bug. + + See merge request easycorp/zentaopms!1291 + +commit 127b69d4c77a4f389f4e205105c389f11d0305c1 +Author: tianshujie +Date: Thu Jan 6 13:47:18 2022 +0800 + + * Fix bug #18095. + +commit b5de7cebfaa79fdabda2a9c7bba149eb42af9aa9 +Author: tanghucheng +Date: Thu Jan 6 13:46:58 2022 +0800 + + * Fix bug. + +commit fcb699c84d7f1533760beb1aa62a62841692c335 +Author: mayue +Date: Thu Jan 6 13:38:10 2022 +0800 + + * Fix bug #18147,18149. + +commit 1cf45ada5cc54e8a8dfe78f939201f2406af8e87 +Author: songchenxuan +Date: Thu Jan 6 13:34:53 2022 +0800 + + *Code for code review. + +commit 0325b075274b339d53b85b6b2efe404e229dc75c +Merge: d1eab22822 ac110317ee +Author: 孙广明 +Date: Thu Jan 6 05:26:24 2022 +0000 + + Merge branch 'sprint/180_xieqiyu_46520' into 'master' + + * Fix bug: test task count error. + + See merge request easycorp/zentaopms!1288 + +commit d1eab2282261225da3807575159dbd43bce4b9d7 +Merge: f4fab2055d f8da5c8503 +Author: 孙广明 +Date: Thu Jan 6 05:22:05 2022 +0000 + + Merge branch 'sprint/181_liumengyi_fixbug' into 'master' + + * Fix bug for batch edit. + + See merge request easycorp/zentaopms!1289 + +commit f8da5c85035469a1ddcc620eee9f9b53965c2bb8 +Author: liumengyi +Date: Thu Jan 6 13:20:16 2022 +0800 + + * Fix bug for batch edit. + +commit f4fab2055d1086a84fe3143265e8de6832626fd2 +Merge: cb699a9f5a 7c1d29f971 +Author: 孙广明 +Date: Thu Jan 6 05:16:44 2022 +0000 + + Merge branch 'sprint/32_zhouxin_fixsomebug' into 'master' + + Do some little change. + + See merge request easycorp/zentaopms!1286 + +commit 7c1d29f971859f685957dab1c2d8de73d08bd219 +Author: zhouxin +Date: Thu Jan 6 05:12:36 2022 +0000 + + Fix bug. + +commit ac110317eed56635539968236e3f9c998d689633 +Author: xieqiyu +Date: Thu Jan 6 13:11:08 2022 +0800 + + * Fix bug: test task count error. + +commit 8927059720464dfc8aa9d039bc0fc0780e60d892 +Author: songchenxuan +Date: Thu Jan 6 13:08:46 2022 +0800 + + *Code for code review. + +commit b74b175a9a870f46b80c42bb188ba40e2cc289e0 +Author: zhouxin +Date: Thu Jan 6 05:01:18 2022 +0000 + + Do some little change. + +commit cb699a9f5ad69454d3e095dc002501dc239f2ceb +Merge: b33826b9ba 5929a4fc32 +Author: 朱金勇 +Date: Thu Jan 6 04:53:49 2022 +0000 + + Merge branch 'sprint/181_tianshujie_lang' into 'master' + + * Modify the English language item of the currency. + + See merge request easycorp/zentaopms!1277 + +commit b33826b9bab7775d0f8aa94844d0204ce5eb1ab2 +Merge: 6d80b334bf a19708adeb +Author: liyuchun +Date: Thu Jan 6 12:07:32 2022 +0800 + + Merge branch 'sprint/32_zhouxin_fixbugs' + +commit a19708adebb6d0d2e067f058ae4bb49fdd5015bb +Merge: 0b08489176 51e32b6fa1 +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 6 04:01:16 2022 +0000 + + Merge branch 'master' into 'sprint/32_zhouxin_fixbugs' + + # Conflicts: + # module/project/config.php + +commit 0b08489176e2b4ccdc033e7b49f197b14fbee718 +Author: zhouxin +Date: Thu Jan 6 03:57:50 2022 +0000 + + Fix bug. + +commit 51e32b6fa11b7d1a5743438765024e2bf85cac97 +Merge: 9b9c95ca54 ad0303f83d +Author: 王怡栋 +Date: Thu Jan 6 11:56:43 2022 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 9b9c95ca545290500edf2b6caae1d500c0613f11 +Author: 王怡栋 +Date: Thu Jan 6 11:56:07 2022 +0800 + + * adjust for check requiredField for flow. + +commit ad0303f83d313894f4995ab96b53facc922e3d06 +Merge: 0943f58b83 3c4b34dc9c +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 6 03:34:05 2022 +0000 + + Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master' + + *Fix bug + + See merge request easycorp/zentaopms!1284 + +commit 3c4b34dc9caa12e83473c0329c3b90ed1f40b4fc +Author: zhengrunyu +Date: Thu Jan 6 11:32:56 2022 +0800 + + *Fix bug + +commit 0943f58b83c885e95c4b6ad77e3a0cae600c0921 +Merge: 0451b2c8b9 520f6077bd +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 6 03:27:12 2022 +0000 + + Merge branch 'sprint/32_zhouxin_fixbugs' into 'master' + + Fix bug. + + See merge request easycorp/zentaopms!1282 + +commit 0451b2c8b9291c9e517b114027d3b5391f389ce2 +Merge: 44fa7d965b f78a39f5a1 +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 6 03:27:01 2022 +0000 + + Merge branch 'sprint/180_xieqiyu_18250' into 'master' + + * Fix bug#18250. + + See merge request easycorp/zentaopms!1283 + +commit 520f6077bd87c45a39b27723e4c67ab386a84ba7 +Author: zhouxin +Date: Thu Jan 6 03:25:52 2022 +0000 + + Add testtask and release table. + +commit 44fa7d965bb51290ece4c54046d097b4c8857b2b +Merge: be84dfdf10 26685258c7 +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 6 03:25:30 2022 +0000 + + Merge branch 'sprint/32/tianshujie_gantt' into 'master' + + * Fix bug #18213. + + See merge request easycorp/zentaopms!1281 + +commit be84dfdf10e38b4b16e755988b382482cfd4f5ed +Merge: c357477762 666760a95c +Author: 孙广明 +Date: Thu Jan 6 03:22:44 2022 +0000 + + Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master' + + *Code chenge status of parent and fix bug + + See merge request easycorp/zentaopms!1280 + +commit f78a39f5a18c5f68f8082d93bc082f15b7ce360e +Author: xieqiyu +Date: Thu Jan 6 11:21:43 2022 +0800 + + * Fix bug#18250. + +commit 05192bdb3e070fc48eae2a50e65a1d78df6a0e28 +Author: zhouxin +Date: Thu Jan 6 03:21:03 2022 +0000 + + Fix bug. + +commit 666760a95c1e3186fdd520a6c8903b5fa9281243 +Author: zhengrunyu +Date: Thu Jan 6 11:20:27 2022 +0800 + + *Code bug. + +commit 26685258c7f9cf0b8846b5215bb02444da9ea436 +Author: tianshujie +Date: Thu Jan 6 11:14:48 2022 +0800 + + * Fix bug #18213. + +commit c0b16334ee0dcc4bae301c150c1879e538f85344 +Author: zhengrunyu +Date: Thu Jan 6 11:12:29 2022 +0800 + + *Code chenge status of parent and fix bug + +commit c357477762e09c637f86d8d4e1b4b9008d2cf914 +Merge: 4ca46cc91f 08132a448d +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 6 03:00:38 2022 +0000 + + Merge branch 'devops18_47047' into 'master' + + * Finish task#47047 + + See merge request easycorp/zentaopms!1272 + +commit 4ca46cc91f7bf21d4c5a5391120fcd654042defd +Merge: d8c5bcb3b4 443a00c606 +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 6 02:59:30 2022 +0000 + + Merge branch 'devops18_47057' into 'master' + + * Finish task#47057 + + See merge request easycorp/zentaopms!1260 + +commit d8c5bcb3b4becf6bb3827693825d40e4541a17e8 +Merge: 962da1c6a2 314173d072 +Author: 李玉春 <563917701@qq.com> +Date: Thu Jan 6 02:58:30 2022 +0000 + + Merge branch 'sprint/180_mayue_18114' into 'master' + + * Fix bug #18114. + + See merge request easycorp/zentaopms!1279 + +commit 962da1c6a235117ac73cfb0a0b6f544c9b2b8490 +Merge: 65f31e5b01 a25ed2eedb +Author: 孙广明 +Date: Thu Jan 6 02:42:31 2022 +0000 + + Merge branch 'sprint/180_xieqiyu_fixbug' into 'master' + + * Fix bug of edit task has only main branch stories. + + See merge request easycorp/zentaopms!1270 + +commit 65f31e5b0167ca7da69db0a039186419bfe688e3 +Merge: f485b31fb9 735c0eae85 +Author: 孙广明 +Date: Thu Jan 6 02:40:14 2022 +0000 + + Merge branch 'sprint/32_zhouxin_fixbugs' into 'master' + + Fix bug #18245. + + See merge request easycorp/zentaopms!1278 + +commit 735c0eae85a254fcbfdff65cf57e7e91aa668fa3 +Author: zhouxin +Date: Thu Jan 6 02:37:08 2022 +0000 + + Fix bug #18245. + +commit 5929a4fc32a7a042d0514161ba327aaedcedb393 +Author: tianshujie +Date: Thu Jan 6 10:35:25 2022 +0800 + + * Modify the English language item of the currency. + +commit 314173d07255279e7e75db9da29fa624f456384d +Author: mayue +Date: Thu Jan 6 09:09:35 2022 +0800 + + * Fix bug #18114. + +commit f485b31fb9247375b2cc88e612c94f99adbcdec2 +Merge: 6d80b334bf b88740a836 +Author: 孙广明 +Date: Thu Jan 6 00:55:33 2022 +0000 + + Merge branch 'sprint/181_liumengyi_edit' into 'master' + + * Fix bug #18173. + + See merge request easycorp/zentaopms!1275 + +commit 6d80b334bffcbaadf94baaa04cb0a52f1adde371 +Merge: cc7f405f4d 22f322fb94 +Author: 孙广明 +Date: Wed Jan 5 12:56:05 2022 +0000 + + Merge branch 'sprint/178_hufangzhou_18220' into 'master' + + * Fix bug #18220. + + See merge request easycorp/zentaopms!1276 + +commit 22f322fb94d4b58cfbf88d33c02f130629865916 +Author: hufangzhou +Date: Wed Jan 5 20:47:05 2022 +0800 + + * Fix bug #18220. + +commit b88740a83608544c12ad28d00923c2507f6063a9 +Author: liumengyi +Date: Wed Jan 5 17:28:21 2022 +0800 + + * Fix bug #18173. + +commit cc7f405f4de7b6a7776cb01eebefa00a2d1ee16c +Merge: 4ca0780fb0 18f60b7825 +Author: 孙广明 +Date: Wed Jan 5 07:14:46 2022 +0000 + + Merge branch 'sprint/181_liumengyi_edit' into 'master' + + * Fix bug #18173. + + See merge request easycorp/zentaopms!1273 + +commit 4ca0780fb01af658a6ccf529ce5e30ca2750522c +Merge: 30f5033357 bc637ef419 +Author: 孙广明 +Date: Wed Jan 5 07:12:38 2022 +0000 + + Merge branch 'sprint/180_songchenxuan_18183,18184' into 'master' + + *Fix bug 18183,18184. + + See merge request easycorp/zentaopms!1274 + +commit bc637ef419ae066fa82ad66388f4cc5c582bfb5c +Author: songchenxuan +Date: Wed Jan 5 15:11:26 2022 +0800 + + *Fix bug 18183,18184. + +commit ecc3ae4608a6675aa68869a3ea43c3796c6ebb08 +Author: songchenxuan +Date: Wed Jan 5 15:06:56 2022 +0800 + + *Fix bug 18183,18184. + +commit 18f60b78258f1fe43e0935f33ad1073fbb6bba3f +Author: liumengyi +Date: Wed Jan 5 14:57:14 2022 +0800 + + * Fix bug #18173. + +commit 30f5033357e5571198e6c74a008e8512b79c64c7 +Merge: a7707776a4 d34b83cd96 +Author: 孙广明 +Date: Wed Jan 5 06:48:31 2022 +0000 + + Merge branch 'sprint/32_zhouxin_fixbugs' into 'master' + + Fix bug #18201. + + See merge request easycorp/zentaopms!1269 + +commit 08132a448dd5e4a718a5d0b0b97b76a590559ed8 +Author: zenggang +Date: Wed Jan 5 06:39:32 2022 +0000 + + * Adjust code + +commit a7707776a4ef45a00678b58901d1db1023132f67 +Merge: 96891e8c70 5ef3cb51a8 +Author: 王怡栋 +Date: Wed Jan 5 06:31:19 2022 +0000 + + Merge branch 'sprint/liyuchun_devops18' into 'master' + + * Fix bug #17956. + + See merge request easycorp/zentaopms!1264 + +commit 79859569b39ea0f8d82b84aea10e1817560fe64a +Author: zenggang +Date: Wed Jan 5 06:24:19 2022 +0000 + + * Finish task#47047 + +commit a25ed2eedb52cb140df85968f76e439102205140 +Author: xieqiyu +Date: Wed Jan 5 14:03:09 2022 +0800 + + * Fix bug of edit task has only main branch stories. + +commit d34b83cd967bcb2250dd383cfdd88cf91c56e099 +Author: zhouxin +Date: Wed Jan 5 05:54:10 2022 +0000 + + Fix bug #18201. + +commit 5ef3cb51a8f6f2086d4ba0ad0fe7e8650b9be436 +Author: liyuchun +Date: Wed Jan 5 13:45:14 2022 +0800 + + * Fix bug #17952. + +commit 96891e8c70efb0ed7ae677a96f49694a657c90eb +Merge: c8db935f34 000c4eac4f +Author: 朱金勇 +Date: Wed Jan 5 05:42:42 2022 +0000 + + Merge branch 'sprint/180_sunhao/optimize_picker' into 'master' + + * Update picker in zui, fix selected value not update in time. + + See merge request easycorp/zentaopms!1248 + +commit ee431f18e3c8475e8627fc53958fb36fbbf5c2f1 +Author: zhouxin +Date: Wed Jan 5 05:09:08 2022 +0000 + + Fix bug #18199. + +commit 818a1d73323f5c50aea7e1a01d99956f8d42dcb6 +Author: liyuchun +Date: Wed Jan 5 11:20:43 2022 +0800 + + * Fix bug #17956. + +commit 31251909386de998405ff835791fc3a1f19859ec +Merge: 90ffee0f0c 5d9dc4885b +Author: 李玉春 <563917701@qq.com> +Date: Wed Jan 5 02:29:38 2022 +0000 + + Merge branch 'devops18_caoyanyi' into 'master' + + * Finish task #47051. + + See merge request easycorp/zentaopms!1259 + +commit 443a00c606c505043c9bbcaa508a871c9fbc1e8d +Author: zenggang +Date: Wed Jan 5 02:16:33 2022 +0000 + + * Finish task#47057 + +commit 5d9dc4885b49c74f744c0bc0d40c2e1176cf544c +Author: caoyanyi +Date: Wed Jan 5 02:03:30 2022 +0000 + + * Finish task #47051. + +commit 90ffee0f0ca9fefc17e695667a8b75b9f2fccefe +Merge: ff9ceaccad 76a3ebdd7b +Author: zhujinyong +Date: Wed Jan 5 09:06:07 2022 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ff9ceaccad40e5e223441444de0a96df0d9add5d +Author: zhujinyong +Date: Wed Jan 5 09:05:32 2022 +0800 + + * Check auth. + +commit c8db935f34da566acd34a2cbd0b772aa313f6963 +Merge: a2bd7cfcf3 44b222eca6 +Author: 孙广明 +Date: Tue Jan 4 22:41:23 2022 +0800 + + Merge branch '180' + +commit 44b222eca698614c46622a8991683588017a61ba (origin/sprint/180) +Merge: e3b3c11e5b 185f2c190a +Author: 孙广明 +Date: Wed Jan 5 05:17:12 2022 +0000 + + Merge branch 'sprint/180_songchenxuan_46518' into 'sprint/180' + + Sprint/180 songchenxuan 46518 + + See merge request easycorp/zentaopms!1254 + +commit a2bd7cfcf39d2d320fc09b06af917aa73566aa63 +Merge: 2ad05dd024 ee431f18e3 +Author: 孙广明 +Date: Wed Jan 5 05:15:13 2022 +0000 + + Merge branch 'sprint/32_zhouxin_fixbugs' into 'master' + + Fix bug #18199. + + See merge request easycorp/zentaopms!1266 + +commit 185f2c190aa5ca5227a89a9f755e82ab12cb7289 +Author: songchenxuan +Date: Wed Jan 5 13:15:01 2022 +0800 + + *Finish task #46518. + +commit dee36b812572b1dd807a9d722c5243b9fa7e24ed +Author: songchenxuan +Date: Wed Jan 5 13:13:35 2022 +0800 + + *Finish task #46158. + +commit 2ad05dd0249c986026ef88e30de4982a625c5dd6 +Merge: 0ffc96d670 4d78e4b9d3 +Author: 孙广明 +Date: Wed Jan 5 05:11:43 2022 +0000 + + Merge branch 'sprint/180_hufangzhou_closeModel' into 'master' + + * Compatible with Firefox browser. + + See merge request easycorp/zentaopms!1262 + +commit 2cac43a56ff5b7ba98a851e4c4d87140d1cde4e1 +Author: songchenxuan +Date: Wed Jan 5 13:11:34 2022 +0800 + + *Finish task #46518. + +commit 0ffc96d6709b369c718ad631d15d3e2ce8bb0bc3 +Merge: a5d74c7181 0a3f8e4969 +Author: 孙广明 +Date: Wed Jan 5 05:11:21 2022 +0000 + + Merge branch 'sprint/181_tianshujie_code' into 'master' + + * Fix problems in code review. + + See merge request easycorp/zentaopms!1263 + +commit e3b3c11e5b320f091e285d9282e5eb581834912a +Merge: 9f1f3a957d 8f05f4c257 +Author: 孙广明 +Date: Wed Jan 5 05:10:14 2022 +0000 + + Merge branch 'sprint/180_xieqiyu_modifyProblem' into 'sprint/180' + + * Modify upgrade tips style. + + See merge request easycorp/zentaopms!1265 + +commit a5d74c71814e432f7c5a7d32a44b7b71e55036e3 +Merge: 3125190938 3837af7a86 +Author: 孙广明 +Date: Wed Jan 5 05:10:01 2022 +0000 + + Merge branch 'sprint/181_liumengyi_review' into 'master' + + * Modify code format for kanban and productplan. + + See merge request easycorp/zentaopms!1261 + +commit 8f05f4c25732d4d7b26595cdd38c2b4233ff2f1d +Author: xieqiyu +Date: Wed Jan 5 13:04:57 2022 +0800 + + * Modify upgrade tips style. + +commit 0a3f8e4969e24b86649db30c0d0692894d853151 +Author: tianshujie +Date: Wed Jan 5 11:06:31 2022 +0800 + + * Edit comment of browse.js file. + +commit ac03f67bdbf5546dd8bad4e8fa6efed8b179224d +Author: tianshujie +Date: Wed Jan 5 11:02:34 2022 +0800 + + * Fix problems in code review. + +commit 4d78e4b9d3346a957b39826341fa9b061607f19d +Author: hufangzhou +Date: Wed Jan 5 10:54:34 2022 +0800 + + * Compatible with Firefox browser. + +commit 3837af7a8688c74f673e92c055a0ef806acea684 +Author: liumengyi +Date: Wed Jan 5 10:54:30 2022 +0800 + + * Modify code format for kanban and productplan. + +commit ad55c5197d957786e0acf9e1f1333880121b95d2 +Author: liumengyi +Date: Wed Jan 5 10:53:45 2022 +0800 + + * Modify code format for kanban and productplan. + +commit 5b3d3e5ce2d9445b43db46f3d322f2dac100513a +Author: songchenxuan +Date: Wed Jan 5 09:40:43 2022 +0800 + + *Finish task #46018. + +commit 0d2445bcb3e13b42a3d93aa399778774d021103d +Author: songchenxuan +Date: Wed Jan 5 09:02:58 2022 +0800 + + *Finish task #46518. + +commit b00bfee1bc100b214f10de36d8f064a272c81a48 +Author: songchenxuan +Date: Wed Jan 5 08:59:42 2022 +0800 + + *Finish task #46518. + +commit 36908927646cc8bbb1e4f292af0c6ab6ee24b724 +Author: songchenxuan +Date: Tue Jan 4 17:40:56 2022 +0800 + + *Finish task #46518. + +commit 9f1f3a957da2a8aba1173a99a62782e86f0fc9f7 +Merge: d7a9f2fd67 15d588491f +Author: 孙广明 +Date: Tue Jan 4 09:21:58 2022 +0000 + + Merge branch 'sprint/180_revert_code' into 'sprint/180' + + Revert code + + See merge request easycorp/zentaopms!1258 + +commit 15d588491fca06a12ab3a24e137012102c63bd66 +Author: mayue +Date: Tue Jan 4 17:19:45 2022 +0800 + + * Revert code. + +commit 294edf6aa02a434dfd03561ff2a4a05106a46649 +Author: songchenxuan +Date: Tue Jan 4 16:58:29 2022 +0800 + + *Finish task #46518. + +commit 76a3ebdd7b128ff7be3b104860816cfea3990643 +Merge: 2df95c203e 18a744763f +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 4 08:50:03 2022 +0000 + + Merge branch 'sprint/181_zhengrunyu_18165' into 'master' + + *Fixbug 18172. + + See merge request easycorp/zentaopms!1257 + +commit 18a744763fc1824012bea89e829830ad12926587 +Author: zhengrunyu +Date: Tue Jan 4 16:47:33 2022 +0800 + + *Fixbug 18172. + +commit 2df95c203e8a5c85080c8a68a8a54d64ed98eb90 +Merge: a4f76848ec 2c5d8abc45 +Author: 王怡栋 +Date: Tue Jan 4 08:17:56 2022 +0000 + + Merge branch 'sprint/liyuchun_devops18' into 'master' + + * Fix bug #18150. + + See merge request easycorp/zentaopms!1256 + +commit 2c5d8abc457670f7a4c88c9d044a4f8899e517f4 +Author: liyuchun +Date: Tue Jan 4 16:15:17 2022 +0800 + + * Fix bug #18150. + +commit a4f76848ec6dfaa847271a92091573152bcb4153 +Merge: 087cc82369 cc2601a4d5 +Author: 孙广明 +Date: Tue Jan 4 08:15:02 2022 +0000 + + Merge branch 'sprint/181_liumengyi_fixbug' into 'master' + + * Add maximum width for plan title. + + See merge request easycorp/zentaopms!1255 + +commit cc2601a4d5f74f90329c81af7d40ca72120704ed +Author: liumengyi +Date: Tue Jan 4 16:08:38 2022 +0800 + + * Add maximum width for plan title. + +commit a3183b3bf86c3bb8b73a6580ad2ff8cd0b751fbe +Author: songchenxuan +Date: Tue Jan 4 16:03:10 2022 +0800 + + *Finish task $46518. + +commit 9612d3abb02262e9d8f2f7157463ca95a1107958 +Author: songchenxuan +Date: Tue Jan 4 15:51:41 2022 +0800 + + *Finish task #46518. + +commit 087cc823693ca9ba4373fcd20e2f8fbe4f981395 +Merge: de825118bc 68f27d5fd8 +Author: 孙广明 +Date: Tue Jan 4 07:48:53 2022 +0000 + + Merge branch 'sprint/32_zhouxin_46683' into 'master' + + Sprint/32 zhouxin 46683 + + See merge request easycorp/zentaopms!1253 + +commit 68f27d5fd827434d06d94234c655b184622b74b5 +Author: zhouxin +Date: Tue Jan 4 07:48:11 2022 +0000 + + Change geshi. + +commit de825118bcb6e4c65e5519e85f9ac4d5cf6109b4 +Merge: a4ed3b0319 41eeabc074 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 4 07:37:30 2022 +0000 + + Merge branch 'sprint/181_zhengrunyu_18165' into 'master' + + *Fix bug 18168. + + See merge request easycorp/zentaopms!1252 + +commit d7a9f2fd67b4052471eaa4b9b4bc0e5a37a3720e +Merge: 87246f0154 e955bc4518 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 4 07:32:59 2022 +0000 + + Merge branch 'sprint/180_mayue_46526' into 'sprint/180' + + * Finish task #46526. + + See merge request easycorp/zentaopms!1249 + +commit 41eeabc074b59cbc213b0222acb06badc537ef1c +Author: zhengrunyu +Date: Tue Jan 4 15:32:54 2022 +0800 + + *Fix bug 18168. + +commit d44067f4e63260abde9c1d95bf8a31581e45cfe3 +Author: zhouxin +Date: Tue Jan 4 07:31:20 2022 +0000 + + Fix a bug. + +commit e955bc4518e214697c77902f5e1a8c8c89f64f69 +Author: mayue +Date: Tue Jan 4 15:30:41 2022 +0800 + + * Optimize code. + +commit 1d28df0e3090279e3de08a8875e0e7ab5dadb6cf +Author: mayue +Date: Tue Jan 4 15:27:07 2022 +0800 + + * Optimize code. + +commit a4ed3b0319180e8bdc85dca80a3b9fed9b59b52f +Merge: 0d673c2e97 c8786ef9ee +Author: 王怡栋 +Date: Tue Jan 4 07:18:49 2022 +0000 + + Merge branch 'sprint/liyuchun_devops18' into 'master' + + * Add unit cases. + + See merge request easycorp/zentaopms!1251 + +commit 0d673c2e973c241fec2966655e2788647ae41df3 +Merge: b1d0c553a1 f06de76227 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 4 07:18:02 2022 +0000 + + Merge branch 'sprint/181_zhengrunyu_18165' into 'master' + + *Fix bug 18165. + + See merge request easycorp/zentaopms!1250 + +commit c8786ef9eee2060d28759e49f12c2803fdcd5442 +Author: liyuchun +Date: Tue Jan 4 15:16:53 2022 +0800 + + * Adjust unit case. + +commit a6f469e4610aeb1e763be6847d11a3f239d8a7b2 +Author: liyuchun +Date: Tue Jan 4 15:10:28 2022 +0800 + + * Add unit cases. + +commit f06de7622771ea7268e8123cfb196402e6959ad2 +Author: zhengrunyu +Date: Tue Jan 4 14:50:44 2022 +0800 + + *Fix bug 18165. + +commit 000c4eac4f37e348549d0851f2cb6624b467cf75 +Author: Hao Sun +Date: Tue Jan 4 13:27:09 2022 +0800 + + * Update picker in zui, fix selected value not update in time. + +commit b1d0c553a1f74280b26a40216096a9f91b0e7424 +Merge: 36a1c6f8a9 0d05a3aa8c +Author: 孙广明 +Date: Tue Jan 4 04:19:32 2022 +0000 + + Merge branch 'zhengry_codeedit' into 'master' + + *Code edit. + + See merge request easycorp/zentaopms!1247 + +commit 0d05a3aa8c459c3650172eb80fb94b82725c3e25 +Author: zhengrunyu +Date: Tue Jan 4 12:00:42 2022 +0800 + + *Code edit. + +commit 36a1c6f8a9533d86921bcdb23515d0a3c96f01f3 +Merge: 7001079844 7739f455a0 +Author: 王怡栋 +Date: Tue Jan 4 11:29:53 2022 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 70010798449fdcc0233634f74deb92797ae549f3 +Author: 王怡栋 +Date: Tue Jan 4 11:28:43 2022 +0800 + + * adjust for block priv. + +commit 7739f455a0a727917057065285be46c5ba9aef77 +Merge: a92e8b5435 e370a094a9 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 4 03:26:17 2022 +0000 + + Merge branch 'sgm_changevar' into 'master' + + * Merge code. + + See merge request easycorp/zentaopms!1246 + +commit e370a094a9c91e3c0121652a46f6fb9eb7af7467 +Author: 孙广明 +Date: Tue Jan 4 11:08:30 2022 +0800 + + * Merge code. + +commit a92e8b54353763a9f7cb3a0c9868fb19631c20d9 +Merge: 87817d186c 7e037ff68d +Author: 孙广明 +Date: Tue Jan 4 03:04:16 2022 +0000 + + Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master' + + *Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code... + + See merge request easycorp/zentaopms!1244 + +commit 87817d186cf44a903dfd6e9f3cc3135279c7aa8a +Author: zhujinyong +Date: Tue Jan 4 10:52:29 2022 +0800 + + * Fix router error of api. + +commit 87246f0154f9c8c22f70a0adf8e6d80b6853d3b9 +Merge: a0143a0bf4 543c3df796 +Author: 孙广明 +Date: Tue Jan 4 02:40:19 2022 +0000 + + Merge branch 'sprint/180_xieqiyu_modifySearchStory' into 'sprint/180' + + * Modify problem of search story. + + See merge request easycorp/zentaopms!1245 + +commit 543c3df7964340cf6461864ac213542d1f8d60fb +Author: xieqiyu +Date: Tue Jan 4 10:37:09 2022 +0800 + + * Modify problem of search story. + +commit 0cd941137127d070a54a031d854359c88caad2be +Author: mayue +Date: Tue Jan 4 10:28:53 2022 +0800 + + * Finish task #46526. + +commit 17384dcb063deaf52637e294881b4df81d719b81 +Author: zhujinyong +Date: Tue Jan 4 10:27:09 2022 +0800 + + * Fix bug: super model must return. + +commit 7e037ff68dcfc45db0cc6f22d39f30743e88df7a +Author: zhengrunyu +Date: Tue Jan 4 10:27:06 2022 +0800 + + *Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit. + +commit c5bd97f2922585196cb13415ed73cf59dced79da +Merge: 1f72bd497a feb80b05d5 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 4 02:21:19 2022 +0000 + + Merge branch 'sgm_46671' into 'master' + + * Fix productplan bug. + + See merge request easycorp/zentaopms!1243 + +commit feb80b05d54e927070d9bd42e074082a81aaa189 +Author: 孙广明 +Date: Tue Jan 4 10:18:48 2022 +0800 + + * Fix productplan bug. + +commit a0143a0bf46b80c8de9ad1b96d9016f436ad35fa +Merge: 6473699b6e 77ba543cc8 +Author: 孙广明 +Date: Tue Jan 4 02:13:37 2022 +0000 + + Merge branch 'sprint/180_xieqiyu_46521' into 'sprint/180' + + * Modify the mutual test problem. + + See merge request easycorp/zentaopms!1242 + +commit 77ba543cc8ce1cd38d3b79def69ea41c28e2fc64 +Author: xieqiyu +Date: Tue Jan 4 10:08:14 2022 +0800 + + * Modify the mutual test problem. + +commit 1f72bd497ae88adf272b910a7c8bdee03295ddc4 +Merge: 9a76f5048e ba570f1467 +Author: 李玉春 <563917701@qq.com> +Date: Tue Jan 4 02:05:58 2022 +0000 + + Merge branch 'sgm_46671' into 'master' + + * Code for task 46671. + + See merge request easycorp/zentaopms!1239 + +commit 9a76f5048e6969767410b6253f5f74e1af7261c2 +Merge: 5a7cd21296 96c9cd54d2 +Author: 孙广明 +Date: Tue Jan 4 02:05:18 2022 +0000 + + Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master' + + *Code edit. + + See merge request easycorp/zentaopms!1241 + +commit 68647da31cc579388507f21bacc26848eab2b922 +Author: zhouxin +Date: Tue Jan 4 01:57:16 2022 +0000 + + Finish task #46683. + +commit 96c9cd54d2467c9feb9dcf92bab07d8481018890 +Author: zhengrunyu +Date: Tue Jan 4 09:56:35 2022 +0800 + + *Code edit. + +commit 5a7cd2129690be965d1615de3c301ae9412e04a7 +Merge: 393371607e 6ae2c2aaab +Author: 孙广明 +Date: Tue Jan 4 01:56:19 2022 +0000 + + Merge branch 'sprint/181_tianshujie_18143' into 'master' + + * Fix bug #18143. + + See merge request easycorp/zentaopms!1240 + +commit 6ae2c2aaab40f6c7d70be899c85c801320cdf086 +Author: tianshujie +Date: Tue Jan 4 09:54:07 2022 +0800 + + * Fix bug #18143. + +commit ba570f14675c7fd184ed1a32c64fe079224d196d +Author: 孙广明 +Date: Tue Jan 4 09:27:44 2022 +0800 + + * Code for task 46671. + +commit 393371607e86b6a92b1a20e88837778d863a08a5 +Merge: a9cc771d85 58a4ebb665 +Author: 孙广明 +Date: Tue Jan 4 01:01:52 2022 +0000 + + Merge branch 'sprint/181_tianshujie_optimize' into 'master' + + * Modify the batch editing plan logic. + + See merge request easycorp/zentaopms!1237 + +commit 58a4ebb665a628fb8a7b8d466061776aef2c0da8 +Author: tianshujie +Date: Tue Jan 4 09:00:21 2022 +0800 + + * Modify the code format of productplan mode file. + +commit 6473699b6e4a2143264e12733cd55a87605b9f36 +Merge: 24ad4bc48c 9c41c46624 +Author: 朱金勇 +Date: Mon Jan 3 14:51:26 2022 +0000 + + Merge branch 'sprint/180_songchenxuan_18132' into 'sprint/180' + + *Fix bug #18132. + + See merge request easycorp/zentaopms!1238 + +commit 3c174fbb7f4ec416745acccbcbe191e48a7380c1 +Author: tianshujie +Date: Mon Jan 3 13:30:22 2022 +0800 + + * Optimize the code for judging whether the time is correct. + +commit ece63ad3c0b538e7723c2a48c9684094db61eda5 +Merge: 0ec08bca7d a9cc771d85 +Author: tianshujie +Date: Mon Jan 3 13:21:24 2022 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_optimize + +commit a9cc771d85f5b0295caaf22dd74d32da0b3e2371 +Author: Hao Sun +Date: Fri Dec 31 17:35:39 2021 +0800 + + Revert "Revert "Merge branch 'devops18_caoyanyi' into 'master'"" + + This reverts commit 3a0ec82016f990a486a3caf352f48be4e3c98949. + +commit 3a0ec82016f990a486a3caf352f48be4e3c98949 +Author: Hao Sun +Date: Fri Dec 31 17:22:32 2021 +0800 + + Revert "Merge branch 'devops18_caoyanyi' into 'master'" + + This reverts commit 41004048b2c76b0b8f1a9dd70bdd59e054a6d856, reversing + changes made to 86fb6e2680f0675a062c9a9b564058f46571d327. + +commit 3bf672f1f311fad23d80a371d5cdd7841b1130d0 +Author: Hao Sun +Date: Fri Dec 31 17:20:59 2021 +0800 + + * Fix chat button not show in biz edition caused by ZentaoPHP ext rule: one control method Ican only be extended once time. + +commit 9c41c4662446ebe636275240564df05385a793fb +Author: songchenxuan +Date: Fri Dec 31 17:10:12 2021 +0800 + + *Fix bug #18132. + +commit 0ec08bca7d01ca0723eba80ebc5ae2040de91f94 +Author: tianshujie +Date: Fri Dec 31 15:58:00 2021 +0800 + + * Adjust the code. + +commit 41004048b2c76b0b8f1a9dd70bdd59e054a6d856 +Merge: 86fb6e2680 401d793532 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 31 07:54:26 2021 +0000 + + Merge branch 'devops18_caoyanyi' into 'master' + + * Modify test case for apiCreateBranchPriv. + + See merge request easycorp/zentaopms!1236 + +commit 24ad4bc48c8fb63f5160415aab01f28881732108 +Merge: 1dfe042dd6 5c4609d302 +Author: 朱金勇 +Date: Fri Dec 31 07:53:33 2021 +0000 + + Merge branch 'sprint/180_xieqiyu_46520' into 'sprint/180' + + Sprint/180 xieqiyu 46520 + + See merge request easycorp/zentaopms!1228 + +commit 1dfe042dd608f208958aa848401ddd353213bb2c +Merge: e944c4a428 5a87a0c909 +Author: 朱金勇 +Date: Fri Dec 31 07:51:30 2021 +0000 + + Merge branch 'sprint/180_sunhao/task46517' into 'sprint/180' + + * Task #46517, update picker lib to improve UI: add bottom actions for multiple selections. + + See merge request easycorp/zentaopms!1234 + +commit 39a8417b61daa8da1c20f532f2b4c2a9d71d01a3 +Author: tianshujie +Date: Fri Dec 31 15:49:44 2021 +0800 + + * Modify the batch editing plan logic. + +commit 5c4609d302387cd5425b5c6190901c97568382aa +Author: xieqiyu +Date: Fri Dec 31 15:43:27 2021 +0800 + + * Modify review problem. + +commit 401d793532c73f6a99caa0fd63c8a67587a03321 +Author: caoyanyi +Date: Fri Dec 31 07:33:58 2021 +0000 + + * Modify test case for apiCreateBranchPriv. + +commit 86fb6e2680f0675a062c9a9b564058f46571d327 +Merge: f798d94311 fde89aa9d5 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 31 07:24:24 2021 +0000 + + Merge branch 'devops18_zenggang' into 'master' + + Devops18 zenggang + + See merge request easycorp/zentaopms!1233 + +commit f798d943116ec374bc923b8e998c711db3a25f6c +Merge: 20bcf6fae5 fe6a6c0c54 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 31 07:10:34 2021 +0000 + + Merge branch 'sgm_codedetail' into 'master' + + * Fix code details. + + See merge request easycorp/zentaopms!1235 + +commit fe6a6c0c5428b775fdae837096c5abcc633e5d02 +Author: 孙广明 +Date: Fri Dec 31 15:09:47 2021 +0800 + + * Fix code details. + +commit 20bcf6fae565abcf57a771cf5a03bef34519b22a +Merge: 68de877d11 1d4e589a26 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 31 07:06:17 2021 +0000 + + Merge branch 'sgm_refactor' into 'master' + + * Fix code details. + + See merge request easycorp/zentaopms!1231 + +commit 1d4e589a26c29930a401f02ab70634787f00189a +Author: 孙广明 +Date: Fri Dec 31 15:05:10 2021 +0800 + + * Fix code style. + +commit 7a2a9daaef391f80a6ca35fe93c46220f4ba5b01 +Author: 孙广明 +Date: Fri Dec 31 15:04:19 2021 +0800 + + * Fix code details. + +commit fde89aa9d5ae4cee1f6731fef79e99b40bc0e14f +Author: zenggang +Date: Fri Dec 31 06:19:15 2021 +0000 + + * Adjust code + +commit 5a87a0c909b71e6c8ec3b34f00989f147a260c4a +Author: Hao Sun +Date: Fri Dec 31 13:58:47 2021 +0800 + + * Task #46517, update picker lib to improve UI: add bottom actions for multiple selections. + +commit 031c8e03a9deed29e8e7f88df74ab68d08092cbc +Author: zenggang +Date: Fri Dec 31 05:56:16 2021 +0000 + + * Add unit test + +commit 68de877d11239a957822d61147f6fa9c398ebd59 +Merge: 56717fe06e 1f1e56c28f +Author: 孙广明 +Date: Fri Dec 31 05:44:16 2021 +0000 + + Merge branch 'sprint/181_tianshujie_optimize' into 'master' + + * Optimize batch editing plan code. + + See merge request easycorp/zentaopms!1232 + +commit 1f1e56c28f700b983524a80359ced0e37a50aecc +Author: tianshujie +Date: Fri Dec 31 13:41:01 2021 +0800 + + * Optimize batch editing plan code. + +commit c4140ad7661f7fc1a6b2c0af18dc73ea4d00cf13 +Author: 孙广明 +Date: Fri Dec 31 13:18:32 2021 +0800 + + * Fix code details. + +commit 56717fe06eae1f17cab65c3ae653e0b997935ac4 +Merge: 94ddbd4852 b7af7a3754 +Author: 孙广明 +Date: Fri Dec 31 05:03:28 2021 +0000 + + Merge branch 'sprint/181_liumengyi_fixbug' into 'master' + + * Modify judgment. + + See merge request easycorp/zentaopms!1230 + +commit 3e3741796efd3bb827b4788e926f1273bf2b07db +Author: mayue +Date: Fri Dec 31 13:03:18 2021 +0800 + + * Finish task #46526. + +commit 94ddbd4852a5db2c4440c3dfbfd2eac872f41c4f +Merge: 2bb6bb8825 c6794b36f2 +Author: 孙广明 +Date: Fri Dec 31 05:02:09 2021 +0000 + + Merge branch 'sprint/181_tianshujie_optimize' into 'master' + + * Modify the problem of dragging the card. + + See merge request easycorp/zentaopms!1227 + +commit b7af7a37546d78243e624fa7a9451e4ad823d0fd +Author: liumengyi +Date: Fri Dec 31 13:00:10 2021 +0800 + + * Modify judgment. + +commit 2bb6bb882522feccd888d03536eb22dedd40cc0b +Merge: b0d7ba1708 ad25920cf0 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 31 04:25:42 2021 +0000 + + Merge branch 'refactor' into 'master' + + Refactor + + See merge request easycorp/zentaopms!1229 + +commit b0d7ba17082f6315128a8acc2388522b902f3f37 +Merge: 0a0bce8c91 c871137c66 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 31 04:19:26 2021 +0000 + + Merge branch 'sgm_46671' into 'master' + + * Finish task #46671. + + See merge request easycorp/zentaopms!1222 + +commit c6794b36f212b2641edab4449eb32210471719c1 +Author: tianshujie +Date: Fri Dec 31 11:22:40 2021 +0800 + + * Fix the problem of the activation operation of the card in progress. + +commit e944c4a428b4777a62a5587f64a447cff50a33dc +Merge: 286c772523 1bdc313562 +Author: zhujinyong +Date: Fri Dec 31 11:21:25 2021 +0800 + + Merge branch 'sprint/180_sunhao/task46524' into sprint/180 + +commit c871137c66d49d3dd0a1d38a45e7cbad5c573ce1 +Author: 孙广明 +Date: Fri Dec 31 11:17:42 2021 +0800 + + * Fix code style. + +commit ad25920cf05edc0286822bba132fd5a8058e1c13 +Author: 孙广明 +Date: Fri Dec 31 11:06:31 2021 +0800 + + * Refactor code. + +commit 28881d6e76e1b2490c813de60cf5a26da61cfe7b +Author: tianshujie +Date: Fri Dec 31 11:03:01 2021 +0800 + + * Modify the problem of dragging the card. + +commit e34901be7a9983569c7e17844f543de5906b1489 +Author: xieqiyu +Date: Fri Dec 31 10:59:51 2021 +0800 + + * Code for task#46520. + +commit 3dd747f40a8d45bfae712877d762cdfde7dceb69 +Author: liumengyi +Date: Fri Dec 31 10:59:37 2021 +0800 + + * Modify judgment for split chid plan. + +commit 0a0bce8c911bdaf1c32753ab9e33d25c3c85733f +Merge: c2da5eefe2 6f03910ea1 +Author: 王怡栋 +Date: Fri Dec 31 02:57:56 2021 +0000 + + Merge branch 'sprint/liyuchun_devops18' into 'master' + + * Fix bug #18088. + + See merge request easycorp/zentaopms!1226 + +commit 6f03910ea1ff786c0f21390164bb322936f3ec87 +Author: liyuchun +Date: Fri Dec 31 10:56:33 2021 +0800 + + * Fix bug #18088. + +commit c2da5eefe229087fdfb8f89e2af7e7fbbe5ff5bd +Merge: 348eefb925 45053fc8ca +Author: liyuchun +Date: Fri Dec 31 10:38:04 2021 +0800 + + Merge branch 'devops18' + +commit 45053fc8ca18901098a0a6a6ed86df21e4881e7b (origin/devops18) +Merge: f1d22a9e0e 05bb5b46b8 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 31 02:34:58 2021 +0000 + + Merge branch 'devops18_wangyidong_bug' into 'devops18' + + * adjust for z tool. + + See merge request easycorp/zentaopms!1225 + +commit 05bb5b46b81d631d59dd8eecd3ce8e23351ea2f9 +Author: 王怡栋 +Date: Fri Dec 31 10:31:58 2021 +0800 + + * fix bug #18111. + +commit f1d22a9e0ebb4dbdb2655fc5e581a1c31b33855f +Merge: d4ddd1fd72 adc4c9ad98 +Author: 王怡栋 +Date: Fri Dec 31 02:27:01 2021 +0000 + + Merge branch 'devops18_liyuchun' into 'devops18' + + * Fix bug #18088. + + See merge request easycorp/zentaopms!1224 + +commit adc4c9ad98099dccbb6623e97086738850cd6119 +Author: liyuchun +Date: Fri Dec 31 10:23:49 2021 +0800 + + * Fix bug #18088. + +commit 348eefb92583732fc102a3b35238b643c0f78fdb +Merge: 2746ae873a 839d71137a +Author: 孙广明 +Date: Fri Dec 31 02:21:00 2021 +0000 + + Merge branch 'sprint/181_tianshujie_error' into 'master' + + * Fix the error of product dashboard block. + + See merge request easycorp/zentaopms!1223 + +commit 839d71137a55a7d7870aeb49f9630177a033384e +Author: tianshujie +Date: Fri Dec 31 10:19:25 2021 +0800 + + * Fix the error of product dashboard block. + +commit 2746ae873a1a052787f756829b1d9a5edd48d5d3 +Merge: 7f75304d63 3c326d3aa9 +Author: 孙广明 +Date: Fri Dec 31 01:55:39 2021 +0000 + + Merge branch 'sprint/181_tianshujie_error' into 'master' + + * Fix the error report of the product summary table under statistical navigation. + + See merge request easycorp/zentaopms!1221 + +commit f895777deccf82cad78f771fba5e81b410a9682c +Author: 王怡栋 +Date: Fri Dec 31 09:54:58 2021 +0800 + + * adjust for z tool. + +commit 3c326d3aa944c75631c4bc3d2b445ccdc26b7381 +Author: tianshujie +Date: Fri Dec 31 09:53:33 2021 +0800 + + * Fix the error report of the product summary table under statistical navigation. + +commit 101be0c103d9d442e2c234cc67e68ff033b82f45 +Author: 孙广明 +Date: Fri Dec 31 09:53:32 2021 +0800 + + * Finish task #46671. + +commit 0894fd48980f79ade80404dded180268df5b7237 +Author: liumengyi +Date: Fri Dec 31 09:47:22 2021 +0800 + + * Modify judgment for split child plan. + +commit d4ddd1fd7206c3f2b6aa28d5625fbc851bc4bc40 +Merge: 03dfe14a43 9d5829d99c +Author: 王怡栋 +Date: Fri Dec 31 01:46:52 2021 +0000 + + Merge branch 'devops18_liyuchun' into 'devops18' + + * Fix bug #18087. + + See merge request easycorp/zentaopms!1220 + +commit 9d5829d99c344958f742107ebd9ec2b27d9e7532 +Author: liyuchun +Date: Fri Dec 31 09:45:58 2021 +0800 + + * Fix bug #18087. + +commit 6107956524bb98ae3b2456260bd1c70513fd7d7f +Author: liyuchun +Date: Fri Dec 31 09:42:24 2021 +0800 + + * Fix bug #18087. + +commit e0d72a4c2573a77b372a71bebd210ca25a836161 +Author: liumengyi +Date: Fri Dec 31 09:40:46 2021 +0800 + + * Refactoring code for update status. + +commit 7f75304d63bf5dd5ba48b36d0de74fb9ff13b607 +Merge: 212ce8b9bf 7b3bab2c4a +Author: 孙广明 +Date: Fri Dec 31 00:59:04 2021 +0000 + + Merge branch 'sprint/181_tianshujie_lane' into 'master' + + * Fix bug #18094,#18077. + + See merge request easycorp/zentaopms!1218 + +commit 7b3bab2c4a2427993965b04dc6ed47379ed406e0 +Author: tianshujie +Date: Fri Dec 31 08:57:08 2021 +0800 + + * Fix bug #18094,#18077. + +commit 212ce8b9bfd02d5386f7f78abbda21b1027344fe +Merge: f122870e36 eaf5bd6c50 +Author: 孙广明 +Date: Fri Dec 31 00:45:37 2021 +0000 + + Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master' + + *Fix bug. + + See merge request easycorp/zentaopms!1217 + +commit 03dfe14a4304cb6ff04b85ed58bd5033ecad3fe5 +Merge: 2f86ca39d8 c26309ad13 +Author: 王怡栋 +Date: Fri Dec 31 00:16:11 2021 +0000 + + Merge branch 'devops18_liyuchun' into 'devops18' + + * Fix bug #18087,18092. + + See merge request easycorp/zentaopms!1216 + +commit eaf5bd6c508a62574d30fbf31338b37ebcee3c37 +Author: zhengrunyu +Date: Thu Dec 30 18:21:26 2021 +0800 + + *Fix bug. + +commit c26309ad134fbf7fb1f3c56ee80c8b60daa06b9d +Author: liyuchun +Date: Thu Dec 30 17:49:04 2021 +0800 + + * Fix bug #18087,18092. + +commit 1bdc313562715fed518142b0f7df2cafab8481b7 +Author: Hao Sun +Date: Thu Dec 30 17:35:41 2021 +0800 + + * Task #46524, refactor some pages with user-picker. + +commit 286c77252382cb5986fe3a0c7c51ed2fc65bb5c4 +Merge: b205ad5ba5 ed73332c41 +Author: 孙广明 +Date: Thu Dec 30 09:26:57 2021 +0000 + + Merge branch 'sprint/180_xieqiyu_46543' into 'sprint/180' + + * Modify the problems. + + See merge request easycorp/zentaopms!1214 + +commit ed73332c41d79d532657fdf387ded15f906668c5 +Author: xieqiyu +Date: Thu Dec 30 17:17:46 2021 +0800 + + * Modify the problems. + +commit b205ad5ba5616e6dd97c5dbb4cbb1141b6f11033 +Merge: 80dd4b7b54 64d6d35a87 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 30 09:05:11 2021 +0000 + + Merge branch 'sprint/180_mayue_46527' into 'sprint/180' + + * Finish task #46527. + + See merge request easycorp/zentaopms!1208 + +commit dff300cf889676f81675b7cbff2558e760f8f07b +Author: Hao Sun +Date: Thu Dec 30 17:02:32 2021 +0800 + + * Task #46524, refactor user selector for page "project/managemembers". + +commit d41525719b3ff9815e2981b1cc1c617b8183e335 +Author: Hao Sun +Date: Thu Dec 30 17:01:49 2021 +0800 + + * refactor. + +commit 64d6d35a876c96a3ee0f2a66631debc9bda1ab65 +Author: mayue +Date: Thu Dec 30 17:01:13 2021 +0800 + + * Optimize code. + +commit eb28c3b3bba631328ab42ba7e16ac726b4baba74 +Author: mayue +Date: Thu Dec 30 16:57:20 2021 +0800 + + * Optimize code. + +commit 0d687f2b7130b7ba1aaa0517e82b24dedf253150 +Author: xieqiyu +Date: Thu Dec 30 16:51:34 2021 +0800 + + * Code for task#46520. + +commit 80dd4b7b54ae9e43821eaba7ea8c272de6613b20 +Merge: 28d3a685c2 47c271d9f6 +Author: 孙广明 +Date: Thu Dec 30 08:49:25 2021 +0000 + + Merge branch 'sprint/180_songchenxuan_update_closed_name' into 'sprint/180' + + *Fix Closed name bug. + + See merge request easycorp/zentaopms!1213 + +commit f122870e362159e7a99eb04cae613c0ad04aaa81 +Merge: 7af8683be4 4c9dcd4af9 +Author: 孙广明 +Date: Thu Dec 30 16:48:26 2021 +0800 + + Merge branch 'sprint/181_zhengrunyu_fixbug' + +commit 4c9dcd4af93b2d0b1820bdd25f1fddf062c0b8e6 +Merge: a3e758269a 7af8683be4 +Author: 孙广明 +Date: Thu Dec 30 08:48:11 2021 +0000 + + Merge branch 'master' into 'sprint/181_zhengrunyu_fixbug' + + # Conflicts: + # module/productplan/model.php + +commit 28d3a685c221da4496bcad175f0b7f25f6d08fad +Merge: 6fb1888e8a ba8e9cf222 +Author: 孙广明 +Date: Thu Dec 30 08:47:24 2021 +0000 + + Merge branch 'sprint/180_songchenxuan_46518' into 'sprint/180' + + Sprint/180 songchenxuan 46518 + + See merge request easycorp/zentaopms!1205 + +commit 47c271d9f6ac613fa8c0ec929aa413d44484b8a0 +Author: songchenxuan +Date: Thu Dec 30 16:40:53 2021 +0800 + + *Fix Closed name bug. + +commit a3e758269a3f2ab12cdc6dae80c82c82fa3b6ef6 +Author: zhengrunyu +Date: Thu Dec 30 16:38:50 2021 +0800 + + *Code batchedit + +commit 7af8683be49e8c0c730412dae82a770e16e9be47 +Merge: 7356af0232 abd52e3141 +Author: 孙广明 +Date: Thu Dec 30 08:33:36 2021 +0000 + + Merge branch 'sprint/181_liumengyi_addChildLabel' into 'master' + + * Modify print label code of plan list. + + See merge request easycorp/zentaopms!1212 + +commit ba8e9cf2229bc8c3c5b02bfaa195e52de374101c +Author: songchenxuan +Date: Thu Dec 30 16:31:33 2021 +0800 + + *Finish task #46518. + +commit 7356af0232575d83bbb7867050796632ee6f1945 +Merge: 355665690b 9f341e49ed +Author: 孙广明 +Date: Thu Dec 30 08:30:07 2021 +0000 + + Merge branch 'sprint/max_tanghucheng_46677' into 'master' + + * Finish task #46677. + + See merge request easycorp/zentaopms!1202 + +commit abd52e3141eb1961ea1c9a290aaa51cf7c930b72 +Author: liumengyi +Date: Thu Dec 30 16:25:32 2021 +0800 + + * Modify print label code of plan list. + +commit 6fb1888e8a99a5f4b1864081f87504c46bccb9b7 +Merge: 1d6a70d41d b32009a0ce +Author: 孙广明 +Date: Thu Dec 30 08:22:28 2021 +0000 + + Merge branch 'sprint/180_songchenxuan_fix_execution_kanban_bug' into 'sprint/180' + + *Fix execution kanban bug. + + See merge request easycorp/zentaopms!1207 + +commit eb9389db3ab0995b17d634878da9beb15585b937 +Author: mayue +Date: Thu Dec 30 16:17:49 2021 +0800 + + * Optimize code. + +commit 1d6a70d41db781bea7fc59281d54db9012dcee39 +Merge: 23ebce7c47 5e7c715efb +Author: 孙广明 +Date: Thu Dec 30 08:17:21 2021 +0000 + + Merge branch 'sprint/180_songchenxuan_46519' into 'sprint/180' + + *Finish task #46519. + + See merge request easycorp/zentaopms!1198 + +commit 2f86ca39d851cc026dde83ef34127ccecde3da1d +Merge: 1c88e99c78 55c7c7e848 +Author: 王怡栋 +Date: Thu Dec 30 08:15:53 2021 +0000 + + Merge branch 'devops18_liyuchun' into 'devops18' + + Fix bug #18078. + + See merge request easycorp/zentaopms!1211 + +commit 355665690be1096ec70623e37f28fabaa1473309 +Merge: 1738b220e7 50dabf7bd7 +Author: 孙广明 +Date: Thu Dec 30 08:15:39 2021 +0000 + + Merge branch 'sprint/32_zhouxin_46674' into 'master' + + Sprint/32 zhouxin 46674 + + See merge request easycorp/zentaopms!1195 + +commit 1738b220e7654c62ec1d9311af96b21217536a86 +Merge: febaa0ffb8 a02d19a0c4 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 30 08:15:20 2021 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix merge code bug. + + See merge request easycorp/zentaopms!1210 + +commit a02d19a0c4eb1efb3296813ac0a860dbe62dedf2 +Author: 孙广明 +Date: Thu Dec 30 16:14:12 2021 +0800 + + * Fix merge code bug. + +commit 55c7c7e848e06e102118d4b0382f93999103f5b5 +Author: liyuchun +Date: Thu Dec 30 16:13:40 2021 +0800 + + * Fix bug #18078. + +commit febaa0ffb80924cec8d94b42c0dc2ad7d289edff +Merge: 2a08f5e7c2 7267c50600 +Author: 孙广明 +Date: Thu Dec 30 16:13:19 2021 +0800 + + Merge branch 'sgm_46670' + +commit 7267c5060003edd51c8fb09e0e101f3af8fc791c +Merge: e9c8da2f1e 2a08f5e7c2 +Author: 孙广明 +Date: Thu Dec 30 08:12:11 2021 +0000 + + Merge branch 'master' into 'sgm_46670' + + # Conflicts: + # module/productplan/model.php + +commit 50dabf7bd7f6465c73a7c636fe08210cfe01c0c4 +Author: zhouxin +Date: Thu Dec 30 08:09:50 2021 +0000 + + Refactor method checkCanChangeModel. + +commit e9c8da2f1e27ec9ea0a2ea2ea4d515019ca419b2 +Author: 孙广明 +Date: Thu Dec 30 16:04:32 2021 +0800 + + * Finish task #46670. + +commit 4d2010f2be4a52e23d39886e2bbb8743151c463f +Author: Hao Sun +Date: Thu Dec 30 15:38:21 2021 +0800 + + * fix setRole not work. + +commit e6a1f039b1809099fb4964e47531d50882e5ec35 +Author: Hao Sun +Date: Thu Dec 30 15:00:54 2021 +0800 + + * move picker lib to zui. + +commit b45ec10f40ca105741fff8435517e2ba03a31c7a +Author: liyuchun +Date: Thu Dec 30 15:36:33 2021 +0800 + + * Fix bug #18078. + +commit b32009a0cee406dfb480670473137c8260b2d656 +Author: songchenxuan +Date: Thu Dec 30 15:34:44 2021 +0800 + + *Fix execution kanban bug. + +commit 1c88e99c789c8ee186ece03eaf9e86296cc087ed +Merge: 26621179fd fce6751316 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 30 07:31:37 2021 +0000 + + Merge branch 'devops18_18046' into 'devops18' + + * Fix bug#18046 and adjust code + + See merge request easycorp/zentaopms!1199 + +commit 26621179fdff5c9af975202bdd21ca6c05462dc4 +Merge: 889d958757 0552eec334 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 30 07:30:53 2021 +0000 + + Merge branch 'devops18_wangyidong_46553' into 'devops18' + + * fix error. + + See merge request easycorp/zentaopms!1206 + +commit 889d958757f98c7a10ba6394ed8589a35ceb0df7 +Merge: 07756750db c35185b5bf +Author: 王怡栋 +Date: Thu Dec 30 07:27:29 2021 +0000 + + Merge branch 'devops18_liyuchun' into 'devops18' + + Devops18 liyuchun + + See merge request easycorp/zentaopms!1203 + +commit c35185b5bf1771a830f82f663c3fe240a40c6911 +Author: liyuchun +Date: Thu Dec 30 15:23:29 2021 +0800 + + * Adjust base64. + +commit 2a08f5e7c29b3ec4372848d4af2d63cb53d7f491 +Merge: d769e7045b 3602538f9c +Author: 孙广明 +Date: Thu Dec 30 07:22:39 2021 +0000 + + Merge branch 'sprint/181_liumengyi_addChildLabel' into 'master' + + * Fix bug for update status. + + See merge request easycorp/zentaopms!1204 + +commit 3602538f9c4af0e58021049508a2b5eb0e48accb +Author: liumengyi +Date: Thu Dec 30 15:21:09 2021 +0800 + + * Fix bug for update status. + +commit 0552eec334fda2862c9e8d5213518e79e6e0933d +Author: 王怡栋 +Date: Thu Dec 30 15:19:59 2021 +0800 + + * fix error. + +commit 990be7d224a0ebbae6f5aeaf7cf4efb9882895de +Author: songchenxuan +Date: Thu Dec 30 15:19:31 2021 +0800 + + *Finish task #46518. + +commit 930538179b1d952f9ccaba24a25fc40c894d934d +Author: liyuchun +Date: Thu Dec 30 15:18:27 2021 +0800 + + * Fix eroor with special symbols. + +commit 23ebce7c4752bcaeaa08d57715e44832841876db +Merge: efe30fce2c ea34d06dad +Author: 孙广明 +Date: Thu Dec 30 07:18:21 2021 +0000 + + Merge branch 'sprint/180_songchenxuan_fix_task_bug' into 'sprint/180' + + *Fix task bug. + + See merge request easycorp/zentaopms!1197 + +commit e9231b595ada904cabe669ef4909b282074358de +Author: zhouxin +Date: Thu Dec 30 07:16:28 2021 +0000 + + Change configuration file. + +commit d769e7045b89281e4be4f31e8503bae4562c8250 +Merge: 470b2730e5 ebe4c65807 +Author: 孙广明 +Date: Thu Dec 30 07:15:04 2021 +0000 + + Merge branch 'sprint/181_liumengyi_addChildLabel' into 'master' + + * Add child label. + + See merge request easycorp/zentaopms!1201 + +commit ebe4c658070d4f924bd4c2a63a934968ae38e3ee +Author: liumengyi +Date: Thu Dec 30 15:11:43 2021 +0800 + + * Add child Label. + +commit 9f341e49edf5c4d9ca3694f64302d5920abf44de +Author: tanghucheng +Date: Thu Dec 30 15:10:54 2021 +0800 + + * Finish task #46677. + +commit fce6751316a6d0d22be32a3f14524ed1bf60c77c +Author: zenggang +Date: Thu Dec 30 07:06:37 2021 +0000 + + * Fix bug#18046 and adjust code + +commit ea34d06dad068de7f4b32cfb430c34a442da29ff +Author: songchenxuan +Date: Thu Dec 30 14:51:33 2021 +0800 + + *Fix task bug. + +commit 470b2730e532c24384dfbf5ade6f36e231e961a9 +Merge: 86994c2af9 82a0d10f4b +Author: 孙广明 +Date: Thu Dec 30 06:48:23 2021 +0000 + + Merge branch 'sprint/181_tianshujie_button' into 'master' + + * The plan is completed or closed grayed out to create an execution button. + + See merge request easycorp/zentaopms!1196 + +commit 86994c2af95847f3cbf0689005689e879a4c5709 +Merge: 9ccf3099a0 9ecbdf2509 +Author: 孙广明 +Date: Thu Dec 30 06:44:40 2021 +0000 + + Merge branch 'sprint/181_liumengyi_modify' into 'master' + + * Fix bug for task #46654. + + See merge request easycorp/zentaopms!1193 + +commit 9ccf3099a0c1b263d250f5b08e7ba65908b85f22 +Merge: 58cd0c11d2 2e79c5f869 +Author: 孙广明 +Date: Thu Dec 30 06:44:16 2021 +0000 + + Merge branch 'sprint/32_zhouxin_46679' into 'master' + + Finish task #46679 and fix a bug. + + See merge request easycorp/zentaopms!1194 + +commit efe30fce2c28e256835628f54d2b179102ad17b9 +Merge: 898709ef8b ff16370bc6 +Author: 朱金勇 +Date: Thu Dec 30 06:37:41 2021 +0000 + + Merge branch 'sprint/180_songchenxuan_46529' into 'sprint/180' + + Sprint/180 songchenxuan 46529 + + See merge request easycorp/zentaopms!1171 + +commit b5348ab449a6c3f1b4b6f01d09aa3316dfb91096 +Author: zhengrunyu +Date: Thu Dec 30 14:35:47 2021 +0800 + + *Code batchedit time. + +commit 9ecbdf2509d3a83f13649b8f8700112812448661 +Author: liumengyi +Date: Thu Dec 30 14:33:20 2021 +0800 + + * Modify the judged data type. + +commit 82a0d10f4b984a32a057bea8fbea7b1e85953cd3 +Author: tianshujie +Date: Thu Dec 30 14:29:53 2021 +0800 + + * The plan is completed or closed grayed out to create an execution button. + +commit d8153ee35888048f652b64bbedec1438662461c6 +Author: Hao Sun +Date: Thu Dec 30 14:27:53 2021 +0800 + + * refactor. + +commit e3933a0f883b1c07a613203e0c0f2ebb7f2f3778 +Author: liumengyi +Date: Thu Dec 30 14:26:35 2021 +0800 + + * Modify judgment for task#46654. + +commit 344682bf7b6ee8f8764597f8a306a395547ba599 +Author: zhouxin +Date: Thu Dec 30 06:25:22 2021 +0000 + + Delete createguide of kanban,change cmmi to waterfall. + +commit 6b8e4630ba18a26f82192d7f5a3ea78d46a937ca +Author: liumengyi +Date: Thu Dec 30 14:23:37 2021 +0800 + + * Fix bug for task #46654. + +commit adac3aefdf2d69a01156632997714ca16d00fa34 +Author: liyuchun +Date: Thu Dec 30 14:19:28 2021 +0800 + + * Finish task #46544. + +commit 1f4ee5581089f0bb6eb5cb67d14700dcea8e23d6 +Author: liyuchun +Date: Thu Dec 30 14:05:57 2021 +0800 + + * Finish task #46544,46556. + +commit 58cd0c11d2417ece5e51615d5ea5430e4a6a27bb +Merge: 9b2df17e26 4d56aa8bdc +Author: 孙广明 +Date: Thu Dec 30 06:04:47 2021 +0000 + + Merge branch 'sprint/181_tianshujie_kanban' into 'master' + + * Modify the mutual test question. + + See merge request easycorp/zentaopms!1192 + +commit 4d56aa8bdcd5f7d45f04a2375d6970bd3b1e6a68 +Author: tianshujie +Date: Thu Dec 30 14:02:55 2021 +0800 + + * Add card drop-down operation. + +commit 05a75e70399676baf241e73d4e01bdabebf1bd36 +Author: zhouxin +Date: Thu Dec 30 05:50:50 2021 +0000 + + Finish task #46674. + +commit 97ea32f7c36fa7002857ed9313e0c98aab3431b2 +Author: tianshujie +Date: Thu Dec 30 13:49:49 2021 +0800 + + * Modify the mutual test question. + +commit 32430239a5961f090a8a644cdaba93c7c7322af2 +Author: zhengrunyu +Date: Thu Dec 30 13:34:48 2021 +0800 + + *code begin and end + +commit 07756750db59eeb6a8cebb268f9df2cd342d542c +Merge: 430cf30f55 3bfc8e04c1 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 30 05:33:10 2021 +0000 + + Merge branch 'devops18_46555' into 'devops18' + + * Finish task#46555 + + See merge request easycorp/zentaopms!1189 + +commit 430cf30f557030b43a052f870fa8ebe05639ec82 +Merge: 6bbb031a07 bb63a8f6ab +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 30 05:30:24 2021 +0000 + + Merge branch 'devops18_wangyidong_46553' into 'devops18' + + Devops18 wangyidong 46553 + + See merge request easycorp/zentaopms!1190 + +commit 3bfc8e04c19f5485af0aa161d361e8973d660395 +Author: zenggang +Date: Thu Dec 30 05:24:37 2021 +0000 + + * Adjust code + +commit 9d89d77c577f30faf2a313f0ebe2159a8084d02d +Author: mayue +Date: Thu Dec 30 13:10:17 2021 +0800 + + * Finish task #46527. + +commit 9b2df17e2633ea9fe7326bbb65f22b0f5566f05f +Merge: d6296cf071 8436cbe443 +Author: 孙广明 +Date: Thu Dec 30 03:53:41 2021 +0000 + + Merge branch 'sprint/181_liumengyi_addDynamic' into 'master' + + * Add dynamic for parent plan status flow. + + See merge request easycorp/zentaopms!1191 + +commit 8436cbe443f7e0c1e8a3148c8b8c324cc23d0b39 +Author: liumengyi +Date: Thu Dec 30 11:34:27 2021 +0800 + + * Modify judgment. + +commit d6296cf0718aff0af3a63e13d03396923ce152f9 +Merge: 5ca7c0cf7f ff35ce06cd +Author: 孙广明 +Date: Thu Dec 30 03:30:11 2021 +0000 + + Merge branch 'sprint/181_tianshujie_46672' into 'master' + + *Finish task #46672. + + See merge request easycorp/zentaopms!1188 + +commit 53aa3007447c272dac3be42b0b8f9e8e43efe4b9 +Author: liumengyi +Date: Thu Dec 30 11:25:57 2021 +0800 + + * Add dynamic for parent plan status flow. + +commit ff35ce06cd001d9cf335a4c373fe471e8d20a0af +Author: tianshujie +Date: Thu Dec 30 11:24:07 2021 +0800 + + * Hide contextmenu when page scroll. + +commit bb63a8f6ab3921e891f3018ed9f6bf7c09ec5b12 +Author: 王怡栋 +Date: Thu Dec 30 11:10:45 2021 +0800 + + * adjust code. + +commit bfde525f1349ecce65fdc16833d3497f3d17faf8 +Author: zenggang +Date: Thu Dec 30 03:08:42 2021 +0000 + + * Finish task#46555 + +commit 08723126ea0ede21bcd601533dcda075593cb746 +Author: tianshujie +Date: Thu Dec 30 11:02:42 2021 +0800 + + * Finish task #46672. + +commit 7c5be1093ef5f1a6d4d9e1bf519da877c67f84f9 +Author: 王怡栋 +Date: Thu Dec 30 10:38:01 2021 +0800 + + * adjust code task #46553. + +commit 134cd55f46aee8333ec6c6ead15884179060e9f1 +Author: 王怡栋 +Date: Thu Dec 30 10:31:19 2021 +0800 + + * adjust for task #46553. + +commit 061bf4388c8132286cd33b1deb185c4d6a018ee5 +Author: 王怡栋 +Date: Thu Dec 30 10:08:00 2021 +0800 + + * adjust for unit test. + +commit 898709ef8b05399eb888889823a186172990b113 +Merge: 5c594723bf c560dc7048 +Author: 孙广明 +Date: Thu Dec 30 01:47:06 2021 +0000 + + Merge branch 'sprint/180_songchenxuan_delete_swp_file' into 'sprint/180' + + *Delete swp file. + + See merge request easycorp/zentaopms!1187 + +commit c560dc7048b3cc01294514eb601dda6f0894ed8e +Author: songchenxuan +Date: Thu Dec 30 09:41:33 2021 +0800 + + *Delete swp file. + +commit b304022ec63697b68e4bb54c9b26e509f104f3b4 +Author: zhengrunyu +Date: Thu Dec 30 09:29:08 2021 +0800 + + *Finish task 46665. + +commit 5ca7c0cf7f1024d8c0f8f9347b86aedbc19da11a +Merge: f92963a68a d4d7ef1074 +Author: 孙广明 +Date: Thu Dec 30 09:18:02 2021 +0800 + + Merge branch 'sprint/181_zhengrunyu_46662' + +commit d4d7ef10743c301250bc25ac47a4451b871e2f91 +Merge: ea8052baa0 e8f23a5c01 +Author: 孙广明 +Date: Thu Dec 30 01:17:44 2021 +0000 + + Merge branch 'master' into 'sprint/181_zhengrunyu_46662' + + # Conflicts: + # module/productplan/lang/en.php + # module/productplan/lang/zh-cn.php + # module/productplan/view/browse.html.php + +commit ea8052baa08edb443dff67e16e013802c00dc57e +Author: zhengrunyu +Date: Thu Dec 30 09:14:30 2021 +0800 + + *Finish task 46662 46664 46669. + +commit ff16370bc6b33ead16f2249d9d2bc939ee3116d1 +Author: songchenxuan +Date: Thu Dec 30 09:05:05 2021 +0800 + + *Finish task 46529. + +commit d28dcd7d6327583ad1850c23c03af800ce543cd8 +Author: zhengrunyu +Date: Thu Dec 30 09:01:44 2021 +0800 + + *Finish task 46662 46665 46669. + +commit 769f7cd58efe3cdac07ee80e95d206d5b2e418a3 +Author: songchenxuan +Date: Thu Dec 30 09:01:33 2021 +0800 + + *Finish task #46529. + +commit 5c594723bf906a7fe3a05ce12f97555a638fde8e +Merge: 7953a80a5e 2b7249da7a +Author: 孙广明 +Date: Thu Dec 30 01:00:31 2021 +0000 + + Merge branch 'sprint/180_xieqiyu_46521' into 'sprint/180' + + Sprint/180 xieqiyu 46521 + + See merge request easycorp/zentaopms!1183 + +commit 2b7249da7a842b03b5e7e310bde91a486d9fd7e6 +Author: xieqiyu +Date: Thu Dec 30 08:47:06 2021 +0800 + + * Code for task#46521. + +commit 137281f8fbec3f5eaa97c99a2f5cdf41dfa18fe5 +Merge: cc81db0ddc e8f23a5c01 +Author: tianshujie +Date: Thu Dec 30 08:40:26 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_46672 + +commit 625a6a47c4653d17f27fcc8e4ef33d80614d709b +Author: 王怡栋 +Date: Thu Dec 30 08:38:54 2021 +0800 + + * code for task #46553. + +commit cc81db0ddcf360201282665a47059803b200f9f6 +Author: tianshujie +Date: Thu Dec 30 08:24:38 2021 +0800 + + * Finish task #46667. + +commit e8f23a5c01c63719336d7207e8abc44588b39501 +Merge: f92963a68a 0ed240c378 +Author: 孙广明 +Date: Wed Dec 29 09:51:36 2021 +0000 + + Merge branch 'sprint/181_liumengyi_checkDate' into 'master' + + * Add judgment for plan start. + + See merge request easycorp/zentaopms!1182 + +commit 5e7c715efbf86c450e3fb82f8d1613c96215351c +Author: songchenxuan +Date: Wed Dec 29 17:42:41 2021 +0800 + + *Finish task #46519. + +commit 0ed240c378716378b3a436276dce5c7a7851384a +Author: liumengyi +Date: Wed Dec 29 17:29:45 2021 +0800 + + * Add judgment for plan start. + +commit f92963a68afa1ae0af2bf92affa8f1b918b51de0 +Merge: 7b23296aa0 aa60c24da5 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 29 09:22:34 2021 +0000 + + Merge branch 'sgm_plan' into 'master' + + * Code for php8.0. + + See merge request easycorp/zentaopms!1181 + +commit aa60c24da560a9c3c42a3e3f66b61c16374ca984 +Author: 孙广明 +Date: Wed Dec 29 17:19:31 2021 +0800 + + * Fix code comment. + +commit 7b23296aa09aa530d1a2bc4bd5d2c11a366e9abe +Merge: c1ffbd839a 1250dca867 +Author: 孙广明 +Date: Wed Dec 29 09:16:30 2021 +0000 + + Merge branch 'sprint/181_liumengyi_fixbug' into 'master' + + * Modify plan status flow judgment method. + + See merge request easycorp/zentaopms!1180 + +commit 1250dca8676d2cb4a7c168dbadbe4e88f9ea5600 +Author: liumengyi +Date: Wed Dec 29 17:13:16 2021 +0800 + + * Modify plan flow button. + +commit 3d3d4130dd791c80648b476e6bd88c0f2bb42787 +Author: 孙广明 +Date: Wed Dec 29 16:59:54 2021 +0800 + + * Code for php8.0. + +commit 7953a80a5ec6826746f5a1d9edab288fad938194 +Merge: 58716fddf1 4b3404983f +Author: 朱金勇 +Date: Wed Dec 29 08:58:28 2021 +0000 + + Merge branch 'sprint/180_songchenxuan_46531' into 'sprint/180' + + *Finish task #46531. + + See merge request easycorp/zentaopms!1172 + +commit 58716fddf1c691854611b817e269c9275b576a16 +Merge: cc8a4eff82 32a4823ff6 +Author: 朱金勇 +Date: Wed Dec 29 08:55:59 2021 +0000 + + Merge branch 'sprint/180_songchenxuan_fix_classicbranchbug' into 'sprint/180' + + Sprint/180 songchenxuan fix classicbranchbug + + See merge request easycorp/zentaopms!1164 + +commit ba9f61de079a96adf3e90985fec710507306a5af +Author: liumengyi +Date: Wed Dec 29 16:31:46 2021 +0800 + + * Modify plan status flow judgment method. + +commit 6bbb031a0714beba3359c4115bd981a97a283dc5 +Merge: 7d8aa9da78 4991afb982 +Author: 王怡栋 +Date: Wed Dec 29 08:06:48 2021 +0000 + + Merge branch 'sprint/liyuchun_devops18' into 'devops18' + + * Fix bug #18047. + + See merge request easycorp/zentaopms!1177 + +commit c1ffbd839a2d418832bd889fccc2ead4b0aaa6c5 +Merge: 408f88a177 7aff111aa4 +Author: 王怡栋 +Date: Wed Dec 29 08:04:37 2021 +0000 + + Merge branch 'sprint/liyuchun_devops' into 'master' + + Sprint/liyuchun devops + + See merge request easycorp/zentaopms!1137 + +commit 408f88a17728013cf840be287240709a581e29b6 +Merge: 70911e06da c483052818 +Author: 孙广明 +Date: Wed Dec 29 07:52:05 2021 +0000 + + Merge branch 'sprint/180_songchenxuan_fix_plan_bug' into 'master' + + *Fix plan bug. + + See merge request easycorp/zentaopms!1179 + +commit c483052818599d273e88d00ee45e1393e6c82a24 +Author: songchenxuan +Date: Wed Dec 29 15:50:49 2021 +0800 + + *Fix plan bug. + +commit 70911e06da59cecaa48527d8ad00562d3b5526ec +Merge: 378b77cec7 5cf82c2ad0 +Author: 孙广明 +Date: Wed Dec 29 06:47:25 2021 +0000 + + Merge branch 'sprint/181_tianshujie_kanban' into 'master' + + Sprint/181 tianshujie kanban + + See merge request easycorp/zentaopms!1178 + +commit 5cf82c2ad06131bdc130cf5c80cd14bfcb894008 +Author: tianshujie +Date: Wed Dec 29 14:41:47 2021 +0800 + + * Remove the copy card function. + +commit f9f726270e46e23672fefcae1e1b8ef258bde98d +Author: tianshujie +Date: Wed Dec 29 14:35:09 2021 +0800 + + * Finish task #46667. + +commit 4991afb982d9bd8c4f0a746b6cac9393b2f15b52 +Author: liyuchun +Date: Wed Dec 29 13:45:40 2021 +0800 + + * Fix bug #18047. + +commit 2e79c5f8696744194ed021936b33f8e3af0b5d34 +Author: zhouxin +Date: Wed Dec 29 03:49:17 2021 +0000 + + Finish task #46679 and fix a bug. + +commit ed350cc124e147419405c207097e3af5a6829c1a +Author: songchenxuan +Date: Wed Dec 29 11:43:12 2021 +0800 + + *Finish task #46518. + +commit 7d8aa9da78adf15472f9b9c6296dd91dc55f1ae3 +Merge: f03376f79d 8e4cfa8744 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 29 03:19:45 2021 +0000 + + Merge branch 'devops18_46549' into 'devops18' + + * Finish task#46549 + + See merge request easycorp/zentaopms!1175 + +commit f03376f79d1580c21cef0fa88ffad5d1345ac72f +Merge: 3a6e39f834 b9c8bd4afd +Author: 王怡栋 +Date: Wed Dec 29 03:00:23 2021 +0000 + + Merge branch 'sprint/liyuchun_devops18' into 'devops18' + + * Fix error when change source project. + + See merge request easycorp/zentaopms!1176 + +commit b9c8bd4afd072b06e9d96e7d559588da8dfaf7ab +Author: liyuchun +Date: Wed Dec 29 10:45:05 2021 +0800 + + * Fix error when change source project. + +commit 510547f7eaf4287ac40b57cc9308bfd21a13d62b +Author: tianshujie +Date: Wed Dec 29 10:41:05 2021 +0800 + + * Fix the real-time update of the Kanban board. + +commit 378b77cec7ecb052a3e3c4cec321428ccf745d85 +Merge: dbe64a36a7 2bb67b955f +Author: 孙广明 +Date: Wed Dec 29 02:32:07 2021 +0000 + + Merge branch 'sprint/181_tianshujie_kanban' into 'master' + + * Finish task #46657. + + See merge request easycorp/zentaopms!1156 + +commit 8e4cfa874472d533be0f374bbafe5317b0aff1e7 +Author: zenggang +Date: Wed Dec 29 02:29:19 2021 +0000 + + * Finish task#46549 + +commit 3a6e39f8343b4ca575408b70b4770e5061ea6e11 +Merge: 4270c776f1 2b44879ba2 +Author: 王怡栋 +Date: Wed Dec 29 02:25:31 2021 +0000 + + Merge branch 'sprint/liyuchun_devops18' into 'devops18' + + * Finish task #46551. + + See merge request easycorp/zentaopms!1174 + +commit 2bb67b955fae316475187e3eb7df6eadcffb5f88 +Author: tianshujie +Date: Wed Dec 29 10:25:28 2021 +0800 + + * Modify code logic. + +commit 2b44879ba25c81dcdd5f54f07534dfaee2db930c +Author: liyuchun +Date: Wed Dec 29 10:24:39 2021 +0800 + + * Adjust code style. + +commit 8e98e9831e257acf7869614ddb084bbb78a25dee +Author: liyuchun +Date: Wed Dec 29 10:02:25 2021 +0800 + + * Finish task #46551. + +commit 4270c776f1f09f052d9aeee1ae5441c0a2cf8e60 +Merge: 08f5b605b6 2e7530441b +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 29 01:51:53 2021 +0000 + + Merge branch 'devops18_wangyidong_46552' into 'devops18' + + Devops18 wangyidong 46552 + + See merge request easycorp/zentaopms!1173 + +commit 2e7530441ba7d4cf348e30ab9c65f13f508504b0 +Author: 王怡栋 +Date: Wed Dec 29 09:49:43 2021 +0800 + + * adjust for task #46552. + +commit 15c13057d02ed3562605b5f37b57943b9d86b9a8 +Author: tianshujie +Date: Wed Dec 29 09:36:57 2021 +0800 + + * Adjust the query plan logic. + +commit 08f5b605b670a4d0c7d186438f3851fb27adb3cf +Merge: 65386f6344 293c00235e +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 29 00:57:57 2021 +0000 + + Merge branch 'devops18_liwenrui_repo_rules' into 'devops18' + + * tweak repos rules api, send raw rules only. + + See merge request easycorp/zentaopms!1169 + +commit 541aeaba80a08321b1cdd6ef3201993232ae5c6e +Merge: 2c8db966ea dbe64a36a7 +Author: tianshujie +Date: Wed Dec 29 08:43:34 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_kanban + +commit 0ba53391eb30682b183ecffe204385dbe92d4c48 +Author: 王怡栋 +Date: Wed Dec 29 08:36:58 2021 +0800 + + * adjust for error. + +commit 0d90eba4e58adbb6f1219944ef7e9e41b6c7b2a3 +Author: songchenxuan +Date: Wed Dec 29 08:32:11 2021 +0800 + + *Finish task #46529. + +commit d5d09b1e937335336942418dd9346a3b8771ddcc +Author: xieqiyu +Date: Tue Dec 28 17:18:11 2021 +0800 + + * Code for task#46521. + +commit 7ac03ddd381722c8e7e447d05ce350088b543d94 +Author: mayue +Date: Tue Dec 28 17:14:32 2021 +0800 + + * Optimized code. + +commit 2c8db966ea6b9c38b259c8402e9dedeba7899024 +Author: liumengyi +Date: Tue Dec 28 17:14:14 2021 +0800 + + * Finish task #46656. + +commit 8e90b750aaeba163f45ac36c7a9e4c6bf95a5cbb +Merge: 830f551425 0eaf072959 +Author: tianshujie +Date: Tue Dec 28 17:12:52 2021 +0800 + + Merge branch 'sprint/181_tianshujie_kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_kanban + +commit 830f551425c845c04991e25faaa6344171148bf8 +Author: tianshujie +Date: Tue Dec 28 17:12:30 2021 +0800 + + * Modify the code. + +commit 0eaf0729598dd9d347f4d26fb7b80814331b2da8 +Author: liumengyi +Date: Tue Dec 28 17:12:16 2021 +0800 + + * Finish task #46656. + +commit 6a6322044ee6b5443e9a85659f36f505a60ed782 +Merge: 545438e452 50efcdf342 +Author: tianshujie +Date: Tue Dec 28 16:59:36 2021 +0800 + + Merge branch 'sprint/181_tianshujie_kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_kanban + +commit 545438e452abd8aec68e8230ab0e9e2af3e92e24 +Author: tianshujie +Date: Tue Dec 28 16:56:38 2021 +0800 + + * Finisht task #46666,#46668,#46659,#46658. + +commit 2a4c3cfa0ee48c51ed77a4516685a7db2bf10959 +Author: 王怡栋 +Date: Tue Dec 28 16:55:35 2021 +0800 + + * code for task #46552. + +commit dbe64a36a767434d584746ebe0efc86f63d4739a (tag: zentaopms_16.0) +Merge: 8407a4a105 2f58499fee +Author: 朱金勇 +Date: Tue Dec 28 08:27:49 2021 +0000 + + Merge branch 'sprint/178_hufangzhou_budget' into 'master' + + * Fix bugs for compatible 8.0. + + See merge request easycorp/zentaopms!1170 + +commit 2f58499feeef2998bedd013a32b51b6a0011ebb9 +Author: hufangzhou +Date: Tue Dec 28 16:26:08 2021 +0800 + + * Fix bugs for compatible 8.0. + +commit 293c00235eb53b311a9d3f4c7f09e98522090c6c +Author: Wenrui LI +Date: Tue Dec 28 16:22:16 2021 +0800 + + * tweak repos rules api, send raw rules only. + +commit 8407a4a105267ada03041bd7e0af8e7518863c47 +Author: zhujinyong +Date: Tue Dec 28 16:21:57 2021 +0800 + + * Adjust code for PHP8. + +commit 65386f634495ea59fc81e416f89fc85b8d82f1e9 +Merge: c6609d792e 601e4498b0 +Author: 李玉春 <563917701@qq.com> +Date: Tue Dec 28 08:21:46 2021 +0000 + + Merge branch 'devops18_46547' into 'devops18' + + * Finish task#46547 + + See merge request easycorp/zentaopms!1168 + +commit ede915fce2489eb9e891f6efde83273587b78247 +Merge: 3dbabdf6af 3b0c8488f0 +Author: zhujinyong +Date: Tue Dec 28 16:15:37 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3dbabdf6afad68bf3309bcc9fb26a3a6374d990e +Author: zhujinyong +Date: Tue Dec 28 16:15:20 2021 +0800 + + * Adjust code for PHP8. + +commit 601e4498b0eee9e90c793ee3cf3f4fa7e329fd7b +Author: zenggang +Date: Tue Dec 28 08:10:12 2021 +0000 + + * Finish task#46547 + +commit 50efcdf3425387a7b5d53b66bdca1e296d616a21 +Author: liumengyi +Date: Tue Dec 28 15:59:57 2021 +0800 + + * Finish task #46661. + +commit c6609d792e80c884dd3ceada495b8aedde10de8c +Merge: 03c38f01c9 7713ab8f29 +Author: 李玉春 <563917701@qq.com> +Date: Tue Dec 28 07:59:06 2021 +0000 + + Merge branch 'devops18_46554' into 'devops18' + + * Finish task#46554 + + See merge request easycorp/zentaopms!1166 + +commit 03c38f01c9cfb137695b0202dd14efce3a42d5b4 +Merge: c59c408da4 01bfc4f928 +Author: 李玉春 <563917701@qq.com> +Date: Tue Dec 28 07:54:01 2021 +0000 + + Merge branch 'devops17_17941' into 'devops18' + + * Fix bug#17941 + + See merge request easycorp/zentaopms!1143 + +commit c59c408da426f8bffce63d66c81006c4b2e6b3d0 +Merge: 85ae7e23cb 9da21e20f0 +Author: 王怡栋 +Date: Tue Dec 28 07:49:59 2021 +0000 + + Merge branch 'sprint/liyuchun_devops18' into 'devops18' + + Sprint/liyuchun devops18 + + See merge request easycorp/zentaopms!1167 + +commit 9da21e20f0b8927dd0d1476737da172917341820 +Author: liyuchun +Date: Tue Dec 28 15:45:09 2021 +0800 + + * Finish task #46550. + +commit 3aeb86e36db985deeb2d03183a07cb886dec0596 +Author: mayue +Date: Tue Dec 28 15:22:08 2021 +0800 + + * Finish task #46526. + +commit 667cf60e421cd042eec0189201407d99cb8d9a1e +Author: 王怡栋 +Date: Tue Dec 28 15:16:08 2021 +0800 + + * code for task #46552. + +commit 36e9b91ba000397a4816a4aa804348fa32e05a8b +Author: liumengyi +Date: Tue Dec 28 15:11:27 2021 +0800 + + * Finish task #46660. + +commit 32a4823ff67c0150a45ab018ce88a0a75d828a99 +Author: songchenxuan +Date: Tue Dec 28 15:08:34 2021 +0800 + + *Fix classic mode branch bug. + +commit 7713ab8f29aa175bea9992e97d650aee3cace525 +Author: zenggang +Date: Tue Dec 28 07:00:36 2021 +0000 + + * Finish task#46554 + +commit cc8a4eff82bcad50220833ad1f28f5dc05c73bb2 +Merge: 7f6d93632a cac3878f12 +Author: 朱金勇 +Date: Tue Dec 28 06:57:22 2021 +0000 + + Merge branch 'sprint/180_xieqiyu_46543' into 'sprint/180' + + Sprint/180 xieqiyu 46543 + + See merge request easycorp/zentaopms!1162 + +commit cac3878f12f8ebd4cc49573e1339043a21d4f974 +Author: xieqiyu +Date: Tue Dec 28 14:56:04 2021 +0800 + + * Add return value. + +commit 3b0c8488f0ca80e2a0657963f030842270117f07 +Merge: df07ada2b3 1a5adfe15f +Author: 朱金勇 +Date: Tue Dec 28 06:48:41 2021 +0000 + + Merge branch 'sprint/178_hufangzhou_php8.0' into 'master' + + * Fix bug for compatible php8.0 . + + See merge request easycorp/zentaopms!1165 + +commit 1a5adfe15f1bff71e80007f1d9faad159662fc4f +Author: hufangzhou +Date: Tue Dec 28 14:46:10 2021 +0800 + + * Fix bug for compatible php8.0 . + +commit df07ada2b3139689447ef523e4d0783f69eb6960 +Author: zhujinyong +Date: Tue Dec 28 14:34:12 2021 +0800 + + * Fix path of api. + +commit 6b20c11c885ae877faf4feeb532d4e8b2be47a7d +Merge: 3183c8fe20 18ffc67c8f +Author: zhujinyong +Date: Tue Dec 28 14:34:06 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit dc46e684fefdec22af6603d7f473be2a16f37d7c +Author: liyuchun +Date: Tue Dec 28 14:10:59 2021 +0800 + + * Fix bug #18023. + +commit b6e030711003749f2556be069dee354452c91f9d +Author: xieqiyu +Date: Tue Dec 28 14:05:58 2021 +0800 + + * Modify review problem. + +commit 5ab26fee5452ce78cf4a532d435dcaaf19db0fd6 +Author: xieqiyu +Date: Tue Dec 28 13:38:35 2021 +0800 + + * Finish task#46543. + +commit 051e3968af60e2d8c01062bb66120d9eab6207dd +Author: songchenxuan +Date: Tue Dec 28 11:02:11 2021 +0800 + + *Fix classic mode branch bug. + +commit 18ffc67c8f656f981a46f1d657acf55d77da94ab +Merge: aa5fabe52c 30d2fb6cfa +Author: 朱金勇 +Date: Tue Dec 28 02:21:15 2021 +0000 + + Merge branch 'sprint/178_hufangzhou_18014' into 'master' + + * Fix bug #18014. + + See merge request easycorp/zentaopms!1161 + +commit 30d2fb6cfa9a4c29cee45a045b5f8a1dbcc05943 +Author: hufangzhou +Date: Tue Dec 28 10:19:20 2021 +0800 + + * Fix bug #18014. + +commit 3183c8fe20a846ce8eda4cb23d0dab4015d83913 +Author: zhujinyong +Date: Tue Dec 28 10:19:05 2021 +0800 + + * Format sql. + +commit a5a0848a1cffff5fc9bc8c41b551266a178bfaee +Author: songchenxuan +Date: Tue Dec 28 09:56:21 2021 +0800 + + *Fix classic mode branch bug. + +commit 4b3404983f935f84a94a9538512239503bb5edde +Author: songchenxuan +Date: Tue Dec 28 09:36:31 2021 +0800 + + *Finish task #46531. + +commit aa5fabe52c35cf64b06578344bc8318914ce0060 +Merge: ded29fd6b8 6c152d01f9 +Author: 朱金勇 +Date: Tue Dec 28 01:31:31 2021 +0000 + + Merge branch 'liwenrui_fix_xuan_webview_width' into 'master' + + * fix webview window width in zentaoclient. + + See merge request easycorp/zentaopms!1160 + +commit 6c152d01f99a0c7363beabf88b1edefe1b095f6a +Author: Wenrui LI +Date: Tue Dec 28 09:11:02 2021 +0800 + + * fix webview window width in zentaoclient. + +commit ded29fd6b8d3ca35790c9f34e74a5a3750a7954f +Merge: a0797b61db 2ebe537d7a +Author: zhujinyong +Date: Tue Dec 28 08:20:21 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit a0797b61dbe908e4caa0fe4cbd3a6a126f15128b +Author: zhujinyong +Date: Tue Dec 28 08:19:59 2021 +0800 + + * Fix bug: remove $this. + +commit 03d56f4c19052251e8bca9292c41fb2ba0488b87 +Author: xieqiyu +Date: Mon Dec 27 18:39:16 2021 +0800 + + * Fix bug: browse stakeholder and link story by plan. + +commit 2ebe537d7aa90cb9030263f4b6ec7e935dc0bcbb +Merge: 1d43e4d994 44783c6933 +Author: 孙广明 +Date: Mon Dec 27 10:08:53 2021 +0000 + + Merge branch 'sprint/178_hufangzhou_branch' into 'master' + + * Fix bug #17999. + + See merge request easycorp/zentaopms!1159 + +commit 44783c6933fd5cb3e0290702c712be41bf71c9b9 +Author: hufangzhou +Date: Mon Dec 27 18:08:09 2021 +0800 + + * Fix bug #17999. + +commit 4dd72bb56b8f55de1a118a07ef49dc9f151e0200 +Author: songchenxuan +Date: Mon Dec 27 17:37:42 2021 +0800 + + *Fix classic mode branch bug. + +commit 1d43e4d99453f1ecc3dd902883a2638e135cfb56 +Merge: dcf8be9a81 d1f8a778c0 +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 27 09:26:30 2021 +0000 + + Merge branch 'revert-0d73915c' into 'master' + + Revert "Merge branch 'sprint/181_liumengyi_29103' into 'master'" + + See merge request easycorp/zentaopms!1158 + +commit dcf8be9a8197fe76417d452c12a780980c98e314 +Merge: 0d73915c49 906641d301 +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 27 09:26:17 2021 +0000 + + Merge branch 'revert-97ed7c1b' into 'master' + + Revert "Merge branch 'sprint/181_tianshujie_sql' into 'master'" + + See merge request easycorp/zentaopms!1157 + +commit d1f8a778c0c283960d2d814736648dd17ce1bd71 +Author: 孙广明 +Date: Mon Dec 27 09:25:34 2021 +0000 + + Revert "Merge branch 'sprint/181_liumengyi_29103' into 'master'" + + This reverts merge request !1155 + +commit 906641d3012ea03244cae285676e4a7fcc1bed4e +Author: 孙广明 +Date: Mon Dec 27 09:25:00 2021 +0000 + + Revert "Merge branch 'sprint/181_tianshujie_sql' into 'master'" + + This reverts merge request !1153 + +commit 593cabd96c8680f71406544aef52462cdb45cf93 +Author: tianshujie +Date: Mon Dec 27 17:20:47 2021 +0800 + + * Modify variable name. + +commit 0d73915c49a658d51e60a0ca54c1dedfa5584a2c +Merge: 85ae7e23cb a7e1623064 +Author: 孙广明 +Date: Mon Dec 27 09:19:24 2021 +0000 + + Merge branch 'sprint/181_liumengyi_29103' into 'master' + + * Finish task#46655. + + See merge request easycorp/zentaopms!1155 + +commit 27319feba980937f73c3b99b56d4381c4d1cf1d0 +Author: tianshujie +Date: Mon Dec 27 17:11:29 2021 +0800 + + * Finish task #46657. + +commit a90fc7c4c040dd48f40a8616ca430201aa22b4cf +Author: songchenxuan +Date: Mon Dec 27 16:47:44 2021 +0800 + + *Fix classic mode branch bug. + +commit 6f10323a8224d05c8c7016dc0313e1dc33074451 +Author: songchenxuan +Date: Mon Dec 27 16:14:05 2021 +0800 + + *Finish task #46529. + +commit a7e16230648246d4bc898955583f5f592ce1c920 +Author: liumengyi +Date: Mon Dec 27 15:53:34 2021 +0800 + + * Finish task#46655. + +commit 85ae7e23cbe6309933a408a9aaf7d4eadf83f160 +Merge: 97ed7c1be6 e73cd865c1 +Author: 王怡栋 +Date: Mon Dec 27 07:51:11 2021 +0000 + + Merge branch 'sprint/178_hufangzhou_xuanxuan' into 'master' + + * Fix an error for xuanxuan. + + See merge request easycorp/zentaopms!1154 + +commit e73cd865c1763ab54f065996d682a3ec19e57504 +Author: hufangzhou +Date: Mon Dec 27 15:49:15 2021 +0800 + + * Fix an error for xuanxuan. + +commit 97ed7c1be6eec33ac0997ba84b35936975ff688d +Merge: 7f6d93632a e2dcd9c5a9 +Author: 孙广明 +Date: Mon Dec 27 07:31:39 2021 +0000 + + Merge branch 'sprint/181_tianshujie_sql' into 'master' + + * Add sql file. + + See merge request easycorp/zentaopms!1153 + +commit e2dcd9c5a9734a562701f0cb6098de5051fc5660 +Author: tianshujie +Date: Mon Dec 27 15:23:14 2021 +0800 + + * Add sql file. + +commit 7f6d93632ab279782284f268f37fd1ad9bf6d49e +Merge: 0cd459d5b8 697b2fd318 +Author: 孙广明 +Date: Mon Dec 27 05:23:27 2021 +0000 + + Merge branch 'Modify_code' into 'master' + + * Modify code. + + See merge request easycorp/zentaopms!1152 + +commit 697b2fd3180a93217282207ef13364bd279796e1 +Author: mayue +Date: Mon Dec 27 13:20:57 2021 +0800 + + * Modify code. + +commit 0cd459d5b8b663bc1d456c345907a63e96b44014 +Merge: 8ce5511ecb 9e96f6a49e +Author: 孙广明 +Date: Mon Dec 27 05:04:40 2021 +0000 + + Merge branch 'sprint/179_sunhao/kanban_dropmenu' into 'master' + + * Fix kanban dropmenu not work as expected. + + See merge request easycorp/zentaopms!1151 + +commit 9e96f6a49e1d540227deb32380b3741848dc70bc +Author: Hao Sun +Date: Mon Dec 27 11:54:33 2021 +0800 + + * Fix kanban dropmenu not work as expected. + +commit 8ce5511ecb1d8e33f1bbc8563730883498e97e72 +Merge: 7d1535f5a6 6e77c55a8f +Author: 朱金勇 +Date: Mon Dec 27 03:38:20 2021 +0000 + + Merge branch 'sprint/179_sunhao/contextmenu' into 'master' + + * Fix contextmenu not work in dropdown mode. + + See merge request easycorp/zentaopms!1149 + +commit 7d1535f5a6a164667081df7f9fbcd19d33ddea34 +Merge: 2529f1b487 b7ca55d9ca +Author: 朱金勇 +Date: Mon Dec 27 03:37:54 2021 +0000 + + Merge branch 'sprint/178_hufangzhou_api' into 'master' + + * Adjust the params of createDemoData when manual import. + + See merge request easycorp/zentaopms!1150 + +commit b7ca55d9ca27d168cdc13b4c78cc9bd378445b4d +Author: hufangzhou +Date: Mon Dec 27 11:36:46 2021 +0800 + + * Adjust the params of createDemoData when manual import. + +commit 6e77c55a8f9be99d284d61a023a6efedd9328057 +Author: Hao Sun +Date: Mon Dec 27 11:32:46 2021 +0800 + + * Fix contextmenu not work in dropdown mode. + +commit 2529f1b48780fe135c451af8f10ebc88a86c77a6 +Merge: be9508d0c8 488297dcaf +Author: 孙广明 +Date: Mon Dec 27 01:24:45 2021 +0000 + + Merge branch 'sprint/178_hufangzhou_upgrade' into 'master' + + * Adjust the sql file name in upgrade. + + See merge request easycorp/zentaopms!1148 + +commit 488297dcaf35127f05320f35f2fd32dc24382e80 +Author: hufangzhou +Date: Mon Dec 27 09:23:49 2021 +0800 + + * Adjust the sql file name in upgrade. + +commit be9508d0c8356f2c3a9caf2f338f53f07228633d +Merge: fead61e40a 6cee36b588 +Author: 孙广明 +Date: Mon Dec 27 01:07:33 2021 +0000 + + Merge branch 'sprint/178_hufangzhou_user' into 'master' + + * Get the current account for install or upgrade. + + See merge request easycorp/zentaopms!1147 + +commit 6cee36b588debbac9f45d5b4091891603d5ed7c8 +Author: hufangzhou +Date: Mon Dec 27 08:59:00 2021 +0800 + + * Get the current account for install or upgrade. + +commit fead61e40a0dcb11aa8fe2303aa167bce0969e07 +Merge: 178e52b999 8425897a08 +Author: 孙广明 +Date: Fri Dec 24 09:26:40 2021 +0000 + + Merge branch 'sprint/179_liumengyi_fixbug' into 'master' + + * Fix bug #17939. + + See merge request easycorp/zentaopms!1146 + +commit 8425897a08e59d9e2dcb5e6c83e940c19ef0313a +Author: liumengyi +Date: Fri Dec 24 17:25:16 2021 +0800 + + * Fix bug #17939. + +commit 178e52b999512d870ef8b39b8c8a23a0d095a4b9 +Merge: d7a8b42cbd 90e006c45c +Author: 孙广明 +Date: Fri Dec 24 09:16:52 2021 +0000 + + Merge branch 'sprint/179_tianshujie_bug' into 'master' + + * Fix kanban column color problem. + + See merge request easycorp/zentaopms!1145 + +commit d7a8b42cbd7f5889bc58072952c9be283d43c97b +Merge: 7a217f9a8b 465fbda7f4 +Author: 王怡栋 +Date: Fri Dec 24 09:15:17 2021 +0000 + + Merge branch 'app_caoyanyi_lang' into 'master' + + * Add language to zentao app. + + See merge request easycorp/zentaopms!1144 + +commit 465fbda7f4ce88efcf1e77a7ec91d0c0552361ee +Author: Mr曹 <1152558546@qq.com> +Date: Fri Dec 24 17:12:19 2021 +0800 + + * Add language to zentao app. + +commit 01bfc4f928ebeea648bedddb2f72c58b82226c50 +Author: zenggang +Date: Fri Dec 24 08:24:05 2021 +0000 + + * Fix bug#17941 + +commit 90e006c45c41423ce30173f28a6177488be63ff2 +Author: tianshujie +Date: Fri Dec 24 16:11:30 2021 +0800 + + * Fix kanban column color problem. + +commit 7a217f9a8b48c5073da46a19a1984ef88c2bc723 +Merge: 37f5ef46b1 547fdbc3d2 +Author: 孙广明 +Date: Fri Dec 24 07:07:03 2021 +0000 + + Merge branch 'sprint/179_tianshujie_bug' into 'master' + + * Fix bug #17935. + + See merge request easycorp/zentaopms!1142 + +commit 37f5ef46b1e4916a01357d91720ea0f95ef9b5ab +Merge: a5176fd46e dfa1a100ee +Author: 孙广明 +Date: Fri Dec 24 07:06:48 2021 +0000 + + Merge branch 'sprint/178_hufangzhou_newVersion' into 'master' + + * Add the new version. + + See merge request easycorp/zentaopms!1141 + +commit dfa1a100eecd01c46143a8caec9387c4df560fe2 +Author: hufangzhou +Date: Fri Dec 24 15:06:11 2021 +0800 + + * Add the fromVersion. + +commit 4b2890c766efdcfca9391afc5b1043d0d55ffe98 +Author: hufangzhou +Date: Fri Dec 24 15:01:04 2021 +0800 + + * Add the new version. + +commit a5176fd46e8f887b4a38d773f7843e7b8e0e4e82 +Merge: 3f3aad524b 572e386eea +Author: 孙广明 +Date: Fri Dec 24 06:58:30 2021 +0000 + + Merge branch 'sprint/179_tianshujie_bug' into 'master' + + * Change assigned to avatar to show up to 3. + + See merge request easycorp/zentaopms!1139 + +commit 3f3aad524b757920f0f2b8459c285d1a07be228b +Merge: 4afe02de99 4979f04de9 +Author: 孙广明 +Date: Fri Dec 24 06:56:31 2021 +0000 + + Merge branch 'sprint/179_liumengyi_modifyStyle' into 'master' + + * Modify style for create card. + + See merge request easycorp/zentaopms!1138 + +commit 547fdbc3d2f121d308ba9083cd6c498632ad8996 +Author: tianshujie +Date: Fri Dec 24 14:23:17 2021 +0800 + + * Fix bug #17935. + +commit 4afe02de993d96be14ce9b919f3c3c04ee55d596 +Merge: 00993b8884 1491db714d +Author: 朱金勇 +Date: Fri Dec 24 05:46:31 2021 +0000 + + Merge branch 'sprint/178_xieqiyu_branch' into 'master' + + * Fix bug: batch update branch. + + See merge request easycorp/zentaopms!1140 + +commit 1491db714d7daabb8d85faebae0ffa7a7860f398 +Author: xieqiyu +Date: Fri Dec 24 13:45:05 2021 +0800 + + * Fix bug: batch update branch. + +commit 00993b8884eeb39c1553f065f3fc22572ee34c18 +Merge: a28772a3f6 f043a50e5e +Author: 朱金勇 +Date: Fri Dec 24 05:42:09 2021 +0000 + + Merge branch 'sprint/178_hufangzhou_api' into 'master' + + * Add the zentao api lib for upgrade. + + See merge request easycorp/zentaopms!1126 + +commit 572e386eeac8449cbc42bed02b5dd82df91a3040 +Author: tianshujie +Date: Fri Dec 24 13:35:18 2021 +0800 + + * Change assigned to avatar to show up to 3. + +commit 4979f04de92c8c3ab77ce5255bc062e5e4a259fd +Author: liumengyi +Date: Fri Dec 24 13:31:12 2021 +0800 + + * Modify style for create card. + +commit 7aff111aa4dcb307c2a1cd70df5ad64a8cce39ba +Author: liyuchun +Date: Fri Dec 24 13:23:44 2021 +0800 + + * Add action log when create mr. + +commit a28772a3f629257e0e18590baa2d631dacdb5dc7 +Merge: 6461596898 8be143a091 +Author: 孙广明 +Date: Fri Dec 24 05:21:55 2021 +0000 + + Merge branch 'sprint/179_liumengyi_17927' into 'master' + + * Fix bug #17927. + + See merge request easycorp/zentaopms!1136 + +commit 8b9207537e47253412781b75fc62ae95c5cc071a +Author: liyuchun +Date: Fri Dec 24 13:21:12 2021 +0800 + + * Add action log when create mr. + +commit 64615968988a118be27ebface18e7a45e84d4a1f +Merge: 55d19cecb2 e0b585354d +Author: 孙广明 +Date: Fri Dec 24 05:21:01 2021 +0000 + + Merge branch 'sprint/179_zhengrunyu_codecard' into 'master' + + *change position of icon-required. + + See merge request easycorp/zentaopms!1135 + +commit 8be143a09197b486ef56265d0cd2c2221f7f5258 +Author: liumengyi +Date: Fri Dec 24 13:20:15 2021 +0800 + + * Fix bug #17927. + +commit f043a50e5e16ce1d50004c83bcf14cb12e482a1a +Author: hufangzhou +Date: Fri Dec 24 13:20:04 2021 +0800 + + * Code for task #17919. + +commit e0b585354d1b4725364dc8f1008e3e2d38666f96 +Author: zhengrunyu +Date: Fri Dec 24 13:18:54 2021 +0800 + + *change position of icon-required. + +commit f02258f8e1a71e7ca66910fc565c3f774baf170a +Author: hufangzhou +Date: Fri Dec 24 13:16:23 2021 +0800 + + * Fix bug #17919. + +commit 55d19cecb2f17c3c7eef6273fd2fb83d24dcd137 +Merge: d79b331d83 65aa1aebdf +Author: 朱金勇 +Date: Fri Dec 24 05:01:05 2021 +0000 + + Merge branch 'sprint/178_xieqiyu_branch' into 'master' + + Fix bug#17791. + + See merge request easycorp/zentaopms!1132 + +commit d79b331d836787f7202a0bcf067e5b5db1d1408d +Merge: 8b96fbfaf2 ff3a24fdbb +Author: 孙广明 +Date: Fri Dec 24 03:21:45 2021 +0000 + + Merge branch 'sprint/179_tianshujie_bug' into 'master' + + Sprint/179 tianshujie bug + + See merge request easycorp/zentaopms!1134 + +commit ff3a24fdbbf90394b51473f34b466f81b5bbca4d +Author: tianshujie +Date: Fri Dec 24 11:18:22 2021 +0800 + + * Fix bug #17928. + +commit 8b96fbfaf2b608a2e7cf8b4a2f409d6f1c97f026 +Merge: d263704ef3 6863cd05b8 +Author: 孙广明 +Date: Fri Dec 24 03:12:53 2021 +0000 + + Merge branch 'sprint/179_liumengyi_modifyStyle' into 'master' + + * Fix bug #17920. + + See merge request easycorp/zentaopms!1133 + +commit 6863cd05b852fe304a78723275f18295110ed649 +Author: liumengyi +Date: Fri Dec 24 11:11:33 2021 +0800 + + * Fix bug #17920. + +commit 65aa1aebdf35cc1641e7f5de788b52931f7a02ad +Author: xieqiyu +Date: Fri Dec 24 11:11:15 2021 +0800 + + * Fix bug#17791. + +commit d263704ef3c16d20f8d5cb72d5af128ce83de032 +Merge: 16d68b5a46 f824d08922 +Author: 朱金勇 +Date: Fri Dec 24 03:09:42 2021 +0000 + + Merge branch 'sprint/179_sunhao/bug17911' into 'master' + + * Bug #17911, add title attribute to kanban column header. + + See merge request easycorp/zentaopms!1127 + +commit 16d68b5a46b2bfccbf1496b5a8a767d92d8657f3 +Merge: 0aa3c0fac0 272c5c0f40 +Author: 朱金勇 +Date: Fri Dec 24 03:09:21 2021 +0000 + + Merge branch 'sprint/179_sunhao/bug17795' into 'master' + + * Bug #17795, hide contextmenu when scrolling kanban. + + See merge request easycorp/zentaopms!1131 + +commit e28dfd6879c5d82b4b32f4e5dbff2e881cda9d46 +Author: hufangzhou +Date: Fri Dec 24 11:08:10 2021 +0800 + + * Add the zentao api lib for install. + +commit 686af2b592bc07d88667727d5a318e8b59980474 +Author: tianshujie +Date: Fri Dec 24 11:02:52 2021 +0800 + + * Fix the problem of copy region error. + +commit 272c5c0f40adedc45e55e8ba4a50efea82fcacf3 +Author: Hao Sun +Date: Fri Dec 24 10:58:46 2021 +0800 + + * Bug #17795, hide contextmenu when scrolling kanban. + +commit 0aa3c0fac064adffb250659f184b9beead0428d5 +Merge: 790b1d5d81 4955bd5450 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 24 02:56:34 2021 +0000 + + Merge branch 'devops17_17910' into 'master' + + * Fix bug#17909,17910 + + See merge request easycorp/zentaopms!1130 + +commit 8b82566999b726ae3d3a98e1f55486b643bc8694 +Author: hufangzhou +Date: Fri Dec 24 10:53:15 2021 +0800 + + * Fix bug #17924. + +commit 1aeccfed4319862eb4cca9c8fe722fb4f74dcedf +Author: hufangzhou +Date: Fri Dec 24 10:47:30 2021 +0800 + + * Fix bug #17919. + +commit 4955bd5450c4d67c45cce07e4ce3f9522c003deb +Author: zenggang +Date: Fri Dec 24 02:46:49 2021 +0000 + + * Fix bug#17909,17910 + +commit 790b1d5d81cb88cb1265439aff0af40529883b83 +Merge: e5024013fe b94a067297 +Author: 王怡栋 +Date: Fri Dec 24 02:41:22 2021 +0000 + + Merge branch 'sprint/liyuchun_devops' into 'master' + + * Fix bug #17912. + + See merge request easycorp/zentaopms!1129 + +commit b94a067297bdd643fa069598c211ab34d16a8057 +Author: liyuchun +Date: Fri Dec 24 10:39:18 2021 +0800 + + * Fix bug #17912. + +commit e5024013fed3de6c23c3913b3a7672737d4ce713 +Merge: 287b4906ae 4554b20b3c +Author: 孙广明 +Date: Fri Dec 24 02:24:02 2021 +0000 + + Merge branch 'sprint/179_tianshujie_bug' into 'master' + + Sprint/179 tianshujie bug + + See merge request easycorp/zentaopms!1128 + +commit 4554b20b3c740d5fbe5dcb729b53f535dbf54358 +Author: tianshujie +Date: Fri Dec 24 10:21:54 2021 +0800 + + * Fix bug #17923. + +commit 464dd4f439da72623d552962506118f8c0da0856 +Author: tianshujie +Date: Fri Dec 24 10:04:30 2021 +0800 + + * Fix bug #17921. + +commit 287b4906aecfc065c38d5f3b0557310589a400fe +Merge: be6ff893dd c2009c72de +Author: 王怡栋 +Date: Fri Dec 24 09:58:48 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit be6ff893ddd6302224bb9f5cdf9b8990bd92aee9 +Author: 王怡栋 +Date: Fri Dec 24 09:58:27 2021 +0800 + + * finish task #46219. + +commit c9eaa1cb0dafd7d021a12b0dd33bc2668c4a5f2d +Author: xieqiyu +Date: Fri Dec 24 09:51:07 2021 +0800 + + * Add a period. + +commit f824d089225e076f6026890e37d4eda18ea7d04c +Author: Hao Sun +Date: Fri Dec 24 09:44:45 2021 +0800 + + * Bug #17911, add title attribute to kanban column header. + +commit be2d532c770166247cd8b295524766c55ac5b9b2 +Author: hufangzhou +Date: Fri Dec 24 09:33:45 2021 +0800 + + * Add the zentao api lib for upgrade. + +commit c2009c72de5ebc8f13f51e376b2926971ec842f9 +Merge: f41f8de32a b9e46558c5 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 24 00:50:18 2021 +0000 + + Merge branch 'devops17_zenggang' into 'master' + + * Code for task#46005 + + See merge request easycorp/zentaopms!1124 + +commit f41f8de32ae9251497e83d4248a2900b33a7f10e +Merge: 0d2f111a67 76821df642 +Author: 王怡栋 +Date: Fri Dec 24 08:42:02 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0d2f111a679854aee7dd982968073ec8972a84fb +Author: 王怡栋 +Date: Fri Dec 24 08:40:34 2021 +0800 + + * fix error for php8.0. + +commit 76821df64247c0c1cdf8f7dda827d0b675e58a01 +Merge: 53eb9cd702 5a8966c8e8 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 23 09:55:10 2021 +0000 + + Merge branch 'sprint/178_hufangzhou_17903' into 'master' + + * Fix bug #17903. + + See merge request easycorp/zentaopms!1125 + +commit 5a8966c8e87d37fcdbf34e895625dcc60d6610ab +Author: hufangzhou +Date: Thu Dec 23 17:28:29 2021 +0800 + + * Fix bug #17903. + +commit b9e46558c596af343250aea492da93f239f9e46d +Author: zenggang +Date: Thu Dec 23 09:21:51 2021 +0000 + + * Code for task#46005 + +commit 53eb9cd70231cf0e233cb794fa490ca84cd380fe +Merge: 0c1ef02491 5e8b17d6df +Author: 朱金勇 +Date: Thu Dec 23 09:19:39 2021 +0000 + + Merge branch 'sprint/178_songchenxuan_17399' into 'master' + + *Fix bug #17399. + + See merge request easycorp/zentaopms!1123 + +commit 5e8b17d6df37af8c1c0542920de84223f62b69e0 +Author: songchenxuan +Date: Thu Dec 23 17:11:35 2021 +0800 + + *Fix bug #17399. + +commit 0c1ef02491c4510c8bcef8480d4b446490df72c4 +Merge: a5cb10a6da f13fbc6f5b +Author: 王怡栋 +Date: Thu Dec 23 09:03:46 2021 +0000 + + Merge branch 'sprint/liyuchun_devops' into 'master' + + * Add unit testcase of delete tag. + + See merge request easycorp/zentaopms!1122 + +commit a5cb10a6da237710af89a14e954fbd0d1c3f48e5 +Merge: 8efde58482 40d0b988d7 +Author: zhujinyong +Date: Thu Dec 23 17:01:43 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f13fbc6f5b738477a4151d8ec323166298ec3532 +Author: liyuchun +Date: Thu Dec 23 17:01:30 2021 +0800 + + * Add unit testcase of apiDeleteTag. + +commit 8efde58482266640b3ba8fb672ae061895e44224 +Merge: b603c6186e 2507b9ba75 +Author: zhujinyong +Date: Thu Dec 23 17:01:30 2021 +0800 + + Merge branch 'sprint/178_songchenxuan_17682' + +commit aba26e05aca637b0c4f862fdf9ba60647b8c6bdc +Author: liyuchun +Date: Thu Dec 23 17:00:24 2021 +0800 + + * Add unit testcase of delete tag. + +commit 40d0b988d71e3183b08ff05a5eed2c2841b3db06 +Merge: b603c6186e 827b4ed3b5 +Author: 孙广明 +Date: Thu Dec 23 08:59:45 2021 +0000 + + Merge branch 'sprint/179_tianshujie_bug' into 'master' + + Sprint/179 tianshujie bug + + See merge request easycorp/zentaopms!1121 + +commit 827b4ed3b5736281604f6a011e992a2c93eaab1c +Author: tianshujie +Date: Thu Dec 23 16:56:33 2021 +0800 + + * Fix bug #17694. + +commit b603c6186ed43693e844b6dd8338853fac0d207d +Merge: 129bf0e524 e04d64126a +Author: 孙广明 +Date: Thu Dec 23 08:53:50 2021 +0000 + + Merge branch 'sprint/179_liumengyi_fixbug' into 'master' + + * Modify css style. + + See merge request easycorp/zentaopms!1120 + +commit e04d64126a08ba42ca60539210927477ea50d0fb +Author: liumengyi +Date: Thu Dec 23 16:51:54 2021 +0800 + + * Modify css style. + +commit 2cda67d63ecc35ec5982fb316bff8426ec36e0fe +Author: tianshujie +Date: Thu Dec 23 16:35:31 2021 +0800 + + * Fix bug #17892,#17899. + +commit 129bf0e5245033b9be7b07869792ea99afe5b15f +Merge: a967a70574 ae99db15f2 +Author: 孙广明 +Date: Thu Dec 23 08:31:05 2021 +0000 + + Merge branch 'sprint/179_zhengrunyu_codecard' into 'master' + + *Code english title wrap. + + See merge request easycorp/zentaopms!1111 + +commit a967a705743f8638e8e095c5803ca584c9da3419 +Merge: 50315f2bf3 9c31edcd60 +Author: 孙广明 +Date: Thu Dec 23 08:28:58 2021 +0000 + + Merge branch 'sprint/178_hufangzhou_tutorial' into 'master' + + * Fix bug #17447. + + See merge request easycorp/zentaopms!1117 + +commit 2507b9ba75cfcc0aaf285eb0babb8edeedbdbf32 +Author: songchenxuan +Date: Thu Dec 23 16:24:11 2021 +0800 + + *Fix bug 17682. + +commit 50315f2bf32b6644e75595455a30db88b0a17292 +Merge: 97d3de7b7e fe9c5aeaf1 +Author: 孙广明 +Date: Thu Dec 23 08:15:11 2021 +0000 + + Merge branch 'sprint/179_tianshujie_bug' into 'master' + + Sprint/179 tianshujie bug + + See merge request easycorp/zentaopms!1118 + +commit 97d3de7b7e5e921a4bd498b88c55d09e83fa47c2 +Merge: f2e9a6c7a0 7f2eb13792 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 23 08:12:59 2021 +0000 + + Merge branch 'sprint/179_liumengyi_fixbug' into 'master' + + * Fix bug #17890, #17888. + + See merge request easycorp/zentaopms!1115 + +commit fe9c5aeaf134cdd616401d0c62ce673e6411e5ec +Author: tianshujie +Date: Thu Dec 23 16:10:03 2021 +0800 + + * Fix the problem of creating a region error. + +commit fb1027b47da297a446c8e77c8863b5981c1169d3 +Author: tianshujie +Date: Thu Dec 23 15:54:41 2021 +0800 + + * Fix bug #17898. + +commit 7f2eb1379254ad492c3e3694f06339f53afeaa4e +Author: liumengyi +Date: Thu Dec 23 15:50:20 2021 +0800 + + * Fix bug for #17894. + +commit 9c31edcd6017418ec38de3978a6eb6f8a204e355 +Author: hufangzhou +Date: Thu Dec 23 15:35:19 2021 +0800 + + * Fix bug #17447. + +commit 090194c8ba8c09b4146be74d2bff0e32472a5bbe +Author: tianshujie +Date: Thu Dec 23 15:29:39 2021 +0800 + + * Fix bug #17892. + +commit f2e9a6c7a0b1e579a9f61722a5b63091d8032c2d +Merge: abe71da613 178a45b6b5 +Author: zhujinyong +Date: Thu Dec 23 15:28:03 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit abe71da61340cc54873ccf1b8a9c3042b5983b2a +Author: zhujinyong +Date: Thu Dec 23 15:27:46 2021 +0800 + + * Fix apistruct. + +commit 8856fcd78542021d8ba8cf43f24d1f18dd6cea21 +Author: liumengyi +Date: Thu Dec 23 15:27:06 2021 +0800 + + * Fix bug #17894. + +commit 47d7d7a92d97fd3136f9deee7c4e0f1f33b1903f +Author: songchenxuan +Date: Thu Dec 23 15:24:23 2021 +0800 + + *Fix bug #17682. + +commit 56fc6f64ff07f3a7b7f21647846380c572d16a0b +Author: tianshujie +Date: Thu Dec 23 15:16:06 2021 +0800 + + * Fix bug #17889,#17870. + +commit 178a45b6b56fb61c09f5c946ea532593e49148ea +Merge: 6e8f173eda ec958d5f90 +Author: liyuchun +Date: Thu Dec 23 15:15:21 2021 +0800 + + Merge branch 'devops17' + +commit 13f0ca9cb4c0131a8d251a5442b793bb6bf166fa +Author: liumengyi +Date: Thu Dec 23 15:14:49 2021 +0800 + + * Fix bug #17890, #17888. + +commit ec958d5f9090a0e3d6a588585d7e3d550a6c8abd (origin/devops17) +Merge: e1ddc3f664 da283574bb +Author: 王怡栋 +Date: Thu Dec 23 07:07:03 2021 +0000 + + Merge branch 'sprint/devops17_liyuchun' into 'devops17' + + * Fix errors. + + See merge request easycorp/zentaopms!1114 + +commit da283574bbc58faf4b94acb6d5eebd8046bb31a1 +Author: liyuchun +Date: Thu Dec 23 15:04:53 2021 +0800 + + * Fix errors. + +commit e1ddc3f664e975f36e3025301b3669ef8319a40a +Merge: 8b14f70b30 9874145789 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 23 07:02:25 2021 +0000 + + Merge branch 'devops17_wangyidong_bug' into 'devops17' + + * fix error for get repo by url. + + See merge request easycorp/zentaopms!1113 + +commit 6e8f173eda4412e7578534fbc1d6562b4d62a5a6 +Merge: 6540fb4f0f be1671c243 +Author: 孙广明 +Date: Thu Dec 23 06:56:01 2021 +0000 + + Merge branch 'sprint/178_mayue_17638' into 'master' + + * Fix a bug #17638. + + See merge request easycorp/zentaopms!1108 + +commit 9874145789e46f8b1d6040f09e6e5129bf0689f5 +Author: 王怡栋 +Date: Thu Dec 23 14:55:19 2021 +0800 + + * fix error for get repo by url. + +commit 6540fb4f0fc7909138fadc5617d8e99a3e443665 +Merge: 3e1b811de9 146a19fbac +Author: 孙广明 +Date: Thu Dec 23 14:54:26 2021 +0800 + + Merge branch 'sprint/179_sunhao/kanban_ui' + +commit 146a19fbaca855c0ee1b655122007a2ce215c9bf +Merge: bf7da44094 2b387708f2 +Author: 孙广明 +Date: Thu Dec 23 06:54:14 2021 +0000 + + Merge branch 'master' into 'sprint/179_sunhao/kanban_ui' + + # Conflicts: + # module/kanban/js/view.js + +commit ae99db15f2ad23e83755901d79e601f00e008971 +Author: zhengrunyu +Date: Thu Dec 23 14:40:41 2021 +0800 + + *Code english title wrap. + +commit bf7da44094647a1d76a17aca5b53ab31c90e5fed +Author: Hao Sun +Date: Thu Dec 23 14:40:39 2021 +0800 + + * fix kanban header affix not work in fullscreen mode. + +commit be1671c243266d705f5b10be90347d577f4a53be +Author: mayue +Date: Thu Dec 23 14:34:44 2021 +0800 + + * Modify the code. + +commit 2b387708f27456ee6d353d05c635a146006a8bf0 +Merge: da2eeed0bf a9c8d74b72 +Author: 孙广明 +Date: Thu Dec 23 06:29:49 2021 +0000 + + Merge branch 'sprint/179_tianshujie_bug' into 'master' + + * Fix bug #17882. + + See merge request easycorp/zentaopms!1110 + +commit da2eeed0bf567dd4a41de304d0eae11432f8e39f +Merge: c47057a387 571baaccce +Author: 孙广明 +Date: Thu Dec 23 06:28:46 2021 +0000 + + Merge branch 'sprint/179_zhengrunyu_codecard' into 'master' + + adjust card color and margin. + + See merge request easycorp/zentaopms!1109 + +commit a9c8d74b726723b24e9433b2f2ca382e94c559d9 +Author: tianshujie +Date: Thu Dec 23 14:26:46 2021 +0800 + + * Fix bug #17882. + +commit 571baaccce3d3cb5afd02efc6a07038b09002813 +Author: zhengrunyu +Date: Thu Dec 23 14:25:39 2021 +0800 + + adjust card color and margin. + +commit f3b3fc93aa2c7942447c993b9b24b07506c5c9a0 +Author: Hao Sun +Date: Thu Dec 23 14:20:13 2021 +0800 + + * limit kanban card height. + +commit c47057a38774b8d2ee5dd37083c5f34f1b4c38e1 +Merge: 3e1b811de9 32927f78c5 +Author: 孙广明 +Date: Thu Dec 23 06:17:56 2021 +0000 + + Merge branch 'sprint/179_liumengyi_fixbug' into 'master' + + * Fix bug for view card. + + See merge request easycorp/zentaopms!1107 + +commit 32927f78c543064ccb82263d2a722126a844b571 +Author: liumengyi +Date: Thu Dec 23 14:15:29 2021 +0800 + + * Fix bug for view card. + +commit f8f763f9dd0511451da20d90acfc7e9703d13e8c +Author: mayue +Date: Thu Dec 23 14:15:27 2021 +0800 + + * Fix a bug #17638. + +commit a8d5863b6b0c62048e99dffd612cfc15100b11ac +Author: Hao Sun +Date: Thu Dec 23 14:15:15 2021 +0800 + + * adjust space for kanban layout. + +commit 3e1b811de928b7c2f83ed9cb0a849c725cf8845b +Merge: 416e541d8d 007dd4f43c +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 23 06:05:45 2021 +0000 + + Merge branch 'sgm_kanbanstyle' into 'master' + + * Adjust kanban style. + + See merge request easycorp/zentaopms!1106 + +commit 416e541d8d2b409017db756eb95451c6ebb8183a +Merge: 9622540b60 3e3fe0543c +Author: 孙广明 +Date: Thu Dec 23 06:03:13 2021 +0000 + + Merge branch 'sprint/179_liumengyi_fixbug' into 'master' + + * Fix bug for create column menu. + + See merge request easycorp/zentaopms!1103 + +commit 9622540b608606b72b589dd46ef22228b968b15f +Merge: b65c22407f 2769417a6d +Author: 孙广明 +Date: Thu Dec 23 06:03:01 2021 +0000 + + Merge branch 'sprint/178_songchenxuan_46099_fixbug' into 'master' + + *Fix task #46099 bug. + + See merge request easycorp/zentaopms!1102 + +commit 8b14f70b301ef0b4fca7c4896e0feaffbd872627 +Merge: 86f2f47ceb 8ebdeefebf +Author: 王怡栋 +Date: Thu Dec 23 06:02:46 2021 +0000 + + Merge branch 'devops17_caoyanyi_test' into 'devops17' + + Devops17 caoyanyi test + + See merge request easycorp/zentaopms!1104 + +commit b65c22407fe37d6ea4abf61fc580e22d291e3818 +Merge: d065d6077b 897f930f48 +Author: 孙广明 +Date: Thu Dec 23 06:02:41 2021 +0000 + + Merge branch 'sprint/178_hufangzhou_mergetBranchStyle' into 'master' + + * Adjust the merge branch page style. + + See merge request easycorp/zentaopms!1105 + +commit 007dd4f43c870fd8d70babecb58c94139948f1b3 +Author: 孙广明 +Date: Thu Dec 23 14:01:37 2021 +0800 + + * Adjust kanban style. + +commit 897f930f481268049f49ef0e7fc896f1fc12e2a2 +Author: hufangzhou +Date: Thu Dec 23 14:01:25 2021 +0800 + + * Adjust the merge branch page style. + +commit 8ebdeefebf4ca7b71c2a3acf81d6fd7001841c5f +Author: caoyanyi +Date: Thu Dec 23 05:59:54 2021 +0000 + + * Add auth and language. + +commit e2f5ad23856882218287a5548262a13cc963e160 +Author: caoyanyi +Date: Thu Dec 23 05:59:42 2021 +0000 + + * Modify empty validate. + +commit af81e6bb78d590c4d0b9f4f0164f807ab0daa293 +Author: Hao Sun +Date: Thu Dec 23 13:51:44 2021 +0800 + + * enable kanban sortable in fullscreen mode. + +commit 3e3fe0543c92f5c86f37e4f4fd9f29186064b11d +Author: liumengyi +Date: Thu Dec 23 13:50:04 2021 +0800 + + * Remove useless code. + +commit 167224d677e692756e5ecd744f1b0098676ac53e +Author: Hao Sun +Date: Thu Dec 23 13:47:39 2021 +0800 + + * optimize UI for d-n-d in kanban. + +commit 126b0f64f2d0a5f89b9200bc30975b64c39152ec +Author: liumengyi +Date: Thu Dec 23 13:42:27 2021 +0800 + + * Fix bug for create column menu. + +commit d065d6077b1d85fd71fd9df683decf114427240d +Author: zhujinyong +Date: Thu Dec 23 13:27:41 2021 +0800 + + * Adjust index page of api. + +commit 2769417a6dbeaacbcb4d41bab706b5ca05d2c696 +Author: songchenxuan +Date: Thu Dec 23 13:23:47 2021 +0800 + + *Fix task #46099 bug. + +commit f384cdfb1bb9c80de95c87bc33311bec759f03b6 +Author: zhujinyong +Date: Thu Dec 23 13:21:18 2021 +0800 + + * Fix style of api. + +commit c6ee25fa52283290a5075607cf4283bb1c9fbe91 +Merge: 105c1ac726 b94fc62ca1 +Author: 孙广明 +Date: Thu Dec 23 05:21:01 2021 +0000 + + Merge branch 'sprint/178_mayue_17581' into 'master' + + * Fix a bug #17581. + + See merge request easycorp/zentaopms!1101 + +commit 105c1ac7260c9bfd84e2dea5159d7975a6dd79e8 +Merge: a3b4bc8cd9 ce6d095ec8 +Author: 孙广明 +Date: Thu Dec 23 05:20:39 2021 +0000 + + Merge branch 'sprint/178_mayue_17854' into 'master' + + * Fix a bug #17854. + + See merge request easycorp/zentaopms!1091 + +commit b94fc62ca19a26a73391f1e15dc4160d110068a6 +Author: mayue +Date: Thu Dec 23 13:16:30 2021 +0800 + + * Fix a bug #17581. + +commit a3b4bc8cd9b021d657a9950d013b2e11bb97a6c1 +Merge: 9a2a490e30 995e01680e +Author: 孙广明 +Date: Thu Dec 23 05:07:26 2021 +0000 + + Merge branch 'sprint/178_hufangzhou_17875' into 'master' + + * Fix bug #17875. + + See merge request easycorp/zentaopms!1100 + +commit 9a2a490e3026f5c5ed4404f8f496fda69b8f1427 +Merge: 2528270fe1 9bfb3c1377 +Author: 孙广明 +Date: Thu Dec 23 13:07:08 2021 +0800 + + Merge branch 'sprint/179_tianshujie_bug' + +commit 9bfb3c1377c0275691b04133071ce868eadf6624 +Merge: 63210497d3 f0342c9745 +Author: 孙广明 +Date: Thu Dec 23 05:06:50 2021 +0000 + + Merge branch 'master' into 'sprint/179_tianshujie_bug' + + # Conflicts: + # module/kanban/js/view.js + +commit 995e01680e1a226959cca8056782fae51b6ce13e +Author: hufangzhou +Date: Thu Dec 23 13:06:18 2021 +0800 + + * Fix bug #17875. + +commit 86f2f47ceb98ce69b0aff8c896576ec8ee678194 +Merge: 49c3e04818 6caf242a80 +Author: 王怡栋 +Date: Thu Dec 23 05:02:53 2021 +0000 + + Merge branch 'devops17_caoyanyi_test' into 'devops17' + + * Add test case for create mr by api. + + See merge request easycorp/zentaopms!1096 + +commit f0342c9745f9d1c34e7a769e83737c3af5b05d34 +Merge: 4e6fe7ffd0 5e07624939 +Author: 孙广明 +Date: Thu Dec 23 04:18:26 2021 +0000 + + Merge branch 'sprint/179_zhengrunyu_Fixbug' into 'master' + + *Fix card + + See merge request easycorp/zentaopms!1098 + +commit 4e6fe7ffd05046024fcbd96ef13169388886e3f0 +Merge: f5da2d8a21 fb904ff0d4 +Author: 孙广明 +Date: Thu Dec 23 04:17:26 2021 +0000 + + Merge branch 'sprint/179_liumengyi_fixbug' into 'master' + + * Fix bug for move card. + + See merge request easycorp/zentaopms!1099 + +commit fb904ff0d42d92f9c89d98d4facf2def5b35fe76 +Author: liumengyi +Date: Thu Dec 23 12:09:18 2021 +0800 + + * Fix bug for move card. + +commit 5e07624939b4f32dbd1a5d5ba466079703543fc1 +Author: zhengrunyu +Date: Thu Dec 23 12:00:42 2021 +0800 + + *Fix card + +commit 6f30a2c4776e63c37bef340c1ec85b1763672290 +Author: Hao Sun +Date: Thu Dec 23 11:58:36 2021 +0800 + + * fix text color for column title in kanban. + +commit 38ed6e4222e26b25094cb5ff8a95428242623d48 +Author: Hao Sun +Date: Thu Dec 23 11:58:06 2021 +0800 + + * fix variable name. + +commit 63210497d30176c238e126cfbd8446482bc94d1e +Author: tianshujie +Date: Thu Dec 23 11:43:04 2021 +0800 + + * Fix bug #17785,#17743. + +commit f5da2d8a21ccb953aecc1e185d2921f3c7af79f7 +Merge: 17aaa5588f e1075ca205 +Author: 孙广明 +Date: Thu Dec 23 03:32:01 2021 +0000 + + Merge branch 'sprint/178_hufangzhou_mergeBranch' into 'master' + + * Finish task #46096. + + See merge request easycorp/zentaopms!1095 + +commit e1075ca20572687f540997de3444f4ebce4bdfa1 +Author: hufangzhou +Date: Thu Dec 23 11:29:51 2021 +0800 + + * Finish task #46096. + +commit 6caf242a802e303981f47a6763e1c93322a0472e +Author: caoyanyi +Date: Thu Dec 23 03:29:27 2021 +0000 + + * Add test case for create mr by api. + +commit 17aaa5588fa59a174e6f803babb6be645b2c435a +Merge: 6736f26abc 259bfef9d9 +Author: 孙广明 +Date: Thu Dec 23 03:25:49 2021 +0000 + + Merge branch 'sprint/179_liumengyi_addView' into 'master' + + * Add Kanban View. + + See merge request easycorp/zentaopms!1090 + +commit 6736f26abc5e7c77d5735a234a5d94d561c9d0b3 +Merge: 919f56ef92 171b3d0c56 +Author: 孙广明 +Date: Thu Dec 23 03:25:24 2021 +0000 + + Merge branch 'sprint/178_songchenxuan_17848' into 'master' + + *Fix bug #17848. + + See merge request easycorp/zentaopms!1092 + +commit 919f56ef923b48a1d158845d009106ce00a8bee6 +Merge: 48620ee08c ea82e4f855 +Author: 孙广明 +Date: Thu Dec 23 03:25:07 2021 +0000 + + Merge branch 'sprint/178_songchenxuan_46100_fixbug' into 'master' + + *Fix task #46100 bug. + + See merge request easycorp/zentaopms!1093 + +commit 48620ee08c735a79a9bcf7b9065f179d2755531e +Merge: 898f65f84b 6eda721a3b +Author: liyuchun +Date: Thu Dec 23 11:23:34 2021 +0800 + + Merge branch 'sgm_fixbug' + +commit 6eda721a3b01d9b86efaed96d2e9045b2b678e26 +Merge: 75f14ac945 2528270fe1 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 23 03:23:07 2021 +0000 + + Merge branch 'master' into 'sgm_fixbug' + + # Conflicts: + # module/kanban/model.php + # module/kanban/view/view.html.php + +commit db17670d31e972aa37df80a2f84274b940c5c1cc +Author: Hao Sun +Date: Thu Dec 23 11:09:27 2021 +0800 + + * Bug #17663, optimize kanban ui on dragging. + +commit 75f14ac9451b5c545739da232851f7203c757672 +Author: 孙广明 +Date: Thu Dec 23 10:56:33 2021 +0800 + + * Fix bugs. + +commit ea82e4f855fe84d8d04188586750b5315b82ae34 +Author: songchenxuan +Date: Thu Dec 23 10:54:40 2021 +0800 + + *Fix task #46100 bug. + +commit ce6d095ec8a4f516fe3d6ca899422b02ab859288 +Author: mayue +Date: Thu Dec 23 10:52:27 2021 +0800 + + * Fix a bug #17854. + +commit 2528270fe1bd2f56282076f8bf87a5d687885853 +Merge: f281e35958 7bdb0499e9 +Author: 孙广明 +Date: Thu Dec 23 10:46:31 2021 +0800 + + Merge branch 'sprint/178_songchenxuan_46100' + +commit 7bdb0499e9e79a81b98c2ade8c5e3e9392e5963d +Merge: 1d7882d51f c9c8dd72eb +Author: 孙广明 +Date: Thu Dec 23 02:46:03 2021 +0000 + + Merge branch 'master' into 'sprint/178_songchenxuan_46100' + + # Conflicts: + # module/productplan/view/batchedit.html.php + # module/productplan/view/browse.html.php + +commit c9c8dd72eb3047386c982066392ba7e9635642a9 +Merge: f281e35958 52259ab836 +Author: 孙广明 +Date: Thu Dec 23 02:38:16 2021 +0000 + + Merge branch 'sprint/179_tianshuje_46242' into 'master' + + Sprint/179 tianshuje 46242 + + See merge request easycorp/zentaopms!1089 + +commit 259bfef9d9f4adec42a07e81ca2f20e23912cd35 +Author: liumengyi +Date: Thu Dec 23 10:30:56 2021 +0800 + + * Add Kanban View. + +commit 52259ab836df6004e69446d2ce2df6d7fe56e610 +Author: tianshujie +Date: Thu Dec 23 10:28:34 2021 +0800 + + * Optimize the details. + +commit 171b3d0c562e1185e0b3c83feabe515fb43ee459 +Author: songchenxuan +Date: Thu Dec 23 10:15:47 2021 +0800 + + *Fix bug #17848. + +commit 49c3e04818690ed2f3e67ff0b97e3d32ce8339a3 +Merge: becda9cbe0 57deb67041 +Author: 王怡栋 +Date: Thu Dec 23 02:08:47 2021 +0000 + + Merge branch 'sprint/devops17_liyuchun' into 'devops17' + + * Fix bug #17811. + + See merge request easycorp/zentaopms!1087 + +commit 1d7882d51f0a856eee38c05cfbb8983aa9724648 +Author: songchenxuan +Date: Thu Dec 23 10:06:54 2021 +0800 + + *Finish task #46100. + +commit 57deb67041945d6378b108f90dcba85f9dd5cb95 +Author: liyuchun +Date: Thu Dec 23 10:02:57 2021 +0800 + + * Fix bug #17811. + +commit 25a2e79f43fb8c64cfefeafb01122c906b2dfc1f +Author: tianshujie +Date: Thu Dec 23 09:59:34 2021 +0800 + + * Finish task #46242. + +commit f281e35958e1acc7ab7a5b738118293eeed6024c +Merge: b948b51841 3ee3458a3b +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 23 01:59:18 2021 +0000 + + Merge branch 'sgm_kanbandetail' into 'master' + + * Adjust kanban details. + + See merge request easycorp/zentaopms!1086 + +commit b948b518411b46aa4f9fc98cbee076d08d6f9cca +Merge: a89a51deec 04c61d1205 +Author: 孙广明 +Date: Thu Dec 23 01:55:38 2021 +0000 + + Merge branch 'sprint/179_liumengyi_fixbug' into 'master' + + * Fix the bug caused by personnel deletion. + + See merge request easycorp/zentaopms!1085 + +commit 3ee3458a3bfe893bf76e670be61d20bdf4280fce +Author: 孙广明 +Date: Thu Dec 23 09:54:56 2021 +0800 + + * Adjust kanban details. + +commit a89a51deecccf219de27db42c622524cf3d474fe +Merge: 2a322567cc 31f4e04ad0 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 23 01:41:25 2021 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix css. + + See merge request easycorp/zentaopms!1084 + +commit 04c61d1205f6c61c89def850ca48e5987bef31cd +Author: liumengyi +Date: Thu Dec 23 09:39:37 2021 +0800 + + * Fix the bug caused by personnel deletion. + +commit 2a322567cc5076732f844609dd9543222ddd9a86 +Merge: 6282b7e066 0a689661f2 +Author: 孙广明 +Date: Thu Dec 23 01:39:19 2021 +0000 + + Merge branch 'sprint/179_liumengyi_fixbug' into 'master' + + * Fix bug #17822. + + See merge request easycorp/zentaopms!1082 + +commit 31f4e04ad05601f1bb223722f8af04b3ead7fa54 +Author: 孙广明 +Date: Thu Dec 23 09:38:37 2021 +0800 + + * Fix css. + +commit c0e1f91e9a4cb720d6c145e46cc68e707b632fe2 +Author: songchenxuan +Date: Thu Dec 23 09:29:34 2021 +0800 + + *Finish task #46100. + +commit becda9cbe08d34b364619c02637e496624638aa6 +Merge: 80455b5ed9 51d75e0802 +Author: 王怡栋 +Date: Thu Dec 23 01:25:26 2021 +0000 + + Merge branch 'sprint/devops17_liyuchun' into 'devops17' + + * Fix bug #17841,17830. + + See merge request easycorp/zentaopms!1083 + +commit 80455b5ed9fd68c4b7e6c2879b4ee3f871ac0359 +Merge: 36a1c2e6af 4c96f9d833 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 23 01:23:13 2021 +0000 + + Merge branch 'devops17_46005' into 'devops17' + + * Code for task#46005 + + See merge request easycorp/zentaopms!1081 + +commit 51d75e0802e150a0fd90cf77eb419d31ce3e6317 +Author: liyuchun +Date: Thu Dec 23 09:20:40 2021 +0800 + + * Fix bug #17841,17830. + +commit 0a689661f24c1eadbe5c1213353ad60164918378 +Author: liumengyi +Date: Thu Dec 23 09:20:40 2021 +0800 + + * Fix bug #17822. + +commit 6282b7e066b41c6a81d5e59c1ad10dae4378e187 +Merge: 483995dca6 88544cf4b9 +Author: 孙广明 +Date: Thu Dec 23 01:02:58 2021 +0000 + + Merge branch 'sprint/179_sunhao/kanban_ui' into 'master' + + * Fix kanban columns width. + + See merge request easycorp/zentaopms!1073 + +commit 4c96f9d833ac0537d501479fb191af7ded845a77 +Author: zenggang +Date: Thu Dec 23 01:02:23 2021 +0000 + + * Code for task#46005 + +commit 36a1c2e6afe58e55c359ae415df5bcd324ad430a +Merge: 66bf2a0f80 b164538b75 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 23 00:49:55 2021 +0000 + + Merge branch 'devops17_mr_update' into 'devops17' + + Devops17 mr update + + See merge request easycorp/zentaopms!1075 + +commit 055df23f69c82e7f4838fffae1ad117609693a99 +Author: songchenxuan +Date: Wed Dec 22 17:32:44 2021 +0800 + + *Finish task #46100. + +commit 66bf2a0f8031a745611a23fe3aeb23b5c1761d1e +Merge: a1406ac51e 11dc36d278 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 22 09:22:08 2021 +0000 + + Merge branch 'devops17_wangyidong_api' into 'devops17' + + * code for mr diff that is from ztool. + + See merge request easycorp/zentaopms!1080 + +commit a1406ac51e40846b639d078b66ab3f5b35bcb313 +Merge: 40d37f91f9 ca30f986e8 +Author: 王怡栋 +Date: Wed Dec 22 09:20:33 2021 +0000 + + Merge branch 'sprint/devops17_liyuchun' into 'devops17' + + Sprint/devops17 liyuchun + + See merge request easycorp/zentaopms!1079 + +commit 11dc36d278f4d7547cfd06af47d54f26c28090b5 +Author: 王怡栋 +Date: Wed Dec 22 17:17:11 2021 +0800 + + * code for mr diff that is from ztool. + +commit 40d37f91f960b3b2a88397cb82439353dfd3b926 +Merge: 0682282971 80ce63d880 +Author: 王怡栋 +Date: Wed Dec 22 09:10:44 2021 +0000 + + Merge branch 'devops17_caoyanyi_bug' into 'devops17' + + * Remove empty. + + See merge request easycorp/zentaopms!1078 + +commit 80ce63d8809371e2c85c8f8cd24a13049009b24a +Author: caoyanyi +Date: Wed Dec 22 09:09:29 2021 +0000 + + * Remove empty. + +commit ca30f986e8849897f70007d4eaec5ba237d606ec +Author: liyuchun +Date: Wed Dec 22 17:07:31 2021 +0800 + + * Adjust code for api create mr. + +commit 7e59c27945e2520da85bd46787cda6d11b2842b5 +Author: liyuchun +Date: Wed Dec 22 16:54:07 2021 +0800 + + * Adjust api create mr. + +commit 06822829710003fa70f4a50c7696fd13d24ab9af +Merge: 9126094ec3 e10a7875f7 +Author: 王怡栋 +Date: Wed Dec 22 08:16:40 2021 +0000 + + Merge branch 'sprint/devops17_liyuchun' into 'devops17' + + * Code for task #46003. + + See merge request easycorp/zentaopms!1077 + +commit e10a7875f70adbbb25ce4a97f39fc47c0a57434d +Author: liyuchun +Date: Wed Dec 22 16:15:49 2021 +0800 + + * Adjust code for task #46003. + +commit cdbff35897d077e98a0898ea11876076a19adb1d +Author: liyuchun +Date: Wed Dec 22 16:12:03 2021 +0800 + + * Code for task #46003. + +commit b164538b75823645aa1c6617f30711d3ebf7c1f8 +Author: zenggang +Date: Wed Dec 22 08:11:38 2021 +0000 + + * Adjust code + +commit 9126094ec3cb35f590fc2c1fcdc3675422746df1 +Merge: 3de88dbf10 5751dd0783 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 22 08:07:29 2021 +0000 + + Merge branch 'devops17_17846' into 'devops17' + + * Fix bug#17846 + + See merge request easycorp/zentaopms!1069 + +commit 483995dca61809d1814d13ec766cd03e1c6c90fe +Merge: b8cd9a28dd 0d36e78c85 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 22 08:01:49 2021 +0000 + + Merge branch 'sgm_46153' into 'master' + + * Fix kanban style. + + See merge request easycorp/zentaopms!1076 + +commit b8cd9a28ddbc5253fe89e426b4cb6a5193e6c7c6 +Merge: edcd625b35 453145af31 +Author: 孙广明 +Date: Wed Dec 22 15:51:42 2021 +0800 + + Merge branch 'sprint/179_zhengrunyu_fixbug' + +commit 0d36e78c8567a3a9decde149ce66a3c74a36e295 +Author: 孙广明 +Date: Wed Dec 22 15:51:17 2021 +0800 + + * Fix kanban style. + +commit 453145af31bfb710828c8d50f9b6637116da7440 +Merge: 7578906006 ea15a6c2ed +Author: 孙广明 +Date: Wed Dec 22 07:51:02 2021 +0000 + + Merge branch 'master' into 'sprint/179_zhengrunyu_fixbug' + + # Conflicts: + # module/kanban/js/view.js + +commit ea15a6c2ed17d5ded01a30f3b93d1d43de72ad95 +Merge: ded871aa6f 12b292b157 +Author: 孙广明 +Date: Wed Dec 22 07:49:57 2021 +0000 + + Merge branch 'sprint/179_liumengyi_fixbug' into 'master' + + * Fix bug #17822. + + See merge request easycorp/zentaopms!1068 + +commit ca1f1e645b607ba4c0516ff7e68d3d9f8963907a +Author: zenggang +Date: Wed Dec 22 07:49:49 2021 +0000 + + * Add mr update unit + +commit ded871aa6fa0e3c54bae8218c57487f2c4b404fc +Merge: 83c8385b69 d0eb0e8662 +Author: 孙广明 +Date: Wed Dec 22 07:49:40 2021 +0000 + + Merge branch 'sprint/31_zhouxin_17711' into 'master' + + Sprint/31 zhouxin 17711 + + See merge request easycorp/zentaopms!1066 + +commit 83c8385b697ebab15b8e076fc52e81827705e61d +Merge: 6b9751f78e 18383e225b +Author: 孙广明 +Date: Wed Dec 22 07:48:35 2021 +0000 + + Merge branch 'sprint/31_zhouxin_17665' into 'master' + + Fix bug #17665. + + See merge request easycorp/zentaopms!1074 + +commit 18383e225b432d4240d4fba8ecba164ddc40a6ea +Author: zhouxin +Date: Wed Dec 22 07:44:26 2021 +0000 + + Fix bug #17665. + +commit 88544cf4b94780134ffc2cee4a3d12b1ed0d63f8 +Author: Hao Sun +Date: Wed Dec 22 15:41:17 2021 +0800 + + * fix kanban columns width. + +commit 6b9751f78ee91be42b8ae88f5ed2ebbf7b79ea71 +Merge: edcd625b35 5da1b391cc +Author: 孙广明 +Date: Wed Dec 22 07:37:29 2021 +0000 + + Merge branch 'sprint/178_mayue_46098' into 'master' + + * Optimize code. + + See merge request easycorp/zentaopms!1071 + +commit 757890600604c9c3fb306ca83025854972b91e02 +Author: zhengrunyu +Date: Wed Dec 22 15:36:36 2021 +0800 + + *change avater show. + +commit 5da1b391cca1ac8a82ffd7e79835593e2b6eb5f9 +Author: mayue +Date: Wed Dec 22 15:35:16 2021 +0800 + + * Optimize code. + +commit 3de88dbf10d6d21fcf2910f54995571002f25927 +Merge: c77fbcadb3 49bfd2dd18 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 22 07:28:15 2021 +0000 + + Merge branch 'devops17_wangyidong_api' into 'devops17' + + * adjust for vs code and php8.0. + + See merge request easycorp/zentaopms!1070 + +commit 49bfd2dd188ce36bf5f682de79d28ca410aa90a2 +Author: 王怡栋 +Date: Wed Dec 22 15:24:47 2021 +0800 + + * adjust for vs code and php8.0. + +commit 5751dd07831d3cc071f57816da111503bca3a9f3 +Author: zenggang +Date: Wed Dec 22 07:17:31 2021 +0000 + + * Fix bug#17846 + +commit 12b292b15795d88acc2c0019e0c5f010eaf6a2d7 +Author: liumengyi +Date: Wed Dec 22 15:10:45 2021 +0800 + + * Fix bug #17822. + +commit edcd625b355d2134b6ab78d48d616f4ebcac79b0 +Merge: bb9171d6ba 5418b47edc +Author: 孙广明 +Date: Wed Dec 22 14:32:22 2021 +0800 + + Merge branch 'sprint/179_liumengyi_fixbug' + +commit 5418b47edccfb4633dcac0a84b81bafeafb07497 +Merge: e454aa2757 bb9171d6ba +Author: 孙广明 +Date: Wed Dec 22 06:31:37 2021 +0000 + + Merge branch 'master' into 'sprint/179_liumengyi_fixbug' + + # Conflicts: + # module/kanban/css/space.css + +commit a7258e471b80510a229d306bfb15c640e0e6812d +Author: songchenxuan +Date: Wed Dec 22 14:28:28 2021 +0800 + + *Finish task #46100. + +commit e454aa2757e44eae845136a58111d6c93e6bac3c +Author: liumengyi +Date: Wed Dec 22 14:26:22 2021 +0800 + + * Fix bug #17768. + +commit d0eb0e8662cdecc871e87017229de7cf0ef4b001 +Author: zhouxin +Date: Wed Dec 22 06:09:36 2021 +0000 + + Fix bug #17711. + +commit bb9171d6babd97eed4ecc605e2eb65b96a78cfe8 +Merge: 9d078d3067 75a3d20358 +Author: 孙广明 +Date: Wed Dec 22 14:05:03 2021 +0800 + + Merge branch 'sprint/179_tianshujie_46241' + +commit 75a3d20358f4fde0abda51b9d6dcff576c312608 +Merge: 0c5b069581 b282a51d1c +Author: 孙广明 +Date: Wed Dec 22 06:03:21 2021 +0000 + + Merge branch 'master' into 'sprint/179_tianshujie_46241' + + # Conflicts: + # module/group/lang/resource.php + # module/kanban/css/space.css + # module/kanban/js/view.js + +commit 32bb53370c971412a34ebb8163b5400e01b35f2a +Author: zhouxin +Date: Wed Dec 22 06:01:35 2021 +0000 + + Fix bug #17711. + +commit 0c5b069581009c60b87c9b2f40c1f4a84aa785d1 +Author: tianshujie +Date: Wed Dec 22 13:52:51 2021 +0800 + + * Modify file comment. + +commit 84e368ccabb19d84d282c1db55b096a877f1ab46 +Author: tianshujie +Date: Wed Dec 22 13:48:47 2021 +0800 + + * Adjust Kanban permissions. + +commit b282a51d1c3c559d10dc4ed899ef106ce30830cb +Merge: 9d078d3067 62be3e024e +Author: 孙广明 +Date: Wed Dec 22 05:25:43 2021 +0000 + + Merge branch 'sprint/179_liumengyi_fixbug' into 'master' + + * Finish task #46146. + + See merge request easycorp/zentaopms!1064 + +commit 62be3e024e5f4dcc9b7c8e9dcf77a2a8c25f7dd3 +Author: liumengyi +Date: Wed Dec 22 13:16:42 2021 +0800 + + * Remove unwanted code. + +commit dab44100d586ee78997ba3b1e0977bba8dd814b2 +Author: tianshujie +Date: Wed Dec 22 13:16:32 2021 +0800 + + * Finish task #46241. + +commit b355559d0ecaff2159b0d05dfd5f6587276c2d12 +Author: liumengyi +Date: Wed Dec 22 13:10:12 2021 +0800 + + * Finish task #46146. + +commit c77fbcadb33d42e65f625e42548576d86015757c +Merge: 7d8dbf5db8 b921ba7679 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 22 03:21:47 2021 +0000 + + Merge branch 'devops17_17751' into 'devops17' + + Devops17 17751 + + See merge request easycorp/zentaopms!1057 + +commit 9d078d30671b691f5801170905d03f9f5093ac67 +Merge: de67c1ad49 521cb5654a +Author: 孙广明 +Date: Wed Dec 22 03:14:12 2021 +0000 + + Merge branch 'sprint/178_mayue_16292' into 'master' + + * Fix a bug #16292. + + See merge request easycorp/zentaopms!1060 + +commit de67c1ad49f96dc356df42f7a35acb69422fa8ff +Merge: 3417a97edc 610112438c +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 22 03:12:09 2021 +0000 + + Merge branch 'sgm_46165' into 'master' + + * Finish task #46165. + + See merge request easycorp/zentaopms!1054 + +commit 521cb5654ae1460e78ac1a725d18067dcaeb514e +Author: mayue +Date: Wed Dec 22 11:10:37 2021 +0800 + + * Optimize code. + +commit 3417a97edcac727a2d427211d9134ef7dcdf1ee3 +Merge: b22fa1b678 5285fc3ac4 +Author: 孙广明 +Date: Wed Dec 22 03:07:56 2021 +0000 + + Merge branch 'sprint/31_zhouxin_17797' into 'master' + + Fix bug #17797. + + See merge request easycorp/zentaopms!1062 + +commit b22fa1b67888ebbac9369f44487991fdef69491d +Merge: 84f2cfb102 14a7faf16d +Author: 孙广明 +Date: Wed Dec 22 03:01:12 2021 +0000 + + Merge branch 'sprint/178_mayue_46098' into 'master' + + * Finish a task #46098. + + See merge request easycorp/zentaopms!1049 + +commit 7d8dbf5db8d21ecd1c348bf846820cc11325ea4e +Merge: 71df92bee6 cb1c14b98b +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 22 03:00:47 2021 +0000 + + Merge branch 'devops17_46005' into 'devops17' + + * Finish task#46005 + + See merge request easycorp/zentaopms!1051 + +commit cb1c14b98b2a61eea563c29ba331060b89fbd859 +Author: zenggang +Date: Wed Dec 22 02:59:57 2021 +0000 + + * Adjust code style + +commit 84f2cfb1020f6db8fb2cf38de6e14c8017e05eac +Merge: b50ed9131b 19f32378b0 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 22 02:53:35 2021 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Finish task #46161. + + See merge request easycorp/zentaopms!1059 + +commit b50ed9131b2eac03263c1fcd488f1b8a20328f14 +Merge: 75fa4d2dd2 b5b1fb4d81 +Author: 孙广明 +Date: Wed Dec 22 02:53:20 2021 +0000 + + Merge branch 'sprint/179_zhengrunyu_46146' into 'master' + + *card name warp. + + See merge request easycorp/zentaopms!1063 + +commit 1c8df7822a5cfc6c0f6a3ed9911709f997b20cef +Author: songchenxuan +Date: Wed Dec 22 10:48:55 2021 +0800 + + *Finish task #46100. + +commit 19f32378b0147ac7d6472edd5d0715aadb45bbd8 +Author: 孙广明 +Date: Wed Dec 22 10:48:33 2021 +0800 + + * Fix code details. + +commit b5b1fb4d81ecba4e3b7a5dcc247742b2983fcc39 +Author: zhengrunyu +Date: Wed Dec 22 10:47:29 2021 +0800 + + *card name warp. + +commit 610112438c65f262ac2d6b4c03c480aed05dc064 +Author: 孙广明 +Date: Wed Dec 22 10:46:23 2021 +0800 + + * Fix details. + +commit 14a7faf16d956b657262a801462b4e97b8ed6fe2 +Author: mayue +Date: Wed Dec 22 10:36:55 2021 +0800 + + * Optimize code. + +commit 08c7f0cc5087be96fe30b91ab6485c949d6ac317 +Author: 孙广明 +Date: Wed Dec 22 10:31:43 2021 +0800 + + * Finish task #46161. + +commit 75fa4d2dd2bad797b43fff58f34c6dc876528ee4 +Merge: 1b05d78e65 5b0923a7a3 +Author: 孙广明 +Date: Wed Dec 22 02:08:40 2021 +0000 + + Merge branch 'sprint/178_hufangzhou_mergebranchpriv' into 'master' + + * Resolve the issue of merge branch. + + See merge request easycorp/zentaopms!1058 + +commit 5b0923a7a34a9e925657097ed18558a401cb393c +Author: hufangzhou +Date: Wed Dec 22 10:07:18 2021 +0800 + + * Resolve the issue of merge branch. + +commit 11a989307b10ba8f8e7f32bdfc1732051fbb50da +Author: mayue +Date: Wed Dec 22 10:07:01 2021 +0800 + + * Fix a bug #16292. + +commit b921ba76793f40d214c7209676cc873083aeb05e +Author: zenggang +Date: Wed Dec 22 02:05:14 2021 +0000 + + * Fix bug#17751 + +commit f66c50d9dbbd0c1db5e35dfd505619dd8fcc5eda +Author: zenggang +Date: Wed Dec 22 02:03:35 2021 +0000 + + * Fix bug#17751 + +commit 71df92bee6307601b371ca712cf2b5a9d8b84256 +Merge: 005e5980d6 5dd72fd196 +Author: 王怡栋 +Date: Wed Dec 22 01:53:51 2021 +0000 + + Merge branch 'sprint/devops17_liyuchun' into 'devops17' + + * Adjust api create mr. + + See merge request easycorp/zentaopms!1056 + +commit 005e5980d6c55f5b7e5060e3911f57cfcd08a907 +Merge: 155b3125db 54b6dd0ffc +Author: 王怡栋 +Date: Wed Dec 22 01:52:26 2021 +0000 + + Merge branch 'devops17_caoyanyi_mr' into 'devops17' + + * Add sql. + + See merge request easycorp/zentaopms!1055 + +commit 5dd72fd196fb06d49939b943af84596d4cff5e25 +Author: liyuchun +Date: Wed Dec 22 09:51:13 2021 +0800 + + * Adjust api create mr. + +commit 197a1bceea7813225c42f534d9bd4f5065dbb463 +Author: 孙广明 +Date: Wed Dec 22 09:41:39 2021 +0800 + + * Finish task #46165. + +commit 5285fc3ac4fd3acd4fb940451a81688ad36552a4 +Author: zhouxin +Date: Wed Dec 22 01:41:09 2021 +0000 + + Fix bug #17797. + +commit 1b05d78e650b5d52b67863aa8eb425d08553f123 +Merge: d8979e3e78 47c35653d6 +Author: 孙广明 +Date: Wed Dec 22 01:13:21 2021 +0000 + + Merge branch 'sprint/179_liumengyi_fixbug' into 'master' + + * Fix bug for enable archive. + + See merge request easycorp/zentaopms!1053 + +commit 47c35653d61828be8870bac5599b37a30d0bc732 +Author: liumengyi +Date: Wed Dec 22 09:11:15 2021 +0800 + + * Fix bug for enable archive. + +commit c854ab0e331908a4461a09de8fb6d254aec11d3c +Author: zenggang +Date: Wed Dec 22 01:01:17 2021 +0000 + + * Add apigettags method unit + +commit d8979e3e78f34f89534a3ae79cf3d1f3c6a095dc +Merge: c250c080a4 10c2f33c2b +Author: zhujinyong +Date: Wed Dec 22 08:55:40 2021 +0800 + + Merge branch 'sprint/178_hufangzhou_46388' + +commit 4ae4c69ea4c7ea7593e604f0402a7f721b6b70cf +Author: zenggang +Date: Wed Dec 22 00:54:44 2021 +0000 + + * Finish task#46005 + +commit c250c080a4af53dedacb9e164f96a111414fe41a +Merge: 3a3c461b51 9a1a55a0f2 +Author: 朱金勇 +Date: Wed Dec 22 00:51:30 2021 +0000 + + Merge branch 'sprint/178_songchenxuan_46095_add' into 'master' + + *Restrict the editing of the parent plan branch. + + See merge request easycorp/zentaopms!1039 + +commit 10c2f33c2b02587f2dc8352e147c3f23590193d1 +Author: hufangzhou +Date: Wed Dec 22 08:50:42 2021 +0800 + + * Adjust the issue of merge branch. + +commit 3a3c461b51cd0806a8e2c3bfbc2a5a35f9926195 +Merge: 434e7fb369 ebebbe127c +Author: 朱金勇 +Date: Wed Dec 22 00:50:36 2021 +0000 + + Merge branch 'sprint/178_songchenxuan_fix_action/lang/en.php' into 'master' + + Sprint/178 songchenxuan fix action/lang/en.php + + See merge request easycorp/zentaopms!1050 + +commit 35a4af824fcae2aed46a5683539f9192a3382f2d +Author: songchenxuan +Date: Wed Dec 22 08:50:10 2021 +0800 + + *Finish task #46100. + +commit ebebbe127cb8fde116a67d281c484919a21e5bd9 +Author: songchenxuan +Date: Wed Dec 22 08:49:06 2021 +0800 + + *Fix action/lang/en.php. + +commit 45ea5572724c8f09fd6df62967d981d38c914e37 +Author: songchenxuan +Date: Wed Dec 22 08:48:15 2021 +0800 + + *Fix action/lang/en.php. + +commit 434e7fb36909c66ef48c1e669b75b1b44a586458 +Merge: c474449b54 31984c6aa9 +Author: 孙广明 +Date: Wed Dec 22 00:16:44 2021 +0000 + + Merge branch 'sprint/master_tanghucheng_fixbug' into 'master' + + * Fix bug for my meeting. + + See merge request easycorp/zentaopms!1038 + +commit 9743ebbb92e3b91e89d3c99f4e86df79887b9736 +Author: hufangzhou +Date: Tue Dec 21 22:26:07 2021 +0800 + + * Finish task #46388. + +commit c474449b54396489ee6a54ede18f62854de54b47 +Merge: 802f3a2282 f5bc141f55 +Author: 李玉春 <563917701@qq.com> +Date: Tue Dec 21 09:47:11 2021 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix project priv bug. + + See merge request easycorp/zentaopms!1012 + +commit ea0477b6b2d724c97c7e18c4f76dce11b25de56c +Author: mayue +Date: Tue Dec 21 17:47:09 2021 +0800 + + * Add a file. + +commit 155b3125dbc32fed516ea050de2a4a6d5a9f8d20 +Merge: 2f620a8662 2eac7ba0d1 +Author: 李玉春 <563917701@qq.com> +Date: Tue Dec 21 09:46:56 2021 +0000 + + Merge branch 'devops17_wangyidong_api' into 'devops17' + + * adjust for get repo rules api. + + See merge request easycorp/zentaopms!1047 + +commit 807961ec256caadc3d937e33cb7b26b3e947590e +Author: mayue +Date: Tue Dec 21 17:43:47 2021 +0800 + + * Modify a question. + +commit 2eac7ba0d1d49e259d368956079d7aacff73c2e6 +Author: 王怡栋 +Date: Tue Dec 21 17:42:38 2021 +0800 + + * adjust for get repo rules api. + +commit 802f3a2282a46bbe234de036a528de1f88f01a1d +Merge: 3481d14020 17cd92f7d3 +Author: 孙广明 +Date: Tue Dec 21 09:31:31 2021 +0000 + + Merge branch 'sprint/179_liumengyi_fixbug' into 'master' + + * Fix bug for move card. + + See merge request easycorp/zentaopms!1046 + +commit 17cd92f7d35aed8db33e970def358778c162584c +Author: liumengyi +Date: Tue Dec 21 17:30:37 2021 +0800 + + * Fix bug for move card. + +commit 2f620a86620080171ce28eb5762262114874856b +Merge: 97bbefbd09 b9a2d19393 +Author: 王怡栋 +Date: Tue Dec 21 09:29:32 2021 +0000 + + Merge branch 'sprint/devops17_liyuchun' into 'devops17' + + * Finish task #46140. + + See merge request easycorp/zentaopms!1042 + +commit 3481d140208b1ffc6512af4a5b11b9c2b6ae05f1 +Merge: 2eb7b428a5 93349c241a +Author: 孙广明 +Date: Tue Dec 21 09:23:53 2021 +0000 + + Merge branch 'sprint/179_liumengyi_fixbug' into 'master' + + * Fix bug #17724, #17769, #17768, #17765, #17763, #17737. + + See merge request easycorp/zentaopms!1045 + +commit 93349c241aeb9e7d2e89850719576d114bca6a91 +Author: liumengyi +Date: Tue Dec 21 17:23:21 2021 +0800 + + * Fix bug. + +commit 6b7cbc74abf0bc3bbf4ce03f135bdd7e885afceb +Author: liumengyi +Date: Tue Dec 21 17:16:46 2021 +0800 + + * Fix bug #17724, #17769, #17768, #17765, #17763, #17737. + +commit 2eb7b428a559be3f872441f008eeb77962119116 +Merge: 6d7569542c 70e0458aa2 +Author: 孙广明 +Date: Tue Dec 21 09:14:05 2021 +0000 + + Merge branch 'sprint/179_zhengrunyu_46146' into 'master' + + *Finish task 46246. + + See merge request easycorp/zentaopms!1044 + +commit 70e0458aa2c9e44d8bb44fbf219f592af1e2b0f0 +Author: zhengrunyu +Date: Tue Dec 21 17:12:32 2021 +0800 + + *Finish task 46246. + +commit 6d7569542c3ff100b489731e0f2afa76024eee2f +Merge: b8a4936df8 03a86096c7 +Author: 孙广明 +Date: Tue Dec 21 09:05:28 2021 +0000 + + Merge branch 'sprint/179_tianshujie_bug' into 'master' + + * Fix bug #17780,#17770,#17760,#17759,#17743. + + See merge request easycorp/zentaopms!1043 + +commit b8a4936df848c30c6ef5c1ed933db70326c053b5 +Merge: 8bd1991c83 28533a6427 +Author: 孙广明 +Date: Tue Dec 21 09:04:49 2021 +0000 + + Merge branch 'sprint/179_zhengrunyu_46146' into 'master' + + *Finish task 46246. + + See merge request easycorp/zentaopms!1041 + +commit 28533a6427da4aadb0aa67ed1faad951d10d2e93 +Author: zhengrunyu +Date: Tue Dec 21 17:04:11 2021 +0800 + + *Finish task 46246. + +commit 111521f56035e4efe08df56464b6eae97a3e8e5e +Author: mayue +Date: Tue Dec 21 17:02:46 2021 +0800 + + * Optimize code. + +commit 03a86096c75e79061245dc4d55a6f47957122a8e +Author: tianshujie +Date: Tue Dec 21 17:01:47 2021 +0800 + + * Add space. + +commit ec286d6057319fd93adc9801b723489fe97caeb9 +Author: zhengrunyu +Date: Tue Dec 21 16:59:52 2021 +0800 + + *Finish task 46246. + +commit 7b918d91f053a6c661381c61863b867261d1790b +Author: tianshujie +Date: Tue Dec 21 16:57:06 2021 +0800 + + * Fix bug #17780,#17770,#17760,#17759,#17743. + +commit b9a2d1939384fe361e087d7393cf8485d8d6102f +Author: liyuchun +Date: Tue Dec 21 16:55:55 2021 +0800 + + * Finish task #46140. + +commit 25feb63a599d1d8426c3c55ea0ff81082ae7c627 +Author: zhengrunyu +Date: Tue Dec 21 16:53:49 2021 +0800 + + *Finish task 46246. + +commit d080173ef81d06d9caa923d8bf17f83c3fdb120e +Author: mayue +Date: Tue Dec 21 16:51:35 2021 +0800 + + * Optimize code. + +commit 75a1a27b08189567ed5161269aea6ded84a9106d +Author: mayue +Date: Tue Dec 21 16:47:48 2021 +0800 + + * Optimize code. + +commit 9a1a55a0f2ff7bc58f6e8256480436da1f77a169 +Author: songchenxuan +Date: Tue Dec 21 16:28:13 2021 +0800 + + *Restrict the editing of the parent plan branch. + +commit 8bd1991c83d68699a955c6138760fae088c28397 +Merge: 42fc345e2a 7b2c5322a7 +Author: zhujinyong +Date: Tue Dec 21 16:13:07 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 42fc345e2a6f87a73870508fd7b872bd4e0b82b5 +Merge: 816e2a3e00 2809bc0b94 +Author: zhujinyong +Date: Tue Dec 21 16:12:48 2021 +0800 + + Merge branch 'sprint/176_xieqiyu_mergeBranch' + +commit 7b2c5322a7261a794b09140fc21c7a332f3c51b0 +Merge: b20d55dc28 863965e61a +Author: 朱金勇 +Date: Tue Dec 21 08:09:12 2021 +0000 + + Merge branch 'sprint/178_hufangzhou_46097' into 'master' + + * Finish task #46097. + + See merge request easycorp/zentaopms!1037 + +commit 54b6dd0ffc33d9241fb5d8ca5193d04519396b55 +Author: caoyanyi +Date: Tue Dec 21 08:06:10 2021 +0000 + + * Add sql. + +commit 397775b21896772c2bd01d031fb827f4524096e8 +Author: songchenxuan +Date: Tue Dec 21 16:01:26 2021 +0800 + + *Restrict the editing of the parent plan branch. + +commit ee98b305f2131c829287d4dd38a48249e71381d2 +Author: mayue +Date: Tue Dec 21 16:01:06 2021 +0800 + + * Finish task #46098. + +commit 31984c6aa9127e0da2043b2ee638fe9fc7564a19 +Author: tanghucheng +Date: Tue Dec 21 15:58:32 2021 +0800 + + * Fix bug for my meeting. + +commit 863965e61af0f150f49c5e4b1e500e1c0b2489c0 +Author: hufangzhou +Date: Tue Dec 21 15:53:27 2021 +0800 + + * Finish task #46097. + +commit 2809bc0b94d652f8978416cda237e5d64a68ce5b +Author: hufangzhou +Date: Tue Dec 21 15:42:26 2021 +0800 + + * Perfect details. + +commit 97bbefbd0939967223fd96956b02fd3bf6a32dea +Author: 王怡栋 +Date: Tue Dec 21 15:28:40 2021 +0800 + + * adjust for update sql. + +commit b7ce8814fb4b09537d718d350d6c82a191216a10 +Merge: 075856775b 4508fec3a3 +Author: 王怡栋 +Date: Tue Dec 21 07:27:35 2021 +0000 + + Merge branch 'sprint/devops17_liyuchun' into 'devops17' + + * Code for task #46001. + + See merge request easycorp/zentaopms!1035 + +commit 4508fec3a3a3bc4c0257c2c266412cf00650a1d4 +Author: liyuchun +Date: Tue Dec 21 15:26:31 2021 +0800 + + * Adjust annotation. + +commit b20d55dc28b34094832613eca6c0ae640f61c8aa +Merge: 816e2a3e00 3825315c6b +Author: 孙广明 +Date: Tue Dec 21 07:24:04 2021 +0000 + + Merge branch 'sprint/179_liumengyi_fixbug' into 'master' + + * Fix bug #17765, #17763, #17737. + + See merge request easycorp/zentaopms!1036 + +commit 3825315c6b7310ac9dbd2ce2c9d675e37c935aea +Author: liumengyi +Date: Tue Dec 21 15:23:19 2021 +0800 + + * Add comment. + +commit e2cbf7dab798edba453059845da53200bbd1c06c +Author: liumengyi +Date: Tue Dec 21 15:21:18 2021 +0800 + + * Fix bug #17765, #17763, #17737. + +commit 816e2a3e00895e0fb558a6f3123c4503561217e0 +Merge: 5a1e31adf2 a29de2106e +Author: zhujinyong +Date: Tue Dec 21 14:53:50 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5a1e31adf2c36709bd12902555295415ca14199d +Author: zhujinyong +Date: Tue Dec 21 14:53:05 2021 +0800 + + * Refactor getList of branch. + +commit a29de2106e968a31d148406aa5d0e348612c6232 +Merge: f6e6ef8bff c19e44c044 +Author: 孙广明 +Date: Tue Dec 21 06:37:35 2021 +0000 + + Merge branch 'fix-die' into 'master' + + Fix die naming compatibility + + See merge request easycorp/zentaopms!1033 + +commit 872a8b2bbdb58b2c32ccee63fb416824ccaca8f9 +Author: hufangzhou +Date: Tue Dec 21 14:30:38 2021 +0800 + + * Finish task #46096. + +commit 075856775b33f585322c242d3bf25b11a6428435 +Merge: 29daabbb57 199443ccb3 +Author: 王怡栋 +Date: Tue Dec 21 14:26:20 2021 +0800 + + Merge branch 'devops17' of https://gitlab.zcorp.cc/easycorp/zentaopms into devops17 + +commit c19e44c04450f675111c8c81b64c77c363b18bda +Author: Yurun +Date: Tue Dec 21 14:25:53 2021 +0800 + + Fix die naming compatibility + +commit 29daabbb573e00cc92c158b223085c72b0446f1b +Author: 王怡栋 +Date: Tue Dec 21 14:24:48 2021 +0800 + + * add unit test case for repo getrepobyurl. + +commit 199443ccb3040de2d9244caa559017fc99185102 +Merge: a6bb7e123f dd807b4192 +Author: 王怡栋 +Date: Tue Dec 21 06:18:15 2021 +0000 + + Merge branch 'devops17_caoyanyi_bug' into 'devops17' + + * Modify placeholder. + + See merge request easycorp/zentaopms!1032 + +commit dd807b4192dcded25bf2001ae100dfa0cee07b1a +Author: caoyanyi +Date: Tue Dec 21 06:11:10 2021 +0000 + + * Modify placeholder. + +commit f6e6ef8bff028a92c76ea26eef70516945512433 +Merge: 14ee3504fa 0fa8bbfb70 +Author: zhujinyong +Date: Tue Dec 21 14:06:54 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 14ee3504fa1d859c264d8b69a3e6b5ca8536c026 +Author: zhujinyong +Date: Tue Dec 21 14:06:24 2021 +0800 + + * Compatibility from PHP5.4. + +commit 0fa8bbfb7067ccd844e0cb7ad394fe5a9d058eb9 +Merge: 3a8eabb057 171045fab4 +Author: 孙广明 +Date: Tue Dec 21 06:03:33 2021 +0000 + + Merge branch 'sprint/179_tianshujie_17754' into 'master' + + * Fix bug #17756,#17755,#17754,#17752,#17747. + + See merge request easycorp/zentaopms!1031 + +commit 3a8eabb05791c65855cc29009326b1baf03abcc3 +Merge: 4de57a92d2 08935cfe5b +Author: 朱金勇 +Date: Tue Dec 21 05:59:10 2021 +0000 + + Merge branch 'change-die-zhangrunyu' into 'master' + + Change die + + See merge request easycorp/zentaopms!1029 + +commit 171045fab4b16e0e13d4c41cbbcd81fde210d99d +Author: tianshujie +Date: Tue Dec 21 13:59:03 2021 +0800 + + * Fix bug #17756,#17755,#17754,#17752,#17747. + +commit 4de57a92d24b97c83f1f38177db75468c67cafb5 +Merge: f2110111fb 3bb8ba6b1d +Author: 孙广明 +Date: Tue Dec 21 05:56:06 2021 +0000 + + Merge branch 'sprint/179_liumengyi_46244' into 'master' + + * Finish task #46244, #46243. + + See merge request easycorp/zentaopms!1030 + +commit 3bb8ba6b1d5e36e0b8aaad8b816b0356e7118b4b +Author: liumengyi +Date: Tue Dec 21 13:55:00 2021 +0800 + + * Change 'let' to 'var'. + +commit f2110111fb6807ec73528b9716156a9c8e9a2979 +Merge: 0b213848a5 72a6d27e6c +Author: 朱金勇 +Date: Tue Dec 21 05:53:23 2021 +0000 + + Merge branch 'sprint/178_songchenxuan_46095' into 'master' + + Sprint/178 songchenxuan 46095 + + See merge request easycorp/zentaopms!1028 + +commit 96ded748b6958f17bad4e4d65b6d321853f7bc6c +Author: liumengyi +Date: Tue Dec 21 13:50:40 2021 +0800 + + * Add punctuation. + +commit 72a6d27e6cbdaf70d4c8fbed084439377acd7761 +Author: songchenxuan +Date: Tue Dec 21 13:48:40 2021 +0800 + + *Finish task #46095. + +commit b8166358ad2ebb455a6fbd206b17c23e65136c3d +Author: liumengyi +Date: Tue Dec 21 13:46:31 2021 +0800 + + * Finish task #46244, #46243. + +commit 0b213848a52ba5f9992bc1faa1b4700005e633cc +Merge: 187c67fd3b 72252707d3 +Author: 朱金勇 +Date: Tue Dec 21 05:38:27 2021 +0000 + + Merge branch 'sprint/178_songchenxuan_17584' into 'master' + + *Fix bug #17584. + + See merge request easycorp/zentaopms!1014 + +commit 08935cfe5b6fa5d3c7ff8e4f353c6a2519b87bc5 +Author: Yurun +Date: Tue Dec 21 13:21:12 2021 +0800 + + Optimize + +commit 72252707d317deaca285342f4cccf4319e79cd24 +Author: songchenxuan +Date: Tue Dec 21 11:55:35 2021 +0800 + + *Fix bug #17584. + +commit 116b1a717dfbedf463403e42506fb63650487ad6 +Author: songchenxuan +Date: Tue Dec 21 11:54:54 2021 +0800 + + *Fix bug #17584. + +commit 187c67fd3b4e782002b816470e558b90ff7e1dda +Merge: 01a62fe94b 7d49e79513 +Author: 孙广明 +Date: Tue Dec 21 03:32:08 2021 +0000 + + Merge branch 'sprint/179_tianshujie_bug' into 'master' + + * Fix bug #17694,17683. + + See merge request easycorp/zentaopms!1027 + +commit 01a62fe94ba3b5db8b03c28c1d6251ceda5e59ba +Merge: 9ed65123b5 49ae6abad6 +Author: zhujinyong +Date: Tue Dec 21 11:28:26 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 9ed65123b580fa32fde7e6808828eeb447676d46 +Author: zhujinyong +Date: Tue Dec 21 11:27:55 2021 +0800 + + * Fix bug: display dropmenu when no lib. + +commit 7d49e79513872668ccc979095cb4addb715bbc1f +Author: tianshujie +Date: Tue Dec 21 11:26:26 2021 +0800 + + * Fix bug #17694,17683. + +commit a6bb7e123f5eda1b763b1c5a1c781ac531aaa77f +Merge: 83f8fc47f1 76453ea1ba +Author: 王怡栋 +Date: Tue Dec 21 03:21:51 2021 +0000 + + Merge branch 'devops17_caoyanyi_bug' into 'devops17' + + * Modify page style and back url. + + See merge request easycorp/zentaopms!1026 + +commit 83f8fc47f1dee9cf0837859e647442d24648ad6d +Merge: 6296ed2139 30acf3d2a7 +Author: liyuchun +Date: Tue Dec 21 11:20:04 2021 +0800 + + Merge branch 'devops17_wangyidong_46002' into devops17 + +commit 30acf3d2a7f52db6081941be45f46fcb668ba286 +Merge: 29852dd3ea 4a09257ab4 +Author: 李玉春 <563917701@qq.com> +Date: Tue Dec 21 03:19:16 2021 +0000 + + Merge branch 'devops17' into 'devops17_wangyidong_46002' + + # Conflicts: + # db/update16.0.beta1.sql + +commit 76453ea1ba0f5dec21289c07a212e28146f7a013 +Author: caoyanyi +Date: Tue Dec 21 03:16:45 2021 +0000 + + * Modify page style and back url. + +commit 49ae6abad6d4a395b95c344cd73465b1592281b2 +Merge: 338657c59f 70612e93aa +Author: 朱金勇 +Date: Tue Dec 21 03:11:57 2021 +0000 + + Merge branch 'sprint/178_songchenxuan_17563' into 'master' + + *Fix bug #17563. + + See merge request easycorp/zentaopms!1013 + +commit 338657c59ff0457728b4e986ea11ab6b6a4d5056 +Merge: a8bcb49883 147c03f2f0 +Author: 朱金勇 +Date: Tue Dec 21 03:09:34 2021 +0000 + + Merge branch 'sprint/178_songchenxuan_17684' into 'master' + + *Fix bug #17684. + + See merge request easycorp/zentaopms!1024 + +commit a8bcb4988308e12fc10aae477a9c5ecabf33369d +Merge: bf4dcdd19c da2117bb2e +Author: 王怡栋 +Date: Tue Dec 21 11:08:56 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit da2117bb2eb925ba62a683bd7f7c98a99b7f3706 +Merge: 68e2a1c668 c4638ccc9d +Author: 朱金勇 +Date: Tue Dec 21 03:08:34 2021 +0000 + + Merge branch 'sprint/179_sunhao/icon' into 'master' + + * Update icons: add icon-sonarqube, remove icon-zone, update icon-cube. + + See merge request easycorp/zentaopms!1025 + +commit bf4dcdd19c9ed88cc1e1255374771e3c79dcab2e +Author: 王怡栋 +Date: Tue Dec 21 11:08:28 2021 +0800 + + * adjust get api version. + +commit 68e2a1c6687700502862c80699f6d1176502f080 +Merge: 951dea2b63 1681d07f6a +Author: 孙广明 +Date: Tue Dec 21 03:05:42 2021 +0000 + + Merge branch 'sprint/179_zhengrunyu_46146' into 'master' + + *Fix bug + + See merge request easycorp/zentaopms!1023 + +commit 1681d07f6a7b31f22c5469ba125758b5b452d0df +Author: zhengrunyu +Date: Tue Dec 21 11:04:12 2021 +0800 + + *Fix task 46163. + +commit f7ff2b00d98e4ecb7c16f59f9a655c24885cb3b9 +Author: zhengrunyu +Date: Tue Dec 21 10:58:30 2021 +0800 + + *Fix bug. + +commit c4638ccc9dadbd5a01653c44a6c89134af20008c +Author: Hao Sun +Date: Tue Dec 21 10:58:22 2021 +0800 + + * Update icons: add icon-sonarqube, remove icon-zone, update icon-cube. + +commit 147c03f2f0802683852f1c79be6ea8c1f7a79413 +Author: songchenxuan +Date: Tue Dec 21 10:17:51 2021 +0800 + + *Fix bug #17684. + +commit 8599448fda2ff92409d838f529f53ed28780bb44 +Author: zhengrunyu +Date: Tue Dec 21 10:08:11 2021 +0800 + + *Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug + +commit 951dea2b63480b916599145585e73cb36fd7ba2a +Merge: 6307414ef2 8ea2cc8e9e +Author: 孙广明 +Date: Tue Dec 21 01:56:29 2021 +0000 + + Merge branch 'sprint/179_tianshujie_bug' into 'master' + + * Fix bug #17704,17740,17694. + + See merge request easycorp/zentaopms!1022 + +commit 30cd7944ff19a2a98a8c72ab422d7601b5cb574e +Author: songchenxuan +Date: Tue Dec 21 09:55:50 2021 +0800 + + *Finish task #46095. + +commit 8ea2cc8e9e082485385d981ac096987b4d9f4edf +Author: tianshujie +Date: Tue Dec 21 09:53:44 2021 +0800 + + * Fix bug #17704,17740,17694. + +commit 2ca28f589fac3952e9b62037774dc2ad97bb1396 +Author: Yurun +Date: Tue Dec 21 09:47:31 2021 +0800 + + Add EndResponseException and helper::die() + +commit 6307414ef28ceb717fa4d95acdaaee1bf59fc4f4 +Merge: 411b060895 d8c93c3dc8 +Author: zhujinyong +Date: Tue Dec 21 09:36:54 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 411b0608959fad3c77095f015d2959ac16594a7c +Author: zhujinyong +Date: Tue Dec 21 09:36:25 2021 +0800 + + + Create demo data for api. + +commit c9c65ce3ef23d40348415ace6e15f1a71b90af12 +Author: songchenxuan +Date: Tue Dec 21 09:16:56 2021 +0800 + + *Finish task #46095. + +commit d8c93c3dc86d88a9d62d580604fb9c8b7ace8882 +Merge: c5cb021416 4f369ace40 +Author: 孙广明 +Date: Tue Dec 21 01:07:07 2021 +0000 + + Merge branch 'sprint/179_liumengyi_fixbug' into 'master' + + * Fix bug for task#46150,#46158. + + See merge request easycorp/zentaopms!1021 + +commit 4f369ace4001d23f1fc2a1718ee98986c2067d6c +Author: liumengyi +Date: Tue Dec 21 09:04:57 2021 +0800 + + * Modify edit card html. + +commit c5cb021416e32e7964bf1f67b0fb2db736bc9a0c +Merge: 53c741481b 5863beeb76 +Author: 孙广明 +Date: Tue Dec 21 01:02:52 2021 +0000 + + Merge branch 'sprint/179_tianshujie_46245' into 'master' + + * Finish task #46245. + + See merge request easycorp/zentaopms!1019 + +commit 8318d1fa699627a39864674bddcce14abe0bb578 +Author: liumengyi +Date: Tue Dec 21 09:02:24 2021 +0800 + + * Fix bug for task#46150,#46158. + +commit 5863beeb76af214fda01e58397a811862231c01b +Author: tianshujie +Date: Tue Dec 21 09:01:53 2021 +0800 + + * Remove extra spaces. + +commit 53c741481b28e6a3eca7c50f1c831f3d87149cee +Merge: e1a6381454 d3e873976d +Author: 孙广明 +Date: Tue Dec 21 00:58:01 2021 +0000 + + Merge branch 'sprint/179_zhengrunyu_Fixbug' into 'master' + + Sprint/179 zhengrunyu fixbug + + See merge request easycorp/zentaopms!1020 + +commit d3e873976da19dbb1b4ba123502e5e82915367ac +Author: zhengrunyu +Date: Tue Dec 21 08:55:15 2021 +0800 + + *Fix bug 17662. + +commit 402458803d20712bc653f340cc9fd29ada700655 +Author: zhengrunyu +Date: Tue Dec 21 08:54:02 2021 +0800 + + *Fixbug17662. + +commit d364b7c3629ffdf93318dc9d233d983828b10a0f +Author: tianshujie +Date: Tue Dec 21 08:53:21 2021 +0800 + + * Remove useless attributes. + +commit c04c2506ae4dcc57908dfc873ed025f7c61d055c +Author: tianshujie +Date: Tue Dec 21 08:51:03 2021 +0800 + + * Finish task #46245. + +commit 851f2fad1dbb8e3a3727f644ba7631f4c53c8f8d +Author: zhengrunyu +Date: Tue Dec 21 08:47:02 2021 +0800 + + *Fix bug 17662. + +commit 4a09257ab42afb273e6a553e7e80f70cf6e67f02 +Merge: 6fff197f99 9e08030544 +Author: 王怡栋 +Date: Tue Dec 21 00:46:08 2021 +0000 + + Merge branch 'devops17_caoyanyi_46003' into 'devops17' + + Devops17 caoyanyi 46003 + + See merge request easycorp/zentaopms!1017 + +commit e1a63814549d0ab6ec0d7e7f673f940329c67458 +Merge: 397f0b587c 6c9f4248cd +Author: 孙广明 +Date: Tue Dec 21 00:44:25 2021 +0000 + + Merge branch 'sprint/179_liumengyi_46156' into 'master' + + * Finish task #46156. + + See merge request easycorp/zentaopms!1016 + +commit 6c9f4248cd94374ae09404771c63a3a31e5c5e85 +Author: liumengyi +Date: Tue Dec 21 08:43:13 2021 +0800 + + * Add dafault card color. + +commit 8712f7640a7ada2ca59e44c58e757ef808c75588 +Author: liumengyi +Date: Tue Dec 21 08:37:40 2021 +0800 + + * Finish task #46156. + +commit 6fff197f99f07d1985e759390b21353eedba312e +Merge: 6296ed2139 64646f028d +Author: 李玉春 <563917701@qq.com> +Date: Tue Dec 21 00:22:11 2021 +0000 + + Merge branch 'devops17_zenggang' into 'devops17' + + * Adjust code + + See merge request easycorp/zentaopms!1015 + +commit 65e41ae4404a3e1b0f3a90b842e91c3fb6cfeb72 +Author: songchenxuan +Date: Mon Dec 20 18:13:23 2021 +0800 + + *Finish task #46095. + +commit ca1230076f3779a8bb6b0f9e2d6e8b53320262b0 +Author: songchenxuan +Date: Mon Dec 20 18:10:40 2021 +0800 + + *Finish task #46095. + +commit 64646f028d28eac057facfc009ca12ebad134658 +Author: zenggang +Date: Mon Dec 20 09:48:58 2021 +0000 + + * Adjust code + +commit f5bc141f5540402dcec523c0c04030ca3579c99e +Author: 孙广明 +Date: Mon Dec 20 17:08:30 2021 +0800 + + * Fix project priv bug. + +commit 397f0b587cd33542f753adbf6931e6bee00d8538 +Merge: 6dbd976baa 3a9fcbc3f0 +Author: 孙广明 +Date: Mon Dec 20 08:50:30 2021 +0000 + + Merge branch 'sprint/179_zhengrunyu_Fixbug' into 'master' + + *Fix bug17647. + + See merge request easycorp/zentaopms!1011 + +commit 6dbd976baa08248f8bc24f27e79c0ba4e7e53c58 +Merge: 112fb5d279 093314fde5 +Author: 孙广明 +Date: Mon Dec 20 16:48:16 2021 +0800 + + Merge branch 'sprint/179_tianshujie_46162' + +commit 093314fde560018181d7f7a03aecefab5e13d501 +Merge: d6fe370f9b 112fb5d279 +Author: 孙广明 +Date: Mon Dec 20 08:47:59 2021 +0000 + + Merge branch 'master' into 'sprint/179_tianshujie_46162' + + # Conflicts: + # module/kanban/js/view.js + +commit 112fb5d279f0af7c6ba81f201c8a0a8a7d767eb2 +Merge: 84fae4bc7d 54b712feed +Author: 孙广明 +Date: Mon Dec 20 16:46:45 2021 +0800 + + Merge branch 'sprint/179_tianshujie_46157' + +commit 54b712feed58cd0756c28db5275db46c771a5da9 +Merge: 0cceea2b86 df28168e3e +Author: 孙广明 +Date: Mon Dec 20 08:46:31 2021 +0000 + + Merge branch 'master' into 'sprint/179_tianshujie_46157' + + # Conflicts: + # module/kanban/js/view.js + +commit 29852dd3eab9f96d05aeb906c6c69b1200985346 +Author: 王怡栋 +Date: Mon Dec 20 16:46:16 2021 +0800 + + * adjust for getRepoByUrl. + +commit df28168e3e7b667290e12d1d9170973896e43b20 +Merge: 5d7b75bb53 9aa2fc86c0 +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 20 08:44:44 2021 +0000 + + Merge branch 'sgm_kanbanstyle' into 'master' + + Sgm kanbanstyle + + See merge request easycorp/zentaopms!1010 + +commit 3a9fcbc3f0fc335e2f4fcf90e4955bf75223ec83 +Author: zhengrunyu +Date: Mon Dec 20 16:42:53 2021 +0800 + + *Fix bug17647. + +commit 9aa2fc86c022f084edf3037a02fc685044ce1b6e +Author: 孙广明 +Date: Mon Dec 20 16:40:33 2021 +0800 + + * Fix card title style. + +commit 8ed5f8545adc8fbf373995f8b27f14fc101b756d +Author: zhengrunyu +Date: Mon Dec 20 15:48:19 2021 +0800 + + *Fix bug. + +commit 6939ffe6214967fac0fcc073f31504a8aca56af5 +Author: zhengrunyu +Date: Mon Dec 20 15:44:44 2021 +0800 + + *Fix bug. + +commit f5eead33bf0f85c0c8889abc2ca3396ce19ac02e +Author: zhengrunyu +Date: Mon Dec 20 15:43:04 2021 +0800 + + *Fix bug. + +commit 5226a302c721f88f572811784a918008ed697f44 +Author: 孙广明 +Date: Mon Dec 20 11:30:37 2021 +0800 + + * Code for project priv. + +commit a5992d64e49586fb39ca51aff6bd77c607880047 +Author: 孙广明 +Date: Mon Dec 20 11:23:33 2021 +0800 + + * Fix project priv bug. + +commit 5d7b75bb5383540247932df1cb6aa6583c8ef71e +Merge: 7d6854cbd6 f578251936 +Author: 孙广明 +Date: Mon Dec 20 08:34:27 2021 +0000 + + Merge branch 'sprint/179_zhengrunyu_Fixbug' into 'master' + + *Fix bug 17653. + + See merge request easycorp/zentaopms!1009 + +commit d6fe370f9b8a7ccf0d3241311f4864028f0061eb +Author: tianshujie +Date: Mon Dec 20 16:33:22 2021 +0800 + + * Modify the name of the variable. + +commit 04f6a9e217334017804e892ffbf0d86db780802d +Author: tianshujie +Date: Mon Dec 20 16:29:06 2021 +0800 + + * Merge conflict. + +commit f5782519364cb7feac99c6a095a4f81111dbe9da +Author: zhengrunyu +Date: Mon Dec 20 16:28:50 2021 +0800 + + *Fix bug 17653. + +commit ec2e94440da37246cf883008a203b8de46857df9 +Author: tianshujie +Date: Mon Dec 20 16:24:19 2021 +0800 + + * Finish task #46162. + +commit 7d6854cbd6a5831b8776914c7738147889c9a069 +Merge: ac49c3f367 ed928752d3 +Author: 孙广明 +Date: Mon Dec 20 08:23:32 2021 +0000 + + Merge branch 'sprint/179_zhengrunyu_Fixbug' into 'master' + + Sprint/179 zhengrunyu fixbug + + See merge request easycorp/zentaopms!1007 + +commit d81ccdff30a7d6941a3f98dc155c589083940b06 +Author: songchenxuan +Date: Mon Dec 20 16:09:18 2021 +0800 + + *Fix bug #17584. + +commit ed928752d3bb269f040b452d6fe96479006aadd3 +Author: zhengrunyu +Date: Mon Dec 20 15:48:19 2021 +0800 + + *Fix bug. + +commit 08758239f98dfe0840cb0021a49dd95b6f57656f +Author: 孙广明 +Date: Mon Dec 20 15:47:47 2021 +0800 + + * Fix kanban style. + +commit 6a3c77e4513df4679d158009f974cf7f134946f0 +Author: zhengrunyu +Date: Mon Dec 20 15:44:44 2021 +0800 + + *Fix bug. + +commit 92a7b2a6cc7c11ccd1038461b81f432e4093a04f +Author: zhengrunyu +Date: Mon Dec 20 15:43:04 2021 +0800 + + *Fix bug. + +commit 3db6c1bf1ea20fb4bf8f46b81dd382404b62c96f +Author: 孙广明 +Date: Mon Dec 20 15:39:03 2021 +0800 + + * Code for trashes. + +commit 428ba360dd31f00ca1ce35a806344b401ff527b5 +Author: 孙广明 +Date: Mon Dec 20 15:02:04 2021 +0800 + + * Fix kanban css. + +commit 1244776f6941d7511d8f766e2bf5fbbd5b874c34 +Author: liumengyi +Date: Mon Dec 20 14:35:36 2021 +0800 + + * Add function comments. + +commit 96971d9029eb831b90434a3e607bfaa87348c6b3 +Author: liumengyi +Date: Mon Dec 20 14:29:55 2021 +0800 + + * Finish task #46155. + +commit c221abf4853657ad35f26f8bd831f290d0d5d85c +Author: tanghucheng +Date: Mon Dec 20 13:51:29 2021 +0800 + + * Fix bug #17690,17688. + +commit 418bf9d1f5a6e409107505cb88f434a28a74c7a1 +Author: tanghucheng +Date: Mon Dec 20 13:42:08 2021 +0800 + + * Fix css for .open dropdown-toggle.btn. + +commit 6296ed2139f35adf88d47bf0a86c1a20f0713930 +Merge: e7305d63d4 c623ca78ac +Author: liyuchun +Date: Mon Dec 20 15:36:19 2021 +0800 + + Merge branch 'devops17_46138' into devops17 + +commit 4f896cf87e45dc85a01d13e6564b9e651eb3696d +Author: liyuchun +Date: Mon Dec 20 15:35:31 2021 +0800 + + * Code for task #46001. + +commit c623ca78ac98293b0f7c6d5f0503d77920643f42 +Merge: 586fbf06fc dcbe1dd7e4 +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 20 07:34:35 2021 +0000 + + Merge branch 'devops17' into 'devops17_46138' + + # Conflicts: + # module/gitlab/lang/en.php + # module/gitlab/lang/zh-cn.php + # module/group/lang/resource.php + +commit a978eff5f0bb2eab96adcfd4403c5e466637f9ab +Author: mayue +Date: Mon Dec 20 15:32:36 2021 +0800 + + * Fix bug #16292. + +commit 586fbf06fcc9604efe0e7f84441f16322f84efa8 +Author: zenggang +Date: Mon Dec 20 07:30:21 2021 +0000 + + * Adjust code + +commit ac49c3f3677c3880745fd4e77fdc560d0ccb33d6 +Merge: 88dca1f12a 81378356b6 +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 20 07:09:59 2021 +0000 + + Merge branch 'sgm_projectpriv' into 'master' + + Sgm projectpriv + + See merge request easycorp/zentaopms!1002 + +commit e66ab3ccbd989bc622f76def6f478ca08dfdac9c +Author: 王怡栋 +Date: Mon Dec 20 15:04:53 2021 +0800 + + * adjust for API. + +commit 0cceea2b866e5d619294abc52ab0b7508e94021e +Author: tianshujie +Date: Mon Dec 20 14:59:05 2021 +0800 + + * Add translation judgment. + +commit 88dca1f12adbf6d92532ba567ef2fbe65577a41b +Merge: 347f0acdf0 14c584555e +Author: 孙广明 +Date: Mon Dec 20 06:47:56 2021 +0000 + + Merge branch 'sprint/179_liumengyi_46155' into 'master' + + * Finish task #46155. + + See merge request easycorp/zentaopms!1004 + +commit 442fbdad44fea9eafdf5c2631bc52d1cb8b219b2 +Author: tianshujie +Date: Mon Dec 20 14:42:06 2021 +0800 + + * Finish task #46157. + +commit dcbe1dd7e4c86f5fa6c843eff2deeec4d64a08c1 +Merge: 6338f44643 d9a5f136b1 +Author: 王怡栋 +Date: Mon Dec 20 06:35:45 2021 +0000 + + Merge branch 'devops17_caoyanyi_tag' into 'devops17' + + Devops17 caoyanyi tag + + See merge request easycorp/zentaopms!1005 + +commit 14c584555eab9a7a07191af072109c2ebfba4744 +Author: liumengyi +Date: Mon Dec 20 14:35:36 2021 +0800 + + * Add function comments. + +commit 6fadc5c01380041da261925567d0b51dada8cab6 +Author: liumengyi +Date: Mon Dec 20 14:29:55 2021 +0800 + + * Finish task #46155. + +commit a24a6918e1260b034c7428e7bb6304c4f3f6ef43 +Author: 孙广明 +Date: Mon Dec 20 14:27:07 2021 +0800 + + * Fix kanban style. + +commit e18576efe70d006ed4fcfc47f4dc9aef2bce65d9 +Author: 王怡栋 +Date: Mon Dec 20 14:24:47 2021 +0800 + + * adjust for resource. + +commit 70612e93aa5860331a9193bff2efc8d1fb4d11d6 +Author: songchenxuan +Date: Mon Dec 20 13:55:22 2021 +0800 + + *Fix bug #17563. + +commit 347f0acdf0978838aaf0f2a72dbb1b6024241219 +Merge: 84fae4bc7d 6fac380f11 +Author: 孙广明 +Date: Mon Dec 20 05:53:40 2021 +0000 + + Merge branch 'sprint/master_tanghucheng_46181' into 'master' + + * Fix bug #17690,17688. + + See merge request easycorp/zentaopms!1003 + +commit 6fac380f11c587423ebc23b97677176137040f66 +Author: tanghucheng +Date: Mon Dec 20 13:51:29 2021 +0800 + + * Fix bug #17690,17688. + +commit 1bbb985b3e0bd40fdb7531cb64dae08ce6c7e923 +Author: songchenxuan +Date: Mon Dec 20 13:44:41 2021 +0800 + + *Finish task #46095. + +commit 5e713ddb07b0991278b6024c9d064b8b72c1e077 +Author: tanghucheng +Date: Mon Dec 20 13:42:08 2021 +0800 + + * Fix css for .open dropdown-toggle.btn. + +commit 81378356b6a321543ec8e7ece981dbe074561535 +Author: 孙广明 +Date: Mon Dec 20 11:30:37 2021 +0800 + + * Code for project priv. + +commit 2df43b48b8e37bff3f1099e0f46ca4da502b3eeb +Author: 孙广明 +Date: Mon Dec 20 11:23:33 2021 +0800 + + * Fix project priv bug. + +commit 84fae4bc7d08c1946e456735e673f8f1c52c35aa +Merge: 2fa7acc4d6 177c9b158f +Author: 孙广明 +Date: Mon Dec 20 10:59:07 2021 +0800 + + Merge branch 'kanban' + +commit 2fa7acc4d6403ab3ef2c6220bcb74984cd2a8580 +Merge: 40e6051daa ae9ddf75fe +Author: 孙广明 +Date: Mon Dec 20 02:42:18 2021 +0000 + + Merge branch 'sprint/master_tanghucheng_46181' into 'master' + + * Finish task #46181. + + See merge request easycorp/zentaopms!1000 + +commit 177c9b158fcff0cd9c92b0b1131583ac2fa3c3ba +Merge: ab43352a90 ecd2d541ac +Author: 孙广明 +Date: Mon Dec 20 02:41:05 2021 +0000 + + Merge branch 'sprint/179_tianshujie_46151' into 'kanban' + + Sprint/179 tianshujie 46151 + + See merge request easycorp/zentaopms!991 + +commit ae9ddf75fe2ebaf8cb086c2fbd9282a5ef45ea03 +Author: tanghucheng +Date: Mon Dec 20 10:30:30 2021 +0800 + + * Finish task #46181. + +commit ab43352a90530f20a918c34ed60a2ac59acc9f92 +Merge: 58a2a8f1d0 08b8e71727 +Author: 孙广明 +Date: Mon Dec 20 01:35:14 2021 +0000 + + Merge branch 'sprint/179_zhengrunyu_46159' into 'kanban' + + Sprint/179 zhengrunyu 46159 + + See merge request easycorp/zentaopms!987 + +commit 08b8e717276246391ae5f757a23fb5e419f43ed1 +Author: zhengrunyu +Date: Mon Dec 20 09:31:53 2021 +0800 + + *Finish + +commit a32c3472a6c1fd918d6629617f4ccca650bb797c +Author: Hao Sun +Date: Mon Dec 20 08:45:19 2021 +0800 + + * Update zui: contextmenu supports submenus. + +commit bc3644053fe5991caec6d5e07a52ea1dd0022795 +Author: 孙广明 +Date: Fri Dec 17 15:55:34 2021 +0800 + + * Fix js error. + +commit 1e13398592bda619d62bd3c89c2d20de1cc0352c +Author: 孙广明 +Date: Fri Dec 17 15:54:00 2021 +0800 + + * Fix kanban js. + +commit cc7c03b834897c9ea3f3216c7dd859bc15b87404 +Author: 孙广明 +Date: Fri Dec 17 15:43:19 2021 +0800 + + * Fix code details. + +commit 7fb096c45191058f930e573e761206f80cf6cc50 +Author: 孙广明 +Date: Fri Dec 17 15:25:59 2021 +0800 + + * Finish task #46164. + +commit 39ac40e17092081ca8532bdef24b1c3076f75fce +Author: zhouxin +Date: Fri Dec 17 06:35:24 2021 +0000 + + Fix bug. + +commit 88b80e2716ac535aa65e8ca75a054ad08f543d5c +Author: zhouxin +Date: Fri Dec 17 05:42:52 2021 +0000 + + Finish task #46230,46228,46227. + +commit 58a2a8f1d0272b349659cfc9cb66ddb93f22591f +Merge: 2722e08c1c 1c61b2a759 +Author: 孙广明 +Date: Mon Dec 20 09:24:40 2021 +0800 + + Merge branch 'sprint/179_liumengyi_46158' into kanban + +commit 40e6051daa4e23bad575daa78bf7b8b43befdaf2 +Author: zhujinyong +Date: Mon Dec 20 09:15:34 2021 +0800 + + - Remove die() of admin module. + +commit 90d2447caec2d2caba48169013563403eeb1c550 +Author: zhujinyong +Date: Mon Dec 20 09:13:32 2021 +0800 + + - Remove die() of admin module. + +commit a31325053d14a1491e22352fe75e175684e6a31c +Author: zhengrunyu +Date: Mon Dec 20 09:10:14 2021 +0800 + + *Finish task*Finish task*Finish task*Finish task*Finish task*Finish task*Finish task*Finish task + +commit 72b41be5b05fa3f79888ae4efe5f2ad86d4dac39 +Author: zhujinyong +Date: Mon Dec 20 09:05:16 2021 +0800 + + - Remove die() of action module. + +commit 1c61b2a759c2fe632b35abef2d5c449966238c16 +Merge: fc7b18ca37 46cc07495d +Author: 孙广明 +Date: Mon Dec 20 00:53:10 2021 +0000 + + Merge branch 'kanban' into 'sprint/179_liumengyi_46158' + + # Conflicts: + # module/kanban/js/view.js + +commit cf477770feaacb85932bb02d970f6ac019eb608b +Merge: 8530bbd031 b0497de051 +Author: 朱金勇 +Date: Mon Dec 20 00:52:21 2021 +0000 + + Merge branch 'sprint/zui_sunhao' into 'master' + + * Add and update icons. + + See merge request easycorp/zentaopms!996 + +commit 8530bbd0319aeda87c9f1c36622d59303ea24ce2 +Merge: 8ba0385b58 ae3326b8f0 +Author: 朱金勇 +Date: Mon Dec 20 00:50:14 2021 +0000 + + Merge branch 'sprint/xuan_sunhao/web_embed' into 'master' + + * Optimize UI for embed client. + + See merge request easycorp/zentaopms!995 + +commit 46cc07495dd210ceface37e061421818205cb724 +Merge: dd6106c22a 2b13143030 +Author: 朱金勇 +Date: Mon Dec 20 00:49:53 2021 +0000 + + Merge branch 'kanban_sunhao/context_menu' into 'kanban' + + * Update zui: contextmenu supports submenus. + + See merge request easycorp/zentaopms!999 + +commit 6338f446432b8ca6227324e78e2893b0a264f6f5 +Merge: b213ed54ba e63b34ca3b +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 20 00:49:07 2021 +0000 + + Merge branch 'devops17_sunhao_icons' into 'devops17' + + * Add and update icons for devops. + + See merge request easycorp/zentaopms!997 + +commit fc7b18ca3710a66d82ecfeaa34036ed22a82c4cf +Author: liumengyi +Date: Mon Dec 20 08:47:25 2021 +0800 + + * Remove unwanted space. + +commit 8ba0385b58e3aac9b2d37cecd1605ffad9535f25 +Merge: ad57d792f1 63bc23d43f +Author: 朱金勇 +Date: Mon Dec 20 00:47:21 2021 +0000 + + Merge branch 'sql-optimization-zhangrunyu' into 'master' + + SQL optimization + + See merge request easycorp/zentaopms!924 + +commit ecd2d541ac8eb5b4322f314cedf398255e769d2e +Author: tianshujie +Date: Mon Dec 20 08:45:35 2021 +0800 + + * Restore code. + +commit 2b131430308a5b38fd38b1329dfa4aff56e76d16 +Author: Hao Sun +Date: Mon Dec 20 08:45:19 2021 +0800 + + * Update zui: contextmenu supports submenus. + +commit 23bec4a9edf4711617e87f466d89b6a22251d899 +Author: liumengyi +Date: Mon Dec 20 08:43:34 2021 +0800 + + * Modify code format. + +commit 79c523399b2c3b3617c33b5c2cc74522d126effd +Author: liumengyi +Date: Mon Dec 20 08:28:18 2021 +0800 + + * Modify kanban judgment in recycle bin. + +commit 22156e183670d6b5127e3ccab01ea5b0b0c03a3f +Author: zhengrunyu +Date: Mon Dec 20 08:19:01 2021 +0800 + + *Finish task. + +commit ad57d792f1ffb28deec872ba0c92bc91906535ce +Merge: c0fd222c18 56437f6418 +Author: 王怡栋 +Date: Fri Dec 17 18:00:31 2021 +0800 + + Merge branch 'apiext' + +commit 56437f6418fb1e1207b02ba5b879f6622f1a5259 +Merge: 7dd4586d46 c0fd222c18 +Author: 王怡栋 +Date: Fri Dec 17 09:58:59 2021 +0000 + + Merge branch 'master' into 'apiext' + + # Conflicts: + # config/routes.php + +commit 7d78b9c4fbad63b70977df03775c1d5e6387d273 +Author: zhengrunyu +Date: Fri Dec 17 17:33:24 2021 +0800 + + *Fix bug + +commit e63b34ca3b34e950217a8bcdfa0900532a4ac740 +Author: Hao Sun +Date: Fri Dec 17 16:50:02 2021 +0800 + + * Add new icons: "ztool", "contacts", "chats", "tag", "tag-lock", "branch-lock", update: "menu-my", "program", "product", "project" + +commit b0497de0512228e2a962737054f8bb7856b82072 +Author: Hao Sun +Date: Fri Dec 17 16:50:02 2021 +0800 + + * Add new icons: "ztool", "contacts", "chats", "tag", "tag-lock", "branch-lock", update: "menu-my", "program", "product", "project" + +commit ae3326b8f0539743a00246a3862a9d11443721c5 +Author: Hao Sun +Date: Fri Dec 17 16:15:27 2021 +0800 + + * optimize UI for embed client. + +commit dd6106c22a8b6758173ff83326e62b235b2919ed +Merge: f2fae37b7f eaf86c493d +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 17 07:56:13 2021 +0000 + + Merge branch 'sgm_movecard' into 'kanban' + + * Fix kanban js. + + See merge request easycorp/zentaopms!994 + +commit eaf86c493d079f3f7718320544832f5157cfd01b +Author: 孙广明 +Date: Fri Dec 17 15:55:34 2021 +0800 + + * Fix js error. + +commit 54cf020b639a9cb94f083b14ca6c0ffbc5717821 +Author: tianshujie +Date: Fri Dec 17 15:54:13 2021 +0800 + + * Modify the code. + +commit 302a576ed1e743e705c63752a2f4ea32f1726425 +Author: 孙广明 +Date: Fri Dec 17 15:54:00 2021 +0800 + + * Fix kanban js. + +commit 9e0803054486bd102448c6806bcfc41423cddd1f +Author: caoyanyi +Date: Fri Dec 17 07:52:19 2021 +0000 + + * Modify conflict status. + +commit f2fae37b7f8b5d4014808b9c3af861efe4a519db +Merge: 6a88107d35 87c12c800a +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 17 07:52:10 2021 +0000 + + Merge branch 'sgm_movecard' into 'kanban' + + *Finish task #46164 + + See merge request easycorp/zentaopms!992 + +commit c0fd222c18dce0f9e564cc376d31ef5d0ad23375 +Merge: 4cddc5effd 788c1c3f42 +Author: 朱金勇 +Date: Fri Dec 17 07:45:23 2021 +0000 + + Merge branch 'sprint/178_xieqiyu_46102' into 'master' + + * Code for task#46102. + + See merge request easycorp/zentaopms!990 + +commit 4cddc5effdd44fcda94740e1c99b7e89f79b604c +Merge: 493b42452c 6227d52547 +Author: 朱金勇 +Date: Fri Dec 17 07:44:07 2021 +0000 + + Merge branch 'sprint/176_xieqiyu_46097' into 'master' + + * Finish task#46097. + + See merge request easycorp/zentaopms!989 + +commit 87c12c800af92dfe4e78ef8c7442aa2d544b1c4c +Author: 孙广明 +Date: Fri Dec 17 15:43:19 2021 +0800 + + * Fix code details. + +commit 493b42452c594f3878167757a581e0699d7df24b +Merge: 67ecc5f8c8 d10d8be62a +Author: 朱金勇 +Date: Fri Dec 17 07:40:40 2021 +0000 + + Merge branch 'sprint/178_songchenxuan_46136' into 'master' + + *Finish task #46136. + + See merge request easycorp/zentaopms!976 + +commit 67ecc5f8c8b3dc308cdf34bffa1aaa3e8305ff83 +Merge: d8852453dc 59bbd18c55 +Author: 朱金勇 +Date: Fri Dec 17 07:40:10 2021 +0000 + + Merge branch 'sprint/178_songchenxuan_46099' into 'master' + + *Finish task #46099. + + See merge request easycorp/zentaopms!974 + +commit 7d3ad08bc60e232394da5289c71c6e806f1199d7 +Author: liumengyi +Date: Fri Dec 17 15:39:41 2021 +0800 + + * Finish task #46158, and fix bug #17657,#17655. + +commit d8852453dc9e8d60983d6d63e30000103acf2547 +Merge: 3381dd3ab0 fd3a645a30 +Author: 朱金勇 +Date: Fri Dec 17 07:39:30 2021 +0000 + + Merge branch 'sprint/xuan_sunhao/adjust_card_style' into 'master' + + * Optimize style for cards in client. + + See merge request easycorp/zentaopms!985 + +commit 9f7eecf9c6b6fcbb64f0557bb0ce6139827ff6d7 +Author: 孙广明 +Date: Fri Dec 17 15:25:59 2021 +0800 + + * Finish task #46164. + +commit 13fe70296ac9ab1a586e65a55647b2e42964c925 +Author: tianshujie +Date: Fri Dec 17 15:20:10 2021 +0800 + + * Ajust code of kanban. + +commit 2628b1c33fd8f4e03b808c992b7e7c69b89abd38 +Author: tianshujie +Date: Fri Dec 17 15:11:26 2021 +0800 + + * Finish task #46151. + +commit 6a88107d3516b50a39fa882b297173d510fa230b +Merge: b6984e33da f61213d23b +Author: 孙广明 +Date: Fri Dec 17 06:48:20 2021 +0000 + + Merge branch 'sprint/31_zhouxin_fixbug' into 'kanban' + + Sprint/31 zhouxin fixbug + + See merge request easycorp/zentaopms!988 + +commit 48107a5644beda258510df5f7ad37a68b17ee19d +Author: zhengrunyu +Date: Fri Dec 17 14:39:44 2021 +0800 + + *Fix bug + +commit 481ba458067390d9c3939507e340512deebed575 +Author: zhengrunyu +Date: Fri Dec 17 14:37:01 2021 +0800 + + *Fix bug + +commit f61213d23b4f350d721004b3a225b04de4ca9df1 +Author: zhouxin +Date: Fri Dec 17 06:35:24 2021 +0000 + + Fix bug. + +commit 7791113e2662ba80e57754b9da4ca9539cc1a1ad +Author: caoyanyi +Date: Fri Dec 17 06:26:14 2021 +0000 + + * Add create mr by api function. + +commit d10d8be62a1e6d7e796e77b4bba7c2ea060012aa +Author: songchenxuan +Date: Fri Dec 17 14:20:05 2021 +0800 + + *Finish task #46136. + +commit 03399bbb8cecba0ab20984a9d2620d7492746170 +Author: songchenxuan +Date: Fri Dec 17 14:17:12 2021 +0800 + + *Finish task #46136. + +commit fd3a645a30f9fa7415f992e0fde64dfbe3df148f +Author: Hao Sun +Date: Fri Dec 17 14:11:50 2021 +0800 + + * Optimize style for cards in client. + +commit 3381dd3ab0e1a9a40f6dc01fd5548eac26487c48 +Merge: dc4eb9867b 44921262ff +Author: 朱金勇 +Date: Fri Dec 17 06:10:26 2021 +0000 + + Merge branch 'sprint/xuan_sunhao/adjust_card_style' into 'master' + + * Adjust url card style in client. + + See merge request easycorp/zentaopms!981 + +commit 3dc85ea330e92d79e6d644ee6c8fb91e7b62f37c +Author: zenggang +Date: Fri Dec 17 06:06:10 2021 +0000 + + * Delete tag file + +commit 858894a72b36b7c256179dd948a8350a6fb03a17 +Author: Hao Sun +Date: Fri Dec 17 13:59:53 2021 +0800 + + * Fix error when load page in client card. + +commit 54b9265be155064b20d0091645b818d434b256d9 +Author: zenggang +Date: Fri Dec 17 05:58:48 2021 +0000 + + * Finish task#46138 + +commit 59bbd18c550612e308c07552e903e7b9446a80bf +Author: songchenxuan +Date: Fri Dec 17 13:58:31 2021 +0800 + + *Finish task #46099. + +commit 63479860a52b86bd8cbc7dee6b5a2deb7d1121ad +Author: songchenxuan +Date: Fri Dec 17 13:56:24 2021 +0800 + + *Finish task #46099. + +commit 647c81e60816640ad73614ca1fbce6d0728d98c5 +Author: zhouxin +Date: Fri Dec 17 05:42:52 2021 +0000 + + Finish task #46230,46228,46227. + +commit dc4eb9867b743d304c36459922b9f5253c635adf +Author: zhujinyong +Date: Fri Dec 17 13:37:16 2021 +0800 + + * Fix problems of mr. + +commit 3be21de66cf27572e7e7debeea41a4bdbb624244 +Merge: 43d07b8cd0 12093a5dce +Author: zhujinyong +Date: Fri Dec 17 13:35:35 2021 +0800 + + Merge branch 'sprint/178_mayue_17015' + +commit 12093a5dce11cc7766a90307505f8188591ec819 +Merge: 65bcac3b67 43d07b8cd0 +Author: 朱金勇 +Date: Fri Dec 17 05:34:25 2021 +0000 + + Merge branch 'master' into 'sprint/178_mayue_17015' + + # Conflicts: + # module/product/control.php + +commit b6984e33da1ecdc7f7461abcd312ca29a8b911f0 +Merge: 7e088767b9 211af57714 +Author: 孙广明 +Date: Fri Dec 17 05:31:02 2021 +0000 + + Merge branch 'sprint/179_zhengrunyu_' into 'kanban' + + *Fix bug. + + See merge request easycorp/zentaopms!983 + +commit 211af577147f1e14c533867f7e02c543ab20f3f4 +Author: zhengrunyu +Date: Fri Dec 17 13:28:03 2021 +0800 + + *Fix bug. + +commit 7e088767b9a81f05f8fac36c8b116d1de29e1ccc +Merge: 2722e08c1c 80cd2e52fd +Author: 孙广明 +Date: Fri Dec 17 05:24:52 2021 +0000 + + Merge branch 'sprint/179_zhengrunyu_' into 'kanban' + + *Finish task. + + See merge request easycorp/zentaopms!982 + +commit 80cd2e52fdc0fb289ec5d17bc4f79747f97e398c +Author: zhengrunyu +Date: Fri Dec 17 13:23:09 2021 +0800 + + *Fix . + +commit 0e5b54464c3fd0218ef2b59d090d2ed901767830 +Author: zhengrunyu +Date: Fri Dec 17 13:18:10 2021 +0800 + + *Finish task. + +commit b213ed54bae8e542b6fde9c590ee6313aeb4e423 +Merge: e7305d63d4 0f49c232f3 +Author: 王怡栋 +Date: Fri Dec 17 05:04:26 2021 +0000 + + Merge branch 'sprint/devops17_liyuchun' into 'devops17' + + * Fix bug #17640. + + See merge request easycorp/zentaopms!980 + +commit b96a5b286d7d7c62f8da82a8b871d437589762b1 +Author: 王怡栋 +Date: Fri Dec 17 13:03:56 2021 +0800 + + * adjust for task #46002. + +commit 44921262ff70e3ea48f2d56239f25eeda8966253 +Author: Hao Sun +Date: Fri Dec 17 11:33:13 2021 +0800 + + * Adjust url card style in client. + +commit 0f49c232f369249e718d7de3074a31148fe07cf0 +Author: liyuchun +Date: Fri Dec 17 11:12:05 2021 +0800 + + * Fix bug #17640. + +commit 43d07b8cd0e785f1e4bf71802d73a21a0ce5ce2c +Merge: 10dfc32924 6ee1345b07 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 17 03:03:39 2021 +0000 + + Merge branch 'sgm_projectpriv' into 'master' + + * Reset project priv. + + See merge request easycorp/zentaopms!979 + +commit 10dfc32924b664c64d71107d31a278200e1ca31e +Merge: de2e4be174 54651928cf +Author: zhujinyong +Date: Fri Dec 17 10:24:23 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit de2e4be17454d8f4f7e53265116e567d927d6e40 +Author: zhujinyong +Date: Fri Dec 17 10:23:57 2021 +0800 + + * Fix test. + +commit 6ee1345b07e562e51710e0d04d6dc21de423599b +Author: 孙广明 +Date: Fri Dec 17 10:13:49 2021 +0800 + + * Reset project priv. + +commit cd4b1019ef9abc40ce8c4fe2fc530c7f8902f0d8 +Merge: 9ad591fc93 2722e08c1c +Author: tianshujie +Date: Fri Dec 17 09:30:32 2021 +0800 + + Merge branch 'kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/179_tianshujie_46151 + +commit 9ad591fc93ffd680ab4e320bee616539575d05f5 +Author: tianshujie +Date: Fri Dec 17 09:27:50 2021 +0800 + + * Realize the function of sub-molecules. + +commit 2722e08c1cc24ac06ce1ca27b11545ca2f593047 +Merge: 31fcde628b a40d4b9ce1 +Author: 孙广明 +Date: Fri Dec 17 01:17:13 2021 +0000 + + Merge branch 'sprint/177_zhengruyu_' into 'kanban' + + *Finish task.*Finish task.*Finish task.*Finish task.*Finish task.*Finish... + + See merge request easycorp/zentaopms!978 + +commit a40d4b9ce15f9bd18de54bcd66d93951bd4c6ed3 +Author: zhengrunyu +Date: Fri Dec 17 09:11:22 2021 +0800 + + *Finish task. + +commit 31fcde628b6a386dba1368604e4215dd6e19c4f0 +Merge: ddf625db0b cc59614c39 +Author: 孙广明 +Date: Fri Dec 17 00:57:09 2021 +0000 + + Merge branch 'sprint/179_liumengyi_46240' into 'kanban' + + * Finish task #46240. + + See merge request easycorp/zentaopms!977 + +commit a377632a4529d8a6cf4afe17ec8662f99d0fb877 +Author: zhengrunyu +Date: Fri Dec 17 08:49:33 2021 +0800 + + *Finish task. + +commit 3a7789e4139ace310920f627d01cc4892fcfa945 +Author: zhengrunyu +Date: Fri Dec 17 08:48:05 2021 +0800 + + *Finish task + +commit 80ca6c55857b7f007102a4d31da018f039c58147 +Author: zhengrunyu +Date: Fri Dec 17 08:43:48 2021 +0800 + + *Finish task.*Finish task.*Finish task.*Finish task.*Finish task.*Finish task.*Finish task.*Finish task. + +commit cc59614c39af5214f241bbde94d814abad1b9a37 +Author: liumengyi +Date: Fri Dec 17 08:49:43 2021 +0800 + + * Finish task #46240. + +commit 1a6615961712980977d1671824018dc4d74091a0 +Author: 王怡栋 +Date: Fri Dec 17 08:47:23 2021 +0800 + + * code for task #46002. + +commit ddf625db0b0d583c3dc64acdb1fa1bc1ace6247b +Merge: 413865019a 0683b91b5c +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 17 00:08:59 2021 +0000 + + Merge branch 'sprint/30_zhouxin_bug_17513' into 'kanban' + + Fix bug #17513. + + See merge request easycorp/zentaopms!962 + +commit b67911b3044dab8be6e415d4884556831aef114f +Author: xieqiyu +Date: Thu Dec 16 17:19:25 2021 +0800 + + * Pass the data of the merged branch. + +commit 0683b91b5c0e34ae110f11027d41666bc4f3b2e7 +Author: zhouxin +Date: Thu Dec 16 08:30:49 2021 +0000 + + Fixed wrong method used. + +commit d5f1c1362456694923de4fc86860a06a76890c33 +Merge: f58bbf9ad1 413865019a +Author: tianshujie +Date: Thu Dec 16 14:50:49 2021 +0800 + + Merge branch 'kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/179_tianshujie_46151 + +commit e7305d63d47453ce672b7739cd47806d6b17eefa +Merge: 898f65f84b af434d440a +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 16 06:47:10 2021 +0000 + + Merge branch 'devops17_46142' into 'devops17' + + * Finish task#46142 + + See merge request easycorp/zentaopms!970 + +commit 413865019afea99d9c5ced8e086cb67f931b8f29 +Merge: 802e7c8f1a ea92c854d6 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 16 06:43:34 2021 +0000 + + Merge branch 'sprint/179_tianshujie_error' into 'kanban' + + * Modify the error. + + See merge request easycorp/zentaopms!972 + +commit ea92c854d6c9673ef280b19f4ad09d8da871907c +Author: tianshujie +Date: Thu Dec 16 14:41:36 2021 +0800 + + * Modify the error. + +commit f58bbf9ad1c7f64dd2d2195dff9135ab6a8affde +Merge: ad9fdd1330 802e7c8f1a +Author: tianshujie +Date: Thu Dec 16 14:37:41 2021 +0800 + + Merge branch 'kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/179_tianshujie_46151 + +commit 802e7c8f1a13a475b51a0d9cfe57243bd83b9072 +Merge: 0ae5f57d7f 2d2c70abe4 +Author: 孙广明 +Date: Thu Dec 16 14:36:15 2021 +0800 + + Merge branch 'sprint/177_tianshujie_46148' into kanban + +commit c7a49edda8f8550bef5349ce6c863adf1fb2b2a9 +Author: songchenxuan +Date: Thu Dec 16 14:36:01 2021 +0800 + + *Finish task #46136. + +commit 2d2c70abe4957456da44a232d151b46ecde71cbf +Merge: 5444c8f471 0ae5f57d7f +Author: 孙广明 +Date: Thu Dec 16 06:28:32 2021 +0000 + + Merge branch 'kanban' into 'sprint/177_tianshujie_46148' + + # Conflicts: + # module/kanban/control.php + # module/kanban/model.php + +commit 5444c8f4719ae68744c75a7620d2fcfc628fe551 +Author: tianshujie +Date: Thu Dec 16 14:26:03 2021 +0800 + + * Query Kanban data. + +commit ad9fdd13302332d5086ee1f329dbf7e3af571764 +Merge: 99095f8785 0ae5f57d7f +Author: tianshujie +Date: Thu Dec 16 14:23:31 2021 +0800 + + Merge branch 'kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/179_tianshujie_46151 + +commit 348bede8f048fd775095beddf33ddd621e7a2239 +Author: tianshujie +Date: Thu Dec 16 14:21:21 2021 +0800 + + * Modify the code. + +commit 99095f8785b0e0b7583190290a9024a48bea4b69 +Author: tianshujie +Date: Thu Dec 16 14:18:57 2021 +0800 + + * Add a sub-column page. + +commit 0ae5f57d7fe2d9e5b29bdd191adbd459c5ccdf75 +Merge: 0ce78c1930 50f207d053 +Author: 孙广明 +Date: Thu Dec 16 14:14:34 2021 +0800 + + Merge branch 'sprint/179_liumengyi_addpriv' into kanban + +commit 50f207d053ecc84e213d997e87e1001e72a6c0d3 +Merge: 21d7584660 0ce78c1930 +Author: 孙广明 +Date: Thu Dec 16 06:14:24 2021 +0000 + + Merge branch 'kanban' into 'sprint/179_liumengyi_addpriv' + + # Conflicts: + # module/group/lang/resource.php + +commit 0ce78c1930fefe8082a3a0c287fcad7dc8f56e1a +Merge: 6bf47bf918 27ee4d87ed +Author: 孙广明 +Date: Thu Dec 16 05:19:22 2021 +0000 + + Merge branch 'sprint/30_zhouxin_bug_17524' into 'kanban' + + Fix bug 17524. + + See merge request easycorp/zentaopms!971 + +commit 27ee4d87ed48a01dd5b38abeaa8785a08437cb69 +Author: zhouxin +Date: Thu Dec 16 05:15:08 2021 +0000 + + Fix bug 17524. + +commit d9a5f136b19bce45debb7e4cb1464b93c710e57b +Author: caoyanyi +Date: Thu Dec 16 05:13:43 2021 +0000 + + * Add gitlab tag create function and page. + +commit 372fa0fa9c9388fa602bc84411bfe41bf9fb17ab +Author: caoyanyi +Date: Thu Dec 16 05:13:18 2021 +0000 + + * Add test case for gitlab tag create. + +commit 54651928cf2b5d336a4f5cae2ea62d3dcd3ee179 +Merge: 898f65f84b 8bf3c8e6e1 +Author: 朱金勇 +Date: Thu Dec 16 05:06:35 2021 +0000 + + Merge branch 'sprint/xuan_sunhao/improve_client_ui' into 'master' + + * Task #45453, improve UI for opening in xuan client. + + See merge request easycorp/zentaopms!969 + +commit 8bf3c8e6e1fee9cf1217d943d945731a8c378451 +Author: Hao Sun +Date: Thu Dec 16 12:02:33 2021 +0800 + + * Adjust navbar position in client. + +commit 348e44a00e80518dd560b53ca98a872ae5207298 +Author: Hao Sun +Date: Thu Dec 16 11:41:12 2021 +0800 + + * Adjust navbar position in client. + +commit 42599b5d8afe9efb8f586d1befc4fb87e8125f39 +Author: Hao Sun +Date: Thu Dec 16 11:16:53 2021 +0800 + + * Fix text color in app header in client. + +commit af434d440af8bb5d65260ef3eb5eb74582a24a46 +Author: zenggang +Date: Thu Dec 16 03:12:21 2021 +0000 + + * Finish task#46142 + +commit b300ca39da513cf6234bd5f1abd8ebf704c897dc +Author: xieqiyu +Date: Thu Dec 16 11:09:02 2021 +0800 + + * Change branch language for manage. + +commit 697b314cc00e5a3884d9ee122e02e31629e31949 +Author: Hao Sun +Date: Thu Dec 16 10:53:05 2021 +0800 + + * Improve UI for opening in xuan client. + +commit 21d7584660fa0e13940c96346fa22dc653552a43 +Author: liumengyi +Date: Thu Dec 16 10:37:07 2021 +0800 + + * Add card permissions. + +commit af350d6db25c0d580ce760bb0269b988d676b1ba +Author: tianshujie +Date: Thu Dec 16 10:07:41 2021 +0800 + + * Finish task #46148. + +commit 788c1c3f4203a8ebe6654f23b73a11e176937efe +Author: xieqiyu +Date: Thu Dec 16 09:42:50 2021 +0800 + + * Code for task#46102. + +commit 6bf47bf918d6faa56e517a8e598c2349ac3b1a27 +Merge: d7e951d26a 990f1fb88c +Author: 孙广明 +Date: Thu Dec 16 01:37:50 2021 +0000 + + Merge branch 'sprint/179_liumengyi_addpriv' into 'kanban' + + * Add permission for card. + + See merge request easycorp/zentaopms!966 + +commit 990f1fb88cdefc5bd2845162a67a8b76982ea173 +Author: liumengyi +Date: Thu Dec 16 09:35:50 2021 +0800 + + * Add permission for card. + +commit 65bcac3b67bb5ed7df72301065e09025edbd14e5 +Author: mayue +Date: Thu Dec 16 09:07:51 2021 +0800 + + * Optimized code. + +commit d7e951d26abb3172cb3848afd8478dbf898164bc +Merge: e5458fe55e 31f8a27fa6 +Author: 孙广明 +Date: Thu Dec 16 00:41:42 2021 +0000 + + Merge branch 'sprint/179_liumengyi_46150' into 'kanban' + + * Finish task #46150. + + See merge request easycorp/zentaopms!964 + +commit 31f8a27fa67ebd634865f446e5369bf199a9fedf +Author: liumengyi +Date: Thu Dec 16 08:41:07 2021 +0800 + + * Remove unwanted code. + +commit e5458fe55e40ea29c97f0d75ad59dd16a2f8eb9d +Merge: 7c042816d5 244a4b4bdd +Author: 孙广明 +Date: Thu Dec 16 00:38:39 2021 +0000 + + Merge branch 'sprint/179_zhengrunyu_46159' into 'kanban' + + *fix bug. + + See merge request easycorp/zentaopms!965 + +commit 244a4b4bddfd46de0f922a7c008ddf7cb830990d +Author: zhengrunyu +Date: Thu Dec 16 08:37:24 2021 +0800 + + *fix bug. + +commit a1be35b2a1502627ec37ab6463073c007e11b034 +Author: liumengyi +Date: Wed Dec 15 17:46:58 2021 +0800 + + * Finish task #46150. + +commit 4716224337a290be8903ae737c2b24bda01b7138 +Author: liumengyi +Date: Wed Dec 15 17:46:30 2021 +0800 + + * Finish task #46150. + +commit fb8793f1d343858e6a828412ee97bbceee956d0e +Author: songchenxuan +Date: Wed Dec 15 17:29:31 2021 +0800 + + *Finish task #46099. + +commit 6227d52547be0b384747b88d06853fbcdff6fc62 +Author: xieqiyu +Date: Wed Dec 15 17:24:46 2021 +0800 + + * Finish task#46097. + +commit 4adf6e0a52c93cf8d2d0bbf4b19db91a3d470f8e +Author: mayue +Date: Wed Dec 15 17:17:57 2021 +0800 + + * Fix bug #17015. + +commit 7c042816d574d47b34e48850a76535a526c77374 +Merge: 0d43d5ee81 ecd813ee37 +Author: 王怡栋 +Date: Wed Dec 15 09:13:54 2021 +0000 + + Merge branch 'sgm_viewcard' into 'kanban' + + * Fix card bug. + + See merge request easycorp/zentaopms!963 + +commit ecd813ee37523dfcc54408abc54fb811884fa1f8 +Author: 孙广明 +Date: Wed Dec 15 17:10:00 2021 +0800 + + * Fix card bug. + +commit f1079a528a94acbef6efabd46a0d7105d746c6c0 +Author: zhouxin +Date: Wed Dec 15 09:08:23 2021 +0000 + + Fix bug #17513. + +commit 0d43d5ee81af3787f16608d3bdf47f3d02d0f094 +Merge: 387466f7f0 a6c87dec8a +Author: 孙广明 +Date: Wed Dec 15 08:30:55 2021 +0000 + + Merge branch 'sprint/179_liumengyi_region' into 'kanban' + + * Modify the deletion prompt of lane, column and card. + + See merge request easycorp/zentaopms!961 + +commit a6c87dec8a9fde44f47ab4449a330f2be8ff09b3 +Author: liumengyi +Date: Wed Dec 15 16:29:04 2021 +0800 + + * Modify close html files. + +commit 925919f913e0af432f7481fe9cecdccd49db2a1a +Author: liumengyi +Date: Wed Dec 15 16:25:35 2021 +0800 + + * Modify the deletion prompt of lane, column and card. + +commit 898f65f84bcbf72ce27917fb67e4d01fc936f7e7 +Merge: 874b4c6cdd 04eb385659 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 15 07:45:07 2021 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix bug. + + See merge request easycorp/zentaopms!956 + +commit 387466f7f08e8ccd4c2681861d153eb13109e335 +Merge: b99a5f0ff7 d1f43a5025 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 15 07:44:31 2021 +0000 + + Merge branch 'sprint/30_zhouxin_bug_17508' into 'kanban' + + Fix bug #17508. + + See merge request easycorp/zentaopms!960 + +commit d1f43a50252e81452fa7226cbc174e5254e85ff3 +Author: zhouxin +Date: Wed Dec 15 07:31:04 2021 +0000 + + Fix bug #17508. + +commit 874b4c6cdd11399104eefcfa3c8cf97e3c4b8ed1 +Merge: eba28ffa85 8409760490 +Author: 孙广明 +Date: Wed Dec 15 06:56:07 2021 +0000 + + Merge branch 'sprint/master_tanghucheng_17565' into 'master' + + * Fix bug #17565. + + See merge request easycorp/zentaopms!959 + +commit 8409760490912c78dbe623a8398b32febf03839f +Author: tanghucheng +Date: Wed Dec 15 14:55:04 2021 +0800 + + * Fix bug #17565. + +commit b99a5f0ff7ec8997ec94a79674b084d38cad24c2 +Merge: 2172937d50 d236164410 +Author: 孙广明 +Date: Wed Dec 15 06:54:34 2021 +0000 + + Merge branch 'sprint/177_zhengrunyu_close' into 'kanban' + + Sprint/177 zhengrunyu close + + See merge request easycorp/zentaopms!958 + +commit 2172937d505dac7294fe4adab94117d12153e138 +Merge: 4c7f8d44e5 d0a4a17fd9 +Author: 孙广明 +Date: Wed Dec 15 06:51:57 2021 +0000 + + Merge branch 'sprint/177_liumengyi_delete' into 'kanban' + + * Add space, Kanban and region deletion methods. + + See merge request easycorp/zentaopms!957 + +commit d236164410ca512140394dbac101d833c1cf09b0 +Author: zhengrunyu +Date: Wed Dec 15 14:51:31 2021 +0800 + + *add delete lane and column. + +commit d0a4a17fd9ddd8e0d225e4124f4b82f14871ac6b +Author: liumengyi +Date: Wed Dec 15 14:48:31 2021 +0800 + + * Modify judgment conditions. + +commit 9f37454e8f5ddf3e10ebafb95dd8c649dbc167d0 +Author: zhengrunyu +Date: Wed Dec 15 14:46:10 2021 +0800 + + *close lane and column. + +commit dbaceb0a29bb6ccb0207754b6229debbdc05ab15 +Author: liumengyi +Date: Wed Dec 15 14:40:13 2021 +0800 + + * Add space, Kanban and region deletion methods. + +commit 04eb385659002f15cadc91bd2342c701bfa8cf1c +Author: 孙广明 +Date: Wed Dec 15 14:34:52 2021 +0800 + + * Fix bug. + +commit 4c7f8d44e5d5e9e4e88f6cb3102eda8fec8bfe45 +Merge: b50293adc0 1ce962d177 +Author: 孙广明 +Date: Wed Dec 15 06:15:18 2021 +0000 + + Merge branch 'sprint/177_zhengrunyu_close' into 'kanban' + + *Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug + + See merge request easycorp/zentaopms!955 + +commit 1ce962d1776fe9e7704f45891aca579be8d11e9a +Author: zhengrunyu +Date: Wed Dec 15 14:13:15 2021 +0800 + + *Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug*Fix bug + +commit b50293adc0818c8008637142780e131bbf93434c +Merge: 24298b5d24 e7e22df6bf +Author: 孙广明 +Date: Wed Dec 15 05:45:39 2021 +0000 + + Merge branch 'sprint/177_tianshujie_close' into 'kanban' + + * Add close space function. + + See merge request easycorp/zentaopms!954 + +commit e7e22df6bff1a361febf1c4ed8e1fb69cd32d003 +Author: tianshujie +Date: Wed Dec 15 13:43:36 2021 +0800 + + * Modify the code. + +commit d6b68211a4cc29ecb4abd17960adcdea951958b4 +Author: tianshujie +Date: Wed Dec 15 13:33:41 2021 +0800 + + * Add and delete card function. + +commit 4e9b6f72987f812d290991cfe73638f60eb5528e +Merge: 66174b2341 24298b5d24 +Author: tianshujie +Date: Wed Dec 15 13:32:09 2021 +0800 + + Merge branch 'kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/177_tianshujie_close + +commit 24298b5d24466e3d669c2fa37d18486ce5769140 +Merge: 4293ca8714 78345e3785 +Author: 孙广明 +Date: Wed Dec 15 13:21:34 2021 +0800 + + Merge branch 'sgm_kanbandetail' into kanban + +commit 78345e3785f69e6a7b5b457e82218a633b005b5a +Merge: 0ab00d2037 4293ca8714 +Author: 孙广明 +Date: Wed Dec 15 05:20:45 2021 +0000 + + Merge branch 'kanban' into 'sgm_kanbandetail' + + # Conflicts: + # module/kanban/js/view.js + # module/kanban/lang/en.php + # module/kanban/model.php + # module/kanban/view/createcard.html.php + # module/kanban/view/createcolumn.html.php + # module/kanban/view/viewcard.html.php + +commit 0ab00d203763e9c0a6ca9328fe03106af3f0597f +Author: 孙广明 +Date: Wed Dec 15 13:13:07 2021 +0800 + + * Code details. + +commit 66174b23410e359e00d2656f72a1f4bcfef64034 +Author: tianshujie +Date: Wed Dec 15 11:31:02 2021 +0800 + + * Add close space function. + +commit 4293ca871452d1c0c523cfb124b4977018140303 +Merge: e17aa6f3f7 d97494e257 +Author: 孙广明 +Date: Wed Dec 15 03:20:05 2021 +0000 + + Merge branch 'sprint/kanban_tanghucheng_stage' into 'kanban' + + * Code for stage. + + See merge request easycorp/zentaopms!953 + +commit e17aa6f3f71c4832eb91427fa899ac98999c4c9e +Merge: 0641d7db15 9cc52b4169 +Author: 孙广明 +Date: Wed Dec 15 03:15:34 2021 +0000 + + Merge branch 'sprint/177_tianshujie_card' into 'kanban' + + * Modify and create card style. + + See merge request easycorp/zentaopms!952 + +commit d97494e257f127ef91ada23ba7aa559c65ee3caa +Author: tanghucheng +Date: Wed Dec 15 11:14:15 2021 +0800 + + * Code for stage. + +commit 9cc52b416990495a889ee601e2b04cd8f30ae15f +Author: tianshujie +Date: Wed Dec 15 11:13:17 2021 +0800 + + * Modify and create card style. + +commit 0641d7db15dd6092e5b9812368f53d614d44fd19 +Merge: d7646afa83 4050299015 +Author: 孙广明 +Date: Wed Dec 15 02:53:09 2021 +0000 + + Merge branch 'sprint/177_liumengyi_17538' into 'kanban' + + * Fix bug #17538. + + See merge request easycorp/zentaopms!951 + +commit 40502990151efbc653e857d62c7a23e7c69fa04c +Author: liumengyi +Date: Wed Dec 15 10:51:42 2021 +0800 + + * Fix bug #17538. + +commit d7646afa839a685104e6abbfdc2bcd9b092842c8 +Merge: dce707c7b9 3e5427789f +Author: 孙广明 +Date: Wed Dec 15 02:46:13 2021 +0000 + + Merge branch 'sprint/177_tianshujie_kanban' into 'kanban' + + * Modify the team drop-down pop-up method. + + See merge request easycorp/zentaopms!950 + +commit dce707c7b9e31ef8627f50301e702b561635b42a +Merge: 0d35e96baf 0d09364ee2 +Author: 孙广明 +Date: Wed Dec 15 02:43:35 2021 +0000 + + Merge branch 'sprint/177_tianshujie_kanban' into 'kanban' + + * Fix the issue of viewing card permissions. + + See merge request easycorp/zentaopms!946 + +commit 3e5427789f91b8a78782707d985c2c88dc2676b6 +Author: tianshujie +Date: Wed Dec 15 10:43:35 2021 +0800 + + * Modify the team drop-down pop-up method. + +commit 0d35e96baf138ba529b0f6a416d251cc07ce3cf6 +Merge: 317fc9c3a9 085846cb48 +Author: 孙广明 +Date: Wed Dec 15 02:37:07 2021 +0000 + + Merge branch 'sprint/177_liumengyi_setlane' into 'kanban' + + * Fix bug #17537,#17542. + + See merge request easycorp/zentaopms!948 + +commit 317fc9c3a91b939c3eff92dd87bae41b20b3c1c3 +Merge: 54ac398d46 57474fce26 +Author: 孙广明 +Date: Wed Dec 15 02:36:03 2021 +0000 + + Merge branch 'sprint/177_zhengrunyu_fixbug' into 'kanban' + + *Fix bug + + See merge request easycorp/zentaopms!949 + +commit 0d09364ee290004ac1b1b77382f92594b8cc3396 +Author: tianshujie +Date: Wed Dec 15 10:34:03 2021 +0800 + + * Fix bug #17540. + +commit 085846cb48fb0c07fe84a9b6bd9b5d234aaa5016 +Author: liumengyi +Date: Wed Dec 15 10:25:27 2021 +0800 + + * Add judgment conditions. + +commit 57474fce2638fd178c7e8110d0294035fc9512b5 +Author: zhengrunyu +Date: Wed Dec 15 10:23:33 2021 +0800 + + *Fix bug + +commit 72739ca93706ffefb5211577e2fd8d03d14b16a9 +Author: tianshujie +Date: Wed Dec 15 10:22:01 2021 +0800 + + * Fix bug #17546. + +commit 1de91f9c04522177f03bef4d0050acc4d5048faf +Author: liumengyi +Date: Wed Dec 15 10:20:14 2021 +0800 + + * Fix bug #17537,#17542. + +commit 610d12a632c2675f55722911092466bead300baf +Author: 孙广明 +Date: Wed Dec 15 10:09:07 2021 +0800 + + * Code for card info. + +commit f1289a8d1a53320d1997986604610d1995ea5aae +Author: liumengyi +Date: Wed Dec 15 09:01:33 2021 +0800 + + * Modify set wip method. + +commit 9096817ac5b756aad6782cd18fdd5fab67689e17 +Author: tanghucheng +Date: Tue Dec 14 19:02:48 2021 +0800 + + * Fix bug #17535. + +commit 6b3bd72ef191599f3c99a42451feab711ee256a7 +Author: tianshujie +Date: Tue Dec 14 17:24:03 2021 +0800 + + * Fix card details style. + +commit c6538afacc1bdab570303b5cd60874e049b413b9 +Author: tianshujie +Date: Tue Dec 14 17:07:03 2021 +0800 + + * Fix the display error of the board. + +commit 530e7e55b0cb262878e9086deb1813bbb090d6ed +Author: 孙广明 +Date: Wed Dec 15 10:10:11 2021 +0800 + + * Merge code. + +commit ca272d7979584d1a8ebc942ca433582d7d3fe968 +Author: tianshujie +Date: Wed Dec 15 10:01:46 2021 +0800 + + * Add title attribute. + +commit 58e48d0e5f3bec97b2e839b2d22a7d45f93f8959 +Author: tianshujie +Date: Wed Dec 15 09:50:06 2021 +0800 + + * Fix the issue of viewing card permissions. + +commit 54ac398d467cfd7038f2ea5adccb1d71e8b90a18 +Merge: f5bbd8f3ec 498ea23823 +Author: 孙广明 +Date: Wed Dec 15 01:09:17 2021 +0000 + + Merge branch 'sprint/177_tianshujie_cardview' into 'kanban' + + * Fix card details style. + + See merge request easycorp/zentaopms!943 + +commit f5bbd8f3ec5ee59d585d16a38572d50975d04dec +Merge: 38560244bf 7feb83733d +Author: 孙广明 +Date: Wed Dec 15 01:07:08 2021 +0000 + + Merge branch 'sprint/177_liumengyi_fixbug' into 'kanban' + + * Modify set wip method. + + See merge request easycorp/zentaopms!945 + +commit 38560244bf69c2fa4378df9da20dbd4256826943 +Merge: ecc4dafe0d 9a06198494 +Author: 孙广明 +Date: Wed Dec 15 01:03:08 2021 +0000 + + Merge branch 'sprint/kanban_tanghucheng_17535' into 'kanban' + + * Fix bug #17535. + + See merge request easycorp/zentaopms!942 + +commit 7feb83733d34a31140b8ba6e33fac2c97fbf5bd1 +Author: liumengyi +Date: Wed Dec 15 09:01:33 2021 +0800 + + * Modify set wip method. + +commit f02ca7df035ad19167730c5b89c2d6a71c9bb0dd +Author: hufangzhou +Date: Wed Dec 15 08:40:25 2021 +0800 + + * Code for task #45756. + +commit eba28ffa8585925c60a4f927fad986a7be45873f +Merge: b3b60dd4e4 8a014b58f4 +Author: 朱金勇 +Date: Wed Dec 15 00:40:22 2021 +0000 + + Merge branch 'sprint/176_songchenxuan_45535' into 'master' + + *Fix task #45535 bug. + + See merge request easycorp/zentaopms!944 + +commit b3b60dd4e4a6171e39ca101ab118d74677b87aaf +Merge: 328379d956 731c7fb45c +Author: 朱金勇 +Date: Wed Dec 15 00:39:56 2021 +0000 + + Merge branch 'sprint/176_songchenxuan_45545' into 'master' + + *Fix task #45545 bug. + + See merge request easycorp/zentaopms!941 + +commit 8a014b58f43f77507122f1a497a4457fc0ae0b03 +Author: songchenxuan +Date: Wed Dec 15 08:37:31 2021 +0800 + + *Fix task #45535 bug. + +commit 9a06198494c4ed27a43bc9de8b251b40b8e74ba0 +Author: tanghucheng +Date: Tue Dec 14 19:02:48 2021 +0800 + + * Fix bug #17535. + +commit 731c7fb45c557a581353721c80f02d2ea86cbc3a +Author: songchenxuan +Date: Tue Dec 14 17:33:01 2021 +0800 + + *Fix task #45545 bug. + +commit 498ea23823a75ef522e6fe5a3de1a62e0f71b9ae +Author: tianshujie +Date: Tue Dec 14 17:24:03 2021 +0800 + + * Fix card details style. + +commit 328379d9561156595a2fc172c21be7dc40924d8d +Merge: 2be30ab738 fde47bebb6 +Author: 朱金勇 +Date: Tue Dec 14 09:12:47 2021 +0000 + + Merge branch 'sprint/176_xieqiyu_17516' into 'master' + + * Fix bug#17516. + + See merge request easycorp/zentaopms!939 + +commit 2be30ab738b8ffa877e9e9b11ef90a0a087ec9df +Merge: 7a7dd0d6c3 df21c2f8bf +Author: 孙广明 +Date: Tue Dec 14 09:10:53 2021 +0000 + + Merge branch 'sprint/liyuchun_bug' into 'master' + + * Fix bug #17521. + + See merge request easycorp/zentaopms!938 + +commit ecc4dafe0d6af42813fdd5d3892322eab345f5f0 +Merge: fcf709a7b4 8974e7080b +Author: 孙广明 +Date: Tue Dec 14 09:10:37 2021 +0000 + + Merge branch 'sprint/177_tianshujie_cardview' into 'kanban' + + * Fix the display error of the board. + + See merge request easycorp/zentaopms!940 + +commit 8974e7080b2c9db5fe72252e9743ca56eb0237fb +Author: tianshujie +Date: Tue Dec 14 17:07:03 2021 +0800 + + * Fix the display error of the board. + +commit fde47bebb6b2cd8a488552f74de6edf3fc54512c +Author: xieqiyu +Date: Tue Dec 14 16:56:59 2021 +0800 + + * Fix bug#17516. + +commit df21c2f8bff2dba61a8382d5a7d86e9a68851a5e +Author: liyuchun +Date: Tue Dec 14 16:56:40 2021 +0800 + + * Fix bug #17521. + +commit fcf709a7b440c3c9bc016251b67f3f31c503738a +Merge: da93f52918 1a3883325b +Author: 孙广明 +Date: Tue Dec 14 08:48:27 2021 +0000 + + Merge branch 'sprint/177_tianshujie_card' into 'kanban' + + * Finish task #45828. + + See merge request easycorp/zentaopms!937 + +commit 1a3883325b219a8fdd92b53237740a3e7498cec3 +Author: tianshujie +Date: Tue Dec 14 16:45:03 2021 +0800 + + * Finish task #45828. + +commit 6ea815f13eab6f4feae2ee1df452b3ee04a12d4e +Author: 孙广明 +Date: Tue Dec 14 16:22:24 2021 +0800 + + * Fix create card view. + +commit 7a7dd0d6c352b6b57e808d9a266e797779adb089 +Merge: d5d4cfe049 a978d41365 +Author: 朱金勇 +Date: Tue Dec 14 07:49:20 2021 +0000 + + Merge branch 'sprint/176_xieqiyu_17503' into 'master' + + * Fix bug#17503. + + See merge request easycorp/zentaopms!931 + +commit a978d4136562105e9860c70cee6f8bc082e1943e +Author: xieqiyu +Date: Tue Dec 14 15:47:19 2021 +0800 + + * Code for bug#17503. + +commit da93f529184b2011e88011f995b9067b3ec09b07 +Merge: 1811c641de 750184ff08 +Author: 孙广明 +Date: Tue Dec 14 15:43:52 2021 +0800 + + Merge branch 'sgm_displaycard' into kanban + +commit d5d4cfe049cb09e55bc8f2e5a7545cf1842a21a2 +Merge: e683c32d25 7deea0d588 +Author: 朱金勇 +Date: Tue Dec 14 07:43:32 2021 +0000 + + Merge branch 'sprint/176_mayue_45544' into 'master' + + * Optimize code. + + See merge request easycorp/zentaopms!936 + +commit e683c32d25e5367e38087de30641385d476ecc96 +Merge: 7f098934f8 2f862118d8 +Author: 朱金勇 +Date: Tue Dec 14 07:40:58 2021 +0000 + + Merge branch 'sprint/177_sunhao/use_rings' into 'master' + + * Refactor progress-pie instead of rings to improve perf. + + See merge request easycorp/zentaopms!932 + +commit 1811c641dea6c511783c6713950e77af787605f2 +Merge: 875451d898 08cb4bea97 +Author: 孙广明 +Date: Tue Dec 14 15:21:11 2021 +0800 + + Merge branch 'sgm_displaycard' into kanban + +commit 750184ff08eaa75c118e7d36574c35eab7fc63bd +Merge: 66c268f186 3227fe3a9b +Author: 孙广明 +Date: Tue Dec 14 07:20:58 2021 +0000 + + Merge branch 'kanban' into 'sgm_displaycard' + + # Conflicts: + # module/kanban/control.php + # module/kanban/lang/en.php + # module/kanban/model.php + # module/kanban/view/createcard.html.php + +commit 08cb4bea97decda066d2981232a18c7e28b457e2 +Author: 孙广明 +Date: Tue Dec 14 15:13:37 2021 +0800 + + * Code details. + +commit 3227fe3a9b0530e2f55a4871a71a7b5666c85db7 +Merge: 2c12c5ec43 59eea3a8d3 +Author: 孙广明 +Date: Tue Dec 14 06:55:30 2021 +0000 + + Merge branch 'sprint/177_zhengrunyu_' into 'kanban' + + *Fix bug + + See merge request easycorp/zentaopms!933 + +commit 59eea3a8d3bcb07f99f6eab124afad5f87d23fcd +Author: zhengrunyu +Date: Tue Dec 14 14:54:19 2021 +0800 + + *fix + +commit 2c12c5ec43bd49b2da4caa0b3bb803f09ae9ae89 +Merge: 02227a8831 44c8a3b7a8 +Author: 孙广明 +Date: Tue Dec 14 06:52:59 2021 +0000 + + Merge branch 'sprint/177_tianshujie_kanban' into 'kanban' + + Optimize permissions + + See merge request easycorp/zentaopms!935 + +commit 02227a88318d0776c23feca123c8fd30074d24ba +Merge: f3a2bdce00 3b377beba4 +Author: 孙广明 +Date: Tue Dec 14 06:46:50 2021 +0000 + + Merge branch 'sprint/177_liumengyi_17510' into 'kanban' + + * Fix bug #17510. + + See merge request easycorp/zentaopms!930 + +commit 66c268f18611da6768fe95919a95a51cbc389dc7 +Author: 孙广明 +Date: Tue Dec 14 14:45:24 2021 +0800 + + * Fix js code. + +commit 3b377beba4356f53af6e8c376ead7b80fb799b0f +Author: liumengyi +Date: Tue Dec 14 14:44:27 2021 +0800 + + * Modify style for create lane. + +commit 8d77f8599b5ec66b57119aed0a0f2c6b1df872e5 +Author: 孙广明 +Date: Tue Dec 14 14:43:48 2021 +0800 + + * Code for card. + +commit 44c8a3b7a8d742de7991679db05731cec09b7991 +Author: tianshujie +Date: Tue Dec 14 14:39:44 2021 +0800 + + * Fix bug #17506. + +commit 5d96d7d9c7f7bd0a498291124401053e50afde08 +Author: liumengyi +Date: Tue Dec 14 14:37:32 2021 +0800 + + * Modify English language items. + +commit d7b47e42b0d790510a4b44feb9eaad73962257a4 +Author: zhengrunyu +Date: Tue Dec 14 14:35:24 2021 +0800 + + *Fix bug + +commit 2f862118d8f8886a00249555e61b23460d3ec38f +Author: Hao Sun +Date: Tue Dec 14 14:31:41 2021 +0800 + + * Refactor progress-pie instead of rings to improve perf. + +commit ed9eedf54399bb5e1ad8455e09c45fd85ad44139 +Author: xieqiyu +Date: Tue Dec 14 14:27:26 2021 +0800 + + * Fix bug#17503. + +commit bec43f53b951f36108388c3c545200ea7a7e412e +Author: liumengyi +Date: Tue Dec 14 14:26:19 2021 +0800 + + * Fix bug #17510. + +commit 7f098934f8352c5e3457a453266a1b257aa18caa +Merge: efdadc07a7 9c47c36ba3 +Author: 李玉春 <563917701@qq.com> +Date: Tue Dec 14 06:10:24 2021 +0000 + + Merge branch 'devops_mr_unit' into 'master' + + * Add mr create unit test and adjust code + + See merge request easycorp/zentaopms!919 + +commit 1ee34df7070381318c0cc2dd76077c107a02ebdb +Author: tianshujie +Date: Tue Dec 14 14:09:34 2021 +0800 + + * Add authority control to the kanban column operation buttons. + +commit f3a2bdce00c6db43642bdd06ecea2f82b321320c +Merge: 7d35d1c878 4244e0cc23 +Author: 孙广明 +Date: Tue Dec 14 06:07:00 2021 +0000 + + Merge branch 'sprint/177_liumengyi_fixbug' into 'kanban' + + * Fix bug for view card. + + See merge request easycorp/zentaopms!929 + +commit 9c47c36ba37b14f8b9c42cf08a6dd78d1db41953 +Author: zenggang +Date: Tue Dec 14 06:06:55 2021 +0000 + + * Adjust code style + +commit 4244e0cc23ffd5ab85d7f6a9f14e800bc86cb0c0 +Author: liumengyi +Date: Tue Dec 14 13:54:53 2021 +0800 + + * Remove useless code. + +commit 7fded68a0d674b507cc645deacdfe468c8dfb1dc +Author: liumengyi +Date: Tue Dec 14 13:53:14 2021 +0800 + + * Fix bug for view card. + +commit dbc8968eb1c3ba1d84fb80fa4e5d665c4d2c4ade +Author: tianshujie +Date: Tue Dec 14 13:48:04 2021 +0800 + + * Modify the width of the pop-up window. + +commit 7deea0d5881a4b02ecf0ed7b88943941f135b6ac +Author: mayue +Date: Tue Dec 14 13:42:54 2021 +0800 + + * Optimize code. + +commit efdadc07a7e75c18c346baf15f400e97b3959b4a +Merge: a14138be45 35a7df0974 +Author: 朱金勇 +Date: Tue Dec 14 05:34:42 2021 +0000 + + Merge branch 'sprint/176_mayue_45544' into 'master' + + * Finish a task #45544. + + See merge request easycorp/zentaopms!928 + +commit 7d35d1c8783399095284f8921170182c4a2e7662 +Merge: ce52632d91 1ba0da2414 +Author: 孙广明 +Date: Tue Dec 14 03:31:19 2021 +0000 + + Merge branch 'sprint/177_tianshujie_kanban' into 'kanban' + + * Modify the save prompt method. + + See merge request easycorp/zentaopms!926 + +commit 1ba0da2414cad79c480d7a8c35709e73fe3671d8 +Author: tianshujie +Date: Tue Dec 14 11:29:16 2021 +0800 + + * Edit button. + +commit ce48a83014a90cedf2bfdc0685e4aa4b04aa7bc1 +Author: tianshujie +Date: Tue Dec 14 11:25:14 2021 +0800 + + * Add setting button print permission. + +commit ce52632d91c08ef484cae549246849dacc13353d +Merge: cc1b1ed0df 778693727f +Author: 孙广明 +Date: Tue Dec 14 03:19:48 2021 +0000 + + Merge branch 'sprint/177_liumengyi_fixbug' into 'kanban' + + * Fix bug for create kanban card. + + See merge request easycorp/zentaopms!927 + +commit 778693727fd738402a6e196337a5d635a17b0bfd +Author: liumengyi +Date: Tue Dec 14 11:18:17 2021 +0800 + + * Fix bug for create kanban card. + +commit cc1b1ed0dff61250150c538dea1f6b52abbad400 +Merge: ee77fa21e3 f743e11177 +Author: 孙广明 +Date: Tue Dec 14 03:11:37 2021 +0000 + + Merge branch 'sprint/177_liumengyi_45820' into 'kanban' + + * Finish task #45820. + + See merge request easycorp/zentaopms!925 + +commit f743e111778ff5a197a63b2ebbb1cb1067a39caf +Author: liumengyi +Date: Tue Dec 14 11:09:09 2021 +0800 + + * Modify view card file. + +commit 35a7df09740e676fe9f8371010524f915e57fab3 +Author: mayue +Date: Tue Dec 14 11:02:15 2021 +0800 + + * Optimize code. + +commit eab106b614c2726cfc0bd3c578daa16a6b9a3e45 +Author: 孙广明 +Date: Tue Dec 14 11:01:49 2021 +0800 + + * Code for display card. + +commit 5f33672c1299909a36ab0e90269187dd2f8e43f6 +Author: tianshujie +Date: Tue Dec 14 10:44:31 2021 +0800 + + * Modify the save prompt method. + +commit 8ad14bea25a7075e3272693feb6a501bcd996a26 +Author: liumengyi +Date: Tue Dec 14 10:42:59 2021 +0800 + + * Finish task #45820. + +commit 63bc23d43f275f36d3295fd9675084842cc5b0cd +Author: Yurun +Date: Tue Dec 14 10:41:02 2021 +0800 + + Optimize bug module + +commit e3db243569538da1c5c99a751be668bb11f25ba3 +Author: Yurun +Date: Tue Dec 14 10:40:43 2021 +0800 + + Fix string + +commit ee77fa21e36d0192fa4e029935a2cb5fef60d4d2 +Merge: 0dede9e395 2c6bc8ac7e +Author: 孙广明 +Date: Tue Dec 14 02:31:03 2021 +0000 + + Merge branch 'sprint/kanban_tanghucheng_17316' into 'kanban' + + * Fix bug #17314,17316. + + See merge request easycorp/zentaopms!923 + +commit 2c6bc8ac7e7999caa269dd993d802f06e7751cbf +Author: tanghucheng +Date: Tue Dec 14 10:29:01 2021 +0800 + + * Fix bug #17316. + +commit 781314142cee4bbdabc84c5488e7dfa038600ff0 +Author: tanghucheng +Date: Tue Dec 14 10:20:34 2021 +0800 + + * Fix bug #17316. + +commit ccf82f622694c4e915a3aea36ac986bf2b8066a2 +Author: mayue +Date: Tue Dec 14 10:18:35 2021 +0800 + + * Modify annotation. + +commit 0dede9e395c8cf82b7f6fb13b96f8395cb8cb790 +Merge: 900ee6ac24 4571f1bfa8 +Author: 孙广明 +Date: Tue Dec 14 02:16:08 2021 +0000 + + Merge branch 'sprint/177_tianshujie_action' into 'kanban' + + Sprint/177 tianshujie action + + See merge request easycorp/zentaopms!922 + +commit 4571f1bfa8fe14e88660a54318ebfc058e25fa72 +Author: tianshujie +Date: Tue Dec 14 10:01:38 2021 +0800 + + * Add Kanban permission control. + +commit a14138be45539b401e57fe0125458c38527ef949 +Merge: 26dc3e847d 559ce03369 +Author: 朱金勇 +Date: Tue Dec 14 01:54:13 2021 +0000 + + Merge branch 'sprint/176_xieqiyu_17472' into 'master' + + * Fix bug#17472. + + See merge request easycorp/zentaopms!921 + +commit 77d36b7467efb5573b7056d008f75e2ed4b3a526 +Author: mayue +Date: Tue Dec 14 09:49:46 2021 +0800 + + * Finish a task #45544. + +commit 26dc3e847d9f2c068bfc499c5702f72cc7059171 +Merge: fb6f913229 6829d52cde +Author: 朱金勇 +Date: Tue Dec 14 01:48:56 2021 +0000 + + Merge branch 'sprint/176_xieqiyu_17469' into 'master' + + * Fix bug#17469. + + See merge request easycorp/zentaopms!918 + +commit d7538814a77b93f5ca8a54b24d7cccb6051635f6 +Author: Yurun +Date: Tue Dec 14 09:47:53 2021 +0800 + + Optimize execution module + +commit fb6f913229294f641cbe6eebb7891aa1372d60b1 +Merge: 45cdfc8f59 0899d3ddea +Author: 李玉春 <563917701@qq.com> +Date: Tue Dec 14 01:47:24 2021 +0000 + + Merge branch 'sprint/devops16_wangyidong_test' into 'master' + + * code for bug #17445. + + See merge request easycorp/zentaopms!920 + +commit 0899d3ddea67bcf6fc900d808e0082b7ed3b4856 +Author: 王怡栋 +Date: Tue Dec 14 09:37:42 2021 +0800 + + code for bug #17465. + +commit 1bc35c32c485f88fbaa7fb276c3ad8610dac0263 +Author: 王怡栋 +Date: Tue Dec 14 09:13:50 2021 +0800 + + * code for task #17444. + +commit 45cdfc8f59793fa9b8d5278cae591281b22716a3 +Merge: e3b686cf57 57da5467c9 +Author: zhujinyong +Date: Tue Dec 14 09:08:15 2021 +0800 + + Merge branch 'xuan' + +commit 559ce03369b526c879f6204b3356252da32c57ae +Author: xieqiyu +Date: Tue Dec 14 08:57:10 2021 +0800 + + * Fix bug#17472. + +commit 900ee6ac24e9ba051f7e3ef6cf73a4f71619fd0b +Merge: b01b11dd7b b64b4cfc6f +Author: 孙广明 +Date: Tue Dec 14 00:53:41 2021 +0000 + + Merge branch 'sprint/max_tanghucheng_45806' into 'kanban' + + * Finish task #45806. + + See merge request easycorp/zentaopms!900 + +commit e3b686cf573ad9cc74fa2a663cb7231bb2301905 +Author: zhujinyong +Date: Tue Dec 14 08:48:49 2021 +0800 + + * Fix merge. + +commit d429a09d420a1be95860efe5d295680d1feda5b3 +Author: tianshujie +Date: Mon Dec 13 17:46:30 2021 +0800 + + * Fix the error. + +commit cc414d4e143b354d28236609a4ec26e833914fdc +Author: tianshujie +Date: Mon Dec 13 17:45:42 2021 +0800 + + * Fix Kanban dynamic issue. + +commit 98a46445b3aeff51034221086f3be174406d4b82 +Author: 王怡栋 +Date: Mon Dec 13 17:24:52 2021 +0800 + + * code for bug #17445. + +commit a34c753438dd08a2c5fc1f1a2bd9079d21c97183 +Author: zenggang +Date: Mon Dec 13 09:08:00 2021 +0000 + + * Add mr create unit test and adjust code + +commit b01b11dd7bb845a8b4a1f775d74b1c5850eec4db +Merge: 10d77713d1 4f5367dae7 +Author: 朱金勇 +Date: Mon Dec 13 09:01:02 2021 +0000 + + Merge branch 'sprint/30_zhouxin_45800' into 'kanban' + + Finish task #45800. + + See merge request easycorp/zentaopms!917 + +commit 6829d52cdeca734a046f079ad3f20388787755c7 +Author: xieqiyu +Date: Mon Dec 13 16:57:25 2021 +0800 + + * Fix bug#17469. + +commit 4f5367dae7263c8740e101ad6b5de926f5a8fb51 +Author: zhouxin +Date: Mon Dec 13 08:56:39 2021 +0000 + + made small changes. + +commit 40f27795e17255317b7f9a9bb53f0b070f6a32c8 +Author: zhouxin +Date: Mon Dec 13 08:45:37 2021 +0000 + + change if...else to switch...case,change now to today. + +commit 10d77713d1113fdf524e2a2e731607be9b6e960e +Merge: 875451d898 a4fd0775ad +Author: 孙广明 +Date: Mon Dec 13 08:45:10 2021 +0000 + + Merge branch 'sprint/master_zhouxin_45795' into 'kanban' + + Sprint/master zhouxin 45795 + + See merge request easycorp/zentaopms!863 + +commit 875451d89869e9a4e84e305e3af3ed1da1c2786b +Merge: e622e958cf d75774cafc +Author: 孙广明 +Date: Mon Dec 13 16:11:16 2021 +0800 + + Merge branch 'sprint/177_tianshujie_card' into kanban + +commit d75774cafc816de5b32d4ca3589ef7a3d5cb119b +Merge: 8add043e90 e622e958cf +Author: 孙广明 +Date: Mon Dec 13 08:11:03 2021 +0000 + + Merge branch 'kanban' into 'sprint/177_tianshujie_card' + + # Conflicts: + # module/kanban/lang/en.php + # module/kanban/lang/zh-cn.php + +commit 47c4b4e5267713f8b82298aa96b9f711ae8bd17c +Merge: 65f3bae568 eadbb0e1de +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 13 08:10:11 2021 +0000 + + Merge branch 'sprint/devops16_wangyidong_test' into 'master' + + * code for bug #17438. + + See merge request easycorp/zentaopms!915 + +commit eadbb0e1de96840a47d183cd980bdc0c40a83685 +Author: 王怡栋 +Date: Mon Dec 13 16:09:40 2021 +0800 + + * adjust code. + +commit 8add043e904e7bae79ac97c222a67767ed5e3fa9 +Author: tianshujie +Date: Mon Dec 13 16:06:15 2021 +0800 + + * Modify the code. + +commit f2020b41c790409d6cec277d50917393ccdc3ad8 +Author: Yurun +Date: Mon Dec 13 15:58:44 2021 +0800 + + Optimize product module + +commit 9567620ff4d72bbad09682616eb597becc989807 +Author: zhouxin +Date: Mon Dec 13 07:53:23 2021 +0000 + + Finish task #45800. + +commit 6a894bc7fbdd96e59e255485492c23cc0e444a10 +Author: tianshujie +Date: Mon Dec 13 15:37:33 2021 +0800 + + * Finish task #45829. + +commit 69023a52bc8c7f90f61d892fc4c8f656f6861f83 +Author: 王怡栋 +Date: Mon Dec 13 15:24:04 2021 +0800 + + * code for bug #17438. + +commit 66fd19444a115f86a75867b125897ed62e4791a3 +Author: Yurun +Date: Mon Dec 13 15:22:56 2021 +0800 + + Optimize story module + +commit e622e958cfa0900bd1c0725fa20039cb27fb068a +Merge: a14bfc93e7 91b700ec42 +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 13 07:11:47 2021 +0000 + + Merge branch 'sgm_addcard' into 'kanban' + + * Code for task #45819. + + See merge request easycorp/zentaopms!914 + +commit 91b700ec423d6569fe2e10e8574306aa7069d32d +Author: 孙广明 +Date: Mon Dec 13 14:59:43 2021 +0800 + + * Fix code details. + +commit b6fa975c4555ebb45b6d6b16f34a068a4a207d74 +Author: 孙广明 +Date: Mon Dec 13 14:47:46 2021 +0800 + + * Add en lang. + +commit 557afc06efb8029427159e787c86dc89fe233881 +Author: 孙广明 +Date: Mon Dec 13 14:42:56 2021 +0800 + + * Code for task #45819. + +commit 65f3bae568e5068ae79af951d807cadcb17d935c +Merge: 78e51a5900 acc03bdcfe +Author: 王怡栋 +Date: Mon Dec 13 06:41:39 2021 +0000 + + Merge branch 'sprint/liyuchun_bug' into 'master' + + * Fix bug #17439. + + See merge request easycorp/zentaopms!913 + +commit acc03bdcfe6b35c2135f31a2afa9be371322912c +Author: liyuchun +Date: Mon Dec 13 14:40:43 2021 +0800 + + * Fix bug #17439. + +commit 56d849cf0a9c37c9b5775e482854fb10ae54b47b +Author: liyuchun +Date: Mon Dec 13 14:28:19 2021 +0800 + + * Fix bug #17439. + +commit a14bfc93e7c97a3d0b65bd8498bbf0d361e86aa1 +Merge: 6404b57858 ce6fef1dce +Author: 孙广明 +Date: Mon Dec 13 06:07:06 2021 +0000 + + Merge branch 'sprint/177_tianshujie_card' into 'kanban' + + * Add the ability to create cards. + + See merge request easycorp/zentaopms!912 + +commit ce6fef1dce1a81e479dbfbf9c0cd19e2feb6f01d +Author: tianshujie +Date: Mon Dec 13 14:02:55 2021 +0800 + + * Add the ability to create cards. + +commit 78e51a5900d59adf91bdd7214bfd78dbe3024116 +Merge: fd6cc79ea0 53e4b2d102 +Author: 朱金勇 +Date: Mon Dec 13 05:54:19 2021 +0000 + + Merge branch 'sprint/176_songchenxuan_45535' into 'master' + + *Finish task #45535. + + See merge request easycorp/zentaopms!911 + +commit 53e4b2d1021fee84a80f45fd3da10db7218651f6 +Author: songchenxuan +Date: Mon Dec 13 13:53:03 2021 +0800 + + *Finish task #45535. + +commit fd6cc79ea0d63f44db0321c109c0f65739c6697a +Merge: 1e60836c3e 5726fde3d6 +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 13 05:51:46 2021 +0000 + + Merge branch 'sprint/devops16_17391' into 'master' + + * Fix bug#17391 + + See merge request easycorp/zentaopms!907 + +commit 6404b578582cfa644ec48cb375738c62e300caaa +Merge: 54910fd3ad 97cda66f87 +Author: 孙广明 +Date: Mon Dec 13 05:07:54 2021 +0000 + + Merge branch 'sprint/177_tianshujie_card' into 'kanban' + + * Modify Kanban description language item. + + See merge request easycorp/zentaopms!910 + +commit 1e60836c3ead524daced821dcb3c87798e5d251c +Merge: 4ecc85aa0e ea39b28199 +Author: liyuchun +Date: Mon Dec 13 12:12:46 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ea39b2819946b5d32b52ebad534217c755f47fd9 +Merge: 58fb407b19 8a0881aef4 +Author: 朱金勇 +Date: Mon Dec 13 05:10:02 2021 +0000 + + Merge branch 'sprint/176_songchenxuan_45543' into 'master' + + *Finish task #45543. + + See merge request easycorp/zentaopms!909 + +commit 58fb407b193a378345ef5808722baa887bf77fd5 +Merge: ad8b03c73f ad01a91304 +Author: 朱金勇 +Date: Mon Dec 13 05:01:45 2021 +0000 + + Merge branch 'sprint/176_songchenxuan_45535' into 'master' + + *Finish task #45535. + + See merge request easycorp/zentaopms!908 + +commit 4ecc85aa0e102c760df60931eaf4d408b320bdb9 +Merge: 58fb407b19 edfb34b749 +Author: liyuchun +Date: Mon Dec 13 12:12:37 2021 +0800 + + Merge branch 'devops16' + +commit 57da5467c9c4f1ca7724ba1b6e34b89c97945bb1 +Author: Hao Sun +Date: Mon Dec 13 11:32:39 2021 +0800 + + * add more space for version label in title of client card title. + +commit 54910fd3ade5cd26f31ab9ef96f2804ecdf49c59 +Merge: c9e940be61 76826e7c21 +Author: 朱金勇 +Date: Mon Dec 13 03:32:01 2021 +0000 + + Merge branch 'sprint/177_zhengrunyu_45817' into 'kanban' + + fix bug + + See merge request easycorp/zentaopms!906 + +commit edfb34b749e5ad0ca1cdd9b1173dc7ef1f022317 +Merge: de158ea32d 313d9f198c +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 13 03:28:33 2021 +0000 + + Merge branch 'sprint/devops16_wangyidong_test' into 'sprint/devops16' + + Sprint/devops16 wangyidong test + + See merge request easycorp/zentaopms!902 + +commit de158ea32d3327ffd67d427b5f9bf13a4d61aeb0 +Merge: fbe7f981ab 203f41745f +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 13 03:27:31 2021 +0000 + + Merge branch 'sprint/devops16_17301' into 'sprint/devops16' + + * Fix bug#17301 + + See merge request easycorp/zentaopms!894 + +commit fbe7f981abf11a9633c0472bf4e24349a72ddcfe +Merge: e0b7453fb8 03a729542c +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 13 03:26:13 2021 +0000 + + Merge branch 'sprint/devops16_17345' into 'sprint/devops16' + + * Fix bug#17345 + + See merge request easycorp/zentaopms!890 + +commit ad01a9130419a1abc2321ad5c4517fe7067e5de9 +Author: songchenxuan +Date: Mon Dec 13 11:22:20 2021 +0800 + + *Finish task #45535. + +commit 5726fde3d6f5a4187ea0a356a219bcfc3b647321 +Author: zenggang +Date: Mon Dec 13 03:12:21 2021 +0000 + + * Fix bug#17391 + +commit e0b7453fb8108d45847930f79ad9e546aaf09fde +Merge: 2cfd2794c4 447e1a3e07 +Author: 王怡栋 +Date: Mon Dec 13 03:12:21 2021 +0000 + + Merge branch 'devops16_caoyanyi_bug' into 'sprint/devops16' + + * Fix bug #17426. + + See merge request easycorp/zentaopms!905 + +commit ad8b03c73ff2441860f208ee0d58d7106bbff909 +Author: zhujinyong +Date: Mon Dec 13 11:03:58 2021 +0800 + + * Refactoring of getDynamic. + +commit 76826e7c2174badd38da2227fdffcf9d84073e77 +Author: zhengrunyu +Date: Mon Dec 13 10:53:41 2021 +0800 + + fix bug + +commit 447e1a3e0769a4c8ae7dd061968c50f4194602fd +Author: caoyanyi +Date: Mon Dec 13 02:17:56 2021 +0000 + + * Fix bug #17426. + +commit 8a0881aef4c7e72a78929aa4cce5eadc89dd07b9 +Author: songchenxuan +Date: Mon Dec 13 10:14:50 2021 +0800 + + *Finish task #45543. + +commit 33046c24876203199633b817c42ffcef87f65b9a +Author: Hao Sun +Date: Mon Dec 13 10:11:22 2021 +0800 + + * prepend style for client mode. + +commit c9e940be61d4d58bee224b50f89bdb29c921228c +Merge: 8b2543d065 3dde658da2 +Author: 朱金勇 +Date: Mon Dec 13 01:53:31 2021 +0000 + + Merge branch 'sprint/177_zhengrunyu_45819' into 'kanban' + + *Finish task 45822. + + See merge request easycorp/zentaopms!904 + +commit 3dde658da2afdcbd782327d2241f6f59f5bc5cd3 +Author: zhengrunyu +Date: Mon Dec 13 09:50:32 2021 +0800 + + *Finish task #45822. + +commit b64b4cfc6febac34e5c4ead7477d85f49e148034 +Author: tanghucheng +Date: Mon Dec 13 09:37:38 2021 +0800 + + * Code for task #45806. + +commit 97cda66f8796db1232425d04e958ff0124916e9e +Author: tianshujie +Date: Mon Dec 13 09:31:23 2021 +0800 + + * Modify Kanban description language item. + +commit 9c56619418d7390b3179089f0c639ab05f52c8ec +Author: zhengrunyu +Date: Mon Dec 13 09:06:55 2021 +0800 + + *Finish task 45822. + +commit f1e97497a3d1614e803ef336756c3e00e0f01046 +Merge: 40e1b04661 46ed4772cf +Author: 朱金勇 +Date: Mon Dec 13 00:46:27 2021 +0000 + + Merge branch 'sprint/176_xieqiyu_45536' into 'master' + + Sprint/176 xieqiyu 45536 + + See merge request easycorp/zentaopms!903 + +commit 0b8fc53302615622cd446b25399cf39d6caf31be +Author: xieqiyu +Date: Sat Dec 11 14:59:03 2021 +0800 + + * Add function of change branch language. + +commit 46ed4772cfc57dc3fadf2208086bd09927ad3275 +Author: xieqiyu +Date: Sat Dec 11 14:39:19 2021 +0800 + + * Delete unused code. + +commit 5472859d6e1117b3f74094ae8913b1f524e1f74a +Author: xieqiyu +Date: Sat Dec 11 14:28:45 2021 +0800 + + * Code for task#45536. + +commit c89277b5fc48480ac8e64a00a4ecb9d733f36f02 +Author: Yurun +Date: Sat Dec 11 09:06:08 2021 +0800 + + Optimize user module + +commit 313d9f198c84e4e068f3de3fcf842a1b0af76626 +Author: 王怡栋 +Date: Fri Dec 10 17:55:39 2021 +0800 + + * adjust for test data. + +commit 8b2543d06594e27e2b3085122480a87149ed0d13 +Merge: dd017eabe1 f77e54af6d +Author: 孙广明 +Date: Fri Dec 10 08:16:16 2021 +0000 + + Merge branch 'sprint/177_tianshujie_lang' into 'kanban' + + * Modify Kanban Authority Language Item. + + See merge request easycorp/zentaopms!901 + +commit dd017eabe1ba85b5efcb7e7b14e4cf00034830c1 +Merge: 866bfd39f6 dce594fc34 +Author: 孙广明 +Date: Fri Dec 10 08:14:24 2021 +0000 + + Merge branch 'sprint/max_tanghucheng_45802' into 'kanban' + + * Finish task #45802. + + See merge request easycorp/zentaopms!883 + +commit f77e54af6d598defba5a195197ff33209238901d +Author: tianshujie +Date: Fri Dec 10 16:14:03 2021 +0800 + + * Modify Kanban Authority Language Item. + +commit d556f52381b78211dfebd5f8487815cf024e0c2a +Author: tanghucheng +Date: Fri Dec 10 16:11:06 2021 +0800 + + * Finish task #45806. + +commit 9fd77be3ef7ee0eb754b7722c1c9d2bb75281cba +Author: 王怡栋 +Date: Fri Dec 10 15:44:35 2021 +0800 + + * adjust for upgrade. + +commit 2cfd2794c4f593194643a002b06536eb1fe70d0f +Merge: fec4ab4604 2d60441372 +Author: 王怡栋 +Date: Fri Dec 10 15:41:55 2021 +0800 + + Merge branch 'devops16_caoyanyi_45677' into sprint/devops16 + +commit 2d60441372d9f307050e1b44031b09b8ba694dd2 +Merge: e32a694e08 fec4ab4604 +Author: 王怡栋 +Date: Fri Dec 10 07:40:46 2021 +0000 + + Merge branch 'sprint/devops16' into 'devops16_caoyanyi_45677' + + # Conflicts: + # module/gitlab/view/browseproject.html.php + +commit 866bfd39f6ef8bc446606043079f7e2ac66a33ca +Merge: b914bf1807 0ba9646782 +Author: 孙广明 +Date: Fri Dec 10 07:39:54 2021 +0000 + + Merge branch 'sprint/177_tianshujie_45821' into 'kanban' + + * Modify the button display style. + + See merge request easycorp/zentaopms!898 + +commit e32a694e08f1c178102b1e0efb42f5049ab72309 +Author: caoyanyi +Date: Fri Dec 10 07:38:21 2021 +0000 + + * Adjust code. + +commit 0ba9646782ca47525d030429ff1f032fea28fadf +Author: tianshujie +Date: Fri Dec 10 15:38:02 2021 +0800 + + * Modify the button display style. + +commit 35e55cc75efb072e4c253654ebb3666f4562d686 +Author: caoyanyi +Date: Fri Dec 10 07:33:24 2021 +0000 + + * Modify data type. + +commit b914bf1807c8b8d0d0765995bdd3b3ce93ec98c3 +Merge: 20ba15afd3 c8879884c0 +Author: liyuchun +Date: Fri Dec 10 15:18:54 2021 +0800 + + Merge branch 'sgm_kanbanaction' into kanban + +commit c8879884c06e2df023d57b319171a28babc8bb0d +Merge: 9e332d17fb 20ba15afd3 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 10 07:18:22 2021 +0000 + + Merge branch 'kanban' into 'sgm_kanbanaction' + + # Conflicts: + # module/kanban/js/view.js + +commit 40e1b04661cc6710635bf0132f7850f5bf4544b9 +Merge: 56081eb2e3 a175c752b8 +Author: 朱金勇 +Date: Fri Dec 10 07:16:22 2021 +0000 + + Merge branch 'sprint/176_songchenxuan_45545' into 'master' + + Sprint/176 songchenxuan 45545 + + See merge request easycorp/zentaopms!880 + +commit fec4ab4604c3079c54ec348af6750b271efa30aa +Merge: b82a451b11 49cd37e6de +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 10 07:06:16 2021 +0000 + + Merge branch 'sprint/devops16_wangyidong_test' into 'sprint/devops16' + + Sprint/devops16 wangyidong test + + See merge request easycorp/zentaopms!888 + +commit 20ba15afd3415647b72d50b833fe36a82760d65d +Merge: 0cde8fa96b 7dfe24dd11 +Author: 孙广明 +Date: Fri Dec 10 06:50:03 2021 +0000 + + Merge branch 'sprint/177_tianshujie_45824' into 'kanban' + + * Remove redundant drop-down menu. + + See merge request easycorp/zentaopms!895 + +commit 0cde8fa96be0b4c397ea0fc3ae31da619902047f +Merge: 8a272c3761 bd15849fe5 +Author: 孙广明 +Date: Fri Dec 10 06:49:47 2021 +0000 + + Merge branch 'sprint/177_liumengyi_fixbug' into 'kanban' + + * Modify chinese language file. + + See merge request easycorp/zentaopms!896 + +commit 9e332d17fb6e2477776b3d6180a87033bc46552f +Author: 孙广明 +Date: Fri Dec 10 14:46:08 2021 +0800 + + * Fix column bug. + +commit bd15849fe5b86b0c927522fb67b9383bb59b2db9 +Author: liumengyi +Date: Fri Dec 10 14:45:13 2021 +0800 + + * Modify chinese language file. + +commit 203f41745f6a52554610bc9cc52f435ef621b9b8 +Author: zenggang +Date: Fri Dec 10 06:44:35 2021 +0000 + + * Fix bug#17301 + +commit 7dfe24dd116f6c5bdebbb957dfacefc7820acc33 +Author: tianshujie +Date: Fri Dec 10 14:44:13 2021 +0800 + + * Remove redundant drop-down menu. + +commit a175c752b8d123b18a183d8d5806aff070f25a59 +Author: songchenxuan +Date: Fri Dec 10 14:41:33 2021 +0800 + + *Finish task #45545. + +commit 49cd37e6dee061fdfd44c0470e0a4fcef1ea2316 +Author: 王怡栋 +Date: Fri Dec 10 14:38:08 2021 +0800 + + * code task #45436. + +commit b08bf7cac6bc88a551a8d247415dce151d0b4bb8 +Author: 孙广明 +Date: Fri Dec 10 14:37:14 2021 +0800 + + * Code for details. + +commit 8a272c37616f2270027b7d3a7023421cc9847541 +Merge: 2da16295d0 5d7a3c9215 +Author: 孙广明 +Date: Fri Dec 10 06:30:18 2021 +0000 + + Merge branch 'sprint/177_tianshujie_45821' into 'kanban' + + * Add dynamic link. + + See merge request easycorp/zentaopms!893 + +commit 2da16295d041075eb25cb19c7654951c4b460503 +Merge: 1a2b990b6a a054b88c31 +Author: 孙广明 +Date: Fri Dec 10 14:29:38 2021 +0800 + + Merge branch 'sprint/177_liumengyi_45830' into kanban + +commit a054b88c31baab7d75d2b30e44d633b9ca07558c +Merge: 6f8133482d 1a2b990b6a +Author: 孙广明 +Date: Fri Dec 10 06:29:20 2021 +0000 + + Merge branch 'kanban' into 'sprint/177_liumengyi_45830' + + # Conflicts: + # module/kanban/js/view.js + # module/kanban/lang/en.php + # module/kanban/lang/zh-cn.php + +commit 5d7a3c9215bb0e2a40ad8290f9a63d0e68abec9f +Author: tianshujie +Date: Fri Dec 10 14:24:16 2021 +0800 + + * Add dynamic link. + +commit 6f8133482d9d3a1c80f1198152f552deac635229 +Author: liumengyi +Date: Fri Dec 10 14:21:13 2021 +0800 + + * Finish task #45830. + +commit 34d84b678cf19d3e7ed7989a2acd8800518bace4 +Author: liumengyi +Date: Fri Dec 10 14:20:50 2021 +0800 + + * Finish task #45830. + +commit 1c08cb92de05217a2364024001ada3f4f5ff30f2 +Author: qixinzhi +Date: Fri Dec 10 14:19:50 2021 +0800 + + * fix leave group failure beacuse function not found + +commit 56081eb2e36b5e3f4ec01c2eb8feb4a698dce431 +Merge: 161233a64f 6c4db07b39 +Author: 朱金勇 +Date: Fri Dec 10 06:17:11 2021 +0000 + + Merge branch 'sprint/176_mayue_16964' into 'master' + + * Fix bug #16964. + + See merge request easycorp/zentaopms!892 + +commit 161233a64fb28878f2b8c9ddbee8981bcb035b77 +Merge: e8feeca41e 581284cf4e +Author: 朱金勇 +Date: Fri Dec 10 06:15:15 2021 +0000 + + Merge branch 'sprint/176_xieqiyu_45536' into 'master' + + Sprint/176 xieqiyu 45536 + + See merge request easycorp/zentaopms!884 + +commit 36be7f468c2c190be1e7078df7a517e6669ff67f +Author: 王怡栋 +Date: Fri Dec 10 14:14:25 2021 +0800 + + * code for task #17340. + +commit e8feeca41e58092f7690fa5f5eb44bbf6ad7a883 +Merge: d148ae7cf4 f77b8ddb9b +Author: 朱金勇 +Date: Fri Dec 10 06:07:32 2021 +0000 + + Merge branch 'sprint/176_songchenxuan_45538' into 'master' + + *Finish task #45538. + + See merge request easycorp/zentaopms!886 + +commit a4fd0775ad314f8974a2ebd8c14694cccf613625 +Author: zhouxin +Date: Fri Dec 10 06:07:26 2021 +0000 + + Finish task #45795. + +commit d148ae7cf4501175ce314e82fa7a47a7b0ce15be +Merge: 5ee11088b8 ac9d06cf7c +Author: 朱金勇 +Date: Fri Dec 10 06:04:55 2021 +0000 + + Merge branch 'sprint/176_songchenxuan_45535' into 'master' + + *Finish task #45535. + + See merge request easycorp/zentaopms!872 + +commit 5ee11088b8c936ecd837d73c5f7367e9c72f263d +Merge: c5bce17ef3 30a8d7acb0 +Author: 朱金勇 +Date: Fri Dec 10 06:04:23 2021 +0000 + + Merge branch 'sprint/176_songchenxuan_45539' into 'master' + + Sprint/176 songchenxuan 45539 + + See merge request easycorp/zentaopms!870 + +commit c0ce88d4fb6832448d952bc9a1a6b8f9a32efb75 +Author: 王怡栋 +Date: Fri Dec 10 14:02:17 2021 +0800 + + * fix bug #17352,17349,17347,17346. + +commit b9707ddb68b23c37df6811a967f75308b3e4baeb +Author: 孙广明 +Date: Fri Dec 10 14:00:22 2021 +0800 + + * Finish task #45827. + +commit 03a729542cc9b0553f4ca2aba9112f5728c69527 +Author: zenggang +Date: Fri Dec 10 05:51:55 2021 +0000 + + * Fix bug#17345 + +commit 3a7ad7dad9bf5229ed33ab488f6e252f9ec19592 +Author: liumengyi +Date: Fri Dec 10 13:43:23 2021 +0800 + + * Finish task #45830. + +commit 1a2b990b6a1577b126ec0febdff96d8f8fdc56a2 +Merge: 829de4b2bb ba8a504802 +Author: 孙广明 +Date: Fri Dec 10 13:42:18 2021 +0800 + + Merge branch 'sprint/177_tianshujie_45824' into kanban + +commit ba8a50480294d256dcee536bf2b66c5be70720df +Merge: c618c7d749 829de4b2bb +Author: 孙广明 +Date: Fri Dec 10 05:41:58 2021 +0000 + + Merge branch 'kanban' into 'sprint/177_tianshujie_45824' + + # Conflicts: + # module/kanban/js/view.js + # module/kanban/lang/en.php + +commit 82689e7af4d1ae378363102de639952e8a6ccd57 +Author: 王怡栋 +Date: Fri Dec 10 13:35:37 2021 +0800 + + * adjust code for test. + +commit c618c7d7498ca13a6e0dc5b0d375a690e07d682a +Author: tianshujie +Date: Fri Dec 10 13:33:59 2021 +0800 + + * Finish task #45824. + +commit 4975843c4f7950094613e71167f49821f27a52ab +Author: caoyanyi +Date: Fri Dec 10 05:32:23 2021 +0000 + + * Adjust codes. + +commit bfcb3deb8eaa3c796c2cfa811f6736c4fa5f4841 +Author: 王怡栋 +Date: Fri Dec 10 13:30:07 2021 +0800 + + * code for task #45676. + +commit 581284cf4e0543b8ca5eb01cfeba34fecc863802 +Author: xieqiyu +Date: Fri Dec 10 13:17:49 2021 +0800 + + * Delete unused space. + +commit c33000b578ea3661a369151933fc7e33bebb42ca +Author: xieqiyu +Date: Fri Dec 10 13:11:37 2021 +0800 + + * Code for task#45536. + +commit 33efd7faf3a0aa8ea64ecba4ad59f8eeedaac247 +Author: songchenxuan +Date: Fri Dec 10 11:34:18 2021 +0800 + + *Finish task #45539. + +commit 829de4b2bbea6ab6e1ff173d3c0d591f281696f4 +Merge: 07232bcc2b 49622a62d9 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 10 03:12:09 2021 +0000 + + Merge branch 'sgm_dropmenu' into 'kanban' + + * Code for kanban drop menu. + + See merge request easycorp/zentaopms!882 + +commit 07232bcc2bf35eae25f697c6a7f315572d11705c +Merge: 84d210ca5d 6ec0f178a4 +Author: 孙广明 +Date: Fri Dec 10 03:11:47 2021 +0000 + + Merge branch 'sprint/177_liumengyi_45826' into 'kanban' + + Sprint/177 liumengyi 45826 + + See merge request easycorp/zentaopms!881 + +commit 49622a62d942b0a0b05bc247ea4442713e9fc7fd +Author: 孙广明 +Date: Fri Dec 10 11:10:53 2021 +0800 + + * Fix code style. + +commit ac9d06cf7cbd0bc05269e6d297858cab40619d67 +Author: songchenxuan +Date: Fri Dec 10 11:05:11 2021 +0800 + + *Finish task #45539. + +commit 6ec0f178a44b6515ef65d5437e50eb4222042126 +Author: liumengyi +Date: Fri Dec 10 11:04:30 2021 +0800 + + * Modify judgment method. + +commit fd0fae5928e6566638b4b3694ce4633be6ba88e9 +Author: 孙广明 +Date: Fri Dec 10 11:03:05 2021 +0800 + + * Code for task #45815. + +commit 30a8d7acb0028f630867a0a7de3a74e8e79987cd +Author: songchenxuan +Date: Fri Dec 10 11:00:04 2021 +0800 + + *Finish task #45539. + +commit 7d91f383817ccd609df885f2e57c7390a6181764 +Author: 孙广明 +Date: Fri Dec 10 10:58:21 2021 +0800 + + * Code for task #45815. + +commit ad8ed52f22e6fa680d6e0d2b4b96d3283a66147d +Author: xieqiyu +Date: Fri Dec 10 10:57:56 2021 +0800 + + * Code for task#45536. + +commit e10c7988889625fe500e537c242db22679a9706a +Author: caoyanyi +Date: Fri Dec 10 02:51:00 2021 +0000 + + * Add test case for checkAccessLevel. + +commit c5bce17ef307ee0b528532a0e26ed3ec76b82dcf +Merge: c1518b36a0 95d51fdc09 +Author: 朱金勇 +Date: Fri Dec 10 02:45:06 2021 +0000 + + Merge branch 'sprint/176_songchenxuan_45537' into 'master' + + *Finish task #45337. + + See merge request easycorp/zentaopms!871 + +commit 234c4a2f7b283986969a5c0400b447d3e0bac854 +Author: liumengyi +Date: Fri Dec 10 10:38:52 2021 +0800 + + * Modify view menu. + +commit e51d8c2136f498d4e319c19a8ca3d45e87355b3f +Author: 孙广明 +Date: Fri Dec 10 10:37:03 2021 +0800 + + * Code for kanban drop menu. + +commit b9fbfee7aae1093d46e1ef703db26fe942bf1784 +Author: liumengyi +Date: Fri Dec 10 10:33:58 2021 +0800 + + * Finish task #45826. + +commit dce594fc34dc38e726118df2d1b665d47bf14a27 +Author: tanghucheng +Date: Fri Dec 10 10:33:56 2021 +0800 + + * Finish task #45802. + +commit a9fc8620596ec206784131e8544ce3306fca7f4b +Author: liumengyi +Date: Fri Dec 10 10:25:44 2021 +0800 + + * Finish task #45826. + +commit 84d210ca5d865563dad117617765dfd4474deb5b +Merge: 660bf469db 34e0d862eb +Author: 孙广明 +Date: Fri Dec 10 02:21:19 2021 +0000 + + Merge branch 'sprint/177_zhengrunyu_45819' into 'kanban' + + * + + See merge request easycorp/zentaopms!879 + +commit 660bf469db8bbd75360cf19ce4748e70bdcec930 +Merge: bf1918df76 bb4e3ed781 +Author: 孙广明 +Date: Fri Dec 10 10:20:43 2021 +0800 + + Merge branch 'sprint/177_tianshujie_45815' into kanban + +commit bb4e3ed7811e49d8c0ee3fd49ae2d2d962601489 +Merge: 6244b7500b bf1918df76 +Author: 孙广明 +Date: Fri Dec 10 02:18:54 2021 +0000 + + Merge branch 'kanban' into 'sprint/177_tianshujie_45815' + + # Conflicts: + # module/kanban/lang/en.php + # module/kanban/lang/zh-cn.php + +commit 435f972c8ceb0544dc0cfe48ec9b59746d31e4bb +Author: caoyanyi +Date: Fri Dec 10 02:18:44 2021 +0000 + + * Add test case for apiDeleteBranchPriv. + +commit 6244b7500b8bf36bcd6a2e0ee22f614f17eb3bbc +Author: tianshujie +Date: Fri Dec 10 10:16:48 2021 +0800 + + * Modify the space variable name. + +commit 34e0d862eb71314778e043287b3a9588ddd964b9 +Author: zhengrunyu +Date: Fri Dec 10 10:14:43 2021 +0800 + + * + +commit b82a451b11ce1430902ca63e229b53f7d4895249 +Merge: 9578ff1eba d121e2e01a +Author: 王怡栋 +Date: Fri Dec 10 02:14:07 2021 +0000 + + Merge branch 'sprint/liyuchun_17293' into 'sprint/devops16' + + * Fix bug #17293. + + See merge request easycorp/zentaopms!878 + +commit 446f4a86ed72d11ee9a27481419965e63dd8669c +Author: tianshujie +Date: Fri Dec 10 10:14:06 2021 +0800 + + * Modify the space variable name. + +commit d121e2e01aa1e3fc3a58cfac294dbe5a755b956d +Author: liyuchun +Date: Fri Dec 10 10:11:56 2021 +0800 + + * Fix bug #17293. + +commit bf1918df76b86c9bd6c324c46ba780f93724dc71 +Merge: 85f50ea175 c4ff55306b +Author: 孙广明 +Date: Fri Dec 10 10:10:44 2021 +0800 + + Merge branch 'sprint/177_zhengrunyu_45882' into kanban + +commit c4ff55306b895f495afbea4e8a4e7235f28f0d86 +Merge: 5fbecc7204 20783bb906 +Author: 孙广明 +Date: Fri Dec 10 02:10:15 2021 +0000 + + Merge branch 'kanban' into 'sprint/177_zhengrunyu_45882' + + # Conflicts: + # module/kanban/lang/en.php + # module/kanban/model.php + +commit ddae5d5c76346b2b89f42d47a54d57185399f8d2 +Author: caoyanyi +Date: Fri Dec 10 02:07:03 2021 +0000 + + * Add test case for apiGetSingleBranchPriv. + +commit 5fbecc7204283df24f94b8ec06d278e74e4425fe +Author: zhengrunyu +Date: Fri Dec 10 10:06:21 2021 +0800 + + *Finish task #45822. + +commit e7fb8aded2b27169a1c910e1154975c1eade73d3 +Author: zhengrunyu +Date: Fri Dec 10 10:03:56 2021 +0800 + + *Finish task #45822. + +commit 9578ff1eba0fc7ee6ff7b5804822fa78afe4215e +Merge: 4ca00009d5 41b90898ee +Author: 王怡栋 +Date: Fri Dec 10 02:03:30 2021 +0000 + + Merge branch 'sprint/liyuchun_17298' into 'sprint/devops16' + + * Fix bug #17298. + + See merge request easycorp/zentaopms!877 + +commit 41b90898ee637510ef1a1b14b17470d00240bcc7 +Author: liyuchun +Date: Fri Dec 10 09:59:43 2021 +0800 + + * Fix bug #17298. + +commit e8cd54a0fd06137a583a6c6a62f46fbd892888d1 +Author: zhengrunyu +Date: Fri Dec 10 09:59:25 2021 +0800 + + *Finish task #45822. + +commit 361378e0fd1c2a723aff44cfcfc335fe936404d1 +Author: zhengrunyu +Date: Fri Dec 10 09:55:52 2021 +0800 + + *Finish task #45822.*Finish task #45822.*Finish task #45822.*Finish task #45822.*Finish task #45822.*Finish task #45822.*Finish task #45822.*Finish task #45822. + +commit 55c61f9ee718c303260f4f4b1bf89450417ee413 +Author: caoyanyi +Date: Fri Dec 10 01:49:30 2021 +0000 + + * Add test case for create model. + +commit 4ca00009d52a93ef04c6a10717fb42bf12a77ee8 +Merge: 8e4803745c 0ab14d8df2 +Author: 王怡栋 +Date: Fri Dec 10 01:48:01 2021 +0000 + + Merge branch 'sprint/devops_liyuchun_45443' into 'sprint/devops16' + + * Fix bug #17343, Finish task #45443. + + See merge request easycorp/zentaopms!876 + +commit 0ab14d8df245ddc656900933fd258bef7e08a1ba +Author: liyuchun +Date: Fri Dec 10 09:42:21 2021 +0800 + + * Fix bug #17343, Finish task #45443. + +commit fe254eafb063bc97d4d830ff63e718f5ce8bdf3e +Author: tianshujie +Date: Fri Dec 10 09:41:07 2021 +0800 + + * Modify card style. + +commit 20783bb906986f80279e678fcd32ff2ce114f531 +Merge: 85f50ea175 37d9aaeb3a +Author: 孙广明 +Date: Fri Dec 10 01:32:49 2021 +0000 + + Merge branch 'sprint/177_liumengyi_45825' into 'kanban' + + * Finish task #45825. + + See merge request easycorp/zentaopms!875 + +commit 37d9aaeb3a65fb64b5cc991804b1f72a16ca7513 +Author: liumengyi +Date: Fri Dec 10 09:28:40 2021 +0800 + + * Finish task #45825. + +commit beef8858bcb5975f487e2539e9ea533d914d633a +Author: caoyanyi +Date: Fri Dec 10 01:28:32 2021 +0000 + + * Add test case for create api. + +commit e662d49ab1096ff6de8c36e07d780870dd5a51d0 +Author: caoyanyi +Date: Fri Dec 10 01:27:44 2021 +0000 + + * Add test case for api create. + +commit 2aa3c3bbcb8e0ec81737e1a4678410dd129f4bfb +Author: zhengrunyu +Date: Fri Dec 10 09:18:05 2021 +0800 + + *Finish task #45882. + +commit 7d58d95af3d59f336b29d0a204e2253df6c60098 +Author: songchenxuan +Date: Fri Dec 10 09:15:55 2021 +0800 + + *Finish task #45545. + +commit 0588ec9b613ae3cae59ce6cc5ac768dd1ef750b1 +Author: tianshujie +Date: Fri Dec 10 09:09:38 2021 +0800 + + * Finish task #45815. + +commit 8e4803745cbbd14f5f0077a5d956f9fc213f8a18 +Merge: 802f13b4db ddc651efbb +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 10 01:02:17 2021 +0000 + + Merge branch 'sprint/devops16_45445' into 'sprint/devops16' + + * Adjust code + + See merge request easycorp/zentaopms!867 + +commit ddc651efbb0296a9691b17e6b6993db7511ee17d +Author: liyuchun +Date: Fri Dec 10 09:01:31 2021 +0800 + + * Code for task #45445. + +commit 802f13b4db9dba2a090ae8257b8bf212eebaa50f +Merge: 33e92f4e21 5338fcd4db +Author: liyuchun +Date: Fri Dec 10 08:26:37 2021 +0800 + + Merge branch 'sprint/devops16_wangyidong_45438' into sprint/devops16 + +commit 33e92f4e218b85233a2b98d931149a01d5535517 +Merge: 6b295805b9 760cfb42be +Author: liyuchun +Date: Fri Dec 10 08:26:02 2021 +0800 + + Merge branch 'sprint/devops16' of https://gitlab.zcorp.cc/easycorp/zentaopms into devops16 + +commit 6b295805b9fe3bf21715cb8c4331a018f8148a03 +Author: liyuchun +Date: Fri Dec 10 08:24:49 2021 +0800 + + * Finish task #45675. + +commit 5338fcd4dbef095cacb4dee36f6e0c472340be0d +Merge: 73d308b0e2 760cfb42be +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 10 00:24:19 2021 +0000 + + Merge branch 'sprint/devops16' into 'sprint/devops16_wangyidong_45438' + + # Conflicts: + # module/gitlab/js/managegroupmembers.js + +commit 73d308b0e2acb539acb7410ef4aa3d409e40f2ea +Author: 王怡栋 +Date: Thu Dec 9 17:58:18 2021 +0800 + + * code for task #45436. + +commit 85f50ea1757c740c5e69f14dc60b08f07be61b27 +Merge: 92bfb40c7c e60f6b4eb9 +Author: 孙广明 +Date: Thu Dec 9 09:53:20 2021 +0000 + + Merge branch 'sprint/177_liumengyi_45831' into 'kanban' + + Sprint/177 liumengyi 45831 + + See merge request easycorp/zentaopms!864 + +commit e60f6b4eb9abf10e18689a6d5747deedfb90d855 +Author: 刘梦艺 +Date: Thu Dec 9 09:52:46 2021 +0000 + + Update model.php + +commit f785cd97323d7368357c6a60241dc96dbe2423c6 +Author: 刘梦艺 +Date: Thu Dec 9 09:46:26 2021 +0000 + + Update common.js + +commit 7b8659a6fb0cd8d90ae389044f07c5b308b798d4 +Author: liumengyi +Date: Thu Dec 9 17:45:41 2021 +0800 + + * Finish task #45831 and #45823. + +commit 2b51182d3d9f598c81c6590c945ba1ceb11f2d59 +Author: liumengyi +Date: Thu Dec 9 17:44:34 2021 +0800 + + * Finish task #45831 and #45823. + +commit 760cfb42beecf69e00e50d833e694c238c2bfc40 +Merge: 730e5f6491 07ce01bda2 +Author: 王怡栋 +Date: Thu Dec 9 09:24:55 2021 +0000 + + Merge branch 'sprint/devops_liyuchun_45441' into 'sprint/devops16' + + * Finish task #45439. + + See merge request easycorp/zentaopms!852 + +commit 92bfb40c7c254fed63f12cb128a2b9b940c67d77 +Merge: f35a970a5f 006fca3fe3 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 9 09:23:38 2021 +0000 + + Merge branch 'sgm_45818' into 'kanban' + + * Finish task #45818. + + See merge request easycorp/zentaopms!866 + +commit c1518b36a0084a954fafb8197bed26da87897c7d (tag: zentaopms_16.0.beta1) +Merge: ad3f580ec5 07699008e8 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 9 09:21:01 2021 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix bug. + + See merge request easycorp/zentaopms!868 + +commit 07699008e89a6f4e8701fb178ef8d4c3765d2a4d +Author: 孙广明 +Date: Thu Dec 9 17:16:30 2021 +0800 + + * Fix bug. + +commit 068eeee4e842f6dfdfc32850d5d8937101ab0b16 +Author: 王怡栋 +Date: Thu Dec 9 17:14:36 2021 +0800 + + * code for task #45435. + +commit f77b8ddb9b34c222141effb19d971c8bc378f0f4 +Author: songchenxuan +Date: Thu Dec 9 17:10:55 2021 +0800 + + *Finish task #45538. + +commit 6bdd9038cfa5a6a427b838effc44d5787b18eb1c +Author: caoyanyi +Date: Thu Dec 9 09:10:18 2021 +0000 + + * Add error return. + +commit dcc92004572d7441f2daa5a10394158269115cd5 +Author: zenggang +Date: Thu Dec 9 09:01:02 2021 +0000 + + * Adjust code + +commit ad3f580ec546cd4e1120dd911f073dc7d00dc22b +Merge: 0a16828af9 ab5b5bdf87 +Author: 孙广明 +Date: Thu Dec 9 08:55:43 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_17311' into 'master' + + * Fix bug #17311. + + See merge request easycorp/zentaopms!865 + +commit ab5b5bdf877aad0d9160440e61830213788632f6 +Author: hufangzhou +Date: Thu Dec 9 16:54:30 2021 +0800 + + * Fix bug #17311. + +commit 006fca3fe3f1afa62d39515c9bab807cdebe4ef6 +Author: 孙广明 +Date: Thu Dec 9 16:53:53 2021 +0800 + + * Finish task #45818. + +commit c6c8f8de15f22c218212fb014f072fe7c584d305 +Author: caoyanyi +Date: Thu Dec 9 08:50:30 2021 +0000 + + * Modify icon. + +commit e3e5325efb65d9522e8d52510936e9d636976271 +Author: 王怡栋 +Date: Thu Dec 9 16:49:46 2021 +0800 + + * code for task #45436. + +commit de5c753de9f13a4f0feea2448dfc724decd893cc +Author: liumengyi +Date: Thu Dec 9 16:46:02 2021 +0800 + + * Modify edit HTML file. + +commit 134070a6101f928931f8184a33f27d6843b158ff +Author: zhouxin +Date: Thu Dec 9 08:45:29 2021 +0000 + + Create language field for create review. + +commit 42370222fc8f871fdfd6c1614f867d506432ef74 +Author: liumengyi +Date: Thu Dec 9 16:40:44 2021 +0800 + + * Finish task #45831. + +commit c0d7c0c6fc30e29154eb33be639670ed8551b086 +Author: zhouxin +Date: Thu Dec 9 08:40:24 2021 +0000 + + Finish task #45795. + +commit 730e5f649158dfc91f8d662454c3ec3d4f8b23be +Merge: 0ebff09658 fe5571a0ed +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 9 08:38:47 2021 +0000 + + Merge branch 'sprint/devops16_17141' into 'sprint/devops16' + + * Fix bug#17141 + + See merge request easycorp/zentaopms!861 + +commit 43555ed06623df4ee846af700089bf9dc013a64b +Author: 王怡栋 +Date: Thu Dec 9 16:31:51 2021 +0800 + + * code for task #45436. + +commit 91faac255a99e434b6aabb78b648317e0492e7d4 +Author: 王怡栋 +Date: Thu Dec 9 16:10:17 2021 +0800 + + * code for task #45438,45437. + +commit f35a970a5f9c1b68cd8d994ed2ac1a3eb3b2f48f +Merge: 7a94a08436 c565b6a5d4 +Author: 孙广明 +Date: Thu Dec 9 08:01:35 2021 +0000 + + Merge branch 'sprint/177_tianshujie_error' into 'kanban' + + * Fix error. + + See merge request easycorp/zentaopms!862 + +commit c565b6a5d41a0181b981fc14299a3f3b1edd83ce +Author: tianshujie +Date: Thu Dec 9 16:00:20 2021 +0800 + + * Fix error. + +commit 7a94a084367379e4f12d301eae0c221230bd1aa0 +Merge: 780cf3a79d 16da4cdf28 +Author: 孙广明 +Date: Thu Dec 9 15:58:19 2021 +0800 + + Merge branch 'sprint/177_tianshujie_45815' into kanban + +commit 0ebff0965878edeab287114079c1985ba5b3227a +Merge: c4dd3a4954 dc7416ebb4 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 9 07:56:27 2021 +0000 + + Merge branch 'sprint/devops16_wangyidong_45504' into 'sprint/devops16' + + Sprint/devops16 wangyidong 45504 + + See merge request easycorp/zentaopms!857 + +commit 16da4cdf2846464e79fa6be7207d93d883cd4b9e +Merge: 30c95b0915 8d1e0491d6 +Author: 孙广明 +Date: Thu Dec 9 07:54:42 2021 +0000 + + Merge branch 'kanban' into 'sprint/177_tianshujie_45815' + + # Conflicts: + # module/kanban/control.php + # module/kanban/model.php + +commit dc7416ebb4f8246b1fb30558eecb3fc967eacbab +Author: 王怡栋 +Date: Thu Dec 9 15:54:41 2021 +0800 + + * adjust code for mr. + +commit 30c95b0915fd1980007637887f35e20d7961e284 +Author: tianshujie +Date: Thu Dec 9 15:51:30 2021 +0800 + + * Modify code variables. + +commit 09c3e9396912906d1838619b9f46c1135d35e5e3 +Author: tianshujie +Date: Thu Dec 9 15:46:24 2021 +0800 + + * Modify the logic of the query space. + +commit fe5571a0ed20c13ded54e17b8bb92e31e98413b1 +Author: zenggang +Date: Thu Dec 9 07:46:07 2021 +0000 + + * Fix bug#17141 + +commit 0a16828af9007aa7d933165589d534cbf9d00cd9 +Merge: 2d91f6d395 dd480f9ced +Author: 朱金勇 +Date: Thu Dec 9 07:42:17 2021 +0000 + + Merge branch 'sprint/xieqiyu_fixbug_build' into 'master' + + * Update project linked branch. + + See merge request easycorp/zentaopms!853 + +commit c4dd3a4954fba5e96158271de5430a3b5b9193b7 +Merge: c09fcb0c15 40c3eb41e8 +Author: 王怡栋 +Date: Thu Dec 9 15:40:55 2021 +0800 + + Merge branch 'sprint/devops16' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/devops16 + +commit c09fcb0c1544414ee0abf6a13b82850724036643 +Merge: d03205740a ca73678ccd +Author: 王怡栋 +Date: Thu Dec 9 15:40:44 2021 +0800 + + Merge branch 'devops16_caoyanyi_45499' into sprint/devops16 + +commit 8d1e0491d66ec0c2d6b57361a85af1d44be15f83 +Merge: 780cf3a79d 02df6e2704 +Author: 孙广明 +Date: Thu Dec 9 07:34:32 2021 +0000 + + Merge branch 'sprint/177_sunhao/new_icons' into 'kanban' + + * add 6 new icons for kanban. + + See merge request easycorp/zentaopms!860 + +commit 362cd1189b55ec565ba5f3c18d686a4792559972 +Author: tianshujie +Date: Thu Dec 9 15:33:16 2021 +0800 + + * Modify variables. + +commit 023db164d0f4b3cffeca60855534b58f4f7afeb7 +Author: tianshujie +Date: Thu Dec 9 15:31:49 2021 +0800 + + * Adjust code of kanban model file. + +commit 40c3eb41e8adce0ff7d8541dfcdb9a2dc4582178 +Merge: d03205740a 6985783f0a +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 9 07:26:41 2021 +0000 + + Merge branch 'sprint/devops16_unit' into 'sprint/devops16' + + * Add pipeline data and apigetbranches model method + + See merge request easycorp/zentaopms!858 + +commit dd480f9ced19048dfe20aa8dcb947db75f13e887 +Author: xieqiyu +Date: Thu Dec 9 15:26:37 2021 +0800 + + * When upgrading, the project and execution add branches of stories. + +commit 02df6e2704dcd1ab168251553b7c2ebba25e0d72 +Author: Hao Sun +Date: Thu Dec 9 15:23:53 2021 +0800 + + * add 6 new icons for kanban. + + The new icons includes: col-add-left, col-add-right, col-split, col-archive, card-archive, zone. + +commit a3e9d350ebaee8aa3cafefa01ed3fc7297db4d35 +Author: tianshujie +Date: Thu Dec 9 15:19:37 2021 +0800 + + * Finish task #45817. + +commit ca73678ccd96730cbf9979edfbb2e7492f5041bc +Author: caoyanyi +Date: Thu Dec 9 07:15:45 2021 +0000 + + * Modify comment. + +commit 8cb4c2a94ccfca3854f00cc17e1ad0233d57cc1a +Author: caoyanyi +Date: Thu Dec 9 07:14:02 2021 +0000 + + * Add comment. + +commit c2513ccc92b7fe11a03e146a02f0593cd43da1a0 +Author: caoyanyi +Date: Thu Dec 9 07:12:35 2021 +0000 + + * Adjust codes. + +commit 6985783f0afc2b166cafb5ef8e78e589a3987a93 +Author: zenggang +Date: Thu Dec 9 06:57:48 2021 +0000 + + * Add pipeline data and apigetbranches model method + +commit 60e6727f35e05a3c48b55118aaa32ceede660ab0 +Author: caoyanyi +Date: Thu Dec 9 06:48:32 2021 +0000 + + * Add mouseover title. + +commit 780cf3a79dcdfe0ec80363690d9b3fa809fbd0dc +Merge: 12ce541d9e f447e44833 +Author: 孙广明 +Date: Thu Dec 9 14:42:37 2021 +0800 + + Merge branch 'sprint/177_liumengyi_45823' into kanban + +commit cb6dbdf1d164ad95fe52d75c478647626a0bd816 +Author: 王怡栋 +Date: Thu Dec 9 14:42:14 2021 +0800 + + * fix error for task #45504. + +commit f447e448332b4a4a3b9fcac5c72acfe19004b3db +Merge: 9c9271ae44 c80b8d09e0 +Author: 孙广明 +Date: Thu Dec 9 06:41:49 2021 +0000 + + Merge branch 'kanban' into 'sprint/177_liumengyi_45823' + + # Conflicts: + # module/kanban/control.php + +commit 9c9271ae4477a50ad062a652b164855f050d0ad0 +Author: liumengyi +Date: Thu Dec 9 14:37:41 2021 +0800 + + * Remove unwanted code. + +commit c80b8d09e083ffb6ec261ad6e19aab0dfbb6412e +Merge: b7480bb257 ad53ead5ba +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 9 06:36:48 2021 +0000 + + Merge branch 'sgm_45818' into 'kanban' + + * Code for task #45818. + + See merge request easycorp/zentaopms!854 + +commit ad53ead5bad12a3b6f63c5c698a9ff711a0cd73e +Author: 孙广明 +Date: Thu Dec 9 14:33:23 2021 +0800 + + * Fix code details. + +commit ac18f706db1c301acc855fa9f2fe051a65c45f5c +Author: Hao Sun +Date: Thu Dec 9 14:32:37 2021 +0800 + + * redirect to app "my" when request open index/index. + +commit 840082e4c1ebbafc7ce2265feeebcd30d905ed4f +Author: liumengyi +Date: Thu Dec 9 14:27:21 2021 +0800 + + * Finish task #45823. + +commit b7480bb25752e5783dbe4a3d408303c73c8d3586 +Merge: 12ce541d9e e392b3f183 +Author: 孙广明 +Date: Thu Dec 9 06:19:40 2021 +0000 + + Merge branch 'sprint/30_zhouxin_45792' into 'kanban' + + Finish task #45792. + + See merge request easycorp/zentaopms!844 + +commit 1c89ca369b950406601f37895d92ad96cde24cd9 +Author: xieqiyu +Date: Thu Dec 9 14:14:26 2021 +0800 + + * Update project linked branch. + +commit 9824f4c6ac18631058adc5e44cf3a711e05a5e7f +Author: 孙广明 +Date: Thu Dec 9 14:11:49 2021 +0800 + + * Code for task #45818. + +commit f7e55495bea8d7a5f923b635649f6a6f5b4bcbf3 +Author: caoyanyi +Date: Thu Dec 9 06:04:33 2021 +0000 + + * Optimize page style. + +commit 2d91f6d39519572eb24af9a4a7c9fdce1523ae8a +Merge: e0217a1569 2997acd37c +Author: zhujinyong +Date: Thu Dec 9 13:39:52 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit e0217a15693520d96917020b6c22adf92a35b8d1 +Author: zhujinyong +Date: Thu Dec 9 13:39:37 2021 +0800 + + * Fix bugs of repo api. + +commit 973bb32da44fa2f55a1244583492f54ccb71d5ec +Author: 王怡栋 +Date: Thu Dec 9 13:30:48 2021 +0800 + + * fix error. + +commit cc682f79539ad75f2a1f56e09689d572ad4dfe8f +Author: 王怡栋 +Date: Thu Dec 9 13:24:00 2021 +0800 + + * fix error. + +commit beadf58834aab94b6041db7c1572d2efa28c4337 +Author: 王怡栋 +Date: Thu Dec 9 13:04:26 2021 +0800 + + * adjust for bug type for mr. + +commit 07ce01bda2710d53550b2dec77760eab20345e1a +Author: liyuchun +Date: Thu Dec 9 12:28:32 2021 +0800 + + * Finish task #45439. + +commit 2997acd37cc186e00b4f5ec065ef0d6e08fbe05f +Merge: 8a8e3d40e8 44a80b866d +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 9 03:24:59 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_17295' into 'master' + + Sprint/174 hufangzhou 17295 + + See merge request easycorp/zentaopms!851 + +commit 44a80b866dbd24d32a4ebae7f08b3700ede7b413 +Author: hufangzhou +Date: Thu Dec 9 11:24:35 2021 +0800 + + * Fix bug #17295. + +commit f1689b4dea0fe3bcf2c30a0afc49e431b7242f8d +Author: 王怡栋 +Date: Thu Dec 9 11:24:14 2021 +0800 + + * code for task #45504. + +commit 8a8e3d40e8d1f5cb294bf38fc5212c80a5ce1469 +Merge: 91e620e2b5 e13665ecfb +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 9 03:19:40 2021 +0000 + + Merge branch 'sprint/xieqiyu_fixbug_build' into 'master' + + * Fix bug: edit build error. + + See merge request easycorp/zentaopms!850 + +commit fe8d8166e94c7e375d98ca614e77e7f2659a5200 +Author: songchenxuan +Date: Thu Dec 9 11:19:25 2021 +0800 + + *Finish task #45545. + +commit e13665ecfba3528eca5cddd8b05e9ed0bbc9f130 +Author: xieqiyu +Date: Thu Dec 9 11:18:10 2021 +0800 + + * Fix bug: edit build error. + +commit 2b7e0ed4b3ac7bd9253406be4e107fb3f37a3b2c +Author: songchenxuan +Date: Thu Dec 9 11:16:29 2021 +0800 + + *Finish task #45545. + +commit 91e620e2b5167e4606e5b6b0f31f4d723599f61e +Author: zhujinyong +Date: Thu Dec 9 11:12:27 2021 +0800 + + * Products of repo is array. + +commit 8224bdc83f77620a77e8fd15a19df1d35b92940c +Merge: b6cfb2a715 2eb63dd763 +Author: zhujinyong +Date: Thu Dec 9 11:08:14 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b6cfb2a715df5699fab0ef6707e4f49b0fae1dbb +Author: zhujinyong +Date: Thu Dec 9 11:07:58 2021 +0800 + + + Add repos api. + +commit 0d230ebe9f8b72531121cea77734bb4ae527a23d +Author: Hao Sun +Date: Thu Dec 9 11:07:23 2021 +0800 + + * adjust style for client cards. + +commit 2eb63dd763eb7523fd2f6a37d5170d70410b4f67 +Merge: b72f016efe b42d7e1129 +Author: 王怡栋 +Date: Thu Dec 9 03:06:58 2021 +0000 + + Merge branch '170_package_bug' into 'master' + + * Fix bug #16639,#16599. + + See merge request easycorp/zentaopms!849 + +commit 12ce541d9e7778fd3836ab264b8215d569b8ed84 +Author: 孙广明 +Date: Thu Dec 9 10:50:05 2021 +0800 + + * Code for task #45818. + +commit e3e50d5ac0e32daf82fbbc54f1afdd0d094b133a +Author: zhouxin +Date: Thu Dec 9 02:39:34 2021 +0000 + + Finish task #45795. + +commit 8298f778e73dd73cec6fa47dfae4bf7d4682a482 +Author: xieqiyu +Date: Thu Dec 9 10:25:23 2021 +0800 + + * Fix bug#17251. + +commit 1517a800e21c28e0d36237e4baf7e6b59581394a +Author: hufangzhou +Date: Thu Dec 9 10:12:08 2021 +0800 + + * Fix an error for lang item. + +commit 2030bbd11c6d9ed2767b584a6f55818b703a8a38 +Author: tianshujie +Date: Thu Dec 9 10:04:46 2021 +0800 + + * Fix bug #17173. + +commit c7d5310496f8b67bed4dba8dc0ee42a4d377e67f +Author: hufangzhou +Date: Thu Dec 9 09:53:54 2021 +0800 + + * Fix bug #16792. + +commit 5287e874102af50fcd1a1da9dd6fc9296b3d1d79 +Author: hufangzhou +Date: Wed Dec 8 17:52:19 2021 +0800 + + * Fix bug #17276. + +commit 0d7f5f6e2d49008116044d431103deecdd4236c6 +Author: hufangzhou +Date: Wed Dec 8 17:26:12 2021 +0800 + + * Adjust the code. + +commit e408f91d1f1bb8a493079b6db867022667df5b01 +Author: hufangzhou +Date: Wed Dec 8 17:16:22 2021 +0800 + + * Fix bug #17269, bug #16975. + +commit ec5d481dc888872adb83d4bf2c78f7f5c70f012e +Author: tianshujie +Date: Wed Dec 8 17:08:10 2021 +0800 + + * Fix bug #17272. + +commit 559c3879c332f7f404be81a4e23636cac7565a9b +Author: mayue +Date: Wed Dec 8 16:52:50 2021 +0800 + + * Optimize code #17248,17246. + +commit 7c3a8dc7531bd6f61c3caa96f3cf5c54f5f2de0a +Author: tianshujie +Date: Wed Dec 8 16:50:48 2021 +0800 + + * Fix bug #17259. + +commit 1111d59ed90def9862b488ce70d9ecedaecdb16c +Author: mayue +Date: Wed Dec 8 16:38:45 2021 +0800 + + * Fix bug #17248,17246. + +commit 147470bf292019a84074ec99fa3d66abaa077a9b +Author: mayue +Date: Wed Dec 8 16:31:24 2021 +0800 + + * Fix bug #17248,17246. + +commit b2336fc180618f2ad306015610c82b284e33c431 +Author: hufangzhou +Date: Wed Dec 8 16:20:08 2021 +0800 + + * Fix bug #17263. + +commit 4be580309c864c3389b25cdb902b50b4d3c292dc +Author: xieqiyu +Date: Wed Dec 8 16:13:42 2021 +0800 + + * Fix bug#17251. + +commit d33c07117792b10a71e0a7f2cdaea89e1ecdfafd +Author: tianshujie +Date: Wed Dec 8 16:10:09 2021 +0800 + + * Fix bug #17259. + +commit 9f168793fee9ac61e0f727e0880ade11e34c5c43 +Author: xieqiyu +Date: Wed Dec 8 16:00:28 2021 +0800 + + * Fix bug#17267. + +commit 83cc442fc30052b019cdd570c93b98853e228acb +Author: hufangzhou +Date: Wed Dec 8 15:29:13 2021 +0800 + + * Fix bug #17261. + +commit eb3005cb9ba87d60069711d931cccfe1720a5c8a +Author: 孙广明 +Date: Wed Dec 8 13:47:24 2021 +0800 + + * Fix program kanban error. + +commit 33971a4671a3ab153bf0beb444e59e2283d08726 +Author: tianshujie +Date: Wed Dec 8 13:36:22 2021 +0800 + + * Fix bug #17243. + +commit 9db7d96139efd2e07fd0d5a24a45f35c77d483e6 +Author: 孙广明 +Date: Wed Dec 8 13:08:28 2021 +0800 + + * Fix kanban bug. + +commit 44bbe314405016e14a3324ecfe2e433ffc97e773 +Author: 孙广明 +Date: Wed Dec 8 11:33:34 2021 +0800 + + * Fix kanban bug. + +commit ddea40c56a38525040772ff564dab20c0fcccc3e +Author: xieqiyu +Date: Wed Dec 8 11:27:47 2021 +0800 + + * Modify style. + +commit 6aca5f10c02fd3fca3a0ad33e79f8c2409437d94 +Author: xieqiyu +Date: Wed Dec 8 11:15:32 2021 +0800 + + * Delete unused code. + +commit 6219e2323b4b8e53cd95c2616b67e9d2ed67181b +Author: tianshujie +Date: Wed Dec 8 11:11:12 2021 +0800 + + * Fix bug #17208. + +commit 14b272a1af4ea58332151866d42c745bc038ec92 +Author: 孙广明 +Date: Wed Dec 8 11:07:06 2021 +0800 + + * Merge 169 untrack file to master. + +commit 32c7a078a71d018574609198450fb267125c175e +Author: hufangzhou +Date: Wed Dec 8 08:47:00 2021 +0800 + + * Fix the code error. + +commit 74958bd6b2e5d1b53f3ecd08ba28c8dbe0315465 +Author: tianshujie +Date: Wed Dec 8 08:44:41 2021 +0800 + + * Fix bug #17208. + +commit f0e55ad2a49e767012d87e54e4435ed87cc12175 +Author: liumengyi +Date: Tue Dec 7 18:11:43 2021 +0800 + + * Fix bug #17227. + +commit 8e7432ad0851d473489b997555c85b509206e5f9 +Author: tianshujie +Date: Tue Dec 7 17:22:14 2021 +0800 + + * Fix bug #17173,17173. + +commit 47c200091449ce84c1e715d8d984e5082f72be70 +Author: xieqiyu +Date: Tue Dec 7 17:18:40 2021 +0800 + + * Fix bug#17193. + +commit 7458b8ef92ab0f6bba97ae4e4bf357547be59472 +Author: tanghucheng +Date: Tue Dec 7 17:13:23 2021 +0800 + + * Fix bug #17225. + +commit 30aa0714261031fd921fde95a61560c5baf3a585 +Author: 李玉春 <563917701@qq.com> +Date: Tue Dec 7 08:50:57 2021 +0000 + + Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'" + + This reverts merge request !803 + +commit 76748224ebf932eabf5e6374d77f4b9f2eb85c96 +Author: liyuchun +Date: Tue Dec 7 16:15:21 2021 +0800 + + * Finish task #45491. + +commit 32601cd5ff0cdd49c30ab3ee8ec6738421706be9 +Author: hufangzhou +Date: Tue Dec 7 15:25:31 2021 +0800 + + * Fix bug #17185. + +commit 8aac5aea931066b0bc908da9d71c71de932ab354 +Author: xieqiyu +Date: Tue Dec 7 14:56:10 2021 +0800 + + * Fix bug#17113. + +commit 408eb2d44fab173ff90b9087975fe27588604d98 +Author: xieqiyu +Date: Tue Dec 7 14:22:56 2021 +0800 + + * Fix bug#17188. + +commit 3a84e87d5532f068b1092519100825c385238a86 +Author: hufangzhou +Date: Tue Dec 7 13:23:39 2021 +0800 + + * Modify the apistruct table field. + +commit a60e642d0ef88bc5f8374b9daf7d9d4f6c8ec403 +Author: hufangzhou +Date: Tue Dec 7 11:15:47 2021 +0800 + + * Modify the editedBy field in zt_apistruct table and add the standard sql. + +commit 70e124b9efd9b79e20e96fd10f7869941a0184e7 +Author: tanghucheng +Date: Tue Dec 7 10:07:02 2021 +0800 + + * Fix bug #17126. + +commit bca881ebecae565804e612752f9d86e09207a5ac +Author: tanghucheng +Date: Tue Dec 7 09:33:52 2021 +0800 + + * Fix bug #17126. + +commit 76d0034f59256d5912bd7f567591ce64fdad8eab +Merge: 65717f117c 7710b314bd +Author: 孙广明 +Date: Thu Dec 9 02:33:31 2021 +0000 + + Merge branch 'sprint/177_tianshujie_45815' into 'kanban' + + * Finish task #45815. + + See merge request easycorp/zentaopms!843 + +commit b72f016efebcc789808012b66d4d7afd2fcd7db2 +Merge: 310d97f859 7a482c5f6a +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 9 02:29:02 2021 +0000 + + Merge branch 'sprint/xieqiyu_fixbug_17251' into 'master' + + * Fix bug#17251. + + See merge request easycorp/zentaopms!848 + +commit 7710b314bdf2cfbbab32eedf713a262862ee4bab +Author: tianshujie +Date: Thu Dec 9 10:28:20 2021 +0800 + + * Modify the code. + +commit 7a482c5f6a88996734efe0ad30eeabce26dc7d86 +Author: xieqiyu +Date: Thu Dec 9 10:25:23 2021 +0800 + + * Fix bug#17251. + +commit a8abcb6c9f09c5a875620a62ca9b5ef09a830eda +Author: caoyanyi +Date: Thu Dec 9 02:14:37 2021 +0000 + + * Add create and edit auth. + +commit 310d97f8598f96c17700a7805f883720a2104a13 +Merge: ce68565c54 73b43980eb +Author: 孙广明 +Date: Thu Dec 9 02:13:42 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_error' into 'master' + + * Fix an error for lang item. + + See merge request easycorp/zentaopms!847 + +commit 73b43980eb1be23a7280e2b6b795d023f0794695 +Author: hufangzhou +Date: Thu Dec 9 10:12:08 2021 +0800 + + * Fix an error for lang item. + +commit d03205740a5e8056eeb804366bf1dfa6c174e038 +Merge: c2c208a86f b13f4e6cfc +Author: 王怡栋 +Date: Thu Dec 9 02:11:21 2021 +0000 + + Merge branch 'sprint/devops_liyuchun_45441' into 'sprint/devops16' + + * Fix error and add unit testcase. + + See merge request easycorp/zentaopms!831 + +commit ce68565c542a564489dc3abfc0ff12045b0fe248 +Merge: 10fd278b2b 9818fe17de +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 9 02:09:17 2021 +0000 + + Merge branch 'sprint/174_tianshujie_17173' into 'master' + + * Fix bug #17173. + + See merge request easycorp/zentaopms!846 + +commit 7869ec56e5704452d7b5efbdf0b1068339e7fd51 +Author: liumengyi +Date: Thu Dec 9 10:06:04 2021 +0800 + + * Modify edit space HTML file. + +commit 10fd278b2b17df384452d2bfc1c79db6c5e52972 +Merge: fbeed71ba8 7f94a46592 +Author: 孙广明 +Date: Thu Dec 9 02:05:41 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_16792' into 'master' + + * Fix bug #16792. + + See merge request easycorp/zentaopms!845 + +commit 9818fe17def64f0fd9b0398580f63bbd28aa6db1 +Author: tianshujie +Date: Thu Dec 9 10:04:46 2021 +0800 + + * Fix bug #17173. + +commit 7f94a46592ba7a4f02ee6c50dc7827152796fd96 +Author: hufangzhou +Date: Thu Dec 9 09:53:54 2021 +0800 + + * Fix bug #16792. + +commit 8249473e63dd2b8982519d85978c140acc626e83 +Author: caoyanyi +Date: Thu Dec 9 01:25:55 2021 +0000 + + * Finish task #45499. + +commit 8b874bfbbc8c70a59673be3aa25795100735bf97 +Author: songchenxuan +Date: Thu Dec 9 09:20:45 2021 +0800 + + *Finish task #45545. + +commit 93e7a57bf59eef5fb8d222f94d4b6150055a1e50 +Author: liumengyi +Date: Thu Dec 9 09:09:46 2021 +0800 + + * Remove unwanted empty lines. + +commit 15e26d67942b71645335fc730c024824a4e0fc68 +Author: liumengyi +Date: Thu Dec 9 09:06:35 2021 +0800 + + * Delete unwanted files,and add edit space file. + +commit 7ea719984de47f71168b77f6a67de571130a5ba2 +Author: liumengyi +Date: Thu Dec 9 08:59:40 2021 +0800 + + * Add kanban space edit function. + +commit 65717f117c88e9a2c85a8a7d564be0fcb00cdda0 +Merge: a1f72bb932 728cb5a63e +Author: 孙广明 +Date: Thu Dec 9 00:38:26 2021 +0000 + + Merge branch 'sprint/master_zhouxin_45801' into 'kanban' + + Finish task #45801. + + See merge request easycorp/zentaopms!825 + +commit a1f72bb9327df2c1f5fe4e577949e00cfcd42fc5 +Merge: 97ceb1461a f12bfb7d0f +Author: 孙广明 +Date: Thu Dec 9 00:38:05 2021 +0000 + + Merge branch 'sprint/master_zhouxin_45807' into 'kanban' + + Finish task #45807. + + See merge request easycorp/zentaopms!806 + +commit fbeed71ba84a4503c8fb4145ef89c5be95e477b2 +Merge: dc2ea56141 ebcc470de1 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 23:55:44 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_17276' into 'master' + + * Fix bug #17276. + + See merge request easycorp/zentaopms!842 + +commit 821fd3644cb096b3a078ff6a63df868df4cef7cf +Author: xieqiyu +Date: Wed Dec 8 18:48:33 2021 +0800 + + * Code for task#45536. + +commit ebcc470de1d0edd25eb2a645df6d861dd01dec9c +Author: hufangzhou +Date: Wed Dec 8 17:52:19 2021 +0800 + + * Fix bug #17276. + +commit dc2ea5614132c40c9e4879c2a0172f1576e7c98f +Merge: cb1e0f7e42 25961617b3 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 09:26:39 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_17269' into 'master' + + * Fix bug #17269, bug #16975. + + See merge request easycorp/zentaopms!841 + +commit 25961617b373ff435b9578269a4602d0731eb448 +Author: hufangzhou +Date: Wed Dec 8 17:26:12 2021 +0800 + + * Adjust the code. + +commit cb1e0f7e4214a49bc4d94fe59a6a3fa3c02068e5 +Merge: b81aeb3d2a a2355212ad +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 09:16:34 2021 +0000 + + Merge branch 'sprint/174_tianshujie_17272' into 'master' + + * Fix bug #17272. + + See merge request easycorp/zentaopms!840 + +commit 68a534b137a2376539b0534c871889ee6abd947e +Author: hufangzhou +Date: Wed Dec 8 17:16:22 2021 +0800 + + * Fix bug #17269, bug #16975. + +commit a2355212adc008e7348eee8324351d57d95779f3 +Author: tianshujie +Date: Wed Dec 8 17:08:10 2021 +0800 + + * Fix bug #17272. + +commit f12bfb7d0f96fe4bf1c767e57d7bbd829fe330f5 +Author: zhouxin +Date: Wed Dec 8 09:03:53 2021 +0000 + + Add nl2br. + +commit b81aeb3d2aaec3c4321918885eb4de31304d7431 +Merge: 03013fe05f 545652e0e4 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 09:00:26 2021 +0000 + + Merge branch 'sprint/174_tianshujie_17259' into 'master' + + * Fix bug #17259. + + See merge request easycorp/zentaopms!839 + +commit 03013fe05fc7cbded94ddbedc580e95d42714b1d +Merge: 15ac60bb5c b1c483be84 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 08:54:39 2021 +0000 + + Merge branch 'mayue_fixbug_17248,17246' into 'master' + + * Fix bug #17248,17246. + + See merge request easycorp/zentaopms!838 + +commit b1c483be84b4507ea94db43cccb1944c0e0e4f18 +Author: mayue +Date: Wed Dec 8 16:52:50 2021 +0800 + + * Optimize code #17248,17246. + +commit 728cb5a63efcf6ef4cb2334af6b6aaeae5e641d2 +Author: zhouxin +Date: Wed Dec 8 08:52:25 2021 +0000 + + change get... to include... . + +commit 32b81b45fac1fe69e0da07e8447a11f31917e995 +Author: caoyanyi +Date: Wed Dec 8 08:51:44 2021 +0000 + + * Modify icon. + +commit 545652e0e409cfff5cfecb5ac631b6050f100966 +Author: tianshujie +Date: Wed Dec 8 16:50:48 2021 +0800 + + * Fix bug #17259. + +commit e392b3f1831f0183aca2f92b37ac65ecb746bc92 +Author: zhouxin +Date: Wed Dec 8 08:48:54 2021 +0000 + + Finish task #45792. + +commit 80c54b28b5935f4fcf547d768c837888979a00c1 +Author: mayue +Date: Wed Dec 8 16:38:45 2021 +0800 + + * Fix bug #17248,17246. + +commit 5761af1ed81f77b790810e0646f8f1e362446df1 +Author: mayue +Date: Wed Dec 8 16:31:24 2021 +0800 + + * Fix bug #17248,17246. + +commit b13f4e6cfc557edc276cee63b030ff827ff892d9 +Author: liyuchun +Date: Wed Dec 8 16:27:47 2021 +0800 + + * Finish task #45441. + +commit 15ac60bb5cdf5cfbba7349e20c5cddcccaaa27f1 +Merge: 2268b70c1d b9a474901f +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 08:23:55 2021 +0000 + + Merge branch 'sprint/xieqiyu_fixbug_17251' into 'master' + + * Fix bug#17251. + + See merge request easycorp/zentaopms!836 + +commit 2268b70c1d2e854f2fd3684482b5eea385f53459 +Merge: 972f3d5753 38b230a824 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 08:23:21 2021 +0000 + + Merge branch 'sprint/xieqiyu_fixbug_17267' into 'master' + + * Fix bug#17267. + + See merge request easycorp/zentaopms!834 + +commit 972f3d5753561deda27112843698f0a01c880622 +Merge: 687ebe8a5d 6da1c0d285 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 08:22:49 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_17263' into 'master' + + * Fix bug #17263. + + See merge request easycorp/zentaopms!837 + +commit c2c208a86f53e44d765cc40cf29c288f9dcec2c2 +Merge: 8271c13e86 6117354514 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 08:20:50 2021 +0000 + + Merge branch 'sprint/devops16_45444' into 'sprint/devops16' + + * Finish task#45444 + + See merge request easycorp/zentaopms!833 + +commit 6da1c0d28591d58cf272dc811cb2173711935975 +Author: hufangzhou +Date: Wed Dec 8 16:20:08 2021 +0800 + + * Fix bug #17263. + +commit 8271c13e861e42d32e92a3ae511653ee359312dd +Merge: ad24ae81f2 4061d19777 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 08:18:49 2021 +0000 + + Merge branch 'sprint/devops16_45445' into 'sprint/devops16' + + * Finish task#45445 + + See merge request easycorp/zentaopms!830 + +commit 687ebe8a5d1c1bd7bed6e379e07e3e55c1532ded +Merge: c62ce9a159 37a65b6789 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 08:16:44 2021 +0000 + + Merge branch 'sprint/174_tianshujie_17259' into 'master' + + * Fix bug #17259. + + See merge request easycorp/zentaopms!835 + +commit b9a474901fa0afe63eb5c552b267654ab7511069 +Author: xieqiyu +Date: Wed Dec 8 16:13:42 2021 +0800 + + * Fix bug#17251. + +commit 37a65b67895192872eb95c390440ee860ceb4a4c +Author: tianshujie +Date: Wed Dec 8 16:10:09 2021 +0800 + + * Fix bug #17259. + +commit 38b230a824d4cc63f2cb480f0aeaf9c842604b94 +Author: xieqiyu +Date: Wed Dec 8 16:00:28 2021 +0800 + + * Fix bug#17267. + +commit 6117354514172d2603c37ad1ab271b17111d21e0 +Author: zenggang +Date: Wed Dec 8 07:52:52 2021 +0000 + + * Finish task#45444 + +commit c62ce9a159491e26a90c21c42a320ab08988e66e +Merge: a2d79091cc 7f7533c521 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 07:43:41 2021 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix program kanban error. + + See merge request easycorp/zentaopms!829 + +commit a0e40c020d7e4c5430dfd96fa04ce3d00ba13e34 +Author: tianshujie +Date: Wed Dec 8 15:38:45 2021 +0800 + + * Add Kanban space creation function. + +commit a2d79091cc237686e8e8a8ab92d3c8c66f421cf7 +Merge: 114629ec8d b1bca8dac0 +Author: 孙广明 +Date: Wed Dec 8 07:32:20 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_17261' into 'master' + + * Fix bug #17261. + + See merge request easycorp/zentaopms!832 + +commit b1bca8dac0739729442844101eeed2fbab00efdb +Author: hufangzhou +Date: Wed Dec 8 15:29:13 2021 +0800 + + * Fix bug #17261. + +commit 97ceb1461a75d6fbdb6c8b29626c43c767e90ada +Merge: 52fffca101 1168d32103 +Author: 孙广明 +Date: Wed Dec 8 07:22:22 2021 +0000 + + Merge branch 'sprint/master_tanghucheng_45805' into 'kanban' + + * Finish task #45805. + + See merge request easycorp/zentaopms!805 + +commit 1168d32103af6ceb8621436a009741354c5ccdde +Author: tanghucheng +Date: Wed Dec 8 15:21:21 2021 +0800 + + * Finish task #45805. + +commit 52fffca101fcefe3e4a349f7774e4b928b9dafef +Merge: d34a614d1d 46ba2e5a0e +Author: 孙广明 +Date: Wed Dec 8 07:09:45 2021 +0000 + + Merge branch 'sprint/master_zhouxin_45793' into 'kanban' + + Finish task #45793. + + See merge request easycorp/zentaopms!809 + +commit 568b61819924cc545a65884bb917c5019e3aa409 +Author: liyuchun +Date: Wed Dec 8 15:09:32 2021 +0800 + + * Fix error and add unit testcase. + +commit 114629ec8d35146e0fba8a72d0f65c9887099408 +Merge: 986bd09df8 8afc0024e0 +Author: 孙广明 +Date: Wed Dec 8 07:08:40 2021 +0000 + + Merge branch 'sprint/master_tanghucheng_project' into 'master' + + * Fix bug #17126. + + See merge request easycorp/zentaopms!797 + +commit 4061d19777549c05443e374c7d1f3ca6c7bd82e7 +Author: zenggang +Date: Wed Dec 8 06:53:11 2021 +0000 + + * Finish task#45445 + +commit ad24ae81f2469428175e34f9e02dd4378426fba0 +Merge: ed5a494bf8 d5d7e8a578 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 06:22:18 2021 +0000 + + Merge branch 'sprint/devops16_45440' into 'sprint/devops16' + + * Finish task#45440 + + See merge request easycorp/zentaopms!827 + +commit d34a614d1d544d9e11ef6718b5abd2e3d438dd6c +Merge: 0e1679c791 e40fd13bbb +Author: 孙广明 +Date: Wed Dec 8 05:59:46 2021 +0000 + + Merge branch 'sprint/177_liumengyi_sql' into 'kanban' + + Sprint/177 liumengyi sql + + See merge request easycorp/zentaopms!826 + +commit e40fd13bbbf58588c294a5fa3352e0dcb620f5fd +Author: liumengyi +Date: Wed Dec 8 13:56:35 2021 +0800 + + * Add key for 'zt_kanbangroup' data table. + +commit 7f7533c52187d9b8c3bc95de1d4962057d13cf3b +Author: 孙广明 +Date: Wed Dec 8 13:47:24 2021 +0800 + + * Fix program kanban error. + +commit 986bd09df8351cac66dcfeefd8e0c304c83a9141 +Merge: 0c4f0dc504 f0d7855414 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 05:40:07 2021 +0000 + + Merge branch 'sprint/174_tianshujie_17243' into 'master' + + * Fix bug #17243. + + See merge request easycorp/zentaopms!828 + +commit 98a8af5d4f4a0d649d69436caafbd5ecc57cfa37 +Author: liumengyi +Date: Wed Dec 8 13:38:26 2021 +0800 + + * Modify lane group data tables. + +commit f0d78554149f5a1f00994ce9520d494233ea62e5 +Author: tianshujie +Date: Wed Dec 8 13:36:22 2021 +0800 + + * Fix bug #17243. + +commit d5d7e8a578c8bb1f5429105d2c538532648c28b7 +Author: zenggang +Date: Wed Dec 8 05:26:59 2021 +0000 + + * Finish task#45440 + +commit 99e725ef37aed410877e9d1ff4e05c4d43488890 +Author: mayue +Date: Wed Dec 8 13:25:50 2021 +0800 + + * Finish task #45544. + +commit d1baae050dcb21c4447cca1c83ed740c906935a2 +Author: liumengyi +Date: Wed Dec 8 13:17:12 2021 +0800 + + * Remove unwanted commas. + +commit ed5a494bf8d513d10662eb55d9fe0a4f1278763e +Merge: d13ad41246 131a9ef165 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 05:11:57 2021 +0000 + + Merge branch 'sprint/devops16_4550' into 'sprint/devops16' + + * Code for task#45500 + + See merge request easycorp/zentaopms!820 + +commit 0c4f0dc5044c1314b50a3b72ebe8835f40889e6a +Merge: 5d02d686cd c1f2a2272f +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 05:10:01 2021 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix kanban bug. + + See merge request easycorp/zentaopms!823 + +commit c1f2a2272f9a580fec2f90eb81885e1ef1a91d79 +Author: 孙广明 +Date: Wed Dec 8 13:08:28 2021 +0800 + + * Fix kanban bug. + +commit d13ad412467dd5eeed16a962ca1c3f918fb7ff40 +Merge: 0de19226e5 c1db0bcb01 +Author: 王怡栋 +Date: Wed Dec 8 05:08:19 2021 +0000 + + Merge branch 'sprint/devops_liyuchun_45442' into 'sprint/devops16' + + * Finish task #45442. + + See merge request easycorp/zentaopms!824 + +commit c1db0bcb0155fd5ac79a6776ab1c96b91b923ddf +Author: liyuchun +Date: Wed Dec 8 13:04:29 2021 +0800 + + * Finish task #45442. + +commit 74cfe9aa7566bce8f6a633df3653ffaaf5df0a87 +Author: 孙广明 +Date: Wed Dec 8 11:33:34 2021 +0800 + + * Fix kanban bug. + +commit 66c2768b6ac3f313581a3f050454f77c0aa1e7ed +Author: songchenxuan +Date: Wed Dec 8 11:30:02 2021 +0800 + + *Finish task #45535. + +commit 5d02d686cd2ce8bcef89a1e15706fa2aec7b80a2 +Merge: 2e614c7d2f 6d6d5fa258 +Author: 孙广明 +Date: Wed Dec 8 03:28:35 2021 +0000 + + Merge branch 'sprint/xieqiyu_deleteUnsedCode' into 'master' + + * Delete unused code. + + See merge request easycorp/zentaopms!822 + +commit 6d6d5fa2581d5e067c55d844d5db5008656d30ff +Author: xieqiyu +Date: Wed Dec 8 11:27:47 2021 +0800 + + * Modify style. + +commit 78b9ba372645ad30095b51957a393335031a663c +Author: liumengyi +Date: Wed Dec 8 11:26:31 2021 +0800 + + * Modify install and upgrade sql files. + +commit 2e614c7d2f489a0ca39ce64f11a31dafc00044ae +Merge: 69185d7fb8 2e6414cc8f +Author: 孙广明 +Date: Wed Dec 8 03:22:22 2021 +0000 + + Merge branch 'sprint/174_tianshujie_17208' into 'master' + + * Fix bug #17208. + + See merge request easycorp/zentaopms!816 + +commit b638ad51c1ea44c5f8c57aa1000ab93d5d9ccb54 +Author: xieqiyu +Date: Wed Dec 8 11:15:32 2021 +0800 + + * Delete unused code. + +commit 69185d7fb838780ce7ddd41c1c82af2a6171b6ac +Merge: 87c24eae5a 13f162edd2 +Author: 王怡栋 +Date: Wed Dec 8 03:12:32 2021 +0000 + + Merge branch 'sgm_mergecode' into 'master' + + * Merge 169 untrack file to master. + + See merge request easycorp/zentaopms!821 + +commit 2e6414cc8f8462840cc53e37db885f34233fe8c9 +Author: tianshujie +Date: Wed Dec 8 11:11:12 2021 +0800 + + * Fix bug #17208. + +commit 6d4ed2f256a23a126506fdda1dfbe0d7d58dd45a +Author: zhouxin +Date: Wed Dec 8 03:09:43 2021 +0000 + + Finish task #45801. + +commit 13f162edd214cfaf13f67e1da929e5dff0c6707f +Author: 孙广明 +Date: Wed Dec 8 11:07:06 2021 +0800 + + * Merge 169 untrack file to master. + +commit 131a9ef165b871aacea714e68a7ff24031574c78 +Author: zenggang +Date: Wed Dec 8 02:39:08 2021 +0000 + + * Code for task#45500 + +commit 0de19226e5b8d7bd485211ef68b1fbed30ac24ee +Merge: 8b1b85dc59 8d32dd3cf1 +Author: 王怡栋 +Date: Wed Dec 8 02:07:48 2021 +0000 + + Merge branch 'sprint/devops_liyuchun_45491' into 'sprint/devops16' + + * Finish task #45491. + + See merge request easycorp/zentaopms!819 + +commit 8d32dd3cf11dabacaed28e50ebe29badd5af8402 +Author: liyuchun +Date: Wed Dec 8 10:02:21 2021 +0800 + + * Finish task #45446. + +commit 8b0da7b97c9fd995563b6ddef089cbf24efc3f9f +Author: liyuchun +Date: Wed Dec 8 09:53:08 2021 +0800 + + * Finish task #45491. + +commit 426522047ceb6126f10598e6ffe5d9e3921fff8f +Author: liumengyi +Date: Wed Dec 8 09:19:57 2021 +0800 + + * Add kanban install and upgrade sql files. + +commit 83c19e91d0d468128df32a462f5d1d5aa286b426 +Author: liumengyi +Date: Wed Dec 8 09:09:38 2021 +0800 + + * Add kanban install and upgrade sql. + +commit 8b1b85dc5925bedb0a20b216f8c6950855d207b5 +Merge: fda32ead41 34c03b2cd5 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 01:01:35 2021 +0000 + + Merge branch 'sprint/devops16_sunhao/icons' into 'sprint/devops16' + + * Update icons, add new icons: 'icon-code-fork', 'icon-diff'. + + See merge request easycorp/zentaopms!813 + +commit fda32ead410b1546d13f0ccd6826b202bba1887f +Merge: 7ad1c3e550 d40736d387 +Author: 王怡栋 +Date: Wed Dec 8 00:59:59 2021 +0000 + + Merge branch 'sprint/devops_liyuchun_45491' into 'sprint/devops16' + + * Finish task #45491. + + See merge request easycorp/zentaopms!818 + +commit d40736d38734ddb842f51266f38d89ab96772613 +Author: liyuchun +Date: Wed Dec 8 08:56:39 2021 +0800 + + * Finish task #45491. + +commit 87c24eae5adff56dca5d640c6ec3250f96801732 +Merge: 6300b9d804 5c53afeeed +Author: 孙广明 +Date: Wed Dec 8 00:55:02 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_action' into 'master' + + * Fix the code error. + + See merge request easycorp/zentaopms!817 + +commit 5c53afeeed4461351788f129152c4a1568ca694a +Author: hufangzhou +Date: Wed Dec 8 08:47:00 2021 +0800 + + * Fix the code error. + +commit 6300b9d804266cccafbacb3ba38ef0864b2d3a28 +Merge: 834684ca51 07cd32ed75 +Author: 孙广明 +Date: Wed Dec 8 00:46:17 2021 +0000 + + Merge branch 'sprint/175_liumengyi_17227' into 'master' + + * Fix bug #17227. + + See merge request easycorp/zentaopms!815 + +commit bca286c0aaaeae52b27aba5ef90172ccb1131e2d +Author: tianshujie +Date: Wed Dec 8 08:44:41 2021 +0800 + + * Fix bug #17208. + +commit 7ad1c3e550f5ae037902bc33b1a30308bf6bcc31 +Merge: cb6364b19d 5e006ac204 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 8 00:30:23 2021 +0000 + + Merge branch 'sprint/devops16_task45434' into 'sprint/devops16' + + * Finish task#45434 + + See merge request easycorp/zentaopms!814 + +commit f7440465d81537d8fdf29f39de15054aa503bb34 +Author: tianshujie +Date: Wed Dec 8 08:20:52 2021 +0800 + + * Add filter button and create button. + +commit 07cd32ed75a4d7bff8590dc76a9d967c36def26c +Author: liumengyi +Date: Tue Dec 7 18:11:43 2021 +0800 + + * Fix bug #17227. + +commit cb6364b19d1518d01c889fb1005bc0f1626aae5d +Merge: ae3fea2f3a 4b83b4bee6 +Author: 李玉春 <563917701@qq.com> +Date: Tue Dec 7 09:47:43 2021 +0000 + + Merge branch 'sprint/devops16_45500' into 'sprint/devops16' + + * Finish task#45500 + + See merge request easycorp/zentaopms!804 + +commit 5e006ac2044dadc0081deb21f9bf04efd26d6c21 +Author: zenggang +Date: Tue Dec 7 09:40:28 2021 +0000 + + * Finish task#45434 + +commit 834684ca516f9c45f02c1cf3cc23b297077ba0a1 +Merge: 29fef7581b 4fdb7107dc +Author: 孙广明 +Date: Tue Dec 7 09:24:13 2021 +0000 + + Merge branch 'sprint/174_tianshujie_17173' into 'master' + + * Fix bug #17173,17173. + + See merge request easycorp/zentaopms!812 + +commit 4fdb7107dcfbfd227e1c4d8bb7394b21f0a5e118 +Author: tianshujie +Date: Tue Dec 7 17:22:14 2021 +0800 + + * Fix bug #17173,17173. + +commit 34c03b2cd5569091c857ca0b398aca70e808c637 +Author: Hao Sun +Date: Tue Dec 7 17:22:03 2021 +0800 + + * Update icons, add new icons: 'icon-code-fork', 'icon-diff'. + +commit 29fef7581bc0168d7b7e57c8b0766c30f4634b6e +Merge: ece705aafa 6f6dc4741a +Author: 孙广明 +Date: Tue Dec 7 09:20:26 2021 +0000 + + Merge branch 'sprint/master_tanghucheng_17225' into 'master' + + * Fix bug #17225. + + See merge request easycorp/zentaopms!810 + +commit ece705aafaf57c3fd6a03bf85db18f2724c03f93 +Merge: 0d6f17536c b41aa8a4ef +Author: 孙广明 +Date: Tue Dec 7 09:20:10 2021 +0000 + + Merge branch 'sprint/xieqiyu_fixbug_17193' into 'master' + + * Fix bug#17193. + + See merge request easycorp/zentaopms!811 + +commit b41aa8a4efe6e611ab3efade4cf53bc9491b99b3 +Author: xieqiyu +Date: Tue Dec 7 17:18:40 2021 +0800 + + * Fix bug#17193. + +commit 6f6dc4741ace02312513f8416cd0a8b763da4b56 +Author: tanghucheng +Date: Tue Dec 7 17:13:23 2021 +0800 + + * Fix bug #17225. + +commit 4b83b4bee648ae8fddec06d9a4169336b6cc4c18 +Author: zenggang +Date: Tue Dec 7 09:13:17 2021 +0000 + + * Adjust code + +commit e79f4b28ea4b51548d064bcbab03b2c8d923e9ff +Author: zenggang +Date: Tue Dec 7 09:08:56 2021 +0000 + + * Adjust code + +commit 58320d375686890dab2b2555080dc1ed77a8b128 +Merge: 1246c4f15d bb44039a30 +Author: zenggang +Date: Tue Dec 7 09:05:28 2021 +0000 + + Merge branch 'sprint/devops16_45500' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/devops16_45500 + +commit 1246c4f15d47789d756939e3cde606bda7a51735 +Author: zenggang +Date: Tue Dec 7 09:04:49 2021 +0000 + + * Adjust code + +commit bb44039a30afd91c5361cc5e5bb39efb81068c66 +Merge: b4685be3de ae3fea2f3a +Author: 李玉春 <563917701@qq.com> +Date: Tue Dec 7 08:54:25 2021 +0000 + + Merge branch 'sprint/devops16' into 'sprint/devops16_45500' + + # Conflicts: + # module/gitlab/control.php + +commit 0d6f17536c52d84c065f64cd652c8e71fa3d410c +Merge: ff06288dc8 3f2793e5bd +Author: 王怡栋 +Date: Tue Dec 7 08:52:26 2021 +0000 + + Merge branch 'revert-ff06288d' into 'master' + + Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'" + + See merge request easycorp/zentaopms!808 + +commit 46ba2e5a0e02850ff7f2e031e637e3b361e85ad4 +Author: zhouxin +Date: Tue Dec 7 08:52:17 2021 +0000 + + Finish task #45793. + +commit ae3fea2f3a83dad48064668635cedd58f72cb285 +Merge: 3d1d34e383 cf280763b2 +Author: 王怡栋 +Date: Tue Dec 7 08:51:24 2021 +0000 + + Merge branch 'cherry-pick-ff06288d' into 'sprint/devops16' + + Merge branch 'sprint/devops16_liyuchun_45491' into 'master' + + See merge request easycorp/zentaopms!807 + +commit 3f2793e5bd003cadf49cad5cd6e1cc4a9f5150bf +Author: 李玉春 <563917701@qq.com> +Date: Tue Dec 7 08:50:57 2021 +0000 + + Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'" + + This reverts merge request !803 + +commit cf280763b2d20a51207d0df92cf6246ce49a46d3 +Author: 王怡栋 +Date: Tue Dec 7 08:21:33 2021 +0000 + + Merge branch 'sprint/devops16_liyuchun_45491' into 'master' + + * Finish task #45491. + + See merge request easycorp/zentaopms!803 + + (cherry picked from commit ff06288dc8614345883d921d7a8ba6556aac4d16) + + b11dd3af * Finish task #45491. + +commit df8859a3b083f6f87ac28be2829d8dc00a529e2b +Author: zhouxin +Date: Tue Dec 7 08:44:22 2021 +0000 + + Finish task #45807. + +commit 06916f0dee0687ea4898cf65325d49f9b197c164 +Author: chaideqing +Date: Tue Dec 7 16:43:21 2021 +0800 + + * recovery module/execution/css/story.css and refactor #main height + +commit ff06288dc8614345883d921d7a8ba6556aac4d16 +Merge: ee97446441 b11dd3af4e +Author: 王怡栋 +Date: Tue Dec 7 08:21:33 2021 +0000 + + Merge branch 'sprint/devops16_liyuchun_45491' into 'master' + + * Finish task #45491. + + See merge request easycorp/zentaopms!803 + +commit b11dd3af4eb63390a85de51e65f60d3d5c1e47e9 +Author: liyuchun +Date: Tue Dec 7 16:15:21 2021 +0800 + + * Finish task #45491. + +commit b4685be3dedf11a8ff5d688ef16b7170cd7325df +Author: zenggang +Date: Tue Dec 7 08:15:04 2021 +0000 + + * Finish task#45500 + +commit 0e1679c7918f321e0aa63e3d6b658147ec780239 +Merge: e5873a07e0 7176ef2b55 +Author: 孙广明 +Date: Tue Dec 7 08:13:25 2021 +0000 + + Merge branch 'sprint/177_tianshujie_45815' into 'kanban' + + * Add Kanban first level navigation. + + See merge request easycorp/zentaopms!801 + +commit 7176ef2b553014c703db97c48aa2f1dad3a85257 +Author: tianshujie +Date: Tue Dec 7 16:12:45 2021 +0800 + + * Remove useless code. + +commit 9f2364c021bdce55d838f76264d08be50c6b154b +Author: tianshujie +Date: Tue Dec 7 16:07:50 2021 +0800 + + * Modify zone to space. + +commit 95d51fdc093868f7c6c519ebc741be9460e7f3e0 +Author: songchenxuan +Date: Tue Dec 7 15:46:13 2021 +0800 + + *Finish task #45337. + +commit b4398a17998a2d9463b0c73996c5d152cf0ae18c +Author: Tintin +Date: Tue Dec 7 15:35:10 2021 +0800 + + * add lang for xuan global options. + +commit ee974464415a19ea8fd7037ae1e7e6d00f4f895e +Merge: 8fe0d5ddd4 9359d427f5 +Author: 李玉春 <563917701@qq.com> +Date: Tue Dec 7 07:33:22 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_xuanxuan' into 'master' + + * Fix bug #17185. + + See merge request easycorp/zentaopms!802 + +commit 8fe0d5ddd481a3ca1eb907804f3388c0cec7d826 +Merge: 69a74c1e4b f22631ac2a +Author: 李玉春 <563917701@qq.com> +Date: Tue Dec 7 07:27:49 2021 +0000 + + Merge branch 'sprint/174_xieqiyu_17113' into 'master' + + * Fix bug#17113. + + See merge request easycorp/zentaopms!800 + +commit 69a74c1e4bba8adcdc45f3fa28061d742bbddf32 +Merge: 847071497d bccefb7751 +Author: 李玉春 <563917701@qq.com> +Date: Tue Dec 7 07:26:22 2021 +0000 + + Merge branch 'sprint/xieqiyu_fixbug_17188' into 'master' + + * Fix bug#17188. + + See merge request easycorp/zentaopms!799 + +commit 9359d427f59a011363f0f7ffcae447739762703a +Author: hufangzhou +Date: Tue Dec 7 15:25:31 2021 +0800 + + * Fix bug #17185. + +commit b69d36f0d1732a585d2e6d0e8a55fe816f926c5f +Author: tianshujie +Date: Tue Dec 7 14:59:30 2021 +0800 + + * Add Kanban first level navigation. + +commit f22631ac2a3a0b82512fcfc7044debd5acaab4ef +Author: xieqiyu +Date: Tue Dec 7 14:56:10 2021 +0800 + + * Fix bug#17113. + +commit 3f132af95b3a2cb89631cd3fdfc224b5eb9eaf9c +Author: songchenxuan +Date: Tue Dec 7 14:51:23 2021 +0800 + + *Finish task #45539. + +commit bccefb77514b4d71467103b1513c99f2d6d73b75 +Author: xieqiyu +Date: Tue Dec 7 14:22:56 2021 +0800 + + * Fix bug#17188. + +commit dde57a36cc4720009296b26354df1768720523d0 +Author: songchenxuan +Date: Tue Dec 7 14:03:20 2021 +0800 + + *Finish task #45539. + +commit 92014ce0ce33203312e253a145de024cd20bbf59 +Author: tanghucheng +Date: Tue Dec 7 13:54:00 2021 +0800 + + * Finish task #45805. + +commit 847071497dc699a36ba604522f43ab51d6dcf27d +Merge: e5873a07e0 b8197551ef +Author: 朱金勇 +Date: Tue Dec 7 05:24:43 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_sql' into 'master' + + * Modify the editedBy field in zt_apistruct table and add the standard sql. + + See merge request easycorp/zentaopms!798 + +commit b8197551effa89478c76f52b40c5e9d2d795271a +Author: hufangzhou +Date: Tue Dec 7 13:23:39 2021 +0800 + + * Modify the apistruct table field. + +commit 6c4db07b391d85e649e23bd127128bb2ee4809d6 +Author: mayue +Date: Tue Dec 7 11:18:57 2021 +0800 + + * Fix bug #16964. + +commit 68b7073f9e105ed1d05f6f1fa45ad5ba9155030d +Author: hufangzhou +Date: Tue Dec 7 11:15:47 2021 +0800 + + * Modify the editedBy field in zt_apistruct table and add the standard sql. + +commit e5873a07e09643212bd086516103856d5e365922 +Author: zhujinyong +Date: Tue Dec 7 11:06:56 2021 +0800 + + + Add demo lib for api. + +commit 05ea6688526fb3dd7b58efce8d1e82abc88e2f00 +Author: songchenxuan +Date: Tue Dec 7 10:34:56 2021 +0800 + + *Finish task #45539. + +commit 8afc0024e0f4ee74d4329b1b3dee374f80a916a3 +Author: tanghucheng +Date: Tue Dec 7 10:07:02 2021 +0800 + + * Fix bug #17126. + +commit 5d1da3d0f5cbd7ba94b3a0d2e454a1e16c3247da +Author: tanghucheng +Date: Tue Dec 7 09:33:52 2021 +0800 + + * Fix bug #17126. + +commit 9a2148a5403c968b9bb656becdcec0b2d741bdb7 +Author: chaideqing +Date: Tue Dec 7 09:27:40 2021 +0800 + + * fix xuanxuan 84's bug + +commit 8cca6a3e33c7c49164f6061ab19b28cc3672d22d +Merge: 192cbfd23a d876550d96 +Author: 王怡栋 +Date: Tue Dec 7 01:25:08 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_package' into 'master' + + * Add the traditional Chinese language item. + + See merge request easycorp/zentaopms!796 + +commit d876550d96013cdc0a40295e9a5ec2639e86b24d +Author: hufangzhou +Date: Tue Dec 7 09:22:58 2021 +0800 + + * Add the traditional Chinese language item. + +commit 192cbfd23a1e4927b9d5470fd3a16eff7d10a119 (tag: zentaopms_16.0.beta1_20211207) +Merge: 1ee592147a 0f72dcc6ea +Author: 李玉春 <563917701@qq.com> +Date: Tue Dec 7 00:56:27 2021 +0000 + + Merge branch 'sprint/175_sgm_fixbug' into 'master' + + * Fix project name check unique logic. + + See merge request easycorp/zentaopms!793 + +commit 1ee592147a50d65b69c48d4c46be6866310e50aa +Author: tanghucheng +Date: Tue Dec 7 08:41:51 2021 +0800 + + * Fix programplan lang. + +commit dfc9fd84db884163c06b0e47c9a31f838a29972a +Merge: 5c84ad89b7 379baac86d +Author: 孙广明 +Date: Tue Dec 7 08:39:25 2021 +0800 + + Merge branch 'sprint/master_tanghucheng_project' + +commit 379baac86d5d90909963e60134a4e49a3c5502bd +Merge: ac12590b03 5c84ad89b7 +Author: 孙广明 +Date: Tue Dec 7 00:38:58 2021 +0000 + + Merge branch 'master' into 'sprint/master_tanghucheng_project' + + # Conflicts: + # module/programplan/lang/en.php + +commit 5c84ad89b76ab76c25f5bee2141908619d45f45c +Merge: dea01a13cf 88eac3a1da +Author: 孙广明 +Date: Tue Dec 7 00:33:48 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_package' into 'master' + + * Fallback version of the xuanxuan folder. + + See merge request easycorp/zentaopms!795 + +commit dea01a13cfead47bbb88c1952c4dc8a2424f4a3a +Merge: 3d1d34e383 ccff5c2366 +Author: 孙广明 +Date: Tue Dec 7 00:33:27 2021 +0000 + + Merge branch 'sprint/174_sunhao/improve_kanban' into 'master' + + * Update kanban lib and compatible with duplicate columns definition. + + See merge request easycorp/zentaopms!794 + +commit 88eac3a1da0449030f89bebf6df8d888d4874660 +Author: hufangzhou +Date: Mon Dec 6 20:09:06 2021 +0800 + + * Fallback version of the xuanxuan folder. + +commit ccff5c236651a006cec64ea626c2eb91ddb315f4 +Author: Hao Sun +Date: Mon Dec 6 17:19:29 2021 +0800 + + * Update kanban lib and compatible with duplicate columns definition. + +commit e4df2494bd400cd23a21feda883da7a27219343e +Author: qixinzhi +Date: Mon Dec 6 17:03:27 2021 +0800 + + * ellipsis long title for zentao card + +commit ac12590b03db55f78daacdabfa036eaf0a1c7c0e +Author: tanghucheng +Date: Mon Dec 6 15:28:53 2021 +0800 + + * Fix bug #17130,17129,17128. + +commit 0f72dcc6ea5960ee00ba0f1c40b24c1939331cfa +Author: 孙广明 +Date: Mon Dec 6 15:22:57 2021 +0800 + + * Fix project name check unique logic. + +commit 3d1d34e383714b39b034125780309c7f7f3d48f0 +Merge: 9db701d207 bb635e3c48 +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 6 07:18:57 2021 +0000 + + Merge branch 'sprint/174_tianshujie_17115' into 'master' + + * Fix bug #17115. + + See merge request easycorp/zentaopms!785 + +commit 9db701d20755e82bfb4b2b024b618947f3390354 +Merge: fd5cca16b3 0dc84860e9 +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 6 07:18:39 2021 +0000 + + Merge branch 'sptint/174_xieqiyu_17079' into 'master' + + * Fix bug#17113. + + See merge request easycorp/zentaopms!788 + +commit fd5cca16b361a9cdea20e34b1f68f62179c097f2 +Merge: 7091037194 22ac002432 +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 6 07:15:25 2021 +0000 + + Merge branch 'sgm_fixbug' into 'master' + + * Fix code error. + + See merge request easycorp/zentaopms!790 + +commit 70910371941b6badcab574bd504bd78e5daa2ee0 +Merge: a339b6e024 8debfb8ad8 +Author: 王怡栋 +Date: Mon Dec 6 07:14:51 2021 +0000 + + Merge branch 'sprint/175_sgm_upgrade' into 'master' + + Sprint/175 sgm upgrade + + See merge request easycorp/zentaopms!786 + +commit a339b6e024e6b529339dc6a7341208b25a0a761d +Merge: f3bd7149f9 bd28d11c75 +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 6 07:14:23 2021 +0000 + + Merge branch 'sprint/175_sgm_fixbug' into 'master' + + * Fix bug. + + See merge request easycorp/zentaopms!792 + +commit fb84d28b4a6495021722efbc6ad4c2210eb8b1fa +Author: tanghucheng +Date: Mon Dec 6 15:04:49 2021 +0800 + + * Fix bug #17128. + +commit bd28d11c757335a9f03ea6c1c05f1f0e29337e31 +Author: 孙广明 +Date: Mon Dec 6 15:04:33 2021 +0800 + + * Fix bug. + +commit cb23e8ff2b32326e04c08b8bd97cbef6cc2db768 +Author: tanghucheng +Date: Mon Dec 6 14:49:53 2021 +0800 + + * adjust for date format for programplan. + +commit f2a989e851df4d60ab02073772db928896ec683a +Author: tanghucheng +Date: Mon Dec 6 14:21:23 2021 +0800 + + * adjust for date format for programplan. + +commit 22ac002432c70ad1a5d81837c8d41a99afe390c2 +Author: 孙广明 +Date: Mon Dec 6 13:59:36 2021 +0800 + + * Fix code error. + +commit 55e74ee1724bec5c6da25592eb1705a94d17eb24 +Author: qixinzhi +Date: Mon Dec 6 13:12:36 2021 +0800 + + * product plan card adjust scroll bar style + +commit f3bd7149f987fdbc2045aabafaf74b24404443e5 +Merge: e24ded1429 9b7a85cdd7 +Author: 孙广明 +Date: Mon Dec 6 05:11:11 2021 +0000 + + Merge branch 'sprint/174_sunhao/improve_kanban' into 'master' + + * Improve kanban UI, bug #17063. + + See merge request easycorp/zentaopms!787 + +commit 074b1ad5918a24f77b364019a28b703e859c7086 +Author: Wenrui LI +Date: Mon Dec 6 13:10:16 2021 +0800 + + * avoid using magic number. + +commit e24ded142945c8f68a003b9b45f4ac9ab53be8fc +Merge: 2dc3e19e7d 05d9182e31 +Author: 孙广明 +Date: Mon Dec 6 05:07:38 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_17116' into 'master' + + * Fix bug #17116, bug #17117. + + See merge request easycorp/zentaopms!789 + +commit 05d9182e31adb2abad1acf2b66a623802a5c28d5 +Author: hufangzhou +Date: Mon Dec 6 12:09:15 2021 +0800 + + * Fix bug #17116, bug #17117. + +commit 2dc3e19e7d9288607167e8f99bf1e10875d86513 +Merge: 641929d5fc 4a2d21595e +Author: 王怡栋 +Date: Mon Dec 6 11:56:16 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 641929d5fcc308d202a39273d31505130acabe3c +Author: 王怡栋 +Date: Mon Dec 6 11:55:50 2021 +0800 + + * adjust for status name for api. + +commit 0dc84860e9ed723ff1f90c0fd6025635cf888b6f +Author: xieqiyu +Date: Mon Dec 6 11:55:46 2021 +0800 + + * Fix bug#17113. + +commit 9b7a85cdd758ba6c80a353bca1e5856296da5927 +Author: Hao Sun +Date: Mon Dec 6 11:44:07 2021 +0800 + + * Fix kanban columns width not fit the layout sometimes in flex mode. + +commit bb635e3c4849251437c85f0b29461f691150501c +Author: tianshujie +Date: Mon Dec 6 11:36:33 2021 +0800 + + * Modify the code format of caselib js file. + +commit 18c0ef3210197c10d6cf7eee9cb4cdace6aee731 +Author: Hao Sun +Date: Mon Dec 6 11:30:11 2021 +0800 + + * Custom dnd rules for project kanban. + +commit 78af43d78c97d2233efb00c545938978cd9f9cc9 +Author: tianshujie +Date: Mon Dec 6 11:26:27 2021 +0800 + + * Fix bug #17115. + +commit 8debfb8ad866cce8533de7b0d1874dab9086821d +Author: 孙广明 +Date: Mon Dec 6 11:25:34 2021 +0800 + + * Remove version. + +commit 4a2d21595e3db7043a4725a6ec933cdbc9e6fef0 +Merge: b8432110bf 4de8fc462f +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 6 03:22:48 2021 +0000 + + Merge branch 'sptint/174_xieqiyu_17079' into 'master' + + * Fix bug#17079. + + See merge request easycorp/zentaopms!778 + +commit 50ad00b1c4e76705792b8815399f6a623b00ba74 +Author: Hao Sun +Date: Mon Dec 6 11:19:05 2021 +0800 + + * Fix dnd not work in project kanban. + +commit 8d08be2f57f2b2ea89feea2df7ce4fadd0b6a072 +Author: Hao Sun +Date: Mon Dec 6 11:18:49 2021 +0800 + + * Fix cards count incorrect on some kanbans. + +commit b8432110bf01b15c7c03efb91f7a9d29f27db02c +Merge: 7ebdc11ad1 bb6dba1a78 +Author: 孙广明 +Date: Mon Dec 6 03:18:06 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_17111' into 'master' + + *Fix bug #17111. + + See merge request easycorp/zentaopms!784 + +commit 7ebdc11ad17163de19a1ceff071e8b39c82e28b0 +Merge: 7cd00e0d84 417c625c84 +Author: 孙广明 +Date: Mon Dec 6 03:16:28 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_17109' into 'master' + + Sprint/174 songchenxuan 17109 + + See merge request easycorp/zentaopms!780 + +commit bb6dba1a7812013d935cded4394cda049bad1c01 +Author: songchenxuan +Date: Mon Dec 6 11:12:21 2021 +0800 + + *Fix bug #17111. + +commit 69304124b5cd8522600cf3b2f9da2b106248b4d6 +Author: 孙广明 +Date: Mon Dec 6 10:58:52 2021 +0800 + + * Change for upgrade. + +commit 7cd00e0d848a6b6a00c39246b9694788de756dc1 +Merge: 679d8aeb5e 11d9ad6044 +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 6 02:41:55 2021 +0000 + + Merge branch 'revert-aacf4ec4' into 'master' + + Revert "Merge branch 'sprint/175_tianshujie_17056' into 'master'" + + See merge request easycorp/zentaopms!783 + +commit 679d8aeb5e103959f65459d0aab89a3f6f1a32b3 +Merge: ad1cc7c04f 2ed3d819e8 +Author: 孙广明 +Date: Mon Dec 6 02:39:26 2021 +0000 + + Merge branch 'sprint/174_sunhao/improve_kanban' into 'master' + + * Bug #17056, fix duplicated modal in execution kanban page. + + See merge request easycorp/zentaopms!782 + +commit 11d9ad6044be0aae99ac19c1d1d2bd080e0e7316 +Author: 孙广明 +Date: Mon Dec 6 02:37:20 2021 +0000 + + Revert "Merge branch 'sprint/175_tianshujie_17056' into 'master'" + + This reverts merge request !781 + +commit ad1cc7c04f8e7e51aeabff7732eac8faa6bb38cb +Merge: aacf4ec487 145fc2a461 +Author: 孙广明 +Date: Mon Dec 6 02:33:35 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_17077' into 'master' + + * Fix bug #17077. + + See merge request easycorp/zentaopms!774 + +commit 145fc2a4615db05fb88ed8ff4e080354e779fed4 +Author: hufangzhou +Date: Mon Dec 6 10:27:51 2021 +0800 + + * Fix bug #17074. + +commit aacf4ec487a8b026e983003b19d41106fffead57 +Merge: 8298927ee3 183bf88f28 +Author: 孙广明 +Date: Mon Dec 6 02:26:51 2021 +0000 + + Merge branch 'sprint/175_tianshujie_17056' into 'master' + + * Fix bug #17056. + + See merge request easycorp/zentaopms!781 + +commit 8298927ee3f335452c204db2b51818394da8dfbc +Merge: 19c28afc63 6507be61d8 +Author: 孙广明 +Date: Mon Dec 6 02:25:45 2021 +0000 + + Merge branch 'sprint/174_tianshujie_17108' into 'master' + + * Fix bug #17108. + + See merge request easycorp/zentaopms!776 + +commit 19c28afc6386a9a277b2afbe977e34e666fedcf7 +Merge: d26c538f79 f0d10b252f +Author: 孙广明 +Date: Mon Dec 6 02:24:57 2021 +0000 + + Merge branch 'sprint/175_liumengyi_17083' into 'master' + + * Fix bug #17083. + + See merge request easycorp/zentaopms!779 + +commit 183bf88f289904d8869125ca905d8a37007d3a12 +Author: tianshujie +Date: Mon Dec 6 10:22:47 2021 +0800 + + * Fix bug #17056. + +commit 2ed3d819e81bd74b51b61dde2fcbde222d497aff +Author: Hao Sun +Date: Mon Dec 6 10:06:35 2021 +0800 + + * Bug #17056, fix duplicated modal in execution kanban page. + +commit 417c625c84b580d4134ad4afafaf3ff20abf6a7f +Author: songchenxuan +Date: Mon Dec 6 10:02:17 2021 +0800 + + *Fix bug #17109. + +commit 22dc646e85f6b1b2f145b00102b8c14696719e75 +Author: qixinzhi +Date: Mon Dec 6 09:59:29 2021 +0800 + + * hide history for product plan card in xuanxuan + +commit eca98433cfcc14a87becdf3adda5e7db989c6fc3 +Author: songchenxuan +Date: Mon Dec 6 09:52:56 2021 +0800 + + *Fix bug #17109. + +commit f0d10b252f76ac4b6e4891b44e135cc3a17b5e40 +Author: liumengyi +Date: Mon Dec 6 09:49:59 2021 +0800 + + * Fix bug #17083. + +commit 2f8bf5331fe14ac1633dc9e68cfd1d2ab3dbf689 +Author: Hao Sun +Date: Mon Dec 6 09:37:15 2021 +0800 + + * update zui lib. + +commit 74ef8b9a1094d519cd04edf0eb803239fc6be957 +Author: Hao Sun +Date: Mon Dec 6 09:36:59 2021 +0800 + + * refactor: comment. + +commit 4de8fc462fdf8f776dc8dc7ac9ab4a463e6d6d60 +Author: xieqiyu +Date: Mon Dec 6 09:33:41 2021 +0800 + + * Fix bug#17079. + +commit d26c538f79b7acd6aec859306fed57852bc65b70 +Merge: a2d33ec110 c6b731717a +Author: 孙广明 +Date: Mon Dec 6 01:31:12 2021 +0000 + + Merge branch 'sprint/master_tanghucheng_project' into 'master' + + * Fix project execution privilege. + + See merge request easycorp/zentaopms!777 + +commit c6b731717a47d58d03b4fbf40a8b75bff16068c5 +Author: tanghucheng +Date: Mon Dec 6 09:24:06 2021 +0800 + + * Fix project execution privilege. + +commit 6507be61d815509783b8ea8f30c7e3f3a7eee9e1 +Author: tianshujie +Date: Mon Dec 6 09:20:22 2021 +0800 + + * Fix bug #17108. + +commit e1b5dd464224f7b760b1b95bd76117df46066687 +Author: hufangzhou +Date: Mon Dec 6 09:12:46 2021 +0800 + + * Add the unitcases method for remove the branch select. + +commit a2d33ec110681b15861e0d79c9ddbb113e83138b +Merge: 7331e5c8e3 5c23642d36 +Author: 孙广明 +Date: Mon Dec 6 01:10:28 2021 +0000 + + Merge branch 'sprint/liyuchun_bug_16639' into 'master' + + * Fix bug #16639. + + See merge request easycorp/zentaopms!775 + +commit 5c23642d3659a256b0663bebf6cbd5b3163c6e7a +Author: liyuchun +Date: Mon Dec 6 09:06:50 2021 +0800 + + * Fix bug #16639. + +commit 6eeaa44aa02f83fb1f1e06fa1a18fb76fe60c3d1 +Author: hufangzhou +Date: Mon Dec 6 08:58:58 2021 +0800 + + * Fix bug #17077. + +commit 7331e5c8e31d58a1f4056b5ce00f2c9a01b9fbe1 +Merge: 5a8e51a9c6 c3836a8327 +Author: 李玉春 <563917701@qq.com> +Date: Mon Dec 6 00:52:44 2021 +0000 + + Merge branch 'sprint/175_sgm_fixbug' into 'master' + + Sprint/175 sgm fixbug + + See merge request easycorp/zentaopms!773 + +commit 5a8e51a9c606afa9777d3efc09e666db1fab14c5 +Merge: 035c35d2e2 2935b5964c +Author: 孙广明 +Date: Mon Dec 6 00:33:10 2021 +0000 + + Merge branch 'sprint/master_tanghucheng_project' into 'master' + + * Merge programplan into stage. + + See merge request easycorp/zentaopms!760 + +commit c3836a83272b324dec2f45228f8af73814c59067 +Author: 孙广明 +Date: Mon Dec 6 08:22:31 2021 +0800 + + * Fix release lang. + +commit 664ba5336ab7f247348612a57a76bf8bdc9bca7b +Author: 孙广明 +Date: Mon Dec 6 08:20:21 2021 +0800 + + * Add lang. + +commit 035c35d2e2f348229772a889a87d1dd63577c304 +Author: zhujinyong +Date: Mon Dec 6 08:19:15 2021 +0800 + + * Fix status of testcase. + +commit 5f3b5817c9d3b5c2b93533b0d0f1b4e1a8cb79a5 +Merge: f6d7234156 f59d0863cd +Author: zhujinyong +Date: Sun Dec 5 23:51:59 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f6d72341569163d2363c485d11e20ccb97c634a7 +Author: zhujinyong +Date: Sun Dec 5 23:51:27 2021 +0800 + + * Fix bugs of api. + +commit f59d0863cdbf998a52a58fe58d776c215e8ca252 +Merge: 2b8a51de68 2b50a60ddc +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 3 09:45:15 2021 +0000 + + Merge branch 'devops_16786' into 'master' + + * Fix bug#16786,16981 + + See merge request easycorp/zentaopms!771 + +commit 2b50a60ddc61ddbdf0609c507504f9b806cab5e9 +Author: zenggang +Date: Fri Dec 3 09:36:33 2021 +0000 + + * Adjust code style + +commit 2935b5964c3889259f4aec7d80fef609f5a94e53 +Author: tanghucheng +Date: Fri Dec 3 15:49:18 2021 +0800 + + * Merge programplan into stage. + +commit 2b8a51de686337a22dba98d74c3fe4692b88ca0a +Merge: c16478c5d0 8d72bedc6d +Author: 王怡栋 +Date: Fri Dec 3 15:48:07 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit c16478c5d028aa6b013b346bf5afe43da9ab4168 +Author: 王怡栋 +Date: Fri Dec 3 15:47:39 2021 +0800 + + * fix for upgrade from lower version. + +commit b464d9d1082f083e271c06906129527f4fa8acd9 +Author: 孙广明 +Date: Fri Dec 3 15:45:00 2021 +0800 + + * Fix bug #17080. + +commit 303ecdf5c81b3c573b5585a2a1ad9860e679bb31 +Author: zenggang +Date: Fri Dec 3 07:40:08 2021 +0000 + + * Adjust code stye + +commit 8d72bedc6de236c45dc319735c040a62ac281605 +Merge: 16bb344a1f d5f6181ea3 +Author: 孙广明 +Date: Fri Dec 3 07:27:07 2021 +0000 + + Merge branch 'sprint/175_zhengrunyu_fixbug' into 'master' + + *Fixbug 17066. + + See merge request easycorp/zentaopms!769 + +commit 7248447ed72f6e5a62582156968edfce0358a91e +Author: zenggang +Date: Fri Dec 3 06:59:44 2021 +0000 + + * Fix bug#16786,16981 + +commit 16bb344a1f2d4ec3506a5c08b9b6561ebf967f86 +Merge: 7344486770 a944ec7ccd +Author: 王怡栋 +Date: Fri Dec 3 06:50:05 2021 +0000 + + Merge branch 'sprint/174_xieqiyu_17075' into 'master' + + * Fix bug#17075. + + See merge request easycorp/zentaopms!770 + +commit a944ec7ccdc33d59840ae843a7e92ac67a320fb2 +Author: xieqiyu +Date: Fri Dec 3 14:46:12 2021 +0800 + + * Fix bug#17075. + +commit be4c1f3041245b04240ba3ae9ff3bec79f03f7e7 +Author: tanghucheng +Date: Fri Dec 3 14:31:47 2021 +0800 + + * Merge programplan into stage. + +commit 30d1e22dcad6a92cbbb8fdfe2d725b5c7669765d +Author: tanghucheng +Date: Fri Dec 3 13:57:08 2021 +0800 + + * Merge programplan into stage. + +commit 7344486770babf89fd77afc9960b347bedf59132 +Merge: 9cf38e4ff8 acf95daf8a +Author: 王怡栋 +Date: Fri Dec 3 13:54:05 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d5f6181ea3b59b3e4cbf9d4685c119e4690f1c30 +Author: zhengrunyu +Date: Fri Dec 3 13:53:53 2021 +0800 + + *Fixbug 17066. + +commit 9cf38e4ff884cd345409590676be1d83edd9b025 +Author: 王怡栋 +Date: Fri Dec 3 13:53:50 2021 +0800 + + * adjust for projectOverview. + +commit 9144c435bc6ab3b043ea3cacf931b75c67b1a725 +Author: 孙广明 +Date: Fri Dec 3 13:49:57 2021 +0800 + + * Fix bug #17068. + +commit acf95daf8aa6d9502ce02fbd9a794ebe473d1be9 +Merge: 0f2ea93509 e76a988bbe +Author: 孙广明 +Date: Fri Dec 3 05:35:30 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_17065' into 'master' + + * Fix bug #17065. + + See merge request easycorp/zentaopms!768 + +commit e76a988bbe14c43a1d1bfed1a0724d529a0908d2 +Author: hufangzhou +Date: Fri Dec 3 13:25:51 2021 +0800 + + * Fix bug #17065. + +commit f9aad89126aa3090bb3aa10e806c258d950e4eca +Author: Hao Sun +Date: Fri Dec 3 13:24:04 2021 +0800 + + * remove unused variable in index view. + +commit 0f2ea93509ddc04ffa24d8a1169378a589d8efcb +Merge: 8c83a45cd3 f619cf0341 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 3 05:22:07 2021 +0000 + + Merge branch 'devops_16884' into 'master' + + * Fix bug#16884,16856 + + See merge request easycorp/zentaopms!758 + +commit 8c83a45cd38a22d2313f418fb191c791f59a1ad3 +Merge: 0c888e8dff 47f1099039 +Author: liyuchun +Date: Fri Dec 3 13:21:23 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0c888e8dff2ead3ecc6289ab7db7acecdee79a8e +Merge: 671cf2a8fa f0f0325a8d +Author: liyuchun +Date: Fri Dec 3 13:20:29 2021 +0800 + + Merge branch 'sprint/174_xieqiyu_45015' + +commit 47f1099039df293e16938f5a6516d4c3fcb42fb2 +Author: xieqiyu +Date: Fri Dec 3 13:09:22 2021 +0800 + + * Fix bug#17061. + +commit f0f0325a8d69286de6c048a29a5120a593732f76 +Merge: 5d5045a4dd 3455ec3004 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 3 05:07:19 2021 +0000 + + Merge branch 'master' into 'sprint/174_xieqiyu_45015' + + # Conflicts: + # module/testcase/control.php + +commit 3455ec3004a2056b8ed22753a3efd1ad145e1d85 +Merge: d73d395995 6057c36ce5 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 3 05:05:42 2021 +0000 + + Merge branch 'sprint/174_xieqiyu_17022' into 'master' + + * Add judgment on null parameters. + + See merge request easycorp/zentaopms!740 + +commit d73d39599512880a24a5b06708b0110f40ee99bc +Merge: e660a67e40 671cf2a8fa +Author: zhujinyong +Date: Fri Dec 3 12:37:58 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit e660a67e40d4c66e722887311448d5889ff32101 +Author: zhujinyong +Date: Fri Dec 3 12:37:45 2021 +0800 + + * Fix product api. + +commit 5d5045a4ddd44db6095d33b7549437de5b746256 +Author: xieqiyu +Date: Fri Dec 3 12:30:30 2021 +0800 + + * Adjust code for import form lib. + +commit f619cf0341ebd821ee01d877920d64d47542ef7a +Author: zenggang +Date: Fri Dec 3 03:09:37 2021 +0000 + + * Adjust mr view button + +commit 499605d81e219380b0287992bc50a2aa3a6dd51b +Author: tanghucheng +Date: Fri Dec 3 11:09:28 2021 +0800 + + * Merge programplan into stage. + +commit 671cf2a8fae1a96c4806def7540b3f59edd99d6f +Merge: 26056ba15b c919c8105d +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 3 02:57:22 2021 +0000 + + Merge branch 'sprint/174_sunhao/bug16878' into 'master' + + * Bug 16878, fix layout when open execution/task in iframe modal. + + See merge request easycorp/zentaopms!765 + +commit c919c8105dff03d28f814533cd9b76fb55f32d66 +Author: liyuchun +Date: Fri Dec 3 10:56:55 2021 +0800 + + * Adjust code style. + +commit e61c87a6ff5eec739961f6bb6d3f181f404508d1 +Author: xieqiyu +Date: Fri Dec 3 10:49:42 2021 +0800 + + * Code for task#45015. + +commit 8143223751b62684e4cea007ac1c12c752785171 +Author: qixinzhi +Date: Fri Dec 3 10:26:14 2021 +0800 + + * promote parentType to contentData + +commit 26056ba15b33337ede26880a6bcf600dabac8dbe +Merge: 87c7acdf03 4b53f349df +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 3 02:25:07 2021 +0000 + + Merge branch 'devops_16736' into 'master' + + * Fix bug#16736,17037,16844 + + See merge request easycorp/zentaopms!766 + +commit 87c7acdf038848a31a3d5cfc9ec754a3db32831b +Merge: fd0e67494d c39512c79e +Author: 孙广明 +Date: Fri Dec 3 02:11:49 2021 +0000 + + Merge branch 'sprint/175_liyuchun_45162' into 'master' + + * Finish task #45154. + + See merge request easycorp/zentaopms!762 + +commit fd0e67494d6749520f3fac40d7a234e4d69a818b +Merge: fc9fe1ac84 cda9cdf969 +Author: 孙广明 +Date: Fri Dec 3 02:11:31 2021 +0000 + + Merge branch 'sprint/175_zhengrunyu_fixbug' into 'master' + + *Fixbug . + + See merge request easycorp/zentaopms!767 + +commit cda9cdf9698a0219fbd6ba6c45d9d419a6e3becf +Author: zhengrunyu +Date: Fri Dec 3 10:04:54 2021 +0800 + + *Fixbug . + +commit fc9fe1ac841e71b66ecbe1edc71e15824f15e40d +Merge: 861e92107c 0d9f5197af +Author: zhujinyong +Date: Fri Dec 3 10:01:17 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 861e92107c519af0516a81fe665ac6cccaf104cb +Author: zhujinyong +Date: Fri Dec 3 10:01:01 2021 +0800 + + + Add user type for api. + +commit 4b53f349dff38ad97c6ddbe59c221b34d477102a +Author: zenggang +Date: Fri Dec 3 01:59:04 2021 +0000 + + * Fix bug#16736,17037,16844 + +commit 06cf26ea9a8182b540e4f3d6d8c13fb775e69335 +Author: chaideqing +Date: Fri Dec 3 09:58:26 2021 +0800 + + * add project name in execution card title + +commit 0d9f5197af1cd102340d8bcdc16e1190c47c9928 +Merge: 096f679282 ae50871336 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 3 01:57:35 2021 +0000 + + Merge branch 'sprint/175_sgm_fixbug' into 'master' + + * Fix bug #17051. + + See merge request easycorp/zentaopms!764 + +commit 42a1cdc0b41e7f79aa3a55585b17a4e405f5e431 +Author: Hao Sun +Date: Fri Dec 3 09:56:11 2021 +0800 + + * Bug 16878, fix layout when open execution/task in iframe modal. + +commit ae50871336e611458a7beb7d8617a5657ca4e022 +Author: 孙广明 +Date: Fri Dec 3 09:55:21 2021 +0800 + + * Fix style. + +commit 096f6792828ed2f3a6e3a255e8f17bddc4407b4b +Merge: caab069444 87769894a6 +Author: 王怡栋 +Date: Fri Dec 3 09:54:44 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit caab0694445531e74056a6e954072d83fc602c45 +Author: 王怡栋 +Date: Fri Dec 3 09:54:28 2021 +0800 + + * add system mode for config. + +commit fe3e96de2d7d97eedb9829525c956a6eb0f7c212 +Author: 孙广明 +Date: Fri Dec 3 09:46:58 2021 +0800 + + * Fix bug #17051. + +commit 87769894a6e47b727013795fdb6d82f732fdb639 +Merge: 3c276c75f5 dda03577c1 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 3 01:46:39 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_17038' into 'master' + + * Fix bug #17038. + + See merge request easycorp/zentaopms!754 + +commit 579d98ada16aa0a4f5c3fec331cca31c0a7b3fcb +Author: tanghucheng +Date: Fri Dec 3 09:39:37 2021 +0800 + + * Merge programplan into stage. + +commit 346b0cf9e20169e422ded1959478d005c041b582 +Author: xieqiyu +Date: Fri Dec 3 09:35:36 2021 +0800 + + * Finish task#45015. + +commit d4bfcd15cc0db4c4a703cfe6e734b2c445975e93 +Author: tanghucheng +Date: Fri Dec 3 09:35:14 2021 +0800 + + * Merge programplan into stage. + +commit c39512c79e96eb41e02f0c4ea3f091c1bc5fbf63 +Author: liyuchun +Date: Fri Dec 3 09:33:35 2021 +0800 + + * Finish task #45154. + +commit 3c276c75f558c8de0956f1e8f8ce8f5746fdc5d7 +Merge: 2837dc322c 32ec141d3d +Author: 王怡栋 +Date: Fri Dec 3 09:26:27 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 2837dc322cdac7478ef792fe8859bde656c90fa6 +Author: 王怡栋 +Date: Fri Dec 3 09:25:44 2021 +0800 + + * adjust for classic mode and fix bug. + +commit 613d171dded25ed303d967b0356011d385e432a8 +Author: tanghucheng +Date: Fri Dec 3 09:20:08 2021 +0800 + + * Merge programplan into stage. + +commit 1acd92b85d12e2499c66597c11202be42b341386 +Author: tanghucheng +Date: Fri Dec 3 09:13:57 2021 +0800 + + * Merge programplan into stage. + +commit 686c40396bb8d39779d24b418a2a5e6a22c3ec30 +Author: tanghucheng +Date: Fri Dec 3 09:11:43 2021 +0800 + + * Merge programplan into stage. + +commit eb8c0226d0a8d88381fe8486704e39c5e15b2605 +Author: Wenrui LI +Date: Fri Dec 3 09:08:41 2021 +0800 + + * group notifications by parent type, and add parent type as content data. + +commit 32ec141d3d60abf4aae4cfd5a7a560b2047d688b +Merge: 27a25ed019 2b331d987d +Author: 孙广明 +Date: Fri Dec 3 01:04:19 2021 +0000 + + Merge branch 'sprint/devops_liyuchun_bug' into 'master' + + * Adjust style. + + See merge request easycorp/zentaopms!750 + +commit 27a25ed019138744dcee325ecc69d394238644d7 +Merge: 789a419696 90b385d022 +Author: 孙广明 +Date: Fri Dec 3 01:03:41 2021 +0000 + + Merge branch 'sprint/174_tianshujie_17025' into 'master' + + * Fix bug #17025. + + See merge request easycorp/zentaopms!761 + +commit 789a419696f7bd5100d956d5f5a64a657ec3cef3 +Merge: acf728eb91 3230cff401 +Author: 朱金勇 +Date: Fri Dec 3 00:50:26 2021 +0000 + + Merge branch 'sprint/168_sunhao/improve_kanban' into 'master' + + * Support for using kanban in old browsers without CSS flex. + + See merge request easycorp/zentaopms!757 + +commit 90b385d0224aaf1a52aa57b6fb6c0cb40c0510e8 +Author: tianshujie +Date: Fri Dec 3 08:45:02 2021 +0800 + + * Fix bug #17025. + +commit acf728eb9144e08aeb1a50ab6b3d575bff4295d0 +Merge: 1c61d0c57a 24c613bba9 +Author: 李玉春 <563917701@qq.com> +Date: Fri Dec 3 00:26:35 2021 +0000 + + Merge branch 'sprint/175_sgm_fixbug' into 'master' + + * Fix bug. + + See merge request easycorp/zentaopms!756 + +commit fa808b990b9b8e2e9e4d7721c7d38f5a1363f83e +Author: tanghucheng +Date: Fri Dec 3 08:19:14 2021 +0800 + + * Merge programplan into stage. + +commit 19420bef7be88e057e77ea4ab0e8bfadee18dc81 +Author: tanghucheng +Date: Fri Dec 3 00:55:54 2021 +0800 + + * Code for stage. + +commit 42a5e9bf782095050ef7bdc2f50bfbb3ba451e69 +Author: zenggang +Date: Thu Dec 2 09:32:45 2021 +0000 + + * Fix bug#16884,16856 + +commit 3230cff401f917d6b7abd1b79195f65404b4ee23 +Author: Hao Sun +Date: Thu Dec 2 17:03:41 2021 +0800 + + * fix kanban not work in ie. + +commit 24c613bba971dfd749cdce0cbffe96c57a5e7c7a +Author: 孙广明 +Date: Thu Dec 2 17:01:33 2021 +0800 + + * Fix bug. + +commit 5d8252a897c46fdfa9e9b170acaab27f815a879f +Author: qixinzhi +Date: Thu Dec 2 17:00:51 2021 +0800 + + * format id for notification message + +commit 1c61d0c57a1edafe009c20f30eccd74fcb4039c0 +Merge: 01cb981c6e e02537be9b +Author: 孙广明 +Date: Thu Dec 2 08:58:47 2021 +0000 + + Merge branch 'sprint/174_tianshujie_17050' into 'master' + + * Fix bug #17050. + + See merge request easycorp/zentaopms!755 + +commit e02537be9b3c7d62cd6441e1aa8806934a0908c5 +Author: tianshujie +Date: Thu Dec 2 16:56:29 2021 +0800 + + * Fix bug #17050. + +commit dda03577c124e28e2541981328d55b2c9cbc94e4 +Author: hufangzhou +Date: Thu Dec 2 16:55:52 2021 +0800 + + * Fix bug #17038. + +commit 62efd53edbd6506a5b0454002c23f1583f7224e1 +Author: Hao Sun +Date: Thu Dec 2 16:54:56 2021 +0800 + + * update kanban lib and refactor usage of it. + +commit 01cb981c6e3a010ca891197182871244f9c0fdfd +Merge: 0951e47a28 2dbdf45a28 +Author: 王怡栋 +Date: Thu Dec 2 16:53:55 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0951e47a2870e4065fad934b1c4f4fe46f951bbf +Author: 王怡栋 +Date: Thu Dec 2 16:53:20 2021 +0800 + + * fix for save query condition. + +commit 2dbdf45a280afefbeac1403ecadd393f0def0186 +Merge: 669e66e39d 1c3c07e6e0 +Author: 孙广明 +Date: Thu Dec 2 08:45:30 2021 +0000 + + Merge branch 'sprint/174_tianshujie_error' into 'master' + + * Fix the problem that cookic is not updated in time. + + See merge request easycorp/zentaopms!753 + +commit 669e66e39d76f5619c623a74540751c11c7d07ea +Merge: 1885ea1b6d cbf1fe21ac +Author: 孙广明 +Date: Thu Dec 2 08:44:20 2021 +0000 + + Merge branch 'sprint/175_liumengyi_17031' into 'master' + + * Fix bug #17031,#17029. + + See merge request easycorp/zentaopms!752 + +commit 1c3c07e6e06008b76732a60310a401d247d63aed +Author: tianshujie +Date: Thu Dec 2 16:43:15 2021 +0800 + + * Fix the problem that cookic is not updated in time. + +commit cbf1fe21ac052c2d146e772181b3b1ec89ad53d5 +Author: liumengyi +Date: Thu Dec 2 16:16:03 2021 +0800 + + * Remove empty lines. + +commit 1885ea1b6de2ef57fa6ee7de08b51661a144a661 +Merge: 82f0d4f39c 6e2f7563df +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 08:11:37 2021 +0000 + + Merge branch 'sprint/175_sgm_fixbug' into 'master' + + * Fix bug. + + See merge request easycorp/zentaopms!751 + +commit 82f0d4f39cd997ab72f2a4cd77325ee137fc0469 +Merge: e99a81d9ad ed2efc053c +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 08:08:58 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_16975' into 'master' + + * Fix bug #16975. + + See merge request easycorp/zentaopms!739 + +commit 6e2f7563df14b7dabbaa00248f7000c662b7971f +Author: 孙广明 +Date: Thu Dec 2 16:08:43 2021 +0800 + + * Fix bug. + +commit 9d7cd3b29ed9f40c668fc08b0b2706ab285f4f85 +Author: liumengyi +Date: Thu Dec 2 16:08:17 2021 +0800 + + * Fix bug #17031,#17029. + +commit e99a81d9ad42b8b0166d8bdbc2cfcb9d53675fc6 +Merge: ebf78059e8 fc8a537ed9 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 08:06:07 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_branch' into 'master' + + * Fix bug #17046. + + See merge request easycorp/zentaopms!749 + +commit 2b331d987d97fb384d7ee2c3ccbd94f16aa99aee +Author: liyuchun +Date: Thu Dec 2 16:00:32 2021 +0800 + + * Fix bug #16885. + +commit ebf78059e884c5cb7777aeb6f1d614077fc03b92 +Author: zhujinyong +Date: Thu Dec 2 15:55:20 2021 +0800 + + * Rename actions of productplan. + +commit 9c9756bdd892abe358dfee7bcec56fcbfa2abf47 +Author: liyuchun +Date: Thu Dec 2 15:53:06 2021 +0800 + + * Fix bug #16853. + +commit a238baf77c0756f0cd1c7cf50cccda30429d4370 +Merge: ddcdaf4319 21a5a2c31a +Author: zhujinyong +Date: Thu Dec 2 15:46:55 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8e11431865caf668564e0638b4ec2b79291587d2 +Author: liyuchun +Date: Thu Dec 2 15:46:53 2021 +0800 + + * Adjust style. + +commit c75b9ca550b44b5ced29f35892fc0c230e341d99 +Merge: af6a88cba5 24440ff526 +Author: chaideqing +Date: Thu Dec 2 15:46:40 2021 +0800 + + Merge branch 'sprint/168_xuan_notifications' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/168_xuan_notifications + +commit ddcdaf4319c8f72059fa169ad05a98be30d45247 +Author: zhujinyong +Date: Thu Dec 2 15:46:24 2021 +0800 + + * Fix api of users. + +commit af6a88cba56f37f5ede9df9cb9db25dbbae00487 +Author: chaideqing +Date: Thu Dec 2 15:46:08 2021 +0800 + + * add linkButton on productPlan card + +commit 21a5a2c31ad9de8c21f9a3679e2a025346e22feb +Merge: 7343f4a2af b26673eb9b +Author: 王怡栋 +Date: Thu Dec 2 15:43:58 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 7343f4a2af67e8049d8830624503658d5a29fbeb +Author: 王怡栋 +Date: Thu Dec 2 15:43:36 2021 +0800 + + * fix bug for save query condition. + +commit b26673eb9b289bf1b227766076645dcf6a20659d +Merge: db897d851d 9e9dcf653d +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 07:42:14 2021 +0000 + + Merge branch 'sprint/174_tianshujie_16968' into 'master' + + Sprint/174 tianshujie 16968 + + See merge request easycorp/zentaopms!748 + +commit db897d851df63671be574b2740ed89f742e3a209 +Merge: a71e05051b a48f584ca8 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 07:41:47 2021 +0000 + + Merge branch 'devops_16765' into 'master' + + * Fix bug#16765,16771 + + See merge request easycorp/zentaopms!746 + +commit fc8a537ed9662bbde85deb66deb9e7672d239580 +Author: hufangzhou +Date: Thu Dec 2 15:41:25 2021 +0800 + + * Fix bug #17046. + +commit a71e05051b20cd7ab6b112ad3ea4f17230ce1949 +Merge: 1c86d07967 3e07dd1d72 +Author: liyuchun +Date: Thu Dec 2 15:41:16 2021 +0800 + + Merge branch 'sprint/174_mayue_17036' + +commit 3e07dd1d7271b5122aa6d1070afe40800f8a9935 +Merge: 8ba4ebf390 befdfa2eb4 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 07:41:03 2021 +0000 + + Merge branch 'master' into 'sprint/174_mayue_17036' + + # Conflicts: + # module/testtask/model.php + +commit 9e9dcf653dc29c42f90813ca2df4e6f288e7eecc +Author: tianshujie +Date: Thu Dec 2 15:40:45 2021 +0800 + + * Modify the code issue. + +commit 8ba4ebf39084ec8f8a368c8a9e59adc03b187986 +Author: mayue +Date: Thu Dec 2 15:40:02 2021 +0800 + + * Conflict resolution #17036. + +commit befdfa2eb4e77135d58091bccd9264a796765ca5 +Merge: 3955798100 895db10fc4 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 07:39:36 2021 +0000 + + Merge branch 'sprint/174_tianshujie_16927' into 'master' + + * Fix bug #16927. + + See merge request easycorp/zentaopms!730 + +commit f6676e275787ccec82b829ab5eb4391c13442046 +Author: mayue +Date: Thu Dec 2 15:36:31 2021 +0800 + + * Conflict resolution #17036. + +commit ac0cd01df6da52fc701fe00171982a49f0c4d8e6 +Author: tianshujie +Date: Thu Dec 2 15:35:35 2021 +0800 + + * Fix bug #17043. + +commit 3955798100480530b569d2a9a4f2f7dcbacce6cc +Merge: 3aa9a7d37f 0cf9288308 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 07:35:33 2021 +0000 + + Merge branch 'devops_17024' into 'master' + + * Fix bug#17027,17024,16884 + + See merge request easycorp/zentaopms!741 + +commit 3aa9a7d37f8466e29e6a4b70920601d98c288430 +Merge: 0c44013922 da73e10709 +Author: 孙广明 +Date: Thu Dec 2 07:34:42 2021 +0000 + + Merge branch 'sprint/devops_liyuchun_bug' into 'master' + + Sprint/devops liyuchun bug + + See merge request easycorp/zentaopms!742 + +commit da73e10709662b4755bc43543535f0e15912e1bc +Author: liyuchun +Date: Thu Dec 2 15:32:27 2021 +0800 + + * Fix bug #16856. + +commit 24440ff5266f15774952898c1e0692e965f7525b +Author: Wenrui LI +Date: Thu Dec 2 15:30:31 2021 +0800 + + * replace link title text with lang items. + +commit 8c355ac388fa895d49322007a194e1cf31272cce +Author: mayue +Date: Thu Dec 2 15:30:23 2021 +0800 + + * Modify style #17036. + +commit 4a62ededb0270d25e83b37965873d36e27346ac2 +Author: tianshujie +Date: Thu Dec 2 15:27:17 2021 +0800 + + * Fix bug #16968. + +commit 895db10fc4076f9b4bb74cf5e73054527ef1105c +Author: tianshujie +Date: Thu Dec 2 15:23:45 2021 +0800 + + * Delete redundant judgments. + +commit 0c44013922679f4c5dc9ae3e2e283fe918ace7b5 +Merge: a6bf945fab 2e0f5badc1 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 07:22:51 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_codefortestbug' into 'master' + + *Fix bug for test bug. + + See merge request easycorp/zentaopms!744 + +commit fac5fc6b2260687daee4be777d8fd3cf174c5951 +Author: Wenrui LI +Date: Thu Dec 2 15:22:12 2021 +0800 + + * remove console.log. + +commit 4617c4218bb90c2674af227ccab2a60a6e30481a +Author: hufangzhou +Date: Thu Dec 2 15:11:05 2021 +0800 + + * Remove the unused code. + +commit a48f584ca8f6f7b0f4f6526aa487114b72063361 +Author: zenggang +Date: Thu Dec 2 07:14:31 2021 +0000 + + * Fix bug#16765,16771 + +commit a6bf945fabbdef1e97ee6b4f03b7f5ddb3a187ea +Merge: f2a7e5e302 0ea3436bc1 +Author: 孙广明 +Date: Thu Dec 2 07:12:10 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_xuanxuan' into 'master' + + * Remove the unused code. + + See merge request easycorp/zentaopms!745 + +commit 0ea3436bc1e3a6f3e17771dda450d31023a630e0 +Author: hufangzhou +Date: Thu Dec 2 15:11:05 2021 +0800 + + * Remove the unused code. + +commit f2a7e5e302978987902a49fc6badd87b6ca42e93 +Merge: 1223ec4a2f 7356cbc76e +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 07:09:05 2021 +0000 + + Merge branch 'sprint/174_tianshujie_16785' into 'master' + + * Fix bug #17006,16785. + + See merge request easycorp/zentaopms!728 + +commit 1223ec4a2f13931e2da3f1b40390fb354000812b +Merge: 1c86d07967 9ddee1bcea +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 07:06:54 2021 +0000 + + Merge branch 'sprint/175_sgm_fixbug' into 'master' + + Sprint/175 sgm fixbug + + See merge request easycorp/zentaopms!737 + +commit 3898d35852ff1478ab4e2a2c85adc75f0b57a6da +Author: Wenrui LI +Date: Thu Dec 2 15:00:15 2021 +0800 + + * fix unable to click on pager links in cards. + +commit 2e0f5badc19fc87572e9d5e556a847b6c5e7c2c5 +Author: songchenxuan +Date: Thu Dec 2 14:57:37 2021 +0800 + + *Fix bug for test bug. + +commit 520639067c4da2050c29f9ef628c0353d0a5855f +Merge: 57b31c8612 f86a3bc6d9 +Author: chaideqing +Date: Thu Dec 2 14:56:28 2021 +0800 + + Merge branch 'sprint/168_xuan_notifications' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/168_xuan_notifications + +commit 57b31c8612d69fc6c65fedddae80a94dcc09d5ff +Author: chaideqing +Date: Thu Dec 2 14:56:05 2021 +0800 + + * modify card style when in xuanxuan notice + +commit c94315115711ffd7ca40b6cfe1ec8c5c2b4e2f6b +Author: liyuchun +Date: Thu Dec 2 14:28:50 2021 +0800 + + * Fix bug #16847. + +commit 0cf9288308fefa31d1a6d2309cf9491e8aa77485 +Author: zenggang +Date: Thu Dec 2 06:26:33 2021 +0000 + + * Fix bug#17027,17024,16884 + +commit 2899947808fb0a00b478661313bea4dce0a364a0 +Author: liyuchun +Date: Thu Dec 2 14:18:13 2021 +0800 + + * Fix bug #16725. + +commit 1c86d0796768102c8e8a83a27fcc39c16b0d0822 +Merge: 54c761da36 696892f246 +Author: 孙广明 +Date: Thu Dec 2 06:16:37 2021 +0000 + + Merge branch 'sprint/devops_liyuchun_bug' into 'master' + + Sprint/devops liyuchun bug + + See merge request easycorp/zentaopms!738 + +commit 696892f246fbe8ae0fbbedb44ae62608be976122 +Author: liyuchun +Date: Thu Dec 2 14:14:29 2021 +0800 + + * Fix bug #16716. + +commit 6057c36ce5a5ec083423b82b905458111495bf1a +Author: xieqiyu +Date: Thu Dec 2 14:12:17 2021 +0800 + + * Add judgment on null parameters. + +commit b75c77b3e74a1a532b3248db3340c7f3f9452fb2 +Author: liyuchun +Date: Thu Dec 2 14:07:06 2021 +0800 + + * Fix bug #17000. + +commit ed2efc053ca15562f3804e9d0fd9b0f01bfb8cbe +Author: hufangzhou +Date: Thu Dec 2 14:05:35 2021 +0800 + + * Fix bug #16975. + +commit 79fa40bef22d2f8282455ec1f7f9fde551099fed +Author: liyuchun +Date: Thu Dec 2 13:55:47 2021 +0800 + + * Reduction code. + +commit 54c761da36057d31b94d917ae0bd9c46da896c04 +Merge: 7bcbab370a 61045c90e6 +Author: 孙广明 +Date: Thu Dec 2 05:55:15 2021 +0000 + + Merge branch 'sprint/devops_liyuchun_16893' into 'master' + + * Fix gitlab error. + + See merge request easycorp/zentaopms!731 + +commit 6caf5097ec5b51604c398d54d7a619c7437ec941 +Author: liyuchun +Date: Thu Dec 2 13:54:06 2021 +0800 + + * Fix error of gitlab. + +commit 9ddee1bcea51d92665dc9890c2585d7c58dde452 +Author: 孙广明 +Date: Thu Dec 2 13:53:56 2021 +0800 + + * Fix bug #17008. + +commit f86a3bc6d961df73b85474d5bf507710175537cc +Author: Tintin +Date: Thu Dec 2 13:39:12 2021 +0800 + + * add close methods. + +commit 7356cbc76ee4d2200f8e008062062c769079a06d +Author: tianshujie +Date: Thu Dec 2 13:23:30 2021 +0800 + + * Optimize code logic. + +commit 600869034a3f63cf7f98309f76753b9b2c9565a8 +Author: Tintin +Date: Thu Dec 2 13:23:05 2021 +0800 + + * remove unused style. + +commit 0e30ba0a3b6bbf9179879ed32ab03fc679c25e43 +Author: liyuchun +Date: Thu Dec 2 13:19:50 2021 +0800 + + * Fix bug #16836. + +commit 1faf5459540be1d13de1aaab8e4ea140908d6a61 +Author: 孙广明 +Date: Thu Dec 2 13:10:55 2021 +0800 + + * Remove unused code. + +commit 7bcbab370a50e09f580f120a7660b70cb089c78f +Merge: 22aff07db9 febde653ad +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 05:08:27 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_16872' into 'master' + + * Fix bug #16872. + + See merge request easycorp/zentaopms!735 + +commit 22aff07db949f1b4efb5b5884d6a9982812cff40 +Merge: ee0bdfb1a2 13324bf430 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 05:08:14 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_addcomment' into 'master' + + * Add testcase batchEdit comment. + + See merge request easycorp/zentaopms!720 + +commit 012d5f7465a62d0aae782bd6212d57c1037253eb +Author: Hao Sun +Date: Thu Dec 2 13:07:52 2021 +0800 + + * adjust space between kanban lanes. + +commit febde653ad55d7af6bdb74958c580100cc98e575 +Author: songchenxuan +Date: Thu Dec 2 13:06:03 2021 +0800 + + * Fix bug #16872. + +commit ee0bdfb1a2ff38d760df72a5166140d18fbbc4c0 +Merge: fa2041169e 0803759223 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 05:05:04 2021 +0000 + + Merge branch 'devops_16736' into 'master' + + * Fix bug#16846 + + See merge request easycorp/zentaopms!732 + +commit fa2041169eb92e301b61af4f421dd299d7708fc9 +Merge: 575d9e098f 38f5ab4145 +Author: liyuchun +Date: Thu Dec 2 12:03:39 2021 +0800 + + Merge branch 'sprint/175_sgm_fixbug' + +commit 38f5ab41455c7bd572ead2c581dbdedf12f2b82c +Merge: ed35de7a0f 575d9e098f +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 05:04:29 2021 +0000 + + Merge branch 'master' into 'sprint/175_sgm_fixbug' + + # Conflicts: + # module/execution/control.php + # module/message/config.php + +commit 9763cd91df62de49cff3367746573d2e64372344 +Author: Wenrui LI +Date: Thu Dec 2 11:29:41 2021 +0800 + + * fix accessing object as array when assembling parent name key. + +commit 565ef0adbb524f5483729ab760cd5dec5ea241d8 +Author: tianshujie +Date: Thu Dec 2 11:27:24 2021 +0800 + + * Fix bug #16927. + +commit 575d9e098ff8aacbd22cb6da9fa1528810c9d5bf +Merge: 199577f068 bd075ac17d +Author: 孙广明 +Date: Thu Dec 2 03:22:23 2021 +0000 + + Merge branch 'sprint/175_zry_fixbug' into 'master' + + Sprint/175 zry fixbug + + See merge request easycorp/zentaopms!733 + +commit 199577f06862f39acde4621833e06a00977889bd +Merge: c543df8b75 126cc84b31 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 03:19:57 2021 +0000 + + Merge branch 'sprint/29_zhouxin_16905' into 'master' + + Fix bug #16905. + + See merge request easycorp/zentaopms!709 + +commit bd075ac17d3daac6c4facd3584dfec2413c207db +Author: zhengrunyu +Date: Thu Dec 2 11:18:53 2021 +0800 + + *Fixbug #16978. + +commit c543df8b754c25d8d1346ccfa5c65198a5f0faf5 +Merge: 4afdccfc5e 00ac35c9db +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 03:16:40 2021 +0000 + + Merge branch 'sprint/174_tianshujie_bug' into 'master' + + * Fix the problem of recording product cookies. + + See merge request easycorp/zentaopms!719 + +commit 4afdccfc5e83d9ecf6e58db7b2aafd837778e914 +Merge: 313c7d8ee3 a5598ddf64 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 03:16:18 2021 +0000 + + Merge branch 'sprint/174_tianshujie_16897' into 'master' + + * Fix bug #16897. + + See merge request easycorp/zentaopms!725 + +commit 313c7d8ee31c5be23935c43453da4bd38d8c6d74 +Merge: b043ff0772 ee60476724 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 03:09:54 2021 +0000 + + Merge branch 'sprint/174_tianshujie_16925' into 'master' + + * Fix bug #16925. + + See merge request easycorp/zentaopms!729 + +commit e70a9157d242265bbe634d8ce2f9a89bb3c0a1de +Author: qixinzhi +Date: Thu Dec 2 11:08:41 2021 +0800 + + * fix different screen scale cause element display different,use scroll bar + +commit 08037592238358221a7dbead1ab1494a78df3731 +Author: zenggang +Date: Thu Dec 2 03:06:27 2021 +0000 + + * Fix bug#16846 + +commit ed35de7a0fd1acf717e7166877e291bb800cd50f +Author: 孙广明 +Date: Thu Dec 2 11:05:47 2021 +0800 + + * Fix code error. + +commit 2f962aafcf0b1a6a01cd6c22fe4cf6bd67975aa0 +Author: tianshujie +Date: Thu Dec 2 11:05:38 2021 +0800 + + * Remove useless code. + +commit 61045c90e639680ef7724350cb9e6ed39deb3fb1 +Author: liyuchun +Date: Thu Dec 2 11:04:54 2021 +0800 + + * Fix gitlab error. + +commit 4ac099088eafc11588907d466bbd6c6f36370883 +Author: tianshujie +Date: Thu Dec 2 11:01:06 2021 +0800 + + * Fix bug #16927. + +commit b043ff077268a45d96ff38be1e769929122c4310 +Merge: bf16167b19 b1cd56f4b3 +Author: 王怡栋 +Date: Thu Dec 2 10:55:40 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit bf16167b195883dbae7cd447265479984ef27c63 +Author: 王怡栋 +Date: Thu Dec 2 10:55:04 2021 +0800 + + * Support for flow. + +commit b1cd56f4b33e0cdf1ba359cbc546c469a191d859 +Merge: 93547bf85b 30e22a7b64 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 02:53:09 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_45079' into 'master' + + Sprint/174 hufangzhou 45079 + + See merge request easycorp/zentaopms!715 + +commit 30e22a7b64f8013d81efd13e9c91e78b55cd52b6 +Merge: 563979094c fa6b49493f +Author: hufangzhou +Date: Thu Dec 2 10:51:23 2021 +0800 + + Merge branch 'sprint/174_hufangzhou_45079' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/174_hufangzhou_45079 + +commit 563979094c2f16e3581e254cd626953f238a3e30 +Author: hufangzhou +Date: Thu Dec 2 10:50:44 2021 +0800 + + * Fix bug #16986. + +commit 93547bf85bee567ba6666bea1a4b9c379597c97e +Merge: d99bd57aa6 e0b03a60a7 +Author: 孙广明 +Date: Thu Dec 2 02:39:31 2021 +0000 + + Merge branch 'sprint/devops_liyuchun_16893' into 'master' + + Fix bug #16997, #16893. + + See merge request easycorp/zentaopms!722 + +commit ee6047672442bff9d0a6d26368dc4e57096af53c +Author: tianshujie +Date: Thu Dec 2 10:19:21 2021 +0800 + + * Fix bug #16925. + +commit 27efa8931d234d43e91b1c27c63e6e095cd7964a +Author: dingyongliang +Date: Thu Dec 2 10:13:57 2021 +0800 + + * delay execution of dom operations. + +commit d33b9ae7e686202dd248e676b21cdd18a2ee2266 +Author: tianshujie +Date: Thu Dec 2 10:11:18 2021 +0800 + + * Fix bug #17006,16785. + +commit 0a7b5b0efc3761c5ad87963dd40cea3dad255391 +Author: zhengrunyu +Date: Thu Dec 2 09:55:54 2021 +0800 + + * Code for kanban. + +commit d99bd57aa676d3043a519c4beae01cbeac058c2e +Merge: f25d797b54 d1b59fc5b0 +Author: 王怡栋 +Date: Thu Dec 2 10:06:59 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit fa6b49493f3719219e2658a5affa0e43cdc53ff1 +Author: xieqiyu +Date: Thu Dec 2 10:04:37 2021 +0800 + + * Fix bug: The problem of execution requirement list module. + +commit f25d797b54ce1ba9edaf6480de5e0178d0c4d11d +Author: 王怡栋 +Date: Thu Dec 2 10:06:02 2021 +0800 + + * adjust for flow. + +commit 33a49e77c8451b03f4575e4870c4aae225115f28 +Merge: 3c8e265ab7 3755502cf5 +Author: hufangzhou +Date: Thu Dec 2 10:04:23 2021 +0800 + + Merge branch 'sprint/174_hufangzhou_45079' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/174_hufangzhou_45079 + +commit 3c8e265ab7148f74632569117e2e98eee851368e +Author: hufangzhou +Date: Thu Dec 2 10:04:14 2021 +0800 + + * Fix bug #16986. + +commit a5598ddf64ba12ff266e27724c54a09519b58086 +Author: tianshujie +Date: Thu Dec 2 10:04:02 2021 +0800 + + * Fix bug #16897. + +commit d1b59fc5b084f535e345e70b59209e280ef7b7e9 +Merge: 79ce6537df 54ab343ed1 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 01:55:01 2021 +0000 + + Merge branch 'devops_16945' into 'master' + + * Fix bug#16945 + + See merge request easycorp/zentaopms!721 + +commit e0b03a60a7833882f43a473c17a9a817bb963152 +Author: liyuchun +Date: Thu Dec 2 09:54:03 2021 +0800 + + * Fix bug #16999. + +commit 79ce6537dfd565f12b104c9abb679af00022bca3 +Author: zhengrunyu +Date: Thu Dec 2 09:53:41 2021 +0800 + + * Code for kanban. + +commit 4c29226156cd0abcbc63ea0d634d6987b8730a40 +Merge: fd0fb325fa 8c6e0fabfb +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 01:48:29 2021 +0000 + + Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master' + + * Fix bug #16987. + + See merge request easycorp/zentaopms!723 + +commit 8c6e0fabfbcb214ce257c42ec5409dccd74dc343 +Author: mayue +Date: Thu Dec 2 09:44:12 2021 +0800 + + * Modify code #16987. + +commit 07f8a820b0f6c3592d9288241b331167986d3586 +Author: mayue +Date: Thu Dec 2 09:28:02 2021 +0800 + + * Code format #16987. + +commit 4b9409273717dfe79004758b7e49b52fce7f9142 +Author: 孙广明 +Date: Thu Dec 2 09:24:01 2021 +0800 + + * Finish task #45162. + +commit 63d4d3dad896e010b4321f2eb4317053c03c2160 +Author: mayue +Date: Thu Dec 2 09:20:37 2021 +0800 + + * Fix bug #16987. + +commit 3755502cf554e3bf9ef3b85230caaa1ddafefd09 +Author: xieqiyu +Date: Thu Dec 2 09:12:50 2021 +0800 + + * Fix bug : Unit test product drop-down error. + +commit 54ab343ed13b35b4ca3a372dc38fa21959b2076d +Author: zenggang +Date: Thu Dec 2 01:10:30 2021 +0000 + + * Adjust code style + +commit c79e9ef65f805f205a1abc07bb8661e100814606 +Author: zenggang +Date: Thu Dec 2 01:07:37 2021 +0000 + + * Adjust code style + +commit c3b824d946cc922726d6b9c5bc1fdb491dae9750 +Author: liyuchun +Date: Thu Dec 2 09:06:23 2021 +0800 + + * Fix bug #16997. + +commit bcb6dbbe0a6cf8b0f885f0498b1e131c032838df +Author: zenggang +Date: Thu Dec 2 00:54:51 2021 +0000 + + * Fix bug#16945 + +commit d68810fd4abc30cf9fa1365beda25d87767bffd4 +Author: liyuchun +Date: Thu Dec 2 08:54:51 2021 +0800 + + * Fix bug #16893. + +commit 6c6c0aa49e4fe392e95135535ec51c585b065dc6 +Author: Wenrui LI +Date: Thu Dec 2 08:47:25 2021 +0800 + + * add card url into notification subcontent. + +commit 00ac35c9db02f2d0fc1a466baf4aed6b2bb8a2aa +Author: tianshujie +Date: Thu Dec 2 08:46:01 2021 +0800 + + * Delete extra blank lines. + +commit 13324bf4302a36da98d94b9ce4e7f6b135196b84 +Author: songchenxuan +Date: Thu Dec 2 08:45:27 2021 +0800 + + * Add testcase batchEdit comment. + +commit be832748762ad165f4517db537bb2fc454ad301d +Author: tianshujie +Date: Thu Dec 2 08:43:44 2021 +0800 + + * Fix the problem of recording product cookies. + +commit fd0fb325facd69dcaa66ca15a72d73690053e75d +Merge: 128af31eda 0e97d5b419 +Author: 李玉春 <563917701@qq.com> +Date: Thu Dec 2 00:34:22 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_16967' into 'master' + + Sprint/174 songchenxuan 16967 + + See merge request easycorp/zentaopms!713 + +commit 128af31edad29f8095f1ec5ce7e52e86470fdee6 +Merge: 178af23bb1 f274c52e33 +Author: 孙广明 +Date: Thu Dec 2 00:21:59 2021 +0000 + + Merge branch 'sprint/175_zhengrunyu_fixbug' into 'master' + + *Finish task #fixbug. + + See merge request easycorp/zentaopms!718 + +commit 0e97d5b4199b599b51951ca66039791d6d8287ee +Author: songchenxuan +Date: Thu Dec 2 08:17:13 2021 +0800 + + * Fix bug #16967. + +commit 178af23bb1d52a2259c5feb1f421405a3bbc0475 +Merge: 0b0aa04db1 71d27fc151 +Author: 孙广明 +Date: Thu Dec 2 00:16:15 2021 +0000 + + Merge branch 'sprint/175_liyuchun_bug' into 'master' + + * Fix error. + + See merge request easycorp/zentaopms!717 + +commit 97b2e63ea0bd682b8a797a798aa06b6e88048855 +Author: songchenxuan +Date: Thu Dec 2 08:14:58 2021 +0800 + + * Fix bug #16967. + +commit f274c52e3333954510c815c23422e06788fc8ce2 +Author: zhengrunyu +Date: Thu Dec 2 08:14:09 2021 +0800 + + *Finish task #fixbug. + +commit 32a526275d83d463a2ef5bf6dea16f9627b000d0 +Author: xieqiyu +Date: Wed Dec 1 18:13:27 2021 +0800 + + * There is a problem with the drop-down of test cases. + +commit 0b0aa04db101be5c0c81b0b02e70befeba8176b7 +Merge: e44737b3b3 92ad301e29 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 09:29:36 2021 +0000 + + Merge branch 'sprint/174_tianshujie_issue' into 'master' + + * Modify the problem of function demonstration. + + See merge request easycorp/zentaopms!714 + +commit 71d27fc151bf2f65867a9be28f54ec2d9002446c +Author: liyuchun +Date: Wed Dec 1 17:23:44 2021 +0800 + + * Fix error. + +commit 92ad301e291ca47819fb2faf89b697a3b1b033dc +Author: tianshujie +Date: Wed Dec 1 17:16:52 2021 +0800 + + * Fix bug #16988. + +commit eec94fd3837f1194ca298ca1d0412e7793b681be +Author: mayue +Date: Wed Dec 1 17:14:43 2021 +0800 + + * Fix bug #16936. + +commit 7d59199f523a9247757d83415ff1d1a761342862 +Merge: 36fa35d3d1 985599a98a +Author: hufangzhou +Date: Wed Dec 1 17:09:56 2021 +0800 + + Merge branch 'sprint/174_hufangzhou_45079' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/174_hufangzhou_45079 + +commit 36fa35d3d1f91cbf61e07a3995fc590a7fb25282 +Author: hufangzhou +Date: Wed Dec 1 17:09:52 2021 +0800 + + * Fix bug #15832. + +commit 41da1fdb7e905244dbb947b7622a68e8afaacb56 +Author: tianshujie +Date: Wed Dec 1 17:05:45 2021 +0800 + + * Fix the problem of graying out the maintenance product. + +commit ad1bd0603c52dc89745e939591afd3b004e95270 +Author: Wenrui LI +Date: Wed Dec 1 17:02:13 2021 +0800 + + * fix notification title getting overridden by a default one. + +commit 3f4c94b3b700442907994596a51c7b84a81fddb0 +Author: Wenrui LI +Date: Wed Dec 1 16:50:07 2021 +0800 + + * replace object count in title. + +commit e44737b3b377ab1822564f435cfc4a0354377285 +Merge: f6301e4c9a 64cac6374b +Author: liyuchun +Date: Wed Dec 1 16:48:31 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f6301e4c9a637755ac919e649d89646da30682b5 +Merge: 04e16ded07 d11f6e9b6f +Author: liyuchun +Date: Wed Dec 1 16:48:00 2021 +0800 + + Merge branch 'sugon' + +commit 64cac6374ba2a2a1da4eaae6008c63924b8b3d06 +Author: tianshujie +Date: Wed Dec 1 16:39:10 2021 +0800 + + * The plan is blank when switching branches. + +commit 11512ead36d9455b1c1e16b5ef401f13f4f13366 +Author: Wenrui LI +Date: Wed Dec 1 16:35:09 2021 +0800 + + * actually merge notifications into one. + +commit 86ccece2ca3b919e6f5049b95a3e8eb4f5b8582f +Author: tianshujie +Date: Wed Dec 1 16:32:10 2021 +0800 + + * Modify the problem of function demonstration. + +commit d11f6e9b6f0aa9df4810ee605ad13b764b2c8670 +Author: liyuchun +Date: Wed Dec 1 16:29:36 2021 +0800 + + * Fix bug #16901. + +commit 85ec2d1cc9e97ab11812cc83da7ff52dfdc44325 +Author: songchenxuan +Date: Wed Dec 1 16:11:35 2021 +0800 + + * Fix bug #16967. + +commit 04e16ded0787f7926c5a485f7d610dbe07bf1b73 +Merge: 5fb26df4f7 fb109d767f +Author: 王怡栋 +Date: Wed Dec 1 08:02:17 2021 +0000 + + Merge branch 'sprint/168_sunhao/improve_kanban' into 'master' + + * Update kanban lib and zui lib. + + See merge request easycorp/zentaopms!705 + +commit fb109d767fe2e989dd5062793dd49039a539ef40 +Author: Hao Sun +Date: Wed Dec 1 16:01:11 2021 +0800 + + * update zui lib to fix $.zui.getScrollbarSize undefined. + +commit 1eb3e7ec98717901a8285f119116d07eb974dc71 +Author: liyuchun +Date: Wed Dec 1 15:50:30 2021 +0800 + + * Fix bug #16903. + +commit 8c7b6d05e14349939fe8ee8d2cb94d51f7682068 +Author: qixinzhi +Date: Wed Dec 1 15:47:30 2021 +0800 + + * fix content encode + +commit 766fbdbb1cc3ab17be5923413abb4d120e856692 +Author: liyuchun +Date: Wed Dec 1 15:35:32 2021 +0800 + + * Fix bug #16893. + +commit 38038eb3ada496533069ee53756477fb6516b59c +Author: liyuchun +Date: Wed Dec 1 15:12:44 2021 +0800 + + * Fix bug #16956. + +commit 5fb26df4f7b77c6bf2df5e6b1ed852b0de221a15 +Merge: 5f4896b12e a2dc25af7c +Author: 孙广明 +Date: Wed Dec 1 07:03:56 2021 +0000 + + Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master' + + * Modify code #44987,44988,44989. + + See merge request easycorp/zentaopms!712 + +commit cfd5455a58eea2abefb8d9a0c39c6598c20abccb +Author: liyuchun +Date: Wed Dec 1 15:03:28 2021 +0800 + + * Fix error when has no gitlab. + +commit a2dc25af7c6e142cbd51637ac9946a03ed217314 +Author: mayue +Date: Wed Dec 1 15:02:12 2021 +0800 + + * Code format. + +commit a3cbb05edd57c74b9e7a74eec0f37c741449de78 +Merge: 45e127be6e b497a92c8e +Author: chaideqing +Date: Wed Dec 1 15:00:12 2021 +0800 + + Merge branch 'sprint/168_xuan_notifications' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/168_xuan_notifications + +commit 45e127be6ecf43f76b9ebaba8f6730ca64792d20 +Author: chaideqing +Date: Wed Dec 1 14:59:33 2021 +0800 + + * add linkButton tips in card and card do not show cross scroll + +commit fc0834cadb58c0ff69860afcbdf297a710b0eefb +Author: mayue +Date: Wed Dec 1 14:58:20 2021 +0800 + + * Modify code #44987,44988,44989. + +commit 985599a98a3feb68bcd8e8701007a356fd57bf97 +Author: xieqiyu +Date: Wed Dec 1 14:57:53 2021 +0800 + + * Code for task#45026. + +commit 5f4896b12e51e09fe8b1792823f41ad3f72b3b44 +Merge: 9ba661dafa 8164998a64 +Author: 孙广明 +Date: Wed Dec 1 06:57:34 2021 +0000 + + Merge branch 'sprint/master_tanghucheng_for_max' into 'master' + + * Code for task #45101. + + See merge request easycorp/zentaopms!711 + +commit 8164998a64a4cc8df7166b64bb895dd9f9398f6f +Author: tanghucheng +Date: Wed Dec 1 14:56:45 2021 +0800 + + * Code task #45101. + +commit b497a92c8ee1d51d2af0174e3c39a8986c3e2ac9 +Author: Wenrui LI +Date: Wed Dec 1 14:52:37 2021 +0800 + + * stuff notification inner contents together. + +commit 9ba661dafa282660c7091844f6d88f82329aac5a +Merge: 340765cf74 fa08551997 +Author: 孙广明 +Date: Wed Dec 1 06:51:36 2021 +0000 + + Merge branch 'sprint/29_zhouxin_45111' into 'master' + + Finish task #45111. + + See merge request easycorp/zentaopms!679 + +commit 340765cf74a89e7f96729fcc142e0d01701cfc89 +Merge: 2fc75a1dd4 59dc2b1cce +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 06:41:18 2021 +0000 + + Merge branch 'sprint/174_tianshujie_16980' into 'master' + + * Fix bug #16980. + + See merge request easycorp/zentaopms!710 + +commit 0c66d3c5b80a1e03193b5fb0831ce6c0db896ccf +Author: liyuchun +Date: Wed Dec 1 14:40:49 2021 +0800 + + * Fix error when no gitlab. + +commit 59dc2b1cce1aff051822ebd4c218fc3989306fa6 +Author: tianshujie +Date: Wed Dec 1 14:39:18 2021 +0800 + + * Fix bug #16980. + +commit 2536fdd15eebb9961a1820e0276750ea127b127d +Author: Wenrui LI +Date: Wed Dec 1 14:28:35 2021 +0800 + + * include parent id in notification content, merge accordingly. + +commit 126cc84b315a3bde1075cdf0c28b36ca7b8ad0ab +Author: zhouxin +Date: Wed Dec 1 06:27:24 2021 +0000 + + Finish task #16905. + +commit df91b19a57ed2b9a81b04cae7bfb7cf76c9e19fa +Author: tanghucheng +Date: Wed Dec 1 14:24:32 2021 +0800 + + * Code for task #45101. + +commit 2fc75a1dd4db87f3fae92feb163c3f60604bf82f +Merge: d258b05fd4 839ee66e77 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 06:24:25 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_45039' into 'master' + + * Finish task #45039. + + See merge request easycorp/zentaopms!704 + +commit d258b05fd4b4f6c78e18346f80e50a2718643a7e +Merge: 85a6828a2e 98b5a77754 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 06:23:41 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_16798' into 'master' + + * Fix bug #16798. + + See merge request easycorp/zentaopms!708 + +commit 85a6828a2e884303c0540a17e6d73a632ed58a8e +Merge: 3d8fc0dcfe 2d251fb452 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 06:23:17 2021 +0000 + + Merge branch 'sprint/174_tianshujie_16801' into 'master' + + * Fix bug #16801. + + See merge request easycorp/zentaopms!703 + +commit 3d8fc0dcfe36af87e1879bd484110142fda9d3d5 +Merge: 876af8d939 e74dd9ad80 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 06:21:29 2021 +0000 + + Merge branch 'sprint/174_tianshujie_16977' into 'master' + + * Fix bug #16977. + + See merge request easycorp/zentaopms!706 + +commit 876af8d9397886edafb7baad7f7e38af0e270bf0 +Merge: 16f81f5b8a e73b8d316c +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 06:18:36 2021 +0000 + + Merge branch 'sprint/174_tianshujie_16973' into 'master' + + * Fix bug #16973. + + See merge request easycorp/zentaopms!707 + +commit 16f81f5b8a2e51e689240f55280084c1dbae0fb0 +Merge: 9286434da5 ac27fd80d8 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 06:17:55 2021 +0000 + + Merge branch 'sprint/174_tianshujie_16781' into 'master' + + * Fix bug #16781. + + See merge request easycorp/zentaopms!702 + +commit 98b5a777548648b326e46c483ea194f5603325c9 +Author: songchenxuan +Date: Wed Dec 1 14:16:24 2021 +0800 + + * Fix bug #16798. + +commit e73b8d316c5bc9c4deaaa0c4b8649f1ca978454e +Author: tianshujie +Date: Wed Dec 1 14:15:20 2021 +0800 + + * Fix bug #16973. + +commit aa118473b2c72cce938e992f0240e21bd7d28b1e +Author: liyuchun +Date: Wed Dec 1 14:14:06 2021 +0800 + + * Fix bug #16893. + +commit e74dd9ad803d7eb93b695da2e318ef9b3baa0bb5 +Author: tianshujie +Date: Wed Dec 1 14:05:59 2021 +0800 + + * Fix bug #16977. + +commit 1af877e1e18b74b33dd4a0fdfc797c3a988348f8 +Author: liyuchun +Date: Wed Dec 1 14:03:47 2021 +0800 + + * Fix bug #16954. + +commit 9286434da58828dcee262e4ad4d119b0bfa939ca +Author: 王怡栋 +Date: Wed Dec 1 13:58:50 2021 +0800 + + * code for task #45297. + +commit 76a1e73851378fc6a7d085c455180cc7a3a87db0 +Author: Hao Sun +Date: Wed Dec 1 13:58:51 2021 +0800 + + * update zui lib. + +commit b6358da39ff356cd9fa88052e069f152556a8061 +Author: Hao Sun +Date: Wed Dec 1 13:57:59 2021 +0800 + + * update kanban lib. + +commit 85c9e94e53aabab92e58379e41efdcfd7f947c6b +Merge: bdccb46405 342d52f1e5 +Author: liyuchun +Date: Wed Dec 1 13:57:46 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit bdccb4640538a84451d5807e084d125aeb6ca32e +Author: liyuchun +Date: Wed Dec 1 13:57:33 2021 +0800 + + * Fix bug #16918. + +commit 342d52f1e5ce27df8bd7a0a6efacb4e3dae6c450 +Author: zenggang +Date: Wed Dec 1 05:56:55 2021 +0000 + + * Adjust mr create js code + +commit c8c954a3fda124f1c1826b5b9fab01538dad69dc +Author: liyuchun +Date: Wed Dec 1 13:53:13 2021 +0800 + + * Fix bug #16911. + +commit 9deab6a19a3a7eba64891f27b48366c169513a56 +Merge: b91bd45f85 deb6809979 +Author: liyuchun +Date: Wed Dec 1 13:47:11 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit b91bd45f85e99411637d43ee85050283160be0c8 +Author: liyuchun +Date: Wed Dec 1 13:46:48 2021 +0800 + + * Fix bug #16903. + +commit 839ee66e7755783115982bab4c8c16b7823449f3 +Author: songchenxuan +Date: Wed Dec 1 13:41:01 2021 +0800 + + * Finish task #45039. + +commit deb6809979534833dcdbcb90f3731b4ba4113bfb +Author: zenggang +Date: Wed Dec 1 05:40:22 2021 +0000 + + * Fix bug#16916 + +commit 2d251fb4528f9998a6299d8c9deabedd406c7db3 +Author: tianshujie +Date: Wed Dec 1 13:37:54 2021 +0800 + + * Fix bug #16801. + +commit ac27fd80d88a5cc63cfd5e1bbf1753a2616fda36 +Author: tianshujie +Date: Wed Dec 1 13:30:10 2021 +0800 + + * Fix bug #16781. + +commit 4b37f6b83b14f0dd064ff091412f5c660a989d34 +Merge: 686d773f0b 631a62e2dd +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 05:24:23 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_45040' into 'master' + + * Finish task #45040. + + See merge request easycorp/zentaopms!684 + +commit 686d773f0b7cd0258d763baa23abd79567c9c4f8 +Merge: 950c567912 c22503af7b +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 05:23:47 2021 +0000 + + Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master' + + * Finish task #44987,44988,44989. + + See merge request easycorp/zentaopms!692 + +commit 86d811108184dd231228ec6a63d435afaf720da7 +Author: songchenxuan +Date: Wed Dec 1 13:23:45 2021 +0800 + + * Fix bug #16967. + +commit 950c567912f129fbd70bb1959f7957bfb0568153 +Merge: ee3a885a28 a0efc7aab9 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 05:23:04 2021 +0000 + + Merge branch 'sprint/174_xieqiyu_45079' into 'master' + + Finish task #44992, task #44991, task #44990. + + See merge request easycorp/zentaopms!687 + +commit c22503af7bce86e1f3d95b1985c7ca167d843ade +Author: mayue +Date: Wed Dec 1 13:18:47 2021 +0800 + + * Finish task #44987,44988,44989. + +commit 9a5c01de3f286600152560387f279ae5936dfbe5 +Author: zenggang +Date: Wed Dec 1 05:18:45 2021 +0000 + + * Fix bug#16851 + +commit ee3a885a283b6b5b4f3e00f2d98776c93e40680e +Merge: 3803a94c4c 3accd38185 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 05:17:33 2021 +0000 + + Merge branch 'sprint/174_tianshujie_16789' into 'master' + + Sprint/174 tianshujie 16789 + + See merge request easycorp/zentaopms!700 + +commit 631a62e2dd627dd3a07bdd5c7b1f1ec9247ccb34 +Author: songchenxuan +Date: Wed Dec 1 13:16:42 2021 +0800 + + * Finish task #45040. + +commit 3803a94c4ce3a286ba285b9f02f00330e101161d +Merge: 171796e08f ae3c0eb522 +Author: 孙广明 +Date: Wed Dec 1 05:16:22 2021 +0000 + + Merge branch 'sprint/175_zhengrunyu_45150' into 'master' + + *Finish task #45150. + + See merge request easycorp/zentaopms!698 + +commit 3accd38185b543e48a0b60f3fabbefa77f66fcf2 +Author: tianshujie +Date: Wed Dec 1 13:14:06 2021 +0800 + + * Remove useless code. + +commit 171796e08f2653b86d37f96027d16c7e9c12608f +Merge: eec7b10dd3 1261ac3edb +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 05:13:53 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_16953' into 'master' + + * Fix bug #16953. + + See merge request easycorp/zentaopms!694 + +commit eec7b10dd3ae61b64fcb528dbff151894e7c7ae9 +Merge: 02199a9296 56d3fa6256 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 05:13:38 2021 +0000 + + Merge branch 'sprint/174_mayue_16640' into 'master' + + * Fix bug #16640. + + See merge request easycorp/zentaopms!695 + +commit 02199a9296c5b51299fdbea0b581d761cefb54af +Merge: 3c56b60dd7 ff0b8d0c9c +Author: 孙广明 +Date: Wed Dec 1 05:13:24 2021 +0000 + + Merge branch 'sprint/master_tanghucheng_for_max' into 'master' + + * Finish task #45101. + + See merge request easycorp/zentaopms!699 + +commit 7498352698340383fbf3ac18952108361e9d086e +Author: tianshujie +Date: Wed Dec 1 13:13:21 2021 +0800 + + * Fix bug #16789. + +commit a69162e260d6fa994c955cacd945cac3d0b3723a +Author: zenggang +Date: Wed Dec 1 05:12:40 2021 +0000 + + * Fix bug#16777 + +commit ae3c0eb522164d179146d069f7b39b7b10b610e2 +Author: zhengrunyu +Date: Wed Dec 1 13:04:31 2021 +0800 + + *Finish task #45150. + +commit ff0b8d0c9c609c579ed077225aefd29757f12c62 +Author: tanghucheng +Date: Wed Dec 1 13:01:54 2021 +0800 + + * Finish task #45101. + +commit 3c56b60dd741631d685d59e51db54ae537d68ca3 +Merge: 20ae1dba85 cf91884c25 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 05:01:25 2021 +0000 + + Merge branch 'sprint/174_mayue_16631' into 'master' + + * Fix bug #16631. + + See merge request easycorp/zentaopms!670 + +commit 20ae1dba854d138380f4b8dd67f6bc0f554d3d79 +Merge: c470e13c6e bba0c40dfe +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 05:01:11 2021 +0000 + + Merge branch 'sprint/175_liumengyi_16882' into 'master' + + * Fix bug #16882. + + See merge request easycorp/zentaopms!690 + +commit c470e13c6e2c8248545cd6f3581c778bac78398a +Merge: 55166d5409 3ba27fe786 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 03:39:17 2021 +0000 + + Merge branch 'sprint/174_tianshujie_16968' into 'master' + + * Fix bug #16968. + + See merge request easycorp/zentaopms!691 + +commit 55166d54095e6b701812dd2fb94b5386c85ce188 +Merge: c1750bffca da240630e5 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 03:35:46 2021 +0000 + + Merge branch 'sprint/174_tianshujie_45029' into 'master' + + * Fix bug #45029. + + See merge request easycorp/zentaopms!685 + +commit c1750bffca14ac477c80026a7d8c21f9600748b3 +Merge: 8ee3e5ce16 64c603d9d5 +Author: zhujinyong +Date: Wed Dec 1 11:32:38 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8ee3e5ce1637bcdc2150b02664f2f67e4f241ba1 +Merge: 1a9a2cb624 5424c131dc +Author: zhujinyong +Date: Wed Dec 1 11:32:08 2021 +0800 + + Merge branch 'sprint/168_sunhao/task45145' + +commit 64c603d9d53e1a98a5cab319303a1733a0a9b8c1 +Merge: ccc6de5463 b7513e7fde +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 03:31:45 2021 +0000 + + Merge branch 'sprint/174_tianshujie_task' into 'master' + + * Restore code. + + See merge request easycorp/zentaopms!680 + +commit a0efc7aab9930fe92748b6d716e047f33fe4aa67 +Author: xieqiyu +Date: Wed Dec 1 11:30:22 2021 +0800 + + * Fix bug. + +commit 660108cc17db6f2b746bda3f92aa6f99bca9901b +Author: zenggang +Date: Wed Dec 1 03:30:02 2021 +0000 + + * Fix bug#16773 + +commit bba0c40dfe3be4fb9a27e1bebe0d51dbf8152cf6 +Author: liumengyi +Date: Wed Dec 1 11:25:02 2021 +0800 + + * Fix bug #16882, #16924. + +commit ccc6de54630a0cd28084942a8c48c360d542d626 +Merge: 5b00079375 9a7bd2a6fc +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 03:21:02 2021 +0000 + + Merge branch 'sprint/174_mayue_16682' into 'master' + + * Fix bug #16682. + + See merge request easycorp/zentaopms!697 + +commit 9a7bd2a6fce2afbbd7db66c328961c9377cb6e23 +Author: mayue +Date: Wed Dec 1 11:19:28 2021 +0800 + + * Fix bug #16682. + +commit 92300af32e1b82712bb988ed0d2a09a77fd53ccf +Author: qixinzhi +Date: Wed Dec 1 11:16:52 2021 +0800 + + * for mutiple notifucation condition + +commit 85cf0ab20c4fc5385287344d019c493f24b5990a +Author: songchenxuan +Date: Wed Dec 1 11:15:19 2021 +0800 + + * Finish task #45040. + +commit 5b00079375363e78a2fb7172d49920a1932b72f5 +Author: 王怡栋 +Date: Wed Dec 1 11:13:49 2021 +0800 + + * adjust for get view with tab. + +commit 1261ac3edb2edba49f4d63280171706b625544b0 +Author: songchenxuan +Date: Wed Dec 1 11:11:11 2021 +0800 + + * Fix bug #16953. + +commit a4d94e61238e1af5b924d2c8c63a2e73e557747f +Merge: 1a9a2cb624 0224791b5a +Author: 孙广明 +Date: Wed Dec 1 03:11:11 2021 +0000 + + Merge branch 'sprint/master_tanghucheng_for_max' into 'master' + + * Fix waterfall menu. + + See merge request easycorp/zentaopms!696 + +commit 17ba1ea1848083502afbbd3c3eb305b63c647908 +Author: chaideqing +Date: Wed Dec 1 11:10:22 2021 +0800 + + * add jump-link in xuanxuan_card which can jump to zentao_extension_page + +commit 0224791b5af6c5bb93e79337b89305f386e1282d +Author: tanghucheng +Date: Wed Dec 1 11:08:13 2021 +0800 + + * Fix waterfall menu. + +commit ffb072e2e831d1aa71864c340d46cd187ceb94a0 +Merge: de1a9ddd9b 64eb33ef49 +Author: chaideqing +Date: Wed Dec 1 11:05:33 2021 +0800 + + Merge branch 'sprint/168_xuan_notifications' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/168_chaideqing_44853 + +commit 64eb33ef4991b57e66eef9aa83dad60b1d5b3ffd +Merge: 6647fc9180 df3908f3ac +Author: Wenrui LI +Date: Wed Dec 1 11:04:34 2021 +0800 + + Merge remote-tracking branch 'origin/sprint/168_sunhao/task44627' into sprint/168_xuan_notifications + +commit fa0855199729a786b9cb8b44735aad1ddd650358 +Author: zhouxin +Date: Wed Dec 1 03:03:58 2021 +0000 + + move some language field to zentaobiz and zentaomax. + +commit 56d3fa62562af40790b4d31792325e3cb15f7723 +Author: mayue +Date: Wed Dec 1 11:02:52 2021 +0800 + + * Fix bug #16640. + +commit 1bb80cb5b3d539f1151ab43d0fa5b84e32b51fdf +Author: songchenxuan +Date: Wed Dec 1 11:02:31 2021 +0800 + + * Fix bug #16953. + +commit 6647fc9180c6c9c612a3197797927693a7590360 +Merge: a248424ca1 47d141759d +Author: Wenrui LI +Date: Wed Dec 1 10:59:01 2021 +0800 + + Merge remote-tracking branch 'origin/sprint/168_dingyongliang_44628' into sprint/168_xuan_notifications + +commit 1a9a2cb6249350c942d4ee7273cc4a26691bf6df +Merge: ac94dadfd4 e6ece3beab +Author: 孙广明 +Date: Wed Dec 1 02:56:55 2021 +0000 + + Merge branch 'spirnt/175_liyuchun_bug' into 'master' + + * Finish task #45152. + + See merge request easycorp/zentaopms!686 + +commit 8a8d0da75e57d7f51a85a0743d13a3b3044ed888 +Merge: 0a29344b53 e3c4741d1b +Author: liyuchun +Date: Wed Dec 1 10:54:26 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit 0a29344b538390dde2ad9ae77c0429e0ac1c7e94 +Author: liyuchun +Date: Wed Dec 1 10:54:13 2021 +0800 + + * Fix bug #16898. + +commit ac94dadfd4357d805d551ca99b0188345247388a +Merge: d91e3346df 85ef3a9849 +Author: 朱金勇 +Date: Wed Dec 1 02:51:38 2021 +0000 + + Merge branch 'sprint/174_xieqiyu_fixOptionMenu' into 'master' + + * Fix option menu in doc and caselib. + + See merge request easycorp/zentaopms!693 + +commit 85ef3a984923a7f42912cef32e427763ed50d6df +Author: xieqiyu +Date: Wed Dec 1 10:49:44 2021 +0800 + + * Fix option menu in doc and caselib. + +commit e3c4741d1baaedd0cd276244a559f46943b71ff2 +Author: zenggang +Date: Wed Dec 1 02:47:39 2021 +0000 + + * Fix bug#16766 + +commit c62d599292506a67cc931cd7d4061fec8f4d9236 +Author: mayue +Date: Wed Dec 1 10:44:38 2021 +0800 + + * Finish task #44987,44988,44989. + +commit d91e3346dfc0363283ea80bfd0b32415be467e58 +Merge: d8cefe71d9 6884b949b0 +Author: 孙广明 +Date: Wed Dec 1 02:43:19 2021 +0000 + + Merge branch 'sprint/175_zhengrunyu_45150' into 'master' + + *Finish task #45150. + + See merge request easycorp/zentaopms!688 + +commit e9baf564e78e3021c0a5320e165c344e30c754bf +Author: liyuchun +Date: Wed Dec 1 10:43:13 2021 +0800 + + * Fix bug #16852. + +commit 3ba27fe7865fbc7c7c3aa5ad8a95c6c2fdf8c62e +Author: tianshujie +Date: Wed Dec 1 10:38:56 2021 +0800 + + * Fix bug #16968. + +commit 6884b949b012a950b8221df7e7bf4db8fb75ace4 +Author: zhengrunyu +Date: Wed Dec 1 10:36:12 2021 +0800 + + *Finish task #45150. + +commit de1a9ddd9b39a23b8236e18bb4f2b0b760db116f +Merge: 74f7a95902 2051492640 +Author: chaideqing +Date: Wed Dec 1 10:35:47 2021 +0800 + + Merge branch 'sprint/168' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/168_chaideqing_44857 + +commit e42d3ebed707084daf5e99b90564261cb577516f +Author: zhengrunyu +Date: Wed Dec 1 10:30:41 2021 +0800 + + *Finish task #45150. + +commit 86674338d965ff366a58fdbaad141a5b4bc87ced +Author: liumengyi +Date: Wed Dec 1 10:24:45 2021 +0800 + + * Fix bug #16882. + +commit cce8477c1c73255e6bbc7d2d09020d7f0f32636f +Author: liyuchun +Date: Wed Dec 1 10:22:52 2021 +0800 + + * Fix bug #16842. + +commit a248424ca1a5434d4e846b3f5a0ea6cfb75fcab5 +Author: Wenrui LI +Date: Wed Dec 1 10:22:29 2021 +0800 + + * do not wait for document ready to add showapp listener. + +commit 4aad07f95ff097784c7518dc8b791bd4232349e7 +Merge: 6f6266c448 74f7a95902 +Author: Lwrless +Date: Wed Dec 1 10:17:48 2021 +0800 + + Merge remote-tracking branch 'origin/sprint/168_chaideqing_44857' into sprint/168_xuan_notifications + +commit 3e4fa30030e4701d2bbabbf6abb8e210f1bd567f +Author: zhengrunyu +Date: Wed Dec 1 10:14:15 2021 +0800 + + *Finish task #45150. + +commit c04947228fbdf18ebde35fff4f4055e5cca48422 +Author: hufangzhou +Date: Wed Dec 1 10:02:46 2021 +0800 + + * Finish task #44992, task #44991, task #44990. + +commit da240630e5c4ae1939fad62d7a8330fbe7928dfb +Author: tianshujie +Date: Wed Dec 1 10:01:39 2021 +0800 + + * Fix bug #16963. + +commit e6ece3beabb866d175bc86258d838b0f90dad4ff +Author: liyuchun +Date: Wed Dec 1 10:01:20 2021 +0800 + + * Finish task #45152. + +commit d8cefe71d924b89eaca48a58a691d8862dcb8c2e +Merge: 74a4cd7470 fc591306b5 +Author: zhujinyong +Date: Wed Dec 1 10:01:02 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 74a4cd7470552d059e256f9c2d56d6e751272ba7 +Author: zhujinyong +Date: Wed Dec 1 10:00:06 2021 +0800 + + + Add productplan methods for api. + +commit 9e5f01dd7b4f2b6dcc2c6d702e6df3fe61548b8b +Author: liyuchun +Date: Wed Dec 1 09:59:13 2021 +0800 + + * Finish task #45152. + +commit 3149307967944e1470c5f35bc450789fc336fbe8 +Author: liyuchun +Date: Wed Dec 1 09:50:16 2021 +0800 + + * Finish task #45152. + +commit 34e9e02ae78030c4939642801402453883684490 +Author: tianshujie +Date: Wed Dec 1 09:31:11 2021 +0800 + + * Fix bug #45029. + +commit 6f6266c4484070359598437b8a57c8546d5351f1 +Author: Lwrless +Date: Wed Dec 1 09:30:14 2021 +0800 + + * remove sender from xuan notification content. + +commit fc591306b5809ee1a708c625eb35bab114f860ea +Author: 王怡栋 +Date: Wed Dec 1 09:16:19 2021 +0800 + + * code for task #45297. + +commit 73726f8a6743acc32b396561a95e8273cb3f66c9 +Author: songchenxuan +Date: Wed Dec 1 09:12:33 2021 +0800 + + * Finish task #45040. + +commit ce93ea9cf0b52ade6776f621a2ef6ac12c68f985 +Author: zenggang +Date: Wed Dec 1 01:05:20 2021 +0000 + + * Fix bug#16741 + +commit cb006257958873bf63824adccd171a5728ff2c90 +Author: songchenxuan +Date: Wed Dec 1 08:45:25 2021 +0800 + + * Finish task #45040. + +commit 8b6bacdcfdd188da80f3082bc290cc316d6333e3 +Merge: 06a2e03018 b3e9bd7e61 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 00:43:03 2021 +0000 + + Merge branch 'sprint/174_xieqiyu_45004' into 'master' + + * Finish task#45004. + + See merge request easycorp/zentaopms!682 + +commit b3e9bd7e61d1b1f5bdf7d567af622533c4fd53cd +Author: xieqiyu +Date: Wed Dec 1 08:42:20 2021 +0800 + + * Delete unused code. + +commit 06a2e0301859e05f592278ebe27f6ef33d65ba79 +Merge: 63b0c9be3c 49be608156 +Author: 李玉春 <563917701@qq.com> +Date: Wed Dec 1 00:40:33 2021 +0000 + + Merge branch 'sprint/174_xieqiyu_45015' into 'master' + + * Finish task#45015. + + See merge request easycorp/zentaopms!681 + +commit 5424c131dcefa28452486d2f9d89162d3ee9e840 +Author: Hao Sun +Date: Wed Dec 1 08:30:57 2021 +0800 + + * task #45145, support to change scale size for execution kanban. + +commit 81f69855be9f469a59762456099e6787b0cbc758 +Author: Hao Sun +Date: Wed Dec 1 08:29:58 2021 +0800 + + * update icon fonts in zui, add new icon "icon-minuse-solid-circle". + +commit 229f49fc69dc79ebe43bb9c50ebf17068589f08f +Author: Hao Sun +Date: Wed Dec 1 08:29:33 2021 +0800 + + * only update kanban when remote data is difference. + +commit 9d7449acae9d131f50bbb705534b2d82a9d97861 +Author: Hao Sun +Date: Wed Dec 1 08:29:07 2021 +0800 + + * refactor. + +commit d7110d4ea8f606abfbc4f2ac12ac9367f8d76e35 +Author: hufangzhou +Date: Wed Dec 1 08:16:32 2021 +0800 + + * Code for task #45079. + +commit 2fc250b9b2e88f53cb4d4e8264ab6db68fe7d970 +Author: xieqiyu +Date: Wed Dec 1 08:15:37 2021 +0800 + + * Code for task#45079. + +commit 4c0eb137dacf4c5c6d9199d31bd4a7628cd575f6 +Author: xieqiyu +Date: Tue Nov 30 19:43:49 2021 +0800 + + * Finish task#45004. + +commit 49be6081566f6c89d812ab657a94bad9a69d2268 +Author: xieqiyu +Date: Tue Nov 30 18:28:51 2021 +0800 + + * Finish task#45015. + +commit b7513e7fdebdada9c7110f79d9dbb483e90234ab +Author: tianshujie +Date: Tue Nov 30 17:47:01 2021 +0800 + + * Restore code. + +commit 0d8f7af482e501cf7e01ec18d659fe23b30d51db +Author: zhouxin +Date: Tue Nov 30 09:41:37 2021 +0000 + + Finish task #45111. + +commit 63b0c9be3c737da46b54bf91858e51af3568f593 +Merge: 493d55e8ef d0afac5593 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 09:31:56 2021 +0000 + + Merge branch 'sprint/174_xieqiyu_fixbug' into 'master' + + * Fix bug for batch edit story and bug in project. + + See merge request easycorp/zentaopms!678 + +commit 493d55e8ef602173410d369e7a4f07b6c02a8b78 +Merge: 64be419604 7cff062d2e +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 09:30:49 2021 +0000 + + Merge branch 'sprint/174_tianshujie_task' into 'master' + + * Search plan drop-down range when modifying linked stories and bugs. + + See merge request easycorp/zentaopms!677 + +commit 7cff062d2e726c46c7458a6a3112b368febb616f +Author: tianshujie +Date: Tue Nov 30 17:29:05 2021 +0800 + + * Adjust code style of model tree. + +commit 2e36226f17d499bf4de9a6dc05df831a28b71958 +Author: zenggang +Date: Tue Nov 30 09:26:24 2021 +0000 + + * Fix bug#16947 + +commit be15ba6045502da4ab78f3d764ebfea370146add +Author: tianshujie +Date: Tue Nov 30 17:24:11 2021 +0800 + + * Fix the module tree under execution. + +commit d0afac55934e7601ce062b755b6d49160887fafc +Author: xieqiyu +Date: Tue Nov 30 17:10:12 2021 +0800 + + * Fix bug for batch edit story and bug in project. + +commit 3fe0e12c2018a104fe237d4e8c312acdded14db2 +Author: Lwrless +Date: Tue Nov 30 16:57:54 2021 +0800 + + * fix notification grouping. + +commit a5cf00f9779f26b108a11fe81558c368800739d2 +Author: Lwrless +Date: Tue Nov 30 16:51:10 2021 +0800 + + * fix message groups array. + +commit eda9acb2ae06c1a1590ca2311b8212ea6bf6cf8b +Author: tianshujie +Date: Tue Nov 30 16:46:36 2021 +0800 + + * Search plan drop-down range when modifying linked stories and bugs. + +commit a9bc9cfaa09e83e7e91e747665a5eda5701942d3 +Merge: 65de424a3e 4a6faf94ee +Author: Guan Xiying +Date: Tue Nov 30 16:11:37 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit 4a6faf94ee08291d3d2993ff0f9e13ee5f570265 +Merge: 053f78ba97 d60dfdb494 +Author: liyuchun +Date: Tue Nov 30 16:11:27 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit 053f78ba971f49658c77464ce796db641ddea029 +Author: liyuchun +Date: Tue Nov 30 16:11:08 2021 +0800 + + * Fix bug #16893. + +commit 65de424a3e9b3a52aa184fc510774fb67864ae80 +Author: Guan Xiying +Date: Tue Nov 30 16:09:24 2021 +0800 + + * Add new markdown parser lib. + +commit 2794215be72262c877f5e97bb391076b7a1312c4 +Author: Lwrless +Date: Tue Nov 30 15:56:01 2021 +0800 + + * refactor, correct phpdoc. + +commit 64be419604145a29c8adca6c26b4035dd29a628f +Merge: a4426db6f0 dbc186a0c4 +Author: liyuchun +Date: Tue Nov 30 15:45:11 2021 +0800 + + Merge branch 'sprint/174_xieqiyu_45080' + +commit dbc186a0c4acc2aa3e8fc888ea89909a76088ff8 +Merge: 70d8039750 a4426db6f0 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 07:44:47 2021 +0000 + + Merge branch 'master' into 'sprint/174_xieqiyu_45080' + + # Conflicts: + # module/story/control.php + # module/story/view/header.html.php + # module/testcase/control.php + +commit d60dfdb494b959e86a59a77ba26ea4481f71376b +Author: zenggang +Date: Tue Nov 30 07:43:02 2021 +0000 + + * Fix bug#16810 + +commit 70d803975072abbd3de99c9b6b9b69cebc955825 +Author: xieqiyu +Date: Tue Nov 30 15:31:10 2021 +0800 + + * Add comment. + +commit 6e7d7c55d080b92065c2dc693040ee1a88d4ed9b +Author: Lwrless +Date: Tue Nov 30 15:30:40 2021 +0800 + + * add merge xuan notification logic, task #44851. + +commit f6049dbe00011f7880d27c952ecbbb8ab434b484 +Author: zenggang +Date: Tue Nov 30 07:25:03 2021 +0000 + + * Fix bug#16771 + +commit 20514926402331ba0e4d64d329802e3159410130 +Merge: 649a23cbd0 569cc32446 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 07:08:13 2021 +0000 + + Merge branch 'sprint/175_liumengyi_16924' into 'sprint/168' + + * Fix bug #16924. + + See merge request easycorp/zentaopms!675 + +commit 888fbfe73be7aad2235794b8db44593a2a22dc16 +Author: xieqiyu +Date: Tue Nov 30 15:05:16 2021 +0800 + + * Code for task#45080. + +commit 5088748be4df0a205281aa31639bfdd86e3a3e57 +Author: zenggang +Date: Tue Nov 30 07:04:46 2021 +0000 + + * Fix bug#16861 + +commit 569cc32446195d0ed2c5c4bb24b3ed0314e19c44 +Author: liumengyi +Date: Tue Nov 30 14:59:49 2021 +0800 + + * Fix bug #16924. + +commit 28e208cbcbba1df938c941410f10638c4e9b525d +Author: liumengyi +Date: Tue Nov 30 14:53:23 2021 +0800 + + * Fix bug #16924. + +commit 68c86f76cedeac27c60b8771ea45e3671348ed29 +Merge: 87bdc8d75d d21f456703 +Author: Lwrless +Date: Tue Nov 30 14:49:42 2021 +0800 + + Merge remote-tracking branch 'origin/sprint/168_qixinzhi_44856' into sprint/168_liwenrui_merge_notifications. + +commit a4426db6f0ca76e927de71b02b3ea132970269d3 +Merge: cb03696c8a 03cb9122ef +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 06:45:48 2021 +0000 + + Merge branch 'sprint/174_tianshujie_45081' into 'master' + + * Fix bug #16939 and modify the scope of the plan when editing bugs. + + See merge request easycorp/zentaopms!672 + +commit cb03696c8a18a618b0c594875693e2c95e1dc563 +Merge: c42cca1249 a8b2009bad +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 06:45:00 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_45019' into 'master' + + * Finish task #45019. + + See merge request easycorp/zentaopms!671 + +commit 03cb9122ef79863c658eac84d083927c42f8ff8d +Author: tianshujie +Date: Tue Nov 30 14:44:48 2021 +0800 + + * Adjust code style of bug module. + +commit 649a23cbd076460944e43968d659ef6831b76d3a +Merge: 801c9ce3d0 0ac782bf1f +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 06:43:55 2021 +0000 + + Merge branch 'sprint/175_liumengyi_45156' into 'sprint/168' + + * Fix bug for task#45146. + + See merge request easycorp/zentaopms!668 + +commit c42cca12499b4ff1bb781ed3fdf8b3899a79219a +Merge: 0ab2f6d249 801c9ce3d0 +Author: 孙广明 +Date: Tue Nov 30 14:38:32 2021 +0800 + + Merge branch 'sprint/168' + +commit 5d192a8413d68821590afaf1ecc59737c2aebc3a +Author: zenggang +Date: Tue Nov 30 06:37:17 2021 +0000 + + * Fix bug#16764 + +commit d21f456703919e42f5ae6a99b0e45743998171fd +Author: qixinzhi +Date: Tue Nov 30 14:32:34 2021 +0800 + + * xuanxuan notification rewrite + +commit 880374b21bcbbc3c93aa08f4f8ccb2e7cea87f71 +Author: zenggang +Date: Tue Nov 30 06:25:41 2021 +0000 + + * Fix bug#16746 + +commit 88e67add782958aaee0881dfb444479a35f440ec +Author: Hao Sun +Date: Tue Nov 30 14:16:15 2021 +0800 + + * refactor usage of kanban. + +commit 0b199d7d0ec3d3c68c81d273bd34304cfe4e82d2 +Author: Hao Sun +Date: Tue Nov 30 14:00:44 2021 +0800 + + * updata kanban lib. + +commit 39a2d7296b14f9a9cae3df68a27c33cc938125ec +Author: Hao Sun +Date: Tue Nov 30 13:43:42 2021 +0800 + + * refactor pages with kanban lib. + +commit 152b3e03bc5b350d4b8f01680ebf1b9daff2ce3d +Author: Hao Sun +Date: Tue Nov 30 13:42:37 2021 +0800 + + * update kanban lib. + +commit 354203e7c9833cf2aad0932a71637098c85ae872 +Author: zenggang +Date: Tue Nov 30 06:14:53 2021 +0000 + + * Fix bug#16857 + +commit 508d7d78bf017c5e1fa169e106a4c246899c52cf +Author: tianshujie +Date: Tue Nov 30 14:14:14 2021 +0800 + + * Fix bug #16939 and modify the scope of the plan when editing bugs. + +commit 87bdc8d75db6891de4ed37513efdb25949f1dcbc +Author: Lwrless +Date: Tue Nov 30 14:02:01 2021 +0800 + + * extend notification related functions, and add placeholder mergeNotifications function. + +commit a8b2009bad18c6383795aa54c033ecd64f6dbdf4 +Author: songchenxuan +Date: Tue Nov 30 14:00:37 2021 +0800 + + * Finish task #45019. + +commit 6dc4aeb45887732dfe664bfc229d09c46ea2ef09 +Author: zenggang +Date: Tue Nov 30 05:59:03 2021 +0000 + + * Fix bug#16774 + +commit cf91884c259bde0ce7fd94ff2a94db4dad09cd50 +Author: mayue +Date: Tue Nov 30 13:56:49 2021 +0800 + + * Fix bug #16631. + +commit 801c9ce3d03403c464018648f4c66fd5403b2dee +Merge: 392463cace 8b9f09e5e8 +Author: 孙广明 +Date: Tue Nov 30 13:47:05 2021 +0800 + + Merge branch 'sprint/169' into sprint/168 + +commit 0ab2f6d249ba2eafc9630e12cd84e65e5530b31d +Merge: c30c1466d0 2a469dc6f7 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 05:39:08 2021 +0000 + + Merge branch 'sprint/174_tianshujie_45007' into 'master' + + * Modify use case branch query conditions. + + See merge request easycorp/zentaopms!667 + +commit 0ac782bf1fa3a81030143a9841e1b293ba688be1 +Author: liumengyi +Date: Tue Nov 30 13:37:39 2021 +0800 + + * Fix bug for task#45146. + +commit ac79294f8df73af7bbac369e18ecddc42bd71847 +Author: liyuchun +Date: Tue Nov 30 13:36:37 2021 +0800 + + * Fix bug #16920. + +commit c30c1466d0f6f831508843316ee9fd5306a2fe22 +Merge: 4b223ec01b b0ad71231c +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 05:19:03 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_45028' into 'master' + + * Finish task #45028. + + See merge request easycorp/zentaopms!662 + +commit adc254b1d0bae3cbdf3849bfcaff61850dd7d4d4 +Author: Lwrless +Date: Tue Nov 30 13:18:15 2021 +0800 + + * store xuan notification data inside notification content. + +commit 392463cace599fa012535238077f0b56f574cb3f +Merge: 2d1e0bb3dc 9e9c024982 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 05:16:08 2021 +0000 + + Merge branch 'sprint/168_sgm_45161' into 'sprint/168' + + Sprint/168 sgm 45161 + + See merge request easycorp/zentaopms!641 + +commit 2d1e0bb3dc507e55a10a72f8c440b0aaaae6e4fd +Merge: e5a9358acd e752382609 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 05:15:34 2021 +0000 + + Merge branch 'sprint/168_sgm_45160' into 'sprint/168' + + * Finish task #45160. + + See merge request easycorp/zentaopms!664 + +commit e5a9358acd4dd296aa86fa216a0605e127c5133b +Merge: 86927c21ad 2fa0124ed8 +Author: 孙广明 +Date: Tue Nov 30 05:11:52 2021 +0000 + + Merge branch 'sprint/29_zhouxin_45106' into 'sprint/168' + + Finish task #45106. + + See merge request easycorp/zentaopms!649 + +commit 9e9c02498218f41165f5766f60a333cfce71151a +Author: 孙广明 +Date: Tue Nov 30 13:10:51 2021 +0800 + + * Adjust lang. + +commit d58fb3c8e75a738bbcdcc627617cbf7111a66a2d +Author: 孙广明 +Date: Tue Nov 30 13:08:17 2021 +0800 + + * Add lang and comment. + +commit 4b223ec01bf72d0e95fedf7a013f2ca74760ed3f +Merge: 0322f02b54 71387b1d37 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 05:02:41 2021 +0000 + + Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master' + + * Finish task #44987,44988,44989. + + See merge request easycorp/zentaopms!657 + +commit 2fa0124ed86287d0f6a5a190563cab728d7ff3a2 +Author: zhouxin +Date: Tue Nov 30 04:27:11 2021 +0000 + + Finish task #45106. + +commit 570b5c1cdb225cebd15acfb8d20f412e35b64736 +Merge: cabe7d0062 5bb1d7b671 +Author: liyuchun +Date: Tue Nov 30 12:03:29 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit b0ad71231ce7ac746f2447a54f20214593fcb081 +Author: songchenxuan +Date: Tue Nov 30 11:31:27 2021 +0800 + + * Finish task #45028. + +commit e75238260980a8b3e74e104e40d767e5c1ea63f3 +Author: 孙广明 +Date: Tue Nov 30 11:30:50 2021 +0800 + + * Remove unused code. + +commit 71387b1d372508211124ced82ed418e2841d25be +Author: mayue +Date: Tue Nov 30 11:26:48 2021 +0800 + + * Finish task #44987,44988,44989. + +commit 0322f02b54df15a02caf5109a6ae66b041f5de19 +Merge: adb7b76f3c 9efa9b1759 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 03:19:57 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_45018' into 'master' + + * Finish task #45018. + + See merge request easycorp/zentaopms!661 + +commit adb7b76f3ceb6435d1a04cfa48e0f282ead39665 +Merge: ca91fc11f1 d19f60d9df +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 03:19:07 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_45049' into 'master' + + Sprint/174 songchenxuan 45049 + + See merge request easycorp/zentaopms!643 + +commit 2a469dc6f7f7b36c92e23e991674ee93e5ddfbf0 +Author: tianshujie +Date: Tue Nov 30 11:17:10 2021 +0800 + + * Modify use case branch query conditions. + +commit 86927c21ad6c748824e2af726ac6eb7bcc6fbd37 +Merge: 4fef5fc188 7dc88ef740 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 03:16:42 2021 +0000 + + Merge branch 'sprint/175_liumengyi_16924' into 'sprint/168' + + * Fix bug #16924. + + See merge request easycorp/zentaopms!666 + +commit ca91fc11f12b6c28401bd32a9e7dce2e8a4582d4 +Merge: 2786d77fcb d2f57affa6 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 03:16:27 2021 +0000 + + Merge branch 'sprint/174_tianshujie_45007' into 'master' + + * Finish task #45005,45007. + + See merge request easycorp/zentaopms!660 + +commit 4fef5fc1887f97df3d5a45626b961d1d2a9ee710 +Merge: 4ca2f22704 f89071b9e7 +Author: 孙广明 +Date: Tue Nov 30 11:13:44 2021 +0800 + + Merge branch 'sprint/168_zhengrunyu_45148' into sprint/168 + +commit f89071b9e7c90352cf0ca1d76d90e26b11d056b6 +Merge: 46a9f157b1 c3ea85771d +Author: 孙广明 +Date: Tue Nov 30 03:13:21 2021 +0000 + + Merge branch 'sprint/168' into 'sprint/168_zhengrunyu_45148' + + # Conflicts: + # module/execution/view/view.html.php + +commit 2786d77fcb0826068c84be09897da16c5bcf5c56 +Merge: 106f5cfcd3 7e225ce3f7 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 03:12:42 2021 +0000 + + Merge branch 'sprint/174_tianshujie_task' into 'master' + + * Finish task #45081,45012. + + See merge request easycorp/zentaopms!655 + +commit 7dc88ef740683a627e72ac7b72648f4e0e4aa8f3 +Author: liumengyi +Date: Tue Nov 30 11:11:54 2021 +0800 + + * Fix bug #16924. + +commit 5bb1d7b6713d93eebe1783c419b23275a37999d6 +Author: zenggang +Date: Tue Nov 30 03:08:33 2021 +0000 + + * Fix bug#16860 + +commit 38619abdd8a00582cb74006b0d4c86dee960a56a +Author: 孙广明 +Date: Tue Nov 30 11:08:33 2021 +0800 + + * Finish task #45160. + +commit c3ea85771d705ec4c01bef2bf7cbee14962abfb9 +Merge: d37bced9ee bd6a007e6a +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 03:05:07 2021 +0000 + + Merge branch 'sprint/175_liumengyi_45156' into 'sprint/168' + + * Finish task #45156. + + See merge request easycorp/zentaopms!639 + +commit cabe7d00621db1f8ea2be8ca4150d1b08d97a1a2 +Author: liyuchun +Date: Tue Nov 30 11:00:47 2021 +0800 + + * Fix bug #16922. + +commit c5deb3e68d3bb92b6d9c66603121aa9768d76e45 +Author: songchenxuan +Date: Tue Nov 30 10:57:49 2021 +0800 + + * Finish task #45028. + +commit 46a9f157b1569ab3be99ab970f2bd524093dfe86 +Author: zhengrunyu +Date: Tue Nov 30 10:56:09 2021 +0800 + + *Finish task #45148. + +commit bd6a007e6af1fa89edfe5631f8813bd3ead8cb84 +Author: liumengyi +Date: Tue Nov 30 10:55:51 2021 +0800 + + * Add comment. + +commit f2d867870aaeb621181eab66ced8de03c5954526 +Author: mayue +Date: Tue Nov 30 10:55:41 2021 +0800 + + * Finish task #44987,44988,44989. + +commit 9efa9b1759cf8c80738f4d21b87de29aabd208d7 +Author: songchenxuan +Date: Tue Nov 30 10:49:38 2021 +0800 + + * Finish task #45018. + +commit d37bced9eed666d9ff9a16d87c43a2eaeb0d3360 +Merge: 9e14a2ac9f b264aa3199 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 02:47:03 2021 +0000 + + Merge branch 'sprint/175_liumengyi_16907' into 'sprint/168' + + * Fix bug 16807,16892. + + See merge request easycorp/zentaopms!658 + +commit 106f5cfcd313be985c68431710dfa7d17194a0a1 +Merge: b3cb90e69e 7a5a4d5807 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 02:46:09 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_tree' into 'master' + + * Solve the problem of mutual testing for task #45085. + + See merge request easycorp/zentaopms!659 + +commit 7a5a4d5807db0ffd4f3881357e99c4c406440824 +Author: hufangzhou +Date: Tue Nov 30 10:44:37 2021 +0800 + + * Rebuild the code. + +commit 67a17333a47e43228fbdcf200dd1f0ab9cc14258 +Author: zenggang +Date: Tue Nov 30 02:40:59 2021 +0000 + + * Fix bug#16849 + +commit d89aa24c8cd582d6210c01713c485b40805f20c5 +Author: mayue +Date: Tue Nov 30 10:32:11 2021 +0800 + + * Finish task #44987,44988,44989. + +commit d2f57affa61778d98643c90ec6d55b0bcfdbfb9b +Author: tianshujie +Date: Tue Nov 30 10:30:36 2021 +0800 + + * Finish task #45000. + +commit 4b9ee832e1a0b1a0d32a5b721257b7de989f5e73 +Author: liumengyi +Date: Tue Nov 30 10:20:50 2021 +0800 + + * Add comment. + +commit 20982701054454fa1e380be72e6ca411ee1329ae +Merge: b80d0643ac 5bbcd0bc35 +Author: liyuchun +Date: Tue Nov 30 10:18:38 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit b80d0643ac9413d9687e758f588e0e7469668beb +Author: liyuchun +Date: Tue Nov 30 10:18:24 2021 +0800 + + * Add field of zt_mr. + +commit 5bbcd0bc35b2330176f28947dd8d4888b4947079 +Author: zenggang +Date: Tue Nov 30 02:12:59 2021 +0000 + + * Fix bug#16849 + +commit 826a99a0b7bb61b1b0e955d8f8ffdd1d976bed5c +Author: tianshujie +Date: Tue Nov 30 10:12:47 2021 +0800 + + * Finish task #45005,45007. + +commit 4736e3a01c8bd3b94e7cc2ef4acf8a01e6ae6c96 +Author: hufangzhou +Date: Tue Nov 30 09:59:14 2021 +0800 + + * Solve the problem of mutual testing for task #45085. + +commit b3cb90e69e2b5c41e2822041dedcaf2881e78c20 +Author: 王怡栋 +Date: Tue Nov 30 09:58:11 2021 +0800 + + * replace processMarkdown method. + +commit b264aa3199f77ff97681e320b0ec8e587ea12da6 +Author: liumengyi +Date: Tue Nov 30 09:46:30 2021 +0800 + + * Fix bug 16807,16892. + +commit 9e14a2ac9f45cb2085b52c23cf120879e1f08810 +Merge: 2f4e67eda8 578d53f5ae +Author: 孙广明 +Date: Tue Nov 30 01:45:57 2021 +0000 + + Merge branch 'sprint/175_liyuchun_45154' into 'sprint/168' + + Sprint/175 liyuchun 45154 + + See merge request easycorp/zentaopms!640 + +commit aa86de638cdc059e432b7f3b124989d96dfa7f20 +Author: liumengyi +Date: Tue Nov 30 09:43:20 2021 +0800 + + * Fix bug #16907. + +commit 83724a370d9aebcc47d6fd8e126a93f8a6657cc7 +Author: zenggang +Date: Tue Nov 30 01:40:07 2021 +0000 + + * Fix bug#16910,16850 + +commit ef2385a1509d884e32fee0653eb0ac4e962d2b07 +Merge: 85d498c5cb 0cf53a32e0 +Author: 王怡栋 +Date: Tue Nov 30 09:38:44 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 85d498c5cb601f04fcafe774166f2c147604f83e +Author: 王怡栋 +Date: Tue Nov 30 09:38:12 2021 +0800 + + * replace lib for markdown to html. + +commit 2f4e67eda8857e41b4bb6af021a5ad7ebf63b7dd +Merge: 361f840ce8 bd2b8ab2a6 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 30 01:37:31 2021 +0000 + + Merge branch 'sprint/175_tengfei_lang' into 'sprint/168' + + * Edit lang file. + + See merge request easycorp/zentaopms!651 + +commit 361f840ce8af4c3579c5f1c37d093ed0bd4c856a +Merge: 4ca2f22704 4cec6b697d +Author: 孙广明 +Date: Tue Nov 30 01:32:21 2021 +0000 + + Merge branch 'sprint/29_zhouxin_45100' into 'sprint/168' + + Finish task 45100. + + See merge request easycorp/zentaopms!647 + +commit 3e346ef8d98406262af4bdc930bc2056dd0f9d37 +Author: liumengyi +Date: Tue Nov 30 09:31:08 2021 +0800 + + * Modify refactor. + +commit de202d29a82c03b6149c8f272bb6982ab6e12643 +Merge: 4906d6f51a 404a567b73 +Author: liyuchun +Date: Tue Nov 30 09:29:53 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit 4906d6f51a01a77967625cb3b9c0337f6816b8a3 +Author: liyuchun +Date: Tue Nov 30 09:29:35 2021 +0800 + + * Fix bug #16759. + +commit 19d489a645af8596ce62bf3f4b99c7a9fd0f074e +Author: mayue +Date: Tue Nov 30 09:27:50 2021 +0800 + + * Fix bug #44987,44988,44989. + +commit e78c876216973c75c4470071dcdd79791dea76aa +Author: zhengrunyu +Date: Tue Nov 30 09:22:04 2021 +0800 + + *Finish task #45148. + +commit 7e225ce3f71d2d6ed7709e12b3d7ed440c72eedc +Author: tianshujie +Date: Tue Nov 30 09:18:05 2021 +0800 + + * Finish task #45081,45012. + +commit 62907853b4e9de2f78fad13d2b5cffe5a8649853 +Author: liumengyi +Date: Tue Nov 30 09:10:42 2021 +0800 + + * Finish task #45156. + +commit d19f60d9dfe84841b7ac41eeab6e512a8fd8b8a7 +Author: songchenxuan +Date: Tue Nov 30 08:57:36 2021 +0800 + + * Finish task 45049. + +commit 404a567b7362ca220fc5e5242fb7844dfb90b18d +Author: zenggang +Date: Tue Nov 30 00:53:46 2021 +0000 + + * Fix bug#16818 + +commit 84baf0c896ccdbe054a1c5626dc0c44f75e823ef +Author: xieqiyu +Date: Mon Nov 29 21:28:42 2021 +0800 + + * Code for task#45080. + +commit 0cf53a32e0794ca37c0e994bbdb1c9e08ccbfad9 +Merge: a3043640ae c43a6b58f5 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 29 09:37:35 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_45048' into 'master' + + * Finish task 45048. + + See merge request easycorp/zentaopms!650 + +commit c43a6b58f55ea06d77a6794f610d593c5385cc8f +Author: songchenxuan +Date: Mon Nov 29 17:37:18 2021 +0800 + + * Finish task #45028. + +commit a3043640aeb2d7cb976784b31667922a4335e875 +Merge: 80b3bcf938 b51f3c957d +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 29 09:37:12 2021 +0000 + + Merge branch 'sprint/174_tianshujie_45081' into 'master' + + * Finish task #45081. + + See merge request easycorp/zentaopms!653 + +commit 80b3bcf93872211f6b5f9e3bc04d292e92e125f1 +Merge: c7a740e915 76e0a170f0 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 29 09:36:36 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_fix_importfromlib_bug' into 'master' + + * Fix bug testcase_importfromlib. + + See merge request easycorp/zentaopms!645 + +commit b51f3c957de0cb388e5f999934564638ce258fff +Author: tianshujie +Date: Mon Nov 29 17:34:50 2021 +0800 + + * Adjust code of story model. + +commit 76e0a170f070d5d8f6210fa61fecb8b5c8881bef +Author: songchenxuan +Date: Mon Nov 29 17:30:52 2021 +0800 + + * Finish task #45028. + +commit 25d07bb7a98c6cc6a8c0c5dfc4d822e25b21a9cb +Author: tianshujie +Date: Mon Nov 29 17:17:59 2021 +0800 + + * Delete unused code. + +commit a1d18bd94ea780162bfe32d5e52a49fd821c9132 +Author: songchenxuan +Date: Mon Nov 29 17:15:57 2021 +0800 + + * Finish task 45048. + +commit 0c33d76709e1fb593f23a50f4fe0045985633c77 +Author: tianshujie +Date: Mon Nov 29 17:14:01 2021 +0800 + + * Finish task #45081. + +commit c7a740e9152513cefcf43a0c99c1cc00d6550fd1 +Merge: 9b6c38f289 fb15cb3bd1 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 29 09:12:24 2021 +0000 + + Merge branch 'sprint/174_mayue_16603' into 'master' + + * Fix bug #16603. + + See merge request easycorp/zentaopms!652 + +commit fb15cb3bd1182a716ff99d440ba3d409c5f12012 +Author: mayue +Date: Mon Nov 29 17:05:23 2021 +0800 + + * Fix bug #16603. + +commit 3fcab63bb9433ee73f2d92696c6f5162ea5eae62 +Merge: 6200b6dc58 1b6059c5b3 +Author: liyuchun +Date: Mon Nov 29 17:02:14 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit 6200b6dc585586162b6e170d80dafb02c442bcff +Author: liyuchun +Date: Mon Nov 29 16:57:21 2021 +0800 + + * Fix bug #16719. + +commit 9b6c38f289903093d94051be544524c86153b472 +Merge: 3c490f50c7 8b65a6c8ef +Author: 王怡栋 +Date: Mon Nov 29 16:45:26 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3c490f50c7e459ced79a9f6b9cfda4bf56e6a8de +Author: 王怡栋 +Date: Mon Nov 29 16:45:10 2021 +0800 + + * adjust for ping. + +commit 1b6059c5b367f63fe2e04f0035897821baf3740b +Author: zenggang +Date: Mon Nov 29 08:41:24 2021 +0000 + + * Fix bug#16858 + +commit bd2b8ab2a61b3f33949457d12086b5d717a340a0 +Author: reneeteng +Date: Mon Nov 29 16:31:18 2021 +0800 + + * Edit lang file. + +commit 908f51250bffca2ddfed64f1417e4d3078da4542 +Author: songchenxuan +Date: Mon Nov 29 16:17:04 2021 +0800 + + * Fix bug #15737. + +commit 7a5c0629470375a52042f98c67db5e2a44120dea +Author: mayue +Date: Mon Nov 29 16:15:50 2021 +0800 + + * Finish task #44987,44988,44989. + +commit d46892bb32d5b2d927279131118d5f470c58b9f1 +Author: zhouxin +Date: Mon Nov 29 08:05:40 2021 +0000 + + Finish task #45106. + +commit 8b65a6c8ef6493f14a20e454f565207d624f7271 +Merge: 5ad303eca9 a99419f0c5 +Author: liyuchun +Date: Mon Nov 29 16:03:48 2021 +0800 + + Merge branch 'sprint/174_tianshujie_45081' + +commit a99419f0c5f1be3110045a1d024dd9734fec287f +Merge: adb2c12935 3050ba859d +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 29 08:03:38 2021 +0000 + + Merge branch 'master' into 'sprint/174_tianshujie_45081' + + # Conflicts: + # module/product/control.php + # module/story/view/batchedit.html.php + +commit adb2c12935661d1f65e285176fb95ac18bba70ee +Author: tianshujie +Date: Mon Nov 29 15:54:48 2021 +0800 + + * Modify the code. + +commit 3050ba859d21cd479a8c5e0dc47aeadedcb92655 +Author: 王怡栋 +Date: Mon Nov 29 15:49:26 2021 +0800 + + * add ping for api. + +commit fea372ea26efdcaee9e6d742429aeeee57662529 +Author: mayue +Date: Mon Nov 29 15:45:56 2021 +0800 + + * Finish task #44987,44988,44989. + +commit 47d141759de8dc211a8e6a6447c127fcd433a6c4 +Author: Tintin +Date: Mon Nov 29 15:30:10 2021 +0800 + + * task #44628, add methods for xuan web client. + +commit 98ab035758766e8883813458e4dae1e3843643f1 +Merge: 21e42772b2 45953a3d13 +Author: 王怡栋 +Date: Mon Nov 29 15:29:26 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 21e42772b2e766ad450c504d876558f8fc3bf0ee +Author: 王怡栋 +Date: Mon Nov 29 15:29:00 2021 +0800 + + * add lang for api. + +commit 45953a3d1320af59b7cce7ca9f3f38598604480a +Merge: ce8cbfe590 8d9fb81d9d +Author: 孙广明 +Date: Mon Nov 29 15:27:07 2021 +0800 + + Merge branch 'sprint/174_hufangzhou_45085' + +commit 8d9fb81d9d44fb8aebe8a35f13877e19282fa68b +Merge: 883f87a19c 5ad303eca9 +Author: 孙广明 +Date: Mon Nov 29 07:26:45 2021 +0000 + + Merge branch 'master' into 'sprint/174_hufangzhou_45085' + + # Conflicts: + # module/story/model.php + +commit 883f87a19c80513e7cac43384ab1ac89b3608f4f +Author: hufangzhou +Date: Mon Nov 29 15:24:46 2021 +0800 + + * Remove the unused code. + +commit bf1ca5893e9493ea0e25475fddca913f4d9e9cac +Author: hufangzhou +Date: Mon Nov 29 15:20:48 2021 +0800 + + * Modify the url when refresh the tree browse in project module. + +commit f164f0cdd099ba7f079fa80860c0be0f475cc1a5 +Author: liumengyi +Date: Mon Nov 29 15:19:19 2021 +0800 + + * Fix bug #16892. + +commit a3f5e8ab43a3cfedf2d6b7c3997cb86437e0ef04 +Author: liumengyi +Date: Mon Nov 29 15:18:12 2021 +0800 + + * Fix bug #16892. + +commit a77510b311e62003a0f74fb303459cec37a6ce11 +Author: mayue +Date: Mon Nov 29 15:11:16 2021 +0800 + + * Finish task #44987,44988,44989. + +commit 9fee3403febd1f9e6e456872efd99ef7fb3d4cf1 +Author: zenggang +Date: Mon Nov 29 07:08:48 2021 +0000 + + * Fix bug#16890,16888 + +commit 4cec6b697d7e30f21a3dceb449182f56fd75c81d +Author: zhouxin +Date: Mon Nov 29 07:00:16 2021 +0000 + + Finish task 45100. + +commit 5ad303eca99272d302bfa8b043568dff78bdeb29 +Merge: ae346dd200 78134ccb9b +Author: 孙广明 +Date: Mon Nov 29 06:58:17 2021 +0000 + + Merge branch 'sprint/174_xieqiyu_45080' into 'master' + + Sprint/174 xieqiyu 45080 + + See merge request easycorp/zentaopms!644 + +commit 74f7a959029745b99da34b7f1112b0ad0607cee9 +Author: chaideqing +Date: Mon Nov 29 14:55:14 2021 +0800 + + * optimize zentao buglist/storylist/tasklist show when in xuanxuan card + +commit e9ead71632b0e48604a92c021b0bdcaca05c0443 +Author: liumengyi +Date: Mon Nov 29 14:37:21 2021 +0800 + + * Finish task #45156. + +commit 7368ed108bb64b34a8a4b15f51e6fadd277872e2 +Author: liumengyi +Date: Mon Nov 29 14:33:44 2021 +0800 + + * Finish task #45156. + +commit aa840c5b9bc2ddabdf6928c98527c275c9c90135 +Author: liumengyi +Date: Mon Nov 29 14:33:12 2021 +0800 + + * Finish task #45156. + +commit 28eaf804d40396c579c6780f1ca2a4a582b48cca +Author: songchenxuan +Date: Mon Nov 29 14:30:50 2021 +0800 + + * Fix bug testcase_importfromlib. + +commit 32c10ef830cb37cf1a838f6e51951ce583a53176 +Author: zenggang +Date: Mon Nov 29 06:21:46 2021 +0000 + + * Fix bug#16756 + +commit a42131daeed6a62a3ae46818be6f977ef6507601 +Author: hufangzhou +Date: Mon Nov 29 14:17:05 2021 +0800 + + * Finish task #45006. + +commit 96a46aa2ca53e62395d069e2e99c2c28cbf7d6e0 +Author: tianshujie +Date: Mon Nov 29 14:16:10 2021 +0800 + + * Modify the code. + +commit 78134ccb9b2672bcf482ef4f2dcef245ef33f669 +Author: xieqiyu +Date: Mon Nov 29 14:14:10 2021 +0800 + + * Code for task#45082. Restore code. + +commit ae346dd200e77da9f0923930a43cff09c18c2e0a +Author: 王怡栋 +Date: Mon Nov 29 14:06:00 2021 +0800 + + * adjust for set api version. + +commit dcb0891ebce58a9d3440ec97be848deffa83f100 +Author: hufangzhou +Date: Mon Nov 29 14:04:38 2021 +0800 + + * Finish task #45023. + +commit 93ae2728f9be14730fa2a4757c37733eab1be587 +Author: xieqiyu +Date: Mon Nov 29 14:03:32 2021 +0800 + + * Code for task#45082. + +commit 84275ecf86220acff64c6ab93a39c27cdf6d5245 +Author: zenggang +Date: Mon Nov 29 06:03:03 2021 +0000 + + * Finish bug#16883 + +commit 2eaba625b359c8606042bb3c4a7d63a6ccdb9e39 +Author: songchenxuan +Date: Mon Nov 29 14:01:35 2021 +0800 + + * Finish task 45049. + +commit 45040819aea1c762af10c41fc4d44ffbb4496e4d +Author: songchenxuan +Date: Mon Nov 29 14:00:06 2021 +0800 + + * Finish task 45049. + +commit 22e4a664c1f1de2abc32f6cf7169aa88c7fc0285 +Author: xieqiyu +Date: Mon Nov 29 13:49:30 2021 +0800 + + * Code for task#45082. + +commit 81108390d1d4d81e7e5dc628279519b1f31129c0 +Author: zenggang +Date: Mon Nov 29 05:45:29 2021 +0000 + + * Fix bug#16761 + +commit 43c1b047b8979755e072d8c2555491dfbbbb7d29 +Author: liumengyi +Date: Mon Nov 29 13:43:04 2021 +0800 + + * Modify Date always in reverse order. + +commit 92eabf46abb81048045feed31a663fdaf107bacc +Merge: 029870ccdb 0d88abfcdb +Author: 王怡栋 +Date: Mon Nov 29 13:38:54 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 029870ccdb897b0b6fb2d32fff4a8a3e84d92dc3 +Author: 王怡栋 +Date: Mon Nov 29 13:38:32 2021 +0800 + + * adjust for task team hour. + +commit ea4ee494dea38c10db53a24726bd3611026d8170 +Author: liumengyi +Date: Mon Nov 29 13:37:27 2021 +0800 + + * Modify Date always in reverse order. + +commit 1e5db8c6db9ba6519cd988681998c1d3c134cedc +Author: liyuchun +Date: Mon Nov 29 13:30:33 2021 +0800 + + * Finish task #44798. + +commit adee5873ecf8f9d7685fb78ab3a8381ad9d2c741 +Author: liumengyi +Date: Mon Nov 29 13:22:05 2021 +0800 + + * Modify Date always in reverse order. + +commit 0965e74d0e8465d436d11059df3b49eb68d75036 +Author: hufangzhou +Date: Mon Nov 29 13:19:55 2021 +0800 + + * Finish task #45085. Fix bug #16792. + +commit eb6bd799632b9947612534b4a6e991def8f753a7 +Author: 孙广明 +Date: Mon Nov 29 13:09:43 2021 +0800 + + * Remove unused file. + +commit 0d88abfcdb9711c7a11b7d1082e364b587d81262 +Merge: be26a7c731 584ef7aa49 +Author: zhujinyong +Date: Mon Nov 29 13:09:19 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit be26a7c7318a87fbc9594933f8047c72892d46d9 +Author: zhujinyong +Date: Mon Nov 29 13:09:05 2021 +0800 + + * Fix errors of api. + +commit 578d53f5ae1478b9a723cfca055163386dc4ef99 +Author: liyuchun +Date: Mon Nov 29 13:08:18 2021 +0800 + + * Finish task #45152. + +commit 584ef7aa490173008bc955d9d7597a359c3be2c2 +Merge: 8fc78ccd45 64492f388b +Author: 王怡栋 +Date: Mon Nov 29 13:07:03 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8fc78ccd451ec7f6ae5e10323f6ecf78fe4896be +Author: 王怡栋 +Date: Mon Nov 29 13:06:47 2021 +0800 + + * adjust for api. + +commit 24513b3472f703a35d699515df4edad16ad7f612 +Author: zenggang +Date: Mon Nov 29 03:34:22 2021 +0000 + + * Fix bug#16769 + +commit c854d353c6b63878802b5cf4cc50b479d1bbef8e +Author: liumengyi +Date: Mon Nov 29 11:30:30 2021 +0800 + + * Modify Date always in reverse order. + +commit dbf176316b8deaea46da3f725b1ea16baa1a782a +Author: liyuchun +Date: Mon Nov 29 11:29:46 2021 +0800 + + * Finish task #45154. + +commit 4ca2f22704e7dc9e81437b805d37c405490c2c8c +Merge: b9a508facd bbcdd1a8a1 +Author: 孙广明 +Date: Mon Nov 29 03:25:28 2021 +0000 + + Merge branch 'sprint/29_zhouxin_45107' into 'sprint/168' + + Finish task 45107. + + See merge request easycorp/zentaopms!638 + +commit bbcdd1a8a17312613cd8f2ee6b69729023326282 +Author: zhouxin +Date: Mon Nov 29 03:17:59 2021 +0000 + + Change planProject to project. + +commit 64492f388b7190d664a64f5e53847384584f6679 +Merge: 4b57e8627b eebabad646 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 29 03:15:52 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_45028' into 'master' + + * Fix task 45028. + + See merge request easycorp/zentaopms!635 + +commit bc42c8527590e6852b34d63b50fb1387f8c21c8d +Author: Lwrless +Date: Mon Nov 29 11:12:57 2021 +0800 + + * refactor. + +commit b9a508facdee6e869a99c23fa6890969be0ec9eb +Merge: 5eaeb090d3 e732fd1a51 +Author: 孙广明 +Date: Mon Nov 29 03:10:47 2021 +0000 + + Merge branch 'sprint/29_zhouxin_45102' into 'sprint/168' + + Finish task 45102. + + See merge request easycorp/zentaopms!622 + +commit 5eaeb090d3dcd9f72c8c61ca3e8f7ac872e895d7 +Merge: a5991c4f6a 3e1fc7ad5a +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 29 02:55:48 2021 +0000 + + Merge branch 'sprint/175_liumengyi_45157' into 'sprint/168' + + * Finish task #45157. + + See merge request easycorp/zentaopms!621 + +commit 3e1fc7ad5a9bd1b51469f0d40d92623aef246c73 +Author: liumengyi +Date: Mon Nov 29 10:52:29 2021 +0800 + + * minor refactor. + +commit cd62501f36d25a2aeb89d47b3fc729bd440008dd +Author: liumengyi +Date: Mon Nov 29 10:49:56 2021 +0800 + + * minor refactor. + +commit a5991c4f6ae29f2754a6fa7d782a57d3420a1f0b +Merge: 803a3524b9 5dbd0ad4b9 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 29 02:44:46 2021 +0000 + + Merge branch 'sprint/175_liumengyi_16869' into 'sprint/168' + + * Fix bug #16869. + + See merge request easycorp/zentaopms!637 + +commit 235d7bbc0a7bc052a37704f72838f91cd987852e +Author: liumengyi +Date: Mon Nov 29 10:43:05 2021 +0800 + + * Finish task #45157. + +commit 41d073f19d7f31abc2412c8ea2b6146e2c05dab1 +Author: liumengyi +Date: Mon Nov 29 10:37:56 2021 +0800 + + * Finish task #45157. + +commit f837e6af2cc1290a1214ee0dcaab2a541ad55dac +Author: zenggang +Date: Mon Nov 29 02:37:38 2021 +0000 + + * Fix bug#16762 + +commit b70703eb343a044e4589b7b74a15e0cbf0b2bd82 +Author: zenggang +Date: Mon Nov 29 02:33:53 2021 +0000 + + * Fix bug#16762 + +commit 19e08aafdcffd3e9ae8b86dfbeea3caf20cf3f06 +Author: 孙广明 +Date: Mon Nov 29 10:29:56 2021 +0800 + + * Finish task #45161. + +commit 5dbd0ad4b9b4f45f68e1fb09371849db09374a4b +Author: liumengyi +Date: Mon Nov 29 10:28:52 2021 +0800 + + * Fix bug #16869. + +commit b0e125a4adc0f4dc9a53a4066ee7b57e58394aed +Author: zenggang +Date: Mon Nov 29 02:27:03 2021 +0000 + + * Fix bug#16763 + +commit 803a3524b9deb567f6c4d85f766eb10aab49caaa +Merge: d33ab012e1 0dcdc497a2 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 29 02:10:47 2021 +0000 + + Merge branch 'sprint/175_liumengyi_45156' into 'sprint/168' + + * Finish task #45156. + + See merge request easycorp/zentaopms!634 + +commit b6acb88c2100a9b6cf823862d0cb4f3742b4be15 +Author: liumengyi +Date: Mon Nov 29 09:55:00 2021 +0800 + + * Fix bug #16869. + +commit 2b52af1ba491d53c940390daeedaccdb06059e06 +Merge: ea87d0d644 a2d0cdb04e +Author: liyuchun +Date: Mon Nov 29 09:48:31 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit ea87d0d644bef0c669335ee73b31da7e16a77e19 +Author: liyuchun +Date: Mon Nov 29 09:48:20 2021 +0800 + + * Fix bug #16760. + +commit 2cfb89f72770a6a29936a06a59b2727a394e381a +Author: liumengyi +Date: Mon Nov 29 09:47:04 2021 +0800 + + * Finish task #45157. + +commit 456b7d06a14ad5ee2fd1260eace52f448d4800cc +Author: zhouxin +Date: Mon Nov 29 01:35:28 2021 +0000 + + Finish task 45107. + +commit b3c8ee7ccbb5a01b55d788181885a07d37371d2a +Author: zhengrunyu +Date: Mon Nov 29 09:29:44 2021 +0800 + + *Finish task #45148. + +commit d33ab012e1eecdc0b01e9df4e92eac9c88c66c22 +Merge: 5afe0b12b5 1b63752f83 +Author: 孙广明 +Date: Mon Nov 29 00:58:04 2021 +0000 + + Merge branch 'sprint/175_liyuchun_45152' into 'sprint/168' + + * Finish task #45152. + + See merge request easycorp/zentaopms!627 + +commit a2d0cdb04e3f84763069484ce43a8ae628d1e3fd +Author: zenggang +Date: Mon Nov 29 00:57:31 2021 +0000 + + * Fix bug#16762 + +commit ad5dfa073c2d03ab92c6f09fa726513d2f325397 +Author: liyuchun +Date: Mon Nov 29 08:39:32 2021 +0800 + + * Fix bug #16845. + +commit 0dcdc497a2f7a216608ce45f1e3504ed642b279e +Author: liumengyi +Date: Mon Nov 29 08:37:47 2021 +0800 + + * Finish task #45156. + +commit 5afe0b12b538dbf21528bc3c0d846f845afc22d8 +Merge: 8c1b5a2a5b c72bdbbdfb +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 29 00:34:53 2021 +0000 + + Merge branch 'sprint/175_liumengyi_45158' into 'sprint/168' + + * Finish task #45158. + + See merge request easycorp/zentaopms!624 + +commit 143dff6f0b6112d432a75e67c2e3bdbdbac4cc60 +Author: liumengyi +Date: Mon Nov 29 08:24:04 2021 +0800 + + * Finish task#45156. + +commit f77c484548e67ebeb97859a893bf2e230c599114 +Author: liumengyi +Date: Mon Nov 29 08:21:29 2021 +0800 + + * Finish task #45157. + +commit 4b57e8627be85ee954c2e40e1f3263c9be1eae5a +Author: zhujinyong +Date: Sun Nov 28 22:17:33 2021 +0800 + + * Fix api of program. + +commit 763ae6ea87cf4afdfe69203b86b4956d1a02facc +Author: xieqiyu +Date: Sun Nov 28 19:54:47 2021 +0800 + + * Code for task#45082. + +commit f2b60bda9e1abecab45d79ac4137300fbafcd3fb +Author: tianshujie +Date: Sat Nov 27 19:17:38 2021 +0800 + + * Finish task #45011. + +commit 06908238660499d327a25ae34531f861f4b82513 +Author: tianshujie +Date: Sat Nov 27 18:58:33 2021 +0800 + + * Finish task #45030. + +commit 582f0e036dbe1b8e3a8d42393f7cf9eea16582ec +Author: tianshujie +Date: Sat Nov 27 18:14:41 2021 +0800 + + * Finish task #45043. + +commit 3bddd21087ce083769181f476704c90dbb6f1755 +Author: tianshujie +Date: Sat Nov 27 17:58:52 2021 +0800 + + * Finish task #45083. + +commit f4d1a727a79630569000d53dacf187da84a6f8bb +Author: tianshujie +Date: Sat Nov 27 17:41:42 2021 +0800 + + * Finish task #45084,44994,44993. + +commit 066db150a42487d599d25da78562e6a620b66551 +Author: tianshujie +Date: Sat Nov 27 09:52:47 2021 +0800 + + * Solve the problem of plan creation and execution error. + +commit bee47f64e11ae80fa8f8f05d6cf8d627ac77c71d +Author: zenggang +Date: Fri Nov 26 09:49:01 2021 +0000 + + * Fix bug#16753 + +commit eebabad646b07bf47fdd7677fdcf57c82056b3cc +Author: songchenxuan +Date: Fri Nov 26 17:34:19 2021 +0800 + + * Fix task 45028. + +commit df3908f3acc291ec05a460390cf5e2a3af986bec +Author: Hao Sun +Date: Fri Nov 26 17:28:05 2021 +0800 + + * task #44626, improve UI for embed client. + +commit dfbff4034fe87b863699c1e117fb23bdb2244a8b +Author: Hao Sun +Date: Fri Nov 26 16:42:56 2021 +0800 + + * change chat button icon. + +commit de48e51585181c3117097190a0e919691d74ebb9 +Author: Hao Sun +Date: Fri Nov 26 16:41:02 2021 +0800 + + * update icon, add new icon "icon-chat-solid". + +commit 89879723dd3f05f7b9d8536b992e62e72f9d6cd2 +Author: Hao Sun +Date: Fri Nov 26 16:38:33 2021 +0800 + + * fix embed panel height. + +commit 6bfdcd4e40362f5dc3b8b6baced9432dc1165528 +Author: zenggang +Date: Fri Nov 26 08:12:46 2021 +0000 + + * Adjust mr create logic + +commit f451a1c23eb5d620dbada2bd230a9e851b0108e6 +Merge: 5b76958a3b 0b965aa699 +Author: liyuchun +Date: Fri Nov 26 16:03:23 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit 5b76958a3b6ccd7ca53f4bdf3e880c3c8f3701b3 +Author: liyuchun +Date: Fri Nov 26 15:57:31 2021 +0800 + + * Fix bug #16719. + +commit 8c1b5a2a5b1ab9e63fcccddcc7d33119050699c4 +Merge: 8ff597ece9 ba19230925 +Author: 朱金勇 +Date: Fri Nov 26 07:43:15 2021 +0000 + + Merge branch 'sprint/168_sunhao/task44627' into 'sprint/168' + + * task #44627, add web client entry button to bottom navbar in index page. + + See merge request easycorp/zentaopms!632 + +commit 8ff597ece9b3cf5ebe6396b934e5614b15bafd80 +Merge: d4020ba717 e7b79d83fc +Author: 孙浩 +Date: Fri Nov 26 07:38:59 2021 +0000 + + Merge branch 'sprint/168_qixinzhi_44858' into 'sprint/168' + + * product plan card for xuanxuan extension + + See merge request easycorp/zentaopms!628 + +commit ba19230925d910863fd8bb34cf370f62983895a7 +Author: Hao Sun +Date: Fri Nov 26 15:38:06 2021 +0800 + + * improve UI for embed web client. + +commit a9d365b282fe04fc6402213522d921437cf0f384 +Merge: 3c5c265210 ffaaf3ab6e +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 26 07:24:27 2021 +0000 + + Merge branch 'sprint/174_mayue_16640' into 'master' + + * Fix bug #16640. + + See merge request easycorp/zentaopms!631 + +commit ffaaf3ab6e23b824acffa6eb0a04c7b05a1b60d0 +Author: mayue +Date: Fri Nov 26 15:23:26 2021 +0800 + + * Fix bug #16640. + +commit 3c5c2652103d8b84b01b3d164cfec73ebbc4c901 +Merge: eeb7a4bf6a 5d6909d347 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 26 07:20:49 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_45050' into 'master' + + * Finish task #45050. + + See merge request easycorp/zentaopms!630 + +commit 9dac5358e393208b8842ce3a1a23f62edce7cde3 +Author: zhengrunyu +Date: Fri Nov 26 15:20:17 2021 +0800 + + *Finish task #45148. + +commit 5d6909d3471dfca4881a09315df4f5c21dbe0216 +Author: songchenxuan +Date: Fri Nov 26 15:20:05 2021 +0800 + + * Finish task #45050. + +commit 0b965aa6998f99ed8e8b91fdd9e360770616ff81 +Author: zenggang +Date: Fri Nov 26 07:17:55 2021 +0000 + + * Fix bug#16745 + +commit eeb7a4bf6a7b132b92d29a155a88aa6844dc857c +Merge: 03f1dd727e 35206b32a8 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 26 07:11:50 2021 +0000 + + Merge branch 'sprint/174_songchenxuan_45049' into 'master' + + * Finish task #45049. + + See merge request easycorp/zentaopms!626 + +commit e5f3e87ea1f593f13066c2c90263e560819c9baa +Author: liumengyi +Date: Fri Nov 26 15:08:17 2021 +0800 + + * Finish task #45157. + +commit 0c2b88ae38c6050ed835f1e0db0245b21154ebff +Author: liumengyi +Date: Fri Nov 26 15:04:47 2021 +0800 + + * Finish task #45157. + +commit d4020ba7175b765fc3148806bcb20f5f4c54723f +Merge: 00b34e5e1f d374d467cc +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 26 07:03:18 2021 +0000 + + Merge branch 'sprint/175_liumengyi_16805' into 'sprint/168' + + * Fix bug #16805. + + See merge request easycorp/zentaopms!629 + +commit 84092dcc2c424791c18ea8efe4af68770c07932f +Author: Hao Sun +Date: Fri Nov 26 15:03:18 2021 +0800 + + * add web client entry button to bottom navbar in index page. + +commit 8632e63341ba5007fedd3e27e104dd56f9041c10 +Author: Hao Sun +Date: Fri Nov 26 15:01:51 2021 +0800 + + * refactor. + +commit 7810fbc629d74e6bb1a98a7d11973caea2379942 +Author: tianshujie +Date: Fri Nov 26 14:59:02 2021 +0800 + + * Finish task #45081. + +commit bc13a23d1efed82bf487ddbcbdd4f902fe8217d7 +Author: songchenxuan +Date: Fri Nov 26 14:58:39 2021 +0800 + + * Finish task #45050. + +commit d374d467ccfae41b298ca3e47e0e14b0a4249f56 +Author: liumengyi +Date: Fri Nov 26 14:31:33 2021 +0800 + + * Fix bug #16805. + +commit 03f1dd727ed62defc8a5a622f7865d4d1787f05f +Author: 王怡栋 +Date: Fri Nov 26 14:18:28 2021 +0800 + + * code for task #45184 and adjust api. + +commit e7b79d83fc26d3a7f06719dccc532b77ec03c6df +Author: qixinzhi +Date: Fri Nov 26 14:15:53 2021 +0800 + + * product plan card for xuanxuan extension + +commit e4e040326b511ab26aa3273387913051e7a664fc +Author: liumengyi +Date: Fri Nov 26 14:01:11 2021 +0800 + + * Finish task #45156. + +commit 1b63752f83dd23ab4fdcd81d2b9c3551620297ed +Author: liyuchun +Date: Fri Nov 26 14:00:54 2021 +0800 + + * Finish task #45152. + +commit 35206b32a836c5aaabbc987e70d245d9c1e63088 +Author: songchenxuan +Date: Fri Nov 26 14:00:01 2021 +0800 + + * Finish task #45049. + +commit 8bf6c34acde568afcfc88cffb066ed4da20d3a13 +Author: tianshujie +Date: Fri Nov 26 13:37:15 2021 +0800 + + * Modify the logic of planning related stories and bugs. + +commit 0a3c124b2069e1a557399df20a4e3752952ba1a6 +Author: mayue +Date: Fri Nov 26 13:34:17 2021 +0800 + + * Fix bug #16640. + +commit ee53bd1ad26376d946b8966bd9c840aa499bc1be +Author: songchenxuan +Date: Fri Nov 26 13:33:35 2021 +0800 + + * Finish task #45049. + +commit d41d6cf262271623c828e625298cdec00532ba47 +Author: 王怡栋 +Date: Fri Nov 26 13:28:45 2021 +0800 + + * adjust for api. + +commit 6f43788b0c0846775d0d5a95601efc129b2d7524 +Author: zenggang +Date: Fri Nov 26 05:16:35 2021 +0000 + + * Fix bug#16722 + +commit 294317ccfe8f5235b4d3069a7879fda83f7d905c +Author: 王怡栋 +Date: Fri Nov 26 11:30:37 2021 +0800 + + * fix bug for product api. + +commit 9b8eea30d93ea7a0907c5146145cd271ce592c64 +Merge: 1ac64ab4c1 6f1784baee +Author: 王怡栋 +Date: Fri Nov 26 11:26:48 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1ac64ab4c18850c7f0a100385036b151c49e50e2 +Author: 王怡栋 +Date: Fri Nov 26 11:26:27 2021 +0800 + + * code for task #44939. + +commit 6f1784baee6db198f3b49d5b73112c984631d74a +Merge: c15bf759b9 b2611b3fb7 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 26 03:18:37 2021 +0000 + + Merge branch 'sprint/174_mayue_16603' into 'master' + + * Fix bug #16603. + + See merge request easycorp/zentaopms!625 + +commit 59b7c221ba31604100d50c557ec9c55e18cd022c +Merge: 02d0050f3f 49f65eaae8 +Author: xiawenlong +Date: Fri Nov 26 11:15:11 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit 02d0050f3f6c4d747501a6243e6db50d5be4e4e9 +Author: xiawenlong +Date: Fri Nov 26 11:15:09 2021 +0800 + + * Fix edit js bug. + +commit 49f65eaae8763667d3b882dc9fb33093d6211227 +Author: zenggang +Date: Fri Nov 26 03:14:51 2021 +0000 + + * Fix bug#16755 + +commit 14ef9fa0de356ede689a8c166944bf4382c9bcf2 +Author: xiawenlong +Date: Fri Nov 26 11:10:53 2021 +0800 + + * Fix create js bug. + +commit 7a53ada4b36ec7788b6c835b0b4d22dc3786b14a +Author: zenggang +Date: Fri Nov 26 03:00:16 2021 +0000 + + * Fix bug#16734 + +commit c72bdbbdfb5707494ca1e77da1740e57bea3640d +Author: liumengyi +Date: Fri Nov 26 10:50:16 2021 +0800 + + * Finish task #45158. + +commit a9b865aa9f59cd8bfde580bd4a28093e7a21e8ee +Author: liumengyi +Date: Fri Nov 26 10:47:53 2021 +0800 + + * Finish task #45158. + +commit b2611b3fb7002e42ab03feea39db756f07bfee1b +Author: mayue +Date: Fri Nov 26 10:43:45 2021 +0800 + + * Fix bug #16603. + +commit c15bf759b92cc0ced78b197f78a15ad1b915dc2e +Author: 王怡栋 +Date: Fri Nov 26 10:40:54 2021 +0800 + + * code for task #44937. + +commit df2f48128a7a9009ff7178f1538059d1f80c529e +Author: liumengyi +Date: Fri Nov 26 10:31:47 2021 +0800 + + * Finish task #45157. + +commit 2c8777ebe9325e732b1ca1dd79c80e8481d1605a +Author: liumengyi +Date: Fri Nov 26 10:26:43 2021 +0800 + + * Finish task #45157. + +commit e732fd1a519abdaae5ed7081685a59b31eb08753 +Author: zhouxin +Date: Fri Nov 26 02:25:56 2021 +0000 + + Finish task 45102. + +commit e2503a001c1609848eba9e38ec8952dee9e0baf3 +Author: 王怡栋 +Date: Fri Nov 26 10:19:11 2021 +0800 + + * fix for task view. + +commit 4d8b54a0b1f75e41f621033102fe46394cdf1eec +Author: liumengyi +Date: Fri Nov 26 10:08:56 2021 +0800 + + * Finish task #45157. + +commit ff9601584fbc2e11a7610577e2614b2ff4d501da +Author: Hao Sun +Date: Fri Nov 26 09:55:27 2021 +0800 + + * update zentao icons, change `icon-group`, add `icon-list-box`. + +commit 73e0f4eaa68b0305f5e4b2e0e82439bb64e01234 +Author: 王怡栋 +Date: Fri Nov 26 09:42:48 2021 +0800 + + * add bug action fo api. + +commit 8b1b0b0da8d1c23c66719cff9b36383b49b9c748 +Author: 王怡栋 +Date: Fri Nov 26 09:37:26 2021 +0800 + + * code for task #44955,44954,44953,44952,44951. + +commit 2ada8ead0b666d1d5f41f61ffa177e70151d5d80 +Author: 王怡栋 +Date: Fri Nov 26 09:31:38 2021 +0800 + + * code for task #44946. + +commit 542369e382cded43008ab2d919672ae288853ae8 +Author: liumengyi +Date: Fri Nov 26 09:13:24 2021 +0800 + + * Finish task #45157. + +commit 508b73fea675ee0d1266605eb0b12b3d89814646 +Author: liumengyi +Date: Fri Nov 26 09:09:48 2021 +0800 + + * Finish task #45157. + +commit c6e4ff62d68c8b396c1c56a69dd7a411f2b5af7d +Author: liumengyi +Date: Fri Nov 26 09:07:28 2021 +0800 + + * Finish task #45157. + +commit 00b34e5e1f4bcf81f831871f1a41c4186a935d89 +Merge: 1e47b084a4 cd9290d80b +Author: 孙广明 +Date: Fri Nov 26 01:06:42 2021 +0000 + + Merge branch 'sprint/29_zhouxin_45099' into 'sprint/168' + + Finish task #45099. + + See merge request easycorp/zentaopms!619 + +commit 1e47b084a447398f687a1473b85dfc9acb5d6d1f +Merge: 617474ece6 119a3fab7d +Author: 孙广明 +Date: Fri Nov 26 01:06:06 2021 +0000 + + Merge branch 'sprint/168_zhengrunyu_45151' into 'sprint/168' + + *Finish task #45151. + + See merge request easycorp/zentaopms!620 + +commit 07363c68ffc6eaac1c97f99f51988595358890d0 +Author: zhengrunyu +Date: Fri Nov 26 09:01:56 2021 +0800 + + *Finish task #45148. + +commit 99b52e6b7e333e0bde28e318557abb96ef67a720 +Author: liumengyi +Date: Fri Nov 26 08:59:55 2021 +0800 + + * Finish task #45157. + +commit da513cfd6d512c13cd1268f1ebbfa3368f83e4c6 +Author: 王怡栋 +Date: Fri Nov 26 08:58:38 2021 +0800 + + * adjust for task #44947. + +commit fb843381ca36daf7519dac776e6c401fcaecccbb +Author: liumengyi +Date: Fri Nov 26 08:55:04 2021 +0800 + + * Finish task #45157. + +commit 119a3fab7d7714ecb52a85782b754ddec30e586e +Author: zhengrunyu +Date: Fri Nov 26 08:48:26 2021 +0800 + + *Finish task #45151. + +commit 2f41e85fda811b2e29064adb77be6b1fb5bb8c3f +Author: zhengrunyu +Date: Fri Nov 26 08:30:55 2021 +0800 + + *Finish task #sprint/168_zhengrunyu_45148. + +commit 617474ece6eb01b22c04db19d1d72394bd13eb73 +Merge: 8a0841977e 4c090eefe2 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 26 00:24:14 2021 +0000 + + Merge branch 'sprint/175_liumengyi_45155' into 'sprint/168' + + * Finish task #45155 + + See merge request easycorp/zentaopms!615 + +commit ba63ff33bfdd30822c9d897a40b52c62589e84e6 +Author: tianshujie +Date: Thu Nov 25 18:22:29 2021 +0800 + + * Transfer the stories and bugs of the parent plan to the child plan. + +commit 774ee347f5cf31bd23449fea8f0d85257bb59f5f +Author: tianshujie +Date: Thu Nov 25 17:57:24 2021 +0800 + + * Translate modified code. + +commit d188b403d54cf7559f8640b3f4981313cabf88f8 +Author: 王怡栋 +Date: Thu Nov 25 17:28:04 2021 +0800 + + * code for task #44958. + +commit 0479696334b84fa8f6d5c835c26d83e68b0c1002 +Author: liyuchun +Date: Thu Nov 25 17:23:46 2021 +0800 + + * Finish task #44798. + +commit 9e6a0d62d3c694beedc81f82f1b845afe77b21ad +Author: Hao Sun +Date: Thu Nov 25 17:10:58 2021 +0800 + + * Update zentao icons, add "icon-groups". + +commit 01e90961402a3811d52428f319c04e27e835eded +Author: 王怡栋 +Date: Thu Nov 25 17:00:24 2021 +0800 + + * code for task #44946. + +commit 95457aa76de11f8a8702687b017203ce71384b62 +Merge: 2f8512af1f 1520eeb375 +Author: dingguodong +Date: Thu Nov 25 16:52:14 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit 2f8512af1faf234f9cc2393533c7f5ec36066ca5 +Author: dingguodong +Date: Thu Nov 25 16:51:37 2021 +0800 + + * Fix bug when changing repo type from others to GitLab. + +commit 396c57f0cb19648b85e3a3ccaa230934eee36619 +Merge: ceded29b95 e372b49a31 +Author: 王怡栋 +Date: Thu Nov 25 16:37:46 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ceded29b95d5284800b63cd95e8161e3294c0474 +Author: 王怡栋 +Date: Thu Nov 25 16:20:41 2021 +0800 + + * code for task #44947,44948,44949,44950,44956. + +commit 1520eeb375fc15123665b5fbfcfee90a5389cc9f +Author: zenggang +Date: Thu Nov 25 08:08:12 2021 +0000 + + * Adjust code + +commit facb6f1ce40880cafac85e671a5fe71e30ccb6d0 +Author: liyuchun +Date: Thu Nov 25 15:59:54 2021 +0800 + + * Fix bug #16715. + +commit 4c090eefe26b73624e819dbd4ebd138955bd0581 +Author: liumengyi +Date: Thu Nov 25 15:58:10 2021 +0800 + + * Finish task #45155. + +commit 59605b34a6ce20fda75e532925048560a5df855b +Author: zenggang +Date: Thu Nov 25 07:52:32 2021 +0000 + + * Finish task#44806 + +commit 26da1c72cb5f210c0579df41a6eec7b6297fff0f +Author: liumengyi +Date: Thu Nov 25 15:52:15 2021 +0800 + + * Finish task#45157. + +commit 0edae7664d1e6136c623670affa3cf89cc4fc0c6 +Author: zhengrunyu +Date: Thu Nov 25 15:42:18 2021 +0800 + + *Finish task #45148. + +commit 8a0841977e05615d358974ca0901a3f80f1d8ffe +Merge: a2f81d7d85 8656350081 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 25 07:34:22 2021 +0000 + + Merge branch 'sprint/168_sgm_45153' into 'sprint/168' + + * Finish task #45153. + + See merge request easycorp/zentaopms!618 + +commit 8656350081425f207b82a14052f7ea98a0079ca2 +Author: 孙广明 +Date: Thu Nov 25 15:28:54 2021 +0800 + + * Remove noproject merge method. + +commit cd9290d80b2bd419d78a718dfb74ed6d548f190e +Author: zhouxin +Date: Thu Nov 25 07:26:24 2021 +0000 + + Finish task #45099. + +commit 182106be139f4060c7539f42612cdd2007fddc7e +Author: 孙广明 +Date: Thu Nov 25 15:14:10 2021 +0800 + + * Finish task #45153. + +commit 3340a383f1f376337b1f7fb9ab8fc17ad9b106be +Author: zhengrunyu +Date: Thu Nov 25 15:03:43 2021 +0800 + + *Finish task #45151. + +commit e372b49a317114249179933ca3ebcd221fefd9ad +Merge: e86878e5c6 0e67779504 +Author: 朱金勇 +Date: Thu Nov 25 06:59:32 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_45085' into 'master' + + * Modify the branch switcher in qa menu. + + See merge request easycorp/zentaopms!617 + +commit 0e6777950408c8d8758d20385861a6b32a4029e6 +Author: hufangzhou +Date: Thu Nov 25 14:53:22 2021 +0800 + + * Modify the branch switcher in qa menu. + +commit e80d9acf3735d0c2be0a3254c73f5c8e54259f03 +Author: liyuchun +Date: Thu Nov 25 14:51:11 2021 +0800 + + * Finish task #44796. + +commit e86878e5c6f4695aa3498d10e95acf4f69ada71e +Author: zhujinyong +Date: Thu Nov 25 14:49:15 2021 +0800 + + * Fix tree of product and branch. + +commit 293a375ec8186d28745f530e82dd7f1121717a59 +Merge: bcc8081925 f92ba845a3 +Author: 朱金勇 +Date: Thu Nov 25 06:45:58 2021 +0000 + + Merge branch 'sprint/174_mayue_16605' into 'master' + + Fix bug #16605. + + See merge request easycorp/zentaopms!616 + +commit f92ba845a355c2ce7f80fd2e2822cde252cb334d +Author: mayue +Date: Thu Nov 25 14:35:33 2021 +0800 + + * Fix bug #16605. + +commit bcc8081925d318c71e885702a0aa677f81bf9cd2 +Merge: 39327b4b8f 8cdf02366c +Author: 王怡栋 +Date: Thu Nov 25 14:23:40 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 39327b4b8f4a22ceea533342e82e8219dbb1c8d4 +Author: 王怡栋 +Date: Thu Nov 25 14:22:26 2021 +0800 + + * code for task #44940,44941,44942,44943,44944,44945. + +commit fd3a7312dc8c9b433e69d233287678854a53310b +Merge: 2aec31c5e0 1d8099d5ff +Author: liyuchun +Date: Thu Nov 25 14:14:37 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit 2aec31c5e09e0ae048e7565db9bf0f2af579503d +Author: liyuchun +Date: Thu Nov 25 14:13:23 2021 +0800 + + * Finish task #44802. + +commit 1d8099d5ff537395e67509f3075a5a9b3c60150b +Merge: 68862907dc ef9ad2c0d7 +Author: zenggang +Date: Thu Nov 25 06:06:48 2021 +0000 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit 68862907dca7f3f3af809ca8350acb4aa8b46f74 +Author: zenggang +Date: Thu Nov 25 06:02:52 2021 +0000 + + * Finish task#44803 + +commit 7fa6f3ef5cbad37ff63b3f9a71c27697199a6d21 +Author: liumengyi +Date: Thu Nov 25 13:53:13 2021 +0800 + + * Finish task #45155:. + +commit ef9ad2c0d7c3e8b206354de506a56858cc005bd5 +Author: liyuchun +Date: Thu Nov 25 13:49:04 2021 +0800 + + * Finish task #44802. + +commit a2f81d7d85b5d925e632ae65b9323b784e56c940 +Merge: 66d1d59357 17f6a6203c +Author: 孙广明 +Date: Thu Nov 25 05:33:36 2021 +0000 + + Merge branch 'sprint/168_tanghucheng_formax' into 'sprint/168' + + * Code for project model function getTeamMemberPairs. + + See merge request easycorp/zentaopms!609 + +commit 17f6a6203c53c9ecd4de681cb89998ec06b0c035 +Author: tanghucheng +Date: Thu Nov 25 13:32:06 2021 +0800 + + * Code for project. + +commit 36afb288d6ea7db593e7c3482d5aff5d8e2bd5b9 +Author: mayue +Date: Thu Nov 25 13:31:35 2021 +0800 + + * Fix bug #16605. + +commit f342b1a219140b22fe60737848be14d731d85205 +Author: tianshujie +Date: Thu Nov 25 13:29:04 2021 +0800 + + * Modify search stories and bug issues. + +commit bcf7283bc7b818afe6c46f701392a4421c2908eb +Author: liumengyi +Date: Thu Nov 25 13:28:45 2021 +0800 + + * Finish task #45155. + +commit 1cf28e11208c6f468cb705d71358bfbd3f499da1 +Author: mayue +Date: Thu Nov 25 13:20:54 2021 +0800 + + * Fix bug #16605. + +commit 3816d9a77541a825c94dec306009e99f12ff48ff +Author: tianshujie +Date: Thu Nov 25 13:16:20 2021 +0800 + + * Modify the scope of linked stories and bugs in the plan. + +commit 762754479a42b2f93a22a876c9929936786a635f +Author: zenggang +Date: Thu Nov 25 05:11:33 2021 +0000 + + * Finish task#44800 + +commit 8cdf02366cfdd6a9183ad358be79e6c6d6fb8ad2 +Merge: 385cb41a0e e431847c58 +Author: 朱金勇 +Date: Thu Nov 25 05:05:20 2021 +0000 + + Merge branch 'sprint/174_hufangzhou_45079' into 'master' + + * Add the branch switcher in tree browse page. + + See merge request easycorp/zentaopms!614 + +commit e431847c583d2ea7fe64794d986f27dbc6c6fa66 +Author: hufangzhou +Date: Thu Nov 25 12:22:56 2021 +0800 + + * Add the branch switcher in tree browse page. + +commit 385cb41a0ed0967a3eec59fe717b0174a6569a45 +Author: 王怡栋 +Date: Thu Nov 25 11:35:46 2021 +0800 + + * code for task #44938. + +commit e0cf5d56f4e88301e7738c8870ae2b29d80a4ae9 +Author: zenggang +Date: Thu Nov 25 03:31:08 2021 +0000 + + * Finish task#44804 + +commit 4f4a1f990b02a99181ba4bbda12ff853f5b7c125 +Author: tianshujie +Date: Thu Nov 25 11:28:50 2021 +0800 + + * Modify the logic of changing branches in stories. + +commit 72863779bb6289731e8a24e63e062969678aadd6 +Author: tanghucheng +Date: Thu Nov 25 10:31:49 2021 +0800 + + * Code for project function getTeamMemberPairs. + +commit 4b7d519ac5ffddf9bcd1f0efe7dbacc6f4ac0e3d +Author: zenggang +Date: Thu Nov 25 02:30:53 2021 +0000 + + * Finish task#44801 + +commit 1d93fa0cd9ce745e3ca01a7aaef7e28ab308efed +Author: tianshujie +Date: Thu Nov 25 10:30:22 2021 +0800 + + * Modify the scope of the linked plan when creating and editing stories. + +commit 49bff6df49cad288e1d9af8018fc94c1e535bdc0 +Author: zhujinyong +Date: Thu Nov 25 10:26:17 2021 +0800 + + * Fix router of api. + +commit 9a80f35962aa001020c985b0d6a34b1dca4c2cf5 +Merge: a83f2d8ce9 57c6ae78a8 +Author: 王怡栋 +Date: Thu Nov 25 10:25:05 2021 +0800 + + Merge branch 'sprint/app10' + +commit f2187d662b7c2fe8b3f51994aacf0d83fa1dd794 +Author: zenggang +Date: Thu Nov 25 02:10:34 2021 +0000 + + * Finish task#44805 + +commit a83f2d8ce94a8cd2205cfce5bf09e58b0edf352d +Merge: fb8ff15c2a c2c13a9079 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 25 01:55:23 2021 +0000 + + Merge branch 'sprint/174_mayue_16605' into 'master' + + * Fix bug #16605. + + See merge request easycorp/zentaopms!613 + +commit c2c13a907945198e9a38d7680c77305c60796130 +Author: mayue +Date: Thu Nov 25 09:53:49 2021 +0800 + + * Fix bug #16605. + +commit 00d1e992f66f097bba94464cbde950487610d7aa +Author: liyuchun +Date: Thu Nov 25 09:47:07 2021 +0800 + + * Fix bug #44799. + +commit c40360d5569dd1863e0593e58012b512f467d71c +Author: mayue +Date: Thu Nov 25 09:43:34 2021 +0800 + + * Fix bug #16605. + +commit fb8ff15c2ac7cfd75ab945a8bdd7dec118c84aab +Merge: d589065650 d9ee0bfbf7 +Author: 王怡栋 +Date: Thu Nov 25 08:34:16 2021 +0800 + + Merge branch 'sprint/170_package_bug' + +commit d589065650fe1f9a6c476e75c68ed831b2c14cbd +Merge: 043850220e eec4c536f5 +Author: 王怡栋 +Date: Thu Nov 25 08:34:08 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d9ee0bfbf7e4bdc81d67cebbeb81a97822eee654 +Merge: 179e766478 eec4c536f5 +Author: 王怡栋 +Date: Thu Nov 25 00:32:52 2021 +0000 + + Merge branch 'master' into 'sprint/170_package_bug' + + # Conflicts: + # module/mr/model.php + +commit eec4c536f5aca9cdef323d57d69e7d20532a10fa +Merge: 74a41448dc 5b84227610 +Author: 王怡栋 +Date: Thu Nov 25 00:31:51 2021 +0000 + + Merge branch 'sprint/170' into 'master' + + Sprint/170 + + See merge request easycorp/zentaopms!611 + +commit b42d7e112970a121be252934a550d4a3c07d5089 +Author: liyuchun +Date: Wed Nov 24 17:30:48 2021 +0800 + + * Fix bug #16639,#16599. + +commit 9a614a1827366efacf2499b6be76cab2293f63e9 +Author: zenggang +Date: Wed Nov 24 09:25:20 2021 +0000 + + * Finish task#44797 + +commit 8742bd03141a13e6e98130a430d43e95075c6a36 +Author: tanghucheng +Date: Wed Nov 24 17:15:05 2021 +0800 + + * Code for project model function getTeamMemberPairs. + +commit 179e766478aebf0710e0e04cafadc47a1851c135 +Author: tianshujie +Date: Wed Nov 24 16:45:08 2021 +0800 + + * Modify function name. + +commit 66d1d59357fb841e16c95201607e8033fb97d3a6 +Merge: 2c0e949608 c5e7bd91c3 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 24 08:19:37 2021 +0000 + + Merge branch 'sprint/168_sgm_fixbug' into 'sprint/168' + + * Fix php 5.3 bug. + + See merge request easycorp/zentaopms!608 + +commit c5e7bd91c307e59ca6cbbca785f2b813c4f4ab57 +Author: 孙广明 +Date: Wed Nov 24 15:06:09 2021 +0800 + + * Fix php 5.3 bug. + +commit 57c6ae78a87e1c836688002aec619726dc5e4304 +Author: 王怡栋 +Date: Wed Nov 24 14:24:35 2021 +0800 + + * adjust for search. + +commit 9b13921ed4835f4eb943d2ffdde4b09a63600533 +Author: zenggang +Date: Wed Nov 24 06:13:04 2021 +0000 + + * Adjust code + +commit 2c0e94960888a442b420e2c58493632685206993 +Merge: 9a9f31d4ec 59172b420e +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 24 06:03:12 2021 +0000 + + Merge branch 'sprint/168_sgm_fixbug' into 'sprint/168' + + * Fix bug. + + See merge request easycorp/zentaopms!606 + +commit 59172b420e81ae8c08e587c1f9aac6b669d4d2ce +Author: 孙广明 +Date: Wed Nov 24 13:59:56 2021 +0800 + + * Fix project and product relation bug. + +commit 0913466eb736325c61a5100066b293ebc77dc7d9 +Author: Lwrless +Date: Wed Nov 24 13:17:53 2021 +0800 + + * update zentao extension for xuanxuan. + +commit 9a9f31d4ecf4f104e342e8e146fac7e20611f24c +Merge: cfde5172f3 b7a6b06a00 +Author: 孙广明 +Date: Wed Nov 24 05:20:11 2021 +0000 + + Merge branch 'sprint/168_liwenrui_update_xuanxuan_extension' into 'sprint/168' + + Update zentao-integrated xuanxuan extension. + + See merge request easycorp/zentaopms!607 + +commit b7a6b06a007d0b79a07f3e0bb7742cf1ae43c14d +Author: Lwrless +Date: Wed Nov 24 13:17:53 2021 +0800 + + * update zentao extension for xuanxuan. + +commit b956e21448cc1fc123c401ce7cd9bdf74c2b9dba +Author: 孙广明 +Date: Wed Nov 24 13:10:40 2021 +0800 + + * Fix bug. + +commit cfde5172f397d28fda30cfabaf027afb5b4e47ef +Merge: 40e772acea 2dc2c46737 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 24 05:03:12 2021 +0000 + + Merge branch 'sprint/168_sgm_fixbug' into 'sprint/168' + + * Fix bug #16703. + + See merge request easycorp/zentaopms!605 + +commit 40e772acead330899745b409707e4ae1d2b52943 +Merge: 052157902a 45556985f7 +Author: 朱金勇 +Date: Wed Nov 24 05:01:16 2021 +0000 + + Merge branch 'sprint/168_chaideqing_44636' into 'sprint/168' + + modify zentao bug/task/story card page's srollbar and actionbar + + See merge request easycorp/zentaopms!604 + +commit ba8ae82bbc910a4e68bf9c7f023357f3bc47e996 +Author: Guan Xiying +Date: Wed Nov 24 11:27:32 2021 +0800 + + * Fix links in tab nav of mr view page. + +commit 97d1a037dd2d26260351c7145b65fbe2440cd992 +Merge: 4e2cda3a82 2d168bf7e8 +Author: hufangzhou +Date: Wed Nov 24 11:26:46 2021 +0800 + + Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug + +commit 4e2cda3a82dd19a85f349bfa3ca598f9813d7932 +Author: hufangzhou +Date: Wed Nov 24 11:26:43 2021 +0800 + + * Fix an error for edit story. + +commit 45556985f72ef696ef72c4ca1b73f712f23bbc76 +Author: chaideqing +Date: Wed Nov 24 11:22:07 2021 +0800 + + * refactor ifelse code + +commit 2d168bf7e874716b99c165e27a203c3e18a09f6d +Author: zhengrunyu +Date: Wed Nov 24 11:00:03 2021 +0800 + + *Finish task 16602. + +commit 2dc2c46737efe02899d6247439eeb0737047bd90 +Author: 孙广明 +Date: Wed Nov 24 10:55:42 2021 +0800 + + * Fix bug #16703. + +commit 838c8c8efb2a0e64d86f34cc521ddae830b67274 +Merge: 7fc99d65fd c1792262cf +Author: songchenxuan +Date: Wed Nov 24 10:52:13 2021 +0800 + + Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170_package_bug + +commit c1792262cfa5a13725e5a6ca1e8cdb4b03dd0cd0 +Merge: cb78fa20e1 0c633c71d6 +Author: hufangzhou +Date: Wed Nov 24 10:51:57 2021 +0800 + + Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug + +commit cb78fa20e1e64f008b3796082f52ad3aed62ce04 +Author: hufangzhou +Date: Wed Nov 24 10:51:54 2021 +0800 + + * Modify the nav in edit story. + +commit 7fc99d65fddf28529c4eb4d23488f914a9568410 +Author: songchenxuan +Date: Wed Nov 24 10:51:49 2021 +0800 + + * Fix bug 16696. + +commit 70677f0673d43d2ef442c7c80aa8b54db0c0ff3f +Author: chaideqing +Date: Wed Nov 24 10:50:51 2021 +0800 + + modify zentao bug/task/story card page's srollbar and actionbar + +commit 0c633c71d6a1dd08a4d33412e14f4151791b4fb8 +Author: xieqiyu +Date: Wed Nov 24 10:22:12 2021 +0800 + + * Fix a bug:There is an error on the suite use case page. + +commit ccb9327c5a562d39ac53b0a8404eced8ca34115c +Author: xieqiyu +Date: Wed Nov 24 10:11:34 2021 +0800 + + * Fix bug#16565. + +commit 7d50d0bb9a857ca4fef815b0455b47f7a6154c39 +Merge: f15477ae01 501e80ddf2 +Author: hufangzhou +Date: Wed Nov 24 10:04:55 2021 +0800 + + Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug + +commit f15477ae017c7a543e2763081ef4a768b35eb7a5 +Author: hufangzhou +Date: Wed Nov 24 10:04:52 2021 +0800 + + * Fix an error of modules in product module for batch edit story. + +commit 501e80ddf295b673a35e534a995381b53debd82d +Author: xieqiyu +Date: Wed Nov 24 10:02:58 2021 +0800 + + * Fix bug#16606. + +commit fc0e55a41884539b9c46d1931d71772d1a2a5b67 +Author: songchenxuan +Date: Wed Nov 24 10:00:59 2021 +0800 + + * Fix bug #16656. + +commit c6e999ecdc14702323547d31492064ea16b7555a +Merge: 76392d18b4 77d7e7c440 +Author: hufangzhou +Date: Wed Nov 24 09:52:51 2021 +0800 + + Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug + +commit 76392d18b446a4ac704f6f3672d7e53d3a0e1f91 +Author: hufangzhou +Date: Wed Nov 24 09:52:49 2021 +0800 + + * Fix an error for batch edit story. + +commit 32a0795e8ed46bf2f6e3d83c448805e17e4352ac +Author: Guan Xiying +Date: Wed Nov 24 09:48:20 2021 +0800 + + * Adjust style of view mr page. + +commit 77d7e7c44080dafabaf2b3b0594dcf9d76589606 +Author: songchenxuan +Date: Wed Nov 24 09:41:39 2021 +0800 + + * Fix bug #16655,16656,16657. + +commit 3cbdfdcb6f04cbfac3b54531546958ad1c3b93fd +Merge: 6f4e21aed1 ea45481a2a +Author: hufangzhou +Date: Wed Nov 24 09:38:23 2021 +0800 + + Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug + +commit 6f4e21aed1c05c4e973e62702ae4a846ce5230d1 +Author: hufangzhou +Date: Wed Nov 24 09:38:21 2021 +0800 + + * Code for bug #16578. + +commit ea45481a2a78ef816906feee8cf00ab282c44809 +Author: songchenxuan +Date: Wed Nov 24 09:24:17 2021 +0800 + + * Fix bug #16654. + +commit 55b762b8b9310193bc0ab97a4ac9f7b94a777bba +Author: songchenxuan +Date: Wed Nov 24 09:09:06 2021 +0800 + + * Fix bug #16654. + +commit 1f2fa3e96d59be7b9cc047d147b17d65427206d5 +Author: Guan Xiying +Date: Tue Nov 23 20:16:59 2021 +0800 + + * Adjust style of mr view. + +commit 08c61e75ed70917732e464cf30964da87fe6d230 +Author: dingguodong +Date: Tue Nov 23 20:15:01 2021 +0800 + + * Adjust the page of view for MR module. + +commit bcb70c304eafb017b1b5c3201addb8fa9d595ee6 +Author: Guan Xiying +Date: Tue Nov 23 20:08:16 2021 +0800 + + * Adjust view header. + +commit 0d520d03d3626d31f14c433581416b5e29bf3d76 +Merge: 80010bb881 15867e4fd3 +Author: zhujinyong +Date: Tue Nov 23 19:47:10 2021 +0800 + + Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170_package_bug + +commit 80010bb88129011a2ed57b2982114f16f554898a +Author: zhujinyong +Date: Tue Nov 23 19:46:35 2021 +0800 + + * Adjust batchEdit of story. + +commit 7b9cefc2f9d2349a8e76ebc843b1571728d4a8d8 +Merge: cff47e6903 8d458a0a72 +Author: dingguodong +Date: Tue Nov 23 19:40:42 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit cff47e690328ffde9e0741c5d518510fae2afb84 +Author: dingguodong +Date: Tue Nov 23 19:40:15 2021 +0800 + + * Add overview to lang file of MR module. + +commit 5b84227610101c9f85c51afce8bf2269aeac5530 (origin/sprint/170) +Merge: 724d2ae39e ace43eb90d +Author: 朱金勇 +Date: Tue Nov 23 11:16:20 2021 +0000 + + Merge branch 'spring/170_xiawenlong' into 'sprint/170' + + * Fix code error + + See merge request easycorp/zentaopms!603 + +commit ace43eb90d89103242364ae55b6ac780098ca16c +Author: xiawenlong +Date: Tue Nov 23 19:11:03 2021 +0800 + + * Fix code error + +commit 8d458a0a725cced4b963486d7f02f19d51447d55 +Author: zenggang +Date: Tue Nov 23 11:08:15 2021 +0000 + + * Finish task#44404 + +commit 15867e4fd30487df3ccdadc3050d3ce1571548ef +Author: xieqiyu +Date: Tue Nov 23 19:03:20 2021 +0800 + + * Fix bug#16638. + +commit 75d5a0178341f429135a1cc0caceda060d8629f3 +Author: dingguodong +Date: Tue Nov 23 18:52:49 2021 +0800 + + * Adjust view page of MR module. + +commit 2b3df26fd87ec589bb2d6edda5bc69303e559690 +Author: zhouxin +Date: Tue Nov 23 18:47:56 2021 +0800 + + Fix bug 16564. + +commit 16873a81541be7554a5ab13a7705fb9fad8ed1f4 +Author: zhengrunyu +Date: Tue Nov 23 17:48:51 2021 +0800 + + *Finish task #16619. + +commit e4f00ca20ebbefdb8e706a2020a2350e9b4551c5 +Merge: d8d277842b 35bdfa9376 +Author: tianshujie +Date: Tue Nov 23 17:39:03 2021 +0800 + + Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug + +commit d8d277842b188edf5a864a2d3654342779991763 +Author: tianshujie +Date: Tue Nov 23 17:38:43 2021 +0800 + + * Fix bug #16549. + +commit 35bdfa93760fdca5737c952c0e7d61bdb5871fec +Author: xieqiyu +Date: Tue Nov 23 17:32:40 2021 +0800 + + * Fix bug#16565. + +commit 049ae60320d87743dce19dfddf3fb71c01b99519 +Author: songchenxuan +Date: Tue Nov 23 17:30:37 2021 +0800 + + * Fix bug #16642. + +commit 052157902aa62dd03cc5744d9156ecc19e1ddb94 (tag: zentaopms_16.0.alpha3_20211124) +Merge: e42559561e c6d990a3f5 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 23 09:13:54 2021 +0000 + + Merge branch 'sprint/168_sgm_fixbug' into 'sprint/168' + + * Fix bug #16530. + + See merge request easycorp/zentaopms!602 + +commit c6d990a3f50fbc53fd7d09d106a5946b56ae7c44 +Author: 孙广明 +Date: Tue Nov 23 16:26:30 2021 +0800 + + * Fix bug #16530. + +commit 6922251f397e3675e4549b465ab0813008e97726 +Author: songchenxuan +Date: Tue Nov 23 15:48:27 2021 +0800 + + * Fix bug 16596. + +commit 4f67ffed0573fe26592ca3be43087bf5514453f4 +Author: zhengrunyu +Date: Tue Nov 23 15:37:23 2021 +0800 + + *Fix bug #16547. + +commit ce4def01745035c3f395db3fdaa260c4e97ad258 +Merge: 9be4ee136f 288cdd6817 +Author: songchenxuan +Date: Tue Nov 23 15:36:17 2021 +0800 + + Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170_package_bug + +commit 9be4ee136fc7def081d6c4d65d3c07b180023373 +Author: songchenxuan +Date: Tue Nov 23 15:35:21 2021 +0800 + + * Fix bug #16560. + +commit 288cdd6817fef6a3ea351fe5bf2dd685f3a6f3a8 +Author: tianshujie +Date: Tue Nov 23 15:31:38 2021 +0800 + + * Fix bug #16628. + +commit 33e557cd18c833640376b91483d91ea6613b0bb9 +Author: tianshujie +Date: Tue Nov 23 15:07:07 2021 +0800 + + * Fix bug #16577. + +commit ec5ca42e49453e733fafb82981349b55abadb7e6 +Author: tianshujie +Date: Tue Nov 23 15:01:51 2021 +0800 + + * Fix bug #16577. + +commit 600e4fdbbabb153f6d9929c71cec7f003fd0ceaf +Author: tianshujie +Date: Tue Nov 23 14:45:20 2021 +0800 + + * Fix bug #16576,16576. + +commit 724d2ae39e9bef3c4ff3e39ce72ff91f6d91e802 +Author: zhujinyong +Date: Tue Nov 23 14:28:49 2021 +0800 + + * Format code style. + +commit 5ac4cfe9f9ae6c15e16c5fa2206813c187b1960a +Author: hufangzhou +Date: Tue Nov 23 14:13:44 2021 +0800 + + * Code for bug #16559. + +commit e42559561e3c70c8287cc30c6bea4ca4878749ff +Merge: 9d2bb37821 d396d4e6a9 +Author: 孙广明 +Date: Tue Nov 23 06:08:49 2021 +0000 + + Merge branch 'sprint/172_liyuchun_16518' into 'sprint/168' + + * Fix bug #16518. + + See merge request easycorp/zentaopms!588 + +commit d396d4e6a92dfa87cb702a6d8184f601b5454c59 +Author: liyuchun +Date: Tue Nov 23 14:05:43 2021 +0800 + + * Adjust code style. + +commit 11e5d04bf7a42232cb161736eca94a9982173353 (tag: zentaopms_app.1.0.beta11_20211124) +Author: 王怡栋 +Date: Tue Nov 23 13:47:12 2021 +0800 + + * fix bug #16439. + +commit fbcc390d81d5cdfa406b99d107c16c559606d78d +Author: hufangzhou +Date: Tue Nov 23 13:35:03 2021 +0800 + + * Code for bug #16580. + +commit c7d94a770eb0493681c5f0858c5f5df9375807ef +Author: 王怡栋 +Date: Tue Nov 23 11:21:02 2021 +0800 + + * add lang for mobile api. + +commit 4f50602fdaf9b22b4bceff3f4550baa14e027cc6 +Author: 王怡栋 +Date: Tue Nov 23 11:05:00 2021 +0800 + + * adjust for progress. + +commit 542adaa80ddcccebc249da5496aca3c6513eaecd +Merge: b0b410cb91 c8fd615b73 +Author: 朱金勇 +Date: Tue Nov 23 02:42:54 2021 +0000 + + Merge branch 'spring/170_xiawenlong' into 'sprint/170' + + * Fix create api doc Bug. + + See merge request easycorp/zentaopms!599 + +commit 043850220e5a67866124f6093301232d40cd5b25 +Author: 王怡栋 +Date: Tue Nov 23 10:42:07 2021 +0800 + + * adjust for progress. + +commit c0d4264148461c167ff86718bc3a339ea146b8fb +Author: hufangzhou +Date: Tue Nov 23 10:10:14 2021 +0800 + + * Fix bug #16564. + +commit c8fd615b73bd485f017f2da407721832042c59ab +Author: xiawenlong +Date: Tue Nov 23 09:36:02 2021 +0800 + + * Fix create api doc Bug. + +commit 74a41448dc4d3a0125309f7a071af6b6282ad4d5 +Author: 王怡栋 +Date: Tue Nov 23 09:35:16 2021 +0800 + + * add lang for mobile api. + +commit 984aa6b1e78c0e7b0b0882dff3af22a1a557ecce +Author: hufangzhou +Date: Tue Nov 23 09:27:08 2021 +0800 + + * Fix bug #16559. + +commit 9d2bb3782139356e23f525bb670428e4960df12c +Merge: 6b32de5910 ff1d07fdf1 +Author: 朱金勇 +Date: Mon Nov 22 09:40:44 2021 +0000 + + Merge branch 'sprint/168_sunhao/task44358' into 'sprint/168' + + * Task #44358, drop card immediately on mouse leave page. + + See merge request easycorp/zentaopms!598 + +commit ff1d07fdf1d692e3568e1b36960fb8fa999104a4 +Author: Hao Sun +Date: Mon Nov 22 17:13:41 2021 +0800 + + * task #44358, drop card immediately on mouse leave page. + +commit 90a913ca4be66e323d3d3f727678b54a19ee2e25 (tag: zentaopms_15.8_20211122) +Merge: d9c7eb75c1 b0b410cb91 +Author: 王怡栋 +Date: Mon Nov 22 16:59:40 2021 +0800 + + Merge branch 'sprint/170' + +commit b0b410cb91e0bb43b2ffff3199d575840903117a +Merge: c5c2a9f34a 578d51ce01 +Author: 王怡栋 +Date: Mon Nov 22 08:54:19 2021 +0000 + + Merge branch 'sprint/173_xieqiyu_16548' into 'sprint/170' + + * Fix bug#16548. + + See merge request easycorp/zentaopms!596 + +commit c5c2a9f34a36d26b49f1a7af24706aec29c59442 +Merge: 74185a47fe 6d03387d4b +Author: 王怡栋 +Date: Mon Nov 22 08:53:38 2021 +0000 + + Merge branch 'sprint/170_hufangzhou_package' into 'sprint/170' + + * Add the new version. + + See merge request easycorp/zentaopms!595 + +commit 578d51ce01bac07151d5127095a0417b032f07ff +Author: xieqiyu +Date: Mon Nov 22 16:49:06 2021 +0800 + + * Fix bug#16548. + +commit 6d03387d4b43f2f95d70cc77d587e5e531dc099d +Author: hufangzhou +Date: Mon Nov 22 16:48:28 2021 +0800 + + * Add the new version. + +commit 74185a47fe4c325097fc53bc2e8514d3596b9895 +Merge: 827a5a6529 e7578880a7 +Author: 孙广明 +Date: Mon Nov 22 08:35:58 2021 +0000 + + Merge branch 'sprint/173_xieqiyu_14507' into 'sprint/170' + + * Fix bug#16507. + + See merge request easycorp/zentaopms!594 + +commit e7578880a7e4c07b7b2de65b3954972640c69d0a +Author: xieqiyu +Date: Mon Nov 22 16:26:36 2021 +0800 + + * Fix bug#16507. + +commit 827a5a65299cc829905954f1aa83d70be16dabc8 +Merge: b5cc969e0a df71f8ff9e +Author: 王怡栋 +Date: Mon Nov 22 08:19:27 2021 +0000 + + Merge branch 'sprint/173_xieqiyu_16545' into 'sprint/170' + + * Fix bug#16545. + + See merge request easycorp/zentaopms!592 + +commit df71f8ff9ec9b359b504f42b15e041e62b02f99a +Author: xieqiyu +Date: Mon Nov 22 16:17:37 2021 +0800 + + * Fix bug#16545. + +commit b5cc969e0a1dcb037798ad345801b7899dd1f171 +Merge: 3d4cff75f7 1f47ec43c9 +Author: 王怡栋 +Date: Mon Nov 22 08:17:09 2021 +0000 + + Merge branch 'sprint/170_zhouxin_16468' into 'sprint/170' + + Fix bug 16468. + + See merge request easycorp/zentaopms!585 + +commit 6b32de5910efaf6908baf1b746629b2c55564827 +Merge: 4801bd8ea7 f5d89fee3d +Author: 王怡栋 +Date: Mon Nov 22 08:15:47 2021 +0000 + + Merge branch 'sprint/168_qixinzhi_44632' into 'sprint/168' + + * fix scroll bar css invalid after merge + + See merge request easycorp/zentaopms!582 + +commit 1f47ec43c9c783e7087c4187d823ecb4dd5ef257 +Author: zhouxin +Date: Mon Nov 22 16:15:37 2021 +0800 + + . + +commit 3d4cff75f74993f5f53c9e398ef8fc2197e69eca +Merge: a452521323 e0d73b8574 +Author: 王怡栋 +Date: Mon Nov 22 08:11:43 2021 +0000 + + Merge branch 'sprint/173_xieqiyu_fixbug' into 'sprint/170' + + * Fix bug#16542. + + See merge request easycorp/zentaopms!590 + +commit a45252132300af12a9a55217c9dd7104ec8ab04b +Merge: f45a268731 7802bc6a47 +Author: 王怡栋 +Date: Mon Nov 22 08:10:48 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16541' into 'sprint/170' + + * Fix bug #16541. + + See merge request easycorp/zentaopms!591 + +commit 7802bc6a47a79f7a359098e7555e92813f7277c6 +Author: tianshujie +Date: Mon Nov 22 16:01:31 2021 +0800 + + * Fix bug #16541. + +commit e0d73b85748e2c9f686bbd5b08870a1dd36af3c4 +Author: xieqiyu +Date: Mon Nov 22 15:59:41 2021 +0800 + + * Fix bug#16542. + +commit 1d2ce49b2433e5eec27d9147e375193af873347d +Author: zhouxin +Date: Mon Nov 22 15:58:14 2021 +0800 + + Add comment. + +commit 4801bd8ea749c858860d4d48803d5ccf61a7ce0d +Merge: 1016c9762c b011796c15 +Author: 朱金勇 +Date: Mon Nov 22 07:47:53 2021 +0000 + + Merge branch 'sprint/168_sunhao/client_integrated' into 'sprint/168' + + * task #44639, task #44637, support for using zentao apps in client left navbar. + + See merge request easycorp/zentaopms!581 + +commit f45a268731629389972f3dd9046a3ea7024340f6 +Merge: 68b6020d06 eca1559259 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 22 07:34:41 2021 +0000 + + Merge branch 'sprint/170_tianshujie_bug' into 'sprint/170' + + * Fix code error. + + See merge request easycorp/zentaopms!589 + +commit b011796c15104c85473fb55b0fef265b46b49bf9 +Author: Hao Sun +Date: Mon Nov 22 15:33:59 2021 +0800 + + * fix php syntax error. + +commit eca15592594da7efa748309f7669ac48f2a747e0 +Author: tianshujie +Date: Mon Nov 22 15:33:04 2021 +0800 + + * Fix code error. + +commit cf29cfdca7a42a1239ef5c20fd97dcaf7ba18e43 +Author: zhouxin +Date: Mon Nov 22 15:23:52 2021 +0800 + + Delete a kongge. + +commit 0e6e41d003f141b44589944c8e49fd69f2d604bb +Author: 王怡栋 +Date: Mon Nov 22 15:21:43 2021 +0800 + + * fix bug for get needconfirm case. + +commit 699204dc878784870c21b8a786041e90af5bb9d4 +Author: zenggang +Date: Mon Nov 22 07:20:48 2021 +0000 + + * Finish task#44395 + +commit 72f57c6f01ca444d5178a342a5820ef9a830df5a +Author: zhouxin +Date: Mon Nov 22 15:19:22 2021 +0800 + + Fix bug 16468. + +commit 68b6020d061f918a8d093e23bfba1fa6a77281cd +Merge: 87ab1ecc76 76bd965626 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 22 07:17:34 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16533' into 'sprint/170' + + * Fix bug #16533. + + See merge request easycorp/zentaopms!586 + +commit afafa08d92015c165dba991ba47986f810b8d0ca +Author: liyuchun +Date: Mon Nov 22 15:17:00 2021 +0800 + + * Fix bug #16518. + +commit 76bd965626014e4d66597eae33be187ba4e338d2 +Author: tianshujie +Date: Mon Nov 22 15:16:51 2021 +0800 + + * Modify the code. + +commit 87ab1ecc76ce6bffd2c37fd2ca5e975f59092b50 +Merge: 8221875b47 995ca51b88 +Author: 孙广明 +Date: Mon Nov 22 07:12:13 2021 +0000 + + Merge branch 'sprint/170_zhengrunyu_16529' into 'sprint/170' + + *Finish task #16529. + + See merge request easycorp/zentaopms!587 + +commit f6797fe2eac670f4ef181ea9ffaa133057ae639a +Author: tianshujie +Date: Mon Nov 22 15:11:20 2021 +0800 + + * Modify the code. + +commit 661965231916192538b91b554062505bff5a3ea7 +Author: Hao Sun +Date: Mon Nov 22 15:10:00 2021 +0800 + + * append special class to body in client mode. + +commit 995ca51b880539e57b7d11602989567aee5cdd2f +Author: zhengrunyu +Date: Mon Nov 22 15:06:52 2021 +0800 + + *Finish task #16529. + +commit a6246e8ad6d4c6feb4638b4745b84d284ed72c59 +Author: tianshujie +Date: Mon Nov 22 15:02:04 2021 +0800 + + * Fix bug #16533. + +commit 8221875b47368226d48f5bd7d546ab7cc0e1b0d5 +Merge: d3c2f014fe b924509817 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 22 06:55:26 2021 +0000 + + Merge branch 'sprint/170_hufangzhou_16512' into 'sprint/170' + + * Fix bug #16512. + + See merge request easycorp/zentaopms!580 + +commit b924509817266efc9835e3ae8bcf88e9df6f392c +Author: hufangzhou +Date: Mon Nov 22 14:52:20 2021 +0800 + + * Remove the unused code. + +commit 1016c9762cfca6d588a971d91e9a992d826bd092 +Merge: 11a320555c e43ea2001f +Author: 孙广明 +Date: Mon Nov 22 06:51:02 2021 +0000 + + Merge branch 'sprint/172_liyuchun_16523' into 'sprint/168' + + * Fix bug #16523. + + See merge request easycorp/zentaopms!568 + +commit 11a320555c77b6652a9b792776389bb029e4ddfa +Merge: c5751d1de2 5dc23ad4f2 +Author: 孙广明 +Date: Mon Nov 22 06:50:34 2021 +0000 + + Merge branch 'sprint/172_liyuchun_16384' into 'sprint/168' + + * Adjust execution button name. + + See merge request easycorp/zentaopms!578 + +commit 5dc23ad4f2366f035802caefd71a480fe8e0973c +Author: liyuchun +Date: Mon Nov 22 14:48:33 2021 +0800 + + * Adjust create bug view. + +commit 7ec2b004931997747cc136fd600b0d0ddaf9e0c5 +Author: zhouxin +Date: Mon Nov 22 14:48:19 2021 +0800 + + Fix bug 16468. + +commit 73aa790f646713adc3c75c57fa81ff97fef627fc +Author: 王怡栋 +Date: Mon Nov 22 14:45:09 2021 +0800 + + * remove files lib in api. + +commit f7b8fcd85f39bc4746349f287434d39b513d8392 +Author: Hao Sun +Date: Mon Nov 22 14:41:15 2021 +0800 + + * fix app menu not show in browser. + +commit d3c2f014fe4278b6d363ff318abad09796f6debf +Merge: 4436dab22c 1a9175f485 +Author: 孙广明 +Date: Mon Nov 22 06:41:02 2021 +0000 + + Merge branch 'sprint/170_zhengrunyu_16529' into 'sprint/170' + + *Finish task #16529. + + See merge request easycorp/zentaopms!584 + +commit 1a9175f485accf0c9a5cc620c590e6ffb8aad43a +Author: zhengrunyu +Date: Mon Nov 22 14:36:56 2021 +0800 + + *Finish task #16529. + +commit c5751d1de2647b514dea8fead3d6d35aa4428644 +Merge: 319e30a822 63bc9f80c4 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 22 06:36:09 2021 +0000 + + Merge branch 'sprint/168_hufangzhou_16509' into 'sprint/168' + + * Fix bug #16509. + + See merge request easycorp/zentaopms!583 + +commit 4436dab22c58e6a3ded7d8ea0bc094ba06369900 +Merge: 1cca1f44d6 8f1a017225 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 22 06:33:16 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16533' into 'sprint/170' + + * Fix bug #16533. + + See merge request easycorp/zentaopms!579 + +commit 5a92064d51495fab1575edd29d0b9c098a49bd1c +Author: Hao Sun +Date: Mon Nov 22 14:30:50 2021 +0800 + + * update zentao integrated extension. + +commit 23f78928dd827a6b234499c871b93872b2525914 +Author: tianshujie +Date: Mon Nov 22 14:28:13 2021 +0800 + + * Modify the code. + +commit 8f1a01722548c2fd1cf69604ac430da43512c6d9 +Author: tianshujie +Date: Mon Nov 22 14:14:17 2021 +0800 + + * Modify the code. + +commit 63bc9f80c4a75eff10b97bba51b624a8406cbd66 +Author: hufangzhou +Date: Mon Nov 22 14:11:13 2021 +0800 + + * Fix bug #16509. + +commit c2ac079bbbbea3f78e4211fb1ffb7513f98757d5 +Author: tianshujie +Date: Mon Nov 22 14:01:02 2021 +0800 + + * Modify the case module problem. + +commit dfe63ef1a61107cfb4d80647910ed0f1555ba00b +Author: liyuchun +Date: Mon Nov 22 14:00:53 2021 +0800 + + * Adjust style of create story. + +commit 4058eae2976d3ff979220cc5c2a498fb9ba84574 +Author: tianshujie +Date: Mon Nov 22 13:52:19 2021 +0800 + + * Change parameters. + +commit f5d89fee3de7abe5b5ab630d64dc0bfdcb7e6559 +Author: qixinzhi +Date: Mon Nov 22 13:51:27 2021 +0800 + + * fix scroll bar css invalid after merge + +commit 1cca1f44d6d6d030ffbf0a0de9bdc73de94f77c1 +Merge: 2ebe6c5dca 0047359ef6 +Author: 孙广明 +Date: Mon Nov 22 05:51:13 2021 +0000 + + Merge branch 'sprint/173_lizhiqiang_16536' into 'sprint/170' + + *Fix Bug #16536. + + See merge request easycorp/zentaopms!577 + +commit 5492d277983a604469b20ae76f8d46052ec09bd1 +Author: hufangzhou +Date: Mon Nov 22 13:46:02 2021 +0800 + + * Fix bug #16512. + +commit 69842996d6df444b2090df0ef41ecc79e7509c8a +Author: tianshujie +Date: Mon Nov 22 13:45:44 2021 +0800 + + * Fix bug #16533. + +commit 0047359ef616d70a5574cd6e821f474e56eee48d +Author: lizhiqiang +Date: Mon Nov 22 13:44:06 2021 +0800 + + *Fix Bug #16536. + +commit 5d6a255a733cc09763bb3806d7b00de1f808b28a +Author: Hao Sun +Date: Mon Nov 22 13:43:23 2021 +0800 + + * support for using zentao apps in client left navbar. + +commit 86867b5d4e017986719045f04730fc653e251942 +Author: lizhiqiang +Date: Mon Nov 22 13:37:38 2021 +0800 + + *Fix Bug #16532. + +commit da47c729d9a5c87ee04b34fed388de150e52cd4d +Author: liyuchun +Date: Mon Nov 22 13:36:52 2021 +0800 + + * Adjust execution button name. + +commit 2ebe6c5dcad01b6f7b4ad3294af9a48e9f5d9850 +Merge: d272f1e392 a6db2057d9 +Author: 孙广明 +Date: Mon Nov 22 05:16:01 2021 +0000 + + Merge branch 'sprint/170_zhengrunyu_16521' into 'sprint/170' + + *Finish task #16521. + + See merge request easycorp/zentaopms!576 + +commit d272f1e392f5576694b5cdcb7b064dce7b6e619a +Merge: 2e37a3b27c 0669e7385b +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 22 05:04:14 2021 +0000 + + Merge branch 'sprint/173_xieqiyu_16479' into 'sprint/170' + + * Fix bug#16479. + + See merge request easycorp/zentaopms!564 + +commit 0669e7385b2ffabd1a2345bba96bc55b6de1d550 +Author: xieqiyu +Date: Mon Nov 22 12:33:27 2021 +0800 + + * Fix bug#16519. + +commit 2e37a3b27cf87d99beef0cf84c9d2d3026974bc8 +Merge: 87a25ad686 318be4d78b +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 22 03:51:26 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_16508' into 'sprint/170' + + Sprint/170 songchenxuan 16508 + + See merge request easycorp/zentaopms!569 + +commit 87a25ad6867b0c76ea954e8906e6272754628878 +Merge: 89149f1ca9 90418ee41d +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 22 03:50:25 2021 +0000 + + Merge branch 'sprint/170_mayue_16405' into 'sprint/170' + + * Fix bug #16405. + + See merge request easycorp/zentaopms!574 + +commit 89149f1ca9608505763633e65e35965436ca0792 +Merge: 9c9203ca18 a1c59d2ca0 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 22 03:50:10 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16528' into 'sprint/170' + + * Fix bug #16528. + + See merge request easycorp/zentaopms!573 + +commit 9c9203ca18e89fd9a27ea65870b2d3da694d3f27 +Merge: a74768d5e6 b209b35a3b +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 22 03:49:35 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16514' into 'sprint/170' + + * Fix bug #16514. + + See merge request easycorp/zentaopms!570 + +commit a74768d5e65d3e4f92974f194a060f0a4df3fcd6 +Merge: 53efb2c9b1 7a743f5786 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 22 03:47:48 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16486' into 'sprint/170' + + * Fix bug #16486. + + See merge request easycorp/zentaopms!563 + +commit 53efb2c9b149e6d7d2ba099af4808255683fa26a +Merge: 8b1d4b430d c5de287171 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 22 03:47:14 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16502' into 'sprint/170' + + * Fix bug #16502. + + See merge request easycorp/zentaopms!562 + +commit 90418ee41d6ed6550e5d819b470f8062ea283262 +Author: mayue +Date: Mon Nov 22 11:30:00 2021 +0800 + + * Fix bug #16405. + +commit a1c59d2ca0a477d6fae46e3d52f7961d61ed5052 +Author: tianshujie +Date: Mon Nov 22 11:23:09 2021 +0800 + + * Fix bug #16528. + +commit 13ae5b4d9a3dffdee7c043e0a489ffc292ed5a9a +Author: xieqiyu +Date: Mon Nov 22 11:16:48 2021 +0800 + + * Code for task#44503. + +commit a6db2057d9d081ea5e1a6eef5cc931b0e6002771 +Author: zhengrunyu +Date: Mon Nov 22 11:12:15 2021 +0800 + + *Finish task #16521. + +commit b209b35a3b368ab1bea9ccd7228dfc0c661a4e0d +Author: tianshujie +Date: Mon Nov 22 11:06:08 2021 +0800 + + * Fix bug #16514. + +commit 318be4d78baa9ebf83740804a9b023a800bb99b6 +Author: songchenxuan +Date: Mon Nov 22 11:00:07 2021 +0800 + + * Fix bug 16508 + +commit ab5c52c902535014c16b3f8feeb7ccfcaaf9544c +Author: songchenxuan +Date: Mon Nov 22 10:59:11 2021 +0800 + + * Fix bug 16508 + +commit 2e677116d779cd74c0921bb50429ef6823483130 +Author: zenggang +Date: Mon Nov 22 02:57:11 2021 +0000 + + * Finish task#44399 + +commit e43ea2001f4b8e2977cf36e1eb1729c2756dfc89 +Author: liyuchun +Date: Mon Nov 22 10:44:00 2021 +0800 + + * Fix bug #16523. + +commit 8b1d4b430d57f64c3869c3e1ebb2cb3e7096bdca +Merge: 56417d12a0 293c0f12e2 +Author: 孙广明 +Date: Mon Nov 22 02:37:05 2021 +0000 + + Merge branch 'sprint/170_zhengrunyu_16507' into 'sprint/170' + + *Finish task #16507. + + See merge request easycorp/zentaopms!566 + +commit 319e30a8220d2a7f43484ec547269246fb63fa10 +Merge: bc262dd295 fb594d53f8 +Author: 孙广明 +Date: Mon Nov 22 02:36:53 2021 +0000 + + Merge branch 'sprint/172_liyuchun_16510' into 'sprint/168' + + Sprint/172 liyuchun 16510 + + See merge request easycorp/zentaopms!565 + +commit 293c0f12e2e0d41f0565067f91d71b7a2f88eaf3 +Author: zhengrunyu +Date: Mon Nov 22 10:33:00 2021 +0800 + + *Finish task #16507. + +commit bc262dd2953c6bd378e219cdd3ed3d2ac5730e74 +Merge: 11f2c39369 e477c580bf +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 22 02:31:29 2021 +0000 + + Merge branch 'sprint/168_liumengyi_16505' into 'sprint/168' + + * Fix Bug #16505. + + See merge request easycorp/zentaopms!567 + +commit e477c580bfc8063ba03ca7fd9ef699fbc17433a1 +Author: liumengyi +Date: Mon Nov 22 10:28:18 2021 +0800 + + * Fix Bug #16505. + +commit 43fab0b8d3fe7ac00161be4d2b770936d6938b95 +Author: zhengrunyu +Date: Mon Nov 22 10:27:12 2021 +0800 + + *Finish task #16507. + +commit 3836941efd65120adfe0eeb7b48bd8fb4f6d473b +Author: liumengyi +Date: Mon Nov 22 10:26:45 2021 +0800 + + * Fix Bug #16505. + +commit fb594d53f8e3748e4d524876525a4d1aa09afae9 +Author: liyuchun +Date: Mon Nov 22 10:23:52 2021 +0800 + + * Fix bug #16518. + +commit 98061fa481351548cf5ec7fcd28976e6bfc3b3dc +Author: liyuchun +Date: Mon Nov 22 10:15:03 2021 +0800 + + * Fix bug #16513. + +commit 48909fa19b5edd5c528a43b14f0ea82d5a57a8c3 +Author: liyuchun +Date: Mon Nov 22 10:06:49 2021 +0800 + + * Fix bug #16511. + +commit 83d49cb8d9ce62360d90bce9021123b1d41fa51a +Author: liyuchun +Date: Mon Nov 22 10:01:31 2021 +0800 + + * Fix bug #16510. + +commit 56417d12a08d0143053fa718f3b60704fda1c829 +Merge: e7606af189 8e7c536a8d +Author: zhujinyong +Date: Mon Nov 22 09:59:53 2021 +0800 + + Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 + +commit dee3dd3be012f2dcb470113d0d6adb59872ad0b9 +Author: xieqiyu +Date: Mon Nov 22 09:59:35 2021 +0800 + + * Restore code. + +commit e7606af189c0c3f5894803b9beccbf6878e08088 +Author: zhujinyong +Date: Mon Nov 22 09:59:21 2021 +0800 + + * Fix english language. + +commit 0d7c8a5e2d3972fc61e1885ecde9bee51f3597f5 +Author: zhujinyong +Date: Mon Nov 22 09:55:20 2021 +0800 + + * Add array type for params type. + +commit 55d9e9f7d13dfa278e97e5e7407e53b3ff0401df +Merge: a946e26bfc 11f2c39369 +Author: liyuchun +Date: Mon Nov 22 09:53:54 2021 +0800 + + Merge branch 'sprint/168' of https://gitlab.zcorp.cc/easycorp/zentaopms into 168 + +commit 7a743f5786f52bba09460b9fd69c1ca928a22887 +Author: tianshujie +Date: Mon Nov 22 09:51:19 2021 +0800 + + * Fix bug #16486. + +commit aae0921d2397737f22c6cd2f2859a45e625cb5b1 +Author: xieqiyu +Date: Mon Nov 22 09:47:35 2021 +0800 + + * Fix bug#16479. + +commit c5de2871714cdd7006109fd4b9e605c3592c5106 +Author: tianshujie +Date: Mon Nov 22 09:32:13 2021 +0800 + + * Fix bug #16502. + +commit 11f2c3936983e6ee84fa945f68177351c802b12b +Merge: 9bfa67680f f943413c6d +Author: 孙广明 +Date: Mon Nov 22 01:13:44 2021 +0000 + + Merge branch 'sprint/172_liyuchun_bug' into 'sprint/168' + + Sprint/172 liyuchun bug + + See merge request easycorp/zentaopms!561 + +commit f943413c6dc497ad1dac741eadf0d26cebeb0c7a +Author: liyuchun +Date: Mon Nov 22 09:12:08 2021 +0800 + + * Adjust style. + +commit 8e7c536a8d2acfd205d33af21b6a5f743e943de9 +Merge: da9dee64bc 46ac0a5e88 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 22 01:00:45 2021 +0000 + + Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170' + + Modify the branch scope when creating and editing bugs. + + See merge request easycorp/zentaopms!560 + +commit 46ac0a5e888a765b1361e235fcb1f1ae3bf8ede5 +Author: tianshujie +Date: Mon Nov 22 08:59:40 2021 +0800 + + * Modify the code. + +commit 9bfa67680f5bf82adf4674b5d9bf256dbc759ab4 +Merge: 3d89875eb0 68edb2f0a4 +Author: zhujinyong +Date: Mon Nov 22 08:56:02 2021 +0800 + + Merge branch 'sprint/168_chaideqing_44636' into sprint/168 + +commit da9dee64bc7c00bb2b641e7126de105683ae194e +Merge: 6b388c2d09 2fcb053765 +Author: 朱金勇 +Date: Mon Nov 22 00:55:22 2021 +0000 + + Merge branch 'sprint/170_liwenrui_xuan_integration' into 'sprint/170' + + * add owt settings, and remove useless group permissions, xuan task #43732. + + See merge request easycorp/zentaopms!387 + +commit 3d89875eb057472997c1825d1762b20072b1f824 +Merge: b5706189c3 5c6023a75e +Author: zhujinyong +Date: Mon Nov 22 08:53:58 2021 +0800 + + Merge branch 'sprint/168_chaideqing_44634' into sprint/168 + +commit b5706189c3fa81146317d60fa2bbd67178915f7f +Merge: 7ad0747fd6 36c7fc5a94 +Author: zhujinyong +Date: Mon Nov 22 08:51:49 2021 +0800 + + Merge branch 'sprint/168_chaideqing_44635' into sprint/168 + +commit 6b388c2d0975332bece2da4f43e436747e6b4a9d +Merge: df3ac3a37f c82113ab84 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 22 00:43:54 2021 +0000 + + Merge branch 'sprint/173_xieqiyu_fixbug' into 'sprint/170' + + Sprint/173 xieqiyu fixbug + + See merge request easycorp/zentaopms!559 + +commit 9502610eced3286b87e829cf30a6f2802a1c41e4 +Author: liyuchun +Date: Mon Nov 22 08:39:34 2021 +0800 + + * Fix error for task #44358. + +commit df3ac3a37f3c4b4da9fb1dcbd44030ec5875977e +Merge: c84f624f16 b98f417d97 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 22 00:32:37 2021 +0000 + + Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170' + + Modified language. + + See merge request easycorp/zentaopms!556 + +commit c84f624f1630c37c013609e9c1d336db5063e70e +Merge: c236f3b221 c1f2dfd857 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 22 00:31:40 2021 +0000 + + Merge branch 'sprint/170_hufangzhou_tree' into 'sprint/170' + + * Modify the module tree in project story. + + See merge request easycorp/zentaopms!558 + +commit 68edb2f0a45695f68602fb175cf6aaff9effecae +Merge: 7bfb998913 b3762e84aa +Author: 文睿 李 +Date: Mon Nov 22 00:23:57 2021 +0000 + + Merge branch 'sprint/168' into 'sprint/168_chaideqing_44636' + + # Conflicts: + # module/task/css/x.view.css + +commit 36c7fc5a94bc57ec95c9a2b922baaa1c51af9b87 +Merge: be154ba960 b3762e84aa +Author: 文睿 李 +Date: Mon Nov 22 00:23:13 2021 +0000 + + Merge branch 'sprint/168' into 'sprint/168_chaideqing_44635' + + # Conflicts: + # module/bug/css/x.view.css + +commit 5c6023a75e5967c769717bd86c927092d2541717 +Merge: 7f72b77b36 b3762e84aa +Author: 文睿 李 +Date: Mon Nov 22 00:21:55 2021 +0000 + + * resolve conflict, Merge branch 'sprint/168' into 'sprint/168_chaideqing_44634' + + # Conflicts Resolved: + # module/story/css/x.view.css + +commit a946e26bfc04598acc94fb4907ebdb8bd55d33da +Merge: d185d6db49 b3762e84aa +Author: liyuchun +Date: Mon Nov 22 08:16:01 2021 +0800 + + Merge branch 'sprint/168' of https://gitlab.zcorp.cc/easycorp/zentaopms into 168 + +commit b3762e84aa71943a8470d9686afb7c1674feb876 +Merge: 1e6832e7d6 e502f80728 +Author: 朱金勇 +Date: Mon Nov 22 00:14:33 2021 +0000 + + Merge branch 'sprint/168_qixinzhi_44632' into 'sprint/168' + + * beautify scroll bar for task/bug/story card + + See merge request easycorp/zentaopms!519 + +commit c236f3b2214ef6648e85f100500654e86c207291 +Merge: 5f8c33d682 01bfb0629e +Author: zhujinyong +Date: Mon Nov 22 08:11:01 2021 +0800 + + Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 + +commit 5f8c33d6824a4aa071bcb75cd4f5b754bf3ecc6b +Author: zhujinyong +Date: Mon Nov 22 08:10:05 2021 +0800 + + * Move chinese to $lang->api. + +commit c1f2dfd85715efbd014ecc76fba189e8bcaac33d +Author: hufangzhou +Date: Sun Nov 21 16:10:21 2021 +0800 + + * Modify the module tree in project story. + +commit c82113ab84dcf953d5dfaaaf07f2b557612f542d +Author: xieqiyu +Date: Sun Nov 21 11:33:43 2021 +0800 + + * Modify the drop-down range of versions when submitting tests. + +commit 0408f2f8ce8f972c99850ce82f9e08efdf8e6a34 +Author: tianshujie +Date: Sun Nov 21 10:46:35 2021 +0800 + + * Modify the execution scope of creating and editing bugs. + +commit fb6ce99d183ef020b0a19f9ad3be7d5e5fcc17f3 +Author: tianshujie +Date: Sun Nov 21 09:34:14 2021 +0800 + + * Fix bug #16490. + +commit 2a18aba808a17b4a0661dd26f21e6106e9b75e3d +Author: xieqiyu +Date: Sun Nov 21 03:38:48 2021 +0800 + + * Display branch when batch edit testcase. + +commit 856afd0b76ce1d4e4145517580bc987e43970cb3 +Author: xieqiyu +Date: Sun Nov 21 02:23:33 2021 +0800 + + * Fix bug#16471. + +commit d91735a9b286a80354c221904dbb293efafb8c32 +Author: xieqiyu +Date: Sun Nov 21 02:13:19 2021 +0800 + + * Fix bug#16465. + +commit 13a0788f374615919fbe6b9013a0a815b79f75b8 +Author: xieqiyu +Date: Sun Nov 21 02:06:38 2021 +0800 + + * Fix bug#16435. + +commit 1fe78e577125de78a7b43033a8ace4731412a910 +Author: xieqiyu +Date: Sun Nov 21 00:55:33 2021 +0800 + + * Fix bug#16489. + +commit 47a651b5993d9c28b55a83e32baaef94bedb08d5 +Author: tianshujie +Date: Fri Nov 19 19:21:34 2021 +0800 + + * Deal with the scope of the product when creating and editing bugs. + +commit 01bfb0629efbfdde5cf3f09b1dd360079a7c85c2 +Merge: d168cf83cb fa32609ca0 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 19 09:30:35 2021 +0000 + + Merge branch 'sprint/173_wangjianhua_44491' into 'sprint/170' + + * fix bugs #16477,#16485 produced by task 44491. + + See merge request easycorp/zentaopms!557 + +commit 2fcb053765fe7ce9a3af6aa498a0402a25d9a24d +Author: Lwrless +Date: Fri Nov 19 16:33:10 2021 +0800 + + * remove owt related stuff, moved to zentaobiz. + +commit fa32609ca09129d48ce43f774fe25d253aa040be +Author: wangjianhua +Date: Fri Nov 19 08:31:58 2021 +0000 + + * Fix bug #16477和#16485 + +commit 7c6a0b0e4e729af8ad409e4eec080904faf6346a +Author: zenggang +Date: Fri Nov 19 08:19:21 2021 +0000 + + * Finish task#44402 + +commit 7bfb9989137a80f1d1f9951ff390fd56dbcb89b1 +Author: chaideqing +Date: Fri Nov 19 16:14:47 2021 +0800 + + * refactor + +commit be154ba960fe2cd08f054bfdf5c943531116b1c7 +Author: chaideqing +Date: Fri Nov 19 16:12:10 2021 +0800 + + * refactor + +commit 7f72b77b3640a843a04cf21206a11cbe846a3aa3 +Author: chaideqing +Date: Fri Nov 19 16:01:00 2021 +0800 + + * refactor + +commit 4ec1fd0f4c3abeaac3a049bf13f54f0a053d7882 +Author: 王怡栋 +Date: Fri Nov 19 15:56:25 2021 +0800 + + * adjust for merge program children. + +commit c849afe0cd8da9b530dc1f1134fbb0e466f09fab +Author: 王怡栋 +Date: Fri Nov 19 15:55:13 2021 +0800 + + * code for task #44324. + +commit d168cf83cb92ad98922b83dbf5afec6b9726b464 +Merge: af1d122219 214f0a767e +Author: liyuchun +Date: Fri Nov 19 15:37:08 2021 +0800 + + Merge branch 'sprint/170_tianshujie_issue' into sprint/170 + +commit 214f0a767e2957b5a0463b013001a09f1f4c2d9e +Merge: 3d09288eca 51e7f68851 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 19 07:36:48 2021 +0000 + + Merge branch 'sprint/170' into 'sprint/170_tianshujie_issue' + + # Conflicts: + # module/testcase/control.php + # module/testcase/view/create.html.php + +commit 3d09288ecaa72f09f3f9bd738e73791292829ec3 +Author: tianshujie +Date: Fri Nov 19 15:33:19 2021 +0800 + + * Modify the code. + +commit b98f417d97da3b25d4f80580005fea0a6f5059bd +Author: zhouxin +Date: Fri Nov 19 15:32:45 2021 +0800 + + Delete a blank line. + +commit 02c028365bceecbdc1f98238573d6d7b20989bf6 +Author: zhouxin +Date: Fri Nov 19 15:27:52 2021 +0800 + + Modified language. + +commit 51e7f68851a5589f03e430efad9826f17f7621e7 +Merge: 94f44c39c8 2b258a7665 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 19 07:14:27 2021 +0000 + + Merge branch 'sprint/170_mayue_modify_style' into 'sprint/170' + + * Modify style. + + See merge request easycorp/zentaopms!555 + +commit d185d6db499b8ecaa917a32075d6dae62e51d9c0 +Author: liyuchun +Date: Fri Nov 19 15:13:34 2021 +0800 + + * Fix bug #16380,#16387. + +commit 2b258a7665978403020c4d960c88a000c7744391 +Author: mayue +Date: Fri Nov 19 15:11:07 2021 +0800 + + * Modify style. + +commit 9828fa18f04654aa14f94b8c8a731a55d313354f +Author: mayue +Date: Fri Nov 19 14:59:56 2021 +0800 + + * Modify style. + +commit 15ce4de1e4002c5fe12c7232d61df47770bd6dc1 +Author: zenggang +Date: Fri Nov 19 06:36:47 2021 +0000 + + * Finish task#44398 + +commit 1e6832e7d69d5febb33d220e855057c5e28eaab4 +Merge: 54816620c8 35915aa0de +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 19 06:28:40 2021 +0000 + + Merge branch 'sprint/168_hufangzhou_datatable' into 'sprint/168' + + * Update the datatable min.js and min.css file. + + See merge request easycorp/zentaopms!554 + +commit 35915aa0dee9e005949f9fff738f0a3031beaab6 +Author: hufangzhou +Date: Fri Nov 19 14:16:19 2021 +0800 + + * Update the datatable min.js and min.css file. + +commit 34df7f89950eb578904294085bda3abfa4ecd090 +Author: xiawenlong +Date: Fri Nov 19 13:54:55 2021 +0800 + + fix mr bug + +commit db6be58c1a4845849809faa837a61a40d283423d +Author: tianshujie +Date: Fri Nov 19 13:12:47 2021 +0800 + + * Modify batch create bug page. + +commit 54816620c8b8261a7ae044fd7e037a7237e0d56c +Merge: 0afa9524f9 8cde6c30d4 +Author: 孙广明 +Date: Fri Nov 19 05:01:47 2021 +0000 + + Merge branch 'sprint/172_liyuchun_44358' into 'sprint/168' + + * Finish task #44357,#44358. + + See merge request easycorp/zentaopms!553 + +commit 0afa9524f9826106d64389fef9753a8b939e72df +Merge: e1a10d9333 7ed253e111 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 19 04:30:31 2021 +0000 + + Merge branch 'sprint/172_sgm_44349' into 'sprint/168' + + * Finish task #44349. + + See merge request easycorp/zentaopms!551 + +commit 8cde6c30d4cc6acd39ee97a0b8bf12f14a104e7c +Author: liyuchun +Date: Fri Nov 19 12:26:23 2021 +0800 + + * Finish task #44357,#44358. + +commit 256c76c0b840c2c6503576750cb8fa1dbf8a1981 +Author: tianshujie +Date: Fri Nov 19 11:40:58 2021 +0800 + + * Modify code logic. + +commit 53a34f154606e24bedc301b201900ca9f6b7381f +Author: tianshujie +Date: Fri Nov 19 11:27:36 2021 +0800 + + * Modify the code. + +commit 85eb8670e7426db5f00cf74d25df804668a62973 +Author: xiawenlong +Date: Fri Nov 19 11:11:30 2021 +0800 + + * Fix sql proplem. + +commit 7ed253e111916e37e1d7676d8e0cd7190c190466 +Author: 孙广明 +Date: Fri Nov 19 11:08:04 2021 +0800 + + * Finish task #44349. + +commit 7dbcf304d19f0d5be2fb6f8dc4fa387a40639c4c +Author: 王怡栋 +Date: Fri Nov 19 11:04:30 2021 +0800 + + * code for task #44334. + +commit 3045b1a234b5ece06b5371bdb55ff9d9c76b6cad +Author: tianshujie +Date: Fri Nov 19 10:54:18 2021 +0800 + + * Fix the scope of the products listed in the edit case. + +commit e1a10d93333f574024594014b605b58f0a19d38e +Merge: c546e57c62 4ffbc120a0 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 19 02:47:57 2021 +0000 + + Merge branch 'sprint/168_liumengyi_16467' into 'sprint/168' + + * Fix bug #16467. + + See merge request easycorp/zentaopms!547 + +commit 94f44c39c802eabd1d4eb1d6d4ba41aba69f51ec +Merge: 8ffbccc050 8b3198bb0a +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 19 02:47:45 2021 +0000 + + Merge branch 'sprint/173_xieqiyu_fixbug' into 'sprint/170' + + * Fix an error for batch run testcase. + + See merge request easycorp/zentaopms!549 + +commit 55e85f39acac573f62fdec5b834cb08617775e7d +Author: chaideqing +Date: Fri Nov 19 10:44:01 2021 +0800 + + * task #44634, optimize story card in xuanxuan + +commit 8b3198bb0a01202dadb158ae2c9bc1c705fdd170 +Author: xieqiyu +Date: Fri Nov 19 10:39:38 2021 +0800 + + * Fix an error for batch run testcase. + +commit 8ffbccc050007fda1de6107bbb10b881eead41e9 +Merge: af1d122219 0a351a6280 +Author: 孙广明 +Date: Fri Nov 19 02:36:47 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_16411' into 'sprint/170' + + * Fix bug 16411. + + See merge request easycorp/zentaopms!546 + +commit e0f2e88048be7d2bee45caf34cf59b8ce11aa1f1 +Author: 王怡栋 +Date: Fri Nov 19 10:34:50 2021 +0800 + + * code for task #44323. + +commit 0a351a62808f8194f9187fc6af04f612542d0797 +Author: songchenxuan +Date: Fri Nov 19 10:32:37 2021 +0800 + + * Fix bug 16411. + +commit af1d122219cf231c08b674441ea51b0dceecd7c0 +Merge: 8fa3ad39c1 7e24f57dad +Author: liyuchun +Date: Fri Nov 19 10:25:27 2021 +0800 + + Merge branch 'sprint/170_songchenxuan_16417' into sprint/170 + +commit 7e24f57dad6fbb1bde5c01e4833c1a09223e42a0 +Merge: 269633eb6d ee477c808b +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 19 02:25:07 2021 +0000 + + Merge branch 'sprint/170' into 'sprint/170_songchenxuan_16417' + + # Conflicts: + # module/testcase/control.php + +commit 269633eb6dadf43875789d95a75c073e0a7d030f +Author: songchenxuan +Date: Fri Nov 19 10:23:44 2021 +0800 + + * Fix bug 16417. + +commit 029c0e4dca94ee72e03633916a0a7ea9e82d7ce9 +Author: songchenxuan +Date: Fri Nov 19 10:20:58 2021 +0800 + + * Fix bug 16411 + +commit 4f5308aefacbf7d3a30a06777f4aea690ad372de +Author: 王怡栋 +Date: Fri Nov 19 10:17:59 2021 +0800 + + * code for task #44320. + +commit 4ffbc120a07c6e8fdee9ddbf2f5f68a8a6c16f2b +Author: liumengyi +Date: Fri Nov 19 10:14:47 2021 +0800 + + * Fix bug #16467. + +commit c546e57c62d78d17ab6302cc1e65fe8fc12ba329 +Merge: 24d18f9c01 c38383ad40 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 19 02:14:19 2021 +0000 + + Merge branch 'sprint/168_liumengyi_16467' into 'sprint/168' + + * Fix bug #16467. + + See merge request easycorp/zentaopms!545 + +commit 71a2ba3f3da1a7827f136a348ca7e99f15726b36 +Author: songchenxuan +Date: Fri Nov 19 10:11:37 2021 +0800 + + * Fix bug 16411. + +commit c38383ad409d208a3ab0f953134da7f2526ad1be +Author: liumengyi +Date: Fri Nov 19 10:08:40 2021 +0800 + + * Fix bug #16467. + +commit 5d7ae6a71baed4c7da0c00a0cb690223f110338c +Author: liumengyi +Date: Fri Nov 19 10:06:56 2021 +0800 + + * Fix bug #16467. + +commit e792607430dbf2efc1713d71cbecfb6a21106f08 +Author: chaideqing +Date: Fri Nov 19 10:04:30 2021 +0800 + + * task #44635, optimize bug card in xuanxuan + +commit ee477c808b89570cb7476f8d70ae49fcfe8c5123 +Merge: 08496ebe70 926e2e853d +Author: 孙广明 +Date: Fri Nov 19 02:02:47 2021 +0000 + + Merge branch 'sprint/170_mayue_16407' into 'sprint/170' + + * Fix bug #16407. + + See merge request easycorp/zentaopms!543 + +commit 926e2e853df876fa1977dcaee53373025b7f9eda +Author: mayue +Date: Fri Nov 19 09:59:01 2021 +0800 + + * Fix bug #16407. + +commit 08496ebe702c4a9b3ca99770057ab2d994b22479 +Merge: 098a6e7a6a b959253bdf +Author: 孙广明 +Date: Fri Nov 19 01:53:45 2021 +0000 + + Merge branch 'sprint/170_zhengrunyu_BUG_16368' into 'sprint/170' + + *Finish task #16368. + + See merge request easycorp/zentaopms!541 + +commit b959253bdf177d5dd876645c2fa52ae9ea13990e +Author: zhengrunyu +Date: Fri Nov 19 09:48:57 2021 +0800 + + *Finish task #16368. + +commit c36c339848ab8c25c5e4a4911e57f034b182c560 +Author: chaideqing +Date: Fri Nov 19 09:45:06 2021 +0800 + + * task #44636, optimize task card in xuanxuan + +commit 098a6e7a6a4eb2b5837654e0294539d50234eaf9 +Merge: ae766460bc 1e6f05b4c8 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 19 01:42:11 2021 +0000 + + Merge branch 'sprint/170_mayue_16454' into 'sprint/170' + + * Fix bug #16454. + + See merge request easycorp/zentaopms!539 + +commit ae766460bca4b5b14f463fb6d821a1bfcef80892 +Merge: 9143b15390 90e6d5d315 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 19 01:41:32 2021 +0000 + + Merge branch 'sprint/170_mayue_16455' into 'sprint/170' + + * Fix bug #16455. + + See merge request easycorp/zentaopms!540 + +commit b4757126904999e143f5a41ae1dfb9c86de8056a +Author: 王怡栋 +Date: Fri Nov 19 09:41:18 2021 +0800 + + * code for task #44322. + +commit 90e6d5d31556c61205ccc6a3d0681791deb9a882 +Author: mayue +Date: Fri Nov 19 09:37:32 2021 +0800 + + * Fix bug #16455. + +commit d0e8e7c34ff3fa4d622cdd3aec0158bae5269c75 +Merge: 1a5809ae20 95e04b9bf0 +Author: xiawenlong +Date: Fri Nov 19 09:34:16 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit 1a5809ae20ba8d7f3ef50b7e4a70061502adee66 +Author: xiawenlong +Date: Fri Nov 19 09:33:51 2021 +0800 + + * Revert gitlab model. + +commit f033e379243afab98910dc52ee138cceea92ccb2 +Author: tianshujie +Date: Fri Nov 19 09:32:00 2021 +0800 + + * Modify the product range of a single creation use case. + +commit 1e6f05b4c8d814e90f112393527b96d68686a1d7 +Author: mayue +Date: Fri Nov 19 09:25:33 2021 +0800 + + * Fix bug #16454. + +commit 5afccaf4172a5cd414d18411466df56dd8624d79 +Author: 王怡栋 +Date: Fri Nov 19 09:22:02 2021 +0800 + + * code for task #44314. + +commit eb63a1788588954763966a5098d1ed46e1c17d9e +Author: 王怡栋 +Date: Fri Nov 19 09:08:03 2021 +0800 + + * code for task #44313. + +commit 5e49c845e6ee0eb63ac0348ab1a50a96830a628a +Author: songchenxuan +Date: Fri Nov 19 09:02:21 2021 +0800 + + * Fix bug 16417 + +commit 24d18f9c0114d0b46f5d0d52b2b7d5e104facffa +Merge: 275404e672 a240c9aa23 +Author: 孙广明 +Date: Fri Nov 19 00:58:44 2021 +0000 + + Merge branch 'sprint/172_liyuchun_bug' into 'sprint/168' + + Sprint/172 liyuchun bug + + See merge request easycorp/zentaopms!535 + +commit 9143b15390c6cc3a2167f5107d39a0f9ee9ee971 +Merge: b9d2f3783e 8112a6e985 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 19 00:54:51 2021 +0000 + + Merge branch 'sprint/173_xieqiyu_fixbug' into 'sprint/170' + + * Fix bug: add loadLang. + + See merge request easycorp/zentaopms!537 + +commit b9d2f3783ecf53246ccb33b3bc0148d2ee17399d +Merge: fde5cb61da 70f8e0d320 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 19 00:47:09 2021 +0000 + + Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170' + + * Fix execution and project linked product prompt issues. + + See merge request easycorp/zentaopms!536 + +commit 8112a6e9858ce9054024aea298975b7bfcab87a0 +Author: xieqiyu +Date: Fri Nov 19 08:45:26 2021 +0800 + + * Fix bug: add loadLang. + +commit 70f8e0d3206699cc1a1b2b5828fc9b799c4d75ce +Author: tianshujie +Date: Fri Nov 19 08:44:53 2021 +0800 + + * Fix execution and project linked product prompt issues. + +commit 39b22de67baa12b3b4b85e418d3b97290bdf244a +Merge: 0ee281b800 fde5cb61da +Author: zhujinyong +Date: Fri Nov 19 08:42:40 2021 +0800 + + Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 + +commit fde5cb61da39db8c170a1f20be5997ab0529d40f +Merge: 68d5d5e903 adc2aa1c9b +Author: 王怡栋 +Date: Fri Nov 19 08:41:00 2021 +0800 + + Merge branch 'sprint/app10' into sprint/170 + +commit 275404e6721e571158c0a751ac1952cd1275e427 +Merge: 6feb9a878b 5705ff994f +Author: 孙广明 +Date: Fri Nov 19 00:40:37 2021 +0000 + + Merge branch 'sprint/172_liyuchun_45368' into 'sprint/168' + + * Finish task #44368. + + See merge request easycorp/zentaopms!533 + +commit 68d5d5e9036836c5571175fd899ebb45745f4e37 +Merge: 92b7515069 4a07c2324f +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 19 00:35:13 2021 +0000 + + Merge branch 'sprint/170_hufangzhou_16385' into 'sprint/170' + + * Fix bug #16385 and fix an error. + + See merge request easycorp/zentaopms!534 + +commit 92b751506981ad64c5bd75ce011bd52cb267ff6a +Merge: 40b0b05a3e b8783ecd5c +Author: 孙广明 +Date: Fri Nov 19 00:33:29 2021 +0000 + + Merge branch 'sprint/170_zhouxin_16408' into 'sprint/170' + + Fix bug 16408. + + See merge request easycorp/zentaopms!526 + +commit a240c9aa231d2a9aa52142d7c5358a12395b5ec0 +Author: liyuchun <563917701@qq.com> +Date: Thu Nov 18 23:17:15 2021 +0800 + + * Fix bug #16426,#16393. + +commit d188fbd7b8e5f133bc3a7cc8a20dc8ec056485e5 +Author: liyuchun <563917701@qq.com> +Date: Thu Nov 18 22:54:48 2021 +0800 + + * Fix bug #16389,#16387. + +commit 8980685d6b6a4f9c2230c78dd9dc203b925eadc7 +Merge: 78d36ea739 6feb9a878b +Author: liyuchun <563917701@qq.com> +Date: Thu Nov 18 21:56:48 2021 +0800 + + Merge branch 'sprint/168' of https://gitlab.zcorp.cc/easycorp/zentaopms into 168 + +commit 4a07c2324f8fe030f27f359f0906737f2e487eda +Author: hufangzhou +Date: Thu Nov 18 21:41:48 2021 +0800 + + * Fix bug #16385 and fix an error. + +commit 95e04b9bf04dd3a2cba69522473c3a4c1c2d447a +Author: zenggang +Date: Thu Nov 18 10:27:39 2021 +0000 + + * Finish task#44397 + +commit 40b0b05a3e529eb6177ed0ef5dc3e3689443449c +Merge: dc8dc55534 1d9fc9d476 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 09:33:43 2021 +0000 + + Merge branch 'sprint/170_mayue_16407' into 'sprint/170' + + * Fix bug #16407. + + See merge request easycorp/zentaopms!525 + +commit b8783ecd5c26dbf649a44e1569e2e2ae28449e26 +Author: zhouxin +Date: Thu Nov 18 17:32:02 2021 +0800 + + Fix bug 16408. + +commit 6feb9a878b852a181ee131023794688d5108346b +Merge: 683b082095 c2b944d7e9 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 09:30:27 2021 +0000 + + Merge branch 'sprint/168_sunhao/improve_product_list' into 'sprint/168' + + * Task #44364, improve UI for page product/all. + + See merge request easycorp/zentaopms!531 + +commit dc8dc55534e822a18c822c541b5179c62bfb6961 +Merge: 8a1ab522bd bff4aebfd4 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 09:29:29 2021 +0000 + + Merge branch 'sprint/170_mayue_16406' into 'sprint/170' + + * Fix bug #16406. + + See merge request easycorp/zentaopms!528 + +commit 1d9fc9d47612b993f7ac9fd503caa328c2b9eb18 +Author: mayue +Date: Thu Nov 18 17:26:27 2021 +0800 + + * Fix bug #16407. + +commit 8a1ab522bdf5432cc6a51393090b56e0d6dfb242 +Merge: ba8ec26e96 1e57264ff4 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 09:24:07 2021 +0000 + + Merge branch 'sprint/173_wangjianhua_44491' into 'sprint/170' + + Finish task 44491. Load branch lang before using. + + See merge request easycorp/zentaopms!532 + +commit bff4aebfd443867fefe20e6dcb5065d10ec1554a +Author: mayue +Date: Thu Nov 18 17:24:00 2021 +0800 + + * Fix bug #16406. + +commit 683b0820955dc300a5cad9df598333a8b196a9d3 +Merge: 6d3d9d94e1 13d5803ce1 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 09:23:47 2021 +0000 + + Merge branch 'sprint/168_sunhao/task44357' into 'sprint/168' + + * Task #44357, refactor executions kanban with kanban component and support dnd. + + See merge request easycorp/zentaopms!497 + +commit ba8ec26e9607bdaec340e313b16de894c19567c3 +Merge: 7c9add376d 88938892b0 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 09:21:25 2021 +0000 + + Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170' + + Add realBegan for program. + + See merge request easycorp/zentaopms!529 + +commit 7c9add376dc2138992bb3edc64b270fc51bdbf46 +Merge: 36e39591be f92a67b62a +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 09:20:35 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_16376' into 'sprint/170' + + Sprint/170 songchenxuan 16376 + + See merge request easycorp/zentaopms!530 + +commit 6d3d9d94e14f39987ab61f784019e7a481694cc9 +Merge: c71f84f5ef 8c15de95c5 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 09:19:45 2021 +0000 + + Merge branch 'sprint/168_tengfei_16386' into 'sprint/168' + + * Edit lang for feedbackby. + + See merge request easycorp/zentaopms!522 + +commit 36e39591be66eb75aa5758c9486c6624c2371873 +Merge: 640eb3a48b e011da6fd2 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 09:19:19 2021 +0000 + + Merge branch 'sprint/173_wangjianhua_44503' into 'sprint/170' + + * finish task 44503 + + See merge request easycorp/zentaopms!516 + +commit 1e57264ff4580e9f8fd8cd2087165bac98a6717a +Author: wangjianhua +Date: Thu Nov 18 09:16:07 2021 +0000 + + * finish task 44491. Load branch lang before using. + +commit adc2aa1c9b8500f0d1f1846751da999a9d6be1f1 +Author: 王怡栋 +Date: Thu Nov 18 17:10:01 2021 +0800 + + * code for task #44312. + +commit f92a67b62a6ebf656c1668b6e718fadbe46fe21e +Author: songchenxuan +Date: Thu Nov 18 17:09:42 2021 +0800 + + * Fix bug 16376 + +commit c2b944d7e9ae3e6cfdccc72e93ca2379d0aa05b4 +Author: Hao Sun +Date: Thu Nov 18 17:08:02 2021 +0800 + + * adjust table layout for english environment. + +commit 8fc68675234444da9c25b24be76e9734a478a341 +Author: xiawenlong +Date: Thu Nov 18 17:07:09 2021 +0800 + + * Add gitlab projects orderby + +commit 1f9f382aa0506cd7a731d71f8bd9bf55ed933c65 +Author: songchenxuan +Date: Thu Nov 18 17:06:44 2021 +0800 + + * Fix bug 16376 + +commit e011da6fd2d3c4d0e24d554ac28e210619fe285c +Author: wangjianhua +Date: Thu Nov 18 09:02:45 2021 +0000 + + - Finish task 44503. Remove usless variable. + +commit 640eb3a48bf7b4aad0cd377b7974f730c49899c5 +Merge: 936f56e325 9c6c4dfc9c +Author: 孙广明 +Date: Thu Nov 18 08:57:25 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16429' into 'sprint/170' + + * Fix bug #16429. + + See merge request easycorp/zentaopms!527 + +commit 084dc50d15039be51b6424e1b86ea921bf66aa64 +Author: 王怡栋 +Date: Thu Nov 18 16:57:21 2021 +0800 + + * convert to array. + +commit fa3fa5d9ca200a7d0b48d19923ffad2882b0cf5f +Author: 王怡栋 +Date: Thu Nov 18 16:54:42 2021 +0800 + + * fix for program progress. + +commit 88938892b057e3bd9b59c8590c25a7ef55029ed9 +Author: zhouxin +Date: Thu Nov 18 16:49:11 2021 +0800 + + Add realBegan for program. + +commit 936f56e325ad3d7c9d4bdd23ce94ee60df2698b2 +Merge: 644abad1fb dcb971c040 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 08:47:29 2021 +0000 + + Merge branch 'sprint/173_wangjianhua_44491' into 'sprint/170' + + * finish task 44491 + + See merge request easycorp/zentaopms!505 + +commit 8b7f4096450149cbab57853b5d7279adf7f297da +Author: 马跃 +Date: Thu Nov 18 08:45:20 2021 +0000 + + Update control.php + +commit 759533f592ba2d1a48cda4a1c9a2d2ee5adeb0c2 +Author: Hao Sun +Date: Thu Nov 18 16:45:11 2021 +0800 + + * task #44364, improve layout for page product/all. + +commit 3a48a570472e5444cfd0382749fdf39a383017af +Author: mayue +Date: Thu Nov 18 16:42:27 2021 +0800 + + * Fix bug #16406. + +commit 5dd63cd0212e4d54d0e353153b7e39cb0d2ec2a0 +Author: 王怡栋 +Date: Thu Nov 18 16:31:27 2021 +0800 + + * fix doclibs order and fix loadModule testcase. + +commit 9c6c4dfc9cac69780b3e9dd9be42816ac95e22f5 +Author: tianshujie +Date: Thu Nov 18 16:30:45 2021 +0800 + + * Fix bug #16429. + +commit d03b905ffdfb6a4e2defb3c3bb59254c082d60d7 +Author: mayue +Date: Thu Nov 18 16:30:07 2021 +0800 + + * Fix bug #16407. + +commit e55bc34ee61363632af5b42454f171d3c3d64ba4 +Author: zhouxin +Date: Thu Nov 18 16:26:29 2021 +0800 + + Fix bug 16408. + +commit 5705ff994f6c4b91d8423bef905d558f7eabff39 +Author: liyuchun +Date: Thu Nov 18 16:25:33 2021 +0800 + + * Finish task #44368. + +commit 4431f52f1e1c14321a7f200effa78c654efddf71 +Author: xiawenlong +Date: Thu Nov 18 16:25:17 2021 +0800 + + * Add gitlab browse title + +commit 940e79bf1f84c034135201eaf1bb339026f608c9 +Author: mayue +Date: Thu Nov 18 16:08:28 2021 +0800 + + * Fix bug #16406. + +commit c71f84f5efbf14f979fcdce1fd919f99a721bc84 +Merge: 35109f495b 64015056ae +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 08:06:24 2021 +0000 + + Merge branch 'sprint/168_liumengyi_16390' into 'sprint/168' + + * Fix bug #16447. + + See merge request easycorp/zentaopms!524 + +commit 8bf4523777c3c3548aa07a2eccdc08ae03eec981 +Author: mayue +Date: Thu Nov 18 16:03:19 2021 +0800 + + * Fix bug #16407. + +commit 27bd5770b129cc36970898fbcdc110a2ef50fdb0 +Author: 王怡栋 +Date: Thu Nov 18 16:03:06 2021 +0800 + + * code for task #44332. + +commit 64015056ae492635cf44959567edcea7817fa028 +Author: liumengyi +Date: Thu Nov 18 16:02:38 2021 +0800 + + * Fix bug #16447. + +commit 75b387619369e640331e9eaa736ce35114830988 +Author: 王怡栋 +Date: Thu Nov 18 15:47:54 2021 +0800 + + * adjust for bug changed status. + +commit 35109f495b91586556c6e7253b3158b61cc6e3b1 +Merge: a913818493 3e3047843d +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 07:41:18 2021 +0000 + + Merge branch 'sprint/168_liumengyi_16390' into 'sprint/168' + + * Fix bug #16388. + + See merge request easycorp/zentaopms!521 + +commit 3e3047843d19ffc2e2e4b315d26253fac013a69c +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 07:41:06 2021 +0000 + + Update control.php + +commit 0e3f80d6d5a60e27c9548dad7d406224fc4f43ea +Author: liumengyi +Date: Thu Nov 18 15:39:34 2021 +0800 + + * Fix bug #16388. + +commit 644abad1fba37d09686d660bff4bb35fe804f9d0 +Merge: 3f52d7ce47 662a1960f5 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 07:37:37 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16431' into 'sprint/170' + + * Fix bug #16431. + + See merge request easycorp/zentaopms!523 + +commit 662a1960f5025ec1c7a473cb9310d9c2b5c0fe9f +Author: tianshujie +Date: Thu Nov 18 15:35:54 2021 +0800 + + * Fix bug #16431. + +commit c7081db530b1a0e6a1d2ea130e438d300edb42bf +Author: xiawenlong +Date: Thu Nov 18 15:31:26 2021 +0800 + + * Finish task 29162,29163 + +commit 499d35fe4cb570834809d2592bd85893c8d4f1ca +Author: liumengyi +Date: Thu Nov 18 15:29:58 2021 +0800 + + * Fix bug #16388. + +commit 3f52d7ce47d659e095282930e21ea2bc9b04d9e4 +Merge: af6d5e4ca0 039784e212 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 07:26:45 2021 +0000 + + Merge branch 'sprint/170_mayue_code_error' into 'sprint/170' + + * Fix code error. + + See merge request easycorp/zentaopms!520 + +commit 039784e21228cc72e80dd29ddef47271d4ce9767 +Author: mayue +Date: Thu Nov 18 15:24:15 2021 +0800 + + * Fix code error. + +commit 8c15de95c529b59bcc2a0fd819924211bc2416e5 +Author: reneeteng +Date: Thu Nov 18 15:21:56 2021 +0800 + + * Edit lang for feedbackby. + +commit 2a3c7922aba6f04944eb880f3ed2cb360347b4ac +Author: Hao Sun +Date: Thu Nov 18 15:21:55 2021 +0800 + + * improve UI for product table list. + +commit e502f8072812127c1de3d1add447ca78d0ddccdc +Author: qixinzhi +Date: Thu Nov 18 15:13:17 2021 +0800 + + * beautify scroll bar for task/bug/story card + +commit af6d5e4ca05951180404bc431fb8868d578b7dbd +Merge: 8fa3ad39c1 eac30e4699 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 07:13:15 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16396' into 'sprint/170' + + * Fix bug #16396. + + See merge request easycorp/zentaopms!518 + +commit eac30e46993b2bce6c180243e938fa5b23f9d88d +Author: tianshujie +Date: Thu Nov 18 15:12:38 2021 +0800 + + * Modify code. + +commit 8fa3ad39c1f445ee69b7ee3839b0654911e1d823 +Merge: 2582f32c78 bf47fb620b +Author: liyuchun +Date: Thu Nov 18 15:09:52 2021 +0800 + + Merge branch 'sprint/170_mayue_16364' into sprint/170 + +commit bf47fb620b878e949eea797ba228caa916a9f0dc +Merge: c26fb97685 12b6f58053 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 07:09:28 2021 +0000 + + Merge branch 'sprint/170' into 'sprint/170_mayue_16364' + + # Conflicts: + # module/project/control.php + +commit 0a03aea29a83e841d400a963265be9bc96694472 +Author: tianshujie +Date: Thu Nov 18 15:07:51 2021 +0800 + + * Fix bug #16396. + +commit c26fb976856f43d4ca979a388d8ded9fd9f1cf8d +Author: mayue +Date: Thu Nov 18 15:07:42 2021 +0800 + + * Fix bug #16364. + +commit 12b6f580533a7460e24d8ca0cf84bc5c333b91ab +Merge: c4e9dc5a4e 073deec215 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 07:06:26 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_16377' into 'sprint/170' + + Sprint/170 songchenxuan 16377 + + See merge request easycorp/zentaopms!514 + +commit 073deec2158dcb94c943d5e20f05d0ec230e3bfb +Author: songchenxuan +Date: Thu Nov 18 15:05:56 2021 +0800 + + * Fix bug 16377 + +commit c4e9dc5a4e0f6eefa23992f4c271dbd6b234792d +Merge: 6085ad3089 0e51961266 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 07:03:43 2021 +0000 + + Merge branch 'sprint/170_zhengrunyu_BUG_16378' into 'sprint/170' + + *Finish task #16378. + + See merge request easycorp/zentaopms!512 + +commit 6085ad30896ca9c7896ab2315aeb7c1e9b9bbe57 +Merge: d8993bf4d5 22fdf1f0fc +Author: 孙广明 +Date: Thu Nov 18 06:59:45 2021 +0000 + + Merge branch 'sprint/170_tianshujie_44496' into 'sprint/170' + + *Finish task #44496 + + See merge request easycorp/zentaopms!511 + +commit 504e284d633f4f44dcb34ebe0b897a89a7af7974 +Author: songchenxuan +Date: Thu Nov 18 14:48:41 2021 +0800 + + * Fix bug 16377. + +commit 22fdf1f0fcb9ea8423607f656717cbcf0f1226f5 +Author: tianshujie +Date: Thu Nov 18 14:48:21 2021 +0800 + + * Modify code. + +commit 49b3b22630cad6e939a94a89d04081db6537eab4 +Author: mayue +Date: Thu Nov 18 14:48:05 2021 +0800 + + * Fix bug #16364. + +commit d8993bf4d5f5ad813415a83d62d0d558bcaa6cad +Merge: a796848a49 745a2e3fea +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 06:42:46 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_codefortest-bug' into 'sprint/170' + + * Code for test-bug. + + See merge request easycorp/zentaopms!510 + +commit 6df12ce1e9fcf9aa5bc0e5efe5bbf42fcdf95383 +Author: 王怡栋 +Date: Thu Nov 18 14:41:58 2021 +0800 + + * fix for bug storyChanged. + +commit a91381849365f5180d3cb4847ce7115acb1e65c8 +Merge: 25558cb8cd 091f931cda +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 06:40:15 2021 +0000 + + Merge branch 'sprint/168_liumengyi_44363' into 'sprint/168' + + * Finish task #44363. + + See merge request easycorp/zentaopms!515 + +commit 0ee281b800559813e96d8bb2dc3ffb964eeb6cb7 +Author: zhujinyong +Date: Thu Nov 18 14:37:26 2021 +0800 + + * Fix version of api request. + +commit a796848a496a525af4f1f088afacbed32ed26c16 +Merge: 6175d59ce3 15967171de +Author: zhujinyong +Date: Thu Nov 18 14:35:50 2021 +0800 + + Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 + +commit 6175d59ce382a05881b920ba1ddeaac46e43e566 +Author: zhujinyong +Date: Thu Nov 18 14:35:21 2021 +0800 + + * Compatiblity for ubb. + +commit 15967171de2cae14e8954a343a09f6ebcd9c5193 +Merge: 3870f6f9e4 e5653c5dd7 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 06:33:49 2021 +0000 + + Merge branch 'sprint/173_lizhiqiang_16371' into 'sprint/170' + + Fix bug#16371. + + See merge request easycorp/zentaopms!513 + +commit 3870f6f9e46b55c7e54795c6c13e20b0b012dcf3 +Merge: 73ea750b76 b658a98de3 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 06:30:03 2021 +0000 + + Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170' + + Finis task #44486,44487,44488. + + See merge request easycorp/zentaopms!495 + +commit 03620d8454ba61d30e0f23e6ddfb6257b09e837b +Author: mayue +Date: Thu Nov 18 14:24:29 2021 +0800 + + * Fix bug #16364. + +commit 091f931cda5cd9e698a04de2add8864f9a4f439a +Author: liumengyi +Date: Thu Nov 18 14:23:50 2021 +0800 + + * Finish task #44363. + +commit e5653c5dd740bde99d154532062af9ca103314ff +Author: lizhiqiang +Date: Thu Nov 18 14:21:34 2021 +0800 + + *Finish Bug #16371. + +commit b658a98de3630f72ef30b195174c3fcf576dce33 +Author: zhouxin +Date: Thu Nov 18 14:13:32 2021 +0800 + + Fix some problem. + +commit 91c8826f45e1329f71f5230769e307ff41de38da +Author: songchenxuan +Date: Thu Nov 18 14:08:21 2021 +0800 + + * Fix bug 16377 + +commit 2df3d6aa390fb9e29ad8e144358b8ef20b0943a2 +Author: songchenxuan +Date: Thu Nov 18 14:08:07 2021 +0800 + + * Fix bug 16377 + +commit 73ea750b76cf35e0122e41856187ab9e246c06e1 +Merge: 099d2365af 68f629210b +Author: 孙广明 +Date: Thu Nov 18 06:05:39 2021 +0000 + + Merge branch 'sprint/173_tianshujie_44502' into 'sprint/170' + + * Finish task #44502. + + See merge request easycorp/zentaopms!503 + +commit 099d2365af2c2194d1688a518bc9f52d30be79c8 +Merge: f18441ad73 8f2c87cae1 +Author: 孙广明 +Date: Thu Nov 18 14:04:05 2021 +0800 + + Merge branch 'sprint/170_tianshuejie_bug' into sprint/170 + +commit 8f2c87cae1d08db4d15a0d9afffb935137540851 +Merge: 7044ccbf2c 98a3b04e99 +Author: 孙广明 +Date: Thu Nov 18 06:03:46 2021 +0000 + + Merge branch 'sprint/170' into 'sprint/170_tianshuejie_bug' + + # Conflicts: + # module/execution/view/create.html.php + +commit 0e51961266aec75fc61c93a049f20b8ef35e38f4 +Author: zhengrunyu +Date: Thu Nov 18 13:51:25 2021 +0800 + + *Finish task #16378. + +commit 5e473398be741f9e71059ec260f10a7915caa55c +Author: tianshujie +Date: Thu Nov 18 13:49:04 2021 +0800 + + * Batch modify the judgment of the branch to which the bug belongs. + +commit 26b110b73ac6cacaec5ea79c4407a430f1f02727 +Author: 王怡栋 +Date: Thu Nov 18 13:45:32 2021 +0800 + + * code for task #44331. + +commit 745a2e3feab0e1b20ac6730772c6954bfeecde3d +Author: songchenxuan +Date: Thu Nov 18 13:42:47 2021 +0800 + + * Code for test-bug. + +commit e9d03af3197a1e3e537dcbf11d949777c4123fc5 +Author: liumengyi +Date: Thu Nov 18 13:40:22 2021 +0800 + + * Finish task #44363. + +commit 98a3b04e99b2131df8835cf6261ffa12a02f2607 +Author: zhujinyong +Date: Thu Nov 18 13:39:01 2021 +0800 + + * Compatibility in scm. + +commit 25558cb8cd092ff81d2a5e3e5dee12d5ea61ab7d +Merge: f6f8ce53d5 8b651bd59c +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 05:37:18 2021 +0000 + + Merge branch 'sprint/168_hufangzhou_upgradelang' into 'sprint/168' + + * Modify the lang file when merge data for upgrade. + + See merge request easycorp/zentaopms!509 + +commit 8b651bd59c9892ff06bec84b305c4d9afc6f08be +Author: hufangzhou +Date: Thu Nov 18 13:35:58 2021 +0800 + + * Modify the lang file when merge data for upgrade. + +commit 8c1cc5c875269ce2085d35840602a6b353494c35 +Author: zhujinyong +Date: Thu Nov 18 13:35:32 2021 +0800 + + * Update purifier library. + +commit f6f8ce53d589263f13eee5477df14abd9031e4d9 +Merge: 5c398e8545 811d9ecae7 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 05:34:49 2021 +0000 + + Merge branch 'sprint/168_tengfei_16386' into 'sprint/168' + + Sprint/168 tengfei 16386 + + See merge request easycorp/zentaopms!504 + +commit 2582f32c78a44965a70825bf5c5e30d2489c7a0e +Merge: c1bc3c48ad e41ccac2b7 +Author: liyuchun +Date: Thu Nov 18 13:17:10 2021 +0800 + + Merge branch 'sprint/170_mayue_branch' into sprint/170 + +commit 15c1ec6c42b84f0899f1b84fd03f19316ca1777a +Author: 王怡栋 +Date: Thu Nov 18 13:16:38 2021 +0800 + + * code for task #44330. + +commit e41ccac2b78ac838c75379da6cfc08e0eabfbf32 +Merge: a9c2c09338 8639b02e76 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 05:15:10 2021 +0000 + + Merge branch 'sprint/170' into 'sprint/170_mayue_branch' + + # Conflicts: + # module/build/view/create.html.php + # module/project/model.php + +commit 8639b02e76f7f05fcfd81940b43c389ea17718dc +Merge: 7f29d93489 000728b47e +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 05:12:40 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_44490' into 'sprint/170' + + Sprint/170 songchenxuan 44490 + + See merge request easycorp/zentaopms!501 + +commit 5c398e85455828e1a0e238da4850bae006820553 +Merge: 4c9a7cd883 21faa0dc2a +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 05:06:43 2021 +0000 + + Merge branch 'sprint/168_hufangzhou_44361' into 'sprint/168' + + Sprint/168 hufangzhou 44361 + + See merge request easycorp/zentaopms!508 + +commit 4c9a7cd883bfab8901835be25bb6a651cf65b20a +Merge: 2eaa60a19f bebdb6eff9 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 05:06:15 2021 +0000 + + Merge branch 'sprint/168_sunhao/update_zui' into 'sprint/168' + + * Update selectable component in zui. + + See merge request easycorp/zentaopms!487 + +commit 6aa55f501136be1f832737a4d896aa6d8a4a724a +Author: wangjianhua +Date: Thu Nov 18 03:52:39 2021 +0000 + + * Finish task 44503. Add branch name before version name. + +commit a9c2c093382aa838b28ccfd2c336324bec85959f +Author: xieqiyu +Date: Thu Nov 18 11:41:17 2021 +0800 + + * Optimize the code. + +commit 21faa0dc2a8a56427d9409aa8a5d1d3eb26287cd +Author: hufangzhou +Date: Thu Nov 18 11:30:28 2021 +0800 + + * Finish task #44361. + +commit 68f629210b6d25ca3fe5444acecd91c4292f1867 +Author: tianshujie +Date: Thu Nov 18 11:23:03 2021 +0800 + + * Change picture. + +commit 3510f6ef63c42d59b6302d8d6b075d64a74d134f +Author: 王怡栋 +Date: Thu Nov 18 11:20:39 2021 +0800 + + * code for task #44321. + +commit 7044ccbf2caf12b7d6e7dbaf273682cba3f20103 +Author: tianshujie +Date: Thu Nov 18 11:17:22 2021 +0800 + + * Modify logic. + +commit 7f29d934898b36ea6e645f676b0ce850a03a35ef +Merge: 34ec52e679 c9baf6fddd +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 03:13:27 2021 +0000 + + Merge branch 'sprint/170_mayue_16332' into 'sprint/170' + + * Fix bug #16332. + + See merge request easycorp/zentaopms!506 + +commit 34ec52e679ae28c74e9318d89af302d396b56471 +Merge: c1bc3c48ad a0efdf92a8 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 03:13:05 2021 +0000 + + Merge branch 'sprint/170_mayue_16333' into 'sprint/170' + + * Fix bug #16333. + + See merge request easycorp/zentaopms!507 + +commit e8f77ac6329a0002d1d39d3c2b880f35c43bb351 +Author: tianshujie +Date: Thu Nov 18 11:10:02 2021 +0800 + + * Modify logic. + +commit 811d9ecae7532828e31fca2dc8d62467931b630d +Author: reneeteng +Date: Thu Nov 18 10:48:53 2021 +0800 + + * Edit lang file for feedbackby interface. + +commit 4e02c5ba538fa04b481b095ee8edc9a2e4112c4a +Author: tianshujie +Date: Thu Nov 18 10:48:31 2021 +0800 + + * Fix product issues during replication sprint. + +commit 7d15430ab1063958c01a11732a929c232581a076 +Author: xieqiyu +Date: Thu Nov 18 10:39:46 2021 +0800 + + * Modify the review code. + +commit dcb971c040020747ef9b688ed94274dbeabb7dae +Author: wangjianhua +Date: Thu Nov 18 02:39:03 2021 +0000 + + * Finish task 44491. + +commit 13d5803ce1f8064f83ce92c1381a1b124489e029 +Author: Hao Sun +Date: Thu Nov 18 10:35:27 2021 +0800 + + * adjust card style in kanban: remove border. + +commit 5a7dbcbfd35eb96526c7d6cd23221ad697c675d8 +Author: Hao Sun +Date: Thu Nov 18 10:27:44 2021 +0800 + + * change cursor to move for execution item in kanban. + +commit 69d7441ce39b2954fbd483d289a62e2a885c50c9 +Author: tianshujie +Date: Thu Nov 18 10:12:45 2021 +0800 + + * Linked product issues when modifying replication sprint. + +commit c9baf6fdddd3d29c7ef5e67f67c12ba794b802c5 +Author: mayue +Date: Thu Nov 18 10:04:16 2021 +0800 + + * Fix bug #16332. + +commit a0efdf92a8c89d95f74ae4318fd3ae66089f5f3a +Author: mayue +Date: Thu Nov 18 09:58:40 2021 +0800 + + * Fix bug #16333. + +commit 8553a87f00f266b5d028eb94aec88c5237d3ae0a +Author: tianshujie +Date: Thu Nov 18 09:51:18 2021 +0800 + + * Finish task #44502. + +commit 1ea20cb24e14dc3c23a14fe146d29859e5b1a659 +Author: tianshujie +Date: Thu Nov 18 09:25:49 2021 +0800 + + * Repair the error reported on the plan linked stories page. + +commit 000728b47ef478af3ad8e7580dbad274888ceba5 +Author: songchenxuan +Date: Thu Nov 18 09:11:57 2021 +0800 + + * Finish task 44490. + +commit c1bc3c48ad40f902da641107f201cef0a17ce7cb +Merge: 77b697c991 9c4b07e8b7 +Author: liyuchun +Date: Thu Nov 18 09:04:27 2021 +0800 + + Merge branch 'sprint/173_lizhiqiang__16336' into sprint/170 + +commit 9c4b07e8b72a504c819ca6061364e75c9e920e16 +Merge: 791ea627de 66dd543027 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 01:04:00 2021 +0000 + + Merge branch 'sprint/170' into 'sprint/173_lizhiqiang__16336' + + # Conflicts: + # module/execution/view/bug.html.php + +commit 66dd54302730174061d47666cde6cdf509da4a92 +Merge: fc7c9acb30 f47e855649 +Author: 孙广明 +Date: Thu Nov 18 00:58:13 2021 +0000 + + Merge branch 'sprint/170_zhengrunyu_44597' into 'sprint/170' + + *Finish task #44597. + + See merge request easycorp/zentaopms!492 + +commit fc7c9acb30d3e062f1b373c49a4668f0aa72b038 +Merge: ca4388dd7a 858f8327ef +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 18 00:57:39 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16367' into 'sprint/170' + + * Fix bug #16367. + + See merge request easycorp/zentaopms!494 + +commit fc50ece3e24102166ffd262f27f0715f960426c3 +Author: 王怡栋 +Date: Thu Nov 18 08:56:53 2021 +0800 + + * code for task #44319. + +commit 858f8327ef56fff56f939908aaff5d8d1f629507 +Author: tianshujie +Date: Thu Nov 18 08:46:35 2021 +0800 + + * Fix bug #16367. + +commit 292b09bb28c1602fe1782236cef21895edfc745a +Author: xieqiyu +Date: Wed Nov 17 23:23:00 2021 +0800 + + * Delete unused code. + +commit 84340fa6f2549a1801c5ecac4a258499cc146971 +Author: xieqiyu +Date: Wed Nov 17 22:57:30 2021 +0800 + + * Code for task#44497. + +commit a1e07d2b4b15b7a92c283e42746fd3e9957df3cb +Author: wangjianhua +Date: Wed Nov 17 13:55:59 2021 +0000 + + * Finish task 44491. + +commit 47cdcd78c0644641507520af0c4d7014d1e19284 +Author: xieqiyu +Date: Wed Nov 17 19:30:13 2021 +0800 + + * Code for task#44497. + +commit 2eaa60a19fd18314cda4b2e8fa417979d8d4d608 +Merge: 94cd6525e4 a1ad4a741b +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 10:11:03 2021 +0000 + + Merge branch 'sprint/168_liumengyi_16390' into 'sprint/168' + + * Fix bug #16390,#16388 + + See merge request easycorp/zentaopms!496 + +commit a1ad4a741b149fdc307aba43a48fbec5ac5dc5e9 +Author: liumengyi +Date: Wed Nov 17 18:09:03 2021 +0800 + + * Fix bug #16390,#16388. + +commit 6e1f7dfbf73adcf6d021886acbb8b3cac06c713a +Author: hufangzhou +Date: Wed Nov 17 18:06:48 2021 +0800 + + * Finish task #44361. + +commit 63dfa14f0473c9aca88ad90a2330ee7f7789dbc9 +Author: liumengyi +Date: Wed Nov 17 18:04:39 2021 +0800 + + * Fix bug #16390,#16388. + +commit ca4388dd7a15d6a8138ea4c31a9f23411f6aba33 +Merge: 508539166d 8df6bbbc1e +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 10:02:05 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16396' into 'sprint/170' + + * Fix bug #16396. + + See merge request easycorp/zentaopms!498 + +commit 4fd69c66616e08ed632b5fd02d644b4fd50b2dbc +Author: wangjianhua +Date: Wed Nov 17 09:59:16 2021 +0000 + + * Finish task 44503. + +commit 791ea627de788796e9aa7c422d1708e1c667a740 +Author: lizhiqiang +Date: Wed Nov 17 17:57:04 2021 +0800 + + * Finish bug #16336. + +commit ebae1b755e929af2503af2dd06f0996cee82e49b +Author: Hao Sun +Date: Wed Nov 17 17:56:37 2021 +0800 + + * apply border color with execution status. + +commit a6accd9c505d8af0642137ea7e316d582a2dd338 +Author: Hao Sun +Date: Wed Nov 17 17:54:08 2021 +0800 + + * refactor: remove console.log. + +commit 8df6bbbc1e3b7b3e147d94e2f541f1b45fd9824f +Author: tianshujie +Date: Wed Nov 17 17:52:38 2021 +0800 + + * Fix bug #16396. + +commit 6ad007f06eda3f3f676a9ca6f83105a69f82b7f4 +Author: Hao Sun +Date: Wed Nov 17 17:51:11 2021 +0800 + + * task #44357, refactor executions kanban with kanban component and support dnd. + +commit 8473895bd2c1bb3d341261349622788f91de1bf0 +Author: tianshujie +Date: Wed Nov 17 17:50:07 2021 +0800 + + * Restore update logic. + +commit cac426bb7ded62d102f01e44234c11f2ea78a1ee +Author: liumengyi +Date: Wed Nov 17 17:49:32 2021 +0800 + + * Fix bug #16390,#16388. + +commit 508539166d6588d6b836787623ef9071fd5de2a2 +Merge: 0be7ff7a2a bf7e878ae4 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 09:45:57 2021 +0000 + + Merge branch 'sprint/170_mayue_16257' into 'sprint/170' + + * Fix bug #16257. + + See merge request easycorp/zentaopms!493 + +commit bf7e878ae4a1c5d0ebd70fdb02418d6f2421fdf8 +Author: mayue +Date: Wed Nov 17 17:44:22 2021 +0800 + + * Fix bug #16257. + +commit c75f8941e5b1a3e29cf9a775c896996d12b7258d +Author: songchenxuan +Date: Wed Nov 17 17:44:10 2021 +0800 + + * Finish task 44490 + +commit b61872bcd0af8d51fa825658a20b2c9c4e7593ae +Author: tianshujie +Date: Wed Nov 17 17:43:42 2021 +0800 + + * Fix bug #16367. + +commit 59f3ac666153ef31bda472de5b0c1c4594bdba8a +Author: songchenxuan +Date: Wed Nov 17 17:42:10 2021 +0800 + + * Finish task 44490 + +commit 0be7ff7a2a47557ec34ae028e34ba085dfbb8c69 +Merge: 1863bf4024 2f4ed8f1c0 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 09:40:45 2021 +0000 + + Merge branch 'sprint/170_mayue_16000' into 'sprint/170' + + * Fix bug #16000. + + See merge request easycorp/zentaopms!488 + +commit 152e27b1a8f2b8a06859dcb591183334107ea345 +Author: tianshujie +Date: Wed Nov 17 17:38:42 2021 +0800 + + * Fix bug #16367. + +commit dc807a53a5b5e7215c35eb6d67de956cae75a839 +Author: liumengyi +Date: Wed Nov 17 17:29:08 2021 +0800 + + * Fix bug #16390,#16388. + +commit 328527a5bdaa1369c5c513330ecb955543cb17f5 +Author: songchenxuan +Date: Wed Nov 17 17:28:28 2021 +0800 + + * Finish task 44490 + +commit 79fa0758545ab313b2a65c1fe7133049fd8a75c4 +Author: tianshujie +Date: Wed Nov 17 17:25:59 2021 +0800 + + * Scope of repair stories. + +commit f47e8556493de4ba2a232f012c3a8cd69683a552 +Author: zhengrunyu +Date: Wed Nov 17 17:25:37 2021 +0800 + + *Finish task #44597. + +commit 5b00c80c4c003647dafd9e8c32181007fcaa0229 +Author: songchenxuan +Date: Wed Nov 17 17:19:29 2021 +0800 + + * Finish task 44490 + +commit d4ccff00e360594733db9d9378f40b5abfee0276 +Author: 王怡栋 +Date: Wed Nov 17 17:13:00 2021 +0800 + + * fix bug. + +commit 9979876a0d26c8984fe86e87b95058dad0c6c77c +Author: mayue +Date: Wed Nov 17 16:54:16 2021 +0800 + + * Fix bug #16257. + +commit 1863bf4024a2317a208e4872ea6f4e4bab72059d +Merge: 63edc9d1f9 1fb7da9222 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 08:50:36 2021 +0000 + + Merge branch 'sprint/173_lizhiqiang_16373' into 'sprint/170' + + *Finish bug #16363. + + See merge request easycorp/zentaopms!491 + +commit 94cd6525e48aa9132cf7e13e4191dc85635fa69c +Merge: 851430dc48 3e93ba664b +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 08:38:56 2021 +0000 + + Merge branch 'sprint/168_liumengyi_16390' into 'sprint/168' + + * Fix bug #16390. + + See merge request easycorp/zentaopms!490 + +commit 63edc9d1f9eb12c4f848bd19b273fbace531b517 +Merge: 1161128163 77fd021410 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 08:37:55 2021 +0000 + + Merge branch 'sprint/173_tianshujie_44502' into 'sprint/170' + + Sprint/173 tianshujie 44502 + + See merge request easycorp/zentaopms!489 + +commit 1fb7da9222ae3d23e073cea291e95a4250938e21 +Author: lizhiqiang +Date: Wed Nov 17 16:36:28 2021 +0800 + + *Finish bug #16363. + +commit 77fd021410186bf59a6b0651d41728cb4467696a +Author: tianshujie +Date: Wed Nov 17 16:33:49 2021 +0800 + + * Fix bug #14101. + +commit 3e93ba664b16f8e51a244d27570a62bb8cd4982e +Author: liumengyi +Date: Wed Nov 17 16:33:42 2021 +0800 + + * Fix bug #16390. + +commit 0eee3bf282e23a4cea26b825f248d094aae73ead +Author: 王怡栋 +Date: Wed Nov 17 16:29:16 2021 +0800 + + * code for task #44326. + +commit 27d509df08752bed87c46d11583b88f8a74e188c +Author: tianshujie +Date: Wed Nov 17 16:28:30 2021 +0800 + + * Finish task #44496. + +commit 8cd05d8301616b4d7cf8a948c6a16de47c9fcb8f +Author: songchenxuan +Date: Wed Nov 17 16:22:43 2021 +0800 + + * Finish task 44490. + +commit 36d7e664e61b1be291fb59b4b9572dbc9ffff95d +Author: zhengrunyu +Date: Wed Nov 17 16:20:54 2021 +0800 + + *Finish task #44597. + +commit 6f813292f2c80239a323036fb9db3e85ae166caa +Author: 王怡栋 +Date: Wed Nov 17 16:19:16 2021 +0800 + + * code for task #44318. + +commit 0d399519504eff03eeebbe178308d4c3f7414837 +Author: hufangzhou +Date: Wed Nov 17 16:14:53 2021 +0800 + + * Code for task #44361. + +commit b7e3fe90033d5e957c2b12e4b9fd91c40ddbe4ea +Author: zhouxin +Date: Wed Nov 17 15:49:24 2021 +0800 + + Finis task #44486,44487,44488. + +commit ccfb8c48312b2185bfefd81a5dbe19887c5dcba8 +Author: xiawenlong +Date: Wed Nov 17 15:40:11 2021 +0800 + + * Fix code style. + +commit 1dab48045ec7463da5a8aa7d37d87576aaad8965 +Author: songchenxuan +Date: Wed Nov 17 15:39:30 2021 +0800 + + * Finish task 44490. + +commit bebdb6eff96a8d98b657fc760decb88b4ebe6a72 +Author: Hao Sun +Date: Wed Nov 17 15:34:04 2021 +0800 + + * update selectable component in zui. + +commit 851430dc48589269fbc573786575a14f3e7b9057 +Merge: bcbfdfb8f3 3f6bdc127b +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 07:21:54 2021 +0000 + + Merge branch 'sprint/168_liumengyi_44369' into 'sprint/168' + + * Finish task #44369. + + See merge request easycorp/zentaopms!486 + +commit 3f6bdc127bb5e51ebf6b52c889c77530598eda1c +Author: liumengyi +Date: Wed Nov 17 15:20:28 2021 +0800 + + * Finish task #44369. + +commit f0ee430addb29b54a49962feeff21b46f4e30003 +Author: wangjianhua +Date: Wed Nov 17 07:18:27 2021 +0000 + + * Insert branch name into drop list of bug search form. + +commit d7763fdee5f00f08baf157c926bbab2647742052 +Author: liumengyi +Date: Wed Nov 17 15:16:22 2021 +0800 + + * Finish task #44369. + +commit f9473570e007f4de1e6bdfeaa46f24478d0b51e3 +Author: 王怡栋 +Date: Wed Nov 17 15:15:18 2021 +0800 + + * code for task #44317. + +commit 641c4ba36224b5f11ad062d33577143142c69ad4 +Author: liumengyi +Date: Wed Nov 17 15:08:45 2021 +0800 + + * Finish task #44369. + +commit 2f4ed8f1c02f8c6b62dde9439e531735d27a5a6e +Author: mayue +Date: Wed Nov 17 15:00:40 2021 +0800 + + * Fix bug #16000. + +commit 7662b547b081322e7da9c66eacee37403ca06f81 +Author: liumengyi +Date: Wed Nov 17 14:59:45 2021 +0800 + + * Finish task #44369. + +commit cad1e69298b22754df09a6b22e48bc0157f7a261 +Author: 王怡栋 +Date: Wed Nov 17 14:53:33 2021 +0800 + + * finish task #44459. + +commit 1161128163c201d974f9040d501ce08328ff3812 +Merge: 3700fa0e63 6b2a45fa70 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 06:52:16 2021 +0000 + + Merge branch 'sprint/170_lizhiqiang_44489' into 'sprint/170' + + * Finish task#44489. + + See merge request easycorp/zentaopms!485 + +commit 859327d7a35d7aad8b4e2b6f89648e5bafaad79d +Author: tianshujie +Date: Wed Nov 17 14:50:42 2021 +0800 + + * Modify the logic of loading stories when creating use cases in batches. + +commit 6b2a45fa70c1f9abae3321e8504b1bd17b503549 +Author: lizhiqiang +Date: Wed Nov 17 14:47:49 2021 +0800 + + * Finish task#44489. + +commit 3700fa0e633acf8cb2f69aa7c2de8230981219ae +Merge: 4d605316d1 510c67ece7 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 06:44:22 2021 +0000 + + Merge branch 'sprint/170_mayue_44493,44494' into 'sprint/170' + + Sprint/170 mayue 44493,44494 + + See merge request easycorp/zentaopms!484 + +commit bcbfdfb8f3cab360336f3d2a524e2b7241cf0229 +Merge: 62f71f78c9 b3d6e63430 +Author: 王怡栋 +Date: Wed Nov 17 14:41:44 2021 +0800 + + Merge branch 'sprint/172_liyuchun_44367' into sprint/168 + +commit 30204c15685cb2ed2658827171feb06c30b728bf +Author: liumengyi +Date: Wed Nov 17 14:39:37 2021 +0800 + + * Finish task #44369. + +commit b3d6e63430f47a095c7185dcd4f795a9ec87a440 +Merge: a9fa89985c 62f71f78c9 +Author: 王怡栋 +Date: Wed Nov 17 06:38:50 2021 +0000 + + Merge branch 'sprint/168' into 'sprint/172_liyuchun_44367' + + # Conflicts: + # db/update15.9.sql + +commit 4d605316d1f5a5069a8b3f8ab55c440a02edb535 +Merge: 7442a15c44 8ddc54edbe +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 06:36:07 2021 +0000 + + Merge branch 'sprint/170_lizhiqiang_44489' into 'sprint/170' + + Finish task #44489. + + See merge request easycorp/zentaopms!474 + +commit 510c67ece7af8ed5d0f8a01bc8315d61e2606d63 +Author: mayue +Date: Wed Nov 17 14:34:00 2021 +0800 + + * Finish task #44493,44494. + +commit 51709b88d53ded95bfa9b4aea6640e739bd02ce1 +Author: mayue +Date: Wed Nov 17 14:32:24 2021 +0800 + + * Finish task #44493,44494. + +commit 8ddc54edbe36b3e5f860262f0096b85a298713ca +Author: lizhiqiang +Date: Wed Nov 17 14:31:11 2021 +0800 + + Finish task #44489. + +commit f7a063e9ec3e827ef1682393a2d6d9d41df8597a +Author: wangjianhua +Date: Wed Nov 17 05:56:48 2021 +0000 + + * Add branch name before product plan name in product list page. + +commit 7442a15c4461ed6db42ddfa63de00ab25412dcb2 +Merge: 293f76a1ed fc3411190c +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 05:35:00 2021 +0000 + + Merge branch 'sprint/170_zhouxin_16209' into 'sprint/170' + + Fix bug. + + See merge request easycorp/zentaopms!480 + +commit 62f71f78c9cc0350c04719de43fd37862ee7f951 +Merge: 08e9934fa0 ecb8881734 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 05:33:53 2021 +0000 + + Merge branch 'sprint/168_sunhao/task44358' into 'sprint/168' + + * Task #44358, project kanban support drag-and-drop. + + See merge request easycorp/zentaopms!481 + +commit 08e9934fa072bbf4fca07c2b6b49f5a549696dcc +Merge: 0ba93971f8 daea38d8e2 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 05:33:43 2021 +0000 + + Merge branch 'sprint/168_sunhao/improve_kanban' into 'sprint/168' + + * Update kanban lib to fix rerender not work as expected and improve d-n-d effect. + + See merge request easycorp/zentaopms!460 + +commit c14392a3ac8255256a675adc2b0696de1ab3f6bd +Author: 王怡栋 +Date: Wed Nov 17 13:31:56 2021 +0800 + + * round for project progress. + +commit fc3411190c91b27c2ba1a24ae8616e084968908e +Author: zhouxin +Date: Wed Nov 17 13:31:54 2021 +0800 + + Fix bug 16209. + +commit 293f76a1ed29cae8f763645051fe77563afd4692 +Merge: bac9beeb27 4b42cb22a4 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 05:25:38 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_44601' into 'sprint/170' + + * Fix bug 13756 + + See merge request easycorp/zentaopms!483 + +commit bac9beeb27be31cd887ff1ae62e5163d3bbb55b1 +Merge: 87597eccbb 7d2daa9302 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 05:10:33 2021 +0000 + + Merge branch 'sprint/170_lizhiqiang_44499' into 'sprint/170' + + Sprint/170 lizhiqiang 44499 + + See merge request easycorp/zentaopms!482 + +commit 3956d6bfd0330d8a20b9545999e0e19e7d626afe +Author: 王怡栋 +Date: Wed Nov 17 13:00:29 2021 +0800 + + * code for task #44310. + +commit a9fa89985c447698acdc00fe339140a8e9f0c5ca +Author: liyuchun +Date: Wed Nov 17 12:50:19 2021 +0800 + + * Adjust code for task #44367. + +commit 03236423ae49a08090e1fbab38ccbe47ab89654c +Author: 王怡栋 +Date: Wed Nov 17 11:17:47 2021 +0800 + + * code for task #44459. + +commit 7d2daa9302381f7f9ccc65ae054c3bcf5753a14c +Author: lizhiqiang +Date: Wed Nov 17 11:09:55 2021 +0800 + + * Fix bug 16302 + +commit 2dcd335698342a3de9e03e43acafd42a101eddc1 +Author: lizhiqiang +Date: Wed Nov 17 11:09:25 2021 +0800 + + * Fix bug 16302 + +commit ecb8881734a62a72a61bbeaed3d986f99e784c8e +Author: Hao Sun +Date: Wed Nov 17 11:01:59 2021 +0800 + + * task #44358, project kanban support drag-and-drop. + +commit daea38d8e239316d564a546a99bfe925c55690e5 +Author: Hao Sun +Date: Wed Nov 17 11:00:37 2021 +0800 + + * improve d-n-d effect for kanban. + +commit 8c1f8ea70cb016f335d04885c4e500e868061ce6 +Author: xiawenlong +Date: Wed Nov 17 10:53:37 2021 +0800 + + *Finish 44403,44406,44406,44401 + +commit 6b63ed43f2693d0457c2eca1cc0b201d44866da7 +Author: zhouxin +Date: Wed Nov 17 10:44:19 2021 +0800 + + Fix bug. + +commit ee073e0530ba66b034e60e904acd982f195a5e83 +Author: liyuchun +Date: Wed Nov 17 10:44:15 2021 +0800 + + * Finish task #44366. + +commit 35cbf3830dbaf8c5ea3afbe6ab769b448c4371f2 +Author: 王怡栋 +Date: Wed Nov 17 10:36:56 2021 +0800 + + * code for task #44309. + +commit 87597eccbbcf53516fed319abd28fe2115b6e2dc +Merge: e9847db1c1 0dd5dd1955 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 02:33:33 2021 +0000 + + Merge branch 'sprint/170_mayue_44493,44494' into 'sprint/170' + + * Finish task #44493,44494. + + See merge request easycorp/zentaopms!477 + +commit e9847db1c1ce48e3c51c93dc8b5e72679c411f70 +Merge: e8af2d25bc db4be7990d +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 02:29:52 2021 +0000 + + Merge branch 'sprint/170_zhengrunyu_44501' into 'sprint/170' + + *Finish task #44501. + + See merge request easycorp/zentaopms!479 + +commit 0dd5dd19556a8d1305274ac26b8bcfdc1a919b0b +Author: mayue +Date: Wed Nov 17 10:27:02 2021 +0800 + + * Finish task #44493,44494. + +commit db4be7990d63d2c4907b09ab3bc08a571f52c5e9 +Author: zhengrunyu +Date: Wed Nov 17 10:06:56 2021 +0800 + + *Finish task #44501. + +commit 7cc9e9f875033594f45c30aa91f2698b7841d9ad +Author: 王怡栋 +Date: Wed Nov 17 09:59:39 2021 +0800 + + * code for task #44308. + +commit b7636447b37c0e0a87909fa0737b5ea9bd93a361 +Author: tianshujie +Date: Wed Nov 17 09:45:21 2021 +0800 + + * Fix bug #14101. + +commit 273e1493bcb6545c7101348e3935c3ab9e1824b4 +Author: tianshujie +Date: Wed Nov 17 09:44:29 2021 +0800 + + * Fix bug #14101. + +commit a5767ccc13479c3bd45c2f4e27f2ae89a35d0d17 +Author: liyuchun +Date: Wed Nov 17 09:35:56 2021 +0800 + + * Finish task #44366. + +commit 8cce5342f446db9f41ebc89f7c82fe3cfca8b0a8 +Author: mayue +Date: Wed Nov 17 09:35:30 2021 +0800 + + * Finish task #44493,44494. + +commit 8b8c4fe18009562e5665b0da1304f27b29b313cb +Author: mayue +Date: Wed Nov 17 09:30:34 2021 +0800 + + * Finish task #44493,44494. + +commit 4b42cb22a46d6b05e8e6f700675fb870a516a424 +Author: songchenxuan +Date: Wed Nov 17 09:26:02 2021 +0800 + + * Fix bug 13756 + +commit ef485c858be99c21b3e1f0d636840a62e7f9b4e8 +Author: lizhiqiang +Date: Wed Nov 17 09:25:44 2021 +0800 + + Finish task #44489. + +commit 217c887499f0cc551978ad2b48d5f6e2c68914e1 +Author: 王怡栋 +Date: Wed Nov 17 09:23:43 2021 +0800 + + * code for task #44307. + +commit bc81d745d8692af5abff5039d5130601f14fe4c7 +Author: 王怡栋 +Date: Wed Nov 17 09:22:05 2021 +0800 + + * fix for statistical data. + +commit fdade49b5d1d55a1d5a9e1c6c65edc5a647d5455 +Author: tianshujie +Date: Wed Nov 17 09:21:05 2021 +0800 + + * Fix the creation and editing of stories and bugs. + +commit 0ba93971f8353d946119982c7bcbf0e17e5bfd12 +Merge: 4799784a30 3bdd6fe22a +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 17 01:18:30 2021 +0000 + + Merge branch 'sprint/168_liumengyi_44354' into 'sprint/168' + + * Finish task#44354. + + See merge request easycorp/zentaopms!478 + +commit 3bdd6fe22abc93a82abdc6b36bfca0be25303f19 +Author: liumengyi +Date: Wed Nov 17 09:16:28 2021 +0800 + + * Finish task #44354. + +commit 4799784a301e301ca7d227e4cc25577180aa11db +Merge: 161b76d10c 9362f0941a +Author: 孙广明 +Date: Wed Nov 17 00:51:42 2021 +0000 + + Merge branch 'sprint/172_liyuchun_44370' into 'sprint/168' + + Sprint/172 liyuchun 44370 + + See merge request easycorp/zentaopms!475 + +commit 65ef0c6f1b90fdadbaec91418a9d54ffd675af08 +Author: mayue +Date: Wed Nov 17 08:41:04 2021 +0800 + + * Finish task #44493,44494. + +commit 06d7434989bf86e16005c6f8611f121836eca4de +Author: liyuchun +Date: Wed Nov 17 08:26:43 2021 +0800 + + * Finish task #44367. + +commit 102561019db818dd7d3fbc883e293838bc8ca7cf +Author: mayue +Date: Tue Nov 16 18:20:35 2021 +0800 + + * Finish task #44493,44494. + +commit e8af2d25bca1bd27081da2e08ba5c9c32f8ac13b +Merge: 3fadaad6ec 1578acc86d +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 16 09:38:14 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_44500' into 'sprint/170' + + *Fix bug #15828 + + See merge request easycorp/zentaopms!473 + +commit 1578acc86da4a657e6865a1dee1d5c58c49c21b5 +Author: songchenxuan +Date: Tue Nov 16 17:37:30 2021 +0800 + + * Fix bug 15828 + +commit fe5c7a762eaee71d4b7eead7fdfcd3d149d248d8 +Author: songchenxuan +Date: Tue Nov 16 17:30:56 2021 +0800 + + * Fix bug 15828 + +commit b5cfba165e728d40b3fe6f54e0d578595369a643 +Author: liyuchun +Date: Tue Nov 16 17:25:30 2021 +0800 + + * Finish task #44367. + +commit ba48e8e38f207cb7ab9b10bc8f135578a0e45dcb +Author: 王怡栋 +Date: Tue Nov 16 17:09:15 2021 +0800 + + * code for task #43761. + +commit d778a69a90d516239508a38adadb280b4b87adb3 +Author: liumengyi +Date: Tue Nov 16 17:05:18 2021 +0800 + + * Finish task #44354. + +commit 7d496eebc2438f3ef0530593adb679b44b4dbcbe +Author: mayue +Date: Tue Nov 16 17:05:03 2021 +0800 + + * Finish task #44493,44494. + +commit 7e0234fde1175124c9a150d0b39352cfe3e76e12 +Author: liumengyi +Date: Tue Nov 16 17:04:44 2021 +0800 + + * Finish task #44354. + +commit 626ff953caf9a0be3537fd32b38a992fc30ae51f +Author: songchenxuan +Date: Tue Nov 16 16:47:00 2021 +0800 + + * Fix bug 15828 + +commit 9362f0941ad5dc9341a256f5fb776dc2ba76870f +Author: liyuchun +Date: Tue Nov 16 16:30:41 2021 +0800 + + * Adjust code for task #44730. + +commit 03d8a26ed550f7730ebc82eeea6fd847ca97e43f +Author: Hao Sun +Date: Tue Nov 16 16:27:46 2021 +0800 + + * update kanban lib, fix kanban rerender not work as expected. + +commit 412fbb23053702d5670130651763759cd22fb9d5 +Author: liyuchun +Date: Tue Nov 16 16:25:00 2021 +0800 + + * Finish task #44370. + +commit 515221aa5d7127f63f68d90ff5262d14cc6f7151 +Author: songchenxuan +Date: Tue Nov 16 16:03:37 2021 +0800 + + *Fix bug #15828 + +commit 2212f7473bc35b3f83301f7d1a325f9a07211816 +Author: lizhiqiang +Date: Tue Nov 16 16:03:07 2021 +0800 + + Finish task #44489. + +commit 3b4070c2f01c93e58d8cc354450f1f863e07d6ba +Author: 王怡栋 +Date: Tue Nov 16 15:42:53 2021 +0800 + + * code for task #44329. + +commit 3fadaad6ecf821a2185d21331e06be6860371a07 +Merge: 33ff51254b cb3678fbf6 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 16 07:33:20 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_44492' into 'sprint/170' + + * Finish task 44492 + + See merge request easycorp/zentaopms!472 + +commit cb3678fbf648fa0900fd9c6a34f7958885110d95 +Author: songchenxuan +Date: Tue Nov 16 15:31:19 2021 +0800 + + * Finish task 44492 + +commit 33ff51254be82c4d1d1d212be318118f506ff050 +Merge: f18441ad73 f262ca14d1 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 16 07:24:16 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_44492' into 'sprint/170' + + Sprint/170 songchenxuan 44492 + + See merge request easycorp/zentaopms!471 + +commit f262ca14d1c07a51fa0bbcb8f80db902db401076 +Author: songchenxuan +Date: Tue Nov 16 15:23:13 2021 +0800 + + *Finish task 44492 + +commit fdfadb794013c287b6414261e4b032791eec9f96 +Author: tianshujie +Date: Tue Nov 16 15:15:14 2021 +0800 + + * Modify the wrong parameter. + +commit d268587e8df03d72f177ca98e413e1a3008d92f1 +Author: tianshujie +Date: Tue Nov 16 15:07:18 2021 +0800 + + * Finish task #44496. + +commit ec558fc04a9057354919a0e3a5cb8bee148c1b9b +Author: 王怡栋 +Date: Tue Nov 16 15:06:54 2021 +0800 + + * code for task #44327. + +commit f495a6cb622a582c81861ac11396bfcb6a87b41f +Author: songchenxuan +Date: Tue Nov 16 14:46:14 2021 +0800 + + * Finish task 44492 + +commit 1079ebaec10cbbd32117e1aefd6765f4eeb422f6 +Author: songchenxuan +Date: Tue Nov 16 14:46:02 2021 +0800 + + * Finish task 44492 + +commit e9caee64f7175e076881cc8747d4a0c6d8c15431 +Author: 王怡栋 +Date: Tue Nov 16 14:41:36 2021 +0800 + + * code for task #44306. + +commit d68ce78a66d73442f114957b22e060455f91aa92 +Author: 王怡栋 +Date: Tue Nov 16 14:40:42 2021 +0800 + + * code for task #44325. + +commit 41d2fb9a04eb3ad12aa343ad36b6fdc1a049e156 +Author: 王怡栋 +Date: Tue Nov 16 14:38:52 2021 +0800 + + * adjust for program list. + +commit 161b76d10c2a628ef6865b3e6cfd295727a1066c +Merge: a9eabc20b1 9c8c16a476 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 16 06:36:48 2021 +0000 + + Merge branch 'sprint/168_sgm_16234' into 'sprint/168' + + * Fix bug #16234. + + See merge request easycorp/zentaopms!466 + +commit a9eabc20b14413503bd5fcff9983c3f7ad1da576 +Merge: 0a286497a3 61b1e2e9e7 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 16 06:36:28 2021 +0000 + + Merge branch 'sprint/168_liumengyi_28727' into 'sprint/168' + + * Finish story #28727. + + See merge request easycorp/zentaopms!469 + +commit 0a286497a333cdaf3f3352b45a33900e5a587bea +Merge: abde7a1795 aef69c87a0 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 16 06:35:42 2021 +0000 + + Merge branch 'sprint/172_hufangzhou_44362' into 'sprint/168' + + * Finish task #44362. + + See merge request easycorp/zentaopms!470 + +commit 61b1e2e9e780c100f2e92702c2ab602e3bb4ceb6 +Author: liumengyi +Date: Tue Nov 16 14:03:17 2021 +0800 + + * Finish story #28727. + +commit aef69c87a03effcdeb0cceaa4ef17612a16c41f0 +Author: hufangzhou +Date: Tue Nov 16 14:02:48 2021 +0800 + + * Finish task #44362. + +commit 9a24531c848ec7a1f543b5987e6fd0d014ec20b8 +Author: liumengyi +Date: Tue Nov 16 14:02:24 2021 +0800 + + * Finish story #28727. + +commit f18441ad73e5258338d6609477cde1b9f5793664 +Merge: b74f5ab258 102d718ecf +Author: 孙广明 +Date: Tue Nov 16 13:47:49 2021 +0800 + + Merge branch 'sprint/170_zhengrunyu_44498' into sprint/170 + +commit 102d718ecf937ea21d6d8f04186af465b98a5a2b +Merge: d5783e71b3 b74f5ab258 +Author: 孙广明 +Date: Tue Nov 16 05:47:29 2021 +0000 + + Merge branch 'sprint/170' into 'sprint/170_zhengrunyu_44498' + + # Conflicts: + # module/project/model.php + +commit d5783e71b3d488d03fe48de6925aa62dfac87c0f +Author: zhengrunyu +Date: Tue Nov 16 13:43:05 2021 +0800 + + *Finish task #44498. + +commit 4201517c23783408316abad7e2ff508c4b5a3547 +Author: liumengyi +Date: Tue Nov 16 13:42:26 2021 +0800 + + * Finish story #28727. + +commit bb13fd8ea079f7796826f23f3f061a90bb7d32cb +Author: liumengyi +Date: Tue Nov 16 13:41:18 2021 +0800 + + * Finish story #28727. + +commit 86431ddb80d37a94f979166d405dd643315e9fe5 +Author: zenggang +Date: Tue Nov 16 05:34:41 2021 +0000 + + * Adjust code style + +commit a76ec95e69187870562ca513cb570301f377975f +Author: zhengrunyu +Date: Tue Nov 16 13:09:51 2021 +0800 + + *Finish task #44498. + +commit b74f5ab2581c1e33f3d73b21033d13886d4f1ce5 (tag: zentaopms_15.8.beta1_20211116) +Merge: b0d992a335 b521b7f6d0 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 16 03:20:54 2021 +0000 + + Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170' + + Fix bug #43916. + + See merge request easycorp/zentaopms!465 + +commit b521b7f6d0168ddfccc51032d4b6052e8265039a +Author: zhouxin +Date: Tue Nov 16 11:19:02 2021 +0800 + + Fix bug. + +commit 4e97e695f393ae8330bb58be860a9cb006f1e620 +Author: dingguodong +Date: Tue Nov 16 10:55:27 2021 +0800 + + * Correct the bad param type. + +commit f1454e840056f82a63d8a6ff37674613ec04bbad +Merge: 2d9d95cc98 4579fc81ad +Author: dingguodong +Date: Tue Nov 16 10:47:22 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit 2d9d95cc98f48db029acd5a637cef179be9ba53e +Author: dingguodong +Date: Tue Nov 16 10:46:48 2021 +0800 + + * Correct or Optimize codes to meet code styles. + +commit 4579fc81adf21a6cf839c783f3777663326127df +Author: zenggang +Date: Tue Nov 16 02:43:08 2021 +0000 + + * Adjust code style + +commit cfb84bb8563d530218570335b78b6741efd8b029 +Author: zenggang +Date: Tue Nov 16 02:40:25 2021 +0000 + + * Adjust code style + +commit abde7a1795ec2d1a23066aa7b51e8479d4316b5d +Merge: 6e2b90bb33 e09374f3b7 +Author: 孙广明 +Date: Tue Nov 16 01:55:27 2021 +0000 + + Merge branch 'sprint/171_liyuchun_44216' into 'sprint/168' + + * Finish task #44216. + + See merge request easycorp/zentaopms!467 + +commit e09374f3b734ef7cf7cb61dadcbc8396a3b53ab2 +Author: liyuchun +Date: Tue Nov 16 09:31:52 2021 +0800 + + * Finish task #44216. + +commit 77b0b5d61e0bb715ac55e8ccb42b1d721b680cc8 +Author: 王怡栋 +Date: Tue Nov 16 09:31:10 2021 +0800 + + * code for task #44305. + +commit 9c8c16a47686842fc9a5f8f64585c51349288bf7 +Author: 孙广明 +Date: Tue Nov 16 09:30:39 2021 +0800 + + * Fix bug #16234. + +commit f1de06223156ef800fe27de9ecfa681fe05ce5a4 +Author: xiawenlong +Date: Mon Nov 15 19:27:43 2021 +0800 + + * Fix function name. + +commit dd5cf8c7bd6cd4a78b3dbe6fed24ba5625a73c0c +Author: zhouxin +Date: Mon Nov 15 19:15:20 2021 +0800 + + Fix bug #43916. + +commit dff6726c6baa27e71df3a876ee2fd00fe15e8084 +Author: 王怡栋 +Date: Mon Nov 15 17:11:12 2021 +0800 + + * code for task #44305. + +commit b0d992a3355f8980b8207b204e3476112a77fa71 +Merge: 3342b38f9e bdb5d1ee01 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 08:53:43 2021 +0000 + + Merge branch 'sprint/170_xieqiyu_16297' into 'sprint/170' + + * Fix bug#16297. + + See merge request easycorp/zentaopms!463 + +commit bdb5d1ee01ed5d6d454dacf3ee07663fd41ca756 +Author: xieqiyu +Date: Mon Nov 15 16:51:12 2021 +0800 + + * Fix bug#16297. + +commit 3342b38f9ee5cbf146982d03f719695169f57f6e +Merge: eee668f6d9 432ffc6602 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 08:36:58 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16303' into 'sprint/170' + + * Fix bug #16303. + + See merge request easycorp/zentaopms!462 + +commit 432ffc6602ca51329a34475520b4465629d7214f +Author: tianshujie +Date: Mon Nov 15 16:27:30 2021 +0800 + + * Fix bug #16303. + +commit 86622cc61882ddda8dcbccf4fe003be49758379d +Author: 王怡栋 +Date: Mon Nov 15 16:24:54 2021 +0800 + + * code for task #44304. + +commit a2f3100ea5a819e225f1d4e348f29ca059465e82 +Author: mayue +Date: Mon Nov 15 16:18:26 2021 +0800 + + * Modify branch. + +commit eee668f6d9a62907f751c2452d18af002ea14a93 +Merge: 8620758bfc b175a5057b +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 08:18:02 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16293' into 'sprint/170' + + * Fix bug #16293. + + See merge request easycorp/zentaopms!461 + +commit b175a5057b9ac84ea6c8555743c50b8502f26cdd +Author: tianshujie +Date: Mon Nov 15 16:13:51 2021 +0800 + + * Fix bug #16293. + +commit 2c0601b7225b7ae486084231c39f3ea5f925bf38 +Author: Hao Sun +Date: Mon Nov 15 16:06:58 2021 +0800 + + * update kanban lib and fix rerender not work as expected. + +commit 6e2b90bb3361be71c5aeab0f8298d48c2d62aa71 +Merge: 9fb523740f 5fbdcff3c2 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 08:05:49 2021 +0000 + + Merge branch 'sprint/168_sgm_waterfall' into 'sprint/168' + + * Add measurement menu. + + See merge request easycorp/zentaopms!459 + +commit 6c240f4b38da4038ea591336b336ba16a727bc26 +Author: 王怡栋 +Date: Mon Nov 15 16:02:08 2021 +0800 + + * code for task #44335. + +commit 5fbdcff3c29e38651f4e4ce85b6cd0a31a838ae4 +Author: 孙广明 +Date: Mon Nov 15 16:01:16 2021 +0800 + + * Add measurement menu. + +commit 9fb523740fb65b476792e1fe4b20328e9c5ec61c +Merge: 62f06ab604 184629174c +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 07:55:10 2021 +0000 + + Merge branch 'sprint/168_sgm_16129' into 'sprint/168' + + Sprint/168 sgm 16129 + + See merge request easycorp/zentaopms!456 + +commit 8620758bfc9566ec8563e0d55d2837842d3649cb +Merge: 152326a33e 4bc73b9223 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 07:54:25 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16304' into 'sprint/170' + + * Fix bug 16304. + + See merge request easycorp/zentaopms!458 + +commit 184629174ceaea10d34d657f5c96b90ff1b79349 +Author: 孙广明 +Date: Mon Nov 15 15:53:54 2021 +0800 + + * Adjust create project page. + +commit 4bc73b9223cf54984a9f8e315c68cb6d96d12095 +Author: tianshujie +Date: Mon Nov 15 15:49:00 2021 +0800 + + * Fix bug 16304. + +commit 62f06ab604017c20b07dd0de3ca8ab46a0bf4fc0 +Merge: aa50ceb485 939023de6d +Author: 孙广明 +Date: Mon Nov 15 07:40:44 2021 +0000 + + Merge branch 'sprint/169_tanghucheng_max_44023' into 'sprint/168' + + * Finish task #44023 for max. + + See merge request easycorp/zentaopms!451 + +commit 152326a33e9022d1a30863750031177cc54215a9 +Merge: 182ab9a55b f77166bfb3 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 07:09:54 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_16297' into 'sprint/170' + + * Fix bug #16297 + + See merge request easycorp/zentaopms!457 + +commit 0c2c05331f23b1f89c4df74e876b9f50c1895f24 +Author: 王怡栋 +Date: Mon Nov 15 14:56:27 2021 +0800 + + * adjust for programs and products api. + +commit 182ab9a55bbc65a159f10d521ee31de83abd15b3 +Merge: 46ce0e09e8 f849667ce3 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 06:47:26 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16296' into 'sprint/170' + + * Fix bug #16296. + + See merge request easycorp/zentaopms!455 + +commit f77166bfb3644de7cf51213035fe27aa942d27ac +Author: songchenxuan +Date: Mon Nov 15 14:47:13 2021 +0800 + + * Fix bug #16297 + +commit f849667ce3de7b73a35b58398eca4371a8bb006d +Author: tianshujie +Date: Mon Nov 15 14:36:48 2021 +0800 + + * Fix bug #16296. + +commit 46ce0e09e8a953d94ca1db31ecd8c04cd5dbee3b +Merge: 878b22f8ca 73b5f5e057 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 05:46:24 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_bug' into 'sprint/170' + + * Product-Settings-Branch/platform-Language item + + See merge request easycorp/zentaopms!454 + +commit 73b5f5e057c51ab2f097aa661a46640dfece4d43 +Author: songchenxuan +Date: Mon Nov 15 13:44:26 2021 +0800 + + * Product-Settings-Branch/platform-Language item + +commit 878b22f8caaa4fcc4383b07534d96f494788b575 +Merge: ba6a2cd512 de30e9216d +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 05:32:14 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_codeforbug' into 'sprint/170' + + * Product->Setting Language item modification. + + See merge request easycorp/zentaopms!444 + +commit cf7ed682f0d7949a1dcc1e8d670f73515a775102 +Author: zenggang +Date: Mon Nov 15 05:31:10 2021 +0000 + + * Finish task#43852 + +commit ba6a2cd5124336ca4020dcaed3bcc3becd784ec1 +Merge: 1b2cf5ca09 ccb98adb41 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 05:23:45 2021 +0000 + + Merge branch 'sprint/170_zhouxin_16209' into 'sprint/170' + + Fix bug #16209. + + See merge request easycorp/zentaopms!452 + +commit 1b2cf5ca09df0c72f25a5246bb674f28007d5757 +Merge: a8523d317a f6884fd700 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 05:14:37 2021 +0000 + + Merge branch 'sprint/170_xieqiyu_upgrade' into 'sprint/170' + + Sprint/170 xieqiyu upgrade + + See merge request easycorp/zentaopms!453 + +commit f6884fd700b5c75baacb26740cb2a23da04b6a55 +Author: xieqiyu +Date: Mon Nov 15 13:09:42 2021 +0800 + + * Modify comment. + +commit 55e0e9591be790f8c9193289d01043264f7bfced +Author: xieqiyu +Date: Mon Nov 15 13:07:07 2021 +0800 + + * Process branch and module when upgrade. + +commit a8523d317a049b9e41d47743a02f2cebf1cc55d2 +Merge: 4719289333 b5ab5a03d7 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 05:05:00 2021 +0000 + + Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170' + + Finish task #43916. + + See merge request easycorp/zentaopms!437 + +commit d6cd8a284efae699d1e33182dccef0456d654513 +Author: 王怡栋 +Date: Mon Nov 15 11:31:12 2021 +0800 + + * adjust for api. + +commit de30e9216d53a10ad8f07ef6abc7abcf90880bb7 +Author: songchenxuan +Date: Mon Nov 15 11:03:54 2021 +0800 + + * Product->Setting Language item modification. + +commit 7cebe10e8d4055c6774b8b2dccafdab3955cc4ea +Author: songchenxuan +Date: Mon Nov 15 10:55:24 2021 +0800 + + * Product->Setting Language item modification. + +commit ccb98adb415b9fe5b21fc9d1cdbca36a4f94f3b7 +Author: zhouxin +Date: Mon Nov 15 10:44:29 2021 +0800 + + Fix bug #16209. + +commit 939023de6db84760c399b0607c6ca62c680635a4 +Author: tanghucheng +Date: Mon Nov 15 10:19:35 2021 +0800 + + * Finish task #44023 for max. + +commit b5ab5a03d796dd34f642fe00d3c00c6c5c11c576 +Author: zhouxin +Date: Mon Nov 15 10:07:01 2021 +0800 + + Finish task #43916. + +commit 4719289333b6d2e80f7cd94e7075a76aa0d88ff7 +Merge: dbf8840697 17ee3c0980 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 02:04:36 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16248' into 'sprint/170' + + * Fix bug #16248. + + See merge request easycorp/zentaopms!450 + +commit 17ee3c0980e27f3a44432ba06526fee76264622a +Author: tianshujie +Date: Mon Nov 15 09:55:18 2021 +0800 + + * Fix bug #16248. + +commit c2d3d4a24b19a9ec1b6f7e22bece2d3dc961cc00 +Author: songchenxuan +Date: Mon Nov 15 09:42:16 2021 +0800 + + * Product->Setting Language item modification. + +commit dbf8840697904dd94fc7f74c75820ab647a4081d +Merge: ca0f02be21 92c5221f26 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 01:40:34 2021 +0000 + + Merge branch 'sprint/170_mayue_16223' into 'sprint/170' + + * Fix bug #16223. + + See merge request easycorp/zentaopms!449 + +commit ca0f02be2148b9b2ee784cdfbe95f7e7d5232390 +Merge: 9e74d7204a 12054383a6 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 01:35:56 2021 +0000 + + Merge branch 'sprint/170_hufangzhou_tree' into 'sprint/170' + + * Fix bug #16179. + + See merge request easycorp/zentaopms!448 + +commit 12054383a6d82e831ebcc9090f8fc9ccccb1ff95 +Author: hufangzhou +Date: Mon Nov 15 09:28:58 2021 +0800 + + * Fix bug #16179. + +commit 92c5221f268efa5b95c9333e5bd1ba2cedbb3f00 +Author: mayue +Date: Mon Nov 15 09:08:40 2021 +0800 + + * Fix bug #16223. + +commit 93794998a9010fdb2fcf4f30c7bff7071aee55d9 +Author: 王怡栋 +Date: Mon Nov 15 09:06:14 2021 +0800 + + * code task #43747. + +commit 9e74d7204a8f62f73f9ed9bb593bae4470eabfaf +Merge: 5ede27a2c6 e441e4a28d +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 01:05:55 2021 +0000 + + Merge branch 'sprint/170_hufangzhou_tree' into 'sprint/170' + + * Fix the bugs. + + See merge request easycorp/zentaopms!447 + +commit 5ede27a2c6943ac325c3c01c2c943d39a93a5662 +Merge: 6839a8e23c a9ba1c9344 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 01:04:47 2021 +0000 + + Merge branch 'sprint/170_xieqiyu_16094' into 'sprint/170' + + * Fix bug#16094. + + See merge request easycorp/zentaopms!445 + +commit 6839a8e23c1ce1624d5ae7087348b9a90ca3f893 +Merge: 2adb14ae19 cce14cef80 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 15 01:04:13 2021 +0000 + + Merge branch 'sprint_xieqiyu_16188' into 'sprint/170' + + * Fix bug#16188. + + See merge request easycorp/zentaopms!446 + +commit aa50ceb485d88ac13aa6540e48b62ae934f6eedf +Merge: e638de03fa af1c32a406 +Author: 孙广明 +Date: Mon Nov 15 00:51:01 2021 +0000 + + Merge branch 'spirnt/171_liyuchun_16208' into 'sprint/168' + + * Fix bug #16208. + + See merge request easycorp/zentaopms!430 + +commit e441e4a28d57d4ecef70b0f2901fdd5fa24f8f6e +Author: hufangzhou +Date: Mon Nov 15 08:50:05 2021 +0800 + + * Fix the bugs. + +commit 66d7d68f950f3204390ad644d9dd081fb3f5577a (tag: zentaopms_app.1.0.beta10_20211115) +Author: 王怡栋 +Date: Mon Nov 15 08:41:11 2021 +0800 + + * adjust for task #43747. + +commit 1feb6d2b2fe93bf612131ab395cf45bb038ecfb9 +Author: 王怡栋 +Date: Mon Nov 15 08:37:51 2021 +0800 + + * code for task #43747. + +commit e638de03faf9659b18930a76032b9fd02501253a +Merge: ea65af554a 7dd3525a66 +Author: 孙广明 +Date: Mon Nov 15 00:33:26 2021 +0000 + + Merge branch 'spirnt/171_liyuchun_bug' into 'sprint/168' + + * Fix bug #16165. + + See merge request easycorp/zentaopms!429 + +commit ea65af554a30628b02c0d54c15fbe8d7ade89e06 +Merge: 68653946e5 2e90a1670a +Author: 朱金勇 +Date: Sun Nov 14 09:46:19 2021 +0000 + + Merge branch 'sprint/168_sunhao/kanban_lib' into 'sprint/168' + + * Update kanban component and fix rerender not work with sub columns. + + See merge request easycorp/zentaopms!432 + +commit 2adb14ae1982f8e9dfd00f6e18800f6aa4364a9a +Merge: 8851c7878b 37071ded1f +Author: 朱金勇 +Date: Sun Nov 14 09:46:04 2021 +0000 + + Merge branch 'sprint/170_sunhao/improve_pie_chart' into 'sprint/170' + + * Fix CanvasRenderingContext2D error when init progress-pie plugin. + + See merge request easycorp/zentaopms!439 + +commit a9ba1c934422b7f666664f099d57ab464f1a7fe9 +Author: xieqiyu +Date: Sun Nov 14 14:18:40 2021 +0800 + + * Fix bug#16094. + +commit cce14cef80de6fc41ea00e9ef86411bb8c862d12 +Author: xieqiyu +Date: Sun Nov 14 10:47:12 2021 +0800 + + * Fix bug#16188. + +commit 8dc0a669e9d9821212a084a52c76a4f8ceb35d97 +Author: dingguodong +Date: Fri Nov 12 18:15:02 2021 +0800 + + * Correct bad comments or bad code style. + +commit b8655275129380a671c316001308d3fa033c6b71 +Author: dingguodong +Date: Fri Nov 12 18:14:10 2021 +0800 + + * Optimize codes that add a same webhook only once and others. + +commit 39210758954463481aa58791a5568a3a6fe6446a +Author: mayue +Date: Fri Nov 12 17:55:58 2021 +0800 + + * Fix bug #16223. + +commit 2f5e351b2c81eee8dae552684c777133770b4014 +Author: dingguodong +Date: Fri Nov 12 17:04:20 2021 +0800 + + * Fix bug that compile status of the MR not synced. + +commit 9ae77a27654e5ededad815037bace8122c8569a1 +Author: songchenxuan +Date: Fri Nov 12 15:54:10 2021 +0800 + + * Product->Setting Language item modification. + +commit 8851c7878b16f8cb5ab0b894ed8015c12f6166cc +Merge: 77b697c991 bc2560fd95 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 12 07:37:34 2021 +0000 + + Merge branch 'sprint/170_tianshujie_merge' into 'sprint/170' + + * Merge conflict. + + See merge request easycorp/zentaopms!443 + +commit bc2560fd957f35fd1fc8e2f26bdfca56b979ff14 +Author: tianshujie +Date: Fri Nov 12 15:36:29 2021 +0800 + + * Remove spaces. + +commit a3da8bf0e067ba545202fb012f8e17b89e8abbf9 +Author: tianshujie +Date: Fri Nov 12 15:33:35 2021 +0800 + + * Merge conflict. + +commit 77b697c991a366c471172f20a6eb1924e1eb2df4 +Merge: c55cc7844c 9686f7e13e +Author: liyuchun +Date: Fri Nov 12 15:31:52 2021 +0800 + + Merge branch 'sprint/170_tianshujie_16194' into sprint/170 + +commit 9686f7e13e4598a6c0dcb6d2f6b2f2f396c89b16 +Merge: 48d7682b0f c55cc7844c +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 12 07:31:40 2021 +0000 + + Merge branch 'sprint/170' into 'sprint/170_tianshujie_16194' + + # Conflicts: + # module/project/control.php + +commit c55cc7844ccb3cddd8232c5feb22bcd0a639da83 +Merge: 9230c6a413 8352d145f5 +Author: 孙广明 +Date: Fri Nov 12 07:30:52 2021 +0000 + + Merge branch 'sprint/170_hufangzhou_tree' into 'sprint/170' + + * Deal with the branch is empty. + + See merge request easycorp/zentaopms!442 + +commit 8352d145f5637641fa771699482aafdf9a94528e +Author: hufangzhou +Date: Fri Nov 12 15:22:47 2021 +0800 + + * Deal with the branch is empty. + +commit 9230c6a413afca0e21ec559838f24502b75db4ae +Merge: 73a9a43999 0c7bcaf928 +Author: 孙广明 +Date: Fri Nov 12 07:22:10 2021 +0000 + + Merge branch 'sprint/170_liyuchun_bug' into 'sprint/170' + + * Fix error of manage product. + + See merge request easycorp/zentaopms!441 + +commit 48d7682b0f8fb9bc731c47fb158e6437061fe98a +Author: tianshujie +Date: Fri Nov 12 15:18:26 2021 +0800 + + * Modify the code issue. + +commit 0c7bcaf9280baaf9bd7aa14d2e6b7a238b6a99dd +Author: liyuchun +Date: Fri Nov 12 15:07:42 2021 +0800 + + * Fix error of manage product. + +commit 50b4590655adef7e0897f5eed5db54e408319759 +Author: tianshujie +Date: Fri Nov 12 14:53:51 2021 +0800 + + * Fix bug #16194. + +commit 73a9a43999e61fd29c418d54914a69e823bcbb54 +Merge: fe15f97b82 225d83b304 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 12 06:52:14 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_16186' into 'sprint/170' + + * Fix bug #16186. + + See merge request easycorp/zentaopms!438 + +commit 37071ded1f3c5e877a9b50dfd8de2176a035bfb9 +Author: Hao Sun +Date: Fri Nov 12 14:35:59 2021 +0800 + + * fix CanvasRenderingContext2D error when init progress-pie plugin. + +commit 225d83b304ca60fb7644fa2b088c833be6b6dbb9 +Author: songchenxuan +Date: Fri Nov 12 14:29:25 2021 +0800 + + * Fix bug #16186. + +commit e57d1d1cc7beb9342092d7e9900a9036d321eb82 +Author: zhouxin +Date: Fri Nov 12 14:06:44 2021 +0800 + + Finish task #43916. + +commit fe15f97b827ef06152a06f4eff3dc66a7daef772 +Merge: 89396523ad 67687a738a +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 12 06:00:30 2021 +0000 + + Merge branch 'sprint/170_mayue_16221' into 'sprint/170' + + * Fix bug #16221. + + See merge request easycorp/zentaopms!436 + +commit 67687a738aea589d02ff5d6731e439d758125169 +Author: mayue +Date: Fri Nov 12 13:58:02 2021 +0800 + + * Fix bug #16221. + +commit 7dd4586d4683fa2f0597e11798880ba2ec0c0923 +Author: 王怡栋 +Date: Fri Nov 12 13:51:26 2021 +0800 + + * adjust for api. + +commit 89396523ad87992155a5305ca6a6ab94440de474 +Merge: e237e5267c 54d69e1969 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 12 05:25:50 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16190' into 'sprint/170' + + * Fix bug #16190. + + See merge request easycorp/zentaopms!434 + +commit 68653946e59f4c626011e703d7139e369b5aac4d +Merge: be6d12a15e 4bc3f4c03a +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 12 05:24:19 2021 +0000 + + Merge branch 'sprint/171_sgm_sortwiki' into 'sprint/168' + + Sprint/171 sgm sortwiki + + See merge request easycorp/zentaopms!435 + +commit be6d12a15e91cdb2f26ef823f941faa6016db22f +Merge: 7130de00a8 1838b65ad1 +Author: 孙广明 +Date: Fri Nov 12 05:20:24 2021 +0000 + + Merge branch 'sprint/171_liyuchun_16182' into 'sprint/168' + + Sprint/171 liyuchun 16182 + + See merge request easycorp/zentaopms!431 + +commit 54d69e1969cd5bcb4c3113ca33294bfd5a2322d3 +Author: tianshujie +Date: Fri Nov 12 13:19:18 2021 +0800 + + * Fix bug #16190. + +commit 4bc3f4c03a206f554fbae7d35c43d4fdcb0f64cc +Author: 孙广明 +Date: Fri Nov 12 13:17:37 2021 +0800 + + * Fix details. + +commit e237e5267cbcc80effcd27a8ae1ec4474789e455 +Merge: b71f540905 1dd4bbc079 +Author: 孙广明 +Date: Fri Nov 12 05:17:02 2021 +0000 + + Merge branch 'sprint/170_wangyidong' into 'sprint/170' + + * fix bug for get tree menu in project view. + + See merge request easycorp/zentaopms!428 + +commit 7130de00a83edbee5d9740459a3edf5e4b4a0949 +Merge: fe230065c3 6890e9535f +Author: 孙广明 +Date: Fri Nov 12 05:13:54 2021 +0000 + + Merge branch 'sprint/168_sunhao/doc_tree_sortable' into 'sprint/168' + + * Fix drop shadow element position. + + See merge request easycorp/zentaopms!433 + +commit 44bfbb7cdc245490d2ba5b9fbfd11a6094eef809 +Author: tianshujie +Date: Fri Nov 12 13:10:52 2021 +0800 + + * Fix bug #16190. + +commit 9d6c421176afada21ebbc1f86bda7da11e81bb66 +Author: 孙广明 +Date: Fri Nov 12 13:03:56 2021 +0800 + + * Fix bug #16203. + +commit 2e90a1670a6d7860b7532d1606f3bd47bed206ca +Author: Hao Sun +Date: Fri Nov 12 11:36:55 2021 +0800 + + * update kanban component and fix update not work with sub columns. + +commit 6890e9535faa938fa5e9d1984fa087a9f913aba5 +Author: Hao Sun +Date: Fri Nov 12 11:35:50 2021 +0800 + + * fix drop shadow element position. + +commit 1838b65ad165fca0303604578c9c07a26afc55aa +Author: liyuchun +Date: Fri Nov 12 11:29:46 2021 +0800 + + * Fix bug #16182. + +commit f04e055db683ac3a07b07ad71765d7c84be39ce2 +Merge: 96c9cad4d9 c55cee174d +Author: xiawenlong +Date: Fri Nov 12 11:25:54 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit 96c9cad4d9948d8f46654b6e2b5386100a5051db +Author: xiawenlong +Date: Fri Nov 12 11:25:52 2021 +0800 + + * delete un unsed code + +commit 70c1981893da961a7e593abcb7604845ac9af796 +Author: 孙广明 +Date: Fri Nov 12 11:23:35 2021 +0800 + + * Fix bug #16059. + +commit 7dd3525a663334c130263435d7c64a7ffdfe2d8a +Author: liyuchun +Date: Fri Nov 12 11:17:42 2021 +0800 + + * Fix bug #16163. + +commit fa1ffa32bbae92be370b4d42f0d4263fd33ade2a +Author: liyuchun +Date: Fri Nov 12 11:13:37 2021 +0800 + + * Fix bug #16163. + +commit 1ae2cffc7c39034f8bb6ebcf7c7f997f894bb730 +Author: liyuchun +Date: Fri Nov 12 11:01:04 2021 +0800 + + * Fix bug #16165. + +commit c55cee174d5886ea36c5dbf86fbb29c20694d132 +Author: zenggang +Date: Fri Nov 12 02:55:33 2021 +0000 + + * Show gitlab project name with namespace + +commit b71f540905bf1f45e9e59affeda157221305f2bf +Merge: 98caaec0ea 2dbfab7e5a +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 12 02:46:18 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_16043' into 'sprint/170' + + * Fix bug #16043. + + See merge request easycorp/zentaopms!427 + +commit fe230065c338823ecf98c170870c9fb31a6a37e3 +Merge: be0606058f 4865431f22 +Author: 孙广明 +Date: Fri Nov 12 02:45:01 2021 +0000 + + Merge branch 'spirnt/171_liyuchun_bug' into 'sprint/168' + + Spirnt/171 liyuchun bug + + See merge request easycorp/zentaopms!426 + +commit 4485893d575ace7276fefc8c51c7964f49f72d27 +Merge: 48fff67403 430ded3626 +Author: dingguodong +Date: Fri Nov 12 10:40:08 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit 48fff67403656de5a6efcfad91ab7fc454269361 +Author: dingguodong +Date: Fri Nov 12 10:39:18 2021 +0800 + + * Optimize browsing the merge requests. + +commit b68cbf646dc5e2fbe970145566deecdb747b6176 +Author: 王怡栋 +Date: Fri Nov 12 10:38:29 2021 +0800 + + * code for task #43751. + +commit 4865431f22b21adf1430bc49cb1f12cfb49aadb3 +Author: liyuchun +Date: Fri Nov 12 10:36:57 2021 +0800 + + * Fix bug #16166. + +commit 430ded36261ce5af7ba883232eadac538ec8f028 +Author: zenggang +Date: Fri Nov 12 02:36:43 2021 +0000 + + * Finish task#43849,43851 + +commit 1dd4bbc079f4616863f239a4017794590fd53c67 +Author: 王怡栋 +Date: Fri Nov 12 10:35:13 2021 +0800 + + * fix bug for get tree menu in project view. + +commit 2dbfab7e5a724bed5299592d5701d4dc9a8a2745 +Author: songchenxuan +Date: Fri Nov 12 10:29:30 2021 +0800 + + * Fix bug #16043. + +commit 36b10d398315ad22ef431fadcfd0f7fa5c5511f6 +Author: liyuchun +Date: Fri Nov 12 10:19:41 2021 +0800 + + * Fix bug #16173. + +commit 98caaec0ea47ed9bd1166b98b81406c66d4e342f +Merge: bac8da4180 bf08427c9a +Author: 孙广明 +Date: Fri Nov 12 02:11:00 2021 +0000 + + Merge branch 'sprint/170_hufangzhou_bug' into 'sprint/170' + + * Modify the cookie of storyModule. + + See merge request easycorp/zentaopms!424 + +commit bac8da41805f7a8b3d3a9322c7cd568dddfe205c +Merge: e75aee2b1e d160b6b0f5 +Author: 孙广明 +Date: Fri Nov 12 02:10:37 2021 +0000 + + Merge branch 'sprint/170_hufangzhou_16219' into 'sprint/170' + + * Fix bug #16219. + + See merge request easycorp/zentaopms!425 + +commit d160b6b0f566196ce6a7cd624439988bba6d63bf +Author: hufangzhou +Date: Fri Nov 12 10:07:28 2021 +0800 + + * Fix bug #16219. + +commit c004b06e1ededa43d6b3399611daf843903ca154 +Author: xiawenlong +Date: Fri Nov 12 09:48:11 2021 +0800 + + finish webhook. + +commit bf08427c9a5cd150b1de3f11f1ae0e93409edcc5 +Author: hufangzhou +Date: Fri Nov 12 09:45:43 2021 +0800 + + * Modify the cookie of storyModule. + +commit 278bb3064628a7fdd9197cdb944af9db540290d2 +Author: 孙广明 +Date: Fri Nov 12 09:45:18 2021 +0800 + + * Fix bug #16055. + +commit d9da6613ace62c2c89193797ce84cbbb4ec943f1 +Author: 孙广明 +Date: Fri Nov 12 09:32:34 2021 +0800 + + * Fix bug #16050. + +commit a075c7253127c4567831120d4eec38188b929a01 +Author: 孙广明 +Date: Fri Nov 12 09:28:37 2021 +0800 + + * Fix execution update order. + +commit ca49d7d380a202d700d0c4e668bcbaf78e5c8d76 +Author: 王怡栋 +Date: Fri Nov 12 09:28:10 2021 +0800 + + * code for task #43751. + +commit 7d4e1240cdf649c2b4d70b5ce17432503d232841 +Author: liyuchun +Date: Fri Nov 12 09:12:20 2021 +0800 + + * Fix bug #16174. + +commit cc75d052805a31ed21cf61767c60b6d2de31acc1 +Author: liyuchun +Date: Fri Nov 12 09:05:52 2021 +0800 + + * Adjust lane name when update kanban lane. + +commit e75aee2b1e125fafc412d65e0ba951ea16925243 +Merge: 89802252fc ca5e8e6090 +Author: 孙广明 +Date: Fri Nov 12 01:04:17 2021 +0000 + + Merge branch 'sprint/170_leiyong' into 'sprint/170' + + * Do not query deleted webhook configurations. + + See merge request easycorp/zentaopms!418 + +commit 89802252fc633d8fea952d831ba0bfca20fc8dd7 +Merge: 27a4b1e560 e349618c4c +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 12 00:57:26 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16205' into 'sprint/170' + + * Fix bug #16205. + + See merge request easycorp/zentaopms!423 + +commit e349618c4cce467c5e120fdf71972dfc1336acac +Author: tianshujie +Date: Fri Nov 12 08:48:52 2021 +0800 + + * Fix bug #16205. + +commit 382e3103d04db6e5a1cae398de9580d226961b81 +Author: tianshujie +Date: Fri Nov 12 08:46:19 2021 +0800 + + * Fix bug #16205. + +commit af1c32a406588d08004847e0f711aaaa3a8ba54f +Author: liyuchun +Date: Fri Nov 12 08:43:50 2021 +0800 + + * Fix bug #16208. + +commit be0606058f22dbe149bbcec04cb6c8a8984c1526 +Merge: 9eed12e7f4 af0b70bb6a +Author: 孙广明 +Date: Fri Nov 12 00:39:18 2021 +0000 + + Merge branch 'sprint/168_tanghucheng_index_js' into 'sprint/168' + + * Adjust index.js for zentaomax. + + See merge request easycorp/zentaopms!422 + +commit af0b70bb6aeb02bbf71b44b7928f021d61abf056 +Author: tanghucheng +Date: Fri Nov 12 08:20:33 2021 +0800 + + * Adjust index.js for zentaomax. + +commit 27a4b1e56014b37ae0a5dfeb6cfea5be91bfa15a +Merge: f4317f05ec 17bee6e900 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 12 00:12:48 2021 +0000 + + Merge branch 'sprint_xieqiyu_fixbug' into 'sprint/170' + + * Fix bug#16197. + + See merge request easycorp/zentaopms!420 + +commit f4317f05ece9d179a93e7d04cefbce2954dd8cf6 +Merge: 1515e07c04 34ad92ab78 +Author: 李玉春 <563917701@qq.com> +Date: Fri Nov 12 00:11:40 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16195' into 'sprint/170' + + * Fix bug #16195. + + See merge request easycorp/zentaopms!419 + +commit 24966356bc26ad8a1f9a5088eb722af2df8f019a +Author: dingguodong +Date: Thu Nov 11 19:16:05 2021 +0800 + + * Optimize codes related to handle GitLab webhook and others. + +commit acb23a5053ea7197a0c0d008eccf58058df1f11a +Author: dingguodong +Date: Thu Nov 11 18:29:59 2021 +0800 + + * Change function comment and resolve others which unexpected. + +commit 2082fe56d1ca8243ff8e0ac20f8c2edc7a9396cd +Merge: 60ef7e6c4d d6fe248caf +Author: dingguodong +Date: Thu Nov 11 18:29:11 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit 60ef7e6c4de71152ac396d1948ecc2c8b71d907b +Author: dingguodong +Date: Thu Nov 11 18:28:21 2021 +0800 + + * Optimize functions which related to GitLab webhook API. + +commit d6fe248caf8dcddfbc30e0cecdca8cdf297d4cfb +Merge: 976e00197f 6ce5b1de33 +Author: xiawenlong +Date: Thu Nov 11 18:16:03 2021 +0800 + + Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon + +commit 976e00197f2ce018ce225cbbae89818ef73209b8 +Author: xiawenlong +Date: Thu Nov 11 18:16:01 2021 +0800 + + update gitlab webhook + +commit 34ad92ab788a003bc94e63574e421268e0182b34 +Author: tianshujie +Date: Thu Nov 11 17:50:47 2021 +0800 + + * Modify the judgment logic. + +commit 17bee6e9002b0c903fe4a5b0d0ba68177ea0705d +Author: xieqiyu +Date: Thu Nov 11 17:46:10 2021 +0800 + + * Fix bug#16197. + +commit b218a43b63c44ece35c6b6b54c1737e74cbb6c89 +Author: tianshujie +Date: Thu Nov 11 17:38:27 2021 +0800 + + * Fix bug #16195. + +commit ca5e8e60900cf7ce18c07d35c20aec72d1601112 +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 11 09:27:36 2021 +0000 + + * Do not query deleted webhook configurations. + +commit 6ce5b1de33516f1f99a5e505b7c1574e12c72813 +Author: dingguodong +Date: Thu Nov 11 17:24:09 2021 +0800 + + * Correct bad code style and resolve others. + +commit 1515e07c04d3c01774731e71eb678aeab9523258 +Author: zhujinyong +Date: Thu Nov 11 17:19:55 2021 +0800 + + * Fix bugs: Compatibility for old version. + +commit 4082d78ff06916971cabb30e3430cc3ee675084c +Merge: 39902ea40e 9617d52d93 +Author: 朱金勇 +Date: Thu Nov 11 08:50:53 2021 +0000 + + Merge branch 'sprint/170_sunhao/task44164' into 'sprint/170' + + * Task #44164, update task list after close modal. + + See merge request easycorp/zentaopms!404 + +commit 9eed12e7f42a01db10a9cbd3350ff7dc836205b6 +Merge: 198ef01629 06c1daf5fd +Author: 孙广明 +Date: Thu Nov 11 08:46:24 2021 +0000 + + Merge branch 'sprint/168_liyuchun_44216' into 'sprint/168' + + * Finish task #44217,#44218,#44219,#44220. + + See merge request easycorp/zentaopms!405 + +commit 198ef0162980016de31fa480d42d49417a3434b9 +Merge: b0d73a4e6c a742b36ef7 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 08:46:23 2021 +0000 + + Merge branch 'sprint/171_sgm_sortwiki' into 'sprint/168' + + * Finish task #43987. + + See merge request easycorp/zentaopms!417 + +commit 39902ea40e906d058b4340f5eea8c37fb822880d +Merge: 00abaf7745 1f8bb88e8c +Author: 孙广明 +Date: Thu Nov 11 08:41:57 2021 +0000 + + Merge branch 'sprint/170_wangyidong' into 'sprint/170' + + * revert ajaxSetUnfoldID. + + See merge request easycorp/zentaopms!416 + +commit a742b36ef7d84e18c9ddb4a1c262c2ddc1c4d141 +Author: 孙广明 +Date: Thu Nov 11 16:40:53 2021 +0800 + + * Finish task #43987. + +commit 00abaf7745a69e3c14b1ea16bc38dfa4da2f4d7a +Merge: 2ff4571f77 93c8bb6ba8 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 08:33:28 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16192' into 'sprint/170' + + * Fix bug #16192. + + See merge request easycorp/zentaopms!415 + +commit 93c8bb6ba8a77fd53474cb8fc91cfbd06d17c0e7 +Author: tianshujie +Date: Thu Nov 11 16:32:29 2021 +0800 + + * Modify the judgment logic. + +commit 2ff4571f77ed5ffaf7f8aa5213efce79d20b0159 +Merge: c8b1eaef62 a8f6836d46 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 08:32:14 2021 +0000 + + Merge branch 'sprint/170_hufangzhou_16169' into 'sprint/170' + + * Fix bug #16169, bug#16179. + + See merge request easycorp/zentaopms!412 + +commit a8f6836d46852f8e09d23d2b69ab83f6c8198056 +Author: hufangzhou +Date: Thu Nov 11 16:30:41 2021 +0800 + + * Remove the unused code. + +commit 1f8bb88e8c537ed6febf539912e23e0a1e910c8d +Author: 王怡栋 +Date: Thu Nov 11 16:19:56 2021 +0800 + + * revert ajaxSetUnfoldID. + +commit c8b1eaef628cf6803fe629e38b8e215b40a6e414 +Merge: 2c296a129b f8eebdf678 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 08:19:38 2021 +0000 + + Merge branch 'sprint/170_mayue_16191' into 'sprint/170' + + * Fix bug #16191. + + See merge request easycorp/zentaopms!414 + +commit 78aee66c47e4fd48e534e4026048c67861dc939c +Author: tianshujie +Date: Thu Nov 11 16:18:54 2021 +0800 + + * Fix bug #16192. + +commit 2c296a129bbb52c7ef32f6075f37382bd8c47677 +Merge: 81f49bd434 7fb8685e04 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 08:09:59 2021 +0000 + + Merge branch 'sprint/170_tianshujie_16190' into 'sprint/170' + + * Fix bug #16190. + + See merge request easycorp/zentaopms!411 + +commit f8eebdf67860c9be1d0563df7a70f1b0ac32295f +Author: mayue +Date: Thu Nov 11 16:08:03 2021 +0800 + + * Fix bug #16191. + +commit 7fb8685e042d62f581faae9613cc1ecfe684c64a +Author: tianshujie +Date: Thu Nov 11 16:01:51 2021 +0800 + + * Fix the problem of reporting errors in batch editing stories. + +commit 81f49bd434915376e451dabd55d1037c730a303d +Merge: 15196aca58 c9996a26ec +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 08:01:22 2021 +0000 + + Merge branch 'sprint/170_mayue_43892' into 'sprint/170' + + * Fix bug #16191. + + See merge request easycorp/zentaopms!413 + +commit c9996a26eca445183f6fb708a3c298539d7a4e58 +Author: mayue +Date: Thu Nov 11 15:54:22 2021 +0800 + + * Fix bug #16191. + +commit fd9423c737a69c4d72544dd77a8144c7171394ba +Author: tianshujie +Date: Thu Nov 11 15:42:42 2021 +0800 + + * Remove useless code. + +commit 4163d17335b87933953c1de99ee902738359ab13 +Author: hufangzhou +Date: Thu Nov 11 15:31:37 2021 +0800 + + * Fix bug #16169, bug#16179. + +commit 2eb1a008819421471f27eddc98475699440bdd88 +Author: tianshujie +Date: Thu Nov 11 15:25:29 2021 +0800 + + * Fix bug #16190. + +commit 4f4b683dbd421667aa5e7086cbd97aa255ef34ee +Author: tianshujie +Date: Thu Nov 11 15:20:01 2021 +0800 + + * Fix bug #16190. + +commit 06c1daf5fdb79717a63599d673a673660c582d08 +Author: liyuchun +Date: Thu Nov 11 15:12:16 2021 +0800 + + * Finish task #44216. + +commit 5bb53b10007193402c184fe13657cf608c6d95fe +Author: liyuchun +Date: Thu Nov 11 15:02:56 2021 +0800 + + * Finish task #44216. + +commit 15196aca58b8f788e0513b52c8ce4640961cbc7a +Merge: a02ebf672e f6f75dace2 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 06:50:43 2021 +0000 + + Merge branch 'sprint/170_tianshujie_43893' into 'sprint/170' + + * Fix the problem of reporting errors on the batch editing story page. + + See merge request easycorp/zentaopms!407 + +commit a02ebf672e9b9668d35dea82ddf4dc2433024d4f +Merge: f90072b45a dfa82c09db +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 06:49:40 2021 +0000 + + Merge branch 'sprint/170_mayue_43892' into 'sprint/170' + + * Finish task #43892. + + See merge request easycorp/zentaopms!410 + +commit f6f75dace2d734ad09fdaf5a5abd5bab91385dd5 +Author: tianshujie +Date: Thu Nov 11 14:49:34 2021 +0800 + + * Modify the issue of batch and zero editing stories. + +commit dfa82c09db0958e24398d86e1f865be69f194625 +Author: mayue +Date: Thu Nov 11 14:48:02 2021 +0800 + + * Finish task #43892. + +commit 67ace49bea5a0eba0fc7032bded0da5f41318d85 +Author: mayue +Date: Thu Nov 11 14:39:21 2021 +0800 + + * Finish task #43892. + +commit f90072b45a0d7fe2add42601786511978e582053 +Merge: 26fec84d76 5f6bc547a3 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 06:38:25 2021 +0000 + + Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170' + + * Fix the trunk display problem when execution manage products. + + See merge request easycorp/zentaopms!409 + +commit 789f650473915796ccad2a0243766b71b3bb28fa +Author: 王怡栋 +Date: Thu Nov 11 14:28:43 2021 +0800 + + * adjust for product progress report. + +commit 26fec84d76736c107e673e838abb34281fce914e +Merge: 8e1b542ca3 b1098e7040 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 06:20:29 2021 +0000 + + Merge branch 'sprint/170_xieqiyu_43890' into 'sprint/170' + + * Finish task#43890. + + See merge request easycorp/zentaopms!408 + +commit 5f6bc547a3672087fe508e70f90217109336b508 +Author: tianshujie +Date: Thu Nov 11 14:15:06 2021 +0800 + + * Fix the problem of obtaining plan. + +commit 9536d3caa8df209193c1d7774fb5638d4aeed215 +Author: dingguodong +Date: Thu Nov 11 14:05:47 2021 +0800 + + * Fill in the missing code of action module for MR review. + +commit 4940500fe19bc18a1022fe9cc862953a1f265cbf +Author: tianshujie +Date: Thu Nov 11 13:59:52 2021 +0800 + + * Fix the trunk display problem when execution manage products. + +commit af83e8a6397e2309dad95a3e0378dda1b9cc2d5c +Author: mayue +Date: Thu Nov 11 13:56:02 2021 +0800 + + * Resolve display of list Settings #43892. + +commit b1098e7040e156abcdf9830b09ac13a26e5234ba +Author: xieqiyu +Date: Thu Nov 11 13:53:24 2021 +0800 + + * Finish task#43890. + +commit edd64950abe01751e00f682e51536d89d22d837f +Author: tianshujie +Date: Thu Nov 11 13:44:27 2021 +0800 + + * Fix the problem of reporting errors on the batch editing story page. + +commit 8e1b542ca381050fe80c91c730b65515c0983bcb +Merge: c606215adb f20bb5bf9c +Author: 孙广明 +Date: Thu Nov 11 05:37:40 2021 +0000 + + Merge branch 'sprint/170_leiyong_44172' into 'sprint/170' + + Sprint/170 leiyong 44172 + + See merge request easycorp/zentaopms!406 + +commit b0d73a4e6cfb8d0ab04dfccf73180b0e89242e19 +Merge: e7d84b1d8a e79a153a1f +Author: 孙广明 +Date: Thu Nov 11 05:32:19 2021 +0000 + + Merge branch 'sprint/168_liyuchun_16054' into 'sprint/168' + + * Fix bug #16054. + + See merge request easycorp/zentaopms!374 + +commit e7d84b1d8a383ce57a49031d6e367ece4a1097c7 +Merge: 0db6339cb8 00912a7d52 +Author: 孙广明 +Date: Thu Nov 11 13:31:03 2021 +0800 + + Merge branch 'sprint/168_sunhao/doc_tree_sortable' into sprint/168 + +commit f20bb5bf9c0b39e5908f1d19eea0c21c85f5ccd8 +Merge: 088a6374df 08d0a5f2aa +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 11 05:29:48 2021 +0000 + + * Conflict resolution. + +commit e63706cb540729f0098bc4dc3d7333e6f7d0b9a7 +Merge: 00912a7d52 0db6339cb8 +Author: 孙广明 +Date: Thu Nov 11 05:28:40 2021 +0000 + + Merge branch 'sprint/168' into 'sprint/168_sunhao/doc_tree_sortable' + + # Conflicts: + # module/project/css/kanban.css + +commit 00912a7d52f54306ca813ccd50a9683678d91dbf +Author: 孙广明 +Date: Thu Nov 11 13:26:33 2021 +0800 + + * Finish task #43985. + +commit 088a6374dfdb6a607c2b8f72c77cc542dbda8734 +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 11 05:26:27 2021 +0000 + + * Finish task#44172,task#44273. + +commit 9617d52d9354a606852899546d8c175ef9baa031 +Author: Hao Sun +Date: Thu Nov 11 13:10:12 2021 +0800 + + * task #44164, update task list after close modal. + +commit 4604c3d496eca929176c46ca573a31276c4eeab8 +Author: liyuchun +Date: Thu Nov 11 12:32:20 2021 +0800 + + * Finish task #44217,#44218,#44219,#44220. + +commit c606215adbfe3de51b39ce1f4f8c539c58e7ae70 +Merge: e3549fe24c efa8f93a72 +Author: liyuchun +Date: Thu Nov 11 12:27:07 2021 +0800 + + Merge branch 'sprint/170_hufangzhou_16092' into sprint/170 + +commit efa8f93a725dc3b61f3132d047fa21874821acfa +Merge: 7d9793eaa3 e3549fe24c +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 05:08:31 2021 +0000 + + Merge branch 'sprint/170' into 'sprint/170_hufangzhou_16092' + + # Conflicts: + # module/product/model.php + +commit 7d9793eaa33c8d13c19a3b57a04fcf0f2eedbd6d +Author: hufangzhou +Date: Thu Nov 11 11:29:54 2021 +0800 + + * Modify the get by search. + +commit e3549fe24c8d84d9c4bc2da1e9e7a1edd8720321 +Merge: 39f712f005 c4c2356bf3 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 03:28:39 2021 +0000 + + Merge branch 'sprint/170_liumengyi_43909' into 'sprint/170' + + * Finish task #43909. + + See merge request easycorp/zentaopms!403 + +commit c4c2356bf32adb5ed2d4fa49b8ce762161580345 +Author: liumengyi +Date: Thu Nov 11 11:25:53 2021 +0800 + + * Finish task #43909. + +commit 39f712f005bf0cd001a896acba1dab447467d80f +Merge: eb62dcead9 fbf487dce8 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 03:23:04 2021 +0000 + + Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170' + + * Fix code errors. + + See merge request easycorp/zentaopms!402 + +commit fbf487dce8642eeea06f41a61150dd37b9606fa3 +Author: tianshujie +Date: Thu Nov 11 11:19:06 2021 +0800 + + * Fix code errors. + +commit eb62dcead9d0051f2856c5debe01389c3f8294d3 +Merge: 802ff05157 be094287b6 +Author: 孙广明 +Date: Thu Nov 11 03:16:43 2021 +0000 + + Merge branch 'sprint/170_zhengrunyu_44163' into 'sprint/170' + + *Finish task #44163. + + See merge request easycorp/zentaopms!399 + +commit 8e9f8b860e6dabe3f3958320b81185d49991dd76 +Author: hufangzhou +Date: Thu Nov 11 11:07:23 2021 +0800 + + * Fix bug #16092. + +commit be094287b68e4d4af77329ef39f6b88d059d090c +Author: zhengrunyu +Date: Thu Nov 11 11:03:20 2021 +0800 + + Finish task #44163. + +commit 802ff0515727c01dd1b3848e49cd4ce4ec8dc8ae +Merge: ef338371e1 ccf0c59981 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 02:56:41 2021 +0000 + + Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170' + + * Fix the problem of judging product permissions. + + See merge request easycorp/zentaopms!397 + +commit ccf0c5998196639af1c91903c64ef525186a86f6 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 02:56:33 2021 +0000 + + Update model.php + +commit 08d0a5f2aaa6ee95f4533caf58b1d5c9894736db +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 11 02:53:19 2021 +0000 + + * Finish task#44172,task#44273. + +commit d4e0ccdef0f51ed75dd97402c17c5990b95e7850 +Author: zhengrunyu +Date: Thu Nov 11 10:49:13 2021 +0800 + + *Finish task #44163. + +commit 8b9ee17312fa9fa997578ba4bbcb8638d11c9c51 +Author: tianshujie +Date: Thu Nov 11 10:47:28 2021 +0800 + + * Restore code. + +commit e2b3ba1066c779bce1cc926ccdba8e8548b9374b +Author: zhengrunyu +Date: Thu Nov 11 10:47:02 2021 +0800 + + *Finish task #44163. + +commit 160b1c9fca33d174e0a2966b59dbb4613991f6d7 +Author: tianshujie +Date: Thu Nov 11 10:44:07 2021 +0800 + + * Restore code. + +commit 467201be5dd150e354b5e985d1d2009d966bc36b +Author: Hao Sun +Date: Thu Nov 11 10:36:20 2021 +0800 + + * refactor: rename css class name to follow the code specification. + +commit e257cb37ceb99e21dccc1bc4717c2e516f121710 +Author: Hao Sun +Date: Thu Nov 11 10:35:00 2021 +0800 + + * make docs tree in left side sortable. + +commit 0db6339cb81e4dd8c854b541449b58b57c9ba52d +Author: 孙广明 +Date: Thu Nov 11 10:34:00 2021 +0800 + + * Hidden close project count. + +commit 0eaa75267f7b88b50e45bdfa823cb1325389b14f +Author: dingguodong +Date: Thu Nov 11 10:30:40 2021 +0800 + + * Correct the browse link in MR module. + +commit c08bd0faef2c758742fffb37aef7bd8c55da8f50 +Author: tianshujie +Date: Thu Nov 11 10:30:29 2021 +0800 + + * Fix the problem of judging product permissions. + +commit ce001d77e34dc33ba73ceccfae4b218df45f0869 +Author: tianshujie +Date: Thu Nov 11 10:27:24 2021 +0800 + + * Fix the problem of judging product permissions. + +commit 301d5b912ebce0ddd517e51c6a3854c88d4d12b5 +Author: zhengrunyu +Date: Thu Nov 11 10:20:58 2021 +0800 + + *Finish task #44163. + +commit ef338371e1d1d67ddb82c1703c9859ff6cbc9095 +Merge: b5ce9fa76b 41045ea4bc +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 02:20:28 2021 +0000 + + Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170' + + * Fix the problem of storing cookies in product branches. + + See merge request easycorp/zentaopms!396 + +commit 41045ea4bc01401110f982dd2e5a2a8819a4fbeb +Author: tianshujie +Date: Thu Nov 11 10:18:59 2021 +0800 + + * Replace session with productID. + +commit 118133afdd6b92a8d10abb4d9498fcaa46609f36 +Author: 王怡栋 +Date: Thu Nov 11 10:16:21 2021 +0800 + + * code for task #44190. + +commit 2ebd3b2b509f693898c4030ff5f6f901f231e40a +Author: tianshujie +Date: Thu Nov 11 10:13:01 2021 +0800 + + * Modify the logic of the product record session. + +commit 603f57a8265a648a4ba6f6a670ae429fd3f98e27 +Author: tianshujie +Date: Thu Nov 11 09:59:16 2021 +0800 + + * Fix the problem of storing cookies in product branches. + +commit db4ee8bbf8a6d9fb8d59b8e5dcd617fab94ad371 +Author: zhengrunyu +Date: Thu Nov 11 09:54:10 2021 +0800 + + *Finish task #44163. + +commit b5ce9fa76bed3c96f285710d4d37d71e16e1024a +Merge: 62e5231ec2 5582354037 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 01:48:45 2021 +0000 + + Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170' + + * Modify the SQL statement linked to the query story plan. + + See merge request easycorp/zentaopms!395 + +commit 5582354037f47524bc6f4e47ac30bf1aa6099ba4 +Author: tianshujie +Date: Thu Nov 11 09:42:37 2021 +0800 + + * When repairing the project and execution linked products, the branch judgment problem. + +commit 62e5231ec28e32578ff48c39c11a7dd18aa88574 +Merge: 595f911b82 877ebd38ad +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 01:38:37 2021 +0000 + + Merge branch 'sprint/170_xieqiyu' into 'sprint/170' + + Sprint/170 xieqiyu + + See merge request easycorp/zentaopms!385 + +commit 877ebd38ad2c3b3bc4d0ead3b1f358d3f53e5aa6 +Author: xieqiyu +Date: Thu Nov 11 09:37:40 2021 +0800 + + * Delete unused code. + +commit 00ced21b19931ff05a4fbf703daee70624430cf2 +Author: xieqiyu +Date: Thu Nov 11 09:34:30 2021 +0800 + + * Optimize the code. + +commit 595f911b822e7b607b2a4ca022c9019ea04ea4d7 +Merge: 6c98cdac94 9b1d2c6748 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 01:32:54 2021 +0000 + + Merge branch 'sprint/170_liumengyi_43909' into 'sprint/170' + + * Finish task #43909. + + See merge request easycorp/zentaopms!390 + +commit 9b1d2c67481406737fe91b1cf2c4905c6f637b72 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 01:32:46 2021 +0000 + + Update workload.html.php + +commit 869d0cc97e9c232cebd3059acf9efb864974aa97 +Author: liumengyi +Date: Thu Nov 11 09:20:48 2021 +0800 + + * Finish task #43909. + +commit e79a153a1f73feb27de1d2d1759d397b255783d4 +Author: liyuchun +Date: Thu Nov 11 09:19:05 2021 +0800 + + * Adjust code for error name. + +commit 4d9387059b7239c775407393402748c120707ecf +Merge: c50592d978 b99febf1b3 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 01:17:48 2021 +0000 + + Merge branch 'sprint/168_sgm_docbtn' into 'sprint/168' + + * Remove unused btn. + + See merge request easycorp/zentaopms!392 + +commit 6c98cdac940d0586e16a07af7dd503eab272b641 +Merge: 0c72b041b4 16251869b4 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 01:17:30 2021 +0000 + + Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170' + + * The product is selected by default when modifying the branch. + + See merge request easycorp/zentaopms!391 + +commit 3a53874c1cc7bb91f8d24f7ff85f3bc9c33a7a02 +Author: liumengyi +Date: Thu Nov 11 09:13:50 2021 +0800 + + * Finish task #43909. + +commit 16251869b4835cb74677f042ad2996cf6d71aeb0 +Author: tianshujie +Date: Thu Nov 11 09:10:38 2021 +0800 + + * Modify the SQL statement linked to the query story plan. + +commit c50592d9781a7ba8a52728f9c7524c7921a95b6e +Merge: 900de67361 1c7e707e41 +Author: 孙广明 +Date: Thu Nov 11 01:07:49 2021 +0000 + + Merge branch 'sprint/168_liyuchun_16107' into 'sprint/168' + + * Fix bug #16107. + + See merge request easycorp/zentaopms!377 + +commit 85f2a10cbd4c29c86a28bc08473fc8aa61aef56d +Author: liumengyi +Date: Thu Nov 11 09:07:49 2021 +0800 + + * Finish task #43909. + +commit d9c7eb75c18b3a197a7db827adc5f297c0f2f1e2 +Merge: 8b1b92bdfc ca70d43ca0 +Author: 王怡栋 +Date: Thu Nov 11 01:06:00 2021 +0000 + + Merge branch 'sprint/169_package' into 'master' + + Sprint/169 package + + See merge request easycorp/zentaopms!393 + +commit b99febf1b354820781b073b7f46b0c3b91c40fc1 +Author: 孙广明 +Date: Thu Nov 11 09:00:25 2021 +0800 + + * Remove unused btn. + +commit 11887cffe92ba669e5fd3e8f3009f240f91534d5 +Author: tianshujie +Date: Thu Nov 11 09:00:05 2021 +0800 + + * The product is selected by default when modifying the branch. + +commit 2182c4dee523ac3ca6ae416728056ce483967c58 +Author: liumengyi +Date: Thu Nov 11 08:55:29 2021 +0800 + + * Finish task #43909. + +commit 2850e195ae2f38dbaeb206059c5fde2eaac8350d +Author: xieqiyu +Date: Thu Nov 11 08:54:26 2021 +0800 + + * Modify lang item. + +commit 48a32457d82377f3fbc88026ee7518531228e912 +Author: xieqiyu +Date: Thu Nov 11 08:41:00 2021 +0800 + + * Add space. + +commit 0c72b041b44f8c488049ea459ae745b1497b880c +Merge: f77b0e6d2d dbfabc47c2 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 11 00:30:32 2021 +0000 + + Merge branch 'sprint/170_mayue_43892' into 'sprint/170' + + * Finish task #43892. + + See merge request easycorp/zentaopms!389 + +commit dbfabc47c25e2f6903d36fb92109e57f3e8cf61a +Author: mayue +Date: Thu Nov 11 08:18:08 2021 +0800 + + * Finish task #43892. + +commit f77b0e6d2d428ce9bef135f94120f6ee092f4d45 +Author: zhujinyong +Date: Thu Nov 11 05:10:38 2021 +0800 + + * Check compatibility. + +commit b9a2673f5a3614229fdb9c66dd0d9d83209cbc5c +Author: dingguodong +Date: Wed Nov 10 17:39:12 2021 +0800 + + * Correct the issue that when the MR is deleted in GitLab. + +commit 763a7e01751b1365a2a9b225a5a501a1dc834522 +Author: zenggang +Date: Wed Nov 10 09:31:47 2021 +0000 + + * Finish task#43848,43850,add gitlab project namespace + +commit 326a9f4ce1ac3227a4e132fbed544614cf19aebe +Merge: 9e996b6deb 09355e3de0 +Author: zhujinyong +Date: Wed Nov 10 16:02:17 2021 +0800 + + Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 + +commit 9e996b6debede234c174d8f1a3a483ae103e16a1 +Author: zhujinyong +Date: Wed Nov 10 16:01:47 2021 +0800 + + * Fix code error of compatibility. + +commit d2685055cbf3599c8f50fa8279f524827cc69ab0 +Author: xieqiyu +Date: Wed Nov 10 15:44:17 2021 +0800 + + * Fix a bug. + +commit 880f91a3d2d03b0a608a8d7116ceea0cb6d8af1f +Author: xieqiyu +Date: Wed Nov 10 15:32:05 2021 +0800 + + * Add duplicate name judgment. + +commit 51960d25b45ca0261dad0b785d87ad2914b96718 +Author: dingguodong +Date: Wed Nov 10 15:07:03 2021 +0800 + + Finish task#43858. review code in diff view of MR module. + +commit 99b100e7f4ba81f74f4d60a8efd3fedd4eda4d1e +Author: dingguodong +Date: Wed Nov 10 15:05:10 2021 +0800 + + * Correct editing a MR and optimize related front style + (some diff func mixd). + +commit 09355e3de09e7f2b654d5eba20eeaae0dedf7d87 +Merge: 37b486ad1c 98ec568b0f +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 10 07:03:46 2021 +0000 + + Merge branch 'sprint/170_hufangzhou_16140' into 'sprint/170' + + * Fix bug #16140. + + See merge request easycorp/zentaopms!386 + +commit 2371a03f321d315365dec9e8c38e0a3453bbc351 +Author: Lwrless +Date: Wed Nov 10 15:02:20 2021 +0800 + + * add owt settings, and remove useless group permissions, xuan task #43732. + +commit 37b486ad1ccd0d17758bf076a652708b085a65d2 +Author: zhujinyong +Date: Wed Nov 10 14:57:48 2021 +0800 + + * Replace htmlspecialchars to htmlSpecialString for compatibility. + +commit 50b928ac9b2e700c829a0bbbdfce40523adeba56 +Author: xieqiyu +Date: Wed Nov 10 14:48:37 2021 +0800 + + * Fix bug#16143. + +commit 98ec568b0f95bb2d4af6cc9c83cc6d9c01345881 +Author: hufangzhou +Date: Wed Nov 10 14:48:09 2021 +0800 + + * Fix bug #16140. + +commit 8d9aebb8551ea63404e32a80fbd89759522c72f1 +Author: xieqiyu +Date: Wed Nov 10 14:29:32 2021 +0800 + + * Fix bug#16142. + +commit 36b9634059996ca59dc5f38f290e38ac5b850938 +Author: xieqiyu +Date: Wed Nov 10 14:21:47 2021 +0800 + + * Add duplicate name judgment. + +commit 1cfabe67d86988073d45be9eeca62f48688597a7 +Merge: 3ec178de54 28043927ac +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 10 06:04:37 2021 +0000 + + Merge branch 'sprint/170_tianshujie_43921' into 'sprint/170' + + * Finish task #43921. + + See merge request easycorp/zentaopms!383 + +commit 28043927ac94f7a00342214c8bca79accadc620b +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 10 06:04:19 2021 +0000 + + Update model.php + +commit 41294b083e170533c9b273e15be8297ea89dbdbb +Author: tianshujie +Date: Wed Nov 10 14:00:12 2021 +0800 + + * Finish task #43921. + +commit 3ec178de544de8f52c4a9c34fdb3b6c3bd84d102 +Author: zhujinyong +Date: Wed Nov 10 13:52:25 2021 +0800 + + * Fix sql error. + +commit c2feb4164ff90daeffd14ad4d5ec1efe3d0f5e66 +Merge: 40e2faf15e 8165200c74 +Author: zhujinyong +Date: Wed Nov 10 13:50:45 2021 +0800 + + Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 + +commit 40e2faf15e1d1c62089c0819a35acc8715f61a8b +Author: zhujinyong +Date: Wed Nov 10 13:50:29 2021 +0800 + + * Fix sql error. + +commit 8165200c74bcf6f59be7b2c86ed783e371dadfe7 +Merge: 53d3014c45 d9564d624f +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 10 05:20:01 2021 +0000 + + Merge branch 'sprint/170_xieqiyu_43920' into 'sprint/170' + + Sprint/170 xieqiyu 43920 + + See merge request easycorp/zentaopms!378 + +commit d9564d624f63537a801e0d37c9937b1241a557d0 +Author: xieqiyu +Date: Wed Nov 10 13:16:32 2021 +0800 + + * Add comments. + +commit 53d3014c45d623137f6d7b2173b87c3af4508de1 +Merge: 562af98e17 c29ea5077a +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 10 05:16:26 2021 +0000 + + Merge branch 'sprint/170_tianshujie_43901' into 'sprint/170' + + * Finish task #43901. + + See merge request easycorp/zentaopms!381 + +commit 562af98e17d08467dddbbe0870f51a70299b339d +Merge: 421b19928f 651af21958 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 10 05:14:37 2021 +0000 + + Merge branch 'sprint/170_liumengyi_43909' into 'sprint/170' + + Finish task #43909 + + See merge request easycorp/zentaopms!382 + +commit c29ea5077af4af43f36ea992cf77f285a9636a4b +Author: tianshujie +Date: Wed Nov 10 13:10:11 2021 +0800 + + * Finish task #43901. + +commit 651af219585a972b58046fd58b03bd6ca21aef76 +Author: liumengyi +Date: Wed Nov 10 13:09:09 2021 +0800 + + * Finish task #43909. + +commit 421b19928f3ea7b85a74003c3dd99195c26f4699 +Merge: 9b10cf663e 7247a7d4b5 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 10 05:03:53 2021 +0000 + + Merge branch 'sprint/170_mayue_43892' into 'sprint/170' + + * Finish task #43892. + + See merge request easycorp/zentaopms!379 + +commit 089238bd79e1415b5b4a2950e847c270d0041b1c +Author: xieqiyu +Date: Wed Nov 10 12:26:55 2021 +0800 + + * Modify review questions. + +commit 938b382fce7670cb26d67e10362a0f10c8ffdeb8 +Author: 王怡栋 +Date: Wed Nov 10 11:57:12 2021 +0800 + + * code for task #43750. + +commit 87d1d09997775a2676af1593f13d73ec7a34eb49 +Author: 王怡栋 +Date: Wed Nov 10 11:34:16 2021 +0800 + + * adjust for get dropmenu by api. + +commit a76e32591e86b47323cebfa13dbb1944646264be +Author: liumengyi +Date: Wed Nov 10 11:30:04 2021 +0800 + + * Finish task #43909. + +commit 7247a7d4b535768d478fb76a4a416d9040a12a33 +Author: mayue +Date: Wed Nov 10 11:13:37 2021 +0800 + + * Finish task #43892. + +commit 9b10cf663e31b5206de88428343abc2984faba26 +Merge: ea45b8f9ea fe315477ea +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 10 02:54:11 2021 +0000 + + Merge branch 'sprint/170_tianshujie_43901' into 'sprint/170' + + * Finish task #43901. + + See merge request easycorp/zentaopms!372 + +commit fe315477ea5f3a5bb493bcc82456ccc269dc6907 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 10 02:53:53 2021 +0000 + + Update manageproducts.html.php + +commit b185ef3ba95b76f0ec370fc03abcdf741c466ea9 +Author: xieqiyu +Date: Wed Nov 10 10:51:09 2021 +0800 + + * Batch edit one branch error. + +commit 0ac42fe56b7cfa94c3c8338fe3228b5706b333ff +Author: tianshujie +Date: Wed Nov 10 10:49:53 2021 +0800 + + * Modify variable value. + +commit 900de673612f292ae9ee58a09c4fb6d9a35a4291 +Merge: deaaaf1da3 6d625bb597 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 10 02:35:22 2021 +0000 + + Merge branch 'sprint/171_sgm_43998' into 'sprint/168' + + * Finish task #43998. + + See merge request easycorp/zentaopms!376 + +commit 1c7e707e41332d2f8b1d913b22ddd984ca010918 +Author: liyuchun +Date: Wed Nov 10 10:24:02 2021 +0800 + + * Fix bug #16107. + +commit 820fbef7b44fe29d38f8e981cedcdc0cb50924ff +Author: xieqiyu +Date: Wed Nov 10 10:09:46 2021 +0800 + + * Hidden merge button. + +commit 36b8752cddbcede95985dcc9cd6f3451b99d46a4 +Author: xieqiyu +Date: Wed Nov 10 10:03:10 2021 +0800 + + * Fix a bug. + +commit fb7f493036da4a50eee60162aab089d6d74f8aac +Author: tianshujie +Date: Wed Nov 10 09:58:49 2021 +0800 + + * Modify the error code. + +commit adaa7cd1d23e9183b9a82a70e76d47e721275ed1 +Author: xieqiyu +Date: Wed Nov 10 09:49:02 2021 +0800 + + * Add dynamic when batch edit main branch. + +commit a80cdfd6ec924a0755a5de10f9e7f58f2e8184c5 +Merge: 9fa76f6912 4f90b186ea +Author: hufangzhou +Date: Wed Nov 10 09:49:31 2021 +0800 + + Merge branch 'sprint/170_xieqiyu_43920' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_xieqiyu_43920 + +commit 9fa76f69120590941c9f1b8845fd200e53da1443 +Author: hufangzhou +Date: Wed Nov 10 09:49:29 2021 +0800 + + * Modify the action of main branch. + +commit 6d625bb59754d52ee12a5da0b9a2c8180ef30328 +Author: 孙广明 +Date: Wed Nov 10 09:43:04 2021 +0800 + + * Finish task #43998. + +commit 4f90b186eaf37bebf1c4a71eb04484bf0148bfcf +Author: xieqiyu +Date: Wed Nov 10 09:37:59 2021 +0800 + + * Fix a bug: batch edit main branch error. + +commit 81745401830fd3956aa7b903ad44836a16c1261c +Author: tianshujie +Date: Wed Nov 10 09:22:08 2021 +0800 + + * Remove useless code. + +commit bb426aaabe060164d00f8b5cace0127bc575abc7 +Author: liyuchun +Date: Wed Nov 10 09:19:25 2021 +0800 + + * Fix bug #16054. + +commit 35504f6745c8c8e6377952e7ac2e858bc72daa4c +Author: tianshujie +Date: Wed Nov 10 09:17:28 2021 +0800 + + * Combine the acquisition branch into a function. + +commit 6bdf3553d1d04f706f0c1f8c8c9db1fa5d4cf15a +Author: liumengyi +Date: Wed Nov 10 09:05:58 2021 +0800 + + * Finish task#43909. + +commit 8d79bbfd349cf99c8cd055fe651a0b70e64333b3 +Merge: 7203acb7af 91e67125f4 +Author: liumengyi +Date: Wed Nov 10 08:44:49 2021 +0800 + + Merge branch 'sprint/170_liumengyi_43909' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_liumengyi_43909 + +commit deaaaf1da3ca4f349e2d7eb3b305eac6f9ed6895 +Merge: df8701d4cb a233ecdf4b +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 10 00:09:54 2021 +0000 + + Merge branch 'sprint/168_sunhao/task43944' into 'sprint/168' + + * Task #43944, fix iframe modal show double times on click at second time. + + See merge request easycorp/zentaopms!371 + +commit ea45b8f9ea1eea37411e13e12f18dd4dff2786f8 +Author: zhujinyong +Date: Tue Nov 9 20:43:53 2021 +0800 + + * Fix compatibility. + +commit 76651524d998302111dfe018757ab482a251c15c +Author: xieqiyu +Date: Tue Nov 9 20:10:07 2021 +0800 + + * Add order. + +commit fe99d1fafb519da45a0f202fcbd886025674120b +Author: tianshujie +Date: Tue Nov 9 19:56:48 2021 +0800 + + * Finish task #43901. + +commit a233ecdf4bd0b8f867f75364a9ff1dce37415138 +Author: Hao Sun +Date: Tue Nov 9 19:55:15 2021 +0800 + + * fix iframe modal show double times on click at second time. + +commit 0a3dc10f4af3ee577c654bdfc271648b912079f0 +Author: xieqiyu +Date: Tue Nov 9 19:46:08 2021 +0800 + + * Finish task#43905. + +commit c14d00e710cb114b12e29e269f6e1dd9bde930ea +Author: hufangzhou +Date: Tue Nov 9 19:23:51 2021 +0800 + + * Code for task #43898. + +commit 58aef31f152b91aeece8b93c3dedb1ab6101666b +Author: dingguodong +Date: Tue Nov 9 18:18:06 2021 +0800 + + * Finish task#44144. + +commit e3ae68fc04c0f21feb18b053a6e4faab4c85da87 +Author: hufangzhou +Date: Tue Nov 9 17:26:32 2021 +0800 + + * Add the priviledge. + +commit 7203acb7af17d786f39362153b96781bb794d675 +Author: liumengyi +Date: Tue Nov 9 17:23:34 2021 +0800 + + * Finish task#43909. + +commit df8701d4cbfebccfc54a9f72e2b5cee29be11f36 +Merge: 1576d443ff 876c9e3877 +Author: 孙广明 +Date: Tue Nov 9 09:24:15 2021 +0000 + + Merge branch 'sprint/168_liyuchun_43941' into 'sprint/168' + + * Finish task #43941. + + See merge request easycorp/zentaopms!369 + +commit 1576d443ffad75d34a652f6eb972c92193988838 +Merge: f13d696912 00d9bc4d7f +Author: 孙广明 +Date: Tue Nov 9 09:23:54 2021 +0000 + + Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168' + + * Sort execution kanban. + + See merge request easycorp/zentaopms!370 + +commit 00d9bc4d7fe2ea2dcfadbaf2ffb89eb8da39fca7 +Author: liyuchun +Date: Tue Nov 9 17:22:42 2021 +0800 + + * Sort execution kanban. + +commit ed537c141568ae679d44afcbe53215bc48d7b0ff +Author: liumengyi +Date: Tue Nov 9 17:10:56 2021 +0800 + + * Finish task#43909. + +commit 20f94c4e7c231885215ff7583bb7b0c9470fda0d +Author: zenggang +Date: Tue Nov 9 09:18:04 2021 +0000 + + * Finish task#43847,43860 + +commit 9f77cc6fb6956d5ffc6bd55ba01bf69bf21bff0c +Author: hufangzhou +Date: Tue Nov 9 17:16:30 2021 +0800 + + * Finish task #43898. + +commit 91e67125f473890279a0ea5248e01a2831b35733 +Author: liumengyi +Date: Tue Nov 9 17:10:56 2021 +0800 + + * Finish task#43909. + +commit 323b167922a7eaca88ce8f88cad6da9fbd69fa39 +Merge: 11af94db7f 9705edb48e +Author: liumengyi +Date: Tue Nov 9 17:09:54 2021 +0800 + + Merge branch 'sprint/170_liumengyi_43909' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_liumengyi_43909 + +commit 11af94db7f12841b3439ab2a5207877506e44ed4 +Merge: 8ee4448e4d 9e622a2995 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 9 08:28:32 2021 +0000 + + Merge branch 'sprint/170_tianshujie_43901' into 'sprint/170' + + * Merge conflicts. + + See merge request easycorp/zentaopms!368 + +commit 876c9e3877283e8651f74469a09869fb106d4269 +Author: liyuchun +Date: Tue Nov 9 17:04:31 2021 +0800 + + * Finish task #43941. + +commit f13d696912d39a2fde3df80e65d7b6bd24479c84 +Merge: 60766cee16 b4e9ab871d +Author: 孙广明 +Date: Tue Nov 9 16:57:11 2021 +0800 + + Merge branch 'sprint/168_liyuchun_43982' into sprint/168 + +commit b4e9ab871d7dff2cb2dd6396da2921e2d4c93943 +Merge: cec2fd2c42 496ecd3c7a +Author: 孙广明 +Date: Tue Nov 9 08:57:01 2021 +0000 + + Merge branch 'sprint/168' into 'sprint/168_liyuchun_43982' + + # Conflicts: + # module/kanban/lang/en.php + # module/kanban/lang/zh-cn.php + +commit cec2fd2c42389073a1d3e093e502e9580640828f +Author: liyuchun +Date: Tue Nov 9 16:42:22 2021 +0800 + + * Finish task #43960. + +commit 9d0023b96923c6f2a28029cbd8b22b4b86ca4538 +Author: 王怡栋 +Date: Tue Nov 9 16:31:28 2021 +0800 + + * code for task #43761. + +commit 9705edb48e95b2e948ad5dcbd1421cae23f4e5df +Merge: 8ee4448e4d 9e622a2995 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 9 08:28:32 2021 +0000 + + Merge branch 'sprint/170_tianshujie_43901' into 'sprint/170' + + * Merge conflicts. + + See merge request easycorp/zentaopms!368 + +commit 9e622a29954ca5cb890ff748aeab5576afe26723 +Author: tianshujie +Date: Tue Nov 9 16:27:06 2021 +0800 + + * Merge conflicts. + +commit 8e4bf08e4f84b0470f5ec986a49c4c2740be0ccd +Author: dingguodong +Date: Tue Nov 9 16:21:08 2021 +0800 + + * Finish task#43855. Approval page issue is fixed. + +commit d889184204cf8fc0251f8c59b7373e7ff2d1c43d +Author: xieqiyu +Date: Tue Nov 9 16:17:15 2021 +0800 + + * Finish task#43920. + +commit 8ee4448e4da72737773c52217e069277a5d3debf +Merge: 489eac1696 98f519fe31 +Author: liyuchun +Date: Tue Nov 9 15:53:54 2021 +0800 + + Merge branch 'sprint/170_tianshujie_43901' into sprint/170 + +commit 489eac1696036b9ca3ef7db5df581df1c64eeb07 +Merge: d99765633e 0d9fa0869a +Author: zhujinyong +Date: Tue Nov 9 15:53:36 2021 +0800 + + Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 + +commit 98f519fe31f76fcf1576a3d79bb4c1068bc65bce +Merge: 8e9dd74c0d 0d9fa0869a +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 9 07:53:17 2021 +0000 + + Merge branch 'sprint/170' into 'sprint/170_tianshujie_43901' + + # Conflicts: + # module/branch/model.php + # module/story/model.php + +commit d99765633ed36d3def6dca04d2907ad02a6d6c40 +Author: zhujinyong +Date: Tue Nov 9 15:52:28 2021 +0800 + + + Add compatibility check. + +commit 8e9dd74c0de77870ca102ae676c5d5bdb1b57019 +Author: tianshujie +Date: Tue Nov 9 15:47:31 2021 +0800 + + * Modify code logic. + +commit 0d9fa0869aa9f30c38cf540f723e4efbddb2aa1b +Merge: d75156dd74 f49cbba01d +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 9 07:09:57 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_15665' into 'sprint/170' + + * Fix bug #15665 + + See merge request easycorp/zentaopms!364 + +commit 108208de6baed58d79e7ff942688d87aa5489370 +Author: liyuchun +Date: Tue Nov 9 15:09:25 2021 +0800 + + * Finish task #43982. + +commit 496ecd3c7a8fa8ea830096c11279ca07613f88fd +Merge: 60766cee16 dc2e2cba79 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 9 07:08:19 2021 +0000 + + Merge branch 'sprint/168_sgm_testcase' into 'sprint/168' + + Sprint/168 sgm testcase + + See merge request easycorp/zentaopms!365 + +commit 8b9f09e5e814c1b0dd54ed2a7679ddb6341b5e77 +Merge: ec8b31e847 07581624f2 +Author: zhujinyong +Date: Tue Nov 9 14:57:52 2021 +0800 + + Merge branch 'sprint/169' of https://gitlab.zcorp.cc/easycorp/zentaopms into 169 + +commit dc2e2cba795787584e2eb690eb512e13bae55466 +Author: 孙广明 +Date: Tue Nov 9 14:57:42 2021 +0800 + + * Adjust doc css. + +commit 521a8e871d29cad0ab5e26299daad2c55058c003 +Author: 孙广明 +Date: Tue Nov 9 14:39:07 2021 +0800 + + * Finish task #44139. + +commit f49cbba01d2705a3eb2349b1b1186bd21218c063 +Author: root +Date: Tue Nov 9 14:38:14 2021 +0800 + + * Fix bug #15665 + +commit 60766cee16ae67db9c6212220f39215546fa4a58 +Merge: cbd2638dcd 21d6cbd160 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 9 06:36:52 2021 +0000 + + Merge branch 'sprint/168_sgm_43995' into 'sprint/168' + + * Finish task #43955. + + See merge request easycorp/zentaopms!359 + +commit 21d6cbd16081bc6520a5dc2c708917396aefe2e3 +Author: 孙广明 +Date: Tue Nov 9 14:24:49 2021 +0800 + + * Fix logic error. + +commit 5ab6fe77c2944c6e61d367a4dd15f900e041a786 +Author: tianshujie +Date: Tue Nov 9 14:21:17 2021 +0800 + + * Modify code logic. + +commit d75156dd74b4d099d49e26a075b59fd67b828f29 +Merge: 90ca341898 397fb3e152 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 9 06:00:23 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_43918' into 'sprint/170' + + * Finish task #43918. + + See merge request easycorp/zentaopms!361 + +commit 397fb3e15233924c58a1f251fd4fa358f4153a7a +Author: root +Date: Tue Nov 9 13:58:39 2021 +0800 + + Finish task #43918. + +commit 90ca3418981940efd831696fbbf121e277de05e5 +Merge: 9d135336e8 411d2429ee +Author: 孙广明 +Date: Tue Nov 9 05:58:09 2021 +0000 + + Merge branch 'sprint/170_zhengrunyu_44157' into 'sprint/170' + + *Finish task #44157. + + See merge request easycorp/zentaopms!362 + +commit 411d2429ee8dc961e7ecb0fe7ef888fb3bde33ef +Author: zhengrunyu +Date: Tue Nov 9 13:55:56 2021 +0800 + + Finish task #44157. + +commit 928784c9a93e47c66a83336a2dfb8c8ae505a675 +Author: zhengrunyu +Date: Tue Nov 9 13:52:13 2021 +0800 + + Finish task #44157. + +commit 0f975ee3c46e8a74f2649fbb397464a9b8e8f01b +Author: zhengrunyu +Date: Tue Nov 9 13:48:06 2021 +0800 + + *Finish task #44157. + +commit 782d1114bf172003badd1e7bedef68e239cea087 +Author: root +Date: Tue Nov 9 13:47:30 2021 +0800 + + Finish task #43918. + +commit fe82c61361102602c16fce3f0d5cf1fee8b20928 +Author: 王怡栋 +Date: Tue Nov 9 13:47:06 2021 +0800 + + * code for task #43761. + +commit cbd2638dcd31fc3221fbed57e85b2357c2f54eae +Merge: c69f5877b5 7e9f72ab57 +Author: 孙广明 +Date: Tue Nov 9 05:43:12 2021 +0000 + + Merge branch 'sprint/168_sunhao/improve_doc_dropdown' into 'sprint/168' + + * Improve UI for dropdown menu in doc side tree. + + See merge request easycorp/zentaopms!363 + +commit 7e9f72ab57d5fad06937ccceb5bda22863a17f3e +Author: Hao Sun +Date: Tue Nov 9 13:38:37 2021 +0800 + + * improve UI for dropdown menu in doc side tree. + +commit 57bc70b75ba85ce154dd29b80a6e97fcdbfabbdf +Author: zhengrunyu +Date: Tue Nov 9 13:31:05 2021 +0800 + + *Finish task #44157. + +commit 44c44f11d1b6c1bf4d774c98fa9453fdfb2346e4 +Author: root +Date: Tue Nov 9 13:25:52 2021 +0800 + + Finish task #43918. + +commit f23ff798b9a18f4b03093da11b4bd8fb754e5a93 +Author: root +Date: Tue Nov 9 13:23:37 2021 +0800 + + Finish task #43918. + +commit 627ba8e4936983d9f7f43839b180ec506a96bec1 +Author: root +Date: Tue Nov 9 13:18:44 2021 +0800 + + Finish task #43918. + +commit 8c731d67fe67954327225af16e6e2d37af23ad1a +Author: root +Date: Tue Nov 9 13:14:05 2021 +0800 + + Finish task #43918. + +commit fdc54380eeb56b1f395c560164a4b9dd59a99fd4 +Author: root +Date: Tue Nov 9 13:08:58 2021 +0800 + + * Finish task #43918. + +commit c69f5877b5eb733dd91cd3dc04a391421f96f388 +Merge: 72a6f47b38 a8ce426a32 +Author: 孙广明 +Date: Tue Nov 9 13:04:37 2021 +0800 + + Merge branch 'sprint/168_liyuchun_43954' into sprint/168 + +commit a8ce426a32d930b26ed9fabb75f56ed63ecc539e +Merge: 7589eca470 72a6f47b38 +Author: 孙广明 +Date: Tue Nov 9 05:04:22 2021 +0000 + + Merge branch 'sprint/168' into 'sprint/168_liyuchun_43954' + + # Conflicts: + # module/kanban/lang/en.php + # module/kanban/lang/zh-cn.php + +commit efb3a369c806bdb7652a580031d5e4c2cbfdc2a1 +Author: dingguodong +Date: Tue Nov 9 12:10:03 2021 +0800 + + * Add compile status of job when creating a MR. + +commit c0169fd82378baa079719359e754848eaaec5b38 +Author: root +Date: Tue Nov 9 11:27:30 2021 +0800 + + * Finish task #43918. + +commit ab5ee93bc38c7a96a7e679cccb02ab4f6c56b4df +Author: root +Date: Tue Nov 9 11:26:25 2021 +0800 + + * Finish task #43918. + +commit 9d135336e80308abd59f3c79d3ee47480206d18e +Merge: b9bdc8a517 9c7884d905 +Author: 孙广明 +Date: Tue Nov 9 03:15:37 2021 +0000 + + Merge branch 'sprint/170_hufangzhou_43891' into 'sprint/170' + + * Code for task #43891. + + See merge request easycorp/zentaopms!360 + +commit 9c7884d9058fe44e6df7b70efac1031b6e61faf5 +Author: hufangzhou +Date: Tue Nov 9 11:09:48 2021 +0800 + + * Code for task #43891. + +commit 67635b0317f8ac463f1be892fd0da71ff44e98f0 +Author: root +Date: Tue Nov 9 10:39:02 2021 +0800 + + * Finish task #43918. + +commit 954221334bfaa3982f8b29ce03514d2f252a5010 +Author: 孙广明 +Date: Tue Nov 9 10:38:09 2021 +0800 + + * Finish task #43955. + +commit c55a455a16f73835506ab108feb209ddd1cba202 +Author: root +Date: Tue Nov 9 10:37:48 2021 +0800 + + * Finish task #43918. + +commit 33539633d7127b3af32143dfd880d42adf21f33a +Author: root +Date: Tue Nov 9 10:35:17 2021 +0800 + + * Finish task #43918. + +commit e3530d7e735b9079f2786a8e05375cd6135f4792 +Author: 王怡栋 +Date: Tue Nov 9 10:31:55 2021 +0800 + + * code for task #43762. + +commit eedcc1aed59c2f54b33212fca549d6872561412d +Author: tianshujie +Date: Tue Nov 9 10:28:16 2021 +0800 + + * Modify code logic. + +commit 3986d8c29718234f0bd96d6dff1c22e22ab4d89c +Author: tianshujie +Date: Tue Nov 9 10:04:05 2021 +0800 + + * Add the logic of project-related multi-branch products. + +commit 6669badf55a0d56631766e41ed7e9967db8660a5 +Author: 王怡栋 +Date: Tue Nov 9 09:57:48 2021 +0800 + + * code for task #43763. + +commit 7589eca47011e6a391fe27ab39da7c05873cc141 +Author: liyuchun +Date: Tue Nov 9 09:50:00 2021 +0800 + + * Finish task #43954. + +commit b9bdc8a5174ddb4485907a42f2ee7cd2befc131f +Merge: 7edc712958 cafb5d08a8 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 9 01:49:16 2021 +0000 + + Merge branch 'sprint/170_mayue_15688' into 'sprint/170' + + * Fix bug #15688. + + See merge request easycorp/zentaopms!356 + +commit cafb5d08a83026b822817afbf71f0ecb5d23cc7e +Author: mayue +Date: Tue Nov 9 09:47:10 2021 +0800 + + * Fix bug #15688. + +commit 6c23d4a336e7a7aba7d2fc640b5dfa5101e3f108 +Author: mayue +Date: Tue Nov 9 09:37:33 2021 +0800 + + * Fix bug #15688. + +commit 72a6f47b388e41e1d3f349ffde800ff75ec5d8ef +Merge: ca4fb1a6ce f634d5f20d +Author: 孙广明 +Date: Tue Nov 9 01:16:47 2021 +0000 + + Merge branch 'spirnt/168_liyuchun_bug' into 'sprint/168' + + * Finish task #43933. + + See merge request easycorp/zentaopms!353 + +commit ca4fb1a6ce233bfff202f33fd6b922407647dca6 +Merge: 6c1200a086 f9f26953aa +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 9 01:15:25 2021 +0000 + + Merge branch 'sprint/168_sgm_43995' into 'sprint/168' + + * Adjust kanban details. + + See merge request easycorp/zentaopms!355 + +commit 7edc712958da3406c59d05237f22a98f71e8939a +Merge: 821f18f770 1c4840c2c0 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 9 01:14:50 2021 +0000 + + Merge branch 'sprint/170_xieqiyu_fixbug' into 'sprint/170' + + * Fix a bug. + + See merge request easycorp/zentaopms!354 + +commit 1c4840c2c0a9e569a7d5cfa93a4c08810bd12eba +Author: xieqiyu +Date: Tue Nov 9 09:11:16 2021 +0800 + + * Fix a bug. + +commit f9f26953aa59aefc87e4a4fee3be61f9d69ea553 +Author: 孙广明 +Date: Tue Nov 9 09:10:07 2021 +0800 + + * Adjust kanban details. + +commit f634d5f20dd113824c90f642afcc14d6b97ea906 +Author: liyuchun +Date: Tue Nov 9 08:59:56 2021 +0800 + + * Finish task #43933. + +commit 9b51c138dc133cd0b0fcbd65a82b234cc707f248 +Author: 王怡栋 +Date: Tue Nov 9 08:47:24 2021 +0800 + + * adjust for multilingual api. + +commit 821f18f770e72bb0ab014e03f5e98ad90769cd59 +Merge: ddbc2d2342 77aa89db59 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 9 00:37:13 2021 +0000 + + Merge branch 'sprint/170_sunhao/add_icons' into 'sprint/170' + + * Add new icons: version、thumbs-up、thumbs-down. + + See merge request easycorp/zentaopms!318 + +commit 6c1200a086b7e2822af2cfe4557914053c0648d7 +Merge: d66bd6f3d3 171eb2f32e +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 9 00:36:56 2021 +0000 + + Merge branch 'sprint/168_sunhao/fix_js_syntax' into 'sprint/168' + + * Fix modern js syntax not work in ie11 or older browser. + + See merge request easycorp/zentaopms!301 + +commit b9dc220fd92b1d485d65a86e774d2ee956644b86 +Author: root +Date: Tue Nov 9 08:35:27 2021 +0800 + + * Finish task #43918 + +commit ddbc2d2342161ea668961ddca683744df659b205 +Merge: 5f372cea88 e53d644169 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 9 00:33:26 2021 +0000 + + Merge branch 'sprint/170_xieqiyu_16058' into 'sprint/170' + + * Fix bug#16058. + + See merge request easycorp/zentaopms!352 + +commit d66bd6f3d354745452c9ba86e93fbe536f3e2fbf +Merge: 9f85b1a557 f786d077e4 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 9 00:32:48 2021 +0000 + + Merge branch 'sprint/168_sunhao/improve_kanban' into 'sprint/168' + + * Adjust kanban layout. + + See merge request easycorp/zentaopms!278 + +commit e53d6441693a3ea2fef819ef6e2fbb8396ffb50d +Author: xieqiyu +Date: Mon Nov 8 19:13:09 2021 +0800 + + * Fix bug#16058. + +commit ad213ae93ad8d4c00beec9b4c40ff6138583f101 +Author: 王怡栋 +Date: Mon Nov 8 18:56:48 2021 +0800 + + * adjust for report api. + +commit 5f372cea88005c588e1856cf42a45dd255ef815a +Merge: b778d246c2 d10834ab9f +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 10:47:38 2021 +0000 + + Merge branch 'spring/170_hufangzhou_43904' into 'sprint/170' + + * Code for task #43904. + + See merge request easycorp/zentaopms!351 + +commit 9f85b1a5579eeda33b5be25afd881d539d64e7ef +Author: 孙广明 +Date: Mon Nov 8 18:22:02 2021 +0800 + + * Fix kanban error. + +commit d10834ab9f6b2ebed4c3765f1daacb4ba169564e +Author: hufangzhou +Date: Mon Nov 8 18:02:15 2021 +0800 + + * Code for task #43904. + +commit 65d9c524bb8fb31cf56119b7e9ab7cac323c8ee7 +Author: zenggang +Date: Mon Nov 8 09:38:15 2021 +0000 + + * Finish task#43846 + +commit aef06be8a5c8ad18677b642b3963567c0e2a3297 +Merge: 50af39a59d 4f9dd0cb4b +Author: liyuchun +Date: Mon Nov 8 17:38:08 2021 +0800 + + Merge branch 'sprint/171_sgm_fixbug' into sprint/168 + +commit 4f9dd0cb4b56fb36cc3d9772e8964b25498a22f7 +Merge: d49b7eac72 50af39a59d +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 09:37:59 2021 +0000 + + Merge branch 'sprint/168' into 'sprint/171_sgm_fixbug' + + # Conflicts: + # module/project/model.php + +commit d49b7eac72a328974bcd667235bdca074e77d3cc +Author: 孙广明 +Date: Mon Nov 8 17:35:09 2021 +0800 + + * Fix kanban error. + +commit b778d246c2e465566747ad16892b66fbb5809706 +Merge: 21ffe0c678 8f2deab146 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 09:34:43 2021 +0000 + + Merge branch 'sprint/170_xieqiyu_16051' into 'sprint/170' + + * Fix bug#16051. + + See merge request easycorp/zentaopms!344 + +commit 50af39a59d56c3dc5d2efd45a26942ae4ff1c70d +Author: 孙广明 +Date: Mon Nov 8 17:30:24 2021 +0800 + + * Fix project kanban bug. + +commit 8f2deab1467fe27e31eafe1e742f530ffdc06ff7 +Author: xieqiyu +Date: Mon Nov 8 17:22:29 2021 +0800 + + * Adjust code style. + +commit 21ffe0c678c015d06afa5803848b7cd42709839e +Merge: 79b2c8c67a 1d7c3b30c5 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 09:16:16 2021 +0000 + + Merge branch 'spring/170_hufangzhou_16065' into 'sprint/170' + + * Fix bug #16065. + + See merge request easycorp/zentaopms!348 + +commit 1d7c3b30c548a8f0ca160d77adb7e8a32d566eb8 +Author: hufangzhou +Date: Mon Nov 8 17:14:35 2021 +0800 + + * Fix bug #16065. + +commit 0e0ab0a48ad9e5e9527d9aeec560d99892bcccca +Merge: e91ff87867 c97af049d8 +Author: 孙广明 +Date: Mon Nov 8 09:08:11 2021 +0000 + + Merge branch 'spirnt/168_liyuchun_bug' into 'sprint/168' + + Spirnt/168 liyuchun bug + + See merge request easycorp/zentaopms!347 + +commit c97af049d860459d74d2fc884d5e3a6e31c9e605 +Merge: bddeb2d5b2 c7529ca96f +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 09:04:11 2021 +0000 + + Merge branch 'sprint/171_sgm_43948' into 'spirnt/168_liyuchun_bug' + + Sprint/171 sgm 43948 + + See merge request easycorp/zentaopms!346 + +commit c7529ca96fac93c5db9477ac30e4090e8862fb1f +Author: 孙广明 +Date: Mon Nov 8 17:01:31 2021 +0800 + + * Code for task #43998. + +commit e91ff87867316de77e8b57f648848d0024744553 +Merge: b0e267571a 870b311f06 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 08:53:02 2021 +0000 + + Merge branch 'sprint/171_sgm_43948' into 'sprint/168' + + * Fix errors. + + See merge request easycorp/zentaopms!343 + +commit bddeb2d5b25bdaa5906ff88e7a1718eac53233b1 +Author: liyuchun +Date: Mon Nov 8 16:50:12 2021 +0800 + + * Remove more button in group lane. + +commit 79b2c8c67a694268df15e04e358381c15cdefa04 +Merge: e384b3be5f c027028759 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 08:47:05 2021 +0000 + + Merge branch 'sprint/170_hufangzhou_43899' into 'sprint/170' + + * Finish task #43899. + + See merge request easycorp/zentaopms!345 + +commit c027028759df6fb0d39b597752e698582f59409a +Author: hufangzhou +Date: Mon Nov 8 16:44:42 2021 +0800 + + * Finish task #43899. + +commit 74c1b31476665ed6e2b296ccef40dc85ff7c34b0 +Author: xieqiyu +Date: Mon Nov 8 16:37:19 2021 +0800 + + * Fix bug#16051. + +commit e384b3be5fd71afc6b9615dd8536ede14719c3a5 +Merge: 784eba13ab 9f27d5918b +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 08:33:05 2021 +0000 + + Merge branch 'sprint/170_hufangzhou_16062' into 'sprint/170' + + * Fix bug #16062. + + See merge request easycorp/zentaopms!342 + +commit 870b311f06ba5dec29dda02bdc47ee6155dce767 +Author: 孙广明 +Date: Mon Nov 8 16:32:18 2021 +0800 + + * Fix errors. + +commit 9f27d5918b2fe63a73b7a9c85b9adc0660e3b3ea +Author: hufangzhou +Date: Mon Nov 8 16:29:22 2021 +0800 + + * Fix bug #16062. + +commit 784eba13abaecb8ff96e83a9cfb0682bcb0a12e6 +Merge: 09d50fd19c eb8300049f +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 07:59:30 2021 +0000 + + Merge branch 'sprint/170_xieqiyu_fixbug' into 'sprint/170' + + * Fix bug. + + See merge request easycorp/zentaopms!341 + +commit b0e267571a0a9b80b1d0b14d4fa3db7a8e378c43 +Merge: e8039ed93a 3d00ecc5b0 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 07:53:34 2021 +0000 + + Merge branch 'sprint/171_sgm_43948' into 'sprint/168' + + Sprint/171 sgm 43948 + + See merge request easycorp/zentaopms!340 + +commit 3d00ecc5b0e455c5528c995794b223e1d3dcefb4 +Author: 孙广明 +Date: Mon Nov 8 15:48:58 2021 +0800 + + * Fix an error. + +commit c2a9dd1d7bad01e64420da4186b97489b4853671 +Author: 孙广明 +Date: Mon Nov 8 15:39:35 2021 +0800 + + * Fix kanban details. + +commit 53d263c3c65373d11d63a3aa2efb5911a88380e0 +Author: dingguodong +Date: Mon Nov 8 15:33:39 2021 +0800 + + * Close and Reopen MR. + +commit 1e931339eff54330fb7ec6f17674f2035c4f95ae +Author: dingguodong +Date: Mon Nov 8 15:32:07 2021 +0800 + + * Get latest MR when viewing it in ZenTaoPMS. + +commit 09d50fd19cc3b79e2a5ed80f088c36735b4f9156 +Merge: 7e1412258c 92fb767ff9 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 07:25:33 2021 +0000 + + Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170' + + Finish task #43916. + + See merge request easycorp/zentaopms!338 + +commit eb8300049fa86e47c8708b647b8f9c86c84a71dd +Author: xieqiyu +Date: Mon Nov 8 15:07:05 2021 +0800 + + * Fix bug. + +commit 7e1412258cef71d00547e58fd4bcc922f224c38e +Merge: 261d027273 b305831daf +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 07:06:48 2021 +0000 + + Merge branch 'sprint/170_mayue_15688' into 'sprint/170' + + * Fix bug #15688. + + See merge request easycorp/zentaopms!339 + +commit b305831daf9817749f7c7939ed00cbf8581d8093 +Author: mayue +Date: Mon Nov 8 15:04:55 2021 +0800 + + * Fix bug #15688. + +commit e8039ed93ac9fd27e192a34c4b484f43edc12a61 +Merge: f4734d8249 1f49e46582 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 07:01:13 2021 +0000 + + Merge branch 'sprint/171_sgm_43948' into 'sprint/168' + + * Finish task #43948. + + See merge request easycorp/zentaopms!337 + +commit 2225f9acb866c7225a797b58fb870f988307f7e7 +Author: 王怡栋 +Date: Mon Nov 8 14:52:40 2021 +0800 + + * adjust for report data. + +commit 261d02727320cf6341c3a5cad93aa1d47f35365e +Merge: 5a4456e08b 35b6e284b7 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 06:40:53 2021 +0000 + + Merge branch 'sprint/170_mayue_15688' into 'sprint/170' + + * Fix bug #15688. + + See merge request easycorp/zentaopms!336 + +commit 92fb767ff96ba2d57c69760abfc5dbb179490cdf +Author: zhouxin +Date: Mon Nov 8 14:34:44 2021 +0800 + + Finish task #43916. + +commit 1f49e4658234670da4591b8f7ada287e87ce1a0a +Author: 孙广明 +Date: Mon Nov 8 14:29:10 2021 +0800 + + * Finish task #43948. + +commit 35b6e284b7a921347472e7bcca11f28019170963 +Author: mayue +Date: Mon Nov 8 14:28:42 2021 +0800 + + * Fix bug #15688. + +commit 7ee8e8dbef4e9e9e6c538f4d2d5c11ce6f29a75f +Author: zenggang +Date: Mon Nov 8 06:25:03 2021 +0000 + + * Add gitlab user avatar + +commit 5a4456e08ba7e92ac524691465a2b12d2c1296e8 +Merge: 7692460500 b483b28d80 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 06:22:34 2021 +0000 + + Merge branch 'sprint/170_xieqiyu_merge' into 'sprint/170' + + Conflict resolution. + + See merge request easycorp/zentaopms!335 + +commit b483b28d80060b8aa8e2b374f6c30ca6bc6e0689 +Author: xieqiyu +Date: Mon Nov 8 14:18:57 2021 +0800 + + * Conflict resolution. + +commit f4734d8249ac00589f652a352027bbf8711510de +Merge: d37ce3b5a3 791be24fb7 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 06:13:06 2021 +0000 + + Merge branch 'sprint/sgm_168_44003' into 'sprint/168' + + Sprint/sgm 168 44003 + + See merge request easycorp/zentaopms!334 + +commit 76924605005896d4c2e8c141d47f97eccbe4ba5a +Merge: 1006db2569 866c7adc75 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 06:08:31 2021 +0000 + + Merge branch 'sprint/170_xieqiyu_44028' into 'sprint/170' + + Finish task#44028. + + See merge request easycorp/zentaopms!327 + +commit 1006db2569b32916e8b7d9a015c3a6ec710b3112 +Merge: 694c15758f 9fe54a903c +Author: liyuchun +Date: Mon Nov 8 13:53:59 2021 +0800 + + Merge branch 'sprint/170_hufangzhou_43891_new' into sprint/170 + +commit 9fe54a903c82d15daeb27f4d3a7281b0bfe055e0 +Merge: acd66decf4 694c15758f +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 05:53:39 2021 +0000 + + Merge branch 'sprint/170' into 'sprint/170_hufangzhou_43891_new' + + # Conflicts: + # module/branch/control.php + +commit 866c7adc7526a657ca2a731ecf57faa178c43e65 +Author: xieqiyu +Date: Mon Nov 8 13:53:16 2021 +0800 + + * Code for task#43902. + +commit 694c15758ff00237ad5f2e9d7e778e6086e2317a +Merge: 57f914b0f0 8b6ba26c9f +Author: 孙广明 +Date: Mon Nov 8 05:41:38 2021 +0000 + + Merge branch 'sprint/170_wangyidong_bug15189' into 'sprint/170' + + * fix bug #15189. + + See merge request easycorp/zentaopms!322 + +commit 57f914b0f0eeec04c264178a7aaa6bd44cfd08b3 +Merge: db0c5df00e 26ec2238ee +Author: 孙广明 +Date: Mon Nov 8 05:41:22 2021 +0000 + + Merge branch 'sprint/170_zhengrunyu_43908' into 'sprint/170' + + *Finish task #43908 + + See merge request easycorp/zentaopms!330 + +commit d37ce3b5a3103d0642240c0193b6f01124394f5f +Merge: 4bb2fa0ea8 ce439b9061 +Author: 孙广明 +Date: Mon Nov 8 05:40:56 2021 +0000 + + Merge branch 'spirnt/168_liyuchun_bug' into 'sprint/168' + + Spirnt/168 liyuchun bug + + See merge request easycorp/zentaopms!331 + +commit 4bb2fa0ea86628954b5228f08def93bc4cfc1114 +Merge: ceef9ab63f 743f03c2cf +Author: 孙广明 +Date: Mon Nov 8 05:40:08 2021 +0000 + + Merge branch 'spirnt/168_liyuchun_43929' into 'sprint/168' + + * Finish task #43929. + + See merge request easycorp/zentaopms!332 + +commit acd66decf464ea80dbc10649edfaff096b5614c2 +Author: xieqiyu +Date: Mon Nov 8 13:40:03 2021 +0800 + + * Add lang. + +commit c15b6e7e6195dc02cf0d528c917712a28ced81cd +Author: xieqiyu +Date: Mon Nov 8 13:36:00 2021 +0800 + + * Code for task#43902. + +commit 743f03c2cf30d388ae0417eb46b7bcdca9303042 +Author: liyuchun +Date: Mon Nov 8 13:35:49 2021 +0800 + + * Finish task #43929. + +commit db0c5df00e4a2b682bf528005288493c04a359bf +Merge: c65c9b2384 aa116136d0 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 05:30:29 2021 +0000 + + Merge branch 'sprint/170_mayue_15688' into 'sprint/170' + + * Fix bug #15688. + + See merge request easycorp/zentaopms!333 + +commit 791be24fb7776e4d54ff4624d78b0a2d48f219bd +Author: 孙广明 +Date: Mon Nov 8 13:27:17 2021 +0800 + + * Remove unused code. + +commit 869faaeaaab21cb6eab9344678c47f3920d66c02 +Author: 孙广明 +Date: Mon Nov 8 13:26:26 2021 +0800 + + * Remove unused code. + +commit aa116136d03fc4b247bf31e758a7e753934fff88 +Author: mayue +Date: Mon Nov 8 13:24:23 2021 +0800 + + * Fix bug #15688. + +commit e257dc4adf7db85985a755fa34148ff7f5fc58f3 +Author: 王怡栋 +Date: Mon Nov 8 13:23:47 2021 +0800 + + * fix bug for get report by dept. + +commit 1ecb25aabcdad3ba35e6dd31e81e103704b49e31 +Author: 孙广明 +Date: Mon Nov 8 13:18:53 2021 +0800 + + * Code for task #43994. + +commit 2fb46989d3caf5bb115971f8fecef99cc842584a +Author: 孙广明 +Date: Mon Nov 8 13:15:56 2021 +0800 + + * Code for task #43997. + +commit e8f2b39833661b23b20cb5cecf998ae2e59983d2 +Author: liyuchun +Date: Mon Nov 8 13:15:17 2021 +0800 + + * Finish task #43929. + +commit 5d1e3bd65e2eb901447bfb7ac51ebf06fde217f3 +Author: hufangzhou +Date: Mon Nov 8 13:14:44 2021 +0800 + + * Finish task #43904. + +commit 3965d5339bbd1dd702052187e8b1faca21d4f1a1 +Author: 孙广明 +Date: Mon Nov 8 13:12:25 2021 +0800 + + * Finish task #44002, #44003... + +commit cc14a187992955394b70d232aa57671e19c14b44 +Author: dingguodong +Date: Mon Nov 8 11:37:06 2021 +0800 + + * Add approval for MR(Optimization is required). + +commit 26ec2238eec69e290c34ca3fa66246bf38acbf44 +Author: zhengrunyu +Date: Mon Nov 8 11:31:46 2021 +0800 + + *Finish task #43908. + +commit ea6bcb8b5cb867058c9058756141c93ecd100569 +Author: zhengrunyu +Date: Mon Nov 8 11:08:56 2021 +0800 + + *Finish task #43908. + +commit 19c88ede74e7d7849b2a90802fc32b137f643f6f +Author: 王怡栋 +Date: Mon Nov 8 11:05:12 2021 +0800 + + * adjust for remove deleted data. + +commit ce439b9061948a8403f8436c06fbcfdb599ed35e +Author: liyuchun +Date: Mon Nov 8 11:05:09 2021 +0800 + + * Compatible php5.3. + +commit 143abdf45b1c574e878b5b973948d4efc4dc84d3 +Author: 孙广明 +Date: Mon Nov 8 11:02:11 2021 +0800 + + * Fix an error. + +commit b18373c7e3a184459e0082a4414673e454261a9c +Author: zhengrunyu +Date: Mon Nov 8 10:52:14 2021 +0800 + + *Finish task #43908. + +commit 4f6739980eb23577d53bedab41ee4c4b3817045f +Author: liyuchun +Date: Mon Nov 8 10:31:34 2021 +0800 + + * Finish task #43937. + +commit 9732ba073a8c4420ba9edaf738d9f282b49f7051 +Author: hufangzhou +Date: Mon Nov 8 10:19:56 2021 +0800 + + * Modify the cookie of preBranch type. + +commit c65c9b2384f7439b88e793700978a4f07d2158fe +Merge: bda2e7576b c5779575c1 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 01:36:37 2021 +0000 + + Merge branch 'sprint/170_tianshujie_43893' into 'sprint/170' + + * Finish task #43893. + + See merge request easycorp/zentaopms!325 + +commit c5779575c1fb99808d1f719474aad250eb3df16c +Author: tianshujie +Date: Mon Nov 8 09:29:45 2021 +0800 + + * Modify code logic. + +commit ceef9ab63f41d4bc3e131c94c5813aff6db044ff +Merge: 733bc581ee 932d73fd12 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 8 01:27:12 2021 +0000 + + Merge branch 'sprint/168_sgm_waterfall' into 'sprint/168' + + Sprint/168 sgm waterfall + + See merge request easycorp/zentaopms!329 + +commit 733bc581ee4c18ff23f054209cf825c1473f16ea +Merge: b8f2d9aa80 3f01755d1b +Author: 孙广明 +Date: Mon Nov 8 01:24:20 2021 +0000 + + Merge branch 'sprint/liyuchun_168_bug' into 'sprint/168' + + Sprint/liyuchun 168 bug + + See merge request easycorp/zentaopms!328 + +commit acf5b15c06a93f6c746fa239ceedfcdc4310786d +Author: xieqiyu +Date: Mon Nov 8 09:20:57 2021 +0800 + + * Code for task#43902. + +commit 932d73fd125963e6fe90b969215699756acda353 +Author: 孙广明 +Date: Mon Nov 8 09:18:15 2021 +0800 + + * Fix menu. + +commit 612c6e072818af667bf02bd7942ad97cea899fff +Author: 孙广明 +Date: Mon Nov 8 09:07:16 2021 +0800 + + * Add weekly and holiday. + +commit 3f01755d1baf627098f03ad085588a3528546573 +Author: holan20180123 <56391770@qq.com> +Date: Sun Nov 7 20:48:04 2021 +0800 + + * Fix error of kanban session. + +commit 78d36ea73902f0dd3f5b16593f7d2d9e0353f961 +Author: holan20180123 <56391770@qq.com> +Date: Sun Nov 7 20:45:50 2021 +0800 + + * Fix error of kanban session. + +commit 30b0c8db070c3fd324f0bad213029fa7592df4a7 +Author: holan20180123 <56391770@qq.com> +Date: Sun Nov 7 20:31:28 2021 +0800 + + * Finish task #43938,#43939. + +commit f22b3ea149a01d51bbde1a47dc8739b8b582828d +Author: qiyu-xie +Date: Sun Nov 7 18:12:57 2021 +0800 + + * Code for task#43902. + +commit f94e0ecb081a15086c266c1785120ef3ec32f053 +Author: qiyu-xie +Date: Sun Nov 7 16:05:02 2021 +0800 + + * Code for task#44028. + +commit 8f902ccf2db9cffdaf78aee1ede1e5c8a8879833 +Author: qiyu-xie +Date: Sun Nov 7 13:44:24 2021 +0800 + + * Code fot task#44028. + +commit 06c235fe9add17995069e3e6eaa181958dbf1ef7 +Author: zenggang +Date: Sat Nov 6 08:58:11 2021 +0000 + + * Finish task#43845 + +commit 02aa340f1880296ef19f258acbdc4767d619b1ae +Author: zenggang +Date: Sat Nov 6 07:50:54 2021 +0000 + + * Code for task#43845 + +commit d279c5d7d777136b0025f19eb2cc675a0b3449b1 +Author: hufangzhou +Date: Fri Nov 5 18:47:39 2021 +0800 + + * Finish task #43891. + +commit 988bb5c7740de925b2c4fdc7f2bb747de49106d2 +Author: xieqiyu +Date: Fri Nov 5 17:25:27 2021 +0800 + + * Code for task#44028. + +commit 0328182a4719c277eb5356fffa4cda6289ea1400 +Author: tianshujie +Date: Fri Nov 5 17:19:41 2021 +0800 + + * Modify the logic of the acquisition plan. + +commit a9f849138851398dea76e8c0b472f636761929e0 +Author: 王怡栋 +Date: Fri Nov 5 16:41:26 2021 +0800 + + * adjust for flow. + +commit 1424fbe8694395e899f113a2c93af2891209697c +Author: tianshujie +Date: Fri Nov 5 16:04:39 2021 +0800 + + * Modify the error. + +commit bda2e7576be028f9871097fb749707b943f61880 +Merge: 925094f331 f7d99dd38c +Author: 王怡栋 +Date: Fri Nov 5 07:48:03 2021 +0000 + + Merge branch 'sprint/170_xieqiyu_43919' into 'sprint/170' + + Finish task#43919. + + See merge request easycorp/zentaopms!324 + +commit 77da7770649523d372deac5429b228bbea8c7723 +Author: tianshujie +Date: Fri Nov 5 15:46:52 2021 +0800 + + * Finish task #43893. + +commit f7d99dd38cf6a2fafa9d18e58b2f3c928b3b9d5e +Author: xieqiyu +Date: Fri Nov 5 15:37:08 2021 +0800 + + * Add lang item. + +commit 925094f3314a75117a757ad972163d29693aa631 +Merge: 4f5e19fc66 21cd984c78 +Author: hufangzhou +Date: Fri Nov 5 14:59:16 2021 +0800 + + Merge branch 'sprint/170_xieqiyu_43919' into sprint/170 + +commit 21cd984c78557ae10cf75bb427015523b01b2710 +Merge: 7992f18ea3 5812a1e510 +Author: 胡方舟 +Date: Fri Nov 5 06:56:47 2021 +0000 + + Merge branch 'sprint/170' into 'sprint/170_xieqiyu_43919' + + # Conflicts: + # db/zentao.sql + +commit 7992f18ea351b89c57461da1d702d8e3109b741b +Author: xieqiyu +Date: Fri Nov 5 14:50:15 2021 +0800 + + * Code for task#43919. Modify review questions. + +commit af3433da43a7df9ba972d5e694b8949862ab36be +Author: dingguodong +Date: Fri Nov 5 14:28:10 2021 +0800 + + * Correct misspelled words. + +commit ea759a440164504d38bca201f2c4b255d0698e4e +Author: dingguodong +Date: Fri Nov 5 14:27:41 2021 +0800 + + * Add zt_mrapproval table. + +commit 38995c2713d3deb372e301657950de83a98a0c19 +Author: dingguodong +Date: Fri Nov 5 14:26:44 2021 +0800 + + * Fix issue when the type of message is string. + +commit 8b7616a6265ceb5aadfe06aedec3cc1d360d021a +Author: xieqiyu +Date: Fri Nov 5 13:48:09 2021 +0800 + + * Code for task#43919. Add lang and main default. + +commit 2155948d195aec5f67734d71f8f999a8757ad8ca +Author: dingguodong +Date: Fri Nov 5 13:47:57 2021 +0800 + + * Add approve function for MR module. + +commit d7831c28e0f19a5504ff2102e8baad8d61d89bab +Author: zenggang +Date: Fri Nov 5 05:19:27 2021 +0000 + + * Finish task#43841,43842,43843 + +commit 7945a8c8cbf63c73e2f05bf7b1e0b35dd0c7da53 +Author: zenggang +Date: Fri Nov 5 05:13:36 2021 +0000 + + * Finish task#43841,43842,43843 + +commit 5f9b3ed65400e3df2b653cc75b8077b1f6a20028 +Author: 王怡栋 +Date: Fri Nov 5 13:11:42 2021 +0800 + + * adjust for lang for api. + +commit 8b6ba26c9f4f96861d7058ba6a6260393d77e516 +Author: 王怡栋 +Date: Fri Nov 5 11:33:59 2021 +0800 + + * fix bug #15189. + +commit b8f2d9aa80c0bcd9ae1ad6c9a71141eb21eaddb3 +Merge: 31f72ade7b d420eba707 +Author: 王怡栋 +Date: Fri Nov 5 03:31:00 2021 +0000 + + Merge branch 'sprint/171_sgm_waterfall' into 'sprint/168' + + * Finish task #44005. + + See merge request easycorp/zentaopms!321 + +commit d420eba707ed2f182e9dad74f56540865d6d2b60 +Author: 孙广明 +Date: Fri Nov 5 11:24:19 2021 +0800 + + * Finish task #44005. + +commit 5812a1e5103bb2bbd91d46fb8f12bbd6f423a0f3 +Merge: dbf4a5cff6 0fa14065b2 +Author: 孙广明 +Date: Fri Nov 5 03:22:17 2021 +0000 + + Merge branch 'sprint/170_tianshujie_43903' into 'sprint/170' + + * Finish task #43903 + + See merge request easycorp/zentaopms!319 + +commit d2c653ff48531d51f66f72b384c3e2ea9f7057f3 +Author: 王怡栋 +Date: Fri Nov 5 11:22:05 2021 +0800 + + * fix bug #15189. + +commit dbf4a5cff6db11a15141f5ac17f441c57aa8cfe1 +Merge: 7377b40c00 1fbae29f29 +Author: 孙广明 +Date: Fri Nov 5 03:20:38 2021 +0000 + + Merge branch 'sprint/170_mayue_15688' into 'sprint/170' + + * Fix bug #15688. + + See merge request easycorp/zentaopms!320 + +commit 0fa14065b2b4c90d9505992a32d98d67bd5c146d +Author: tianshujie +Date: Fri Nov 5 11:20:22 2021 +0800 + + * Modify the constant name of the branch trunk. + +commit 1fbae29f2933726e85942a5e1798fddb71f0b6c7 +Author: mayue +Date: Fri Nov 5 10:53:36 2021 +0800 + + * Fix bug #15688. + +commit a802ccc98200c8e443322da13a5ab58aa2e0877e +Author: 王怡栋 +Date: Fri Nov 5 10:35:22 2021 +0800 + + * fix error. + +commit fce9a155c06b340502dd996e9a3e42176cf0ffd4 +Author: 王怡栋 +Date: Fri Nov 5 10:17:24 2021 +0800 + + * adjust for js error. + +commit 62041f2bf3f74352616259f39482f666afa8b993 +Author: 王怡栋 +Date: Fri Nov 5 10:15:53 2021 +0800 + + * code task #43770,43771,43772,43773,43774,43775,43776. + +commit fcfa4a9064b1899383bef39e915a2915db703154 +Author: tianshujie +Date: Fri Nov 5 09:25:47 2021 +0800 + + * Add all options in the branch drop-down. + +commit 1ae57e792b6c23c386c9e1aeee4d2d4dc433a29c +Author: tianshujie +Date: Fri Nov 5 09:22:36 2021 +0800 + + * Modify language item of branch lang file. + +commit 0e3d64843e84529027aed6de471360c30bba5cf8 +Author: tianshujie +Date: Fri Nov 5 09:08:25 2021 +0800 + + * Restore code. + +commit 6cb70ab01d9c9fee6dcd34b23b85fe43dbb476eb +Author: tianshujie +Date: Fri Nov 5 08:59:55 2021 +0800 + + * Finish task #43903. + +commit 7377b40c00795b3b01eba6fd631d089795636c0f +Merge: 9285f2424f 2ee7793126 +Author: 孙广明 +Date: Fri Nov 5 00:58:50 2021 +0000 + + Merge branch 'sprint/170_mayue_15690' into 'sprint/170' + + * Fix bug #15690. + + See merge request easycorp/zentaopms!316 + +commit 2ee7793126b81d046e599bc24cf19e24dec7dc9a +Author: mayue +Date: Fri Nov 5 08:55:33 2021 +0800 + + * Fix bug #15690. + +commit d74ce6644581b9e8e92426a21389441ab209ceef +Author: xieqiyu +Date: Fri Nov 5 08:45:34 2021 +0800 + + * Code for task#43919. + +commit 9285f2424f46f44d09378fd273f7f412e115336c +Merge: d7ac642f3d 23b7e471d2 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 4 09:42:56 2021 +0000 + + Merge branch 'sprint/170_zhouxin_43876' into 'sprint/170' + + Finish task #43876. + + See merge request easycorp/zentaopms!315 + +commit d7ac642f3db940e8bdd0194f5d0749334ca35482 +Merge: 8c28cf76e9 d6361de047 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 4 09:42:14 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_43917' into 'sprint/170' + + * Finish task 43917 + + See merge request easycorp/zentaopms!314 + +commit 77aa89db59f060183ef8a20433efe48b5a01e8e1 +Author: Hao Sun +Date: Thu Nov 4 17:41:28 2021 +0800 + + * add new icons: version、thumbs-up、thumbs-down. + +commit 8c28cf76e9fab5e971afbc13a8014b7e1010ff2f +Merge: f14b5910fe 708957c6b2 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 4 09:40:50 2021 +0000 + + Merge branch 'sprint/170_dingna_task_43913' into 'sprint/170' + + * Adjust code for task#43913. + + See merge request easycorp/zentaopms!317 + +commit d6361de047dd77cf405cb1d1846b53a02000105c +Author: root +Date: Thu Nov 4 17:38:34 2021 +0800 + + * Finish task 43917 + +commit 708957c6b2445e4ff49cd50cf23f242d3b789a7b +Author: dingna +Date: Thu Nov 4 17:37:26 2021 +0800 + + * Adjust code for task#43913. + +commit 150a1395e12c2ae14455dfbabf334db2e08ce99b +Author: mayue +Date: Thu Nov 4 17:30:11 2021 +0800 + + * Fix bug #15690. + +commit 24c8e0948d808d513f7855f64cbb02ae888e1938 +Author: root +Date: Thu Nov 4 17:24:52 2021 +0800 + + * Finish task 43917 + +commit 23b7e471d29c9228144376a0195704211aa06808 +Author: zhouxin +Date: Thu Nov 4 17:16:16 2021 +0800 + + Finish task $43876. + +commit 31f72ade7b50f47ce2d74fe0cd3f02c063aea6a1 +Merge: ad7fd76e1b f9978c4841 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 4 09:15:26 2021 +0000 + + Merge branch 'sprint/168_sgm_44005' into 'sprint/168' + + * Code for task #44005. + + See merge request easycorp/zentaopms!313 + +commit f9978c4841afa7487992e8ccba31b6937c45dc59 +Author: 孙广明 +Date: Thu Nov 4 17:07:37 2021 +0800 + + * Code for task #44005. + +commit 75d547998c859a7e7809ce2214a26fa1128bfdd6 +Author: 孙广明 +Date: Thu Nov 4 16:55:37 2021 +0800 + + * Code for task #44005. + +commit ad7fd76e1bf9f6734098bd36d115e9cbe4a8b462 +Merge: 62dced270b 67f485736e +Author: 孙广明 +Date: Thu Nov 4 08:44:28 2021 +0000 + + Merge branch 'sprint/171_liyuchun_bug' into 'sprint/168' + + * Finish task #43935. + + See merge request easycorp/zentaopms!312 + +commit 67f485736e6232c88d30b902f1e54164372b85a9 +Author: liyuchun +Date: Thu Nov 4 16:32:51 2021 +0800 + + * Fix error of task #43935. + +commit f14b5910fe72c7e4e68b246148f4f5357d6332c4 +Merge: 7f9a50407a ccabbde1e0 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 4 08:29:24 2021 +0000 + + Merge branch 'sprint/170_dingna_task_43913' into 'sprint/170' + + * Finish task#43913. + + See merge request easycorp/zentaopms!307 + +commit a6483ab2dc9ab0238a1c98271f5561e0f9d9d729 +Author: liyuchun +Date: Thu Nov 4 16:24:32 2021 +0800 + + * Finish task #43935. + +commit ccabbde1e095e501a1badc48100de12450ec7caa +Author: dingna +Date: Thu Nov 4 16:21:59 2021 +0800 + + * Adjust code for task#43913. + +commit 4f30e04c95a7c90001d58dcaca69a3ee48ffb522 +Author: dingna +Date: Thu Nov 4 16:18:02 2021 +0800 + + * Adjust code for task#43913. + +commit 966abc3d554c713ad2347c861faf2207c95c1471 +Author: dingna +Date: Thu Nov 4 16:06:08 2021 +0800 + + * Adjust code for task#43913. + +commit 3bce793b94a104bd419045b054e687213d374784 +Author: dingguodong +Date: Thu Nov 4 16:03:20 2021 +0800 + + * Optimize view MR and prepare for approve MR. + +commit e893c7f6c38cca5891a8d64a71404abf97194e6c +Author: tianshujie +Date: Thu Nov 4 15:42:39 2021 +0800 + + * Add upgrade sql. + +commit 7f9a50407a10ac899549cfeaecfb6f654652b221 +Merge: f0c33b07e4 b6d31db5aa +Author: 王怡栋 +Date: Thu Nov 4 07:22:55 2021 +0000 + + Merge branch 'sprint/170_sunhao/fix_task41233' into 'sprint/170' + + * Task #41233, fix open in new tab on pressed ctrl key not work as expected and improve perf. + + See merge request easycorp/zentaopms!287 + +commit f0c33b07e45c01549bb17167236e883f3ac98481 +Merge: b4905cdf02 de56fc1253 +Author: 王怡栋 +Date: Thu Nov 4 07:21:45 2021 +0000 + + Merge branch 'sprint/170_liugang/fix_fullscreen_bug' into 'sprint/170' + + * Fix that can't toggle fullscreen mode in IE11. + + See merge request easycorp/zentaopms!303 + +commit 421cb2dfa8c7e8a4312d0b546872e2e234b9c74e +Author: dingna +Date: Thu Nov 4 14:48:51 2021 +0800 + + * Adjust code for task#43913. + +commit 0afeb5620a12d6d8ed1d6f8cf9c92769b56bd4a0 +Author: dingna +Date: Thu Nov 4 14:45:40 2021 +0800 + + * Adjust code for task#43913. + +commit b4905cdf02cacbd9b07413c5e3b60827807000af +Merge: 6f5e1b75f7 50ad0453f6 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 4 06:32:57 2021 +0000 + + Merge branch 'sprint/170_tianshujie_43907' into 'sprint/170' + + * Modify variable error. + + See merge request easycorp/zentaopms!311 + +commit 50ad0453f6de24acafaea6d279e3f5d588b5a63c +Author: tianshujie +Date: Thu Nov 4 14:25:33 2021 +0800 + + * Modify variable error. + +commit 6f5e1b75f7930199889a63fce18ebf93c02252da +Merge: 9d359fa387 8fe8ad90af +Author: 孙广明 +Date: Thu Nov 4 06:23:51 2021 +0000 + + Merge branch 'sprint/170_zhouxin_43877' into 'sprint/170' + + Sprint/170 zhouxin 43877 + + See merge request easycorp/zentaopms!308 + +commit 62dced270b5ff83d931c33b702841dc48c36442f +Merge: 3d2350112a edd4f50a8e +Author: 孙广明 +Date: Thu Nov 4 06:16:45 2021 +0000 + + Merge branch 'sprint/171_liyuchun_bug' into 'sprint/168' + + Finish task #43928, #43927. + + See merge request easycorp/zentaopms!310 + +commit edd4f50a8e8851354e42f439146d0a846daeab55 +Author: liyuchun +Date: Thu Nov 4 14:10:00 2021 +0800 + + * Fix bug #43928. + +commit 9d359fa3877ab3b49d06ba8a4f054a74cdb4b407 +Merge: 4f5e19fc66 d8baf1d3fa +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 4 05:44:25 2021 +0000 + + Merge branch 'sprint/170_hufangzhou_43899' into 'sprint/170' + + * Add the last plan lang item. + + See merge request easycorp/zentaopms!309 + +commit d8baf1d3fa099a4bbb2df3f449c58b0e3c86ca37 +Author: hufangzhou +Date: Thu Nov 4 13:42:51 2021 +0800 + + * Add the last plan lang item. + +commit 8fe8ad90afd0b21ae02bd6a1098bdb7f643b4c1a +Author: zhouxin +Date: Thu Nov 4 13:22:09 2021 +0800 + + Finish task 43877. + +commit 638903f5c4816f0a0c2148b8ef75499425a6b71c +Author: dingna +Date: Thu Nov 4 13:21:43 2021 +0800 + + * Finish task#43913. + +commit 4f5e19fc66472164da889320ec11953f0f0826fc +Merge: b60cdf29e2 64d4d04c7e +Author: 孙广明 +Date: Thu Nov 4 05:14:47 2021 +0000 + + Merge branch 'sprint/170_zhengrunyu_43915' into 'sprint/170' + + *Finish task #43915. + + See merge request easycorp/zentaopms!297 + +commit 64d4d04c7eaf32c19c50d3f472b3c17fac76940b +Author: zhengrunyu +Date: Thu Nov 4 13:13:10 2021 +0800 + + *Finish task #43915. + +commit c3558d6b7569b9087f3c767ed503ae3070f05449 +Author: zhouxin +Date: Thu Nov 4 13:12:17 2021 +0800 + + Finish task #43877. + +commit 01a7ed9151c0a49558a910116d57c9e59cba0107 +Author: zhengrunyu +Date: Thu Nov 4 13:09:02 2021 +0800 + + *Finish task #43915. + +commit 5b47d67d937895bf7ffa26c2a16eebcdaacbe169 +Author: zhengrunyu +Date: Thu Nov 4 13:05:19 2021 +0800 + + *Finish task #43915. + +commit b60cdf29e208f6a772cb0e858da08216a8653b7a +Merge: e3dd8fcba4 af5b6ff489 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 4 05:04:03 2021 +0000 + + Merge branch 'sprint/170_hufangzhou_43899' into 'sprint/170' + + * Finish task #43899. + + See merge request easycorp/zentaopms!305 + +commit af5b6ff489910791a8c6dffec12c3bc85dd56a56 +Author: hufangzhou +Date: Thu Nov 4 11:48:22 2021 +0800 + + * Finish task #43899. + +commit b684d521228b35c4dde4309260937b56756ddb8c +Author: 王怡栋 +Date: Thu Nov 4 11:29:55 2021 +0800 + + * code for task #43770. + +commit 33368deaf455c0fc6aad0148c817c2ae796fc031 +Author: dingguodong +Date: Thu Nov 4 11:27:19 2021 +0800 + + * Make sure each file with same ID is unique. + +commit 2d8ea6385be804fdfb7f9606c28293ee42d1bf6a +Author: 王怡栋 +Date: Thu Nov 4 10:46:26 2021 +0800 + + * code for task #43780. + +commit af5636233ff64531024c03712792594ec31df6fe +Author: dingguodong +Date: Thu Nov 4 10:38:56 2021 +0800 + + * Add .vscode into .gitignore file. + +commit de56fc1253f50593100e669d5275241e02a7e782 +Author: liugang +Date: Thu Nov 4 10:30:01 2021 +0800 + + * Fix that can't toggle fullscreen mode in IE11. + +commit 2acf4c98db142dcd5bd6e598f4ad7d6eea39fe31 +Author: dingguodong +Date: Thu Nov 4 10:21:17 2021 +0800 + + * Optimize merge request status in view page of MR module. + +commit 201e471accfa4c67c5b01a73411ae79c757c8097 +Author: dingguodong +Date: Thu Nov 4 10:20:43 2021 +0800 + + * Enable diff function in view page of MR module. + +commit 7cbfe70bd436f44daff9fcc7f5fc127664d8ae5c +Author: 王怡栋 +Date: Thu Nov 4 10:19:50 2021 +0800 + + * code for task #43779. + +commit d5c9ad1017224f15f46667fae79e11d2f5d0b0e4 +Author: dingguodong +Date: Thu Nov 4 10:18:38 2021 +0800 + + * Optimize diff function in MR module. + +commit 380941f957bf2140f88a65ab016b34d6115ac943 +Author: liyuchun +Date: Thu Nov 4 10:06:14 2021 +0800 + + * Fix bug #43927. + +commit 3d2350112ae4e9109bb00f315921ee964655f7df +Merge: 88c410fdf2 5db6060e90 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 4 02:01:53 2021 +0000 + + Merge branch 'sprint/171_sgm_43987' into 'sprint/168' + + * Code for task #43985. + + See merge request easycorp/zentaopms!302 + +commit e3dd8fcba4ace5bf77924e28bf15e7d9a7926067 +Merge: 76bbef3f01 79597546d9 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 4 01:57:55 2021 +0000 + + Merge branch 'sprint/170_tianshujie_43907' into 'sprint/170' + + *Finish task #43907. + + See merge request easycorp/zentaopms!299 + +commit 76bbef3f01301290aed0598fe503c7713228f2c1 +Merge: e951745a7e f79d676ad3 +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 4 01:56:48 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_15695' into 'sprint/170' + + * Fix bug #15695. + + See merge request easycorp/zentaopms!300 + +commit 5db6060e900600c8f6a622da384bd18e38715b55 +Author: 孙广明 +Date: Thu Nov 4 09:53:03 2021 +0800 + + * Code for task #43985. + +commit f79d676ad3a56ec6c83fad560895a77f86d71f85 +Author: root +Date: Thu Nov 4 09:51:54 2021 +0800 + + * Fix bug #15695 + +commit 66f83b187d7fc6a601eae4fce05ffdd61f6483a5 +Author: root +Date: Thu Nov 4 09:50:51 2021 +0800 + + * Fix bug #15695 + +commit 171eb2f32eb843e5ba2c004e4f84fda9916658a1 +Author: Hao Sun +Date: Thu Nov 4 09:46:25 2021 +0800 + + * fix modern js syntax not work in ie11. + +commit 4dc9c7c5df1cc4f04d1f4ff97fda0987b210afe8 +Author: root +Date: Thu Nov 4 09:33:56 2021 +0800 + + * Fix bug #15695 + +commit eafd443fca4885f5c64d74b7aa8e564b60a69024 +Author: root +Date: Thu Nov 4 09:31:17 2021 +0800 + + * Fix bug #15695 + +commit e951745a7ebefbedda0f855c5729bb1f932e66c0 +Merge: 11fc599508 cb6a36fd4b +Author: 李玉春 <563917701@qq.com> +Date: Thu Nov 4 01:17:07 2021 +0000 + + Merge branch 'sprint/170_mayue_12047' into 'sprint/170' + + * Fix bug #12047. + + See merge request easycorp/zentaopms!298 + +commit 79597546d9277cbfdbd67da288fbfd36e47843ef +Author: tianshujie +Date: Thu Nov 4 09:07:09 2021 +0800 + + * Finish task #43907. + +commit cb6a36fd4b34d5bcbb3d7c2d304cbea96a7a47a5 +Author: mayue +Date: Thu Nov 4 08:54:25 2021 +0800 + + * Fix bug #12047. + +commit f123cdefc1aeb66b6ea46a500d37d035b37fffe6 +Author: mayue +Date: Thu Nov 4 08:18:20 2021 +0800 + + * Fix bug #12047. + +commit bdcf45423950a2a6c417f72ff08bcc0d1cc35754 +Author: dingguodong +Date: Wed Nov 3 17:53:14 2021 +0800 + + * Implement view diffs in MR module. + +commit 79e7052af0ba8f9557a761b5e07c4c2b5a5e6f79 +Author: zhengrunyu +Date: Wed Nov 3 17:23:38 2021 +0800 + + *Finish task #43915. + +commit 3a5bbcdaf79eb120dcb92da192df0a458cc9cac3 +Author: zhengrunyu +Date: Wed Nov 3 17:20:24 2021 +0800 + + *Finish task #43915. + +commit 88c410fdf2f7729533a966a96184a023f3ceee61 +Merge: 830a8d4583 245d8ef65f +Author: 孙广明 +Date: Wed Nov 3 09:17:19 2021 +0000 + + Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168' + + * Fix bug #15933. + + See merge request easycorp/zentaopms!295 + +commit 6a20c5b9b9972766a2fbe6b9cd0abc8b675c4875 +Author: zhengrunyu +Date: Wed Nov 3 17:16:46 2021 +0800 + + *Finish task #43915. + +commit 830a8d4583bd764a4251ea6e4116ef2f5073634a +Merge: 784a74c8f1 410499dc9a +Author: 孙广明 +Date: Wed Nov 3 09:15:21 2021 +0000 + + Merge branch 'sprint/171_liyuchun_bug' into 'sprint/168' + + Sprint/171 liyuchun bug + + See merge request easycorp/zentaopms!296 + +commit 410499dc9a0ea53cfb83428c67ac12712fbb2ec2 +Author: liyuchun +Date: Wed Nov 3 17:04:50 2021 +0800 + + * Fix bug #43931. + +commit 28027af1b041c12fb45c7ce94326587bea057624 +Author: liyuchun +Date: Wed Nov 3 17:03:57 2021 +0800 + + * Fix bug #43931. + +commit 11fc5995083ccda1c868afc5987b141501c7505a +Merge: c91536aea4 fb9bc91030 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 3 08:52:18 2021 +0000 + + Merge branch 'sprint/170_mayue_15973' into 'sprint/170' + + * Fix bug #15973. + + See merge request easycorp/zentaopms!291 + +commit ddc8fade9a954c2f7ce73426b3b20716c0fc671d +Author: liyuchun +Date: Wed Nov 3 16:51:14 2021 +0800 + + * Fix bug #15869. + +commit c91536aea4a5ab79e219391c8ca9bf37d9b38917 +Merge: bf89b952d9 02c2f5e2e2 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 3 08:10:57 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_15689' into 'sprint/170' + + * Fix bug #15689 + + See merge request easycorp/zentaopms!292 + +commit bf89b952d9f37813f5d61a47c096e7b1f407bef8 +Merge: 0ce134c1e4 2dd70ed7e4 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 3 08:10:42 2021 +0000 + + Merge branch 'sprint/170_dingna_task_43900' into 'sprint/170' + + * Finish task#43900. + + See merge request easycorp/zentaopms!286 + +commit 784a74c8f14757ffc51cd0faa83a6c960645cae1 +Merge: f47ca70f2e 373b4746d0 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 3 08:09:52 2021 +0000 + + Merge branch 'sprint/171_sgm_43987' into 'sprint/168' + + * Code for task #43985,#43984. + + See merge request easycorp/zentaopms!294 + +commit 0ce134c1e400439b3a633ddae743b39195fa368d +Merge: c3a2ed73ba d297c809b3 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 3 08:07:55 2021 +0000 + + Merge branch 'sprint/170_tianshujie_43907' into 'sprint/170' + + * Finish task #43907. + + See merge request easycorp/zentaopms!293 + +commit 2dd70ed7e45f85eefa3de7aab5b46fb555d0eea5 +Author: dingna +Date: Wed Nov 3 16:02:06 2021 +0800 + + * Finish task#43900. + +commit 373b4746d00e69755a7ddb81af8308e4fed43e2e +Author: 孙广明 +Date: Wed Nov 3 16:02:02 2021 +0800 + + * Code for task #43985,#43984. + +commit d297c809b349558eb3edabd080c52bafafb12452 +Author: tianshujie +Date: Wed Nov 3 15:51:04 2021 +0800 + + * Finish task #43907. + +commit 02c2f5e2e2fe71fc1f72cb552d8380f2d774ce44 +Author: root +Date: Wed Nov 3 15:45:26 2021 +0800 + + * Fix bug #15689 + +commit fb9bc9103007c8effd5de2d0ea785053db21bd7e +Author: mayue +Date: Wed Nov 3 15:38:49 2021 +0800 + + * Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973. + +commit c3a2ed73ba00326e9ec1e8329675a1699582bfb6 +Merge: 01e30c4dbd b5d3e49e80 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 3 07:38:21 2021 +0000 + + Merge branch 'sprint/170_zhouxin_43875' into 'sprint/170' + + Finish task #43875. + + See merge request easycorp/zentaopms!290 + +commit f47ca70f2ef5250c7ab2ae8f72b342721b0fc7bf +Merge: 55d9d675b6 e4a97a5687 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 3 07:24:41 2021 +0000 + + Merge branch 'sprint/168_tianshujie_kanban' into 'sprint/168' + + * Fix bug card update logic. + + See merge request easycorp/zentaopms!285 + +commit b5d3e49e80ff5435f5ab2bde48abdd64a06dd55f +Author: zhouxin +Date: Wed Nov 3 15:22:31 2021 +0800 + + Finish task #43875. + +commit 01e30c4dbd962d1dd26e70665a3d0d4fda995b3b +Merge: 961a683fcb c916df0117 +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 3 07:18:17 2021 +0000 + + Merge branch 'sprint/170_mayue_15780' into 'sprint/170' + + * Fix bug #15780. + + See merge request easycorp/zentaopms!288 + +commit 961a683fcb687ef866c66cc079e91a0d35b73627 +Merge: 8b1b92bdfc 30c118cd9a +Author: 李玉春 <563917701@qq.com> +Date: Wed Nov 3 07:17:40 2021 +0000 + + Merge branch 'sprint/170_songchenxuan_15691' into 'sprint/170' + + * Fix bug #15691. + + See merge request easycorp/zentaopms!289 + +commit c5e9e3713e0ebc4b05559a7e146ef6b2911d1c51 +Author: 王怡栋 +Date: Wed Nov 3 15:17:13 2021 +0800 + + * code for task #43778. + +commit 30c118cd9a6ab6ab84f4f111b1e4f5dd07ed9a8e +Author: root +Date: Wed Nov 3 15:06:36 2021 +0800 + + * Fix bug #15691 + +commit c916df0117117693799732410b5fdbe09babab39 +Author: mayue +Date: Wed Nov 3 15:05:44 2021 +0800 + + * Fix bug #15780. + +commit 9eadf03db64e7ff01b3976076588782c4f7bcdba +Author: 王怡栋 +Date: Wed Nov 3 14:55:52 2021 +0800 + + * code for task #43777. + +commit be67b785b3022bedc5e8e0ee6bf990f243affd5d +Author: mayue +Date: Wed Nov 3 14:50:48 2021 +0800 + + * Fix bug #15780. + +commit 8fb62009f48cbc296e89a16f5cbea36ada101bf6 +Author: root +Date: Wed Nov 3 14:45:14 2021 +0800 + + * Fix bug #15691. + +commit b6d31db5aab06e0462a6a8c124ae05fe2e8f7ad5 +Author: Hao Sun +Date: Wed Nov 3 14:19:22 2021 +0800 + + * task #41233, fix open in new tab on pressed ctrl key not work as expected and improve perf. + +commit 7b19208c1be0d0bb83e0445f4c7a86b0fe4ada1e +Author: dingna +Date: Wed Nov 3 13:50:07 2021 +0800 + + * Finish task#43900. + +commit ca70d43ca02610b8c9bbb2be1c9b986f0f4ee5d5 +Author: tianshujie +Date: Wed Nov 3 13:09:20 2021 +0800 + + * Fix the task pri language item of the max version. + +commit 420c0ab6d410d4eb48516fb7f68290ae4b0c8ebc +Author: 王怡栋 +Date: Wed Nov 3 13:07:04 2021 +0800 + + * code for task #43781. + +commit e4a97a5687e421690cf0704be21f1be73d577a72 +Author: tianshujie +Date: Wed Nov 3 12:34:03 2021 +0800 + + * Fix bug card update logic. + +commit 25858631e8909ad928f17760c918293585d82186 +Merge: 760e4703ce 5ca0c7972e +Author: tianshujie +Date: Wed Nov 3 11:26:21 2021 +0800 + + Merge branch 'sprint/169_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/169_package + +commit 760e4703ce7ae6e479e2b10655d06648b19591ef +Author: tianshujie +Date: Wed Nov 3 11:25:59 2021 +0800 + + * Fix bug #15693. + +commit 5ca0c7972ef2b8bc823323191b176f321279ed36 +Author: mayue +Date: Wed Nov 3 11:24:51 2021 +0800 + + * Fix bug #15835. + +commit c9bc23b5522475281e3b99e714b5489cc776ce4c +Merge: c8cecbdae1 0c6cc1ecf3 +Author: tianshujie +Date: Wed Nov 3 11:15:57 2021 +0800 + + Merge branch 'sprint/169_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/169_package + +commit c8cecbdae19a7c7d416db2e5cfbaa5127bf53d04 +Author: tianshujie +Date: Wed Nov 3 11:15:34 2021 +0800 + + * Fix bug #15958. + +commit 0c6cc1ecf39679b02f3849c86a48f2dfe8eb8c13 +Merge: 8418711168 c57171f5b2 +Author: hufangzhou +Date: Wed Nov 3 10:55:22 2021 +0800 + + Merge branch 'sprint/169_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/169_package + +commit 84187111689706f82cfff544cda672039eadf3a0 +Author: hufangzhou +Date: Wed Nov 3 10:50:10 2021 +0800 + + * Fix bug #15953. + +commit c57171f5b25ccc262ff1bfd07752a1581351ba60 +Author: tianshujie +Date: Wed Nov 3 10:34:16 2021 +0800 + + * Fix bug #15958. + +commit 245d8ef65f462a95990d2ed2ae9e856199e17a04 +Author: liyuchun +Date: Wed Nov 3 09:40:21 2021 +0800 + + * Fix bug #15933. + +commit 55d9d675b6f45338fa9cafa5f1e9909c2ee0280b +Merge: f011907e1f a25e86cb59 +Author: 孙广明 +Date: Wed Nov 3 01:17:58 2021 +0000 + + Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168' + + Sprint/168 liyuchun bug + + See merge request easycorp/zentaopms!284 + +commit a25e86cb590851c91e8b3129bf81fd460e13f9f6 +Author: liyuchun +Date: Wed Nov 3 09:15:07 2021 +0800 + + * Adjust error of kanban action. + +commit 6ce13b1e1747963219d0d4688c908c52d66eafe9 +Author: liyuchun +Date: Wed Nov 3 08:57:46 2021 +0800 + + * Fix bug #15928. + +commit 074d13aa20a1df023c00f2a650160122b5278e57 +Author: dingguodong +Date: Wed Nov 3 08:53:18 2021 +0800 + + * Correct malformed codes and create sugon branch. + +commit f011907e1f595235c7cf220e7d72a0f030d48c09 +Merge: 86c7464aca 90b6253107 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 2 06:13:46 2021 +0000 + + Merge branch 'sprint/168_sgm_fixvarname' into 'sprint/168' + + * Change var name. + + See merge request easycorp/zentaopms!281 + +commit 90b62531078d7561469352ac7f7e486d23a3dcde +Author: 孙广明 +Date: Tue Nov 2 14:12:18 2021 +0800 + + * Fix var name. + +commit 86c7464aca379ed7477d64d006e1a195bc68aa24 +Merge: 3a61d3e8a6 c7f0e74517 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 2 06:09:04 2021 +0000 + + Merge branch 'sprint/168_sgm_assignpriv' into 'sprint/168' + + * Assign btn check priv. + + See merge request easycorp/zentaopms!282 + +commit cc321393f607b9b822385f1520eb85371b019b8e +Author: 孙广明 +Date: Tue Nov 2 14:05:53 2021 +0800 + + * Change var name. + +commit 3a61d3e8a643e54bceaf3387151e161bb9ea1a29 +Merge: 05592f11a4 59364de4d8 +Author: 孙广明 +Date: Tue Nov 2 06:04:03 2021 +0000 + + Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168' + + * Fix bug #15852. + + See merge request easycorp/zentaopms!275 + +commit 05592f11a45ac9886657b8b112bdc6dd2084f46a +Merge: f5ddaea3d9 b48c61becc +Author: 孙广明 +Date: Tue Nov 2 06:01:44 2021 +0000 + + Merge branch 'sprint/168_zenggang_15929' into 'sprint/168' + + * Fix bug#15929 + + See merge request easycorp/zentaopms!280 + +commit c7f0e745177518339d0e535a05249fc50c3a9d78 +Author: 孙广明 +Date: Tue Nov 2 13:59:41 2021 +0800 + + * Assign btn check priv. + +commit 9fba68e3672f41a2e8c29e7028fddc7888828ed6 +Author: 王怡栋 +Date: Tue Nov 2 13:44:00 2021 +0800 + + * code for task #43768. + +commit f5ddaea3d91e6c77556453bf55b2df00c3e0cb1b +Merge: f5e671c523 40a2c67b6d +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 2 05:06:15 2021 +0000 + + Merge branch 'sprint/168_tianshujie_15909' into 'sprint/168' + + * Fix bug #15909. + + See merge request easycorp/zentaopms!279 + +commit 8b1b92bdfc674ce73015f26f88c579413f5bff6a (tag: zentaopms_15.7.1_20211102) +Author: hufangzhou +Date: Tue Nov 2 12:37:51 2021 +0800 + + * Add the version. + +commit 40a2c67b6de6cef4f3864f35937538c85a544a66 +Author: tianshujie +Date: Tue Nov 2 12:29:30 2021 +0800 + + * Fix bug #15909. + +commit b48c61becc0f01b6eb03d13b04f0fe9ed34899ff +Author: zenggang +Date: Tue Nov 2 03:49:50 2021 +0000 + + * Fix bug#15929 + +commit f786d077e4469681238a6b2ca757a05edcfdd9aa +Author: Hao Sun +Date: Tue Nov 2 11:17:12 2021 +0800 + + * improve layout of execution kanban. + +commit 2b9f96e513c581d9380cf18afcd4c013443d426b +Author: Hao Sun +Date: Tue Nov 2 11:16:56 2021 +0800 + + * refactor. + +commit a48665e11b9d8b99ea52896965d112654a399f65 +Author: Hao Sun +Date: Tue Nov 2 11:16:27 2021 +0800 + + * limit kanban height. + +commit f5e671c523ed5156e4e8661c1e6c84c38e6eca21 +Merge: e57c5d4cd4 cfda1731a1 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 2 02:45:22 2021 +0000 + + Merge branch 'sprint/168_tianshujie_15889' into 'sprint/168' + + * Fix bug #15889. + + See merge request easycorp/zentaopms!276 + +commit e57c5d4cd427b87408327f71dc267c0e04080031 +Merge: b8c16619cc a626227f5e +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 2 02:44:55 2021 +0000 + + Merge branch 'sprint/168_tianshujie_15870' into 'sprint/168' + + * Fix bug #15870. + + See merge request easycorp/zentaopms!277 + +commit a626227f5ea7d7e959c36889c358fa2ca72ac777 +Author: tianshujie +Date: Tue Nov 2 10:30:30 2021 +0800 + + * Fix bug #15870. + +commit 59364de4d831ae332fb8a6e27f43600c6a74ee15 +Author: liyuchun +Date: Tue Nov 2 10:18:44 2021 +0800 + + * Fix bug #15851. + +commit cfda1731a1e26330fb8656a6909fd9e781a4e618 +Author: tianshujie +Date: Tue Nov 2 10:10:02 2021 +0800 + + * Fix bug #15889. + +commit 03d1e570fc2e77b62f220ad96eac861f26a8e18a +Author: liyuchun +Date: Tue Nov 2 09:58:20 2021 +0800 + + * Fix bug #15844. + +commit f8e3ffe97b630192bb006c5c3f00f7491bc72e41 +Merge: 46f2aecae3 07581624f2 +Author: 王怡栋 +Date: Tue Nov 2 09:54:05 2021 +0800 + + Merge branch 'sprint/169' + +commit fcce47b768cefe104050656f788850b6b22f0c59 +Author: liyuchun +Date: Tue Nov 2 09:48:49 2021 +0800 + + * Fix bug #15852. + +commit b8c16619cc521804ca0f3d9ba7c3c140463a55ed +Merge: 27abd7ddf0 84de930ed1 +Author: 孙广明 +Date: Tue Nov 2 01:48:08 2021 +0000 + + Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168' + + * Fix bug #15907. + + See merge request easycorp/zentaopms!273 + +commit 27abd7ddf0320b4002e87a4912abd3d0dbaaa32f +Merge: f7ce0adcd0 a91d1f3f98 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 2 01:47:09 2021 +0000 + + Merge branch 'sprint/168_xieqiyu_15888' into 'sprint/168' + + * Fix bug#15888. + + See merge request easycorp/zentaopms!274 + +commit a91d1f3f98263962b3f72b6ccc214bd450896de4 +Author: xieqiyu +Date: Tue Nov 2 09:45:53 2021 +0800 + + * Code for bug#15888. + +commit 68c4026e14fea2652713031721d600428a2c1077 +Author: xieqiyu +Date: Tue Nov 2 09:38:02 2021 +0800 + + * Fix bug#15888. + +commit 84de930ed16d825fca8d07240009702680d1a660 +Author: liyuchun +Date: Tue Nov 2 09:27:06 2021 +0800 + + * Fix bug #15853. + +commit 49360564653eafb739adcd76a6ff3cc72db99986 +Author: liyuchun +Date: Tue Nov 2 09:15:53 2021 +0800 + + * Fix bug #15907. + +commit f7ce0adcd000f2abb166ec97eadc04e9fc49c711 +Merge: c054ee2c8c a925bd1d90 +Author: 孙广明 +Date: Tue Nov 2 01:05:03 2021 +0000 + + Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168' + + * Fix bug #15901. + + See merge request easycorp/zentaopms!270 + +commit c054ee2c8c531026c3b9b97f37286fc9ab133504 +Merge: cb3e573d30 237b488504 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 2 01:01:57 2021 +0000 + + Merge branch 'sprint/168_tianshujie_15904' into 'sprint/168' + + * Fix bug #15904. + + See merge request easycorp/zentaopms!272 + +commit 07581624f287c4971c938b7808450fa318efbb5a (origin/sprint/169) +Merge: 67743d72d9 70c21e6a28 +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 2 01:00:26 2021 +0000 + + Merge branch 'sprint/169_hufangzhou_bug' into 'sprint/169' + + * Fix bug #15838. + + See merge request easycorp/zentaopms!271 + +commit 237b48850470e93ef12289bf1943fe3996fa1962 +Author: tianshujie +Date: Tue Nov 2 08:57:47 2021 +0800 + + * Fix bug #15904. + +commit 70c21e6a282dfb2b2aa517b6ebc96af9155e78df +Author: hufangzhou +Date: Tue Nov 2 08:56:20 2021 +0800 + + * Fix bug #15838. + +commit cb3e573d307508e556d5b319a23845457392cbbb +Merge: e7c595df19 5fc96f394c +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 2 00:34:38 2021 +0000 + + Merge branch 'sprint/168_tianshujie_15902' into 'sprint/168' + + * Fix bug #15902. + + See merge request easycorp/zentaopms!269 + +commit e7c595df19fdf7082df4f1b4e85cf56d6d426645 +Merge: 1c98dbd28b 47ee3885ba +Author: 李玉春 <563917701@qq.com> +Date: Tue Nov 2 00:33:07 2021 +0000 + + Merge branch 'sprint/168_xieqiyu_kanban' into 'sprint/168' + + * Fix bug#15886. + + See merge request easycorp/zentaopms!268 + +commit 47ee3885ba65524cb8f8702e5908122242dcb597 +Author: xieqiyu +Date: Tue Nov 2 08:27:32 2021 +0800 + + * Optimize the code. + +commit 5fc96f394c966a825a85fc79875446cff7105890 +Author: tianshujie +Date: Tue Nov 2 08:19:10 2021 +0800 + + * Modify format. + +commit a925bd1d90afa66f085bd5f591ba0a001be1c850 +Author: liyuchun +Date: Mon Nov 1 17:40:36 2021 +0800 + + * Fix bug #15901. + +commit 5444d35cde7d5552d3f32f67f1f89f0f2f8bb3d4 +Author: tianshujie +Date: Mon Nov 1 17:34:25 2021 +0800 + + * Fix bug #15902. + +commit 67743d72d9bd48e35694e125fd3c645f701d33eb +Merge: 771de2c02e 1c4ceda168 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 1 09:22:43 2021 +0000 + + Merge branch 'sprint/169_songchenxuan_15784' into 'sprint/169' + + Sprint/169 songchenxuan 15784 + + See merge request easycorp/zentaopms!267 + +commit 1c4ceda1684fee72982da270cb844bc18f371044 +Author: root +Date: Mon Nov 1 17:19:25 2021 +0800 + + Fix bug 15784 + +commit 1c98dbd28b32cde85f5441d13935f27698686d82 +Merge: 5cfaf07475 38fe82e21d +Author: 孙广明 +Date: Mon Nov 1 09:18:16 2021 +0000 + + Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168' + + * Fix bug #15887,#15877,#15874. + + See merge request easycorp/zentaopms!266 + +commit 1aac9130a4139d02790c4d0f0fc3fbfb410e6740 +Author: root +Date: Mon Nov 1 17:16:28 2021 +0800 + + Fix bug 15784 + +commit 69287cea2216b71a7b848b4c33a7f33c424b2355 +Author: root +Date: Mon Nov 1 17:06:51 2021 +0800 + + Fix bug 15784 + +commit 8101f661ab14543698c1b58780d0088eb339d6b1 +Author: root +Date: Mon Nov 1 17:01:13 2021 +0800 + + Fix bug 15784 + +commit 01656fd00577a648e61cd13ad4f52d0037f42166 +Author: root +Date: Mon Nov 1 16:59:27 2021 +0800 + + Fix bug 15784 + +commit 38fe82e21d3d0155a487dbdce8859a65ed092745 +Author: liyuchun +Date: Mon Nov 1 16:57:10 2021 +0800 + + * Fix bug #15874. + +commit 16317913686d5a817dd1ed5354dc7e87ef28bd86 +Author: liyuchun +Date: Mon Nov 1 16:54:02 2021 +0800 + + * Fix bug #15887,#15877. + +commit 771de2c02ed85aa14ef1104d9360e60b84b6dd3a +Merge: d77254c662 00d83c729c +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 1 08:42:37 2021 +0000 + + Merge branch 'sprint/169_xieqiyu_15716' into 'sprint/169' + + * Fix bug#15716. + + See merge request easycorp/zentaopms!265 + +commit 5cfaf074754a1ef79f6d4e275c41b45b486713d4 +Merge: 38da2ef80d aadb69106d +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 1 08:41:04 2021 +0000 + + Merge branch 'sprint/168_hufangzhou_43423' into 'sprint/168' + + * Code for task #43423. + + See merge request easycorp/zentaopms!264 + +commit 00d83c729ce4609c2e128c4f0ac8855d1b701f04 +Author: xieqiyu +Date: Mon Nov 1 16:40:18 2021 +0800 + + * Fix bug#15716. + +commit 38da2ef80d044727e71d85e606146657a4187a42 +Merge: 44c5cfdbc4 201ee20f1e +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 1 08:40:07 2021 +0000 + + Merge branch 'sprint/168_tianshujie_15882' into 'sprint/168' + + * Fix bug #15882. + + See merge request easycorp/zentaopms!263 + +commit 44c5cfdbc49f313d8c7cd0d77a75323d518bce21 +Merge: 065b0d04c9 7af3f622c0 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 1 08:39:12 2021 +0000 + + Merge branch 'sprint/168_tianshujie_15871' into 'sprint/168' + + * Fix bug #15871. + + See merge request easycorp/zentaopms!262 + +commit aadb69106de3f0a98d8f1c655b92f7438fc0e5a5 +Author: hufangzhou +Date: Mon Nov 1 16:32:28 2021 +0800 + + * Code for task #43423. + +commit 065b0d04c9e02ea3b45ece278ae430d786fcaf37 +Merge: 697498e199 d8c96a6430 +Author: 孙广明 +Date: Mon Nov 1 08:30:11 2021 +0000 + + Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168' + + * Fix bug #15867. + + See merge request easycorp/zentaopms!260 + +commit 7af3f622c09e6e75a621ba1849efca8f9a3a589c +Author: tianshujie +Date: Mon Nov 1 16:26:50 2021 +0800 + + * Fix bug #15871. + +commit 697498e199b96800f2d2602e4440e00c8a05b6b2 +Merge: a3e3b5a7fd 19fca33fa3 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 1 08:22:31 2021 +0000 + + Merge branch 'sprint/168_xieqiyu_merge' into 'sprint/168' + + * Delete the unused code. + + See merge request easycorp/zentaopms!259 + +commit 7f9028691c646ecc0f2140cce1a9e296001056ae +Author: root +Date: Mon Nov 1 16:20:56 2021 +0800 + + Fix bug 15784 + +commit 19fca33fa30921cc62258ada1bb8b846137a573a +Author: xieqiyu +Date: Mon Nov 1 16:20:01 2021 +0800 + + * Delete the unused code. + +commit edc60704d59b3754b73a99a1fdf5d0118530a974 +Author: xieqiyu +Date: Mon Nov 1 16:15:22 2021 +0800 + + * Add color to the lane. + +commit a3e3b5a7fdf8ca89e4004827a4bba4f622230dbb +Merge: bec1e33ea2 5d438c910e +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 1 08:14:47 2021 +0000 + + Merge branch 'sprint/168_tianshujie_15881' into 'sprint/168' + + * Fix bug #15881. + + See merge request easycorp/zentaopms!258 + +commit bec1e33ea2c2bacface81d66c6f7edd379a51cce +Merge: f6ce6f4e42 16b6f5786e +Author: liyuchun +Date: Mon Nov 1 16:13:56 2021 +0800 + + Merge branch 'sprint/168_hufangzhou_43423' into sprint/168 + +commit d8c96a6430a10a5e1517edbe3f01a168199413a3 +Author: liyuchun +Date: Mon Nov 1 16:13:13 2021 +0800 + + * Fix bug #15867. + +commit 16b6f5786ebb7c1c36f1ec629fd2d769ae343aae +Merge: 353b9bbb33 2b2ec6f202 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 1 08:12:58 2021 +0000 + + Merge branch 'sprint/168' into 'sprint/168_hufangzhou_43423' + + # Conflicts: + # module/execution/js/kanban.js + # module/kanban/model.php + +commit 353b9bbb33dbed096ecc669837ff45cb9fcd5362 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 1 08:12:17 2021 +0000 + + 更新module/kanban/control.php + +commit 9ccc42efc074094e0ac485eb7342bcd4d6b1ee45 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 1 08:11:47 2021 +0000 + + 更新module/kanban/model.php + +commit c118bfe048a56574292a5446b14c00ab3667fddb +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 1 08:05:08 2021 +0000 + + 更新module/execution/js/kanban.js + +commit 2b2ec6f2027a53be262223828421faf7b8e6d65c +Merge: c72bde8698 7d31524581 +Author: 孙广明 +Date: Mon Nov 1 08:02:42 2021 +0000 + + Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168' + + * Fix bug #15861. + + See merge request easycorp/zentaopms!252 + +commit 200801ebeef18bacb6e58a3669569c52d486e9e2 +Author: hufangzhou +Date: Mon Nov 1 15:51:30 2021 +0800 + + * Add the dynamic for moving swimlane. + +commit 201ee20f1e0c4bf49f2e0655a526aa58f045a4d0 +Author: tianshujie +Date: Mon Nov 1 15:44:06 2021 +0800 + + * Fix bug #15882. + +commit 4450c96453bd7821420f1d103a1f3c3adf8d987f +Author: dingna +Date: Mon Nov 1 15:38:34 2021 +0800 + + * Fix lang for select menu. + +commit 5d438c910ed3b8e0d8488b8c2f8451f8d1411c8d +Author: tianshujie +Date: Mon Nov 1 15:38:08 2021 +0800 + + * Fix bug #15881. + +commit 3cdf3b339583ad5c46ddc6596f5204d30647305f +Merge: 46f2aecae3 a459f5fd47 +Author: 王怡栋 +Date: Mon Nov 1 15:35:49 2021 +0800 + + Merge branch 'sprint/167_wangyidong_api' into sprint/app10 + +commit c72bde8698e1054ee456161d2d2fdb09a65c1a3c +Merge: d66dbe0d13 6417119744 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 1 07:32:14 2021 +0000 + + Merge branch 'sprint/168_tianshujie_15878' into 'sprint/168' + + * Fix bug #15878. + + See merge request easycorp/zentaopms!257 + +commit 64171197449988a74a64e6f00d56f49cd99df20c +Author: tianshujie +Date: Mon Nov 1 15:28:35 2021 +0800 + + * Fix bug #15878. + +commit 46f2aecae38d71620a8318b6ba92f9b6c3231154 +Merge: a2ca4f646f d5f5192ee5 +Author: 王怡栋 +Date: Mon Nov 1 15:27:58 2021 +0800 + + Merge branch 'sprint/167' + +commit d77254c662bcdc06b3ac7ee77dad92ad8c9e5635 +Merge: d4fdd7b9e2 4f5c9691a3 +Author: 孙广明 +Date: Mon Nov 1 07:26:28 2021 +0000 + + Merge branch 'sprint/169_zhengrunyu_43708' into 'sprint/169' + + *Finish task #43708. + + See merge request easycorp/zentaopms!255 + +commit d66dbe0d133ad1530461b3f38fd46fa9d0a28358 +Merge: 4099ac4a20 9d1899e3ff +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 1 07:25:31 2021 +0000 + + Merge branch 'sprint/168_tianshujie_15876' into 'sprint/168' + + * Fix bug #15876. + + See merge request easycorp/zentaopms!256 + +commit a2ca4f646f976b1a9ae082c2033bb78dd30de3ca +Merge: ce8cbfe590 21ad4ecf0a +Author: 王怡栋 +Date: Mon Nov 1 15:23:15 2021 +0800 + + Merge branch '15.6' + +commit a459f5fd4797fa00c63f6e0a88656bae317dfc96 +Author: 王怡栋 +Date: Mon Nov 1 15:15:28 2021 +0800 + + * fix bug for set actions. + +commit 9d1899e3ff61afc986ee649808d1df6ffd57f953 +Author: tianshujie +Date: Mon Nov 1 14:39:21 2021 +0800 + + * Fix bug #15876. + +commit 4f5c9691a33dde3fdf28a455a9612b56035aaa99 +Author: zhengrunyu +Date: Mon Nov 1 14:12:39 2021 +0800 + + *Finish task #43708. + +commit f0349dac2c2512594454ceca89bbf5cb70b1bbf5 +Author: hufangzhou +Date: Mon Nov 1 14:11:21 2021 +0800 + + * Adjust the variable name. + +commit d7418db734df72395a61d6d4b62c31841b3212db +Author: zhengrunyu +Date: Mon Nov 1 14:07:11 2021 +0800 + + *Finish task #43708. + +commit 4099ac4a20b266b256decd80a042112fb2d6f96e +Merge: 2d2609618c c28e4c1b61 +Author: 孙广明 +Date: Mon Nov 1 05:53:00 2021 +0000 + + Merge branch 'sprint/168_xieqiyu_kanban' into 'sprint/168' + + Sprint/168 xieqiyu kanban + + See merge request easycorp/zentaopms!253 + +commit 702c40addd2f46ffe3a53542619883f139ad1d56 +Author: hufangzhou +Date: Mon Nov 1 13:50:53 2021 +0800 + + * Finish task #43423. + +commit 7d31524581cad8375b9e9585a6ccbb71336cc961 +Author: liyuchun +Date: Mon Nov 1 13:45:43 2021 +0800 + + * Fix bug #15861. + +commit c28e4c1b61d730596f58302e1d852ef65d922697 +Author: dingna +Date: Mon Nov 1 09:22:01 2021 +0800 + + * Fix code for task#43401,#43403,#43404,#43405,#43398,#43399. + +commit c08c981ab0d1041a55422ca1c5d537b91d3f5800 +Author: xieqiyu +Date: Mon Nov 1 13:13:56 2021 +0800 + + * Display the sub Lane view kanban. + +commit 2d2609618c29f8ed5b5dbbbe5e272245979e94ec +Merge: ad9ddb07d4 970763b0c5 +Author: 孙广明 +Date: Mon Nov 1 05:06:36 2021 +0000 + + Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168' + + * Adjust create object in kanban. + + See merge request easycorp/zentaopms!250 + +commit 970763b0c5ecef28e42fa214e94b11e2d491dde3 +Author: liyuchun +Date: Mon Nov 1 11:32:21 2021 +0800 + + * Adjust create object in kanban. + +commit d4fdd7b9e2a21bd9037968750935265574bb3ce0 +Merge: da02aa3742 96513f604e +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 1 02:45:38 2021 +0000 + + Merge branch 'sprint/169_tianshujie_43621' into 'sprint/169' + + * Finish task #43621. + + See merge request easycorp/zentaopms!249 + +commit da02aa37424ca2d3bc48f0c4fa656842fdd148e9 +Merge: 39cdb1dc32 594eae2a3f +Author: 孙广明 +Date: Mon Nov 1 02:40:36 2021 +0000 + + Merge branch 'sprint/169_zhengrunyu_43708' into 'sprint/169' + + * Finish task #43708. + + See merge request easycorp/zentaopms!248 + +commit 594eae2a3f5b36e52414d7ca9bcc358928052361 +Author: zhengrunyu +Date: Mon Nov 1 10:33:20 2021 +0800 + + * Finish task #43708. + +commit bd765c68813411bc4f95caf5bc5d6272846b8a01 +Author: zhengrunyu +Date: Mon Nov 1 10:27:34 2021 +0800 + + * Finish task #43708. + +commit 39cdb1dc32a3079b8f05a839f12243f49b876509 +Merge: d17f0f28ce 7d311cc32c +Author: 孙广明 +Date: Mon Nov 1 02:27:17 2021 +0000 + + Merge branch 'sprint/169_zhouxin_43556' into 'sprint/169' + + Finish task #43556. + + See merge request easycorp/zentaopms!232 + +commit 96513f604ec86bfd56dd122ee878df1abb0148d1 +Author: tianshujie +Date: Mon Nov 1 10:21:11 2021 +0800 + + * Modify and maintain product line logic. + +commit f78f9ecdfee99b953db2f4e98a4799a3ae3c9a5f +Author: tianshujie +Date: Mon Nov 1 10:18:21 2021 +0800 + + * Finish task #43621. + +commit d17f0f28cec39a8dd71e7a5934be8d23cbb175ae +Merge: cdb03367bb de6cda0e2f +Author: 孙广明 +Date: Mon Nov 1 02:18:14 2021 +0000 + + Merge branch 'sprint/169_tanghucheng_43707' into 'sprint/169' + + * Finish task #43707. + + See merge request easycorp/zentaopms!236 + +commit cdb03367bb2f1c57aad777322a48f027be7a26b4 +Merge: 976f3b80ad ad40f5be8e +Author: 孙广明 +Date: Mon Nov 1 02:16:29 2021 +0000 + + Merge branch 'sprint/169_zhouxin_43539' into 'sprint/169' + + Finish task #43539. + + See merge request easycorp/zentaopms!238 + +commit 976f3b80ad42a0a56e7c1a0d06c4b08462640e07 +Merge: e4a3dc1b88 07bcb9012e +Author: 朱金勇 +Date: Mon Nov 1 02:11:15 2021 +0000 + + Merge branch 'sprint/169' into 'sprint/169' + + * Adjust and correct codes for gitlab module. + + See merge request easycorp/zentaopms!222 + +commit ad9ddb07d49f1c4a4351abc3959faf75fa3318a2 +Merge: 317e423180 a755136ee9 +Author: 朱金勇 +Date: Mon Nov 1 02:10:25 2021 +0000 + + Merge branch 'sprint/168_sunhao/improve_kanban' into 'sprint/168' + + * Limit range for iframe modal triggers. + + See merge request easycorp/zentaopms!234 + +commit da27ff9c06a99873144479d79ea0dae3fea869f1 +Author: zhengrunyu +Date: Mon Nov 1 10:08:36 2021 +0800 + + * Finish task #43708 + +commit 0ae939a8060383db69c53ec7fcbc6c1d5d4bfddb +Author: zhengrunyu +Date: Mon Nov 1 09:52:09 2021 +0800 + + 1 + +commit e4a3dc1b88ef184795a3c91ef87e7056bc4f6350 +Merge: cfa69a4143 0a6a4d2e1d +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 1 01:50:03 2021 +0000 + + Merge branch 'sprint/169_songchenxuan_15467' into 'sprint/169' + + Sprint/169 songchenxuan 15467 + + See merge request easycorp/zentaopms!244 + +commit 0a6a4d2e1dde01378bd0271b4096785c7ea5b3b1 +Author: root +Date: Mon Nov 1 09:39:07 2021 +0800 + + sovle bug 15467 + +commit 6db04fa88e08ac7aa9c1013cd55e63af9e14d22e +Author: root +Date: Mon Nov 1 09:29:45 2021 +0800 + + bug_15467 + +commit cfa69a41438bdeed0967092503cb84521ef1054b +Merge: 6877e4c7f0 0e03f7c478 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 1 01:00:56 2021 +0000 + + Merge branch 'sprint/169_xiawenlong' into 'sprint/169' + + finish 43676 + + See merge request easycorp/zentaopms!243 + +commit 317e423180bbee55fedf7277e0eb19b00eed35b8 +Merge: b5532e7379 b9c0807023 +Author: 李玉春 <563917701@qq.com> +Date: Mon Nov 1 00:59:04 2021 +0000 + + Merge branch 'sprint/168_tianshujie_lang' into 'sprint/168' + + * merge code of kanban lang. + + See merge request easycorp/zentaopms!241 + +commit 0e03f7c47817d5777d8ed5ef008160b6812ee8f5 +Author: xiawenlong +Date: Mon Nov 1 08:54:01 2021 +0800 + + finish 43676 + +commit 07bcb9012e62869154a954a9ce85dedbb110daae +Merge: ff55234a7b 6877e4c7f0 +Author: dingguodong +Date: Fri Oct 29 17:33:56 2021 +0800 + + Merge branch 'sprint/169' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/169 + +commit ff55234a7b72d974d883fdaaffc044bfe781f441 +Author: dingguodong +Date: Fri Oct 29 17:33:13 2021 +0800 + + * Correct codes in job and compile module. + +commit 6877e4c7f06f800b35c0e1bdf71061e3904bb873 +Merge: 0a8de60c4e 217927ce09 +Author: 孙广明 +Date: Fri Oct 29 09:30:36 2021 +0000 + + Merge branch 'sprint/169_mayue_15835' into 'sprint/169' + + * Fix a bug #15835. + + See merge request easycorp/zentaopms!242 + +commit b9c0807023a64a997fc67088be8e5ab55d8accfd +Author: tianshujie +Date: Fri Oct 29 17:20:20 2021 +0800 + + * merge code of kanban lang. + +commit 0a8de60c4e200048363c30d768c84f6e5aecd0fa +Merge: f1fbcdf74e 4f1126ada7 +Author: 孙广明 +Date: Fri Oct 29 07:17:58 2021 +0000 + + Merge branch 'sprint/169_zhouxin_43617' into 'sprint/169' + + Finish task #43617. + + See merge request easycorp/zentaopms!229 + +commit b5532e7379e48883f07ad48512ea8939240ad16e +Merge: f6ce6f4e42 70349fe46a +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 29 07:15:20 2021 +0000 + + Merge branch 'sprint/168_tianshujie_kanban' into 'sprint/168' + + * Add a default color to the kanban column. + + See merge request easycorp/zentaopms!239 + +commit f6ce6f4e4223d05def980b31a15aa17e5c45dadc +Merge: 06feb0f942 1187d1cb81 +Author: liyuchun +Date: Fri Oct 29 15:12:02 2021 +0800 + + Merge branch 'sprint/168_dingna_enlang' into sprint/168 + +commit 1187d1cb8184a11eab211e7d98b38eb71fe50e96 +Merge: e352053c76 06feb0f942 +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 29 07:10:27 2021 +0000 + + Merge branch 'sprint/168' into 'sprint/168_dingna_enlang' + + # Conflicts: + # module/kanban/lang/zh-cn.php + +commit 70349fe46ae01a5d6ff247f1f382515398dc29e5 +Author: tianshujie +Date: Fri Oct 29 15:05:33 2021 +0800 + + * Add a default color to the kanban column. + +commit 06feb0f942c6ce0477787842b9d131a1d3137f31 +Merge: 4c91b03239 dfc29b5cb2 +Author: 孙广明 +Date: Fri Oct 29 07:04:08 2021 +0000 + + Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168' + + * Fix error of save WIP. + + See merge request easycorp/zentaopms!240 + +commit 4c91b032393d22554ef8eccdd72deaa682195d8d +Merge: 2e8baf8959 5744e27e52 +Author: 孙广明 +Date: Fri Oct 29 07:03:13 2021 +0000 + + Merge branch 'sprint/168_zenggang_tasks' into 'sprint/168' + + * Finish task#43410,43411,43413 + + See merge request easycorp/zentaopms!227 + +commit bf032684e4afeb2e12dd5d63bf7ab801e89f4a93 +Author: tianshujie +Date: Fri Oct 29 14:49:17 2021 +0800 + + * Add a default color to the kanban column. + +commit dfc29b5cb286b83cf60c08054dc66329d6adaeff +Author: liyuchun +Date: Fri Oct 29 14:48:38 2021 +0800 + + * Fix error of save WIP. + +commit 217927ce0953e02885309aadc780bbe5b411ce75 +Author: mayue +Date: Fri Oct 29 14:47:21 2021 +0800 + + * Fix a bug #15835. + +commit ad40f5be8ead2ce2829bc5f3196cba7d1ff25a46 +Author: zhouxin +Date: Fri Oct 29 14:42:16 2021 +0800 + + Finish task #43539. + +commit de6cda0e2fb716f8045d94768d507e26da34a0c1 +Author: tanghucheng +Date: Fri Oct 29 14:39:23 2021 +0800 + + * Finish task #43707. + +commit e352053c7695f57a01d973dae5be5571c8d7e68a +Author: dingna +Date: Fri Oct 29 14:37:35 2021 +0800 + + * Fix language items. + +commit 2e8baf89595dd7fdbef790053fc63e9d6eb18f40 +Merge: 188d3fa8d9 d5914e8ffc +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 29 06:16:03 2021 +0000 + + Merge branch 'sprint/168_dingna_merge' into 'sprint/168' + + * Conflict resolution. + + See merge request easycorp/zentaopms!235 + +commit 188d3fa8d96fddf38e5872d67798bf407ecedbb4 +Merge: 1970b04106 619b95257c +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 29 06:15:26 2021 +0000 + + Merge branch 'sprint/168_xiawenlong' into 'sprint/168' + + fix fullscreen bug + + See merge request easycorp/zentaopms!233 + +commit 619b95257c2f0f92204b651805775a8027467b8a +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 29 06:15:03 2021 +0000 + + 更新module/execution/js/kanban.js + +commit d5914e8ffca308106704fabffb5eec84d13b2b4b +Author: xieqiyu +Date: Fri Oct 29 14:12:07 2021 +0800 + + * Conflict resolution. + +commit a755136ee9050de5674246093559cf74b5aa7bca +Author: Hao Sun +Date: Fri Oct 29 14:11:03 2021 +0800 + + * limit range for iframe modal triggers. + +commit 92632bc105c14952a6b9269c79195c2a08bf9e71 +Author: xiawenlong +Date: Fri Oct 29 14:04:15 2021 +0800 + + fix fullscreen bug + +commit c295854d261a165cf0df54808d8a7f9ce1d60e7e (tag: zentaopms_app.1.0.beta9_20211029) +Author: 王怡栋 +Date: Fri Oct 29 14:01:52 2021 +0800 + + * adjust for users api. + +commit 1970b04106faaf4285730990ad9ba61a185cc4b4 +Merge: 85b0c18495 f02082212c +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 29 05:53:40 2021 +0000 + + Merge branch 'sprint/168_sunhao/kanban_dnd' into 'sprint/168' + + * Add method to handle dnd action in kanban. + + See merge request easycorp/zentaopms!184 + +commit 85b0c18495782d7ef9228bf0259e1e68227b3ab7 +Merge: 56b529d7d8 8ce1a694fc +Author: liyuchun +Date: Fri Oct 29 13:51:04 2021 +0800 + + Merge branch 'sprint/168_dingna_task_43401' into sprint/168 + +commit 8ce1a694fc416713b2fa0fcc16c3f68e4fa44c6d +Merge: 6369e0f7a3 56b529d7d8 +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 29 05:50:12 2021 +0000 + + Merge branch 'sprint/168' into 'sprint/168_dingna_task_43401' + + # Conflicts: + # module/execution/control.php + # module/execution/view/kanban.html.php + # module/kanban/lang/zh-cn.php + # module/kanban/model.php + +commit 56b529d7d82456b57926631d6749c97799cc5cc4 +Merge: 44ad6d63a4 23c6b5c347 +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 29 05:45:08 2021 +0000 + + Merge branch 'sprint/168_sunhao/kanban_icons' into 'sprint/168' + + * Add icons for kanban. + + See merge request easycorp/zentaopms!228 + +commit 44ad6d63a4b827b9bb04173ce31e1fb9f478ec8c +Merge: 8ef42ffc5c 0e1910bf9a +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 29 05:44:50 2021 +0000 + + Merge branch 'sprint/168_sunhao/improve_kanban' into 'sprint/168' + + * Fix kanban not work in program, product or project page. + + See merge request easycorp/zentaopms!225 + +commit 5744e27e52417378692cd9f3b7ade3cc66dff122 +Author: zenggang +Date: Fri Oct 29 05:43:28 2021 +0000 + + * Adjust code + +commit 0e1910bf9aabd60f749d8a83018a4ba7bd4ee740 +Author: Hao Sun +Date: Fri Oct 29 13:39:01 2021 +0800 + + * fix limit count not show as expected in kanban. + +commit 6369e0f7a398577ab38afcf9958743f3c9975c26 +Author: dingna +Date: Fri Oct 29 13:37:03 2021 +0800 + + * Fix an error. + +commit 7d311cc32c65c0869586ad9b440fdeaca2bc44f8 +Author: zhouxin +Date: Fri Oct 29 13:35:20 2021 +0800 + + Finish task #43556. + +commit 8ef42ffc5c482635124a11744a82cf0badd255f0 +Merge: 50fbd8a1a1 4f56cc8c0f +Author: 孙广明 +Date: Fri Oct 29 05:34:32 2021 +0000 + + Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168' + + * Finish task #43407,#43406. + + See merge request easycorp/zentaopms!231 + +commit d84ffbd355b87b88f5cb04431c472a7673a9607e +Author: zenggang +Date: Fri Oct 29 05:31:26 2021 +0000 + + * Adjust code format + +commit 50fbd8a1a17515251c41b8e8ded73367031ac2ed +Merge: e618b57d12 36f9e95c4f +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 29 05:18:23 2021 +0000 + + Merge branch 'sprint/168_xiawenlong' into 'sprint/168' + + rename kanban common + + See merge request easycorp/zentaopms!230 + +commit 36f9e95c4f12eb44154029665018e4cfa85d7de7 +Author: xiawenlong +Date: Fri Oct 29 13:16:38 2021 +0800 + + rename kanban common + +commit ddffca8d417a010743c1e6e08b8032bc99ed4a3a +Author: dingna +Date: Fri Oct 29 13:14:53 2021 +0800 + + * Fix an error. + +commit 4f56cc8c0f1dfabaf100bf40716fffa59794f67d +Author: liyuchun +Date: Fri Oct 29 12:37:59 2021 +0800 + + * Finish task #43407,#43406. + +commit 0fac3aa189a8e063e277455c49b643955dab09ea +Author: dingna +Date: Fri Oct 29 11:32:36 2021 +0800 + + * Adjust Code for task#43401,#43403,#43404,#43405,#43398,#43399. + +commit 0c5c8e2a42429438a707c05cc0ea023b66b27fab +Author: xieqiyu +Date: Fri Oct 29 11:32:42 2021 +0800 + + * Modify code logic. + +commit ce7c632045a5b652688374daebe385a5612c2444 +Author: zenggang +Date: Fri Oct 29 03:29:08 2021 +0000 + + * Change function name + +commit 4f1126ada786f5bda13b40e7b003dd4459ad13a5 +Author: zhouxin +Date: Fri Oct 29 11:28:41 2021 +0800 + + Finish task #43617. + +commit 23c6b5c347609558cae884adb3036a58de635e5b +Author: Hao Sun +Date: Fri Oct 29 11:20:37 2021 +0800 + + * add icons for kanban by update zui. + +commit 6bdf89c2932856836f6a317ffa1fcb6b955ba404 +Author: zenggang +Date: Fri Oct 29 03:18:10 2021 +0000 + + * Finish task#43410,43411,43413 + +commit a89fb80abcaac72e2d641714c8d072489d59f95e +Author: 王怡栋 +Date: Fri Oct 29 11:11:09 2021 +0800 + + * fix bug for export testcase. + +commit 5217e0dfc2e91a92ce3a2d9bf0439b84218a81a3 +Author: dingna +Date: Fri Oct 29 10:44:28 2021 +0800 + + * Adjust code style. + +commit e618b57d12ad46a89df4002b075de0fceb1a0933 +Merge: e2e9eb721d 54bb24823f +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 29 02:43:44 2021 +0000 + + Merge branch 'sprint/168_xiawenlong' into 'sprint/168' + + add permission + + See merge request easycorp/zentaopms!223 + +commit 54bb24823f02a1ae63ba15d0a173b8b351f83b11 +Author: liyuchun +Date: Fri Oct 29 10:42:27 2021 +0800 + + * Delete unused code. + +commit eaadf27fd164a9187b31a4e6e0ecbb6c02b1a3b5 +Author: Hao Sun +Date: Fri Oct 29 10:36:19 2021 +0800 + + * fix kanban not work in product or project page. + +commit 1e39ba869a3e136af3bb172cf07b9f42120f6568 +Author: Hao Sun +Date: Fri Oct 29 10:36:00 2021 +0800 + + * remove product card shadow. + +commit e90026232a135b7330600cde8ef19aa99c1c24a0 +Author: Hao Sun +Date: Fri Oct 29 10:35:45 2021 +0800 + + * refactor. + +commit e2e9eb721d349d3af4a6d260ac48530a6f602718 +Merge: 2e6faf1373 cdfb230005 +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 29 02:34:31 2021 +0000 + + Merge branch 'sprint/168_sgm_assignto' into 'sprint/168' + + * Add link to assignto. + + See merge request easycorp/zentaopms!224 + +commit a0a4af4daa008f3aedc1e3c4a7fc4441198d4080 +Author: 夏文龙 +Date: Fri Oct 29 02:33:45 2021 +0000 + + Update kanban.html.php + +commit f1fbcdf74ef25712648102bdeb976a22edbd85cf +Merge: 07d6f3e27e 162846d43f +Author: 孙广明 +Date: Fri Oct 29 02:28:44 2021 +0000 + + Merge branch 'sprint/169_tanghucheng_43619' into 'sprint/169' + + Finish task #43619,63620 + + See merge request easycorp/zentaopms!220 + +commit f74435a42df0067fef777ea7c862d9b270006849 +Author: xiawenlong +Date: Fri Oct 29 10:26:34 2021 +0800 + + fix code style + +commit 162846d43fa7f6bc0ca5c64e4f319fd624a1b0c2 +Author: tanghucheng +Date: Fri Oct 29 10:22:56 2021 +0800 + + * Finish task #43619,43620. + +commit 6d701ebc81a40a7f28991ffff01041909a37bf72 +Author: xieqiyu +Date: Fri Oct 29 10:14:50 2021 +0800 + + * Add data to the Kanban column database table. + +commit 5397954f15f654992422c719701239a621785900 +Author: xiawenlong +Date: Fri Oct 29 10:13:39 2021 +0800 + + Finish permissionOC + +commit 3dc83584344c3d17a18b4c09995571bc792f3725 +Author: xiawenlong +Date: Fri Oct 29 10:09:07 2021 +0800 + + Finish permissionOC + +commit cdfb23000599c4a7a9ef54c2a93ce3bd14a120ef +Author: 孙广明 +Date: Fri Oct 29 10:07:59 2021 +0800 + + * Add link to assignto. + +commit f3b6a384034402fa3b009f18de8cd6774bfdd031 +Author: dingguodong +Date: Fri Oct 29 10:06:50 2021 +0800 + + * Adjust and correct codes for gitlab module. + +commit d5f5192ee5d7cab2675ce8ed43242cd39c6a0dc1 +Author: dingguodong +Date: Fri Oct 29 10:00:19 2021 +0800 + + - Revert codes which should not be here. + +commit 2e6faf137310ab39e14e114cd24791ba5fd814b6 +Merge: 37e96eebe7 726529bdb9 +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 29 01:54:48 2021 +0000 + + Merge branch 'sprint/168_tianshujie_43416' into 'sprint/168' + + * Increase the card sorting judgment of the parent lane column. + + See merge request easycorp/zentaopms!221 + +commit 726529bdb9c52d3f5c6b28c3709625c34756e63b +Author: tianshujie +Date: Fri Oct 29 09:49:56 2021 +0800 + + * Modify the sort logic of the lane column by field. + +commit 02647a91a48a718890ca65f860e079c05ca6bd85 +Author: dingna +Date: Fri Oct 29 09:48:26 2021 +0800 + + * Code update again for #43401,#43507,#43398. + +commit 37e96eebe7d5e4b396c431384f899537850a5d93 +Merge: 3b11423f2f 7a208ad404 +Author: 孙广明 +Date: Fri Oct 29 01:42:47 2021 +0000 + + Merge branch 'sprint/168_liyuchun_43519' into 'sprint/168' + + * Finish task #43519. + + See merge request easycorp/zentaopms!219 + +commit e93d27401f7f4fca0a64829e062d0c032e24fee5 +Author: dingguodong +Date: Fri Oct 29 09:41:53 2021 +0800 + + * Adjust and correct codes for gitlab module. + +commit 7a208ad404f2e7d7cd72fb072d63a26caa79e7c1 +Author: liyuchun +Date: Fri Oct 29 09:41:09 2021 +0800 + + * Adjust task $43519. + +commit 7f9f5e56497436ca030a15b52bcdba99355544a2 +Author: tianshujie +Date: Fri Oct 29 09:32:56 2021 +0800 + + * Increase the card sorting judgment of the parent lane column. + +commit 0b13f868128fef25770f7a730d1e2cd7a0a4c167 +Author: dingna +Date: Fri Oct 29 09:23:53 2021 +0800 + + * Code update for task * 43401,#43507,#43398. + +commit 8d1e5cd785f356decf3eb65e0ff66e7fb066eabc +Author: tanghucheng +Date: Fri Oct 29 09:17:57 2021 +0800 + + * Finish task #43619,43620. + +commit 04b34ce72420d817ed0a69b9829338bc66912026 +Author: xieqiyu +Date: Fri Oct 29 08:56:58 2021 +0800 + + * Adjust code style. + +commit 87c6365aee50b718fc3e3566febe04b073d057b2 +Author: dingna +Date: Fri Oct 29 08:30:07 2021 +0800 + + * Code for task#43401,#43507,#43398. + +commit 3b11423f2fc7a8a4b7d5944dc2abf8332de4f105 +Merge: 2da2792c0a 817178e93b +Author: 孙广明 +Date: Fri Oct 29 00:39:22 2021 +0000 + + Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168' + + * Add button of set WIP and column name. + + See merge request easycorp/zentaopms!216 + +commit 6035a7f700dfbbd22a9cbbb2fbb9b6e5dacc49eb +Author: xieqiyu +Date: Thu Oct 28 17:24:20 2021 +0800 + + * Add data to the Kanban lane table. + +commit 2da2792c0a992570b94068b05a495d5a7ca87244 +Merge: 936ae57bff 8ae7fec1de +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 09:20:16 2021 +0000 + + Merge branch 'sprint/168_tianshujie_43416' into 'sprint/168' + + * Add card sorting logic. + + See merge request easycorp/zentaopms!218 + +commit 8ae7fec1de756ca016d6edb23043dbc15c217018 +Author: tianshujie +Date: Thu Oct 28 17:18:33 2021 +0800 + + * Edit comment of kanban control. + +commit ac5bda3929d684b8ad9feff1b459c20477f32778 +Author: tianshujie +Date: Thu Oct 28 17:16:42 2021 +0800 + + * Revert conflicting codes. + +commit 4472d176d9f6c5fe21d0cb6ff862999fd7c0eab8 +Author: tianshujie +Date: Thu Oct 28 17:10:54 2021 +0800 + + * Add comment of kanban control. + +commit 34d7a4eb007974f1ceb6e4b897b5becb6f48cfc6 +Author: tianshujie +Date: Thu Oct 28 17:00:51 2021 +0800 + + * Add card sorting logic. + +commit 936ae57bff67a9f5438d0aca38252f6f296f3368 +Merge: 97f883c3b2 faeef62b5c +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 08:52:44 2021 +0000 + + Merge branch 'sprint/168_sgm_fix_detail' into 'sprint/168' + + * Fix create story action error. + + See merge request easycorp/zentaopms!214 + +commit 97f883c3b258b4f148d2e35d712d51eff2ebc702 +Merge: 3fabdeaa88 c061aac0e1 +Author: 孙广明 +Date: Thu Oct 28 08:36:36 2021 +0000 + + Merge branch 'sprint/168_zenggang_15773' into 'sprint/168' + + * Fix bug#15773 + + See merge request easycorp/zentaopms!198 + +commit 07d6f3e27e0ff94f8653bcd92ac449c36ad66d92 +Merge: d2df32b6d2 af5c3178ee +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 08:28:19 2021 +0000 + + Merge branch 'sprint/169_mayue_15696' into 'sprint/169' + + *Fix a bug #15696. + + See merge request easycorp/zentaopms!217 + +commit 2c3d42360c5eaee0574d2a54bda0ad816f14212b +Author: 王怡栋 +Date: Thu Oct 28 16:26:16 2021 +0800 + + * adjust for delete file session. + +commit 3fabdeaa88a82923c186d2c60681fd22ab897a9d +Merge: b1d8c05ec8 fcbe1cb9cc +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 08:25:23 2021 +0000 + + Merge branch 'sprint/168_sunhao/improve_contextmenu' into 'sprint/168' + + * Improve contextmenu, support for custom attrs for menu items. + + See merge request easycorp/zentaopms!215 + +commit af5c3178eec439a0ce1e7b9622542ed4cf9d8051 +Author: mayue +Date: Thu Oct 28 16:21:31 2021 +0800 + + *Fix a bug #15696. + +commit 817178e93b718634bf50ad9a8b602baf8e053c8d +Author: liyuchun +Date: Thu Oct 28 16:19:16 2021 +0800 + + * Add button of set WIP and column name. + +commit fcbe1cb9cc61fc112832b3c02114c812d9def930 +Author: Hao Sun +Date: Thu Oct 28 16:14:57 2021 +0800 + + * improve contextmenu, support for custom attrs for menu items. + +commit c061aac0e18136bb975aa63c0c8809edf6568210 +Author: zenggang +Date: Thu Oct 28 07:56:24 2021 +0000 + + * Adjust code style + +commit d2df32b6d26da3922eeb72fa54023967d9e607e3 +Merge: 90746c0c40 886f54508f +Author: 孙广明 +Date: Thu Oct 28 07:39:36 2021 +0000 + + Merge branch 'spirnt/169_liyuchun_api' into 'sprint/169' + + * Adjust style of api index. + + See merge request easycorp/zentaopms!212 + +commit b1d8c05ec8937347c7667978649ca0973c49dc16 +Merge: dc5697803d 3de0e1d319 +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 07:29:46 2021 +0000 + + Merge branch 'sprint/168_tianshujie_updatecards' into 'sprint/168' + + * Modify variables. + + See merge request easycorp/zentaopms!213 + +commit 90746c0c400c8557d3ad86b27c008d5711ddbd3a +Merge: 6573f7d627 539fb5d7b0 +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 07:17:23 2021 +0000 + + Merge branch 'sprint/169_mayue_15778' into 'sprint/169' + + *Fix a bug #15778. + + See merge request easycorp/zentaopms!211 + +commit faeef62b5c4bfa4c13d0f4302cf6ff8ec7235270 +Author: 孙广明 +Date: Thu Oct 28 15:15:17 2021 +0800 + + * Fix create story action error. + +commit 3de0e1d31953b7b7cd11f734dc9b6ead011a7088 +Author: tianshujie +Date: Thu Oct 28 15:14:55 2021 +0800 + + * Modify variables. + +commit 539fb5d7b089cb2fd333482b97b422e4fe04b7d3 +Author: mayue +Date: Thu Oct 28 15:13:15 2021 +0800 + + *Fix a bug #15778. + +commit 886f54508fc06a9484f09add3e0f0223e3fa63cf +Author: liyuchun +Date: Thu Oct 28 15:10:23 2021 +0800 + + * Adjust style of api index. + +commit dc5697803df470aaa30344a4a36030f3f3658592 +Merge: 125dbc0d00 4edfddbc52 +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 07:07:59 2021 +0000 + + Merge branch 'sprint/168_tianshujie_kanban' into 'sprint/168' + + * Update Kanban cards. + + See merge request easycorp/zentaopms!207 + +commit 4edfddbc5235b168f68529e22ffc957c92a50c41 +Author: tianshujie +Date: Thu Oct 28 15:03:02 2021 +0800 + + * Modify the variable name of the kanban column. + +commit 6fefaaaead1af900f096211422a099c5332c2c9a +Author: tianshujie +Date: Thu Oct 28 14:56:58 2021 +0800 + + * Modify the variable name of the kanban column. + +commit ded3d0551a0e8a75a0727858eb190e33c0c9158b +Author: tianshujie +Date: Thu Oct 28 14:52:54 2021 +0800 + + * Adjust and update card logic. + +commit 6573f7d627d6274bcc0fdc4a2fb42ddbc3976a34 +Merge: c326a859ec a4aef73aa6 +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 06:49:32 2021 +0000 + + Merge branch 'sprint/169_xiawenlong' into 'sprint/169' + + * Finish Task #43676,43675,43672,43671,43679,43669 + + See merge request easycorp/zentaopms!210 + +commit 936770dc65233c4219182672040031438a94252f +Author: mayue +Date: Thu Oct 28 14:48:20 2021 +0800 + + *Fix a bug #15778. + +commit 125dbc0d00b8ebac762bf81910a7a9868a0a5c5b +Merge: 8997b3d141 f9b40d2887 +Author: liyuchun +Date: Thu Oct 28 14:47:46 2021 +0800 + + Merge branch 'sprint/168_sgm_43393' into sprint/168 + +commit f9b40d288708dd2e830d4ca1b086fce6631a0ebe +Merge: 0036787aac f6be40b764 +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 06:47:11 2021 +0000 + + Merge branch 'sprint/168' into 'sprint/168_sgm_43393' + + # Conflicts: + # module/execution/js/kanban.js + +commit 0036787aaccd8e751fe5b4fa1e4c627e2a20a461 +Author: 孙广明 +Date: Thu Oct 28 14:43:55 2021 +0800 + + * Add en lang. + +commit a4aef73aa630e4d3a7ccd7640cd6c3a996ee20e9 +Author: xiawenlong +Date: Thu Oct 28 14:41:31 2021 +0800 + + * Finish Task #43676,43675,43672,43671,43679,43669 + +commit f6be40b7644a348b852726789144344a296cbe95 +Merge: 6c0c73cd44 c9611abe04 +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 06:38:44 2021 +0000 + + Merge branch 'sprint/168_sunhao/improve_kanban' into 'sprint/168' + + * Support for using context menu in kanban. + + See merge request easycorp/zentaopms!201 + +commit 6c0c73cd447d02e4794a6144466ba091271efed9 +Merge: 9150e515d7 5377de8a81 +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 06:36:01 2021 +0000 + + Merge branch 'sprint/168_hufangzhou_15817' into 'sprint/168' + + * Fix bug #15817. + + See merge request easycorp/zentaopms!208 + +commit 5377de8a814dbcd97996e54d2a44420faf63dcdd +Author: hufangzhou +Date: Thu Oct 28 14:24:36 2021 +0800 + + * Fix bug #15817. + +commit 1b8db9c5002f38774a5a4cf4d6c3a1103a9f0a69 +Author: tianshujie +Date: Thu Oct 28 14:18:18 2021 +0800 + + * Update Kanban cards. + +commit 488c4a8cb290bf6b99b5f6500eef979a2aee2c9c +Author: tanghucheng +Date: Thu Oct 28 13:50:41 2021 +0800 + + * Finish task #43619,43620 + +commit 9150e515d7fc8a511104db1e0145befed8e06db0 +Merge: 6c32c9a397 ab99aaf886 +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 05:39:05 2021 +0000 + + Merge branch 'sprint/168_xiawenlong' into 'sprint/168' + + add delete files + + See merge request easycorp/zentaopms!204 + +commit ab99aaf886ff811916f2d6b84059ab545371c0be +Author: xiawenlong +Date: Thu Oct 28 13:38:33 2021 +0800 + + add delete files + +commit c326a859ecddacdc3dd103b44a994cf1b14c3b1e +Merge: 2b064a057e 92b450679a +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 05:35:09 2021 +0000 + + Merge branch 'sprint/169_mayue_15776' into 'sprint/169' + + *Fix a bug #15776. + + See merge request easycorp/zentaopms!205 + +commit 92b450679a39a11a8c5c7aac040560d9dbe07637 +Author: mayue +Date: Thu Oct 28 13:32:15 2021 +0800 + + *Fix a bug #15776. + +commit 1b117b4793826afffb71fd7d36dc3ba0fe5d49e5 +Author: xiawenlong +Date: Thu Oct 28 13:25:56 2021 +0800 + + add delete files + +commit 2b064a057e3847c1b6d37ef21cd01804be36f685 +Merge: dd359d9877 26cc334d95 +Author: 孙广明 +Date: Thu Oct 28 05:24:56 2021 +0000 + + Merge branch 'sprint/169_zhouxin_43618' into 'sprint/169' + + Finish task #43618. + + See merge request easycorp/zentaopms!199 + +commit dd359d98775a6f45d60ecc322fa2c080838dda3a +Merge: 806bf1cfe4 3d52f403d0 +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 05:15:55 2021 +0000 + + Merge branch 'sprint/169_xiawenlong' into 'sprint/169' + + * Finish Task #43624 + + See merge request easycorp/zentaopms!203 + +commit fb17df4424b74f0456a3aa249d6f1956716ed8c7 +Author: 王怡栋 +Date: Thu Oct 28 13:12:33 2021 +0800 + + * add upload file api. + +commit 31a12238ee615cc01f2ad4ebe858e7273c6dd203 +Author: liyuchun +Date: Thu Oct 28 13:06:12 2021 +0800 + + * Finish task #43519. + +commit 3d52f403d0f465df2f345990e7e9fb958f051b8c +Author: xiawenlong +Date: Thu Oct 28 13:02:38 2021 +0800 + + * Finish Task #43624 + +commit c9611abe046b8ebfebdc369497b68dbb27e55f1f +Author: Hao Sun +Date: Thu Oct 28 11:50:01 2021 +0800 + + * fix cards count not show as expected in column header which is parent. + +commit 4dadfbd5583a5ef04b098838c54bb390e40a57f6 +Author: Hao Sun +Date: Thu Oct 28 11:49:27 2021 +0800 + + * add actions button to cards. + +commit 34064d70b03d23cb3e089e1bea29059b7dcdd9f0 +Author: Hao Sun +Date: Thu Oct 28 11:34:46 2021 +0800 + + * support for using contextmenu in kanban. + +commit 6c32c9a397eec5f8f944b31fd8dea5e3f61167a5 +Merge: 6a8f69b524 cf5682ef5b +Author: 孙广明 +Date: Thu Oct 28 03:32:04 2021 +0000 + + Merge branch 'sprint/tengfei_168_lang' into 'sprint/168' + + Sprint/tengfei 168 lang + + See merge request easycorp/zentaopms!192 + +commit 7cf59f0e135efa20dfcc12cf2d6d47b7c31df89d +Author: Hao Sun +Date: Thu Oct 28 11:31:50 2021 +0800 + + * support for using iframe modal in kanban page. + +commit e26a26f93489d6d5183cbd78d9fa8d43bf30430e +Author: Hao Sun +Date: Thu Oct 28 11:30:58 2021 +0800 + + * show deadline on task and bug card. + +commit 83f30798043baadfd570fa4fc6fe9a67ef6fe29d +Author: 孙广明 +Date: Thu Oct 28 11:01:50 2021 +0800 + + * Finish task #43393. + +commit 26cc334d9510925010efc02c7e8a19ec318c1869 +Author: zhouxin +Date: Thu Oct 28 10:37:01 2021 +0800 + + Finish task #43618. + +commit 9096f800590103139b06f300ddccb3e6073ac516 +Author: zenggang +Date: Thu Oct 28 02:34:20 2021 +0000 + + * Fix bug#15773 + +commit cf5682ef5b32a6eb7e05db74de080faf63a8d68c +Author: reneeteng +Date: Thu Oct 28 10:11:52 2021 +0800 + + * Edit api lang and related files. + +commit 806bf1cfe482c2f31dcbc1f44afa00bc91350314 +Merge: 92895e16b5 ef9821f709 +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 02:11:00 2021 +0000 + + Merge branch 'sprint/169_mayue_15793' into 'sprint/169' + + *Fix a bug #15793. + + See merge request easycorp/zentaopms!197 + +commit ef9821f70904024a0a9bf0a65889ed3f628c1e07 +Author: mayue +Date: Thu Oct 28 10:10:04 2021 +0800 + + *Fix a bug #15793. + +commit 60afff4fcdad5816f566595c64ad3c2998d9ad0e +Author: mayue +Date: Thu Oct 28 10:04:55 2021 +0800 + + *Fix a bug #15793. + +commit a2a8552221a149bc87b3734d0b9f1b2d0365e4a0 +Author: mayue +Date: Thu Oct 28 09:52:35 2021 +0800 + + *Fix a bug #15793. + +commit 6a8f69b5246f94454ae57db26ecf6bf9b61c505d +Merge: 1632e807af ef415555ef +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 01:37:15 2021 +0000 + + Merge branch 'sprint/168_sgm_adjustcode' into 'sprint/168' + + * Adjust code style. + + See merge request easycorp/zentaopms!196 + +commit 1632e807af34520e89c3068e959d5237b09278ba +Merge: 77124bcb9f 1520ef7ddf +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 01:33:59 2021 +0000 + + Merge branch 'sprint/168_xiawenlong' into 'sprint/168' + + fix unique lane column name + + See merge request easycorp/zentaopms!195 + +commit 1520ef7ddfd7e392dc163e1f21b997c1b96868d0 +Author: xiawenlong +Date: Thu Oct 28 09:32:40 2021 +0800 + + fix code style + +commit 6767ddb22f47cbe887339715c15ec376ea355783 +Author: xiawenlong +Date: Thu Oct 28 09:32:07 2021 +0800 + + fix code style + +commit ef415555ef7c4d0a0a652d544e889f4d9075d969 +Author: 孙广明 +Date: Thu Oct 28 09:29:34 2021 +0800 + + * Adjust code style. + +commit f6517fdc016cb3b505443c81bc6bae2200152890 +Author: xiawenlong +Date: Thu Oct 28 09:25:23 2021 +0800 + + fix code style + +commit f6f3eea0526f6e4075112b08942bc6bafed1e131 +Author: xiawenlong +Date: Thu Oct 28 08:56:48 2021 +0800 + + fix code style + +commit 4b760d9837a67eb8f7b8a3cf5ca459add14074ed +Author: xiawenlong +Date: Thu Oct 28 08:50:26 2021 +0800 + + fix unique lane column name + +commit 77124bcb9f2e25056ae72a49b5c4727b9393fe61 +Merge: 5357edda36 f361a97721 +Author: 孙广明 +Date: Thu Oct 28 00:40:23 2021 +0000 + + Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168' + + * Fix error of kanban. + + See merge request easycorp/zentaopms!194 + +commit 5357edda360f42bc5c21dc9529ad2d581b60bdb8 +Merge: b6cc57c54e ceefa34752 +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 28 00:36:40 2021 +0000 + + Merge branch 'sprint/168_tianshujie_kanban' into 'sprint/168' + + *Sprint/168 tianshujie kanban + + See merge request easycorp/zentaopms!191 + +commit f361a9772115402539b2a0c0292fae3c31cc7bbf +Author: liyuchun +Date: Thu Oct 28 08:35:21 2021 +0800 + + * Fix error of kanban. + +commit 076f32891492262d59b594f1c6882154f81e7247 +Author: 王怡栋 +Date: Wed Oct 27 19:58:50 2021 +0800 + + * add lang for zentaoapp and adjust api. + +commit b6cc57c54ec687814c54cca7f40c05ce2e0c6716 +Merge: c749aeb0cb 1981133d03 +Author: 孙广明 +Date: Wed Oct 27 09:27:49 2021 +0000 + + Merge branch 'spirnt/168_liyuchun_43409' into 'sprint/168' + + * Finish task #43521. + + See merge request easycorp/zentaopms!193 + +commit 92895e16b5bc153e6aad6a40cece5112161c1b3e +Merge: 0b6b0ee956 cf7826954e +Author: 李玉春 <563917701@qq.com> +Date: Wed Oct 27 09:24:46 2021 +0000 + + Merge branch 'sprint/169_zhouxin_43556' into 'sprint/169' + + Fix bug 43556 + + See merge request easycorp/zentaopms!190 + +commit 0b6b0ee95684a61c4a761696f771bef2100fc3e6 +Merge: 968c53b3ab 0417c40e83 +Author: 孙广明 +Date: Wed Oct 27 09:18:04 2021 +0000 + + Merge branch 'sprint/169_zhouxin_43539' into 'sprint/169' + + Fix bug #43539 + + See merge request easycorp/zentaopms!176 + +commit 1981133d035cc0d617875b01afa7c26e0de224f5 +Author: liyuchun +Date: Wed Oct 27 17:17:45 2021 +0800 + + * Finish task #43521. + +commit ceefa34752fefcf9cfc5b92d36fe674dc00a5eea +Author: tianshujie +Date: Wed Oct 27 17:14:37 2021 +0800 + + * Modify to get card data. + +commit c749aeb0cb26cc45b99ba16ec0e9d3e205cbb92d +Merge: e72ae4fa18 1bd4afcd24 +Author: 孙广明 +Date: Wed Oct 27 09:03:25 2021 +0000 + + Merge branch 'sprint/168_xiawenlong' into 'sprint/168' + + Finish Task #43407,43420 + + See merge request easycorp/zentaopms!188 + +commit 968c53b3ab63926c80b23086473063ed080a4f33 +Merge: 8b586a0a27 82d42ca24a +Author: 孙广明 +Date: Wed Oct 27 09:00:41 2021 +0000 + + Merge branch 'sprint/169_tanghucheng_43541' into 'sprint/169' + + Finish task #43541 + + See merge request easycorp/zentaopms!186 + +commit 8b586a0a27cce37e19990e63d7dd385c9f687a2d +Merge: 3ded66986e 896300727d +Author: 李玉春 <563917701@qq.com> +Date: Wed Oct 27 08:59:28 2021 +0000 + + Merge branch 'sprint/169_tianshujie_43537' into 'sprint/169' + + * Finish task #43537. + + See merge request easycorp/zentaopms!189 + +commit cf7826954eaf2a193b89d8665aac0545f4bbbae3 +Author: zhouxin +Date: Wed Oct 27 16:55:26 2021 +0800 + + Fix bug #43556. + +commit 896300727d5f29a1a2080009cc582b5890d714b5 +Author: tianshujie +Date: Wed Oct 27 16:54:43 2021 +0800 + + * Fix bug #43537. + +commit 1bd4afcd24eab1e2611c3043c384991caa013db4 +Author: xiawenlong +Date: Wed Oct 27 16:53:31 2021 +0800 + + * Finish Task #43407,43420 + +commit 5b0458b841aae3de83d0876bb5dcaed9548ea611 +Author: xiawenlong +Date: Wed Oct 27 16:53:15 2021 +0800 + + * Finish Task #43407,43420 + +commit e72ae4fa189976605322d157fe1e699558b33543 +Merge: 2204b280f1 81603f04bd +Author: 李玉春 <563917701@qq.com> +Date: Wed Oct 27 08:48:55 2021 +0000 + + Merge branch 'sprint/168_sgm_kanban' into 'sprint/168' + + * Finish task #43394, #43395, #43396. + + See merge request easycorp/zentaopms!187 + +commit 81603f04bd31569e2cde641105e4363e0cd8088a +Author: 孙广明 +Date: Wed Oct 27 16:40:30 2021 +0800 + + * Finish task #43394, #43395, #43396. + +commit 82d42ca24a5183899c726e56beac1cebfed08fe4 +Author: tanghucheng +Date: Wed Oct 27 16:37:30 2021 +0800 + + * Finish task #43541. + +commit 9cc238ca96d77925418efebe36bb395884122afa +Author: tanghucheng +Date: Wed Oct 27 16:34:43 2021 +0800 + + * Finish task #43541. + +commit 4ea309a73d9da3e0c3b3c5e7e7698146094e7252 +Author: tanghucheng +Date: Wed Oct 27 16:30:56 2021 +0800 + + * Finish task #43541. + +commit a0d22615b87c345f470ebde8d5e814511f7fa06d +Merge: 635f4e1c35 d2cca97b50 +Author: tanghucheng +Date: Wed Oct 27 16:19:24 2021 +0800 + + Merge branch 'sprint/169_tanghucheng_43541' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/169_tanghucheng_43541 + +commit 635f4e1c35fedf0a5591935529cc820705b610c5 +Author: tanghucheng +Date: Wed Oct 27 16:14:35 2021 +0800 + + * Finish task #43541. + +commit 2204b280f135ca7c9825980bc76dde2c63a21467 +Merge: be167bcafb af47fbde25 +Author: 李玉春 <563917701@qq.com> +Date: Wed Oct 27 07:51:25 2021 +0000 + + Merge branch 'sprint/168_tianshujie_kanban' into 'sprint/168' + + * Modify query Kanban logic. + + See merge request easycorp/zentaopms!183 + +commit af47fbde25e6de554309ce115f4acb461dd95f19 +Author: tianshujie +Date: Wed Oct 27 15:47:53 2021 +0800 + + * Modify the parent swimlane column data. + +commit be167bcafbfb6e67fc3e2b6650c6aaabf9548884 +Merge: f2cf07b71d d0b9dda4d7 +Author: 孙广明 +Date: Wed Oct 27 07:46:11 2021 +0000 + + Merge branch 'sprint/168_liyuchun_43424' into 'sprint/168' + + * Finish task #43519,#43503. + + See merge request easycorp/zentaopms!185 + +commit 3ded66986ec184daa3a3c8c9175c808f2bb4235b +Merge: 6d3b95f797 9c588bd32e +Author: 孙广明 +Date: Wed Oct 27 07:45:57 2021 +0000 + + Merge branch 'sprint/169_xieqiyu_43555' into 'sprint/169' + + * Finish task#43555. + + See merge request easycorp/zentaopms!182 + +commit d6d04e1152d497a938face4ea6cb4b1917024e92 +Author: tianshujie +Date: Wed Oct 27 15:45:01 2021 +0800 + + * Modify the parent lane column data. + +commit d0b9dda4d77ba282d32a54a76f86a635a92706d0 +Author: liyuchun +Date: Wed Oct 27 15:41:36 2021 +0800 + + * Finish task #43519,#43503. + +commit f02082212cb746bc22c6448f98bb358cd7b78108 +Author: Hao Sun +Date: Wed Oct 27 15:41:35 2021 +0800 + + * add changeCardColType method. + +commit 6f72de9b65ad15322facfa6bf00a437680340ac8 +Author: tianshujie +Date: Wed Oct 27 15:34:59 2021 +0800 + + * Modify query Kanban logic. + +commit 9c588bd32e24b24a4b0fecf38e0226dc1d563a53 +Author: xieqiyu +Date: Wed Oct 27 15:24:29 2021 +0800 + + * Finish task#43555. + +commit f2cf07b71d0682b343333d7d4578fbfbce8ed924 +Merge: 4afd15a4fe e403896809 +Author: Hao Sun +Date: Wed Oct 27 15:20:45 2021 +0800 + + Merge branch 'sprint/168_sunhao/kanban_refactor' into sprint/168 + + # Conflicts: + # module/execution/js/kanban.js + +commit 4afd15a4fecf1fa28208fe9474903f2c6ec537dd +Author: Hao Sun +Date: Wed Oct 27 15:20:03 2021 +0800 + + * Fix merge conflict. + +commit 6d3b95f797e02909cc3ae353a36401705ab7501c +Merge: ee48738da8 b2ea4ec71f +Author: 李玉春 <563917701@qq.com> +Date: Wed Oct 27 07:07:58 2021 +0000 + + Merge branch 'sprint/169_mayue_15741' into 'sprint/169' + + *Fix a bug #15741. + + See merge request easycorp/zentaopms!179 + +commit 8997b3d1416a3e874f79bb5229f98a4ea17ed3f0 +Merge: 1dd7098228 5822a06c7d +Author: liyuchun +Date: Wed Oct 27 15:07:06 2021 +0800 + + Merge branch 'sprint/167_sgm_kanbandata' into sprint/168 + +commit 5822a06c7da22c512a04d97ced0af7cff1afe0ff +Merge: 8bfa8d5a42 1dd7098228 +Author: 李玉春 <563917701@qq.com> +Date: Wed Oct 27 07:05:51 2021 +0000 + + Merge branch 'sprint/168' into 'sprint/167_sgm_kanbandata' + + # Conflicts: + # module/kanban/model.php + +commit e403896809f443f9b9252058f14bfbdd4e588e35 +Author: Hao Sun +Date: Wed Oct 27 15:03:51 2021 +0800 + + * avoid override window.kanbanDropRules settings in other place. + +commit 7e8d65f34ea370482c1c1b7e4ab35b7813f52176 +Author: Hao Sun +Date: Wed Oct 27 14:53:45 2021 +0800 + + * fix window.columnRenderers works with defaultCardType. + +commit 81ad2610dc41f71ff45367cef49cf74aaaf9476a +Author: Hao Sun +Date: Wed Oct 27 14:53:15 2021 +0800 + + * refactor: alignment statements. + +commit 1dd7098228cd922b7900465d0d001e009e41fa1d +Merge: 90079cd4fb 0fc3731113 +Author: 孙广明 +Date: Wed Oct 27 14:51:12 2021 +0800 + + Merge branch 'sprint/168_xiawenlong' into sprint/168 + +commit 37f88fdd831b236b072316fd3f94b9f4cdedd95b +Author: Hao Sun +Date: Wed Oct 27 14:49:10 2021 +0800 + + * refactor: rename maxCount->limit, item -> card and comment. + +commit 8bfa8d5a4204ee6e4588da8e108fcb8c1bfa4656 +Author: 孙广明 +Date: Wed Oct 27 14:50:13 2021 +0800 + + * Add get kanban group. + +commit 0fc3731113eb15eaa8fe5e91f7c8fe8f5cd69999 +Merge: 19d91de64c 1d75b28c4d +Author: 孙广明 +Date: Wed Oct 27 06:48:39 2021 +0000 + + Merge branch 'sprint/168' into 'sprint/168_xiawenlong' + + # Conflicts: + # module/execution/js/kanban.js + +commit b2ea4ec71fc24ed7e7dc8e018c7726e8d0b30fb5 +Author: mayue +Date: Wed Oct 27 14:39:57 2021 +0800 + + *Fix a bug #15741. + +commit 1d75b28c4dc1681de1ac22b0d59c0a63397f01a2 +Merge: e623a13cb2 b4631b3665 +Author: 孙广明 +Date: Wed Oct 27 06:30:31 2021 +0000 + + Merge branch 'sprint/168_sunhao/improve_kanban_ui' into 'sprint/168' + + * Improve UI for kanban page, adjust page layout and support for dnd. + + See merge request easycorp/zentaopms!175 + +commit b4631b3665a1e696f4018ac9b317b599334a4562 +Author: Hao Sun +Date: Wed Oct 27 14:28:03 2021 +0800 + + * add drag and drop animation to kanban. + +commit 19d91de64c3f572f53de7146249d63030b44bdb8 +Author: xiawenlong +Date: Wed Oct 27 14:23:28 2021 +0800 + + * Finish Task #43420 + +commit d2cca97b50aeb7612aafe6386613f0f4e697c4c8 +Author: tanghucheng +Date: Wed Oct 27 14:19:38 2021 +0800 + + * Finish task #43541. + +commit f1fd0ee1db1da1fd90103cd877e81a694adaaf07 +Author: xiawenlong +Date: Wed Oct 27 14:14:50 2021 +0800 + + * Finish Task #43420 + +commit 0417c40e834a705815f12b1df804a1b5dcefdbf0 +Author: zhouxin +Date: Wed Oct 27 14:10:45 2021 +0800 + + Fix bug #43539. + +commit ee48738da81a80736027dfae3a72035cfc564a6e +Merge: a98c6931e0 9fac2ea22e +Author: 李玉春 <563917701@qq.com> +Date: Wed Oct 27 06:10:09 2021 +0000 + + Merge branch 'sprint/169_tianshujie_43540' into 'sprint/169' + + * Fix bug #43540. + + See merge request easycorp/zentaopms!174 + +commit b9ce9d697f1326f48a523bea7b0c5f3b81508a9f +Author: Hao Sun +Date: Wed Oct 27 14:08:22 2021 +0800 + + * support for d-n-d in kanban. + +commit f3b29388f7e88b774c36301cc6c129c0e3a93c4f +Author: Hao Sun +Date: Wed Oct 27 13:52:27 2021 +0800 + + * adjust layout for kanban page. + +commit 9fac2ea22e0b60cc1a74e2bab93c3f11efbacedc +Author: tianshujie +Date: Wed Oct 27 13:50:27 2021 +0800 + + * Fix bug #43540. + +commit e623a13cb2c5023461c85ecf091d281cff4e45d1 +Merge: 57995a6e7f b571de52de +Author: 孙广明 +Date: Wed Oct 27 05:37:43 2021 +0000 + + Merge branch 'sprint/168_xiawenlong' into 'sprint/168' + + add right actions + + See merge request easycorp/zentaopms!173 + +commit a98c6931e069461ec5aef619a7e47a50ad6c5c6a +Merge: 1275fa87cd 36cf32bb9b +Author: 朱金勇 +Date: Wed Oct 27 05:00:43 2021 +0000 + + Merge branch 'sprint/169' into 'sprint/169' + + Fix the bug in the compile submodule of DevOps module. + + See merge request easycorp/zentaopms!172 + +commit b571de52de52ed127f6965170ad6b1c761ea4239 +Author: xiawenlong +Date: Wed Oct 27 11:46:54 2021 +0800 + + add right actions + +commit 36cf32bb9bd13603906af2e3db5ebd2b89351075 +Author: dingguodong +Date: Wed Oct 27 11:08:37 2021 +0800 + + * Make codes meet the CR rules. + +commit ec8b31e847501e78d760756027de19c2d26098e2 +Merge: 7ad0747fd6 1275fa87cd +Author: zhujinyong +Date: Wed Oct 27 11:06:45 2021 +0800 + + Merge branch 'sprint/169' of https://gitlab.zcorp.cc/easycorp/zentaopms into 169 + +commit 57995a6e7fc1448d5c7cb6d1a0d68433e49a07ca +Merge: 0af76bd862 a6e7949301 +Author: 朱金勇 +Date: Wed Oct 27 03:01:59 2021 +0000 + + Merge branch 'sprint/168_sunhao/refactor_avatar_helper' into 'sprint/168' + + * Refactor avatar helper, the $user param cannot be an avatar url now. + + See merge request easycorp/zentaopms!161 + +commit 0af76bd86217c652779808772bbb9a7e2d8639d5 +Merge: 15fcbf79e8 ee28e0f7ef +Author: 李玉春 <563917701@qq.com> +Date: Wed Oct 27 02:55:51 2021 +0000 + + Merge branch 'sprint/168_sgm_43396' into 'sprint/168' + + * Add bind product action. + + See merge request easycorp/zentaopms!166 + +commit 15fcbf79e8bc0dd0a2ca2ecb3b532a5ab7f12dbb +Merge: 90079cd4fb d7868c41e3 +Author: 孙广明 +Date: Wed Oct 27 02:46:22 2021 +0000 + + Merge branch 'sprint/168_liyuchun_43503' into 'sprint/168' + + Sprint/168 liyuchun 43503 + + See merge request easycorp/zentaopms!171 + +commit 0a93db90f222771e8ead09fd4e21e2b844dcd452 +Author: dingguodong +Date: Wed Oct 27 10:41:03 2021 +0800 + + * Add comments and notes. + +commit e7c337c8b5839103f169bd03d74671f34709facc +Author: dingguodong +Date: Wed Oct 27 10:39:54 2021 +0800 + + * Fix the bug that compile can run scheduled job. + +commit fff67388f868d515d0ef0f22c6af3db3094892ff +Author: dingguodong +Date: Wed Oct 27 10:39:11 2021 +0800 + + * Fix the bug that user can not select pipeline from jenkins. + +commit d7868c41e37405fe675b35f6ad991a5365c244fc +Author: liyuchun +Date: Wed Oct 27 10:38:52 2021 +0800 + + * Code for task #43503. + +commit c0502c85fdefb3c1a95df19ada780ecd86e9d9bc +Author: liyuchun +Date: Wed Oct 27 10:35:51 2021 +0800 + + * Code for task #43503. + +commit 1275fa87cd70195a9d43d51517202ae977a09fd8 +Merge: 1007936087 554214895b +Author: 孙广明 +Date: Wed Oct 27 02:29:46 2021 +0000 + + Merge branch 'sprint/169_tanghucheng_43557' into 'sprint/169' + + Finish task #43557 + + See merge request easycorp/zentaopms!170 + +commit 1007936087da464df1e537f91bcf3008c312f5a7 +Merge: 5cec976a63 706128a141 +Author: 孙广明 +Date: Wed Oct 27 02:29:25 2021 +0000 + + Merge branch 'sprint/169_wangjingbo_43541' into 'sprint/169' + + Sprint/169 wangjingbo 43541 + + See merge request easycorp/zentaopms!157 + +commit 5cec976a636827b82cbc4a3b6ba398344ca552d3 +Merge: e565ab289a 396d267729 +Author: 孙广明 +Date: Wed Oct 27 02:28:04 2021 +0000 + + Merge branch 'sprint/169_zhouxin_43561' into 'sprint/169' + + Sprint/169 zhouxin 43561 + + See merge request easycorp/zentaopms!160 + +commit 554214895b1b5f9df6fbdb7a2cf4a8ced5a8993b +Author: tanghucheng +Date: Wed Oct 27 10:26:23 2021 +0800 + + * Finish task #43557 + +commit 90079cd4fba7f94f52cd0d549b78f54ddc848b57 +Merge: 3a4933ef96 1b3e236f01 +Author: 孙广明 +Date: Wed Oct 27 02:26:14 2021 +0000 + + Merge branch 'sprint/tengfei_168_lang' into 'sprint/168' + + * Edit dept lang. + + See merge request easycorp/zentaopms!169 + +commit 1b3e236f0167a51c82d2d8a452796139cd16108d +Author: reneeteng +Date: Wed Oct 27 10:19:25 2021 +0800 + + * Edit dept lang. + +commit a6544b38edb7893d0220d0467ab2c0bc2f4f1a99 +Author: tanghucheng +Date: Wed Oct 27 10:05:51 2021 +0800 + + * Finish task #43557. + +commit 36e71df8eb45dee826558a35cbbc3ccabb4a54c5 +Author: Hao Sun +Date: Wed Oct 27 10:04:29 2021 +0800 + + * support to limit kanban board width. + +commit ee28e0f7efc98e6a52da48cad70d8c549ad807e0 +Author: 孙广明 +Date: Wed Oct 27 09:37:39 2021 +0800 + + * Add bind product action. + +commit 3a4933ef9660e325fa345576d4c5780cfa41481a +Merge: 2ae094b948 51531e1e6b +Author: 孙广明 +Date: Wed Oct 27 01:27:09 2021 +0000 + + Merge branch 'sprint/168_zenggang_15488' into 'sprint/168' + + * Fix bug#15488 + + See merge request easycorp/zentaopms!163 + +commit 2ae094b94887928dea7a4cba57f8f09251cd3754 +Merge: 7ad0747fd6 14d45f2939 +Author: 孙广明 +Date: Wed Oct 27 00:58:10 2021 +0000 + + Merge branch 'sprint/168_sunhao/improve_kanban_ui' into 'sprint/168' + + * Fix last merge conflict from kanban_demo and improve avatar style. + + See merge request easycorp/zentaopms!162 + +commit e565ab289a15e834a2666433e14cdd9b61db98eb +Merge: 014bf4f068 131b428d20 +Author: 李玉春 <563917701@qq.com> +Date: Wed Oct 27 00:57:38 2021 +0000 + + Merge branch 'sprint/169_mayue_15712' into 'sprint/169' + + *Fix a bug #15712 + + See merge request easycorp/zentaopms!164 + +commit 131b428d20cdf3b70f48c84788b2d634c5a1d959 +Author: mayue +Date: Tue Oct 26 18:20:14 2021 +0800 + + *Fix a bug #15712 + +commit 51531e1e6bd075439efb26f018ee4b148cde876c +Author: zenggang +Date: Tue Oct 26 09:39:25 2021 +0000 + + * Fix bug#15488 + +commit 14d45f2939e0008ec66821f9026531ae9d726a63 +Author: Hao Sun +Date: Tue Oct 26 16:59:24 2021 +0800 + + * move some code from kanban_demo. + +commit 77d40738690d6da5aec8ce0e40a493e16067841e +Author: Hao Sun +Date: Tue Oct 26 16:57:36 2021 +0800 + + * improve avatar style in kanban. + +commit a6e7949301e55937f577cfad3a17ca5da1791ff1 +Author: Hao Sun +Date: Tue Oct 26 16:39:44 2021 +0800 + + * refactor avatar helper, the $user param cannot be an avatar url now. + +commit 4b31274644e41789f3f04f9d62156c5290db7aee +Author: 王怡栋 +Date: Tue Oct 26 16:25:25 2021 +0800 + + * adjust for get undone product. + +commit 089a1204f104ae3548134aec308bf403fd13c8a0 +Author: 王怡栋 +Date: Tue Oct 26 16:18:35 2021 +0800 + + * fix for return fields. + +commit 396d267729941e02649a2d95fb850253b8bf5026 +Author: zhouxin +Date: Tue Oct 26 16:00:50 2021 +0800 + + Finish task #43561. + +commit 7ad0747fd6d517f09101052a400e09c7c296a614 +Merge: d48c8c0d5a 1da7061d7a +Author: 孙广明 +Date: Tue Oct 26 07:57:05 2021 +0000 + + Merge branch 'sprint/168_zenggang' into 'sprint/168' + + * Fix menu pri judge + + See merge request easycorp/zentaopms!159 + +commit d48c8c0d5ad034937f779cdd5fd4a5c7975bcff6 +Merge: ff8f020485 fb5687c6a4 +Author: 孙广明 +Date: Tue Oct 26 15:56:09 2021 +0800 + + Merge branch 'sprint/168_sunhao/kanban_demo' into sprint/168 + +commit fb5687c6a403325dbe8c0fe8039ba2152fbd5eb7 +Merge: 0063ed7950 e2d368f251 +Author: 孙广明 +Date: Tue Oct 26 07:53:38 2021 +0000 + + Merge branch 'sprint/168' into 'sprint/168_sunhao/kanban_demo' + + # Conflicts: + # module/execution/js/kanban.js + # module/execution/view/kanban.html.php + +commit 1da7061d7a999427dbc46a53836d7f5d30456c81 +Author: zenggang +Date: Tue Oct 26 07:49:56 2021 +0000 + + * Fix menu pri judge + +commit 0063ed7950a9a0097631b3dc13c0876c91f1b53e +Author: Hao Sun +Date: Tue Oct 26 15:47:50 2021 +0800 + + * replace kanban with kanbandemo. + +commit 001ca0ef8f2b372ec89f59251b6a1c9ef87574f3 +Author: 王怡栋 +Date: Tue Oct 26 15:39:46 2021 +0800 + + * code for task #43347. + +commit 706128a141a00490bb60c28e50d3f72efa7938a0 +Author: wangjingbo +Date: Tue Oct 26 15:39:25 2021 +0800 + + * Finish task #43541. + +commit b6f3608ab4fdf304bcc7cbe997c0a0f6d29f1629 +Author: Hao Sun +Date: Tue Oct 26 15:38:00 2021 +0800 + + * change kanban page width to full size. + +commit 014bf4f0680a1f0d09842c0ab3d1a9c440840e4e +Merge: dd2657b9a1 c884f07868 +Author: 王怡栋 +Date: Tue Oct 26 07:31:50 2021 +0000 + + Merge branch 'sprint/169_liugang_bug' into 'sprint/169' + + Remove the outdated code and fix return value. + + See merge request easycorp/zentaopms!152 + +commit dd2657b9a12b12b04856f1928bb4dc1cb5b4e9d0 +Merge: c7f185503c d4f7c938c1 +Author: 孙广明 +Date: Tue Oct 26 07:31:25 2021 +0000 + + Merge branch 'spring/169/xiawenlong' into 'sprint/169' + + Spring/169/xiawenlong + + See merge request easycorp/zentaopms!156 + +commit e2d368f2516da8ad4702a6eb2706e7a329257e53 +Merge: 0458578361 c45866a3a3 +Author: 孙广明 +Date: Tue Oct 26 07:31:02 2021 +0000 + + Merge branch 'sprint/168_liyuchun_43519' into 'sprint/168' + + Sprint/168 liyuchun 43519 + + See merge request easycorp/zentaopms!155 + +commit d4f7c938c1a6c3b9cd138bd27f4b43ba4c7930b4 +Author: xiawenlong +Date: Tue Oct 26 15:26:05 2021 +0800 + + rollback code. + +commit c45866a3a32dca367fad01a4c91fb6959262a8dd +Author: liyuchun +Date: Tue Oct 26 15:24:09 2021 +0800 + + * Code for task #43519. + +commit 04585783618a6ade31f87909bd54f9668daca18e +Merge: 28dcdf4449 ad05f1d4cf +Author: 李玉春 <563917701@qq.com> +Date: Tue Oct 26 07:16:12 2021 +0000 + + Merge branch 'sprint/168_sgm_kanban' into 'sprint/168' + + * Add kanban view. + + See merge request easycorp/zentaopms!154 + +commit c7f185503cb102905f1d8f62d61a32ac7f3b650a +Merge: 354061c768 fdc33354fc +Author: 李玉春 <563917701@qq.com> +Date: Tue Oct 26 07:12:32 2021 +0000 + + Merge branch 'sprint/169_mayue_15739' into 'sprint/169' + + *Fix a bug #15739 + + See merge request easycorp/zentaopms!150 + +commit 354061c76899e7a6ae56a70f6dace7ee6d3f8d34 +Merge: aad6d4c76a aa9aeb37b0 +Author: 孙广明 +Date: Tue Oct 26 07:10:17 2021 +0000 + + Merge branch 'sprint/169_tanghucheng_43549' into 'sprint/169' + + Finish task #43549 + + See merge request easycorp/zentaopms!151 + +commit ad05f1d4cfa0b4a427c9bd50ce537e5d588b69f0 +Author: 孙广明 +Date: Tue Oct 26 15:03:27 2021 +0800 + + * Add kanban view. + +commit fdc33354fcbb210e236917dd1d0af99ac2c56cc1 +Author: mayue +Date: Tue Oct 26 15:01:14 2021 +0800 + + *Fix a bug #15739 + +commit c884f078689765e3093d3ee661ddefdf3d230852 +Author: liugang +Date: Tue Oct 26 14:56:48 2021 +0800 + + * Remove the outdated code. + +commit dd729bb202a495e83267da2ce8ae64220cbd1c7a +Author: liugang +Date: Tue Oct 26 14:55:15 2021 +0800 + + * Fix return value. + +commit cc3fb38f5056dc23ec5d09545b001b92f3f123bd +Author: Hao Sun +Date: Tue Oct 26 14:55:12 2021 +0800 + + * fix maxCount not show in kanban header. + +commit f5420202e22934addde9e9065b2854227dbe66d7 +Author: Hao Sun +Date: Tue Oct 26 14:54:57 2021 +0800 + + * remove width limit in kanban page. + +commit 43d52ddb9bee790529887e55830dd4f0c3a5037e +Author: Hao Sun +Date: Tue Oct 26 14:54:16 2021 +0800 + + * improve style for affixed header in kanban. + +commit 28dcdf4449578f030459077246735b994bd3df52 +Merge: ff8f020485 4d09ade9cb +Author: 李玉春 <563917701@qq.com> +Date: Tue Oct 26 06:49:35 2021 +0000 + + Merge branch 'sprint/168_tianshujie_43426' into 'sprint/168' + + * Correct Kanban data. + + See merge request easycorp/zentaopms!147 + +commit 4e082eb88320b91ec5ba15012b6697ebd502b92d +Author: mayue +Date: Tue Oct 26 14:48:54 2021 +0800 + + *Fix a bug #15739 + +commit aa9aeb37b0afb4dbd7a0471fc352263863a4e0ea +Author: tanghucheng +Date: Tue Oct 26 14:38:30 2021 +0800 + + * Finish task #43549. + +commit 0dc857f2bb207624b45b8f74de3a57a9a5778344 +Author: liyuchun +Date: Tue Oct 26 14:38:00 2021 +0800 + + * Code for task #43519. + +commit 17118b4595044ef2d52a5c1f05b0d8d1cf86d28d +Author: mayue +Date: Tue Oct 26 14:37:42 2021 +0800 + + *Fix a bug #15739 + +commit 4d09ade9cb0fe6b9a99c47dd9013b6a60d66283f +Author: tianshujie +Date: Tue Oct 26 14:37:39 2021 +0800 + + * Get card data of kanban column. + +commit 9edd3746121d0b0304f550f782a1ac7724f0c921 +Author: xiawenlong +Date: Tue Oct 26 14:06:45 2021 +0800 + + * Finish task #43551. + +commit 83a1e66eabe6422933a2f2e3a2eec2bc377a39aa +Author: tianshujie +Date: Tue Oct 26 13:35:02 2021 +0800 + + * Adjust code. + +commit b28abf1c4cee8c15b15921b3d7251b4ab18de937 +Author: zhouxin +Date: Tue Oct 26 13:02:12 2021 +0800 + + Finish task#43538. + +commit f8447c98250eaa64071e6f88427b32bf625737bc +Author: tianshujie +Date: Tue Oct 26 11:46:33 2021 +0800 + + * Correct Kanban data. + +commit 920b8234a3fba14a2dbbdc297a13418fabfdae0d +Author: Hao Sun +Date: Tue Oct 26 11:42:23 2021 +0800 + + + add kanban demo files. + +commit 7fb8c5ca8b5498548d520e613c621d5679f0a279 +Author: 王怡栋 +Date: Tue Oct 26 10:57:52 2021 +0800 + + * adjust for task #43565. + +commit ff8f0204859186fa53d316a1154c17b65bb7fb1c +Merge: 5f286affd8 4a2b7dae24 +Author: 李玉春 <563917701@qq.com> +Date: Tue Oct 26 02:51:13 2021 +0000 + + Merge branch 'sprint/168_tianshujie_43426' into 'sprint/168' + + * Refactoring the Kanban function. + + See merge request easycorp/zentaopms!145 + +commit 4a2b7dae2459c4ad676ddb7390360802c955fc25 +Author: tianshujie +Date: Tue Oct 26 10:49:42 2021 +0800 + + * Add comment of kanban model.php + +commit a577f54958e53813536741635c57fe1b92e1b9cd +Author: tanghucheng +Date: Tue Oct 26 10:45:49 2021 +0800 + + * Finish task #43557. + +commit 5f286affd87fd98e6fac130935a2f4bef9b1075c +Merge: b77f8474c3 6765c0bdae +Author: 李玉春 <563917701@qq.com> +Date: Tue Oct 26 02:28:59 2021 +0000 + + Merge branch 'sprint/168_dingna_api' into 'sprint/168' + + * Add testcase of product. + + See merge request easycorp/zentaopms!140 + +commit a71cacdaa8d7601f4de01aba3650040bfab48a27 +Author: tianshujie +Date: Tue Oct 26 10:25:33 2021 +0800 + + * Refactoring the Kanban function. + +commit 58116c1bbcf301ef9659c8d9bbe41ff5b9190480 +Author: xiawenlong +Date: Tue Oct 26 10:06:38 2021 +0800 + + * Finish task #43543. + +commit 0172e0106e86a76c17797b77b093dba8078a0ff6 +Author: 王怡栋 +Date: Tue Oct 26 09:47:26 2021 +0800 + + * code for task #43565. + +commit 7372f327d98afa76ddfe47ff2d9dde5671c1a8bf +Author: 王怡栋 +Date: Tue Oct 26 09:41:15 2021 +0800 + + * code for task #43565. + +commit b77f8474c3657a1de808df0f71954cd720dccad8 +Merge: 86afd37ec1 f860008e56 +Author: 王怡栋 +Date: Mon Oct 25 09:07:40 2021 +0000 + + Merge branch 'sprint/168_liugang_bug' into 'sprint/168' + + * Remove the outdated code. + + See merge request easycorp/zentaopms!143 + +commit f860008e5602256062c2240e4ba240087ae64773 +Author: liugang +Date: Mon Oct 25 16:18:48 2021 +0800 + + * Remove the outdated code. + +commit 546edae92a2049438b7978779a1b0befe3639dd0 +Author: tianshujie +Date: Mon Oct 25 16:11:36 2021 +0800 + + * Adjust code of kanban. + +commit 86afd37ec116e89fb48373ed3f360cbed0829ab0 +Merge: c0cf35c191 5ad02fe558 +Author: 李玉春 <563917701@qq.com> +Date: Mon Oct 25 08:06:24 2021 +0000 + + Merge branch 'sprint/168_dingna_bug' into 'sprint/168' + + * Fix the bug that no navigation after clicking the subtask on the Work page. + + See merge request easycorp/zentaopms!142 + +commit c0cf35c1918f5d757ee4c02dfc6a9558c1a6378c +Merge: cd371a9491 d76b563cc5 +Author: 王怡栋 +Date: Mon Oct 25 07:35:22 2021 +0000 + + Merge branch 'sprint/168_sgm_kanban' into 'sprint/168' + + * Add project managed products lang. + + See merge request easycorp/zentaopms!139 + +commit 5ad02fe55846cb3621b81b7491e950b3b23bccde +Author: dingna +Date: Mon Oct 25 15:25:28 2021 +0800 + + * Fix the bug that no navigation after clicking the subtask on the Work page. + +commit a72b84e25762b8e065b6826dfa54326589364829 +Author: tianshujie +Date: Mon Oct 25 15:03:27 2021 +0800 + + * Get Kanban data. + +commit 6765c0bdae2def2a967aab1602be99d78df93737 +Author: dingna +Date: Mon Oct 25 14:48:21 2021 +0800 + + * Add testcase of product. + +commit 3d22a50a001fd71e03b36a3e255650f37ae5a8a0 +Author: tianshujie +Date: Mon Oct 25 14:13:44 2021 +0800 + + * Create the single execution Kanban lane and Kanban column. + +commit f21be3ec126a2aecbbe91d9708d2470a3239632b +Author: 王怡栋 +Date: Mon Oct 25 13:53:34 2021 +0800 + + * code for task #43341. + +commit d76b563cc5408b3348408f2a8d53c9297d9a0a87 +Author: 孙广明 +Date: Mon Oct 25 13:34:41 2021 +0800 + + * Add project managed products lang. + +commit cd371a94916e99ea284101a419c943ecc0bb9aa5 +Merge: dc05dbb963 e8b2344122 +Author: 孙广明 +Date: Mon Oct 25 02:33:58 2021 +0000 + + Merge branch 'sprint/168_liyuchun_api' into 'sprint/168' + + * Adjust cases of testcase. + + See merge request easycorp/zentaopms!130 + +commit dc05dbb963faa2b067e5cb9c13798b191d311866 +Merge: 824afd991b 534254a5a3 +Author: 孙广明 +Date: Mon Oct 25 02:33:31 2021 +0000 + + Merge branch 'sprint/168_zenggang_15682' into 'sprint/168' + + * Fix bug#15682 + + See merge request easycorp/zentaopms!135 + +commit 95fde8eaca079df47413545b4697e07cf62000a4 +Author: 王怡栋 +Date: Mon Oct 25 09:49:14 2021 +0800 + + * code task #43342. + +commit 43ac49410668f893380db85fd835ea6d87aa5039 +Author: 王怡栋 +Date: Mon Oct 25 08:42:13 2021 +0800 + + * fix bug for loophole. + +commit 824afd991bc0b426a2ada1d6eddd638617227374 +Merge: a5434d2cf2 e74f44e852 +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 22 07:37:43 2021 +0000 + + Merge branch 'sprint/168_tianshujie_api' into 'sprint/168' + + * Add test case of bug module. + + See merge request easycorp/zentaopms!134 + +commit aad6d4c76a5c5a33147cf4df31edf9682fcac985 +Merge: 839371a9d4 28a87df599 +Author: 孙广明 +Date: Fri Oct 22 03:14:47 2021 +0000 + + Merge branch 'spirnt/167_liyuchun_15164' into 'sprint/167' + + * Fix bug #15164. + + See merge request easycorp/zentaopms!138 + +commit 28a87df5993bd4ac55ddceef461a93656a62358c +Author: liyuchun +Date: Fri Oct 22 11:11:10 2021 +0800 + + * Fix bug #15164. + +commit 839371a9d40dd032d6bcea5f070e7661173798d4 +Merge: 39a6596687 6cbf8074f2 +Author: 王怡栋 +Date: Fri Oct 22 01:28:18 2021 +0000 + + Merge branch 'sprint/167_sgm_api' into 'sprint/167' + + * Add cases of user. + + See merge request easycorp/zentaopms!97 + +commit 534254a5a3ed448d718856327ea18a7bcf5b07ab +Author: zenggang +Date: Fri Oct 22 01:25:55 2021 +0000 + + * Fix bug#15682 + +commit 39a659668702bbfa45f1810a523b76a88f8db407 +Merge: a24fbb9075 bf6b658810 +Author: 王怡栋 +Date: Fri Oct 22 01:23:33 2021 +0000 + + Merge branch 'sprint/167_hufangzhou_15717' into 'sprint/167' + + * Fix bug #15717. + + See merge request easycorp/zentaopms!133 + +commit e8010e951aee59df93e20f714bde89ffce23fad9 +Author: tianshujie +Date: Fri Oct 22 09:22:54 2021 +0800 + + * Add table of kanban. + +commit a5434d2cf2030f4a3aad90073d64ce0a0c0de523 +Merge: 759ab4c815 760d533ccd +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 22 00:59:58 2021 +0000 + + Merge branch 'sprint/168_tianshujie_15693' into 'sprint/168' + + * Fix bug #15693. + + See merge request easycorp/zentaopms!131 + +commit bf6b6588105a5afa7f4f4b6db324d615e48b2a77 +Author: hufangzhou +Date: Fri Oct 22 08:45:02 2021 +0800 + + * Fix bug #15717. + +commit 760d533ccdd6df4a9b41ec1247cff555ee7de325 +Author: tianshujie +Date: Thu Oct 21 16:55:55 2021 +0800 + + * Fix bug #15693. + +commit 96bf22be3a826afdfb1bbb53223bbb21381fcd61 +Author: 王怡栋 +Date: Thu Oct 21 16:43:37 2021 +0800 + + * finish task #43339. + +commit 5920491ee067f82f304ee1b83c534bd59d679c56 +Author: 王怡栋 +Date: Thu Oct 21 16:22:43 2021 +0800 + + * code for task #43339. + +commit e74f44e85229b5739efdc0d23c524bee64b6c092 +Author: tianshujie +Date: Thu Oct 21 16:04:08 2021 +0800 + + * Add test case of bug module. + +commit 759ab4c815769a00c3fab83f155001c0e0e100ed +Author: zhujinyong +Date: Thu Oct 21 15:18:28 2021 +0800 + + * Rewrite p function. + +commit 784f729a813c510e4531670802c11e6c701f4b6c +Author: 王怡栋 +Date: Thu Oct 21 15:10:40 2021 +0800 + + * code for task #43338. + +commit e8b2344122c4ba928db758550e6e90c7237f2ad1 +Author: liyuchun +Date: Thu Oct 21 13:06:02 2021 +0800 + + * Adjust cases of testcase. + +commit a24fbb90750022c25be5eeb08eb292f5b3e94298 +Merge: 78eb0b7ebc 69743fa3a4 +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 21 00:37:05 2021 +0000 + + Merge branch 'sprint/167_tianshujie_15698' into 'sprint/167' + + * Fix bug #15698. + + See merge request easycorp/zentaopms!129 + +commit 69743fa3a4de50f91db404e16068b8165202ff68 +Author: tianshujie +Date: Thu Oct 21 08:32:55 2021 +0800 + + * Fix bug #15698. + +commit 78eb0b7ebc8cda52f9935c0b508c6eae9465c957 +Merge: c16a7cc2f1 d92c073cb5 +Author: 孙广明 +Date: Wed Oct 20 09:11:48 2021 +0000 + + Merge branch 'sprint/167_liyuchun_15684' into 'sprint/167' + + * Fix bug #15684. + + See merge request easycorp/zentaopms!128 + +commit d92c073cb5b3500ec8e85781ac5a788873fd5eec +Author: liyuchun +Date: Wed Oct 20 17:08:53 2021 +0800 + + * Fix bug #15684. + +commit fe1f206e3d080acc48b92d20761e5143cb842678 +Author: 王怡栋 +Date: Wed Oct 20 17:08:30 2021 +0800 + + * adjust for task #43336. + +commit c16a7cc2f18ea3a033c0b6744ff649c81ba5d9f9 +Merge: 7cd46da726 5eb305f393 +Author: 孙广明 +Date: Wed Oct 20 08:56:36 2021 +0000 + + Merge branch 'sprint/167_liyuchun_15684' into 'sprint/167' + + * Fix bug #15684. + + See merge request easycorp/zentaopms!127 + +commit 5eb305f3937b874fe3fe25fdb9aca1f0e818ac4c +Author: liyuchun +Date: Wed Oct 20 16:40:47 2021 +0800 + + * Fix bug #15684. + +commit 7cd46da72601ddfa5b8986ceac2629a163214a6b +Merge: a3948383f8 fce0f3aafa +Author: 孙广明 +Date: Wed Oct 20 08:07:38 2021 +0000 + + Merge branch 'sprint/167_liyuchun_15592' into 'sprint/167' + + * Fix bug #15592. + + See merge request easycorp/zentaopms!125 + +commit fce0f3aafa6d51e4b05aa56eb461b2c43bd6793a +Author: liyuchun +Date: Wed Oct 20 16:04:44 2021 +0800 + + * Fix bug #15592. + +commit a3948383f8e3d548e936207e7dbc0b3812161b34 (tag: zentaopms_15.7_20211020) +Merge: 28698c9061 3f279a9ec1 +Author: 孙广明 +Date: Wed Oct 20 07:40:43 2021 +0000 + + Merge branch 'sprint/167_api_doc' into 'sprint/167' + + * Fix bug #15674. + + See merge request easycorp/zentaopms!124 + +commit 28698c90619206dc0bc3b01a2e4d68b4a47e7eba +Merge: 53cccbed9f eaaed9cfe6 +Author: 李玉春 <563917701@qq.com> +Date: Wed Oct 20 07:34:30 2021 +0000 + + Merge branch 'sprint/167_tianshujie_15679' into 'sprint/167' + + * Fix bug #15679. + + See merge request easycorp/zentaopms!123 + +commit eaaed9cfe6bce5bc66eaeb77b3b61155c4926f06 +Author: tianshujie +Date: Wed Oct 20 15:32:02 2021 +0800 + + * Fix bug #15679. + +commit 3f279a9ec1161a76838a7e5cc7724a0ddf1df154 +Author: liyuchun +Date: Wed Oct 20 15:00:11 2021 +0800 + + * Fix bug #15674. + +commit 53cccbed9f1a309f63d89f667fe102a85a1cdd5c +Merge: 04d67237b7 e912a03df7 +Author: 朱金勇 +Date: Wed Oct 20 05:59:34 2021 +0000 + + Merge branch 'sprint/167_api_doc' into 'sprint/167' + + fix many subfiled bug + + See merge request easycorp/zentaopms!122 + +commit e912a03df7f4895e158193f450c9ffb74554a828 +Author: hufangzhou +Date: Wed Oct 20 13:50:51 2021 +0800 + + * Fix bug #15673. + +commit 902d24ff14ed57805489c4fc7feb095711410429 +Author: xiawenlong +Date: Wed Oct 20 13:48:18 2021 +0800 + + fix code style + +commit e5cac550f511fe0c3bce1dac889323e6374a5ec6 +Author: xiawenlong +Date: Wed Oct 20 13:39:46 2021 +0800 + + fix many subfield bug. + +commit 16bd74d1bc52d3059144159353c64de091622227 +Author: 王怡栋 +Date: Wed Oct 20 13:25:32 2021 +0800 + + * code for task #43333. + +commit 04d67237b714a8bb55d51b8f2ba9a77161aa24e1 +Author: zhujinyong +Date: Wed Oct 20 11:26:43 2021 +0800 + + * Cannot change account. + +commit 9ca19c49d14a776a4158ccc6c779b5e3f9ca8a20 +Merge: 48e7adeb39 9a7c381540 +Author: zhujinyong +Date: Wed Oct 20 11:23:20 2021 +0800 + + Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 + +commit 48e7adeb39479e69637bea090b1191fd81883ce0 +Author: zhujinyong +Date: Wed Oct 20 11:23:00 2021 +0800 + + * Check gender value. + +commit 2fb6e092189d57a9a9bc8f7bce34df9b9aef97f2 +Author: liyuchun +Date: Wed Oct 20 11:18:10 2021 +0800 + + * Fix bug #15663. + +commit 02f2bd22c6fca90b444e01fb4aee3927a231e96e +Author: hufangzhou +Date: Wed Oct 20 11:07:24 2021 +0800 + + * Fix bug #15669. + +commit 409f2936cbf5a3958da2ed3b2523857501abeb44 +Author: hufangzhou +Date: Wed Oct 20 10:21:38 2021 +0800 + + * Fix bug #15666. + +commit 8024914da1b8a8ce973d62d5e1c8cbb127dcb81e +Author: hufangzhou +Date: Wed Oct 20 09:26:52 2021 +0800 + + * Fix bug #15652. + +commit 9a7c38154074c74374fd99c9c3a188f6ada5ad28 +Merge: f0793bf911 e3fc0a1bf5 +Author: 朱金勇 +Date: Tue Oct 19 13:02:13 2021 +0000 + + Merge branch 'sprint/167_hufangzhou_package1' into 'sprint/167' + + * Adjust the lang file. + + See merge request easycorp/zentaopms!120 + +commit e3fc0a1bf5bde37fccbddb8520204ed25e1f5cd9 +Author: hufangzhou +Date: Tue Oct 19 21:00:11 2021 +0800 + + * Adjust the lang file. + +commit f0793bf9117270dfce2e56b936820250df0391fc +Merge: 2b04f2ba14 50ea48702e +Author: 朱金勇 +Date: Tue Oct 19 12:53:20 2021 +0000 + + Merge branch 'sprint/167_api_doc' into 'sprint/167' + + fix api lib default access control + + See merge request easycorp/zentaopms!119 + +commit 50ea48702ec3ed63d81fd98fceb21d1c46ac2e06 +Author: xiawenlong +Date: Tue Oct 19 20:51:13 2021 +0800 + + fix api lib default access control + +commit 2b04f2ba1450e918b9f2dd440a088d82be46d1ba +Merge: 20c2314588 f02595167f +Author: 朱金勇 +Date: Tue Oct 19 12:42:52 2021 +0000 + + Merge branch 'sprint/167_xiawenlong' into 'sprint/167' + + fix default body type. + + See merge request easycorp/zentaopms!118 + +commit 20c23145884311573e9f09bd358760849d81328d +Merge: 3f5c7fed0f 724588ee19 +Author: zhujinyong +Date: Tue Oct 19 20:41:10 2021 +0800 + + Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 + +commit 3f5c7fed0f978433ac895d21b098a8aa3e593a37 +Merge: d3a6af49b6 235fa53d01 +Author: zhujinyong +Date: Tue Oct 19 20:40:59 2021 +0800 + + Merge branch 'sprint/167_liyuchun_15639' into sprint/167 + +commit 724588ee1934ef4287fb5905c79506f09f8a9739 +Merge: b21e0a29d3 0b7c4c5f1c +Author: 李玉春 <563917701@qq.com> +Date: Tue Oct 19 12:40:58 2021 +0000 + + Merge branch 'sprint/167_tianshujie_15638' into 'sprint/167' + + * Fix bug #15638. + + See merge request easycorp/zentaopms!115 + +commit f02595167f8acceb9918b1e52087febf6266f64d +Author: xiawenlong +Date: Tue Oct 19 20:40:26 2021 +0800 + + fix default body type. + +commit 235fa53d01a601cf005dcd862387a9e3cd7a2a79 +Merge: a2163a67d0 b21e0a29d3 +Author: 朱金勇 +Date: Tue Oct 19 12:40:17 2021 +0000 + + Merge branch 'sprint/167' into 'sprint/167_liyuchun_15639' + + # Conflicts: + # module/api/lang/en.php + +commit a2163a67d0a245343124bba3d0c56706f217ca13 +Author: liyuchun +Date: Tue Oct 19 20:37:36 2021 +0800 + + * Add auth of api. + +commit 9e83958e1c997ffff2548e15d12f37a0034609d0 +Author: liyuchun +Date: Tue Oct 19 20:34:59 2021 +0800 + + * Adjust order of change log. + +commit b32541f20f5c1cc91ae90e9fa61b8255641d40c1 +Author: liyuchun +Date: Tue Oct 19 20:32:06 2021 +0800 + + * Fix bug #15639. + +commit 8c12096a92543e1741e64c48d095c27c8d86b715 +Author: liyuchun +Date: Tue Oct 19 20:23:19 2021 +0800 + + * Fix bug #15639. + +commit 0b7c4c5f1c9b0a39f9ad08731628eb6f3ce7289d +Author: tianshujie +Date: Tue Oct 19 20:18:42 2021 +0800 + + * Fix bug #15638. + +commit b21e0a29d33cdd8118b7db6a2bb14326b2d773e6 +Merge: d3a6af49b6 24795122b8 +Author: 朱金勇 +Date: Tue Oct 19 12:16:42 2021 +0000 + + Merge branch 'sprint/167_hufangzhou_package1' into 'sprint/167' + + * Check the api module for package. + + See merge request easycorp/zentaopms!116 + +commit 24795122b8061e07c819c6fd9fc9e768121014eb +Author: hufangzhou +Date: Tue Oct 19 20:12:57 2021 +0800 + + * Check the api module for package. + +commit adef61538651cad509c383e3b06e31cc517318ca +Author: tianshujie +Date: Tue Oct 19 19:41:05 2021 +0800 + + * Fix bug #15638. + +commit d3a6af49b624bfeceb63370a742958dec994900c +Author: zhujinyong +Date: Tue Oct 19 19:34:42 2021 +0800 + + + Add charset of zentao15.7.sql. + +commit b0ba5cff66e93197f540a95d42e4fe4384b40474 +Merge: 5f40b9b51d d4133f4128 +Author: 朱金勇 +Date: Tue Oct 19 11:32:35 2021 +0000 + + Merge branch 'sprint/167_xiawenlong' into 'sprint/167' + + update sql. + + See merge request easycorp/zentaopms!114 + +commit d4133f41289d4e0e4a393421ba53d1e3fa6e8a7c +Author: xiawenlong +Date: Tue Oct 19 19:29:51 2021 +0800 + + fix sql. + +commit 79b78520a7cac084ae555c583efa063c89eb7499 +Author: xiawenlong +Date: Tue Oct 19 19:28:25 2021 +0800 + + fix sql. + +commit 5f40b9b51d49e08097ef351849d75aaab8495b39 +Merge: f81f49ea5d ef970d5005 +Author: zhujinyong +Date: Tue Oct 19 19:28:11 2021 +0800 + + Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 + +commit f81f49ea5d6681c6c3632cfd2a72325b62c9f31e +Author: zhujinyong +Date: Tue Oct 19 19:27:53 2021 +0800 + + + Add charset of zentao.sql. + +commit ef970d5005b59a7bdf1e0d07f3f17ac509c29397 +Merge: 879066853e a2b3fe0ff1 +Author: 朱金勇 +Date: Tue Oct 19 11:19:28 2021 +0000 + + Merge branch 'spirnt/167_liyuchun_15636' into 'sprint/167' + + * Fix bug #15636. + + See merge request easycorp/zentaopms!113 + +commit a2b3fe0ff176aa8799a709bf5148c72d975f0d83 +Author: liyuchun +Date: Tue Oct 19 19:17:15 2021 +0800 + + * Fix bug #15636. + +commit 879066853e0d5af053a12d058038b8d41d6def78 +Author: zhujinyong +Date: Tue Oct 19 19:17:09 2021 +0800 + + + Add charset of table. + +commit 99fd35321f686a970072b838f4bcbf9c7f43816b +Author: xiawenlong +Date: Tue Oct 19 19:14:24 2021 +0800 + + fix sql. + +commit f17a9bd5f64db316867b7500dc6663ab0035cbca +Merge: d6db6a965b 3bebe533db +Author: zhujinyong +Date: Tue Oct 19 19:10:01 2021 +0800 + + Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 + +commit 3bebe533dbe79c5a3a519f9d36ac0c2746206c53 +Merge: fe9e1ac81e 1251aa587a +Author: 朱金勇 +Date: Tue Oct 19 11:09:40 2021 +0000 + + Merge branch 'sprint/167_xiawenlong' into 'sprint/167' + + fix code style. + + See merge request easycorp/zentaopms!112 + +commit 1251aa587a43eb02aaec5ebd6b8b04474bd0bf84 +Author: xiawenlong +Date: Tue Oct 19 19:09:04 2021 +0800 + + delete debug code. + +commit 20fea2b68c4cc25d8afe8565531d3ceabe21068a +Author: xiawenlong +Date: Tue Oct 19 19:07:20 2021 +0800 + + delete debug code. + +commit 5db2b168decb8cffe0126ee389ceb0732556a23a +Author: xiawenlong +Date: Tue Oct 19 19:04:30 2021 +0800 + + fix code style. + +commit d6db6a965b949a6d6800372c6e71d455946471ce +Merge: 823fd5db59 fe9e1ac81e +Author: zhujinyong +Date: Tue Oct 19 18:57:36 2021 +0800 + + Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 + +commit 823fd5db597a991478b53399472c40d685bd0e24 +Author: zhujinyong +Date: Tue Oct 19 18:57:15 2021 +0800 + + * Format code. + +commit fe9e1ac81e9c09583143fd43eed0772fc32b6d4f +Merge: b913fbb993 1dea8203c0 +Author: liyuchun +Date: Tue Oct 19 18:45:56 2021 +0800 + + Merge branch 'sprint/167_xieqiyu_15615' into sprint/167 + +commit b913fbb993406e25ea9dc15c3d85091978d89c40 +Author: zhujinyong +Date: Tue Oct 19 18:45:01 2021 +0800 + + * Fix location. + +commit 1dea8203c03b975911b755f6a4ce150c1a418cf8 +Merge: 5479e2db3f 1e69e81346 +Author: 李玉春 <563917701@qq.com> +Date: Tue Oct 19 10:44:18 2021 +0000 + + Merge branch 'sprint/167' into 'sprint/167_xieqiyu_15615' + + # Conflicts: + # module/api/view/index.html.php + +commit 5479e2db3fd5fe858ad1581437312486d3e1a2ed +Author: xieqiyu +Date: Tue Oct 19 18:40:55 2021 +0800 + + * Code for bug#15615. + +commit 1e69e81346611aa45fa9967d5ddfe672618fdca9 +Merge: 0959ee3ef2 44d842755e +Author: 李玉春 <563917701@qq.com> +Date: Tue Oct 19 10:29:39 2021 +0000 + + Merge branch 'sprint/167_tianshujie_15620' into 'sprint/167' + + * Fix bug #15620. + + See merge request easycorp/zentaopms!111 + +commit 44d842755e03e68e524acb6d4d614a748b6d8a49 +Author: tianshujie +Date: Tue Oct 19 18:28:53 2021 +0800 + + * Adjust code of api module. + +commit 0959ee3ef2315d33a7c226052a8a3b829b39c539 +Merge: cf2f61ddb3 dd618cf53e +Author: 李玉春 <563917701@qq.com> +Date: Tue Oct 19 10:27:05 2021 +0000 + + Merge branch 'sprint/167_hufangzhou_15637' into 'sprint/167' + + * Fix bug #15637. + + See merge request easycorp/zentaopms!110 + +commit d6a56aaeab728284c6e0ab319e01a41d8b186ef6 +Author: tianshujie +Date: Tue Oct 19 18:25:20 2021 +0800 + + * Adjust code of api module. + +commit 8a1948c48761c41d40d85d9799f3df65416d7305 +Author: tianshujie +Date: Tue Oct 19 18:23:10 2021 +0800 + + * Fix bug #15620. + +commit dd618cf53e37b3738f49037162d883a0dcfffb19 +Author: hufangzhou +Date: Tue Oct 19 18:20:35 2021 +0800 + + * Fix bug #15637. + +commit cf2f61ddb38179df27ffe5a51c9c4329290efa85 +Merge: 7967afd49a a184ef1ce3 +Author: 朱金勇 +Date: Tue Oct 19 10:18:18 2021 +0000 + + Merge branch 'sprint/167_xiawenlong' into 'sprint/167' + + Sprint/167 xiawenlong + + See merge request easycorp/zentaopms!109 + +commit a184ef1ce3e298be9be78780a539ec8fee57d477 +Author: xiawenlong +Date: Tue Oct 19 18:15:24 2021 +0800 + + fix code style. + +commit 7967afd49ab8388b871641c3d9ee96fbb500a325 +Merge: 71c5b684fd 8d08c9cf1a +Author: 李玉春 <563917701@qq.com> +Date: Tue Oct 19 10:14:30 2021 +0000 + + Merge branch 'sprint/167_tianshujie_15634' into 'sprint/167' + + * Fix bug #15634. + + See merge request easycorp/zentaopms!108 + +commit b70e00dbad3ade8c9a801ae1812f2322048ef064 +Author: xieqiyu +Date: Tue Oct 19 18:14:27 2021 +0800 + + * Adjust code style. + +commit 8d08c9cf1ab8eb9e5097876ca1232647740c8c01 +Author: tianshujie +Date: Tue Oct 19 18:12:08 2021 +0800 + + * Fix bug #15634. + +commit e872c187cf4398c942e2530f6e7523a7b110636d +Author: xiawenlong +Date: Tue Oct 19 18:09:48 2021 +0800 + + fix group en language. + +commit cfaea6c602a95eff5a17bea4930ce08bf27eec07 +Author: xieqiyu +Date: Tue Oct 19 17:59:36 2021 +0800 + + * Fix bug#15615. + +commit 2f28bb8c85a745cc70ed367d457e25114f7051b5 +Author: xiawenlong +Date: Tue Oct 19 17:49:39 2021 +0800 + + fix all level 1 and 3 bugs. + +commit 71c5b684fdfb67dbe413edb5b1845b9c7a659367 +Merge: 579763d5f8 c576e60197 +Author: 李玉春 <563917701@qq.com> +Date: Tue Oct 19 09:47:02 2021 +0000 + + Merge branch 'sprint/167_hufangzhou_compatible' into 'sprint/167' + + * Compatible with pro version in mobile. + + See merge request easycorp/zentaopms!104 + +commit 579763d5f82c323a2ccdcfc20297a49173fd470d +Merge: 46b0477852 d3a9f0fb73 +Author: 李玉春 <563917701@qq.com> +Date: Tue Oct 19 09:44:29 2021 +0000 + + Merge branch 'sprint/167_sgm_fixbug' into 'sprint/167' + + * Fix bug #15635. + + See merge request easycorp/zentaopms!105 + +commit d3a9f0fb73dab36907c7f61304dc26fae7c7b965 +Author: 孙广明 +Date: Tue Oct 19 17:42:53 2021 +0800 + + * Fix bug #15635. + +commit 46b047785284c42c6e57779fc39a80a2e0997cd6 +Merge: 9ed05281f1 fe063ce0b9 +Author: 朱金勇 +Date: Tue Oct 19 09:37:43 2021 +0000 + + Merge branch 'sprint/167_xieqiyu_15628' into 'sprint/167' + + * Fix bug#15628. + + See merge request easycorp/zentaopms!103 + +commit c576e60197dc111b0f026662bfaf15f0387278e2 +Author: hufangzhou +Date: Tue Oct 19 17:36:13 2021 +0800 + + * Compatible with pro version in mobile. + +commit fe063ce0b9d905419e8b3b70c2368c6fbe34583e +Author: xieqiyu +Date: Tue Oct 19 17:34:15 2021 +0800 + + * Fix bug#15628. + +commit 9ed05281f14869af06deb322b51044120a623f99 +Merge: 06a91b0175 6eefec7f8c +Author: 孙广明 +Date: Tue Oct 19 09:32:25 2021 +0000 + + Merge branch 'spirnt/167_liyuchun_15613' into 'sprint/167' + + * Fix bug #15585. + + See merge request easycorp/zentaopms!102 + +commit 6eefec7f8c34c4ae71852477f4c7f765a30fbdef +Author: liyuchun +Date: Tue Oct 19 17:20:31 2021 +0800 + + * Fix bug #15585. + +commit 06a91b017565fb418b5e4aaa6e0f2cf677f28fee +Merge: 3653106d27 51277c5580 +Author: 朱金勇 +Date: Tue Oct 19 09:15:14 2021 +0000 + + Merge branch 'sprint/167_xieqiyu_15614' into 'sprint/167' + + * Fix bug#15614. + + See merge request easycorp/zentaopms!101 + +commit 3653106d27b5e86eaed16744983116b4a0cf08e6 +Author: zhujinyong +Date: Tue Oct 19 17:14:30 2021 +0800 + + + Add action name of api. + +commit 51277c558065299ca8ff0d5b42f02e79cf839302 +Author: xieqiyu +Date: Tue Oct 19 17:11:11 2021 +0800 + + * Fix bug#15614. + +commit 6e507855894fae29453c963e1fddb6588d625356 +Merge: 17cf1b620a b68ad1f9a9 +Author: zhujinyong +Date: Tue Oct 19 16:54:44 2021 +0800 + + Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 + +commit 17cf1b620af523ef41cecd104c78fbad925e30af +Author: zhujinyong +Date: Tue Oct 19 16:53:55 2021 +0800 + + * Fix bug#15586. + +commit b68ad1f9a991ddf2b0dd625a1fd9d594559dc807 +Merge: 8f7c0e6f47 e2a25fb6f8 +Author: 孙广明 +Date: Tue Oct 19 08:49:34 2021 +0000 + + Merge branch 'sprint/167_sunhao/picker' into 'sprint/167' + + * Improve UI for picker, clear search keys when select option by Enter key in multiple mode. + + See merge request easycorp/zentaopms!100 + +commit e2a25fb6f80c5622102cd7492611df89502048da +Author: Hao Sun +Date: Tue Oct 19 16:44:40 2021 +0800 + + * Improve UI for picker, clear search keys when select option by Enter key in multiple mode. + +commit 8f7c0e6f479dcb272010c06000d2f7aedbbefa90 +Author: zhujinyong +Date: Tue Oct 19 16:24:10 2021 +0800 + + * Merge manually. + +commit 62b2b79a245280bac3184483b20f44b038069adf +Merge: 8bba71d6bb e770ce54d1 +Author: zhujinyong +Date: Tue Oct 19 16:20:47 2021 +0800 + + Merge branch 'sprint/167_xiawenlong_api' into sprint/167 + +commit e770ce54d1c0b8324153da86a0a7a4690b705a07 +Merge: b849261155 8bba71d6bb +Author: 朱金勇 +Date: Tue Oct 19 08:18:16 2021 +0000 + + Merge branch 'sprint/167' into 'sprint/167_xiawenlong_api' + + # Conflicts: + # module/api/view/editlib.html.php + +commit 8bba71d6bb499012cdd1b4341464dde422dc82fc +Author: zhujinyong +Date: Tue Oct 19 16:14:51 2021 +0800 + + * Fix get method of user api. + +commit b849261155c5d3a882be2d27532ea4155d0006f8 +Author: xiawenlong +Date: Tue Oct 19 16:03:02 2021 +0800 + + fix bugs. + +commit fc2e75eeb8da39bb5e19ed32112405b0a1a14a2a +Author: zhujinyong +Date: Tue Oct 19 15:59:07 2021 +0800 + + * Fix languages. + +commit b8c1cf99e6f8834ab57af7c666073ef89458aa3d +Merge: c6b2921dc0 350285bbd0 +Author: 孙广明 +Date: Tue Oct 19 07:49:52 2021 +0000 + + Merge branch 'sprint/167_liyuchun_api' into 'sprint/167' + + Add cases of testcase. + + See merge request easycorp/zentaopms!96 + +commit 6cbf8074f28bd7e8db419e64ea470db7f21e75b6 +Author: 孙广明 +Date: Tue Oct 19 15:46:57 2021 +0800 + + * Add cases of user. + +commit 350285bbd0438d80c466faad4346cafeacfa3db4 +Author: liyuchun +Date: Tue Oct 19 15:36:01 2021 +0800 + + * Adjust cases of testcase. + +commit c6b2921dc0fda0bc09a9519065074f11a56b53cf +Merge: e75d061537 0ea60016a7 +Author: 朱金勇 +Date: Tue Oct 19 07:14:48 2021 +0000 + + Merge branch 'sprint/167_xiawenlong_api' into 'sprint/167' + + Sprint/167 xiawenlong api + + See merge request easycorp/zentaopms!95 + +commit 0ea60016a7f8cf447393f94cd4383d0917139551 +Author: xiawenlong +Date: Tue Oct 19 15:09:13 2021 +0800 + + add permission. + +commit 82fbee89e344a18fedc2ea325611c46454b1592a +Author: 王怡栋 +Date: Tue Oct 19 15:09:10 2021 +0800 + + * add project api test. + +commit a2afa498450d74f848b0cf7ce419eb1c2f14d9a5 +Author: liyuchun +Date: Tue Oct 19 15:06:01 2021 +0800 + + * Add cases of testcase. + +commit e75d061537604d40d8671782cbb00b2073203074 +Merge: 7155161701 779aff3efb +Author: 王怡栋 +Date: Tue Oct 19 06:56:36 2021 +0000 + + Merge branch 'sprint/167_hufangzhou_package1' into 'sprint/167' + + * Add the privilege in changelog. + + See merge request easycorp/zentaopms!94 + +commit 779aff3efb81f1a85beaf61ebf69eeb24c81d902 +Author: hufangzhou +Date: Tue Oct 19 14:54:44 2021 +0800 + + * Add the privilege in changelog. + +commit 7f733c3ad3fd098a034609e3d7da3ab5c1b5881a +Author: xiawenlong +Date: Tue Oct 19 14:48:08 2021 +0800 + + fix language fie. + +commit 7155161701f252dd55bdc291267ecdc548143660 +Merge: 2f123ce5ab c7e3f11892 +Author: 孙广明 +Date: Tue Oct 19 06:44:48 2021 +0000 + + Merge branch 'sprint/167_liyuchun_15541' into 'sprint/167' + + * Fix bug #15541. + + See merge request easycorp/zentaopms!83 + +commit 2f123ce5ab34a518b91afec1b9452b937ed55dcb +Merge: 3b1d8b46a1 4c6d8f5a99 +Author: 孙广明 +Date: Tue Oct 19 06:42:33 2021 +0000 + + Merge branch 'sprint/167_zenggang_15548' into 'sprint/167' + + * Fix bug#15548 + + See merge request easycorp/zentaopms!92 + +commit 3b1d8b46a19fcffc388456fe774f841cd8beaf1b +Merge: 75c34e7e46 bf96595c5d +Author: 王怡栋 +Date: Tue Oct 19 06:21:43 2021 +0000 + + Merge branch 'sprint/167_hufangzhou_package1' into 'sprint/167' + + * Fix an error for upgrade sql. + + See merge request easycorp/zentaopms!91 + +commit bf96595c5d20a23f92323bfc071f727000c4052c +Author: hufangzhou +Date: Tue Oct 19 14:20:49 2021 +0800 + + * Fix an error for install sql. + +commit 328075c4196100b436cb03f198305b52ec4f9ff3 +Author: hufangzhou +Date: Tue Oct 19 14:15:27 2021 +0800 + + * Fix an error for upgrade sql. + +commit 75c34e7e46f2c112c94ea184a17eeeb378cdabe7 +Merge: 68e738fdd7 e5d8340402 +Author: 王怡栋 +Date: Tue Oct 19 05:50:50 2021 +0000 + + Merge branch 'sprint/167_hufangzhou_package1' into 'sprint/167' + + * Add the upgrade sql in upgrade module. + + See merge request easycorp/zentaopms!90 + +commit e5d834040257e8aef2630fb66ef1a5997d8332a7 +Author: hufangzhou +Date: Tue Oct 19 13:48:28 2021 +0800 + + * Add the upgrade sql in upgrade module. + +commit 68e738fdd79439a1da395593dcefa4338621479e +Author: zhujinyong +Date: Tue Oct 19 13:21:22 2021 +0800 + + * Reformat code style. + +commit 64af527b27c662f0d01f29ca2082b9a30db2f9f7 +Author: zhujinyong +Date: Tue Oct 19 12:11:43 2021 +0800 + + * Adjust code for api. + +commit 4c6d8f5a99807202d05bd0fb78adea542d71b242 +Author: zenggang +Date: Tue Oct 19 04:04:01 2021 +0000 + + * Fix bug#15548 + +commit a11155b1db4aadc650bffc8d25f7362f66d40cbe +Merge: 6ee64dffe7 eea0631507 +Author: 李玉春 <563917701@qq.com> +Date: Tue Oct 19 03:56:56 2021 +0000 + + Merge branch 'sprint/167_sgm_apitest' into 'sprint/167' + + * Add insert user test. + + See merge request easycorp/zentaopms!89 + +commit 6ee64dffe7189eb13aa431bb2c18e846b934ddf8 +Merge: 57fcb19976 4bb27b624e +Author: 王怡栋 +Date: Tue Oct 19 11:36:19 2021 +0800 + + Merge branch 'api_doc' into sprint/167 + +commit eea06315071a87a667ab6238f73080a90b7306be +Author: 孙广明 +Date: Tue Oct 19 11:03:44 2021 +0800 + + * Add insert user test. + +commit 4bb27b624ea9bd18af94f0afece01e9fcbd02a64 +Author: zhujinyong +Date: Tue Oct 19 11:00:55 2021 +0800 + + * Adjust code for Api doc. + +commit 57fcb19976eaf1c1c38d1820f72b0ce4c0169a2c +Merge: 310190aeb9 27086797f3 +Author: 王怡栋 +Date: Tue Oct 19 01:46:51 2021 +0000 + + Merge branch 'sprint/167_sgm_apitest' into 'sprint/167' + + * Fix story bug and add user test. + + See merge request easycorp/zentaopms!88 + +commit 27086797f3a7cdc584c323f73364eb604b4a801b +Author: 孙广明 +Date: Tue Oct 19 08:54:24 2021 +0800 + + * Fix story bug and add user test. + +commit 310190aeb968a8c7560de851fc06e8a2c0cb88f4 +Merge: 68c2d64f67 d506cba4a5 +Author: 李玉春 <563917701@qq.com> +Date: Mon Oct 18 09:32:25 2021 +0000 + + Merge branch 'sprint/167_mayue_15506' into 'sprint/167' + + Sprint/167 mayue 15506 + + See merge request easycorp/zentaopms!87 + +commit d506cba4a5b37d9e4591a174daa40ff135b5388c +Author: mayue +Date: Mon Oct 18 17:17:13 2021 +0800 + + *Fix bug #15506. + +commit e667a33996a23673e116b9a5faeaac47c52a9dc6 +Author: xiawenlong +Date: Mon Oct 18 17:14:18 2021 +0800 + + fix English language. + +commit 1bfd0b0b6206051b9fa09d63f3fd00357e243c53 +Author: mayue +Date: Mon Oct 18 16:55:50 2021 +0800 + + * Fix bug #15506. + +commit d7166c8bc18207e5a9b8938e4c701fbc8115495c +Author: xiawenlong +Date: Mon Oct 18 16:46:08 2021 +0800 + + fix code style. + +commit 90a357a9804515b94bfaf195ed638da9280096eb +Author: xiawenlong +Date: Mon Oct 18 16:42:38 2021 +0800 + + finish api release manage. + +commit 68c2d64f6796f4049e7e6efc10f65cc51f07aad5 +Merge: 7f1f5c8993 e9b614a72b +Author: 李玉春 <563917701@qq.com> +Date: Mon Oct 18 08:39:46 2021 +0000 + + Merge branch 'sprint/167_xieqiyu_15561' into 'sprint/167' + + * Fix bug#15561. + + See merge request easycorp/zentaopms!86 + +commit e9b614a72b9d73e2565420485fd90c916d93b179 +Author: xieqiyu +Date: Mon Oct 18 16:37:36 2021 +0800 + + * Fix bug#15561. + +commit 7f1f5c8993d78c1df2ed23806d8d76c12563ab33 +Merge: 352ec4d0b4 cf3654bd0d +Author: 王怡栋 +Date: Mon Oct 18 08:35:14 2021 +0000 + + Merge branch 'sprint/167_hufangzhou_15557' into 'sprint/167' + + * Fix bug #15557. + + See merge request easycorp/zentaopms!85 + +commit cf3654bd0daa7802ea4d13c7a0ddff853276bc99 +Author: hufangzhou +Date: Mon Oct 18 16:34:33 2021 +0800 + + * Modify the variable name. + +commit 20fbf2436cd8db4b8728abaad75edf7483db1485 +Author: hufangzhou +Date: Mon Oct 18 16:32:31 2021 +0800 + + * Modify the variable name. + +commit 5691e3963303280795fb71e16e68002d37d719f0 +Author: hufangzhou +Date: Mon Oct 18 16:27:36 2021 +0800 + + * Fix bug #15557. + +commit e1bed5bc55155dc136c9288a92cb64432f40f8a0 +Author: xiawenlong +Date: Mon Oct 18 16:13:46 2021 +0800 + + finish api release. + +commit 352ec4d0b4e5362fbf2bfc5980ab2d91694e98e3 +Merge: 775f9942d2 d8ac3d1950 +Author: 王怡栋 +Date: Mon Oct 18 16:04:22 2021 +0800 + + Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 + +commit 775f9942d2ff14c60220660ceadc9cab662c52e7 +Author: 王怡栋 +Date: Mon Oct 18 16:03:42 2021 +0800 + + * fix bug #15553. + +commit d8ac3d195050458ce254fcf0cd1e3848721fe640 +Merge: 7dae5e88f5 c4824ba3d7 +Author: 王怡栋 +Date: Mon Oct 18 05:14:44 2021 +0000 + + Merge branch 'sprint/167_hufangzhou_package' into 'sprint/167' + + * Check the code for upgrade. + + See merge request easycorp/zentaopms!84 + +commit c4824ba3d71134dfb79c139ce1fcb532a01efc44 +Author: hufangzhou +Date: Mon Oct 18 13:11:07 2021 +0800 + + * Check the code for upgrade. + +commit c7e3f118927c5dfdab8bec23de24bbdeee5e2dd1 +Author: liyuchun +Date: Mon Oct 18 11:27:01 2021 +0800 + + * Fix bug #15541. + +commit 7dae5e88f5a8d63656daaeeb0dfcf77af03228dd +Merge: 66b80ac558 672598aada +Author: 孙广明 +Date: Mon Oct 18 02:58:03 2021 +0000 + + Merge branch 'sprint/167_liyuchun_15541' into 'sprint/167' + + * Fix bug #15541. + + See merge request easycorp/zentaopms!82 + +commit 672598aadaa8bd637d8dbb2d54ccaae98bf3941a +Author: liyuchun +Date: Mon Oct 18 10:39:15 2021 +0800 + + * Fix bug #15541. + +commit 66b80ac558874f988d21d3a4a72fdf33972bc24a +Merge: 8ca427b1c7 fac2119507 +Author: 孙广明 +Date: Mon Oct 18 02:32:29 2021 +0000 + + Merge branch 'sprint/167_liyuchun_15541' into 'sprint/167' + + Sprint/167 liyuchun 15541 + + See merge request easycorp/zentaopms!81 + +commit fac211950730e3f5bc844db16ebaee210a1cb014 +Author: liyuchun +Date: Mon Oct 18 10:28:47 2021 +0800 + + * Fix bug #15541. + +commit 8ca427b1c77d7856dbcbe7ac2c345963ff31a37b +Merge: e5dc2e2f59 06f6d31579 +Author: 王怡栋 +Date: Mon Oct 18 10:26:28 2021 +0800 + + Merge branch 'sprint/167_wangyidong' into sprint/167 + +commit 06f6d3157967cfbfc6d9c4e3bf28da15dca5d49e +Author: 王怡栋 +Date: Mon Oct 18 10:24:28 2021 +0800 + + * add my bug data for api. + +commit c8fe1f5e14e192a21090a29a96402953059ea823 +Author: liyuchun +Date: Mon Oct 18 10:21:08 2021 +0800 + + * Fix bug #15541. + +commit e5dc2e2f59edd2628eefed30cd7af7613c61aa6c +Merge: 621eecf52c abc5c4a302 +Author: 王怡栋 +Date: Mon Oct 18 10:20:31 2021 +0800 + + Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 + +commit 621eecf52ca4d45e239ce4900430902acbe64978 +Author: 王怡栋 +Date: Mon Oct 18 10:18:40 2021 +0800 + + * adjust for execution action list. + +commit abc5c4a302bc1a5feb815ccc337a637beade1bf9 +Author: zhujinyong +Date: Mon Oct 18 09:20:56 2021 +0800 + + * Fix code error. + +commit 375b74b9d664a5a07b53994de137ccbca1de1e03 +Author: 王怡栋 +Date: Mon Oct 18 09:20:10 2021 +0800 + + * adjust for api. + +commit 7ec9315a9b3d3dbcd292f40cce56ace23f972c76 +Merge: 4fe24e06a5 1ee2b61d95 +Author: zhujinyong +Date: Mon Oct 18 09:18:48 2021 +0800 + + Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 + +commit 4fe24e06a52c2a41602b0c3a148433280dfbd537 +Author: zhujinyong +Date: Mon Oct 18 09:18:19 2021 +0800 + + + Add test for api. + +commit 1ee2b61d9535c14b758d6fc27c51154ea85ad1d8 +Merge: 72c92b6b0d 3e8e0dbcce +Author: 李玉春 <563917701@qq.com> +Date: Mon Oct 18 01:17:58 2021 +0000 + + Merge branch 'sprint/167_xieqiyu_15457' into 'sprint/167' + + * Fix bug#15457. + + See merge request easycorp/zentaopms!78 + +commit e3291b0e2a7edf6f96bb435bee563d35a3c551fd +Author: liyuchun +Date: Mon Oct 18 09:07:11 2021 +0800 + + * Fix bug #15541. + +commit 72c92b6b0d4c1029bec9a7f99e23d1211fe86574 +Author: 王怡栋 +Date: Mon Oct 18 09:06:48 2021 +0800 + + * fix error. + +commit 5e0ac98809f5b974d99441e0f126eb24144244ac +Merge: 351b07352b 68cd0eb2f9 +Author: 王怡栋 +Date: Mon Oct 18 08:53:30 2021 +0800 + + Merge branch 'sprint/167_wangyidong' into sprint/167 + +commit 351b07352bf28c53f686a32a2212b7fede79f707 +Merge: 2864a8301c 21ad4ecf0a +Author: 王怡栋 +Date: Mon Oct 18 08:53:13 2021 +0800 + + Merge branch '15.6' into sprint/167 + +commit 68cd0eb2f97c42e0d33d94d3f58c9eb59f45cbce +Merge: d4c32965e2 21ad4ecf0a +Author: 王怡栋 +Date: Mon Oct 18 08:44:13 2021 +0800 + + Merge branch '15.6' into sprint/167_wangyidong + +commit 3e8e0dbcce9eee6ddb6220df1253d7e54d5f9378 +Author: xieqiyu +Date: Sat Oct 16 15:32:13 2021 +0800 + + * Fix bug#15457. + +commit 21ad4ecf0a6b17f41786af10a22dfd0c1434d570 +Author: xieqiyu +Date: Sat Oct 16 08:27:28 2021 +0800 + + * Code for bug#15543.Modify the consumed hours of the project in the block. + +commit d4c32965e2f7c70bae5087566c8c4a3c6e93a7b6 +Author: 王怡栋 +Date: Fri Oct 15 17:20:51 2021 +0800 + + * adjust for zui. + +commit 2864a8301c4b3f24b15d823ef920a668a9ab6343 +Merge: 88323d34da 1fbf34f9bc +Author: 朱金勇 +Date: Fri Oct 15 09:03:35 2021 +0000 + + Merge branch 'sprint/167_sunhao/task43181' into 'sprint/167' + + * Task #43181, bug #15371, fix nest toggle in program table not work when... + + See merge request easycorp/zentaopms!77 + +commit 1fbf34f9bcc3e3a8b612963915d68672e717a55b +Author: Hao Sun +Date: Fri Oct 15 15:31:30 2021 +0800 + + * Task #43181, bug #15371, fix nest toggle in program table not work when close program dialog first time. + +commit 5cd2f5d2dbfe9dd5db370619e2ab3d115805bc82 +Author: xieqiyu +Date: Fri Oct 15 14:45:01 2021 +0800 + + * Code for bug#15543. + +commit 88323d34da269ce2d5fb61356254e020d78c486d +Merge: e6e578a798 dc8317d122 +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 15 06:19:33 2021 +0000 + + Merge branch 'sprint/167_hufangzhou_15544' into 'sprint/167' + + * Fix bug #15544. + + See merge request easycorp/zentaopms!76 + +commit e6e578a7986094a0c6ab5aab0e2146f990eb6c67 +Merge: d27aaff476 4c800f938a +Author: 孙广明 +Date: Fri Oct 15 06:18:16 2021 +0000 + + Merge branch 'sprint/167_zenggang_15438' into 'sprint/167' + + Sprint/167 zenggang 15438 + + See merge request easycorp/zentaopms!75 + +commit d27aaff476221f3b9de28eab8cb39c28ee45f046 +Merge: 1ac68a832d ae5003bde1 +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 15 06:17:55 2021 +0000 + + Merge branch 'sprint/167_tianshujie_15541' into 'sprint/167' + + *Fix bug #15541. + + See merge request easycorp/zentaopms!74 + +commit 1ac68a832d983333c0e8fb733c483a8567030f24 +Merge: 733d12bab4 d8327a0cdc +Author: 朱金勇 +Date: Fri Oct 15 06:17:06 2021 +0000 + + Merge branch 'sprint/167_sunhao/task43195' into 'sprint/167' + + * Task #43195, fix project creating guide modal not show as expected sometimes. + + See merge request easycorp/zentaopms!73 + +commit 5697ba482a99bcfce479ecfd578b88a38c4d9009 +Author: xieqiyu +Date: Fri Oct 15 14:13:41 2021 +0800 + + * Fix bug#15543. + +commit dc8317d122847fe301aadccfd40566c198731232 +Author: hufangzhou +Date: Fri Oct 15 14:11:42 2021 +0800 + + * Fix bug #15544. + +commit 4c800f938aac31a449eaf4eeb6a4c4fe0f79e66a +Author: zenggang +Date: Fri Oct 15 06:09:32 2021 +0000 + + * Adjust code + +commit ae5003bde1acedbcc9d29089a21d62caf598fdfb +Author: tianshujie +Date: Fri Oct 15 13:57:42 2021 +0800 + + * Fix bug #15541. + +commit d9ffc89d5ecd33c6025a8ec1712f6409c7d09420 +Author: tianshujie +Date: Fri Oct 15 13:57:27 2021 +0800 + + * Fix bug #15541. + +commit 733d12bab47a23c831ade77455d528e59be1b39c +Merge: 8ee2811723 b12524d17b +Author: 朱金勇 +Date: Fri Oct 15 05:57:04 2021 +0000 + + Merge branch 'sprint/167_sunhao/task43183' into 'sprint/167' + + * Task #43183, bug #15163, make tutorial tooltip visible in small screen. + + See merge request easycorp/zentaopms!72 + +commit 3989c71b3fe2418ed644476e9ddbc57ed72c6b38 +Author: 王怡栋 +Date: Fri Oct 15 13:38:05 2021 +0800 + + * fix for large size session. + +commit 8ee2811723a338dee266c3210e08d8572e517afc +Merge: fae6d95bfe 8e38b12360 +Author: 王怡栋 +Date: Fri Oct 15 13:11:52 2021 +0800 + + Merge branch '15.6' into sprint/167 + +commit d8327a0cdc40d8bb03f21a665f7929bc37f3070b +Author: Hao Sun +Date: Fri Oct 15 11:18:30 2021 +0800 + + * Task #43195, fix project creating guide modal not show as expected sometimes. + +commit b12524d17b1dde05492c2733010f301419d14bfd +Author: Hao Sun +Date: Fri Oct 15 10:35:52 2021 +0800 + + * task #43183, bug #15163, make tutorial tooltip visible in small screen. + +commit fae6d95bfeeccc1b2a0ba77f3a15cc229ee91510 +Merge: 83f19c2b65 4d8095c106 +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 15 01:32:39 2021 +0000 + + Merge branch 'sprint/167_tianshujie_43169' into 'sprint/167' + + *Finish task #43169 + + See merge request easycorp/zentaopms!71 + +commit 83f19c2b65b9665f21cb630d0104fc35989d76ec +Merge: e50c3c65d9 f0bd7efdef +Author: 李玉春 <563917701@qq.com> +Date: Fri Oct 15 01:31:16 2021 +0000 + + Merge branch 'sprint/167_tianshujie_43190' into 'sprint/167' + + * Finish task #43190. + + See merge request easycorp/zentaopms!69 + +commit 4d8095c106e1f3c3d6b6100ba1b069efe9d54baa +Author: tianshujie +Date: Fri Oct 15 09:28:50 2021 +0800 + + * Finish task #43169. + +commit e50c3c65d9d52cd6aa26c6121d6641c4eda22539 +Merge: 22dab31b5f de37a33ed5 +Author: 朱金勇 +Date: Fri Oct 15 01:05:33 2021 +0000 + + Merge branch 'sprint/167_zenggang_43179' into 'sprint/167' + + * Finish task#43179 + + See merge request easycorp/zentaopms!49 + +commit 8e38b123601e30714264541516dd15a3f21e4a3c +Author: xieqiyu +Date: Fri Oct 15 08:06:44 2021 +0800 + + * Code for bug#14879. + +commit cae0dba0700283b63965519d4fd1e9d19d425d64 +Author: zenggang +Date: Thu Oct 14 09:32:03 2021 +0000 + + * Fix bug15438 for classic mode + +commit 943bb6be594d4629be9e7b7f6b56451581e18cc5 +Merge: 1f7e26303a 22dab31b5f +Author: tianshujie +Date: Thu Oct 14 17:16:34 2021 +0800 + + Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into 167 + +commit 22dab31b5f65f86431a8343b83c184e6191039b7 +Merge: b3cfb77e0b 03df63c20c +Author: zhujinyong +Date: Thu Oct 14 17:10:32 2021 +0800 + + Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 + +commit b3cfb77e0b2bb2ac1c2f71f67f9eae3e294fb51e +Author: zhujinyong +Date: Thu Oct 14 17:10:11 2021 +0800 + + + Add api test. + +commit f0bd7efdefb9dacf20dc4e5685db5e65620faaa6 +Author: tianshujie +Date: Thu Oct 14 16:42:04 2021 +0800 + + * Finish task #43190. + +commit 1f7e26303a6ccd5c09ba8dd53aaaa8338b428afa +Author: tianshujie +Date: Thu Oct 14 16:38:11 2021 +0800 + + * Adjust css. + +commit 03df63c20cf7e642acc86c075682887dc86410ae +Merge: a44472fb45 140f2f88c8 +Author: 王怡栋 +Date: Thu Oct 14 16:21:40 2021 +0800 + + Merge branch '15.6' into sprint/167 + +commit 140f2f88c87fb85fe844920aeaa458d6614efb25 +Author: xieqiyu +Date: Thu Oct 14 16:17:01 2021 +0800 + + * Fix bug#15524. + +commit 0541e5a87ccd623a924716da5593cafcb7a42134 +Author: hufangzhou +Date: Thu Oct 14 16:01:31 2021 +0800 + + * Code for bug #15518. + +commit 4f9086045a91bfb94871fe4b6e659b4eb2faabb1 +Author: xiawenlong +Date: Thu Oct 14 15:57:38 2021 +0800 + + finish api release. + +commit a44472fb452c34ce7ca4ad57619328b1602b6064 +Merge: 5861134df5 e6640c6f2c +Author: 王怡栋 +Date: Thu Oct 14 15:48:14 2021 +0800 + + Merge branch '15.6' into sprint/167 + +commit e6640c6f2c24684ccad524802848ecb9eaf7f14e +Merge: ac5781d88f b7da8b63b3 +Author: hufangzhou +Date: Thu Oct 14 15:46:54 2021 +0800 + + Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6 + +commit ac5781d88f20a957faa5cde4cdde456e1a589cbf +Author: hufangzhou +Date: Thu Oct 14 15:46:50 2021 +0800 + + * Fix bug #15528. + +commit b7da8b63b379c30bd6c79bf6b1bc45697afb08d3 +Author: xieqiyu +Date: Thu Oct 14 15:32:06 2021 +0800 + + * Code for bug#15513. + +commit 5861134df5b08beaba6c167f295bbdc36d489169 +Merge: 5b6e4a771e 2b2132d5e0 +Author: 王怡栋 +Date: Thu Oct 14 07:15:48 2021 +0000 + + Merge branch 'sprint/sgm_fix_bug' into 'sprint/167' + + * Fix story review bug. + + See merge request easycorp/zentaopms!68 + +commit 91f8db484cc7db138ce5227e59fd6e6a51befe2e +Author: tianshujie +Date: Thu Oct 14 15:09:20 2021 +0800 + + * Fix bug #15511. + +commit 2b2132d5e06290b7c184f5d1f43c2d14b26bfd6c +Author: 孙广明 +Date: Thu Oct 14 14:56:48 2021 +0800 + + * Fix story review bug. + +commit 92462e266ac074fab16e867f13115d47e2473116 +Author: xieqiyu +Date: Thu Oct 14 14:46:35 2021 +0800 + + * Code for bug#15518. + +commit 5b6e4a771e782ada5a23905b66b0ba8b352602cd +Merge: 148b2e5612 8e95a7f98d +Author: 孙广明 +Date: Thu Oct 14 06:37:45 2021 +0000 + + Merge branch 'sprint/167_zenggang_15466' into 'sprint/167' + + * Fix bug#15466 + + See merge request easycorp/zentaopms!67 + +commit 11f7e9cfb768872fc71f03c7e5462817f2cddd59 +Merge: 3363c1adbf 5c867b2c96 +Author: hufangzhou +Date: Thu Oct 14 14:28:55 2021 +0800 + + Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6 + +commit 3363c1adbf00357fc77043c50ccdb640694727c7 +Author: hufangzhou +Date: Thu Oct 14 14:28:49 2021 +0800 + + * Code for bug #15518. + +commit 8e95a7f98d8f35930128be7e630b9e9a3ce524b9 +Author: zenggang +Date: Thu Oct 14 06:25:19 2021 +0000 + + * Fix bug#15466 + +commit 5c867b2c96f8ef71846b81ae178965aaea802210 +Author: tianshujie +Date: Thu Oct 14 14:11:14 2021 +0800 + + * Fix bug #15525. + +commit 148b2e5612ba00fa9c15b27ceb85946eb8c389fb +Merge: d215a06448 cfdce3652f +Author: 孙广明 +Date: Thu Oct 14 06:03:12 2021 +0000 + + Merge branch 'sprint/167_liyuchun_43187' into 'sprint/167' + + Finish task #43187. + + See merge request easycorp/zentaopms!66 + +commit d215a0644858245dfdd5b6663c3b7fa2f6fb127d +Merge: 8e1161b02c 63248e8f8f +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 14 05:53:17 2021 +0000 + + Merge branch 'sprint/167_xieqiyu_43168' into 'sprint/167' + + * Code for task#43168. + + See merge request easycorp/zentaopms!65 + +commit 07fbc65dfd37377cd9cb38afbd705c1bfaf88250 +Merge: 52e49919d2 ab662e5cf4 +Author: hufangzhou +Date: Thu Oct 14 13:52:05 2021 +0800 + + Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6 + +commit 52e49919d2a15a2f1b63a58889467e5b997bee18 +Author: hufangzhou +Date: Thu Oct 14 13:51:59 2021 +0800 + + * Code for bug #15518. + +commit cfdce3652fbfb9d4e40a2046c4615becab38ba97 +Author: liyuchun +Date: Thu Oct 14 13:51:47 2021 +0800 + + * Finish task #43187. + +commit 63248e8f8fa58faeb93f85654ff5f7c71d32e8e1 +Author: xieqiyu +Date: Thu Oct 14 13:47:13 2021 +0800 + + * Code for task#43168. + +commit ab662e5cf4f253a0bd8279102b845650f7cc29c7 +Author: tianshujie +Date: Thu Oct 14 13:31:08 2021 +0800 + + * Fix bug #15511. + +commit 77f7f7407f0c7e6a01eb2e741eeffd0879566283 +Author: tianshujie +Date: Thu Oct 14 13:16:40 2021 +0800 + + * Fix bug #15522. + +commit 8e1161b02cb0e51a810ffd248d12c26b694b3c67 +Merge: ad21350632 f5e1ceb880 +Author: 李玉春 <563917701@qq.com> +Date: Thu Oct 14 05:05:12 2021 +0000 + + Merge branch 'sprint/167_tianshujie_43169' into 'sprint/167' + + * Finish task #43169. + + See merge request easycorp/zentaopms!64 + +commit 601229248d3129dea5b36a81d76769af61a7138f +Author: xieqiyu +Date: Thu Oct 14 12:20:36 2021 +0800 + + * Code for task#43168. + +commit ad21350632f09e1b3e38903f4857327aa822d03d +Merge: fb086df41b 0f546a39e2 +Author: 王怡栋 +Date: Thu Oct 14 03:32:18 2021 +0000 + + Merge branch 'sprint/167_sgm_15489' into 'sprint/167' + + * Fix bug #15489. + + See merge request easycorp/zentaopms!57 + +commit 993a02eb781f08a481b4369cc0bf0f65232530ec +Author: tianshujie +Date: Thu Oct 14 11:31:38 2021 +0800 + + * Fix bug #15521. + +commit 264a20d583d8d83f599d0af3a29f2efeaac1e71d +Author: tianshujie +Date: Thu Oct 14 10:47:07 2021 +0800 + + * Fix bug #15516. + +commit 6e94ad01de9fd3cc5806837b4976479bdd58cf74 +Merge: 01e57a1c57 b811e3c80d +Author: liyuchun +Date: Thu Oct 14 10:06:25 2021 +0800 + + Merge branch '15.6' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.6 + +commit b811e3c80d5916ef4fc5a7ce24bdd5263b0ea7c0 +Author: xieqiyu +Date: Thu Oct 14 10:05:42 2021 +0800 + + * Fix bug#15513. + +commit 01e57a1c570e5263852a074e7262fa89a26d0312 +Author: liyuchun +Date: Thu Oct 14 10:05:53 2021 +0800 + + * Fix bug #15514. + +commit de37a33ed5cced0260d32e0352ad1f90b6efc89e +Author: zenggang +Date: Thu Oct 14 01:56:19 2021 +0000 + + * Adjust code format + +commit 04fce5278bf5b116af9232a6d52dc433d2408d08 +Author: tianshujie +Date: Thu Oct 14 09:37:41 2021 +0800 + + * Fix bug #15500. + +commit f5e1ceb88080dcd0f97e7aa21f758da6a46fa6a8 +Author: tianshujie +Date: Thu Oct 14 09:24:16 2021 +0800 + + * Finish task #43169. + +commit 02717dbe648e9bc839ab02720658e422e4ef5df1 +Author: xieqiyu +Date: Thu Oct 14 09:19:56 2021 +0800 + + * Fix bug#15512. + +commit fb086df41b679ec3f434d8012651260cd362e94c +Merge: 5ba5ad9305 dbe27dff42 +Author: 孙广明 +Date: Thu Oct 14 01:03:14 2021 +0000 + + Merge branch 'sprint/167_zenggang_15490' into 'sprint/167' + + * Fix bug#15490 + + See merge request easycorp/zentaopms!62 + +commit 756576f2e4b8cc7affd48bd1cb627004b6b71ed0 +Author: liyuchun +Date: Thu Oct 14 09:00:36 2021 +0800 + + * Finish task #43205. + +commit ce8cbfe590fad10863681d0a416f57ae1a89dcc7 +Merge: 0b693e6ad4 c0764bb1e9 +Author: 丁国栋 +Date: Wed Oct 13 09:51:50 2021 +0000 + + Merge branch 'master' into 'master' + + * Fix bug that fetching users form GitLab API limited to 20 users. + + See merge request easycorp/zentaopms!44 + +commit 4ca1a13e34d898309f7c28c7023102d4a4cd5750 +Author: hufangzhou +Date: Wed Oct 13 17:46:10 2021 +0800 + + * Fix bug #15504. + +commit 836a35ab8254cb9cf49ce25c26e95cfc8af299f4 +Author: xieqiyu +Date: Wed Oct 13 17:24:10 2021 +0800 + + * Code for bug#15504. + +commit 89be4c74c76798906586d3ffb3f3ed28a4c0f191 +Merge: 2330adc576 880c8893c8 +Author: 李玉春 <563917701@qq.com> +Date: Wed Oct 13 09:23:33 2021 +0000 + + Merge branch '15.6_tianshujie_15484' into '15.6' + + * Fix bug #15484. + + See merge request easycorp/zentaopms!63 + +commit 2330adc5764e984417858b8cfafe068e80c38300 +Author: liyuchun +Date: Wed Oct 13 17:16:53 2021 +0800 + + * Adjsut update user view error. + +commit 6359266cf95d4399ff8ee033731e455dc8de1907 +Author: liyuchun +Date: Wed Oct 13 16:37:24 2021 +0800 + + * Adjust logic of update whitelist when update user view. + +commit 1de36134f06477aacbb7b410026b29e7d3b518d6 +Merge: 1e173e756d 28d62ece60 +Author: hufangzhou +Date: Wed Oct 13 16:16:02 2021 +0800 + + Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6 + +commit 1e173e756d2448bcbd5182754f50d8f0f326109f +Author: hufangzhou +Date: Wed Oct 13 16:15:57 2021 +0800 + + * Fix bug #15498. + +commit dbe27dff42b38d030f258beeed25f2298572de7f +Author: zenggang +Date: Wed Oct 13 08:13:02 2021 +0000 + + * Fix bug#15490 + +commit 28d62ece6068f05b8880070d1c016a944a6b66b0 +Author: xieqiyu +Date: Wed Oct 13 16:10:41 2021 +0800 + + * Fix bug#15501. + +commit 5ba5ad93056a07226a69f2886e9c4f77d36dbb8b +Merge: 26026cbf89 64c4e31370 +Author: 李玉春 <563917701@qq.com> +Date: Wed Oct 13 07:31:18 2021 +0000 + + Merge branch 'sprint/167_xieqiyu_43173' into 'sprint/167' + + * Finish task#43173. + + See merge request easycorp/zentaopms!59 + +commit 9f36655aeae7472c8ce9e2bf757054bc64780df9 +Author: liyuchun +Date: Wed Oct 13 15:29:53 2021 +0800 + + * Finish task #43205. + +commit 64c4e3137018728fd772dac3193d73eac6d78126 +Author: xieqiyu +Date: Wed Oct 13 15:28:22 2021 +0800 + + * Code for task#43173. Modify variable name. + +commit 880c8893c8a0c9a619dea19209ab149b713989da +Author: tianshujie +Date: Wed Oct 13 15:11:26 2021 +0800 + + * Fix bug #15484. + +commit a28498a56beeabde17308be35b032e69126340d9 +Author: xieqiyu +Date: Wed Oct 13 14:53:33 2021 +0800 + + * Finish task#43173. + +commit 5cd7ed9d748dc0b3a71f68269c95eb936d99cfaa +Author: liyuchun +Date: Wed Oct 13 14:35:09 2021 +0800 + + * Fix bug #15495. + +commit 26026cbf89e87773df9d9c92238e3c210aab52f8 +Merge: 4d208b36a6 8b8544d129 +Author: 李玉春 <563917701@qq.com> +Date: Wed Oct 13 03:10:29 2021 +0000 + + Merge branch 'sprint/167_xieqiyu_43168' into 'sprint/167' + + * Finish task#43168. + + See merge request easycorp/zentaopms!58 + +commit 7472470526879455d12e0d24941b6980d91e4382 +Merge: e2f51ef422 3ddba6aeeb +Author: hufangzhou +Date: Wed Oct 13 10:51:38 2021 +0800 + + Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6 + +commit e2f51ef4228f6faa6a82c22493c331e7e912c583 +Author: hufangzhou +Date: Wed Oct 13 10:51:30 2021 +0800 + + * Fix bug #15270. + +commit 3ddba6aeeb9c9d6846c98fdcf14d6c85ddeee483 +Author: liyuchun +Date: Wed Oct 13 10:17:53 2021 +0800 + + * Fix bug #15479. + +commit 8b8544d129365815839703e66ad56561a5c91293 +Author: xieqiyu +Date: Wed Oct 13 10:10:05 2021 +0800 + + * Finish task#43168. + +commit 8f0b4a575eb7aaa34f7075348b67dc62e8182dd4 +Author: zenggang +Date: Wed Oct 13 01:44:56 2021 +0000 + + * Adjust code style + +commit 0f546a39e222f35531b33e761d2270920283c172 +Author: 孙广明 +Date: Wed Oct 13 09:10:12 2021 +0800 + + * Fix bug #15489. + +commit 4d208b36a62e555117683abd7683ae11f1182428 +Merge: aa9252f50b a588e38cbc +Author: 朱金勇 +Date: Wed Oct 13 00:55:20 2021 +0000 + + Merge branch 'spirnt/167_liyuchun_43178' into 'sprint/167' + + * Finish task #43178. + + See merge request easycorp/zentaopms!48 + +commit aa9252f50b0c087f8d3d52629bf2b67a8d28a600 +Merge: 79fc550337 697be11443 +Author: 李玉春 <563917701@qq.com> +Date: Wed Oct 13 00:42:34 2021 +0000 + + Merge branch 'sprint/167_xieqiyu_43168' into 'sprint/167' + + * Finish task#43168. + + See merge request easycorp/zentaopms!56 + +commit 79fc550337decf905c966f9439f3da54a67c5565 +Merge: 01b777c445 973ec92d4a +Author: 李玉春 <563917701@qq.com> +Date: Wed Oct 13 00:41:49 2021 +0000 + + Merge branch 'sprint/167_xieqiyu_43173' into 'sprint/167' + + * Finish task#43173. + + See merge request easycorp/zentaopms!55 + +commit 315b6352f1fbad4dfab9ef0bf2d105d883bdf693 +Merge: a7b043f7b2 d6cea498cd +Author: 孙广明 +Date: Wed Oct 13 00:39:33 2021 +0000 + + Merge branch '15.6_tianshujie_43206' into '15.6' + + * Finish task #43206. + + See merge request easycorp/zentaopms!54 + +commit 973ec92d4a5d43779e0bf297d2b8707abc526ff5 +Author: xieqiyu +Date: Wed Oct 13 08:36:23 2021 +0800 + + * Add spaces. + +commit 697be11443204321d42cdc35a5a39221977d9a1f +Author: xieqiyu +Date: Wed Oct 13 08:28:16 2021 +0800 + + * Finish task#43168. + +commit 01b777c445908ad8df717f78ed152a682f8f6e18 +Merge: 8fa2e839fb 7a1fa1ef3b +Author: 李玉春 <563917701@qq.com> +Date: Wed Oct 13 00:27:43 2021 +0000 + + Merge branch 'sprint/167_hufangzhou_43188' into 'sprint/167' + + * Finish task #43188. + + See merge request easycorp/zentaopms!51 + +commit 8fa2e839fbca1ec47bddb80a16ff55efb1a414fa +Merge: e5132dcc3e d69aeae3b9 +Author: 朱金勇 +Date: Tue Oct 12 14:02:03 2021 +0000 + + Merge branch 'sprint/167_tianshujie_43190' into 'sprint/167' + + *Finish task #43190 + + See merge request easycorp/zentaopms!50 + +commit a7b043f7b2a3ff49d98b60d8c8439ff827957800 +Merge: 013b6a37cd e7f819ac53 +Author: 朱金勇 +Date: Tue Oct 12 14:01:00 2021 +0000 + + Merge branch 'sprint/165_zenggang_15439' into '15.6' + + Sprint/165 zenggang 15439 + + See merge request easycorp/zentaopms!52 + +commit 013b6a37cdc5c59438a4caf81cccb96fcae8e4ad +Author: hufangzhou +Date: Tue Oct 12 17:36:18 2021 +0800 + + * Fix bug #15476. + +commit 1cb991b70f3dab6b4c2b5d126e47a333a21b8ea4 +Author: thanatos +Date: Tue Oct 12 17:18:58 2021 +0800 + + 详情 + +commit 5e3863b284ad1858618fd27f89abd0315cc44b51 +Merge: a80eca0ab5 edc45687fd +Author: hufangzhou +Date: Tue Oct 12 15:43:02 2021 +0800 + + Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6 + +commit a80eca0ab53d9e71fcce7bd3fbe71a2d6230e2ef +Author: hufangzhou +Date: Tue Oct 12 15:42:58 2021 +0800 + + * Fix bug #15477. + +commit edc45687fd59333d61f7e0abc28fdd6fea18f642 +Author: 王怡栋 +Date: Tue Oct 12 14:54:35 2021 +0800 + + * fix error. + +commit 25737f936675184bd0b0d5c59a14525c6e9a93d5 +Merge: ee892ef350 f89abbe31c +Author: 王怡栋 +Date: Tue Oct 12 13:03:13 2021 +0800 + + Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6 + +commit ee892ef350ae3e7267409b1b72d7898344ee823e +Author: 王怡栋 +Date: Tue Oct 12 13:02:39 2021 +0800 + + * fix for api. + +commit f89abbe31c159aadceacf4678309bc8224ab508d +Author: hufangzhou +Date: Tue Oct 12 11:22:59 2021 +0800 + + * Fix an error of demo data. + +commit ac415b67aab0d1eaad4310c2fe69a1bd8ca48db7 +Author: xieqiyu +Date: Tue Oct 12 11:05:23 2021 +0800 + + * Finish task#43173. + +commit 8ff95d2d44f40213ee426cc19b4c6502db035434 +Author: hufangzhou +Date: Tue Oct 12 10:57:38 2021 +0800 + + * Modify the demo data, delete the unused fields. + +commit d6cea498cd6567484017e40539486fe256d9aea5 +Author: tianshujie +Date: Tue Oct 12 10:33:07 2021 +0800 + + * Finish task #43206. + +commit 0b693e6ad44571ac8293204131ea4c4840bbcd74 +Merge: eec51b9f69 753c31e84c +Author: 孙广明 +Date: Tue Oct 12 02:14:15 2021 +0000 + + Merge branch 'sprint/165_liyuchun_42834' into 'master' + + * Finish task #43205. + + See merge request easycorp/zentaopms!53 + +commit 753c31e84c99ad7e6c1fe94223a5fe0e0191fc6c +Author: liyuchun +Date: Tue Oct 12 10:09:49 2021 +0800 + + * Finish task #43205. + +commit cb1613604faf69b8cd9097f43708edaa18415f06 +Author: thanatos +Date: Tue Oct 12 09:41:21 2021 +0800 + + fix header action + +commit bf78fe9be46935cecc8c180cd953dd2880205641 (tag: zentaopms_15.6_20211012) +Author: hufangzhou +Date: Tue Oct 12 09:35:39 2021 +0800 + + * Add the 15.6 version and upgrade. + +commit c0764bb1e92fced0b27368678538214d18a7b74f +Author: dingguodong +Date: Mon Oct 11 16:21:11 2021 +0800 + + * Add GitLab and ZenTao user binding status. + +commit d9b19205b86baea69cb1a0a46519c0170e56319b +Merge: f3ebd7bdea eec51b9f69 +Author: dingguodong +Date: Mon Oct 11 16:19:52 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit eec51b9f695779204d70aa5c446822c80a6567ef +Author: 王怡栋 +Date: Mon Oct 11 16:18:41 2021 +0800 + + * adjust for zentao sql. + +commit 7a1fa1ef3bd818414aada3d98d6fea8b438fb977 +Author: hufangzhou +Date: Mon Oct 11 16:11:48 2021 +0800 + + * Finish task #43188. + +commit d69aeae3b94a562f9c01534e22c6edd07550808e +Author: tianshujie +Date: Mon Oct 11 15:58:09 2021 +0800 + + * Adjust the style of the project list under the product. + +commit 5f35a398ad246b34dea0b97aea4e1170669c5355 +Author: zenggang +Date: Mon Oct 11 07:26:18 2021 +0000 + + * Finish task#43179 + +commit a588e38cbce6ce2a3069cedb4d09a6cc2a83ea20 +Author: liyuchun +Date: Mon Oct 11 14:58:22 2021 +0800 + + * Finish task #43178. + +commit 1af5598b1a42d2c568fb24e257dace04b3d9f43a +Author: tianshujie +Date: Mon Oct 11 14:53:53 2021 +0800 + + * Finish task #43190. + +commit e5132dcc3ebf6baf0dc4d87e9473f219089cdc28 +Merge: 4058674e81 f5f9772e08 +Author: 王怡栋 +Date: Mon Oct 11 14:20:07 2021 +0800 + + Merge branch '165' + +commit f5f9772e08ecc847937a20804d5b3e4f56092627 +Merge: c280d772c2 cf687f3ee5 +Author: 王怡栋 +Date: Mon Oct 11 14:15:54 2021 +0800 + + Merge branch 'sprint/165_test' into 165 + +commit e7f819ac53122a5976cbcd77e8cafc58e7d495e2 +Author: zenggang +Date: Mon Oct 11 01:16:15 2021 +0000 + + * Adjust code variable name + +commit cf687f3ee5b1b83ab50d60b91535ffd2b427481a +Author: liyuchun +Date: Mon Oct 11 08:51:56 2021 +0800 + + * Adjust of zt_dept. + +commit c280d772c26e6c09384bf7b352581ea59b258baf +Merge: b90e78d4c9 e99daf2900 +Author: 朱金勇 +Date: Sun Oct 10 14:13:27 2021 +0000 + + Merge branch 'sprint/165_wangyidong' into 'sprint/165' + + * fix for todo data. + + See merge request easycorp/zentaopms!46 + +commit b90e78d4c96ceef35a54cc6e7002bf1ca2b46815 +Merge: 96a8ef6b04 5945717a55 +Author: 朱金勇 +Date: Sun Oct 10 12:08:18 2021 +0000 + + Merge branch 'sprint/165_liyuchun_42859' into 'sprint/165' + + * Finish task #42859，modify the syntax of Notification. + + See merge request easycorp/zentaopms!47 + +commit 0b7c8943c0da3e0836e679ac1897313153004eed +Author: zenggang +Date: Sat Oct 9 09:11:02 2021 +0000 + + * Fix bug#15438 + +commit f7cd95e3188696f8381d4eea4016b1ef2b0eec8d +Author: dingna +Date: Sat Oct 9 16:54:01 2021 +0800 + + * Modify desc of products. + +commit 1ac46abd23dd1cef07fd467cfe5850a84a21df8a +Author: dingna +Date: Sat Oct 9 15:29:20 2021 +0800 + + * Modify name of products. + +commit 5945717a55a510bc9db0f12a96363af06ab10071 +Author: liyuchun +Date: Sat Oct 9 15:22:57 2021 +0800 + + * Fix bug #42859. + +commit 5d94e8e207ff28d016fcdc1d72089ef9031818dc +Author: dingna +Date: Sat Oct 9 14:42:47 2021 +0800 + + * Modify product of branch and add created time for products. + +commit bb268a2bf6bb5905339a511bcc4f3bc81122cb32 +Author: 孙广明 +Date: Sat Oct 9 13:56:42 2021 +0800 + + * Merge code. + +commit e23e7975a35c6e6390db1d118f5733acd3f0f4be +Merge: a187e11d52 40a362c7f2 +Author: hufangzhou +Date: Sat Oct 9 13:20:44 2021 +0800 + + Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_test + +commit a187e11d52921b2516601c7cd2022efb8ef02736 +Author: hufangzhou +Date: Sat Oct 9 13:20:38 2021 +0800 + + * Modify the name of build and release in yaml file. + +commit 40a362c7f2e91a4ebbff815ac64c2b9b66fefaec +Author: xieqiyu +Date: Sat Oct 9 13:12:47 2021 +0800 + + * Add data of deleted products. + +commit 39d8d91adec151d9380a3424ed0f6d776178cf8e +Merge: 948c0ef88a 988dcea07e +Author: hufangzhou +Date: Sat Oct 9 10:51:05 2021 +0800 + + Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_test + +commit 948c0ef88afc4396a402577c6618814fa1ddbf1b +Merge: 0e15bc92cb 7045bcfcac +Author: hufangzhou +Date: Sat Oct 9 10:50:43 2021 +0800 + + Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_test + +commit 0e15bc92cbb7daf934014ebef8537d4c414358f3 +Author: hufangzhou +Date: Sat Oct 9 10:50:34 2021 +0800 + + * Modify the build yaml and release yaml. + +commit 988dcea07eccba44ca4fa47f776145bc7c050ec5 +Author: tianshujie +Date: Sat Oct 9 10:50:03 2021 +0800 + + * Add independent project linked product data. + +commit e99daf2900be2ddcc108eba9870747b82809ddc3 +Author: 王怡栋 +Date: Sat Oct 9 10:41:00 2021 +0800 + + * fix for todo data. + +commit 7045bcfcace994b39d7b858039e04c26fb40e2eb +Author: 孙广明 +Date: Sat Oct 9 10:39:49 2021 +0800 + + * Adjust productplan and user yaml. + +commit 96a8ef6b048057753ac8d7cd5b2410459bc70678 +Merge: ff09127219 1c7301c929 +Author: 王怡栋 +Date: Sat Oct 9 10:06:05 2021 +0800 + + Merge branch '15.5' into 165 + +commit 267fd9b1d44021ce15cea3d35845a8b06ea10009 +Author: xieqiyu +Date: Sat Oct 9 10:05:16 2021 +0800 + + * Delete the owner of the product with the same project name. + +commit 6abe8d32a2ccd2ad003fcad5aa71136677075061 +Merge: bc33f19a67 d3611fd8a9 +Author: zhujinyong +Date: Sat Oct 9 09:34:05 2021 +0800 + + Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165_test + +commit d3611fd8a913a52b2c2d37dc87d0a1d778f840da +Author: dingna +Date: Sat Oct 9 09:31:20 2021 +0800 + + * Add products with the same name as project. + +commit ff09127219fe83a142c05024c4c938cc03ea81c2 +Merge: 85fb57086c 0fa52d3318 +Author: 朱金勇 +Date: Sat Oct 9 01:32:30 2021 +0000 + + Merge branch 'sprint/165_wangyidong' into 'sprint/165' + + * finish task #42846. + + See merge request easycorp/zentaopms!41 + +commit bc33f19a67bc2b5ce6617c24857bc054f9b5f787 +Author: zhujinyong +Date: Sat Oct 9 09:30:16 2021 +0800 + + + Add postfix for debug. + +commit 0fa52d33183417caea5f48a44d1db0816907ce18 +Author: 王怡栋 +Date: Sat Oct 9 09:29:10 2021 +0800 + + * adjust for review code. + +commit 3f163029be355b93e075d972340d2430ad9dce7c +Merge: fd80fb2889 9cf1f6e09d +Author: tianshujie +Date: Sat Oct 9 09:25:34 2021 +0800 + + Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165_test + +commit fd80fb2889f3fec1059cf856b8cf1a5889b4f17b +Author: tianshujie +Date: Sat Oct 9 09:23:01 2021 +0800 + + * Fixed zt_block table for inserting data. + +commit 85fb57086c6d11bcb74cd602ca8aa248ba68d138 +Merge: 4e0207d7e4 07bbef9251 +Author: 朱金勇 +Date: Sat Oct 9 01:21:22 2021 +0000 + + Merge branch 'sprint/165_tianshujie_42867' into 'sprint/165' + + *Finish task #42867 + + See merge request easycorp/zentaopms!43 + +commit 9cf1f6e09d48541e34122bc0fcac9ca4f1baccb6 +Author: 孙广明 +Date: Sat Oct 9 09:14:42 2021 +0800 + + * Adjust user.yaml. + +commit 4e0207d7e4a30c1d0d34f579bf32948dd9a5dbb7 +Merge: 73d16a8128 77a9b33191 +Author: 朱金勇 +Date: Sat Oct 9 01:10:05 2021 +0000 + + Merge branch 'sprint/165_zenggang' into 'sprint/165' + + Sprint/165 zenggang + + See merge request easycorp/zentaopms!40 + +commit bf16a12c7b24a2f56da946fccd750054f8717fa1 +Author: zenggang +Date: Sat Oct 9 01:05:07 2021 +0000 + + * Fix bug#15439 + +commit f3ebd7bdea374791cf6f2a3e14ce77ee091798a2 +Author: dingguodong +Date: Fri Oct 8 16:44:12 2021 +0800 + + * Fix bug that fetching users form GitLab API limited to 20 users. + +commit 7bef6061fe86a6835832c998fce065fcee281542 +Merge: bf8b850e63 4654a827dd +Author: leiyong <1549684884@qq.com> +Date: Fri Oct 8 15:16:19 2021 +0800 + + Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_leiyong + +commit bf8b850e63f67927100085b11449d0c4e450305c +Author: leiyong <1549684884@qq.com> +Date: Fri Oct 8 15:15:46 2021 +0800 + + * Add yaml file. + +commit 4654a827dd0bdf9591341ec76855abe581f17e2a +Merge: 9d5d77e721 0bbe006055 +Author: hufangzhou +Date: Fri Oct 8 15:02:53 2021 +0800 + + Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_test + +commit 9d5d77e7212bc198d33da3352d458959cedd706d +Author: hufangzhou +Date: Fri Oct 8 15:02:48 2021 +0800 + + * Modify the user and productplan yaml. + +commit 0bbe006055304f7ae4d77220e28aa858afdb84ca +Author: xieqiyu +Date: Fri Oct 8 14:56:50 2021 +0800 + + * Add products with long names. + +commit 325eba274e4948dd0dcff92554edb3a548b985fd +Author: hufangzhou +Date: Fri Oct 8 14:53:42 2021 +0800 + + * Modify the build yaml and add the release yaml file. + +commit 7935fc39fa3b0cb48508d07b41be32926651db08 +Author: tianshujie +Date: Fri Oct 8 14:20:06 2021 +0800 + + * Modify the number of data generated in the zt_projectproduct table. + +commit 33c2caa37d4427e95959d8a1f2c5c7c7afa54e51 +Author: tianshujie +Date: Fri Oct 8 14:17:54 2021 +0800 + + * Modify the yaml file of the zt_projectproduct table. + +commit 80bfe95d0771f5429d181d20186883f7e757c300 +Author: dingna +Date: Fri Oct 8 14:11:41 2021 +0800 + + * Add standalone products. + +commit 07bbef92513e03fcaddbef4bcbd15d9082fa8845 +Author: tianshujie +Date: Fri Oct 8 13:58:22 2021 +0800 + + * Modify language item. + +commit 33ec8312e3ed4a19ce90bd09aa26bc08cf543938 +Author: tianshujie +Date: Fri Oct 8 13:50:25 2021 +0800 + + * Finish task #42867. + +commit 0c6c024bb14876fb4417d227be23cd7654309504 +Author: zhujinyong +Date: Fri Oct 8 13:48:10 2021 +0800 + + * Fix menu vars. + +commit b9dac7f8285a8f6f0c40392bfba427a7792b37ec +Merge: 51c44517c3 1201cc4298 +Author: hufangzhou +Date: Fri Oct 8 11:30:44 2021 +0800 + + Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_test + +commit 51c44517c385f17942fd22bbb0e9ac96a3bd82a0 +Author: hufangzhou +Date: Fri Oct 8 11:30:35 2021 +0800 + + * Add the build yaml file. + +commit 1201cc42985501aaec82932d4fa67d7e78afec9e +Author: tianshujie +Date: Fri Oct 8 11:27:00 2021 +0800 + + * Add zt_projectproduct table yaml file and rename zt_block table yaml file. + +commit 88a5c5d207fa62caf0dfc31872fec0d8cff1eddb +Author: 王怡栋 +Date: Fri Oct 8 10:35:38 2021 +0800 + + * fix loophole. + +commit 77a9b33191ffc5156f6a28b1285204049fd2a8a9 +Author: zenggang +Date: Fri Oct 8 02:27:50 2021 +0000 + + * Adjust code style + +commit 6a0872f17a4291306f3bb742994a3b33349dbc91 +Author: tianshujie +Date: Fri Oct 8 10:21:00 2021 +0800 + + * Add zt_block table yaml file. + +commit 64d53657a5c273f3bdad73770c206d233c96df6f +Merge: de72a2bcef b9bb3f446b +Author: 王怡栋 +Date: Fri Oct 8 08:45:43 2021 +0800 + + Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165_test + +commit 83d598745f4860882760b12f6ba91cf050b6b7fb +Author: zhujinyong +Date: Fri Oct 8 08:01:53 2021 +0800 + + * Finish task#43059. + +commit 658ad668c0e10bb52076d6f8eb07ed1138189931 +Author: zhujinyong +Date: Thu Oct 7 00:38:06 2021 +0800 + + * Format code. + +commit b9bb3f446ba0ceb2460e10fa65034dcfb65a2ae1 +Author: xieqiyu +Date: Sat Oct 2 18:29:29 2021 +0800 + + * Modify product and branch yaml. + +commit 189bc062b3feb0e51e798b65948e5563ce552abe +Author: zenggang +Date: Thu Sep 30 16:17:48 2021 +0800 + + * Fix bug#15363 + +commit a14fc4e7f9bc7addb492ab1424aa805c564221cc +Author: 王怡栋 +Date: Thu Sep 30 15:49:24 2021 +0800 + + * finish task #42848. + +commit cc28a1a0377386373c6c2b6b70dea467e0c9e7d8 +Author: zenggang +Date: Thu Sep 30 14:53:36 2021 +0800 + + * Fix bug#14382 + +commit 6b63972e79ec9e0b7e3a84ccd3bbc22bb2218995 +Author: xieqiyu +Date: Thu Sep 30 14:51:24 2021 +0800 + + * Add zentaodata file of product and branch. + +commit bd4475e142201b5825694d6935c6c7601a375325 +Author: liyuchun +Date: Thu Sep 30 14:46:15 2021 +0800 + + * Adjsut zendata file of usergroup. + +commit de72a2bcefab99525f201521b8199c093a059d91 +Author: 王怡栋 +Date: Thu Sep 30 14:34:08 2021 +0800 + + * adjust for project zendata. + +commit 10762bf7803caedae7f2af619267b843668e9f84 +Author: liyuchun +Date: Thu Sep 30 13:40:22 2021 +0800 + + * Add zendata files. + +commit f139f00e61b31270215cb05739cc6de5f3aa8fed +Author: zenggang +Date: Thu Sep 30 11:19:05 2021 +0800 + + * Task 42862,previously committed to the master branch, now resubmit to the 165 branch + +commit 5ab6b223ba7160d9b20da67b7236e3bc8570c9e1 +Author: 王怡栋 +Date: Thu Sep 30 11:03:06 2021 +0800 + + * fix loophole. + +commit 533c559b0c2d05f34a106b3bdf535902f2df9626 +Author: zhujinyong +Date: Wed Sep 29 14:47:41 2021 +0800 + + + Add api for zdisk. + +commit 73d16a81289b3e4e3020bb92c1a5c2fee0a2a85e +Merge: 77e4283f2c 0f2c519651 +Author: 孙浩 +Date: Wed Sep 29 05:23:46 2021 +0000 + + Merge branch 'sprint/165_sunhao/theme_blue' into 'sprint/165' + + Update theme blue and improve style of table list in product/all. + + See merge request easycorp/zentaopms!30 + +commit 77e4283f2c321c4df8fd4ac0b61728a5bc83d7ac +Merge: 610ab20e9e fb979963f2 +Author: 孙浩 +Date: Wed Sep 29 05:23:21 2021 +0000 + + Merge branch 'sprint/165_sunhao/bug14748' into 'sprint/165' + + Bug #14748, task #42858, fix the submit button was still clickable after the form submitted to server. + + See merge request easycorp/zentaopms!25 + +commit ee39f52c2ee84deb1c4b16fcb66a29c9084dbf9e +Author: 王怡栋 +Date: Wed Sep 29 11:51:17 2021 +0800 + + * finish task #42846. + +commit 3efa1338279493879adb8c58a23a2e0c58afbd17 +Author: zenggang +Date: Wed Sep 29 10:59:27 2021 +0800 + + * Fix bug#15278 + +commit 5d37062ad684bdacde3e29f06009a97d092d229d +Author: zenggang +Date: Wed Sep 29 10:46:07 2021 +0800 + + * Fix bug#15359 + +commit a224eed92be6eb7f97bd03e7a37b25c26ba6a3ff +Author: zhujinyong +Date: Wed Sep 29 08:18:05 2021 +0800 + + * Ajust code style. + +commit 610ab20e9ec088261b2184baf82ee6af4c6272d9 +Author: Guan Xiying +Date: Tue Sep 28 16:28:38 2021 +0800 + + * Add public keywords to define helper::cd function. + +commit 8ef308be2f8d8c76fee6652eb1c6a97e04d04f7e +Merge: d31182c9f0 d4ddac562d +Author: 朱金勇 +Date: Tue Sep 28 08:11:15 2021 +0000 + + Merge branch 'sprint/165_zenggang' into 'sprint/165' + + * Fix bug#15368 + + See merge request easycorp/zentaopms!35 + +commit d4ddac562d7b318cb37956068b92303584611976 +Author: zenggang +Date: Tue Sep 28 15:56:43 2021 +0800 + + * Add code annotation + +commit d31182c9f0681fffe6af3185ef009288a0fa92da +Merge: 79a020c0f5 eada128988 +Author: 朱金勇 +Date: Tue Sep 28 07:49:28 2021 +0000 + + Merge branch 'sprint/165_sunguangming' into 'sprint/165' + + * Fix bug #15335. + + See merge request easycorp/zentaopms!33 + +commit 79a020c0f507afcef03c29c49455a5f88fa12f0a +Merge: 98f93d563d 5b5ae6dfdd +Author: 朱金勇 +Date: Tue Sep 28 07:46:19 2021 +0000 + + Merge branch 'sprint/165_dingna_task42827' into 'sprint/165' + + * Finish task 42827. + + See merge request easycorp/zentaopms!36 + +commit 98f93d563d644c7f04e6ffd4a34391b6bd5c2d7a +Merge: aa86fdea50 353bef2e83 +Author: 朱金勇 +Date: Tue Sep 28 07:42:48 2021 +0000 + + Merge branch 'spirnt/165_tianshujie_42867' into 'sprint/165' + + * Finish task #42867. + + See merge request easycorp/zentaopms!28 + +commit 353bef2e83f8e290b2e297a1ea3fdf2236435694 +Author: tianshujie +Date: Tue Sep 28 15:38:34 2021 +0800 + + * Finish task #42867. + +commit aa86fdea50c7a1fd2f1ae6bbf26dae40cba53c27 +Merge: fa879ae303 9b5a28392b +Author: 朱金勇 +Date: Tue Sep 28 07:37:30 2021 +0000 + + Merge branch 'sprint/165_liyuchun_42854' into 'sprint/165' + + * Finish task #42854. + + See merge request easycorp/zentaopms!38 + +commit fa879ae3034b225ad51005937e058837202554cc +Merge: 1173e8b65d 4f977efaeb +Author: 朱金勇 +Date: Tue Sep 28 07:35:23 2021 +0000 + + Merge branch 'sprint/165_tianshujie_42854' into 'sprint/165' + + * Finish task #42854. + + See merge request easycorp/zentaopms!39 + +commit 1173e8b65d5c2e75060619950854dbfd6fda808d +Merge: 1bf1ac1156 08f1d594c0 +Author: 朱金勇 +Date: Tue Sep 28 07:31:10 2021 +0000 + + Merge branch 'sprint/165_wangyidong' into 'sprint/165' + + Sprint/165 wangyidong + + See merge request easycorp/zentaopms!37 + +commit 4f977efaeb9517258f2da5aff8201b4ab8ff0c53 +Author: tianshujie +Date: Tue Sep 28 13:14:32 2021 +0800 + + * Finish task #42854. + +commit 9b5a28392b7d51cf89dfec8097a0e83b604328e2 +Author: liyuchun +Date: Tue Sep 28 12:31:59 2021 +0800 + + * Finish task #42854. + +commit eccb9609ac5bd7ff9e4a391de85bea63c519e4ee +Author: thanatos +Date: Tue Sep 28 11:39:45 2021 +0800 + + update api detail style + +commit a2b41fdcf89ce408a123b008d273d6ca59b902c2 +Author: thanatos +Date: Tue Sep 28 11:38:05 2021 +0800 + + update api detail style + +commit 57b48dd406d0b49f6995dfca6e7d3d416ba75360 +Author: zenggang +Date: Tue Sep 28 11:20:05 2021 +0800 + + * Code for bug#15365 + +commit 08f1d594c08720d2c23b84f2378a120e94c36e1c +Author: 王怡栋 +Date: Tue Sep 28 09:24:33 2021 +0800 + + * adjust for task #42835. + +commit 9b9d95f923f49f947fdbe996d44b782a984347de +Author: thanatos +Date: Tue Sep 28 08:58:55 2021 +0800 + + update params + +commit 5b5ae6dfddad1ccc235a201aa708bdc42a7b75f4 +Author: dingna +Date: Mon Sep 27 16:21:26 2021 +0800 + + * Finish task #42827. + +commit 1c7301c9290dd3347abade03f02127e0fc3f0655 +Author: 王怡栋 +Date: Mon Sep 27 16:04:03 2021 +0800 + + * Save session with tab for project. + +commit 47c0876b9d7c1ff2669786f5f204edeb7f85d384 +Author: 王怡栋 +Date: Mon Sep 27 16:03:40 2021 +0800 + + * fix bug #15389. + +commit 336a4e59517c243d964010a5ee6c00b28663d72d +Author: zenggang +Date: Mon Sep 27 15:32:22 2021 +0800 + + * Fix bug#15368 + +commit 1bf1ac1156b04f220459e1aff0521a36e5cd4b71 +Merge: 978cfdbdc8 1cf925a37c +Author: 朱金勇 +Date: Mon Sep 27 07:30:03 2021 +0000 + + Merge branch 'sprint/165_test' into 'sprint/165' + + * Copy common folder to tmp. + + See merge request easycorp/zentaopms!34 + +commit 1cf925a37c3ddfdd8dc93ccbe16f5d60143fdf31 +Author: zhujinyong +Date: Mon Sep 27 15:27:29 2021 +0800 + + * Copy common folder to tmp. + +commit c5e340855dc03ccbfd67813d5a753288fad3a5f7 +Author: tianshujie +Date: Mon Sep 27 15:12:59 2021 +0800 + + * Finish task #42867. + +commit f30eb20fbda21500440d5615d376355520b981e5 +Author: 王怡栋 +Date: Mon Sep 27 14:50:09 2021 +0800 + + * code for task #42835. + +commit 978cfdbdc8de6fd22140435866e11053fa9bf8d8 +Merge: 452d4d8605 f1151c37c7 +Author: 朱金勇 +Date: Mon Sep 27 06:47:51 2021 +0000 + + Merge branch 'sprint/165_test' into 'sprint/165' + + * Init test framework + + See merge request easycorp/zentaopms!32 + +commit eada128988d4fb1db24396dedc45e47b40b45132 +Author: 孙广明 +Date: Mon Sep 27 14:32:33 2021 +0800 + + * Fix bug #15335. + +commit 0f2c519651b51859c078c37ffd6f4fb339fc8df5 +Author: Hao Sun +Date: Mon Sep 27 14:29:45 2021 +0800 + + * Update theme blue and improve style of table list in product/all. + +commit f1151c37c73b88d8588507465b4330b925d73c21 +Author: zhujinyong +Date: Mon Sep 27 14:05:51 2021 +0800 + + * Adjust code for test demo. + +commit 5e0068701e7dfa6a286b3c035e4af423c7231d61 +Author: tianshujie +Date: Mon Sep 27 13:55:09 2021 +0800 + + * Finish task #42867. + +commit e059381d7d1c5fbc65bc82b36f106161fedf8b46 +Author: zhujinyong +Date: Mon Sep 27 02:52:35 2021 +0800 + + * Supply multiple config files. + +commit 452d4d860524d1d1426c498149144dc5fc03b585 +Merge: f76d206ee5 6798a9cb46 +Author: 朱金勇 +Date: Sun Sep 26 09:47:55 2021 +0000 + + Merge branch 'sprint/165_zenggang' into 'sprint/165' + + Sprint/165 zenggang + + See merge request easycorp/zentaopms!27 + +commit f76d206ee5940c958bf60b9736919512a1ba99e3 +Merge: 98b74f4a94 898d78514e +Author: 朱金勇 +Date: Sun Sep 26 09:45:24 2021 +0000 + + Merge branch '165_tianshujie42861' into 'sprint/165' + + * Finish task #42861. + + See merge request easycorp/zentaopms!24 + +commit 898d78514e79240aa6f823a3850b3f3069948539 +Author: tianshujie +Date: Sun Sep 26 17:32:52 2021 +0800 + + * Finish task #42861. + +commit 48fb6fc46f9545b9dd9663a4527c306f475c70fe +Author: tianshujie +Date: Sun Sep 26 17:23:55 2021 +0800 + + * Finish task #42861. + +commit 6798a9cb46ee45993f76f02fc17e8199abb419ad +Author: zenggang +Date: Sun Sep 26 17:10:11 2021 +0800 + + * Fix bug#15280 + +commit 98b74f4a94661db821324e6a3b80d8d6fa7c3c87 +Merge: db1ec55d84 e9044ca0c9 +Author: 朱金勇 +Date: Sun Sep 26 09:08:04 2021 +0000 + + Merge branch 'sprint/165_wangyidong' into 'sprint/165' + + * finish task #42832. + + See merge request easycorp/zentaopms!22 + +commit 40d848f03f3dd841d20cc65c08e9b2522afbae83 +Author: zenggang +Date: Sun Sep 26 17:06:13 2021 +0800 + + * Fix bug#15282 + +commit db1ec55d84e4b8973c71fc7cf72279d671bc1f56 +Merge: beaae9f167 7dfa0963e6 +Author: 朱金勇 +Date: Sun Sep 26 08:57:41 2021 +0000 + + Merge branch 'spirnt/165_liyuchun_42860' into 'sprint/165' + + * Finish task #42860. + + See merge request easycorp/zentaopms!26 + +commit 4058674e81917899f9699182daac5e04c712999d +Merge: 78e743b18f c9eee62003 +Author: 朱金勇 +Date: Sun Sep 26 08:42:47 2021 +0000 + + Merge branch 'master' into 'master' + + * Fix bug for getting all objects when one label is not exist. + + See merge request easycorp/zentaopms!17 + +commit 7dfa0963e6f4621d68a675c20876a8c29f36dc62 +Author: liyuchun +Date: Sun Sep 26 16:23:20 2021 +0800 + + * Finish task #42860. + +commit fb979963f2f9373f3e43c9495ee231466d519bf2 +Author: Hao Sun +Date: Sun Sep 26 16:16:19 2021 +0800 + + * Bug #14748, task #42858, prevent to enable form when server response data has "closeModal" property. + +commit 9211504ebb4d17985079baf020ecb8b2a47c52e5 +Author: 王怡栋 +Date: Sun Sep 26 15:16:28 2021 +0800 + + * fix bug #15357. + +commit 62483636fd9f2b1d0be615c810bb3b8ed41b642a +Author: tianshujie +Date: Sun Sep 26 15:11:50 2021 +0800 + + * Finish task #42861. + +commit 36a6d9f4e34367c8eb9e55cae0e7421225530684 +Author: liyuchun +Date: Sun Sep 26 14:43:28 2021 +0800 + + * Finish task #42834. + +commit c0e6b93d3f2734dcfa156e7454bd93bf9c288537 +Author: thanatos +Date: Sun Sep 26 13:33:22 2021 +0800 + + fix bug + +commit e9044ca0c951fdcefc804f3e95c371591224bc29 +Author: 王怡栋 +Date: Sun Sep 26 12:11:44 2021 +0800 + + * adjust for task #42832. + +commit beaae9f1674ae8a5eb6a1238e85a3229f0ccfbbf +Merge: 04607e8a79 b416d20512 +Author: 朱金勇 +Date: Sun Sep 26 04:01:53 2021 +0000 + + Merge branch 'sprint/165_dingna_task42850' into 'sprint/165' + + * Finish task #42850 + + See merge request easycorp/zentaopms!21 + +commit 0d4c2da922a3b724ed377f60e3b4aa24416681e8 +Author: 王怡栋 +Date: Sun Sep 26 10:16:10 2021 +0800 + + * finish task #42832. + +commit b416d2051238695a0e3d6b3cf381f4bbccf45b4a +Author: dingna +Date: Sun Sep 26 09:51:02 2021 +0800 + + * Finish task #42850 Cost:0.5h + +commit c9eee6200327daba789aed4242b43f8ebd93de39 +Author: dingguodong +Date: Fri Sep 24 16:39:32 2021 +0800 + + * Remove bad comments and rename user to account. + +commit a33f9b096df038bd08ab93b9fb7e05e95dc3229b +Author: 王怡栋 +Date: Fri Sep 24 16:27:08 2021 +0800 + + * adjust for project link in classic mode. + +commit 9c8a10c5b6f9ef5fb763848d2e65a2ab989f9c7e +Author: dingguodong +Date: Fri Sep 24 16:08:52 2021 +0800 + + * Optimize codes when one label not exist and fix bug for getting issue(s). + +commit b4d44062766ea258030b891077781d219e3bbca2 +Merge: 1762865528 78e743b18f +Author: dingguodong +Date: Fri Sep 24 15:04:03 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 04607e8a79c7bff11f9b724398a617e0d9bf0175 +Merge: 1bf7d48cdb eb04910243 +Author: 管西迎 +Date: Fri Sep 24 06:56:37 2021 +0000 + + Merge branch 'sprint/165_test' into 'sprint/165' + + * Send encrypted password when creating user by API. + + See merge request easycorp/zentaopms!20 + +commit eb04910243660b1a12fcc6996d7a17db06ff1976 +Author: zhujinyong +Date: Fri Sep 24 14:50:27 2021 +0800 + + * Send encrypted password when creating user by API. + +commit 1bf7d48cdb023253450260702d9b30c2c6201778 +Merge: 1f9ab6c380 83dbf6a99d +Author: 朱金勇 +Date: Fri Sep 24 05:11:12 2021 +0000 + + Merge branch '165_dingna' into 'sprint/165' + + * Finish task #42849. + + See merge request easycorp/zentaopms!11 + +commit 1f9ab6c380ec51b6f2c2a90c95e6e93e8206dfa5 +Merge: f0c48a05f7 ad2da66aac +Author: 朱金勇 +Date: Fri Sep 24 05:07:05 2021 +0000 + + Merge branch 'sprint/165_dingna_task42826' into 'sprint/165' + + * Finish task #42826. + + See merge request easycorp/zentaopms!19 + +commit f0c48a05f7901cb94c9a00bc476aab04c23b876e +Merge: b866ebe1fd 27670f7b3a +Author: 朱金勇 +Date: Fri Sep 24 05:06:33 2021 +0000 + + Merge branch 'sprint/165_dingna_task42851' into 'sprint/165' + + * Finish task #42851. + + See merge request easycorp/zentaopms!18 + +commit ad2da66aac9c190c84d7ce94eadf8c96b0331dc5 +Author: dingna +Date: Fri Sep 24 09:48:55 2021 +0800 + + * Finish task #42826. + +commit 27670f7b3a8690fd2f3dfe8dbe309f6627ec2250 +Author: dingna +Date: Fri Sep 24 09:31:23 2021 +0800 + + * Finish task #42851. + +commit dbeacce70f0a179ee09ad0663c99fba80ec4d4b1 +Author: thanatos +Date: Fri Sep 24 08:48:47 2021 +0800 + + edit api doc + +commit 78e743b18f22fc6e5da2a6ded852bc85e1253621 +Merge: 5c4ae3dbf5 d77af31e52 +Author: 朱金勇 +Date: Fri Sep 24 00:46:01 2021 +0000 + + Merge branch '165_zenggang' into 'master' + + * Finish task#42862 + + See merge request easycorp/zentaopms!15 + +commit b866ebe1fd377afb34e650975c0f5f60272d5785 +Merge: 9f702ff91a 4d99f28b8c +Author: zhujinyong +Date: Fri Sep 24 08:44:24 2021 +0800 + + Merge branch 'sprint/165' of http://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165 + +commit 9f702ff91a36c9acf7d8b12009bc14a7be99c754 +Author: zhujinyong +Date: Fri Sep 24 08:43:03 2021 +0800 + + * Use rpe for testcase. + +commit 83dbf6a99d9a28c101d54a97dd28967b8164554b +Author: dingna +Date: Thu Sep 23 17:07:09 2021 +0800 + + * Code for task #42849. + +commit 17628655284504789c527e5aee76e751f44a1375 +Author: dingguodong +Date: Thu Sep 23 16:54:22 2021 +0800 + + * Fix bug for getting all objects when one label is not exist. + +commit 4d99f28b8c3fd0e0f8d81da8569eb8608a54cfee +Merge: f182feb33c 2a4b2497dc +Author: 朱金勇 +Date: Thu Sep 23 08:02:13 2021 +0000 + + Merge branch '165_tianshujie' into 'sprint/165' + + * Finish task #42847. + + See merge request easycorp/zentaopms!10 + +commit 02b0ab4dda3ed3515193a1f8597784494c353f16 +Author: thanatos +Date: Thu Sep 23 15:57:57 2021 +0800 + + fix code style + +commit 0f6152e9db270e0478787edeab19fdb55cb1f35b +Author: dingna +Date: Thu Sep 23 15:45:44 2021 +0800 + + * Code for task #42849. + +commit 5c4ae3dbf502ab0013f9d4e151d2614680a0c28e +Merge: a304d99033 aebb3a6322 +Author: 管西迎 +Date: Thu Sep 23 07:25:27 2021 +0000 + + Merge branch 'sprint/165_sunhao_bug15216' into 'master' + + BUG #15216: 调整火狐浏览器上单选框空间获得焦点样式 + + See merge request easycorp/zentaopms!14 + +commit d77af31e5239c39dc680fe623d8b3cad72872c8c +Author: zenggang +Date: Thu Sep 23 15:18:34 2021 +0800 + + * Finish task#42862 + +commit a304d9903371d9cd5d349b20943919fa43b6f8be +Merge: 8484303a23 5d21219908 +Author: 管西迎 +Date: Thu Sep 23 07:17:34 2021 +0000 + + Merge branch 'sprint/165_sunhao' into 'master' + + BUG #14890: 修复了执行→需求列表点击表头全新复选框可能触发拖拽批量选择的问题，现在拖拽批量选择仅在正常的数据行内 ID 列（td.c-id）生效。 + + See merge request easycorp/zentaopms!12 + +commit ec628d33f18c238ab5a7bbcb01d2f4d9260978c1 +Author: thanatos +Date: Thu Sep 23 15:05:22 2021 +0800 + + fix code style + +commit 8484303a237a9f40767793ba64b1fc0b8731692c +Author: zhujinyong +Date: Thu Sep 23 14:55:06 2021 +0800 + + + Add count config for zendata. + +commit aebb3a63224578759f1f35d297a9e3cebc1cc94a +Author: Hao Sun +Date: Thu Sep 23 13:32:57 2021 +0800 + + * Bug #15216, remove dashed outline in firefox on windows. + +commit 4576217894cdadfd890f6b3e849713bc6df74f89 +Author: zhujinyong +Date: Thu Sep 23 13:18:20 2021 +0800 + + * Load config. + +commit 5d21219908a5f023ff6cd3480d7d527c5a0b4671 +Author: Hao Sun +Date: Thu Sep 23 12:31:48 2021 +0800 + + * Bug #14890, diable batch selection by dragging from table header to avoid conflict with table sorter. + +commit 391fb25125e117b1b080b0d92e5990dc812927c2 +Author: dingna +Date: Thu Sep 23 11:34:44 2021 +0800 + + * Finish task #42849. + +commit 1787e7a86cbd3bdda8b4ab899760cb7fb008dbe8 +Author: thanatos +Date: Thu Sep 23 10:58:00 2021 +0800 + + fix code style + +commit 3b921a953b6f746763752f4ccd2033da58888994 +Merge: adcb36c393 848c14fb9c +Author: zhujinyong +Date: Thu Sep 23 10:32:12 2021 +0800 + + Merge branch 'api_doc' of http://gitlab.zcorp.cc/easycorp/zentaopms into api_doc + +commit adcb36c393ee61b11453aec5cd14ede5b2e85a98 +Author: zhujinyong +Date: Thu Sep 23 10:31:52 2021 +0800 + + * Adjust code style. + +commit 848c14fb9cb15d34e58390dab8de92455b3e120f +Author: thanatos +Date: Thu Sep 23 10:17:06 2021 +0800 + + fix indent + +commit 6d90be6dcc03d96a9a2b226990113610960aeedd +Author: zhujinyong +Date: Thu Sep 23 08:58:59 2021 +0800 + + * Init directory of test. + +commit 2a4b2497dcdea5d34211a8ce1776e3a64603cb15 +Author: tianshujie +Date: Thu Sep 23 08:56:40 2021 +0800 + + * Finish task #42847. + +commit a71f7225d534eb71aacbd975020fff93804b8b4e +Merge: 86c8930cdd 8bbf7475f8 +Author: 王怡栋 +Date: Wed Sep 22 16:49:43 2021 +0800 + + Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 + +commit 86c8930cddcf986a404bffde20cfd722b275591d +Author: 王怡栋 +Date: Wed Sep 22 16:48:09 2021 +0800 + + * adjust for apache error. + +commit 8bbf7475f84724430469b28a06c99a0b215e60cb +Author: hufangzhou +Date: Wed Sep 22 09:02:31 2021 +0800 + + * Fix bug #14231. + +commit 9efcf7e686bfb7ccd053715ba9fff116770a4260 +Merge: 7ed13fff0a 3966f808a3 +Author: 王怡栋 +Date: Wed Sep 22 08:45:36 2021 +0800 + + Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 + +commit 7ed13fff0aea91166fde45ee12c01c7b2e50e280 +Author: 王怡栋 +Date: Wed Sep 22 08:45:09 2021 +0800 + + * fix bug #15215. + +commit 3966f808a32567085c4964242e12090c5f35dc37 +Author: liyuchun +Date: Sat Sep 18 15:40:17 2021 +0800 + + * Fix bug #15242. + +commit e62809eabd9738cbd8e9db7fd2a506364ced09bb +Author: zenggang +Date: Sat Sep 18 15:38:36 2021 +0800 + + * Fix bug#14360 + +commit c6b7f25fa3b07273338fd84f15e41fe9d0b46135 +Author: zenggang +Date: Sat Sep 18 14:08:31 2021 +0800 + + * Adjust code style. + +commit 01b7db1dd66da6ae5412b948346175d28a5bb922 +Author: 王怡栋 +Date: Sat Sep 18 13:51:15 2021 +0800 + + * adjust for upgrade. + +commit bd8cf246f94bb8138f3caf257cc859753f2f709f +Merge: 435849a9de e4ab2d8a80 +Author: 王怡栋 +Date: Sat Sep 18 13:14:21 2021 +0800 + + Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 + +commit 435849a9dec94d284a6444a5229a752737fee9e5 +Author: 王怡栋 +Date: Sat Sep 18 13:09:28 2021 +0800 + + * finish task #42598. + +commit e4ab2d8a80449c3de4a4d6ee95e697ab2136f85e +Author: liyuchun +Date: Sat Sep 18 11:19:12 2021 +0800 + + * Fix bug #15245. + +commit 4380f4d4b04db2360c871b1e5ee6bfc747943227 +Author: zenggang +Date: Sat Sep 18 11:01:08 2021 +0800 + + * Fix bug#14580 + +commit f182feb33ccfa29a8a98609dd3ca49a3cd8dc514 +Author: liyuchun +Date: Sat Sep 18 08:37:12 2021 +0800 + + * Fix bug #15183. + +commit 33e946e96871466c17e25df4d1e2f4d6d9a58d0b +Author: liyuchun +Date: Sat Sep 18 08:33:58 2021 +0800 + + * Fix bug #15183. + +commit 7650e339886856f8830b05efdaca8b69cf2a33fe +Author: zenggang +Date: Fri Sep 17 17:23:15 2021 +0800 + + * Fix bug#15232 + +commit bc6f0a2ea8d13ea190ce4e42c5142a4e00fd72ae +Author: hufangzhou +Date: Fri Sep 17 16:39:45 2021 +0800 + + * Fix bug #15240. + +commit 0166be0544052674f10f6d384df270ed325ab2f6 +Merge: 7603337d74 7a059c7cb6 +Author: hufangzhou +Date: Fri Sep 17 15:44:14 2021 +0800 + + Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 + +commit 7603337d74ffb63ece37297b8260da7c78dc3ce8 +Author: hufangzhou +Date: Fri Sep 17 15:44:06 2021 +0800 + + * Fix bug #15235. + +commit 7a059c7cb6af0144cf80971389386dd712e41083 +Merge: b1dfaa21bb 4d97c0a325 +Author: lichengjun +Date: Fri Sep 17 07:15:24 2021 +0000 + + Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 + +commit b1dfaa21bb46dd6e5e3a56675d65ee93e9f9316a +Author: lichengjun +Date: Fri Sep 17 07:14:30 2021 +0000 + + * Fix Bug #15200. + +commit 4d97c0a3255330d47a7d6394206324f5a5eea013 +Merge: 7723233161 ed613b4377 +Author: hufangzhou +Date: Fri Sep 17 15:12:31 2021 +0800 + + Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 + +commit 77232331614618c05cc1a1090d53d220ab382408 +Author: hufangzhou +Date: Fri Sep 17 15:12:23 2021 +0800 + + * Fix bug #15233. + +commit ed613b4377d63202edfd9d722c8373d4ab28b9a1 +Author: zenggang +Date: Fri Sep 17 14:59:25 2021 +0800 + + * Fix bug#15202 + +commit b977bd5eb8619ba2f627dcb34b5fe5733f002908 +Author: thanatos +Date: Fri Sep 17 14:03:27 2021 +0800 + + fix call_user_func_array bug on php 8.0 + +commit cdcb32548b8260b611995da7d78f5673b12f2ba6 +Author: thanatos +Date: Fri Sep 17 13:26:05 2021 +0800 + + add editorconfig + +commit 8a44a6dc9544a48183e85656c43e3c4b7031065e +Author: thanatos +Date: Fri Sep 17 13:25:40 2021 +0800 + + fix bug + +commit d9ac3552601b4a5fd198c5b15f141580d32bc461 +Author: dingna +Date: Fri Sep 17 13:19:57 2021 +0800 + + * Fix bug #14529. + +commit 497bcdb57432eab3c8a5957c42dc72cf3becb3b1 +Author: zenggang +Date: Fri Sep 17 11:11:36 2021 +0800 + + * Fix bug#14490 + +commit 773219497613b97d7bf6b2616e229ea4976325a1 +Merge: ddb583a707 9bcd85907f +Author: hufangzhou +Date: Fri Sep 17 10:53:17 2021 +0800 + + Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 + +commit ddb583a70715878ddbff1817449abc11ce51f34c +Author: hufangzhou +Date: Fri Sep 17 10:53:08 2021 +0800 + + * Fix bug #15230: Added judgment conditions for version when batch review stories. + +commit 9bcd85907f3a251038c886cf038ee13bf10e6d99 +Author: tianshujie +Date: Fri Sep 17 10:26:57 2021 +0800 + + * Fix bug #15228. + +commit 555ecdd9a5d8f65b09d49fdfa1720ad594c64bb7 +Author: tianshujie +Date: Fri Sep 17 10:22:21 2021 +0800 + + * Fix test report run case error. + +commit 1a0effc1e65356ddcc5d6695da71f620c99bb77c +Author: zenggang +Date: Fri Sep 17 09:51:23 2021 +0800 + + * Fix bug15211,14525 + +commit b09b80d4e786df1bab92496f74a9336dc13e22db +Author: hufangzhou +Date: Fri Sep 17 09:30:11 2021 +0800 + + * Fix an error: Divide the my bug query condition from bug query condition. + +commit ee07a042a44361143af6f9098dbd84f8a99fd5b1 +Author: zenggang +Date: Thu Sep 16 17:31:40 2021 +0800 + + * Fix bug#15211,14525 + +commit 233f599d2a1944bc4ecd93d4f3c1af12a4591e2d +Author: mayue +Date: Thu Sep 16 16:55:21 2021 +0800 + + * Adjust style in features page. + +commit 0d116021dbda76e600c7a8d51865f3012465f74d +Author: thanatos +Date: Thu Sep 16 16:10:49 2021 +0800 + + finish api doc. first commit + +commit ddd1de7fa9d5f95c7770837e0f91cf34110e3d10 +Author: 孙广明 +Date: Thu Sep 16 14:46:30 2021 +0800 + + * Finish task #42588. + +commit 70358073e39ae9870c2e6b15b76709aec4ecb35a +Author: tianshujie +Date: Thu Sep 16 11:33:53 2021 +0800 + + * Fix bug #42594. + +commit a3dc73a6dca455f2c8a88073d1799e6ab97560c0 +Author: dingna +Date: Thu Sep 16 10:25:54 2021 +0800 + + * Fix bug #15201. + +commit 59c4b2b41f9d65adbf4fe4c4308a2aeb372129e7 +Author: 孙广明 +Date: Thu Sep 16 10:11:23 2021 +0800 + + * Finish task #42588. + +commit c352c8b9df22c1a6420411b59daada5b014c6fcc +Author: zenggang +Date: Thu Sep 16 09:43:41 2021 +0800 + + * Fix bug#14830 + +commit 00619a268fc3d83903491881737c8272ccc57995 +Author: tianshujie +Date: Thu Sep 16 09:04:36 2021 +0800 + + * Fix dynamic error. + +commit a26b46215ad8f1558848c0953e493defb3ba25ba +Author: tianshujie +Date: Thu Sep 16 08:50:11 2021 +0800 + + * Fix bug #15205. + +commit d708c198a53c13cf2d782ec4415d22fc9120632a +Author: tianshujie +Date: Thu Sep 16 08:48:20 2021 +0800 + + * Fix bug #15205. + +commit bc312bfe2df306a84324416849feee16dd682729 +Author: Hao Sun +Date: Wed Sep 15 19:23:02 2021 +0800 + + * improve UI for cropavatar dialog and fix conflict with autosize feature of ModalTrigger. + +commit 2d636f7ab9d18911c7e157261b4a50312cfc276b +Author: hufangzhou +Date: Wed Sep 15 18:12:05 2021 +0800 + + * Fix the upload avatar. + +commit 116e8bab90366409cce4f5d93893e0b3ea7321eb +Author: Hao Sun +Date: Wed Sep 15 18:00:11 2021 +0800 + + * remove unused ajax initialization. + +commit 514492576c21a5f05e751fbe68c10169e3fc0b5e +Author: Hao Sun +Date: Wed Sep 15 17:55:08 2021 +0800 + + * fix avatar uploader not work in user profile page. + +commit 5f8067802d25476c7116315a2d6ffe8a96e4e59e +Merge: a206296708 caaaa90cf5 +Author: 王怡栋 +Date: Wed Sep 15 17:01:59 2021 +0800 + + Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 + +commit 6e15fb25beaf81fbb24b964b5274dd02968c1bd6 +Author: dingna +Date: Wed Sep 15 16:43:28 2021 +0800 + + * Modify the execution button link. + +commit 7e2466b119f858478b0f141cfcacb0ca631b5b1b +Author: dingguodong +Date: Wed Sep 15 16:31:57 2021 +0800 + + * Optimize and streamline the codes. + +commit d52023fbab46396c057e7993eca95767c467611c +Author: Hao Sun +Date: Wed Sep 15 16:00:37 2021 +0800 + + * fix bug icon margin in page testcase/browse. + +commit caaaa90cf5058a67202657bb40281832179a7a58 +Merge: 441cda176d 3c7139840f +Author: tianshujie +Date: Wed Sep 15 15:56:33 2021 +0800 + + Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 + +commit 441cda176d0b57aec4f3708d988ab6c709813a07 +Author: tianshujie +Date: Wed Sep 15 15:56:19 2021 +0800 + + * Modify the global creation return link. + +commit 444b29404a18fcc70451dde45ac47b718fa9c2b3 +Author: xieqiyu +Date: Wed Sep 15 15:35:42 2021 +0800 + + * Fix bug#14585. + +commit adae84550cef7a6e7ba99597432f29d4173e6d78 +Author: dingguodong +Date: Wed Sep 15 15:28:37 2021 +0800 + + * Fix bug #15041. + +commit 3c7139840f149da5c073986fef60ee0dd45430a4 +Merge: 9c2cd403d7 5fe40b698b +Author: liyuchun +Date: Wed Sep 15 15:21:44 2021 +0800 + + Merge branch '15.5' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 + +commit 5fe40b698b5b978b9e4fd37b538d80d979066fa7 +Merge: dd00b9801a da6ed899ac +Author: lichengjun +Date: Wed Sep 15 07:11:24 2021 +0000 + + Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 + +commit dd00b9801a22d311d0b53de2a5b006c064c0f4d0 +Author: lichengjun +Date: Wed Sep 15 07:10:28 2021 +0000 + + * Fix bug#15073. + +commit da6ed899ac6051af0e88e8be81e30f3738f9652f +Author: zenggang +Date: Wed Sep 15 15:09:39 2021 +0800 + + * Fix bug 14926 + +commit 9c2cd403d71cdedac8cdaf583ab8fafc5d26581e +Author: liyuchun +Date: Wed Sep 15 15:08:47 2021 +0800 + + * Fix bug #14558. + +commit 1b4c15e37e9a97f91a1206a2f37d2ecddeec8d14 +Merge: 8847360d38 a8c37fa1de +Author: hufangzhou +Date: Wed Sep 15 15:06:11 2021 +0800 + + Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 + +commit 8847360d3853a1b5d9819f47b24116dc37a340cc +Author: hufangzhou +Date: Wed Sep 15 15:06:02 2021 +0800 + + * Fix bug #15197. + +commit a8c37fa1deed1dbd26e1a8e4931c0537e11457ab +Author: lichengjun +Date: Wed Sep 15 06:55:09 2021 +0000 + + * Fix bug#15073. + +commit b2b0370a0c84532ed193d8b8f350fa1b2b41dd75 +Author: dingna +Date: Wed Sep 15 14:48:55 2021 +0800 + + * Fix bug #13820. + +commit a206296708370d2b19f858bcae1a31aee2462137 +Merge: 77d501887d e6ed9fba46 +Author: 王怡栋 +Date: Wed Sep 15 14:34:59 2021 +0800 + + Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 + +commit 77d501887d9e06575cce1ee252a9506ce1d90393 +Author: 王怡栋 +Date: Wed Sep 15 14:34:13 2021 +0800 + + * fix bug for save execution session. + +commit e6ed9fba46ab1b7873e2cd69ec6f6abe63b86c84 +Author: zenggang +Date: Wed Sep 15 14:19:01 2021 +0800 + + * Fix bug#14654 + +commit d53385ae0480cf6bfe531a85cc6ed4cc0d7feb22 +Author: xieqiyu +Date: Wed Sep 15 14:04:23 2021 +0800 + + * Fix bug#14879. + +commit 4c0319296ca9052016d6e9814c6917c0ea9c2ac5 +Author: liyuchun +Date: Wed Sep 15 13:58:52 2021 +0800 + + * Fix bug #15183. + +commit be3dfb76c9b48c9d327be285676e855f7e8e2421 +Author: dingguodong +Date: Wed Sep 15 13:29:30 2021 +0800 + + * Change the begin time of todo to undefined for MR. + +commit fc887d625a8852075d0d73d345f38b1c45e8f1ca +Author: 王怡栋 +Date: Wed Sep 15 11:26:29 2021 +0800 + + * revert for bug #15187. + +commit ededa035c9998758e0644ae7ebdc46a2d9188237 +Author: dingna +Date: Wed Sep 15 11:23:36 2021 +0800 + + * Fix bug #14199. + +commit 6c5d9b76f4b77aff467746281b93e9d1009179c7 +Merge: 342a0335b1 32213e6266 +Author: 王怡栋 +Date: Wed Sep 15 11:20:32 2021 +0800 + + Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 + +commit 342a0335b13943be3d7983b45c2fea6e9e66c0ba +Author: 王怡栋 +Date: Wed Sep 15 11:19:54 2021 +0800 + + * Merge for bug #15187. + +commit 32213e6266be8621cf107f8b64c665228bd40ae5 +Author: tianshujie +Date: Wed Sep 15 10:59:09 2021 +0800 + + * Fix bug #15187. + +commit db1c0ebb309b5295bd55011e4644fa3df3e55d09 +Author: dingguodong +Date: Wed Sep 15 10:57:05 2021 +0800 + + * Merge codes for gitlab from 15.5. + +commit d38a39d6b6b2f83be8c17112f7b98392b7613d69 +Author: Hao Sun +Date: Wed Sep 15 10:54:55 2021 +0800 + + * bug #15187, redirect to tutorial page when user cancel to quit tutorial mode. + +commit abcc6dd94883e17c650201f7c7dde03b046acb3f +Merge: 9cedf76f8c afb19a3a14 +Author: dingguodong +Date: Wed Sep 15 10:38:00 2021 +0800 + + Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 + +commit 9cedf76f8ca884fbc29905fadfe3387e8eb9c324 +Author: dingguodong +Date: Wed Sep 15 10:36:36 2021 +0800 + + * Fix bug for the job with gitlab type, merged from master. + +commit afb19a3a14c1abfbff5da9135721669d8765f016 +Author: 王怡栋 +Date: Wed Sep 15 10:36:14 2021 +0800 + + * Merge for userbind btn. + +commit 7757da97f50b7023a274c456b765933cd4049a24 +Author: 王怡栋 +Date: Wed Sep 15 10:28:46 2021 +0800 + + * adjust for get wait project in program kanban. + +commit 0947f1a7e1c787df3efe8b51808a5783b30372d1 +Author: dingguodong +Date: Wed Sep 15 10:09:10 2021 +0800 + + * Improve code robustness for editing a job. + +commit 7e44cf65c0ea067bc3f040853ec79ffe646fea01 +Author: Guan Xiying +Date: Wed Sep 15 10:06:21 2021 +0800 + + * Check job reference is set. + +commit 310b23c8fa7087c60cca13ec97fd4cbe7215af1e +Merge: d2ef694ea6 77cab3ad10 +Author: 王怡栋 +Date: Wed Sep 15 10:05:04 2021 +0800 + + Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 + +commit d2ef694ea6246d32ff761e599149b979085d96c4 +Author: 王怡栋 +Date: Wed Sep 15 10:04:28 2021 +0800 + + * fix for set realStart when edit task. + +commit 4eaf583ea8f4d90ff26347abe02ccb61f2178a83 +Author: dingguodong +Date: Wed Sep 15 09:55:42 2021 +0800 + + * Fix bug when exec gitlab pipeline in job module. + +commit 96dac5453a698bebb5396a92c2c8361100ed96d2 +Author: liyuchun +Date: Wed Sep 15 09:16:11 2021 +0800 + + * Fix bug #15184. + +commit 77cab3ad10b27e71b229cbc9aac25249f0e3ce67 +Author: liyuchun +Date: Wed Sep 15 09:14:16 2021 +0800 + + * Fix bug #15184. + +commit 9ff54e47388186713134757255c4d9be30def33a +Author: hufangzhou +Date: Wed Sep 15 09:12:28 2021 +0800 + + * Fix bug #15150. + +commit 7e2632fdece079fa1b2db2babcf9f60bc531d741 +Author: hufangzhou +Date: Wed Sep 15 09:06:53 2021 +0800 + + * Fix bug #15151. + +commit 723e921b6e585010427069b2b2bea232001dc987 +Author: liyuchun +Date: Wed Sep 15 08:36:18 2021 +0800 + + * Fix bug #15169. + +commit a862b3b850a259ba924ef83b8e0bc7ef692dbd49 +Author: 王怡栋 +Date: Wed Sep 15 08:33:40 2021 +0800 + + * fix lang. + +commit 746b7c85a7b608b787bf7d3d19296c80f249ab87 +Author: chenfeiCF +Date: Tue Sep 14 12:54:42 2021 +0000 + + * Fix bug #15173. + +commit 89cd8317442453fefc9191ac4b40a31644586e25 +Author: 王怡栋 +Date: Tue Sep 14 17:33:43 2021 +0800 + + * adjust for 15.5. + +commit 1085bc1288535b48a7d8775d1df048c5f1d2f193 +Author: xieqiyu +Date: Tue Sep 14 17:27:56 2021 +0800 + + * Fix bug#15020. + +commit 9e165f93b75ff01581f8ee525e2aa3cb2068b9e6 +Author: Hao Sun +Date: Tue Sep 14 17:27:11 2021 +0800 + + * bug #15089, skip to show items count in kanban header. + +commit 626c95b0957aa474652bfc9cd534cfa17e0812ee +Author: tianshujie +Date: Tue Sep 14 17:24:42 2021 +0800 + + * Fix bug #15162. + +commit 11729b9730e600daa6ac3db1a278d4d24ed0ca4d +Author: dingna +Date: Tue Sep 14 17:24:29 2021 +0800 + + * Fix bug #15020. + +commit 3d5ff75decbb832840fd55eff93b5602bb5a682e +Author: tianshujie +Date: Tue Sep 14 16:42:39 2021 +0800 + + * Fix the problem of upgrade build error. + +commit d0c7c58f180a01178f79e9670506930f37c225fe +Author: hufangzhou +Date: Tue Sep 14 16:27:56 2021 +0800 + + * Fix bug #15172. + +commit 321b257bad258c50bae658681f7ff7ba204ec112 +Author: zenggang +Date: Tue Sep 14 16:19:41 2021 +0800 + + * Fix bug#14587 + +commit dd454a6bc30ef740d97b0b05da565c727964571a +Author: 王怡栋 +Date: Tue Sep 14 16:08:50 2021 +0800 + + * fix for flow. + +commit 8fc5296ee317d3dea0716bdb7ad41d7f0db16a4b +Author: dingna +Date: Tue Sep 14 16:05:32 2021 +0800 + + * Fix bug #15161. + +commit 14993337dbf0625e1907a774496f4dcaa3ad13cd +Author: lichengjun +Date: Tue Sep 14 07:52:11 2021 +0000 + + * Fix bug#14177. + +commit b7696df6ce10f26a18378739b6cf1c62949718af +Author: liyuchun +Date: Tue Sep 14 15:48:07 2021 +0800 + + * Update skip guide key. + +commit 47da26c5c84a18b8f984e0acc1fbe9ea9a55ab3d +Author: xieqiyu +Date: Tue Sep 14 15:39:36 2021 +0800 + + * Fix bug#15149. + +commit 7e4e07d82cbf01dc071d6e1c7839b3701cc038af +Author: tianshujie +Date: Tue Sep 14 15:15:41 2021 +0800 + + * Fix bug #14892. + +commit 7f748cfa0e8fb0a1829c06654b70d9fdcb009667 +Author: tianshujie +Date: Tue Sep 14 15:13:35 2021 +0800 + + * Fix bug #15101. + +commit 3302a7bedb512139111b8d2c61b8d487ce81649d +Author: liyuchun +Date: Tue Sep 14 15:10:15 2021 +0800 + + * Code for task #41764. + +commit 358ab9fcb4b77cdda7211ab298a1926ae8cdfebe +Merge: 825184e665 9691ae8a73 +Author: liyuchun +Date: Tue Sep 14 15:09:24 2021 +0800 + + Merge branch '15.5' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 + +commit 825184e665cf286a022e6da957261acc63e1615a +Author: liyuchun +Date: Tue Sep 14 15:08:38 2021 +0800 + + * Adjust new feature style. + +commit 9691ae8a735cffe61738b3d5bedce045fdddb417 +Author: tianshujie +Date: Tue Sep 14 15:07:38 2021 +0800 + + * Fix bug #15160,15159. + +commit 48254bab16feece0f9b232f94d233332e38a7852 +Author: liyuchun +Date: Tue Sep 14 15:02:34 2021 +0800 + + * Code for task #41764. + +commit ac0dda63e5189f99308a2f47934f309e4b9b299e +Merge: 605ee502be c5c5a8e789 +Author: liyuchun +Date: Tue Sep 14 15:01:10 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit c5c5a8e789f3f14887d261df21cb3de4d05a40d4 +Merge: 993fc51fbd 6a13fd7d73 +Author: 王怡栋 +Date: Tue Sep 14 14:56:37 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 993fc51fbd84829de1fc877e1b3cc9458596c82b +Author: 王怡栋 +Date: Tue Sep 14 14:55:58 2021 +0800 + + * adjust for flow. + +commit 6a13fd7d73453485cf61ed683a3316515b024fc6 +Merge: f6f851312a 1916e9172a +Author: zhujinyong +Date: Tue Sep 14 14:52:06 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit f6f851312a1b16858f7e204f9b3d3b95b0e1a1df +Author: zhujinyong +Date: Tue Sep 14 14:51:01 2021 +0800 + + * Adjust fields of story. + +commit 1916e9172a52e5cba80b2abfa6054e7d357b8a04 +Author: tianshujie +Date: Tue Sep 14 14:34:07 2021 +0800 + + * Fix bug #15159. + +commit cef9898958c51b86c1ffa0967e19eeebfdfb52c6 +Merge: 5a27bc0249 75a44c6a05 +Author: lichengjun +Date: Tue Sep 14 06:31:41 2021 +0000 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5a27bc0249f724332ecfca9f68ea001a42b0c661 +Author: lichengjun +Date: Tue Sep 14 06:29:58 2021 +0000 + + * Adjust GitLab userbind browse html. + +commit 75a44c6a059e0350dc0c0becc695b58cf2a3df68 +Author: zenggang +Date: Tue Sep 14 14:26:54 2021 +0800 + + * Fix bug#14926 + +commit 605ee502be5839daf7f8e2f6be43f4b8ffaa2cdf +Author: liyuchun +Date: Tue Sep 14 14:25:56 2021 +0800 + + * Adjust new feature style. + +commit 4a41a2888e1ac6b266560b4ec65e9815b63036ce +Author: xieqiyu +Date: Tue Sep 14 14:21:46 2021 +0800 + + * Fix bug#15149. + +commit 464d641b513ce6b39bcd9bb4680d4e0a60a1596f +Author: tianshujie +Date: Tue Sep 14 14:22:00 2021 +0800 + + * Fix bug #15101. + +commit 7afe10e852eb5ea32d5f4b234d8a85dbb8b7873a +Merge: 9d3c257592 56a6accf6a +Author: zhujinyong +Date: Tue Sep 14 14:06:31 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 9d3c257592bea4e7525ecf055c0656a557e1e20d +Author: zhujinyong +Date: Tue Sep 14 14:05:56 2021 +0800 + + + Add POST for testcases. + +commit 56a6accf6a1557b7c1c87e626bbb4b53de89624c +Author: tianshujie +Date: Tue Sep 14 13:22:06 2021 +0800 + + * Fix bug #14892. + +commit f60c06fd5c117907fb6b51bd388a33516842361e (tag: zentaopms_15.5_20210914) +Merge: b70381885a aebeda9ce2 +Author: 王怡栋 +Date: Tue Sep 14 11:36:22 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b70381885af9f43b2da7f314974c883499732deb +Author: 王怡栋 +Date: Tue Sep 14 11:36:00 2021 +0800 + + * add new version and upgrade. + +commit aebeda9ce212923bbb491fb971534fef7fc9c6da +Merge: fdb1aa702f aa8ca4b8ed +Author: lichengjun +Date: Tue Sep 14 03:33:13 2021 +0000 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit fdb1aa702fe3b29562b9911cee1a6fb7e719ee87 +Author: lichengjun +Date: Tue Sep 14 03:32:20 2021 +0000 + + * Adjust branch view manage code. + +commit aa8ca4b8edb846e9ce4757839fb858ae71d00467 +Merge: 659a466795 05f8e92c08 +Author: zhujinyong +Date: Tue Sep 14 11:31:00 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 659a466795fa6b7b20f966ca15c66f127cedbb45 +Author: zhujinyong +Date: Tue Sep 14 11:30:17 2021 +0800 + + * Fix key of testcases. + +commit 05f8e92c089ee180ad810b02ee8b2922a1cc5116 +Merge: 96fd75142f 87397bf86f +Author: liyuchun +Date: Tue Sep 14 11:29:52 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 87397bf86fb971c0aafe61a2afa0e3c3be99c43c +Author: tianshujie +Date: Tue Sep 14 11:23:56 2021 +0800 + + * Fix bug #15138. + +commit 96fd75142feaa5a49d576a1ae229c5cefa9d5c63 +Author: liyuchun +Date: Tue Sep 14 11:20:00 2021 +0800 + + * Code for task #41764. + +commit 0dc8bcf78118892b1af9f57a7a78ab455ef75045 +Author: lichengjun +Date: Tue Sep 14 03:18:39 2021 +0000 + + * Add the back button. + +commit bbb3a6b78098d9bda3cbf12d3be0592a576cc777 +Merge: 79ed71d8d8 6491d1aaf0 +Author: lichengjun +Date: Tue Sep 14 03:02:55 2021 +0000 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6491d1aaf0cead05a4581c49b19dbbbee239d5ee +Merge: dc1021747b 5c6a6e39b0 +Author: zhujinyong +Date: Tue Sep 14 10:57:21 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit dc1021747b3df95bb758c3b817ce0bc3d9dca958 +Author: zhujinyong +Date: Tue Sep 14 10:56:40 2021 +0800 + + * Fix GET of testcases. + +commit 5c6a6e39b096f049cb40741472acb96cf9f8c533 +Author: zenggang +Date: Tue Sep 14 10:38:27 2021 +0800 + + * Fix bug#15072 + +commit 7fffa6c3804af3a24e5384f4fed80aaeccacda51 +Author: xieqiyu +Date: Tue Sep 14 10:33:19 2021 +0800 + + * Code for bug#15148. + +commit dadd7f68d800a831872d9d19f3c20c464f6ec095 +Author: zhujinyong +Date: Tue Sep 14 10:29:12 2021 +0800 + + * Adjust routes for API. + +commit e1eeae030a117ec17748fbd672de7e787dbb71a1 +Merge: 179cf13221 59ef172f9c +Author: 王怡栋 +Date: Tue Sep 14 10:25:05 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 179cf1322149e4399eb140937bb10418a29ee9c3 +Author: 王怡栋 +Date: Tue Sep 14 10:24:34 2021 +0800 + + * fix bug #14690. + +commit 59ef172f9c5156d24375e4a79d1ba3a712351786 +Author: liyuchun +Date: Tue Sep 14 10:22:40 2021 +0800 + + * Fix bug #14682. + +commit be91f00d153ab7c1cb43d2b2f759d2ffe2971886 +Author: 孙广明 +Date: Tue Sep 14 10:11:08 2021 +0800 + + * Fix release back link. + +commit 6b53c5380b790db8e08d4ac46bd42df280a59a8b +Author: 孙广明 +Date: Tue Sep 14 10:05:53 2021 +0800 + + * Fix productplan back link. + +commit 9a72344c79941ae98a847f3e9fd62d30f63c72b3 +Author: Hao Sun +Date: Tue Sep 14 10:04:37 2021 +0800 + + * adjust text style of kanban lane name. + +commit f6e99ac6a979cd758e9d4a87093fcb57d754731b +Merge: b0f587b061 a22c3ba71f +Author: hufangzhou +Date: Tue Sep 14 09:57:39 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b0f587b061f97e83e3312bee4425713ccda88bdf +Author: hufangzhou +Date: Tue Sep 14 09:57:29 2021 +0800 + + * Fix bug #14835. + +commit a22c3ba71ffd646ec3775d0bd4254adb98870fb1 +Author: liyuchun +Date: Tue Sep 14 09:48:12 2021 +0800 + + * Adjust access permission of create doc. + +commit ef4d051601337add0fb12deeda1fa6504a90ba9b +Author: tianshujie +Date: Tue Sep 14 09:41:17 2021 +0800 + + * Fix bug #14219. + +commit f27982fe580fd1847a563bbc1f9f8399a28f4f4d +Merge: 11ea717fa6 5888921712 +Author: tianshujie +Date: Tue Sep 14 09:31:43 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 11ea717fa656f6d926a07f3e21f748fc8a8b9624 +Author: tianshujie +Date: Tue Sep 14 09:31:20 2021 +0800 + + * Fix bug #14858. + +commit 58889217122b434c1abbab500165a8e2926d4347 +Author: dingna +Date: Tue Sep 14 09:27:23 2021 +0800 + + * Finish task #42375. + +commit a3205654597eb9f1d3e65c0e0399ae8a05f8fffa +Author: tianshujie +Date: Tue Sep 14 09:28:02 2021 +0800 + + * Fix bug #14858. + +commit 6748622c623d753aa535e02cf347d5a5cedd34fb +Author: liyuchun +Date: Tue Sep 14 09:16:06 2021 +0800 + + * Change image of young blue theme. + +commit 8e2eae4f050786bca219691d84b5887047d99faf +Author: liyuchun +Date: Tue Sep 14 08:59:24 2021 +0800 + + * Fix bug #14697. + +commit c473a76d0187db6a4506c53ab22d71a4e32e8c07 +Author: tianshujie +Date: Tue Sep 14 08:56:22 2021 +0800 + + * Fix bug #15136. + +commit bd55ba11098eaad5665208af0b7d57a5b7c43b50 +Author: 王怡栋 +Date: Tue Sep 14 08:39:59 2021 +0800 + + * fix bug #14975. + +commit ba9c9f836cc74cf627582107b51ed6980bf90016 +Author: Hao Sun +Date: Mon Sep 13 17:17:59 2021 +0800 + + * bug #14902, affix table custom btn on top when scrolling page. + +commit a4d66018e66ed38e662d4938a49fb91f97180ea5 +Merge: df3d33e91f 12eed7bca6 +Author: dingna +Date: Mon Sep 13 17:02:21 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit df3d33e91fa04e8e224e5b6d7d3287cfe5df375c +Author: dingna +Date: Mon Sep 13 16:56:52 2021 +0800 + + * Fix bug #14930. + +commit 12eed7bca6b6dcaf548a8d3f1a96630543e150ea +Merge: 94854c4dec 8497408724 +Author: hufangzhou +Date: Mon Sep 13 16:03:43 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 94854c4decb210de0cf17658a8e81f51069339ba +Author: hufangzhou +Date: Mon Sep 13 16:03:34 2021 +0800 + + * Adjust the width of execution story actions. + +commit 79ed71d8d8acb134687d06778d3428bc3a7b762c +Merge: 4bc78961be 8497408724 +Author: lichengjun +Date: Mon Sep 13 07:39:29 2021 +0000 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4bc78961be2a2abacdd50212895ed0f79c1d502f +Author: lichengjun +Date: Mon Sep 13 07:36:33 2021 +0000 + + * Fix bug id15128. + +commit 933e35279652149121377d41a819e09671799ff5 +Merge: 01fe1161a9 33e1839583 +Author: hufangzhou +Date: Mon Sep 13 15:25:54 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 01fe1161a90fea6034306503d6afef3b53936e2e +Author: hufangzhou +Date: Mon Sep 13 15:25:45 2021 +0800 + + * Fix bug #15133. + +commit 33e183958323f3ba2e3e8c48b79b4075670930ff +Author: liyuchun +Date: Mon Sep 13 15:01:40 2021 +0800 + + * Fix bug #15121. + +commit e4cf744e87d19a61d7028dbc8070e059e33dfe1b +Merge: 3c75a3e024 ebda4e7a4e +Author: lichengjun +Date: Mon Sep 13 06:30:20 2021 +0000 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3c75a3e024609e03ad126a9cfddd9d52522036a9 +Author: lichengjun +Date: Mon Sep 13 06:29:21 2021 +0000 + + * Fix bug #15012 + +commit ebda4e7a4e85870979f652a2bdb595f79c5464f9 +Author: Hao Sun +Date: Mon Sep 13 14:12:25 2021 +0800 + + * change features modal type to "iframe". + +commit 21ca95f7be2044a98873069dccc5f73ea4162354 +Author: xieqiyu +Date: Mon Sep 13 13:56:36 2021 +0800 + + * Fix bug#15090. + +commit d85d84095a67449130301ea766365b4aea0d26d7 +Merge: 7ba0c35e35 d2db472868 +Author: dingguodong +Date: Mon Sep 13 13:53:25 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d2db4728682cc3250c1424e3227534dd70536ceb +Author: Hao Sun +Date: Mon Sep 13 13:41:39 2021 +0800 + + * refactor usage of showFeaturesDialog(). + +commit 8497408724cc135083c87a76aad85b7eafa03a7c +Author: tianshujie +Date: Mon Sep 13 13:28:32 2021 +0800 + + * Fix bug #14810. + +commit ebad305ad8e34f89b4403d7996321c6d423be09d +Author: liyuchun +Date: Mon Sep 13 15:34:17 2021 +0800 + + * Fix bug #14747. + +commit 4f13760c32c58e62b3c46d3dc72672b2230c6c44 +Author: tianshujie +Date: Mon Sep 13 13:17:05 2021 +0800 + + * Fix bug #14810. + +commit 13614e058bca9d3e3d5c3d0433bfb3f9111e0819 +Author: lichengjun +Date: Mon Sep 13 05:04:18 2021 +0000 + + * Fix GitLab MR edit template style. + +commit 8dd99a2f51b4699c93e1805d09f39fa339e581f6 +Author: lichengjun +Date: Mon Sep 13 04:50:56 2021 +0000 + + * Adjust common model code style. + +commit 96ab6dbca2327c4979890ddd43ef47e88b7d2f34 +Author: lichengjun +Date: Mon Sep 13 04:48:16 2021 +0000 + + * * Fix bug#14574 + +commit 3e59e58fdb1f7e9cf74aaba86f93276132865d1b +Merge: 0a8d494e8c d18e3632dc +Author: liyuchun +Date: Mon Sep 13 11:17:48 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit d18e3632dc74ae63aa2438a03ee65af5ed8234b6 +Merge: c9eb3ebfa1 4e3933ddad +Author: 王怡栋 +Date: Mon Sep 13 11:16:37 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0a8d494e8c4e8af40b49d0e9bc68b48a94f2b3d1 +Author: liyuchun +Date: Mon Sep 13 11:16:32 2021 +0800 + + * Fix bug #15113. + +commit c9eb3ebfa122ff31b41603c6e273aa5801f6298f +Author: 王怡栋 +Date: Mon Sep 13 11:14:54 2021 +0800 + + * fix bug for finish task by repo. + +commit 4e3933ddad317b561a51c85f5e6f124afdb836e7 +Author: liyuchun +Date: Mon Sep 13 11:08:23 2021 +0800 + + * Fix bug #15106. + +commit 7ba0c35e35ad235e3588c3847336a56e0f50e18f +Author: dingguodong +Date: Mon Sep 13 10:45:02 2021 +0800 + + * Correct the misspelled word. + +commit dbd2bb524853f2e65d845345af7b9ca2847d556f +Merge: 4ed8765f38 e2008d5c31 +Author: hufangzhou +Date: Mon Sep 13 10:27:21 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4ed8765f385a09d02e0b4a1510d05e656648b785 +Author: hufangzhou +Date: Mon Sep 13 10:27:11 2021 +0800 + + * Fix bug #15093. + +commit e2008d5c313119bf041eabd20256e4db00d76219 +Author: zenggang +Date: Mon Sep 13 10:23:05 2021 +0800 + + * Fix bug#15099 + +commit 275a567b7ac29175c66014a1ac664f19c9584a79 +Author: tianshujie +Date: Mon Sep 13 10:12:53 2021 +0800 + + * Modify function comment. + +commit 8219bc43d356c2c29acf1d338bb61d687b3cc5da +Author: tianshujie +Date: Mon Sep 13 09:52:24 2021 +0800 + + * Fix bug #14966. + +commit 62bcf528b2ceb208a793190ba70cbf76c1f32823 +Author: zenggang +Date: Mon Sep 13 09:17:09 2021 +0800 + + * Fix bug#15087 + +commit c411204b8bbd96a0ae4c1a5d22454f11301831a9 +Author: xieqiyu +Date: Mon Sep 13 09:03:55 2021 +0800 + + * Fix bug#15085. + +commit 5b366705214757614a62556d279ba8059910f417 +Author: dingguodong +Date: Mon Sep 13 08:51:03 2021 +0800 + + * Correct the wrong comments in the gitlab module. + +commit 663defda35ae6b48aad0cc3538d81838a6a3e625 +Author: dingguodong +Date: Mon Sep 13 08:35:41 2021 +0800 + + * Correct the misspelled word. + +commit 12c7c7a1cf3ae43528e757c0e4b0133a6d310f9f +Author: zenggang +Date: Fri Sep 10 15:24:26 2021 +0800 + + * Fix bug#15095 + +commit d71edd6474bdb003b4ee3a0de4c7d9cef19f0b58 +Author: lichengjun +Date: Fri Sep 10 05:12:50 2021 +0000 + + * Adjust GitLab MR text style. + +commit f686c987b7fc958ff8d8f344b98191092563c4e3 +Author: lichengjun +Date: Fri Sep 10 05:09:32 2021 +0000 + + * Adjust GitLab MR text style. + +commit 2fadc69fa3b13802cfef18ebf8b1cf70c308458d +Author: 王怡栋 +Date: Fri Sep 10 11:34:10 2021 +0800 + + * fix bug #15083,15079. + +commit 9bda624e57fc89ded346a99be1dc957b789c9888 +Merge: 5bc20274e0 4ff032d2d5 +Author: 王怡栋 +Date: Fri Sep 10 11:25:40 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5bc20274e08f29d77bd7bdec0d2068385f3197c7 +Author: 王怡栋 +Date: Fri Sep 10 11:24:25 2021 +0800 + + * fix bug #14701. + +commit 4ff032d2d5da9ac9016651204ed254bf6b4a7b92 +Merge: 798c0b202c e546ca3adb +Author: zhujinyong +Date: Fri Sep 10 10:15:26 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 798c0b202cd6870ad2f2f2066ef8a26e079841cb +Author: zhujinyong +Date: Fri Sep 10 10:14:22 2021 +0800 + + * Fix GET builds and projects of API. + +commit e546ca3adb7dc1734eb581d28a34955bbaf95205 +Author: zenggang +Date: Fri Sep 10 10:10:48 2021 +0800 + + * Fix variable name expression accuracy. + +commit 553c797c67cbccb71c1902f4272fc74d0b08a234 +Author: liyuchun +Date: Fri Sep 10 09:34:19 2021 +0800 + + * Fix get products error. + +commit 5f8f9dca5491849c2bc43229c2e205d4e09954c2 +Author: Hao Sun +Date: Fri Sep 10 09:18:03 2021 +0800 + + * fix background color for empty sub lanes. + +commit 6ac0a2c55a9b84bb343fd36bcdec511ef9029c07 +Author: Hao Sun +Date: Fri Sep 10 09:13:31 2021 +0800 + + * set max col height to auto for project kanban. + +commit b1b6f24e2dd06264b7c6f121268ea919b86f9929 +Merge: 5617d3b89d 15c3de1171 +Author: 王怡栋 +Date: Fri Sep 10 08:54:40 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4a4afa23d9d915f0ca4b0f91641bd86b85ab5b13 +Author: dingguodong +Date: Fri Sep 10 08:53:13 2021 +0800 + + * Rename function for display action(JIHU). + +commit 15c3de11719508eba50fe19e4e139dd135275926 +Merge: d2b43d2a2f d2e77394b8 +Author: zhujinyong +Date: Fri Sep 10 08:35:29 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit d2b43d2a2f4fa0dc6801a0fb716721ecf7db3088 +Author: zhujinyong +Date: Fri Sep 10 08:35:03 2021 +0800 + + * Fix bugs of product api. + +commit 90839a8c9476b33179cdf339632fca9fdde1e1b7 +Author: zhujinyong +Date: Fri Sep 10 08:34:10 2021 +0800 + + * Get builds by projectID. + +commit d2e77394b822cfaeeea5326af82cc19ac768127b +Author: Hao Sun +Date: Fri Sep 10 08:27:20 2021 +0800 + + * improve kanban UI. + +commit 30afa04d257d67c6254328204a044d43f012ff3d +Author: Hao Sun +Date: Fri Sep 10 08:26:17 2021 +0800 + + * support for adjusting horizontal position of kanban header automatically on scrolling page. + +commit 4dc316fb21f9586c2a3118a13deaa556733078b9 +Merge: ff5288131b a17e173ab2 +Author: lichengjun +Date: Thu Sep 9 13:06:35 2021 +0000 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ff5288131b5edcf08c554849a532ffebbfb53c90 +Author: lichengjun +Date: Thu Sep 9 13:05:38 2021 +0000 + + * Adjust Details Code Format. + +commit a17e173ab21ae0c3b901739fc06f757df11f9d4c +Author: Hao Sun +Date: Thu Sep 9 20:48:01 2021 +0800 + + * bug #15078, disable scrollbar for kanban container. + +commit 897bfa094ac8ad9fb2d4cc85bea37e58b37840f4 +Author: Hao Sun +Date: Thu Sep 9 20:41:47 2021 +0800 + + * limit #main width by update zui.css. + +commit 666845d17915a8d3665a109120707d7def3ca7ba +Author: Hao Sun +Date: Thu Sep 9 20:41:18 2021 +0800 + + * change min height for kanban lane. + +commit 7edde287add4c03c7e332c206fe5f2bf1ff87ed7 +Merge: 0669d4653a 974633de86 +Author: lichengjun +Date: Thu Sep 9 12:10:19 2021 +0000 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0669d4653a93424f030b202cac98f4954b1766a5 +Author: lichengjun +Date: Thu Sep 9 12:08:58 2021 +0000 + + * Adjust Details Code Format. + +commit 974633de86cd4aff1acff6f965918e0d5ecbce25 +Author: liyuchun +Date: Thu Sep 9 19:44:03 2021 +0800 + + * Finish task #42143. + +commit b8e19bf4fc331fb236ab89b71ec069fdd3301d5f +Author: lichengjun +Date: Thu Sep 9 10:29:13 2021 +0000 + + * Adjust GitLab MR Details Style. + +commit c2f95a20c73cb10262d0b6c90b6bff1b4c1df443 +Merge: 4c8a29b414 a8c1cd4c6a +Author: dingguodong +Date: Thu Sep 9 18:00:03 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit a8c1cd4c6a532b053666f19dafd97ceb573aec70 +Author: zenggang +Date: Thu Sep 9 17:59:11 2021 +0800 + + * Fix builds post、put api + +commit 4c8a29b41492047c55c507b56bdc293578dd7427 +Author: dingguodong +Date: Thu Sep 9 17:58:57 2021 +0800 + + * Fix bug when call API due to actor of action is System. + +commit f2b7e270d3fd6661aeb2771eed37538b5233a7fc +Author: lichengjun +Date: Thu Sep 9 09:55:11 2021 +0000 + + * Fix gitlab mr details format. + +commit f748d83c352cbf616bae5337710807677c975d1a +Author: dingguodong +Date: Thu Sep 9 17:27:55 2021 +0800 + + * Rename index to key for array loop and improve robustness. + +commit 8c478196a2d14751dcc085232512d6dc607e5570 +Author: Hao Sun +Date: Thu Sep 9 17:00:32 2021 +0800 + + * fix php error when click task link in tutorial mode. + +commit 0a7f3469e2411ba181bdea571de2a3b2766e710f +Author: tianshujie +Date: Thu Sep 9 16:58:24 2021 +0800 + + * Fix bug #14957. + +commit 0ac0e19e3e612a6ebd675f0808f81a4ec8babc89 +Author: Hao Sun +Date: Thu Sep 9 16:55:32 2021 +0800 + + * bug #15024, limit min height for kanban lane. + +commit 83e14d45f13a1ea16071ea9bb9c02be177fbbae2 +Author: Hao Sun +Date: Thu Sep 9 16:50:36 2021 +0800 + + * bug #15082, fix php error in tutorial mode. + +commit e052c27f4ca6b9d157447fc239437b5890aab1ca +Author: Hao Sun +Date: Thu Sep 9 16:43:33 2021 +0800 + + * bug #14690, update language data for tutorial tasks. + +commit ff58f5dfba3987e98831d034f46c1bdf0a751050 +Author: Hao Sun +Date: Thu Sep 9 16:31:15 2021 +0800 + + * disable datatable in tutorial mode to prevent content overflow. + +commit cefac14189b319005737911e05598a02cd9cc800 +Author: thanatos +Date: Thu Sep 9 16:28:31 2021 +0800 + + finish api doc table + +commit 6aa4a3d163bab64e12d74e554ae771fcbc3df1a6 +Author: xieqiyu +Date: Thu Sep 9 16:13:05 2021 +0800 + + * Fix bug#14951. + +commit 96474f4801cc5c656ad4467dc143373c4d9104c1 +Author: dingguodong +Date: Thu Sep 9 16:04:01 2021 +0800 + + * Reformat code for API(JIHU). + +commit 234c40f41762a27d405ff5f4a21deb13496f568b +Author: Hao Sun +Date: Thu Sep 9 15:51:32 2021 +0800 + + * bug #15013, hide some columns for tutorial mode. + +commit b08066c64c68be6d18d0ef585a84e1c163ed3a38 +Author: Guan Xiying +Date: Thu Sep 9 15:45:34 2021 +0800 + + * Change getSingleCommit to getCommitedDate, + +commit 5c4178002db2ff070c75e3e7cd4f1d08b022acd3 +Author: Guan Xiying +Date: Thu Sep 9 15:44:27 2021 +0800 + + * Remove extra space. + +commit f336c6d370be667142210c2300630377cea1241a +Author: zenggang +Date: Thu Sep 9 15:41:39 2021 +0800 + + + projectrelease api + +commit a3a274ba034542c9189e8872c535cf3c07fc63e4 +Author: Hao Sun +Date: Thu Sep 9 15:39:19 2021 +0800 + + * remove ellipsis from long text in kanban. + +commit 8b9498d95a277d7a162169e695c8dd218c1ceb52 +Author: Hao Sun +Date: Thu Sep 9 15:34:44 2021 +0800 + + * prevent users from closing features dialog by click the backdrop. + +commit 500555d1737ddc6b25008d8df6b07582bc8d7504 +Author: tianshujie +Date: Thu Sep 9 15:33:37 2021 +0800 + + * Fix bug #14948. + +commit 851ed6e17cc3821e401193c79e846008420478cf +Author: Hao Sun +Date: Thu Sep 9 15:30:15 2021 +0800 + + * fix next step btn not show in features dialog as expected. + +commit 6ebab91d33e6a7e807c96fbb0e91d7da1873520a +Author: zenggang +Date: Thu Sep 9 15:16:38 2021 +0800 + + + projectrelease api + +commit 3246254d04c5c9a9214f219e05545d24c0bce162 +Author: tianshujie +Date: Thu Sep 9 15:08:07 2021 +0800 + + * Fix bug #15075. + +commit d038b14aee4d1646203f5862c9a4c334b419fb72 +Author: tianshujie +Date: Thu Sep 9 15:07:48 2021 +0800 + + * Fix bug #14957. + +commit 963be97b9a1c2cce7e3235d4ed294a3b2f6d4f66 +Author: Hao Sun +Date: Thu Sep 9 14:57:30 2021 +0800 + + * bug #14817, remove copy btn in tutorial mode. + +commit 42e7e8d29e22bd64368632af7e2114c0e6cb005f +Author: Hao Sun +Date: Thu Sep 9 14:53:24 2021 +0800 + + * bug #15011, hide some cols in tutorial mode to avoid overflow. + +commit 805cc92c339aa54323bd8d1ffe438009afa82b30 +Author: Hao Sun +Date: Thu Sep 9 14:52:52 2021 +0800 + + * fix tooltip not show when flow linkStory task in tutorial mode. + +commit 56eb32dc3ab39d49859dfeb5b9f8f129d7cdbeb4 +Merge: 5b9332cfff 31a0b96717 +Author: dingguodong +Date: Thu Sep 9 14:48:23 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5b9332cfff3754495023eb78e9a872acbf5b961b +Author: dingguodong +Date: Thu Sep 9 14:47:27 2021 +0800 + + * Remove mrapprove from todo type list due to incomplete implementation. + +commit 31a0b9671754ee0920998e51119ff952edf87285 +Merge: 30fc52a695 fa2e8cd1b0 +Author: lichengjun +Date: Thu Sep 9 06:45:59 2021 +0000 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit fa2e8cd1b0773079b629445bca89ee10aaef2b8e +Author: liyuchun +Date: Thu Sep 9 14:43:41 2021 +0800 + + * Fix bug #15004. + +commit 30fc52a6953130a5b07920ef6ebc0465ca13ba8b +Author: lichengjun +Date: Thu Sep 9 06:42:09 2021 +0000 + + * Fix GitLab mr Details Style And API request condition status pending. + +commit 0a57ae9e091c5bf71cf3f6c146ece4b5a1eb374d +Author: Hao Sun +Date: Thu Sep 9 14:41:57 2021 +0800 + + * bug #15017, adjust table style in product/all in tutorial mode. + +commit 5617d3b89d96f9cd0009cdd9bca73d6b5bf5f5fd +Author: 王怡栋 +Date: Thu Sep 9 14:33:09 2021 +0800 + + * adjust for edit project in program. + +commit c9d9a16b7d8686450fb701eda251079df6827361 +Author: Hao Sun +Date: Thu Sep 9 14:25:24 2021 +0800 + + * align checkbox in product table list. + +commit 3e81a3ac58bca099492dd36222bc29aba7f0f14e +Author: Hao Sun +Date: Thu Sep 9 14:17:39 2021 +0800 + + * bug #15030, improve UI for scrolling in kanban page. + +commit 230c02728fd2fc4d4360b68ac016526d48978ea8 +Author: Hao Sun +Date: Thu Sep 9 14:03:46 2021 +0800 + + * bug #15069, show zero count in kanban header. + +commit d05c78c0d248c75a6d36c251f463d5c942a8aa15 +Merge: 4ca4f1457c 743b5d1d1a +Author: zhujinyong +Date: Thu Sep 9 13:58:46 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4ca4f1457c78972cf45fde0c314d6aabeae94c93 +Author: zhujinyong +Date: Thu Sep 9 13:58:27 2021 +0800 + + + Add release and productplan entry point. + +commit 743b5d1d1a379732c0c866b2fb8f2fde7d84a15a +Author: Hao Sun +Date: Thu Sep 9 13:51:38 2021 +0800 + + * fix tutorial mode for classic mode. + +commit 71c5376be7a212381b0999edfe41817f8a04ada1 +Author: Hao Sun +Date: Thu Sep 9 13:41:16 2021 +0800 + + * bug #15069, fix doing execution and prooject count not show. + +commit 851fa4a77af4ec25942093dd1d785c05eb014a90 +Author: tianshujie +Date: Thu Sep 9 13:38:44 2021 +0800 + + * Modify the problem that the avatar of the program list is incorrectly reported. + +commit 6cb8ca59086084fd1c7c4c6dfc2fdabf4634c3be +Author: tianshujie +Date: Thu Sep 9 13:33:14 2021 +0800 + + * Fix bug #14948. + +commit 7cb746d5bb872cc3eaf1fe68fd0d2a8a39daacbb +Author: dingguodong +Date: Thu Sep 9 13:30:39 2021 +0800 + + * Correct select merge request from db. + +commit 960a67884a84a6b7cc85a8a19c39371aaf603e86 +Author: thanatos +Date: Thu Sep 9 13:16:00 2021 +0800 + + fix dao class commit & commit api doc 15.5 + +commit f54cf01c047adca1d8d452be180e7024503fa288 +Author: Hao Sun +Date: Thu Sep 9 12:33:51 2021 +0800 + + + add misc/features page. + +commit 6b3b5661dba877bdcb79de8f4f072bad8ad088e5 +Author: Hao Sun +Date: Thu Sep 9 12:33:32 2021 +0800 + + + add corousel component. + +commit 893f0455f521e14eb06ad04d925f5cb2aa966514 +Author: dingguodong +Date: Thu Sep 9 11:50:45 2021 +0800 + + * Fix bug when creating todo for mr. + +commit 6a6f5c1883c21b274337166da0feb4da25f62b1d +Author: dingguodong +Date: Thu Sep 9 11:43:28 2021 +0800 + + * Adjust sql location. + +commit ce3d71c7958ac85a73a7a570b037f6bbfa738289 +Author: dingguodong +Date: Thu Sep 9 11:30:50 2021 +0800 + + * Add merge request title to that todo. + +commit 11c16786bf83285e38e1e0fcc76c3bdca429c91a +Author: dingguodong +Date: Thu Sep 9 11:23:05 2021 +0800 + + * Remove reviewer from lang thoroughly. + +commit b0b3ccd77bbe1f870763d4603df71cba857c941e +Merge: 1c45dfc33f 9e8583ee1e +Author: dingguodong +Date: Thu Sep 9 11:20:50 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1c45dfc33f8e20ef2152d5239e8cc1f85332c91d +Author: dingguodong +Date: Thu Sep 9 11:19:55 2021 +0800 + + * Fix bug #15033, complete TODO for merge request. + +commit aed241bd0eed6b19283a70c7d161bf89dfec1f9f +Author: dingguodong +Date: Thu Sep 9 11:19:11 2021 +0800 + + * Correct and optimize function apiGetTodoList. + +commit 9e8583ee1e0e973a4d8faa05325411a4f5e7be61 +Author: tianshujie +Date: Thu Sep 9 11:06:58 2021 +0800 + + * Ignore admin when judging permissions. + +commit 2a86208f6582bc4bed4929edcbd558c21e0a16e7 +Author: tianshujie +Date: Thu Sep 9 10:51:06 2021 +0800 + + * Fix bug #14957. + +commit 2c0ea271c2dd5def3e3b14eb27df42c2b7790778 +Author: liyuchun +Date: Thu Sep 9 10:47:32 2021 +0800 + + * Fix bug #14361. + +commit 29ea0911613ee4c2e305825cdc76ffbda84a1013 +Author: hufangzhou +Date: Thu Sep 9 10:39:49 2021 +0800 + + * Finish task #42412. + +commit 185ebad02f0316b4890d3629834737c76b963c44 +Merge: 140a632498 1cf0703cd6 +Author: hufangzhou +Date: Thu Sep 9 10:26:14 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 140a63249806aa013844c05c1843f2e41f99fc9a +Author: hufangzhou +Date: Thu Sep 9 10:26:10 2021 +0800 + + * Finish task #42391. + +commit 1cf0703cd6ba2ee85611efd9dd781c941c904dce +Merge: 462d61fcf3 1b8e9f4a71 +Author: 王怡栋 +Date: Thu Sep 9 10:25:59 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 462d61fcf3542954815c8919fd0ff94fc00f9a7d +Author: 王怡栋 +Date: Thu Sep 9 10:25:06 2021 +0800 + + * adjust priv and fix bug for view assigned todo. + +commit 1b8e9f4a71caa3bd797aa485b8af682c9f2978a1 +Author: liyuchun +Date: Thu Sep 9 10:06:16 2021 +0800 + + * Finish task #42377. + +commit 5b10432b7506f50838a1c7de64a6e7c8f065599e +Author: Hao Sun +Date: Thu Sep 9 10:01:13 2021 +0800 + + * refactor: remove console.log. + +commit 0b3309033fe36b22d725fd9dd579e9082c4f0ebc +Author: 孙广明 +Date: Thu Sep 9 09:54:55 2021 +0800 + + * Fix details. + +commit 2f192ff299d9b6c89038df6bab1f2a8ca1433150 +Author: Hao Sun +Date: Thu Sep 9 09:47:08 2021 +0800 + + * adjust kanban layout after render. + +commit 842f2209a02c7bf49893abc1d846f63291ddcd70 +Author: dingguodong +Date: Thu Sep 9 09:44:04 2021 +0800 + + - Remove reviewer from creating and updating MR. + +commit 926d0cc79407d00b93322884553fe74330f07a62 +Author: dingguodong +Date: Thu Sep 9 09:35:48 2021 +0800 + + * Change the lang for reviewer in MR module. + +commit db621d4f79f060c76b05a2769605c37f044d8ee2 +Author: dingguodong +Date: Thu Sep 9 09:30:37 2021 +0800 + + - Remove reviewer from creating and editing MR because of API issue. + +commit 9193387eb71b563bd43670e588189025906fe213 +Author: dingguodong +Date: Thu Sep 9 09:23:02 2021 +0800 + + * Fix bug when deleting a MR in ZenTao. + +commit 1609837ff73fe4694dc053d7b2eec4510689115c +Author: tianshujie +Date: Thu Sep 9 09:12:42 2021 +0800 + + * Fix bug #14982. + +commit 44396cde9aa58dae0b3202d674c9205ba4808bbb +Author: dingguodong +Date: Thu Sep 9 09:09:30 2021 +0800 + + * Create a todo item for this merge request. + +commit 2f776b61a1662d861c45be900631a06d80c7b95e +Author: liyuchun +Date: Thu Sep 9 09:06:18 2021 +0800 + + * Finish task #42379. + +commit 831b78e6db5455821856fb55b326e58e98c8fb30 +Author: liyuchun +Date: Thu Sep 9 09:02:43 2021 +0800 + + * Finish task #42380. + +commit 3701965dbaf035ac646ee36fb7842dfd4b541c32 +Author: tianshujie +Date: Thu Sep 9 08:57:41 2021 +0800 + + * Finish task #42382. + +commit c88d7f16e2b51b772ecd6ca66fdd2be2a5a46803 +Author: tianshujie +Date: Thu Sep 9 08:56:01 2021 +0800 + + * Finish task #42385. + +commit 27a1652e0ec77e8e1710da496d3c0b46e27ef75a +Author: xieqiyu +Date: Thu Sep 9 08:50:55 2021 +0800 + + * Fix bug#14951. + +commit a36a423e78321c95470ffdd60e1dede82e34a4f7 +Author: tianshujie +Date: Thu Sep 9 08:51:58 2021 +0800 + + * Finish task #42400. + +commit 62cf724ed4c02b3b800f7c483fd88caab3fa062d +Author: tianshujie +Date: Thu Sep 9 08:50:29 2021 +0800 + + * Finish task #42401. + +commit 9f5377c86595684b041d0468b26de73e56714727 +Author: liyuchun +Date: Thu Sep 9 08:50:07 2021 +0800 + + * Finish task #42384. + +commit 0de33c60b94885417aebe62ba1dc5e90b1b2fb1c +Author: Hao Sun +Date: Thu Sep 9 08:47:36 2021 +0800 + + * improve UI of kanban. + +commit 32bf1c3e19e5a4aef1b0bfb1a44d6002cbae24a9 +Author: Hao Sun +Date: Wed Sep 8 20:27:31 2021 +0800 + + * layout lane name with css property writing-mode. + +commit 09266c751f1cf471a1ebafcc77da7c5582c5e1e5 +Author: Hao Sun +Date: Wed Sep 8 20:11:03 2021 +0800 + + * improve UI of kanban for browser which is not support css flex. + +commit 5275c5de7b718e1ceb742de0d2eff6e44ebd35f6 +Author: Hao Sun +Date: Wed Sep 8 20:10:35 2021 +0800 + + * fix js error in ie. + +commit 0046eecae7c804df1a1917940d8fdfb8388906fa +Author: xieqiyu +Date: Thu Sep 9 08:15:35 2021 +0800 + + * Fix execution link in Program Kanban. + +commit c8bf46a8905601dfe8feb1dd0480df60a07a66ee +Author: xieqiyu +Date: Thu Sep 9 08:09:36 2021 +0800 + + * Fix execution link in project Kanban. + +commit 4633573d6fad12297ec70664d4871a5c1f6df053 +Merge: 53a68cac8f d85c93438a +Author: zhujinyong +Date: Thu Sep 9 06:32:47 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 53a68cac8ffd14ed4220f6591468af09fe482483 +Author: zhujinyong +Date: Thu Sep 9 06:32:28 2021 +0800 + + + Add checkPriv for api. + +commit d85c93438a32655df8bb823229bd6fdfcbc1578d +Author: Guan Xiying +Date: Wed Sep 8 23:08:51 2021 +0800 + + * Fix bug #15007. + +commit 7f41858f5a152d0ca741390eccc0aa867eca5a7c +Author: Guan Xiying +Date: Wed Sep 8 23:00:55 2021 +0800 + + * Fix bug #15006. + +commit 81092346b7f5fa3f97c5ddc04765062b8d6c4269 +Author: dingguodong +Date: Wed Sep 8 18:00:43 2021 +0800 + + * For compatibility with PHP 5.4 . + +commit 0f6b2b4a42fa362146a64375fb4554a16edd4583 +Merge: cf102db743 e281a4d639 +Author: dingguodong +Date: Wed Sep 8 17:35:24 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit cf102db7432e048065c40ddd75174875729ad4a8 +Author: dingguodong +Date: Wed Sep 8 17:34:17 2021 +0800 + + * Set menu in constructor of every module under devops. + +commit e281a4d6392c4caa314781cc5b4ca720ad34320c +Author: 孙广明 +Date: Wed Sep 8 17:26:45 2021 +0800 + + * Fix code error. + +commit 5f50cf9db795b0403d41087dde7d5c91ca626814 +Merge: 19934cba20 89022d1a40 +Author: hufangzhou +Date: Wed Sep 8 17:05:52 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 19934cba20b62c469ee636c5be5126f27f64d86c +Author: hufangzhou +Date: Wed Sep 8 17:05:45 2021 +0800 + + * Fix bug #14967. + +commit 89022d1a40fe16ac7807272d6e9e00cef2b62be2 +Author: tianshujie +Date: Wed Sep 8 16:59:17 2021 +0800 + + * Finish task #42405. + +commit 797b4c216774f23dfe1b9c40b240644634907dc0 +Author: liyuchun +Date: Wed Sep 8 16:58:51 2021 +0800 + + * Finish task #42399. + +commit 5e8acae02e90eb8a7d1b112e5754d3cf16f6c515 +Author: 孙广明 +Date: Wed Sep 8 16:55:08 2021 +0800 + + * Remove empty column. + +commit 69c1b441576d1972ed1e0ab00494dcc72e117885 +Author: liyuchun +Date: Wed Sep 8 16:53:55 2021 +0800 + + * Fix bug #15061. + +commit fff95ea74d9241c8df16d1281fcf3d72365b9123 +Author: Hao Sun +Date: Wed Sep 8 16:47:27 2021 +0800 + + * refactor: comment. + +commit 2f4caca4cd4851c503d7aa1e006cc70142d9e36b +Author: liyuchun +Date: Wed Sep 8 16:46:20 2021 +0800 + + * Finish task #42404. + +commit 48a03ff80d22c15b1eb6e900c74a1b85350eef03 +Author: liyuchun +Date: Wed Sep 8 16:44:30 2021 +0800 + + * Fix bug #14953. + +commit 8619e17050ed4255b18997e2af2d43dd9204e4de +Merge: 270e485602 6ad4f813c4 +Author: hufangzhou +Date: Wed Sep 8 16:44:01 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 270e485602debfc0d905f96ed768845c3daf4e65 +Author: hufangzhou +Date: Wed Sep 8 16:43:56 2021 +0800 + + * Fix bug #14946. + +commit 6ad4f813c48388565252856479c215e49fe9ca60 +Author: tianshujie +Date: Wed Sep 8 16:43:25 2021 +0800 + + * Fix bug #14711. + +commit e9002f78c238ee7c460ceaced3c4289bece4946b +Merge: 47b838ddb5 4ba2c2d7f8 +Author: dingguodong +Date: Wed Sep 8 16:33:36 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 47b838ddb5af10cc13cdd10c0f8df02de2108a3f +Author: dingguodong +Date: Wed Sep 8 16:33:05 2021 +0800 + + * Merge code from ext to this branch for API(JIHU). + +commit 870c3be96ea603f5f09d5293fc53010bce930b0e +Author: dingguodong +Date: Wed Sep 8 16:24:11 2021 +0800 + + * Add lang for GitLab in MR creation. + +commit 4ba2c2d7f81a9d41ab1ccbb5ffda3af99e3de05b +Author: tianshujie +Date: Wed Sep 8 16:18:20 2021 +0800 + + * Fix bug #15060. + +commit a83705f159982262bcc7dd12688c364203cbc6d4 +Author: Hao Sun +Date: Wed Sep 8 16:09:40 2021 +0800 + + * fix show empty execution item in program kanban. + +commit ad06e6239d7bf5f8a4f12ade5ad5c5e24d2034dc +Merge: ccdfd0e09b 5eaa7bc277 +Author: hufangzhou +Date: Wed Sep 8 16:08:38 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ccdfd0e09b7d1e3c0734ba4e32bdf8c7c9b8fd17 +Author: hufangzhou +Date: Wed Sep 8 16:08:34 2021 +0800 + + * Fix bug #15000. + +commit 5eaa7bc277fe835761b59757a7277e56dc4d0cc2 +Author: 孙广明 +Date: Wed Sep 8 16:06:11 2021 +0800 + + * Fix details. + +commit 9751d83ea111f812aa51a5f736a072b3bd0f7521 +Merge: fe3f6b3a01 a03a74fd5b +Author: 王怡栋 +Date: Wed Sep 8 16:02:36 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit fe3f6b3a0157218ee94dd6d726f1ee1562c527b4 +Author: 王怡栋 +Date: Wed Sep 8 16:02:11 2021 +0800 + + * add mr zh-tw lang. + +commit a03a74fd5bfba6fb7656f5d082979ad271182f5a +Author: liyuchun +Date: Wed Sep 8 16:01:41 2021 +0800 + + * Fix bug #15004. + +commit 71e494840af931b3a9eb33f3e214a537e581659b +Merge: d2403a6b8e 6e71ee5e78 +Author: 王怡栋 +Date: Wed Sep 8 16:01:39 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d2403a6b8e710a237daafed5037cbfd475c660eb +Author: 王怡栋 +Date: Wed Sep 8 16:00:42 2021 +0800 + + * add new version and upgrade. + +commit 6e71ee5e78e86991334b6ef24275bc212a88c1dc +Author: tianshujie +Date: Wed Sep 8 15:52:27 2021 +0800 + + * Modify the requirements list of the project. + +commit 21b5e773824d3ec019ea08a537df15416a4e1d74 +Author: liyuchun +Date: Wed Sep 8 15:52:00 2021 +0800 + + * Fix bug #15004. + +commit 0721ef15133549ff9ee512f9f3c25e2a470f7506 +Merge: 1d2c85895c ae2036048a +Author: tianshujie +Date: Wed Sep 8 15:48:36 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ae2036048a7e10ded9d5e2b364c7e30e97d4f52f +Author: 孙广明 +Date: Wed Sep 8 15:48:06 2021 +0800 + + * Fix program kanban execution link. + +commit 1d2c85895c8d927531c75d32c409ef32b4a0754c +Author: tianshujie +Date: Wed Sep 8 15:47:32 2021 +0800 + + * Modify the independent project to enter the story list problem. + +commit f7c4ae6d87762336b9df0a534e431b7aa945e693 +Author: Hao Sun +Date: Wed Sep 8 15:37:59 2021 +0800 + + * fix execution item not render correctly in kanban. + +commit 93126af4daa51ecb575d237546cc04ae327c4c7b +Author: Hao Sun +Date: Wed Sep 8 15:37:40 2021 +0800 + + * set text size in avatar with custom size. + +commit c4be0c2c26cc7e91751c89a6644221bc3e1de5da +Merge: 88d981a33c 7aff97bb42 +Author: zhujinyong +Date: Wed Sep 8 15:35:04 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 88d981a33c19f71a94d51073a19a3289900d818f +Author: zhujinyong +Date: Wed Sep 8 15:34:49 2021 +0800 + + + Add comments of api. + +commit 7aff97bb42242eb1b98ef44768389c204739f1e0 +Author: tianshujie +Date: Wed Sep 8 15:32:49 2021 +0800 + + * Fix bug #14987. + +commit f495f058ed1aa02b4df7077cb0c5ecc22fd05aad +Author: zenggang +Date: Wed Sep 8 15:31:11 2021 +0800 + + * Finish task#42421,42411,42409,42403,42392,42388,42386,42374 + +commit 6fa640e5c6742f75200cf008f37b4aa15ea2df21 +Author: 孙广明 +Date: Wed Sep 8 15:26:44 2021 +0800 + + * Fix program kanban bug. + +commit d1bfa1aecc2342b8ce63a103922b4dad6d5e76e5 +Author: Hao Sun +Date: Wed Sep 8 15:25:17 2021 +0800 + + * adjust release item style in kanban. + +commit 0172943dbc143105856286b7707d253801e779a5 +Author: Hao Sun +Date: Wed Sep 8 15:13:33 2021 +0800 + + * refactor. + +commit 7c2cf95f69dbec6d221865545aabe22a16be1a08 +Author: tianshujie +Date: Wed Sep 8 14:56:44 2021 +0800 + + * Fix bug #14808. + +commit 57c7ed054dcbd3e511faff47cd3da85459ef852d +Author: dingguodong +Date: Wed Sep 8 14:54:27 2021 +0800 + + * Fixed GitLab selection when creating MR. + +commit d0c88105417472eeb1dd271f5871a678bae030dd +Merge: 0653d3d3aa c34679d102 +Author: hufangzhou +Date: Wed Sep 8 14:52:52 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0653d3d3aa931332c0be9fe9cb98ecedd9ef974c +Author: hufangzhou +Date: Wed Sep 8 14:52:47 2021 +0800 + + * Finish task #42376. + +commit c34679d10235718105dc5749e25a3d62d18067ea +Author: Hao Sun +Date: Wed Sep 8 14:47:45 2021 +0800 + + * hide bottom border of last project row. + +commit c636b99dcc1a1cd9eb8269f3e0701c37d9fd5f60 +Author: xieqiyu +Date: Wed Sep 8 14:34:44 2021 +0800 + + * Finish task #42390. + +commit 2c957c59705b1697523b96ff3cf60e08d0b6f1e2 +Author: dingguodong +Date: Wed Sep 8 14:29:41 2021 +0800 + + * Adjust column width in MR browse page. + +commit fe446302a42d1094606ba7912d19bcc07948a4b7 +Author: Hao Sun +Date: Wed Sep 8 14:22:12 2021 +0800 + + * skip to show empty kanban. + +commit e7f44676dd3d9edc2ec93c5a5abe402fbf80d44c +Author: xieqiyu +Date: Wed Sep 8 14:13:56 2021 +0800 + + * Finish task#42402. + +commit e291343d5692cdc42f8c877ec90afa86912fcea1 +Author: tianshujie +Date: Wed Sep 8 14:15:04 2021 +0800 + + * Finish task #42408. + +commit cc6c764780074fe2d14ac6c236833bf21c0d1fe0 +Author: Hao Sun +Date: Wed Sep 8 14:14:15 2021 +0800 + + * show doing project and execution in one row for project and program kanban. + +commit 7e66fb46e9f43f67b1463f97cf4a0c18e8fa7a10 +Author: hufangzhou +Date: Wed Sep 8 14:14:09 2021 +0800 + + * Delete the unused code. + +commit bf5242da87caef0abeda8e52107e4d86d1a7d885 +Author: tianshujie +Date: Wed Sep 8 14:12:10 2021 +0800 + + * Finish task #42413. + +commit 1ec700ee17a23158b56e57b395c73dfc5eca8cf2 +Merge: 1dbceea571 3e685690b4 +Author: dingguodong +Date: Wed Sep 8 14:11:52 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3e685690b4867dcbff9f26630ec23aa3dc3bff0c +Author: 孙广明 +Date: Wed Sep 8 14:11:25 2021 +0800 + + * Fix bug #15040. + +commit 1dbceea5717ae8846568b8159dee84006533597d +Author: dingguodong +Date: Wed Sep 8 14:10:08 2021 +0800 + + * Remove needless prompt for required fields. + +commit e23b4cd7ff50a6fdb88ed42237db4127bf76e4cd +Author: tianshujie +Date: Wed Sep 8 14:09:23 2021 +0800 + + * Fix bug #15010. + +commit 21964bc9988d300e39ea0a374013020937a999b3 +Author: xieqiyu +Date: Wed Sep 8 14:04:20 2021 +0800 + + * Finish task#42407. + +commit b2e0b0c82b66690da7e7f3eb6240b27d03fd9309 +Author: Hao Sun +Date: Wed Sep 8 14:00:56 2021 +0800 + + * skip to render lane name in classic mode in product kanban. + +commit b8f2ff9f22b7cb72f22500661084621ed6bdf5d8 +Author: liyuchun +Date: Wed Sep 8 13:59:46 2021 +0800 + + * Fix bug #15021. + +commit 8ea07cce8334885c769c45f10fd5ea05134db2b9 +Merge: a4be8f518a cef4ce5e1c +Author: dingguodong +Date: Wed Sep 8 13:58:51 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit a4be8f518abdedbdc7c82dc995ec4a40d052b914 +Author: dingguodong +Date: Wed Sep 8 13:58:22 2021 +0800 + + * Fix bug #14996. + +commit cef4ce5e1cc818cc2f307f5724e017b67ca9af94 +Author: Guan Xiying +Date: Wed Sep 8 13:57:19 2021 +0800 + + * Add $lang->mr to common module. + +commit d3ffc97d41dde93860755661e6f22912852023c9 +Author: zenggang +Date: Wed Sep 8 13:52:53 2021 +0800 + + * Fix bug#14927 and Finish task#42423,42420,42419 + +commit aecf12e083d357e02943f71f1c1418fb4843ae57 +Author: tianshujie +Date: Wed Sep 8 13:51:43 2021 +0800 + + * Finish task #42415. + +commit 6d45dea34524f2398a426311a84782c052b5acd3 +Author: Hao Sun +Date: Wed Sep 8 13:46:02 2021 +0800 + + * fix padding of project name in table list. + +commit d1a08fda290f91e79c5fa3d04c1b4d15a522e72f +Author: Guan Xiying +Date: Wed Sep 8 13:45:41 2021 +0800 + + * Fix bug #15006. + +commit 723f3a9e2826e70e405cef80bcf9ec34f4aa2b2a +Merge: aa35ebd821 c5b835ae0e +Author: hufangzhou +Date: Wed Sep 8 13:45:26 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit aa35ebd8216968230975b598b72f97bdcd330dab +Author: hufangzhou +Date: Wed Sep 8 13:45:21 2021 +0800 + + * Product Kanban compatible with classic mode. + +commit c5b835ae0e5737af5ec418afda813db8b9627372 +Author: xieqiyu +Date: Wed Sep 8 13:42:19 2021 +0800 + + * Finish task#42383. + +commit 5d13c5119b90334ec2aff1ab6edef81ff04e46b0 +Author: xieqiyu +Date: Wed Sep 8 08:43:05 2021 +0800 + + * Modify links in Project Kanban. + +commit b47d2bdf3194bbb2850dba71a709c9db6129cc9a +Author: Hao Sun +Date: Wed Sep 8 13:39:37 2021 +0800 + + * fix incorrect num class in menu nav. + +commit 4a2d06e13c56d9ba9c66e54b9d4a12dabe7a3be3 +Author: 孙广明 +Date: Wed Sep 8 13:36:54 2021 +0800 + + * Finish task #42389. + +commit ea12eaf5f88c0a89451b140848e78adc662f674c +Author: 孙广明 +Date: Wed Sep 8 13:34:21 2021 +0800 + + * Finish task #42396. + +commit 5def99b75f5fd11ef39a603b64a3681ed29ba0d3 +Author: 王怡栋 +Date: Wed Sep 8 13:28:28 2021 +0800 + + * adjust for notes. + +commit 2a9d3735a845cccb2e044ee5fd2b8078031ef642 +Merge: 6cb052396f cc1e8a8b32 +Author: 王怡栋 +Date: Wed Sep 8 13:26:28 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6cb052396fe84ff9f7f7f92e864f16be51a6d6a9 +Author: 王怡栋 +Date: Wed Sep 8 13:25:37 2021 +0800 + + * finish task #42429. + +commit f3a07d930a0aee9f24da7095fec75f451053b2b7 +Author: 王怡栋 +Date: Wed Sep 8 13:24:37 2021 +0800 + + * finish task #42428. + +commit 09ce55e8a65cffda1e4ace7e1d2897432802470c +Author: 王怡栋 +Date: Wed Sep 8 13:21:46 2021 +0800 + + * finish task #42426. + +commit c427beb6f9208cca59874efacf46d4171135476e +Author: 王怡栋 +Date: Wed Sep 8 13:20:40 2021 +0800 + + * finish task #42425. + +commit cc1e8a8b3234eb5ddec9de3ac810cc7517a0a587 +Author: Hao Sun +Date: Wed Sep 8 13:19:44 2021 +0800 + + * bug #14738, fix tootip not show as expected in menu nav. + +commit b70ef8e1c0a0eb5d23dd312c44b220ce30ea8bb5 +Author: 王怡栋 +Date: Wed Sep 8 13:19:16 2021 +0800 + + * finish task #42424. + +commit 5ae8a3ff2dd29aa33989dab037276aacba6e6252 +Author: liyuchun +Date: Wed Sep 8 13:18:42 2021 +0800 + + * Finish task #42410. + +commit a265e45b8a390da168f2cce5b2a654b91a97d444 +Author: 王怡栋 +Date: Wed Sep 8 13:16:38 2021 +0800 + + * finish task #42398. + +commit 64c100dd058aee47eaf1c4399dcde1dd2b6fcbe2 +Author: 王怡栋 +Date: Wed Sep 8 13:15:30 2021 +0800 + + * finish task #42397. + +commit b87b7867cfe0f46bfbd84e9f31a164bb84e0778f +Merge: efa385717c 54661ec813 +Author: 王怡栋 +Date: Wed Sep 8 13:12:48 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 54661ec8132b44b1a9ab7d18df40a9cb2d71f4dd +Author: liyuchun +Date: Wed Sep 8 13:12:19 2021 +0800 + + * Finish task #42414. + +commit efa385717c09e1a107a537e38d15cb9402d71ef7 +Author: 王怡栋 +Date: Wed Sep 8 13:09:37 2021 +0800 + + * finish task #42373. + +commit 84c31791799ddb229d337328f29b633a0fb3e14f +Author: 王怡栋 +Date: Wed Sep 8 13:07:59 2021 +0800 + + * finish task #42372. + +commit ac707aff2ec01155f8a156949fa069cc640d328d +Merge: 5c2a1acab7 0d764a7ce0 +Author: 王怡栋 +Date: Wed Sep 8 13:06:08 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5c2a1acab7819bf92437098ec49417520c6dfa4f +Author: 王怡栋 +Date: Wed Sep 8 13:05:47 2021 +0800 + + * finish task #42381. + +commit 26ee9677ce1072ce653091ee49ef319343d9b069 +Author: 王怡栋 +Date: Wed Sep 8 13:04:27 2021 +0800 + + * finish task #42394. + +commit 0d764a7ce0ba77df3fcefcfaaa6a491ad092d976 +Author: liyuchun +Date: Wed Sep 8 13:04:21 2021 +0800 + + * Finish task #42430. + +commit c0bcc61b1ef3f14287679b47939c2294f8bd766a +Author: 王怡栋 +Date: Wed Sep 8 11:33:25 2021 +0800 + + * finish task #42422. + +commit 5c36a700b43f9658e3ad452274759c126bfc1f8d +Merge: cce8dff395 36198e0b2d +Author: 王怡栋 +Date: Wed Sep 8 11:31:55 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit cce8dff395c841851295d132770336421cd904b0 +Author: 王怡栋 +Date: Wed Sep 8 11:31:37 2021 +0800 + + * finish task #42433. + +commit 36198e0b2df425ad2c6103cc8b74a0caaec58f60 +Author: Hao Sun +Date: Wed Sep 8 11:28:55 2021 +0800 + + * fix affix not work as expected in kanban. + +commit 0156e986bac32514ab2615fb81678f830830db0b +Author: Hao Sun +Date: Wed Sep 8 11:28:42 2021 +0800 + + * show title for lane name in kanban. + +commit a409ef22f09252e1d184521340c5f28b31af758c +Author: liyuchun +Date: Wed Sep 8 11:28:13 2021 +0800 + + * Finish task #42432. + +commit bc87c4bd4cff5d578324326ecc838da23276a40f +Author: tianshujie +Date: Wed Sep 8 11:25:34 2021 +0800 + + * Finish task #42417. + +commit a580403a3e14d1bf5c8f2b600a87b149bdc36204 +Author: tianshujie +Date: Wed Sep 8 11:22:05 2021 +0800 + + * Finish task #42427. + +commit f5e33aee87d5b3afc04c08642ed0b83d922bd725 +Author: zenggang +Date: Wed Sep 8 11:14:30 2021 +0800 + + * Finish task#42101 + +commit 00a0484612402137ae9c36a8f0173663ce1e4a0e +Author: tianshujie +Date: Wed Sep 8 11:09:05 2021 +0800 + + * Fix bug #14814. + +commit 28965b277796e4e9c6cc69025aa20507e2eeaaaa +Author: dingguodong +Date: Wed Sep 8 10:55:21 2021 +0800 + + * Correct php warnings. + +commit 02a2892002a392f9147ac6ed54d0de036bea93e9 +Author: dingguodong +Date: Wed Sep 8 10:54:50 2021 +0800 + + * Fix bug #14994 . + +commit 4acb8c181c5c25eb4e6cfe1f9d2d4d1d3738d52e +Author: Hao Sun +Date: Wed Sep 8 10:44:49 2021 +0800 + + * improve UI for kanban. + +commit 29728c87edc90f9fed90e93eac6ea04b6f78b954 +Merge: 489a87e0ec 1017947c6c +Author: zhujinyong +Date: Wed Sep 8 10:40:57 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 489a87e0ec8f5c5440a5eb8b4bb48c4cb0fec1fc +Author: zhujinyong +Date: Wed Sep 8 10:40:25 2021 +0800 + + * Adjust response of api. + +commit 1017947c6c44b3a51bb450418ba4ebe1e3d2bf38 +Author: Guan Xiying +Date: Wed Sep 8 10:38:39 2021 +0800 + + * Fix bug #15019. + +commit 2cee5fc75ec7d7bc7e27713e37258e800712fd6f +Author: Guan Xiying +Date: Wed Sep 8 10:31:08 2021 +0800 + + * Fix bug #14996. + +commit 426e3667917aadb6002a5eb357bd42cf120c36d0 +Author: Guan Xiying +Date: Wed Sep 8 10:30:10 2021 +0800 + + * Hide mr setting lang item. + +commit 616f491b7c7fa756d6d8e4caf9d0f7eba349c510 +Author: Hao Sun +Date: Wed Sep 8 10:29:10 2021 +0800 + + * align doing project and execution in one row in product kanban. + +commit 6e3be6bdf2c3361aa8812e04464534f494344cc8 +Author: Guan Xiying +Date: Wed Sep 8 10:27:05 2021 +0800 + + * Fix bug #15006. + +commit ba70dcbaabd8b975422bf27978b305ac65d91712 +Author: Guan Xiying +Date: Wed Sep 8 10:24:13 2021 +0800 + + * Fix bug #15007. + +commit b305b8c752cc29e14fe44bbd10b53acef09fd71d +Author: Guan Xiying +Date: Wed Sep 8 10:13:28 2021 +0800 + + * Fix bug #15009 and change config->MR to config->mr. + +commit 6ba818fd783eeec592f121b0cb9bca88e6112292 +Author: Hao Sun +Date: Wed Sep 8 09:08:09 2021 +0800 + + * change kanban border size to 2px + +commit fb98b4ff7b03ef1e79a28f4114aa1e7679d65b0d +Author: Hao Sun +Date: Wed Sep 8 09:01:52 2021 +0800 + + * fix item id in kanban. + +commit 302e3636da05d85ffa6d070a79d8d11675fc25bd +Author: liyuchun +Date: Wed Sep 8 08:52:38 2021 +0800 + + * Fix bug #14990. + +commit bcd78639b0ea16c521c6f2eeaa9ce453174497f4 +Author: liyuchun +Date: Wed Sep 8 08:22:10 2021 +0800 + + * Finish task #42154. + +commit 0fc95905c37422185b4adf49a19bef679ed5e875 +Author: liyuchun +Date: Wed Sep 8 07:53:02 2021 +0800 + + * Fix bug #14566. + +commit e343a14e235e06f07bb06cd5880ee7d9f76fdd23 +Author: zenggang +Date: Tue Sep 7 21:50:03 2021 +0800 + + * Fix bug#14927 + +commit dafa834838d951a77589864fbf1b85849fa623c9 +Author: Hao Sun +Date: Tue Sep 7 21:40:51 2021 +0800 + + * fix product/kanban not render as expected. + +commit 6479af20fa848d3688fd488764d5fc269650abd5 +Author: Hao Sun +Date: Tue Sep 7 21:23:14 2021 +0800 + + * fix kanban UI, feedback by @sunguangming. + +commit 2df7e608a050eae8a7147a35f34afe5af77a230a +Author: Hao Sun +Date: Tue Sep 7 20:01:53 2021 +0800 + + * fix project/managemembers not work in tutorial mode. + +commit c02049d5a539d711de90969258d07e922e6f9dea +Author: dingguodong +Date: Tue Sep 7 20:50:03 2021 +0800 + + * Remove extra character. + +commit 314c3c593ed01fa2ea39a8e357e597926de34bf3 +Merge: 75a2555bd8 448d1423a6 +Author: dingguodong +Date: Tue Sep 7 20:47:10 2021 +0800 + + Merge branch 'jihuMR' + +commit 448d1423a6cae5e1cb1440d6352159c579e93bb8 +Author: dingguodong +Date: Tue Sep 7 20:33:04 2021 +0800 + + + Add SQL file for update version 15.4 . + +commit b1e05cd0f34535ac1707ab5b1820183b524c533e +Author: dingguodong +Date: Tue Sep 7 20:18:50 2021 +0800 + + * Adjust display style. + +commit 6de75d2fcb066d8eb528c2fb497a00ddb4ec71f9 +Author: dingguodong +Date: Tue Sep 7 20:17:31 2021 +0800 + + * Fix bug for sync mr. + +commit 74d6b1895ae5ed087a0a991af4d4a1b158c8a672 +Author: dingguodong +Date: Tue Sep 7 18:12:01 2021 +0800 + + * Update accept MR display style. + +commit 75a2555bd8f6a04d249ae5d8177721c2de0d9cbb +Author: Hao Sun +Date: Tue Sep 7 17:42:49 2021 +0800 + + * bug #14689, fix tip not show in manageTeam task in tutorial mode. + +commit a36720eed10679a58e43f898e7cc75a2f2ca2c86 +Author: liyuchun +Date: Tue Sep 7 17:19:16 2021 +0800 + + * Code for review. + +commit 2ff53945421e63505f091e2a6fd89ef4d797d933 +Author: Hao Sun +Date: Tue Sep 7 17:17:25 2021 +0800 + + * bug #14825, fix php error when click .btn-open-target-page. + +commit 30fcb005cf1b5d96f653632676c41e6e9352658f +Author: Hao Sun +Date: Tue Sep 7 17:12:56 2021 +0800 + + * bug #14857, improve table layout of page company/browse for tutorial mode. + +commit 29528a5cfb043cba3f335be95310b2056bac8f46 +Author: Hao Sun +Date: Tue Sep 7 17:03:49 2021 +0800 + + * bug #14852, fix tooltip format error. + +commit 8d443af88e0ad54d619a5d5367d11e751974e3a1 +Author: Hao Sun +Date: Tue Sep 7 16:58:00 2021 +0800 + + * fix php error in tutorial mode. + +commit 41c50622650d8dfe47687687c77efaed0d0d085f +Author: Hao Sun +Date: Tue Sep 7 16:37:58 2021 +0800 + + * bug #14844, only show tutorial tasks that the user has permission access. + +commit 47833b256d2d966106e8a40952ff54abb16a249f +Author: Hao Sun +Date: Tue Sep 7 16:36:52 2021 +0800 + + * fix en lang data. + +commit 571306733c6cc20d734b94e0a1e8c0aa27cb356a +Author: Hao Sun +Date: Tue Sep 7 16:28:25 2021 +0800 + + * bug #14846, fix show more than one tips in tutorial mode. + +commit 92befce1926f905cc8a98d0f272d2da5c2923d55 +Author: Hao Sun +Date: Tue Sep 7 16:27:56 2021 +0800 + + * refactor. + +commit 8d6ad937272cdc0c2ce7c1bf3cebda1d7685d81f +Author: Guan Xiying +Date: Tue Sep 7 16:13:52 2021 +0800 + + * Add gitlab browse to resoure list. + +commit eef065aa3937148632260a5bde474df8d49b742a +Author: Hao Sun +Date: Tue Sep 7 16:12:56 2021 +0800 + + * refactor: remove console.log. + +commit 9803d12a215571f710f93f206c0d72705e37816c +Author: Hao Sun +Date: Tue Sep 7 15:56:41 2021 +0800 + + * bug #14860, fix cannot click project name in tutorial mode sometimes. + +commit a5e730c1f3e577b53e7ec976815f482d5e2cf9d0 +Author: Hao Sun +Date: Tue Sep 7 15:56:21 2021 +0800 + + * fix name size in project table list. + +commit 4e08891ea9b4a80e3b8f04b1eebc49020c0ea6c6 +Author: dingguodong +Date: Tue Sep 7 15:46:40 2021 +0800 + + * Optimize comment. + +commit 995806614bf52bf12e1f879da3b0242b12296985 +Author: Hao Sun +Date: Tue Sep 7 15:37:14 2021 +0800 + + * fix php error in tutorial mode. + +commit 154662d760f141a1d11f807cbafaa5b7dee1339f +Author: dingguodong +Date: Tue Sep 7 15:05:09 2021 +0800 + + * Disable diff in MR feature. + +commit 4220c08e0847aaf93d8de70ef6a71308563c400a +Author: Hao Sun +Date: Tue Sep 7 13:47:06 2021 +0800 + + * bug #14936, fix tasks count incorrect. + +commit ba7b5fc6aa1132d918abe5b5bf9b764e527b4d5f +Author: Hao Sun +Date: Tue Sep 7 13:43:53 2021 +0800 + + * task #42125, remove some kanban colors. + +commit 13366dd44d8930c26fa47da18b33dd38a35f700d +Author: Hao Sun +Date: Tue Sep 7 13:23:03 2021 +0800 + + * support to affix kanban board header on window scroll or resize. + +commit 69c1e30959fcbd9177676eeaf7096d1779d9b150 +Author: 孙广明 +Date: Tue Sep 7 13:15:49 2021 +0800 + + * Fix code error. + +commit 70f0136b2bde061c6f84cedc358218457ba2d56e +Merge: 8e8875319f d5b52bc7ad +Author: dingguodong +Date: Tue Sep 7 10:51:12 2021 +0800 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit 8e8875319fbc5e60618f717ca44ce030fa511fa4 +Author: dingguodong +Date: Tue Sep 7 10:50:44 2021 +0800 + + * Optimize function getDiffs. + +commit d5b52bc7ad77c49cd72c7ea3063206f7486fa792 +Author: Guan Xiying +Date: Tue Sep 7 10:50:34 2021 +0800 + + * Fix viewDiif. + +commit b223736b18f03d0cbb56a6d4167cb11948f05a56 +Merge: 12935f3ead 7b9cb9ed8e +Author: lichengjun +Date: Tue Sep 7 02:38:43 2021 +0000 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit 12935f3ead2c2d7a9cb23cc13e195be0e1b16ec6 +Author: lichengjun +Date: Tue Sep 7 02:33:36 2021 +0000 + + * Adjust GitLab MR TODO Detail. + +commit 7b9cb9ed8e2fdba6ef83afd3284f7c74b4750897 +Author: Guan Xiying +Date: Tue Sep 7 10:26:39 2021 +0800 + + * Remove debug codes. + +commit 13ff8a54b024ba510389462e225b1ace9cfa6454 +Author: Hao Sun +Date: Tue Sep 7 10:14:27 2021 +0800 + + * improve UI for kanban. + +commit 701b000c09e5182f2546e0b74527831d62544f07 +Author: dingguodong +Date: Tue Sep 7 10:13:57 2021 +0800 + + * Optimize language file. + +commit 14c2e282f2022895ef213f86665ff9b6f68b47ba +Merge: ee13e00554 90c3e3479f +Author: dingguodong +Date: Tue Sep 7 10:03:34 2021 +0800 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit ee13e00554757c2484141fa0a8c30cb4a8c8231a +Author: dingguodong +Date: Tue Sep 7 10:02:52 2021 +0800 + + * Add tips for merge code locally. + +commit 90c3e3479f8f5e74c5087aaa55f54f079e324976 +Author: lichengjun +Date: Tue Sep 7 01:58:24 2021 +0000 + + * Fix GitLab MR sync status. + +commit 73ab0915994563af23286b82a551817084f3e2cb +Author: Hao Sun +Date: Tue Sep 7 09:57:01 2021 +0800 + + * improve UI for kanban. + +commit a19b2952b5a448ea6c86d2fc04c4a9b4049b55e4 +Author: tianshujie +Date: Tue Sep 7 09:06:37 2021 +0800 + + * Fix bug #14847. + +commit fbc5a7de5609bff66eace28887eaf493508b847b +Merge: 2edd3732cb 4ee76f3b82 +Author: liyuchun +Date: Tue Sep 7 09:00:18 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 2edd3732cbf28ba55d9a5537b2534d87354acfa0 +Merge: 8bc4f8dfc6 d88a87d307 +Author: liyuchun +Date: Tue Sep 7 09:00:13 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4ee76f3b8263739378f683cf1f98276245ef77b5 +Author: zenggang +Date: Tue Sep 7 08:57:59 2021 +0800 + + * Fix bug#14923 + +commit 8bc4f8dfc64227a3abc969cbafd4d200d1d27873 +Author: liyuchun +Date: Tue Sep 7 08:56:00 2021 +0800 + + * Code for review. + +commit eb9911eb1f495bd72a7ab9bb591b4c5eb4fdd7c2 +Author: liyuchun +Date: Tue Sep 7 08:54:35 2021 +0800 + + * Code for review. + +commit a786e5f00d13ad482a0078cbaf2a0dde3fc467e7 +Author: lichengjun +Date: Tue Sep 7 00:50:33 2021 +0000 + + * GitLab MR Code Merge. + +commit 1c3f7060887e14509031f501668cd26b9f9b77c0 +Merge: 7ca5893ce2 2d1bc4fcc7 +Author: lichengjun +Date: Tue Sep 7 00:46:31 2021 +0000 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit 7ca5893ce2afea68297eb07555f0a46b0e06bafe +Author: lichengjun +Date: Tue Sep 7 00:44:34 2021 +0000 + + * Cancel GitLab SYNC Settings. + +commit d88a87d307943ac92e2115c11ed736d2e88a8ccb +Author: Hao Sun +Date: Tue Sep 7 08:26:58 2021 +0800 + + * implement kanban pages with kanban component. + +commit 75ac012b6cadf2a5183ac556236f6e97ae3d6c56 +Author: Hao Sun +Date: Tue Sep 7 08:26:34 2021 +0800 + + + add common kanban component. + +commit 2d1bc4fcc77df8662f24fda6afd586a5d49cb996 +Author: Guan Xiying +Date: Mon Sep 6 20:07:04 2021 +0800 + + * Finish task #41977. + +commit 7322869f8dd9878d57464edaf20fe16d4349d9fe +Merge: 9d5c1de0ab cd1a40b066 +Author: dingguodong +Date: Mon Sep 6 17:59:42 2021 +0800 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit 9d5c1de0ab2e9027063d8fc89eb518cde8fe0569 +Author: dingguodong +Date: Mon Sep 6 17:57:27 2021 +0800 + + * Sync MR in ZenTao database whatever status of MR in GitLab. + +commit 968e115af3855c441f1cf783dd41082aa59af5e2 +Author: zenggang +Date: Mon Sep 6 17:50:28 2021 +0800 + + * Fix bug#14935 + +commit cd1a40b066a7d2f7aa84a0dd3346b37c190213e5 +Author: Guan Xiying +Date: Mon Sep 6 17:45:08 2021 +0800 + + * Fix job object name in browse page. + +commit a5ceffb6cf67278170ef3fb990c291712fed11d2 +Author: Guan Xiying +Date: Mon Sep 6 17:29:37 2021 +0800 + + * Fix exec gitlab job bug and adjust exec job function. + +commit 1a6a47c8445c80b148c3288102d08fd692b67eea +Author: Hao Sun +Date: Mon Sep 6 17:19:24 2021 +0800 + + * typo. + +commit 4cd16454364382f963f947c309ceaf0c1b2a2f06 +Author: Hao Sun +Date: Mon Sep 6 17:17:28 2021 +0800 + + * task #42141, adjust modal style in page tutorial. + +commit 61df601ab8dd6a9f0b5d54af09b662d44ac173b8 +Author: Hao Sun +Date: Mon Sep 6 17:10:46 2021 +0800 + + * change back color for default user avatar. + +commit ddfe2479ac327e3cd9eceafbbc3dcbf32b9edd66 +Author: Guan Xiying +Date: Mon Sep 6 16:46:07 2021 +0800 + + * Finish task #41976, adjust exec gitlab function. + +commit 81795244b321008b2623096484cec244a6cf796d +Author: Guan Xiying +Date: Mon Sep 6 16:44:27 2021 +0800 + + * Adjust getReferenceOptions function, rename param of function apiCreatePipeline. + +commit 7e8705afcdafca39db5a1e141f90b31f9eadb5ad +Merge: f16eba5b09 e664627f12 +Author: lichengjun +Date: Mon Sep 6 05:26:41 2021 +0000 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit f16eba5b09f5b28c0958b1a9c95c9a2a48b6d80a +Author: lichengjun +Date: Mon Sep 6 05:22:27 2021 +0000 + + * Add GitLab Merge Request Permission configuration. + +commit 85ad745929aef5ba20d3ebe53389b73ab3a8cfd8 +Author: hufangzhou +Date: Mon Sep 6 13:06:33 2021 +0800 + + * Add the recall in project story list, add the review and recall in execution story list. + +commit e664627f128466c87654daa6887b90fe35d27151 +Author: dingguodong +Date: Mon Sep 6 11:31:56 2021 +0800 + + * Add en lang for MR in DevOps menu. + +commit 94f4d9110700bb0cabd0dbdca09ad98e462de0d9 +Author: dingguodong +Date: Mon Sep 6 11:29:52 2021 +0800 + + * Modify en lang for MR. + +commit 3a30ffec775986efd47e1e2a2bb19fd00f07e601 +Author: xieqiyu +Date: Mon Sep 6 11:08:27 2021 +0800 + + * Finish task#42121. + +commit af08c20f6c52f4aa110b3b309fe7d7fc8e90eee0 +Merge: af3ee3ea36 3638fb9f84 +Author: liyuchun +Date: Mon Sep 6 10:53:59 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit af3ee3ea3661a58dedb6b362be1ec875e776d39a +Author: liyuchun +Date: Mon Sep 6 10:52:06 2021 +0800 + + * Fix global create doc error. + +commit 3638fb9f8485d8c227bb6fdb30c8897d07081cdc +Merge: 71624f48b0 188da03da2 +Author: hufangzhou +Date: Mon Sep 6 10:37:05 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 71624f48b0268163aa1a6972f4cda1026c1cc2d0 +Author: hufangzhou +Date: Mon Sep 6 10:36:59 2021 +0800 + + * Finish task #42140: Remove the entrance of tutorial. + +commit 188da03da27b4cfa6c6b3930390ab54eafd951d9 +Author: xieqiyu +Date: Mon Sep 6 10:21:38 2021 +0800 + + * Finish task#42145. + +commit 728da6baf5026e4c19bab45e29185fc330f38581 +Author: xieqiyu +Date: Mon Sep 6 10:21:08 2021 +0800 + + * Finish task#42145. + +commit 1dc70f977e9802cc095d347ba1310ba82ca9648c +Merge: 5cc963e3e1 26db3d9aff +Author: hufangzhou +Date: Mon Sep 6 10:17:37 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5cc963e3e13eaf5e659fe0a74be8ceba22388339 +Author: hufangzhou +Date: Mon Sep 6 10:17:33 2021 +0800 + + * Change the review result to review opinion. + +commit 26db3d9aff6c86d0e76374de5fb0be07d3683278 +Author: tianshujie +Date: Mon Sep 6 10:16:05 2021 +0800 + + * Fix the style problem of the head-down menu. + +commit 3f5dea88f36a355ed15861c56ab31b3984a07eaf +Author: zenggang +Date: Mon Sep 6 10:04:09 2021 +0800 + + * Finish task#42099 + +commit b513af011b5b3436c23011fd8ee7c2d5bc6caf32 +Merge: 0df4895cee 1d20b590fe +Author: hufangzhou +Date: Mon Sep 6 10:01:01 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0df4895ceef4cfae7748d8373693ed30fbc9dc1e +Author: hufangzhou +Date: Mon Sep 6 10:00:57 2021 +0800 + + * Remove the count when search the object. + +commit 1d20b590fe89b2f1b59d0e1e1ea5b0e772624143 +Author: liyuchun +Date: Mon Sep 6 09:31:37 2021 +0800 + + * Finish task #42129. + +commit e3af8d6d5ee9955fa378bab9f208669f3d234af5 +Merge: a69ffad760 5591075d4d +Author: hufangzhou +Date: Mon Sep 6 09:30:09 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit a69ffad7605078880a75bda4464dc8bdc7cde51e +Author: hufangzhou +Date: Mon Sep 6 09:30:05 2021 +0800 + + * Product Kanban is compatible with the classic model. + +commit 5591075d4d2fc1ce9046d40d8b6cee5ba9f1b76d +Author: liyuchun +Date: Mon Sep 6 09:20:20 2021 +0800 + + * Fix error of eidt story and send webhook message. + +commit da0134263d90ac8b2f8fe9d6b9162555bd101b2c +Author: 王怡栋 +Date: Sat Sep 4 13:03:18 2021 +0800 + + * adjust for product edit. + +commit 7c73fd04ea7ce93da90f3d0db2bff7a0cf9896f0 +Author: zenggang +Date: Sat Sep 4 11:22:41 2021 +0800 + + * Finish task#42097 + +commit 99a60c1954b545c5abbe7f726775949435825ea4 +Author: zenggang +Date: Sat Sep 4 10:43:50 2021 +0800 + + * Finish task#42096 + +commit 636517be88f7f209fde226b814d24f91a7679051 +Author: zenggang +Date: Fri Sep 3 18:13:32 2021 +0800 + + * Fix bug#13883 + +commit 3194e7ad861acf2a8b525fa7372e45015040c827 +Merge: 17283c1eea 2b20dc64f4 +Author: 王怡栋 +Date: Fri Sep 3 16:26:58 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 17283c1eea028a416538774c302aa375eba83b0e +Author: 王怡栋 +Date: Fri Sep 3 16:25:39 2021 +0800 + + * set main menu for tutorial mode. + +commit 2b20dc64f4f44cd301a7e78ad9a0473763032e5e +Author: tianshujie +Date: Fri Sep 3 16:09:35 2021 +0800 + + * Adjust the drop-down style of the global add button. + +commit 6557f80a0b8ae97a7a3e1b802503f89e1a03da96 +Author: Hao Sun +Date: Fri Sep 3 16:06:06 2021 +0800 + + * improve UI of left menu. + +commit e769b98b824fad682e7d9dc8beca13603a16e8e1 +Author: liyuchun +Date: Fri Sep 3 16:01:06 2021 +0800 + + * Adjust logic of get execution by id list. + +commit bcd5feea24cb029f2c550ba436d1695be1c21ec9 +Author: tianshujie +Date: Fri Sep 3 15:58:52 2021 +0800 + + * Finish task #42131,42130. + +commit d1ecf687bb023c1193b5f27d0b4b86c011c8b9de +Merge: 9c7d248d0c 46feb983e9 +Author: 王怡栋 +Date: Fri Sep 3 15:54:34 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 9c7d248d0c97eaeb0311227f4c4aba2b483f9da7 +Author: 王怡栋 +Date: Fri Sep 3 15:53:55 2021 +0800 + + * check not set vars. + +commit 46feb983e9c14aba698d1ac8843e52d400f0bed2 +Author: Hao Sun +Date: Fri Sep 3 15:43:31 2021 +0800 + + * adjust create btn color for themes. + +commit 6b0ade295ece419581e333ec34e42f7b56ac2550 +Author: Hao Sun +Date: Fri Sep 3 15:15:17 2021 +0800 + + * adjust style for user nav at topbar. + +commit 1a31ff468aaf89a7c28723c91ecb102533ae02f6 +Author: zenggang +Date: Fri Sep 3 15:14:05 2021 +0800 + + * Fix bug#14578 + +commit fde5d66e3cf58d12bf998e50926aa150f9aa3b7c +Author: dingguodong +Date: Fri Sep 3 14:54:35 2021 +0800 + + * Adjust function comment. + +commit 82d9ac3b02250eb3493dc1741492846f7b5f6c00 +Author: dingguodong +Date: Fri Sep 3 14:52:51 2021 +0800 + + + Add apiGetProjectMembers apiGetProjectMember functions. + +commit 8a1163e37df1ef3e0295904a150991246062cffb +Author: zenggang +Date: Fri Sep 3 14:40:24 2021 +0800 + + * Fix bug#13883 + +commit 6f9a5c7e67d5befb9f578f7002b14a95b2feb131 +Author: liyuchun +Date: Fri Sep 3 14:37:28 2021 +0800 + + * Finish task #42155. + +commit 92efb7df916286a452475f2f2887387e8d775a58 +Author: tianshujie +Date: Fri Sep 3 14:18:28 2021 +0800 + + * Modify the back button link of the created document. + +commit 58577bb42cc34892eb6c9fef74014eeafb5571d1 +Author: liyuchun +Date: Fri Sep 3 14:15:05 2021 +0800 + + * Code for task #42154. + +commit baa6f023b073190f487705a3759e0928c936110e +Author: 孙广明 +Date: Fri Sep 3 14:02:02 2021 +0800 + + * Fix story batch change plan bug. + +commit c80ce42a12327385fb187824daf6cbb3211ad61e +Author: dingguodong +Date: Fri Sep 3 13:39:54 2021 +0800 + + * Reformat code for accept MR. + +commit 13506c3cbd2c59c511289aa7f371655cbaaf17ba +Author: dingguodong +Date: Fri Sep 3 13:37:41 2021 +0800 + + * Add locate redirection but test not passed. + +commit 1cb80806138eeee7ae996b95db96e97ee71f5871 +Merge: f7aeb1da12 6da546e2a4 +Author: liyuchun +Date: Fri Sep 3 13:25:32 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit f7aeb1da12e8a57cc5070b86db120a9baf7e22a9 +Author: liyuchun +Date: Fri Sep 3 13:25:20 2021 +0800 + + * Finish task #42133. + +commit 6da546e2a4491b33160a880cf78a0bc9f14e9959 +Author: tianshujie +Date: Fri Sep 3 13:24:30 2021 +0800 + + * Load the language item of the bug. + +commit 7a7c63499f1ef892094ed3ac440acb74182f587a +Author: dingguodong +Date: Fri Sep 3 13:21:14 2021 +0800 + + * Fix bug for no response after accept view. + +commit 7d83d3110fa1570accc6a56694a293bf54b2b67a +Author: dingguodong +Date: Fri Sep 3 13:20:53 2021 +0800 + + * Fix bug when sudo as user. + +commit 179216b0c35e9a2eb4f21bf66eda7a3174dac2f8 +Author: tianshujie +Date: Fri Sep 3 13:15:49 2021 +0800 + + * Add title to the project name. + +commit 297be7901c10b8467db38f302f7db2e215336da0 +Author: tianshujie +Date: Fri Sep 3 13:10:38 2021 +0800 + + * Fix bug #14918. + +commit fd1007b5e5f51abb5d89186553aed6be2551b36e +Author: zenggang +Date: Fri Sep 3 13:10:20 2021 +0800 + + * Fix bug#14145 + +commit a916b523e465f953716bea1dae57da28887688b7 +Author: xieqiyu +Date: Fri Sep 3 11:18:53 2021 +0800 + + * Finish task#42117. + +commit 4879d7e6b78ef41398cc42ba3e0bb2ff306af87d +Author: tianshujie +Date: Fri Sep 3 11:15:22 2021 +0800 + + * Fix bug #14889. + +commit dfbe7ad645ac654b13f02174e9f64caf285af13f +Author: zenggang +Date: Fri Sep 3 10:56:04 2021 +0800 + + * Fix bug#14557 + +commit 1d87bcb08b74367609f14df33e9c85dead940b88 +Author: tianshujie +Date: Fri Sep 3 10:50:31 2021 +0800 + + * Fix bug #14890. + +commit fbf6b37c236f387adab2751fbfa729b29a46eb3e +Author: xieqiyu +Date: Fri Sep 3 10:48:17 2021 +0800 + + * Finish task#42128. + +commit 2d485513cd6786b361c01361f19ae59ed7742f56 +Author: Hao Sun +Date: Fri Sep 3 10:18:59 2021 +0800 + + * use tablesorter-noSort to ignore sort on click checkbox. + +commit 2fb4d5842d8c5f06c54b753b1257854950050ffc +Author: Hao Sun +Date: Fri Sep 3 10:16:50 2021 +0800 + + * upgrade tablesorter to use option cssNoSort. + +commit 7f58361b9530214ff535c608f4222bc6c40939e7 +Author: xieqiyu +Date: Fri Sep 3 10:16:56 2021 +0800 + + * Finish task#42122. + +commit 97e6ea501a84d8a1643455e0a56916d4fb0216be +Author: zenggang +Date: Fri Sep 3 09:57:12 2021 +0800 + + * Fix bug#14578 + +commit 2a68d2ac8328b4caf6b01495c9b5badc675b2e1a +Author: dingguodong +Date: Fri Sep 3 09:52:42 2021 +0800 + + * Adjust the action for JIHU API. + +commit 67cc48e3cb2a9dadf060c86a22cdcb81982abd8f +Author: hufangzhou +Date: Fri Sep 3 09:40:11 2021 +0800 + + * Finish task #42144. + +commit 6441a8de44bc98caf8c42dc375b527bfcaa3defe +Author: lichengjun +Date: Fri Sep 3 01:39:33 2021 +0000 + + * Add GitLab MR English Language. + +commit 4eee4d5523f45d3ec746b899a9cf8ee696d0a4cb +Merge: 28be8dbc61 3fb14ef213 +Author: 王怡栋 +Date: Thu Sep 2 19:21:30 2021 +0800 + + Merge branch '15.4' + +commit 28be8dbc61d48a872fbcf4c6f1b1b736000ba16e +Author: liyuchun +Date: Thu Sep 2 17:43:59 2021 +0800 + + * Finish task #42137. + +commit 3b7251d00bd3f7524da9c4227f11422a75a87142 +Author: zenggang +Date: Thu Sep 2 17:21:59 2021 +0800 + + * Fix bug#14714 + +commit 3d360a1e4e07b7673d34f651ec33829ded496822 +Author: dingguodong +Date: Thu Sep 2 16:49:52 2021 +0800 + + * Bug fix and reduce PHP notices. + +commit d7240c56065778c8438e2d74056b837709b93888 +Merge: 8ccc0f75b2 9bdd6a9af5 +Author: 王怡栋 +Date: Thu Sep 2 16:49:03 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8ccc0f75b2bfa7ac442f3ed8198d6913cdd5b9e8 +Author: 王怡栋 +Date: Thu Sep 2 16:48:43 2021 +0800 + + * finish task #42142. + +commit 003f03589cd1b7b1d550feea6eba8a46d076e443 +Author: 王怡栋 +Date: Thu Sep 2 16:47:50 2021 +0800 + + * finish task #42159. + +commit 9bdd6a9af5b1d0d3f7a8d9daddfc6ef09418a700 +Author: 孙广明 +Date: Thu Sep 2 16:39:59 2021 +0800 + + * Adjust program kanban css. + +commit 425f6265b6d8260a8aabcf9dea6bf0f159cdc131 +Author: lichengjun +Date: Thu Sep 2 08:35:06 2021 +0000 + + * fix bug 14612. + +commit d272eeeefce98a643fad1f7d603d1e0ea3b0f87f +Author: dingguodong +Date: Thu Sep 2 15:39:34 2021 +0800 + + * Optimize fetching data from API. + +commit 1b41b61cee8eef4965ef44175747e05b28e152e3 +Author: dingguodong +Date: Thu Sep 2 15:21:19 2021 +0800 + + * Using sudo to accept merge request. + +commit 8201fafc464360724423785174957d2db4c66c52 +Author: dingguodong +Date: Thu Sep 2 15:20:21 2021 +0800 + + + Get sudo user ID in GitLab. + +commit 38e48335064f1b2e275393092946c668e288b452 +Author: zenggang +Date: Thu Sep 2 15:19:05 2021 +0800 + + * Adjust my api + +commit 4af365d2d26198416c94a675295defd9910e58c2 +Merge: d9eddd66ad 60369d8e64 +Author: hufangzhou +Date: Thu Sep 2 14:50:20 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d9eddd66ad25e9b2c2396c49203cec652ecd56e7 +Author: hufangzhou +Date: Thu Sep 2 14:50:16 2021 +0800 + + * Adjust the program kanban style. + +commit 60369d8e64d55cf6272f387c9d1a1eb47a4d4e4e +Author: xieqiyu +Date: Thu Sep 2 14:40:12 2021 +0800 + + * Finish task#42126. + +commit 8088a0c285361b0190d05cdcfba572388de6ba2d +Author: tianshujie +Date: Thu Sep 2 14:33:50 2021 +0800 + + * Finish task #42146. + +commit 1009626f394c9a72c123cd8f28ab6ff8c094b3c2 +Merge: cbf7227e89 db552dc428 +Author: dingguodong +Date: Thu Sep 2 14:20:45 2021 +0800 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit cbf7227e8915b828eec7c3cd9eb90e0ee2129dd6 +Author: dingguodong +Date: Thu Sep 2 14:19:43 2021 +0800 + + * Correct the bug when a API error is raised. + +commit 17dba195eff736535ad93c88acf7a5e0ac473587 +Author: liyuchun +Date: Thu Sep 2 14:17:44 2021 +0800 + + * Fix bug #14764. + +commit db552dc4287b72f664c1eff66ad752e9a14db63a +Author: lichengjun +Date: Thu Sep 2 06:13:18 2021 +0000 + + * Adjust sync gitlab mr code. + +commit aba2bb23e7073b43283693b5e3cd8ba3ffee99dc +Author: xieqiyu +Date: Thu Sep 2 14:09:49 2021 +0800 + + * Finish task#42127. + +commit 8d33e803fe9e916b541149e385877775f7bdd13a +Author: zenggang +Date: Thu Sep 2 14:09:54 2021 +0800 + + * Adjust my api + +commit de48c8c8d21111137ed8ab1fa8e29d1e8c028840 +Merge: 149650ee8f 9f7bde9760 +Author: hufangzhou +Date: Thu Sep 2 13:38:08 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 149650ee8fff9d821259af500c5c3b2ae5487bb4 +Author: hufangzhou +Date: Thu Sep 2 13:38:04 2021 +0800 + + * Finish task #42139. + +commit 9f7bde9760b41ff915daafb407998a9a4626d2eb +Merge: 76945e64ff 1b0f19c0b9 +Author: 王怡栋 +Date: Thu Sep 2 13:13:48 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 76945e64ff495f4a1f3dd209a72040de5341407f +Author: 王怡栋 +Date: Thu Sep 2 13:13:04 2021 +0800 + + * Sync stories to new project when change execution project. + +commit 1b0f19c0b92ac8f9e3c074e960a5a75526477e86 +Author: liyuchun +Date: Thu Sep 2 13:05:19 2021 +0800 + + * Fix bug #14871. + +commit 6f7835da43cbb732829067b8b632d3f98fdd26e1 +Author: tianshujie +Date: Thu Sep 2 13:02:26 2021 +0800 + + * Fix bug #14568. + +commit 553255a1bf42864f70dc3d18eb997f9645689ecc +Author: 王怡栋 +Date: Thu Sep 2 11:16:23 2021 +0800 + + * adjust for upgrade. + +commit 8f9a010887588e83d19d8d34ba9e8c4b5777255a +Merge: ed03ef7305 a17656461e +Author: 王怡栋 +Date: Thu Sep 2 11:15:25 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ed03ef730593611bcc0dce8ddaa741c588e0ae39 +Author: 王怡栋 +Date: Thu Sep 2 11:14:59 2021 +0800 + + * fix bug #14870. + +commit a17656461e4d72bd7b34ec0c2b1ecfa5034a4c45 +Author: zenggang +Date: Thu Sep 2 11:13:36 2021 +0800 + + * Fix bug#13918 + +commit a7dd3de536f55ecdab5f212be3adfbdc2d025886 +Author: tianshujie +Date: Thu Sep 2 11:01:57 2021 +0800 + + * Fix bug #14568. + +commit b48f02e66ad2f27edae77af01fbbc8c231166fcf +Author: Hao Sun +Date: Thu Sep 2 10:55:14 2021 +0800 + + * task #41783, fix tutorial task for classic mode. + +commit 1d1f77875ab253c929966919d979a17c3c9abcf3 +Author: 孙广明 +Date: Thu Sep 2 10:13:49 2021 +0800 + + * Fix program kanban style. + +commit 7f8da2c5ae9af8084a899ba4d4c3921c9cf02301 +Author: liyuchun +Date: Thu Sep 2 09:38:24 2021 +0800 + + * Fix bug #14822. + +commit a1081dd3d7514e3189b399d58319c6c36570ed2f +Author: zenggang +Date: Thu Sep 2 09:26:15 2021 +0800 + + * Finish task#42136 + +commit 8dddb63e9a5931a8fb3760b323b2ac92325d9fd7 +Author: zenggang +Date: Wed Sep 1 17:29:43 2021 +0800 + + * add my api workhour count + +commit 159180febee3a1e780280c77bff5a71055afc255 +Author: hufangzhou +Date: Wed Sep 1 17:20:17 2021 +0800 + + * Modify height for project kanban. + +commit 3fb14ef21396264c856a8dab1792e51655b6bc97 +Author: hufangzhou +Date: Wed Sep 1 16:56:23 2021 +0800 + + * Revert the code. + +commit 881a6e8ec54ec70e83a3fbf8d572f79fbaab016b +Author: tianshujie +Date: Wed Sep 1 16:48:30 2021 +0800 + + * Fix bug #14162. + +commit d2a348b57bb43c2bf3df913bce6375f25976c26a +Merge: 7f71a63468 bcdee8ef2c +Author: lichengjun +Date: Wed Sep 1 07:03:04 2021 +0000 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit 7f71a63468447dfbcfbbcd87001ebd706193abaa +Author: lichengjun +Date: Wed Sep 1 07:02:17 2021 +0000 + + * Sync GitLab Todo ZenTao Todo. + +commit 1a871ab3b08b9066de32d6f3bafd8fa8d62705da +Author: 孙广明 +Date: Wed Sep 1 13:50:27 2021 +0800 + + * Fix details. + +commit 4cda4bc9db129b559be6d59d2eb88ac328799283 +Merge: b7651ed530 4415f0c6e4 +Author: hufangzhou +Date: Wed Sep 1 13:49:04 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b7651ed5306a0fef2814749a1701ef395b38c1ec +Author: hufangzhou +Date: Wed Sep 1 13:49:01 2021 +0800 + + * Adjust the program kanban style. + +commit 4415f0c6e4770058600f6840b395de81e04eaabe +Author: xieqiyu +Date: Wed Sep 1 13:47:16 2021 +0800 + + * Adjust card height for project kanban. + +commit 0fc8ebc741b25665287b2e423de01627e490a95c +Author: Hao Sun +Date: Wed Sep 1 13:40:31 2021 +0800 + + * improve style for project table. + +commit 11794815ce9fab901f27f127496912cda5ccdf4f +Author: 孙广明 +Date: Wed Sep 1 13:33:12 2021 +0800 + + * Fix program kanban style. + +commit 29c419141670e4515208f801063831168b51f4a1 +Author: xieqiyu +Date: Wed Sep 1 13:09:47 2021 +0800 + + * Fix bug#14781. + +commit 1c9d3d38c951746cc60a635b4733e6428fff4ad3 +Author: 孙广明 +Date: Wed Sep 1 13:05:02 2021 +0800 + + * Fix code error. + +commit 3170d8eb247268c407ebad07ad99e17793592d2d +Author: liyuchun +Date: Wed Sep 1 11:33:29 2021 +0800 + + * Code for task #41764. + +commit 54c4a5d00da9d77341ea1b40957fe7b3df2ec626 +Merge: cdb85dcf8b e0f0b72fbc +Author: 王怡栋 +Date: Wed Sep 1 11:31:13 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit cdb85dcf8b80279ff6db26db298a423e9a16ec5e +Author: 王怡栋 +Date: Wed Sep 1 11:30:47 2021 +0800 + + * fix for set object link. + +commit e0f0b72fbc3208d12b7bc558ce6b5595a676c8f1 +Author: Hao Sun +Date: Wed Sep 1 11:30:21 2021 +0800 + + * fix border style for product/kanban. + +commit 817bfd6e9d93a5cd17d63a9286bc00716cd2d92d +Merge: 79e6601360 4d2912a1eb +Author: hufangzhou +Date: Wed Sep 1 11:22:27 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 79e6601360f1e83120e6354d0f2fb349799f1c18 +Author: hufangzhou +Date: Wed Sep 1 11:22:23 2021 +0800 + + * Fix bug #14839. + +commit bcdee8ef2cb69ec0f73eaa72423513b6b9bb5575 +Merge: ff83efb066 5e5cbe2d2f +Author: 管西迎 +Date: Wed Sep 1 03:15:00 2021 +0000 + + Merge branch 'jihuMR' into 'jihuMR' + + Finish task#41303 + + See merge request easycorp/zentaopms!8 + +commit 4d2912a1ebf507e7a76161fcb6272db65e96294f +Author: liyuchun +Date: Wed Sep 1 11:13:05 2021 +0800 + + * Adjust color of doc menu. + +commit 5e5cbe2d2fafe6e1ab4861df4eebf54141129208 +Author: dingguodong +Date: Wed Sep 1 11:08:34 2021 +0800 + + * Update and correct editing a MR. + +commit 35934fa6d983df30429b2dace02ee7e841ca382a +Author: xieqiyu +Date: Wed Sep 1 11:00:52 2021 +0800 + + * Adjust the height of the progress. + +commit 54593337f28d8cee330da4384959edbaa3a1db8a +Author: Hao Sun +Date: Wed Sep 1 10:58:53 2021 +0800 + + * update theme "blue". + +commit ff83efb0666cbc320709f029e8d2d841df56005e +Author: Guan Xiying +Date: Wed Sep 1 10:57:07 2021 +0800 + + * Add manage reference of gitlab job function. + +commit d7599b4644df7800ff48c86c74a65a38647a2d26 +Author: xieqiyu +Date: Wed Sep 1 10:52:47 2021 +0800 + + * Set beyond hidden. + +commit 5e770ed8ca44185383ee771d5dbc663ab6f2e584 +Author: Hao Sun +Date: Wed Sep 1 10:40:53 2021 +0800 + + * add request "tutorial/ajaxFinish" back. + +commit 8b17a74a1ccce29dc68b04da49043a6d276fc6a2 +Author: dingguodong +Date: Wed Sep 1 10:36:02 2021 +0800 + + * Update fetching users list when creating a MR. + +commit 5ebad79a991cced602a1b80240e46fec42abc01d +Author: dingguodong +Date: Wed Sep 1 10:33:55 2021 +0800 + + * Fix bug when getting gitlab projects list. + +commit b4bca55cce2825a99936bb8457cbf89a82d3a5db +Merge: 163d32cd2b e99fb59620 +Author: 王怡栋 +Date: Wed Sep 1 10:33:41 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 163d32cd2b0e21941f604e82e9c2d04eef6a4481 +Author: 王怡栋 +Date: Wed Sep 1 10:33:05 2021 +0800 + + * adjust for restart tutorial. + +commit e99fb596201c5429c1d6572d3560d77af284cca2 +Author: Hao Sun +Date: Wed Sep 1 10:31:41 2021 +0800 + + * fix tutorial mode not work as expected sometimes. + +commit e6799383792bf059ae373c27f8321dee5d0303d2 +Author: dingguodong +Date: Wed Sep 1 10:29:03 2021 +0800 + + * Update ajaxGetMRUserPairs function. + +commit 3209790874beb0d2746b21a539031416670a8259 +Author: dingguodong +Date: Wed Sep 1 10:28:06 2021 +0800 + + + Add apiGetProjectUsers function. + +commit 5e96d4544ea210cc1e06c691cfe41658b43706e1 +Author: tianshujie +Date: Wed Sep 1 10:18:00 2021 +0800 + + * Fix bug #14757. + +commit 761c5d282e01964bbbb279dd0989811e72c827fb +Author: dingguodong +Date: Wed Sep 1 09:40:46 2021 +0800 + + * Fix bug when getting gitlab projects list. + +commit d9d8618f4bc1d4da5b431258006d0924c13bb14d +Author: Hao Sun +Date: Wed Sep 1 09:34:13 2021 +0800 + + * update theme "classic". + +commit 67dfccb01c69b0c016fa2b48a71e388c31b860a7 +Author: tianshujie +Date: Wed Sep 1 09:31:55 2021 +0800 + + * Fix bug #14776. + +commit 9328d2f7eb47626d9742c488c4b5bacb888a705c +Author: 孙广明 +Date: Wed Sep 1 09:15:23 2021 +0800 + + * Finish task #41715. + +commit 2ae6dc6b4ef78f772c65b94abd51e52eeaf674c1 +Merge: 4a0c1241bd 26d6ce34c1 +Author: zhujinyong +Date: Wed Sep 1 09:08:15 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4a0c1241bd400c8d3a7addd359757c30a83638d8 +Author: zhujinyong +Date: Wed Sep 1 09:02:37 2021 +0800 + + * Process options method. + +commit 26d6ce34c1909430000703edd0101722736dbf1a +Author: liyuchun +Date: Wed Sep 1 09:00:15 2021 +0800 + + * Fix bug #14269. + +commit 3276b61533dcccbc70ac0b18a1bcff8f31fe5909 +Author: xieqiyu +Date: Tue Aug 31 17:25:47 2021 +0800 + + * Fix bug#14797. + +commit 3947642f668d7bc53ba429c1a05b9a7cca3510d4 +Author: Hao Sun +Date: Tue Aug 31 17:20:25 2021 +0800 + + * improve UI for tutorial mode. + +commit 96d4ddca69038b7e6e3990282a220c4fdc19633c +Merge: c2ae426965 d59cd0a4c3 +Author: 王怡栋 +Date: Tue Aug 31 17:00:16 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit c2ae426965002e51a109c0576ced3b0b720798f9 +Author: 王怡栋 +Date: Tue Aug 31 16:59:48 2021 +0800 + + * upgrade for xuanxuan 4.4. + +commit d59cd0a4c312c1440e8546a463e0aec451be967b +Author: tianshujie +Date: Tue Aug 31 16:56:00 2021 +0800 + + * Fix bug #14826. + +commit 7cfc4a819d3fbac79525ecd81d7800df0cf29f3a +Author: liyuchun +Date: Tue Aug 31 16:55:22 2021 +0800 + + * Fix bug #14720. + +commit 3a82dbb2e717a62a8721c63acab790499b25d610 +Merge: 705b0c69e8 104c1e8548 +Author: liyuchun +Date: Tue Aug 31 16:26:18 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 705b0c69e8b67e6d562acad68e0636731dc922f3 +Author: liyuchun +Date: Tue Aug 31 16:26:03 2021 +0800 + + * Fix bug #14439. + +commit 104c1e854849d3d57d63ddf98d82876cf3220c2e +Author: xieqiyu +Date: Tue Aug 31 16:25:27 2021 +0800 + + * Code for task#41781. + +commit 71a023247a2aef0a4018215a42a2858a740d758a +Author: dingguodong +Date: Tue Aug 31 16:09:43 2021 +0800 + + - Remove getGitlabProjects function from repo model. + +commit 174518c1b58b33c735e925cf950cc6e3ebbaad43 +Author: dingguodong +Date: Tue Aug 31 16:09:03 2021 +0800 + + * Remove membership filter. + +commit 42db6b50eb5fe3d03e62efa24a7af0e61971856c +Author: tianshujie +Date: Tue Aug 31 16:02:11 2021 +0800 + + * Fix bug #14820. + +commit 9778deb98f4e090499b46b35e74546a2d52bc11d +Merge: 8cd6a20a38 84782b70c3 +Author: hufangzhou +Date: Tue Aug 31 16:00:41 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8cd6a20a3835db028ed836dce54d63e78e38bf0e +Author: hufangzhou +Date: Tue Aug 31 16:00:35 2021 +0800 + + * Code for task #41781. + +commit 84782b70c3dbfdef0614458de89d6c9e1d258cdb +Merge: 6230063da0 8a8e02dc10 +Author: 王怡栋 +Date: Tue Aug 31 16:00:22 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6230063da097ce4696ac63bcae66bbda88532434 +Author: 王怡栋 +Date: Tue Aug 31 15:59:27 2021 +0800 + + * Add autocomplete attr for input. + +commit 8a8e02dc104193b655c8dc2394a5cf10ead1f9b3 +Author: liyuchun +Date: Tue Aug 31 15:58:39 2021 +0800 + + * Fix bug #14783. + +commit a6872aca8e157c4fa97750b85e3cc005c5057400 +Merge: aa678ec71c 006e9488e1 +Author: 王怡栋 +Date: Tue Aug 31 15:56:22 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit aa678ec71c5ea47cd6f8c2b882f9921a960b5648 +Author: 王怡栋 +Date: Tue Aug 31 15:55:00 2021 +0800 + + * Fix for get gitlab projects. + +commit 006e9488e1fd046c70aa407fc49a2bae9cf181d3 +Author: tianshujie +Date: Tue Aug 31 15:45:19 2021 +0800 + + * Fix bug #14806. + +commit 04dbede9390c3871c2d7efbbccc9f49534395a4e +Author: tianshujie +Date: Tue Aug 31 15:34:45 2021 +0800 + + * Fix the execution view error. + +commit eb8fc2119cb937bafc74a46b2ea3c592dd501ed8 +Author: liyuchun +Date: Tue Aug 31 15:30:06 2021 +0800 + + * Fix bug #14800,#14657. + +commit 16344b108dd091631fac8f2ac6cdb9a89a010020 +Author: 孙广明 +Date: Tue Aug 31 15:29:44 2021 +0800 + + * Adjust program kanban style. + +commit 14a048caca06a93e4431c1166207c068e2e22a71 +Author: tianshujie +Date: Tue Aug 31 15:28:38 2021 +0800 + + * Fix bug #14806. + +commit d36c7fbc2011293d83ea2126d00bc5f869587fcd +Merge: 3fbc826d42 7af3f2ba8a +Author: dingguodong +Date: Tue Aug 31 15:24:27 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3fbc826d42dd4f12bdf8da07e2ba19f85e32345d +Author: dingguodong +Date: Tue Aug 31 15:24:12 2021 +0800 + + * Format user detail and date. + +commit 3e7f292efcfcd456bd658265699cf14abf7dedb9 +Author: dingguodong +Date: Tue Aug 31 15:22:37 2021 +0800 + + * Json encode the issue with JSON_HEX_TAG. + +commit 7af3f2ba8a6f30eff4c0b6608abc37f30fb0148a +Author: tianshujie +Date: Tue Aug 31 15:21:31 2021 +0800 + + * Fix bug #14811. + +commit 1fd8f082fdb44105ebf7e698bdfb5ef9d85a70d5 +Author: tianshujie +Date: Tue Aug 31 15:11:08 2021 +0800 + + * Fix error when creating task. + +commit 026287cbf57d6f7e7a6a88070dfbcbe21f62061f +Author: tianshujie +Date: Tue Aug 31 14:59:53 2021 +0800 + + * Fix bug #14655. + +commit cfee41bde41f06f7935e9207b03b60296c07e4ff +Author: tianshujie +Date: Tue Aug 31 14:57:11 2021 +0800 + + * Fix bug #14804. + +commit 7881844284240b8a5ac4162654c9c04b635f3749 +Merge: 189cca6b75 2754933fb6 +Author: 王怡栋 +Date: Tue Aug 31 14:33:58 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 189cca6b75450caa21ff47e5edfea02733360a51 +Author: 王怡栋 +Date: Tue Aug 31 14:33:25 2021 +0800 + + * finish task #40874. + +commit 2754933fb6cfae9240d5ce0b61f769d98d69452d +Author: zenggang +Date: Tue Aug 31 14:26:33 2021 +0800 + + * Finish bug#14753 + +commit b37e36dc2b1ab96e085b623d9520ad3e53bb5288 +Merge: eda39dafe8 bb27425288 +Author: hufangzhou +Date: Tue Aug 31 14:10:00 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit eda39dafe88319ba88177b7a93770ac5333caad4 +Author: hufangzhou +Date: Tue Aug 31 14:09:55 2021 +0800 + + * Add the setTutorialConfig method to open method. + +commit bb2742528843c0e001ef6401b2779342b93e4e09 +Author: Guan Xiying +Date: Tue Aug 31 14:08:34 2021 +0800 + + * Add process actions function. + +commit 6b34ef44c6be4577749d725335d0357ddc839df2 +Author: tianshujie +Date: Tue Aug 31 14:02:03 2021 +0800 + + * Fix bug #14802. + +commit 3c2934254ffd37b9f0d752ca4c29105f04f083c3 +Merge: 2103bf7b57 5c187e211b +Author: tianshujie +Date: Tue Aug 31 13:48:35 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 2103bf7b576a338b332de307e3cc24444643aa70 +Author: tianshujie +Date: Tue Aug 31 13:47:53 2021 +0800 + + * Fix bug #14723. + +commit 5c187e211b099f14e3724c68393932eb9d9b4800 +Author: liyuchun +Date: Tue Aug 31 13:47:47 2021 +0800 + + * Fix bug #14803. + +commit f4e99b630dda2ec3b796c2f5e55b1c530a03b0a9 +Author: tianshujie +Date: Tue Aug 31 13:40:55 2021 +0800 + + * Fix bug #14799. + +commit c90f6e6dbd672a618687445198b0303eacde40f5 +Author: liyuchun +Date: Tue Aug 31 13:23:40 2021 +0800 + + * Fix bug #14721. + +commit 8a99c654f5d5bea8aefa05b99408f7626f9e72a3 +Merge: 757d23337d 79f28e9605 +Author: liyuchun +Date: Tue Aug 31 13:01:16 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 757d23337d7fed6102548d01a14d3b6ee1f47dcf +Author: liyuchun +Date: Tue Aug 31 13:00:58 2021 +0800 + + * Fix bug #14783. + +commit 79f28e9605ff8b8674cd297d465f9c09d599c88e +Author: xieqiyu +Date: Tue Aug 31 11:27:30 2021 +0800 + + * Code for task#41776. + +commit 346173b831df7a8e59dece4447e33fe3f913af70 +Author: tianshujie +Date: Tue Aug 31 11:12:38 2021 +0800 + + * Fix bug #14795. + +commit 33b287b4279b5fba6a02110b6c0be9f2d8082862 +Author: dingguodong +Date: Tue Aug 31 11:10:50 2021 +0800 + + - Remove extra lines which should be deleted. + +commit 0d11868895e46a7c2aaf1519f920753b4dce4c3a +Merge: 1632859faf 587dd38b63 +Author: dingguodong +Date: Tue Aug 31 11:06:50 2021 +0800 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/dingguodong/zentaopms into jihuMR + +commit 1632859fafb9aef5299a7c91d6471929a320ff09 +Author: dingguodong +Date: Tue Aug 31 11:01:29 2021 +0800 + + * Update MR view and lang. + +commit 95c2adad703f2ca0f08f00104b8b2943b824e210 +Author: dingguodong +Date: Tue Aug 31 10:57:17 2021 +0800 + + * Correct apiAcceptMR and update functions. + +commit b2f1fd3f3cdba385403bf8ddd3f7005387d4838a +Author: dingguodong +Date: Tue Aug 31 11:05:03 2021 +0800 + + + Accept a MR. + +commit 587dd38b63164a043d73bc4ca648b54c458bad68 +Author: dingguodong +Date: Tue Aug 31 11:01:29 2021 +0800 + + * Update MR view and lang. + +commit df881ebb35d088cee1cf62ebf9a71db62987e98f +Author: dingguodong +Date: Tue Aug 31 10:57:17 2021 +0800 + + * Correct apiAcceptMR and update functions. + +commit cebaa0cad165d3cbe69f216df22443da632bd6c9 +Author: dingguodong +Date: Tue Aug 31 10:56:41 2021 +0800 + + + Accept a MR. + +commit 1cdf0f171d522bfeb08d8ffd8488c828de63073a +Author: tianshujie +Date: Tue Aug 31 10:56:25 2021 +0800 + + * Fix bug #14722. + +commit 454ddd6394bfb629e961c8fc3cb839a67a8efc00 +Author: liyuchun +Date: Tue Aug 31 10:25:37 2021 +0800 + + * Fix bug #14475. + +commit 34b5a5610566acc973ea83bdf107af0cefab4534 +Author: xieqiyu +Date: Tue Aug 31 10:13:44 2021 +0800 + + * Code for task#41776. + +commit 06906e06d6857a186c1aa41a44d544b16aad1557 +Author: Hao Sun +Date: Tue Aug 31 10:14:01 2021 +0800 + + * adjust padding of kanban containers. + +commit 8167e53ad899fbc514cfc0b4ade94c23251f594e +Author: tianshujie +Date: Tue Aug 31 10:12:24 2021 +0800 + + * Fix bug #14779. + +commit 2657f8e84c3235da64e5caa7b8d377cb7a98214c +Author: liyuchun +Date: Tue Aug 31 10:04:28 2021 +0800 + + * Fix bug #14736. + +commit 578613ca5b9f7b8ddc86ae9627ed11f49405b1e9 +Author: Guan Xiying +Date: Tue Aug 31 09:56:05 2021 +0800 + + * Fix query all issues bug. + +commit 2305c6c5b2133690500af0094f6c95a17077b4a1 +Author: tianshujie +Date: Tue Aug 31 09:50:57 2021 +0800 + + * Fix bug #14726. + +commit df220c11e2a7a1a0cc423a23eb3c3d999ad44088 +Author: 孙广明 +Date: Tue Aug 31 09:27:00 2021 +0800 + + * Fix program kanban bug. + +commit a3aae6c22610dda16b6a9a0e39487100678286cc +Author: liyuchun +Date: Tue Aug 31 09:16:51 2021 +0800 + + * Fix bug #14750. + +commit f4591051298acf2369aa043bb85ad8f1995ace18 +Author: tianshujie +Date: Tue Aug 31 09:12:58 2021 +0800 + + * Modify dynamic back link problem. + +commit 9b5e65973ebf84f92d092a7c7db98f16f503a52e +Author: xieqiyu +Date: Tue Aug 31 09:09:26 2021 +0800 + + * Put the project kanban card on the top. + +commit d72a254330d701aec870b926ea16b646c3be95af +Merge: f05c6c9607 8f3e2f9a08 +Author: hufangzhou +Date: Tue Aug 31 09:10:41 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f05c6c96070f3ee2a386e34fcba9f333829a9549 +Author: hufangzhou +Date: Tue Aug 31 09:10:36 2021 +0800 + + * Adjust the link font color. + +commit 8f3e2f9a08d6535b7c2c9fed6754a67ed7afa695 +Author: liyuchun +Date: Tue Aug 31 08:51:00 2021 +0800 + + * Fix bug #14757. + +commit efd85e67e19944ceacc6506f175b7a38903b5e17 +Merge: fd1f70f9da 664e290f97 +Author: liyuchun +Date: Tue Aug 31 07:55:34 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit fd1f70f9da811cbb54e993e84234194564a5e1c6 +Author: liyuchun +Date: Tue Aug 31 07:55:25 2021 +0800 + + * Fix bug #14759. + +commit 664e290f973a68cff7034f00abe7d5ce1a15db53 +Author: zhujinyong +Date: Tue Aug 31 00:30:48 2021 +0800 + + * Rename openApp to tab. + +commit ecab3e0392a545495399d91f8c72f59662a02616 +Author: Hao Sun +Date: Mon Aug 30 19:28:55 2021 +0800 + + * improve UI for page product/all. + +commit 3bf2e3013a59138a97750e8ac83bde211e588713 +Author: Hao Sun +Date: Mon Aug 30 17:00:59 2021 +0800 + + Revert "* fix padding top of #main in doc/tablecontents." + + This reverts commit c8495bc8178e117fd9516e5bcdbf112f72cdf856. + +commit d7bc81b5bcb378adaade2aca220fa15aa8711175 +Merge: 1a086845e7 24e12278da +Author: tianshujie +Date: Mon Aug 30 16:57:09 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1a086845e79b7e323a9d1422f18d6b9319dd8e61 +Author: tianshujie +Date: Mon Aug 30 16:56:56 2021 +0800 + + * Fix bug #14780. + +commit 24e12278da381a277f4c9461c32d3784fcef3bf8 +Merge: f35427ab9d 66e2833ee9 +Author: liyuchun +Date: Mon Aug 30 16:48:09 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit f35427ab9d1ca8ba6c24e1d66985600251e92bb2 +Author: liyuchun +Date: Mon Aug 30 16:47:59 2021 +0800 + + * Fix bug #14763. + +commit 66e2833ee9b68f350c6896fc4163af5f62dafb0f +Author: hufangzhou +Date: Mon Aug 30 16:46:19 2021 +0800 + + * Adjust the height of emptyBoard box. + +commit 06c8fbf471a523c519506fe18c87680e4ef3b5fa +Author: xieqiyu +Date: Mon Aug 30 16:25:05 2021 +0800 + + * Code for adjust the padding of more dropdown menus in English. + +commit d90d52c1e7cacc24c78cbd55eaf6d4e8666daff2 +Author: zenggang +Date: Mon Aug 30 16:19:58 2021 +0800 + + * Finish task#41799 + +commit 0bade25c36f2f8812d97539b297e526e38e70964 +Author: liyuchun +Date: Mon Aug 30 16:10:03 2021 +0800 + + * Fix bug #14765. + +commit 7d95dc55d91c0b57f8bcba2254102d428fdf479f +Author: tianshujie +Date: Mon Aug 30 16:04:50 2021 +0800 + + * Modify the back link of the testtask. + +commit 8e93990427bb2dcabf408cb46b09b42c0de5eb9c +Author: liyuchun +Date: Mon Aug 30 15:55:48 2021 +0800 + + * Finish task #41701. + +commit 6a2bb96f76d6712147655082752e3fa648b935fc +Author: xieqiyu +Date: Mon Aug 30 15:52:50 2021 +0800 + + * Code for task#41787. + +commit c478622702941e4842edea21e1f05710e4f5dd44 +Author: Hao Sun +Date: Mon Aug 30 15:51:10 2021 +0800 + + * update zui.js. + +commit 89c43c9a6399e39d053501261a280c29c763eb6e +Author: tianshujie +Date: Mon Aug 30 15:19:47 2021 +0800 + + * Modify the return link of the task. + +commit ff83b9d8e1f69038c30d69ebd423b66c0d79db39 +Author: tianshujie +Date: Mon Aug 30 15:11:03 2021 +0800 + + * Modify the back link of the test report. + +commit 99fdb293270306b3f0b1d188d4d0bf94b1ab44fa +Author: lichengjun +Date: Mon Aug 30 07:04:48 2021 +0000 + + * Adjust GitLab view html. + +commit 95ea397519b4297d8c1731c3c2b70245bddaabf5 +Author: lichengjun +Date: Mon Aug 30 06:55:05 2021 +0000 + + * Add GitLab view html. + +commit 8f4cfb67da9f735d6a96c0a6e44884a2f0d26aa3 +Author: lichengjun +Date: Mon Aug 30 06:52:02 2021 +0000 + + * Add Sync MR from GitLab API to Zentao database, default time 5 minutes to execute once. + +commit df8c8e651927199a361f33173cfbc5345a348bb0 +Author: tianshujie +Date: Mon Aug 30 14:49:19 2021 +0800 + + * Finish task #41700. + +commit 6c0ed1691ff6b8c996fba0855190d016911c0e18 +Author: Guan Xiying +Date: Mon Aug 30 14:40:57 2021 +0800 + + * Fix query by labels error. + +commit 543bf816da05ba0bcd3293ea0d7088bbd1169c3f +Author: tianshujie +Date: Mon Aug 30 14:37:17 2021 +0800 + + * Modify the return link of the report. + +commit f8b50c70205999b85ddd71d4942f38e3521d0f53 +Author: tianshujie +Date: Mon Aug 30 14:33:30 2021 +0800 + + * Fix the return link problem of the report module. + +commit 44167ab5001038282f65a24758327f5a56da3272 +Author: zenggang +Date: Mon Aug 30 14:31:13 2021 +0800 + + * Finish task#41681 + +commit 7a41cef9cb4976c95c18182979a8e61ce5ea18a3 +Merge: 10b1dc5231 4abf6d040c +Author: hufangzhou +Date: Mon Aug 30 14:19:19 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 10b1dc5231161dacf10fafdc1c92ec51f452b167 +Author: hufangzhou +Date: Mon Aug 30 14:19:11 2021 +0800 + + * Draft or closed story not allowed to create task. + +commit 4abf6d040c6f1d7ec97508bb47daf8f77135ba76 +Author: xieqiyu +Date: Mon Aug 30 14:17:58 2021 +0800 + + * Fix an error for export execution. + +commit cc9a32d981659833baab72bf9eaa9051691b4257 +Author: tianshujie +Date: Mon Aug 30 14:14:37 2021 +0800 + + * Fix product module return link problem. + +commit ed00c3ff6e96a492636629eedc6e827672f57456 +Merge: 8ca2119f37 92e2a4e18e +Author: tianshujie +Date: Mon Aug 30 13:58:28 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 92e2a4e18e6bb762f62652f78ee4fc081addd66f +Author: liyuchun +Date: Mon Aug 30 13:57:59 2021 +0800 + + * Fix bug #14718. + +commit 8ca2119f370c3077e8e800504d7ff6ef10bf602e +Author: tianshujie +Date: Mon Aug 30 13:57:21 2021 +0800 + + * Fix back link problem of execution module. + +commit cc9ad9a713738a825c0c38e1ffd79c3b2e272145 +Author: liyuchun +Date: Mon Aug 30 13:51:35 2021 +0800 + + * Finish task #41676. + +commit d2858989a423beb7b2bb9207d5b3638f647d7ae7 +Author: zenggang +Date: Mon Aug 30 13:44:19 2021 +0800 + + * Finish task#41681 + +commit ebc543ff544feb0ae544ded871766b5d53086770 +Merge: adeb8ba5b6 6e4be017b0 +Author: hufangzhou +Date: Mon Aug 30 13:31:03 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit adeb8ba5b68fe7393967000b988b09fddacc3738 +Author: hufangzhou +Date: Mon Aug 30 13:30:59 2021 +0800 + + * Code for bug #12802. + +commit 6e4be017b01f56332e70b1d56be601e652b365ad +Author: liyuchun +Date: Mon Aug 30 13:29:49 2021 +0800 + + * Finish task #41692. + +commit e60c95725e2ab64cfb2dc185bac85d7819299d58 +Author: tianshujie +Date: Mon Aug 30 13:23:07 2021 +0800 + + * Modify the test module to return the link problem. + +commit 46f2dc73c3095b134ea27b197b37abebaf4ccf11 +Author: liyuchun +Date: Mon Aug 30 13:00:53 2021 +0800 + + * Finish task #41764. + +commit d82f45a7dfa10c6799eb394fe0c0756e4b45f556 +Author: Guan Xiying +Date: Mon Aug 30 11:32:04 2021 +0800 + + * Fix query by label error. + +commit bc10a2e360a606aaa5932658384c46a1b3f876a5 +Author: tianshujie +Date: Mon Aug 30 11:18:33 2021 +0800 + + * Modify the problem of the project module return link. + +commit d88cf84cca8303715bcd71a669bbac9552e08bf7 +Merge: 4141b05b7b f8cb02016b +Author: hufangzhou +Date: Mon Aug 30 11:13:59 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4141b05b7b151e1d2cff7e55b3e07bf7863a9e71 +Author: hufangzhou +Date: Mon Aug 30 11:13:53 2021 +0800 + + * Fix bug #12802. + +commit f8cb02016b3d7c602ee4348a35cc5573b02738ad +Author: xieqiyu +Date: Mon Aug 30 11:07:24 2021 +0800 + + * Adjust locate link for project at program kanban. + +commit d694419e52532bc96f59dc2e299b168c4ae87796 +Author: liyuchun +Date: Mon Aug 30 11:01:10 2021 +0800 + + * Code for task #41764. + +commit c125e23874258c112dbafc98f5f7550b35f3ed79 +Author: 孙广明 +Date: Mon Aug 30 10:45:04 2021 +0800 + + * Code for task #41736. + +commit 02e29f3d0de129d98c8111fe00445caef9dc8136 +Author: xieqiyu +Date: Mon Aug 30 10:32:41 2021 +0800 + + * Fix an error of my collection is empty. + +commit 1765f123388f67df2054c1330b4458a01eb35de9 +Author: tianshujie +Date: Mon Aug 30 10:24:25 2021 +0800 + + * Modify the problem of the product module return link. + +commit f5f503cea4922e65b7c45e413e5b8402d88c9a99 +Author: xieqiyu +Date: Mon Aug 30 10:06:19 2021 +0800 + + * Finish task#41787. + +commit 6a93618b840c179604dafb383d5ea7b6668dcfe8 +Author: liyuchun +Date: Mon Aug 30 09:43:13 2021 +0800 + + * Code for task #41764. + +commit 3f5f2ef873d9ccaf538f47c48d3a5b34101cbb30 +Author: 孙广明 +Date: Mon Aug 30 09:25:28 2021 +0800 + + * Remove gitlab hosts empty value. + +commit 1970465eef3e72ad3a57e1b90101d6a1b8326846 +Author: tianshujie +Date: Mon Aug 30 09:01:18 2021 +0800 + + * Remove useless code. + +commit bdf1f1d7d650d38efdbf2eb95090e6a60a635fce +Author: liyuchun +Date: Sun Aug 29 22:50:36 2021 +0800 + + * Code for task #41764. + +commit 49b75957c22c0a30ef77577149c5ab4fb271d2f9 +Author: liyuchun +Date: Sun Aug 29 22:30:05 2021 +0800 + + * Code for task #41764. + +commit 18352e76b00a0e4cfe5fe14201867b9bf4b4f4f7 +Author: liyuchun +Date: Sun Aug 29 22:28:09 2021 +0800 + + * Code for task #41764. + +commit e37cf70d836a2ab072e5d7d4a6a2159ecbf00373 +Author: Hao Sun +Date: Sun Aug 29 11:25:30 2021 +0800 + + * update theme "blue". + +commit b2e53875cf3833588b3577712b48debf4edb47f0 +Author: Hao Sun +Date: Sun Aug 29 11:25:20 2021 +0800 + + * refactor: remove duplicate classname .main-table. + +commit ac455fd310f6579004ed769ea727ab40be5ca95d +Author: 王怡栋 +Date: Sun Aug 29 11:23:51 2021 +0800 + + * finish task #41531. + +commit 27a0cb76e627e3ea94e3fbc29949f3043a09be99 +Merge: 193667e18a cea6248bc0 +Author: 王怡栋 +Date: Sun Aug 29 11:20:00 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 193667e18a916b869006ab29f6a7dc2d983202db +Author: 王怡栋 +Date: Sun Aug 29 11:18:48 2021 +0800 + + * finish task #41794. + +commit cea6248bc0251513e0dd22773fed87825e3c76e2 +Author: xieqiyu +Date: Fri Aug 27 21:28:29 2021 +0800 + + * Finish task#41684. + +commit e3a751acaf2cf8b02eb2253eaf6a3c2298c0fc38 +Author: xieqiyu +Date: Fri Aug 27 21:24:41 2021 +0800 + + * Finish task#41684. + +commit 8cc601a7ae38d0a669bda9f9194f25cb0aa89be0 +Author: xieqiyu +Date: Fri Aug 27 20:44:11 2021 +0800 + + * Finish task#41685. + +commit 6676d63626e065d9121f6cd119f5a38673192799 +Author: xieqiyu +Date: Fri Aug 27 20:25:43 2021 +0800 + + * Add link for project kanban. + +commit 9638d2ff944d18761b83072ee4e70e250f18c16b +Author: xieqiyu +Date: Fri Aug 27 19:37:27 2021 +0800 + + * Code for task#41787. + +commit 934cf4736ba8d39e1aeefb8f0a4c4934bb0ffa12 +Merge: a90a378321 7e4c7dc503 +Author: 王怡栋 +Date: Fri Aug 27 18:03:02 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit a90a378321a7e8929f35ecaf0f6ad02736b6f6e2 +Author: 王怡栋 +Date: Fri Aug 27 18:02:41 2021 +0800 + + * finish task #41707. + +commit 1b73c952ec5d1c0ac033d7c96e9888d7059f83cf +Merge: 2b03f84fe4 033ffbb3ed +Author: 丁国栋 +Date: Fri Aug 27 09:48:39 2021 +0000 + + Merge branch 'jihuMR' into 'jihuMR' + + * Fix bug when creating a repo without gitlabProject. + + See merge request easycorp/zentaopms!7 + +commit caff652439ae7d92fbf42be68f3fe2dbade9bf23 +Author: dingguodong +Date: Fri Aug 27 17:45:46 2021 +0800 + + * Fix bug when creating a repo without gitlabProject. + +commit 7e4c7dc503961ec12721fa88872347bd9811a0a9 +Author: dingguodong +Date: Fri Aug 27 17:43:54 2021 +0800 + + * Fix bug when creating a repo without gitlabProject. + +commit 033ffbb3ed9676258879b74c67d1bd94704da9f7 +Author: dingguodong +Date: Fri Aug 27 17:37:28 2021 +0800 + + * Fix bug when creating a repo without gitlabProject. + +commit 2a24e037250b00eb7ea8245f27977259a186951b +Author: zenggang +Date: Fri Aug 27 17:08:07 2021 +0800 + + * Finish task#41709 + +commit 4e278c4c44a8a0aef424b1e3e64b456e4df7c4b4 +Author: tianshujie +Date: Fri Aug 27 17:01:03 2021 +0800 + + * Finish task #41688. + +commit f318aa5e989bd62a90b9f4d69e17c7c152677664 +Author: liyuchun +Date: Fri Aug 27 16:43:00 2021 +0800 + + * Finish task #41591. + +commit 7eb5c6142c4685ea473c0212fc6668fefe8c6912 +Author: liyuchun +Date: Fri Aug 27 16:40:43 2021 +0800 + + * Code for task #41764. + +commit 75faca9e87fd723821cfd7a1be43c7e6f32e390e +Author: tianshujie +Date: Fri Aug 27 16:21:43 2021 +0800 + + * Revert commit. + +commit bcc6f6a97e2433be9bc76efca7aa5fe28274256b +Merge: 1df67f68c0 75dd81398c +Author: hufangzhou +Date: Fri Aug 27 16:20:40 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1df67f68c04528240817113ecd347f4f27a3a520 +Author: hufangzhou +Date: Fri Aug 27 16:19:03 2021 +0800 + + * Finish task #41690. Fix bug #14291. + +commit 2b03f84fe4c87e0d77fc3229408dcd70a7f9c555 +Author: lichengjun +Date: Fri Aug 27 08:10:04 2021 +0000 + + * Adjust GitLab browse template. + +commit 75dd81398c2ec0487496065ec6ff07656c1a8b93 +Merge: 6c74af389a bf598f288f +Author: 王怡栋 +Date: Fri Aug 27 15:53:37 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6c74af389a0f183bc33d106a72d1b54a0345eb5d +Author: 王怡栋 +Date: Fri Aug 27 15:52:52 2021 +0800 + + * fix bug for get execution stories when create task. + +commit bf598f288f9a0b200a755ad70002d0753a950f52 +Author: zenggang +Date: Fri Aug 27 15:44:56 2021 +0800 + + + Finish task#41826 + +commit b97e80568efa89603e770f79095de23e953ee6f2 +Author: tianshujie +Date: Fri Aug 27 15:42:03 2021 +0800 + + * Modify the testsuite return link problem. + +commit ec13c206fff284399c445c9748ca4e27104397b7 +Merge: 75df1a3dda e3ce1be1a8 +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 27 15:39:48 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 75df1a3ddaba02e410061b6bd285e3c59c354b9d +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 27 15:39:38 2021 +0800 + + * Finish task #41722. + +commit 4cd4dd6a3d7247b9bb59eec68f8b7c30e22bdde9 +Author: lichengjun +Date: Fri Aug 27 07:36:48 2021 +0000 + + * Add GitLab view template and control view function. + +commit e3ce1be1a8b11138c5fde3b24ffaf682de5b1f1f +Merge: 5f740be96b ad66c56b0a +Author: tianshujie +Date: Fri Aug 27 15:24:54 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5f740be96bed3555caed44e62e5c870e2c77b371 +Author: tianshujie +Date: Fri Aug 27 15:24:32 2021 +0800 + + * Modify the test case back link problem. + +commit ad66c56b0ac801803f8447ca1d7d3dde8a29b115 +Author: zenggang +Date: Fri Aug 27 15:19:52 2021 +0800 + + * Finish task#41691 + +commit 0bf45545a82fd81e9d3bb79e06127c51e8ae52b5 +Merge: 5042f1de90 9f550b256c +Author: hufangzhou +Date: Fri Aug 27 15:13:51 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5042f1de90247fe3566adfd3a393cde7d62fa3b8 +Author: hufangzhou +Date: Fri Aug 27 15:13:45 2021 +0800 + + * Fix bug #14731. + +commit d00f7f9fdd60c3ec3fdc345eafd42629491a2589 +Author: dingguodong +Date: Fri Aug 27 15:12:16 2021 +0800 + + * Fix bug#14737 . + +commit 9f550b256c83550c932156b51d6dc7eada5a9276 +Merge: d5589f7157 6ee9262b2c +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 27 15:02:18 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d5589f71571c11305269a8e83d085f7046668905 +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 27 15:01:55 2021 +0800 + + * Finish task #41727. + +commit 6ee9262b2c7c76eda6a881cd334432c89195db2c +Merge: d5619ae6a5 6e28920ff2 +Author: 王怡栋 +Date: Fri Aug 27 14:53:36 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d5619ae6a50f083211e509025b518851dcab404e +Author: 王怡栋 +Date: Fri Aug 27 14:53:20 2021 +0800 + + * finish task #41528. + +commit 6e28920ff268f847983af5b9ee637d30ed03a9e7 +Merge: 501bb4afaf 66334479d5 +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 27 14:46:56 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 501bb4afafba9e606524029a8169fb453a5b4e57 +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 27 14:46:44 2021 +0800 + + * Finish task #41730. + +commit c6922215ae362f03bd247591a4dd0a8a2ae38360 +Author: 王怡栋 +Date: Fri Aug 27 14:42:14 2021 +0800 + + * fix bug for edit build and compute userview. + +commit 66334479d5b4e66cf663c451ba6585d74659620c +Merge: 77ef906b39 6384f4fb3b +Author: tianshujie +Date: Fri Aug 27 14:37:13 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6384f4fb3bff58fd45aefabdfd416f4a53b32f98 +Merge: 47f7d26b51 b6e0911e30 +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 27 14:36:59 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 47f7d26b517ede02890482156b7e008c4132ee1d +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 27 14:36:51 2021 +0800 + + * Remove unused code. + +commit 77ef906b3910226aa5186137d8860db7c700c864 +Author: tianshujie +Date: Fri Aug 27 14:36:27 2021 +0800 + + * Set the session for the page's return link. + +commit b6e0911e300b89c40f2b76383516c64eb0ae03a6 +Author: zenggang +Date: Fri Aug 27 13:55:59 2021 +0800 + + + Finish task#41824 + +commit a2ccfffdb4342116ea5e67c50d1a24965ba7fcca +Merge: 268eb0f161 496729984f +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 27 13:53:06 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 268eb0f16144e5fa534541b8c0db8b993e1c8d29 +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 27 13:52:59 2021 +0800 + + * Finish task #41736. + +commit 496729984f3f622080c5dbfd2de068c74d9b9636 +Author: tianshujie +Date: Fri Aug 27 13:45:01 2021 +0800 + + * Modify the test report to report an error. + +commit 06a685da94b8c74e038b4570c50546ee2f7d9eed +Merge: 5e42afa56b 81761d4918 +Author: hufangzhou +Date: Fri Aug 27 13:34:51 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5e42afa56b4defce78d6e436f2485cb53fe3aeab +Author: hufangzhou +Date: Fri Aug 27 13:34:47 2021 +0800 + + * Fix bug #14623. + +commit 81761d4918ce977c4ce365023a1693cbcc00ed1e +Merge: 89328862e8 0f279a3c84 +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 27 13:23:54 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 89328862e8b0a9fceedb7760133a8ba4fb6bc302 +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 27 13:23:45 2021 +0800 + + * Finish task #41738. + +commit 0f279a3c8432f07ddb987a344ad876830e242464 +Author: tianshujie +Date: Fri Aug 27 13:21:00 2021 +0800 + + * Fix bug #14725. + +commit cd6b1ace33571e5750f978062ad2a1279ac843a7 +Merge: c134837538 0cd7dbe352 +Author: hufangzhou +Date: Fri Aug 27 13:18:13 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit c13483753844ba3e6677d8554eace8b7c38b87e0 +Author: hufangzhou +Date: Fri Aug 27 13:18:03 2021 +0800 + + * Add the access control for link in product kanban page. + +commit 0cd7dbe352cb99f6b5d58a3fe8bbd1654b507b71 +Author: xieqiyu +Date: Fri Aug 27 11:03:50 2021 +0800 + + * Code for task#41776. + +commit 2191301d6a78d57b7286aca531c8631f533fa19c +Author: tianshujie +Date: Fri Aug 27 10:47:23 2021 +0800 + + * Modify site list execution and project jump links. + +commit 3c24fec3c2fc79b224c90d2a9baadb8df2fd17b4 +Author: tianshujie +Date: Fri Aug 27 10:30:20 2021 +0800 + + * Modify the back link jump problem. + +commit 82c3d83ce4eb4339dc71133505900eb5a6e82afd +Merge: 0a9b1f42ac c8a961b99d +Author: 王怡栋 +Date: Fri Aug 27 10:21:20 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0a9b1f42ac30d8ffef67321f2468fec0269c2490 +Author: 王怡栋 +Date: Fri Aug 27 10:20:27 2021 +0800 + + * fix bug #14682. + +commit c8a961b99dbb79d0954a0646d1c052e5ef770134 +Merge: eac7ad0dee 3f70e1ac12 +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 27 09:49:07 2021 +0800 + + Mselferge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit eac7ad0dee2949957faf4973a1cd67cd092df4c2 +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 27 09:48:59 2021 +0800 + + * Finish task #41743. + +commit 3f70e1ac12ac9567893901a3a2435e5f103bf81c +Merge: 102cedf40d d9f17ce8b4 +Author: hufangzhou +Date: Fri Aug 27 09:46:23 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 102cedf40d83478b09fb990a10598435e0e97b21 +Author: hufangzhou +Date: Fri Aug 27 09:46:17 2021 +0800 + + * Finish task #41801. + +commit d9f17ce8b4e5b594a16be13ca9051efb3b13a28d +Author: tianshujie +Date: Fri Aug 27 09:38:39 2021 +0800 + + * Finish task #41688. + +commit 4cf1c0daa9a10d98787040001bae344f6cd4d15c +Merge: 871cd7d21a 1d9263a077 +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 27 09:28:31 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 871cd7d21af6e50dde3c3ec7ee91c7bb264904e7 +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 27 09:28:21 2021 +0800 + + * Finish task #41744. + +commit 1d9263a077905ad32314216aa95c0aeec01ea50d +Author: tianshujie +Date: Fri Aug 27 09:06:34 2021 +0800 + + * Finish task #41688. + +commit 528fed35dc9810121c6f93e5fd69eb28128ea2c4 +Author: tianshujie +Date: Fri Aug 27 08:38:35 2021 +0800 + + * Finish task #41537. + +commit 4d6543317170f11ade61c571facf91cce6b0ea99 +Author: tianshujie +Date: Fri Aug 27 08:34:16 2021 +0800 + + * Finish task #41607. + +commit 81781c80f097c8ca75b671fda74bf667f5fbf622 +Author: xieqiyu +Date: Thu Aug 26 18:32:22 2021 +0800 + + * Code for task#41776. + +commit c840abc9c7525f98c6d8cc7500dd7085d99afe34 +Author: zenggang +Date: Thu Aug 26 18:03:50 2021 +0800 + + * Finish task#41822 + +commit d392f0e44c73047e448dc71035867581fcb7183d +Author: liyuchun +Date: Thu Aug 26 17:59:58 2021 +0800 + + * Code for task #41764. + +commit 0a56e0100e03e12ee9671eb0e7b6f72bb80b48b3 +Author: Guan Xiying +Date: Thu Aug 26 17:45:16 2021 +0800 + + * Fix comments. + +commit 8c32895ad801b05cb7190236d4d4e3cea27589c0 +Author: Guan Xiying +Date: Thu Aug 26 17:44:44 2021 +0800 + + * Fix comments. + +commit 1160e1eba721370c26298a965be7c3eba25bed17 +Author: Guan Xiying +Date: Thu Aug 26 17:44:06 2021 +0800 + + * Use common::printLink and remove extra comments. + +commit 03b9fd39825262675c88367661df17d55bd5e168 +Author: Guan Xiying +Date: Thu Aug 26 17:43:10 2021 +0800 + + * Add apiError->createMR lang item. + +commit cfd56b03f0e39832fc3eca5991326e7c87545d36 +Author: Guan Xiying +Date: Thu Aug 26 17:41:35 2021 +0800 + + * Remove processMR function, Adjust api error message. + +commit 3110a903c35c34f90415946b2e6cab0057c73cdd +Author: Guan Xiying +Date: Thu Aug 26 17:41:13 2021 +0800 + + * Fix ajaxGetMRTragetProjects. + +commit 567f80f171b9c9a8d9600f8d5863b8e7727cc7e2 +Author: Guan Xiying +Date: Thu Aug 26 17:40:03 2021 +0800 + + * Fix ajaxGetMRTragetProjects and remove and Fix comments. + +commit 89f25d447dccada07e7f622511a4eb2cc965cf3f +Author: tianshujie +Date: Thu Aug 26 17:38:39 2021 +0800 + + * Add return session to statistical report. + +commit e64147cfc1454235bf9e3e67d6b2f426929d3e32 +Author: tianshujie +Date: Thu Aug 26 17:32:17 2021 +0800 + + * Finish task #41574. + +commit ed95aa5dbd30b5267a93974b3aed69eff5f0353b +Author: Guan Xiying +Date: Thu Aug 26 17:08:09 2021 +0800 + + * Fix rignt spell error. + +commit e283aa7ddf86b41c5f29d9e17b9b85e240875309 +Author: tianshujie +Date: Thu Aug 26 16:59:07 2021 +0800 + + * Modify the back link of the imported use case page. + +commit 2d6419c497fb594b24909cedbd1c25e7a8c0e15d +Author: Guan Xiying +Date: Thu Aug 26 16:58:29 2021 +0800 + + * Adjust style of pipeline status. + +commit db2e98efbc333a53d8ac726a5fe173a2dd746df6 +Author: tianshujie +Date: Thu Aug 26 16:51:19 2021 +0800 + + * Delete the back button of the prompt. + +commit 0a88f13f16f168b67d5537324cbfcfeb79c76da6 +Author: Guan Xiying +Date: Thu Aug 26 16:46:47 2021 +0800 + + - Delete list.html.php . + +commit 9b1ca198bccd04bed0a38eb75fd8d137703d1b01 +Author: Guan Xiying +Date: Thu Aug 26 16:45:29 2021 +0800 + + * Adjust style of view MR page. + +commit 96408952fa4846f8031abac19c24ef4e7a327429 +Author: tianshujie +Date: Thu Aug 26 16:36:53 2021 +0800 + + * Finish task #41697. + +commit 539903b7a3ab286c0b463274929a9cee715917a7 +Merge: 720f431791 62e878b346 +Author: hufangzhou +Date: Thu Aug 26 16:31:42 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 720f431791d8bbc3770407b3f2e70fa78abba7b0 +Author: hufangzhou +Date: Thu Aug 26 16:31:38 2021 +0800 + + * Add the language item. + +commit 62e878b346328d95e7c0e8daff502afe86f82b42 +Merge: 91ed2464fb f81ac5db58 +Author: tianshujie +Date: Thu Aug 26 16:29:12 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f81ac5db58e3d6f7de501b70aeafcc26dff51445 +Author: liyuchun +Date: Thu Aug 26 16:27:53 2021 +0800 + + * Code for task #41764. + +commit 91ed2464fb9b18a765a5896ccd9064b2f0e703d4 +Author: tianshujie +Date: Thu Aug 26 16:23:26 2021 +0800 + + * Modify the storage method of cookies. + +commit c47fbcc3334b9ecaad5e1be9347a7391d8623358 +Author: hufangzhou +Date: Thu Aug 26 16:07:40 2021 +0800 + + * Finish task #41797, task #41795, task #41796. + +commit 4b230745c12ff97e6a81b2a163b83335861e5e93 +Author: 孙广明 +Date: Thu Aug 26 15:45:44 2021 +0800 + + * Code for task #41775. + +commit 718a96fd424489704f3ab8fa2d71b5b5de44eb61 +Author: tianshujie +Date: Thu Aug 26 15:22:18 2021 +0800 + + * Modify the method of obtaining links. + +commit 02ab020a4bcb1f13dc6101fd586ae5e0eb86bd5a +Merge: d2db659d01 e92f6632a4 +Author: 王怡栋 +Date: Thu Aug 26 15:14:06 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d2db659d01bcc8108a184a5df9394c7bc8bfc0cf +Author: 王怡栋 +Date: Thu Aug 26 15:13:40 2021 +0800 + + * code for task #41718. + +commit e92f6632a44bb9c25ef4eaa7e876ea57693d7756 +Author: zenggang +Date: Thu Aug 26 14:54:16 2021 +0800 + + + Finish task#41812,41813,41814 + +commit 043da8c9660741d2a0b5e864e88c7b51cbaa297a +Author: tianshujie +Date: Thu Aug 26 14:49:54 2021 +0800 + + * Modify the width of the list. + +commit ed852c35ed8ee6f45da0a0dc50eccc137af04050 +Merge: 02f74276fa ea49bdfa2e +Author: 王怡栋 +Date: Thu Aug 26 14:40:24 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 02f74276faf717caa7fef5586dec375b942d43fa +Author: 王怡栋 +Date: Thu Aug 26 14:39:58 2021 +0800 + + * finish task #41718. + +commit ea49bdfa2e9582e18b163ce899b8ec9c4b18a63b +Merge: c24f76ce19 4f58b7d309 +Author: hufangzhou +Date: Thu Aug 26 14:36:42 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit c24f76ce19b32548f5b56e4718c7d49d0816b7da +Author: hufangzhou +Date: Thu Aug 26 14:36:38 2021 +0800 + + * Code for task #41777. + +commit 4f58b7d309a54b49bb21bc56d9626d358a23f440 +Author: tianshujie +Date: Thu Aug 26 14:34:58 2021 +0800 + + * Finish task #41553. + +commit 8993bbe8db431466952f2496547eb92b71674dd4 +Author: tianshujie +Date: Thu Aug 26 14:33:10 2021 +0800 + + * Finish task #41551. + +commit 86ac7b617627c303e293096f79930c4d88827e1d +Author: tianshujie +Date: Thu Aug 26 14:31:26 2021 +0800 + + * Finish task #41687. + +commit 7239c661298b165e97beb1a73c37fc45a9739d69 +Author: Guan Xiying +Date: Thu Aug 26 14:22:19 2021 +0800 + + * Add js file of mr diff page. + +commit 4b0400c738daa971eaeb42582e27623bee00a2c2 +Author: tianshujie +Date: Thu Aug 26 14:21:33 2021 +0800 + + * Finish task #41697. + +commit 6e3158cc69295c3185530aba7992b81a47f09951 +Author: Guan Xiying +Date: Thu Aug 26 14:20:52 2021 +0800 + + * Finish view mr codes diff page. + +commit b31b78b3d508ca16fef9b415e606db43f9774afa +Author: tianshujie +Date: Thu Aug 26 14:15:35 2021 +0800 + + * Finish task #41689. + +commit 90010edb53a58a23544512f9a7ca63508a070732 +Merge: 350ddb61d4 840588adaa +Author: tianshujie +Date: Thu Aug 26 13:49:54 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 350ddb61d4a2c553d63af6e57814ffc21d627718 +Author: tianshujie +Date: Thu Aug 26 13:49:44 2021 +0800 + + * Finish task #41772. + +commit 38c327927fe595b1ab5f272bbded1e620510949b +Author: lichengjun +Date: Thu Aug 26 05:49:38 2021 +0000 + + * Adjust GitLab history log. + +commit 840588adaab189ac1bac58cb44c3d67a0dd2d1b7 +Merge: c6cd5d42a3 9cdeee2f00 +Author: 王怡栋 +Date: Thu Aug 26 13:45:19 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit c6cd5d42a36d30ee419ac5171c93a231c1a8410b +Author: 王怡栋 +Date: Thu Aug 26 13:43:57 2021 +0800 + + * Set menu when batchEdit product come from program. + +commit 89f498454fdb66bb694b9ce166d910411b49ec7d +Author: 王怡栋 +Date: Thu Aug 26 11:20:44 2021 +0800 + + * finish task #41769. + +commit d1a4cae58fc129a293ceb4af955374b2822f6417 +Author: 王怡栋 +Date: Thu Aug 26 11:20:03 2021 +0800 + + * fix for no select checkbox default. + +commit 9cdeee2f00d1a5df91a63fd0b306df5c9f34a337 +Author: Hao Sun +Date: Thu Aug 26 11:11:29 2021 +0800 + + * change tutorial settings. + +commit 7177136cd01a003f52d1fdbe964864151d223a98 +Author: Hao Sun +Date: Thu Aug 26 10:57:44 2021 +0800 + + * task #41783, #task 41765, improve UI for tutorial mode. + +commit 6659fc86a722ee0421a2c0d057a5de0e8474e61b +Author: Hao Sun +Date: Thu Aug 26 10:25:34 2021 +0800 + + * change english lang data for tutorial mode. + +commit acaa2af9b9fc4f86dfc1416e60118ae9f5d0f189 +Author: Hao Sun +Date: Thu Aug 26 10:21:01 2021 +0800 + + * fix task id in tutorial page. + +commit 23704ad6a5df913ee7064ed1680c44e1e0821772 +Author: liyuchun +Date: Thu Aug 26 10:08:42 2021 +0800 + + * Fix bug #14666. + +commit 5cccf8d9bfc3e445633ccb79357efc87a4bbc1e4 +Merge: 316d32a696 09f4a426d4 +Author: liyuchun +Date: Thu Aug 26 10:05:55 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 316d32a696b224ec26e22e1daafe6bdd1fe34824 +Author: liyuchun +Date: Thu Aug 26 10:05:40 2021 +0800 + + * Code for task #41764. + +commit 09f4a426d47ac768affe2cdae255a97535f78cb3 +Author: Hao Sun +Date: Thu Aug 26 10:05:30 2021 +0800 + + * task #41783, #task 41765, improve UI for tutorial mode. + +commit 2fe38173b7c1149cd5264e94a03a03ab82f6254f +Merge: 63bae30d3d 4c0e765a10 +Author: 王怡栋 +Date: Thu Aug 26 09:45:23 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 63bae30d3d5519f28315d873a56f627fde944ef0 +Author: 王怡栋 +Date: Thu Aug 26 09:44:58 2021 +0800 + + * add cookie for edit project checkbox. + +commit abe86c312872e30a1d3664da06272bb2bda3df0d +Author: 王怡栋 +Date: Thu Aug 26 09:44:37 2021 +0800 + + * adjust for php8. + +commit 4c0e765a105d75bcd7ff81a2edb0ac7c0b5b39f7 +Merge: 10f39c9053 a46623e25b +Author: hufangzhou +Date: Thu Aug 26 09:26:23 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 10f39c9053df040d869ffc5822d6c99866ffd114 +Author: hufangzhou +Date: Thu Aug 26 09:26:19 2021 +0800 + + * Task #41784: Remove the unused code. + +commit a46623e25b2cceb23c94f8914f56005b556c1525 +Author: 王怡栋 +Date: Thu Aug 26 09:24:09 2021 +0800 + + * fix for exec sql in tutorial mode. + +commit 4779bb64b30ef95ddc26d888c181e2db7a0ea65d +Author: Hao Sun +Date: Thu Aug 26 08:45:03 2021 +0800 + + * task #41783, #task 41765, implement tutorial mode and add new tutorial task. + +commit 6b275b3487a159686b4e4f15d9e81021e0e740e5 +Merge: 4500687de6 5b8e78cd18 +Author: 王怡栋 +Date: Wed Aug 25 20:10:51 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4500687de6e5fae737280437560b70fd7879b953 +Author: 王怡栋 +Date: Wed Aug 25 20:10:03 2021 +0800 + + * finish task #41923. + +commit 5b8e78cd1814945f14db34d9e0715a34b4d7c291 +Author: xieqiyu +Date: Wed Aug 25 19:54:33 2021 +0800 + + * Code for task#41776. + +commit 488823ddbca804f9d260bec51ff103c743dfbb8a +Author: Hao Sun +Date: Wed Aug 25 17:46:21 2021 +0800 + + * trigger event on app state changes. + +commit 394a4ace8bcfc077251ea0955433591a40826ca7 +Author: Hao Sun +Date: Wed Aug 25 17:45:26 2021 +0800 + + * fix tutorial/start link in user profile menu. + +commit 3d18ea5cd834670a5435fa5e8a0ea092caca9443 +Author: Hao Sun +Date: Wed Aug 25 17:42:17 2021 +0800 + + * fix refreshMoreMenu method not work as expected. + +commit a4c23b29f14300a4935c0253f9691c27836c875e +Merge: ce09fc310f 9f136b3626 +Author: zhujinyong +Date: Wed Aug 25 17:30:33 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit ce09fc310ffdca1023513624b6c926490498860a +Author: zhujinyong +Date: Wed Aug 25 17:29:59 2021 +0800 + + * Code review for issue api. + +commit 9f136b3626f6578d35bd1655e45c9f1d5f224492 +Author: liyuchun +Date: Wed Aug 25 17:02:22 2021 +0800 + + * Finish task #41712. + +commit 224977ab889a0de85a56ffdee9d79a2d2d56597b +Merge: 3cb8c9be13 cf06d1f24f +Author: hufangzhou +Date: Wed Aug 25 16:14:42 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3cb8c9be13704f0528246744043189a9a3cd214c +Author: hufangzhou +Date: Wed Aug 25 16:14:38 2021 +0800 + + * Fix bug #14640. + +commit cf06d1f24f272b85d194994e81ebd56fa4d97f26 +Author: 孙广明 +Date: Wed Aug 25 15:54:01 2021 +0800 + + * Code for task #41775. + +commit b11ac8d119578d6d1098c832f5ecc1e283f72dea +Author: tianshujie +Date: Wed Aug 25 15:31:45 2021 +0800 + + * Finish task #41549. + +commit e9334febb034af4e2818df1800fb1294b0831adf +Author: tianshujie +Date: Wed Aug 25 15:24:03 2021 +0800 + + * Finish task #14609. + +commit d192c968010541d87f94abdc8ad1a2fad229dc9e +Merge: 57e1f5d63d a7aadf82e4 +Author: tianshujie +Date: Wed Aug 25 15:19:35 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 57e1f5d63d86eff18d185f81a957c217d2fcfcf9 +Author: tianshujie +Date: Wed Aug 25 15:15:09 2021 +0800 + + * Change the team name at the time of creation execution. + +commit a7aadf82e420c8bac3d13e4aefa6cd1065d5dbe0 +Author: Hao Sun +Date: Wed Aug 25 15:09:36 2021 +0800 + + * improve UI, see https://back.zcorp.cc/pms/doc-objectLibs-product-79-749-564.html. + +commit 6af6ae1ce021f60b8ebd9626addadcdd653dc871 +Author: zenggang +Date: Wed Aug 25 14:49:11 2021 +0800 + + + my question api task#41820 + +commit c45e3985d9b414287162d522a32805cb5ac3276c +Author: Hao Sun +Date: Wed Aug 25 14:35:09 2021 +0800 + + * refactor the avatar usage with html::avatar. + +commit 8c97d88d917575b1fe4f74d8223cb541891fcfcc +Author: Hao Sun +Date: Wed Aug 25 14:34:28 2021 +0800 + + * add html helper method, includes: "html::avatar()"、"html::smallAvatar()"、"html::largeAvatar()"、"html::stringToCode()". + +commit 3176f52b481266533c2fcf0ae1b90543d4047be6 +Author: Hao Sun +Date: Wed Aug 25 14:33:29 2021 +0800 + + * improve UI for theme "blue". + +commit d891abc34eccf90340065d722279b115fd88a95d +Author: Hao Sun +Date: Wed Aug 25 14:33:18 2021 +0800 + + * update zentao icons. + +commit b6387cdec7162f14b8dfb42dc4812fd97de8a17b +Author: Hao Sun +Date: Wed Aug 25 11:10:30 2021 +0800 + + * remove extra .main-table on form element. + +commit 60215949d0b69ffa53a724aceb0b629f6bab51df +Author: 王怡栋 +Date: Wed Aug 25 14:27:32 2021 +0800 + + * adjust for story status lang. + +commit d609002d4ef2100eefa0f2d331467fee026194a3 +Merge: 944b66e6f6 a402d0fd7b +Author: 王怡栋 +Date: Wed Aug 25 13:52:48 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 944b66e6f6551af2635c64bd8542364536df9956 +Author: 王怡栋 +Date: Wed Aug 25 13:52:21 2021 +0800 + + * fix bug for send jsoned data. + +commit ad9fcd2b0fb8c4ac394e2e10f3cbfe1c241d3634 +Author: holan20180123 +Date: Wed Aug 25 13:44:27 2021 +0800 + + * Fix bug #14552. + +commit 0008317c553b71237e3da649b02349e9758635cf +Author: dingguodong +Date: Wed Aug 25 13:27:58 2021 +0800 + + * Pull the codes from master(Optimization). + +commit a402d0fd7b26c0cb6b5206ffb5f1088a2e79358f +Merge: 13f2529a7c d7b198b73f +Author: dingguodong +Date: Wed Aug 25 13:26:56 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 13f2529a7cb459bc7fdaf60fee13dd438233ce1c +Author: dingguodong +Date: Wed Aug 25 13:26:25 2021 +0800 + + * Fix bug#14617. + +commit d7b198b73f6c4589df4a28d28ab2ea8fa0394119 +Author: holan20180123 +Date: Wed Aug 25 13:24:07 2021 +0800 + + * Finish task #41547. + +commit c4f059793a050c5a0ab8d30d5e2aafb797844d65 +Author: holan20180123 +Date: Wed Aug 25 13:21:51 2021 +0800 + + * Finish task #41549. + +commit 154ab2984e4422922505249da3bd6172abc90167 +Author: dingguodong +Date: Wed Aug 25 13:12:38 2021 +0800 + + * Trim the spaces in access token before check it. + +commit 5dd3436041ec27a679b7caa5b93eccc060fc8e05 +Author: dingguodong +Date: Wed Aug 25 13:11:45 2021 +0800 + + * Add the tokenLimit lang. + +commit cb14cd81ddcd48b3444aeed4f713925fa1ef15bb +Author: holan20180123 +Date: Wed Aug 25 13:04:22 2021 +0800 + + * Adjust create execution logic. + +commit 8e63fff93d45f29ffc015720faea64d476390dc1 +Author: Guan Xiying +Date: Wed Aug 25 11:30:36 2021 +0800 + + * Trim token from form. + +commit 2a0af328c39de4330ba15ec99e0eb0f017f1aed0 +Author: holan20180123 +Date: Wed Aug 25 11:19:22 2021 +0800 + + * Add cookie for project story list. + +commit 0acb0aadce6f9a69cdf583fa1989f6f5dda1e456 +Author: Guan Xiying +Date: Wed Aug 25 11:16:36 2021 +0800 + + * Add check token codes before import issue. + +commit 276c78f1f06b8f73c9e29a373f8bdf2d1674c237 +Author: holan20180123 +Date: Wed Aug 25 11:09:04 2021 +0800 + + * Finish task #41702. + +commit 9cdb127be65d406f57e77260c7a7595939a614b2 +Author: holan20180123 +Date: Wed Aug 25 10:50:21 2021 +0800 + + * Finish task #41712. + +commit 80b869fd76368e220c504c5bb292d2933cce53c3 +Merge: f8074fdafb 4f38cc63eb +Author: tianshujie98 +Date: Wed Aug 25 10:45:50 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f8074fdafb6b202f44fec2edb1bf6868e8ce4f47 +Author: tianshujie98 +Date: Wed Aug 25 10:45:33 2021 +0800 + + * Finish task #41800. + +commit 4b63f3021e9d1821f934fb2b0ce6e9c8413e9caa +Author: 王怡栋 +Date: Wed Aug 25 10:45:29 2021 +0800 + + * fix for gitlab token invalid. + +commit b05c112ad9ba1213d398f5537c384820aac936d7 +Merge: e22ad5c083 c1059facef +Author: 王怡栋 +Date: Wed Aug 25 10:44:52 2021 +0800 + + Merge branch '15.4' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.4 + +commit c1059facef26b9dd1027e9877f95cefd0e8866c1 +Author: Guan Xiying +Date: Wed Aug 25 10:44:06 2021 +0800 + + * Check gitlab token when create gitlab job. + +commit bf103ceb7890a72edc6e0b83a7350284c3be13d2 +Author: Guan Xiying +Date: Wed Aug 25 10:39:29 2021 +0800 + + * Merge task #41371. + +commit eef945755ffe8dfcdefa9ffb2b1d52bdd16ab753 +Author: Guan Xiying +Date: Wed Aug 25 10:36:18 2021 +0800 + + * Add diff page. + +commit e22ad5c0834be92645b84fa15bb99b455610a1ec +Author: 王怡栋 +Date: Wed Aug 25 10:36:09 2021 +0800 + + * change for lower php version. + +commit 22d79c2681b42e132b7b874275c22155b1b4a6d3 +Author: Guan Xiying +Date: Wed Aug 25 10:35:12 2021 +0800 + + * Add extra param to scm::diff function. + +commit e578838258803e791fa8ae046af1f186d4caa4b8 +Author: Guan Xiying +Date: Wed Aug 25 10:33:53 2021 +0800 + + * Add fromProject param for diff. + +commit 754163aae4c6768ef1bd8cd82c656736cd395f71 +Merge: 7ed0e3c970 df116c8cdb +Author: Guan Xiying +Date: Wed Aug 25 10:33:09 2021 +0800 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit 7ed0e3c9702acb66d2be76216063d5c500e23a07 +Author: Guan Xiying +Date: Wed Aug 25 10:32:44 2021 +0800 + + * Add getDiffs function. + +commit 4f38cc63eba4ec98679beaad3365cbdf0691c015 +Author: holan20180123 +Date: Wed Aug 25 10:02:30 2021 +0800 + + * Finish task #41770. + +commit 11f7edc0646757ebefac032df8e69463e0a48bf4 +Author: 王怡栋 +Date: Wed Aug 25 09:55:44 2021 +0800 + + * finish task #41753. + +commit 7ce3823a9cd127c584b2dfd916017fbdd4a7e679 +Author: 王怡栋 +Date: Wed Aug 25 09:39:26 2021 +0800 + + * finish task #41678. + +commit df116c8cdbacf462233aa8428628674bc5973d45 +Author: dingguodong +Date: Tue Aug 24 23:22:35 2021 +0800 + + * Add view a MR(staging). + +commit 452aaac4d71f6523b2389dae508ff39f4b24762e +Author: zenggang +Date: Tue Aug 24 19:07:56 2021 +0800 + + + Add my risk api task#41819 + +commit 6f3a39f33411a9116a67f53e0cf6d31d4510b86f +Author: 王怡栋 +Date: Tue Aug 24 17:37:26 2021 +0800 + + * fix for pager for browse plan. + +commit 8b014e586905a7482aa53e3a687a22abcd98a4ef +Merge: 8a6ef83c49 67569ee658 +Author: dingguodong +Date: Tue Aug 24 17:35:38 2021 +0800 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit 8a6ef83c499ae009459558747b842fd7991ea51a +Author: dingguodong +Date: Tue Aug 24 17:35:17 2021 +0800 + + + Add apiGetSingleBranch function. + +commit 883dfcf4b84701203e44859883da1ba0a04c100e +Author: holan20180123 +Date: Tue Aug 24 17:30:24 2021 +0800 + + * Finish task #41548. + +commit 2dc3d78b9a90e71dd6020613a545de6efd1d0c43 +Author: holan20180123 +Date: Tue Aug 24 17:26:32 2021 +0800 + + * Finish task #41594. + +commit a52bc025aeae1a837d3158ab72cf6997ec4261db +Author: holan20180123 +Date: Tue Aug 24 17:21:34 2021 +0800 + + * Finish task #41773. + +commit d5a49acffc33b7f7a92f4b9763e31da08cb946fb +Merge: 5322e98da0 ce0936eca2 +Author: 王怡栋 +Date: Tue Aug 24 17:21:19 2021 +0800 + + Merge branch '15.4' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.4 + +commit ce0936eca207789d8162d0d50ff8b2dfa73e06cd +Author: hufangzhou +Date: Tue Aug 24 17:19:37 2021 +0800 + + * Remove the story review in project and execution module when batch create story. + +commit 5322e98da0da071aae7592f2522c410fc1db4b60 +Merge: 2269a270c6 33c79d77a3 +Author: 王怡栋 +Date: Tue Aug 24 16:25:59 2021 +0800 + + Merge branch '15.4' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.4 + +commit 33c79d77a3dbbd0cdb8a59660c68334cc05b4064 +Author: tianshujie98 +Date: Tue Aug 24 16:10:26 2021 +0800 + + * Fix code errors. + +commit 2269a270c6407e1bccbdee395bf9d370eef2bf32 +Merge: 1744867fcb 04142b276d +Author: 王怡栋 +Date: Tue Aug 24 16:06:29 2021 +0800 + + Merge branch '15.4' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.4 + +commit 04142b276d979e094bcd8a7756bb8c3d0a8f772e +Merge: 44f509cf75 481f13ef0f +Author: holan20180123 +Date: Tue Aug 24 15:49:43 2021 +0800 + + Merge branch '15.4' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.4 + +commit 44f509cf752d2da258cc524194b4b2629a313c86 +Author: holan20180123 +Date: Tue Aug 24 15:49:00 2021 +0800 + + * Fix bug #14598. + +commit e3e8714d1855bd7d86e10ee82c5d1b6c44412ee2 +Author: lichengjun +Date: Tue Aug 24 07:39:28 2021 +0000 + + *Adjust GitLab code. + +commit 4a5aa3d11a1329ff83e81217ebd77aaa601448e8 +Author: 王怡栋 +Date: Tue Aug 24 15:38:12 2021 +0800 + + * finish task #41754. + +commit 67569ee658cbb60e786492c66fcf00ec5057c528 +Author: lichengjun +Date: Tue Aug 24 07:36:22 2021 +0000 + + * Add GitLab log. + +commit 1744867fcb86c7a46069a550d75730625252b9e1 +Author: 王怡栋 +Date: Tue Aug 24 14:58:58 2021 +0800 + + * change for zh-tw lang. + +commit 481f13ef0fd384502fd2d06e869aa1fd521aead0 +Author: 王怡栋 +Date: Tue Aug 24 14:56:34 2021 +0800 + + * Merge from master for bug #14591. + +commit 5b3adf00499599fb38e031453f54facac641e6f3 +Merge: 8529a59731 7634ed89a2 +Author: 王怡栋 +Date: Tue Aug 24 14:53:03 2021 +0800 + + Merge branch '15.4' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.4 + +commit 8529a59731d744dfb87aa71d7736f223a16e32e7 +Author: 王怡栋 +Date: Tue Aug 24 14:42:49 2021 +0800 + + * fix for switch program by dropmenu when create project. + +commit b7c87d071b3b95e2206e523c3430f5f3629dc47e +Author: 孙广明 +Date: Tue Aug 24 14:34:52 2021 +0800 + + * Fix bug #14591. + +commit 7634ed89a292009a4bd47f0380b826f172aa1e7b +Author: holan20180123 +Date: Tue Aug 24 14:26:21 2021 +0800 + + * Fix bug #14589. + +commit 7a41616a1439912e7d376024f455d8c3c99116aa +Author: tianshujie98 +Date: Tue Aug 24 14:08:54 2021 +0800 + + * Fix bug #14590. + +commit 668b0ecf2b4ea4a99583ff699f029a7b34979640 +Merge: 491f2df2dd bdf8c078a8 +Author: holan20180123 +Date: Tue Aug 24 14:07:21 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 491f2df2dd8f2a4e1d4a21a47aace91b9b2fb0d6 +Author: holan20180123 +Date: Tue Aug 24 14:07:01 2021 +0800 + + * Finish task #41774. + +commit bdf8c078a8306448851cbf4588d6bbf5625e284c +Author: tianshujie98 +Date: Tue Aug 24 14:06:42 2021 +0800 + + * Fix bug #14588. + +commit e1149ae66ccaa3e64d5df598d387d7bdfc63b3b1 +Author: tianshujie98 +Date: Tue Aug 24 13:45:54 2021 +0800 + + * Finish task #41563. + +commit d4d23232f4f4166a8d1a5e9a32a39777ea2e137e +Author: tianshujie98 +Date: Tue Aug 24 13:42:07 2021 +0800 + + * Finish task #41740. + +commit a9b309fefc19c82c80c88bdcd48ff70ab178ae0b +Author: 王怡栋 +Date: Tue Aug 24 13:39:45 2021 +0800 + + * adjust for lower php version. + +commit bee81d91b35f618762d037cfd648fe063b09ccc1 +Merge: 02624b4cac ef601db4b5 +Author: 王怡栋 +Date: Tue Aug 24 13:32:47 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 02624b4cac90d2c8c477162be73c40e578412dd5 +Author: 王怡栋 +Date: Tue Aug 24 13:32:31 2021 +0800 + + * finish task #41677. + +commit ef601db4b5e0f0a7395591c269ff554467afea6d +Author: tianshujie98 +Date: Tue Aug 24 13:23:28 2021 +0800 + + * Fixed site editing issues and report errors. + +commit 9c83f3b3b6477365185caea42534475303985591 +Author: 王怡栋 +Date: Tue Aug 24 13:04:52 2021 +0800 + + * adjust for lower php version. + +commit 4f94bcafc59d1558aaeb469cec68372b3bbfa44e +Author: dingguodong +Date: Tue Aug 24 11:13:00 2021 +0800 + + * Update function for editing a MR. + +commit be9a94087c9ebd38347298d5eb50abd5962b60f5 +Author: dingguodong +Date: Tue Aug 24 10:52:35 2021 +0800 + + * Change assignee and reviewer from gitlab user ID to zentao account. + +commit 3dfbd1304bf16fa8932b6c3ba686260256321456 +Merge: 0f4735080d 199f1a48b0 +Author: lichengjun +Date: Tue Aug 24 02:28:39 2021 +0000 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0f4735080d878e047bdc35ddd3bd833e2ce9bc48 +Author: lichengjun +Date: Tue Aug 24 02:27:40 2021 +0000 + + *Adjust GitLab Token validation. + +commit 199f1a48b061481e3cdbaa73941bdcaa2abea954 +Author: zenggang +Date: Tue Aug 24 10:20:09 2021 +0800 + + + Add testtask api task#41480 + +commit 18569c95d2c5e2293cce4176582fb4f55cf94d05 +Author: dingguodong +Date: Tue Aug 24 10:19:57 2021 +0800 + + * Update apiSyncMR function. + +commit 2c0f36696d4b7a5a91eedd32227d82118be2fb78 +Author: lichengjun +Date: Tue Aug 24 02:12:17 2021 +0000 + + * Adjust GitLab Token validation code. + +commit e71dba2f2d4baf07a0f7fa17ba9d3349f7613eda +Author: tianshujie98 +Date: Tue Aug 24 09:55:25 2021 +0800 + + * Fix bug #14572. + +commit 19463a9c5fa70ec81ccb583a981a5564ecd821c8 +Author: tianshujie98 +Date: Tue Aug 24 09:46:05 2021 +0800 + + * Finish task #41711. + +commit c68b9f28df7b8de65deda002882aa9def5d0a97c +Author: Hao Sun +Date: Tue Aug 24 09:20:22 2021 +0800 + + * update zui: fix responsive table when fixed header on top. + +commit 68815d526addd8e274632d9235e8fdbddf3f76e8 +Author: holan20180123 +Date: Tue Aug 24 09:14:08 2021 +0800 + + * Fix bug #14543. + +commit b304b97f615692fa87414d60fd9ade062dbb98af +Author: qiyu-xie +Date: Tue Aug 24 08:50:28 2021 +0800 + + * Finish task#41780. + +commit dc981a4a05ed574b1e9abd314dc2b063d22e98de +Author: dingguodong +Date: Tue Aug 24 08:26:13 2021 +0800 + + * Update function for editing MR. + +commit 973e8be6cc778b9ad1e1fa8f87359e87f61faa88 +Author: qiyu-xie +Date: Tue Aug 24 07:58:16 2021 +0800 + + * Finish task#41538. + +commit aa69b17ccfc01ab7479cb1e32c11e190f2e46cef +Author: 王怡栋 +Date: Mon Aug 23 19:05:56 2021 +0800 + + * adjust for zh-tw lang. + +commit 957d19ed92ebab753feb72372a6655b0bb270bf2 +Merge: 6095bc4246 eb5e3dbac7 +Author: dingguodong +Date: Mon Aug 23 17:58:40 2021 +0800 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit 6095bc4246df596f3ed1889a84f4986157dc608d +Author: dingguodong +Date: Mon Aug 23 17:57:50 2021 +0800 + + * Get latest MR from GitLab API before display MR. + +commit eb5e3dbac7e975ca20e5c46cd5e32b24ff5734cd +Author: Guan Xiying +Date: Mon Aug 23 17:14:34 2021 +0800 + + * Fix params of apiGetSingleDiffVersion and apiGetDiffVersions. + +commit 80c872be8062d9ebc75d59641cc47168b20eba1a +Author: Guan Xiying +Date: Mon Aug 23 17:08:03 2021 +0800 + + * Rename mrModel::edit function. + +commit d2e51fb7a37755bc8fb27fd80586830be880bb00 +Author: Guan Xiying +Date: Mon Aug 23 17:07:26 2021 +0800 + + * Rename mrModel::edit function. + +commit 1e26528ffedac1fe5459a1b2f0cc0ce7c7c61e77 +Merge: 82ba7789b6 38f7285ff4 +Author: Guan Xiying +Date: Mon Aug 23 17:06:34 2021 +0800 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit 82ba7789b6bd2904f6b446ee0e19e857c2d301c6 +Author: Guan Xiying +Date: Mon Aug 23 17:06:21 2021 +0800 + + * Fix params of get versions api. + +commit 7ccb99423b5762ce5d5ce1b7c579961330dcf79f +Author: Guan Xiying +Date: Mon Aug 23 17:04:51 2021 +0800 + + * Fix delete mr error. + +commit 1e019a9e25470449dc6ab544b919e356e3b4aaec +Author: zhujinyong +Date: Mon Aug 23 17:03:00 2021 +0800 + + + Add configurations of api. + +commit 38f7285ff41ad3214ef549fd1b92926a3c66eb6f +Author: dingguodong +Date: Mon Aug 23 17:01:40 2021 +0800 + + * Update zt_mr table. + +commit aace62c5c9378d069a0222e96be43bc24936d23b +Merge: c112088b06 e318e02c1a +Author: 王怡栋 +Date: Mon Aug 23 17:00:00 2021 +0800 + + Merge branch '15.4' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.4 + +commit c112088b0633101b1d19b74446829cc4779414d4 +Author: 王怡栋 +Date: Mon Aug 23 16:59:34 2021 +0800 + + * adjust for minifyfront. + +commit e318e02c1a8bd2d5ccd33da9062c3e66c71a97c2 +Author: tianshujie98 +Date: Mon Aug 23 16:56:55 2021 +0800 + + * Fix bug #14567. + +commit 2e2af2560b9820d54c7a2d277abc02bab5ba0a90 +Author: tianshujie98 +Date: Mon Aug 23 16:55:44 2021 +0800 + + * Fix bug #14567. + +commit 84f5c25aa9e47e7d1638012762b6808bb52cd715 +Author: dingguodong +Date: Mon Aug 23 16:53:10 2021 +0800 + + * Refactor the function for editing MR. + +commit dc0c4a277dabf8142ee22168132665ed60d13e9d +Merge: e706560740 e2e6428ef9 +Author: hufangzhou +Date: Mon Aug 23 16:49:11 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit e706560740977a94d6e66b397804dc6bd7b8578e +Author: hufangzhou +Date: Mon Aug 23 16:49:07 2021 +0800 + + * Add the product kanban privilege. + +commit d9a77b810748294370c57aac41e99a074a2240a6 +Author: holan20180123 +Date: Mon Aug 23 16:45:29 2021 +0800 + + * Fix bug #14571. + +commit e2e6428ef919a94f291a70e6b880a8befe3161f0 +Author: lichengjun +Date: Mon Aug 23 08:30:14 2021 +0000 + + * Add GitLab Token validation language. + +commit 07dbfae09f7702f995e91d14f994d53884592162 +Author: 王怡栋 +Date: Mon Aug 23 16:28:55 2021 +0800 + + * code for bug #14565. + +commit 304ed9c54e5ae16afc2b88f52f91b584263a41a0 +Merge: 95c9e107c3 581791948c +Author: dingguodong +Date: Mon Aug 23 16:23:40 2021 +0800 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit 95c9e107c36836576930994ffba96b47bbf7f381 +Author: dingguodong +Date: Mon Aug 23 16:22:46 2021 +0800 + + * Refactor creating function for MR. + +commit 0d943aae9bb83b81f30529fd2be12a448c9d390c +Author: holan20180123 +Date: Mon Aug 23 16:19:48 2021 +0800 + + * Fix bug #14552. + +commit b7fdd257bc913c0ac4097e0f6afbf962affb0fda +Merge: 7cdd3d5d00 428b401718 +Author: 王怡栋 +Date: Mon Aug 23 16:14:57 2021 +0800 + + Merge branch '15.4' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.4 + +commit 7cdd3d5d00b0506dc39cccc3171345f80d0616a0 +Author: 王怡栋 +Date: Mon Aug 23 16:14:27 2021 +0800 + + * fix bug #14565. + +commit 428b401718034cbeee15c3bf4a5130e95f082497 +Author: Hao Sun +Date: Mon Aug 23 16:09:19 2021 +0800 + + * bug #14554, fix refresh help app not work. + +commit f523673d71c2d7fd118750e4edd5752a10965396 +Author: Hao Sun +Date: Mon Aug 23 16:09:19 2021 +0800 + + * bug #14554, fix refresh help app not work. + +commit 39db8d04f368badd8559dd7c76a5699093b60336 +Merge: 4f51d890b1 a072ee2b7f +Author: hufangzhou +Date: Mon Aug 23 16:09:23 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4f51d890b13f88d71e47b0cd1234490ff31e8854 +Author: hufangzhou +Date: Mon Aug 23 16:09:19 2021 +0800 + + * Finish task #41779. + +commit a072ee2b7fd4b48ee280c17428794947b991e3d0 +Author: tianshujie98 +Date: Mon Aug 23 16:04:37 2021 +0800 + + * Finish task #41735. + +commit 70a08aab08459efb5cfe61ec39c8aa8e69eaf834 +Author: qiyu-xie +Date: Mon Aug 23 16:02:20 2021 +0800 + + * Delete empty three-level navigation when create documents in execution. + +commit 38cd58107e032464ac3e008bffb80872e21f9852 +Author: zenggang +Date: Mon Aug 23 15:58:59 2021 +0800 + + + My tasks api + +commit 57a253db4fa78daeaa92f6621ae8f18d8385f7cb +Author: holan20180123 +Date: Mon Aug 23 15:58:47 2021 +0800 + + * Fix bug #14561. + +commit 581791948c94bdab4537b5ec3db2221a0559321f +Author: lichengjun +Date: Mon Aug 23 07:54:44 2021 +0000 + + * Fix GitLab bug. + +commit a6ce38ef9c989b0cdd760f03ee5eec4d2c3c35e9 +Author: tianshujie98 +Date: Mon Aug 23 15:54:03 2021 +0800 + + * Finish task #41751. + +commit 4e0cd5a9650c5c067c3ae4246d9150092fc8eadb +Author: 王怡栋 +Date: Mon Aug 23 15:46:34 2021 +0800 + + * fix bug #14540. + +commit a075fd552e334d34ce7314c78a02aaeb937bb784 +Author: tianshujie98 +Date: Mon Aug 23 15:24:07 2021 +0800 + + * Finish task #41726. + +commit 8c430d9c6b8d0431730ac75473387463ccd8fc0c +Merge: 4eb57d6207 7c08153b7c +Author: 王怡栋 +Date: Mon Aug 23 15:13:26 2021 +0800 + + Merge branch '15.4' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.4 + +commit 4eb57d620764b192709a26abe3e3a02948bd9a38 +Author: 王怡栋 +Date: Mon Aug 23 15:12:57 2021 +0800 + + * code for bug #14540. + +commit 2c842367ef18b9beaac3d13f3cac442a8c882cd7 +Author: 王怡栋 +Date: Mon Aug 23 15:12:38 2021 +0800 + + * fix for upgrade. + +commit 51fd58482611284f3cb63fdf4fa391ccf04aea74 +Merge: 7ea1822892 d0a28b7995 +Author: hufangzhou +Date: Mon Aug 23 15:08:16 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 7ea182289228c01db6c141e81fd10a9b8a133fdf +Author: hufangzhou +Date: Mon Aug 23 15:08:09 2021 +0800 + + * Finish task #41784. + +commit 73d1634090fc296f0ecefd365b97d5dbfd80eb1d +Merge: e26c267231 f0ed277adb +Author: dingguodong +Date: Mon Aug 23 15:05:31 2021 +0800 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit e26c2672315eb0139950b13236758c761336a31e +Author: dingguodong +Date: Mon Aug 23 15:03:36 2021 +0800 + + * Add view functions for MR. + +commit e89f6043b00b9cd11a7b4f1e202198b0e19640d8 +Author: dingguodong +Date: Mon Aug 23 15:01:34 2021 +0800 + + * Optimize some function of processMR. + +commit 615ba5eac4c570930d1d5f57507fc2308b7bcaf1 +Author: dingguodong +Date: Mon Aug 23 15:00:33 2021 +0800 + + * Correct menu display of MR. + +commit d0a28b799537b24cb99ac6e03795f43ed5d75861 +Author: tianshujie98 +Date: Mon Aug 23 14:58:04 2021 +0800 + + * Finish task #41703. + +commit 752f6e235020e4bca830a0ff48a18499bf313597 +Author: tianshujie98 +Date: Mon Aug 23 14:50:09 2021 +0800 + + * Finish task #41725. + +commit 1fd161ec33c05ba5c48bd25da9376cf102311814 +Author: tianshujie98 +Date: Mon Aug 23 14:42:21 2021 +0800 + + * Modify the judgment of printing stakeholder links. + +commit 6fdb4fd97f3836918ebf97ec85423c620eacea5c +Author: tianshujie98 +Date: Mon Aug 23 14:39:58 2021 +0800 + + * Finish task #41721. + +commit 7c08153b7c55640539b350fa88995c40eacab341 +Author: holan20180123 +Date: Mon Aug 23 14:39:23 2021 +0800 + + * Fix bug #14543. + +commit 79a070108c9fc4f9bf14e810e1d599456e0e498d +Merge: cd6592eaaf f95496efe3 +Author: tianshujie98 +Date: Mon Aug 23 14:24:26 2021 +0800 + + Merge branch '15.4' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.4 + +commit cd6592eaaf724eb3eec4909b2bc487ae35b3ac67 +Author: tianshujie98 +Date: Mon Aug 23 14:23:44 2021 +0800 + + * Synchronize the roles of team members when copying a team. + +commit f95496efe327006b9522dad7a4badae0749e1f6c +Author: qiyu-xie +Date: Mon Aug 23 14:22:08 2021 +0800 + + * Modify the problem of can select project in classic mode. + +commit f0ed277adbb3e757c1682d9f0e18c6648f4e3c0a +Author: Guan Xiying +Date: Mon Aug 23 14:15:55 2021 +0800 + + * Fix browe mr page. + +commit 2a86dffc9341c9730e5c789ab4c0c7c1e2cefff5 +Author: zenggang +Date: Mon Aug 23 14:13:10 2021 +0800 + + * Adjust todo api + +commit fa8a1accd12faa254ffeea55f880ad606af6cd63 +Author: tianshujie98 +Date: Mon Aug 23 14:03:55 2021 +0800 + + * Finish task #41720. + +commit 56c3453dd7c94e38fd0a12a0f531aec3f829dcae +Author: holan20180123 +Date: Mon Aug 23 14:01:18 2021 +0800 + + * Fix bug #14536. + +commit 08fb9b5cc3b77d66fba9ad24a41f9112e16cbbd5 +Author: tianshujie98 +Date: Mon Aug 23 13:56:50 2021 +0800 + + * Finish task #41713. + +commit dbbc18dfa4508c3b937fd8d2d7398fc789768e7e +Merge: 19ad7b2dfb ba9b5130cb +Author: holan20180123 +Date: Mon Aug 23 13:56:37 2021 +0800 + + Merge branch '15.4' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.4 + +commit 19ad7b2dfbda2c0d9044aab70e5a10eddb5c54a6 +Author: holan20180123 +Date: Mon Aug 23 13:55:41 2021 +0800 + + * Fix bug #14538. + +commit ba9b5130cbb06c9346e188ffd493bc8c998956e1 +Author: 王怡栋 +Date: Mon Aug 23 13:55:25 2021 +0800 + + * adjust for upgrade. + +commit 7b3358c578e5a79ee3304f44711a4f6b2fc8c45d +Merge: 65ca276361 83d8d8477f +Author: 王怡栋 +Date: Mon Aug 23 13:37:46 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 65ca276361089ca5b0b9db4c5a56e3d7fea41978 +Author: 王怡栋 +Date: Mon Aug 23 13:27:35 2021 +0800 + + * fix update sql. + +commit 83d8d8477f3f5e05966b8706ea6f077d17981012 +Author: Guan Xiying +Date: Mon Aug 23 13:25:18 2021 +0800 + + * Check gitlab token when create gitlab job. + +commit d61afb2d76b2e04de1b9ce7ab764ac48261d5020 +Author: Guan Xiying +Date: Mon Aug 23 13:25:04 2021 +0800 + + * Add space. + +commit 9afcbc7a846f17228d0e76c926fdd5f5fc35a55a +Author: Guan Xiying +Date: Mon Aug 23 13:13:57 2021 +0800 + + * Fix check admin tocken codes. + +commit b47ea4a0528fef89174cd556e9591c56a9541a0f +Author: Guan Xiying +Date: Mon Aug 23 13:08:42 2021 +0800 + + * Add check admin tocken function. + +commit 7b7af4abc3facaf2763cb842128af3fab70bea75 +Author: holan20180123 +Date: Mon Aug 23 13:04:42 2021 +0800 + + * Finish task #41768. + +commit c63e863a123915e36518db486f4d4851ffa85377 +Merge: 1e1dae70f6 e99d3664ab +Author: 王怡栋 +Date: Mon Aug 23 13:00:44 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1e1dae70f6471c80ef07b29d80179947c038fa44 +Author: 王怡栋 +Date: Mon Aug 23 13:00:32 2021 +0800 + + * adjust for upgrade. + +commit e99d3664ab6094df89458523fbd1e442d2339bf9 +Author: tianshujie98 +Date: Mon Aug 23 11:37:26 2021 +0800 + + * Finish task #41704. + +commit 49b8f26e32ec66a2bf109fd1fb41ae580f503546 +Author: zhujinyong +Date: Mon Aug 23 11:34:04 2021 +0800 + + * Fix actions of todo in API. + +commit 15f32acefedbeb083ed0c3e294e0db48dd51737e +Author: tianshujie98 +Date: Mon Aug 23 11:28:47 2021 +0800 + + * Finish task #41693. + +commit 9cef0e8f32f5e8666b8b75809d8d43a35704a5ef +Author: Hao Sun +Date: Mon Aug 23 10:54:02 2021 +0800 + + * update icon-qc and icon-qc-*. + +commit a04e1a0cb8a2dd10eab32398255b958dd66ad629 +Merge: 569cbe909e 807ad4b4e8 +Author: Guan Xiying +Date: Mon Aug 23 10:49:55 2021 +0800 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit ecb3e3c513ee5e2fb3ec7f8452aeb7e40c7d643d +Author: Hao Sun +Date: Mon Aug 23 10:48:14 2021 +0800 + + * update zentao icons: p-square, video-play, plus-solid-circle, s, t, c, guide, todo. + +commit 807ad4b4e855278f7499bdff88fff2e7c01cc9e7 +Author: dingguodong +Date: Mon Aug 23 10:41:37 2021 +0800 + + * Bug fix for editing a MR. + +commit 2c0afdeedcb301a0a77e2edbb8d78b7638308122 +Author: dingguodong +Date: Mon Aug 23 10:40:34 2021 +0800 + + * Correct bad syntax. + +commit 75f004f38a0c7166c0b658ef87982a28842dd5ef (tag: zentaopms_15.4_20210823) +Author: 王怡栋 +Date: Mon Aug 23 10:24:12 2021 +0800 + + * add new version and upgrade. + +commit 4a06510d472db196926d8076b9225256425ff7b8 +Merge: 808932285c f933f1f349 +Author: 王怡栋 +Date: Mon Aug 23 10:10:06 2021 +0800 + + Merge branch '15.3' + +commit 808932285c51dc3778fad3b30ef119576f1ae2f7 +Merge: 3f67668e53 c3774d2fc7 +Author: 王怡栋 +Date: Mon Aug 23 10:02:31 2021 +0800 + + Merge branch '15.2' + +commit 3f67668e53b0593bf475b9a4a585c78766653d29 +Author: holan20180123 +Date: Mon Aug 23 09:50:27 2021 +0800 + + * Finish task #41699. + +commit 0add36522ea318d2c6483671638e735570e2d7a9 +Merge: 1d1f620a6f 8db34c1604 +Author: holan20180123 +Date: Mon Aug 23 09:33:28 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1d1f620a6fb198500544ff72c92a877dbaceec47 +Author: holan20180123 +Date: Mon Aug 23 09:33:16 2021 +0800 + + * Finish task #41598. + +commit 8db34c16044c28018996a0c30a2b6fb61413a921 +Merge: fb56ac9301 31c72cbbe9 +Author: sgm0422 <976204163@qq.com> +Date: Mon Aug 23 09:33:15 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit fb56ac93012c82770e2c9f6730d0676a547b5325 +Author: sgm0422 <976204163@qq.com> +Date: Mon Aug 23 09:33:03 2021 +0800 + + * Finish task #41778. + +commit 31c72cbbe932560de75149b8edc4ea54c60d00ff +Author: holan20180123 +Date: Mon Aug 23 09:29:32 2021 +0800 + + * Finish task #41768. + +commit f933f1f349a4323e760673fef5307843b779a186 +Author: 王怡栋 +Date: Mon Aug 23 09:25:37 2021 +0800 + + * add standard sql. + +commit 852120191b688b3c3b9db7932d81961dca6c4b4c +Author: dingguodong +Date: Mon Aug 23 09:20:58 2021 +0800 + + * Edit/Update a MR. + +commit 569cbe909e98ad01eba513dd08998fa04c12b2c3 +Merge: 30f4e19096 11356d714a +Author: Guan Xiying +Date: Sun Aug 22 16:58:05 2021 +0800 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit 30f4e190965cb58a658a6307776e603bf71000ee +Author: Guan Xiying +Date: Sun Aug 22 16:53:33 2021 +0800 + + * Add disable attribute on disabled link. + +commit dde394387290ef0f88f802a4b7d81bf1efe0d64f +Author: zenggang +Date: Fri Aug 20 17:45:53 2021 +0800 + + * Finish task #41480 + +commit 11356d714a23fb4fdbc1af27ea519096cf76331f +Author: dingguodong +Date: Fri Aug 20 16:31:37 2021 +0800 + + * Make browse MR work. + +commit e7089866bcdf154692d25e1bc71da1b15de26258 +Author: dingguodong +Date: Fri Aug 20 16:29:54 2021 +0800 + + * Update processMR function and bug fix. + +commit 0a8c4b40f10de81390a87f2a7adc7264290fdcfe +Author: dingguodong +Date: Fri Aug 20 15:37:15 2021 +0800 + + * Change plural to singulative. + +commit fbb71c24c6749a56586d925236ab6052cc6f2b9d +Author: zenggang +Date: Fri Aug 20 15:36:54 2021 +0800 + + + add todos api + +commit 802d7a2c89a829d421a9dd0a4c0928f9523e02bf +Author: 孙广明 +Date: Fri Aug 20 15:31:53 2021 +0800 + + * Finish task #41731. + +commit 2b9572b4ce4ca087a97364629c5d05b1b3544c3a +Merge: 2729cd843e 1531acf289 +Author: tianshujie98 +Date: Fri Aug 20 15:27:35 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 2729cd843e0479d9364590c16ceab257aad83371 +Author: tianshujie98 +Date: Fri Aug 20 15:27:18 2021 +0800 + + * Finish task #41563. + +commit 7e4610ce9b73a8626850c279420be4f552bdee87 +Author: lichengjun +Date: Fri Aug 20 07:17:40 2021 +0000 + + * Adjust gitlab code. + +commit f5e2f780f4e76542af7d34eae9f3b7fc414f1afb +Merge: 08aff43f08 773ac9ef95 +Author: dingguodong +Date: Fri Aug 20 15:16:46 2021 +0800 + + erge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit 08aff43f08c95e3f31d66fd2cdfba3803be00d7f +Author: dingguodong +Date: Fri Aug 20 15:16:18 2021 +0800 + + * Finish creating MR in model. + +commit 2056fc52ff2e6aeade6443c0761d0e76c9e4a560 +Author: dingguodong +Date: Fri Aug 20 15:13:30 2021 +0800 + + + Add getBranches functions. + +commit 1531acf2899a62f242124a5064174db024f63ce3 +Author: 孙广明 +Date: Fri Aug 20 14:44:22 2021 +0800 + + * Finish task #41748. + +commit ef6ad86e20d184b04891867ff93cbf04abb56554 +Author: qiyu-xie +Date: Fri Aug 20 14:33:07 2021 +0800 + + * Finish task#41706. + +commit 773ac9ef95836492515351d0bc11511131e514a1 +Merge: 08f9e8e572 84b7170f9c +Author: lichengjun +Date: Fri Aug 20 06:29:09 2021 +0000 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit 08f9e8e572a8354b43a52e388c047264b551455e +Author: lichengjun +Date: Fri Aug 20 06:27:58 2021 +0000 + + * Adjust GitLab MR Delete function. + +commit 40fa97eadbbaa5a6fb3185f5ecd9e0a78d208e0d +Author: 王怡栋 +Date: Fri Aug 20 14:14:00 2021 +0800 + + * finish task #41582. + +commit 02ba0350a50ce3a8e2cd2eaaace015dbb6fc70de +Author: 王怡栋 +Date: Fri Aug 20 14:08:35 2021 +0800 + + * finish task #41571. + +commit bfd6515739186a3ee9bbe11aba9dcc7d9b59e614 +Author: 王怡栋 +Date: Fri Aug 20 14:06:09 2021 +0800 + + * finish task #41554. + +commit 8a484a543108ecb0b1baaa208deeff7cb51816f2 +Author: 王怡栋 +Date: Fri Aug 20 14:04:10 2021 +0800 + + * finish task #41541. + +commit 2dadc9122bbed8954c54fd7b6640d1a226c66439 +Author: 王怡栋 +Date: Fri Aug 20 14:01:38 2021 +0800 + + * finish task #41530. + +commit 8cb5168ce3b9caad4a7a2354e010922da3e15367 +Merge: 4c841a2f23 01bbed061c +Author: 王怡栋 +Date: Fri Aug 20 13:59:20 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4c841a2f23a63a38a06bbcdc92e2c2110b6621e9 +Author: 王怡栋 +Date: Fri Aug 20 13:58:50 2021 +0800 + + * finish task #41529. + +commit 01bbed061c445e64cd148e2e622d353f2f7616dc +Author: qiyu-xie +Date: Fri Aug 20 13:40:12 2021 +0800 + + * Finish task#41558. + +commit f4329c3f6597fa45590a31681511649d952a7055 +Author: tianshujie98 +Date: Fri Aug 20 13:39:13 2021 +0800 + + * Finish task #41798. + +commit e3fc41415bde8c5e7e855ca740a6b62baada7ceb +Author: tianshujie98 +Date: Fri Aug 20 13:32:04 2021 +0800 + + * Add the title attribute to the document. + +commit e8e004764ad7b841c900d52f1de9acd273fb75ec +Author: tianshujie98 +Date: Fri Aug 20 13:30:18 2021 +0800 + + * Notify the submitter of the story to add release. + +commit aa84629f3b7e462e4fe2d997acbd57e3bca291d2 +Author: tianshujie98 +Date: Fri Aug 20 13:17:10 2021 +0800 + + * Finish task #41798. + +commit 11ac174b15c1d197e37b4c5283996f98b81e4575 +Author: qiyu-xie +Date: Fri Aug 20 13:12:08 2021 +0800 + + * Finish task#41766. + +commit 84b7170f9c021b2ac199dabdbf073b8682e44c3f +Author: dingguodong +Date: Fri Aug 20 12:12:56 2021 +0800 + + * Finish the control and view for creating MR. + +commit 90e660b38848646d3488f9161512f9cbca2bed1b +Author: dingguodong +Date: Fri Aug 20 12:11:37 2021 +0800 + + * Get MR user pairs to select assignee_ids and reviewer_ids. + +commit 71601102640fcff0b6aff7f080b3faeecb7752a0 +Author: Hao Sun +Date: Fri Aug 20 11:43:05 2021 +0800 + + * update zentao icon. + +commit 86af6fd340bc75c6776e3a520e7bb63a70680222 +Author: Hao Sun +Date: Fri Aug 20 11:25:33 2021 +0800 + + * fix style of table header when fixed on top. + +commit c8495bc8178e117fd9516e5bcdbf112f72cdf856 +Author: Hao Sun +Date: Fri Aug 20 11:05:00 2021 +0800 + + * fix padding top of #main in doc/tablecontents. + +commit 18ae5d27ba3ad93583d6e04e63dec37faec74bef +Author: tianshujie98 +Date: Fri Aug 20 11:02:03 2021 +0800 + + * Fix the problem that the name of the edited release build under the project is displayed incorrectly. + +commit 848ef0e72bb60c51513bd9b8fd760076da910a95 +Author: Hao Sun +Date: Fri Aug 20 11:01:45 2021 +0800 + + * improve UI for dropdown of doc create button. + +commit d02e526dacf5c6e63a7992cda95f454bf70cacfb +Author: Hao Sun +Date: Fri Aug 20 10:53:38 2021 +0800 + + * improve UI for user nav in header. + +commit 6f944d4833fb8cab053ec2e0d4f053ccebdb0377 +Merge: d228aa6f10 f133fc8f10 +Author: hufangzhou +Date: Fri Aug 20 10:39:31 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d228aa6f10007f5cb8f49627bc5703e96f6a41d0 +Author: hufangzhou +Date: Fri Aug 20 10:39:28 2021 +0800 + + * Finish task #41786. + +commit f133fc8f102e60ce1e0a089b660acfa106a0b438 +Author: tianshujie98 +Date: Fri Aug 20 10:30:12 2021 +0800 + + * Finish task #41592. + +commit 86ef3181035c97ea58e47681c0b826f5e7533e8a +Author: qiyu-xie +Date: Fri Aug 20 10:26:13 2021 +0800 + + * Finish task#41583. + +commit 7bc8158610e6aa251804ae51be64cc6c88708b9b +Author: tianshujie98 +Date: Fri Aug 20 10:24:04 2021 +0800 + + * Finish task #41586. + +commit d5a6e92d98079e763fd412c0ebf2d284a4da229b +Author: tianshujie98 +Date: Fri Aug 20 10:19:53 2021 +0800 + + * Finish task #41587. + +commit 9ba8cc1f57362ccc40138ac21b6a1dbf328fc4b0 +Author: tianshujie98 +Date: Fri Aug 20 10:16:22 2021 +0800 + + * Fix bug #14429. + +commit 60f9f418ea1bf0ee667e9553c981fd40a8d67052 +Author: lichengjun +Date: Fri Aug 20 01:53:14 2021 +0000 + + * Adjust gitlab token Permissions code. + +commit c3774d2fc7d6727df85835c642b33e2642f1019a +Author: 孙广明 +Date: Fri Aug 20 09:48:35 2021 +0800 + + * Finish task #40875. + +commit 6bd20ecaaf0dc59f085dc8a8cc7d0392e8483c8f +Author: lichengjun +Date: Fri Aug 20 01:28:54 2021 +0000 + + * Adjust GitLab admin token fix bug. + +commit 26a3ee3782e30a2a25b692380816f7cae0c78b62 +Author: lichengjun +Date: Fri Aug 20 01:01:53 2021 +0000 + + *Adjust GitLab code. + +commit c5a67c28086941f037f0be96c97c45c7ad21f7a8 +Author: lichengjun +Date: Fri Aug 20 00:45:10 2021 +0000 + + * Adjust the gitlab permission to judge the presentation. + +commit ee209755f3344194a9c84cc332c0cfdc8a528228 +Author: tianshujie98 +Date: Fri Aug 20 08:32:39 2021 +0800 + + * Finish task #41585. + +commit f59fb32722ee6744ea5ab5fc3977a71f5a69c60b +Author: tianshujie98 +Date: Fri Aug 20 08:17:39 2021 +0800 + + * Fix bug #14429. + +commit c385974191f15833fc7fe227ff8a0315a5a389d1 +Author: tianshujie98 +Date: Fri Aug 20 08:10:44 2021 +0800 + + * Finish task #41584. + +commit b1506c8330ddc05e4258b1c0cad599c3c2a5cdd3 (tag: zentaopms_15.3.1_20210819) +Author: 王怡栋 +Date: Thu Aug 19 21:17:25 2021 +0800 + + * add new version and upgrade. + +commit a5f99962096476c1656c1d8f6157643a16656f97 +Merge: 4cfc249fca 7f97e52ce6 +Author: 王怡栋 +Date: Thu Aug 19 20:39:04 2021 +0800 + + Merge branch '15.2' into 15.3 + +commit 4cfc249fcae4520168658baeec2ab131be528c0c +Author: 王怡栋 +Date: Thu Aug 19 20:04:26 2021 +0800 + + * fix bug for standard. + +commit 204c566a30786f59a2888adee960b27d190fe45f +Merge: 82b49a5992 aff9c266c4 +Author: 王怡栋 +Date: Thu Aug 19 19:50:32 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 82b49a5992e7b08f6846e238bfdd05f009ac673e +Author: 王怡栋 +Date: Thu Aug 19 19:50:14 2021 +0800 + + * fix for standard sql. + +commit cb4c9a389d4ee00bb4504640aeff0a27ba2a9970 +Author: 王怡栋 +Date: Thu Aug 19 19:49:21 2021 +0800 + + * Adjust entry code. + +commit b3947d30e5a2fca3f395093bf58a091ea8a8bd21 +Merge: d95711841d 5537f3500a +Author: dingguodong +Date: Thu Aug 19 18:23:58 2021 +0800 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit d95711841d4895003443c3e5df70d4fdd3bc7ff0 +Author: dingguodong +Date: Thu Aug 19 18:22:42 2021 +0800 + + * Add some functions to creating MR(staging). + +commit 2999fd6e49552f8bf9d246e29603e25b910ac3c0 +Author: dingguodong +Date: Thu Aug 19 18:18:56 2021 +0800 + + * Finish the view of creating MR(staging). + +commit 1dc911db569ebd68903797102ae78c2d5ea5f885 +Author: dingguodong +Date: Thu Aug 19 18:14:53 2021 +0800 + + + Add apiGetUpstream,apiGetForks, getUserIdRealnamePairs. + +commit 66c69c04c91b456c9f6b987983c5fe750153f86b +Author: dingguodong +Date: Thu Aug 19 18:13:08 2021 +0800 + + * Correct ajaxGetProjectBranches function. + +commit 2d16d4302daaf6674d73084c999cf955c35fa944 +Author: dingguodong +Date: Thu Aug 19 18:11:41 2021 +0800 + + * Remove addGitlab. + +commit aff9c266c4c271eb67441a88c1ccc089202a18dd +Author: zhujinyong +Date: Thu Aug 19 17:16:56 2021 +0800 + + * Fix API: get my info. + +commit 5537f3500a43c43943e878a74c4bdd53726fcc0a +Author: Guan Xiying +Date: Thu Aug 19 16:32:40 2021 +0800 + + * Remove extra line. + +commit b14f5af220d695fc53bdeab0fb0dcb4b9a10ed6f +Author: lichengjun +Date: Thu Aug 19 08:28:59 2021 +0000 + + * Add GitLab Token authority verification. + +commit 9b20bfdf192efe55e0d4a90e9b8e37bbe999d3a3 +Author: lichengjun +Date: Thu Aug 19 08:20:09 2021 +0000 + + * Adjust jihuMR zh. + +commit 962728e04d94e250f681e2423f6a345e0e6bec61 +Author: zenggang +Date: Thu Aug 19 16:08:40 2021 +0800 + + * Adjust code style + +commit d793c67789759049b24e2ec5c595aad2e6173a70 +Author: zenggang +Date: Thu Aug 19 15:40:55 2021 +0800 + + * Finish task #41482 + +commit d3255cbbb39bd191152190be8a5d715ce4aea72e +Author: Hao Sun +Date: Thu Aug 19 15:09:26 2021 +0800 + + *skip to show notice in card mode. + +commit 1b14499cae461d4e4eec9947ff92862089c37555 +Author: dingguodong +Date: Thu Aug 19 15:08:52 2021 +0800 + + * Revert checkToken function. + +commit c810d364f7e6e2e7a887d1a304a85b16a5a1970e +Author: Hao Sun +Date: Thu Aug 19 14:26:33 2021 +0800 + + * update zentao icons. + +commit d144b8b83b62210d6a80e824891bd14f38263634 +Author: Hao Sun +Date: Thu Aug 19 14:26:26 2021 +0800 + + * remove ellipsis in actions column in story table. + +commit 080f26ae86e85114e984d8deed23e48bfc2aff13 +Author: dingguodong +Date: Thu Aug 19 14:01:07 2021 +0800 + + * Change getApiRoot to from gitlab module. + +commit e215bc47f3eaeea83b4498ad95ef42ae3132294b +Author: Guan Xiying +Date: Thu Aug 19 13:27:17 2021 +0800 + + * Review codes. + +commit 7dde29881c41e34e3a5ebb36ec6b00cd9f704cad +Author: tianshujie98 +Date: Thu Aug 19 13:06:06 2021 +0800 + + * Finish task #41581. + +commit 0a4266bb3fdb2cd53018f2dcf31ed9a6e7d160b6 +Author: tianshujie98 +Date: Thu Aug 19 13:03:45 2021 +0800 + + * Finish task #41579. + +commit 7f97e52ce69e2d13bc09a7a328b73f21caa7b063 +Author: zenggang +Date: Thu Aug 19 12:17:43 2021 +0800 + + * Finish bug #13103 + +commit cf7131125b31c60d4b38bee4ca60ccd91ec5ff3b +Author: tianshujie98 +Date: Thu Aug 19 11:33:53 2021 +0800 + + * Finish task #41568. + +commit 3dd6c7b8518d58cc14dc74e8271e7a24b3929aa7 +Merge: 46331bf799 21386f9559 +Author: dingguodong +Date: Thu Aug 19 10:39:34 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 46331bf7997f3fbc000c2f7fb147457b1a331312 +Author: dingguodong +Date: Thu Aug 19 10:38:53 2021 +0800 + + * Remove funcs for get user detail to user module and reformat it. + +commit d7986085adbeb7f5783262bba173b401905428df +Author: dingguodong +Date: Thu Aug 19 10:38:18 2021 +0800 + + * Refactor get user details logic. + +commit e5e0ec2c8d1bdf3932f00ab1ba0be28ac5222507 +Author: lichengjun +Date: Thu Aug 19 02:37:48 2021 +0000 + + * Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function. + +commit 21386f9559ce7ce5354b8b7f62e45cd6ce539bd9 +Author: tianshujie98 +Date: Thu Aug 19 10:31:52 2021 +0800 + + * Finish task #41545. + +commit dcdea462671f9ecd451adc7f2431972f26383940 +Author: holan20180123 +Date: Thu Aug 19 10:27:48 2021 +0800 + + * Finish task #41611. + +commit 62883451954ac100856826d44d57198a3c496b60 +Author: dingguodong +Date: Thu Aug 19 10:24:46 2021 +0800 + + * Remove blank line and correct variable name. + +commit 689f602d2e9bb107f0e8329bb3a6978a85f19652 +Author: tianshujie98 +Date: Thu Aug 19 10:21:12 2021 +0800 + + * Finish task #41569. + +commit 120a2cd068cf04c5c14e2d1304db3a01c40c900f +Author: Guan Xiying +Date: Thu Aug 19 10:20:38 2021 +0800 + + * Fix create zt_mr table sql. + +commit 97f8c78487a2b15fbf1a2d1aa67dd9b10472b5e4 +Author: tianshujie98 +Date: Thu Aug 19 10:15:56 2021 +0800 + + * Finish task #41588. + +commit 564bb493cd27344bbf1782d2474182e9a6d1f0f3 +Author: tianshujie98 +Date: Thu Aug 19 10:13:50 2021 +0800 + + * Finish task #41589. + +commit 026eaacf91d15d25593d092653fe92df43fa4219 +Author: tianshujie98 +Date: Thu Aug 19 10:12:01 2021 +0800 + + * Finish task #41552. + +commit 7f980c72261487f1d85f4f19abac93e506f15461 +Author: tianshujie98 +Date: Thu Aug 19 10:10:49 2021 +0800 + + * Fix bug #14429. + +commit c4903ed168908554ac16bfdcb33cac8867e1d6af +Merge: 08d4a6084f 4a127a581a +Author: holan20180123 +Date: Thu Aug 19 09:55:32 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 08d4a6084f7f6f9a4e7566fbca7adb196ea6f4fe +Author: holan20180123 +Date: Thu Aug 19 09:55:20 2021 +0800 + + * Finish task #41565. + +commit 4a127a581ad67c606888632887e307c2d1c77f13 +Merge: c80bb11ebb 1b6373b60a +Author: hufangzhou +Date: Thu Aug 19 09:51:22 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit c80bb11ebb81c891b71c756d8e8e4df5d2dd246e +Author: hufangzhou +Date: Thu Aug 19 09:51:17 2021 +0800 + + * Fix bug #14393. + +commit 1b6373b60aba50143e8889ab5139df2ed7a73212 +Author: tianshujie98 +Date: Thu Aug 19 09:49:42 2021 +0800 + + * Finish task #41590. + +commit f4f91f63e928363b8af8c51f404fe81e54853136 +Merge: 954d2908c4 f7b9887fe0 +Author: dingguodong +Date: Thu Aug 19 09:49:02 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 954d2908c487bb55e0122c6a024b97955e9dea26 +Author: dingguodong +Date: Thu Aug 19 09:47:49 2021 +0800 + + * Refactor get user details logic and improve performance. + +commit 2c0f0414ac0a11a339a8a2bc34e7a6042961ff6a +Author: dingguodong +Date: Thu Aug 19 09:47:01 2021 +0800 + + + Add function getUserDetailsForAPI to user module. + +commit f7b9887fe06a8663130e933108de548363d32dc1 +Author: holan20180123 +Date: Thu Aug 19 09:46:24 2021 +0800 + + * Finish task #41565. + +commit 7306d7a66774bb8dd55b13fd33e7585c3d7451e3 +Author: tianshujie98 +Date: Thu Aug 19 09:42:56 2021 +0800 + + * Finish task #41572. + +commit 91a7306bc481ca5b7d063e597866f3dde8a167ee +Author: tianshujie98 +Date: Thu Aug 19 09:40:12 2021 +0800 + + * Finish task #41572. + +commit 45c1153e17fbdd5e16763137f3ba8f8d3ff80683 +Author: tianshujie98 +Date: Thu Aug 19 09:36:08 2021 +0800 + + * Finish task #41573,41575. + +commit 4c60d66765dcae009abf0de6fd0ab9e7e77d160d +Author: qiyu-xie +Date: Thu Aug 19 09:21:04 2021 +0800 + + * Finish task#41556. + +commit 00e47922e0409419b04a910a38e6281fe9ef4d2e +Author: qiyu-xie +Date: Thu Aug 19 09:19:22 2021 +0800 + + * Delete unused language items. + +commit 85129ebb3c8a9b0ba0431be51f0d98395a60e194 +Author: tianshujie98 +Date: Thu Aug 19 09:16:28 2021 +0800 + + * Finish task #41608. + +commit 1a17dd0207c255f7f46f3112cabea731924c91a9 +Author: qiyu-xie +Date: Thu Aug 19 09:16:00 2021 +0800 + + * Finish task#41557. + +commit 567021b12b86f09d4cf9d8c3618a74e42989cfeb +Author: tianshujie98 +Date: Thu Aug 19 09:13:03 2021 +0800 + + * Fix bug #14424. + +commit 54bf6bc829df58013bf632fb6f4a5d486e83fb17 +Author: holan20180123 +Date: Thu Aug 19 08:54:49 2021 +0800 + + * Finish task #41550. + +commit 8551ba49e303e5c1af6683ab2ecec7a8fe11d2af +Author: lichengjun +Date: Thu Aug 19 00:46:15 2021 +0000 + + * Adjust mr control browse function. + +commit c913b9a95d162e8f7f608d3c443c6990aaabaa69 +Author: holan20180123 +Date: Thu Aug 19 08:28:57 2021 +0800 + + * Finish task #41543. + +commit 3660358dba74e25760c7f4d40cbe4f153c3c4de7 +Author: holan20180123 +Date: Thu Aug 19 08:07:16 2021 +0800 + + * Finish task #41542. + +commit 1a992eb16e91905117b20652efe157734f0b3f7a +Author: Hao Sun +Date: Wed Aug 18 19:15:27 2021 +0800 + + * fix cannot open app "help". + +commit e46c521642013ab55adf2cb8ad9152a58e276cc2 +Author: holan20180123 +Date: Wed Aug 18 17:34:55 2021 +0800 + + * Finish task #41577. + +commit bce4ebbe55831d167018d6180c25c4adb46ae2e9 +Author: tianshujie98 +Date: Wed Aug 18 17:26:21 2021 +0800 + + * Fixed issue with publishing browser notifications. + +commit f3984ddb206d09bcf121d3573e2045317226a9d1 +Merge: 25242a2317 fa47259a5b +Author: holan20180123 +Date: Wed Aug 18 17:23:30 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 25242a2317fbc91f3f42b776041c94f5a5d8fe8a +Author: holan20180123 +Date: Wed Aug 18 17:23:13 2021 +0800 + + * Finish task #41238. + +commit fa47259a5baeb49a2cd0dca857f336b0f6026bfb +Merge: ca17d69bee ce2e30f293 +Author: hufangzhou +Date: Wed Aug 18 17:21:43 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ca17d69bee296dbaa66cf487611dfd7cfe36e123 +Author: hufangzhou +Date: Wed Aug 18 17:21:39 2021 +0800 + + * Finish task #41596. + +commit ce2e30f29372f472ef25a9b953b0590bf57757d1 +Author: qiyu-xie +Date: Wed Aug 18 17:18:46 2021 +0800 + + * Fix bug#14045. + +commit 39ddc676193f0af09d9b213318c4baa27186d078 +Author: tianshujie98 +Date: Wed Aug 18 17:02:01 2021 +0800 + + * Fixed issue with publishing browser notifications. + +commit 957449bcf958fbb30912e02cc0f4bb2f8e1e6fb3 +Merge: 86bf040c72 d7981d28a8 +Author: tianshujie98 +Date: Wed Aug 18 16:54:23 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 86bf040c7271f0ff81779e729d81557a69578551 +Author: tianshujie98 +Date: Wed Aug 18 16:53:49 2021 +0800 + + * Fixed issue with publishing browser notifications; + +commit 34391dbe4cbd427a92224002e0ea6d2c7ffa513c +Author: lichengjun +Date: Wed Aug 18 08:49:02 2021 +0000 + + * Adjust Gitlab list function. + +commit d7981d28a83ebce55adbc27382eb5eda2e6921fe +Merge: 438537f296 16a3342248 +Author: hufangzhou +Date: Wed Aug 18 16:47:49 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 438537f29670447b1d18dc876f8b65270f4c51dc +Merge: 15133464e9 a760652e04 +Author: hufangzhou +Date: Wed Aug 18 16:47:39 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 15133464e9d57389605aaf466a4d4706f8171177 +Author: hufangzhou +Date: Wed Aug 18 16:47:35 2021 +0800 + + * Finish task #41532. + +commit 16a33422480502cc44d6953a6ffddcb6beac2c9e +Author: qiyu-xie +Date: Wed Aug 18 16:47:28 2021 +0800 + + * Finish task#41546. + +commit a760652e04b653208bdd99bdb81f9b63da2929a7 +Author: qiyu-xie +Date: Wed Aug 18 16:36:24 2021 +0800 + + * Finish task#41559. + +commit 4732bd95013939d4e21190f2c3dde25eed78557b +Author: dingguodong +Date: Wed Aug 18 16:30:38 2021 +0800 + + * Optimize branch function after code review. + +commit fb1d5dd07f143b53f95f869020a47389cd75aaf1 +Merge: 23550dfd5d a2348ddc66 +Author: hufangzhou +Date: Wed Aug 18 16:27:35 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 23550dfd5d7137f0e7cc0bc469ae7a34d9147719 +Author: hufangzhou +Date: Wed Aug 18 16:27:30 2021 +0800 + + * Finish task #41603. + +commit a2348ddc66e1f2dc5c9ec30e6f7800e5f94a67d6 +Author: qiyu-xie +Date: Wed Aug 18 16:24:14 2021 +0800 + + * Finish task#41561. + +commit 4de2b1e37fd8a95c64c98fc04226f6f1706943ac +Author: qiyu-xie +Date: Wed Aug 18 16:17:31 2021 +0800 + + * Finish task#41564. + +commit ff36cd96f100bb96e877c8fbd32732fbe7252058 +Author: tianshujie98 +Date: Wed Aug 18 16:15:44 2021 +0800 + + * Finish task #41567. + +commit 13b25931aa5f5c9675ab921479536a2a4d1cca9c +Author: qiyu-xie +Date: Wed Aug 18 16:15:10 2021 +0800 + + * Finish task#41570. + +commit 76cf48a80e411a9d0e263068d8c5b05b1b9b8ba6 +Merge: 5659d23df2 744234725b +Author: dingguodong +Date: Wed Aug 18 16:06:12 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5659d23df24d6ba480c0e81d555d9def0dcc6d00 +Author: dingguodong +Date: Wed Aug 18 16:05:22 2021 +0800 + + * Remove some todo. + +commit 744234725b88e4a82bebc2e5655708d23a63406e +Author: qiyu-xie +Date: Wed Aug 18 15:59:38 2021 +0800 + + * Finish task#41578. + +commit 85043c81df023081500030cb6b7794a2cca50d47 +Merge: 6a83580ecf 4671a62533 +Author: dingguodong +Date: Wed Aug 18 15:57:10 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6a83580ecf0a1c585cda4e944818dc30a68159a4 +Author: dingguodong +Date: Wed Aug 18 15:56:33 2021 +0800 + + * Correct code format after code review. + +commit 4671a62533cc39afd479de23ef1c072b6cf6ec9b +Author: qiyu-xie +Date: Wed Aug 18 15:56:15 2021 +0800 + + * Finish task#41595. + +commit 30486df520b731550f99f5c07b40a8239ad79ea1 +Author: qiyu-xie +Date: Wed Aug 18 15:53:41 2021 +0800 + + * Finish task#41597. + +commit 28a76ef7398fda0ddec74d9771f5ffa96269256f +Author: qiyu-xie +Date: Wed Aug 18 15:50:22 2021 +0800 + + * Finish task#41599. + +commit c18901ad6d49a9127155683236e63efbf487b601 +Author: hufangzhou +Date: Wed Aug 18 15:50:20 2021 +0800 + + * Finish task #41533. + +commit 27c6306ef0530989f949dcd5ff08200b56ddb11b +Merge: 84c181103e 29759080f9 +Author: hufangzhou +Date: Wed Aug 18 15:47:53 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 84c181103e37133c0903e58ef1e148c06541f8ff +Author: hufangzhou +Date: Wed Aug 18 15:47:49 2021 +0800 + + * Finish task #41544. + +commit 29759080f9ab0bb4f4803577856ac259951042ef +Author: qiyu-xie +Date: Wed Aug 18 15:46:44 2021 +0800 + + * Finish task#41600. + +commit 5da2970802acdf40924b9a026ed935eaeb5b59e7 +Author: qiyu-xie +Date: Wed Aug 18 15:44:20 2021 +0800 + + * Finish task#41604. + +commit 3f27bb0f4bbc8419ee3be51200da0b113e110e32 +Merge: 82fc60a677 f13869ea27 +Author: hufangzhou +Date: Wed Aug 18 15:44:32 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 82fc60a677f5d385386c64bebbf715ba24ba12a6 +Author: hufangzhou +Date: Wed Aug 18 15:44:28 2021 +0800 + + * Finish task #41605. + +commit f13869ea2788bcf39c859f95c7f60138c7b4408f +Author: tianshujie98 +Date: Wed Aug 18 15:44:00 2021 +0800 + + * Finish task #41566. + +commit 8dc96ee49b0439dbc475f00b7ce141f55442b9f2 +Merge: e8b3aee5d8 7ead5cb05e +Author: reneeteng +Date: Wed Aug 18 15:42:22 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 7ead5cb05eeef80831a7fc276df2209e0b7f65a7 +Author: qiyu-xie +Date: Wed Aug 18 15:41:47 2021 +0800 + + * Finish task#41606. + +commit a363ca9ced969b974d5c4993d9d58ec6ebc0788a +Author: qiyu-xie +Date: Wed Aug 18 15:37:31 2021 +0800 + + * Finish task#41609. + +commit 97e97867046ef4d01b3d40c85b3d68dc3ee28831 +Merge: ba8d7288df ffa740828a +Author: hufangzhou +Date: Wed Aug 18 15:37:33 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ba8d7288dfa2770bc225f07414f913c5b79e45a6 +Author: hufangzhou +Date: Wed Aug 18 15:37:29 2021 +0800 + + * Finish task #41602. + +commit ffa740828a3b6e7e6d4bcb211bcd54539e559ec0 +Author: qiyu-xie +Date: Wed Aug 18 15:35:29 2021 +0800 + + * Finish task#41610. + +commit fb71698273ff7f1a73fe07d35c6f8a55a8d204cf +Author: qiyu-xie +Date: Wed Aug 18 08:05:51 2021 +0800 + + * Finish task#41230. + +commit 9aa7b48f833cd79ce40fc3501ea257b7a91dc7d2 +Author: tianshujie98 +Date: Wed Aug 18 15:25:25 2021 +0800 + + * Finish task #41562. + +commit ce9ba610a2be161bb5901ba003d237d4a91f8ab4 +Author: zenggang +Date: Wed Aug 18 15:20:14 2021 +0800 + + * Finish task #41487 + +commit e2c1af5541390e545c68cf36e40bbc199b40e86d +Author: tianshujie98 +Date: Wed Aug 18 15:12:45 2021 +0800 + + * Finish task #41560. + +commit 8153dbc0946abb00ef17f64e2236095b86e39845 +Author: tianshujie98 +Date: Wed Aug 18 15:10:18 2021 +0800 + + * Finish task #41555. + +commit 9d619b3c6f1e328364d88b6344807f70f3d873e5 +Author: tianshujie98 +Date: Wed Aug 18 15:05:45 2021 +0800 + + * Finish task #41539. + +commit 9ed732fd9e41fd037d3d6529d15f268f065f1f4a +Author: tianshujie98 +Date: Wed Aug 18 15:02:27 2021 +0800 + + * Finish task #41536. + +commit eb513ffa6ee5646057bd37e0d093e6cd6e7a24fe +Author: tianshujie98 +Date: Wed Aug 18 15:00:50 2021 +0800 + + * Finish task #41534. + +commit e9887b9976086423eb74e63efafa90363c212d4e +Author: dingguodong +Date: Wed Aug 18 14:52:15 2021 +0800 + + * Change function commitResult after code review. + +commit 0571865a7b52742e4678fa92ccb246b7f34b84ee +Author: tianshujie98 +Date: Wed Aug 18 14:49:09 2021 +0800 + + * Modify the display condition of the postponed label. + +commit 656aa6a4470ae5787755dec74d8f5bdb24f49679 +Author: dingguodong +Date: Wed Aug 18 14:37:47 2021 +0800 + + * Revert and correct back to original function comment. + +commit f26c989ed2d645799a40a767e210db78fa223d18 +Author: holan20180123 +Date: Wed Aug 18 13:44:16 2021 +0800 + + * Adjust code style in tree module. + +commit 6648beb06776ed1238020dd5a6bd7df841e2dd4e +Author: lichengjun +Date: Wed Aug 18 03:05:02 2021 +0000 + + * MR code merge. + +commit a6ed9fa6f579b1f4c813262ac29e714db77cf4f8 +Author: holan20180123 +Date: Wed Aug 18 10:58:58 2021 +0800 + + * Adjust style of project doc. + +commit 4b278f6a9382978b4a70d92092adad931921991a +Merge: 2ae9360cdf 14de596bc0 +Author: lichengjun +Date: Wed Aug 18 02:58:57 2021 +0000 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit 2ae9360cdfc57cc011ae4bb3931f891ae64f5e59 +Author: lichengjun +Date: Wed Aug 18 02:57:36 2021 +0000 + + * Add Gitlab MR List Function. + +commit 14de596bc0f1fc905a6c0cea6ac0eefd839e61fd +Author: dingguodong +Date: Wed Aug 18 10:40:15 2021 +0800 + + * Rename getObjectNameForJob to getProjectName. + +commit 474b438db778d8cd2d662e5c82aa7f8bdbeb5564 +Author: dingguodong +Date: Wed Aug 18 10:27:31 2021 +0800 + + * Optimize main page of MR. + +commit d71858bc5ba686286dc504a17d60ea5832eafc6f +Merge: bb8cf72b8b 95afa43ff1 +Author: 王怡栋 +Date: Tue Aug 17 19:35:15 2021 +0800 + + Merge branch '15.2' into 15.3 + +commit 82cedbde1ceea914730e25984101be757eaf006c +Merge: 8ebe5b4cc9 549ea9bbde +Author: lichengjun +Date: Tue Aug 17 11:16:44 2021 +0000 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit 8ebe5b4cc9dc7c666a4ced2e719c7b8c5fa60321 +Author: lichengjun +Date: Tue Aug 17 11:14:56 2021 +0000 + + * adjust the GitLab list function + +commit 549ea9bbde37743868293fdff517707939a7320c +Author: dingguodong +Date: Tue Aug 17 17:52:55 2021 +0800 + + * Create MR(staging). + +commit d9683594db29515294c4ab2730f3022c81101ae4 +Author: dingguodong +Date: Tue Aug 17 17:52:05 2021 +0800 + + + Get forked projects. + +commit 5728c38e66ba84c4243449cd731ba10461e17bc4 +Author: dingguodong +Date: Tue Aug 17 17:49:47 2021 +0800 + + * Remove and correct useless statements. + +commit 3dc7a2111b1755c7e08a0824a3a6369c2d6261fb +Author: dingguodong +Date: Tue Aug 17 17:44:58 2021 +0800 + + + Get project branches. + +commit b5234d6869dd92f959c5e7df8f2eeabd5f2e67db +Author: qiyu-xie +Date: Tue Aug 17 17:29:26 2021 +0800 + + * Adjust code style at review. + +commit bb8cf72b8b14d04438c1a6f43d8613403bbf8e4e +Author: 王怡栋 +Date: Tue Aug 17 17:27:42 2021 +0800 + + * Merge for fixed code after tag in this release. + +commit 511073750032e472ccadc39818aa2b38a559f678 +Author: 王怡栋 +Date: Tue Aug 17 16:27:29 2021 +0800 + + * remove test code. + +commit ccef522d3aa1902b3bd869b529e271106a097e9f +Merge: 63902b7793 4afeac075b +Author: 王怡栋 +Date: Tue Aug 17 16:26:38 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 63902b779398650736c36a933a24d6d8e67c760d +Author: 王怡栋 +Date: Tue Aug 17 16:25:04 2021 +0800 + + * check onlybody for tostory/totask/tobug link. + +commit 4afeac075b27e3e228884a7c1dfbfd2f7bdeaf44 +Author: tianshujie98 +Date: Tue Aug 17 13:06:27 2021 +0800 + + * Fix bug #14395. + +commit f9538926a5cbea982a55794f33d7284285008935 +Author: zenggang +Date: Tue Aug 17 11:26:49 2021 +0800 + + * Finish task #40920 + +commit e8b3aee5d8f58f327ed5020585cd106a7a8ca423 +Author: reneeteng +Date: Tue Aug 17 10:36:55 2021 +0800 + + * Optimize translation. + +commit 354b119a2c05e5d57f588005c6c5f0de8a0a9598 +Merge: 09dd10e192 a14ee06288 +Author: reneeteng +Date: Tue Aug 17 10:03:12 2021 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d23d3adf03d869ac948bf67dd523561fa26bcb61 +Author: dingguodong +Date: Tue Aug 17 09:47:22 2021 +0800 + + * Remove extra project selector in create view. + +commit b67c63fb5b337f8694ae16c2ae4bf2f48621bbb0 +Author: tianshujie98 +Date: Tue Aug 17 09:42:31 2021 +0800 + + * Modify the distance between the project card avatars. + +commit 226a3ab8c827b00b95c9e8e1f4aa63192b7f1467 +Author: tianshujie98 +Date: Tue Aug 17 09:37:03 2021 +0800 + + * Modify the display problem of the project card avatar. + +commit 833b9b14ae5668e986977914d87986de17c575fc +Author: tianshujie98 +Date: Tue Aug 17 09:26:20 2021 +0800 + + * Fix the problem that the first product cannot be linked when copye execution. + +commit 53b275c5e85cc8c7be1c9f78cfaaf9f32f30fb11 +Author: tianshujie98 +Date: Tue Aug 17 08:53:49 2021 +0800 + + * Modify the link executed in the prompt box. + +commit ffe03244d9b0ebee498c5b5bdea026faf563665d +Author: holan20180123 +Date: Tue Aug 17 08:51:44 2021 +0800 + + * Code for task #41238. + +commit 58e5eca2902750dcaf8b4b550bad9f5b7bf03ba6 +Author: hufangzhou +Date: Tue Aug 17 08:21:41 2021 +0800 + + * Add the space before and after slash. + +commit 03e8ba6937529e0079b07efc5041e3672ab1f62f +Author: qiyu-xie +Date: Mon Aug 16 18:08:02 2021 +0800 + + * Modify the button of view closed executions style in execution kanban. + +commit 479edc3effa3054968052aa0928d5e4f54896aaf +Author: qiyu-xie +Date: Mon Aug 16 17:57:15 2021 +0800 + + * Distinguish the name of the execution library. + +commit cbddf5ced6c0a5ce4b5edc57d6e4c87112748327 +Merge: fc3a74c1d4 92cac9b4c2 +Author: dingguodong +Date: Mon Aug 16 17:45:18 2021 +0800 + + Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR + +commit fc3a74c1d4e5ed1b96c9a643301d795aa43d4c8c +Author: dingguodong +Date: Mon Aug 16 17:44:52 2021 +0800 + + * Add merge request list view. + +commit a33798be718a0efc6293c926bd8cd72ff91e35b8 +Merge: d63dc92095 84937a6436 +Author: hufangzhou +Date: Mon Aug 16 17:29:26 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d63dc92095be10d272846064af695eee63d0489a +Author: hufangzhou +Date: Mon Aug 16 17:29:21 2021 +0800 + + * Adjust the recall function redirection. + +commit 84937a64362e5d153f92b5b1bf525b2510cf78ce +Author: qiyu-xie +Date: Mon Aug 16 16:16:58 2021 +0800 + + * Finish task#41230. + +commit bef4feee5e917f7f1c2d714afe98aaa09987f188 +Merge: f87de9e569 967128f4cb +Author: holan20180123 +Date: Mon Aug 16 16:16:50 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit f87de9e5699e36f9341ef76d628d024d5d102217 +Author: holan20180123 +Date: Mon Aug 16 16:16:32 2021 +0800 + + * Code for task #41238. + +commit 967128f4cbe4d3e7d56bf8ebea51c4a834bd372d +Author: Hao Sun +Date: Mon Aug 16 16:01:23 2021 +0800 + + * update zentao icon. + +commit ba63832c2db29c6bd6c291177b1818c0969ac638 +Merge: 2ab74f5a81 c6f1204eb8 +Author: hufangzhou +Date: Mon Aug 16 15:41:51 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 2ab74f5a819f7d07c8780b80c7140bd12daea62d +Author: hufangzhou +Date: Mon Aug 16 15:41:47 2021 +0800 + + * Finish task #41438. + +commit c6f1204eb8d25d64f6f64da97c109cc3c3b1572f +Author: qiyu-xie +Date: Mon Aug 16 15:34:28 2021 +0800 + + * Task#41230. + +commit bf2b811ef543f8085d5d0ff62230770365419fb6 +Author: tianshujie98 +Date: Mon Aug 16 15:31:03 2021 +0800 + + * Fix bug #14372. + +commit 92cac9b4c2f2ffbd70dea08ba29d6b1fede65496 +Author: lichengjun +Date: Mon Aug 16 07:29:19 2021 +0000 + + * Adjust the gitlab validation style. + +commit a5919d62f65d77f1edbcdfbe8385d30ffe552c48 +Merge: e13f57252d 6a5b430d80 +Author: hufangzhou +Date: Mon Aug 16 15:11:15 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit e13f57252dd4936b243c5614a430daaf076066e2 +Author: hufangzhou +Date: Mon Aug 16 15:11:11 2021 +0800 + + * Adjust the background color of independent product when hover the link. + +commit 6a5b430d80a77cf0f100947668c8b4440722c266 +Author: tianshujie98 +Date: Mon Aug 16 15:09:34 2021 +0800 + + * Store the body of the document in a temporary field. + +commit aeca480f656f8ec7af4d687f20cb9da54d09ad70 +Author: Hao Sun +Date: Mon Aug 16 14:49:03 2021 +0800 + + * improve button style in left menu. + +commit e698967275188eea822d8619610635a497a62c36 +Merge: d53b163411 33f6ac4171 +Author: hufangzhou +Date: Mon Aug 16 14:39:12 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d53b16341199b5601e453049f453c6549a917867 +Author: hufangzhou +Date: Mon Aug 16 14:39:09 2021 +0800 + + * Adjust the style in drop menu. + +commit fa062b6b8446b24ff3e3b2b231dd4f9b03cc1596 +Author: dingguodong +Date: Mon Aug 16 14:37:04 2021 +0800 + + * Create MR view. + +commit 33f6ac4171cf3ac6c710d8ff0347370c486783fd +Author: Hao Sun +Date: Mon Aug 16 14:28:16 2021 +0800 + + * improve UI of cards view for project/browse: change grid size when screen width reduction. + +commit 0e41eef88aa361522edb863688ca820176c834df +Merge: 3c25753951 c3884a8b8e +Author: hufangzhou +Date: Mon Aug 16 14:21:49 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3c25753951b8956716d5f1f441f46850d97bbab4 +Author: hufangzhou +Date: Mon Aug 16 14:21:45 2021 +0800 + + * Finish task #41433. + +commit c3884a8b8ea732d8f235f6e49c514fcd83279f26 +Author: Hao Sun +Date: Mon Aug 16 14:18:13 2021 +0800 + + * fix click tabs bar not work. + +commit 2a5731b49b53df4fbeb885ca6a27a022da3faa6a +Author: Hao Sun +Date: Mon Aug 16 14:15:37 2021 +0800 + + * update zui.js: refactor. + +commit d64a4593d98e8d2626912d299d0650d7f754cb46 +Author: qiyu-xie +Date: Mon Aug 16 14:16:11 2021 +0800 + + * Finish task#41436. + +commit fd9011e14c3f2fe1dfa4cca4393b4cc5efbf4ecc +Author: tianshujie98 +Date: Mon Aug 16 14:08:23 2021 +0800 + + * Modify the problem of reporting an error when a multiplayer task team member is removed. + +commit 6e159b97eac55f340116ca207a4e7c749c5244a9 +Author: Hao Sun +Date: Mon Aug 16 14:06:51 2021 +0800 + + * set width to auto for searchbox in dropmenu @hufangzhou. + +commit 920ab4050fc1caf93873c194d315d1d3aa386baf +Author: qiyu-xie +Date: Mon Aug 16 14:05:04 2021 +0800 + + * Finish task#41432. + +commit 1b4eba82ba38286c198e89d7e09395a1ba0f0d39 +Author: holan20180123 +Date: Mon Aug 16 13:46:31 2021 +0800 + + * Finish task #41439. + +commit 40f1d0e5d7e57fdf53bf2d0cd4cef033d90baec4 +Author: qiyu-xie +Date: Mon Aug 16 13:40:25 2021 +0800 + + * Finish task#41427. + +commit efa727575d7548901ba3ce58671e7940bd28c52c +Author: Hao Sun +Date: Mon Aug 16 13:28:05 2021 +0800 + + * update theme "blue". + +commit a646147967bb68b25db8dd0de767b4340454b1d3 +Author: 王怡栋 +Date: Mon Aug 16 13:17:52 2021 +0800 + + * fix for resetProgramPriv. + +commit 4713ac9be82f61c99781131a853106d1db867ec9 +Merge: 14b1c60dd3 0d208f38f5 +Author: 王怡栋 +Date: Mon Aug 16 13:17:21 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0d208f38f596b389903383ab5a49ee4291f22e28 +Author: holan20180123 +Date: Mon Aug 16 13:16:20 2021 +0800 + + * Finish task #41245. + +commit b58ce0784cefc4115295a38f56518fd438950d74 +Author: holan20180123 +Date: Mon Aug 16 13:09:15 2021 +0800 + + * Finish task #41435. + +commit 7cf36cd10ba9b5e7ed200bb96b51281be47aa686 +Author: Hao Sun +Date: Mon Aug 16 12:06:24 2021 +0800 + + * improve style of theme "blue". + +commit 8869c5a3d27417b4cd02a2254d4553c05804eeb1 +Author: tianshujie98 +Date: Mon Aug 16 11:28:02 2021 +0800 + + * Finish task #41225. + +commit 836a0bacd6426b844d020342b989a015ba117eda +Author: holan20180123 +Date: Mon Aug 16 10:30:10 2021 +0800 + + * Finish task #41437. + +commit c1bc10b4777f1ecfdc3df30f2edf9c1d212f0348 +Author: Hao Sun +Date: Mon Aug 16 10:15:58 2021 +0800 + + * refactor. + +commit a6bd22b09dd7e9020538bdca1cc3a098e975c1d9 +Author: Hao Sun +Date: Mon Aug 16 10:15:53 2021 +0800 + + * show tooltip for left menu. + +commit 4d42368a7f8e763a808caf755c1ef173a26e0149 +Author: Hao Sun +Date: Mon Aug 16 09:37:39 2021 +0800 + + * fix UI for more menu not work as expected. + +commit 8cfe9d4f50756fba9cbfcb861c3b5e1bc5c64ad8 +Author: Hao Sun +Date: Mon Aug 16 09:24:33 2021 +0800 + + * fix menu button not clickable. + +commit 412bb4b154c797ffdb7172ee7861c9b5acf293a3 +Merge: 5237f1649c a2699e352c +Author: hufangzhou +Date: Mon Aug 16 09:15:01 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5237f1649c5b2df7ee26087d6351ff11633ba017 +Author: hufangzhou +Date: Mon Aug 16 09:14:56 2021 +0800 + + * Fix bug #14289. + +commit a2699e352c8528dbfa698b9469a7ecab8409f7ef +Author: qiyu-xie +Date: Mon Aug 16 09:00:26 2021 +0800 + + * Execution lib doc link jump error in dynamic. + +commit 14b1c60dd3dd197e7a0fcea60026e190cc5e1bd6 +Merge: 3f69110edc a14ee06288 +Author: 王怡栋 +Date: Mon Aug 16 08:56:30 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit a14ee06288af519d4ccec8492320987ffe678fb6 +Author: Hao Sun +Date: Fri Aug 13 17:57:28 2021 +0800 + + * improve UI of left menu. + +commit f5b9f42fb7e94f1f941953009f9a0ef5f44f12e4 +Author: Hao Sun +Date: Fri Aug 13 17:57:19 2021 +0800 + + * improve theme "blue". + +commit 753fb1b2cd956bb08561aa51115b58af19a9b375 +Author: dingguodong +Date: Fri Aug 13 17:35:29 2021 +0800 + + * Add list function for mr control(staging). + +commit e0b0777126f44cbe6ebab58c1b2dab2a0e9d1042 +Author: dingguodong +Date: Fri Aug 13 17:33:32 2021 +0800 + + * Update MR model. + +commit 4c64b164467ebbf207f3f1cacad7bd75043ef5e0 +Author: Hao Sun +Date: Fri Aug 13 16:42:57 2021 +0800 + + * update zentao icons. + +commit 9b23391900d0b73688e46092ac9897cf6ccce3fd +Author: dingguodong +Date: Fri Aug 13 16:33:48 2021 +0800 + + * Update MR model. + +commit 5466c2ed0282415eac09841c362582c9d15beecc +Author: dingguodong +Date: Fri Aug 13 16:19:07 2021 +0800 + + + Add gitlab MR model. + +commit c7f53c574a9799e49e274a0ddb25d42872ce7142 +Author: dingguodong +Date: Fri Aug 13 15:47:01 2021 +0800 + + * Add TABLE_MR config. + +commit e186ed56be171f3487acae7b86395044f59784cc +Author: zenggang +Date: Fri Aug 13 15:44:21 2021 +0800 + + * Adjust my api + +commit 23bcc9d891ac4d1160a58158b34777a19ddcfcce +Author: holan20180123 +Date: Fri Aug 13 14:53:15 2021 +0800 + + * Finish task #41227. + +commit 2f2abb8294ec9571101e35cb64cd606c024c108a +Author: qiyu-xie +Date: Fri Aug 13 14:32:39 2021 +0800 + + * Fix an error at custom doc page. + +commit 65c6e9a3d09c8d849e4c417aca2d9f9ef179fc33 +Author: holan20180123 +Date: Fri Aug 13 14:22:56 2021 +0800 + + * Fix bug #13962. + +commit 3f69110edc21b4254217f787c562e0d77d411a39 +Author: 王怡栋 +Date: Fri Aug 13 14:08:10 2021 +0800 + + * adjust for fulltext search. + +commit e818e038edaca3c5ec35af8e29ebe3955d523796 +Author: holan20180123 +Date: Fri Aug 13 14:00:57 2021 +0800 + + * Finish task #41237. + +commit 4a43e87e35ac2f25b59080dc05b31be26e4a7d37 +Author: dingguodong +Date: Fri Aug 13 13:57:24 2021 +0800 + + * Add zt_mr database table. + +commit aefb968d9a1021a94b340988d03f1e850cc86959 +Merge: 4d3e4aa7f5 80dcc25179 +Author: hufangzhou +Date: Fri Aug 13 13:55:21 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4d3e4aa7f5b196331b28fa808d5ed75b5e4217f3 +Author: hufangzhou +Date: Fri Aug 13 13:55:15 2021 +0800 + + * Fix bug #14266. + +commit 80dcc251796366c3f85be42a6fa012e125680a54 +Author: qiyu-xie +Date: Fri Aug 13 13:38:49 2021 +0800 + + * Finish task#41430. + +commit 262b01de85285118eb79ebb4e612432906164bd2 +Author: tianshujie98 +Date: Fri Aug 13 13:18:58 2021 +0800 + + * Take out the method of skipping the creation and execution for config. + +commit af77b379c221bc95b88c9ba5af6e9994b4e57dbf +Author: tianshujie98 +Date: Fri Aug 13 13:09:42 2021 +0800 + + * Modify card team member link. + +commit 95aeac2ee7b9863644c359345767424bbf7ce660 +Merge: 4935f81e70 cf8e0e9530 +Author: tianshujie98 +Date: Fri Aug 13 11:35:00 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4935f81e70cd354158ffc36e77d6ee399c2da2e8 +Author: tianshujie98 +Date: Fri Aug 13 11:34:30 2021 +0800 + + * Finish task #41426. + +commit cf8e0e953096747d2ebadec02266936ac81f3555 +Author: qiyu-xie +Date: Fri Aug 13 11:30:17 2021 +0800 + + * Finish task#41428. + +commit 8ef381f43e219b55d293d4f4c5a9d6979c120602 +Author: holan20180123 +Date: Fri Aug 13 11:18:53 2021 +0800 + + * Finish task #41235. + +commit be9f189c4dbf43e348f236695a3c7c89a52f061a +Author: qiyu-xie +Date: Fri Aug 13 10:57:43 2021 +0800 + + * Finish task#41431. + +commit 5c675fe85f463d5d9d81e0390ad846b1972bb068 +Merge: 1488745195 23b5655055 +Author: Guan Xiying +Date: Fri Aug 13 10:40:20 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 14887451957e6ac1d659dbb808b086905d891710 +Author: Guan Xiying +Date: Fri Aug 13 10:39:39 2021 +0800 + + * Fix sync gitlab scm by cron bug. + +commit 23b5655055d877f26183a697e11607ef9ab238a9 +Author: Hao Sun +Date: Fri Aug 13 10:12:43 2021 +0800 + + * refactor usage of chosen options. + +commit fd8f1318298b99a628e7ea5fbdd72bfea87edda6 +Author: qiyu-xie +Date: Fri Aug 13 09:18:34 2021 +0800 + + * Finish task#41216. + +commit e12c8606ca7b75acfa799a73df04af6d4915c188 +Author: 孙广明 +Date: Fri Aug 13 09:14:53 2021 +0800 + + * Add priv filter for doc. + +commit de7fc5c8ea6f316cef19147a553263f0b25a2521 +Author: tianshujie98 +Date: Fri Aug 13 08:57:53 2021 +0800 + + * Fix bug #14260. + +commit 341d3a5fd4ea77830f5e9018e60fd380877bfdd7 +Merge: 9281d2342c 4e6c597f77 +Author: hufangzhou +Date: Fri Aug 13 08:28:05 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 9281d2342cae347d645cb2b867fa176f9beea2e9 +Author: hufangzhou +Date: Fri Aug 13 08:28:00 2021 +0800 + + * Fix bug #14254. + +commit 4e6c597f7758840bedb99e623ee9e955c6195a96 +Merge: dba3acf631 152d774391 +Author: holan20180123 +Date: Fri Aug 13 08:12:22 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit dba3acf63151a2d03bc8661b9073695ad10f5194 +Merge: e107e0a660 99de8fa2ce +Author: holan20180123 +Date: Fri Aug 13 08:12:17 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 152d7743916328be4e676ebd1a31c47b7abee93d +Author: qiyu-xie +Date: Thu Aug 12 18:13:28 2021 +0800 + + * Task#41216. + +commit d326a7e84228019d9a0613347faf48added08e03 +Author: hufangzhou +Date: Thu Aug 12 18:13:02 2021 +0800 + + * Add the language item. + +commit e107e0a66017e2da2555a7d3ed6332c510e11db5 +Author: holan20180123 +Date: Thu Aug 12 17:28:41 2021 +0800 + + * Finish task #41245. + +commit 99de8fa2ce8540b9aa83494120f200074e71aa28 +Author: hufangzhou +Date: Thu Aug 12 17:13:46 2021 +0800 + + * Avoid the change button and recall button are clickable at the same time. + +commit 0cac05799891e7f25de99dd3e76e703c9c51aaf0 +Merge: f5ad15ecaf 3e86bf4da9 +Author: hufangzhou +Date: Thu Aug 12 16:53:20 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f5ad15ecaf76c7a0696187a126cf21de6e48ffdc +Author: hufangzhou +Date: Thu Aug 12 16:53:15 2021 +0800 + + * Add the recall button in my module. + +commit 3e86bf4da9443484ccf198510596e2041b74e822 +Author: tianshujie98 +Date: Thu Aug 12 16:14:56 2021 +0800 + + * Finish task #41226. + +commit 83ffe7deeec7fc786e80bcd439cd5a8af3768eaf +Merge: 4d0fd03c5e 003c247069 +Author: hufangzhou +Date: Thu Aug 12 16:02:15 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4d0fd03c5ec595aff0e645ae0bf701daf2e64563 +Author: hufangzhou +Date: Thu Aug 12 15:56:07 2021 +0800 + + * Finish task #41241. + +commit 003c24706901b630d781a784d6c130a24bb64bf5 +Author: Hao Sun +Date: Thu Aug 12 15:44:23 2021 +0800 + + * discard PRJ suffix when use createLink method. + +commit 34c8aa14230d84c781d646f74e2c0461e77c8985 +Author: 孙广明 +Date: Thu Aug 12 15:04:09 2021 +0800 + + * Fix build can't remove branch bug. + +commit 4f07ce44982d48b862b8a9d0906026ba82561a2d +Author: qiyu-xie +Date: Thu Aug 12 14:45:10 2021 +0800 + + * Finish task#41229. + +commit 82a684cccbe5b2469f796a01f818f593d51d5b8a +Author: tianshujie98 +Date: Thu Aug 12 14:27:22 2021 +0800 + + * Fixed issues with replication teams. + +commit b8113c047b6734464f1f4a9bd557c0c93421bbb4 +Author: lichengjun +Date: Thu Aug 12 06:24:48 2021 +0000 + + * Add Language configuration items. + +commit 9632af71fea6107008c6003200772cb5617fd4cc +Author: qiyu-xie +Date: Thu Aug 12 14:18:48 2021 +0800 + + * Finish task#41218. + +commit 0c2f5fd11e837ba53ac5c65ff5688ed5332937e7 +Author: dingguodong +Date: Thu Aug 12 14:02:07 2021 +0800 + + * Add creating a gitlab project from repo. + +commit a6598c7771b4b34ab79e12aeca8d2b131449b78d +Author: dingguodong +Date: Thu Aug 12 13:39:27 2021 +0800 + + * Show gitlab project list in MR. + +commit 4257cc701e1e541ace2df8a823466a2346858936 +Author: holan20180123 +Date: Thu Aug 12 13:32:18 2021 +0800 + + * Finish task #41240. + +commit bc368ec7611055871e6db63712e146925a3d7475 +Merge: b3a7b4d9d9 85738fb231 +Author: hufangzhou +Date: Thu Aug 12 13:07:44 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b3a7b4d9d99bdf334356669cb747d29c649564bb +Author: hufangzhou +Date: Thu Aug 12 13:07:26 2021 +0800 + + * Add the reviewer when change the story. + +commit 85738fb231389d581f7b0d182d6502ab8ca57dd8 +Author: qiyu-xie +Date: Thu Aug 12 13:06:57 2021 +0800 + + * Finish task#41229. + +commit 685f11f3e5a3a700a8e53ecf86faa54f37e11799 +Author: dingguodong +Date: Thu Aug 12 12:15:01 2021 +0800 + + * Add MR to DevOps menu. + +commit 283b63d327ce0f9487525665d1092d3f3e516133 +Merge: 7599eb9bad fc2e14dcab +Author: hufangzhou +Date: Thu Aug 12 10:55:58 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 7599eb9bad19c233e04d54654753172dea6b1e3a +Author: hufangzhou +Date: Thu Aug 12 10:55:54 2021 +0800 + + * Task#41242: If only the reviewers has changed when change the story, the story version also plus one. + +commit fc2e14dcab1b513ee91a4790c27cee7234bef9b2 +Merge: 9e7e2d83b4 4db30b464d +Author: 王怡栋 +Date: Thu Aug 12 10:45:55 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 9e7e2d83b4f60aca2157eba362f9e2929bf65e91 +Author: 王怡栋 +Date: Thu Aug 12 10:45:23 2021 +0800 + + * reset session for user avatar. + +commit 499a3ce009a7a3082722dd5a840b1b515e96afc9 +Author: 王怡栋 +Date: Thu Aug 12 10:44:58 2021 +0800 + + * fix for lower php version. + +commit 4db30b464d2b2cc2fa5d94f2ec3202d27c15bcde +Author: qiyu-xie +Date: Thu Aug 12 10:44:04 2021 +0800 + + * Finish task#41218. + +commit a5677e39a34959d65bcde3653d9925d7cbe27999 +Merge: 981eb4590d f6973d6348 +Author: 王怡栋 +Date: Thu Aug 12 09:29:30 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f6973d6348beccb6418d57a6709f5de5dc98e66c +Author: hufangzhou +Date: Thu Aug 12 08:03:00 2021 +0800 + + * Make the story status active when review the story. + +commit 28e579f78141549968f89542c28c3d77af5745f8 +Author: qiyu-xie +Date: Wed Aug 11 22:21:06 2021 +0800 + + * Task#41218. + +commit f15f007087f0468c4fc17f62f70207cf1649d626 +Merge: ec56a0fed2 99ef4f4c33 +Author: dingguodong +Date: Wed Aug 11 18:00:25 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ec56a0fed263eceb88dd83ab98e47e849b8bbfb6 +Author: dingguodong +Date: Wed Aug 11 17:59:44 2021 +0800 + + * Add API 404 handler for product and project. + +commit 98bb1ab539847c64bf466ff6402b5c01ff9b3a27 +Author: dingguodong +Date: Wed Aug 11 17:56:10 2021 +0800 + + * Adjust authorization logic for entry. + +commit 99ef4f4c332406c363613a6b2c99bf72c0eb5cfd +Author: qiyu-xie +Date: Wed Aug 11 17:42:51 2021 +0800 + + * Task#41217. Modify locate link when manage members. + +commit 981eb4590ddc83523042194d1767bf91596f7938 +Author: 王怡栋 +Date: Wed Aug 11 17:09:34 2021 +0800 + + * fix bug for link plan stories in classic mode. + +commit 49aa77c3fdca016daf026e124f9dcf8feb7b038e +Author: qiyu-xie +Date: Wed Aug 11 17:00:36 2021 +0800 + + * Fix bug#14208. + +commit 665cd698b180c6dc01d421b1fd40e0734a43819c +Merge: c373fb2ade 4acca21bde +Author: holan20180123 +Date: Wed Aug 11 17:00:14 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit c373fb2adea4a357144070d44030a4f6a97c3351 +Author: holan20180123 +Date: Wed Aug 11 16:59:59 2021 +0800 + + * Fix load avatar error. + +commit 4acca21bde01e534509002e6dfb8d912d9ba3eb8 +Author: qiyu-xie +Date: Wed Aug 11 16:54:46 2021 +0800 + + * Finish task#41217. + +commit 2a05fe7e21fff69b58c34e82d9aca12c8a39a176 +Author: zenggang +Date: Wed Aug 11 16:45:52 2021 +0800 + + * Adjust my api + +commit 8a0be108e4e0cbe563fcd5058e86759852c637b0 +Author: 孙广明 +Date: Wed Aug 11 15:43:31 2021 +0800 + + * Fix story track bug. + +commit 181b8c78cb7a4c56346de8b52401d528d666e37c +Merge: 939fab4725 00aaa39dcc +Author: hufangzhou +Date: Wed Aug 11 16:31:19 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 939fab4725f4c630abb05d51d88a485bb48f13bc +Author: hufangzhou +Date: Wed Aug 11 16:31:14 2021 +0800 + + * Task#41242: Make the reviewer not empty when edit the story. Recalculate story status when change the reviewer. + +commit 00aaa39dcc4e4b92fe58a2e36ec0df48a0672ef7 +Author: dingguodong +Date: Wed Aug 11 16:20:17 2021 +0800 + + * Reformat codes and correct spells for productissues. + +commit e6db5a9d96e2e658247210193049e23de6a85f05 +Author: dingguodong +Date: Wed Aug 11 16:15:43 2021 +0800 + + * Remove trim for get param function in case that int type. + +commit 09dd10e192ee4a776fd80c49a8a5002efcbdc9f6 +Author: reneeteng +Date: Wed Aug 11 15:52:35 2021 +0800 + + * Optimize lang files. + +commit bb451c34328f8d563e113f4c94f73ccf5b3aed42 +Merge: 85131fd511 6b299017c1 +Author: dingguodong +Date: Wed Aug 11 15:38:45 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6b299017c113470703c42234cfb8d34cafff4ebe +Author: qiyu-xie +Date: Wed Aug 11 15:37:03 2021 +0800 + + * Task#41220. Transfer the cookie to the method to add. + +commit 85131fd511848068ee532e56812602aa76d269af +Merge: 9b5e768fd2 18fd529d8e +Author: dingguodong +Date: Wed Aug 11 15:27:04 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 9b5e768fd2e6b5fa395d4fab9e9b7419ad1c9c45 +Author: dingguodong +Date: Wed Aug 11 15:26:13 2021 +0800 + + * Add filter by labels and rename projects to products. + +commit 18fd529d8e91d7fdf302d6bb4796baa35876705f +Merge: 201285215b ba6360d671 +Author: tianshujie98 +Date: Wed Aug 11 15:04:46 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 201285215bf888b7e115bf9bd2c3d01c25edc1e8 +Author: tianshujie98 +Date: Wed Aug 11 15:04:29 2021 +0800 + + * Finish task #41244. + +commit e47b403c7b0658fa21363929285d20b965600dec +Merge: 495caf1c77 ba6360d671 +Author: reneeteng +Date: Wed Aug 11 14:38:08 2021 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ba6360d671d054c62554c940530f67afb39beefe +Merge: f5caade0e4 ff08e8e0c6 +Author: 王怡栋 +Date: Wed Aug 11 13:58:47 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f5caade0e4e115f9377100ba95cf1e2fb9598a70 +Author: 王怡栋 +Date: Wed Aug 11 13:57:55 2021 +0800 + + * fix bug for fulltext search and action. + +commit ff08e8e0c6ff5b8ee6eec7033238a4617343b857 +Author: holan20180123 +Date: Wed Aug 11 13:55:59 2021 +0800 + + * Finish task #41237. + +commit a2afd5353792b3dd8cbedbe1f79d7b04cdb76a88 +Author: holan20180123 +Date: Wed Aug 11 13:05:43 2021 +0800 + + * Finish task #41235. + +commit ea4da56cbe37f63f0fd11813febb35afc602eb60 +Merge: c13d5a1183 aca7ac4e54 +Author: zhujinyong +Date: Wed Aug 11 11:41:43 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit c13d5a118387c7ef0ed23c3673d92e825cbbb5d8 +Author: zhujinyong +Date: Wed Aug 11 11:41:06 2021 +0800 + + * Adjust code for my api. + +commit 925d78059f46ed051c4dc83d38cd5c73baac9116 +Merge: 3adf8b4257 aca7ac4e54 +Author: 王怡栋 +Date: Wed Aug 11 11:30:13 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit aca7ac4e54f1842a807b0f82c068db77b71a136e +Author: Hao Sun +Date: Wed Aug 11 11:29:30 2021 +0800 + + * fix page reload when click url is '#...'. + +commit 487662ad624d68c16b51a0276090f6c421741e09 +Author: holan20180123 +Date: Wed Aug 11 10:58:03 2021 +0800 + + * Finish task #41237. + +commit 3adf8b4257cf7a8e86cd28a4c52daefaa2cd4c14 +Merge: 5b33d7efde fa86185291 +Author: 王怡栋 +Date: Wed Aug 11 10:55:02 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit fa86185291d23518d64e4f8cb51d3abcbb174c9a +Author: Hao Sun +Date: Wed Aug 11 10:51:59 2021 +0800 + + * bug #14163, fix position of show-more-menu button in left menu. + +commit ffe3bc0b3137595c526de81eff148317cc486827 +Merge: c90b7150a4 89d0a5c23e +Author: hufangzhou +Date: Wed Aug 11 10:26:49 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit c90b7150a4ba29a286b60f4b9e7f0b4e19b0faec +Author: hufangzhou +Date: Wed Aug 11 10:26:44 2021 +0800 + + * Fix bug #14168. + +commit 5b33d7efdeb2b6f56f98a20babc957f1e3fe7bd0 +Author: 王怡栋 +Date: Wed Aug 11 10:23:00 2021 +0800 + + * change for api. + +commit 89d0a5c23e42430d3fbe908776091cae423f251f +Author: qiyu-xie +Date: Wed Aug 11 10:03:00 2021 +0800 + + * Task#41220. + +commit f58777432b7de8fcfb0c0be4f53ff32209cee61a +Author: zenggang +Date: Wed Aug 11 09:24:32 2021 +0800 + + * adjust my module api + +commit b16fa8274013f380a9ea868958ba5a897ff12e7d +Author: tianshujie98 +Date: Wed Aug 11 09:15:29 2021 +0800 + + * Compatible with lower version avatar output problem. + +commit a92ac04bacccae42c50115ad7634fd2381a9bbdc +Author: qiyu-xie +Date: Wed Aug 11 09:06:53 2021 +0800 + + * Modify program list user avatar. + +commit e28bf4f7495e0c00f3ad7730f30e71209fb19c80 +Author: hufangzhou +Date: Wed Aug 11 08:22:22 2021 +0800 + + * Add the delete user dynamic action. + +commit a246041747467edbf7a8abbd727a4717491b0f8c +Author: zenggang +Date: Tue Aug 10 19:12:17 2021 +0800 + + + my module api + +commit d4a914e1dfafd2c4cce8c4bb5c966f3ed9079ece +Author: qiyu-xie +Date: Tue Aug 10 17:39:28 2021 +0800 + + * Fix an error at task list. + +commit 975bb6117aa8f8e3bf64b5e0056964f97ca88a23 +Merge: e4d86ff8d9 e7a7b31264 +Author: tianshujie98 +Date: Tue Aug 10 17:22:44 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit e4d86ff8d9f8e9b4ec688027a721f92b95e845c5 +Author: tianshujie98 +Date: Tue Aug 10 17:22:28 2021 +0800 + + * Finish task #41231. + +commit e7a7b31264df70f74f66192f82a9caaeb6a93ed0 +Author: qiyu-xie +Date: Tue Aug 10 17:16:14 2021 +0800 + + * Modify task#41219. + +commit df3de3ba712520be70e01ae1f1547325757f4221 +Merge: 1073b0cc36 3cac516fb3 +Author: dingguodong +Date: Tue Aug 10 16:50:14 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1073b0cc36470729f3c5bf7a46c8e092c74b2ddf +Author: dingguodong +Date: Tue Aug 10 16:48:35 2021 +0800 + + * Optimize code for getData in entry and program model. + +commit 3cac516fb3b9298d62238853eea2a48a69b30acf +Merge: d030b71784 14c03ae920 +Author: 王怡栋 +Date: Tue Aug 10 16:26:46 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 14c03ae9202ecee328481d186f960f3a191bc3b9 +Author: qiyu-xie +Date: Tue Aug 10 16:25:48 2021 +0800 + + * Finish task#41219. + +commit d030b717848e45e0bb5f011a1da8945de4d414c1 +Author: 王怡栋 +Date: Tue Aug 10 16:26:24 2021 +0800 + + * Adjust for check https. + +commit 3c19d74e00eb9ee43318d7e4da94fc4d6b1f1d0c +Merge: 6d5eb4fa8e 63038c836c +Author: hufangzhou +Date: Tue Aug 10 15:53:18 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6d5eb4fa8e4f62957f2e841687a31ce992c30cea +Author: hufangzhou +Date: Tue Aug 10 15:53:13 2021 +0800 + + * Finish task #41242. + +commit 63038c836c8dde06c867016b3f1bac1da15fb33b +Author: leiyong <1549684884@qq.com> +Date: Tue Aug 10 15:31:33 2021 +0800 + + * Finish task#40904. + +commit 5020a6f181acddf3bed8101e2e4a8e29c243366e +Author: tianshujie98 +Date: Tue Aug 10 15:15:57 2021 +0800 + + * Fix the main library permission issue when upgrading the project. + +commit 4eda336b2768c9fd3eefd318f998c9c4a41a5836 +Author: tianshujie98 +Date: Tue Aug 10 14:39:30 2021 +0800 + + * Finish task #41234. + +commit b53a22019e66971164bc4592a1ccfc7ff837341b +Merge: 74b26a72b0 5a9f7f7a5d +Author: dingguodong +Date: Tue Aug 10 14:09:56 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 74b26a72b028335ddca291311be0669a94ee7d1a +Author: dingguodong +Date: Tue Aug 10 14:09:30 2021 +0800 + + * Put isonlybody back to api/helper.class.php . + +commit 5a9f7f7a5d75339e5bd7c61236e44d03565673bd +Merge: cb40696190 746cb1f8c2 +Author: zhujinyong +Date: Tue Aug 10 14:07:59 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 746cb1f8c28e18793c49f0426d839e5cb5091a88 +Merge: d0632b8ff3 c4b9c9ef3c +Author: 王怡栋 +Date: Tue Aug 10 14:06:49 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d0632b8ff3634f98c363cf5cba437bcfb2d0bc3e +Author: 王怡栋 +Date: Tue Aug 10 14:06:35 2021 +0800 + + * adjust show action. + +commit cb40696190d69efd95df055abbd330ab2cb72008 +Author: zhujinyong +Date: Tue Aug 10 14:02:41 2021 +0800 + + * Enable CSRF protection by default. + +commit c4b9c9ef3ca7a2720faf2afd7e81ccb11f3f9431 +Author: dingguodong +Date: Tue Aug 10 13:57:13 2021 +0800 + + * Filter projectissues by label. + +commit 1f87bc88ee1e14548ed4c782bae20aaaca169692 +Author: dingguodong +Date: Tue Aug 10 13:53:46 2021 +0800 + + * Use same params for createLink function to removing warns. + +commit 853a0fb71c30a9752b7aa89bfa16964255c1c554 +Author: qiyu-xie +Date: Tue Aug 10 13:37:45 2021 +0800 + + * Finish task#41219. + +commit 8f351f9b223f94258562552007f010a27800b516 +Merge: 96dc983fb6 5d14c1f8ce +Author: hufangzhou +Date: Tue Aug 10 13:34:32 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 96dc983fb69139263ea187bed65123385001145d +Author: hufangzhou +Date: Tue Aug 10 13:34:28 2021 +0800 + + * Finish task #41232. + +commit 5d14c1f8ce1fa08fc9f71088a4d0388b5217001d +Author: dingguodong +Date: Tue Aug 10 13:26:05 2021 +0800 + + * Put some functions which call biz logic into entry model. + +commit 04c5a40c20ffb3b9f78dfeb672c2680850c11be2 +Merge: 4c9a8772b6 43f80cfc49 +Author: dingguodong +Date: Tue Aug 10 13:15:42 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4c9a8772b6e731be7f0fc2bbd842eb36a6f375d1 +Author: dingguodong +Date: Tue Aug 10 13:14:39 2021 +0800 + + * Put general method `createLink` for API into helper. + +commit 43f80cfc49134396ca97d5264cca6ca2574f5188 +Author: tianshujie98 +Date: Tue Aug 10 13:14:03 2021 +0800 + + * Finish task #41228. + +commit 1e71901af93ba89663060d4b6acad03bb53a31fc +Author: holan20180123 +Date: Tue Aug 10 13:11:38 2021 +0800 + + * Finish task #41243. + +commit b4f28ca7d77a217cd9f7a6ed347400275fe999af +Merge: 55d843ff40 751900edf9 +Author: hufangzhou +Date: Tue Aug 10 11:32:59 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 55d843ff40912b04673eebb86325aadd0aefc0d1 +Author: hufangzhou +Date: Tue Aug 10 11:32:55 2021 +0800 + + * Finish task #41233. + +commit 751900edf9a2220078ac515ca03bde0091b41137 +Author: tianshujie98 +Date: Tue Aug 10 11:31:15 2021 +0800 + + * Finish task #41215. + +commit 105458335f21208f2b544deb91a55dd27f77d220 +Merge: c070427e11 0fd19fec5b +Author: hufangzhou +Date: Tue Aug 10 11:29:19 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit c070427e11bb3f92a4d4681f446d923375717d11 +Author: hufangzhou +Date: Tue Aug 10 11:29:14 2021 +0800 + + * Adjust the page style when the account without anyone custom doclib. + +commit 95afa43ff1077f7563d9148cff024884f5937147 +Author: 孙广明 +Date: Tue Aug 10 10:46:25 2021 +0800 + + * Finish task #40887. + +commit 0fd19fec5bd3dbef163ad4d149f778f09fad5c34 +Author: dingguodong +Date: Tue Aug 10 10:42:45 2021 +0800 + + * Optimize createLink for every request type. + +commit 944ac9aec7f791366f47e778da0240d440492ce8 +Author: dingguodong +Date: Tue Aug 10 08:59:00 2021 +0800 + + * Make createLink support PATH_INFO2. + +commit 675810e5944159b8544058376b897a89bcc0afed +Author: zenggang +Date: Mon Aug 9 18:36:55 2021 +0800 + + * Finish bug #13092 + +commit 7b4ba7e7430bc220b2a1e0f860862d0bb9a3a9b3 +Author: 孙广明 +Date: Mon Aug 9 17:31:31 2021 +0800 + + * Del no used file. + +commit 4c9c778a564b53866d366779f9d32d5abe4f47ee +Author: sunguangming +Date: Mon Aug 9 17:30:46 2021 +0800 + + * Test user name. + +commit c641348c5c6f948b7e03ef56500bb603bfa3a97c +Author: dingguodong +Date: Mon Aug 9 17:24:21 2021 +0800 + + * Refactor send404 function and set to uniformed format. + +commit ceb74bf406a8c7e8cf3b9523b4039a580c3cdb9c +Author: 王怡栋 +Date: Mon Aug 9 17:11:34 2021 +0800 + + * fix for updateWhitelist. + +commit 77df60a20dc188a49bea19e73a1e9fe8c87d61a1 +Merge: f6904dc8ab c2d6dd8de6 +Author: 王怡栋 +Date: Mon Aug 9 17:04:41 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f6904dc8ab90d9e9bf3d32ab14a7bafcddc3c594 +Author: 王怡栋 +Date: Mon Aug 9 17:04:12 2021 +0800 + + * adjust for updatewhitelist when increase. + +commit c2d6dd8de6b7b60339df6be59fb94a63daf0a945 +Author: dingguodong +Date: Mon Aug 9 16:59:23 2021 +0800 + + * Refactor send404 function and set to uniformed format. + +commit 9fbd5e7507d2b7effc88375e48bf26c056991a6f +Author: dingguodong +Date: Mon Aug 9 16:47:19 2021 +0800 + + * Change function name and optimize codes for API. + +commit 8b1d769e67e9288e49427862109e101de8db97f7 +Author: Hao Sun +Date: Mon Aug 9 16:31:14 2021 +0800 + + * forbid open index/index in app's iframe to prevent infinite nesting. + +commit bc723e845b21d784d93ae8ee519351eddaa24ec9 +Author: dingguodong +Date: Mon Aug 9 16:07:50 2021 +0800 + + * Remove useless code and correct bad comments. + +commit 837be6276c49996a25ed47d1b7275d22c6250617 +Author: dingguodong +Date: Mon Aug 9 15:49:28 2021 +0800 + + * Correct bad comments of function. + +commit eea88163ebad5470abf197cfeb586f211566f9a0 +Author: dingguodong +Date: Mon Aug 9 15:40:07 2021 +0800 + + * Change default avatar creation rules. + +commit c453b991944a6cd651382683c1e0e58cb4023999 +Author: dingguodong +Date: Mon Aug 9 15:31:49 2021 +0800 + + * Return details of assignedTo and openedBy for API. + +commit c231c51d6314a716878a49899db18bbab826b4da +Author: dingguodong +Date: Mon Aug 9 15:30:50 2021 +0800 + + * Correct codes for checkEntry functions. + +commit 54f244cbbabdc115efcc081dbcc1e63289bffcbf +Author: 孙广明 +Date: Mon Aug 9 15:06:41 2021 +0800 + + * Fix compute user view method. + +commit 506d2ec05f007498d9df0a9b2103f533dd68e353 +Author: qiyu-xie +Date: Mon Aug 9 14:32:00 2021 +0800 + + * Fix bug#14091. + +commit b22f1df1d612148eac92cf05a58a2289f1209804 +Merge: 0c6c88d2e6 7e28815aee +Author: wangyidong +Date: Mon Aug 9 14:26:51 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0c6c88d2e6c7441e34cf9136b4e3c18a410b6d25 +Author: wangyidong +Date: Mon Aug 9 14:26:22 2021 +0800 + + * adjust for lower php version. + +commit 5b2cb87596f84da3d6be0e333e210e613de6f197 +Author: 孙广明 +Date: Mon Aug 9 14:25:53 2021 +0800 + + * Fix report lang. + +commit 7e28815aeefe3506c9ad8c94aee9564d77d9e9fd +Author: tianshujie98 +Date: Mon Aug 9 14:15:31 2021 +0800 + + * Fix bug #13862. + +commit 6311a90388cc998c9995c5dcaadce6ece12650aa +Author: tianshujie98 +Date: Mon Aug 9 13:57:25 2021 +0800 + + * Fix bug #13932. + +commit baae5fb3610c339f028bd0655d7eb9efb88f5859 +Merge: 26ce07e38d f9269d1c77 +Author: hufangzhou +Date: Mon Aug 9 13:53:53 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 26ce07e38d6a0b9465d22fcf0baf62d5581e383a +Author: hufangzhou +Date: Mon Aug 9 13:53:49 2021 +0800 + + * Fix bug #13762. + +commit f9269d1c77c59dccc657399f87f48d15eaf2ded4 +Author: tianshujie98 +Date: Mon Aug 9 13:23:09 2021 +0800 + + * Fix bug #13903. + +commit 474d6597c477ae49e819637300e684181096d234 +Merge: 6888bea503 ea22005a73 +Author: hufangzhou +Date: Mon Aug 9 10:32:43 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6888bea503c9d742921a4714b64993f68b2144f0 +Author: hufangzhou +Date: Mon Aug 9 10:32:38 2021 +0800 + + * Fix bug #14008. + +commit ea22005a73e432bdf378c281fd2e79251c8a413a +Author: qiyu-xie +Date: Mon Aug 9 10:30:49 2021 +0800 + + * Fix bug#14102. + +commit 8ce068eb0e39b57ba32e2802c0e7421c77de7994 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 9 10:28:06 2021 +0800 + + * Finish task #40908. + +commit 27a7490d1ee69f48299164dea02ce41dc9684661 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 9 10:16:54 2021 +0800 + + * Finish task #40875. + +commit be67b064d72908a2b8d4fbc220472b5a12382e38 +Author: qiyu-xie +Date: Mon Aug 9 09:48:30 2021 +0800 + + * Fix bug#13727. + +commit 68ae214200e6d9cb9d5866c1ec58dd3b231a5dd1 +Merge: bc5a2ecf9c 2cbaaa7ddb +Author: hufangzhou +Date: Mon Aug 9 09:44:30 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit bc5a2ecf9cc400f0c74bfcbb594b0eba04bd829c +Author: hufangzhou +Date: Mon Aug 9 09:44:26 2021 +0800 + + * Fix bug #13021. + +commit 2cbaaa7ddbb341544b10b0ee7c6c49b776c891a5 +Author: tianshujie98 +Date: Mon Aug 9 09:38:32 2021 +0800 + + * Fix bug #13991. + +commit dd1375a2cb3e30c1ef04cdcfb5f32b6358489c2c +Author: wangyidong +Date: Fri Aug 6 19:41:48 2021 +0800 + + * adjust requiredFields for create job. + +commit c1559f9ac82bcb2ccc558d48bf87f94c27fad4ba +Author: Yagami <976204163@qq.com> +Date: Fri Aug 6 18:55:45 2021 +0800 + + * Fix whitelist bug. + +commit 9311b71820b47a16ee24aa3f16f5d5c607961a25 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 6 18:53:00 2021 +0800 + + * Fix whitelist bug. + +commit 654f6658d9c55aa50fc2cfcb804a2677d9b8f8c7 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 6 18:46:06 2021 +0800 + + * Fix personnel bug. + +commit fb3afc88a3fa54075673bef122b3c2837dec6413 +Merge: 509afaa6f7 a949c4b752 +Author: wangyidong +Date: Fri Aug 6 18:12:34 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 509afaa6f73bf96aba41bc637a3af9980de176c1 +Author: wangyidong +Date: Fri Aug 6 18:12:18 2021 +0800 + + * adjust upgrade. + +commit a949c4b752db0dc4c561006edaec8d76b1011d5c +Author: Yagami <976204163@qq.com> +Date: Fri Aug 6 18:04:19 2021 +0800 + + * Fix can't unbind user in whitelist bug. + +commit 9fe092394b854f30c956e79088b534f964497c5d +Author: tianshujie98 +Date: Fri Aug 6 17:15:52 2021 +0800 + + * Fix dynamic issues during upgrade. + +commit 34f408023665192f0f29ae9d58609bfb1650b409 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 6 14:59:09 2021 +0800 + + * Finish task #40908. + +commit 8a9373967ade8673bf418c1cf794bd448c125cac +Author: tianshujie98 +Date: Fri Aug 6 14:55:00 2021 +0800 + + * Fix bug #14099. + +commit 8f0e7ac3b621d1ba3d14a99547ec5d988e1acfc8 +Author: qiyu-xie +Date: Fri Aug 6 14:46:24 2021 +0800 + + * Sync testcases of executions to projects when classic mode switched to new mode. + +commit d46f75dbc0e88e5c6128612902265b693d8e77aa +Author: holan20180123 +Date: Fri Aug 6 14:37:04 2021 +0800 + + * Fix locate next and prev doc error. + +commit 7c6fb70deb93d34647031ade7506267419d40c3a +Author: Yagami <976204163@qq.com> +Date: Fri Aug 6 13:51:24 2021 +0800 + + * Finish task #40905. + +commit 927d91b09ca7d75f734e183bb2d411c8c2f589b5 +Merge: 36b298a29b 2842ff3620 +Author: wangyidong +Date: Fri Aug 6 13:44:39 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 36b298a29bd3e11c64c2115dd6d5bd177f294b35 +Author: wangyidong +Date: Fri Aug 6 13:44:18 2021 +0800 + + * fix bug #14093. + +commit 04be61ef0d8ea573867b774d3ed59c436e6de936 +Author: wangyidong +Date: Fri Aug 6 13:43:48 2021 +0800 + + * fix bug #14094. + +commit 2842ff36204967acde6bd8fff4ec900440009a9a +Author: tianshujie98 +Date: Fri Aug 6 13:39:10 2021 +0800 + + * Fix bug #14097. + +commit e8e6ecfd5afaf351365f82ed1fd36d598c111f5e +Author: zhujinyong +Date: Fri Aug 6 11:46:15 2021 +0800 + + * Fix issues api. + +commit 501dbdd8ab19ec25b5c20a042d354b88b845af5e +Author: wangyidong +Date: Fri Aug 6 11:21:10 2021 +0800 + + * adjust for adjust priv. + +commit 8a28c3c2c6cee4d2e9ef7cd2c9ca9ffb44215224 +Merge: 43ce84beee 47a0a042e5 +Author: hufangzhou +Date: Fri Aug 6 11:14:49 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 43ce84beeeb5936b326c1b9de518828b5062f807 +Author: hufangzhou +Date: Fri Aug 6 11:14:45 2021 +0800 + + * Add the tableContents function privilege. + +commit 47a0a042e5a6141558afa054a971dd965242a361 +Author: tianshujie98 +Date: Fri Aug 6 10:58:31 2021 +0800 + + * Modify the query logic of the project library. + +commit d909bbcf0f3f444eaca3e05b0dfb9a2d12e684d2 +Author: zenggang +Date: Fri Aug 6 10:56:20 2021 +0800 + + * Finish task #40894 + +commit 5c28353c097dcb8b10a4878053081a6272399f1e +Merge: 286f99948f 8864fffb70 +Author: tianshujie98 +Date: Fri Aug 6 10:52:05 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 286f99948f1fc4f1cd8f656023eb495848e4939f +Author: tianshujie98 +Date: Fri Aug 6 10:51:36 2021 +0800 + + * Do not display the main execution library under the project library. + +commit 8864fffb7080e17aebc3a1e7d65843d3b1bbc8b0 (tag: zentaopms_15.3_20210806) +Author: wangyidong +Date: Fri Aug 6 10:06:50 2021 +0800 + + * adjust for zh-tw lang. + +commit 5cd04e39032dbc4d6212292f82deb03b33201f3c +Author: wangyidong +Date: Fri Aug 6 09:40:10 2021 +0800 + + * adjust for priv. + +commit 2529f5a076bc07db8475ae6aff0fc3a25d5a8faa +Merge: b6bb62db9f e246f4b2a1 +Author: wangyidong +Date: Fri Aug 6 09:29:30 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b6bb62db9f20d8fbee4f591ceb4380603f834d6d +Author: wangyidong +Date: Fri Aug 6 09:29:07 2021 +0800 + + * fix bug #14059. + +commit e246f4b2a19104599b6984f1561b16e14f2a9255 +Author: tianshujie98 +Date: Fri Aug 6 08:30:05 2021 +0800 + + * Title the merged repository page. + +commit e9fdb1e775f2265fe08f9d8aecf2b132a1dc2558 +Merge: 656e13e3b9 29c183ee35 +Author: wangyidong +Date: Thu Aug 5 17:34:54 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 656e13e3b95f00ce84e0c23d20b14595e0e7d622 +Author: wangyidong +Date: Thu Aug 5 17:34:04 2021 +0800 + + * adjust for construct function. + +commit 382f43ab16edfb86b19a59dbaf7f04925eb8e8c6 +Author: wangyidong +Date: Thu Aug 5 17:33:24 2021 +0800 + + * adjust for delItem for create job. + +commit 29c183ee350a0075b27632d9d40045c6ffc929d9 +Author: qiyu-xie +Date: Thu Aug 5 17:27:41 2021 +0800 + + * Fix bug#14045. + +commit 8bdaed8390c749d41f54be39fbbc58bad22865cf +Author: wangyidong +Date: Thu Aug 5 17:11:43 2021 +0800 + + * fix js error. + +commit 7e6d5e09462c86f65532de01ba9ab1942c2571dd +Author: wangyidong +Date: Thu Aug 5 17:04:37 2021 +0800 + + * adjust for exec gitlab. + +commit 2675cea5add2bb5ca87358dc8ac12df60da1dce6 +Author: zenggang +Date: Thu Aug 5 16:57:49 2021 +0800 + + * Finish task #40876 + +commit 772f49bb9da8fdef8c6e775af817cffdbcf44f03 +Merge: 9edf5f89e1 a940593cd9 +Author: wangyidong +Date: Thu Aug 5 16:56:47 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 9edf5f89e16c7f04d964384f350eabd005db19a0 +Author: wangyidong +Date: Thu Aug 5 16:56:29 2021 +0800 + + * fix for create job. + +commit a940593cd9ed24fa2332c325181bf2d2a7313401 +Author: dingguodong +Date: Thu Aug 5 16:46:26 2021 +0800 + + * Correct the error when creating jenkins pipeline. + +commit e22669a1018772b5cc25170efed33b9e1858c2af +Merge: 5677063f10 f864be78f4 +Author: holan20180123 +Date: Thu Aug 5 16:44:02 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5677063f10441c0b018d6ba5ee1a9a337569a73c +Author: holan20180123 +Date: Thu Aug 5 16:43:40 2021 +0800 + + * Adjust edit repo logic. + +commit f864be78f44c339751ed5f258c19cfdd26526b49 +Author: dingguodong +Date: Thu Aug 5 16:35:13 2021 +0800 + + * Put old repo back to the html form. + +commit a1a9587f8e900bc459ed1d59dab5975a4abf85c9 +Author: dingguodong +Date: Thu Aug 5 16:34:10 2021 +0800 + + * Correct bad syntax. + +commit 6ad2d852c2b8b2eef30d42f9d6725288e40b87b1 +Merge: eeb18662bc 804fd2c559 +Author: dingguodong +Date: Thu Aug 5 16:32:39 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit eeb18662bc7835c830fe7683e5b31e35a4aa0acb +Merge: 39ebbc2784 249f29ddf1 +Author: dingguodong +Date: Thu Aug 5 16:32:25 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 804fd2c5591d6f4907b322e360cc4a8d78ec9597 +Author: Guan Xiying +Date: Thu Aug 5 16:32:16 2021 +0800 + + * Fix ajaxLoadPorducts to ajaxLoadProducts. + +commit 39ebbc278468ad6aef15c750b98640cc35861308 +Author: dingguodong +Date: Thu Aug 5 16:28:52 2021 +0800 + + * It does not display repos which are not giltab type when editing it. + +commit 249f29ddf16d9c9a3b56045a689ce9b6dedced83 +Merge: 3fc2eecb3c 2adb370548 +Author: wangyidong +Date: Thu Aug 5 16:25:24 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3fc2eecb3c3f7b3416f4afafd794b0d469e2d8cc +Author: wangyidong +Date: Thu Aug 5 16:25:08 2021 +0800 + + * adjust for show dao error. + +commit 2adb370548d12ceb35f53241ed6ef742862898ad +Author: holan20180123 +Date: Thu Aug 5 16:13:53 2021 +0800 + + * Adjust style of job browse. + +commit a125ef3a72d2d5ab5546aeebf0d7de7d98476e02 +Merge: 34fca03d67 412cc976bf +Author: holan20180123 +Date: Thu Aug 5 16:11:15 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 34fca03d67eabba3c2d2ee5995a999839162d942 +Author: holan20180123 +Date: Thu Aug 5 16:11:04 2021 +0800 + + * Fix bug #13967. + +commit 412cc976bfbb2c9b2488d2e31cb71288144f947f +Merge: 98c0e920b4 cbcdd534ec +Author: hufangzhou +Date: Thu Aug 5 16:10:59 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 98c0e920b44625e21d76e94d45a5d361c5f9d2f7 +Author: hufangzhou +Date: Thu Aug 5 16:10:56 2021 +0800 + + * Fix bug #13887. + +commit d90d4580f4ee1d4eee30384a776f66ba78061cc7 +Author: wangyidong +Date: Thu Aug 5 16:05:25 2021 +0800 + + * adjust for error. + +commit cbcdd534eceb55927a5276054cfa436b6c89a8e1 +Merge: c4d0eabcf3 d80633e29b +Author: wangyidong +Date: Thu Aug 5 16:05:11 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d80633e29bfb4427372b4c86a5a7fdf6fdf72b3b +Author: holan20180123 +Date: Thu Aug 5 16:04:42 2021 +0800 + + * Add go back link in import issue. + +commit c4d0eabcf300ffe186e5ea506f150fc202a961e5 +Author: wangyidong +Date: Thu Aug 5 16:03:46 2021 +0800 + + * adjust for show pipeline in trash. + +commit 27515c52cf1e79cd0b37231c97fe6d8c2da3f29f +Author: Guan Xiying +Date: Thu Aug 5 15:54:35 2021 +0800 + + * Fix ajax load products bug. + +commit 0c3817ded1d4c081dc959f6a9f317eda68f396de +Merge: b63623ad27 d4f225e520 +Author: Guan Xiying +Date: Thu Aug 5 15:48:15 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b63623ad27db211b49ac3958831162cd9fc45ec2 +Author: Guan Xiying +Date: Thu Aug 5 15:47:41 2021 +0800 + + * Disable local git and svn repo in gitlab job. + +commit 79b72edf494f5d2ae0ad8483ee89270cb89ce7dd +Author: Yagami <976204163@qq.com> +Date: Thu Aug 5 15:36:57 2021 +0800 + + * Finish task #40908. + +commit 8a4f46b1ce469c2a1cb9c34f038b3946c0dbecaa +Author: Hao Sun +Date: Thu Aug 5 15:23:24 2021 +0800 + + * support for limiting user place some panel in other columns. + +commit 13aa0c9628046f58b2f1b4593ba0a1fc887174cb +Author: Hao Sun +Date: Thu Aug 5 15:20:34 2021 +0800 + + * support for limiting user place some panel in other columns. + +commit d4f225e520d6b52dba1ad9c7cd1b10eb3fb44cd6 +Author: hufangzhou +Date: Thu Aug 5 15:20:07 2021 +0800 + + * Make the action buttons of requirement in my module call the isClickable function. + +commit 46869cf95a19d783e7202f0871467c7fd30f02f3 +Merge: f20f3d1658 4ce49042d3 +Author: hufangzhou +Date: Thu Aug 5 15:09:03 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f20f3d16586d0b2c0e6869804dec4a50e07836c5 +Author: hufangzhou +Date: Thu Aug 5 15:08:59 2021 +0800 + + * Make the action buttons of story in my module call the isClickable function. + +commit df5d8e384da3a25ca3bd4a8d3ad5a9d71a8055b0 +Author: leiyong <1549684884@qq.com> +Date: Thu Aug 5 14:34:50 2021 +0800 + + * Finish task#40899. + +commit 4ce49042d318e2a9234bb70821498f89fbb22f5e +Merge: 38606a8bd3 086657a301 +Author: wangyidong +Date: Thu Aug 5 14:28:47 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 38606a8bd330616e1afd7f18651053109d1695e6 +Author: wangyidong +Date: Thu Aug 5 14:28:26 2021 +0800 + + * fix bug for show unitCases in modal. + +commit 086657a301be36b03a13e5beea96d6245c8f58b1 +Author: holan20180123 +Date: Thu Aug 5 14:13:48 2021 +0800 + + * Adjust style of compile browse. + +commit 17c6f4e24e9f96c8c897527e7ba3e55226b15384 +Merge: 1975cdb024 1a19103791 +Author: wangyidong +Date: Thu Aug 5 14:05:38 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1975cdb024a78ac8974d0072811af2383f2e0c45 +Author: wangyidong +Date: Thu Aug 5 14:05:19 2021 +0800 + + * fix bug #14038. + +commit 1a1910379169130f80b309f2bdecb6dafedbf610 +Merge: 72dae0756c e6d377561b +Author: zhujinyong +Date: Thu Aug 5 14:03:41 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 72dae0756cbd726d5e5d614690e0d62250e95c2b +Author: zhujinyong +Date: Thu Aug 5 14:01:54 2021 +0800 + + * Fix scheme of http request. + +commit e6d377561b690b5b0efd3b19589d4377dd0558db +Author: dingguodong +Date: Thu Aug 5 14:01:46 2021 +0800 + + * Fix bug when checking compile status and adding privileges etc. + +commit 79508d4e3b140aa76a2b8eda7faf505348bdf41a +Author: Yagami <976204163@qq.com> +Date: Thu Aug 5 14:00:37 2021 +0800 + + * Finish task #40916. + +commit e8e9f39c4705aabc0720edba533e28e0e3d108a6 +Author: Yagami <976204163@qq.com> +Date: Thu Aug 5 13:59:58 2021 +0800 + + * Delete code in master. + +commit 3962e1de325f24735bb0024d578e65bf6a341345 +Merge: cfda81bede efb55c623d +Author: wangyidong +Date: Thu Aug 5 13:58:26 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit cfda81bede2418f7163a6feb9fb520bc6006175f +Author: wangyidong +Date: Thu Aug 5 13:57:57 2021 +0800 + + * fix for edit job. + +commit efb55c623dcdd88a65463e56b22511ed9cad7029 +Author: Yagami <976204163@qq.com> +Date: Thu Aug 5 13:55:08 2021 +0800 + + * Finish task #40916. + +commit 75f83bac4aae5e9c467651fe6051a7aad102d40d +Author: holan20180123 +Date: Thu Aug 5 13:33:29 2021 +0800 + + * Adjust style of jenkins and job browse. + +commit 54d8c561c268130eaea5fd587a46dba44ae212c2 +Merge: 7f5db66701 ef0788a58d +Author: wangyidong +Date: Thu Aug 5 13:32:00 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 7f5db66701e04953a004cf457054bc185b6e8d1c +Author: wangyidong +Date: Thu Aug 5 13:30:57 2021 +0800 + + * adjust for delete repo and jenkins. + +commit ef0788a58d0f44a8b5bb31f1c3915e9d74ce7381 +Author: holan20180123 +Date: Thu Aug 5 13:28:31 2021 +0800 + + * Adjust page style of repo browse. + +commit 62cdfe21985db70c9b477cb7ac47400f0fb7f8c8 +Author: tianshujie98 +Date: Thu Aug 5 13:25:34 2021 +0800 + + * Fix bug #14049. + +commit 5fe9be710ca3e79342adc7a43f96ad5e3e6ee359 +Merge: 776a2d45b2 4937cb49ad +Author: holan20180123 +Date: Thu Aug 5 13:24:10 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 776a2d45b2276b8c0a0b7743254df5a6e9cb1125 +Author: holan20180123 +Date: Thu Aug 5 13:23:29 2021 +0800 + + * Adjust logic of product link job. + +commit 4937cb49ad2b0a3c79c40b7c8bd9fdbd71d92800 +Author: zhujinyong +Date: Thu Aug 5 13:23:15 2021 +0800 + + * Fix bug: bug table error. + +commit 0f17432c531cb7e519ae8f450bd30acd3901a7f2 +Author: wangyidong +Date: Thu Aug 5 13:08:17 2021 +0800 + + * adjust for create job. + +commit e65f0cfc739eb0f3775e9771ab83dbca02855168 +Author: zhujinyong +Date: Thu Aug 5 11:57:31 2021 +0800 + + * Fix api of jihu. + +commit fcd81023513d3113bb99d9e76ab9d62b90939672 +Author: dingguodong +Date: Thu Aug 5 11:54:16 2021 +0800 + + * Add priority to task and story when importing issue from gitlab. + +commit fff3e2eae0ea500bb9377b16d3cd2279fcf143a5 +Merge: 97adda7087 9b64c0cd26 +Author: Guan Xiying +Date: Thu Aug 5 11:14:38 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 97adda7087f4d0f15dc19f954cf2955730453807 +Merge: 5b3a681b36 50874e716b +Author: Guan Xiying +Date: Thu Aug 5 11:14:17 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 9b64c0cd2649e8b9d00a85316023b11469455a55 +Merge: a3a24aaff2 50874e716b +Author: holan20180123 +Date: Thu Aug 5 11:14:13 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 50874e716bb2ec77b8d4cedfc6bc8cd08272d467 +Author: qiyu-xie +Date: Thu Aug 5 11:13:34 2021 +0800 + + * Align the equals sign. + +commit a3a24aaff2798e42e7306573c405eb50e214e709 +Author: holan20180123 +Date: Thu Aug 5 11:13:34 2021 +0800 + + * Adjust page style when no data in compile browse. + +commit 350e308e481bd612862ff2b019f5b45227a9057b +Author: tianshujie98 +Date: Thu Aug 5 11:13:03 2021 +0800 + + * Fix the problem of clicking on favorites of contributed documents. + +commit 5b3a681b36c74a0c999cca663b4bbd7e73346165 +Author: Guan Xiying +Date: Thu Aug 5 11:12:55 2021 +0800 + + * Unset schedule triggerType for gitlab job. + +commit 894e897447a761f30b6f747908b623c07d7120bf +Merge: be28e26fd5 3bed17c945 +Author: holan20180123 +Date: Thu Aug 5 11:07:18 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit be28e26fd53ff3a14f8a8cabd07cee974c99a85d +Author: holan20180123 +Date: Thu Aug 5 11:06:45 2021 +0800 + + * Add selected style in repo browse. + +commit 3bed17c945fdafa666e604cacb146b71854e1f06 +Author: wangyidong +Date: Thu Aug 5 11:02:24 2021 +0800 + + * adjust style for create job. + +commit c7ebee7431d1f68398cbaaba5e2e7acd1efe0734 +Merge: e4bd2b2d01 e8c6079cd6 +Author: wangyidong +Date: Thu Aug 5 10:56:27 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit e4bd2b2d01bde7140d2d757b7d7c95b80cbc3f46 +Author: wangyidong +Date: Thu Aug 5 10:56:02 2021 +0800 + + * fix for get branches from gitlab. + +commit e8c6079cd67080b5b890a60d74dd7caa49309b6a +Author: holan20180123 +Date: Thu Aug 5 10:55:25 2021 +0800 + + * Hide product when permission is available in repo. + +commit 3503223e89ac6396eb4a5f7c61798c77e706356e +Merge: 71a16a3093 f2bcfa15a5 +Author: hufangzhou +Date: Thu Aug 5 10:54:36 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 71a16a309307a28332a10fb91057c2de3968617d +Author: hufangzhou +Date: Thu Aug 5 10:54:31 2021 +0800 + + * Adjust the doc module link in drop menu. + +commit f2bcfa15a57750173317f43dff1f69490a8513b6 +Author: holan20180123 +Date: Thu Aug 5 10:52:27 2021 +0800 + + * Adjust page style of gitlab browse. + +commit 919c8143bb6e8fd0c4cf2ae3a3725f6bd6d5e80d +Merge: 8164c499f1 d6b0fbbfbd +Author: dingguodong +Date: Thu Aug 5 10:51:18 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d6b0fbbfbd4dcbdd4f6d56252c0615f78f6036cd +Merge: 472360028a 824f0b28cf +Author: wangyidong +Date: Thu Aug 5 10:50:39 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8164c499f11c1a09f585d81b4e7b6a2a291e70ba +Author: dingguodong +Date: Thu Aug 5 10:50:17 2021 +0800 + + * Fix bug when editing a pipeline with parameters. + +commit 472360028a188905df8acd659ebc4c90c163dbaa +Author: wangyidong +Date: Thu Aug 5 10:50:11 2021 +0800 + + * adjust for priv lang. + +commit 55c7e1ada6614ada150a7b57327ab6cd16e0bdc1 +Author: wangyidong +Date: Thu Aug 5 10:48:53 2021 +0800 + + * fix bug #14060. + +commit 19ca95819b17ee2810219eaec5aefbcafd734471 +Author: wangyidong +Date: Thu Aug 5 10:48:16 2021 +0800 + + * fix bug #14059. + +commit 824f0b28cf5f07230fd02ab27b73ae2bd93c5b3b +Author: holan20180123 +Date: Thu Aug 5 10:40:11 2021 +0800 + + * Adjust gitlab browse style. + +commit 2c9b5758956d9dd79993b28c71dc0e6b73ebb97f +Merge: c6fd961de9 b8a31398c9 +Author: wangyidong +Date: Thu Aug 5 10:28:46 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit c6fd961de90e0f919d83804b3a761bd0998e17af +Author: wangyidong +Date: Thu Aug 5 10:27:57 2021 +0800 + + * fix bug for repo maintain order. + +commit b8a31398c918533e964ce740deb6b28870531851 +Author: Hao Sun +Date: Thu Aug 5 10:05:19 2021 +0800 + + * fix icon style in table. + +commit 206af620269a0ef2277f0cd1675b3c0265787177 +Author: zhujinyong +Date: Thu Aug 5 09:52:45 2021 +0800 + + * Init before using it. + +commit 831b9b586cc488b1edfa741cddc25cf016e29f20 +Author: tianshujie98 +Date: Thu Aug 5 09:46:10 2021 +0800 + + * Fix the problem of selecting all when merging by product. + +commit 8ffdf25334afdd814def201411f24827f3b4a351 +Author: holan20180123 +Date: Thu Aug 5 08:29:45 2021 +0800 + + * Fix bug #14065. + +commit 6917f1219326b5ebf461e454d810b461a1892cf8 +Author: zenggang +Date: Wed Aug 4 18:25:45 2021 +0800 + + * Finish task #40889 + +commit 7d2064c15eceb4b1dd77a300ef4df69049949f9d +Merge: 87a04e4857 8e5696a1b7 +Author: wangyidong +Date: Wed Aug 4 16:58:41 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 87a04e4857be448c379aa86c079ca2af3680bd3c +Author: wangyidong +Date: Wed Aug 4 16:58:15 2021 +0800 + + * finish task #40900. + +commit 8e5696a1b7684fd4dbed27292228138384efa543 +Merge: 183bd16df3 1cf618686d +Author: tianshujie98 +Date: Wed Aug 4 16:29:31 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 183bd16df3e3ed22885d4ef536c1cabd18082173 +Author: tianshujie98 +Date: Wed Aug 4 16:29:10 2021 +0800 + + * Fix bug #13973. + +commit 1cf618686d73a24faf18c94222620d7b37bc0288 +Author: Guan Xiying +Date: Wed Aug 4 15:58:53 2021 +0800 + + * Fix prefix of gitlab repo. + +commit d19f75d212b5d57a990ce6f3f9378ce7f09c8aa0 +Author: Guan Xiying +Date: Wed Aug 4 15:57:53 2021 +0800 + + * Adjust default per_page param for get commits from gitlab api. + +commit 4fb7cb2fda9f27d58ab3060549f4fb743cfa65fb +Author: zenggang +Date: Wed Aug 4 15:43:56 2021 +0800 + + * Finish task #40893 + +commit 67a3e241558dbccb975a4b3b476e7b68b4ff31bf +Author: dingguodong +Date: Wed Aug 4 15:22:05 2021 +0800 + + * Set menu when changing tab(menu) from gitlab to repo. + +commit f4361e7d28f8d50ceb3384c11e0753956ce86835 +Author: zenggang +Date: Wed Aug 4 15:02:57 2021 +0800 + + * delete not need + +commit 59d8d2f3dc5a0a0c64c555dc6bdb62fea776cc6c +Author: hufangzhou +Date: Wed Aug 4 14:53:43 2021 +0800 + + * Fix bug #14044. + +commit b8156cc66c36f885a58603cf195a946227915759 +Author: hufangzhou +Date: Wed Aug 4 14:26:58 2021 +0800 + + * Fix bug #13983. + +commit 9629cfa015ee35dcb1871de0ea30ca976796a1e2 +Merge: 15bd66d47b 392f0b1525 +Author: hufangzhou +Date: Wed Aug 4 14:23:04 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 15bd66d47bd727f6124745e8168dfb13ccaf27cf +Author: hufangzhou +Date: Wed Aug 4 14:22:59 2021 +0800 + + * Fix bug #14044. + +commit 392f0b15251e011402bafbeb13f36a5fc094e78d (tag: zentaopms_15.3_20210804) +Merge: fd8d02c7df 3f1e7b39d6 +Author: wangyidong +Date: Wed Aug 4 14:19:37 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit fd8d02c7df2f0e08632505423f088a404900641b +Author: wangyidong +Date: Wed Aug 4 14:18:09 2021 +0800 + + * add new version and upgrade. + +commit 3f1e7b39d60b24ba0f35a1e2bea4799301bf3659 +Author: leiyong <1549684884@qq.com> +Date: Wed Aug 4 14:03:50 2021 +0800 + + * Limit budget value size. + +commit 50cb5e7c22a5d79e374e3506955b259dbb09f5de +Author: Hao Sun +Date: Wed Aug 4 13:59:45 2021 +0800 + + * fix icon position in history panel. + +commit 86702f6c7cc36ce8bb8174bd3b3f01b817da3b24 +Author: dingguodong +Date: Wed Aug 4 13:54:29 2021 +0800 + + * Fix bug for description is empty when importing a issue. + +commit 68033ced564d97578354329ca811558836d01cd8 +Author: Guan Xiying +Date: Wed Aug 4 13:38:51 2021 +0800 + + * Execute process gitlab repo when upgrade from 15.3 . + +commit 995ae04702842b878212136bac66d16e2e3bb51a +Merge: 59b31b5b1e d8c69da5b4 +Author: hufangzhou +Date: Wed Aug 4 13:11:54 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 59b31b5b1e34b41a44efb22e59cb9c2999fdaadc +Author: hufangzhou +Date: Wed Aug 4 13:11:51 2021 +0800 + + * Delete the unused code. + +commit d8c69da5b479182221463e9fad0e77d7bd64cd86 +Author: wangyidong +Date: Wed Aug 4 13:04:42 2021 +0800 + + * change for upgrade. + +commit 6621d2971f37a25daa25a59f4948343a7b76d5a5 +Merge: 4deba02129 6169abe658 +Author: wangyidong +Date: Wed Aug 4 11:28:10 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4deba02129c725ad88d196bca62d4c4b432d408c +Merge: b601825a36 39f6d4396f +Author: wangyidong +Date: Wed Aug 4 11:27:57 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6169abe658fbdb82a44813f301d0a450ea92ccd0 +Author: holan20180123 +Date: Wed Aug 4 11:27:48 2021 +0800 + + * Fix bug #14034. + +commit b601825a367d646f9e8c2d3210ad11572704b455 +Author: wangyidong +Date: Wed Aug 4 11:26:20 2021 +0800 + + * finish task #40918. + +commit 39f6d4396fc6f093ee75072589d86357531b27de +Author: zenggang +Date: Wed Aug 4 11:26:07 2021 +0800 + + * Finish task #40914 + +commit 0958d97936f2e0f5c49e1b2c92e09859e42e8745 +Author: tianshujie98 +Date: Wed Aug 4 11:23:18 2021 +0800 + + * Fix the display problem of asset library navigation. + +commit 2455a9752ce9ea477b5601d78a941f58560e0baf +Merge: f33e081ad6 a22636bbb5 +Author: hufangzhou +Date: Wed Aug 4 11:16:23 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f33e081ad6e99b07ea7edc79b8f97fe1c6d9dcf3 +Author: hufangzhou +Date: Wed Aug 4 11:16:20 2021 +0800 + + * Update the project main doc library users when manage the project team members. + +commit a22636bbb5d89e8943a9f7899c581f56a8867500 +Author: Hao Sun +Date: Wed Aug 4 10:58:41 2021 +0800 + + * fix icon style for history panel. + +commit 4680ac7531a044dc405070f3b761f24d40046155 +Author: tianshujie98 +Date: Wed Aug 4 10:53:39 2021 +0800 + + * Fix bug #13974. + +commit 11095c1a768f8dd255576a95bc3fa8acb4fb5d4c +Merge: 3ccbb16941 7afc2d8ebc +Author: wangyidong +Date: Wed Aug 4 10:46:47 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3ccbb16941090b426551081dac8a1ef6d9bfe9f1 +Author: wangyidong +Date: Wed Aug 4 10:46:31 2021 +0800 + + * finish task #40919. + +commit 7afc2d8ebc1af53a48054e9f8e284fabf20dec98 +Author: hufangzhou +Date: Wed Aug 4 10:42:40 2021 +0800 + + * Fix an error. + +commit 3e1717fc44f8707715c0760e0abce395a6d8fba5 +Merge: 722dbe4f77 938ac3f7c6 +Author: wangyidong +Date: Wed Aug 4 10:09:44 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 722dbe4f77ae690c851799c6825313740a9edb82 +Author: wangyidong +Date: Wed Aug 4 10:09:26 2021 +0800 + + * finish task #40923. + +commit 938ac3f7c619917a53b215e15073af09759188e4 +Author: zenggang +Date: Wed Aug 4 10:04:46 2021 +0800 + + * Finish bug #13092 + +commit 600fd531319424356af7e09cc830aa1fd774f7f4 +Author: qiyu-xie +Date: Wed Aug 4 10:00:57 2021 +0800 + + * Fix bug#13973. + +commit 446cb5969c6778e6fb3f9ab2a32800bf8955c635 +Merge: a7ff4d0e41 1bf5898f94 +Author: hufangzhou +Date: Wed Aug 4 10:01:06 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit a7ff4d0e418ac64489b94f227bec576975fd3b62 +Author: hufangzhou +Date: Wed Aug 4 10:01:02 2021 +0800 + + * Fix bug #14027. + +commit 1bf5898f9419c0a56025e38e73a47d41cc17f53e +Merge: f39bb5ba5e 918d6b0fb7 +Author: wangyidong +Date: Wed Aug 4 10:00:17 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 918d6b0fb7f7a4a725ed68f626f6938fcb093eea +Author: Hao Sun +Date: Wed Aug 4 10:01:21 2021 +0800 + + * fix not preserve current app when change language or theme. + +commit f39bb5ba5eff0c163d0017d5a964e924c09c6d75 +Author: wangyidong +Date: Wed Aug 4 09:59:55 2021 +0800 + + * finish task #14038. + +commit 502a6f95a28a1d4e92e47cc3387904d13709b915 +Merge: b2f733d05e 8bd8dde8dd +Author: wangyidong +Date: Wed Aug 4 09:44:27 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b2f733d05e8dafcc7c9c6f2ef09b0e079cbc63b2 +Author: wangyidong +Date: Wed Aug 4 09:44:04 2021 +0800 + + * finish task #40927. + +commit 8bd8dde8dde875d30ece976f0be212af3ea1a386 +Merge: 424b73acf2 428d861e1e +Author: hufangzhou +Date: Wed Aug 4 09:29:53 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 424b73acf2a957c4bad8b48e0495e42a0c22f795 +Author: hufangzhou +Date: Wed Aug 4 09:29:48 2021 +0800 + + * Fix bug #14033. + +commit 428d861e1e1019236fc7c3cac42c796c0bc13f83 +Author: tianshujie98 +Date: Wed Aug 4 09:27:11 2021 +0800 + + * Leave the project field of the product document blank. + +commit 1868d7bc55dbd82b1a6960c91e9d0b9fcbc3a648 +Merge: 7a87eb31c2 b30272cb39 +Author: tianshujie98 +Date: Wed Aug 4 09:16:01 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 7a87eb31c220c469c9a27859c1e0e70d05caff36 +Author: tianshujie98 +Date: Wed Aug 4 09:15:27 2021 +0800 + + * Fix the error when clicking on my favorite execution document. + +commit b30272cb39ab3166083e334f10d690eeb9266866 +Merge: beab1217de 3a63925df3 +Author: hufangzhou +Date: Wed Aug 4 09:02:27 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit beab1217de13356f14db1e5114fcc66b33558480 +Author: hufangzhou +Date: Wed Aug 4 09:02:23 2021 +0800 + + * Modify the comment. + +commit 3a63925df38a6a6780f157536f97a1c6e3c9f80f +Author: tianshujie98 +Date: Wed Aug 4 08:57:13 2021 +0800 + + * Modify My Favorites Jump Link. + +commit 6f70fd827c6fd37797d2cf6dbb01ce76f18ba894 +Author: tianshujie98 +Date: Wed Aug 4 08:30:33 2021 +0800 + + * Fix bug #13974. + +commit 28aec9b43d4d569f237c5493886148968b0f7618 +Author: tianshujie98 +Date: Wed Aug 4 08:15:12 2021 +0800 + + * Refresh the page when unfavorite. + +commit 752d33949a37dca3acaef5c01c43e97156da79ba +Author: hufangzhou +Date: Wed Aug 4 08:11:46 2021 +0800 + + * Fix an error. + +commit 18dfc22307bbb6a7f7270b72466833899021f292 +Author: qiyu-xie +Date: Tue Aug 3 17:38:32 2021 +0800 + + * Fix bug#14029. + +commit 26942d81feadc59fcc5bc56cc2162d91e7e5c661 +Author: qiyu-xie +Date: Tue Aug 3 17:23:42 2021 +0800 + + * Finish task#40809. + +commit 46d47bdd67fee4e7321907d824133583f4a2e394 +Merge: 047780db1c 46429eb9d1 +Author: wangyidong +Date: Tue Aug 3 17:22:19 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 047780db1cdaf0936471dd05343037dbb7084622 +Author: wangyidong +Date: Tue Aug 3 17:21:53 2021 +0800 + + * finish task #40901. + +commit 46429eb9d1c0d97d441c8191caf6ff99327fa0a1 +Author: leiyong <1549684884@qq.com> +Date: Tue Aug 3 16:51:36 2021 +0800 + + * Fix bug#13588. + +commit d06d09f155b7b6589ea8e6724242fd6e162306b0 +Author: tianshujie98 +Date: Tue Aug 3 16:45:48 2021 +0800 + + * Modify function comment. + +commit 9be2cf253f4f40d42e4f24eb8f37f1eed71018fd +Merge: 1445f18e14 31edf998a3 +Author: wangyidong +Date: Tue Aug 3 16:38:51 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1445f18e141789cafc6b62d3f3fbd1ca20fcb39e +Author: wangyidong +Date: Tue Aug 3 16:37:48 2021 +0800 + + * finish task #40901. + +commit 57e68d9f4d094bbf8b3ad21a36152e2d563e9a52 +Author: wangyidong +Date: Tue Aug 3 16:32:23 2021 +0800 + + * fix for view bug in modal. + +commit 31edf998a399db011a0a774c92bceae05c4fccfd +Author: tianshujie98 +Date: Tue Aug 3 16:29:23 2021 +0800 + + * Finish task #40854. + +commit 4c2ebf8f97cc5fb3c992e4210ca2a497e187cc2d +Merge: 2fc3496f90 5e08cd860e +Author: wangyidong +Date: Tue Aug 3 16:23:38 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 2fc3496f90a5b2b9696d1d812641b3050262b850 +Author: wangyidong +Date: Tue Aug 3 16:22:31 2021 +0800 + + * fix bug #14015. + +commit 5e08cd860eef08adba0530549656aa43eac1712c +Author: leiyong <1549684884@qq.com> +Date: Tue Aug 3 16:12:37 2021 +0800 + + * Fix bug#14026. + +commit 59b2e6f0f073336639712d535c0e1e4c551edac2 +Author: tianshujie98 +Date: Tue Aug 3 16:08:18 2021 +0800 + + * Finish task #40834. + +commit 3b1933ca4306ef9fbde7e55c8df1ecf6ef8f497e +Author: holan20180123 +Date: Tue Aug 3 16:06:20 2021 +0800 + + * Fix bug #14009. + +commit aad5ceb176937a5edd0feec2cb81c54ffe887ffa +Author: zenggang +Date: Tue Aug 3 15:53:34 2021 +0800 + + * Adjust code format + +commit 477e380687ea5c4c4c8f79299320bbb94f5a5e8e +Merge: a18fdc5a54 31772c8e16 +Author: dingguodong +Date: Tue Aug 3 15:48:38 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 31772c8e161b5fb18996bafc5b821ef0e10a2ff3 +Author: holan20180123 +Date: Tue Aug 3 15:47:44 2021 +0800 + + * Fix issue #367. + +commit a18fdc5a54301ee003ca5cc63632d6b4a9d2c223 +Author: dingguodong +Date: Tue Aug 3 15:47:34 2021 +0800 + + - Remove extra line for importing issues. + +commit 7bf9bbf1ca50ce6592d0612ab9c7a309a03a6abd +Author: holan20180123 +Date: Tue Aug 3 15:37:22 2021 +0800 + + * Fix bug #14024. + +commit b8ba41c6c9ae1bef7951e2d20dfc2f894cf49b89 +Author: qiyu-xie +Date: Tue Aug 3 15:35:21 2021 +0800 + + * Finish task#40805. + +commit d6e08c274e69e208e2b36392a8b770e00b9093c3 +Author: wangyidong +Date: Tue Aug 3 15:33:11 2021 +0800 + + * adjust priv. + +commit 7907a29cf8f2f8cf5a8a69d20c9153252bc7f383 +Author: wangyidong +Date: Tue Aug 3 15:32:44 2021 +0800 + + * finish task #40911. + +commit a40762cb98c2a5c6aff9b1e6ae12a21db4d1706c +Author: wangyidong +Date: Tue Aug 3 15:31:28 2021 +0800 + + * strtolower for loadExtension. + +commit 415eee6922e38074cef1df22f1ca0736642ee4d5 +Author: dingguodong +Date: Tue Aug 3 15:22:26 2021 +0800 + + * Adjust codes after code review for job module. + +commit 7a2bbe1badf514ac676a62674a187bdf2ede2a80 +Merge: 5c03500871 dbdea2e48c +Author: holan20180123 +Date: Tue Aug 3 15:21:59 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit dbdea2e48ccf16e10a0695b8b37afdf338b985a9 +Author: dingguodong +Date: Tue Aug 3 15:21:01 2021 +0800 + + * Add lang for gitlab module and adjust codes after code review. + +commit 5c03500871857676c98fe2cc2c66cca40978bb59 +Merge: 040faf5e3e d93ec01d15 +Author: holan20180123 +Date: Tue Aug 3 15:20:53 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 040faf5e3e3ff71954928c4286215c71e5f8dddb +Author: holan20180123 +Date: Tue Aug 3 15:20:38 2021 +0800 + + * Fix issue #363. + +commit d93ec01d1550a5acb8a6835bccee2fd420ab7606 +Author: zenggang +Date: Tue Aug 3 15:18:57 2021 +0800 + + * Finish task #40892 + +commit d747f8c6176ade1fe40d0bedc2f9c4a7944c5418 +Author: qiyu-xie +Date: Tue Aug 3 15:11:58 2021 +0800 + + * Finish task#40803. + +commit c0a418196cc51b816bb9e710515d6e9f256edddf +Author: hufangzhou +Date: Tue Aug 3 14:55:40 2021 +0800 + + * Rename the function name. + +commit e18aa0c930b61705c26210e0e1e12a1fa1606ac4 +Merge: ac800c7875 35bb4e68a5 +Author: hufangzhou +Date: Tue Aug 3 14:46:55 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ac800c78753c73b6227b9e1c5e44d3734cc6f260 +Author: hufangzhou +Date: Tue Aug 3 14:46:52 2021 +0800 + + * Finish task #40808. + +commit 35bb4e68a52721486ef773c262cf19c54d440db7 +Author: qiyu-xie +Date: Tue Aug 3 14:37:55 2021 +0800 + + * Finish task#40813. + +commit fc6a645862f7694bdd877de1639d3b4e36684430 +Merge: 92bc42118e d60da49f27 +Author: hufangzhou +Date: Tue Aug 3 14:35:17 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 92bc42118ebbc16f74dc5e364ae2e8494287f20c +Author: hufangzhou +Date: Tue Aug 3 14:35:04 2021 +0800 + + * Fix bug #14020. + +commit d60da49f2787605c238fdb83b45a98b81a0e64e4 +Author: qiyu-xie +Date: Tue Aug 3 14:30:50 2021 +0800 + + * Finish task#40815. + +commit 20841b5552ae1a25245b48a141135a8be4fc22e6 +Author: Hao Sun +Date: Tue Aug 3 14:20:35 2021 +0800 + + * issue #360, update some icons. + +commit 242dc94ae0a5ac374c645bdb46c2c930735c0bd9 +Author: Hao Sun +Date: Tue Aug 3 14:12:21 2021 +0800 + + * issue #354, fix side-by-side not active in fullscreen mode. + +commit 10e94230bd6f63c41f16cf4dbca3f7146375c508 +Author: qiyu-xie +Date: Tue Aug 3 14:03:52 2021 +0800 + + * Finish task#40820. + +commit dcb627fcede322da1ff30f33a774d7adbecaa887 +Author: qiyu-xie +Date: Tue Aug 3 13:52:13 2021 +0800 + + * Fix issue#361. + +commit a1b499bb986045b28edb079bc018e9da4503dcbe +Author: holan20180123 +Date: Tue Aug 3 13:47:37 2021 +0800 + + * Fix issue #364. + +commit 74d9e41f9c900f9de3ae63a4956760a051e1396e +Author: holan20180123 +Date: Tue Aug 3 13:40:50 2021 +0800 + + * Fix issue #367. + +commit 7f87b7742ccb25e29e655ba5df23e0ec204119b0 +Author: holan20180123 +Date: Tue Aug 3 13:32:31 2021 +0800 + + * Fix issue #371. + +commit b29484680e02edd4b1488fce9bb29c8b849fa018 +Author: holan20180123 +Date: Tue Aug 3 13:12:24 2021 +0800 + + * Finish task #40806. + +commit 54aef9129b1ebba312c3f5f46910c513a6500ac2 +Author: Hao Sun +Date: Tue Aug 3 12:28:55 2021 +0800 + + * refactor: format. + +commit 6df27b170cc245f9c82868d73b4ecb9f0a9e1ce9 +Author: Hao Sun +Date: Tue Aug 3 11:58:56 2021 +0800 + + * issue #359, update theme "blue". + +commit 037d75c242cc5a670c94cfc443d1c7e672a1bb52 +Author: tianshujie98 +Date: Tue Aug 3 11:35:04 2021 +0800 + + * Finish task #40811. + +commit 8f32a5fe01808cf116aba790e2f948e1a15114c3 +Author: tianshujie98 +Date: Tue Aug 3 11:32:44 2021 +0800 + + * Finish task #40802. + +commit 3736a884acbfe9beefd4918bb2dc81f6fdfd6c34 +Author: tianshujie98 +Date: Tue Aug 3 11:25:54 2021 +0800 + + * Finish task #40812. + +commit a173f112dc7a6770ce66f8ee8231c16b7776f6da +Author: dingguodong +Date: Tue Aug 3 11:16:34 2021 +0800 + + * Change loadModel to access apiGetJobLog func from gitlab module. + +commit 06dd344c356e49dc92b7f3dfcdef1fc50125b1c1 +Merge: c0da73754f b009f1df7b +Author: dingguodong +Date: Tue Aug 3 11:14:57 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit c0da73754fc5c440648c426454f04fd6b30b9efe +Author: dingguodong +Date: Tue Aug 3 11:14:53 2021 +0800 + + - Remove useless lines about gitlab from bug module. + +commit b009f1df7b834ada7883da31ad0de46ae2e1082e +Author: qiyu-xie +Date: Tue Aug 3 11:13:58 2021 +0800 + + * Fix issue#370. + +commit 56b030f2a619c4cf51d29c72a54474ab5ac6adb4 +Author: dingguodong +Date: Tue Aug 3 11:13:13 2021 +0800 + + * Put gitlab to first position and reformat codes. + +commit 57ac047b3cf384ea092c49257867d0e1ba0fc892 +Merge: d493efc769 f708ec4cbd +Author: dingguodong +Date: Tue Aug 3 11:12:05 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d493efc76929fb571d84f6119e78b42d0a7d6d82 +Author: dingguodong +Date: Tue Aug 3 11:12:03 2021 +0800 + + * Change function comment for zget. + +commit f708ec4cbd3e2d5e004399adb9d75f4c2988fdc0 +Merge: bbdd039250 2da9abb8c5 +Author: tianshujie98 +Date: Tue Aug 3 11:06:30 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit bbdd039250cad96e49d89f58c6049b1ce922faec +Author: tianshujie98 +Date: Tue Aug 3 11:06:13 2021 +0800 + + * Finish task #40832. + +commit 2da9abb8c5f9085e42669d674abab18110d9ebfc +Author: holan20180123 +Date: Tue Aug 3 11:06:06 2021 +0800 + + * Finish task #40810. + +commit 7e9e1d0623a858d67c6528583ccb9fcca10028f0 +Author: tianshujie98 +Date: Tue Aug 3 11:05:11 2021 +0800 + + * Finish task #40833. + +commit 2fef22e3dc1f8393f726732aef67d23664bbf23b +Author: dingguodong +Date: Tue Aug 3 11:04:04 2021 +0800 + + * Change count to 1 and add a todo. + +commit 9d6c2bc7c1edd6d6647d243e91c11c419497f4fb +Author: tianshujie98 +Date: Tue Aug 3 11:02:51 2021 +0800 + + * Finish task #40836. + +commit 08f4ebc0ded8ff1e760327a0354a0b8ebc38b82b +Merge: 13aed8abb1 d83bb8b852 +Author: hufangzhou +Date: Tue Aug 3 10:56:46 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 13aed8abb1d25e79431ccfea79ee46c236b3fa43 +Merge: fb65244794 2e0d20f7b9 +Author: hufangzhou +Date: Tue Aug 3 10:55:59 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit fb652447946c39be42852b5dca9d6860f8f0b30e +Author: hufangzhou +Date: Tue Aug 3 10:55:55 2021 +0800 + + * Fix issue #355. + +commit d83bb8b8524459077e70a3666d014ef412088a58 +Author: tianshujie98 +Date: Tue Aug 3 10:55:39 2021 +0800 + + * Finish task #40843. + +commit 2e0d20f7b9c7c24fde5461a30279845afd0ca71a +Author: holan20180123 +Date: Tue Aug 3 10:42:10 2021 +0800 + + * Finish task #40814. + +commit 2269148b1f01336ecbe75645a6a62be26a923615 +Author: holan20180123 +Date: Tue Aug 3 10:37:04 2021 +0800 + + * Fix issue #336. + +commit c16b0d4ffae32f6e66f50e924b29e951af5dd0e3 +Author: qiyu-xie +Date: Tue Aug 3 10:32:00 2021 +0800 + + * Finish task#40841. + +commit e56c5bafdc8c48f56ae9d9855e2ffeaab28358a7 +Author: tianshujie98 +Date: Tue Aug 3 10:21:34 2021 +0800 + + * Finish task #40837. + +commit e9ef1765566097a46b9529886755d32e9caab132 +Author: holan20180123 +Date: Tue Aug 3 10:16:08 2021 +0800 + + * Fix doc lib menu error. + +commit 4ef90203311c9cb9d6dfdd0e84b29bdc91a9b964 +Author: tianshujie98 +Date: Tue Aug 3 10:14:12 2021 +0800 + + * Finish task #40838. + +commit 7a5f49acaa8e5fb1aac357a525327e20e5e9991d +Author: holan20180123 +Date: Tue Aug 3 10:08:56 2021 +0800 + + * Finish task #40817. + +commit 4c621f9f1e8ebd0f1d2976733adf2429400b7473 +Author: holan20180123 +Date: Tue Aug 3 10:05:13 2021 +0800 + + * Finish task #40818. + +commit 4dc617d142a3f8d478cc542509cd7cd835afe471 +Merge: 572a6c8647 de89015f58 +Author: hufangzhou +Date: Tue Aug 3 09:59:52 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 572a6c864710b3d551df97914da491e32f7fd5fb +Author: hufangzhou +Date: Tue Aug 3 09:59:48 2021 +0800 + + * Finish task #40800. + +commit de89015f58d84842368b155f78816519d15ecbef +Author: qiyu-xie +Date: Tue Aug 3 09:52:35 2021 +0800 + + * Finish task#40850. + +commit e4cb62f622a2628d5e959255cafd21d340a61244 +Author: qiyu-xie +Date: Tue Aug 3 09:43:31 2021 +0800 + + * Finish task#40850. + +commit ba3a76967c9a3dfb1bc253b57d7d06d3b9c65077 +Author: zenggang +Date: Tue Aug 3 09:37:05 2021 +0800 + + * Finish task #40888 + +commit 57bf580fa563a2e122e37636846e8a9636ae4d9b +Author: hufangzhou +Date: Tue Aug 3 09:30:05 2021 +0800 + + * Finish task #40835. + +commit ae24ad59a1262362b79f12af0e9238c7ec31c1d4 +Merge: 49aa90f84c 4e578bf78f +Author: hufangzhou +Date: Tue Aug 3 09:25:02 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 49aa90f84cdcf1d6f0d86325dc3644c1be12bf78 +Author: hufangzhou +Date: Tue Aug 3 09:24:58 2021 +0800 + + * Finish task #40816. + +commit 4e578bf78fcb9d1974df8e72d6c1297124447ce1 +Author: holan20180123 +Date: Tue Aug 3 09:23:24 2021 +0800 + + * Finish task #40819. + +commit ace9f69bba4945d90aa73a39d30a5bc871a426a1 +Merge: 8940b75637 9e99084add +Author: hufangzhou +Date: Tue Aug 3 09:21:32 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8940b75637587b1d68d7691bed3184afc15529ed +Author: hufangzhou +Date: Tue Aug 3 09:21:27 2021 +0800 + + * Finish task #40848. + +commit 9e99084addd157825c818b9828448941e3d83b85 +Author: tianshujie98 +Date: Tue Aug 3 09:20:50 2021 +0800 + + * Finish task #40839. + +commit 1d51ae04a6e6023186293e1c488a7e04d52ccf07 +Author: holan20180123 +Date: Tue Aug 3 09:18:03 2021 +0800 + + * Finish task #40824. + +commit 9f04b9540d5f4e1f829c385a13463b6c70223755 +Author: tianshujie98 +Date: Tue Aug 3 09:16:24 2021 +0800 + + * Finish task #40840. + +commit 02a4add87cd13d81bea131846fc057f8089abf7a +Merge: b3e9198bd9 0580d76434 +Author: tianshujie98 +Date: Tue Aug 3 09:13:53 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b3e9198bd92bdd0b3fe99326f66e2ac0bccf367c +Author: tianshujie98 +Date: Tue Aug 3 09:13:32 2021 +0800 + + * Finish task #40853. + +commit 0580d76434295eb2718d915a2601c0ade830576c +Author: hufangzhou +Date: Tue Aug 3 09:13:27 2021 +0800 + + * Finish task #40856. + +commit 4492bb2f0cd02cce35f0e207f7a6299449c1ecf6 +Author: qiyu-xie +Date: Tue Aug 3 09:10:22 2021 +0800 + + * Finish task#40852. + +commit d47b7efdcb9fb1a1228cda26f8913ec983ebea74 +Author: tianshujie98 +Date: Tue Aug 3 09:08:27 2021 +0800 + + * Finish task #40857. + +commit 44081d1fbaf692c043edd2dd103b6b3a3bec5942 +Author: tianshujie98 +Date: Tue Aug 3 09:06:27 2021 +0800 + + * Resolved issue #373. + +commit e7cbc05a1e925852863343ce45a1fed7c377d521 +Author: qiyu-xie +Date: Tue Aug 3 09:03:36 2021 +0800 + + * Finish task#40855. + +commit 612c6d9aeeaeb71fb2fc99e151aafe1f8c44c83b +Author: tianshujie98 +Date: Tue Aug 3 09:02:54 2021 +0800 + + * Resolved issue #372. + +commit 133eac3fb65b7fe02a621d176078ba910bb7197a +Author: tianshujie98 +Date: Tue Aug 3 08:57:44 2021 +0800 + + * Resolved issue #368. + +commit 3574dd2f0095750689584fbc3a14cb144b96d8ba +Author: qiyu-xie +Date: Tue Aug 3 08:54:04 2021 +0800 + + * Finish task#40851. + +commit 559c1679b55bfbac3007a237bd2ab59d255bb990 +Merge: 6424ffd442 c319f176c0 +Author: holan20180123 +Date: Tue Aug 3 08:28:23 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6424ffd442a0143883a57dffc7aceffa379b4a09 +Author: holan20180123 +Date: Tue Aug 3 08:27:48 2021 +0800 + + * Adjust review code. + +commit c319f176c063cba07a3803d11e5fd0fbf2714fc5 +Author: tianshujie98 +Date: Tue Aug 3 08:15:12 2021 +0800 + + * Code modified when submitting code review. + +commit b6dbfeaedb3c26538186df3caeb0c424243095c3 +Author: Hao Sun +Date: Mon Aug 2 17:35:12 2021 +0800 + + * bug #13993, fix z-index for dropmenu of chosen. + +commit 7f6170c77ebad022f3bada0364095b46e74d8f0a +Merge: 7b0a8a5bb0 4bfe1e413a +Author: wangyidong +Date: Mon Aug 2 16:59:33 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 7b0a8a5bb05087bb84fd552fc709dfe4afba11a1 +Author: wangyidong +Date: Mon Aug 2 16:59:14 2021 +0800 + + * fix bug for loadModel. + +commit 4bfe1e413a0281d1990c6cd5085b46d192c136fe +Author: qiyu-xie +Date: Mon Aug 2 16:50:59 2021 +0800 + + * Delete empty line. + +commit 9cc4e07ee03a7d4a4123b6f171f2d669d7b52b13 +Author: dingguodong +Date: Mon Aug 2 16:42:45 2021 +0800 + + * Correct wrong codes for checkCompileStatus func. + +commit f7ac8b9678e4408032b2a318d0b16a3fe3426f5a +Author: dingguodong +Date: Mon Aug 2 16:33:41 2021 +0800 + + * Change order when creating repo, choose gitlab first. + +commit 46b576255c35d16a49e0c07a20373b82c4ed1f69 +Merge: bbe793a8aa 6b73cfc0bc +Author: wangyidong +Date: Mon Aug 2 16:31:51 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit bbe793a8aabd0679e785b40d78b65e8c32c23fac +Merge: 4dd58196d7 545d611d56 +Author: wangyidong +Date: Mon Aug 2 16:31:42 2021 +0800 + + Merge branch '15.2' + +commit 6b73cfc0bce44603695979822fe16e9b63275a9e +Author: dingguodong +Date: Mon Aug 2 16:28:15 2021 +0800 + + * Optimize back button. + +commit 7b8d9695ceee45bfe0f8a5c52f654295817df384 +Author: dingguodong +Date: Mon Aug 2 16:26:18 2021 +0800 + + * Reformat codes for syncGitlabTaskStatus after code review. + +commit 867b7a56129dba6b53cdf83cdf44ffed76fbd656 +Author: dingguodong +Date: Mon Aug 2 16:24:11 2021 +0800 + + * Correct wrong variable when editing a job. + +commit 4dd58196d77bff4e4525828101c5cabe30f55b74 +Author: wangyidong +Date: Mon Aug 2 16:02:10 2021 +0800 + + * adjust for upgrade. + +commit 111758fa4f4bb107f745a829c41a69b8e053eb37 +Author: Guan Xiying +Date: Mon Aug 2 14:32:59 2021 +0800 + + * Add document ready. + +commit 545d611d5619cb4c3647ef6c662c725f73b427a4 +Author: wangyidong +Date: Mon Aug 2 14:31:59 2021 +0800 + + - delete null row. + +commit 8856ad6cc492dc11bb522f1d31c5b79563dc21b5 +Author: qiyu-xie +Date: Mon Aug 2 14:30:53 2021 +0800 + + * Modify create project and program button style. + +commit 0f231bbf80d239bb598a92af202e43aff2f5eb72 +Author: wangyidong +Date: Mon Aug 2 13:47:28 2021 +0800 + + * adjust for change subStatus when finish task by effort. + +commit c43c53d1b6690c829937c87bd294374a5d750faf +Author: holan20180123 +Date: Mon Aug 2 13:42:02 2021 +0800 + + * Adjust review codes. + +commit 89b439d1da79ae06ef02edcdee7ea9ef7bc19b38 +Merge: 7f9e7623e1 08cea5a111 +Author: wangyidong +Date: Mon Aug 2 13:12:47 2021 +0800 + + Merge branch '15.2' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.2 + +commit 7f9e7623e15f6f7f04874a1d38b55d1873f773c6 +Author: wangyidong +Date: Mon Aug 2 13:12:27 2021 +0800 + + * add api in build. + +commit 222997d166c5b9986afb6e2a474cd924324a3380 +Author: holan20180123 +Date: Mon Aug 2 09:14:55 2021 +0800 + + * Fix bug #13823. + +commit 6cf5b67feb6da35abfa3951e4a9e7903c5bec7de +Author: tianshujie98 +Date: Mon Aug 2 09:01:11 2021 +0800 + + * Add format judgment to the exchange rate. + +commit 4ac9ca105df363b3f8ce466839d78a86fe34f232 +Author: holan20180123 +Date: Mon Aug 2 08:30:02 2021 +0800 + + * Fix bug #13909. + +commit f313706851853edddf87c6dca95341fc0d2e2f3d +Merge: 6dab95a734 eaffdc7a50 +Author: holan20180123 +Date: Mon Aug 2 08:02:14 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6dab95a7342fb25d4dcb43b81522484dccd21592 +Author: holan20180123 +Date: Mon Aug 2 08:01:59 2021 +0800 + + * Adjust review codes. + +commit eaffdc7a500aca46d129b849138c70119b63eb1a +Author: qiyu-xie +Date: Sun Aug 1 14:40:54 2021 +0800 + + * Fix bug#13816. + +commit 7e85b9f2e3f3c003594f1b0282dc47315562cec3 +Author: qiyu-xie +Date: Sun Aug 1 14:16:10 2021 +0800 + + * Fix bug#13966,#13965. + +commit 5550d0009a693def69a81dfe00f3cdac14726911 +Author: tianshujie98 +Date: Sun Aug 1 12:05:38 2021 +0800 + + * Adjust project card style. + +commit e8b6b2d68bdbe03033472566a087c350f56d9fe3 +Author: qiyu-xie +Date: Sun Aug 1 10:50:07 2021 +0800 + + * Fix bug#13960. + +commit d44eb3925e51a8d72c2b96a4618b4a8f30ac10ee +Author: tianshujie98 +Date: Sun Aug 1 10:42:56 2021 +0800 + + * Adjust the order of icons in the display mode of the switching project list. + +commit a69e6720805b890d88b5d97ffeb7ba611e5581a0 +Author: tianshujie98 +Date: Sun Aug 1 10:36:32 2021 +0800 + + * Fix bug #13968. + +commit 9511cef076f13c4aee2c2de88649cfd95a498d8c +Author: Hao Sun +Date: Fri Jul 30 21:25:17 2021 +0800 + + * update zui. + +commit dc7cb70b0786c56c70a4af84c34c155a4a4f4a5d +Author: Hao Sun +Date: Fri Jul 30 21:16:29 2021 +0800 + + * update theme "blue". + +commit 3d6b23887a63344f68652b0886e5b0a70c944e16 +Author: Hao Sun +Date: Fri Jul 30 17:32:01 2021 +0800 + + * update zentao icons. + +commit 3817b1e3b6891e28c697c09863be0cde63be4292 +Author: zhujinyong +Date: Fri Jul 30 15:35:09 2021 +0800 + + * Fix bug: status lost. + +commit 1397cd8c1ecca7a2a0fa333ee5421ec679f77cda +Author: zhujinyong +Date: Fri Jul 30 15:25:08 2021 +0800 + + * fix lastEditedDate of api. + +commit bdc440ddf6276d8ae83d137c75b299e4ff8cdc84 +Author: zhujinyong +Date: Fri Jul 30 15:17:56 2021 +0800 + + * fix api of projectissue. + +commit 8392165c9ffb66a82d7d689c3ca115ad1420011c +Author: Hao Sun +Date: Fri Jul 30 14:46:39 2021 +0800 + + * fix incorrect use the attribute "data-nested". + +commit 66000762f27dc3f884d485435d60493f07c08d21 +Author: Hao Sun +Date: Fri Jul 30 14:40:18 2021 +0800 + + * update theme "blue". + +commit 4bfa8f6cadd8eb958ffaa76f016fcf067e0cc71c +Author: Hao Sun +Date: Fri Jul 30 14:38:32 2021 +0800 + + * improve UI. + +commit 8de42e5bca850d60de4667b56e864c5c6913ee5f +Author: Hao Sun +Date: Fri Jul 30 11:20:55 2021 +0800 + + * add space between icon and text. + +commit 2d52308dc5b8371a0a54937985a029f52a993bba +Author: qiyu-xie +Date: Fri Jul 30 13:19:18 2021 +0800 + + * Merge duplicate codes of getLibFiles method. + +commit 98174d5f37cc073e24b3c05bfb76500696aa273c +Author: tianshujie98 +Date: Fri Jul 30 13:17:53 2021 +0800 + + * Fix bug #13959. + +commit 10d8ed31abe307b5b3d5cbfd44c4f6c87c513cf3 +Author: qiyu-xie +Date: Fri Jul 30 12:38:28 2021 +0800 + + * Merge duplicate codes. + +commit d2e29e27fae12930eb4afc16c6a4bcc062da058b +Author: qiyu-xie +Date: Fri Jul 30 12:17:22 2021 +0800 + + * Add bug,testcase,testreport for execution and project files lib. + +commit b4ac65fb05580d5ad88167c97c9da34ca42a9393 +Merge: 1beb593f82 9c4b097a3f +Author: holan20180123 +Date: Fri Jul 30 11:36:50 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1beb593f828d2ba794222d057336eff99149a09a +Author: holan20180123 +Date: Fri Jul 30 11:36:30 2021 +0800 + + * Fix bug #13822. + +commit 9c4b097a3f9e6e6a44e8b728b3a79ccb14a79805 +Author: qiyu-xie +Date: Fri Jul 30 11:21:04 2021 +0800 + + * Fix a bug of user view project. + +commit 08cea5a1119e88f47099ec5ea5903e15d53de172 +Author: zenggang +Date: Fri Jul 30 11:05:32 2021 +0800 + + * Finish task #13100 + +commit 4beec759c8800c69f1ce33da567e0af378b4b341 +Author: qiyu-xie +Date: Fri Jul 30 11:01:48 2021 +0800 + + * Modify file source type name for requirement. + +commit 3c09c80ffa256f9e9b5fb47ce6809ebc8cb43a41 +Author: qiyu-xie +Date: Fri Jul 30 10:57:14 2021 +0800 + + * Modify file source type name for requirement. + +commit 3bfa1df8469e190fe8d67e9f896b93846f0a374c +Author: wangyidong +Date: Fri Jul 30 10:48:14 2021 +0800 + + * fix bug #13954. + +commit a099da0f04b62e0a5a710ccd438710bd791b0e1b +Author: tianshujie98 +Date: Fri Jul 30 10:38:25 2021 +0800 + + * Fix bug #13953. + +commit c9c76ded4f6f7f50d74d8686f04da5cf4373afbb +Author: tianshujie98 +Date: Fri Jul 30 10:36:18 2021 +0800 + + * Fix bug #13950. + +commit e67b31f6a909772052a9702be5a81e8119ea8b7f +Author: tianshujie98 +Date: Fri Jul 30 10:26:35 2021 +0800 + + * Fix bug #13927. + +commit 5c43943fe82d884b6bb1921c7f3fe44e655f1223 +Author: holan20180123 +Date: Fri Jul 30 10:08:59 2021 +0800 + + * Fix bug #13880. + +commit 09a8a1ecb37f8e6a5b81191b51bf3895372987da +Author: qiyu-xie +Date: Fri Jul 30 10:04:37 2021 +0800 + + * Modify error in file lib at not max version. + +commit 6e5ef4c27bcf84d4244ff99810354692985e98bf +Author: Yagami <976204163@qq.com> +Date: Fri Jul 30 10:03:43 2021 +0800 + + * Fix execution drop menu bug. + +commit b7b2427661c77e566226479e7e3d44532b3fe296 +Author: dingguodong +Date: Fri Jul 30 09:54:35 2021 +0800 + + * Fix the bug for job status wrong after checkCompileStatus. + +commit eb69515e8f300602376e2ad0c5f89a3347313700 +Author: qiyu-xie +Date: Fri Jul 30 09:52:17 2021 +0800 + + * Add issue,meeting,design at max version. + +commit 79087c0ac31e658345838c7492f8863ce990ae0b +Author: holan20180123 +Date: Fri Jul 30 09:26:30 2021 +0800 + + * Finish task #40509. + +commit 847b85dfdb5bc6567a918bcc9cda6ea1527014c9 +Author: dingguodong +Date: Fri Jul 30 09:17:39 2021 +0800 + + * Correct the fatal error when creating job. + +commit c642e66bb5f9b86a56c80203a0b267cfca7c8222 +Author: dingguodong +Date: Fri Jul 30 09:13:04 2021 +0800 + + * Add English language support for job and compile modules. + +commit 0fbad9c198b1fa3cae8ec74a4812e00633878814 +Merge: 5ff35b3d94 c543e233dc +Author: hufangzhou +Date: Fri Jul 30 08:57:23 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5ff35b3d945a2524fc0b9b7e0e92f1a222efbe57 +Author: hufangzhou +Date: Fri Jul 30 08:57:18 2021 +0800 + + * Fix bug #13860. + +commit 9d91f22f32e234cc46a36ba83604f52c8566b425 +Author: wangyidong +Date: Fri Jul 30 08:42:23 2021 +0800 + + * finish task #40115. + +commit c543e233dc6c38fb37793b4ff23f3fca685a4bdc +Author: qiyu-xie +Date: Fri Jul 30 08:29:52 2021 +0800 + + * Add testreport type to find file source name. + +commit 8cf24ffd24aa7c7358d4a47aa8da0e8746ffa4c4 +Merge: 129b1ec87c 800ff00032 +Author: hufangzhou +Date: Thu Jul 29 17:53:05 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 129b1ec87ce09099d16e0ebf442ce24be648f1f0 +Author: hufangzhou +Date: Thu Jul 29 17:53:00 2021 +0800 + + * Fix bug #13920. + +commit 800ff00032b08b5a87939cba2f238ba0fcbdc494 +Author: Guan Xiying +Date: Thu Jul 29 17:28:51 2021 +0800 + + * Fix exec gitlab pipeline function. + +commit 21d998872dd47ae92cab0152f8899ac19822c5fe +Merge: c9b7d49d9d c9a2d4c206 +Author: hufangzhou +Date: Thu Jul 29 17:22:38 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit c9b7d49d9d39419d3c2972216035f333e261218f +Author: hufangzhou +Date: Thu Jul 29 17:22:34 2021 +0800 + + * Fix bug #13922. + +commit c9a2d4c20685b18acfde67199f6b0d1ce241bdc6 +Author: qiyu-xie +Date: Thu Jul 29 17:11:08 2021 +0800 + + * Modify the navigation highlighting problem at show file page. + +commit e620c3420266402efad4030df570482351765490 +Author: wangyidong +Date: Thu Jul 29 17:02:22 2021 +0800 + + * fix bug #13891 in master branch. + +commit 304f5416213c6eff2899f466b14104f7220a5656 +Author: wangyidong +Date: Thu Jul 29 17:00:07 2021 +0800 + + * code for task #13891. + +commit 3def2a471331301c13442f16e8e5362b92a54d03 +Author: wangyidong +Date: Thu Jul 29 16:52:13 2021 +0800 + + * adjust update userview for project involved execution. + +commit 1deebb9199a05277d10285a96bc7e7612f6ef226 +Author: qiyu-xie +Date: Thu Jul 29 16:50:12 2021 +0800 + + * Add preview to picture at show file page. + +commit 7055857a900dfec5006a4adba4ddbbc2eff3cf81 +Author: wangyidong +Date: Thu Jul 29 16:47:56 2021 +0800 + + * fix bug #13891. + +commit 9a2f60f2e56e8fa250feb5eb5977de57901b83e0 +Author: tianshujie98 +Date: Thu Jul 29 16:36:36 2021 +0800 + + * Fix bug #13944. + +commit 7521a2832a6051a1a796e0086c4809e09b405edd +Author: tianshujie98 +Date: Thu Jul 29 16:29:38 2021 +0800 + + * Fix bug #13943. + +commit 65593ba3d0ef201070bb557b0125a9ed4b15d13a +Author: Guan Xiying +Date: Thu Jul 29 16:28:13 2021 +0800 + + * Fix link of refresh button of compile logs page. + +commit 6fe756fb143d80d9337654c64371516aaf0c6b5b +Author: Guan Xiying +Date: Thu Jul 29 16:26:20 2021 +0800 + + * Adjust param of ciModel::checkCompileStatus function. + +commit f62cbc279222b9ec05f5f4219429536cdc31ecba +Author: qiyu-xie +Date: Thu Jul 29 16:16:55 2021 +0800 + + * Modify the problem of navigation highlight at showfiles page. + +commit d180d67c91365d9f7a11760f2ccbee0f59dfe361 +Author: Guan Xiying +Date: Thu Jul 29 16:13:58 2021 +0800 + + * Adjust syncGitlabTaskStatus function. + +commit f46c5f507200dab0ff7630d6cb2f2fdf2dc48cda +Author: wangyidong +Date: Thu Jul 29 16:12:41 2021 +0800 + + * fix for save index. + +commit e988753fb168236c456b757c3a061c47fda37c26 +Author: qiyu-xie +Date: Thu Jul 29 16:06:51 2021 +0800 + + * Delete batch download files. + +commit 04c6580dfcbfb846e36318caa338cea6d975c969 +Author: Hao Sun +Date: Thu Jul 29 16:04:12 2021 +0800 + + * bug #13931, fix css rule conflict. @tianshujie + +commit f053df89124124cfab70ec3032cc2de1ef6f994d +Author: Guan Xiying +Date: Thu Jul 29 15:51:11 2021 +0800 + + * Rename jobModel::getGitlabProjectName to gitlabModel::getObjectNameForJob. + +commit f84eb4c1acf402358356d10e89e224f5c8095eee +Author: tianshujie98 +Date: Thu Jul 29 15:49:24 2021 +0800 + + * Adjust the display format of deadlines for task and bug lists. + +commit 2b8ca78940752c6641125e552bcc8c3b30b2dffd +Author: Hao Sun +Date: Thu Jul 29 15:49:07 2021 +0800 + + * handle situations where the full screen interface is not available. + +commit d201e9c65b2147445d2a6ac88675195454d84da9 +Author: Hao Sun +Date: Thu Jul 29 15:44:59 2021 +0800 + + * allow fullscreen for app page which opened with iframe. + +commit 94b7c2c4efec4f6432438bd21b9145408c969057 +Author: Hao Sun +Date: Thu Jul 29 15:41:35 2021 +0800 + + * fix active state for outline in doc page. + +commit 13da9e6d65017c11e5d6c53d8c6a1afbf30d2693 +Author: Hao Sun +Date: Thu Jul 29 15:20:28 2021 +0800 + + * story #40503, update doc content silently on switch doc version. @liyuchun. + +commit 9e5cc6a1a5073b1168124ecb4c59d9b0abfe466a +Author: tianshujie98 +Date: Thu Jul 29 15:43:01 2021 +0800 + + * Fix bug #13939. + +commit 0689243c4d00170498b3a22e508c063b5c5b749a +Author: qiyu-xie +Date: Thu Jul 29 15:39:19 2021 +0800 + + * Modify testcase field name when select case title. + +commit 45502452f1cdc692dc99cebe2363ecaf2e368b6f +Author: Guan Xiying +Date: Thu Jul 29 15:32:59 2021 +0800 + + * Fix . in zh-cn lang. + +commit 25433731e2c3f38bd76254748669ff173baabffc +Author: Guan Xiying +Date: Thu Jul 29 15:23:26 2021 +0800 + + * Remove extra space from repoModel::processGitlab function. + +commit 017731880dba0536054f750723e50e1af9d3b821 +Merge: fab0581b52 030c6e855c +Author: hufangzhou +Date: Thu Jul 29 15:17:07 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit fab0581b529532f7fa1cbb0076333b36eafd8037 +Author: hufangzhou +Date: Thu Jul 29 15:17:03 2021 +0800 + + * Add the outline in wiki. + +commit 030c6e855ca61a017bc0481a9f433bc55733f3a3 +Merge: 1594001d2b 4f3ede468c +Author: dingguodong +Date: Thu Jul 29 15:13:14 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1594001d2b1df0dc311992443ef1a4da7666ca9f +Author: dingguodong +Date: Thu Jul 29 15:12:49 2021 +0800 + + * Optimize run gitlab pipeline. + +commit 2dc9795baef3cc1aef10e9b5b0346bad5b525ab3 +Author: dingguodong +Date: Thu Jul 29 15:12:41 2021 +0800 + + * Update create pipeline function. + +commit 0a131fe8db8efc427743cdf1a3d99582bdbee841 +Author: wangyidong +Date: Thu Jul 29 15:12:10 2021 +0800 + + * finish task #40432. + +commit 561ab1567dae6da63b9c073948ff84afbdb92109 +Author: dingguodong +Date: Thu Jul 29 15:12:05 2021 +0800 + + * Add more pipeline status. + +commit 4f3ede468c6be8dbbadb87298f0720f78e104d10 +Author: Guan Xiying +Date: Thu Jul 29 15:11:31 2021 +0800 + + * Clear codes for sync gitlab issues. + +commit 5a859f383f927cb501708c5d39210e2945ae4c46 +Author: Hao Sun +Date: Thu Jul 29 15:05:08 2021 +0800 + + * refactor: format. + +commit 3fe55c479fb213ee9f0d1a8fc36f35c3f163d41f +Author: Hao Sun +Date: Thu Jul 29 15:05:03 2021 +0800 + + * improve style for doc page. + +commit 885d0f5c859e3fe3ff1d92bafcb26ca7ccf7b3b3 +Merge: 1468397f36 f5c43c1bbd +Author: hufangzhou +Date: Thu Jul 29 14:52:48 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1468397f368b1aa7ce13460b7a79b4456ce16480 +Author: hufangzhou +Date: Thu Jul 29 14:52:43 2021 +0800 + + * Fix bug #13908. + +commit f5c43c1bbdf2941b0e9d5a53a96cd424ae971840 +Author: Hao Sun +Date: Thu Jul 29 14:46:29 2021 +0800 + + * improve style for page project/browse. + +commit db0416297ab909bdf6e843cbd2889cb544f372b2 +Author: Guan Xiying +Date: Thu Jul 29 14:22:04 2021 +0800 + + * Clear codes for sync gitlab isssues. + +commit 2c02bfb29cca17bc960fc06d1ff28aedf38e4403 +Author: holan20180123 +Date: Thu Jul 29 14:17:33 2021 +0800 + + * Remove condition of doc to max. + +commit ca73612e3a3341062d9357c518211ae6286ca3f4 +Author: holan20180123 +Date: Thu Jul 29 14:04:34 2021 +0800 + + * Fix bug #13825. + +commit 17639c9a4dc496638390c14ec4314b6a348bcdba +Merge: 6195295a3a 5fa44cf80f +Author: holan20180123 +Date: Thu Jul 29 13:51:36 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6195295a3adccb32a5040af71fb6f02948928aab +Author: holan20180123 +Date: Thu Jul 29 13:51:00 2021 +0800 + + * Fix bug #13928. + +commit 5fa44cf80f1ed990bf008ef5cdc2a19b8704f4a3 +Author: Guan Xiying +Date: Thu Jul 29 13:49:55 2021 +0800 + + * Clear codes for GitLab issue synchronous operation. + +commit 6f851b6a334834e7ec59f16f3e182aee446c3709 +Author: Guan Xiying +Date: Thu Jul 29 13:37:33 2021 +0800 + + * Revert sync issues menu. + +commit 150d84d4c32440de7efa520483b5198bbd22f32d +Author: holan20180123 +Date: Thu Jul 29 13:31:07 2021 +0800 + + * Fix bug #13928. + +commit 72574418023099c30b88d0ca9cfdd1b3431a246e +Author: Yagami <976204163@qq.com> +Date: Thu Jul 29 13:21:47 2021 +0800 + + * Fix burn data error. + +commit be6f9a010beb9c917ca18f50c712a17ce668d6b6 +Author: tianshujie98 +Date: Thu Jul 29 10:29:27 2021 +0800 + + fy the remaining working hours of the project card and the project overview. + +commit c27a19e7f0023137c0ba700f731f7c7c0a44e712 +Author: tianshujie98 +Date: Thu Jul 29 09:41:35 2021 +0800 + + * Modify the jump link parameters after the project is successfully created. + +commit d097328cfd38bacc40f800de3cdd2bd9e687850e +Author: qiyu-xie +Date: Thu Jul 29 09:31:37 2021 +0800 + + * Modify download fail when batch load. + +commit 689d01a15cbf1071bb4b9f520e69d1f352a44615 +Author: tianshujie98 +Date: Thu Jul 29 09:28:35 2021 +0800 + + * When there is no document library added, there is no operation document library button to judge. + +commit a5cea19a104a3247654d72f7e60b62a6a34371b4 +Author: tianshujie98 +Date: Thu Jul 29 09:21:18 2021 +0800 + + * Adjust the style when the project card list has no data. + +commit cfa510b14d969aa24f219d8fdf68d7aea9f73baa +Author: tianshujie98 +Date: Thu Jul 29 09:19:41 2021 +0800 + + * Adjust the drop-down style of the program filter in the item card list. + +commit ecf2a627411d9525cf886d52ac2b06a039d56250 +Merge: 3d202d0dfd 3c1c8ac6c4 +Author: hufangzhou +Date: Thu Jul 29 09:10:07 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3d202d0dfd977b18e28af357039ebec0625bc09d +Author: hufangzhou +Date: Thu Jul 29 09:10:03 2021 +0800 + + * Adjust the dotted line style in table contents page. + +commit 3c1c8ac6c450d95ba3720a2121b285629cfd1f4c +Author: tianshujie98 +Date: Thu Jul 29 09:05:05 2021 +0800 + + * Adjust the column width of the product list under the program. + +commit ce31274d28cbf7f326281e3e39e8e732e91b339b +Author: qiyu-xie +Date: Wed Jul 28 22:48:11 2021 +0800 + + * Add function for batch download. + +commit 8d37af5669bcfa15c1f3817efba20fd4bfadc23f +Author: wangyidong +Date: Wed Jul 28 17:49:03 2021 +0800 + + * code for task #40451. + +commit 8ab984d96883b06bb9e5e2b48749309a63683253 +Author: dingguodong +Date: Wed Jul 28 17:33:19 2021 +0800 + + * Add page of runPipeline and related funcs. + +commit 3312ae8bfd8731f9970d13f6ab4c9435f225f4c8 +Author: dingguodong +Date: Wed Jul 28 17:30:57 2021 +0800 + + + Get project repository branches and tags by api. + +commit 683792d62fd7b5f2f5ec500c6ea8cc2d66e71dcc +Author: Yagami <976204163@qq.com> +Date: Wed Jul 28 16:24:35 2021 +0800 + + * Fix priv bug. + +commit 4f8b9daeeef0165c02567443268583fbf21ca5e9 +Author: tianshujie98 +Date: Wed Jul 28 16:23:06 2021 +0800 + + * Adjust code. + +commit 54f454cac08f2b35f742791535ac466a0b45ed9a +Author: tianshujie98 +Date: Wed Jul 28 15:59:31 2021 +0800 + + * Adjust page. + +commit 04b4c245348e52f1477cbfcf2717126a3f17669f +Author: Yagami <976204163@qq.com> +Date: Wed Jul 28 15:58:46 2021 +0800 + + * Fix priv bug. + +commit 9b6bf1c5cce32e8057e04436e89958a5dd1c254f +Author: holan20180123 +Date: Wed Jul 28 15:01:40 2021 +0800 + + * Fix bug #13892. + +commit 67000ef54252bb221a9a9cd8d87b9779024fbc17 +Author: tianshujie98 +Date: Wed Jul 28 14:47:52 2021 +0800 + + * Fix bug #13868. + +commit d78d2cc3efaf911e8f2da6514d85f987134ef11e +Author: Yagami <976204163@qq.com> +Date: Wed Jul 28 14:44:48 2021 +0800 + + * Fix task #40454. + +commit 11e96fd3f73fb3d5ac45ac8fa3a67f37755fd422 +Merge: 013cb16efe 77698397ad +Author: hufangzhou +Date: Wed Jul 28 14:34:55 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 013cb16efe487ffa8c531544fa4b42a6ea7547dd +Author: hufangzhou +Date: Wed Jul 28 14:34:48 2021 +0800 + + * Adjust the title width in table contents. + +commit 77698397ad6cc1b0979b90678185f345da3188c5 +Author: tianshujie98 +Date: Wed Jul 28 14:30:45 2021 +0800 + + * Fix bug #13846. + +commit a6fda523aae72075dd907fe306ef2e91aa67686e +Merge: 4394d810d0 82239404f1 +Author: tianshujie98 +Date: Wed Jul 28 14:30:34 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4394d810d021936d34c072c0515b7a2fc9a30782 +Author: tianshujie98 +Date: Wed Jul 28 14:04:01 2021 +0800 + + * Adjust page. + +commit 82239404f18f96bf7f041569c02826f47798fd3c +Author: qiyu-xie +Date: Wed Jul 28 14:03:48 2021 +0800 + + * Fix an error. + +commit 79ed62833fd74be2948603b1a906851c5e5fa028 +Author: tianshujie98 +Date: Wed Jul 28 13:56:34 2021 +0800 + + * Fix bug #13872. + +commit 49640a9e3b7ca3988a0c90c2bb232c9d35edaead +Author: qiyu-xie +Date: Wed Jul 28 13:42:07 2021 +0800 + + * Add language for files. + +commit 3f553ea462d0a7a77e8e0b5cd9e14cab1a54c8b8 +Merge: 034fe1fe7a a8e413c921 +Author: tianshujie98 +Date: Wed Jul 28 13:38:20 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 034fe1fe7a4a3786a8a9fc5343cb04d70f5b5dd7 +Author: tianshujie98 +Date: Wed Jul 28 13:38:00 2021 +0800 + + * Fix bug #13853. + +commit a8e413c921ce3cf39372e5b4db0c5bff5bc3983b +Author: Yagami <976204163@qq.com> +Date: Wed Jul 28 13:22:43 2021 +0800 + + * Fix bugs. + +commit 1be5c6bbfda892fbb78b0a6249eeff1a9a07eb9d +Author: qiyu-xie +Date: Wed Jul 28 13:20:12 2021 +0800 + + * Fix an error. + +commit 6d95b80fb18d630b854f8be790e3f4c2481a02e1 +Merge: 9b56250b79 b1eb2ca377 +Author: hufangzhou +Date: Wed Jul 28 13:04:40 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 9b56250b791a2be2a6f1c9fb789fb32886a1c53d +Author: hufangzhou +Date: Wed Jul 28 13:04:34 2021 +0800 + + * Finish task #40501,task #40502. + +commit b1eb2ca377b765389dcf21961bead4c335b94b28 +Author: qiyu-xie +Date: Wed Jul 28 11:37:45 2021 +0800 + + * Adjust code style. + +commit e2e4d0931ba39437960b13f53ab4bdc14ad76fd8 +Author: tianshujie98 +Date: Wed Jul 28 11:36:14 2021 +0800 + + * Add authority. + +commit ccf6ba717424393ac734893eefba5c90b8284831 +Author: zenggang +Date: Wed Jul 28 11:31:46 2021 +0800 + + * Finish task #40443 + +commit 8f40906717d349559e4f8ed2646395b48f6f2295 +Author: qiyu-xie +Date: Wed Jul 28 11:08:57 2021 +0800 + + * Add priv for showfiles. + +commit be6f9dc061c4c007fe3f6450c36cecacf065288a +Author: qiyu-xie +Date: Wed Jul 28 10:57:02 2021 +0800 + + * Fix bug: modify select datatable field name. + +commit 3f52fdcc39686a0e7df19148d9f3580f0a822726 +Author: dingguodong +Date: Wed Jul 28 10:39:35 2021 +0800 + + * Change text margin of id in job browse view. + +commit 906ce0d06dcdbdb21c0e26cf01915486e250ec0e +Author: qiyu-xie +Date: Wed Jul 28 10:37:30 2021 +0800 + + * Fix bug: add open app. + +commit ca8a8229bf71fb2d460b2a9589dc969175549101 +Author: dingguodong +Date: Wed Jul 28 10:33:46 2021 +0800 + + * Display and reformat job log. + +commit 000090ba9629860062f658de972065dcc095a976 +Author: qiyu-xie +Date: Wed Jul 28 10:27:56 2021 +0800 + + * Add notes when have not files. + +commit b78cd5fdcaaea68c32d36d91987e8c4e7378f1b4 +Author: qiyu-xie +Date: Wed Jul 28 10:21:49 2021 +0800 + + * Fix bug: file pager error. + +commit 0cb9d7b116debaa995d5c5c50d030450d9f4a089 +Author: tianshujie98 +Date: Wed Jul 28 10:07:59 2021 +0800 + + * Adjust css. + +commit d4d4e860b3c10b3d21f45c12b0d8f9a878949178 +Author: tianshujie98 +Date: Wed Jul 28 09:56:57 2021 +0800 + + * Adjust css. + +commit ffc05df649be75b4c9260fbc80e514696bfb4cb7 +Author: qiyu-xie +Date: Wed Jul 28 09:31:14 2021 +0800 + + * Task#40529,#40530. + +commit 22820cfc2222d928db94bc000ee33b7b22abfb6a +Author: tianshujie98 +Date: Wed Jul 28 09:30:14 2021 +0800 + + * Fix bug #13828. + +commit f00d5eb4048ede250c03012e48e0ad98f62ede1e +Author: tianshujie98 +Date: Wed Jul 28 09:15:52 2021 +0800 + + * Adjust page. + +commit 3f8e035996f5cd1cd39c55ff32ec7fe1028a1baa +Author: holan20180123 +Date: Wed Jul 28 09:09:52 2021 +0800 + + * Finish task #40498. + +commit cf4aa6d59e360b8515225bdb9677d1676b6e795f +Author: tianshujie98 +Date: Wed Jul 28 09:07:56 2021 +0800 + + * Finish task #40520. + +commit b80572e861da691c4d342fc7a3ab09fd9f6acff8 +Author: holan20180123 +Date: Wed Jul 28 09:04:07 2021 +0800 + + * Finish task #40498. + +commit 523073f4bb35e26bce055910bafb8926224dd784 +Author: tianshujie98 +Date: Wed Jul 28 08:21:29 2021 +0800 + + * Add title. + +commit 263cc1d3c43e67f49d7d85f123873a225d47e404 +Author: tianshujie98 +Date: Wed Jul 28 08:18:21 2021 +0800 + + * Adjust page. + +commit 5c7709d7845aed4928ecc23033e9c218a5c250f1 +Author: dingguodong +Date: Tue Jul 27 20:03:21 2021 +0800 + + * Change gitlab api for getting job log. + +commit f6fe8372b3f85ba432b586dec9db933f7892d589 +Author: Guan Xiying +Date: Tue Jul 27 18:00:59 2021 +0800 + + * Add refresh logs function. + +commit 22e7de0524c67d1236c57c77ba3bce1cf45071a6 +Author: dingguodong +Date: Tue Jul 27 17:26:45 2021 +0800 + + * Display gitlab pipeline log and add refresh button. + +commit e59a6f7b35d7cf5cea436bca599607a13e742897 +Author: Hao Sun +Date: Tue Jul 27 17:06:56 2021 +0800 + + * add new icons. + +commit c0e7db717107db0d71383b708f5ffedb3ad9c567 +Author: holan20180123 +Date: Tue Jul 27 15:12:07 2021 +0800 + + * Finish task #49504. + +commit 61bff4552db14494e1b937e3fbe83a538bfa5c0d +Author: wangyidong +Date: Tue Jul 27 13:32:33 2021 +0800 + + * fix error. + +commit 42588eabfe81b2eff60b6c4f44fb55fc14d9fb2a +Author: wangyidong +Date: Tue Jul 27 13:32:09 2021 +0800 + + * adjust for flow. + +commit 4f29e51ef0c16fbbf0cd913926cbd70cca7a9887 +Author: wangyidong +Date: Tue Jul 27 13:30:38 2021 +0800 + + * fix bug for create action when close story. + +commit 3293dea3c0cd067d0b8f2e8646237986b33d9747 +Merge: 32853c2943 55731a6c50 +Author: holan20180123 +Date: Tue Jul 27 11:33:59 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 32853c29433f1da26d315621b9c2997089d04e27 +Author: holan20180123 +Date: Tue Jul 27 11:32:56 2021 +0800 + + * Finish task #40523. + +commit 55731a6c5038bdaab855bb9fcd231d7dfcb2526c +Author: Guan Xiying +Date: Tue Jul 27 11:05:54 2021 +0800 + + * Add sync gitlab pipeline job status function. + +commit e1e3cf9efa4bae4a5610c5148890402efb399ef1 +Merge: c371d5ae61 e7ce24cf41 +Author: zhujinyong +Date: Tue Jul 27 10:53:45 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit c371d5ae61ccc0bce143f82c2f279e7125d348d1 +Author: zhujinyong +Date: Tue Jul 27 10:53:25 2021 +0800 + + + Add productissue entry point. + +commit e7ce24cf41b9c1d6600e3a1f899b7dd0daddf1c0 +Author: tianshujie98 +Date: Tue Jul 27 10:48:43 2021 +0800 + + * Adjust icon. + +commit a9811d2bfe7ec133f5c85c94f978bd4e18edcbf9 +Author: Guan Xiying +Date: Tue Jul 27 10:39:18 2021 +0800 + + * Trim repo->prefix of gitlab repo. + +commit c68a5aea7ae2d9b8745414bc899c0b0b261b2b3d +Author: dingguodong +Date: Tue Jul 27 10:31:03 2021 +0800 + + * Change display text for corn of job module. + +commit 6a03dfc504e450fb49e9f331b9730d1521e92b8f +Merge: d113a7f150 de7ae809d6 +Author: Guan Xiying +Date: Tue Jul 27 10:03:46 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d113a7f150e327ab37bf4363a2cf5b49dc173874 +Author: Hao Sun +Date: Tue Jul 27 09:55:21 2021 +0800 + + * bug #13848, fix border style for panels and cells. + +commit de7ae809d627b1ce1bafb90554537bb2f7325b08 +Author: Hao Sun +Date: Tue Jul 27 09:55:21 2021 +0800 + + * bug #13848, fix border style for panels and cells. + +commit d10c54fa2c4a71fd45d362b09d3dea416f6200f0 +Author: wangyidong +Date: Tue Jul 27 09:50:38 2021 +0800 + + * fix bug #13850. + +commit 2187c2bbe8dca7ef304a8f3f556f84eb04c86b8b +Author: holan20180123 +Date: Tue Jul 27 09:39:04 2021 +0800 + + * Finish task #40523. + +commit 704cee37ec7dfbe7e80500a5a6fc591f014e75d8 +Author: dingguodong +Date: Tue Jul 27 09:23:51 2021 +0800 + + * Adjust editing a job. + +commit 5f437c5387049d403c50f55a3ea4e893e953a22a +Author: dingguodong +Date: Tue Jul 27 09:22:41 2021 +0800 + + * Correct bad display text. + +commit 5dd8dccdce1a47e0eb45f59efb3e633f94a58181 +Merge: bebcc1488f 7c5bccaaac +Author: dingguodong +Date: Tue Jul 27 09:21:59 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 7c5bccaaacf58595531ff1c79e25d8e0bb014626 +Author: Hao Sun +Date: Tue Jul 27 09:22:52 2021 +0800 + + * bug #13851, fix search panel not show when use theme "blue". + +commit bebcc1488f0f06319d5bfe0671e39f04c9aa13e4 +Author: dingguodong +Date: Tue Jul 27 09:21:12 2021 +0800 + + * Adjust form row sequence for creating job. + +commit c3a28b5c5b733be48ed22f1666a488a31312da94 +Merge: 84f4723fb6 12fb7839b7 +Author: wangyidong +Date: Mon Jul 26 17:41:57 2021 +0800 + + Merge branch '15.2' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.2 + +commit 84f4723fb62c258f2cc8fcc74560923e7716697f +Author: wangyidong +Date: Mon Jul 26 17:41:35 2021 +0800 + + * finish task #40452. + +commit 843050d16773b68b75d5e33c4a71d1f7e22e0ba1 +Author: Hao Sun +Date: Mon Jul 26 17:08:23 2021 +0800 + + * fix angle icon color in header for theme "blue". + +commit a8a676a2a3c72ad041105f07e9e01dc2de5378aa +Author: tianshujie98 +Date: Mon Jul 26 16:57:42 2021 +0800 + + * Adjust page. + +commit 12fb7839b79a6e0d55118624f7c7ee5514555b4e +Author: zenggang +Date: Mon Jul 26 16:47:26 2021 +0800 + + * Finish task #40461 + +commit 56d7700f3863309f93ca1946027dd4a400cf3a82 +Author: dingguodong +Date: Mon Jul 26 16:27:04 2021 +0800 + + * Change gitlabpipeline to gitlab. + +commit 4e99693ed9ed1b67b1f4689dc0261a751356e122 +Author: dingguodong +Date: Mon Jul 26 16:24:32 2021 +0800 + + - Remove gitlabpipeline. + +commit 5c313eef531c00067cc4a42ecf6892e21267a4e4 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 26 16:22:01 2021 +0800 + + * Finish task #40431. + +commit 4604f26da9d07b1212ff44f697b88331faedac6e +Author: dingguodong +Date: Mon Jul 26 16:19:21 2021 +0800 + + * Put functions from gitlabpipeline into gitlab. + +commit ab6c5743dfc976bcef641cb013613fc28c37824a +Merge: b4308635cd 7dc0b31a96 +Author: Guan Xiying +Date: Mon Jul 26 15:52:01 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b4308635cd4b14beeeab95c53f01134ca4cedc53 +Author: Guan Xiying +Date: Mon Jul 26 15:51:26 2021 +0800 + + * Use job::exec to execute one gitlab ci job. + +commit 7dc0b31a968caed287eb5beeddd72eeeb5aeeb4c +Author: holan20180123 +Date: Mon Jul 26 15:40:21 2021 +0800 + + * Adjust hover style. + +commit 6963df112f9a23a512dad6569fd75e32b90a21a0 +Author: holan20180123 +Date: Mon Jul 26 15:17:12 2021 +0800 + + * Hidden file aciton buttons when full screen doc. + +commit 97d96be74bdf4b78dd4c4af6986bd56f3b0b2a4a +Author: Hao Sun +Date: Mon Jul 26 15:05:22 2021 +0800 + + * update zui.js. + +commit 68e47b4b7e86981c4a244346ed0f85ff08733b7d +Author: holan20180123 +Date: Mon Jul 26 14:55:39 2021 +0800 + + * Finish task #40499. + +commit a311c88903239dbcb2dd64ad78031d442008f0dc +Author: dingguodong +Date: Mon Jul 26 14:44:22 2021 +0800 + + * Run gitlab pipeline. + +commit 1fe958fd5fa04278a07e9b1bd805fbb7c4803e91 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 26 14:13:00 2021 +0800 + + * Finish task #40458. + +commit 6ce1007028f7ee310c7ab087bbea19c7d821708f +Merge: db9c20ddec 9962d22eec +Author: holan20180123 +Date: Mon Jul 26 13:31:04 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit db9c20ddecd525b75bf497ff9885f8181be45445 +Author: holan20180123 +Date: Mon Jul 26 13:30:56 2021 +0800 + + * Adjust upgrade tips. + +commit 9962d22eec0de43a6f992a8fcdfb39c612fd3574 +Merge: 58eefc28fc ec3c0e6003 +Author: hufangzhou +Date: Mon Jul 26 13:17:32 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 58eefc28fcc42cb7aadf646bee7914d244c1abd1 +Author: hufangzhou +Date: Mon Jul 26 13:17:28 2021 +0800 + + * Adjust the code. + +commit 9ec3e847d97b5fec0454a858a34131470834e69b +Author: wangyidong +Date: Mon Jul 26 13:07:31 2021 +0800 + + * code for task #40466. + +commit ec3c0e6003d7458d0c2947a935ea95cd7768442c +Merge: ead006c413 358455547c +Author: Guan Xiying +Date: Mon Jul 26 11:50:40 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ead006c413633ecffbd207ff335675432f29a124 +Author: Guan Xiying +Date: Mon Jul 26 11:50:05 2021 +0800 + + * Adjust styles of job engine. + +commit b1e233feb18d807643252c94f85080880d3d3211 +Merge: effe28a36e 6fab61854b +Author: wangyidong +Date: Mon Jul 26 11:46:35 2021 +0800 + + Merge branch '15.2' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.2 + +commit effe28a36ee7a1af5019252d0b236dbe27ce3677 +Author: wangyidong +Date: Mon Jul 26 11:46:06 2021 +0800 + + * finish task #40466. + +commit 12361696b2304e56df72e540f3e71fe763c60167 +Author: wangyidong +Date: Mon Jul 26 11:45:13 2021 +0800 + + * fix bug #13812. + +commit 358455547ca29f17b02d13a5b32605b170921d93 +Merge: 1dcc5b11c3 440d037368 +Author: hufangzhou +Date: Mon Jul 26 11:45:02 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1dcc5b11c3c2d78edcef216ee371dac837893713 +Author: hufangzhou +Date: Mon Jul 26 11:44:56 2021 +0800 + + * Finish task#40496. + +commit 440d037368fb81fa2e2397bfaae6da0e1b2e2417 +Author: dingguodong +Date: Mon Jul 26 11:39:51 2021 +0800 + + * Remove useless spaces. + +commit f2278a737e41228ae07bebe143c6962ab97abf35 +Author: Hao Sun +Date: Mon Jul 26 11:38:26 2021 +0800 + + * improve style of home button for app "devops". + +commit 4d90a115cbb120af8240775db843e1fe564119b7 +Author: Hao Sun +Date: Mon Jul 26 11:32:45 2021 +0800 + + * change style of devops item in menu. + +commit 8d7f8d7c17961017a5156e093a7e8513410e4684 +Merge: 4dba1fa124 db9769248f +Author: Guan Xiying +Date: Mon Jul 26 11:30:44 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4dba1fa124d2870beaa5fe35a827f5c6850c1712 +Author: Guan Xiying +Date: Mon Jul 26 11:29:34 2021 +0800 + + * Hide Sever and task item when edit gitlab job. + +commit db9769248f8859cf5877a7455adf254bc436adc9 +Author: qiyu-xie +Date: Mon Jul 26 11:21:01 2021 +0800 + + * Finish task#40506. + +commit b108616049f84ac14031f61807eae3e3d4e834b4 +Author: Hao Sun +Date: Mon Jul 26 11:17:55 2021 +0800 + + * fix menu text of help app not show. + +commit 4582305006c64bbbac4e5893254c14aae92dfba1 +Author: Hao Sun +Date: Mon Jul 26 11:12:00 2021 +0800 + + * typo. + +commit 636dfa096d878382278328f1746130ed65d78fd0 +Author: holan20180123 +Date: Mon Jul 26 11:12:33 2021 +0800 + + * Finish task #40497. + +commit 9a095764309e9c7571c5f2365bd539dbef83c636 +Author: Hao Sun +Date: Mon Jul 26 10:47:49 2021 +0800 + + * task #40521, improve theme "blue"（青春蓝）. + +commit 95d5d44fd2db95cc74081e6a6ea1eb5863c2d2b2 +Author: tianshujie98 +Date: Mon Jul 26 10:34:14 2021 +0800 + + * Adjust button. + +commit c8eb402aad08381bdbecdd2fd6922cbd91034b13 +Author: holan20180123 +Date: Mon Jul 26 10:30:32 2021 +0800 + + * Finish task #40497. + +commit a4cf5f82433116d2d9e4aacafbd75e46a2f3af7f +Author: Hao Sun +Date: Mon Jul 26 10:22:36 2021 +0800 + + * update zenicons. + +commit 0426b0d3ffe1533fbb728823deb8bb8525f38590 +Author: tianshujie98 +Date: Mon Jul 26 10:02:45 2021 +0800 + + * Finish task #40518. + +commit 60e9643246783f4b11f96f061642c36f3de744f8 +Author: qiyu-xie +Date: Mon Jul 26 09:58:25 2021 +0800 + + * Finish task#40513. Adjust program progress display style. + +commit b4833f74e8b9349106d6e1d9fe00c4e222adee17 +Author: dingguodong +Date: Mon Jul 26 09:33:23 2021 +0800 + + * Display gitlab project name. + +commit 309d3720450e6f8447b60aeaf34ea0767cd8f7f9 +Author: dingguodong +Date: Mon Jul 26 09:32:43 2021 +0800 + + + Add getGitlabProjectName func. + +commit 1cb5122e74b2f1dc4399eb453735642bbda431d2 +Author: dingguodong +Date: Mon Jul 26 09:31:59 2021 +0800 + + + Add apiGetSingleProject func. + +commit 8b6c3073d4500efab0e167f3d637be3bb2464524 +Merge: c18b85dbda fbd82f1d7c +Author: tianshujie98 +Date: Mon Jul 26 09:27:36 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit c18b85dbda7a8069b80e99478c1f651e43b8bc33 +Author: tianshujie98 +Date: Mon Jul 26 09:27:12 2021 +0800 + + * Finish task #40518,#40519. + +commit fbd82f1d7c5e2b5b121d7d74496befda6a7bcae2 +Author: qiyu-xie +Date: Mon Jul 26 08:59:47 2021 +0800 + + * Modify icon-product color. + +commit 6fab61854b2b5c797ba4413137edf42050066061 +Author: zenggang +Date: Sat Jul 24 23:07:22 2021 +0800 + + * Finish task #40413 + +commit fa3da1b7b42f840b204d05125337d84b953d27e2 +Author: dingguodong +Date: Fri Jul 23 17:57:05 2021 +0800 + + * Change display name in browse view of job module. + +commit 5bd9aa23b3447fde9a21d35b0dd1d9f9d5ba1c96 +Author: dingguodong +Date: Fri Jul 23 17:48:59 2021 +0800 + + * Create gitlab pipeline(staging). + +commit e3ca8c84f8fc935d630461b9a0cc4e451e4f1ac5 +Author: Hao Sun +Date: Fri Jul 23 17:44:42 2021 +0800 + + * task #40521, add new theme "blue"（青春蓝）. + +commit a8cc7592a1d24fb3e76831c7ef845e0fa50ae09a +Author: Yagami <976204163@qq.com> +Date: Fri Jul 23 16:13:07 2021 +0800 + + * Fix project datatable details. + +commit ccdb189af44e4f38d2d37ef730330c6438a275c7 +Author: Yagami <976204163@qq.com> +Date: Fri Jul 23 16:01:13 2021 +0800 + + * Code for task #13559. + +commit 3d1aafd882e744e3da9a838da9703f18f2757bb1 +Author: qiyu-xie +Date: Fri Jul 23 15:27:18 2021 +0800 + + * Finish task#40524. + +commit f65206c38dedf9d506f4baa11e3e2f2c6334aa3f +Author: Hao Sun +Date: Fri Jul 23 15:18:18 2021 +0800 + + * add icon-ops. + +commit fcbf7ea63aa325307681c38ba92b5566162790f4 +Author: qiyu-xie +Date: Fri Jul 23 15:15:42 2021 +0800 + + * Fix a bug: empty program progress has error. + +commit bfe3bcf3dda57a90cfe78767d9fb20d888ba7ad0 +Author: Yagami <976204163@qq.com> +Date: Fri Jul 23 15:10:39 2021 +0800 + + * Code for task #40447. + +commit 750ef9fad315e8f24c065f2a4c690e83d78acb0b +Author: wangyidong +Date: Fri Jul 23 14:48:30 2021 +0800 + + * finish task #40469. + +commit 8f837267c70dccbe5ae8015a116452e7b457cb33 +Author: holan20180123 +Date: Fri Jul 23 14:35:05 2021 +0800 + + * Adjsut full screen style. + +commit b290e2ac4e83ff4370d91251864eb7921a6bd2df +Merge: 8e46156a84 8ff722cf36 +Author: dingguodong +Date: Fri Jul 23 14:34:33 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8e46156a84fd613f2c53f80f1854a1df87c961fa +Author: dingguodong +Date: Fri Jul 23 14:34:09 2021 +0800 + + * Change exec to runPipeline in lang file. + +commit 8ff722cf36a97b3e8bd00403872988864074365b +Author: Hao Sun +Date: Fri Jul 23 14:33:40 2021 +0800 + + * task #40522, brand zentao icons. + +commit 75b77b80dce11fd643275fcc5ab50fc079a1085d +Merge: d05be65e7b 03fec49978 +Author: dingguodong +Date: Fri Jul 23 14:29:40 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d05be65e7b1361fb01ddae103858e5a22d4b8b27 +Author: dingguodong +Date: Fri Jul 23 14:28:44 2021 +0800 + + * Correct misspelled word. + +commit 03fec49978c1e96dc4e08fa2cea7879ae14ff705 +Merge: 954d3c7803 e7c113f935 +Author: holan20180123 +Date: Fri Jul 23 14:26:55 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 954d3c7803dd67f0faf247718524b88db75e5a69 +Author: holan20180123 +Date: Fri Jul 23 14:26:44 2021 +0800 + + * Adjust doc style. + +commit e7c113f9353aa5c70e5276154a23fdddd0efed7a +Author: qiyu-xie +Date: Fri Jul 23 14:11:22 2021 +0800 + + * Finish task#40513. + +commit c7ec5e1bdf31e932fddd56216da10c07cc2dd157 +Author: dingguodong +Date: Fri Jul 23 14:11:14 2021 +0800 + + * Rename exec to runPipeline and add this func. + +commit bbd3368393ff1a053e2fa9c573ea64a7b54131f0 +Author: dingguodong +Date: Fri Jul 23 14:09:17 2021 +0800 + + * Rename codes to meet devel rule and bug fix on params. + +commit 4cc45d1e81d4b430d434bc65ced2b715cbb03155 +Merge: 9b638436cf 4c82e0cd9e +Author: hufangzhou +Date: Fri Jul 23 14:07:32 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 9b638436cf350ed7cd43d1b88a33bb1e7df032d3 +Author: hufangzhou +Date: Fri Jul 23 14:07:08 2021 +0800 + + * Fix bug #13796. + +commit 4c82e0cd9e6adfffc3289400b070af5b278597bf +Author: holan20180123 +Date: Fri Jul 23 14:00:29 2021 +0800 + + * Finish task #40505. + +commit 495caf1c77e7ac9cc75ec76b14adb81d6bac994a +Merge: 55b27d6b59 76784bf9cd +Author: reneeteng +Date: Fri Jul 23 13:57:53 2021 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 76784bf9cd53b4cc477489f2d2b952e82a80b0ca +Author: dingguodong +Date: Fri Jul 23 13:35:13 2021 +0800 + + * Add lang support for printIcon on giltabpipeline. + +commit a3296558bf809ec7ce3fec8bd9a3973f189c69be +Author: dingguodong +Date: Fri Jul 23 13:34:13 2021 +0800 + + * Improve code robustness. + +commit b8f1d5c6070b39e95dcddf0914f8a7180eeb4033 +Author: hufangzhou +Date: Fri Jul 23 11:39:17 2021 +0800 + + * Add the images. + +commit 44232d39255e3d9e8652215864306e8944d0bce1 +Author: holan20180123 +Date: Fri Jul 23 11:15:00 2021 +0800 + + * Finish task #40500. + +commit b74462aa35531ddcbd509de37169d8b6125e4085 +Author: lichengjun +Date: Fri Jul 23 11:05:18 2021 +0800 + + * Fix gitlabpipeline module code format. + +commit 029e98d6bfc5f194896f29e5295ee9db5f781a08 +Author: lichengjun +Date: Fri Jul 23 10:59:33 2021 +0800 + + *Adjust code. + +commit 1308cd685e5619a5f5db7d6160193a6469e636ee +Author: tianshujie98 +Date: Fri Jul 23 10:57:02 2021 +0800 + + * Finisht task #40516. + +commit c6225f8b5d0cff22e1b5d0af6dcda1db8c4f7252 +Author: Hao Sun +Date: Fri Jul 23 10:55:03 2021 +0800 + + * ensure visible progress pie inited after toggle nest states @xieqiyu. + +commit 28f38b372854498f909a0d7117580e553babf2ea +Author: dingguodong +Date: Fri Jul 23 10:50:31 2021 +0800 + + * Show gitlab pipeline exec button. + +commit bbd03f9756424fa551674ca0d3341e830139fd0a +Author: holan20180123 +Date: Fri Jul 23 10:46:27 2021 +0800 + + * Finish task #40500. + +commit 42829fa59787f30003c84c89de92edd3cf433d77 +Author: tianshujie98 +Date: Fri Jul 23 10:39:56 2021 +0800 + + * Adjust page. + +commit b140a6c0f7fb4ddc23c47d1a462a0aa5fabe7a06 +Author: dingguodong +Date: Fri Jul 23 10:37:56 2021 +0800 + + * Create gitlab pipeline. + +commit 3214ac9d4907bc91fb624f24c37b5518c62e0939 +Author: tianshujie98 +Date: Fri Jul 23 10:20:32 2021 +0800 + + * Adjust page. + +commit 3e51d30e829c2cc98bb95c59ebe4d0e969f356da +Merge: b9156e2ce1 687fdf9391 +Author: tianshujie98 +Date: Fri Jul 23 10:17:06 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b9156e2ce1ca59e00de3335e8b9af0a037e9a597 +Author: tianshujie98 +Date: Fri Jul 23 10:16:57 2021 +0800 + + * Add lang. + +commit 687fdf939165c453bee2eaedb24d7691168eb7e7 +Merge: 5cedd929a0 ba5e6590cf +Author: dingguodong +Date: Fri Jul 23 10:13:14 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5cedd929a08193742bfb8e2f25403bd6ac81ef4a +Author: dingguodong +Date: Fri Jul 23 10:12:35 2021 +0800 + + * Add gitlab pipeline. + +commit ab500dacb4c1c258b39036ad4cad78629d2b6e6a +Author: dingguodong +Date: Fri Jul 23 10:11:49 2021 +0800 + + * Open gitlab menu. + +commit 7305db37c1d2dfe5389ef2df1211c17018af9be3 +Author: dingguodong +Date: Fri Jul 23 10:09:14 2021 +0800 + + * Revert repo module from jihu branch's feature. + +commit ba5e6590cfb20dc9e75a0bc939aadc51c7cd92ad +Author: lichengjun +Date: Fri Jul 23 10:07:51 2021 +0800 + + Adjust code. + +commit 5a396b1a19d4cecca8bfe04cd47e507a1ccc1676 +Author: lichengjun +Date: Fri Jul 23 09:57:31 2021 +0800 + + * Add gitlabpipeline module. + +commit ac45a3d27b9b3a7b5b1b3495f5c77e3af2555a5b +Author: holan20180123 +Date: Fri Jul 23 09:34:06 2021 +0800 + + * Finish task #40503. + +commit 86063e6236099d1edde423a624fb7eead64184c8 +Merge: f333e1aa21 e7ac26998e +Author: wangyidong +Date: Fri Jul 23 09:25:26 2021 +0800 + + Merge branch '15.2' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.2 + +commit f333e1aa21e67ab746c8d70b318e6abd8a3386f9 +Author: wangyidong +Date: Fri Jul 23 09:24:01 2021 +0800 + + * adjust for flow in GET. + +commit aa34afe4c8c100282c6d3325d92646f1eec6d751 +Author: tianshujie98 +Date: Fri Jul 23 09:15:22 2021 +0800 + + * Finish task #40517. + +commit a846d966b50661799e544fab070ab9a30c889e73 +Author: qiyu-xie +Date: Fri Jul 23 09:07:49 2021 +0800 + + * Add progress at program list. + +commit 6997a6885ffaa3da5156dd6c4ab536edb002b93d +Author: tianshujie98 +Date: Fri Jul 23 08:23:07 2021 +0800 + + * Adjust code. + +commit 07d3d2b61797439393b8d458e2bb2c60f3b85c69 +Author: holan20180123 +Date: Fri Jul 23 08:19:38 2021 +0800 + + * Finish task #40499. + +commit a3eb9ec328f83c5c97706e424e625e59bcc1a584 +Author: tianshujie98 +Date: Fri Jul 23 08:17:47 2021 +0800 + + * Finish task #40515. + +commit 54e19553f5e7ae269b1738631d6e9278b974054b +Author: lichengjun +Date: Thu Jul 22 18:00:12 2021 +0800 + + *Add db update15.2.sql + +commit 438a9a963a6865e83ab095aa102d273afe18b681 +Merge: e8776c4400 f734d04bbc +Author: holan20180123 +Date: Thu Jul 22 17:32:13 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit e8776c440035e789dd7974f7eb600f32fcf3e60d +Author: holan20180123 +Date: Thu Jul 22 17:31:58 2021 +0800 + + * Finish task #40499. + +commit f734d04bbc7f33880dc89dcafa038fc42e7e04de +Merge: b10592575b a10a069fd6 +Author: tianshujie98 +Date: Thu Jul 22 17:30:48 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b10592575bf80d42eedc16f02b63262e65633094 +Author: tianshujie98 +Date: Thu Jul 22 17:30:03 2021 +0800 + + * Finish task #40507. + +commit e7ac26998e208d7d8cf50bc02e4e85dee0e0fdb8 +Author: zenggang +Date: Thu Jul 22 16:48:02 2021 +0800 + + * Finish task #40470 + +commit a10a069fd69d77f7091e0703ff19ebecf98a9e20 +Author: qiyu-xie +Date: Thu Jul 22 16:00:07 2021 +0800 + + * Finish task#40514. + +commit 0db7f60ed2df3fcdaaa019b08ebc7293a21fdad8 +Author: dingguodong +Date: Thu Jul 22 15:25:32 2021 +0800 + + * Change ajaxGetProductByRepo function. + +commit 5a5436ffc59773d1cdb93f193dc5f3c46fbe1381 +Merge: 07cac61f4c cf9275cbae +Author: wangyidong +Date: Thu Jul 22 15:09:24 2021 +0800 + + Merge branch '15.2' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.2 + +commit 07cac61f4c5c6b100079f6f535862c668ddddefb +Author: wangyidong +Date: Thu Jul 22 15:08:57 2021 +0800 + + * adjust for substatus. + +commit f91513425fac616024790178ab87a8918701cd6a +Author: holan20180123 +Date: Thu Jul 22 14:59:11 2021 +0800 + + * Finish task #40491. + +commit 048ec8020b346530f0614d214298fcaed3dca389 +Author: Yagami <976204163@qq.com> +Date: Thu Jul 22 14:56:36 2021 +0800 + + * Code for bug #13766. + +commit 5a25b835ff9852a9486c5cbf880d8f77fb08a56e +Author: qiyu-xie +Date: Thu Jul 22 14:40:05 2021 +0800 + + * Finish task#40512. + +commit 39dd1339baad795ee3d5a00d1a0aa4e0d3e73f08 +Author: qiyu-xie +Date: Thu Jul 22 14:32:13 2021 +0800 + + * Finish task#40512. + +commit 94d2a7e78112c4e3bfb207a9422cd6d14db585f2 +Author: qiyu-xie +Date: Thu Jul 22 14:14:19 2021 +0800 + + * Adjust code. + +commit d06c0b12f21a0eb1a1779736900424d0a237a9bb +Author: holan20180123 +Date: Thu Jul 22 14:06:03 2021 +0800 + + * Finish task #40490. + +commit 101a8a16b5f556ab336872a178be7cc1066bbc06 +Author: qiyu-xie +Date: Thu Jul 22 14:02:24 2021 +0800 + + * Finish task#40489. + +commit 7d2733396d5c6bb550865b380b79f29944875b6e +Author: Yagami <976204163@qq.com> +Date: Thu Jul 22 13:53:11 2021 +0800 + + * Fix bug #13766. + +commit 599e51660bea3758391cc888201e3c1e85215288 +Author: qiyu-xie +Date: Thu Jul 22 13:39:34 2021 +0800 + + * Finish task#40489. + +commit cf9275cbaee2ad8fe5cd7982d72f28019fc44072 +Author: zenggang +Date: Thu Jul 22 13:27:43 2021 +0800 + + * Finisth task #40426 + +commit 260c129f3055c34a2b8e8442b61a7ddffe78ddbc +Merge: 90c3ce0e81 17780ea4a1 +Author: holan20180123 +Date: Thu Jul 22 11:33:43 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 90c3ce0e81e85777594c16f8f42d230a6a98769e +Author: holan20180123 +Date: Thu Jul 22 11:33:29 2021 +0800 + + * Finish task #40503. + +commit 17780ea4a19a6df4fb944fe8a2c92dffac366913 +Merge: fb9d13856b 85d80014dd +Author: hufangzhou +Date: Thu Jul 22 11:01:29 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit fb9d13856b2d20d01d7117910b9525c961fe16a0 +Author: hufangzhou +Date: Thu Jul 22 11:01:23 2021 +0800 + + * Finish task #40495. + +commit 85d80014ddc355678328d64b753c6a59f56c4f40 +Author: tianshujie98 +Date: Thu Jul 22 10:48:06 2021 +0800 + + * Finish task #40510. + +commit 85e974c7a14056d5cb0cd6b2c29073aca6efc2ca +Merge: dd4372e1eb 1b03630493 +Author: hufangzhou +Date: Thu Jul 22 10:46:13 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit dd4372e1eb01490da5cabad56b2f6b40d5e082d4 +Author: hufangzhou +Date: Thu Jul 22 10:46:08 2021 +0800 + + * Finish task #40494. + +commit 1b03630493a02bbe95f49f94ba7d369a71fe673c +Author: dingguodong +Date: Thu Jul 22 10:42:30 2021 +0800 + + + Add getting product by repo. + +commit 6b57df2abcde9f10d99945285c0b1267bb3ca6ad +Merge: 1f81cb5c18 7de636609c +Author: hufangzhou +Date: Thu Jul 22 10:37:43 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1f81cb5c18c39a1df152e89d91eb8e27256cba62 +Author: hufangzhou +Date: Thu Jul 22 10:37:39 2021 +0800 + + * Finish task #40493. + +commit 7de636609cd5d5b6644eec1bc5d538604f81ce48 +Author: qiyu-xie +Date: Thu Jul 22 10:28:48 2021 +0800 + + * Finish task#40512. + +commit 94ba06cf2ab6732bab813cefa609d43d8f8bd5e5 +Author: qiyu-xie +Date: Thu Jul 22 10:23:28 2021 +0800 + + * Finish task#40511. + +commit 6cfa9a5878d6c73e077c5733ac764ed3407cec11 +Author: tianshujie98 +Date: Thu Jul 22 10:04:09 2021 +0800 + + * Finish task #40508. + +commit 546ed93e743af3ffa83a91f8be6c058821d2b961 +Author: wangyidong +Date: Thu Jul 22 09:42:30 2021 +0800 + + * finish task #40477. + +commit daf877dfb669ec54d81a7a241edce4775bdf7615 +Author: dingguodong +Date: Thu Jul 22 09:30:46 2021 +0800 + + * Add gitlab to pipeline job(staging). + +commit bbf8e0b88be034f89ecb583b83b05ca998c853e8 +Author: dingguodong +Date: Thu Jul 22 09:29:52 2021 +0800 + + * Rename function name for jenkins. + +commit efbfe56d27e861931212bc8cdc2ce6dbeca52d18 +Author: dingguodong +Date: Thu Jul 22 09:28:36 2021 +0800 + + * Comment gitlab menu instead of deleting it. + +commit 21c9ee13bc4a5729c259ec2c2f34ca22ebc79e09 +Author: dingguodong +Date: Thu Jul 22 09:27:24 2021 +0800 + + + Add ajaxc getting gitlab project pipeline. + +commit ca014d182f34a24df13a33613eaa05ada959f299 +Author: dingguodong +Date: Thu Jul 22 09:25:09 2021 +0800 + + * Enable newer gitlab module for repo. + +commit cfee7fdf8f0b26aaf0abe655c112bc95412401be +Author: dingguodong +Date: Thu Jul 22 09:23:18 2021 +0800 + + * Remove warning message for git repo. + +commit dd1331d853295daf5ecf27fbacebb955cee8a980 +Merge: 3384f53fa9 eb5a96a23b +Author: wangyidong +Date: Wed Jul 21 17:42:02 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3384f53fa957de890ea2fb8dedda8c16b5885aa3 +Author: wangyidong +Date: Wed Jul 21 17:41:43 2021 +0800 + + * fix bug. + +commit eb5a96a23b21afa60ac08421cbb312649c3b756d +Merge: f157a35f20 9646584b16 +Author: zhujinyong +Date: Wed Jul 21 13:59:40 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 9646584b165f8d143b1e1edc0e95efa8721371a5 +Merge: 443f016f25 bbee699fe8 +Author: dingguodong +Date: Wed Jul 21 13:58:16 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f157a35f20581491eaef90464bf2dce262408db5 +Author: zhujinyong +Date: Wed Jul 21 13:57:30 2021 +0800 + + * Add params of list. + +commit 443f016f252d968bd92658477849deab736e0018 +Author: dingguodong +Date: Wed Jul 21 13:57:20 2021 +0800 + + * Finish task #40406 (change jenkins variables to general name). + +commit bbee699fe87367742d8768a1a99485694ee83a40 +Author: tianshujie98 +Date: Wed Jul 21 12:12:41 2021 +0800 + + * Fix bug #13743. + +commit 7781d1d5fdb9217355f5dcfac78b8f563399f1b5 +Author: zenggang +Date: Wed Jul 21 11:44:13 2021 +0800 + + * Finish bug #13740 + +commit 7c0ee909ec182c69f7619679cc7d267d1945e6ff +Author: tianshujie98 +Date: Wed Jul 21 11:38:10 2021 +0800 + + * Fix bug #13744. + +commit fa763bc55028a933a29eaaed7d3710ecbf436f43 +Author: tianshujie98 +Date: Wed Jul 21 09:43:32 2021 +0800 + + * Fix bug #13742. + +commit f0bb1eb52ba3aa88d99eff2b6da096aeb880b6bf +Author: wangyidong +Date: Wed Jul 21 08:26:59 2021 +0800 + + * adjust for changelog. + +commit 8f6bf9800e878ea4c3d2e593a517684b1e96efb8 +Author: zhujinyong +Date: Wed Jul 21 06:44:41 2021 +0800 + + * Format fields of response data. + +commit 51558901a59bcdb48858fd7ca7bb9c27c94dcc09 +Author: zenggang +Date: Tue Jul 20 18:30:19 2021 +0800 + + * Finish task #40117 + +commit 16e442433ae58952ac2a8f97936a750182de6603 +Author: qiyu-xie +Date: Tue Jul 20 17:30:03 2021 +0800 + + * Fix bug#13685. + +commit 379e0ba43c30b30dd2b067aca7452c302325ac2d (tag: zentaopms_15.2_20210720) +Merge: cfd37eb46d 26bef8c7de +Author: dingguodong +Date: Tue Jul 20 16:49:05 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit cfd37eb46d3d91a58ba11c47add558646ad90326 +Author: dingguodong +Date: Tue Jul 20 16:48:41 2021 +0800 + + * Revert jenkins related files. + +commit 26bef8c7de17d2613137c8f301f4deb8c659c56d +Merge: eab9f17636 4171ee28b2 +Author: wangyidong +Date: Tue Jul 20 16:48:34 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit eab9f176366b0bf3533868c3eddb5461230d889b +Author: wangyidong +Date: Tue Jul 20 16:48:14 2021 +0800 + + * adjust for english. + +commit 4171ee28b20834e13ffd99ff429da6d1dbdebca3 +Author: qiyu-xie +Date: Tue Jul 20 16:35:03 2021 +0800 + + * Fix bug#13716. + +commit 499a4dbec05dc1bc1f5411ca2da774fafc3610f4 +Merge: 1ae0fcda04 661dcdcc13 +Author: holan20180123 +Date: Tue Jul 20 16:14:12 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1ae0fcda0479968be5b0729dda79a040d479ed6e +Author: holan20180123 +Date: Tue Jul 20 16:13:54 2021 +0800 + + * Adjsut page style of install. + +commit 661dcdcc13a9db78f7ab1ed7830f0772b796f43d +Author: dingguodong +Date: Tue Jul 20 16:13:48 2021 +0800 + + + Add engine column to zt_job. + +commit 7f491bea77851d25f22592acf27f19a2640d894d +Merge: e5ea831b9d 88d24e684b +Author: dingguodong +Date: Tue Jul 20 16:06:33 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit e5ea831b9de51021e55f0de8c7ba4be11df4e750 +Author: dingguodong +Date: Tue Jul 20 16:05:43 2021 +0800 + + * Change jenkins variables to general name. + +commit 88d24e684b6479bba3ff2ffeae6d035bf1e07313 +Author: qiyu-xie +Date: Tue Jul 20 15:59:49 2021 +0800 + + * Fix bug#13725. + +commit 616f719120a9f27f6fa1c267821b1f2afc95ad20 +Author: hufangzhou +Date: Tue Jul 20 15:11:06 2021 +0800 + + * Adjust the product link in product dynamic page. + +commit ea6c40b244f61ce83776fa210ba847df2860d32d +Merge: c3d74652be 824f465f8e +Author: hufangzhou +Date: Tue Jul 20 14:47:02 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit c3d74652be5c95c379060bd3e1bb7e725ed5aa48 +Author: hufangzhou +Date: Tue Jul 20 14:46:56 2021 +0800 + + * Fix bug #13713. + +commit 824f465f8e45853dc9d10de3f36dfce5ca89148e +Author: holan20180123 +Date: Tue Jul 20 14:44:10 2021 +0800 + + * Adjust update mode. + +commit 56d0edbf4b6f9f670f145a7873278c3c1f252c2b +Author: holan20180123 +Date: Tue Jul 20 14:42:57 2021 +0800 + + * Fix update mode. + +commit 68c2583a38bf6042ffec3ce884b32bbf4eb2f233 +Author: wangyidong +Date: Tue Jul 20 14:35:56 2021 +0800 + + * change AUTHORIZATION to TOKEN. + +commit f6c4075c55db2aa5b00b720010e5dfde97a85c99 +Author: qiyu-xie +Date: Tue Jul 20 14:23:38 2021 +0800 + + * Fix bug#13727. + +commit 6f8222ae97078d1014048defa512532dd4ffc6ed +Merge: c757f08599 391ac55824 +Author: wangyidong +Date: Tue Jul 20 14:18:19 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit c757f08599a9376750dfb9a65aa2c03bf237cd74 +Author: wangyidong +Date: Tue Jul 20 14:18:06 2021 +0800 + + * remove gitlab. + +commit 391ac558249379ca25506395c2d6415832410216 +Author: holan20180123 +Date: Tue Jul 20 14:09:46 2021 +0800 + + * Adjust executionCommon to projectCommon when upgrade. + +commit 49215a71e931ce49a34253fe7c41add1aa935a85 +Merge: 6d897cf2d1 7aacb6717a +Author: wangyidong +Date: Tue Jul 20 14:03:21 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6d897cf2d1b2b5e29b68a4c6e9e256325a5d9366 +Author: wangyidong +Date: Tue Jul 20 14:03:06 2021 +0800 + + * fix bug for sessionID. + +commit 7aacb6717aa150a8bf9700b0625e804b956f7313 +Author: hufangzhou +Date: Tue Jul 20 14:01:27 2021 +0800 + + * Fix bug #13684. + +commit 2499c19069bef7a2d9e5412156eea47404e6d5ab +Merge: e93daa531e d8a12f6f76 +Author: wangyidong +Date: Tue Jul 20 11:48:11 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit e93daa531e0435116639159a96c50a1e257a8aae +Merge: 8aa8534f73 b320376f87 +Author: wangyidong +Date: Tue Jul 20 11:46:13 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d8a12f6f760dffefd6f24613c8b8fb98ba573211 +Author: holan20180123 +Date: Tue Jul 20 11:45:59 2021 +0800 + + * Adjust project to execution when merage database. + +commit 8aa8534f733cd514343c5e1583d45f0c77724214 +Author: wangyidong +Date: Tue Jul 20 11:45:53 2021 +0800 + + * adjust for sql. + +commit b320376f8716ab1c7244400f6e059b91e3ee90b7 +Author: tianshujie98 +Date: Tue Jul 20 11:43:31 2021 +0800 + + * Historical projects are used as the start and end dates of the updated projects and programs when performing upgrades. + +commit d687dbb8f03636b738c255140805ab2bc00b8a10 +Merge: 5377eef475 19b3b75b2e +Author: wangyidong +Date: Tue Jul 20 11:30:23 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5377eef475395fbc22cbe56ae2788bfdd386470d +Author: wangyidong +Date: Tue Jul 20 11:30:09 2021 +0800 + + * adjust for api. + +commit c47b37d8d7c182d2b91b8f6f48dc308049a15d98 +Author: wangyidong +Date: Tue Jul 20 11:28:10 2021 +0800 + + * fix bug. + +commit 19b3b75b2e3b512049dd81ccb503e75324c6990f +Author: qiyu-xie +Date: Tue Jul 20 11:24:50 2021 +0800 + + * Restore code and fix a bug of unlink project`s product when edit the product has not change program. + +commit 566c87f9405c33816800671121a9e86a0afae822 +Author: tianshujie98 +Date: Tue Jul 20 11:09:34 2021 +0800 + + * Fix the issue of select all product lines. + +commit d8a7c921babdc2d37190d44bc43adf330ad67de9 +Author: qiyu-xie +Date: Tue Jul 20 10:44:25 2021 +0800 + + * Fix a bug of unlink project`s product when edit the product has not change program. + +commit 55b27d6b5954f79b0357e0fc1871695f307eebd2 +Merge: cc0257cf63 2a80e33c1f +Author: reneeteng +Date: Tue Jul 20 10:47:21 2021 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cc0257cf6318d8ff34ed8d80acd93cf5dab94c4b +Author: reneeteng +Date: Tue Jul 20 10:47:04 2021 +0800 + + * Update lang file. + +commit 2a80e33c1ffeb169f3f3e05cce2298ba33c609f9 +Author: tianshujie98 +Date: Tue Jul 20 10:43:47 2021 +0800 + + * Fix the issue of select all projects. + +commit 25fb32ee8d85b6668db81062abd479abd7691116 +Author: reneeteng +Date: Tue Jul 20 10:39:49 2021 +0800 + + * Changed lang file. + +commit d47b6a087a7ce7d0cb8c305be880b8a6fe69f160 +Merge: 1545b21271 566a2091c1 +Author: reneeteng +Date: Tue Jul 20 10:31:51 2021 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 566a2091c12ad1dda0ac26131783265d4ee6f397 +Author: tianshujie98 +Date: Tue Jul 20 10:25:40 2021 +0800 + + * Fix the select all issue. + +commit 23858061c9c201e61a85d7f5b5558642f6400f51 +Author: qiyu-xie +Date: Tue Jul 20 10:16:45 2021 +0800 + + * Fix bug#13686. + +commit ea798466aa3bf03e4eb318ba651d1a4ab641a516 +Author: holan20180123 +Date: Tue Jul 20 10:11:56 2021 +0800 + + * Delete a blank line. + +commit 027408f64d10785220c23f06578dfefc20cb06a2 +Merge: f7284ad5de 4a5a4956f1 +Author: tianshujie98 +Date: Tue Jul 20 10:04:24 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f7284ad5de091c8ec909ba7f10ba68834196c10c +Author: tianshujie98 +Date: Tue Jul 20 10:04:09 2021 +0800 + + * Fix comment. + +commit 4a5a4956f1df2b70826c700f0dd090bed1bfa9bb +Merge: 54ff43eb6f cc3574c20a +Author: wangyidong +Date: Tue Jul 20 09:59:33 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 54ff43eb6fe3acaa53276643a8711cf1d113ac4d +Author: wangyidong +Date: Tue Jul 20 09:58:58 2021 +0800 + + * add changelog and zh-tw lang. + +commit cc3574c20aed778e88f927b7f52c153456e55927 +Author: tianshujie98 +Date: Tue Jul 20 09:58:55 2021 +0800 + + * Adjust code. + +commit 66ef18e845619dcedfb5b7c105f7385ffe9f5b95 +Author: tianshujie98 +Date: Tue Jul 20 09:49:31 2021 +0800 + + * Adjust code. + +commit b5864c2e60c3a08fe1b4fd7fb1d7c6252b3d6ad1 +Merge: fc0677d8f5 dcf978f406 +Author: zhujinyong +Date: Tue Jul 20 09:37:16 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit fc0677d8f52b36aeefd1768eaca7e0e89a8c0ab5 +Author: zhujinyong +Date: Tue Jul 20 09:29:30 2021 +0800 + + * Fix list of entry points. + +commit dcf978f406d40e38dede365655cd5db6dccf907a +Author: tianshujie98 +Date: Tue Jul 20 09:26:23 2021 +0800 + + * Adjust code. + +commit ab108bd178600009324452be1c36b60b2cb05bf4 +Merge: 8ce3d4de2a 907f16d5ff +Author: wangyidong +Date: Tue Jul 20 09:05:19 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8ce3d4de2a89dc464edbc3fb5ab098e2ba7ccd02 +Author: wangyidong +Date: Tue Jul 20 09:04:54 2021 +0800 + + * fix error. + +commit 907f16d5fffeea7ec9e7695f896cc944fd0ee9f7 +Author: qiyu-xie +Date: Tue Jul 20 08:31:59 2021 +0800 + + * When project manage product, make normal product without 'has-branch' class. + +commit c9ee925c651e0ff9dbab3d95cb19576bce04e20c +Author: qiyu-xie +Date: Tue Jul 20 08:14:27 2021 +0800 + + * When execution manage products, make the normal product without 'has-branch' class. + +commit 5175ff92220fa90296dd0b59a3ecc5efe0863c26 +Author: tianshujie98 +Date: Tue Jul 20 08:15:23 2021 +0800 + + * Ajust code. + +commit ad51c0ec88b3e59d08c2d68aba64ddeecf96af22 +Author: wangyidong +Date: Mon Jul 19 17:25:59 2021 +0800 + + * adjust for upgrade. + +commit 9a88eb8231704b1310717dbaf35d74de17ec7e44 +Merge: f11a030bfc 7c81657603 +Author: wangyidong +Date: Mon Jul 19 16:48:15 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f11a030bfc259abe691b72b8d587a8004a8548d2 +Author: wangyidong +Date: Mon Jul 19 16:47:56 2021 +0800 + + * adjust for company dynamic. + +commit 7c816576033d1cdb3011e0835002261e7e550e21 +Author: qiyu-xie +Date: Mon Jul 19 16:39:22 2021 +0800 + + * Adujust product icon. + +commit 066b3d709bae5b3628588bff721e2424c3201b1e +Author: holan20180123 +Date: Mon Jul 19 16:35:33 2021 +0800 + + * Adjust edit program and confirm upgrade version. + +commit 4f39fb07851da276ac73ebca7f59a77b98e84517 +Merge: e3605bc30d c9c8e494d0 +Author: zhujinyong +Date: Mon Jul 19 16:32:38 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit e3605bc30dada64f5976fa05198bee406982f532 +Author: zhujinyong +Date: Mon Jul 19 16:32:05 2021 +0800 + + * Fix token name of API. + +commit c9c8e494d0489393e9d3023083b9a5adccf10787 +Author: tianshujie98 +Date: Mon Jul 19 16:30:48 2021 +0800 + + * Ajust code. + +commit 5f7cedfced314eb06f0501796c21bc4f81f7f3d3 +Author: tianshujie98 +Date: Mon Jul 19 16:10:08 2021 +0800 + + * Adjust code. + +commit 44f6c8abee743cc2c50641f1ea4a02dbe6d2f131 +Author: tianshujie98 +Date: Mon Jul 19 16:01:13 2021 +0800 + + * Ajust code. + +commit 1021a6e0dd1219c1523ffc07f2df5b9be16831cc +Author: tianshujie98 +Date: Mon Jul 19 15:55:20 2021 +0800 + + * Ajust code. + +commit 9f289eaef253d98b7d072fe339bdb37a21a0586a +Author: holan20180123 +Date: Mon Jul 19 15:42:39 2021 +0800 + + * Adjust annotation. + +commit e97278cb6ad2cffc5ff7cf29755a0592e7a0d2ef +Author: tianshujie98 +Date: Mon Jul 19 15:18:14 2021 +0800 + + * Fix bug #13715. + +commit 9fcf997f960019efb09baa1adc9fe50b0bc85efc +Author: wangyidong +Date: Mon Jul 19 15:11:42 2021 +0800 + + * adjust for locate url. + +commit afa59e519009faf633c24011e4c8cb294ba0c137 +Merge: 53ea62affd 9a0addce6b +Author: wangyidong +Date: Mon Jul 19 14:43:54 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 53ea62affd6ac85ef4123472f5fe9ad887791438 +Author: wangyidong +Date: Mon Jul 19 14:43:36 2021 +0800 + + * fix bug #13705. + +commit 9a0addce6b6bcef21999d7b809cb4eaede00c9e8 +Author: holan20180123 +Date: Mon Jul 19 14:28:29 2021 +0800 + + * Adjust style of program browse. + +commit d9620805835bfe2baa3033b5de583f8cb814a959 +Merge: de2ce061b2 d75f650c7e +Author: tianshujie98 +Date: Mon Jul 19 14:18:35 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit de2ce061b2239f0c08f1cad793e9af76bde69251 +Author: tianshujie98 +Date: Mon Jul 19 14:18:08 2021 +0800 + + * adjust for upgrade big data. + +commit d75f650c7ebdb111f25fa504e558dad7bae828f9 +Merge: 37f44fbbca cd381775a8 +Author: zhujinyong +Date: Mon Jul 19 11:59:06 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 37f44fbbcac19e286d050d3ebcb56ae036792af0 +Author: zhujinyong +Date: Mon Jul 19 11:58:25 2021 +0800 + + + Add user and bug api. + +commit cd381775a8e33dd50ecc9c266adeef0f43c4b796 +Merge: 5e153036fb 89d109179e +Author: hufangzhou +Date: Mon Jul 19 11:26:58 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5e153036fbde82ddc0b1c29f83acde4a0d802e85 +Author: hufangzhou +Date: Mon Jul 19 11:26:54 2021 +0800 + + * Fix bug #13711. + +commit 89d109179ef0e00ba07f396cefe63623916c84e1 +Author: holan20180123 +Date: Mon Jul 19 11:23:18 2021 +0800 + + * Finish task #40320. + +commit 2d11dcd6cdd16ddef369e3e3e69d75aa4c2fc8f1 +Author: zenggang +Date: Mon Jul 19 11:02:35 2021 +0800 + + * Finish task #40108 + +commit eb41a29bac7fb1d2198edbf3d75ac0fc04e37fb9 +Author: holan20180123 +Date: Mon Jul 19 10:50:24 2021 +0800 + + * Fix bug #13680. + +commit ba403ae52481349e107cd04d6bb677aba380847a +Merge: cb82b46f52 fae99a59ba +Author: lichengjun +Date: Mon Jul 19 10:41:38 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit fae99a59bafee3b5153965b2a7beebc6831b97dc +Author: holan20180123 +Date: Mon Jul 19 10:40:01 2021 +0800 + + * Adjust edit project. + +commit cb82b46f52967479b7f9d3e727bdd9c2204e68c0 +Author: lichengjun +Date: Mon Jul 19 10:37:45 2021 +0800 + + * Fix GitLab Module code. + +commit c2e541b71f377bc57367d7e1b96a4f1b3aca3ed1 +Merge: cef2033d50 78438a723c +Author: hufangzhou +Date: Mon Jul 19 10:07:47 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit cef2033d500fdcd304a6b740183c9e4538ee4476 +Author: hufangzhou +Date: Mon Jul 19 10:07:43 2021 +0800 + + * Fix bug #13702. + +commit 78438a723cfc04ceee7001c196c616bbdbce1d26 +Merge: 2de42041ea 0b387bcd2a +Author: holan20180123 +Date: Mon Jul 19 09:54:01 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 2de42041ea120e1343bde4c14deffa32c6762bdd +Author: holan20180123 +Date: Mon Jul 19 09:53:53 2021 +0800 + + * Adjust edit product. + +commit 0b387bcd2a14f46b13f87e679b3072eea91ef40c +Author: tianshujie98 +Date: Mon Jul 19 09:36:21 2021 +0800 + + * Adjust code. + +commit 054e506fe155f98d5df6efb346dfbc2b82636076 +Author: tianshujie98 +Date: Mon Jul 19 09:33:44 2021 +0800 + + * Adjust code. + +commit 9e904b5dbd7f473820fb820a0e5b795169006b92 +Merge: 9d181f5493 63914b01a2 +Author: hufangzhou +Date: Mon Jul 19 09:17:08 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 9d181f54930bdf87cd1578959a0491bde3ed250a +Author: hufangzhou +Date: Mon Jul 19 09:17:05 2021 +0800 + + * Fix bug #13706. + +commit 63914b01a235d2a822b671144d5e15cdbfa6b0d6 +Author: tianshujie98 +Date: Mon Jul 19 09:04:10 2021 +0800 + + * Ajust code. + +commit 44ad3e602c2aedca7f7ba73fd9dd61c0997aa323 +Merge: 280b62c916 d5569ed55c +Author: hufangzhou +Date: Fri Jul 16 17:32:15 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 280b62c916914679b6a95420bdf3232e314edb01 +Author: hufangzhou +Date: Fri Jul 16 17:32:09 2021 +0800 + + * Fix a bug. + +commit d5569ed55c4e641c972b7c50eee58102de88fed4 +Author: Guan Xiying +Date: Fri Jul 16 17:18:15 2021 +0800 + + * Fix code format and comments of ajaxGetGitlabProjects function. + +commit 779b43eae992bf167c13a477886d5b39ab222372 +Author: holan20180123 +Date: Fri Jul 16 17:01:09 2021 +0800 + + * Finish task #40310. + +commit f75815e4fbe2b99bced59ada21f4d7e02c7db08a +Author: holan20180123 +Date: Fri Jul 16 16:58:36 2021 +0800 + + * Finish task #40305. + +commit ecf2810b1ba8f2d7f4ecd5c23e1f5eabdcb7eb21 +Merge: f21634b963 21a3689bb2 +Author: tianshujie98 +Date: Fri Jul 16 16:50:21 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f21634b963197343322408178c5acf7e6040281c +Author: tianshujie98 +Date: Fri Jul 16 16:50:03 2021 +0800 + + * Adjust language. + +commit 21a3689bb2b8b899080a38855edc9a062b6abc89 +Merge: aa9871385a 48b8cea00c +Author: wangyidong +Date: Fri Jul 16 16:49:59 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit aa9871385affb19d2c9dcc6b983a22afaac26d8d +Author: wangyidong +Date: Fri Jul 16 16:49:35 2021 +0800 + + * fix bug #13618. + +commit 48b8cea00c1a43137ffa638e66aa487ffa3d8107 +Author: holan20180123 +Date: Fri Jul 16 16:42:37 2021 +0800 + + * Adjust product list. + +commit 9491fa4a5c1f5d2cb281bc460621c845cdb05557 +Author: tianshujie98 +Date: Fri Jul 16 16:33:36 2021 +0800 + + * Ajust code. + +commit 2c3c0ce27d79d286c88d4ad3af46bc9298883ba3 +Merge: 8c43cd0fa6 05b564fc39 +Author: wangyidong +Date: Fri Jul 16 16:25:19 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8c43cd0fa6c5ef7f84f2662484795eda44c7337b +Author: wangyidong +Date: Fri Jul 16 16:25:02 2021 +0800 + + * adjust for batchedit. + +commit 05b564fc39c585e6f0b8d06dc47f1297773b51a6 +Author: holan20180123 +Date: Fri Jul 16 16:17:31 2021 +0800 + + * Fix bug #13691. + +commit b93f366581fd93e0729328ec71a87eacbb760d0e +Author: lichengjun +Date: Fri Jul 16 16:12:17 2021 +0800 + + * Adjust GitLab. + +commit 8409cb5b54c328def3680419e851fcc0f1a7180f +Author: tianshujie98 +Date: Fri Jul 16 16:08:16 2021 +0800 + + * Adjust style. + +commit 6d8956ff414c744e0793882ee61d73f42e13cbc6 +Merge: fa7e9fa792 c983c28857 +Author: holan20180123 +Date: Fri Jul 16 16:07:07 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit fa7e9fa7927686d3211e06199dd016979fc5eddf +Author: holan20180123 +Date: Fri Jul 16 16:06:38 2021 +0800 + + * Fix bug #13694. + +commit c983c288579a09aa80b2d0209fd9b170541a35f9 +Author: lichengjun +Date: Fri Jul 16 16:01:28 2021 +0800 + + *Turn off the new GItLab feature. + +commit 782bb743cd3c0ead796292a1f83cf3d6eceacc72 +Merge: d12f9bd00c 3a2d22e188 +Author: wangyidong +Date: Fri Jul 16 15:58:14 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d12f9bd00c874aeaa3858aa3b03876715c7b2402 +Author: wangyidong +Date: Fri Jul 16 15:57:41 2021 +0800 + + * fix bug #13620. + +commit 0f11bf5a2c4bb8345aa3fc93dac2e00ecb081d5b +Author: wangyidong +Date: Fri Jul 16 15:49:26 2021 +0800 + + * fix bug #13648. + +commit 3a2d22e18864d74a817be321c4c0585e810fd67e +Author: tianshujie98 +Date: Fri Jul 16 15:23:41 2021 +0800 + + * Ajust code. + +commit 46688484f6a030c64ad75b24df591ab9b61cb00d +Merge: 42217d6ae9 0eda274189 +Author: tianshujie98 +Date: Fri Jul 16 15:07:22 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 42217d6ae9c3a76300d5b92aa7b415b7abdef081 +Author: tianshujie98 +Date: Fri Jul 16 15:07:06 2021 +0800 + + * Adjust code. + +commit 0eda27418992f18fe71d78f7da15468285245f77 +Merge: 4fe3d248cd 3c353c91cc +Author: wangyidong +Date: Fri Jul 16 15:01:15 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4fe3d248cd79ba34786bcc7314446122c82f8410 +Author: wangyidong +Date: Fri Jul 16 15:00:36 2021 +0800 + + * fix bug #13699. + +commit 3c353c91ccc1716ab8efa6020021a22959d283e7 +Merge: f91b8b975a c787551eb0 +Author: hufangzhou +Date: Fri Jul 16 14:55:10 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f91b8b975acd39689dd76758cb4bf1b5b70438b7 +Author: hufangzhou +Date: Fri Jul 16 14:55:06 2021 +0800 + + * Finish task #40295. + +commit c787551eb00a1ba44d24be7c3ffb0660c0014a4c +Merge: eb93e37b04 7811676145 +Author: wangyidong +Date: Fri Jul 16 14:41:25 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit eb93e37b045cc8f10d616cd774a02f40c5ca37e0 +Author: wangyidong +Date: Fri Jul 16 14:41:13 2021 +0800 + + * fix error. + +commit 78116761450113b51a5849097f927d6d22836598 +Merge: a7d53c67e7 f27a385438 +Author: lichengjun +Date: Fri Jul 16 14:40:29 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit a7d53c67e790fb2a2e1bdcdea9ceb7deb085c687 +Author: lichengjun +Date: Fri Jul 16 14:39:07 2021 +0800 + + *Fix bug ID 40655. + +commit 4c43ac17b4c209f7621d41ab6e4f80ad6a02501d +Merge: d18d3e3024 f27a385438 +Author: wangyidong +Date: Fri Jul 16 14:38:17 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d18d3e302427213f44f5026b37db4c71c4eb08ea +Author: wangyidong +Date: Fri Jul 16 14:37:56 2021 +0800 + + * fix error. + +commit f27a385438e9f86c2147431f049d6e156c6f53d3 +Merge: 3533722c49 eec44392ca +Author: zenggang +Date: Fri Jul 16 14:36:17 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3533722c49f927a40ed46217c5b1b9450d511c93 +Author: zenggang +Date: Fri Jul 16 14:35:43 2021 +0800 + + * change video src task #40002 + +commit eec44392caabac93d4c875fb93fb9d9d825c09e2 +Merge: 4e95021b08 d8f8ae1e45 +Author: lichengjun +Date: Fri Jul 16 14:32:31 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4e95021b08b7b17171de9dce487160c8c2d7b94a +Author: lichengjun +Date: Fri Jul 16 14:32:26 2021 +0800 + + Fix Bug ID 40660. + +commit 5f2f502fc6ae7012c81ee27adbffe096bcafc33c +Author: wangyidong +Date: Fri Jul 16 14:32:25 2021 +0800 + + * finish task #40312. + +commit d8f8ae1e45ae998adead12f395fe7eb5b62d5f33 +Author: zenggang +Date: Fri Jul 16 14:31:28 2021 +0800 + + * English video task #40002 + +commit 5d9942ff982db36b60026983613cc5c5d26458ef +Author: holan20180123 +Date: Fri Jul 16 14:21:09 2021 +0800 + + * Fix bug #13603. + +commit db3e5445043aaaa2f3542de77be69eb4fa71e3eb +Author: qiyu-xie +Date: Fri Jul 16 14:16:45 2021 +0800 + + * Fix bug#13672. + +commit 574ecd7bd32bd243034e421b108b6b620071fedc +Author: tianshujie98 +Date: Fri Jul 16 14:12:08 2021 +0800 + + * Fix the issue #173. + +commit 19533bfb0687f509ae818d66a82ba80c23130194 +Author: hufangzhou +Date: Fri Jul 16 14:08:30 2021 +0800 + + * Task #40318: Adjust the code. + +commit 50a0fc8da2d6152953d01b9279744dfd6f099986 +Author: qiyu-xie +Date: Fri Jul 16 14:03:32 2021 +0800 + + * Finish task#40318. + +commit 34992b6a4088b67118e41f56f006b8019ee58813 +Author: qiyu-xie +Date: Fri Jul 16 14:00:27 2021 +0800 + + * Adjust code. + +commit 3f25c7db97f6312c59b009c314cebd54b6120a08 +Merge: 5133fd164a 5e8bf5f6f6 +Author: wangyidong +Date: Fri Jul 16 13:49:47 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5133fd164a10964ce835a5a1af1eddc222d36cab +Author: wangyidong +Date: Fri Jul 16 13:45:56 2021 +0800 + + * finish task #40311. + +commit f63bb9135f33c341b43b9b993721ebc3c818b03c +Author: wangyidong +Date: Fri Jul 16 13:45:01 2021 +0800 + + * finish task #40307. + +commit 6a973517de7dbeb200446f46e78102d77b2577c1 +Author: wangyidong +Date: Fri Jul 16 13:43:54 2021 +0800 + + * finish task #40306. + +commit 5e8bf5f6f625dd7cf7d799bbfcde3e5d87783536 +Author: qiyu-xie +Date: Fri Jul 16 13:36:07 2021 +0800 + + * Adjust code. + +commit 143d8336b141a61ca642ef1a64bdbff4cc18e6f2 +Author: wangyidong +Date: Fri Jul 16 13:28:46 2021 +0800 + + * finish task #40304. + +commit 2c8a1ef5ef76ffc443ecf5d70e4eaef5df1741ac +Merge: 382f829564 7bb10b58db +Author: hufangzhou +Date: Fri Jul 16 13:20:05 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 382f8295643815ddafd2f057fc4766214733c60e +Author: hufangzhou +Date: Fri Jul 16 13:20:01 2021 +0800 + + * Fix issue #169. + +commit 92ea15541fba9a1a66bdbbcd2da4e02f92f61d80 +Author: wangyidong +Date: Fri Jul 16 13:03:55 2021 +0800 + + * finish task #40299. + +commit 268c4e47b7e80d04ef905264b93f3b57e5eb38e1 +Author: wangyidong +Date: Fri Jul 16 13:02:42 2021 +0800 + + * finish task #40293. + +commit 7bb10b58dbdb069e1a0bdcaad3924998397c9853 +Merge: 2e8f0393ce 4c80b77454 +Author: zhujinyong +Date: Fri Jul 16 12:10:33 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4c80b774545d5f8f0163c6c30d057597860af8a1 +Merge: f2620f53ec 51cf6d2aa0 +Author: wangyidong +Date: Fri Jul 16 11:46:01 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f2620f53ecc9e71b14501e2f5906edb18caabb5c +Author: wangyidong +Date: Fri Jul 16 11:45:43 2021 +0800 + + * finish task #40292. + +commit 51cf6d2aa00c1d52031055ad3b380e08bd7ee7f2 +Author: holan20180123 +Date: Fri Jul 16 11:40:49 2021 +0800 + + * Fix bug #13692. + +commit 4e85c05ae919f19b5ba2619d4900ec2751091a18 +Author: holan20180123 +Date: Fri Jul 16 11:31:04 2021 +0800 + + * Fix bug #13691. + +commit 685b270170d4677e7e893bdac64130bb33586bf9 +Author: qiyu-xie +Date: Fri Jul 16 11:29:15 2021 +0800 + + * Finish task#40313. + +commit c3bfd5a36a416de569cb44c89870a6fa4ac07c96 +Merge: 0a63fa55d6 8a29874b14 +Author: tianshujie98 +Date: Fri Jul 16 11:29:11 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0a63fa55d66783cf1b78d2e9fedb8bcf53507eac +Author: tianshujie98 +Date: Fri Jul 16 11:28:52 2021 +0800 + + * Finish task #40301. + +commit 8a29874b141f88b2d963f248a15dc846e199c0e9 +Author: qiyu-xie +Date: Fri Jul 16 11:25:53 2021 +0800 + + * Finish task#40317. + +commit 7db4307242bc6ca955876a08278ae08f7679c420 +Author: qiyu-xie +Date: Fri Jul 16 11:22:25 2021 +0800 + + * Finish task#40302. + +commit 2c27035699f6c0780bf43830f0f79e189fc49766 +Author: qiyu-xie +Date: Fri Jul 16 11:22:05 2021 +0800 + + * Adjust code. + +commit 4eb641ad8175a8bf377a3a34b47c1ae15e97e945 +Author: tianshujie98 +Date: Fri Jul 16 11:21:48 2021 +0800 + + * Finish task #40289. + +commit 425280996aa865c3c97d4f143296ab39ce53f942 +Author: wangyidong +Date: Fri Jul 16 11:21:10 2021 +0800 + + * finish task #40289. + +commit 2017a9cc7813f12f0ba06299a6d899db3e6952fa +Author: wangyidong +Date: Fri Jul 16 11:20:23 2021 +0800 + + * finish task #40291. + +commit 22abf816b9e21289550825acf64164e908105fa8 +Author: wangyidong +Date: Fri Jul 16 11:19:08 2021 +0800 + + * finish task #40290. + +commit 2608091b670a42391c24ee90ffb5f11b4fb870a7 +Author: tianshujie98 +Date: Fri Jul 16 11:18:35 2021 +0800 + + * Fix bug. + +commit 2e8f0393ce4f81bbe82a83a1af70aee4a79bd148 +Author: zhujinyong +Date: Fri Jul 16 11:10:43 2021 +0800 + + + Fix project entry points of API. + +commit 75d459bfd9b3c0b4a9c7f21c5ffe3dd107e8002d +Merge: 788620eeb1 25a3320c75 +Author: Guan Xiying +Date: Fri Jul 16 10:58:57 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 788620eeb145a0adea5ba683793892f69260af4d +Author: Guan Xiying +Date: Fri Jul 16 10:58:18 2021 +0800 + + * Skip process gitlab repo function. + +commit 25a3320c75f660749cdd0c6501a895df66d78121 +Author: holan20180123 +Date: Fri Jul 16 10:57:51 2021 +0800 + + * Finish task #40315. + +commit d77656a14cf24e51663efd0010cf56c0e192c84a +Author: zenggang +Date: Fri Jul 16 10:34:11 2021 +0800 + + * Finish task #40110 + +commit 8710a08f6ff5bc6684af4a6bdf3a8bc13bd80b36 +Merge: fcf6f3149a 81883efbb6 +Author: lichengjun +Date: Fri Jul 16 10:08:23 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit fcf6f3149afe1a92099e2fc9c3fb01b0e80f9488 +Author: lichengjun +Date: Fri Jul 16 10:08:19 2021 +0800 + + Fix code bug. + +commit 9fea485339323bf9083918ad9f134c445153c58c +Author: lichengjun +Date: Fri Jul 16 10:06:02 2021 +0800 + + *Skip gitlab menu. + +commit 81883efbb6722f058d81caa09d5f4aa054fcef7c +Merge: 19d343dec4 3326a59cbd +Author: Guan Xiying +Date: Fri Jul 16 10:00:49 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 19d343dec44993fa06daff08d27057812ed46f40 +Author: Guan Xiying +Date: Fri Jul 16 09:59:55 2021 +0800 + + * Skip process gitlab repo function. + +commit 3326a59cbd4622cbb0830c845ca5abaeabd68d64 +Author: lichengjun +Date: Fri Jul 16 09:46:01 2021 +0800 + + *Fix Bug ID 13665. + +commit e50ecb316abcdd8ffbb74c05bd37131c3eeadc84 +Merge: 6f04aedcd3 cc3f4f45a7 +Author: zhujinyong +Date: Fri Jul 16 09:44:50 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6f04aedcd3643b7c90f22d898f5e1169990520f0 +Merge: 1677574443 842230d91f +Author: zhujinyong +Date: Fri Jul 16 09:44:23 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit cc3f4f45a72bcad0ae93ce50901699faf1422558 +Merge: 8075005620 842230d91f +Author: hufangzhou +Date: Fri Jul 16 09:41:58 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8075005620891e219f044c1727e9d5f672fef3c7 +Author: hufangzhou +Date: Fri Jul 16 09:41:53 2021 +0800 + + * Finish task #40314. + +commit 842230d91f1ce0c4894082324927e71e4cc3419b +Author: Hao Sun +Date: Fri Jul 16 09:40:58 2021 +0800 + + * add new icons: icon-swap, icon-lane, icon-side-right, icon-side-left. + +commit 167757444365e4f712f7be5648151822c596e69a +Author: zhujinyong +Date: Fri Jul 16 09:40:41 2021 +0800 + + * return before $this->send. + +commit e465c7635deccd5fb27d919ee805eb1a5662f66e +Author: dingguodong +Date: Fri Jul 16 09:04:49 2021 +0800 + + * Correct code to meet devel standard after CR. + +commit 0b4279fbba0647cda7242bd64c7b490d6617f276 +Author: zenggang +Date: Fri Jul 16 09:04:25 2021 +0800 + + * Adjust code task #40319 + +commit 7d86ce798aabfd165c29dfec85e26a23f8d67c76 +Merge: be7bb7c331 c7391fb286 +Author: Guan Xiying +Date: Fri Jul 16 08:57:11 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit be7bb7c3316889503080f707cc49013683cca82f +Author: Guan Xiying +Date: Fri Jul 16 08:56:39 2021 +0800 + + * Add upgrade from 15.0.3 options. + +commit c7391fb286e7d9e5b68c2d2eb30c113cd0260b50 +Merge: 52ffea1d9d 8709db17bb +Author: hufangzhou +Date: Fri Jul 16 08:53:38 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 52ffea1d9d44c4862863162d01f9e4a87f1405c3 +Author: hufangzhou +Date: Fri Jul 16 08:53:34 2021 +0800 + + * Adapt to fallback version. + +commit 8709db17bbecaea0ef807bbee337bdcad40c35ae +Author: zenggang +Date: Fri Jul 16 08:46:15 2021 +0800 + + * Adjust code + +commit 373ebc452285ed439b713e385c5267dc6dee61e8 +Author: dingguodong +Date: Thu Jul 15 18:02:44 2021 +0800 + + * Fix bug #13657, remove useless codes. + +commit f8a107bd799939c7aaa29bea81ed31bcdfbecdde +Author: tianshujie98 +Date: Thu Jul 15 17:27:25 2021 +0800 + + * Adjust code. + +commit 109867f1038ce1b0095e7a29320a9a6374727c8e +Author: holan20180123 +Date: Thu Jul 15 17:18:16 2021 +0800 + + * Adjust create repo. + +commit 347ca7c674eed213d3a5067a0a0279b4cb5eff29 +Author: tianshujie98 +Date: Thu Jul 15 17:02:03 2021 +0800 + + * Adjust code. + +commit ee5392f676617c5f4dd8de02b1cbb21f8c5d0942 +Merge: 53c075cbee 03ac2e6820 +Author: lichengjun +Date: Thu Jul 15 16:48:46 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 53c075cbeeb24d6048c57367b92d2cce0f1bf55a +Author: lichengjun +Date: Thu Jul 15 16:39:58 2021 +0800 + + *Adjust code. + +commit 03ac2e6820034edbe56b96938d384ff8d63b77bb +Merge: f448f4d37e 6520a11545 +Author: zenggang +Date: Thu Jul 15 16:34:49 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f448f4d37e4c43243c93f6175bc26b7c05fecba6 +Author: zenggang +Date: Thu Jul 15 16:33:59 2021 +0800 + + * Finish task #40002 + +commit 6520a11545e7eddab1e4810c85831785cc655f94 +Author: tianshujie98 +Date: Thu Jul 15 16:33:51 2021 +0800 + + * Adjust code. + +commit 1f4d75765d1060afeb575735a7cc69a919155993 +Author: tianshujie98 +Date: Thu Jul 15 16:03:56 2021 +0800 + + * Adjust lang. + +commit 1531bb805b419544e37e22ac882a5ea9512fed56 +Author: holan20180123 +Date: Thu Jul 15 15:58:05 2021 +0800 + + * Adjust create product required field. + +commit d9f5c53e0b352213284871ccc2589124fbf7ab21 +Author: hufangzhou +Date: Thu Jul 15 15:54:08 2021 +0800 + + * Adjust the code. + +commit f2fdd0b4333fd73be908d78bd6db24be0cbbe6df +Merge: be50281d7a cc51c80047 +Author: hufangzhou +Date: Thu Jul 15 15:23:50 2021 +0800 + + * Adjust the code. + +commit be50281d7a42d1aa96e88d837d2d6a601bf9cff2 +Author: hufangzhou +Date: Thu Jul 15 15:19:59 2021 +0800 + + * Adjust the code. + +commit cc51c80047ef6059ee148e821bb5792dad362b5e +Author: dingguodong +Date: Thu Jul 15 15:18:01 2021 +0800 + + * Correct bad comments. + +commit ed6eddb82b9865a738a18b53541d3c3bca58a0bf +Author: tianshujie98 +Date: Thu Jul 15 14:45:14 2021 +0800 + + * Adjust code. + +commit 2759b55b41d5375f285ac8cb83f7fb5636a5ef1d +Author: tianshujie98 +Date: Thu Jul 15 14:39:58 2021 +0800 + + * Adjust lang. + +commit 763dee0749bf516b72253d6e009862c64e8dfa1c +Author: dingguodong +Date: Thu Jul 15 14:02:41 2021 +0800 + + * Correct bad statement. + +commit 3747bf90d9a016a1ed2a9cd1d0c5d3eccc3892e1 +Merge: bb7f7cf142 437ed911c8 +Author: dingguodong +Date: Thu Jul 15 13:53:43 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit bb7f7cf142fc475d9005a06f10f035a439587072 +Author: dingguodong +Date: Thu Jul 15 13:53:04 2021 +0800 + + * Remove duplicated loadModel for gitlab related after CR. + +commit 437ed911c8504660e472031dbe32024f6048aa72 +Author: zhujinyong +Date: Thu Jul 15 13:39:06 2021 +0800 + + + Add product and story entry points of API. + +commit e11a32c975ba9226e719ba223c96f4ce58de337e +Author: tianshujie98 +Date: Thu Jul 15 13:16:54 2021 +0800 + + * Fix bug #13611. + +commit 8064db605032343b0bc7ac1b8f117e29984a806f +Author: tianshujie98 +Date: Thu Jul 15 13:14:00 2021 +0800 + + * Fix bug #13663. + +commit d95833ed279f0fd6ccabdb3de41ef81b74ca2585 +Author: tianshujie98 +Date: Thu Jul 15 13:09:38 2021 +0800 + + *Fix bug #13666. + +commit 4c58d0bbe43267d04982c005fcf1a9e450428f66 +Author: zenggang +Date: Thu Jul 15 10:16:18 2021 +0800 + + * Finish task #40111 + +commit ef1b0dbb9063f0b33a9716c53d1054f89efc69b8 +Author: dingguodong +Date: Thu Jul 15 09:52:05 2021 +0800 + + * Correct link in gitlab view. + +commit bf17874e41322e49d8a24a11bb06a6d32a2d42d5 +Merge: 850d98c8a8 0de91bbaf5 +Author: tianshujie98 +Date: Thu Jul 15 09:50:40 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 850d98c8a8cf292bd3c724b40f29b3666b689931 +Author: tianshujie98 +Date: Thu Jul 15 09:50:13 2021 +0800 + + * Fix bug #13662. + +commit 0de91bbaf5c7ba02ac858baa5ede6feaef9acee6 +Author: dingguodong +Date: Thu Jul 15 09:40:51 2021 +0800 + + * Correct gitlab display error. + +commit 5d46c91a6bdb71054cc745c6a48407bf3b588a36 +Author: lichengjun +Date: Thu Jul 15 09:34:33 2021 +0800 + + *Fix bug 13651. + +commit 0ca193a73cc475d70dc89db20cf413160f3057c3 +Author: dingguodong +Date: Thu Jul 15 09:25:51 2021 +0800 + + * Optimize action moments for gitlab module. + +commit 5af6ff7707706b308f180233b51813c36155942d +Author: dingguodong +Date: Thu Jul 15 09:11:42 2021 +0800 + + * Optimize action moments for gitlab module. + +commit b73608a9b3e381c0c3ec07ace1e7dc67d2f61877 +Author: holan20180123 +Date: Thu Jul 15 09:08:07 2021 +0800 + + * Add gitlib language. + +commit 8c4a074c0f85d3bf844e6c946e69f5feade79a17 +Author: hufangzhou +Date: Thu Jul 15 08:58:02 2021 +0800 + + * Adjust the search box width. + +commit a9862dc312898fd0af701d1ffe640431905aff66 +Author: lichengjun +Date: Wed Jul 14 21:21:36 2021 +0800 + + * Fix Bug 13654 and 13651. + +commit 089977624b554ba064495f2d44034885ca1e325e +Author: hufangzhou +Date: Wed Jul 14 17:51:06 2021 +0800 + + * Fix bug #13650. + +commit a2340a1a91cb8fb44d1302eaac3717d232fcddaf +Merge: bf088f06a3 bf0716d462 +Author: hufangzhou +Date: Wed Jul 14 17:26:21 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit bf088f06a36a92dd8d636c3a30f8e15e3a1996ff +Author: hufangzhou +Date: Wed Jul 14 17:26:17 2021 +0800 + + * Adjust the code. + +commit bf0716d4624467546e2e04380176c58a3a291160 +Author: lichengjun +Date: Wed Jul 14 16:59:15 2021 +0800 + + *Fix repo. + +commit 8d782a446984549c4285862d37f21c536c2b28bc +Merge: 1c61084531 7cd35ad185 +Author: hufangzhou +Date: Wed Jul 14 16:54:20 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1c6108453137bcdf1e22ee089ed761d269b20577 +Author: hufangzhou +Date: Wed Jul 14 16:52:29 2021 +0800 + + * Fix bug #13649. + +commit 7cd35ad1855e2e34459d4f6bfe7faa1be7c219ce +Author: Yagami <976204163@qq.com> +Date: Wed Jul 14 16:51:56 2021 +0800 + + * Finish task #40118. + +commit 3b1d7a3e868b1d8fdcd07af7a13c7cbe949bda3c +Author: hufangzhou +Date: Wed Jul 14 16:26:44 2021 +0800 + + * Add the background color when hover the project name, product name and execution name. + +commit ea4d6490f7a7b8573d373ff18745b1e9fe478151 +Merge: 6ab983b443 f401a0ac06 +Author: hufangzhou +Date: Wed Jul 14 16:15:04 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6ab983b4432e833d4d409f967701f559c127b41b +Author: hufangzhou +Date: Wed Jul 14 16:15:00 2021 +0800 + + * Fix a bug. + +commit f401a0ac0690ff018fb12117853098bcb4440705 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 14 15:54:15 2021 +0800 + + * Code for task #40118. + +commit e2319a0f030ce464ec1e7ab3d2ec8dce8fe25f9b +Author: Yagami <976204163@qq.com> +Date: Wed Jul 14 15:44:47 2021 +0800 + + * Fix details. + +commit 02fbcbe8f4a8813e4c1d7855015495f0bb106aad +Author: qiyu-xie +Date: Wed Jul 14 15:51:12 2021 +0800 + + * Fix a bug. + +commit 04306b09a118486346e9e1fa94db4df3fc9f5047 +Merge: 995862b472 b17af857e9 +Author: hufangzhou +Date: Wed Jul 14 15:50:55 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 995862b472df51313c3340cf17d6a27b390e656e +Author: hufangzhou +Date: Wed Jul 14 15:50:51 2021 +0800 + + * Fix bug #13613. + +commit b17af857e96285aa0ae2655067dd63e946a1093d +Author: qiyu-xie +Date: Wed Jul 14 15:22:24 2021 +0800 + + * Adjust code. + +commit c7c10f11db4bae4b7bf9dec45850524f243ddcea +Author: holan20180123 +Date: Wed Jul 14 15:21:54 2021 +0800 + + * Adjust product browse. + +commit ecbcecd463ea1f15ea2185aa3f25268c73d706b2 +Author: lichengjun +Date: Wed Jul 14 15:21:05 2021 +0800 + + *Fix code format. + +commit 5226947886b2a25ceea6a5825f14423002428718 +Merge: 5d1b56199d 49844b90e6 +Author: hufangzhou +Date: Wed Jul 14 15:07:23 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5d1b56199dcda3b54fbd5113cd0af40c6b4993f7 +Author: hufangzhou +Date: Wed Jul 14 15:07:19 2021 +0800 + + * Adapt to the old version and modify the font color. + +commit 49844b90e698b76e3e8957f05db12f16286be945 +Author: lichengjun +Date: Wed Jul 14 15:05:27 2021 +0800 + + *Fix code format. + +commit 28d9d2993ada5468a35f75b572a286deaabdb1cd +Merge: 6342f74031 fd001068bb +Author: lichengjun +Date: Wed Jul 14 15:01:39 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit fd001068bb15feb1a4e9ad940890a9aa23561683 +Merge: 04467052dc fd9a5711e0 +Author: dingguodong +Date: Wed Jul 14 15:01:21 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 04467052dcfeb5d3a623ebfb2ec9dc6a77c6f795 +Author: dingguodong +Date: Wed Jul 14 15:00:35 2021 +0800 + + * Optimize back button for bug #13628. + +commit 6342f7403137d59a96e381626269ad59ff293e16 +Author: lichengjun +Date: Wed Jul 14 14:59:48 2021 +0800 + + *Fix code format. + +commit fd9a5711e0be116d6d3355b1186c6761130bc1aa +Author: lichengjun +Date: Wed Jul 14 14:55:34 2021 +0800 + + *Fix gitlab english lang. + +commit 15633b086da805291c5a3f03922d1ba95c210294 +Merge: 2e94758c6a c29583f980 +Author: lichengjun +Date: Wed Jul 14 14:47:19 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 2e94758c6a66ffe3f5819577ea3495ac54ad5278 +Author: lichengjun +Date: Wed Jul 14 14:45:09 2021 +0800 + + *Add English language. + +commit c29583f980e399f53ecfa8d7f23a641bf8fcb97e +Author: zenggang +Date: Wed Jul 14 14:44:48 2021 +0800 + + * finish task #40111 + +commit 49892661bf90277b4735351ceb4151a9403445bc +Author: holan20180123 +Date: Wed Jul 14 14:41:43 2021 +0800 + + * Fix product dynamic error. + +commit 1d93f3215220c59ad89fc3857b075361423106e3 +Merge: 38f0f04693 a1705e2f78 +Author: dingguodong +Date: Wed Jul 14 14:39:02 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 38f0f04693b7ef54bbfd35fb3c3bb745a4a9eaf4 +Author: dingguodong +Date: Wed Jul 14 14:38:25 2021 +0800 + + * Fix bug #13628. + +commit a1705e2f78f6827a1c6439b6f996b1e035ab54ea +Merge: 05eebf3ccc 25b54558d0 +Author: hufangzhou +Date: Wed Jul 14 14:20:35 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 05eebf3ccc3aa21a7dca32e31f297503cbe59247 +Author: hufangzhou +Date: Wed Jul 14 14:20:30 2021 +0800 + + * Adjust the label in front of the project name or program name. + +commit 25b54558d0baea96ac615cb537b0a2968efa7360 +Author: tianshujie98 +Date: Wed Jul 14 14:15:22 2021 +0800 + + * Adjust code. + +commit 1901703fd8b6d40154f8707c558c995ce0d0cb36 +Merge: 4849eddedc 395e901d1c +Author: dingguodong +Date: Wed Jul 14 14:01:16 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4849eddedc829e210ea094a63a8327fe936733fe +Author: dingguodong +Date: Wed Jul 14 14:00:37 2021 +0800 + + * Correct bad spelled word. + +commit 395e901d1cb10db6ba4342660114b9d4ba5c3ca8 +Merge: 0f8326e5bd 09f87bbd47 +Author: tianshujie98 +Date: Wed Jul 14 13:55:45 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0f8326e5bd706927467131b66cda7e5450714edb +Author: tianshujie98 +Date: Wed Jul 14 13:55:35 2021 +0800 + + * Adjust code. + +commit 1545b21271e24f0ff0168af45c0dfcf7be0cedb2 +Merge: 0833fd6497 a7f8cd98c4 +Author: reneeteng +Date: Wed Jul 14 13:48:59 2021 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 09f87bbd475af32bc2792e4b487e5da6e13f2ee0 +Merge: 085f39bc3e a7f8cd98c4 +Author: wangyidong +Date: Wed Jul 14 13:48:54 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0833fd6497b29b5a1736a910e1cd80d0e166145e +Author: reneeteng +Date: Wed Jul 14 13:48:32 2021 +0800 + + * Update user lang file. + +commit 085f39bc3efe6d69bec89942e02b396b781dc126 +Author: wangyidong +Date: Wed Jul 14 13:48:23 2021 +0800 + + * adjust for lang. + +commit a7f8cd98c42c2577c6825a209b06ff19b1d90515 +Author: qiyu-xie +Date: Wed Jul 14 13:48:05 2021 +0800 + + * Fix a bug. + +commit 7305bb4f1282c24015211e1b3bd5d3f254b7c539 +Author: lichengjun +Date: Wed Jul 14 13:46:21 2021 +0800 + + *fix code format. + +commit 83d78bab5f40e66215462b4d551e8e3438a53b03 +Author: wangyidong +Date: Wed Jul 14 13:45:19 2021 +0800 + + * fix for webhook. + +commit 182b8217f3075ac3a46b77bd1ccdce09405875ba +Author: zenggang +Date: Wed Jul 14 13:42:30 2021 +0800 + + finish task #40111 + +commit 20945e92ef4543cea87df1a72d0a1e9beea7622a +Merge: fabc81d71e 571be2ca67 +Author: hufangzhou +Date: Wed Jul 14 13:37:11 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit fabc81d71e5f45757b0c221e588503c5d5446252 +Author: hufangzhou +Date: Wed Jul 14 13:37:07 2021 +0800 + + * Adjust the tab active when I am not admin and current project is closed. + +commit 571be2ca675904cf4081949abecf4887c2e09460 +Author: tianshujie98 +Date: Wed Jul 14 13:18:22 2021 +0800 + + * Adjust code. + +commit 2a9f1d9a78cddc7590403858cf4323465cc9c663 +Author: lichengjun +Date: Wed Jul 14 12:27:49 2021 +0800 + + *Add gitlab managepriv. + +commit ce06e9f6d1c635d498d4596fe46a53d2b94afd3c +Author: hufangzhou +Date: Wed Jul 14 11:46:11 2021 +0800 + + * Adjust the program name and project name style in drop menu. + +commit 59a2bf3e5cb9b414c93fbadfd1b4ae5d48b2749a +Author: dingguodong +Date: Wed Jul 14 11:30:53 2021 +0800 + + + Add upgrade sql statements. + +commit 289adb62c8312d060c77488340496037f3727eb6 +Author: tianshujie98 +Date: Wed Jul 14 11:22:56 2021 +0800 + + * Fix bug #13581. + +commit d7cc954aca883cdbb2e26c9ea6b4c4dbf1e10594 +Author: qiyu-xie +Date: Wed Jul 14 11:13:58 2021 +0800 + + * Adjust project order at execution kanban. + +commit d279fa648a9ce2eda0ee857a061f6dd9b92651f3 +Author: tianshujie98 +Date: Wed Jul 14 10:41:08 2021 +0800 + + * Fix bug #13612. + +commit 5ae0d229925b0591fecc06ddf356c0285eda27f9 +Merge: 7e13c5544b 19af1f8d87 +Author: tianshujie98 +Date: Wed Jul 14 10:30:58 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 7e13c5544b0ff91fbfa61d08e7594015eaeac8f3 +Author: tianshujie98 +Date: Wed Jul 14 10:30:19 2021 +0800 + + * Adjust code style. + +commit 19af1f8d874f038f9900cca4c71477ff799cf8b3 +Author: qiyu-xie +Date: Wed Jul 14 10:21:23 2021 +0800 + + * Deal the link of execution kanban at classic version. + +commit 21d3eaf3c18ffeb0a76be45b339f4e57ee1792da +Merge: 8b2db53ab2 ae3c34c9b0 +Author: lichengjun +Date: Wed Jul 14 10:16:48 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ae3c34c9b0df2119adebc511f6069e507b741107 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 14 10:16:00 2021 +0800 + + * Fix task begin and end width. + +commit 8b2db53ab2e316653579ee0a1001e5a44314bb5c +Author: lichengjun +Date: Wed Jul 14 10:14:18 2021 +0800 + + *Add title in importIssue function. + +commit 78ea82597be0bed6cb2bf1da60b60cfdde88b82c +Author: Yagami <976204163@qq.com> +Date: Wed Jul 14 10:13:03 2021 +0800 + + * Fix bug #13545. + +commit 1c802f2a36affd0f089539580ee8aaf2ab2eb021 +Merge: 6255a862c7 be054d1c2b +Author: Guan Xiying +Date: Wed Jul 14 09:48:58 2021 +0800 + + Merge branch 'jihu' + +commit 6255a862c71eb7b5e687a0b8cccd95c955dfb366 +Merge: 86a0e7d8bf 1f7e04e6f0 +Author: zenggang +Date: Wed Jul 14 09:38:25 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 86a0e7d8bffe5cd74801d08ae7e57230434f3043 +Author: zenggang +Date: Wed Jul 14 09:32:48 2021 +0800 + + finish task #40123 + +commit 1f7e04e6f08f90b08a56ef913f1b2d0155093192 +Author: qiyu-xie +Date: Wed Jul 14 09:31:50 2021 +0800 + + * Add no data tips when look execution kanban. + +commit be054d1c2b679d14e9869cd8f54ff1b53abbf30e +Merge: 6f2ae70f06 e8c9118515 +Author: Guan Xiying +Date: Wed Jul 14 09:28:49 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 6f2ae70f06c1756f21c0d35340d8af5e04f5d2e7 +Author: Guan Xiying +Date: Wed Jul 14 09:28:34 2021 +0800 + + * Merge from mapi branch. + +commit ac8fb7783f76bcb58cafb23bc1bb6c6028920cd0 +Merge: 09b1ed61e1 a519be7fb6 +Author: Guan Xiying +Date: Wed Jul 14 09:16:21 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit e8c9118515d1239ad5f0d1ddb3cb2e63c0260baf +Author: dingguodong +Date: Wed Jul 14 09:08:57 2021 +0800 + + * Correct function comment, and keep func code stay. + +commit 73394d0435aab535c0646937f8340410416cb106 +Merge: a4db5380eb 020ab8d8b8 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jul 13 18:20:52 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit a4db5380eb1ca1fe0cfe696aee61e5e60e74b2f0 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jul 13 18:20:48 2021 +0800 + + * Finish task #40000. + +commit a519be7fb673f3f8e3f70447ffc2313a3ea2a1a7 +Author: dingguodong +Date: Tue Jul 13 17:43:59 2021 +0800 + + * Bug fix when assign user on story in execution. + +commit 020ab8d8b858b62ec4fba8728fdacd970f714444 +Author: qiyu-xie +Date: Tue Jul 13 17:40:19 2021 +0800 + + * Finish task#40010. + +commit 753943fe07148ba11bad01b8b736e520bc1a3fed +Author: wangyidong +Date: Tue Jul 13 17:38:25 2021 +0800 + + * adjust for pinyin abbr. + +commit 9fe62d43866d5c0ee0245a99241bd44205fdac85 +Author: wangyidong +Date: Tue Jul 13 17:37:55 2021 +0800 + + * finish task #40121. + +commit fee5d53f946957c81b887d128959d449ab988c43 +Author: dingguodong +Date: Tue Jul 13 16:50:46 2021 +0800 + + * Optimize import issue and bug fix. + +commit 876721d2670ec8d6952d71e839cb72473d0ed8b8 +Author: qiyu-xie +Date: Tue Jul 13 16:31:47 2021 +0800 + + * Adjust other language item. + +commit 3a9492c7cca0b23ad95c276d9014ea378085bc8e +Author: qiyu-xie +Date: Tue Jul 13 16:27:26 2021 +0800 + + * Add other language item. + +commit e276882ea8abfe29712c4031bbfcf78fd0568743 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jul 13 16:20:07 2021 +0800 + + * Fix bug #13603. + +commit 9d2a4f70d9e1a815d92d303347468712c4132026 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 13 16:04:15 2021 +0800 + + * Finish task #40129. + +commit b76d6f2b3e736077c2f2e5243110410d6fc3e1f4 +Merge: fd4b4f3b35 d51930784c +Author: hufangzhou <746775970@qq.com> +Date: Tue Jul 13 15:49:27 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit fd4b4f3b35a315a83bd6c7310c9cd7b3e3f09b23 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jul 13 15:49:23 2021 +0800 + + * Adjust the font color in drop menu. + +commit d51930784c89fb0f71ccae97859cee91c199bf70 +Author: qiyu-xie +Date: Tue Jul 13 15:47:43 2021 +0800 + + * Fix a bug. + +commit 9d4e2a4dd1d07c430accf6659ae9651fea03d30d +Author: qiyu-xie +Date: Tue Jul 13 15:26:08 2021 +0800 + + * Fix a bug. + +commit e23de07bee4b4b6aa100066c5f958e569b37aa65 +Merge: 132d5484f9 da283bc32d +Author: tianshujie98 +Date: Tue Jul 13 15:17:16 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 132d5484f95e3f92c11816cc8b59403a4bcc10e6 +Author: tianshujie98 +Date: Tue Jul 13 15:17:04 2021 +0800 + + * Adjust code. + +commit da283bc32dfe2af8ef93fb3446b8798c6a2f409a +Author: qiyu-xie +Date: Tue Jul 13 15:16:47 2021 +0800 + + * Fix a bug. + +commit dd7d97fc044d2c97f6ae3068677024b4f52aaf6f +Author: dingguodong +Date: Tue Jul 13 15:00:58 2021 +0800 + + * Add private column to sql file. + +commit 8c6f5898eabfbd96b54d340a3296edede2dd5a37 +Author: tianshujie98 +Date: Tue Jul 13 15:00:40 2021 +0800 + + * Fix an error. + +commit 7fd8cdf8fd4d7daac7e178c0320e997aeaae008a +Author: qiyu-xie +Date: Tue Jul 13 13:49:34 2021 +0800 + + * Finish task#40013. + +commit bc40429ad6f1b197ac570e97204fdc25db42ef50 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 13 14:49:22 2021 +0800 + + * Fix details. + +commit 690980d60abf4923aad63218fc366519a0a74c71 +Author: tianshujie98 +Date: Tue Jul 13 14:41:02 2021 +0800 + + * Fix an error. + +commit c8b3045fc9768ba8808358e5cf591258735c82f6 +Author: dingguodong +Date: Tue Jul 13 14:39:20 2021 +0800 + + * Rename pipline to pipeline. + +commit b3641df7b20438e11bbe1c3f3e799f90199d9b3a +Author: dingguodong +Date: Tue Jul 13 14:36:01 2021 +0800 + + * Display icon name in lang setting. + +commit 51eb6980c1c4d698673bb94edd67c85a03e61035 +Merge: 7626959450 65a43e49a3 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jul 13 14:23:03 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 7626959450bbf06796c1508031c4553327518cff +Author: hufangzhou <746775970@qq.com> +Date: Tue Jul 13 14:22:59 2021 +0800 + + * Adjust the label background color. + +commit 65a43e49a342c112333aecc1c2c9254b1cd32770 +Merge: d11e847832 98eaee685b +Author: 王怡栋 +Date: Tue Jul 13 06:18:45 2021 +0000 + + Merge branch '15.0' into 'master' + + * update picker js. + + See merge request easycorp/zentaopms!4 + +commit d11e8478327cfcdef9eebefee23176cb372bc85f +Merge: 09b2caf838 637acf434a +Author: hufangzhou <746775970@qq.com> +Date: Tue Jul 13 14:11:37 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 09b2caf838e01c022af605c140c21d7ba4b454ab +Author: hufangzhou <746775970@qq.com> +Date: Tue Jul 13 14:11:32 2021 +0800 + + * Adjust the project order in project drop menu. + +commit 637acf434a96ce7440588642ef59e5effe378806 +Author: wangyidong +Date: Tue Jul 13 14:10:27 2021 +0800 + + * adjust for show image. + +commit e2f6101340618072251cf1df12954a10c56f6165 +Author: tianshujie98 +Date: Tue Jul 13 14:00:34 2021 +0800 + + * Add start and end date judgment. + +commit 2e8884d86cb1bd2e98ef1557bd2c540946278ae6 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jul 13 13:51:21 2021 +0800 + + * Fix bug #13585. + +commit 1926cb7ad94149f28daac622b996fbfafaa8ecfe +Author: tianshujie98 +Date: Tue Jul 13 13:41:57 2021 +0800 + + * Fix bug #13579. + +commit f689717078db85bb5cd8a2ed639a613ed5ba18c9 +Author: qiyu-xie +Date: Tue Jul 13 13:40:50 2021 +0800 + + * Add permissions to the executive Kanban. + +commit 6977cf91ede8602f29ca3c8df25df334e295a55a +Author: tianshujie98 +Date: Tue Jul 13 13:38:14 2021 +0800 + + * Add select all. + +commit 7ef07b30baaa2fcf8284758a34666be46ac94980 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 13 13:37:33 2021 +0800 + + * Finish task #40113. + +commit dafebe5d958c1e82f09d289b935f152e1eec5e2a +Merge: e007087966 c523e60eb0 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jul 13 13:33:34 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit e00708796640ec9412f11d516801ab45871c0d81 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jul 13 13:33:14 2021 +0800 + + * Finish task #39999. + +commit c523e60eb0c33d008ce8692d29429e9a4b76672e +Merge: 503815289a 4a025a7452 +Author: wangyidong +Date: Tue Jul 13 13:30:15 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 503815289ab928f0ecbdc4b1e1fe383143881028 +Author: wangyidong +Date: Tue Jul 13 13:29:50 2021 +0800 + + * finish task #40114. + +commit 4a025a7452b3e2e6c285f87f8564e47592cd49ac +Author: Yagami <976204163@qq.com> +Date: Tue Jul 13 13:14:07 2021 +0800 + + * Finish task #40128. + +commit bf07567ff0ff80eb756b5f7a04f15c6479ff6c9d +Author: holan20180123 <56391770@qq.com> +Date: Tue Jul 13 13:13:44 2021 +0800 + + * Fix bug #13584. + +commit 58b3372e4d9a7dc82a67ab24a8258bfb657a87e3 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 13 13:04:52 2021 +0800 + + * Fix user-deny lang. + +commit a527cb5b5e6c8281294a9ed9edc10801a90444eb +Author: holan20180123 <56391770@qq.com> +Date: Tue Jul 13 13:03:49 2021 +0800 + + * Adjust batch edit products. + +commit d8e8be9e4f178a7b8d529da8fbcfac802eed582e +Author: qiyu-xie +Date: Tue Jul 13 11:32:48 2021 +0800 + + * Finish task#40013. + +commit 6c598c245a91b0554f8182ebf1422b58cde4a73e +Author: qiyu-xie +Date: Tue Jul 13 11:23:58 2021 +0800 + + * Finish task#40009. + +commit fef177344ed5d6863e10b72a420d435dd3786e05 +Author: dingguodong +Date: Tue Jul 13 11:08:24 2021 +0800 + + * Rename gitlab issue name to en lang. + +commit 1d0f19caaa128b6225b470a0bc2feca30a513592 +Author: dingguodong +Date: Tue Jul 13 11:06:13 2021 +0800 + + + Delete project relation when user deleting a repo. + +commit 6078ae465fde942a13df2fa15d6ddae37b37dd1a +Merge: ba2c8018d6 230193cbf4 +Author: wangyidong +Date: Tue Jul 13 10:26:36 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ba2c8018d66473bee0f6ecbd3c71c8f770cbc9de +Author: wangyidong +Date: Tue Jul 13 10:24:57 2021 +0800 + + * fix for update userview. + +commit 230193cbf45485b00158386323cdb3173353269d +Merge: f30d5627d5 5d3bce55af +Author: hufangzhou <746775970@qq.com> +Date: Tue Jul 13 10:16:19 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f30d5627d5748fe33faac2c632b81a30efb27f29 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jul 13 10:16:05 2021 +0800 + + * Task #39998: Adjust the tab active in project drop menu. + +commit 5d3bce55afd7210210be7d446cb2fa957669f40d +Merge: 6e235a0e6a 309f6047ee +Author: holan20180123 <56391770@qq.com> +Date: Tue Jul 13 10:12:26 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 309f6047ee3eb34400c9ebc6efcc76f67f422f0c +Author: tianshujie98 +Date: Tue Jul 13 10:11:34 2021 +0800 + + * Fix logic problems. + +commit 6e235a0e6a553ac710bef591a55fe422a45fb1f0 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jul 13 10:10:37 2021 +0800 + + * Finish task #40015. + +commit a14b1c87119c17b7c78452f8d625a692eeed18a6 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jul 13 10:02:40 2021 +0800 + + * Finish task #40004. + +commit 9ae5f3e8fe5727979426a68a77111c543afcf27f +Author: dingguodong +Date: Tue Jul 13 10:02:06 2021 +0800 + + * Change getting repoID from _GET to getting from para. + +commit 71d91cdc54df5ee4c8bfca860bcc29432b88fbb1 +Author: wangyidong +Date: Tue Jul 13 09:52:53 2021 +0800 + + * fix error. + +commit 0cba64db6affa2bcf57d2f2adb554bfe24f2fcf2 +Merge: 9d95d960e5 106ffc839e +Author: wangyidong +Date: Tue Jul 13 09:39:25 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 9d95d960e51625918e2b0aa8d4a7c52681dc351e +Author: wangyidong +Date: Tue Jul 13 09:38:27 2021 +0800 + + * finish task #40005. + +commit 106ffc839e1ab94a6e1c2d95a1a1dc6d1b2c17ae +Author: tianshujie98 +Date: Mon Jul 12 16:34:59 2021 +0800 + + * Finish task #40011. + +commit cea7d733f5680a6343a41adca8f31eeff06e5e79 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 12 16:27:54 2021 +0800 + + * Fix details. + +commit 28744fa8221b45f91614bd4d1a5ef3c1c8c6c6fa +Author: hufangzhou <746775970@qq.com> +Date: Mon Jul 12 16:04:48 2021 +0800 + + * Finish task #39998. + +commit 9267c1e6b1a339f401cc1c9bc27da63949c0cff5 +Author: Hao Sun +Date: Mon Jul 12 15:47:34 2021 +0800 + + * hide program item in search list in drop menu. + +commit ad4e5f7c446eb99fb82562c2747d44da4aa8a443 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 12 15:41:52 2021 +0800 + + * Finish task #40134. + +commit c12c6c38739d6aa296f0f7d6bf56b29f9e845889 +Author: Hao Sun +Date: Mon Jul 12 15:42:45 2021 +0800 + + * fix list style in drop menu. + +commit 867452258df75138fe80b91e37077b76df2b4c37 +Author: tianshujie98 +Date: Mon Jul 12 15:40:29 2021 +0800 + + * Fix bug. + +commit bad9c9e0427e65e47f7794a19d7c710cede6325f +Author: tianshujie98 +Date: Mon Jul 12 14:52:46 2021 +0800 + + * Finish task #40016,40017. + +commit cc60268ee4721096d6d7ac35ee5688f18fd5dbff +Author: dingguodong +Date: Mon Jul 12 14:32:48 2021 +0800 + + * Filter issue in gitlab using alternative way. + +commit 2ba786263cffe2a98f39bed0542e284f9193c727 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 12 14:09:25 2021 +0800 + + * Finish task #40104. + +commit 2fce8df996694fee18156b3983120ff8000ad899 +Author: dingguodong +Date: Mon Jul 12 14:06:18 2021 +0800 + + * Remove link when scm is not gitlab. + +commit ecf718ee9b26f9230e17bcbe243df1c762a6ac5e +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 12 13:16:11 2021 +0800 + + * Finish task #40015. + +commit 34a35d4c807a4ac5d2636430f4f51e75427f19bf +Merge: b996d2556d 195e6492d2 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jul 12 13:11:48 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b996d2556d5e48a5b73b60b7ca4322a83865038f +Author: hufangzhou <746775970@qq.com> +Date: Mon Jul 12 13:11:44 2021 +0800 + + * Task#39998: Adjust the project counts style. + +commit 195e6492d2304736bb9cce8f3da8dab6d105db29 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 12 10:36:44 2021 +0800 + + * Finish task #40004. + +commit 3034d24f2c61bfc5c453020351dca844c9d99650 +Author: wangyidong +Date: Mon Jul 12 10:09:39 2021 +0800 + + * adjust for task #40020. + +commit 0cbd7bd2b81dfae07b9359ffeb1edbe17637c58a +Author: zenggang +Date: Mon Jul 12 01:37:50 2021 +0000 + + finish task #40019 + +commit 945b8ed111d726b6ce65f83cce7245dd18211e30 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 12 09:32:38 2021 +0800 + + * Fix details. + +commit 55130c2ee9fa6f418ade8b13abb39b395efc3a24 +Author: tianshujie98 +Date: Sat Jul 10 10:12:49 2021 +0800 + + * Finish task #40003. + +commit 5e1e83721add1d48db5e680e53cafd9fe6494cc3 +Author: tianshujie98 +Date: Sat Jul 10 00:40:33 2021 +0800 + + * Add language item. + +commit d27efcb9eaec1e8a0f718169ea681139e9863306 +Author: dingguodong +Date: Fri Jul 9 18:02:28 2021 +0800 + + * Get full object when desc is empty. + +commit fdb69a81b14d0ef6e328e80f0fb1bfa5a1c1d333 +Author: dingguodong +Date: Fri Jul 9 17:23:16 2021 +0800 + + * Change all lines about apiUpdateIssue func. + +commit 677a3b00525d68362d08933806b369b6afbcb0f9 +Author: dingguodong +Date: Fri Jul 9 17:22:27 2021 +0800 + + * Add objectID to object for apiUpdateIssue(bug fix). + +commit 504b448e3c359a8032f3978e0b66e7f119acf137 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jul 9 15:27:58 2021 +0800 + + * Adjust the code. + +commit b31e7af3888b012843ac1519993af2c82c7b1d37 +Author: tianshujie98 +Date: Fri Jul 9 15:11:37 2021 +0800 + + * Fix bug. + +commit 92467420b5cb9f0faaf84511f742807442f876c5 +Author: tianshujie98 +Date: Fri Jul 9 15:03:57 2021 +0800 + + * Fix bug. + +commit 5de789ad8d383bc7882323142ec7b877a566d3b6 +Author: dingguodong +Date: Fri Jul 9 15:03:18 2021 +0800 + + * Fix bug when batch assign on task. + +commit 0e6b12d7823753e536044c8d1cd02c9882012c48 +Author: Hao Sun +Date: Fri Jul 9 14:56:17 2021 +0800 + + * fix project dropmenu not work as expected. + +commit 9e6b4db720a6dd50965cc7e8e92413ba9825a5d7 +Author: dingguodong +Date: Fri Jul 9 14:33:49 2021 +0800 + + * Fix bug when batch edit task,bug,story. + +commit d2a5588e9de35b41aa09ed29e1f8113d1501bfc4 +Author: dingguodong +Date: Fri Jul 9 14:00:36 2021 +0800 + + * Link story to execution. + +commit ab2e2191e3083c85a27baf51ef09bf81b77f243c +Author: dingguodong +Date: Fri Jul 9 13:48:23 2021 +0800 + + * Bug fix and optimize for import issue. + +commit 98eaee685bc7e2aa95d7beab112c94eedab0f4e5 +Author: Hao Sun +Date: Fri Jul 9 11:39:54 2021 +0800 + + * update picker js. + +commit 7e52bb680a2faf26efd1c6c880e9c4c4f758dd1e +Merge: 081888a196 846e9f46ba +Author: guanxiying +Date: Fri Jul 9 10:50:11 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 081888a196f115a0f92e6068e3d77db418e8c95b +Author: guanxiying +Date: Fri Jul 9 10:50:07 2021 +0800 + + * Task #39998: Adjust the project drop menu. + +commit b062fe0a8e738d9cea78eb647744983ef20f23f4 +Author: dingguodong +Date: Fri Jul 9 10:16:12 2021 +0800 + + * Optimize codes when importing issues. + +commit 14d78cca44f711485dcb638ccfbe46f47114ef51 +Author: dingguodong +Date: Fri Jul 9 10:15:04 2021 +0800 + + * Construct object manually instead of using fixer. + +commit 846e9f46ba066ffc72dc7d6f1f900a52b503fdad +Merge: 8a8d8c18f3 7ca5a95ea4 +Author: wangyidong +Date: Fri Jul 9 09:55:58 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8a8d8c18f33d6154108888239cfd27c693f46557 +Author: wangyidong +Date: Fri Jul 9 09:55:07 2021 +0800 + + * adjust for get gitlab by api. + +commit 7bf0789e54ba969ad1aa1e83c6b7b2b680e2f150 +Author: dingguodong +Date: Thu Jul 8 17:35:55 2021 +0800 + + * Rename zt_jenkins to zt_pipeline. + +commit 22eeab384a4fd65609dfc496b71e67105baf7044 +Author: dingguodong +Date: Thu Jul 8 16:07:58 2021 +0800 + + * Change per_page value to 20. + +commit 47102c509e47f9dd36003f47f55a1bb376bf9e7e +Author: dingguodong +Date: Thu Jul 8 15:55:11 2021 +0800 + + + Finished importing issue to story. + +commit 6af64c8c1273e7b08c84a3c2d634c92abbcf4bc3 +Author: dingguodong +Date: Thu Jul 8 15:51:50 2021 +0800 + + * Change variable name and add a todo for issueToZentaoObject. + +commit b6c91b5bbd367367e8853923b577be1fe848c4d9 +Merge: 9e76157a0c 8c11397651 +Author: dingguodong +Date: Thu Jul 8 14:58:19 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 9e76157a0c228c9e248ab668ecdaab8db359fb5e +Author: dingguodong +Date: Thu Jul 8 14:54:18 2021 +0800 + + * Put product into removal field and bug fix. + +commit 7ca5a95ea46c661ff5c2f63b1216008aede5e529 +Author: tianshujie98 +Date: Thu Jul 8 14:47:12 2021 +0800 + + * Fix an error. + +commit 8c113976513b254faac04f2023a381def9b1b759 +Merge: 5c25aba4c6 129e14bf30 +Author: lichengjun +Date: Thu Jul 8 14:47:01 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 5c25aba4c664ecf74266de1f190942791352289e +Author: lichengjun +Date: Thu Jul 8 14:46:27 2021 +0800 + + * Fix task code bug. + +commit 4c3af55bbbb9fb85253c3a769901fcb409a915d3 +Author: tianshujie98 +Date: Thu Jul 8 14:31:03 2021 +0800 + + * Add the language item of the project. + +commit 129e14bf30be90d86d2bf04782b210fa5ed97db7 +Author: dingguodong +Date: Thu Jul 8 14:30:28 2021 +0800 + + * Finish importing issue to zentao bug(staging). + +commit 7be1de8381f8f5cb63a70b71ee308e5d4af54e07 +Merge: 834d42610c ccc8c97aaa +Author: wangyidong +Date: Thu Jul 8 13:11:47 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 834d42610c9cb4beb1e707d044b440f3a1d5dd44 +Author: wangyidong +Date: Thu Jul 8 13:11:27 2021 +0800 + + * finish task #40020. + +commit fdc8ed02faf5f3cf006ce002feb2c171aa1ecb1e +Author: wangyidong +Date: Thu Jul 8 13:10:59 2021 +0800 + + * fix bug for richtext in flow. + +commit 832e9b1cf1fc256fdf770a36b67d383bd60b0e0e +Author: dingguodong +Date: Thu Jul 8 11:25:14 2021 +0800 + + * Optimize code when value is null. + +commit 882f7195fdde44e7dd64aaaaaa13d93a786d677f +Author: dingguodong +Date: Thu Jul 8 10:54:23 2021 +0800 + + * Keep uniformed style for fixer removal action. + +commit ccc8c97aaa31fb3ada2dc10fa868eea226f15f47 +Author: qiyu-xie +Date: Thu Jul 8 10:14:23 2021 +0800 + + * Finish task#40008. + +commit de848b9faf23f0ffb68b44f0e17368ac7f52fd44 +Author: lichengjun +Date: Thu Jul 8 09:29:29 2021 +0800 + + * Fix code format. + +commit 8b36d4f2fc92df461bf9f4a75923f6f69a200eb3 +Merge: 90d5f86b61 b42bc4afc9 +Author: lichengjun +Date: Wed Jul 7 17:42:43 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 90d5f86b612bc13799262ef5389a9694201639f1 +Author: lichengjun +Date: Wed Jul 7 17:41:07 2021 +0800 + + * Fix close funciton code. + +commit b42bc4afc977e6e4dbd99b61ac60f3dfed640392 +Author: dingguodong +Date: Wed Jul 7 17:29:53 2021 +0800 + + * Optimize url parameter. + +commit 47e3c473a1d6c084e3cf146947499954b3eb963e +Author: dingguodong +Date: Wed Jul 7 17:16:06 2021 +0800 + + * Put strings in long line to config file. + +commit a7cd6f83a1356b2689b8739006f5f2bc252deac5 +Merge: e9bcb88d9e b6192eb928 +Author: dingguodong +Date: Wed Jul 7 17:09:50 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit e9bcb88d9edb3949c3b0f98a0d9f7eb47193c5c6 +Author: dingguodong +Date: Wed Jul 7 17:09:04 2021 +0800 + + * Rename saveSyncedIssue to saveIssueRelation, add func doc. + +commit b6192eb928eecd012e974aa4c1d212686220f36e +Author: lichengjun +Date: Wed Jul 7 16:35:21 2021 +0800 + + * Add bug,task,story,model. + +commit cb4fd5ffb1581fd80e7f2ea0bbf568d6bfe9254b +Author: tianshujie98 +Date: Wed Jul 7 13:42:12 2021 +0800 + + * Fix bug. + +commit d38280e257acffabb7726e398a9d80ca549bc4cb +Author: tianshujie98 +Date: Wed Jul 7 10:47:45 2021 +0800 + + * Fix bug #13518. + +commit 3369449307cd8dbe15eb4e23d715efd04166495e +Author: tianshujie98 +Date: Wed Jul 7 10:39:00 2021 +0800 + + * Fix bug #13519. + +commit 09b1ed61e1f9f0fc37d1730659e80b201a66330b +Merge: e5df582bd7 24f0350d44 +Author: Guan Xiying +Date: Wed Jul 7 09:49:28 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit e5df582bd7853e57588515ec149cb765c201460e +Author: Guan Xiying +Date: Wed Jul 7 09:46:16 2021 +0800 + + * Fix sync task changes to issue function. + +commit 83d23a312c1162dee68e06d2e6e509adafaaf4f0 +Author: Guan Xiying +Date: Wed Jul 7 09:44:16 2021 +0800 + + * Add getIssueListByObjects function. + +commit fa4fa5941ecf18348de65a54a20ed85486a73d5e +Merge: 1d11be7552 396954c678 +Author: wangyidong +Date: Tue Jul 6 19:28:30 2021 +0800 + + Merge branch '15.0' + +commit 396954c678972a3d189905384bd34d0dde07bea3 +Merge: 353529bb6c ed019b72f5 +Author: wangyidong +Date: Tue Jul 6 17:41:22 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 353529bb6c826ae46bde60492fcca781f3fc3c9d +Author: wangyidong +Date: Tue Jul 6 17:37:03 2021 +0800 + + * adjust for ci-commitResult. + +commit 24f0350d446c64a9cf90aaa3cabc6138ba11b899 +Merge: d241e218ce 362f8ae984 +Author: dingguodong +Date: Tue Jul 6 17:35:43 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit d241e218ce54cc1c696d58eb4cb8accf47a79457 +Author: dingguodong +Date: Tue Jul 6 17:35:02 2021 +0800 + + * Finished import gitlab issue to task. + +commit 362f8ae9846b21ad3d05b7e53be42fa97be32792 +Merge: f04514f65d 790ba783da +Author: lichengjun +Date: Tue Jul 6 16:43:35 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit f04514f65d267628ebe94132753bd783b401e8e8 +Author: lichengjun +Date: Tue Jul 6 16:43:04 2021 +0800 + + * Fix code format. + +commit 790ba783da8e6178e83d88f54918d786dcc9f571 +Merge: 9ab1e4541f e5d78d015b +Author: dingguodong +Date: Tue Jul 6 16:32:31 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 9ab1e4541f59b94d33ee8ed526cd320deba8e71f +Author: dingguodong +Date: Tue Jul 6 16:31:43 2021 +0800 + + * Import gitlab issue to task(staging). + +commit ed019b72f5afcdde4a645ec15a26ae9d6d7b2e08 +Author: qiyu-xie +Date: Tue Jul 6 16:21:09 2021 +0800 + + * Fix bug#13287. + +commit 81c1c0927f14e06698d8bfebb5bfdc9293bfa465 +Author: qiyu-xie +Date: Tue Jul 6 14:33:07 2021 +0800 + + * Fix bug#13474. + +commit 3e5e6cf6e20435acdc4ed78dcd0e0f2b83c97dca +Author: tianshujie98 +Date: Tue Jul 6 14:23:27 2021 +0800 + + * Fix bug #13508. + +commit d9fb8d7af0d2bf4d8ec0fe75faa193e43fbba2d1 +Author: qiyu-xie +Date: Tue Jul 6 14:14:24 2021 +0800 + + * Fix bug#13473. + +commit 001e93c1f927dc5425402449db126a17e04f1e5d +Merge: 3f0aeaf173 4347cc014e +Author: wangyidong +Date: Tue Jul 6 13:50:50 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 3f0aeaf173137b4da9d2f187f81e282e65dc3bb5 +Author: wangyidong +Date: Tue Jul 6 13:34:44 2021 +0800 + + * finish task #39793. + +commit 4347cc014e468f6eda452c833dd573d145d85f05 +Author: qiyu-xie +Date: Tue Jul 6 13:16:39 2021 +0800 + + * Fix bug#13385. + +commit e5d78d015ba87fa817acc310eea96a76659d36ee +Author: lichengjun +Date: Tue Jul 6 11:21:12 2021 +0800 + + *Fix bug model code format. + +commit 7db7bd4635838f17508f4438ea65eb5f5ad8be6e +Author: Guan Xiying +Date: Tue Jul 6 10:18:28 2021 +0800 + + * Fix parse bug and story object from webhook issue function. + +commit 7f84c6da14fde69360f98ec00a3fde858e179a1b +Author: qiyu-xie +Date: Mon Jun 7 16:43:47 2021 +0800 + + * Fix bug#13079. + +commit 90056bbe7cbf2cfd45f3e109c7b57a7d2597ab82 +Author: tianshujie98 +Date: Tue Jul 6 10:16:30 2021 +0800 + + * Fix bug #13495. + +commit 085811d8d4a14499aac36d821bc14abb71b6da53 +Author: tianshujie98 +Date: Tue Jul 6 09:25:38 2021 +0800 + + * Fix bug #13495. + +commit 480c6e4afc4c5fb13711fb40be8d30e1793fa378 +Author: tianshujie98 +Date: Tue Jul 6 08:19:15 2021 +0800 + + * Adjust code. + +commit c4191da8352910bc1b10cc111f08981fa039aebc +Author: tianshujie98 +Date: Tue Jul 6 08:11:11 2021 +0800 + + * Fix bug #13485. + +commit 63ff976e8f14097a0ea6c8ada55aefa7a5520a4d +Merge: 5013c8b2c6 c88110d8fc +Author: guanxiying +Date: Mon Jul 5 15:49:36 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 5013c8b2c6a10d7d14a707134f0824acb369f680 +Author: guanxiying +Date: Mon Jul 5 15:49:32 2021 +0800 + + * Fix bug #13252. + +commit c88110d8fc3337d0b61175da2034f4b6435356ce +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 5 15:49:03 2021 +0800 + + * Fix bug #13483. + +commit baecfc2c22d8f7f1059e5d3755b2caf8481c9667 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 5 15:45:51 2021 +0800 + + * Fix bug #13272. + +commit 1d11be75528beb5f571821cc61e6eadfc1ad23fe +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 5 15:41:13 2021 +0800 + + * Fix bug #13483. + +commit 53f21df6d2660b5d6794a134c4d296116c244782 +Author: tianshujie98 +Date: Mon Jul 5 15:29:09 2021 +0800 + + * Fix bug #13250. + +commit ec86c142ef6f84d404528d33ba4077872668947d +Author: dingguodong +Date: Mon Jul 5 15:10:34 2021 +0800 + + * set product column table width to 400. + +commit ff332737ffd2f786a5c1e32193387805148f5b94 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 5 15:07:36 2021 +0800 + + * Fix bug #13272. + +commit 7773ad77368bb8877908b368cbb36de0b0f26319 +Merge: 94a297d341 162f55c59a +Author: dingguodong +Date: Mon Jul 5 15:04:26 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 94a297d341f41bdc3a1c6b66778108de3febc243 +Author: dingguodong +Date: Mon Jul 5 15:03:55 2021 +0800 + + * set page to 100 temp. + +commit 57c807dd721b9c7be2ef22b1578e4de23e1a464f +Author: dingguodong +Date: Mon Jul 5 15:01:54 2021 +0800 + + * Fix bug for sql datetime lt empty string. + +commit 3d6bed24759782a7bdf6e8b4522e73f315db45cc +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 5 14:56:47 2021 +0800 + + * Fix bug #13272. + +commit 51ff47c095386e6631ac851d80259f21935aaf9d +Author: tianshujie98 +Date: Mon Jul 5 14:52:33 2021 +0800 + + * Fix bug #13057. + +commit 26be168acedc0b9c1136bfeb19a2b1c6b92b7eb0 +Merge: bc3bd8316c ecb988b495 +Author: guanxiying +Date: Mon Jul 5 14:47:18 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit bc3bd8316c1cd21f91070f46c110c7420d52c933 +Author: guanxiying +Date: Mon Jul 5 14:47:15 2021 +0800 + + * Fix bug #12828. + +commit d6368e99a6a2bd914fe915ea33a36bcb4d364cef +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 5 14:46:03 2021 +0800 + + * Fix bug #13271. + +commit ecb988b495fc6e1f7defaa82ddd828060c23514c +Author: tianshujie98 +Date: Mon Jul 5 14:32:31 2021 +0800 + + * Fix bug #13360. + +commit 5654030da5809cf1b0a80f34be264dcd0cc5b261 +Author: Hao Sun +Date: Mon Jul 5 14:29:43 2021 +0800 + + * update zui: force pages to open in app tab in workflow and related modules. + +commit 98f7e592ad8fe9db6250404740dce1f85b942994 +Author: tianshujie98 +Date: Mon Jul 5 13:39:04 2021 +0800 + + * Fix bug #13443. + +commit 162f55c59a01a048f700173d15517fea4a55ac4c +Merge: 30f8f51e3b 388f6365c9 +Author: lichengjun +Date: Mon Jul 5 13:32:20 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 79c27570e8eda06526a4daa243911eeb5df87e5b +Merge: b49812bfb6 81e73ff548 +Author: wangyidong +Date: Mon Jul 5 13:27:12 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 30f8f51e3b016606ee66780fcc74b0486d44c0a7 +Author: lichengjun +Date: Mon Jul 5 13:26:49 2021 +0800 + + *Add batch update, assign, function in the story model. + +commit b49812bfb6071d2cb1f562cab84b71ab4a644a71 +Author: wangyidong +Date: Mon Jul 5 13:26:30 2021 +0800 + + * finish task #39793. + +commit 81e73ff5480937cfbc1f34dd239be1e66534a6f5 +Author: Hao Sun +Date: Mon Jul 5 13:11:25 2021 +0800 + + * update zui: force pages in workflow module open in app tab. + +commit d49a33383758c65c8d1fa84942cbd2e1e13a2694 +Merge: 2d47b0e755 7a4dd087a1 +Author: wangyidong +Date: Mon Jul 5 11:45:27 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 2d47b0e75562f8d5425741c0d79de01cc7adfa41 +Author: wangyidong +Date: Mon Jul 5 11:45:02 2021 +0800 + + * finish task #39793. + +commit 388f6365c925b48fc5fe9db65977f00ad4bda236 +Author: dingguodong +Date: Mon Jul 5 10:50:24 2021 +0800 + + * The GET form for importIssue is completed, post not. + +commit 390916928878040e17be6903c3ca92b2881a3924 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 5 10:35:13 2021 +0800 + + * Adjust code style of import to lib. + +commit 9f05faa716fd251ccc2a857b2d0500713a056c4e +Merge: eca1930586 b840895478 +Author: dingguodong +Date: Mon Jul 5 10:28:01 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit eca1930586bbdcb01641be85abba432c911f8d42 +Author: dingguodong +Date: Mon Jul 5 10:26:54 2021 +0800 + + * Remove useless variables for apiGetIssues. + +commit b8408954785358d7634d4db61a02f5da6abaa749 +Author: Guan Xiying +Date: Mon Jul 5 09:57:10 2021 +0800 + + * Remove issue param from apiCreateIssue function. + +commit 7a4dd087a1c842d0540901d24454023bd333e6f4 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 5 09:28:22 2021 +0800 + + * Finish task #38791. + +commit 2650aab901f4dc0f8d9bd761699fb251f672e74f +Author: lichengjun +Date: Mon Jul 5 09:03:42 2021 +0800 + + * Fix gitlab model apiCreateIssues function code format. + +commit 38df84e8ede26f65f11adc666ba40372d838b293 +Author: lichengjun +Date: Mon Jul 5 05:40:10 2021 +0800 + + * Fix story, task bug. + +commit 1c5aed2d76b02e62a829580d0b2b3e0849313491 +Author: lichengjun +Date: Sat Jul 3 10:25:58 2021 +0800 + + * Fix bug,story,task code format. + +commit 0e1f288c4b98c91e85485c174b8b6dbd82e0a090 +Merge: c64b3580c8 4485dbe009 +Author: lichengjun +Date: Sat Jul 3 10:03:44 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit c64b3580c888835fba7b34e14f24b9704e5f1a36 +Author: lichengjun +Date: Sat Jul 3 09:58:23 2021 +0800 + + * Fix bug,task,story code format. + +commit 4485dbe009ba0f4c05bd4d5fc043f8dc5c0e66f3 +Author: dingguodong +Date: Fri Jul 2 17:36:18 2021 +0800 + + + Create apiGetIssues function. + +commit 82f854f3f101e865a3448e5b38ba866cac0438d2 +Author: dingguodong +Date: Fri Jul 2 17:32:24 2021 +0800 + + - Remove unneeded function. + +commit ae5f25d110da591990fe98db82bb77d91cddb54c +Merge: 7d31a09810 5688c9c052 +Author: dingguodong +Date: Fri Jul 2 17:22:38 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 7d31a09810b9c6e46fd2c78ff0591ac72a915f07 +Author: dingguodong +Date: Fri Jul 2 17:21:40 2021 +0800 + + * commit unfinished job for task #38934. + +commit 5688c9c0529683604453d4e3d6b04a57524a3016 +Merge: a4f4cfd8a9 745957f6e3 +Author: Guan Xiying +Date: Fri Jul 2 17:17:42 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit a4f4cfd8a9416c3a167495728d9d97f7b1d420bf +Author: Guan Xiying +Date: Fri Jul 2 17:16:56 2021 +0800 + + * Rename gitlabModel::createWebhook to initWebhooks. + +commit 3b84be4f9979fb64c2988698b212b724791ea255 +Author: qiyu-xie +Date: Fri Jul 2 16:40:46 2021 +0800 + + * Adjust action when import from library. + +commit 790dcefa53315ec4e72dedbc4e7e27ff4ac6a62e +Author: wangyidong +Date: Fri Jul 2 16:16:22 2021 +0800 + + * remove ztCloud. + +commit 9679c84a907b099231a0dfcf4386166bec3f317c +Author: holan20180123 <56391770@qq.com> +Date: Fri Jul 2 15:25:10 2021 +0800 + + * Fix import to story lib error. + +commit f3681dc1f6e3963d49661f4250806255bb9f74a5 +Author: wangyidong +Date: Fri Jul 2 15:00:07 2021 +0800 + + * adjust for gitlab. + +commit 37241468cc953b7ebaaf4a043662a865a33090c5 +Author: qiyu-xie +Date: Fri Jul 2 14:47:45 2021 +0800 + + * Fix bug#13425. + +commit de2662ade7220e96ed56c25eb41fffe2c46bb304 +Author: guanxiying +Date: Fri Jul 2 14:40:30 2021 +0800 + + * Fix an error. + +commit 05d63b5bd2ee65c8d9f7556dfb5071c39c8ba13c +Merge: ac0ecdb07f e7bec99dc7 +Author: guanxiying +Date: Fri Jul 2 14:33:57 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ac0ecdb07fdff07ee32a65cb4b20e4c92a8c59aa +Author: guanxiying +Date: Fri Jul 2 14:33:53 2021 +0800 + + * Fix an error. + +commit e7bec99dc706e6f7dd1fb472f6d2625526cd4546 +Author: qiyu-xie +Date: Fri Jul 2 14:30:48 2021 +0800 + + * Fix a bug when import story from library. + +commit 745957f6e3bcfb22a1eb03e59a529e99d37fe4f8 +Author: lichengjun +Date: Fri Jul 2 14:19:17 2021 +0800 + + * Fix gitlab to issues bug. + +commit 6c250a97f9f8112ac8a5d768c716a23f7603eae9 +Author: wangyidong +Date: Fri Jul 2 14:08:08 2021 +0800 + + * finish task #39794. + +commit 07c4cf8887427a2a4e3500a8b8bb147447c5c2dc +Author: tianshujie98 +Date: Fri Jul 2 13:52:33 2021 +0800 + + * Adjust code. + +commit b72c17b2911683495f178410e5365ea9f7e19a0f +Author: guanxiying +Date: Fri Jul 2 13:05:16 2021 +0800 + + * Remove the branch in storylib search. + +commit 5016d4751d942730c9c33f80b80a9d7b28d2fc94 +Author: wangyidong +Date: Fri Jul 2 11:26:13 2021 +0800 + + * finish task #39796. + +commit a951e67f59ff2de695b763e220358f123f6a2acf +Author: lichengjun +Date: Fri Jul 2 11:04:50 2021 +0800 + + * Fix issues bugs. + +commit 04faa67fc72ef886d5ab37d3315141b13a12b76f +Merge: 6f4b4588ab 38f01b13ff +Author: wangyidong +Date: Fri Jul 2 10:54:43 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 6f4b4588ab6841f4edb9b6c35932c5bcaf052330 +Author: wangyidong +Date: Fri Jul 2 10:54:24 2021 +0800 + + * fix for gitlab. + +commit defa632d132c402214b28fdd7c1be4ecac7a7cf9 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jul 2 09:35:13 2021 +0800 + + * Finish task #39832. + +commit 38f01b13ffbbb1617de022d50a7e0929de441429 +Merge: ec4bdc3477 c287a0cb49 +Author: zenggang +Date: Fri Jul 2 00:56:22 2021 +0000 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit c5e4c1d1c9298f4f8101365b2ad18faf739cd868 +Author: tianshujie98 +Date: Fri Jul 2 08:54:26 2021 +0800 + + * Finish task #39840. + +commit ec4bdc347721dc514e7e9cdfe9664b36d229c28d +Author: zenggang +Date: Fri Jul 2 00:54:16 2021 +0000 + + * finish task#39797 + +commit 7b52b61439cfa9c179380c3d05f51da3864db0fc +Author: dingguodong +Date: Thu Jul 1 21:15:31 2021 +0800 + + * Optimize function parseObjectToIssue. + +commit cebe56a593ec0a8ae7c185b8ede1fb816693949c +Author: lichengjun +Date: Thu Jul 1 18:34:24 2021 +0800 + + * Fix Replace with getRationByObject. + +commit 232f386373ef6dbb10169c21a81a607e92c88f25 +Merge: 4e505d434f b96490b491 +Author: guanxiying +Date: Thu Jul 1 17:34:00 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4e505d434f5fc47594bbfa05e5c000efd4012277 +Author: guanxiying +Date: Thu Jul 1 17:33:55 2021 +0800 + + * Fix bug #13427. + +commit b96490b491b725557456479844c0c4fbb9c2d107 +Author: tianshujie98 +Date: Thu Jul 1 17:22:00 2021 +0800 + + * Finish task #39870. + +commit 7c240783aff4fcaf5d1b2c73a2f0510d25e5a3ea +Author: dingguodong +Date: Thu Jul 1 17:14:23 2021 +0800 + + * Remove needless bracket and bug fix for stdclass. + +commit b8ae511b5bba16e80f1d33e32f1ce132f5f419c3 +Author: dingguodong +Date: Thu Jul 1 17:12:00 2021 +0800 + + * Transform tab to 4 spaces. + +commit 4b5d26f224cbf817c73ae9a803f048883b7aeb76 +Merge: 7015721af5 3af2cbffbf +Author: dingguodong +Date: Thu Jul 1 17:04:07 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 7015721af5afb92425424661b15e12aa783010fb +Author: dingguodong +Date: Thu Jul 1 17:03:34 2021 +0800 + + + Add function for parsing zentao object to issue. + +commit c287a0cb49e5f82a0351ec45fcce4cccf348e69e +Author: wangyidong +Date: Thu Jul 1 16:56:59 2021 +0800 + + * adjust code. + +commit 3af2cbffbffba828c2e5af90f174158d0d0f5b8b +Author: lichengjun +Date: Thu Jul 1 16:39:15 2021 +0800 + + * Misjudgment story issues status; + +commit 1a5824ea8bf69e87036c4994783ed6a01e2f7f2e +Author: dingguodong +Date: Thu Jul 1 16:33:13 2021 +0800 + + * Simplify function for deleteIssue. + +commit 568e59f1677f18eaf7110b98afcd55e6c3da8975 +Merge: 75e6079c46 65e1feff0d +Author: dingguodong +Date: Thu Jul 1 16:22:45 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 65e1feff0d58f389b6697fd850b37103d807b3a4 +Merge: 2341965ff4 df46ea907b +Author: lichengjun +Date: Thu Jul 1 16:22:07 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 75e6079c46de17531ffdb4da864d77c2dba282c9 +Merge: 84674f2d5c df46ea907b +Author: dingguodong +Date: Thu Jul 1 16:20:58 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 84674f2d5c6d11b453aca03e2fd9450463ab082b +Author: dingguodong +Date: Thu Jul 1 16:18:57 2021 +0800 + + + Add unfinished transferIssue function for optimizing after code review. + +commit 2341965ff4a71d477eb4cd05db49e7ae357c69b6 +Author: lichengjun +Date: Thu Jul 1 16:18:22 2021 +0800 + + * Fix format code. + +commit 56e66eb40ad12cc0c44e5f353df8f0cfe7e668e8 +Author: dingguodong +Date: Thu Jul 1 16:15:19 2021 +0800 + + * Simplify function for createZentaoObjectLabel. + +commit df46ea907bff19967441d186a9e9ffd80140a1bc +Author: Guan Xiying +Date: Thu Jul 1 16:07:29 2021 +0800 + + * Format code. + +commit d4d8185131dd3746b930f0f3fd326abdc2baa66c +Author: dingguodong +Date: Thu Jul 1 15:55:20 2021 +0800 + + * Rename some functions after code review. + +commit 688890ee8454fd52f08ecd39a9f996d95a1d1a47 +Author: Guan Xiying +Date: Thu Jul 1 15:49:19 2021 +0800 + + * Return all fields in getRelationByObject function. + +commit c83c6a973c026d647d648989b06af6622625a8ab +Merge: e510d5ae6a 3f3b7873c1 +Author: Guan Xiying +Date: Thu Jul 1 15:41:04 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit e510d5ae6a505e1cd8342b985f28165964f3693b +Author: Guan Xiying +Date: Thu Jul 1 15:39:54 2021 +0800 + + * Review codes and adjust code format. + +commit 3f3b7873c1bd6d8b0f65c7e295815a21c398e336 +Merge: ed4d6d4c11 1fa03c1f44 +Author: dingguodong +Date: Thu Jul 1 14:31:24 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit ed4d6d4c11655d33a199ff4e4589f72377937f74 +Author: dingguodong +Date: Thu Jul 1 14:30:59 2021 +0800 + + - Remove unused bindProduct. + +commit 9c75960c31604dfe904685c89dd04fefb3db0094 +Merge: a182a850de 1fa03c1f44 +Author: Guan Xiying +Date: Thu Jul 1 14:24:29 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 1fa03c1f44cc196ad83c9a4e45f1eb7d05461de2 +Author: lichengjun +Date: Thu Jul 1 14:24:05 2021 +0800 + + * Add api get single issue + +commit a182a850de3089a759cd90e24f06e0a11c783b43 +Merge: dd8cd2aa5e 1b0f48b9e3 +Author: Guan Xiying +Date: Thu Jul 1 14:20:57 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 1b0f48b9e380db5a005216c62958de55e4c2e4d8 +Author: lichengjun +Date: Thu Jul 1 14:00:43 2021 +0800 + + * Fix close to issues. + +commit c74a1f483d95bfcfc5fec3d23958dc563916db4c +Author: zenggang +Date: Thu Jul 1 03:33:20 2021 +0000 + + * fix bug 13182 + +commit 5d31216afdd8049fd498422dfdee679b1860cf1b +Author: lichengjun +Date: Thu Jul 1 11:21:05 2021 +0800 + + * Fix close to issues bug. + +commit d3571635f89c20512e5ea16d7a0144785eff1281 +Author: tianshujie98 +Date: Thu Jul 1 10:21:29 2021 +0800 + + * Adjust code. + +commit 493f692a69ac32a6f091ce205a2072f263c585e6 +Author: dingguodong +Date: Thu Jul 1 10:19:36 2021 +0800 + + + Append story link in zentao to gitlab issue description. + +commit 8d6531c91663f9e8fbbeed3aee5780dce00140e9 +Author: dingguodong +Date: Thu Jul 1 10:16:35 2021 +0800 + + + Append task link in zentao to gitlab issue description. + +commit ef8948e381190262f46d9d840aabb62922c51869 +Author: dingguodong +Date: Thu Jul 1 10:05:49 2021 +0800 + + + Append bug link in zentao to gitlab issue description. + +commit f98d12dee8e61265b65a287fe0ed19be1cace27b +Merge: f407f70700 26ec63969d +Author: wangyidong +Date: Thu Jul 1 08:20:21 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit f407f70700a1c55d22882590777709b03fc11ab3 +Author: wangyidong +Date: Thu Jul 1 08:19:49 2021 +0800 + + * adjust for book. + +commit 15149a59556c0c046b0727dbf95822753e219062 +Author: dingguodong +Date: Thu Jul 1 08:12:43 2021 +0800 + + * Rename pushObject to pushToIssue. + +commit b48df3518a9f6488350d87b4f83e75acb6a82264 +Author: lichengjun +Date: Wed Jun 30 18:56:55 2021 +0800 + + * Fix story bug. + +commit 3154474094a34f249e4d7304be6a891316cdcd6e +Author: guanxiying +Date: Wed Jun 30 18:39:30 2021 +0800 + + * Add the session list and adjust the assetlib link in dynamic. + +commit ecb973f9d9668226ae701a27a614cf4be3ade67f +Author: tianshujie98 +Date: Wed Jun 30 17:13:39 2021 +0800 + + * Adjust code. + +commit a1cda98a922a4241c4816ea1eff7fffc2bb4ee6b +Author: tianshujie98 +Date: Wed Jun 30 16:31:36 2021 +0800 + + * Adjust code. + +commit 432c4564beca27fb3cb30b6eb47ea92f956e898c +Author: tianshujie98 +Date: Wed Jun 30 16:27:44 2021 +0800 + + * Adjust code. + +commit 1c27519ef2b6b65f8293fc66789f9d701e958ba8 +Author: lichengjun +Date: Wed Jun 30 16:22:33 2021 +0800 + + * Fix story sync Issuse bug. + +commit 54ead1734e08aee008d248583fa6f083d907ec7f +Author: tianshujie98 +Date: Wed Jun 30 16:07:41 2021 +0800 + + * Adjust code. + +commit 1cf38e09f18ee0ff6e19d1e445540b6bfa02fa3e +Author: tianshujie98 +Date: Wed Jun 30 14:55:37 2021 +0800 + + * Adjust code. + +commit 360d5ab644b52b5f28430fd2ddc8528fd5c3e15b +Author: tianshujie98 +Date: Wed Jun 30 14:47:45 2021 +0800 + + * Fix bug. + +commit 5b018bb833e17cfb514d08c396f92e6a6b63f572 +Merge: a491068115 48a545ea4d +Author: holan20180123 <56391770@qq.com> +Date: Wed Jun 30 14:16:50 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 48a545ea4d192afb31e8b960d2247b4cb0e16495 +Author: tianshujie98 +Date: Wed Jun 30 14:07:47 2021 +0800 + + * Adjust code. + +commit a491068115805610a5c56b25e61d57814dc1fd15 +Author: holan20180123 <56391770@qq.com> +Date: Wed Jun 30 13:40:44 2021 +0800 + + * Adjust action. + +commit fed23d507da343c3afa1ebd3f5111bcf28ab61f1 +Author: tianshujie98 +Date: Wed Jun 30 11:02:08 2021 +0800 + + * Adjust code. + +commit 9f967a76359d1afc56e1605a4cf944a23ae820dc +Author: tianshujie98 +Date: Wed Jun 30 10:58:21 2021 +0800 + + * Adjust code. + +commit 7653154b20a2ef7ab8b212fdc367d9c40322eaeb +Author: tianshujie98 +Date: Wed Jun 30 10:28:51 2021 +0800 + + * Adjust code. + +commit 6d7bb20eac75a1a5d60ffa8088057e0c81ab1cf6 +Author: dingguodong +Date: Tue Jun 29 16:56:14 2021 +0800 + + * Remove token from url for security. + +commit ad41a07d3607b1cd8eab670b905a2083f85409bd +Author: dingguodong +Date: Tue Jun 29 16:47:09 2021 +0800 + + + Create webhook with access token; + +commit 584823089cb6683a7fc1e1c0ef3167c866813e8c +Merge: 49d1c35356 2b8b7c6555 +Author: tianshujie98 +Date: Tue Jun 29 16:45:14 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 49d1c35356d352a0664a2ed0428499dc2e74da15 +Author: tianshujie98 +Date: Tue Jun 29 16:44:54 2021 +0800 + + * Adjust code. + +commit 2b8b7c6555f3bde048794370df6bc5ed5c720ff4 +Merge: 1915b9558d 84b1280ab0 +Author: guanxiying +Date: Tue Jun 29 16:44:54 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1915b9558df43b2a4aee5ac62589d19a46adc7e7 +Author: guanxiying +Date: Tue Jun 29 16:44:50 2021 +0800 + + * Add the getByIdList function in doc module. + +commit 26ec63969db07368e4e2f7f71808d1709e272264 +Author: Yagami <976204163@qq.com> +Date: Tue Jun 29 16:23:59 2021 +0800 + + * Fix code details. + +commit 18acf1cef6bf7d932061408f3a4a619b9065843c +Author: Yagami <976204163@qq.com> +Date: Tue Jun 29 16:22:23 2021 +0800 + + * Fix progress block logic. + +commit 812b048621856ef3ea8c715268257bd54346e9bf +Author: dingguodong +Date: Tue Jun 29 16:20:01 2021 +0800 + + + Add story state map(without full qa). + +commit dd8cd2aa5eb93a4204a97a12bb9a2fc37725d8d6 +Author: Guan Xiying +Date: Tue Jun 29 16:15:15 2021 +0800 + + * Check token by X-Gitlab-Token. + +commit aaa61e88807727346c0729f8c0573e6e817dd263 +Merge: 701b817946 4e01b01a70 +Author: dingguodong +Date: Tue Jun 29 16:10:48 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 701b817946d5b310161248bb3c3ac6be9f40103f +Author: dingguodong +Date: Tue Jun 29 16:10:11 2021 +0800 + + * Bug fixed when creating object and syncing to issue. + +commit 4e01b01a7084587676e1f8867211d8f31f89bc44 +Merge: e8695963af ef784ec1fe +Author: lichengjun +Date: Tue Jun 29 16:08:18 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 84b1280ab045e73233b3f7ee50ff914cc7fe2253 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jun 29 16:05:16 2021 +0800 + + * Adjust save user acl. + +commit 69e62a08da342076fe959c4c86889ad4d6a2617f +Author: wangyidong +Date: Tue Jun 29 16:01:06 2021 +0800 + + * adjust for style. + +commit e8695963aff6e4319237b0d7dc10221245cd83e8 +Author: lichengjun +Date: Tue Jun 29 15:58:38 2021 +0800 + + *Task fixed close issues. + +commit ef784ec1fee5f3f0317b75e80d3e8cdc88e750a9 +Merge: 3b69fe594d 47af403729 +Author: dingguodong +Date: Tue Jun 29 15:40:05 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 3b69fe594d5bd2ab1230519cd5ad26c83de4e2fe +Author: dingguodong +Date: Tue Jun 29 15:39:34 2021 +0800 + + * Bug fixed for curl DELETE. + +commit 47af4037295248e772f1700ef809d208bd86e589 +Merge: e2eabb8771 60bfc2d2fe +Author: Guan Xiying +Date: Tue Jun 29 15:32:32 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit e2eabb87712cc8de18665754d2272697eee5b263 +Author: Guan Xiying +Date: Tue Jun 29 15:32:07 2021 +0800 + + * Finish sync assign option. + +commit e9cbc7b38381290663b1afa13e273c8f25b6fda9 +Author: tianshujie98 +Date: Tue Jun 29 15:08:33 2021 +0800 + + * Adjust code. + +commit 60bfc2d2fe8ada0b056578f8667cdbdfbe7b2507 +Merge: 925a7417ea 5f68564d28 +Author: lichengjun +Date: Tue Jun 29 14:53:34 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 925a7417eaebf3048080f451e7875613d5edc174 +Author: lichengjun +Date: Tue Jun 29 14:52:49 2021 +0800 + + * fix code. + +commit 5f68564d28c280bcd286f1788de4e9b89ac3f854 +Author: dingguodong +Date: Tue Jun 29 14:52:37 2021 +0800 + + * Optimize codes for deleting issue when deleting object. + +commit cefd614900bdc01de28ba8410c49faeb22c94e64 +Author: wangyidong +Date: Tue Jun 29 14:31:58 2021 +0800 + + * fix bug and adjust for createLink params. + +commit 391b57776630a313686566a924c4f92a562b7dfb +Author: dingguodong +Date: Tue Jun 29 14:29:35 2021 +0800 + + * Optimize codes for deleting issue when deleting object. + +commit ae7e631f90f3c9e58f1331f7e3c42a0c27f7d74e +Author: holan20180123 <56391770@qq.com> +Date: Tue Jun 29 14:22:06 2021 +0800 + + * Add import doc to asset. + +commit d863acfdd918057c0349985661a5980f83107062 +Author: dingguodong +Date: Tue Jun 29 14:10:36 2021 +0800 + + * Update issue when updating the bug. + +commit 16c4e340e8bc4ee94318582b5d88e02d38ab9bbd +Author: dingguodong +Date: Tue Jun 29 14:00:05 2021 +0800 + + * Resolve whoes the bug. + +commit 7f42605c3118d06b6cf1ca3652af7ebd7fbef297 +Author: dingguodong +Date: Tue Jun 29 13:58:53 2021 +0800 + + * Reactivate issue when reopen the bug. + +commit af524d455b6aa61129b56067c090f36846985974 +Author: dingguodong +Date: Tue Jun 29 13:43:08 2021 +0800 + + * Resolve hidden error. + +commit b3a5fff35ece8ed37a421da01d97e0c19c081ea9 +Author: dingguodong +Date: Tue Jun 29 13:32:39 2021 +0800 + + * Push bug when creating bug using productID. + +commit d31184ccd3e5d83a6b5444bf2a3784cb95329bcb +Author: dingguodong +Date: Tue Jun 29 13:32:01 2021 +0800 + + + Add func to get gitlab and project by productID. + +commit bfb6b438dcaa7c95e16d07fc5fcf630e1f23dfa1 +Author: wangyidong +Date: Tue Jun 29 13:07:56 2021 +0800 + + * adjust for gitlab. + +commit bf9d28ef7f0f9317542dc8e81024c5e482d55d1d +Author: dingguodong +Date: Tue Jun 29 11:13:29 2021 +0800 + + + Update issue status when close bug. + +commit 7b7ff8d2094fe1d977d7ab0f82045c968435dba4 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jun 29 11:11:14 2021 +0800 + + * Adjust js locate. + +commit 00f4e8b4051bc36a66a9408f34897176fbf991af +Merge: ad05859fad af02efc949 +Author: dingguodong +Date: Tue Jun 29 11:07:23 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit ad05859fadce946c83958a98674653046a802137 +Author: dingguodong +Date: Tue Jun 29 11:05:48 2021 +0800 + + * Update bugToIssue and meet the gitlab API. + +commit af02efc949357c1ebb2247b7a0ce6299a59f6a42 +Author: Guan Xiying +Date: Tue Jun 29 10:59:42 2021 +0800 + + * Add strtotime. + +commit 1325d772fe2774a50f6b556f7a59f7b57feb18a3 +Merge: e3a5814eec 7a1a1e44f5 +Author: Guan Xiying +Date: Tue Jun 29 10:58:39 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit e3a5814eecdf80ce2110f1600b665a13bf62c076 +Author: Guan Xiying +Date: Tue Jun 29 10:58:17 2021 +0800 + + * Fix date and datetime field. + +commit 54505413910b4de7234a4b4e52926e68983e8ecb +Author: Guan Xiying +Date: Tue Jun 29 10:56:17 2021 +0800 + + * Add datetime and date option. + +commit 7a1a1e44f5ab5a0ac9aecdc60b4008799573f9ed +Merge: df508bdfec 1bad02c282 +Author: lichengjun +Date: Tue Jun 29 10:46:23 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit df508bdfec086f9a767c49c5b8736ed1e98ba610 +Author: lichengjun +Date: Tue Jun 29 10:43:30 2021 +0800 + + * Add bug,story,task push to issues function. + +commit 1bad02c282be6ed7d06327f561697ddba9bf7003 +Author: dingguodong +Date: Tue Jun 29 10:13:26 2021 +0800 + + * Correct issue state. + +commit d3c1fe0658d980b412a86c93b1301daa665f9046 +Merge: 9459443016 bd2442488f +Author: dingguodong +Date: Tue Jun 29 10:03:45 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit bd2442488f426508b2f2e10de2f21b31943b3df2 +Merge: cb733a0186 38ca3cbb9e +Author: Guan Xiying +Date: Tue Jun 29 10:01:49 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit cb733a018660e584f9b0b6b468ee8f1023290d7c +Author: Guan Xiying +Date: Tue Jun 29 10:01:34 2021 +0800 + + * Add webhookIssueAssign function. + +commit 9459443016108bec7e7fd8b4288b6be9827e02f5 +Author: dingguodong +Date: Tue Jun 29 10:00:45 2021 +0800 + + * Preparing for merge them to pushObject. + +commit 9d7b8901fce9369728ada8977d2dced1ae06e967 +Author: Guan Xiying +Date: Tue Jun 29 10:00:04 2021 +0800 + + * Fix gitlab issue state. + +commit 38ca3cbb9e386ef22adf28752b089f0c2d8eb592 +Author: dingguodong +Date: Tue Jun 29 09:40:45 2021 +0800 + + * Optimize codes and bug fix. + +commit 3906982fdb04b25300eabce04faeb2accfd1031b +Author: dingguodong +Date: Tue Jun 29 09:36:34 2021 +0800 + + * Rename syncObject to pushObject. + +commit db68646908a5b28ad0a17751616fd13900cd91b3 +Author: dingguodong +Date: Tue Jun 29 09:31:29 2021 +0800 + + - Remove old pushObject function. + +commit 7fa1167376d350a62497b0ef6ad8c28304a44c38 +Author: qiyu-xie +Date: Tue Jun 29 09:28:05 2021 +0800 + + * Fix bug#12376. + +commit facb35a4e5edcabddbad5c7cd0e1d5d7df4b2ac0 +Author: tianshujie98 +Date: Tue Jun 29 09:23:37 2021 +0800 + + * Adjust code. + +commit 9aec0e4450f620126b3fadbe353468518ed515c0 +Merge: 5fb6d97efd 203f0984d9 +Author: wangyidong +Date: Tue Jun 29 09:11:11 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 5fb6d97efd335a9a065329657e01c25678224672 +Author: wangyidong +Date: Tue Jun 29 09:10:57 2021 +0800 + + * adjust error. + +commit 2e9351bad6bbada6257ad72d1347a257888eb773 +Author: lichengjun +Date: Tue Jun 29 09:07:00 2021 +0800 + + * Add fix update story. + +commit 203f0984d94b211fc2b7c729961afd32a61ac150 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jun 29 08:57:48 2021 +0800 + + * Adjust execution link plan. + +commit b0c6f39a35b63bc38922982f3b25c16cf69741af +Merge: 38a0f4bbfd 6dba8ad443 +Author: lichengjun +Date: Tue Jun 29 08:38:23 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 38a0f4bbfde8a92e43596bfeebb8c143c9b231f5 +Author: lichengjun +Date: Tue Jun 29 08:36:51 2021 +0800 + + * Add update story to gitlab issue. + +commit 6dba8ad4430b5965d6fca1409c82e8b2bf78fb83 +Author: dingguodong +Date: Mon Jun 28 23:31:48 2021 +0800 + + + Update issue when assign bug to user. + +commit c064d05ab60b99f8a79dbaaa870d8dfa765309c5 +Author: dingguodong +Date: Mon Jun 28 23:17:50 2021 +0800 + + * Bug fix and format codes. + +commit bb3bce97db00e07753d52e0e54ff8127cca9660d +Author: dingguodong +Date: Mon Jun 28 21:47:26 2021 +0800 + + + Delete related issue in gitlab when deleting story. + +commit 8189d6070935b890ea1e2b6070298bd46da82f47 +Author: dingguodong +Date: Mon Jun 28 21:47:12 2021 +0800 + + + Delete related issue in gitlab when deleting bug. + +commit d15cb6ed42ac7c91d892b94ddf32c086ba5e6f8b +Author: dingguodong +Date: Mon Jun 28 18:17:36 2021 +0800 + + * Optimize codes. + +commit 627ca95b07b58ab65bf0d5ef3f0b8e7c740833fe +Author: dingguodong +Date: Mon Jun 28 17:51:17 2021 +0800 + + + Delete related issue in gitlab when deleting task. + +commit 59f4f344e741e4b7ef2609317d6e3c01ce7e836e +Author: dingguodong +Date: Mon Jun 28 17:50:10 2021 +0800 + + + Add the function of deleting an issue. + +commit cc64050647f3235109b195d67277316cc72722f3 +Author: dingguodong +Date: Mon Jun 28 17:16:52 2021 +0800 + + + Add delete an issue function. + +commit 6a358a0cf8c0862eb3229aa9ff40cd9b7ccc382f +Author: dingguodong +Date: Mon Jun 28 16:54:29 2021 +0800 + + * Optimize this function. + +commit 6f7b82a051b9c287ea58745b73ae40dafc12b2c1 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jun 28 16:37:02 2021 +0800 + + * Fix bug #12406. + +commit 71e268a06b711c4b1cf633296b4350134510ffc9 +Author: tianshujie98 +Date: Mon Jun 28 16:24:01 2021 +0800 + + * Adjust code. + +commit 690594741c4a2080102142a7d20e235e28e7b5ba +Author: holan20180123 <56391770@qq.com> +Date: Mon Jun 28 15:53:20 2021 +0800 + + * Adjust action link. + +commit 48912189f428413a1d6fe3e5bd9b97dafbd59ace +Merge: aebfaa2fbe 462fb4b164 +Author: lichengjun +Date: Mon Jun 28 15:03:25 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit aebfaa2fbeda416709b6057c25339a568731619d +Author: lichengjun +Date: Mon Jun 28 15:02:53 2021 +0800 + + *Adj code. + +commit 462fb4b164f4d83a75d0c057c23c668821820879 +Merge: 9623172398 cd060c0fef +Author: dingguodong +Date: Mon Jun 28 14:40:41 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 9623172398753a02f5f9454cc9115d466dd9d5c4 +Author: dingguodong +Date: Mon Jun 28 14:39:33 2021 +0800 + + * Ready for pushing story to issue. + +commit db8a1a3c5838fc0b22186ef65ee9ff48454421d4 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jun 28 14:06:27 2021 +0800 + + * Adjust import stroy to lib. + +commit cd060c0fef2b2fa00a0ef904345da2b1fdb18642 +Merge: be619512c4 6f424a1466 +Author: lichengjun +Date: Mon Jun 28 14:05:05 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit be619512c460b03c665de18cfc4c2d6c237acea8 +Author: lichengjun +Date: Mon Jun 28 14:04:02 2021 +0800 + + * Adj Code. + +commit 6f424a14664450a520726a8bc8e304e53935b4c6 +Author: Guan Xiying +Date: Mon Jun 28 13:51:32 2021 +0800 + + * Return object for webhook. + +commit 2f3033138f7543e4842793b3b6c558dd12764bad +Author: tianshujie98 +Date: Mon Jun 28 13:09:58 2021 +0800 + + * Adjust code. + +commit e0e72bf4e3c78cd581a596601645162ab74a4556 +Author: Guan Xiying +Date: Mon Jun 28 13:08:33 2021 +0800 + + * Fix parse gitlab user id error. + +commit 626f7346fae3cbc263eedcf05db790acfd25a4cf +Author: tianshujie98 +Date: Mon Jun 28 13:03:16 2021 +0800 + + * Adjust code. + +commit c36f697aef1c91a489b49bf2836fb98e4966909f +Author: Yagami <976204163@qq.com> +Date: Mon Jun 28 12:02:51 2021 +0800 + + * Fix bug. + +commit a55ddb6bd7a01eb2e41a1fc3790da6bd0a01c613 +Merge: 57dee3d6a4 082ced2d7d +Author: holan20180123 <56391770@qq.com> +Date: Mon Jun 28 11:37:33 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 082ced2d7d930c72b55242940072403081d853e0 +Author: qiyu-xie +Date: Mon Jun 28 11:34:32 2021 +0800 + + * Modify import from lib action. + +commit 697a7450a9a1baa7f51f7a710b9c7448f2658e00 +Merge: 2076a3aadb 3907ff1ea7 +Author: Guan Xiying +Date: Mon Jun 28 11:33:53 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 3907ff1ea7fd2c9d2c08317e9e465072edfceb3a +Author: lichengjun +Date: Mon Jun 28 11:24:55 2021 +0800 + + * Add bug fix. + +commit 9c21bf6aa66f00217336ff48123e3efcbc227944 +Author: qiyu-xie +Date: Mon Jun 28 11:03:28 2021 +0800 + + * Finish task#39576. + +commit 57dee3d6a410de0626556bd1a25dc883231a4c0b +Author: holan20180123 <56391770@qq.com> +Date: Mon Jun 28 10:03:47 2021 +0800 + + * Add action link for asset lib. + +commit 3429d54c09ceefb06233be96c95157e816dd0d8c +Author: lichengjun +Date: Mon Jun 28 08:38:59 2021 +0800 + + * Add sync bug to issue. + +commit cb12197a3b427687efcc7c37c392320ba2035957 +Merge: 1d600ede32 afb01a3a95 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jun 28 08:13:30 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 2076a3aadb968c9303c15ca17e38fb3faa578750 +Author: Guan Xiying +Date: Fri Jun 25 17:55:19 2021 +0800 + + * Change markdown description to html. + +commit 898fd11a5895ffb0b2a59207a4f5fc20f1ba690c +Author: Guan Xiying +Date: Fri Jun 25 17:21:22 2021 +0800 + + * Add gitlab objectTables config. + +commit af7ac63f2edc11e39e43c17cb282b94f1eff7c02 +Author: Guan Xiying +Date: Fri Jun 25 17:20:40 2021 +0800 + + * Add gitlab webhook filter config. + +commit 6957dcadef5eb583a5117107698d6f87ee6f8ea5 +Author: Guan Xiying +Date: Fri Jun 25 16:58:53 2021 +0800 + + * Fix apigetuser bug. + +commit 2fedfd52f9ad46507306293892fe645a2a1c9d02 +Merge: 10ad9f6010 758f1b7d69 +Author: Guan Xiying +Date: Fri Jun 25 16:56:01 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 10ad9f6010a8bec66c439c43934ccb52569e8fd9 +Author: Guan Xiying +Date: Fri Jun 25 16:55:40 2021 +0800 + + * Fix params of webhookSyncIssue function. + +commit 758f1b7d69c102be06ea8b6cc2d79fa1f32074d8 +Author: dingguodong +Date: Fri Jun 25 16:43:56 2021 +0800 + + * Bind label when create issue for sync task and story. + +commit afb01a3a95e5125f9c15703ca1b8b136437a38ac +Author: guanxiying +Date: Fri Jun 25 16:41:05 2021 +0800 + + * Adjust the code. + +commit 1d600ede32841ae09c1e9efbb0b145ea92f1dcca +Author: holan20180123 <56391770@qq.com> +Date: Fri Jun 25 16:29:59 2021 +0800 + + * Adjust import to asset lib. + +commit ad0175744bdf78398e68c11e5b8efbcfb9b2fb4d +Author: dingguodong +Date: Fri Jun 25 15:53:07 2021 +0800 + + + Put root URL to created link. + +commit 2744cdebf9a554ee9af35d01c7a5ebfb3b57a98f +Merge: 5a931d88b9 8d7b731670 +Author: dingguodong +Date: Fri Jun 25 15:36:31 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 5a931d88b9468433f2892eda472add451f20eb31 +Author: dingguodong +Date: Fri Jun 25 15:34:46 2021 +0800 + + * Optimize codes of label related and etc. + +commit 179bc3018b2d2b7b170f209f5f8295fb64d62af4 +Author: dingguodong +Date: Fri Jun 25 15:33:47 2021 +0800 + + * Fix bug when sync task to issue. + +commit 8d7b7316705f98463adff5d0b33564f2e2b65537 +Author: Guan Xiying +Date: Fri Jun 25 15:16:13 2021 +0800 + + * Change zentaoApiWebhookUrl to webhookURL. + +commit eab79e485eb0e70feb7489bc4539772198b9d008 +Merge: 076cc8b94a 508cd67241 +Author: lichengjun +Date: Fri Jun 25 15:13:19 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 076cc8b94a5226eff5ca1ab30369a282f8f16b98 +Author: lichengjun +Date: Fri Jun 25 15:10:32 2021 +0800 + + *Add private field + +commit 508cd672419c20c4d7aa346e3e7366a5b444402f +Merge: 354d13f907 9485858e27 +Author: dingguodong +Date: Fri Jun 25 15:08:55 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 354d13f907cbdae9ab316ee9fce03678ab9fa31e +Author: dingguodong +Date: Fri Jun 25 15:08:11 2021 +0800 + + * Fix bug when creating zentao object label. + +commit 9485858e27218aa6b60483dddfa0c101d3d44e10 +Author: Guan Xiying +Date: Fri Jun 25 14:56:24 2021 +0800 + + * Add check webhook token function. + +commit d734071dfbd06157014e922dff11ce5805df4339 +Merge: 88b5382ce8 903f361882 +Author: Guan Xiying +Date: Fri Jun 25 14:56:12 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 88b5382ce8ee8aa9242eaf88d71323b979daf007 +Author: Guan Xiying +Date: Fri Jun 25 14:55:47 2021 +0800 + + * Add checkwebhook token function. + +commit 903f361882899523bcd34f9f4147aeb4be3807f6 +Author: dingguodong +Date: Fri Jun 25 14:49:42 2021 +0800 + + * Correct syntax error. + +commit 5ca01706dcf93c607e69adbf64f5bcbb11787244 +Author: dingguodong +Date: Fri Jun 25 14:47:16 2021 +0800 + + * Correct syntax error. + +commit db60652fb395d332a609e79778685efb6f1b76cd +Merge: 16488940d4 e0209b3ea6 +Author: dingguodong +Date: Fri Jun 25 14:40:20 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 16488940d4c34057f5d809487f7c72a0cd0cb2d4 +Author: dingguodong +Date: Fri Jun 25 14:39:31 2021 +0800 + + + Delete a Label by labelName. + +commit e0209b3ea6bad4f6bd69258651a41dcec92419c7 +Merge: 3188d293a8 6a64f459bc +Author: Guan Xiying +Date: Fri Jun 25 14:32:46 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 3188d293a8485a91c64ca0ab471908d041843720 +Author: Guan Xiying +Date: Fri Jun 25 14:32:10 2021 +0800 + + * Adjust create webhook function and format codes. + +commit 6a64f459bc3e3aa64b1e814bdd7994548356ce08 +Author: dingguodong +Date: Fri Jun 25 14:05:33 2021 +0800 + + * Optimize create label func and call it. + +commit 9ef6f630ec6387ce3496cdfd79a4d4f6b8e69717 +Merge: bf6cf641f0 898cf8a923 +Author: dingguodong +Date: Fri Jun 25 13:57:57 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit bf6cf641f0b624e384c6912c6bc5fb321a636d0f +Author: dingguodong +Date: Fri Jun 25 13:57:42 2021 +0800 + + + Create zentao object label for gitlab project. + +commit 898cf8a923d434df653b7edf4e7cdf2938ff8f20 +Author: lichengjun +Date: Fri Jun 25 13:21:16 2021 +0800 + + * Add gitlab bug config. + +commit 8431d0f6c2d5c5a07347e855c4d50e4e9a4721fb +Author: dingguodong +Date: Fri Jun 25 13:10:42 2021 +0800 + + - Remove deprecated label funcs and codes. + +commit ed22d7e58182ca4421dc817f4d3f5b9079d0c4da +Author: dingguodong +Date: Fri Jun 25 11:42:07 2021 +0800 + + + Add config for labels. + +commit 8ced324b2d108f10ec964b2826e88c8eae69f337 +Merge: 9d1058018d 7b313fd10b +Author: dingguodong +Date: Fri Jun 25 11:25:10 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 9d1058018d3d86d9b03aebb36d28c88072118492 +Author: dingguodong +Date: Fri Jun 25 11:24:34 2021 +0800 + + + Sync story to issue when create it. + +commit eba2dbfaaba0ef9e2e6d106b67eaff7218cf92d1 +Author: wangyidong +Date: Fri Jun 25 11:19:09 2021 +0800 + + * adjust for svn diff to repo. + +commit 7b313fd10b549c88273edeb8f0df4c50db0fb2bd +Author: Guan Xiying +Date: Fri Jun 25 11:10:20 2021 +0800 + + * Adjust indent and remove debug code. + +commit 501be95bec42336a4ab91169d9ba83eafddeae57 +Author: Guan Xiying +Date: Fri Jun 25 11:09:20 2021 +0800 + + * Adjust function names of gitlabModel. + +commit 18d9724e1444e9de0e000f7d70d7c96c05b9c849 +Merge: d8d49be51f e3087ad9fb +Author: wangyidong +Date: Fri Jun 25 09:37:41 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit d8d49be51fe7af5cbf60718146850b44f7383bd8 +Author: wangyidong +Date: Fri Jun 25 09:36:52 2021 +0800 + + * adjust for check compile status. + +commit c7e4084d783f7054b0544760ca8704acbaec8a69 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jun 25 09:12:36 2021 +0800 + + * Batch import stories to lib. + +commit 606a9dd7601083b47c08def95cf34e3293c09307 +Merge: 74070508af 2349f883ba +Author: dingguodong +Date: Thu Jun 24 16:59:51 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 74070508afe3277d70d04ded5820135fd1cc107f +Author: dingguodong +Date: Thu Jun 24 16:59:15 2021 +0800 + + + Add story to issue funcs. + +commit 2349f883ba7343b179982cf28bee8cc41a10ae4f +Merge: a8bbc1dd60 b16d5bab3e +Author: Guan Xiying +Date: Thu Jun 24 16:49:12 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit a8bbc1dd60b62a3e197510e7d49ec02ee3363885 +Merge: a7d476e882 04d32851c3 +Author: Guan Xiying +Date: Thu Jun 24 16:49:03 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit b16d5bab3e6f2ca00f6cd8c13ce3b2b794d0de53 +Author: dingguodong +Date: Thu Jun 24 16:47:17 2021 +0800 + + + Add funcs of sync story to gitlab issue. + +commit a7d476e8823942cf6eec40d0706d85feef56a3dc +Author: Guan Xiying +Date: Thu Jun 24 16:36:23 2021 +0800 + + * Format codes. + +commit 0ee9f999eab6b66df5f90f198a041f3f542648d0 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jun 24 16:31:12 2021 +0800 + + * Code for task #39518. + +commit e3087ad9fb00cde088d860535d2ddab5f2a8146a +Merge: e6b9ec682f b77d480ce0 +Author: tianshujie98 +Date: Thu Jun 24 15:03:50 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit e6b9ec682f6c659f35b46ae62b6f0101307ebe64 +Author: tianshujie98 +Date: Thu Jun 24 15:03:35 2021 +0800 + + * Fix bug. + +commit 04d32851c3d7e8403e46ec82b09172861ed5ce70 +Author: dingguodong +Date: Thu Jun 24 15:02:04 2021 +0800 + + * Change put to PUT when using curl. + +commit b77d480ce056d7787605bda7de32c2a24cd02dde +Author: wangyidong +Date: Thu Jun 24 15:00:01 2021 +0800 + + * fix bug. + +commit 3516898af26285d2d01b3b6717986edd3cc20c03 +Merge: 86c7e9b4cc 58a4475fb9 +Author: dingguodong +Date: Thu Jun 24 14:57:47 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 86c7e9b4ccd86f09318cdb5bc18bcbfb84f42c1a +Author: dingguodong +Date: Thu Jun 24 14:56:23 2021 +0800 + + + Add funcs to update issue when the assigned user changed in task. + +commit 58a4475fb98acec7ca210d50dd0bdd6ac1f8b05f +Merge: 2a274668fc 49af2b3bb1 +Author: Guan Xiying +Date: Thu Jun 24 13:28:15 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 2a274668fcf288a1de025b83b81b030bb05b6f75 +Author: Guan Xiying +Date: Thu Jun 24 13:27:41 2021 +0800 + + * Finish parse issue webhook function. + +commit aedf5935d1a1f8f609855e2c073e32c9b8043052 (tag: zentaopms_15.0.3_20210624) +Author: wangyidong +Date: Thu Jun 24 13:17:04 2021 +0800 + + + add version and upgrade. + +commit 49af2b3bb1837de98f3c728cca356ada86143fee +Author: dingguodong +Date: Thu Jun 24 13:15:55 2021 +0800 + + + Add func to find the issue by object type and id. + +commit d5890caba792d1f25f6379c2ff45ebe479c110bb +Author: wangyidong +Date: Thu Jun 24 11:39:43 2021 +0800 + + * finish task #38738. + +commit e22638852f071a2ae892cc338da54f6c6a89f136 +Merge: 11b261b4ca 7556df707c +Author: wangyidong +Date: Thu Jun 24 11:24:48 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 11b261b4ca7bbeb0764e035675b49190facc40b7 +Author: wangyidong +Date: Thu Jun 24 11:24:32 2021 +0800 + + * adjust for upgrade. + +commit b3248d21055a3159a4d2a649a3374ff8ec8bbac7 +Author: dingguodong +Date: Thu Jun 24 10:22:47 2021 +0800 + + * Remove extra attributes of task with bp. + +commit a907eb4b246fb896c5869379ae60444bdbcf827d +Author: dingguodong +Date: Thu Jun 24 10:15:56 2021 +0800 + + * Fix bug when creating task and sync to gitlab issue. + +commit 7556d9cdb330b279b6b11fe79a052f752ae95829 +Author: wangyidong +Date: Thu Jun 24 10:03:54 2021 +0800 + + * adjust for merge xuanxuan. + +commit 0da52a84a555bde0bdf7c0145cc94caf6f9449be +Author: wangyidong +Date: Thu Jun 24 10:02:31 2021 +0800 + + * fix bug #13302. + +commit a55f27056ea7f08743949d07fd5bec9b7d1964e5 +Author: dingguodong +Date: Thu Jun 24 09:37:50 2021 +0800 + + * Fix bug when create a repo with gitlab. + +commit 16b137a9a0bc60f5e8c8c817e1f1a1bf2bef7696 +Author: tianshujie98 +Date: Thu Jun 24 09:07:48 2021 +0800 + + * Add method of caselib module. + +commit 88ffd1682026060d6ceaa1fde2addaeb856d6bc7 +Author: Guan Xiying +Date: Wed Jun 23 17:29:04 2021 +0800 + + * Add test function and sync issue function. + +commit e41fc21ece7786e7fd69d6d88bd7dc807f3ed547 +Author: Hao Sun +Date: Wed Jun 23 15:06:53 2021 +0800 + + * add new icon: icon-assets and icon-diamond. + + # Conflicts: + # www/theme/zui/fonts/ZentaoIcon.eot + # www/theme/zui/fonts/ZentaoIcon.ttf + # www/theme/zui/fonts/ZentaoIcon.woff + +commit 12fde09988969952679def2a923eb1e77e26cc2b +Merge: 2891589492 b9eda36d99 +Author: Guan Xiying +Date: Wed Jun 23 15:17:45 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit b9eda36d99e6cdef0f7ad86bd4fb631e8fddf005 +Author: dingguodong +Date: Wed Jun 23 15:17:36 2021 +0800 + + * Put product into the unique key relation. + +commit 2891589492e546ce312cceb23e790174ee69f579 +Author: Guan Xiying +Date: Wed Jun 23 15:16:54 2021 +0800 + + * Show gitlab and gitlab projects selector in create task view. + +commit cd891c90cb7629468380e6c18bdc58665f074e00 +Author: Guan Xiying +Date: Wed Jun 23 15:15:36 2021 +0800 + + * Fix save relation of gitlab's project and product bug. + +commit 69764ec2e28f06e590369cb3cbaede2e6885c2ba +Author: Guan Xiying +Date: Wed Jun 23 15:14:56 2021 +0800 + + * Remove gitlab param from getProducts function. + +commit 953fec21f988946a1fda4ca1d059346f23449f33 +Author: Guan Xiying +Date: Wed Jun 23 15:14:28 2021 +0800 + + * Add getProjectsByExecution function. + +commit 7556df707c11c88a88c07ce6bd47a83c28e3dcf5 +Author: Hao Sun +Date: Wed Jun 23 15:06:53 2021 +0800 + + * add new icon: icon-assets and icon-diamond. + +commit 8defd7528f0882c957097ad3e8b6130188e552d8 +Author: lichengjun +Date: Wed Jun 23 13:44:01 2021 +0800 + + * Add code for gitlab. + +commit d02701de5a71b10e651a701d1c796dde32bafb5b +Merge: 1222462df6 d4de46f619 +Author: lichengjun +Date: Tue Jun 22 20:12:48 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit d4de46f619369ff280a6fcba4704238013091615 +Author: Guan Xiying +Date: Tue Jun 22 17:46:21 2021 +0800 + + * rename parseWebhookBody to webhookParseBody. + +commit fca78aed23fa6c43e73f296a91633e2eabf0aea3 +Author: Guan Xiying +Date: Tue Jun 22 17:45:51 2021 +0800 + + * Add get user pairs functions. + +commit d933de4d176e9dceb596be4756a330ed2995f356 +Merge: d5b0d36330 7975f38eca +Author: Guan Xiying +Date: Tue Jun 22 17:28:12 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit d5b0d363306651869bd6c09d62c8cbecde20005f +Author: Guan Xiying +Date: Tue Jun 22 17:27:12 2021 +0800 + + * Rename saveRelation. + +commit c898114c7cf8ad1a3cf38ad8d0507c4213caa840 +Author: Hao Sun +Date: Tue Jun 22 16:51:11 2021 +0800 + + * bug #13286, fix xxs bug. + +commit 53baebf38ec4ba8c89ea3b7162d2a23fd78b9a26 +Author: wangyidong +Date: Tue Jun 22 16:45:45 2021 +0800 + + * finish task #38728. + +commit 7975f38ecaf2fdc2653624d21da8e03448611191 +Author: dingguodong +Date: Tue Jun 22 16:10:11 2021 +0800 + + * Corrent bad spells for getting account in zentaopms and etc. + +commit ffa7de4e72e0839fd9850df200dafe6135606316 +Author: dingguodong +Date: Tue Jun 22 16:09:16 2021 +0800 + + * Rename func for getting account in zentaopms and etc. + +commit cb31662f7f721b2f8e386db7eac4b6b01d9e43a0 +Merge: 353278f136 0cb06aaa53 +Author: wangyidong +Date: Tue Jun 22 16:02:53 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 353278f1362944f4fce65231a6df1583a9f263ae +Author: wangyidong +Date: Tue Jun 22 16:01:24 2021 +0800 + + * adjust for dev module. + +commit 0cb06aaa53f9a626296a92c9b5d97adfc8f51332 +Author: Yagami <976204163@qq.com> +Date: Tue Jun 22 16:00:48 2021 +0800 + + * Fix code error. + +commit 2ca2752120606ca0fb73862eceb3659c7725618f +Merge: 4e65665a40 00e9c35cff +Author: wangyidong +Date: Tue Jun 22 15:39:40 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 4e65665a4073d53bc777a068cc78cb326c7fef5b +Author: wangyidong +Date: Tue Jun 22 15:39:14 2021 +0800 + + * code for task #38701. + +commit 5a36acb96e93f6e5f7ecf025b88ee70fe10b1316 +Author: dingguodong +Date: Tue Jun 22 15:10:58 2021 +0800 + + + Add get account name in zentaopms. + +commit 00e9c35cff0829cabe6f5540cd6eaddcbcff2519 +Author: Yagami <976204163@qq.com> +Date: Tue Jun 22 14:25:23 2021 +0800 + + * Fix btn border. + +commit 1222462df6e7df1d676f17130166cd17c5a0f57b +Merge: 3c24507015 7514cf80e3 +Author: lichengjun +Date: Tue Jun 22 14:00:56 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 3c2450701510a365be0b16792bb9992c2643bf0b +Author: lichengjun +Date: Tue Jun 22 13:59:31 2021 +0800 + + * fix gitlab config bug. + +commit 7514cf80e3f418ddb543a1271369dd8fec68891e +Merge: b03b5ca6a5 88cc7a096f +Author: Guan Xiying +Date: Tue Jun 22 13:58:01 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit b03b5ca6a5920d3d029824fec6c1b194123b7b28 +Merge: cd65a3a41f dbe3e103cb +Author: Guan Xiying +Date: Tue Jun 22 13:57:55 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 88cc7a096f85dd88c126491e76d2266b21a19cea +Merge: 35d95e043b dbe3e103cb +Author: dingguodong +Date: Tue Jun 22 13:54:49 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 35d95e043b74f55ffb213b0ee8d3105d7d203ffb +Author: dingguodong +Date: Tue Jun 22 13:54:29 2021 +0800 + + * Correct bad spells. + +commit cd65a3a41ffadf9faa86724e04893d72fa425c7a +Author: Guan Xiying +Date: Tue Jun 22 13:54:02 2021 +0800 + + * Add parse gitlab issue functions. + +commit 925d5f72b0031a58c9d72bcaa467d55ea99274c0 +Author: Guan Xiying +Date: Tue Jun 22 13:50:03 2021 +0800 + + * Add gitlab->zentaoLabel. + +commit dbe3e103cb303daf8dce11adc3cd3d071d76116f +Merge: 4542208cf8 3e18bc7e19 +Author: lichengjun +Date: Tue Jun 22 12:45:21 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 4542208cf8854a3b257f216692931210fc9e9a39 +Author: lichengjun +Date: Tue Jun 22 12:43:15 2021 +0800 + + * Fix bug of module. + +commit 3e18bc7e1955bbfd977a1ab8c576dd317bd086ed +Author: dingguodong +Date: Tue Jun 22 12:17:19 2021 +0800 + + + Add story label func. + +commit ccf132cc87575a237009e81f993bda4750f36a01 +Author: dingguodong +Date: Tue Jun 22 11:47:24 2021 +0800 + + * Add more issue params. + +commit 4cc730a68553d3094497d1215a2711b8e0b86645 +Merge: 74f01e94bb ff5efc984f +Author: wangyidong +Date: Tue Jun 22 11:36:46 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 74f01e94bb0fa3ecb989923b38b2daf3b1183e0f +Author: wangyidong +Date: Tue Jun 22 11:36:26 2021 +0800 + + * finish task #38705. + +commit d90c25c7f7d84ac8eda34d238f548d6be83ed00c +Author: wangyidong +Date: Tue Jun 22 10:24:42 2021 +0800 + + * finish task #38701. + +commit ff5efc984f34c31bd9d639a799fbc5ed61470ee2 +Author: tianshujie98 +Date: Tue Jun 22 09:22:12 2021 +0800 + + * Fix bug of doc module. + +commit 166decfa53d4a22eae981b15e25a1575cbd6618b +Author: tianshujie98 +Date: Tue Jun 22 09:18:53 2021 +0800 + + * Fix bug of doc module. + +commit 7712eb9fdaa0c3669027796381b91ba87b133825 +Author: dingguodong +Date: Mon Jun 21 17:46:11 2021 +0800 + + * Bug fix when displaying gitlab proj address. + +commit f8c9d4ff347fd003722f0a6823d1fbaab00d2319 +Author: Hao Sun +Date: Mon Jun 21 17:24:38 2021 +0800 + + * skip to watch changes for search form. + +commit 9069e4044a5a5960588880f045a7c873942728db +Author: lichengjun +Date: Mon Jun 21 16:58:01 2021 +0800 + + * Fix bug. + +commit 0205c86b346c4102befc70b98056c8ff412813df +Author: lichengjun +Date: Mon Jun 21 16:34:16 2021 +0800 + + * Add execution task gitlab. + +commit d1156f769d067043ef408b971049b0eb898c5f2d +Merge: ae96cd1161 9ed83f977d +Author: Guan Xiying +Date: Mon Jun 21 16:17:56 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit ae96cd1161ef1034d4fee1a658efefd5e71479bb +Author: Guan Xiying +Date: Mon Jun 21 16:17:37 2021 +0800 + + * Show placeholders. + +commit 1af22a4ae1d6c52eb9d1b8055393a9be73a98a29 +Author: wangyidong +Date: Mon Jun 21 16:09:21 2021 +0800 + + * finish task #38717. + +commit 9ed83f977d62e7db4603aff9dfe0d1fe53958147 +Author: dingguodong +Date: Mon Jun 21 16:03:51 2021 +0800 + + - Remove unused codes. + +commit b1b3b88759c37396407a49ea223234b6696dd44e +Author: wangyidong +Date: Mon Jun 21 15:58:57 2021 +0800 + + * finish task #38722. + +commit 8235310ef9aae4b4a4121c4a247ef7362bdd427d +Author: dingguodong +Date: Mon Jun 21 15:39:54 2021 +0800 + + * Bug fix when binding user from gitlab to zentao. + +commit 4c196fc62129e596be5cc9de192891ecba3396b5 +Merge: 205129859f b6b31de401 +Author: wangyidong +Date: Mon Jun 21 15:10:22 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 205129859fcd7ff123ed72de29cded8b1544f06f +Author: wangyidong +Date: Mon Jun 21 15:02:35 2021 +0800 + + * finish task #38732. + +commit b6b31de401ee55c36c9f50b51a253e5f1ba28ede +Author: Yagami <976204163@qq.com> +Date: Mon Jun 21 14:50:35 2021 +0800 + + * Finish task #38715. + +commit 14b887c714aca906841855969bad317134b65338 +Merge: 1d6ffcd6b4 2e0f114c2f +Author: tianshujie98 +Date: Mon Jun 21 14:49:32 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 1d6ffcd6b4506138e93ff8e8a98b40cb23dd22c2 +Author: tianshujie98 +Date: Mon Jun 21 14:49:16 2021 +0800 + + * Fix bug #13170. + +commit 2e0f114c2f65c465f6aab256556932ef4ab8070e +Author: Yagami <976204163@qq.com> +Date: Mon Jun 21 14:40:35 2021 +0800 + + * Remove unused field. + +commit 2366219f2aa806c054510d74d6587db807187f9c +Author: Yagami <976204163@qq.com> +Date: Mon Jun 21 14:37:19 2021 +0800 + + * Fix error for story link requirement. + +commit 2323481feb2c1269dd1db63bf5820d3ef5cfcdc8 +Author: tianshujie98 +Date: Mon Jun 21 14:32:44 2021 +0800 + + * Fix bug #13263. + +commit 61b24395934ea2598b57fa4ac005d2853a89e5ad +Author: tianshujie98 +Date: Mon Jun 21 14:30:54 2021 +0800 + + * Fix bug 13268. + +commit b08c1e4fd57b2955c085fa1d63bcf3dbb2387b11 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 21 14:28:29 2021 +0800 + + * Finish task #38710. + +commit b9162912938ca54c1ae92cd6572e9fd218c69dbd +Author: Yagami <976204163@qq.com> +Date: Mon Jun 21 14:14:48 2021 +0800 + + * Fix code error. + +commit ab450196b2e328ae8772030998dd9901b8088e36 +Author: tianshujie98 +Date: Mon Jun 21 13:58:50 2021 +0800 + + * Fix bug #13268. + +commit 19eb443a069208e173369a811f4ff902d5084cc3 +Author: dingguodong +Date: Mon Jun 21 13:58:04 2021 +0800 + + * Fix bug when bind user. + +commit 8b0bbb62cceacbf5f1e40fc75f6e009430dd02bd +Author: dingguodong +Date: Mon Jun 21 13:24:38 2021 +0800 + + * Add comment event support for creating webhook. + +commit 4369c928d8be5dfbe1a7e993749e821772627e90 +Author: tianshujie98 +Date: Mon Jun 21 13:17:24 2021 +0800 + + * Fix the problem of batch creation todo. + +commit b20038e6c282254daeaa91e3513b88088fc75a27 +Author: wangyidong +Date: Mon Jun 21 13:14:13 2021 +0800 + + * finish task #38734. + +commit 45fd0977284e713d6ff7eaf0701afbb9ed57acc1 +Author: Guan Xiying +Date: Mon Jun 21 11:16:37 2021 +0800 + + * Add parse webhook functions. + +commit ad9944342962a43026aee4b9b0e5a2a8d14e8f58 +Merge: d30e533e92 af3db56e35 +Author: wangyidong +Date: Mon Jun 21 10:56:17 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit d30e533e9265b1798a5109d774cd0c1ec73c7aa0 +Author: wangyidong +Date: Mon Jun 21 10:56:04 2021 +0800 + + * finish task #38761. + +commit 2370afe1d4eddfc1fbb4d908b1ff8c0ee85d22bf +Merge: b5f32bf347 8239145e75 +Author: Guan Xiying +Date: Mon Jun 21 10:05:50 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit b5f32bf347b42ec1f1fe764f49764d3be2b5742a +Author: Guan Xiying +Date: Mon Jun 21 10:05:12 2021 +0800 + + * Add check webhook api of gitlab module. + +commit af3db56e35241d01bb1ec2825994cdc1d215ef84 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 21 10:03:51 2021 +0800 + + * Adjust getRemind condition. + +commit 1ebdebd16c45a5cfb5e2a96b6626e5e2651d22ca +Author: Guan Xiying +Date: Mon Jun 21 10:03:48 2021 +0800 + + * Check open method in config->openMethods. + +commit f853b676e0ad541485e28ab4191522aa32033ce8 +Author: Guan Xiying +Date: Mon Jun 21 10:03:21 2021 +0800 + + * Remov utf8 bom. + +commit ab37633ba6e0070a03c182dd9e3359931ad8297d +Author: Guan Xiying +Date: Mon Jun 21 10:01:41 2021 +0800 + + * Add openmethod config. + +commit 8239145e75b5ffa59bdacdd969f34bb236fdd983 +Merge: 6b9867c683 b90639355d +Author: lichengjun +Date: Sat Jun 19 15:28:05 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 6b9867c68345b430c12ce78ede3453ae43cf1750 +Author: lichengjun +Date: Sat Jun 19 15:23:59 2021 +0800 + + * fix Associat bug + +commit b90639355dc6ee4b8c670b88c171573fc26e3d4d +Author: dingguodong +Date: Sat Jun 19 11:35:15 2021 +0800 + + * Reformat codes and prepare for call. + +commit 7a67b762c4140f7c5f2417a4db41a7acf9425f51 +Author: lichengjun +Date: Fri Jun 18 17:35:53 2021 +0800 + + * Add Associat function + +commit c38c99e0a8a48a38cbc989a0578f638075128b25 +Author: tianshujie98 +Date: Fri Jun 18 16:17:04 2021 +0800 + + * Fix bug. + +commit 8004b371324dab3bd27a04197f0debd426207649 +Author: tianshujie98 +Date: Fri Jun 18 15:51:25 2021 +0800 + + * Fix bug #13257. + +commit 0fce5f06f37ba869b4a12d8a063367b40d64bbfe +Author: dingguodong +Date: Fri Jun 18 15:05:01 2021 +0800 + + * Remove bad blank lines. + +commit ff1360bcda6417a05d0e03db44eb5af2ec450974 +Merge: caccf6b229 4c792a2318 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jun 18 14:54:46 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit caccf6b229a223a1fdd59991047c2c389d4d88c6 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jun 18 14:53:12 2021 +0800 + + * Adjust webhook send message. + +commit 4c792a23184ed512a30bdfdfe0e8198ea5e47482 +Author: tianshujie98 +Date: Fri Jun 18 14:41:03 2021 +0800 + + * Fix bug. + +commit 637a3c29e42a9c81d8cf5fdc03055d552d3cf96e +Author: tianshujie98 +Date: Fri Jun 18 14:16:02 2021 +0800 + + * Fix bug. + +commit cdbcb418a874e5f299dcf995edb66993dca36fc0 +Author: dingguodong +Date: Fri Jun 18 13:38:24 2021 +0800 + + * Improve code robustness. + +commit 00985acb35a30396eb75861795b0385a4d7fd800 +Author: tianshujie98 +Date: Fri Jun 18 13:36:50 2021 +0800 + + * Fix bug 13246. + +commit be0f4320e6bef78c9a33a1909c42f2be744489e8 +Author: tianshujie98 +Date: Fri Jun 18 11:25:28 2021 +0800 + + * Fix bug #13248. + +commit 8e176c30010e6fd9905bd1421f25b6d79ce5a1f7 +Author: dingguodong +Date: Fri Jun 18 11:05:45 2021 +0800 + + * Fix bug when empty labels exists. + +commit 52dde68865bc328268841dde7eb28d40f154a738 +Author: dingguodong +Date: Fri Jun 18 11:01:37 2021 +0800 + + * Create webhook when update product and project mapping. + +commit 51b2a70308f4442ae3830f8509a2279abfb95c9f +Author: dingguodong +Date: Fri Jun 18 10:51:31 2021 +0800 + + * Create webhook for each products. + +commit 019e946496603527eeb48802ac3a208ef7eaca43 +Author: Guan Xiying +Date: Fri Jun 18 10:41:15 2021 +0800 + + * Fix gitlab api hook url. + +commit 812d48e9b57a62832f8d1fadda2b4bc30295171d +Merge: 5fdf41d62f 936816dc1a +Author: holan20180123 <56391770@qq.com> +Date: Fri Jun 18 10:27:57 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5fdf41d62f14c8c2268c0869e712764f1045c989 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jun 18 10:27:27 2021 +0800 + + * Fix bug #13234. + +commit ca563c3a5f1a52bdebe833749b6bb138686093f9 +Merge: a657124b48 c3c6bec4fa +Author: Guan Xiying +Date: Fri Jun 18 10:22:04 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit a657124b4892e45b525011edc5dc8a00313cb284 +Author: Guan Xiying +Date: Fri Jun 18 10:21:37 2021 +0800 + + * Add checkToken function and remove unused functions. + +commit 936816dc1a91e0d3e517e5bc1e70de29ae15a66e +Merge: 8c9c237236 5f15025297 +Author: wangyidong +Date: Fri Jun 18 10:21:23 2021 +0800 + + Merge branch '15.0.beta1' + +commit 5f1502529761b94a607d3e3c5a04b0407bb2dc0e +Merge: 117f9b8a7c 8c9c237236 +Author: 王怡栋 +Date: Fri Jun 18 02:19:40 2021 +0000 + + Merge branch 'master' into '15.0.beta1' + + # Conflicts: + # module/upgrade/control.php + +commit 8c9c237236656d9aa5bb4de001acf050e72a27c3 +Merge: 57d390129c c2d05fcbab +Author: 王怡栋 +Date: Fri Jun 18 02:17:49 2021 +0000 + + Merge branch '15.0.beta3' into 'master' + + 15.0.beta3 + + See merge request easycorp/zentaopms!2 + +commit c3c6bec4fa2bdbb7e4acb420ccda612ea71d1ccf +Merge: 444566afb5 e3f5bd2388 +Author: dingguodong +Date: Fri Jun 18 09:59:46 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 444566afb55225ef09e47bee648ef6cb215bf9a3 +Author: dingguodong +Date: Fri Jun 18 09:58:45 2021 +0800 + + + Create webhook when create map for product and gitlab project. + +commit e3f5bd2388ff7aa8030b9f0b3a6e54f129e04562 +Merge: ffac7cdd45 94f7cde43c +Author: Guan Xiying +Date: Fri Jun 18 09:55:52 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit ffac7cdd45285ecac7c79c22d345b051c266988a +Author: Guan Xiying +Date: Fri Jun 18 09:55:41 2021 +0800 + + * Format code. + +commit c8eadb2ce98adb3901dc2210c1055fb76174a40b +Author: Hao Sun +Date: Fri Jun 18 09:53:35 2021 +0800 + + * update datetimepicker. + +commit 57d390129c35927c69f1f000c6c69656f648f5b5 +Author: tianshujie98 +Date: Fri Jun 18 09:54:11 2021 +0800 + + Fix an error. + +commit 48a50f9e0a77de7ac5303a8730fdcb4e985cb3dc +Author: Hao Sun +Date: Fri Jun 18 09:53:35 2021 +0800 + + * update datetimepicker. + +commit 94f7cde43c52a7ca9617140a241bdb56ae63e797 +Author: dingguodong +Date: Fri Jun 18 09:38:20 2021 +0800 + + * Correct misspelled word. + +commit 5ee795330ef3403fc6f506121b16e70f2c642645 +Merge: b7caec933d abe711e334 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jun 18 09:25:54 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b7caec933d1fd6dbcfa19e49c0d8eb726076edd1 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jun 18 09:25:50 2021 +0800 + + * Adjust the code. + +commit abe711e3341e00fdf6b7fc5d4d90a21fd2d62388 +Author: tianshujie98 +Date: Fri Jun 18 09:10:40 2021 +0800 + + * Finish task #39450. + +commit 53cf8a8b2a1df922efd2f5b9e19cbb3f1d5ccd5b +Author: tianshujie98 +Date: Fri Jun 18 09:05:37 2021 +0800 + + * Finish task #39451. + +commit a73d28f969089534966da7fda4105f41de47a65c +Author: qiyu-xie +Date: Fri Jun 18 08:58:56 2021 +0800 + + * Finish task#39387. + +commit db2212743b0cf2e506392a57a8f6bc8dd2b11c90 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jun 18 08:05:38 2021 +0800 + + * Finish task #39452. + +commit 23206c4ea8057ba47424f684eb1b3d1be5455a69 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jun 17 17:43:56 2021 +0800 + + * Finish task #39453. + +commit 16adebed5e0eac050f0afb736220b995a7b95034 +Author: Hao Sun +Date: Thu Jun 17 17:21:56 2021 +0800 + + * fix remind in dashboard page not show after refresh. + +commit 19aac233744b2491c8f482780b2d9a63a9b1a3a9 +Author: dingguodong +Date: Thu Jun 17 16:05:55 2021 +0800 + + * Add product and gitlab relationship. + +commit d45bb9c4f26812cabc3faa4c4e7d82b9c08d352a +Author: wangyidong +Date: Thu Jun 17 14:57:30 2021 +0800 + + * finish task #38726. + +commit ae771f7405162b4f32e2b0fdd6cdc93764e45123 +Author: wangyidong +Date: Thu Jun 17 14:53:29 2021 +0800 + + * finish task #39379. + +commit 3efeef51f82f20e11122139b1865b972d03e73a4 +Merge: 012f334c2e 1969d12f2f +Author: dingguodong +Date: Thu Jun 17 14:52:18 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 683e3b40e4531f066da732e16425fcaae2400466 +Author: wangyidong +Date: Thu Jun 17 14:52:18 2021 +0800 + + * adjust for api send error. + +commit 012f334c2e5bead13764b582976734de8c2f32b0 +Author: dingguodong +Date: Thu Jun 17 14:51:39 2021 +0800 + + * Add bindproduct. + +commit 0f9f9ae9f5670397477bc91acc9179cb4b75f7d4 +Author: wangyidong +Date: Thu Jun 17 14:48:58 2021 +0800 + + * fix bug. + +commit 6a0674c3db6ecbb087f74821a0c115eaad4de791 +Author: wangyidong +Date: Thu Jun 17 14:48:24 2021 +0800 + + * fix for api. + +commit 82c3c82d23e38489376152f8b9e4b5e3fc7822b4 +Author: wangyidong +Date: Thu Jun 17 14:46:54 2021 +0800 + + * adjust for convert to pinyin for picker. + +commit aaf5288a6dd84bb2f5f7d44fb8762b81c88bdf4c +Merge: 6441e05b1d b4d60b8edc +Author: wangyidong +Date: Thu Jun 17 14:30:48 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 6441e05b1dea53b0449ca470b762cdbdeac6328d +Author: wangyidong +Date: Thu Jun 17 14:30:30 2021 +0800 + + * finish task #38735. + +commit 1969d12f2fc0910e5cd683037a204ce97f0049bb +Author: Guan Xiying +Date: Thu Jun 17 14:27:23 2021 +0800 + + * Fix bind gitlab user function. + +commit 52246b07cce433f8eb795415b98f3450d92e53f8 +Author: tianshujie98 +Date: Thu Jun 17 14:26:12 2021 +0800 + + * Adjust code. + +commit b4d60b8edc7bf827976cffcd20ecde19c0076cb9 +Author: Hao Sun +Date: Thu Jun 17 13:33:56 2021 +0800 + + * task #38754, bug #11135, only auto append child when user toggle type manually. + +commit 4bc2653e598b909411db1c7ebee193be2adda842 +Author: Hao Sun +Date: Thu Jun 17 11:40:18 2021 +0800 + + * task #38754, bug #11135, support for adding child step for group automatically. + +commit 2c97d3cc2d45667549e7b1f2069314c8785c182b +Author: lichengjun +Date: Thu Jun 17 13:05:31 2021 +0800 + + * Adjust the code + +commit 69bfc9917f619b4972226a7f6650e7e356c073e2 +Author: Hao Sun +Date: Thu Jun 17 11:40:18 2021 +0800 + + * task #38754, bug #11135, support for adding child step for group automatically. + +commit 06c6deb1ea166cd8daccb5ed004b5a8b865c6da2 +Author: z +Date: Thu Jun 17 10:12:24 2021 +0800 + + * Adjust code. + +commit 9c3c8022c9d6e7a82f98531aff677a21c766cf5c +Author: dingguodong +Date: Wed Jun 16 20:04:47 2021 +0800 + + * Put name used frequently into config. + +commit eb59efcbcae28c10abc9eab71ca23a583305722d +Author: Guanxiying +Date: Wed Jun 16 19:46:30 2021 +0800 + + * Fix get commits function. + +commit bb52ead3da5e12144b0c7508ab391cbc6907d5cb +Merge: d8a99bcf9e 829e5eaa5c +Author: Guanxiying +Date: Wed Jun 16 19:46:05 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit d8a99bcf9e97ace029c3c9c7f843218c68b61b8d +Author: Guanxiying +Date: Wed Jun 16 19:45:23 2021 +0800 + + * Process gitlab id and gitlab project of one repo. + +commit 829e5eaa5c9667002556dc387b351690238ea289 +Author: dingguodong +Date: Wed Jun 16 18:37:13 2021 +0800 + + * Rename some variables and add docs. + +commit 65a6b38fae1d68cfd44679d457cdaa874e9e48eb +Author: dingguodong +Date: Wed Jun 16 17:34:44 2021 +0800 + + + Create labels when gitlab server added successfully. + +commit b09234b272d30eb4d3597e597b96c2289bb7300c +Merge: 0dd6c819a9 afa6c54f93 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jun 16 17:26:06 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0dd6c819a93b733f1abf5399ff74a773fdeb7dc2 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jun 16 17:26:01 2021 +0800 + + * Adjust the code. + +commit afa6c54f93ef86e006dae72bc549cac5ddcebb01 +Author: tianshujie98 +Date: Wed Jun 16 17:14:31 2021 +0800 + + * Adjust code. + +commit 69538f2cb7858ff981421aa61406490bc34aea1b +Author: hufangzhou <746775970@qq.com> +Date: Wed Jun 16 17:12:25 2021 +0800 + + * Adjust the source select control width in batch create page. + +commit 1867f60ff56380ae53c6cb313178c039ac46b667 +Author: holan20180123 <56391770@qq.com> +Date: Wed Jun 16 16:28:43 2021 +0800 + + * Adjust story view. + +commit fbd2d87db8a3f77a12deb621702153182d3cd90e +Author: Yagami <976204163@qq.com> +Date: Wed Jun 16 16:01:57 2021 +0800 + + * Verify branch name. + +commit 51cf2086213246c3afbf3ac7d63446d751eabbc6 +Author: holan20180123 <56391770@qq.com> +Date: Wed Jun 16 15:37:06 2021 +0800 + + * Adjust batch edit story. + +commit 387899f28e55141233074c86a662c410f4c83e4d +Merge: 8a5d9c8bb5 420a526d54 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jun 16 15:05:21 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8a5d9c8bb5d14ef13a81755df647f4495785dc3b +Author: hufangzhou <746775970@qq.com> +Date: Wed Jun 16 15:05:18 2021 +0800 + + * Adjust the code. + +commit 420a526d54f5bd7ed52438f244d1f839d3d0a2be +Author: tianshujie98 +Date: Wed Jun 16 14:08:34 2021 +0800 + + * Adjust code. + +commit 08d176663e13bc84c4871df321cf59b685cc6f73 +Author: tianshujie98 +Date: Wed Jun 16 13:45:40 2021 +0800 + + * Fix dynamic issues. + +commit 93ba2dce18bc1643e159d9c39d1a55a02d0756c9 +Author: Yagami <976204163@qq.com> +Date: Wed Jun 16 13:45:07 2021 +0800 + + * Fix an error. + +commit 941525e672c4c98bc3115d978d63a0c5c7af9bf2 +Author: tianshujie98 +Date: Wed Jun 16 13:31:34 2021 +0800 + + * Adjust the jump app. + +commit 26315605a27827a8d3f900d7c5f2ea1d7974a9c4 +Author: dingguodong +Date: Wed Jun 16 13:30:56 2021 +0800 + + * Rename funcs on need. + +commit 93430eae9f8896f3217d5e9505817830aab64efb +Author: Yagami <976204163@qq.com> +Date: Wed Jun 16 13:20:19 2021 +0800 + + * Fix details. + +commit ef3a445ff0ba76ffa48010a6b6bca3bc0819fca3 +Author: dingguodong +Date: Wed Jun 16 13:16:17 2021 +0800 + + * Change snake name to camel name. + +commit cf22c9e6b3c451ad78182ecb90b139bf38094f39 +Author: dingguodong +Date: Wed Jun 16 12:53:21 2021 +0800 + + * Add funcs for webhooks. + +commit 2ab2964fe5895ce4f14f8d85009283206547d608 +Author: tianshujie98 +Date: Wed Jun 16 11:12:30 2021 +0800 + + * Fix work and contribute navigation permission check issues. + +commit 550f8c48179675d11d3ae9f0ab343c8e38faf1a5 +Author: holan20180123 <56391770@qq.com> +Date: Wed Jun 16 09:25:21 2021 +0800 + + * Adjust create and edit story. + +commit 3e626efb0b10462ac1caed4cf6d6c48aad5562ed +Merge: 17578d3a8c 4c84e02be8 +Author: wangyidong +Date: Tue Jun 15 17:28:32 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 17578d3a8c47c188d50695e86d423e1443501b63 +Author: wangyidong +Date: Tue Jun 15 17:28:14 2021 +0800 + + * fix bug. + +commit 78151f19e1b22ac260044456a903974c1a824777 +Author: Guanxiying +Date: Tue Jun 15 17:25:50 2021 +0800 + + * Format codes. + +commit 5a6630e11e97ccdf8946d62ae0015b0e2a7b0e2d +Author: tianshujie98 +Date: Tue Jun 15 17:12:40 2021 +0800 + + * Adjust code. + +commit 742f61ce6cf2fdab6652c1e7c69a4476cac3ca96 +Author: Guanxiying +Date: Tue Jun 15 16:59:43 2021 +0800 + + * Format code. + +commit a17f6627fee611e3b21254512b23ecbd156c1c98 +Author: Guanxiying +Date: Tue Jun 15 16:58:19 2021 +0800 + + * Adjust style of gitlab avatar. + +commit e8f7d97a51114b2eed4f71f12a97fd60b1aeebee +Author: qiyu-xie +Date: Tue Jun 15 16:41:26 2021 +0800 + + * Add lt and le lang. + +commit c22b78a555687297df5be47222cf8ea03327a53f +Author: tianshujie98 +Date: Tue Jun 15 16:38:50 2021 +0800 + + * Fix the problem of pending block. + +commit 50a934f3c4e918ce0a390ecdd4ed805361763a7e +Author: dingguodong +Date: Tue Jun 15 16:36:57 2021 +0800 + + * Adjust display style. + +commit 8ff0636eac49fffb05818c112fa3688c298914e1 +Author: dingguodong +Date: Tue Jun 15 15:27:26 2021 +0800 + + - Remove jmespath. + +commit 8deca355ba01acbe4f7467c27448290c497057b6 +Author: dingguodong +Date: Tue Jun 15 15:26:11 2021 +0800 + + * Add gitlab binduser funcs. + +commit 4c84e02be8055c6a1b57bf62e54df17b66255375 +Author: Yagami <976204163@qq.com> +Date: Tue Jun 15 14:01:38 2021 +0800 + + * Add new sql. + +commit 3b7a2c21d0916370809ec8570c43772a11758482 +Author: dingguodong +Date: Tue Jun 15 12:29:02 2021 +0800 + + * Add empty funcs of webhooks. + +commit 5ebf525b9b4de748ff61d253195d9b81c4ec3bcd +Author: dingguodong +Date: Tue Jun 15 11:20:59 2021 +0800 + + * Simplify the func name. + +commit 36cb1b7c7a30c0abc7cd2964d3f0a59fad7f7530 +Author: dingguodong +Date: Tue Jun 15 11:08:09 2021 +0800 + + * Add funcs for getting gitlab api url with access_token. + +commit 15987dd3083e97c7fa8fbddba583f7196d782cbb +Author: dingguodong +Date: Tue Jun 15 11:07:22 2021 +0800 + + * Add JMESPath lib. + +commit 4de6fa1c01cbdaf72865b9f65d5aba11dccbf263 +Author: tianshujie98 +Date: Tue Jun 15 11:03:20 2021 +0800 + + * Ajust page. + +commit 3ecc5e262e7188526c42a87d23b788c63c1b9050 +Author: qiyu-xie +Date: Tue Jun 15 09:46:16 2021 +0800 + + * Fix bug#13138. + +commit 48ddd1957b6c62c97911b24b0ee90e8c00d17f28 +Author: tianshujie98 +Date: Sat Jun 12 21:32:31 2021 +0800 + + * Adjust code. + +commit 16b3845b2e5efaa29aa658394e7b278080159e75 +Author: tianshujie98 +Date: Sat Jun 12 21:06:57 2021 +0800 + + * Add meeting to pending block. + +commit d179eec3948595fc72ad62a22598a0ae249a377c +Author: tianshujie98 +Date: Sat Jun 12 18:56:39 2021 +0800 + + * Add meeting to pending. + +commit 5e371ace2dd59f56b4d769bf8d449d1ac055e4b8 (tag: zentaopms_15.0.2_20210612) +Author: wangyidong +Date: Sat Jun 12 15:46:12 2021 +0800 + + * add new version and upgrade. + +commit d13ef4c69031e8adb00e7890b64faf02746b5d68 +Merge: 4d5bacb823 c8b77f1b0d +Author: wangyidong +Date: Fri Jun 11 16:51:40 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit daec205b9a119655afe2560072f409a20c35219c +Author: dingguodong +Date: Fri Jun 11 16:51:29 2021 +0800 + + * Keep the edit and create action in a same ui. + +commit 4d5bacb8236b420062a979a8745997a35d34b58c +Author: wangyidong +Date: Fri Jun 11 16:51:28 2021 +0800 + + * adjust for web page. + +commit dfda9e84453e662c025e94ef25e19656e5bfb38d +Author: dingguodong +Date: Fri Jun 11 16:43:58 2021 +0800 + + + Add a icon of webhook ext using printLink. + +commit 1f9f3a9d17f61e27f3ab1fe25928ff41ef7d6dd9 +Merge: 48353b2897 e42385a1c3 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jun 11 15:34:38 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 48353b2897affa6d01b80fbe9de252078daf2f0a +Author: hufangzhou <746775970@qq.com> +Date: Fri Jun 11 15:34:31 2021 +0800 + + * Finish task #39093. + +commit b25645732d7b259a665cddf1cc60f911e63519d9 +Author: dingguodong +Date: Fri Jun 11 14:37:48 2021 +0800 + + * Change the display text of the gitlab project url. + +commit 384081671565539f03e8115db7d7c22c8e97207c +Merge: f927d0e908 76b44aa431 +Author: Guanxiying +Date: Fri Jun 11 14:35:43 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit f927d0e9085fe5118ede428577f90e4d1cc501c7 +Author: Guanxiying +Date: Fri Jun 11 14:35:20 2021 +0800 + + * Fix repo path when get repo list. + +commit 76b44aa43101e01506a65fc5a8c0155620cac6ce +Author: dingguodong +Date: Fri Jun 11 14:32:55 2021 +0800 + + * Optimize the text of the gitlab project id. + +commit bbe13d5077f3f332b30b03312eeb9d0be4f2d4d1 +Author: Guanxiying +Date: Fri Jun 11 13:56:23 2021 +0800 + + * Use commonModel::http. + +commit e42385a1c3cfa5d1c267d6eb8311ac5906799bc6 +Author: Yagami <976204163@qq.com> +Date: Fri Jun 11 13:51:28 2021 +0800 + + * Modify custom setting verify. + +commit 797b84bbb636ae3feb568980f3d45a9b1eaeae57 +Author: dingguodong +Date: Fri Jun 11 13:47:02 2021 +0800 + + * Improve code robustness. + +commit 3441ea0ad69cad42e226a65def3f79a7b519c921 +Author: dingguodong +Date: Fri Jun 11 11:47:25 2021 +0800 + + * Add tips for when adding gitlab server. + +commit 61debf97e9e56bed9cad9e9b40301dbe2305af5d +Author: dingguodong +Date: Fri Jun 11 11:41:04 2021 +0800 + + + Add some tips for user when adding gitlab server. + +commit be7bfdb515bd5b5151312ca97d45b68d5cdefb63 +Author: Guanxiying +Date: Thu Jun 10 15:38:46 2021 +0800 + + * Revert getProjectsByID function. + +commit f7e9df2037d5ad3b98300425713e1049a9d68a61 +Author: tianshujie98 +Date: Thu Jun 10 15:22:36 2021 +0800 + + * Add session. + +commit 993f6984d0eedef71fe1945b48be5f913eeac854 +Merge: a45167b655 7f211e633e +Author: Lichengjun +Date: Thu Jun 10 15:00:55 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit a45167b6558e2709b163138d0a4f7b693980686f +Author: Lichengjun +Date: Thu Jun 10 14:57:04 2021 +0800 + + Revert "Revert "* Add test commit"" + + This reverts commit 0c0a1dbcc9e7194f63cd1959566e8d3d10568036. + +commit 0c0a1dbcc9e7194f63cd1959566e8d3d10568036 +Author: Lichengjun +Date: Thu Jun 10 14:56:29 2021 +0800 + + Revert "* Add test commit" + + This reverts commit 7e8c167b87685fbd110443b6a90b6287990eae15. + +commit 7e8c167b87685fbd110443b6a90b6287990eae15 +Author: Lichengjun +Date: Thu Jun 10 14:55:50 2021 +0800 + + * Add test commit + +commit 7f211e633e85edfbf1b42d1e8e019aff9d2fa967 +Author: dingguodong +Date: Thu Jun 10 14:53:27 2021 +0800 + + * Increase robustness. + +commit cab06fced9a69cc66e09590cf5be61e3b4cf350a +Merge: 1847e38c73 5ab9031369 +Author: Guanxiying +Date: Thu Jun 10 14:09:12 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 1847e38c73db0495d07036f4e47cceb2d0f2cb42 +Author: Guanxiying +Date: Thu Jun 10 14:08:06 2021 +0800 + + * Finish task 39216. + +commit b995276fb103bbca8fa4cb2af51f163e3726f4a5 +Author: Guanxiying +Date: Thu Jun 10 14:06:04 2021 +0800 + + * Fix gitlab repo path and client field. + +commit f918d0c652b7f59c95ba03ab86c508e2716ecbc9 +Author: Guanxiying +Date: Thu Jun 10 13:59:44 2021 +0800 + + * Set gitlab info by gitlab server. + +commit 3fd9aed0ce5c496efc4ef86414d260392d06710e +Author: Guanxiying +Date: Thu Jun 10 13:48:44 2021 +0800 + + * Fix TABLE_PIPELINE table. + +commit 5ab90313699f6630e5f84ba7684ce03daa4fbb5d +Merge: 45412184bb a10130df5c +Author: David.li <1441836644@qq.com> +Date: Thu Jun 10 11:11:53 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + + # Conflicts: + # module/gitlab/model.php + +commit 95b253b75f0bd96cf6461668593e1c943afb891c +Author: qiyu-xie +Date: Thu Jun 10 10:48:41 2021 +0800 + + * Add outline and schedule for create change. + +commit aed100aaf0bc67e9802ecd8484b85dcedefa9e30 +Author: tianshujie98 +Date: Thu Jun 10 10:01:41 2021 +0800 + + * Adjust code. + +commit 45412184bbeb9613934218eb135c11daf7f88e9d +Author: David.li <1441836644@qq.com> +Date: Wed Jun 9 23:03:15 2021 +0800 + + * Add getUserBindList Function. + +commit a10130df5c4a398bc329b71734c208bafa8a79ba +Author: Guanxiying +Date: Wed Jun 9 19:49:43 2021 +0800 + + * Add getProjectsByID function. + +commit f3f5574ad0f143a1e774e1d75fd2f7b7b4609290 +Author: Guanxiying +Date: Wed Jun 9 19:16:30 2021 +0800 + + * Change pipeline table name. + +commit 5e313ffdf347896d9c6f99d9972212356af56627 +Merge: 36691f54c0 e4023e6b99 +Author: tianshujie98 +Date: Wed Jun 9 13:12:31 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 36691f54c0afe5dedac2eddc217ab894c0ec7d02 +Author: tianshujie98 +Date: Wed Jun 9 13:12:17 2021 +0800 + + * Finish task #39086. + +commit e4023e6b9905364931e9d07c84ed7cb8cd6fa9e0 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jun 9 11:47:22 2021 +0800 + + * Adjust the code. + +commit b9584dc3c2d0f4c49e20d44199252681b28c6de2 +Author: Guanxiying +Date: Tue Jun 8 16:53:22 2021 +0800 + + * Finish task 38937. + +commit c8b77f1b0d1827e1416a88668f604601f3024e7a +Author: Yagami <976204163@qq.com> +Date: Tue Jun 8 13:49:46 2021 +0800 + + * Fix bug #1552. + +commit e09060e7cad802b6ffe07d6187ac7dcf76958dc7 +Merge: 42eb835fa3 f27fef0b00 +Author: David.li <1441836644@qq.com> +Date: Tue Jun 8 13:34:19 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + + # Conflicts: + # config/zentaopms.php + # module/gitlab/model.php + +commit 3f7fdecfc44d7ab383a72554088f928e17a25910 +Merge: 3893084999 64be23b2c5 +Author: wangyidong +Date: Tue Jun 8 13:33:47 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 389308499990fc25ed7c7cbe3dedf761c84e8169 +Author: wangyidong +Date: Tue Jun 8 13:33:34 2021 +0800 + + * adjust for mhtml. + +commit 42eb835fa33d8b98d56c650a72a95fd8468f5b19 +Author: David.li <1441836644@qq.com> +Date: Tue Jun 8 13:31:44 2021 +0800 + + * Add + +commit f27fef0b00c4e6339c7da43017805de2cea8c4c2 +Author: Guanxiying +Date: Tue Jun 8 13:16:58 2021 +0800 + + * Call pipeline model in gitlab model. + +commit 4492f5f23c12e101cf054a07f3ffbbd7453d44fd +Author: Guanxiying +Date: Tue Jun 8 13:04:03 2021 +0800 + + * Rename jenkins table. + +commit e2157697e8ba4e1e01c3ebf6f9d32f133fad35d5 +Author: dingguodong +Date: Tue Jun 8 12:13:16 2021 +0800 + + * Rename pipline to pipeline. + +commit 7ea2322002bfaf63b4d3451b0c252af700c4b6f0 +Author: dingguodong +Date: Tue Jun 8 11:45:32 2021 +0800 + + * Rename PIPLINE to PIPELINE. + +commit 08567f098a89edb1c74cc1130320cbc2fdfed79a +Author: Guanxiying +Date: Mon Jun 7 18:53:52 2021 +0800 + + * Rename jenkins table. + + Add pipline module. + +commit c68d0be34d1d259b33a6ea7256202a03f87a4524 +Merge: 8e00b74c72 6be518e93b +Author: Guanxiying +Date: Mon Jun 7 16:43:47 2021 +0800 + + Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu + +commit 8e00b74c72d0bb15e2f6db2a4936a927af842d43 +Author: Guanxiying +Date: Mon Jun 7 16:43:21 2021 +0800 + + * Add pipline module. + +commit 6be518e93b2b497bdc1669d2354f4b0d76228eb3 +Author: David.li <1441836644@qq.com> +Date: Mon Jun 7 16:36:46 2021 +0800 + + * gitlab for upgrade. + +commit 64be23b2c53c2477117b40128fdfc8e57c325208 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jun 7 16:06:09 2021 +0800 + + * Fix bug #12627. + +commit 3716f8568e491f5ddc150c52d1ef3380ca0e9c9e +Author: Guanxiying +Date: Mon Jun 7 15:53:43 2021 +0800 + + * Add pipline table. + +commit 608b41e1533b9951202927a4745c42e696067850 +Merge: dd9214da2f f67ee188dc +Author: wangyidong +Date: Mon Jun 7 14:37:47 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit dd9214da2f64bd62b9fbf5c9a034d6d763648c3d +Author: wangyidong +Date: Mon Jun 7 14:37:32 2021 +0800 + + * adjust for upgrade. + +commit f67ee188dc4a6aa96a0b415f84a18862977449df +Author: hufangzhou <746775970@qq.com> +Date: Mon Jun 7 14:26:03 2021 +0800 + + * Fix bug #13004. + +commit aacf8c1e1bf6ef0e85597684871d728b2c7f57e5 +Merge: 08de61a26c 0080c97b0f +Author: wangyidong +Date: Mon Jun 7 14:13:17 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 08de61a26cc34a9e0f6852a7748d6c397dcccd92 +Author: wangyidong +Date: Mon Jun 7 14:13:01 2021 +0800 + + * fix bug and merge from master. + +commit 0080c97b0f5830f2eb8f48d62f27bbcc91adf4ed +Merge: a055980108 fedd2ddc87 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jun 7 13:28:11 2021 +0800 + + Merge branch '15.0' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit a055980108072f03a6ac288c85c1793329d70156 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jun 7 13:27:51 2021 +0800 + + * Add English language file for automation. + +commit fedd2ddc8763716807c44e902d2e4f81842fe6bd +Merge: 0942d6a4f7 8d75769726 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jun 7 12:26:32 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 0942d6a4f70fc99430dce3646df6ab5496c470b4 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jun 7 12:26:28 2021 +0800 + + * Adjust the code. + +commit f61d966f07ba170b93a40a62df7b715cb42ec8ca +Author: David.li <1441836644@qq.com> +Date: Mon Jun 7 12:03:42 2021 +0800 + + Add Gitlab module. + +commit 8d7576972631a6e00b98dd90a846ec78a79c6f32 +Merge: 773356c97c af0a85083b +Author: wangyidong +Date: Mon Jun 7 11:31:32 2021 +0800 + + Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 + +commit 773356c97ca9139edcfd35f8465d2f25dcc66e55 +Author: wangyidong +Date: Mon Jun 7 11:30:10 2021 +0800 + + * fix bug for xuanxuan get dept. + +commit af0a85083b6e7c6af4b9569ae9d27679ba3e2667 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jun 7 09:15:44 2021 +0800 + + * Fix bug #12627. + +commit 206dea63bdcd4bd374796b9c4d34bdb7e446dc88 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jun 7 08:56:57 2021 +0800 + + * Add comments. + +commit c2d05fcbabd251c51d3260c05b957de3ac7e4efe +Merge: 41d59a0688 9c166e59d0 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jun 7 08:16:06 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 41d59a068829be1f430564dfab03e0e1f43efcc2 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jun 7 08:15:32 2021 +0800 + + * Fix bug 12627. + +commit 3fe8523aba4206f083d48c90b406edee6a1e2dae (tag: zentaopms_15.0.1_20210606) +Author: wangyidong +Date: Sun Jun 6 18:33:33 2021 +0800 + + * adjust for upgrade. + +commit 9a0512f334433e5ef26fd0abffec322ce60ca9ff +Author: wangyidong +Date: Sun Jun 6 09:46:11 2021 +0800 + + * add zh-tw lang. + +commit ce35cfd36870f4a4c5d5f07a462db2c6690e29d3 +Author: wangyidong +Date: Sun Jun 6 09:29:56 2021 +0800 + + * change version. + +commit 387b09e25c1230d05049fa2e4deba3a86806f385 +Merge: f48a91f264 9c166e59d0 +Author: wangyidong +Date: Sun Jun 6 09:27:45 2021 +0800 + + Merge branch '15.0.beta3' + +commit b6676572f048c3543df283a180be8b5b303ecbc7 +Author: wangyidong +Date: Sun Jun 6 09:05:34 2021 +0800 + + * merge from 15.0.beta3. + +commit 9c166e59d0546d56f5476c568b0dcb1f9c728928 +Author: wangyidong +Date: Sun Jun 6 08:32:49 2021 +0800 + + * adjust for task #38876. + +commit fe58d5f20e9b1c35b53e71e7f5dba976dac4bbd4 +Author: tianshujie98 +Date: Sat Jun 5 21:09:16 2021 +0800 + + * Fix bug #13082. + +commit 3f7d702a82a74edbcd4c58d426851043ac8eae31 +Author: hufangzhou <746775970@qq.com> +Date: Sat Jun 5 18:32:13 2021 +0800 + + * Fix bug #13066. + +commit fcf1d669d7f4c7259c92e6d9b5c3369dc4b51663 +Author: hufangzhou <746775970@qq.com> +Date: Sat Jun 5 18:14:44 2021 +0800 + + * Revert the changed code of task #38644. + +commit e03bc08d00aee2488adc8a740d980b4ab5e184ff +Author: qiyu-xie +Date: Sat Jun 5 16:24:02 2021 +0800 + + * Finish task#38881. + +commit 968c88329a0040270b08ce1ca1f4fe460bb65f5f +Author: wangyidong +Date: Sat Jun 5 15:40:09 2021 +0800 + + * fix bug. + +commit 0fb37ae0f6477db15424409a27623bbf0786be20 +Author: wangyidong +Date: Sat Jun 5 15:39:07 2021 +0800 + + * adjust for upgrade. + +commit 778c8c79ebdb5c7c7efeb5a82a3f382ba3ffba70 +Merge: bc207f4700 69532aba77 +Author: hufangzhou <746775970@qq.com> +Date: Sat Jun 5 15:26:36 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bc207f4700474162ef7f7dd155252dbad887e8dc +Author: hufangzhou <746775970@qq.com> +Date: Sat Jun 5 15:26:26 2021 +0800 + + * Finish task #38900. + +commit a07123b8cbd3e5e045bc4cdf2ba82523938b9303 +Author: wangyidong +Date: Sat Jun 5 15:22:26 2021 +0800 + + * adjust for upgrade. + +commit 769e6b433bd5da76364dd66174b1c404eb37947a +Author: wangyidong +Date: Sat Jun 5 13:01:53 2021 +0800 + + * merge from 15.0.beta3. + +commit 69532aba7706f2e756a71344f05a635807b76736 +Author: qiyu-xie +Date: Sat Jun 5 12:02:38 2021 +0800 + + * Finish task#38909. + +commit 09b760415e3cea225e558862958c009756fff2c7 +Author: qiyu-xie +Date: Sat Jun 5 11:02:08 2021 +0800 + + * Fix create execution bug. + +commit 1ed3ae021bdcc6e9b3d6ef9eeedf9b1bbf32f41b +Merge: 6132743c6b 72809c5087 +Author: wangyidong +Date: Sat Jun 5 10:59:55 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 6132743c6b7e48b47096089b8beec801c3e7ac8e +Author: wangyidong +Date: Sat Jun 5 10:59:27 2021 +0800 + + * fix bug #13074. + +commit 72809c508743fa8df640a3ef9470b48ad2a11dac +Author: qiyu-xie +Date: Sat Jun 5 10:37:29 2021 +0800 + + * Fix action bug. + +commit f4f0e83f284815241b37bbfe4536b9be2c61dc9d +Author: hufangzhou <746775970@qq.com> +Date: Sat Jun 5 00:57:02 2021 +0800 + + * Fix a bug. + +commit 0b25ff55bd63247f7de5f1781f6612691541e295 +Author: hufangzhou <746775970@qq.com> +Date: Sat Jun 5 00:43:20 2021 +0800 + + * Finish task #38895. + +commit b3d33fd10f038fb5d25a96617790e7f4b467bd26 +Merge: dd4999de53 f3921abf0a +Author: hufangzhou <746775970@qq.com> +Date: Fri Jun 4 23:54:10 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit dd4999de53dc208c54dd66d3ce5abee5235bfe65 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jun 4 23:54:03 2021 +0800 + + * Finish task #38896. + +commit f3921abf0ab22e6651c168a89f4d193ecbb70bc2 +Author: tianshujie98 +Date: Fri Jun 4 22:41:29 2021 +0800 + + * Finish task #38922. + +commit cf74e5728c042fa1aa1d9ec21db8c5a9722edbaf +Merge: b645d23e55 d38cfbd23e +Author: hufangzhou <746775970@qq.com> +Date: Fri Jun 4 22:22:13 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b645d23e559108899b6fc9d1cf1f39e3739ebd80 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jun 4 22:22:07 2021 +0800 + + * Finish task #38923. + +commit d38cfbd23e2bbf5f593c2212ab51d2c9378d6c0c +Author: qiyu-xie +Date: Fri Jun 4 22:16:11 2021 +0800 + + * Finish task#38911. + +commit fc473ab743788b0173ca9089a117a0c330fd6f20 +Merge: 15ee092857 0eb60e6129 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jun 4 22:15:03 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 15ee0928570193bd5d5b96e4c976d055510729e7 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jun 4 22:14:54 2021 +0800 + + * Finish task #38925. + +commit 0eb60e6129b52564a6c17d553644e243b0260365 +Author: tianshujie98 +Date: Fri Jun 4 21:55:57 2021 +0800 + + * Finish task #38921. + +commit 0ccc2c3f2889e34d6ce4e4204466d4888f3a5571 +Author: qiyu-xie +Date: Fri Jun 4 18:03:03 2021 +0800 + + * Finish task#38926. + +commit 3dbe2cde464cc45f2733841a6fb382138b0f31b5 +Merge: 80b876383c d83af0420d +Author: tianshujie98 +Date: Fri Jun 4 17:30:43 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 80b876383c3d6fee3f84ed94d6a1b3da082d8e2f +Author: tianshujie98 +Date: Fri Jun 4 17:30:09 2021 +0800 + + * Finish task #38920. + +commit d83af0420def89c783fbd53ef4671f277b1959e6 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jun 4 17:28:48 2021 +0800 + + * Finish task #38898. + +commit 7c1e69e3e0d03f134ce2d479f694b34dbd659a85 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jun 4 17:25:07 2021 +0800 + + * Finish task #38901, task #38899. + +commit 18ca3cbb99f7695df62fad5d347e8f7d9c77600b +Author: qiyu-xie +Date: Fri Jun 4 17:18:49 2021 +0800 + + * Finish task#38910. + +commit e4f221bf59b9e2ef979dafbf292d7b3e8c4bc3dc +Author: tianshujie98 +Date: Fri Jun 4 16:41:38 2021 +0800 + + * Finish task #38917. + +commit ca9a6ba037bf117347e02b0d2b724a2abed23910 +Author: tianshujie98 +Date: Fri Jun 4 16:21:19 2021 +0800 + + * Modify language items. + +commit d83d07dd6882bf8ed04045ee5846ad242f6bc9a1 +Merge: 64ac581298 e14b3a6b42 +Author: tianshujie98 +Date: Fri Jun 4 16:13:21 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 64ac58129871b5f22c7e8be447fe5995ff5f7376 +Author: tianshujie98 +Date: Fri Jun 4 16:12:59 2021 +0800 + + * Modify language items. + +commit e14b3a6b42c2226a7086d3a7d84b3b5428e5a91f +Merge: 8d1ca6b022 3d91cef47c +Author: wangyidong +Date: Fri Jun 4 16:07:13 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8d1ca6b0224d049357743b8d184cefc99e0f2c76 +Author: wangyidong +Date: Fri Jun 4 15:59:01 2021 +0800 + + * finish task #38890. + +commit 3d91cef47c5cb1a7d37e76ab811aa03277a4a4e7 +Author: tianshujie98 +Date: Fri Jun 4 15:47:43 2021 +0800 + + * Finish task #38919. + +commit 954b1d5a35789446ccfdf632f0522a692a9aa95b +Merge: 10d2d37ee6 1a11405e6b +Author: tianshujie98 +Date: Fri Jun 4 15:46:12 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 10d2d37ee6b673dfac9152f93e878ec3b2df9e3e +Author: tianshujie98 +Date: Fri Jun 4 15:45:59 2021 +0800 + + * Finish task #38918. + +commit 1a11405e6bcdd1750a047e583a0bdd734e9c89b1 +Merge: e858eb9d98 635515190f +Author: wangyidong +Date: Fri Jun 4 15:36:42 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit e858eb9d9891f6ef010a1551efd87338c13749b3 +Author: wangyidong +Date: Fri Jun 4 15:36:26 2021 +0800 + + * fix bug. + +commit 635515190f7e8473aac4a168e8f9a4ba39f4ba14 +Author: tianshujie98 +Date: Fri Jun 4 15:24:53 2021 +0800 + + * Finish task #38878. + +commit fd979e7e326850926acd55818cdcfb6c264bed6d +Author: tianshujie98 +Date: Fri Jun 4 15:20:59 2021 +0800 + + * Finish task #38888. + +commit 849d43b4b2f2140a1f110c4630b7f53677032db8 +Author: tianshujie98 +Date: Fri Jun 4 15:06:02 2021 +0800 + + * Fix action bug. + +commit dbb2d5f65004d9f41950e7d57c553a93efeec4d1 +Author: qiyu-xie +Date: Fri Jun 4 14:40:46 2021 +0800 + + * Adjust code. + +commit 266c354102e34efe79ee6f731ec2b72d07850fa3 +Author: tianshujie98 +Date: Fri Jun 4 14:26:49 2021 +0800 + + * Finish task #38877. + +commit de5ab488181f832cd2f10d3e37ad34854f993a33 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jun 4 13:57:20 2021 +0800 + + * Adjust logic of hidden stage field. + +commit 0eef651b5655fe1e9048fdd4393f9dda351e4ef5 +Author: tianshujie98 +Date: Fri Jun 4 13:57:20 2021 +0800 + + * finish task #38880. + +commit a3056d3c426764f3ac3bf2f86a3625d95a46b905 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jun 4 13:41:24 2021 +0800 + + * Adjust code for review. + +commit c587c18b463eb2cef5639a93aaf182ef92f9841d +Author: tianshujie98 +Date: Fri Jun 4 13:18:23 2021 +0800 + + * Finish task #38889. + +commit bebed24d041280eb96fee9797c9b2a1531ba33b4 +Author: tianshujie98 +Date: Fri Jun 4 12:49:40 2021 +0800 + + * Finish task #38894. + +commit 9d1876b0099dc72f9d035eb6fecee5ed8178484c +Merge: f6594c7022 de0257819b +Author: wangyidong +Date: Fri Jun 4 12:11:22 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f6594c7022fcfb766da60d3c51102bfaed0f573f +Author: wangyidong +Date: Fri Jun 4 12:10:48 2021 +0800 + + * adjust version and adjust test. + +commit de0257819b013090d41ee53de076108cf078dca4 +Author: tianshujie98 +Date: Fri Jun 4 12:02:47 2021 +0800 + + * Adjust code. + +commit b27fbb4f963419b8866c1fed6b273d5849aeac90 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jun 4 11:21:50 2021 +0800 + + * Adjust code style. + +commit 3cc93bd72250630f4da296809b6c9ae46ffd8229 +Merge: b157d011e8 5389de2709 +Author: tianshujie98 +Date: Fri Jun 4 08:56:35 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b157d011e81968ad3c7f951925bc8eeaa66073a8 +Author: tianshujie98 +Date: Fri Jun 4 08:56:21 2021 +0800 + + * Fix bug #13022. + +commit 5389de27097a840fd4df413cb34a055f63026260 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jun 4 08:51:45 2021 +0800 + + * Adjust code for review. + +commit fdb263a4f2b616630953cb91740b50f9cfdfd9c9 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jun 4 08:03:02 2021 +0800 + + * Adjust the code. + +commit 761c0c5f3504cb12266e05ab1f868004d6619887 +Author: tianshujie98 +Date: Thu Jun 3 10:28:11 2021 +0800 + + * Fix bug. + +commit fe1c5ad01a8d4f8d6f60be47d0b6c377de1ce494 +Author: tianshujie98 +Date: Thu Jun 3 10:14:07 2021 +0800 + + * Fix todo problems. + +commit 742984af62a5f6fd73d4386f417c3d3397008cae +Merge: 8919772d94 ec041a4168 +Author: wangyidong +Date: Thu Jun 3 10:08:55 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8919772d94cddac6668cc083818daee99ef916dd +Author: wangyidong +Date: Thu Jun 3 10:08:21 2021 +0800 + + * finish task #38651. + +commit ec041a41688d715286b895201a688e980a4456d5 +Author: qiyu-xie +Date: Thu Jun 3 10:00:48 2021 +0800 + + * Add getById method testcase of trainplan module. + +commit 101054020bdb2e1bc1a82542a16fe8e77c54a89e +Merge: 4696a6dceb 2ad0a9319a +Author: wangyidong +Date: Thu Jun 3 09:47:34 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 4696a6dceb86dbc381b8c6e6167fc048a2ef6b08 +Author: wangyidong +Date: Thu Jun 3 09:47:06 2021 +0800 + + * code for xhtml. + +commit 2ad0a9319a437474bd48f89c73b837c18f4e62ec +Merge: 0537771b0f f8ab352864 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jun 3 09:29:28 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 0537771b0f5f46b2e969f9022e6d7b95740d5bd5 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jun 3 09:29:24 2021 +0800 + + * Add getbyid method testcase of gapanalysis module. + +commit f8ab35286474ba4bd6ff63ab035a4edabc7e1a0d +Author: holan20180123 <56391770@qq.com> +Date: Thu Jun 3 09:07:37 2021 +0800 + + * Add unit testcase of branch module. + +commit cf6dfd8a3f3843d752f7a5fe1d020210b739d871 +Merge: f4947017f4 abb3131648 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jun 2 17:31:20 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f4947017f4c37a6b0d03e54cff0aa1727711a12c +Author: hufangzhou <746775970@qq.com> +Date: Wed Jun 2 17:31:15 2021 +0800 + + * Adjust the code. + +commit abb31316481321c502944b065299c5ce8af9a2de +Author: qiyu-xie +Date: Wed Jun 2 16:10:55 2021 +0800 + + * Fix bug#12967. + +commit 1280fab624dad66246b40a617888bcbfd13531dc +Author: qiyu-xie +Date: Wed Jun 2 15:40:26 2021 +0800 + + * Fix bug#12966,#12965. + +commit 581d35e006864a9757820dcf9c6136d3b723c7f4 +Author: qiyu-xie +Date: Wed Jun 2 13:25:39 2021 +0800 + + * Fix bug#12123. + +commit 82014234d45c0a5a87d392545862d0098448f769 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jun 2 13:19:21 2021 +0800 + + * Adjust the status and stage of story when batch create in project or execution module. + +commit e18e065a5928b2b69d8d1c9d4805660b62cdfbc0 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jun 2 11:40:57 2021 +0800 + + * Fix a bug. + +commit c21ce9355420355c1494445a467c2a76266df47a +Merge: d7d324f78f 2dc084e911 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jun 2 10:47:31 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d7d324f78f84c9187f5822ba52d087f5e29337bb +Author: hufangzhou <746775970@qq.com> +Date: Wed Jun 2 10:47:26 2021 +0800 + + * Fix bug #12840. + +commit 2dc084e911736683e3099e9ce559a1b51fdd18be +Author: tianshujie98 +Date: Wed Jun 2 10:25:21 2021 +0800 + + * Modify the required item prompt language item. + +commit 246f8c72325f203f5fea038b27a206951ec17f64 +Author: tianshujie98 +Date: Wed Jun 2 09:41:41 2021 +0800 + + * Edit required language. + +commit 7179382ac5551a3a31066223208d7467047ffafe +Author: tianshujie98 +Date: Wed Jun 2 09:29:51 2021 +0800 + + * Fix navigation highlight problem. + +commit 50e4f6611e289bba151ce5efecbf2e49d6a132da +Author: tianshujie98 +Date: Wed Jun 2 09:24:18 2021 +0800 + + * Fix bug #12955. + +commit 246332c661bf3b95ef9363e8d389049224c67f1a +Author: tianshujie98 +Date: Wed Jun 2 09:17:41 2021 +0800 + + * Fix an error. + +commit f335d5747d0d24338a2dbdecc0558314c51f6443 +Author: tianshujie98 +Date: Wed Jun 2 09:02:51 2021 +0800 + + * Fix the problem of project admin group. + +commit 984351e06755550c879ea844467afe249a0cefa5 +Author: tianshujie98 +Date: Tue Jun 1 17:22:24 2021 +0800 + + * Fix bug #12948. + +commit 0bff58d0141534ada0ff2b52aeba233464309d78 +Author: tianshujie98 +Date: Tue Jun 1 17:08:18 2021 +0800 + + * Fix bug #12674. + +commit 3cb954f0cb6e36b17b6365484f3fd3b76cee0d90 +Author: tianshujie98 +Date: Tue Jun 1 16:48:57 2021 +0800 + + * Fix start problem. + +commit 1d8647bb515e03599f7f119052b4637e337d04b1 +Author: tianshujie98 +Date: Tue Jun 1 16:44:29 2021 +0800 + + * Fix bug #12947. + +commit f0f36ee496b9ee358a0169e8413e2f962e045e71 +Merge: f98e23cf15 60992398e5 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jun 1 16:16:12 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f98e23cf15b68e076b19903f7b6f279c6e839b78 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jun 1 16:16:08 2021 +0800 + + * Fix bug #12837. + +commit 60992398e5f484a2aadca9beee9533fa16a242a0 +Merge: b3798706a8 2840c4007e +Author: tianshujie98 +Date: Tue Jun 1 15:58:29 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b3798706a86a977bbc4da7294fda242bfee3c826 +Author: tianshujie98 +Date: Tue Jun 1 15:58:21 2021 +0800 + + * Fix bug. + +commit 2840c4007e731be27855cfeffb1be48a7ebd5537 +Merge: 59f09a1fb5 0b0493988d +Author: hufangzhou <746775970@qq.com> +Date: Tue Jun 1 15:55:23 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 59f09a1fb5234325c8dc10cb79f0b1832d1cf86e +Author: hufangzhou <746775970@qq.com> +Date: Tue Jun 1 15:55:19 2021 +0800 + + * Fix bug #12836. + +commit 0b0493988dca487fcf44c9f109d194218cc71610 +Author: qiyu-xie +Date: Tue Jun 1 15:52:06 2021 +0800 + + * Fix bug#6455. + +commit 283683350d88a0194587e565a4487bcef6ae630f +Author: tianshujie98 +Date: Tue Jun 1 15:52:10 2021 +0800 + + * Fix bug #12674. + +commit fbc5f1404ec483b221a69d07ef6284da26349f74 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jun 1 15:33:31 2021 +0800 + + * Fix bug 12781. + +commit ec8ff5d72db611dc3fa947204930ce560721224f +Merge: 7456301e30 0e7439591e +Author: hufangzhou <746775970@qq.com> +Date: Tue Jun 1 15:29:19 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 7456301e30f4bfb87343f5ebc965c8bb3f34fd81 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jun 1 15:29:15 2021 +0800 + + * Fix bug #12482. + +commit 0e7439591e60f09120273390fd9330a0515be2f6 +Author: tianshujie98 +Date: Tue Jun 1 15:27:14 2021 +0800 + + * Fix bug #12861. # 请为您的变更输入提交说明。以 '#' 开始的行将被忽略，而一个空的提交 + +commit d98ea76e53b7cf0152593b38146b9c027505a803 +Author: tianshujie98 +Date: Tue Jun 1 15:23:14 2021 +0800 + + * Add historical record condition judgment. + +commit 27538bc0179661c097df27eedb92264bf5614953 +Author: qiyu-xie +Date: Tue Jun 1 14:38:09 2021 +0800 + + * Finish task#38637. + +commit 6957fa70a4ac2f3d31d740a67c67424b60a0486a +Author: tianshujie98 +Date: Tue Jun 1 14:31:11 2021 +0800 + + * Adjust code style. + +commit a35032c35f73562e9a3cb77adce26208e16667c9 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jun 1 14:30:38 2021 +0800 + + * Fix bug #12781. + +commit 7c9125b7796de6fd80eae513fd92f63967c2f8fb +Merge: 970dd000e2 b2c742abfc +Author: hufangzhou <746775970@qq.com> +Date: Tue Jun 1 14:25:08 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 970dd000e2214c61b5fa7b9b7e7b8eb88e785414 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jun 1 14:25:03 2021 +0800 + + * Fix bug #12720. + +commit b2c742abfc667328a4f36992481461376e250c8b +Author: tianshujie98 +Date: Tue Jun 1 14:05:50 2021 +0800 + + * Fix bug. + +commit a9297f36b8c72d11c169a3064131fb1667ca13f8 +Author: wangyidong +Date: Tue Jun 1 14:03:13 2021 +0800 + + * fix bug. + +commit 1a6f74c85a9bc18d966c74834c19812ae71c6f5d +Author: tianshujie98 +Date: Tue Jun 1 14:02:41 2021 +0800 + + * Fix bug #12861. + +commit 4c4d6b2d7a3ae1987ada7de13a715c5ca8e7b345 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jun 1 13:51:49 2021 +0800 + + * Fix bug #12381. + +commit 591fdee8ff3d1d4b5767b878717644834029a51c +Author: tianshujie98 +Date: Tue Jun 1 13:29:48 2021 +0800 + + * Fix bug #38634. + +commit 014a2152e27b6b83ea778ae638639f118a45d444 +Merge: 42374c2c84 b9025f5853 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jun 1 13:06:42 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 42374c2c849905a89d13e79fe164de825105bb96 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jun 1 13:06:35 2021 +0800 + + * Fix an error. + +commit b9025f58537d54441d87ae7299a7b5e49c23fbca +Merge: 65b97e69bc 8667b83f17 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jun 1 11:39:23 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 65b97e69bcc1d7046db4e71ea5ac9be917343185 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jun 1 11:39:07 2021 +0800 + + * Fix error. + +commit 8667b83f17588ae0c83bd997dee467835577360c +Merge: f7cc368902 c7d97d4712 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jun 1 11:05:38 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f7cc3689023b9046547b79c2c406f4bebc8e6fb2 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jun 1 11:05:28 2021 +0800 + + * Finish task #38636. + +commit c7d97d471208a1be4f1b0e5eb1b1af9fdebdf5fd +Merge: 5ea1603678 fae8fb6bb0 +Author: wangyidong +Date: Tue Jun 1 11:03:48 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 5ea1603678d9de05903ad097046d3669076f83ee +Author: wangyidong +Date: Tue Jun 1 11:03:17 2021 +0800 + + * code for task #38642. + +commit fae8fb6bb07c9b8db1fc4298fe7176743dc14ece +Merge: 9fb469a9ac cf907e8325 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jun 1 10:53:53 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 9fb469a9acb29e7d19e60d25ad99156e96eb7ad9 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jun 1 10:53:49 2021 +0800 + + * Add the language item. + +commit cf907e83255f34cf15088d4a9999d752cf2df572 +Merge: 3f446e63a6 e92289c2c6 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jun 1 10:10:10 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 3f446e63a66ca94a35355e17f0149086424254d7 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jun 1 10:09:45 2021 +0800 + + * Fix bug 12732. + +commit e92289c2c6ce3365c8fcc0e0a1c4c70162fcb5db +Author: tianshujie98 +Date: Tue Jun 1 09:50:19 2021 +0800 + + * Fix the issue of assigned to single-select drop-down when switching is performed. + +commit add67a90394e48a398f1ddc7ba20e8fdfe86d9fd +Author: tianshujie98 +Date: Tue Jun 1 09:38:58 2021 +0800 + + * Fix the priority issue of creating todo. + +commit 5d2a13673cc32d1f1afabe02ecaae113bcc27a20 +Merge: b0291eeba4 97a4bf5bdc +Author: hufangzhou <746775970@qq.com> +Date: Tue Jun 1 09:29:35 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b0291eeba4ec2e6ef36ac8763ee5ca01e0bddfdd +Author: hufangzhou <746775970@qq.com> +Date: Tue Jun 1 09:29:30 2021 +0800 + + * Fix bug #38644. + +commit 97a4bf5bdcbde0884655906a64065e235c02789b +Merge: 0696c67339 b3760d274f +Author: wangyidong +Date: Tue Jun 1 09:19:53 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 0696c67339821aae26f9f5c512edd44cdc5d6d72 +Author: wangyidong +Date: Tue Jun 1 09:19:30 2021 +0800 + + * finish task #38645. + +commit b3760d274fc5c5e0506f149d622be411197d0644 +Author: qiyu-xie +Date: Tue Jun 1 08:32:32 2021 +0800 + + * Fix bug#12679. + +commit 50bc95bca1fba4aa6db07d69cdc4df4dcd29d16a +Merge: 234b0e84a9 7e8f5657ba +Author: wangyidong +Date: Mon May 31 17:12:56 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 234b0e84a9e47140f626741d1fd8c6027e916978 +Author: wangyidong +Date: Mon May 31 17:12:38 2021 +0800 + + * Convert ' to \'. + +commit 29627e372f21c5b2a1b36985aeb86be89503e2f0 +Author: wangyidong +Date: Mon May 31 17:12:13 2021 +0800 + + * fix bug #38652. + +commit 7e8f5657ba9b784b292705efed2467b2bd0f2a86 +Author: qiyu-xie +Date: Mon May 31 16:21:24 2021 +0800 + + * Fix bug#38647. + +commit 910eb61cd48d9db0469b9c15413bb2c8afc6bf0b +Author: qiyu-xie +Date: Mon May 31 16:03:52 2021 +0800 + + * Fix bug#12748. + +commit 18fd0d937c12670e54d8192dcb128b45411cbdfb +Merge: 8fad1f8c06 00fec1d638 +Author: wangyidong +Date: Mon May 31 14:52:15 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8fad1f8c068553c9d1436a53b27107906724b62a +Author: wangyidong +Date: Mon May 31 14:51:43 2021 +0800 + + * change for edit project field. + +commit 00fec1d638c51af58ef619dd7f45ea595e7cc418 +Author: qiyu-xie +Date: Mon May 31 14:11:56 2021 +0800 + + * Fix bug#12748. + +commit c95962902025f68803cc8c0a1e3efeb91fe05491 +Author: tianshujie98 +Date: Mon May 31 13:58:07 2021 +0800 + + * Fix todo transfer bug issue. + +commit 2ba21256647f8f4347a75826eacada59c4427cf5 +Author: holan20180123 <56391770@qq.com> +Date: Mon May 31 13:21:43 2021 +0800 + + * Fix bug #12839. + +commit e327e6feb53af6a6750982b84cb9c9572ef057fd +Merge: 3a18190245 49cd722bd3 +Author: wangyidong +Date: Mon May 31 13:09:17 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 3a181902458ae83275975b483df022b398903729 +Author: wangyidong +Date: Mon May 31 13:08:31 2021 +0800 + + * fix for get projects for gitlib.com. + +commit 49cd722bd3bc2f9361517fd07685f25e62e3c7e7 +Author: leiyong <1549684884@qq.com> +Date: Mon May 31 12:27:16 2021 +0800 + + * Fix bug. + +commit d3d3456ad390dc3ee478d447a9ea21ef244eee1b +Author: tianshujie98 +Date: Mon May 31 11:23:02 2021 +0800 + + * Add the story identification of the required review. + +commit ad26f52a97e8ef94037911e86fc238254813ffe7 +Author: tianshujie98 +Date: Mon May 31 11:12:46 2021 +0800 + + * Fix opportunity editing issue. + +commit 124d7c70d83e61ea81c21cc93eb119597efee1be +Merge: d51d13af6a 23dd18af7e +Author: tianshujie98 +Date: Mon May 31 11:11:02 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 23dd18af7ef989400beb4466b557d7844d030c12 +Merge: 31b10ab2ac 1d0d901747 +Author: hufangzhou <746775970@qq.com> +Date: Mon May 31 11:03:30 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 31b10ab2ac52b90721d2034907a04428769e4a4f +Author: hufangzhou <746775970@qq.com> +Date: Mon May 31 11:03:26 2021 +0800 + + * Fix a bug. + +commit d51d13af6a43efb9324aec7113bbfbbe212cd975 +Author: tianshujie98 +Date: Mon May 31 10:59:03 2021 +0800 + + * Fix the value range of projects when todo transfer tasks. + +commit 1d0d901747a487fa56b4e7b6393e17fd139c695a +Author: tianshujie98 +Date: Mon May 31 10:35:02 2021 +0800 + + * Add empty. + +commit f2a4de0a42f11282a58fc56b40cdc7be2a0a42f5 +Merge: 2384e37658 f48ce1d43b +Author: hufangzhou <746775970@qq.com> +Date: Mon May 31 10:22:13 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2384e3765898da96188d0afdf4130c6c35b3872a +Author: hufangzhou <746775970@qq.com> +Date: Mon May 31 10:22:08 2021 +0800 + + Adjust the code. + +commit f48ce1d43bbd5919d74981beb0545642432aa838 +Author: tianshujie98 +Date: Mon May 31 10:17:55 2021 +0800 + + * Add function to get team member pairs of project members. + +commit daf84879dba971ccd1d3e3c2fe0608f9fefb28da +Author: wangyidong +Date: Mon May 31 10:07:20 2021 +0800 + + * adjust for sync gitlab. + +commit cab32bab5bd6d0ffeab77988cc544e05441186ff +Author: wangyidong +Date: Fri May 28 15:55:21 2021 +0800 + + * fix bug for #12853. + +commit 3bc71badd7d4bddd06333c6132000333b51e4e06 +Author: hufangzhou <746775970@qq.com> +Date: Fri May 28 15:43:40 2021 +0800 + + * Adjust the code. + +commit f5c1986d8b7c70378ed4debff3e293a6e5ec3fbd +Merge: a09aab24f8 dabb26abbf +Author: wangyidong +Date: Fri May 28 13:22:51 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit a09aab24f8f63c42c9498b0af273075793a70f51 +Author: wangyidong +Date: Fri May 28 13:22:28 2021 +0800 + + * fix for sync gitlab. + +commit dabb26abbf05363a8861440b731a2a789383002f +Merge: 2c5347622f 7ac9d6450d +Author: hufangzhou <746775970@qq.com> +Date: Fri May 28 11:34:21 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2c5347622fe6b79898f2939f053df2a05a462f7b +Author: hufangzhou <746775970@qq.com> +Date: Fri May 28 11:34:16 2021 +0800 + + * Adjust the code. + +commit 7ac9d6450d851b59dfae2965198c4b9c99e19e92 +Author: tianshujie98 +Date: Fri May 28 11:30:57 2021 +0800 + + * Record return session. + +commit 5553c101e61ac67b8839559afb6e6e95b9acfe25 +Author: hufangzhou <746775970@qq.com> +Date: Fri May 28 10:21:46 2021 +0800 + + * Finish task #38393. + +commit 2670d1840e16424fc1ea762843e7ec6d3ee979d4 +Author: hufangzhou <746775970@qq.com> +Date: Fri May 28 09:16:52 2021 +0800 + + * Add the trainplanList session. + +commit 129448e74ba4111fc3459ecf075078514b0e520a +Merge: bcc1dc1484 1441f64b63 +Author: tianshujie98 +Date: Fri May 28 08:57:55 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bcc1dc1484147444f8336b9d46b527a055a9a41e +Author: tianshujie98 +Date: Fri May 28 08:57:38 2021 +0800 + + * Fix dynamic issue. + +commit 1441f64b63bf2229613d060d605fef24a9466434 +Merge: ac6cabfeca 3d1e94daa1 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 27 17:50:49 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit ac6cabfecaf4bca31fe59900976e1526f22450b7 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 27 17:50:45 2021 +0800 + + * Add the lang items. + +commit 3d1e94daa1b556a07814d29fc040c3a6337ec0b5 +Author: tianshujie98 +Date: Thu May 27 17:37:34 2021 +0800 + + * Finish task #38381. + +commit 2b296ecd4201a2b1a0246fccbbb6510866044174 +Author: tianshujie98 +Date: Thu May 27 15:34:58 2021 +0800 + + * Finish task #38375. + +commit 3e97c2111f009154c8a1600094621f537ec9a7db +Author: Hao Sun +Date: Thu May 27 15:32:34 2021 +0800 + + * update zenicon, add new icon "icon-summary"（培训总结）. + +commit bf365b91884fefc3eaa7338a18661dbcb58f77c7 +Author: wangyidong +Date: Thu May 27 14:16:44 2021 +0800 + + * adjust for gitlab branch. + +commit 49febd6e96d4f372ca2767559075ecaa293537db +Author: wangyidong +Date: Wed May 26 17:29:33 2021 +0800 + + * fix bug for show pager. + +commit 4e87dc7970e0270a5d88176b16f07b519b2b9bcb +Author: tianshujie98 +Date: Wed May 26 11:46:10 2021 +0800 + + * Add actions of opportunity. + +commit adc77673d910d402b0a6e93f912058a496ed7d3e +Author: hufangzhou <746775970@qq.com> +Date: Tue May 25 08:58:40 2021 +0800 + + * Fix bug #12786. + +commit 0751031d0a12e240d993fa1ca3b699876306b10a +Merge: 2d39d6e69d 667f3799c2 +Author: hufangzhou <746775970@qq.com> +Date: Mon May 24 17:02:48 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2d39d6e69d5afa315902d14868efb054f65469f9 +Author: hufangzhou <746775970@qq.com> +Date: Mon May 24 17:02:41 2021 +0800 + + * Fix bug #12789, bug #12788. + +commit 667f3799c2690c2b072394354dff0dccfe87313c +Author: Hao Sun +Date: Mon May 24 14:07:42 2021 +0800 + + * bug #12716, fix active wrong menu item when opening action is canceled. + +commit 97d582a859d384a8240234df4e65fefa0ff793ea +Merge: d2688a7eab cc475e4740 +Author: hufangzhou <746775970@qq.com> +Date: Mon May 24 13:06:49 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d2688a7eab509d709b495bfd2c74bcaf6e02e8ce +Author: hufangzhou <746775970@qq.com> +Date: Mon May 24 13:06:44 2021 +0800 + + * Fix bug #12784, bug #12783. + +commit cc475e474021d87212d8448267e574a0d72e40b6 +Author: tianshujie98 +Date: Mon May 24 12:08:41 2021 +0800 + + * Modify English language file. + +commit 16ffbd5b44beb05826f62885b932d31d951bbeb2 +Author: hufangzhou <746775970@qq.com> +Date: Mon May 24 12:03:53 2021 +0800 + + * Fix bug #12782. + +commit 1c7573cbefa5659117e5b1f5c7168bdc7e9f416f +Author: hufangzhou <746775970@qq.com> +Date: Mon May 24 11:36:45 2021 +0800 + + * Fix bug #12780. + +commit b978d2967c9fe52e36da83c2ab08a3bd25e4d3fb +Merge: 9376551b52 6048f6a0d0 +Author: hufangzhou <746775970@qq.com> +Date: Mon May 24 11:10:43 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 9376551b52edb3b3e442963bae442768a3fcb8e6 +Author: hufangzhou <746775970@qq.com> +Date: Mon May 24 11:10:38 2021 +0800 + + * Do not allow remove the reviewer who has been reviewed when edit the story. + +commit 6048f6a0d035b8d645bb4c1b9422fd37ec4a747c +Author: tianshujie98 +Date: Mon May 24 11:09:05 2021 +0800 + + * Modify bug query conditions. + +commit a8608cffc250744a043ebebc38ce9d7914156340 +Author: Hao Sun +Date: Mon May 24 10:12:53 2021 +0800 + + * bug #12758, skip to watch form changes in advnace table. + +commit fc7f7f102dd84a8093a490c88b40b8a989e159c5 +Author: Hao Sun +Date: Mon May 24 09:59:43 2021 +0800 + + * bug #12708, improve UI of tips for unsaved forms. + +commit 076f1fca1d7b80f043ed432fa4140062d2611024 +Author: tianshujie98 +Date: Mon May 24 09:41:56 2021 +0800 + + * Fix bug #12749. + +commit 772a358c46f465e55909317402615d93251ba4cb +Merge: e9eb91aebe 3e44ff7a49 +Author: hufangzhou <746775970@qq.com> +Date: Mon May 24 09:30:18 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit e9eb91aebe925e8a1959e94d3f0b7c1aed613d13 +Author: hufangzhou <746775970@qq.com> +Date: Mon May 24 09:30:14 2021 +0800 + + * Adjust the code. + +commit 3e44ff7a495e12398e61c350d7a7dea49de9cbeb +Author: Hao Sun +Date: Mon May 24 09:27:34 2021 +0800 + + * bug #12704, fix tips of unsaved form for lang 'zh-cn'. + +commit 9d67ef41aae6e32ef5622cfb03ad0be988ec80f0 +Author: Hao Sun +Date: Mon May 24 09:23:48 2021 +0800 + + * bug #12715, fix alert for unsaved form not work as expected. + +commit d55163f46490eafe2b1db434ad5ab9940d1ca96c +Author: tianshujie98 +Date: Mon May 24 08:56:32 2021 +0800 + + * Add empty judgment. + +commit 6c479125965ac985cfbdf19845687d0a7de6613a +Author: tianshujie98 +Date: Mon May 24 08:56:11 2021 +0800 + + * Fix bug #12755. + +commit d4d96d6478c699aca3cd4087dcf32f1f6f995f75 +Merge: f477c9f4f7 f79dec9b8a +Author: hufangzhou <746775970@qq.com> +Date: Fri May 21 17:23:30 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f477c9f4f753c2390dc7496f35fe702097009588 +Author: hufangzhou <746775970@qq.com> +Date: Fri May 21 17:23:24 2021 +0800 + + * Fix bug #12785. + +commit f79dec9b8ad406e3595f1795a4d0588d2d31acad +Merge: 5206f44c1e 265d38cf7e +Author: wangyidong +Date: Fri May 21 16:59:34 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 5206f44c1e1c803a147e5154a75c0ae912736df5 +Author: wangyidong +Date: Fri May 21 16:59:19 2021 +0800 + + * adjust for upgrade. + +commit 265d38cf7e1bed7442191d0b8844fadc1edc730c +Author: hufangzhou <746775970@qq.com> +Date: Fri May 21 16:16:09 2021 +0800 + + * Fix a bug. + +commit ab8a03d6d4688e7391dcd1892137511cd5818a98 +Author: hufangzhou <746775970@qq.com> +Date: Fri May 21 16:00:06 2021 +0800 + + * Fix an error. + +commit 2e81e60f553fd1ef7e1c4f6f7b437027fe718559 +Merge: b221f21a42 cbe619e34c +Author: hufangzhou <746775970@qq.com> +Date: Fri May 21 15:44:00 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b221f21a4200eacd451f256813ef3f0b004d8607 +Author: hufangzhou <746775970@qq.com> +Date: Fri May 21 15:43:56 2021 +0800 + + * Fix bug #12774. + +commit cbe619e34c15dc1026dcd609bb7a0753190c86d7 +Merge: 8dcfa8f189 01ce722fbe +Author: tianshujie98 +Date: Fri May 21 15:21:50 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8dcfa8f18939f2ca6ddba6b536cc83f9adea2b5a +Author: tianshujie98 +Date: Fri May 21 15:21:31 2021 +0800 + + * Add English item. + +commit 01ce722fbe803055a763fa33830d54796311cc04 +Merge: cb624d49bd 8e02c7313b +Author: hufangzhou <746775970@qq.com> +Date: Fri May 21 14:14:31 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit cb624d49bddd972e005bcb158d79a67b81e5fccc +Author: hufangzhou <746775970@qq.com> +Date: Fri May 21 14:14:27 2021 +0800 + + * Fix bug #12669. + +commit 8e02c7313b49daf2da56c3580087545edd6bd498 +Author: qiyu-xie +Date: Fri May 21 14:07:12 2021 +0800 + + * Fix bug#12636. + +commit d346a176aa8e7814443644dc58ad53777d6c8fc5 +Merge: 06c6930abd fa62fc19d6 +Author: hufangzhou <746775970@qq.com> +Date: Fri May 21 13:56:16 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 06c6930abd4528ed1ca2eec16d585df54a6d05ad +Author: hufangzhou <746775970@qq.com> +Date: Fri May 21 13:56:12 2021 +0800 + + * Adjust the history of story review. + +commit fa62fc19d61c248ff55c857cdb9abf7afc375c31 +Author: tianshujie98 +Date: Fri May 21 13:11:34 2021 +0800 + + * Fix an error. + +commit 20b17a0f4555ec7990fb5f3b64c701d2ee2fcfd9 +Author: tianshujie98 +Date: Fri May 21 11:30:45 2021 +0800 + + * Add dynamic view of team. + +commit af7cd71254b4d5b14edf6d578f4d126e9239a784 +Author: tianshujie98 +Date: Fri May 21 11:19:06 2021 +0800 + + * Fix bug #12602. + +commit d7586cb2818c01128506da9b26ac8f08a1dd15df +Author: tianshujie98 +Date: Fri May 21 11:05:38 2021 +0800 + + * Fix bug #12737. + +commit 301d4371b0792f28d4ef5449fb6696ae7ab84f73 +Author: tianshujie98 +Date: Fri May 21 11:00:32 2021 +0800 + + * Finish task #38176. + +commit daa23b66af38a46e5af11b795224e4751958658b +Author: hufangzhou <746775970@qq.com> +Date: Fri May 21 10:37:22 2021 +0800 + + * Show the reviewers in story view page. + +commit 964522b68430cf4c64a75c372c94dd987ba0d289 +Author: hufangzhou <746775970@qq.com> +Date: Fri May 21 09:45:29 2021 +0800 + + * Fix an error. + +commit 071bc3dbcdfc1523fcf4fccdd3e57b3d20f2e5ea +Author: hufangzhou <746775970@qq.com> +Date: Fri May 21 09:10:02 2021 +0800 + + * Remove the unused code. + +commit a1e09e0bc423222fd42d993ee27eb5cc0c6c0a1b +Author: hufangzhou <746775970@qq.com> +Date: Fri May 21 09:01:52 2021 +0800 + + * Change the judgment rules of story review when change the review rules halfway. + +commit e56f9d04bbf67d28a54455e2a1dd80ef6b0f262f +Merge: 1cae502aee 6dd99adfad +Author: wangyidong +Date: Thu May 20 16:56:04 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 1cae502aee7094c65e240c9aaeb36a783df987f7 +Author: wangyidong +Date: Thu May 20 16:55:12 2021 +0800 + + * adjust for web html. + +commit 6dd99adfad239b7c4ac574c7168d8aee0da5ee16 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 20 16:51:47 2021 +0800 + + * Fix a bug. + +commit 508ed10f05c2afdc8c943a015481892355e24ae8 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 20 16:19:52 2021 +0800 + + * Fix bug #12744. + +commit 45d81723d9b6b001b2980f27ed83f4cc14b92e6a +Author: hufangzhou <746775970@qq.com> +Date: Thu May 20 16:04:51 2021 +0800 + + * Change the judgment rules of story review. + +commit ec1935b5166e462f42cb3701611a5e4d2e399d6e +Author: qiyu-xie +Date: Thu May 20 15:57:00 2021 +0800 + + * Add story reviewer for edit story. + +commit 3eeb136b1e2df01d5da6d7dfc6cc206ca382caa4 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 20 15:40:01 2021 +0800 + + * Change the story change button. + +commit e7abb2e5be479ebe1a6318714e8711bb1586d885 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 20 15:02:43 2021 +0800 + + * Fix bug #12723. + +commit 99b2ecdebf2beb2b47adf9bc7f148a51113fe1d3 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 20 14:22:43 2021 +0800 + + * Remove the closed story in reviewby page. + +commit 6b4937cd85d5135f5146556f817b08c7427afec4 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 20 14:14:19 2021 +0800 + + * Fix a bug. + +commit 7af99efa68bab4df63b59578630509883fb7508e +Author: hufangzhou <746775970@qq.com> +Date: Thu May 20 13:56:56 2021 +0800 + + * Fix bug #12725. + +commit bb46e5f3a45c60f7a7f7f2d2822658a81cf2f558 +Merge: 277545e475 69fa5c6b6c +Author: hufangzhou <746775970@qq.com> +Date: Thu May 20 13:10:22 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 277545e475cbc69eee0e68272e9e236222ed828a +Author: hufangzhou <746775970@qq.com> +Date: Thu May 20 13:10:18 2021 +0800 + + * Change the history of reject result when story review. + +commit 69fa5c6b6c766b264d633ff28d88cb4da68e1e98 +Author: holan20180123 <56391770@qq.com> +Date: Thu May 20 11:14:45 2021 +0800 + + * Fix bug #12737. + +commit 43dc4b74f4d6a8e3e4b222b15c59c2ac23f6705d +Author: holan20180123 <56391770@qq.com> +Date: Thu May 20 10:36:25 2021 +0800 + + * Finish task #38280. + +commit be80ce2e0f9322853377a2bfdf9c9ca97a802f65 +Author: holan20180123 <56391770@qq.com> +Date: Thu May 20 09:27:36 2021 +0800 + + * Adjust story estimate style. + +commit e120249286713270e6d52532572eaa60bf412644 +Author: tianshujie98 +Date: Thu May 20 09:14:39 2021 +0800 + + * Add an empty prompt. + +commit 493eef181f2a0be2b7bec5ea36fbf781b1ac3b1c +Merge: 382508929f b1d469c140 +Author: wangyidong +Date: Thu May 20 09:02:12 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b1d469c1401a231daade60647c65a5a566c47568 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 20 09:00:45 2021 +0800 + + * Change the reject result of story review. + +commit f1ac9731b26cbde96c485f1ab07a83ba99d3a75d +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 17:10:52 2021 +0800 + + * Fix bug #12727. + +commit 382508929f1be31a64e8c1bff6a56fd3013fa324 +Merge: c889215d8d ede18e3879 +Author: wangyidong +Date: Wed May 19 16:56:56 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit ede18e3879b3c6ae55596f71c4a9728a91f96f0d +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 16:42:10 2021 +0800 + + * Fix bug #12703. + +commit 64d129b15c070ac65ba1fcd47e956057b2f75d06 +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 16:22:56 2021 +0800 + + * Fix bug #12684. + +commit 7242f70b2899c3601322a22814ab1da02ac776f5 +Merge: 3dc31bc299 e18e3cbe1a +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 16:17:24 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 3dc31bc299d866f6cf2f9184d5b9c60f87fda35c +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 16:17:06 2021 +0800 + + * Fix bug #12727. + +commit e18e3cbe1a308f356e9826f1bcd6ee10bf0ae5f9 +Author: hufangzhou <746775970@qq.com> +Date: Wed May 19 15:53:28 2021 +0800 + + * Fix bug #12725. + +commit e95769b7ccd62f91cb49b2e6026dacedf49cf2e1 +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 15:33:50 2021 +0800 + + * Fix bug #12663. + +commit 43e3088520bb7299d6f9132f5de002be143c0b81 +Merge: 46e344bf0f 6960058949 +Author: hufangzhou <746775970@qq.com> +Date: Wed May 19 15:29:21 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 46e344bf0f91cab2d35ec01403f3ee70753af1e1 +Author: hufangzhou <746775970@qq.com> +Date: Wed May 19 15:29:17 2021 +0800 + + * Remove the reviewedBy select control in story edit page. + +commit 69600589490a2953edcc2a3c5e76af863ca14b33 +Merge: 10a17aaf42 6295ac3cf8 +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 15:20:16 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 10a17aaf42c53b2278429082ab834b70f696f8b1 +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 15:19:57 2021 +0800 + + * Fix bug #12710. + +commit 6295ac3cf8d23bd4674eda8df5b8de12cc5cc906 +Merge: 02d891da70 11c8524069 +Author: hufangzhou <746775970@qq.com> +Date: Wed May 19 15:02:48 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 02d891da70ee0ce343a304329db151595ec6e08b +Author: hufangzhou <746775970@qq.com> +Date: Wed May 19 15:02:45 2021 +0800 + + * Change the story review rules halfway. + +commit 11c8524069809eb8f4947cacafd8a948f0361900 +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 14:38:33 2021 +0800 + + * Fix bug #12712. + +commit c0203da1a65a6c6d4e2c21d9b9a844672082c3de +Author: hufangzhou <746775970@qq.com> +Date: Wed May 19 13:40:06 2021 +0800 + + * Fix bug #12653. + +commit 6b15e590d2638f8f3dd73afbc9857e24c5d271cb +Merge: 7553693fc1 696abfd278 +Author: hufangzhou <746775970@qq.com> +Date: Wed May 19 13:34:23 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 7553693fc159b5ff4a8bd6fc43096dba7607b273 +Author: hufangzhou <746775970@qq.com> +Date: Wed May 19 13:34:20 2021 +0800 + + * Fix bug #12675. + +commit 696abfd2786b2a79a9091b21c53dafa0e64ae93c +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 13:29:32 2021 +0800 + + # Fix bug #12711. + +commit 7d27baa047bf58e8ec69f5a82c2d29a83b0a6ea8 +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 13:25:44 2021 +0800 + + * Fix bug #12670. + +commit 478b7dcbb7542bd8bfbfea138ab475139e8a912b +Merge: ec44482f9d 17581462f0 +Author: hufangzhou <746775970@qq.com> +Date: Wed May 19 12:43:06 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit ec44482f9d74058221bd6d5aca54929f3aefbf06 +Author: hufangzhou <746775970@qq.com> +Date: Wed May 19 12:43:02 2021 +0800 + + * Fix bug #12720. + +commit 17581462f036bc09fec6ea3b40d080f6f1e6d84a +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 11:32:32 2021 +0800 + + * Add view right of action. + +commit ceed7f755dca6c15df9cb5cd14bd8e1f8ff0050b +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 11:21:55 2021 +0800 + + * Fix bug #12654. + +commit 56f4c24cc70713bc2c9ef0a1697bd7f533d215c2 +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 11:12:10 2021 +0800 + + * Modifying Language Items. + +commit 729c3c4891cab65fd706c6d5cf28fb5a9111b889 +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 11:04:01 2021 +0800 + + * Fix bug #12714. + +commit 91c98ab401aa41c112cffeaf8109970bf33aeba2 +Merge: eb3546de5c ad07e28083 +Author: hufangzhou <746775970@qq.com> +Date: Wed May 19 10:48:13 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit eb3546de5c569a7eddf9e5771cb0f3cde917515a +Author: hufangzhou <746775970@qq.com> +Date: Wed May 19 10:48:08 2021 +0800 + + * Fix bug #12709. + +commit ad07e2808387573e89fcc4fef3943bd65b697369 +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 10:38:17 2021 +0800 + + * Fix bug #12660. + +commit 3a6fc3d638f0cd88a7fdee6915e0654aaff0466a +Merge: bacb8a5e1f 002f85e70b +Author: hufangzhou <746775970@qq.com> +Date: Wed May 19 10:19:52 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bacb8a5e1f97d6ef8201a4eb5afed9f29f66b9bf +Author: hufangzhou <746775970@qq.com> +Date: Wed May 19 10:19:46 2021 +0800 + + * Change the review button of story review. + +commit 002f85e70bc8c736209c39efed1cdffff05d7118 +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 10:04:08 2021 +0800 + + * Fix bug #12662. + +commit 8da9b93845efb5a7bfcd62683dbf0ab713b94cb7 +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 09:51:19 2021 +0800 + + * Fix bug #12654. + +commit e58771d42a57e605a2e4100dd1bd22e1e81d70d6 +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 09:38:23 2021 +0800 + + * Fix bug #12645. + +commit 9371c943620f6409e771a87fc2ae09d6b80678a5 +Author: holan20180123 <56391770@qq.com> +Date: Wed May 19 09:20:07 2021 +0800 + + * Fix bug #12643. + +commit e26f2e22a84615e9b460942605916d1756215b34 +Author: qiyu-xie +Date: Wed May 19 09:00:41 2021 +0800 + + * Fix bug#12639. + +commit ce41342447e45e1757c89d5ff8775fab6056d3b5 +Author: hufangzhou <746775970@qq.com> +Date: Mon May 17 09:21:01 2021 +0800 + + * Add the reviewBy type for requirement. + +commit 33a5e6d13e89d206a560ff4dd016d1a88b1ff61c +Author: Hao Sun +Date: Sun May 16 16:12:12 2021 +0800 + + * task #38159, story #25767, alert when leave page with unsaved form. + +commit d08413d20d1c6a06f469254b1166d976e8bd7847 +Author: Hao Sun +Date: Sun May 16 11:22:52 2021 +0800 + + * upgrade version of iconfont. + +commit f48a91f26408b6ad3fbe58e164e9bd8af0810e35 +Author: liugang +Date: Sat May 15 22:30:53 2021 +0800 + + * Fix bug that the variable type's value was changed to all. + +commit 516ea6c272c49cafb14a1db8bf6d50a67de089e5 +Author: holan20180123 <56391770@qq.com> +Date: Fri May 14 17:27:31 2021 +0800 + + * Fix bug #12678. + +commit 3503c5f983c008071d88af0a48e8006372efcf1e +Author: tianshujie98 +Date: Fri May 14 17:18:39 2021 +0800 + + * Add view right of action. + +commit 425207020964f20064aa088584fbfbde4f43e6dc +Merge: c86827e39c dfa92e6331 +Author: hufangzhou <746775970@qq.com> +Date: Fri May 14 17:11:54 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c86827e39c78e462e605ebe746bd65648b8120ec +Author: hufangzhou <746775970@qq.com> +Date: Fri May 14 17:10:45 2021 +0800 + + * Finish task#38171,#38168. + +commit dfa92e633161d09b5acfef1bbe9dfc21e959b6b8 +Author: holan20180123 <56391770@qq.com> +Date: Fri May 14 17:08:57 2021 +0800 + + * Fix bug #12670. + +commit ad592a98ec06a15c5d75bc8a4379318f8ca43eb3 +Merge: 05a2443236 1bf69e647f +Author: holan20180123 <56391770@qq.com> +Date: Fri May 14 17:06:01 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 1bf69e647fa15c552d30160b1957136c7357d3f7 +Author: Hao Sun +Date: Fri May 14 17:08:02 2021 +0800 + + * add icon-estimate. + +commit 05a24432364b0d354f3dd360424cff59bfb62671 +Author: holan20180123 <56391770@qq.com> +Date: Fri May 14 17:05:25 2021 +0800 + + * Fix bug #12676. + +commit 4fe31f612310830e0c94522456a61597d5e02bba +Author: holan20180123 <56391770@qq.com> +Date: Fri May 14 16:56:38 2021 +0800 + + * Fix bug #12678,#12677. + +commit f57fb51fb952944762a6bacdf02ec2bce6db5a68 +Author: holan20180123 <56391770@qq.com> +Date: Fri May 14 16:25:53 2021 +0800 + + * Fix bug #12664. + +commit b2c6bcb6fcb2adbc59ef6a4a246866b756292a71 +Merge: 8e3ed74c1c c44f474fef +Author: hufangzhou <746775970@qq.com> +Date: Fri May 14 15:25:47 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8e3ed74c1c14991dfc2ba111313b60af78275c5b +Author: hufangzhou <746775970@qq.com> +Date: Fri May 14 15:24:43 2021 +0800 + + * Adjust the code. + +commit c44f474fef45b7862bb800e38ff0d1fa4004a7c5 +Author: holan20180123 <56391770@qq.com> +Date: Fri May 14 15:12:17 2021 +0800 + + * Fix bug #12672. + +commit a5a6aecb056047369b15c35b90b519dc9ce35eb7 +Author: holan20180123 <56391770@qq.com> +Date: Fri May 14 14:43:32 2021 +0800 + + * Fix bug #12657,#12661. + +commit 2b421b7b356c10f2ca200f896731d841e47cf1da +Merge: daf14af385 2392386b86 +Author: holan20180123 <56391770@qq.com> +Date: Fri May 14 14:32:48 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit daf14af385c787ca1bfc06c2b8941491a61ea0f5 +Author: holan20180123 <56391770@qq.com> +Date: Fri May 14 14:32:26 2021 +0800 + + * Finish task #38180. + +commit 2392386b861cef37908bb0b30b06f0491f44287a +Author: hufangzhou <746775970@qq.com> +Date: Fri May 14 11:19:07 2021 +0800 + + * Adjust the code. + +commit 58f3baea8b64fb5173f4676bdc199a17e3f30e96 +Author: hufangzhou <746775970@qq.com> +Date: Fri May 14 09:15:04 2021 +0800 + + * Add the story review table. + +commit 948525dcd3bfe9e69a183562e0bd82dbcae3e21e +Author: hufangzhou <746775970@qq.com> +Date: Thu May 13 17:37:49 2021 +0800 + + * Fix bug #12630. + +commit 8c0c9f89b24e8ec6ddf563a599f630735f39a8fe +Author: hufangzhou <746775970@qq.com> +Date: Thu May 13 17:22:25 2021 +0800 + + * Adjust the reviewedBy control in create requirement page. + +commit c63eb8b3a85190cc0550d24316e2b03cbc770279 +Merge: 26fd1f24de 6d00f3253a +Author: hufangzhou <746775970@qq.com> +Date: Thu May 13 17:11:08 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 26fd1f24de08815d1049fd4e46206d47d1eb6a40 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 13 17:11:03 2021 +0800 + + * Adjust the code. + +commit 6d00f3253a79f21751f7cd2ae4ca18bc2abae136 +Author: holan20180123 <56391770@qq.com> +Date: Thu May 13 17:10:34 2021 +0800 + + * Fix bug #12626. + +commit cc1da460df22b68686bb7044850ad61dbe9ecae7 +Merge: a59880a890 54117a4ce8 +Author: holan20180123 <56391770@qq.com> +Date: Thu May 13 16:33:21 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit a59880a890e4f84b2620f285b7c2d2830ead19ec +Author: holan20180123 <56391770@qq.com> +Date: Thu May 13 16:32:54 2021 +0800 + + * Finish task #38161. + +commit 54117a4ce8ae0a6d9ea66c962082b895d9b9c8f9 +Merge: 0d0d85c9ff b983700fe9 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 13 16:07:12 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 0d0d85c9ff2e55aaaf4d11015330ddf89d67771c +Author: hufangzhou <746775970@qq.com> +Date: Thu May 13 16:07:09 2021 +0800 + + * Finish task #38171. + +commit b983700fe90ef7ccd55f341e2fb1827dc70ee444 +Author: qiyu-xie +Date: Thu May 13 16:05:46 2021 +0800 + + * Fix bug. + +commit c889215d8d42a4fb80f151e168924ea9724e7216 +Author: wangyidong +Date: Thu May 13 15:14:24 2021 +0800 + + * fix bug for gitlab. + +commit 087b4a3c625e6d9cf11a61009ef6e46b38a51324 +Author: qiyu-xie +Date: Thu May 13 15:13:47 2021 +0800 + + * Finish task#38172. + +commit 9858610cb93aad059ed83ad83d7f8443c6dc8a0a +Merge: 898ea4e956 c3f9c08c17 +Author: wangyidong +Date: Thu May 13 15:06:56 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c3f9c08c17a11db6ada2d50d315fda8c00580e5b +Merge: 6c4dbb83ee 39c2c6b267 +Author: holan20180123 <56391770@qq.com> +Date: Thu May 13 14:35:44 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 6c4dbb83ee74c3537903a27edeb2915a6b43729b +Author: holan20180123 <56391770@qq.com> +Date: Thu May 13 14:35:32 2021 +0800 + + * Rename version name. + +commit 39c2c6b267e3fbe09268c53876a5ed20af948ae6 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 13 14:34:14 2021 +0800 + + * Adjust the code. + +commit f36338d4e0b6a7c3fa27d8ea6a8d129c8641dbc2 +Author: holan20180123 <56391770@qq.com> +Date: Thu May 13 14:30:10 2021 +0800 + + * Fix error. + +commit 06694e49110675d6b9c27c9599eaab7aad49efcd +Author: qiyu-xie +Date: Thu May 13 13:53:23 2021 +0800 + + * Finish task#38174. + +commit 0a2a86ce85ee576e3683bed9da63b32ce6be69d7 +Author: holan20180123 <56391770@qq.com> +Date: Thu May 13 13:20:43 2021 +0800 + + * Fix error. + +commit ae9e280b647dfefd7a93cdeef784d9c56fae0071 +Author: holan20180123 <56391770@qq.com> +Date: Thu May 13 10:53:37 2021 +0800 + + * Finish task #38162. + +commit 29954b1ab79a3e7e8c8e1f795868eb198d0ac508 +Merge: d4e19aed32 b42ef1e5a5 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 13 10:23:29 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d4e19aed3203c7af137d36c2d4ba594e0dfe2b88 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 13 10:23:25 2021 +0800 + + * Finish task #38178. + +commit b42ef1e5a5601068da92e8fb75ab5abdcfce9f79 +Author: tianshujie98 +Date: Thu May 13 10:06:06 2021 +0800 + + * Finish task #38160. + +commit b12c613ed936c81167798a5e53f833f3e4c953b4 +Author: qiyu-xie +Date: Thu May 13 09:37:01 2021 +0800 + + * Adjust the code. + +commit 0a10378c6a2561e2dc4ece0e1f46f211f716399f +Author: hufangzhou <746775970@qq.com> +Date: Thu May 13 09:29:41 2021 +0800 + + * Add the related test report for create testtask. + +commit 898ea4e9564c26014714df25737df5d64e5fdf0f +Merge: f54f907c5b 51af4491d9 +Author: wangyidong +Date: Thu May 13 08:45:19 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f54f907c5bf6aea2a6ab9d5383a409ce394a5416 +Author: wangyidong +Date: Thu May 13 08:44:15 2021 +0800 + + * fix bug for gitlab. + +commit 9ad62afaefbbe897a2ea36bf135d1c88d75a6775 +Author: wangyidong +Date: Thu May 13 08:41:07 2021 +0800 + + * adjust for upgrade. + +commit 51af4491d9c58c760089b14a2f01eed0c6566c81 +Author: holan20180123 <56391770@qq.com> +Date: Wed May 12 17:33:59 2021 +0800 + + * Return id when create object by API. + +commit bfd4d6c32332b9d696d386c3ccc72840a7e7ff43 +Merge: 49e9302c31 c152100434 +Author: holan20180123 <56391770@qq.com> +Date: Wed May 12 17:00:53 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 49e9302c314f9ec2c8e5ebb7d635de151915b46a +Author: holan20180123 <56391770@qq.com> +Date: Wed May 12 17:00:26 2021 +0800 + + * Return id when create object by API. + +commit c15210043496ec6446d0d641fb7fc8a084c4e6ce +Merge: ac5f247d1e ac6f3f5201 +Author: hufangzhou <746775970@qq.com> +Date: Wed May 12 16:50:04 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit ac5f247d1e648373b4a7b2a4f0c3535cee9224ca +Author: hufangzhou <746775970@qq.com> +Date: Wed May 12 16:50:01 2021 +0800 + + * Adjust the code. + +commit ac6f3f52014b2cf3d417af14033db0a0df4c35dc +Author: holan20180123 <56391770@qq.com> +Date: Wed May 12 16:33:35 2021 +0800 + + * Return id when create object by API. + +commit df22b0a09f9cc1dd875a5f7389274cc2339e6d33 +Author: qiyu-xie +Date: Wed May 12 16:25:45 2021 +0800 + + * Add sql. + +commit fcb0176f3c8500b5c90bf6304fbbdfe00deb01d8 +Author: holan20180123 <56391770@qq.com> +Date: Wed May 12 16:08:50 2021 +0800 + + * Return id when create object by API. + +commit c5ac6e1bbee4598210c007daefda26490f6fa54b +Author: holan20180123 <56391770@qq.com> +Date: Wed May 12 16:03:12 2021 +0800 + + * Return id when create object by API. + +commit c5dd642138ae26298541dc379fa86f8ab96c8fec +Author: holan20180123 <56391770@qq.com> +Date: Wed May 12 15:44:04 2021 +0800 + + * Return id when create object by API. + +commit 53fc060547ab99b456fb7e4de2441f9aa256ad09 +Author: qiyu-xie +Date: Wed May 12 15:34:14 2021 +0800 + + * Finish task#38179. + +commit 9fd362073f7f4e6a10daef574aa0a67b0fd1ff70 +Author: holan20180123 <56391770@qq.com> +Date: Wed May 12 15:23:13 2021 +0800 + + * Return id when create object by api. + +commit 0d83fa5a31745b37f3b23183287fec4974b83147 +Merge: 9ded400f57 ab4260d5f1 +Author: hufangzhou <746775970@qq.com> +Date: Wed May 12 14:52:39 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 9ded400f5763a7d295614d8d907c094c4317f4c0 +Author: hufangzhou <746775970@qq.com> +Date: Wed May 12 14:52:34 2021 +0800 + + * Finish task #38170. + +commit ab4260d5f198f28315f217296b32ebb10491c556 +Author: qiyu-xie +Date: Wed May 12 14:50:19 2021 +0800 + + * Finish task#38177. + +commit 1f0ada77d3e2095d86b610f1f5561e9bbfa92a2d +Author: hufangzhou <746775970@qq.com> +Date: Wed May 12 14:08:08 2021 +0800 + + * Adjust the reviewedBy control width. + +commit 07d5f4477b04349bced1cffc3ab4b707ae937974 +Author: hufangzhou <746775970@qq.com> +Date: Wed May 12 13:57:13 2021 +0800 + + * Finish task #38169. + +commit 1e3fb7f061f1366228b3eb1ee67ea0b99a751b24 +Author: hufangzhou <746775970@qq.com> +Date: Wed May 12 13:39:56 2021 +0800 + + * Finish task #38173. + +commit d3285b3d8e145826602edecae2f8ecbea5029fdb +Author: hufangzhou <746775970@qq.com> +Date: Wed May 12 13:19:17 2021 +0800 + + * Finish task #38164. + +commit f986caf09818a1b6f7a760219447c3d2bcabe6ea +Author: tianshujie98 +Date: Wed May 12 11:45:23 2021 +0800 + + * Finish task #38165. + +commit 7ff5ccae1273419c99230a8c6ec68973656cddae +Author: qiyu-xie +Date: Tue May 11 13:59:23 2021 +0800 + + * Fix bug. + +commit 12eeaa107aaa8463df39056d8163f0dd6baf0322 +Author: tianshujie98 +Date: Tue May 11 13:36:17 2021 +0800 + + * Fix bug #12585. + +commit 504f44715b1f8a1634059227b5443c12121f268e +Author: qiyu-xie +Date: Tue May 11 13:02:53 2021 +0800 + + * Modify the button to edit project. + +commit 25af1d95169fc614c63d094e86a18a9b710ccfb2 +Author: wangyidong +Date: Tue May 11 10:49:49 2021 +0800 + + * adjust for upgrade. + +commit 5174ede18ef59c4bd35ff21749da608b2cce046f +Author: holan20180123 <56391770@qq.com> +Date: Tue May 11 10:43:56 2021 +0800 + + * Fix bug #10841. + +commit b712c10fbdd8134a8206cc6955c71eb9c11fe21d +Merge: cb2fb0ccdc 6bff4cc5e7 +Author: wangyidong +Date: Mon May 10 16:04:14 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit cb2fb0ccdc66f9787231bc8013066194d2a7dbaa +Author: wangyidong +Date: Mon May 10 16:03:50 2021 +0800 + + * set default value for systemMode. + +commit 6bff4cc5e79fd1960a1b52aceb3d63c6664c7d6d +Author: qiyu-xie +Date: Mon May 10 15:56:02 2021 +0800 + + * Fix bug#12524. + +commit 3ddf64e750e0306ad1a488c344b2c0cd9e782cff +Author: tianshujie98 +Date: Mon May 10 15:02:31 2021 +0800 + + * Fix bug #12570. + +commit 184c5eb3a09ad1003f30fa035047c30af5dbbac7 +Merge: 0f93148727 183cea7e84 +Author: tianshujie98 +Date: Mon May 10 14:56:01 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 0f931487278542ac1fc6172de2a626e8fdee6448 +Author: tianshujie98 +Date: Mon May 10 14:55:31 2021 +0800 + + * Fix bug #12568. + +commit 183cea7e84da10b0e4e46acbe84893f492cff808 +Author: qiyu-xie +Date: Mon May 10 14:48:47 2021 +0800 + + * Fix bug#12516. + +commit bfe532113f6bd1eb8bd76c81498bfaa18a869581 +Merge: 3ed2493a59 d66c726032 +Author: wangyidong +Date: Mon May 10 14:38:21 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 3ed2493a59243be0af5ed7d2f7e4e8b91150ce83 +Author: wangyidong +Date: Mon May 10 14:38:01 2021 +0800 + + * adjust for php5.3 + +commit d66c7260328aa75cce67eaa9c0c8bd02f794d5f3 +Author: qiyu-xie +Date: Mon May 10 13:59:08 2021 +0800 + + * Fix bug#12497. + +commit 4ef83185fe381abe426efc96f7969d66e1f54713 +Author: qiyu-xie +Date: Thu May 6 17:27:31 2021 +0800 + + * Fix bug#12525. + +commit a81bdc4c73bd7613286d555f5101520b023d6e7c +Merge: 5c0c62f669 875ed7fb9b +Author: hufangzhou <746775970@qq.com> +Date: Mon May 10 13:28:19 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 5c0c62f669f6ff4b17e1568199eebdc0832be123 +Author: hufangzhou <746775970@qq.com> +Date: Mon May 10 13:28:14 2021 +0800 + + * Fix bug #12500. + +commit e26e1a5a15f84feb999ee4dd84fc509968359a80 +Author: tianshujie98 +Date: Mon May 10 13:07:58 2021 +0800 + + * Reduction. + +commit 875ed7fb9b807b74ad3491de3dd633fcd9d8f232 +Author: tianshujie98 +Date: Mon May 10 11:29:48 2021 +0800 + + * Fix an error. + +commit 1f24c935c22409697f5ff6b80666b4e2f150658d +Merge: 8e003ff449 c24a099448 +Author: wangyidong +Date: Mon May 10 11:15:51 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8e003ff4491edf5c32a2cfad27fc9235d40822b6 +Author: wangyidong +Date: Mon May 10 11:15:31 2021 +0800 + + * fix error. + +commit c24a099448794557a28442f7247e001e8b8ee79b +Author: tianshujie98 +Date: Mon May 10 09:58:53 2021 +0800 + + * Fix bug #12530. + +commit 3d73a666e1ffa8a63f3f8a813798ab1f78ebec62 +Author: tianshujie98 +Date: Mon May 10 09:41:23 2021 +0800 + + * Fix bug #12557. + +commit 97deea5233344c7c6fc0821df1212c9c9d9c7cc6 +Author: tianshujie98 +Date: Mon May 10 09:26:21 2021 +0800 + + * Fix bug #12546. + +commit 93d80f1321f7e1c5bc8f9135027e8f1393fceca4 +Author: hufangzhou <746775970@qq.com> +Date: Fri May 7 16:11:14 2021 +0800 + + * Adjust the code. + +commit c3ba33332357868a8d10575b306b2a5279c66c10 +Merge: 12c783069d aed1a2f6a5 +Author: hufangzhou <746775970@qq.com> +Date: Fri May 7 13:22:26 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 12c783069d07d17ddb45eb63c81f90e5cf94d30c +Author: hufangzhou <746775970@qq.com> +Date: Fri May 7 13:22:21 2021 +0800 + + * Fix bug #12482. + +commit aed1a2f6a5b042eca91b73c1cba52b80768aa200 +Author: tianshujie98 +Date: Fri May 7 10:38:02 2021 +0800 + + * Fix the dynamic problem of make-up class. + +commit b8cea83e10fc241d2995d2984492466c6c90a77d +Merge: da7ac30dbd 910521d3d0 +Author: tianshujie98 +Date: Fri May 7 09:27:53 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit da7ac30dbdde1428c1e330ad16e0c67b29bc3066 +Author: tianshujie98 +Date: Fri May 7 09:27:26 2021 +0800 + + * Modifying Language Items. + +commit 910521d3d0da7eada2a3279019816d40c334ed7c +Merge: 56cb93207b 4520e903fb +Author: wangyidong +Date: Fri May 7 09:20:19 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 56cb93207b3c077eaab239630b68939623ceee29 (tag: zentaopms_15.0.stable_20210430) +Author: wangyidong +Date: Fri May 7 09:19:34 2021 +0800 + + * adjust for demo sql. + +commit 4520e903fb3f4a58a6dab69ad00b4c29cce55fe4 +Author: holan20180123 <56391770@qq.com> +Date: Thu May 6 16:29:16 2021 +0800 + + * Fix bug #2852. + +commit 78f08ca7009f788d1193b7896d97053d79f3aeb5 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 6 16:03:37 2021 +0800 + + * Adjust the code. + +commit b864f06de7922be372a481ed44173b5e97ea2b41 +Merge: 36d42a882d 9bd7e77547 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 6 15:52:21 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 36d42a882d0389879bc6495e44e42b9c2280426d +Author: hufangzhou <746775970@qq.com> +Date: Thu May 6 15:52:16 2021 +0800 + + * Fix bug #12491. + +commit 9bd7e77547303153b0f3bf4d5bf9989cc830055a +Merge: 931b4e51bd 8a1ab47e0a +Author: tianshujie98 +Date: Thu May 6 15:51:14 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 931b4e51bd9220e7ea7f32944a66f98d41046761 +Author: tianshujie98 +Date: Thu May 6 15:50:50 2021 +0800 + + * Fix bug #12520. + +commit 8a1ab47e0abe111c2839d899ce73b577ad5ba05d +Author: qiyu-xie +Date: Thu May 6 15:50:26 2021 +0800 + + * Finish task#37930. + +commit 791a25c554d7166f1036323db86a73c851f60f80 +Author: holan20180123 <56391770@qq.com> +Date: Thu May 6 15:45:09 2021 +0800 + + * Finish task #37931. + +commit 5384ba4acffe47e64598d27c42dface6ba483af0 +Merge: e9fe38f8d4 ecc74b68a3 +Author: wangyidong +Date: Thu May 6 15:35:47 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit e9fe38f8d4ecc3007c4314e5c57f8120aa7cded2 +Author: wangyidong +Date: Thu May 6 15:35:32 2021 +0800 + + * fix error. + +commit ecc74b68a3cc0b2f4341bd20a89037f53fa51ecc +Author: holan20180123 <56391770@qq.com> +Date: Thu May 6 15:24:27 2021 +0800 + + * Finish task #37931. + +commit 09e79ede456f7fe3141da0d4370f9828b72cc02e +Author: hufangzhou <746775970@qq.com> +Date: Thu May 6 14:30:44 2021 +0800 + + * Fix bug #12486. + +commit 8a82c893a48e16baafb1eee65ff3f132d8c9ea31 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 6 14:22:59 2021 +0800 + + * Fix bug #12498. + +commit e03fa8da3f36b2e71e6034eaef7e38c17bb1dfa6 +Author: hufangzhou <746775970@qq.com> +Date: Thu May 6 13:26:44 2021 +0800 + + * Finish task #37922. + +commit d95cbe7dcbd98d1aedf412119ad9db43aea57c0a +Author: wangyidong +Date: Thu May 6 13:02:01 2021 +0800 + + * adjust for upgrade. + +commit 5119c6ea28b404e3ea3f05b2f399c4483428420a +Merge: 19a098481e 01b2b463db +Author: wangyidong +Date: Thu May 6 11:35:05 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 19a098481efceb70badba8069b17ba8da8130254 +Author: wangyidong +Date: Thu May 6 11:34:33 2021 +0800 + + * adjust demo sql and fix ls gitlib. + +commit 01b2b463db4cde5164ba41a032d67baf3952f6b9 +Author: holan20180123 <56391770@qq.com> +Date: Thu May 6 10:26:17 2021 +0800 + + * Finish task #37931. + +commit 55560f0f056446de0757d712d745fbfae6765dcf +Author: tianshujie98 +Date: Thu May 6 10:01:45 2021 +0800 + + * Finish task #37924. + +commit 36bbe8f06f325ea8204e42b8c2cce05575476a8f +Merge: 9eb8dd147d 5f8cecdfa9 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 30 16:03:03 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 9eb8dd147d5656b8ae1d540fd161bba23f7e7a7c +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 30 16:02:59 2021 +0800 + + * Fix a bug. + +commit 5f8cecdfa9fa55956053e7de028ddbf25735867c +Author: wangyidong +Date: Fri Apr 30 16:01:28 2021 +0800 + + * fix bug. + +commit 3785a393255d2c45f56d5a14f720331d1bdc0e94 +Author: wangyidong +Date: Fri Apr 30 14:14:43 2021 +0800 + + * adjust for zh-tw lang. + +commit c5fe3484909f7a044c739eba28307e0f6512f330 +Author: wangyidong +Date: Fri Apr 30 13:55:45 2021 +0800 + + * adjust for upgrade. + +commit 3f75e066e328c396dd06a93c4b2be604d6e63df2 +Author: wangyidong +Date: Fri Apr 30 13:17:43 2021 +0800 + + * fix bug. + +commit 5b0230c7ceb58f00384b10129d5ca41197ff53aa +Author: wangyidong +Date: Fri Apr 30 11:44:26 2021 +0800 + + * adjust for demo sql. + +commit 970e666d4cc2a93021fa7400460079e0415f4317 +Merge: 8fbb5c1c89 443f322340 +Author: wangyidong +Date: Fri Apr 30 11:23:58 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8fbb5c1c89201b74ed6a5197c1a3c820322104fd +Author: wangyidong +Date: Fri Apr 30 11:23:46 2021 +0800 + + * adjust for upgrade. + +commit 443f322340e71626d6ba02c416784a9eb5c8d466 +Author: tianshujie98 +Date: Fri Apr 30 10:35:11 2021 +0800 + + * Fix the navigation highlighting problem of the testtask. + +commit 28af0816de8d617b667801f94a31d7e1c9574a31 +Author: tianshujie98 +Date: Fri Apr 30 10:13:43 2021 +0800 + + * Fix the navigation highlighting problem of the testtask. + +commit fd2cea594afdba2994c4f5b607af4ccedc9ca2cc +Author: wangyidong +Date: Fri Apr 30 09:26:50 2021 +0800 + + * adjust for create doc. + +commit 107dd03c42d3c643073a14941b8093d883faad94 +Author: wangyidong +Date: Fri Apr 30 08:50:22 2021 +0800 + + * adjust for xuanxuan. + +commit 3d6e0158aff77c22544c32a990a098b61fa391f8 +Author: wangyidong +Date: Thu Apr 29 17:16:39 2021 +0800 + + * adjust for demo sql. + +commit c4184ed4bcc1bbd51d5486f8378403b9ef4f5997 +Merge: bc64f29551 63a63135c6 +Author: wangyidong +Date: Thu Apr 29 16:10:14 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bc64f295510505ee43f75deceef16fc6c4c2b6dd +Author: wangyidong +Date: Thu Apr 29 16:09:51 2021 +0800 + + * fix for xuanxuan. + +commit b8d1cc17d842ab1a4a11150089d0b7328c3ddd0a +Author: wangyidong +Date: Thu Apr 29 14:18:58 2021 +0800 + + * adjust for demo. + +commit 63a63135c6e7b87c304d4f89a060caa6313a01d2 +Author: tianshujie98 +Date: Thu Apr 29 14:13:38 2021 +0800 + + * Fix bug #12368. + +commit b6da28f99ca533125d598c6d8da5092b5cb8b63e +Author: tianshujie98 +Date: Thu Apr 29 13:38:07 2021 +0800 + + * Fix bug #12456. + +commit d80bc64add31601ab1ce069ba1d72c857a5ab65f +Author: wangyidong +Date: Thu Apr 29 13:33:27 2021 +0800 + + * adjust for upgrade. + +commit f8f39f8f95bf3dfb54f23a2797e82c115c6338b9 +Author: wangyidong +Date: Thu Apr 29 13:05:34 2021 +0800 + + * change for upgrade. + +commit 76c1de90afd5ce5dc8cee4555cb381599dfb5f5c +Merge: 57e1291823 58028b469b +Author: wangyidong +Date: Thu Apr 29 12:11:05 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 57e12918236644e88b03f582b8e872eb6841e06a +Author: wangyidong +Date: Thu Apr 29 12:10:34 2021 +0800 + + * fix bug #12452. + +commit 58028b469b9de40788d695211a2c8f8b73618ccd +Author: tianshujie98 +Date: Thu Apr 29 11:43:19 2021 +0800 + + * Fix bug #12455. + +commit 180405a9d1137fbcb2cd4db95f23edbf4e9ec38b +Merge: fb21c70896 9fa83d4269 +Author: wangyidong +Date: Thu Apr 29 11:31:28 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit fb21c7089693885999a4db96d2b03019114c45b8 +Author: wangyidong +Date: Thu Apr 29 11:31:12 2021 +0800 + + * adjust for xuanxuan upgrade. + +commit 9fa83d42693dea5a307dc4066e0d3b2da4896674 +Merge: 485e2c4d46 290fccfef0 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 29 11:30:23 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 485e2c4d463610ac38123680776edb4c20b6fdec +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 29 11:30:19 2021 +0800 + + * Fix bug #12451. + +commit 290fccfef0549ff432db8da9fe2e75a1a6a4001f +Author: tianshujie98 +Date: Thu Apr 29 11:04:22 2021 +0800 + + * Fix bug #12453. + +commit 64501298c8f71d69a7d078eefd159ebeefd69850 +Merge: 4bb52f334f 44385524fa +Author: wangyidong +Date: Thu Apr 29 10:56:13 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 4bb52f334fa9cfc43586a332ebf24b665145c965 +Author: wangyidong +Date: Thu Apr 29 10:55:42 2021 +0800 + + * code for xuanxuan. + +commit 44385524fa470bd8d9d0e7920cace6023baa4743 +Author: tianshujie98 +Date: Thu Apr 29 10:50:26 2021 +0800 + + * Fix bug #12452. + +commit f82c488dff63110b5972b44b93d738b4deda5394 +Merge: 19395757fe cf1ca1ad6d +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 29 10:27:52 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 19395757fee9316f4b59b53a6b6bbd5a3f7b5229 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 29 10:27:47 2021 +0800 + + * Fix bug #12451. + +commit cf1ca1ad6d4b3b5b0f9f126c14923c1de11dd10c +Author: tianshujie98 +Date: Thu Apr 29 10:23:39 2021 +0800 + + * Fix bug #12246. + +commit 95ff14e30f98c3ea0e5c4afe4ad7de1ed25dd1a1 +Author: tianshujie98 +Date: Thu Apr 29 09:55:03 2021 +0800 + + * Fix bug #12450. + +commit bfc78b6f437f3c2a1daa4ff8f4a02eb505d915b2 +Author: tianshujie98 +Date: Thu Apr 29 09:39:40 2021 +0800 + + * Fix bug #12445. + +commit aacdace38379a05bcb0723ba2318819c4ecffc52 +Author: tianshujie98 +Date: Thu Apr 29 09:02:26 2021 +0800 + + * Fix bug #12446. + +commit d285dd2aea09b4508adbd396702772d21b8020ca +Author: tianshujie98 +Date: Thu Apr 29 09:00:40 2021 +0800 + + * Fix bug #12444. + +commit b0ee3e7adab2864f2e1361afdd8dc29e161e8d78 +Author: tianshujie98 +Date: Thu Apr 29 08:26:38 2021 +0800 + + * Adjust code. + +commit 6530f01c2ffa632445d77ab1fef8f77164baf137 +Author: tianshujie98 +Date: Wed Apr 28 17:26:40 2021 +0800 + + * Fix bug #12415. + +commit c4409fce08e5a11335f935597f41f2d9b1b4661b +Author: Yagami <976204163@qq.com> +Date: Wed Apr 28 17:22:23 2021 +0800 + + * Fix upgrade logic. + +commit 2f0c62524cb97e3807d8b5a9d0c7341028a63f7b +Merge: faf4c2b4dd 5beeb1c894 +Author: wangyidong +Date: Wed Apr 28 16:28:28 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit faf4c2b4ddda0a56352d1326420973e0ea96c746 +Author: wangyidong +Date: Wed Apr 28 16:27:34 2021 +0800 + + * fix bug and xuanxuan. + +commit 5beeb1c894ac187655d1f119d9c4215106877612 +Merge: d6ff645901 29e9ed0f51 +Author: tianshujie98 +Date: Wed Apr 28 16:01:23 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d6ff645901023047da3da5bc054d62b8a84b3284 +Author: tianshujie98 +Date: Wed Apr 28 16:01:01 2021 +0800 + + * Fix bug #12440. + +commit 29e9ed0f511597271ca39a59c5b819333b62a95c +Merge: 1ba92805c1 e70e2a7a22 +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 28 15:59:32 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 1ba92805c16c0b0e9f0b8810e5dd136147136659 +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 28 15:59:29 2021 +0800 + + * Fix bug #12439. + +commit e70e2a7a2200f35a9d4f53349f82ccfcea82862c +Merge: 77ac56be5b b9c059ce40 +Author: tianshujie98 +Date: Wed Apr 28 15:52:44 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b9c059ce40040ff62ecd954ba57418c3bb4f38af +Merge: 616341779a 9edbd23c41 +Author: Guanxiying +Date: Wed Apr 28 15:52:29 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 77ac56be5be787c90a8e324dd5da5c85a0882f8f +Author: tianshujie98 +Date: Wed Apr 28 15:52:21 2021 +0800 + + * Fix bug #12437. + +commit 616341779a9d46025d8ba936ff6868484222191e +Author: Guanxiying +Date: Wed Apr 28 15:52:14 2021 +0800 + + * Fix get projects error. + +commit 9edbd23c419d3ff5feb46369864d3b517d75ec3e +Author: tianshujie98 +Date: Wed Apr 28 15:19:26 2021 +0800 + + * Fix bug #12440. + +commit 53b42e6eb29490f51dcbe34d3280bf34bca4a39c +Merge: bc71469cd1 08da42d6f4 +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 28 15:07:17 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bc71469cd1020e00beed317a23f3a750dbda8732 +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 28 15:07:12 2021 +0800 + + * Adjust the product getSwitcher link under the testtask module. + +commit 08da42d6f44b02daa86dc947c177cb2b8c259a1b +Merge: 2ec29e2c70 bbf9941348 +Author: tianshujie98 +Date: Wed Apr 28 14:54:46 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2ec29e2c70a656d1d4efc1ec7328b44b207c421f +Author: tianshujie98 +Date: Wed Apr 28 14:54:22 2021 +0800 + + * Fix bug #12031. + +commit bbf9941348ded84a609634b36b3b9ea5a2fb3df5 +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 28 14:29:53 2021 +0800 + + * Adjust the code. + +commit a937d44c8b2f8c48d15062d23b3d19906d0f02ea +Merge: 88e140be8f 375b47bf83 +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 28 14:27:46 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 88e140be8fad845789981f813ba5ac5dd7bfea05 +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 28 14:27:41 2021 +0800 + + * Update the user view when create project. + +commit 75ddc26f8242ba131ea1d062a078768304c5c7bd +Author: wangyidong +Date: Wed Apr 28 13:44:22 2021 +0800 + + * adjust for demo sql. + +commit 375b47bf8300542dd7586ce0bea40c2698032b81 +Author: zhujinyong +Date: Wed Apr 28 13:12:56 2021 +0800 + + * wrap get file size. + +commit 2e03100a96f5a6f9499d82044a847dff6875a474 +Author: Yagami <976204163@qq.com> +Date: Wed Apr 28 13:12:21 2021 +0800 + + * Fix bug. + +commit 67a4154017f518a449e97023a1852b1212bf652f +Merge: 962685950e b9dc226197 +Author: Guanxiying +Date: Wed Apr 28 11:41:46 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 962685950e4ccd356c5efdfdd362301fcc431bc5 +Author: Guanxiying +Date: Wed Apr 28 11:41:02 2021 +0800 + + * Add field param to comments of getById function. + +commit 3ec725bfa688b4c8be2a61f5007422781d5f88f2 +Author: Guanxiying +Date: Wed Apr 28 11:39:46 2021 +0800 + + * Fix spelling mistakes. + +commit b9dc22619774002742449f071b1d22d8df2f89fa +Merge: c201e15bb4 1eeeef6cf6 +Author: wangyidong +Date: Wed Apr 28 11:10:11 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c201e15bb4822211f253752206ebab2abd66ac73 +Author: wangyidong +Date: Wed Apr 28 11:09:03 2021 +0800 + + * fix bug. + +commit 1eeeef6cf6c51e418bb5c17d4be219e1f34cbae8 +Merge: 09acfbbc53 3cf8005a7d +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 28 11:00:32 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 09acfbbc531dc7a10f661944033155d29d8e9757 +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 28 11:00:28 2021 +0800 + + * Modify the project doc lib acl when the project acl is program. + +commit 3cf8005a7d5e57fe679d1441d269fcbd24ae018a +Merge: 3b8dd3db34 a43d99ff02 +Author: wangyidong +Date: Wed Apr 28 10:54:24 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 3b8dd3db340ccc4a56d028a4f7b0e1a8f1f7f0c3 +Author: wangyidong +Date: Wed Apr 28 10:53:52 2021 +0800 + + * fix bug #12050. + +commit a43d99ff027e2ab808576ba3284e94a2cee241f7 +Merge: 96d2f5a07d 92da7aa0dd +Author: Guanxiying +Date: Wed Apr 28 09:57:13 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 96d2f5a07d48491a92d3ee80452bec9df1ba9086 +Author: Guanxiying +Date: Wed Apr 28 09:56:44 2021 +0800 + + * Fix comments of public funtions. + +commit 92da7aa0dd250992643f6cd225c66eda17c552f1 +Author: tianshujie98 +Date: Wed Apr 28 09:46:55 2021 +0800 + + * Fix the issue of the module that created the bug. + +commit f29b1e949a40a478924c59a28534b4a2bee1653b +Author: qiyu-xie +Date: Wed Apr 28 09:36:19 2021 +0800 + + * Fix bug#11391. + +commit a2f78623dedb0d72aaa91d61ab0a60b135136e25 +Merge: 33bc4ee8b3 9cd7618fbc +Author: wangyidong +Date: Wed Apr 28 09:19:10 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 33bc4ee8b33ddd1bb0bd85136a9b7236ca81c7ee +Author: wangyidong +Date: Wed Apr 28 09:18:59 2021 +0800 + + * adjust for load lang. + +commit 1e744baa53ca87442c966187ae625fb8aef8c892 +Author: wangyidong +Date: Wed Apr 28 09:17:53 2021 +0800 + + * adjust for bug #11171. + +commit 9cd7618fbc923606fe730700a7b7153214ce189d +Author: tianshujie98 +Date: Wed Apr 28 08:29:25 2021 +0800 + + * Remove useless code. + +commit 3264f6146fb937c36d810897427aef14d2723d76 +Author: Guanxiying +Date: Tue Apr 27 19:17:15 2021 +0800 + + * Fix comments of getById function. + +commit 4f963166b8a57cf30446d7b327723c5ba2d66651 +Merge: 7c07fb49ba 12b33378f2 +Author: Guanxiying +Date: Tue Apr 27 19:15:16 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 7c07fb49ba6487e3063dff5855a1a368d8491b18 +Author: Guanxiying +Date: Tue Apr 27 19:14:54 2021 +0800 + + * Add zendata path. + +commit 56639160c44f78d76d5d7eadd721f445ea810687 +Author: Guanxiying +Date: Tue Apr 27 19:12:54 2021 +0800 + + * Add getbyid file. + +commit f154f10c9e8fedaf1d3000ee7492f77249d1e55a +Author: Guanxiying +Date: Tue Apr 27 19:05:12 2021 +0800 + + * Add chdir and fix run and expect funtion. + +commit 12b33378f28a4d68da2289cad2d86877b6e73177 +Author: tianshujie98 +Date: Tue Apr 27 17:21:28 2021 +0800 + + * Fix bug #12386. + +commit 43d74042f0648913fbd8d9fd791d4e5a11b24375 +Merge: 1c1b100a69 d3922df5a9 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 27 16:57:35 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 1c1b100a698c159044804b88f1424b4599e8234d +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 27 16:57:31 2021 +0800 + + * Adjust the project doclib acl when merge data. + +commit d3922df5a938e95bc99921ab3d233aa99aa6e242 +Author: zhujinyong +Date: Tue Apr 27 16:56:44 2021 +0800 + + * Recovery file upload. + +commit df4a023a7dba48dd76e2febeaf752e08943002e5 +Author: tianshujie98 +Date: Tue Apr 27 16:55:07 2021 +0800 + + * Fix bug #12426. + +commit acd04944e709555676a3322bf3574353ca3360c7 +Merge: 7e89f43e86 7ed10733b3 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 27 16:17:56 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 7e89f43e86ee627e7db648d322487161c50e243a +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 27 16:17:49 2021 +0800 + + * Fix bug #12226. + +commit 7ed10733b38e135dabf9dd01ed268950bd1783f4 +Author: tianshujie98 +Date: Tue Apr 27 15:06:52 2021 +0800 + + * Fix bug #11210. + +commit 402e1cb49244dd7abb068c0d7b69eef07c3e28e3 +Author: qiyu-xie +Date: Tue Apr 27 15:04:11 2021 +0800 + + * Fix bug#12397. + +commit 7874535fd5930541ac63042f6551c2217ab1e80a +Author: qiyu-xie +Date: Tue Apr 27 14:34:53 2021 +0800 + + * Fix bug#12380. + +commit 4cec21a516ac096d4f10a231dd867e48a6e55639 +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 27 14:28:21 2021 +0800 + + * Fix bug #12333. + +commit 68ac2499142e49009390cffdd671cf7762c1848e +Author: qiyu-xie +Date: Tue Apr 27 14:24:04 2021 +0800 + + * Fix bug#12373. + +commit 35b297388fba29422ac00f23648aba7b01b8d8ee +Merge: 7f3145888c 5b2dd0cfec +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 27 14:13:45 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 7f3145888cdc0f2d004a247c763074001f084b50 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 27 14:13:40 2021 +0800 + + * Fix bug #12420. + +commit 5b2dd0cfecc6fab23a211edd9015709f0e0eae6b +Author: tianshujie98 +Date: Tue Apr 27 13:16:13 2021 +0800 + + * Fix bug #12404. + +commit f83a4e4b41afb6dea01ffd99ab3ce590b75ade05 +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 27 11:37:39 2021 +0800 + + * Fix bug #12368. + +commit 83762f4350718b057fb24edf35e1ee70444bccfb +Merge: 6c14bd8916 9d88236bfd +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 27 11:35:38 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 6c14bd891664bf7ca85ae9b3f03ba9ae4680b59c +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 27 11:35:33 2021 +0800 + + * Fix bug #12181. + +commit 9d88236bfd812672b1a9bc04d979ff5975b61178 +Author: tianshujie98 +Date: Tue Apr 27 11:13:05 2021 +0800 + + * Fix bug #12400. + +commit c8f2782c0e2354521041a89ba5c3939e03c256b9 +Merge: 29115a9882 cd8799bd03 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 27 11:12:36 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 29115a9882cbfb404e44356e79cf3d006d734c42 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 27 11:12:33 2021 +0800 + + * Fix bug #12413. + +commit cd8799bd033c34ee1256dcf4381dd86e80e0c435 +Merge: 7535cfe35f 65f9d1cb1c +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 27 10:55:07 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 7535cfe35f3f1958ca7954e2b25a7730bf8af14a +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 27 10:54:34 2021 +0800 + + * Fix bug #12406. + +commit 65f9d1cb1cafea56dbcac1649387533ce095d735 +Author: tianshujie98 +Date: Tue Apr 27 10:39:35 2021 +0800 + + * Fix bug #12402. + +commit b97ab834bf39f1a2cf3f27785a29cd6ec3b6f5d6 +Author: tianshujie98 +Date: Tue Apr 27 10:23:49 2021 +0800 + + * Fix bug #12411. + +commit 532f08788483d713a14c2c3b59a389a748b03fae +Author: Catouse +Date: Mon Apr 26 17:53:42 2021 +0800 + + * improve UI of more apps menu. + +commit 2148ba9b7d833b2ce21478072cff83c774a474d0 +Merge: 23800eace1 a20f580a5d +Author: wangyidong +Date: Mon Apr 26 17:32:31 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 23800eace12f67310bbcc24af99a80cda2d27f61 +Author: wangyidong +Date: Mon Apr 26 17:32:10 2021 +0800 + + * adjust for gitlab. + +commit a20f580a5db0366e5971421494e96e4f8ec6f43e +Author: tianshujie98 +Date: Mon Apr 26 17:29:18 2021 +0800 + + * Fix bug #12402. + +commit 6141efa38c36cd3d0741d3c97979856aa79ef989 +Author: tianshujie98 +Date: Mon Apr 26 17:12:04 2021 +0800 + + * Fix bug #12405. + +commit 7e1c2d20a010ee0edab1a767d6de56d27b25b676 +Merge: f2fb924b0c 2113fc91cc +Author: tianshujie98 +Date: Mon Apr 26 16:58:39 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f2fb924b0cb8cadafe912e25a74c8ebde7e65bed +Author: tianshujie98 +Date: Mon Apr 26 16:58:29 2021 +0800 + + * Fix bug #12189. + +commit 2113fc91cc153b1641d0db299a296d8d1cc21d0f +Merge: 72fdd4a52b 2d921f8262 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 16:41:21 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 72fdd4a52bfb46a2cb2c8d5a81d864f677cba6f0 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 16:41:17 2021 +0800 + + * Fix bug #12366. + +commit 2d921f8262324ef82b16f9df5cfa2ec8957768ff +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 26 16:38:29 2021 +0800 + + * Fix bug #12362. + +commit dde9bc9d5340e4ff87a3941284ac9d4f84b13b94 +Author: qiyu-xie +Date: Mon Apr 26 16:25:35 2021 +0800 + + * Fix bug#12367. + +commit 664cae45b0a480f76723884bf65a8aea52d58d76 +Merge: c783202435 09f16fe1b4 +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 26 16:11:09 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c783202435571e1fb51ec72e47a08e765f0656ef +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 26 16:10:58 2021 +0800 + + * Fix bug #12399. + +commit 09f16fe1b44e7ed8375fdb02b819c71d45ddf696 +Author: qiyu-xie +Date: Mon Apr 26 15:25:42 2021 +0800 + + * Fix bug#12376. + +commit c7a282cdd367ca7434d0cb9b6c264eeb3614f5d4 +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 26 15:24:29 2021 +0800 + + * Fix bug #12401. + +commit fd03cbbb805c047b4d246e55de4d92221dd27660 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 15:03:51 2021 +0800 + + * Link the plan stories when edit the project. + +commit 8dce53e8520d978e1cecaebf172809f8796be86a +Author: tianshujie98 +Date: Mon Apr 26 14:52:16 2021 +0800 + + * Fix bug #12332. + +commit f00d94cf42f2ca62f2bf4592d3f2291bfa265cc6 +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 26 14:48:23 2021 +0800 + + * Fix bug #12325. + +commit ce762a919aab19e4734465f364d78276470ae5c4 +Author: tianshujie98 +Date: Mon Apr 26 14:17:54 2021 +0800 + + * Fix bug #12394. + +commit 9b1438d40c90b908ebace5b44f51bf7a317c5121 +Author: tianshujie98 +Date: Mon Apr 26 14:03:58 2021 +0800 + + * Fix bug #12392. + +commit 0046b58c1d7711a780c797757cde8f24acdba507 +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 26 13:55:56 2021 +0800 + + * Fix bug #12327. + +commit ab994d6f92ef27ace68b159695f9a834bfddd1fe +Author: qiyu-xie +Date: Mon Apr 26 13:50:07 2021 +0800 + + * Fix bug#12372. + +commit 35e91b8c3b42f5cd620c84f28a1d8073128b13ed +Author: Yagami <976204163@qq.com> +Date: Mon Apr 26 13:36:51 2021 +0800 + + * Fix bug #12338. + +commit ec75ca1c5c87e25e559ea0138711f423dd279be5 +Merge: c8b405be88 34e8b36ef6 +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 26 13:34:08 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 34e8b36ef6785c5d0644299bbf2d1334999934bb +Merge: 2ae329dae4 4c749117a6 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 13:33:56 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c8b405be8883a7ec67218cf505053bd4054d4aec +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 26 13:33:55 2021 +0800 + + * Fix bug #12375. + +commit 2ae329dae4acfbd1ef239a783dcc7db4da6313cc +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 13:33:52 2021 +0800 + + * Fix bug #12324. + +commit 4c749117a6e1eb8e27ed1e510a38ac0f500ca649 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 26 13:29:13 2021 +0800 + + * Fix bug. + +commit 8f686722ccbc63445606813c613fbc8db4630787 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 26 13:22:59 2021 +0800 + + * Fix bug #12296. + +commit a8d33273e6de8945274c2ef4da9d6ec9da968704 +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 26 13:26:02 2021 +0800 + + * Adjust menu in test task. + +commit 8f71af3835517e1753ce10785378aceafe5f8f91 +Author: tianshujie98 +Date: Mon Apr 26 13:13:49 2021 +0800 + + * Fix bug #12389. + +commit dc659c6c1664b7574f623ea4533e54efbb3e4e2a +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 26 13:03:27 2021 +0800 + + * Fix bug #12194. + +commit 3655c3a76e92e99c1e760c7c0f15ca6e4f615ad4 +Author: wangyidong +Date: Mon Apr 26 13:00:45 2021 +0800 + + * adjust for bug #12116. + +commit 604b7b74cd365df4fd05551821fdc8716ecebd58 +Merge: a5c997919b 6b962a12c4 +Author: wangyidong +Date: Mon Apr 26 11:22:32 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit a5c997919bbf456db40a0cb827600d84d85cb79f +Author: wangyidong +Date: Mon Apr 26 11:18:00 2021 +0800 + + * fix bug #12116. + +commit 1fc9c2e6ca4e81773bd4460a3785c54604811bbd +Author: wangyidong +Date: Mon Apr 26 11:14:11 2021 +0800 + + * fix bug. + +commit 6b962a12c43378c8c6e9e5e2beb27da7e8988795 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 26 11:12:10 2021 +0800 + + * Add testtask switcher link. + +commit 0c0508e6cd319327824dcc4df1946e314682a8c9 +Merge: b5080499fd 2ec2a2fb85 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 10:57:02 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b5080499fde062856044a8c5dd0f73ef8f103910 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 10:56:59 2021 +0800 + + * Fix bug #12343. + +commit 2ec2a2fb859b2447dbe983a767640fb4e9486b4d +Author: tianshujie98 +Date: Mon Apr 26 10:51:07 2021 +0800 + + * Fix bug. + +commit 4112706f32c62d104c52843f45dec64cf8686c4a +Author: qiyu-xie +Date: Mon Apr 26 10:44:48 2021 +0800 + + * Fix bug#12367. + +commit ff4e1de377ed35d86d9b9e6dc7d5ecbb81ab3fe1 +Merge: 87419d4552 0379c1b463 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 10:38:14 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 87419d45525b40f9b47909a06ec30339e57ff9b5 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 10:38:11 2021 +0800 + + * Fix an error for project cases of all products when product can not modify. + +commit 0379c1b4630318dbdc64f30f825c286f1bca9df6 +Merge: f563acb640 69fd07ac2f +Author: wangyidong +Date: Mon Apr 26 10:32:03 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f563acb6404f2f4750355daa039ec2b638d2d548 +Author: wangyidong +Date: Mon Apr 26 10:31:52 2021 +0800 + + * adjust code. + +commit aadb69c473d4255644a79c12f482604da6b50c05 +Author: wangyidong +Date: Mon Apr 26 10:31:23 2021 +0800 + + * fix bug. + +commit 6ebc8fd208e9bc7839995375b32c588059192b2d +Author: wangyidong +Date: Mon Apr 26 10:30:50 2021 +0800 + + * fix bug #12134. + +commit 69fd07ac2f8b637f885ce76dd20215495ee26888 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 10:17:01 2021 +0800 + + * Adjust the execution getSwitcher link when the execution do not link proudct. + +commit b2ffb0226f860fff6ed39c381a73380e693aecc1 +Merge: 60cd66073c f68b70bb7a +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 09:58:01 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 60cd66073c3e3ca25337be492af3573c6117be94 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 09:57:57 2021 +0800 + + * Fix bug #12364. + +commit f68b70bb7aa2177f48a1fcd3dd0960f307254354 +Author: qiyu-xie +Date: Mon Apr 26 09:50:40 2021 +0800 + + * Fix bug#12363. + +commit 5db70e02f46731f229bc8148f2369b358a6e2262 +Merge: 919fba9d2d d3df2dfa61 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 09:35:53 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 919fba9d2dba16140c4d84c9d206ce2478b234a6 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 09:35:50 2021 +0800 + + * Fix bug #12365. + +commit d3df2dfa61cc58ce8ad85f00b97cd763dd563837 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 26 09:27:00 2021 +0800 + + * Remove unused code. + +commit c076bc624accee024e460b83190550448babf309 +Merge: 7ae8f4a32a 9a5d8d50b9 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 09:22:52 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 7ae8f4a32a1a309718434073f9c816cc77bbd44d +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 09:22:48 2021 +0800 + + * Fix bug #12371. + +commit 9a5d8d50b97e4f7bb4b46216dfc0f212ac2088ee +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 26 09:07:28 2021 +0800 + + * Fix bug #12347. + +commit 07245d54af416b25b92d7e6d95c620d119b7d9c3 +Merge: 32e900f518 8446e34e64 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 09:05:52 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 32e900f5183cee83b420b54b436ad2ced5c47b4f +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 26 09:05:49 2021 +0800 + + * Fix bug #12360. + +commit 8446e34e641206453f7830ba2036b0a7191a5130 +Author: qiyu-xie +Date: Mon Apr 26 08:53:20 2021 +0800 + + * Fix bug#12359. + +commit 5496cfffcdaefd72b03856a9623c4e2916da78e7 +Author: tianshujie98 +Date: Sun Apr 25 17:07:03 2021 +0800 + + * Add my. + +commit 6ee3cf890048b85bcfee17360912e2e4834e1f58 +Author: holan20180123 <56391770@qq.com> +Date: Sun Apr 25 16:46:11 2021 +0800 + + * Fix bug #12349. + +commit 2ab738c70ef5711fa3004f5ff83145f7ba2e7783 +Author: holan20180123 <56391770@qq.com> +Date: Sun Apr 25 16:40:55 2021 +0800 + + * Fix bug #12350. + +commit d071f7947ed3a48382b74a7bd4cf74b887ddc0fa +Author: tianshujie98 +Date: Sun Apr 25 16:21:59 2021 +0800 + + * Add company, doc and qa. + +commit 985e7a6e423807678badb9c69f6cc243b4fa221f +Author: hufangzhou <746775970@qq.com> +Date: Sun Apr 25 16:17:18 2021 +0800 + + * Add program and project. + +commit 3a83e29c0aa3d46f8d4246b67eeaeffcb1cc86ba +Author: tianshujie98 +Date: Sun Apr 25 15:38:54 2021 +0800 + + * Adjust go back button. + +commit 8776066762c5d01510536a365ab3d3ae22c8db74 +Author: tianshujie98 +Date: Sun Apr 25 15:07:05 2021 +0800 + + * Adjust icon. + +commit 59a4b7206587f7c059ffb8cfd9e7278183baa7b2 +Author: tianshujie98 +Date: Sun Apr 25 15:01:44 2021 +0800 + + * Fix bug create error. + +commit 50edcb043a23fe2061c970dfd8746d40cc44e80c +Merge: d1dcc466f5 dc02b6cbf6 +Author: hufangzhou <746775970@qq.com> +Date: Sun Apr 25 14:50:21 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d1dcc466f53a22eb5738aac9a243bc3014bbcb60 +Author: hufangzhou <746775970@qq.com> +Date: Sun Apr 25 14:50:08 2021 +0800 + + * Fix a bug. + +commit dc02b6cbf619b35843d1ae8ca746bdb87913b65d +Author: tianshujie98 +Date: Sun Apr 25 14:12:58 2021 +0800 + + * Remove unused code. + +commit f2979f39e657d92af882f11c91e914e49d32e759 +Merge: 9c73720e57 53951d0a38 +Author: tianshujie98 +Date: Sun Apr 25 14:04:09 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 9c73720e57e4e59aef3bad4076fbe4b3d9392adf +Author: tianshujie98 +Date: Sun Apr 25 14:03:55 2021 +0800 + + * Adjust icon. + +commit 53951d0a388b8d40f91d7604156ed45c776c4064 +Author: Yagami <976204163@qq.com> +Date: Sun Apr 25 13:14:26 2021 +0800 + + * Fix todo bug. + +commit 4ffef413e99a384efac913a41e8ddfc5ccd36bc1 +Author: Yagami <976204163@qq.com> +Date: Sun Apr 25 11:42:32 2021 +0800 + + * Fix bug assign logic. + +commit 47cc78ea86ee0760a42919d38f05df7e2e1b3ccd +Merge: b46e886060 9d5d20170f +Author: tianshujie98 +Date: Sun Apr 25 09:53:00 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b46e88606076e7c8adfef155daebfab33db1c145 +Author: tianshujie98 +Date: Sun Apr 25 09:52:26 2021 +0800 + + * Adjust guest avatar. + +commit 9d5d20170faf097365079d167f37591182c8ee7c +Author: holan20180123 <56391770@qq.com> +Date: Sun Apr 25 09:27:21 2021 +0800 + + * Fix menu error. + +commit 8a20dc3ccfa1e8d06946c34c1dffb6f1bcf69523 +Author: hufangzhou <746775970@qq.com> +Date: Sun Apr 25 09:25:15 2021 +0800 + + * Fix bug #12322. + +commit 4c40da1ec7d621be66f0c66dbe424b8f7e403763 +Author: qiyu-xie +Date: Sun Apr 25 08:24:25 2021 +0800 + + * Modify the navigation of the edit program. + +commit b2475a73f5bf22bce4d2be0969aa646687d37386 +Merge: 6611af5bf3 bcf9ee5ede +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 23 16:15:50 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 6611af5bf36622767e0335f7a2ac2cf22fb0ff37 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 23 16:15:46 2021 +0800 + + * Fix a bug. + +commit fdf4e101fd51bee1a14d453de5bc07ad49d8162f +Author: tianshujie98 +Date: Fri Apr 23 16:14:36 2021 +0800 + + * Add test case of UI. + +commit bcf9ee5ede72768d21dc0e593961c5e374493574 +Author: tianshujie98 +Date: Fri Apr 23 15:28:06 2021 +0800 + + * Fix error of search builds in execution module. + +commit f21e1f9334980002b8772ed182c316c93db735cf +Author: Catouse +Date: Fri Apr 23 15:28:28 2021 +0800 + + * fix icon-qucheng with large font size. + +commit 0d204ca328adb5a502cc1750fe7b12ed98896fd9 +Merge: 8f6f9fa0b7 29cc7eb9b0 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 23 15:18:32 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8f6f9fa0b7050bef01ec3594b2ee0fd1d79444bd +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 23 15:18:27 2021 +0800 + + * Fix a bug. + +commit 29cc7eb9b08184b1c3fea3cb554ccabe1346e064 +Author: tianshujie98 +Date: Fri Apr 23 15:15:12 2021 +0800 + + * Fix select of build error. + +commit 21e1e636f3636f66c934f5477e9568c921685757 +Merge: e86b0d2a7b 241d2245f0 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 23 15:09:48 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit e86b0d2a7be7ce9e1129da65d842b47c31d404bf +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 23 15:09:42 2021 +0800 + + * Fix an error. + +commit 241d2245f0d9ceb971163f3fa80c8cdfcd45c296 +Author: tianshujie98 +Date: Fri Apr 23 15:08:07 2021 +0800 + + * Fix an error. + +commit 4d7bf73990433bad3817de31c03a9e06d12074e7 +Merge: b90c9dd573 ce3f93e8d8 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 23 14:49:20 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b90c9dd5737632e996ca7cfdf936f370471b8822 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 23 14:49:16 2021 +0800 + + * Fix bugs. + +commit ce3f93e8d8c4de27738ced17c7a3c24bfdfbd36c +Author: tianshujie98 +Date: Fri Apr 23 14:32:33 2021 +0800 + + * Fix menu error. + +commit 059b41fa325f389b7ad56979df89e9ab68986826 +Author: tianshujie98 +Date: Fri Apr 23 14:16:41 2021 +0800 + + * Fix execution menu. + +commit be8a73b171579172d9401ecf13fc9f9ceec95bb5 +Author: Catouse +Date: Fri Apr 23 14:09:14 2021 +0800 + + * fix link with data-app not work in tree content view. + +commit 794f0f1b500616b6ffd27ae8f20346534c727e85 +Author: tianshujie98 +Date: Fri Apr 23 14:06:38 2021 +0800 + + * Fix menu error. + +commit 6f94a465463a1f14fc9274916ea6d12af25cb870 +Author: tianshujie98 +Date: Fri Apr 23 13:58:54 2021 +0800 + + * Fix menu error. + +commit b276f0369f22cd3e850b0ab9ae242dc4ff7f5e4f +Author: Catouse +Date: Fri Apr 23 13:47:21 2021 +0800 + + Revert "* update zui.js." + + This reverts commit 60c2855bba16a62e6131a3216955b25a20bd76ac. + +commit 744703fff46a2880eb160752b29ddf740d09be44 +Author: Catouse +Date: Fri Apr 23 13:37:15 2021 +0800 + + * update zui.js. + + # Conflicts: + # www/js/zui/min.js + +commit 60c2855bba16a62e6131a3216955b25a20bd76ac +Author: Catouse +Date: Fri Apr 23 13:37:15 2021 +0800 + + * update zui.js. + +commit 7fccbfde30d99515a51028b093400371070a9a6e +Author: tianshujie98 +Date: Fri Apr 23 13:34:42 2021 +0800 + + * Fix testcase of execution module error. + +commit 0553379bf102db7440a82fe76658c4c2c321e147 +Merge: 1640e5a20d 5c188665d7 +Author: Guanxiying +Date: Fri Apr 23 11:23:12 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 1640e5a20d2abceca73e479a3f921ab10236e94f +Author: Guanxiying +Date: Fri Apr 23 11:22:46 2021 +0800 + + * Provider tester object. + +commit 5c188665d7cd054ecabe3d95dc12f8373b8ae442 +Author: tianshujie98 +Date: Fri Apr 23 10:45:52 2021 +0800 + + * Fix menu error. + +commit 1ca1e16a7bd8ccf2b2169b5d956e767cf0600f4b +Author: tianshujie98 +Date: Fri Apr 23 10:11:12 2021 +0800 + + * Fix manage task module tree error. + +commit 142e73552d938b36724a612459521b0c5444790b +Merge: 164c218209 cf24126d5b +Author: Guanxiying +Date: Fri Apr 23 09:37:41 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 164c2182095b42a7c33e5f42eb09bea166e2bd6e +Author: Guanxiying +Date: Fri Apr 23 09:37:20 2021 +0800 + + + Add init tester file. + +commit cf24126d5b7bbe40a5031d432955dd7f6d01c13d +Author: zhujinyong +Date: Thu Apr 22 17:23:14 2021 +0800 + + * Wrap move_uploaded_file function. + +commit 75fe67cbdb7ac119258c854c45fe424ff1e0dfa3 +Merge: 58d01b093f 64406fe023 +Author: wangyidong +Date: Thu Apr 22 15:00:43 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 58d01b093f5064a605996e1f9b10e6e0b57c6f68 +Author: wangyidong +Date: Thu Apr 22 15:00:30 2021 +0800 + + * fix error. + +commit 64406fe023846c873e7d043fd094eadc8bde3b76 +Author: tianshujie98 +Date: Thu Apr 22 11:38:54 2021 +0800 + + * Fix bug #12272. + +commit 89ec9cec9cb167200e120e46e7c9ced1b1fa4ffc +Author: qiyu-xie +Date: Thu Apr 22 11:35:45 2021 +0800 + + * Fix bug#12065. + +commit 4c329dfcef1eb3d9154f5e2421a61abe090fecda +Merge: 5ec52b5ba4 f1954b3dab +Author: Guanxiying +Date: Thu Apr 22 10:40:40 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 5ec52b5ba42af125f65b989bcf4fc8974ccae8a0 +Author: Guanxiying +Date: Thu Apr 22 10:35:16 2021 +0800 + + * Fix Gitlab judgement. + +commit f1954b3dab13756d48a60e849647db5104dbbdb1 +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 22 09:37:34 2021 +0800 + + * Fix bug #12275. + +commit ef47bc7e2c5b5b3044f4501168ad00ba7f605700 +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 21 17:15:25 2021 +0800 + + * Fix upgrade error. + +commit e638da0be74f8b3687d10c511aafad43f4666ae7 +Author: qiyu-xie +Date: Wed Apr 21 15:19:41 2021 +0800 + + * Fix bug#12087. + +commit 076f57232698f066bf632425f2473adf452d26ff +Author: tianshujie98 +Date: Wed Apr 21 15:19:24 2021 +0800 + + * Fix bug #12279. + +commit 9ce713bb46d62875bf442d2fa1d9ebce688adc16 +Merge: dd1550a434 5b9dc62ae5 +Author: wangyidong +Date: Wed Apr 21 14:34:25 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit dd1550a434db3c0c8586fc582afa78f79ffbc300 +Author: wangyidong +Date: Wed Apr 21 14:34:08 2021 +0800 + + * fix bug. + +commit 5b9dc62ae536d1222e005f840bb8df3075fcc729 +Merge: c2e986dfac e692b32d55 +Author: tianshujie98 +Date: Wed Apr 21 14:14:10 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c2e986dfac5011858408ef3a13a3f3a5a685be08 +Author: tianshujie98 +Date: Wed Apr 21 14:13:49 2021 +0800 + + * Fix bug #12121. + +commit e692b32d552bee6d64b5008199f7b7b5e7821cfe +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 21 14:10:21 2021 +0800 + + * Fix bug #12234. + +commit 4b455d512f9f53e74f4d006839ab03f31c81921e +Merge: 03b63387a2 2f3fca3927 +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 21 13:42:21 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 03b63387a2b96e4107cac0988a5373252c019ecb +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 21 13:42:17 2021 +0800 + + * Adjust the code. + +commit 2f3fca392733788cb7f539ea75747e24f1f96790 +Merge: 23ebc8f532 ae9fc5a1e8 +Author: tianshujie98 +Date: Wed Apr 21 11:00:59 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 23ebc8f532e4103b86d43e9145fb28720e63494c +Author: tianshujie98 +Date: Wed Apr 21 11:00:42 2021 +0800 + + * Fix bug #12125. + +commit ae9fc5a1e8b86e838b42b7d4163c05797706b4f4 +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 21 10:56:54 2021 +0800 + + * Fix bug #12228. + +commit 8f5359eba4990e955d5c76c8bd95bf9a7c6c71ea +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 21 10:27:33 2021 +0800 + + * Fix bug #12096. + +commit b13b635102a3d5a52d14b3419b72a81c14580d01 +Author: Yagami <976204163@qq.com> +Date: Wed Apr 21 09:35:48 2021 +0800 + + * Fix error. + +commit c342f476288e6cf995dd16097116a73e379ab1fd +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 21 09:21:39 2021 +0800 + + * Fix bug #12210. + +commit ddbcdf63b41b5c512c9697e590d890700cc7b6da +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 21 09:09:28 2021 +0800 + + * Fix bug #12233. + +commit ca41001014505103d41c43c908190ed884fa0ffa +Author: tianshujie98 +Date: Wed Apr 21 09:05:50 2021 +0800 + + * Fix bug #12260. + +commit df950305f3d9dd79a0b0f11339c16ec1b165c4e4 +Author: tianshujie98 +Date: Tue Apr 20 17:20:36 2021 +0800 + + * Fix error. + +commit 0c351122cd19952e7392b0d173ba2d0e5bbceae6 +Author: tianshujie98 +Date: Tue Apr 20 16:53:09 2021 +0800 + + * Fix error. + +commit 3c96c449358bfbfdcf5103ac8b1fb67a27abd872 +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 20 16:06:43 2021 +0800 + + * Fix bug #11915. + +commit c399696227a1f6bc8cd1ecbe7113f4cb9fa4524c +Author: tianshujie98 +Date: Tue Apr 20 15:55:33 2021 +0800 + + * Fix bug #12238. + +commit 3d7ed816fb3f3c3a92937c5dc21852cec5aa6e41 +Merge: 175264712b c844419a66 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 20 15:31:16 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 175264712b7a6cd73b5c9302140837f8e861f1a8 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 20 15:31:12 2021 +0800 + + * Adjust the language file. + +commit c844419a668b7c3c9c22a606274e60a4ba15b1d1 +Author: tianshujie98 +Date: Tue Apr 20 15:00:33 2021 +0800 + + * Adjust style. + +commit 01a2b73704d816a17c824665aa314e6f0f6cc81e +Author: tianshujie98 +Date: Tue Apr 20 14:45:39 2021 +0800 + + * Fix the link to the document library on the execution view. + +commit ce88bfedf01595502e44a1eab2e8e88fb1f7235d +Merge: 29f6b0f2df 9a2d565cce +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 20 14:41:18 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 29f6b0f2dfcafd7fbedd41cdd194103da64ef8e2 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 20 14:41:14 2021 +0800 + + * Fix bug #12255. + +commit 9a2d565cce9626ba0f46cbbc80ab130883e15b13 +Author: Yagami <976204163@qq.com> +Date: Tue Apr 20 14:35:57 2021 +0800 + + * Fix detail. + +commit bb605c56f5590258343107cfcea7eb91e5b38c7f +Author: tianshujie98 +Date: Tue Apr 20 14:28:33 2021 +0800 + + * Fix the report back link problem. + +commit 6b7e3863666694acd4323f898bda4adcb395227e +Author: tianshujie98 +Date: Tue Apr 20 14:02:13 2021 +0800 + + * Fix the project history note issue. + +commit d69021b8df09b7819b4039cecc214df6afd771c3 +Author: qiyu-xie +Date: Tue Apr 20 13:55:08 2021 +0800 + + * Fix bug. + +commit 29c5cfe9897fc3df8ffc094952deaf9b2961a425 (tag: zentaopms_15.0.rc3_20210420) +Author: tianshujie98 +Date: Tue Apr 20 13:39:29 2021 +0800 + + * Fix the language item error. + +commit 9c1da5df92a18fd5b3ece8cd6acf78b9aee8f36e +Author: tianshujie98 +Date: Tue Apr 20 13:32:41 2021 +0800 + + * Fix the issue of adding stakeholders. + +commit 4f135506390955e4a3e2aa0ab46d92e065203b4b +Author: qiyu-xie +Date: Tue Apr 20 13:31:15 2021 +0800 + + * Fix bug. + +commit a515c25eae732c09dddd2d621740ca089cc127c2 +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 20 13:03:22 2021 +0800 + + * Fix bug #12228. + +commit f376e97061b072b18d8a9f2d1fc8dc3db0d886c2 +Author: qiyu-xie +Date: Tue Apr 20 11:10:19 2021 +0800 + + * Fix bug#12195. + +commit a3d1ab355009660771e0bde0ee26b4712efcfe1a +Author: qiyu-xie +Date: Tue Apr 20 10:27:41 2021 +0800 + + * Fix bug. + +commit 8690ab4c271a9d06571e3e662889d6627e9455b4 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 20 10:25:15 2021 +0800 + + * Fix bug #12209. + +commit 3d012a896f8eb9a2382f5b438b05d952d9bd99f8 +Merge: 4b720ec7d1 681f79651d +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 20 10:18:52 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 4b720ec7d1d87168f0f38a9d62a4d72740e42f37 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 20 10:18:47 2021 +0800 + + * Fix bug #12207. + +commit 681f79651db56512a01a2d92f501f7f0c20abec9 +Author: tianshujie98 +Date: Tue Apr 20 10:08:37 2021 +0800 + + * Fix bug #12249,12250. + +commit e3b32a0ced9570ce114b5ccfa6292d6507b68212 +Merge: d2b17487a7 e0f2291666 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 20 09:47:43 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d2b17487a7ebde43e11b501b0a4f79bc07a2b8da +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 20 09:47:39 2021 +0800 + + * Fix an error. + +commit e0f229166692ba7b53f5016b0096116f76a37f0f +Author: qiyu-xie +Date: Tue Apr 20 09:42:20 2021 +0800 + + * Fix bug#12036. + +commit 02d9e9f142be808cf4ed09dd0794e22315ab73c3 +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 19 17:22:44 2021 +0800 + + * Fix bug #12242. + +commit ae090c630dc9311be5b79d98e59e51a73d76b41f +Author: tianshujie98 +Date: Mon Apr 19 17:11:12 2021 +0800 + + * Fix bug #12247. + +commit 9d1873ca7184e2284447750bf51b2875ce5d0914 +Author: tianshujie98 +Date: Mon Apr 19 16:52:01 2021 +0800 + + * Fix bug #12244. + +commit 95bfccb4ded95dd221e3a7dd703c021947596b3e +Author: tianshujie98 +Date: Mon Apr 19 16:39:43 2021 +0800 + + * Fix bug #12238. + +commit 3e214f0ba1e11ea514759d19af10d08b2cbce3d1 +Merge: d05dd00c26 17f3b7f116 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 19 16:16:37 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d05dd00c26f04bf50cca4d42cb8487be452b47a4 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 19 16:16:33 2021 +0800 + + * Fix bug #12236. + +commit 17f3b7f11695d28e680f7c81e1fb9b4ff64fd0d5 +Author: tianshujie98 +Date: Mon Apr 19 15:50:51 2021 +0800 + + * Fix bug. + +commit 76d1514df47b087b76adfb62dce0586323e38b38 +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 19 15:44:26 2021 +0800 + + * Fix bug #12222. + +commit 95045691910a74b1047a1c8a61e78387d625413d +Author: Yagami <976204163@qq.com> +Date: Mon Apr 19 15:09:15 2021 +0800 + + * Fix code details. + +commit f36cd83baedf815678678a7b576c863f1d0247b3 +Merge: e9ddc58b7d 4f4c0d6f5c +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 19 14:51:29 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit e9ddc58b7d26d301af1e73c7d3b6bfb0d55f9c7d +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 19 14:51:23 2021 +0800 + + * Fix an error of execution burn page. + +commit 4f4c0d6f5cfde112a30c34fad2bf842713d1c6b0 +Author: tianshujie98 +Date: Mon Apr 19 14:28:31 2021 +0800 + + * Fix the highlight problem of site navigation. + +commit 1495580ca8537f7fa979fc5aa66cd18f8bd32f26 +Author: qiyu-xie +Date: Mon Apr 19 14:20:09 2021 +0800 + + * Fix bug. + +commit 81d26ebf658e4113b3e49594e438710d4c4b013d +Merge: 36f166a260 762b1c2e69 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 19 14:19:19 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 36f166a2604d3502029960855eeed7faa5b0892c +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 19 14:19:08 2021 +0800 + + * Remove the testcase review button under the scrum project. + +commit 762b1c2e69b1b63cefd6ca8faa4cce27946b675d +Author: qiyu-xie +Date: Mon Apr 19 14:17:53 2021 +0800 + + * Fix bug. + +commit 46728a985432061d106c62bf7d73325bfe10a346 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 19 14:16:35 2021 +0800 + + * Add code for max. + +commit 2783c1a9665ca68796b795e0bcdcb5aa0b111f5e +Author: tianshujie98 +Date: Mon Apr 19 14:16:12 2021 +0800 + + * Fix document paging problem. + +commit b16e7eeecabb40596422c98c02d23e4ea8b2a97f +Author: Yagami <976204163@qq.com> +Date: Mon Apr 19 14:01:00 2021 +0800 + + * Fix bug. + +commit d5dcc7d68f657d87d60795f221d071030b519263 +Author: qiyu-xie +Date: Mon Apr 19 13:27:13 2021 +0800 + + * Modify the language item of the copy execution. + +commit 796bafb2cac3676f842aa19f7b7971e4c353bf53 +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 19 11:43:31 2021 +0800 + + * Fix execution team info error. + +commit cab9785e00c0bfc4c20081df2f5158f18cf436bf +Author: Yagami <976204163@qq.com> +Date: Mon Apr 19 11:25:18 2021 +0800 + + * Fix upgrade logic. + +commit b75eef360b525c38b311499b3d2625286ee4cb6c +Author: qiyu-xie +Date: Mon Apr 19 10:05:42 2021 +0800 + + * The bind field should be 1 when create independent product. + +commit 574d8142067f2f25ca9640d6f49bc2157d11107b +Merge: f54be0f26c 1470b49308 +Author: tianshujie98 +Date: Mon Apr 19 10:07:06 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f54be0f26c2603b50ff79f23b29616914bd5fe48 +Author: tianshujie98 +Date: Mon Apr 19 10:07:00 2021 +0800 + + * Fix the highlight problem of site navigation. + +commit 1470b4930853a2fd1eaae8912a28430046b52a60 +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 19 09:41:27 2021 +0800 + + * Fix bug #12196. + +commit a7f907598032f3504153bee6ecfd6d57c81054a4 +Author: qiyu-xie +Date: Mon Apr 19 09:25:36 2021 +0800 + + * Highlight navigation when create program. + +commit b2c06e65b698e58776fb0709e7be7a30e81a5cda +Merge: ce17db8eeb 717a6d55ee +Author: wangyidong +Date: Fri Apr 16 17:20:38 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit ce17db8eebfd3ebc5507d1accf8dde87c9c58ac4 +Author: wangyidong +Date: Fri Apr 16 17:19:46 2021 +0800 + + * adjust for lang. + +commit 717a6d55eeb0c6f86a6c4914e10c541ae7e0d5dc +Author: qiyu-xie +Date: Fri Apr 16 17:04:20 2021 +0800 + + * Fix bug#12205. + +commit 65badd2500290adf6f93bfa54d67d6a7e26a920c +Author: tianshujie98 +Date: Fri Apr 16 17:01:16 2021 +0800 + + * Fix bug #12175. + +commit 3393cc7ebc8109984b0f28143e47eeeeedbbfc4b +Merge: 01ea55e94a bfa6fa768f +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 16 08:12:55 2021 +0000 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 01ea55e94a5cb81f31c37092af0f1cb636c096b4 +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 16 08:12:50 2021 +0000 + + * Fix bug. + +commit bfa6fa768fe1ef0fbe79698dddaf5d684f5d4c72 (tag: zentaopms_15.0.rc3_20210416) +Author: qiyu-xie +Date: Fri Apr 16 16:01:21 2021 +0800 + + * Fix bug#12082. + +commit ec0c6bd04ba45dddc4cd0243fac7f9b61762bd1c +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 16 15:52:47 2021 +0800 + + * Fix bug #12194. + +commit 0789d893a85e841d60a13966706bc495c06f46ba +Author: zhujinyong +Date: Fri Apr 16 15:37:00 2021 +0800 + + * Do not check dulplicate name When task name is empty. + +commit 42f5badbc8beff90fcd01bb58d4c86f24830f35a +Author: qiyu-xie +Date: Fri Apr 16 15:34:40 2021 +0800 + + * Fix bug#12185. + +commit 7e03dcdb0732210b8e36ec5e06ac84795816ce4a +Author: Yagami <976204163@qq.com> +Date: Fri Apr 16 15:27:12 2021 +0800 + + * Fix code error. + +commit 819960316ab6b91233c1555551925965b531a9dd +Author: Yagami <976204163@qq.com> +Date: Fri Apr 16 15:12:35 2021 +0800 + + * Fix error. + +commit de1f0c0798b536156a0efeaa1be955a6e6d261b9 +Merge: 3fc650e112 b674ca50f9 +Author: tianshujie98 +Date: Fri Apr 16 15:12:33 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 3fc650e1124f29ef2849383b4687f12744f81003 +Author: tianshujie98 +Date: Fri Apr 16 15:12:16 2021 +0800 + + * Fix bug #12176. + +commit b674ca50f9acb1498955ed5ce5135f6f7f8c9d4c +Merge: 93ce7703fb 09d4ee4ba5 +Author: Guanxiying +Date: Fri Apr 16 14:49:55 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 93ce7703fbcc2cc85fe1eda5d12b768ca56b5735 +Author: Guanxiying +Date: Fri Apr 16 14:49:32 2021 +0800 + + * Skip check gitlab client. + +commit 09d4ee4ba5dfa8931fdfa1cf66877f1a33122e1e +Merge: db477bbf3e a59fff9b57 +Author: wangyidong +Date: Fri Apr 16 14:48:58 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit db477bbf3e84cf6f7a7a05ff0571598878dd158d +Author: wangyidong +Date: Fri Apr 16 14:48:23 2021 +0800 + + * fix bug #12179. + +commit a59fff9b5729c41035ff092bf697538dcec64889 +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 16 06:44:43 2021 +0000 + + * Fix bug#12070. + +commit 251ec077b65f10b4e54977d899a169ccfbf5d8f9 +Author: qiyu-xie +Date: Fri Apr 16 14:38:32 2021 +0800 + + * Fix a bug. + +commit c29afaf5a3f397aeec438299217391dcc7cba6bb +Merge: 2f8fa6f91a 627cb3796a +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 16 14:37:06 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2f8fa6f91a7bdb4ac3fe26178f784b347c79c6a1 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 16 14:37:01 2021 +0800 + + * Adjust the project story tree link. + +commit 627cb3796ae39b35c9ed32a3920ece7bbf4d7800 +Author: qiyu-xie +Date: Fri Apr 16 14:20:42 2021 +0800 + + * Modify the drop menu in the batch create story of project. + +commit 0c163ebe6d1ac257f052c18c2350587448dae743 +Author: qiyu-xie +Date: Fri Apr 16 14:05:04 2021 +0800 + + * Add a null value when batch creat bugs. + +commit f4758564b1e834b4247a5b339162b7abcf0b22c7 +Merge: 422c90ad76 49ae51b722 +Author: Guanxiying +Date: Fri Apr 16 14:01:51 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 422c90ad7635b150aa7d19c3b63f5b2f7332feb4 +Author: Guanxiying +Date: Fri Apr 16 14:01:35 2021 +0800 + + * Fix diff function. + +commit 49ae51b7226e270942c27197d58198c64db8df3a +Author: qiyu-xie +Date: Fri Apr 16 13:55:44 2021 +0800 + + * Adjust the create testcase button. + +commit 6556a4f6ba169d7ab3542d054846f33ae0c23b89 +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 16 05:46:14 2021 +0000 + + * Fix bug#12078. + +commit d74f2550571be3044429f183288b6d4f53561ec9 +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 16 05:38:49 2021 +0000 + + * Fix bug#12078. + +commit f776b374f245cdba43ae725c86799b6c534d1057 +Merge: 4ec9f7b1e8 1dca949bb5 +Author: Guanxiying +Date: Fri Apr 16 13:32:33 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 1dca949bb538148bd10d37462ca2f6030c9e728e +Author: qiyu-xie +Date: Fri Apr 16 13:31:59 2021 +0800 + + * Add permissions to the create bug button. + +commit f4d3ad864b28f845b9a5da6504b875083ff134ce +Author: wangyidong +Date: Fri Apr 16 13:16:04 2021 +0800 + + * adjust for upgrade. + +commit 4ec9f7b1e82bcca9728a9b2660846a71bbfffe4a +Author: Guanxiying +Date: Fri Apr 16 13:11:10 2021 +0800 + + * Use Git repo codes on Gitlab repo. + +commit 7d52b3717f5d5ebd92039dd58cbb40c4cd6412e5 +Author: qiyu-xie +Date: Fri Apr 16 11:42:56 2021 +0800 + + * Fix bug#12087. + +commit 14a7078ff6856bcdd9e33329d63ba576cf4fc4cc +Merge: bd9fb4c1d2 0bce567eac +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 16 11:22:49 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bd9fb4c1d22ae11f57533a8be4f7af7518260b07 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 16 11:22:44 2021 +0800 + + * Fix bug #12163. + +commit 0bce567eac7087a560327668358a9ace072c92b7 +Merge: d54cc94694 ac2ffeeeb9 +Author: tianshujie98 +Date: Fri Apr 16 11:08:42 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d54cc94694746c2ae36d112622816a27fe0a57a1 +Author: tianshujie98 +Date: Fri Apr 16 11:08:30 2021 +0800 + + * Fix error. + +commit ac2ffeeeb90b82f5a391199b7141cb5a53484335 +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 16 11:01:41 2021 +0800 + + * Fix bug #12119. + +commit b7bd0e7103fe93b352de7cc23c29f9778cf114ac +Merge: 558e30790b 6c2132567b +Author: wangyidong +Date: Fri Apr 16 10:41:02 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 558e30790be4d3aed3e2d0562b32098cf5ba3826 +Author: wangyidong +Date: Fri Apr 16 10:40:46 2021 +0800 + + * add standard sql. + +commit 6c2132567bd5beb19ee2fbbcb7d87b421a490c77 +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 16 02:39:21 2021 +0000 + + * Finish task#37522 + +commit b38603387033af0a72e4506581a791633c4585f6 +Author: wangyidong +Date: Fri Apr 16 10:22:27 2021 +0800 + + * fix bug #12142. + +commit 2ffffa9b8ee1dc2768525e946de7eeab4264a10a +Merge: 23ceba780d 3457aa83c4 +Author: wangyidong +Date: Fri Apr 16 10:17:25 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 23ceba780d562c84fbda5cc8c605273b21c596e3 +Author: wangyidong +Date: Fri Apr 16 10:16:26 2021 +0800 + + * fix bug #12139. + +commit 3457aa83c482f0b35d465fb0a7f9a8242fd8e4f7 +Merge: c304d9515a 26dc024e5a +Author: Guanxiying +Date: Fri Apr 16 10:07:38 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c304d9515a906dcb2aa65216acc7b861fa832735 +Author: Guanxiying +Date: Fri Apr 16 10:07:19 2021 +0800 + + * Fix bug 12052. + +commit 26dc024e5aaee4a7e3baef81bcde844ce414c779 +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 16 09:08:44 2021 +0800 + + * Fix bug #12079. + +commit 45246578c046e236b72dba2b119c430526db33e7 +Author: zhujinyong +Date: Thu Apr 15 23:03:17 2021 +0800 + + * Fix style of avatar menu. + +commit ec60337667602c1ed2e5016e18a563f15e677ce9 +Merge: 082d15eef3 0daf41d179 +Author: zhujinyong +Date: Thu Apr 15 22:53:00 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 082d15eef348e4f09e4090d7024cb51da17388c2 +Author: zhujinyong +Date: Thu Apr 15 22:52:40 2021 +0800 + + * Fix divider before first item in menu. + +commit 0daf41d1797fb252d45eb3ccbbbc0d3184a483ff +Author: qiyu-xie +Date: Thu Apr 15 16:52:36 2021 +0800 + + * Finish task#37554. + +commit ac1dd08476605a9fff1846f72775157aefc9a79f +Merge: 8bdad21525 cf7c1dc400 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 15 16:43:51 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8bdad2152573d3c5968c854bf0a0a317d3805996 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 15 16:43:46 2021 +0800 + + * Fix bug #12093. + +commit cf7c1dc400c3b7dd1dcf9b4ccbc52214710b82a0 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 15 16:42:25 2021 +0800 + + * Fix menu. + +commit 8498428ca3a9442fe8563fea528e3153afcc08b1 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 15 16:42:08 2021 +0800 + + * Fix menu. + +commit 2db8513fbbb9b137056d3810282d23ebd026874c +Merge: d76368e265 60ea4c3705 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 15 16:32:28 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d76368e2656181d7998f92aa6cffc219d255319a +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 15 16:32:24 2021 +0800 + + * Adjust the nav hight light of maintainrelation page. + +commit 60ea4c37053c66cbfbad882a699eecc369b2dddd +Author: tianshujie98 +Date: Thu Apr 15 16:24:23 2021 +0800 + + * Adjust code. + +commit 9ce2232cbf422c269a4f9275ebfdeca6c7965789 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 15 16:09:51 2021 +0800 + + * Add change flow. + +commit b942a675b8b72334845974dd13ed61d64a0beb48 +Merge: 4aad17c101 205f3748cb +Author: tianshujie98 +Date: Thu Apr 15 16:02:22 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 4aad17c101b892ea8f4f748510844dd79a3e5ecd +Author: tianshujie98 +Date: Thu Apr 15 16:02:02 2021 +0800 + + * Finish task #37551. + +commit 205f3748cb5a5ac03f74d960cba381550a521b6f +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 15 15:49:56 2021 +0800 + + * Finish task #37500. + +commit 4a2a72ac4589c11017f970a827ed3147afb9ce4f +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 15 15:37:04 2021 +0800 + + * Finish task #37555. + +commit c769414efd77de095177aef5e91466b0eb88350a +Author: qiyu-xie +Date: Thu Apr 15 15:25:12 2021 +0800 + + * Fix a bug. + +commit caf8b0e7a045a61254de0fceec75255f6e08d41f +Merge: 00f3c47bb5 160a359b13 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 15 15:09:55 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 00f3c47bb5a8b321d9f00a3928504a4e293dfe7f +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 15 15:09:50 2021 +0800 + + * Fix bug #12120. + +commit 160a359b136388aa62f4ce5232743abd733979e5 +Author: tianshujie98 +Date: Thu Apr 15 15:09:37 2021 +0800 + + * Finish task #37552. + +commit e42fa28ad725db9384b2f238da2a2d9fe6db2ce0 +Author: tianshujie98 +Date: Thu Apr 15 15:08:10 2021 +0800 + + * Finish task #37531. + +commit ac24179dc10100242b4566339c837dd7fbdfbcf6 +Author: wangyidong +Date: Thu Apr 15 15:03:16 2021 +0800 + + * fix bug. + +commit 2ea93b6e476c9a8fb6acf16436719c95f7ad925a +Merge: 81cbb2fd67 eaa1460654 +Author: wangyidong +Date: Thu Apr 15 14:54:49 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 81cbb2fd677de10865e57d91b40741e6c351abcd +Author: wangyidong +Date: Thu Apr 15 14:54:26 2021 +0800 + + * fix bug #12061. + +commit eaa146065499b36a3d897736d9b8fe1314f4d70d +Author: qiyu-xie +Date: Thu Apr 15 14:52:36 2021 +0800 + + * Modify the name of the tr. + +commit 1bf545170d4667ea88e33d391310738f5e5d08a7 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 15 14:53:05 2021 +0800 + + * Fix user menu highlight. + +commit 57450ee56ebc61340bf6eea2c3e029f8f0ce90c2 +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 15 14:51:10 2021 +0800 + + * Finish task #37526. + +commit 1162c7a8a2363ad17f9dac3744bc70f0daf045a1 +Author: tianshujie98 +Date: Thu Apr 15 14:47:24 2021 +0800 + + * Rename. + +commit 1e1c5e0f43f9703eab2f318fa245e0e9e3fdfb64 +Merge: 04a5041611 3162efb035 +Author: wangyidong +Date: Thu Apr 15 14:46:05 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 04a5041611e7fb20336c4cbdee1a9e69e953fe5f +Author: wangyidong +Date: Thu Apr 15 14:45:35 2021 +0800 + + * fix bug #12059. + +commit 3162efb035b9aa110ecb044dd571a8756ea0dd92 +Author: tianshujie98 +Date: Thu Apr 15 14:44:46 2021 +0800 + + * Finish task #37535. + +commit 035efe6bd4e95d0b106fc18c14384d4d36a8e752 +Merge: e5a1820b05 ac7be952c9 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 15 14:38:55 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit e5a1820b054ff922fd6fd3a8435912a4bc9de27d +Merge: c19ad08621 460c24e27e +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 15 14:38:44 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit ac7be952c9dfb1f9d5368d439d323f5f3408e38c +Merge: bc26fa80a9 460c24e27e +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 15 06:38:42 2021 +0000 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c19ad08621d90e291e0f25e130c8f026aa3d9c46 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 15 14:38:39 2021 +0800 + + * Finish task #37530. + +commit bc26fa80a9a5dc65829ece4d438c1a780aef51b5 +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 15 06:38:37 2021 +0000 + + * Fix bug#37538. + +commit 460c24e27e4fc08f71da7ccfa8bec45d42e15ab2 +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 15 14:37:37 2021 +0800 + + * Finish task #37519. + +commit 5647cfb0662aeb82f37653dba57d6b0c0b6a4212 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 15 14:34:15 2021 +0800 + + * Adjust code detail. + +commit f496c745915a44007a1c58adb93a56e27ade6033 +Author: tianshujie98 +Date: Thu Apr 15 13:02:17 2021 +0800 + + * Fix bug #11858. + +commit a6e9f70abd4307fd8d6124c7a05d91444c4f69d9 +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 15 10:27:10 2021 +0800 + + * Finish task #37528. + +commit 060474862394f7dacfd9ce05201ce61c2aa63e28 +Author: tianshujie98 +Date: Thu Apr 15 10:13:38 2021 +0800 + + * Fix bug #12049. + +commit c399ec52807f76807ea789460df0c5b801ba267a +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 15 10:02:21 2021 +0800 + + * Finish task #37518. + +commit 78895ace0a13d6c806d600ccc3393e838e2b4d9f +Merge: df90fbb77d c4454bb6d9 +Author: Guanxiying +Date: Thu Apr 15 09:57:13 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit df90fbb77d879ad4d7ea5aba2c601ea117d95c99 +Author: Guanxiying +Date: Thu Apr 15 09:57:00 2021 +0800 + + * Fix skip field bug. + +commit c4454bb6d9df6cd8eda9ff177821e7a2c86072b8 +Merge: bb3705495a 6d92f44c4b +Author: wangyidong +Date: Thu Apr 15 09:43:51 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bb3705495ad3e140447ce54ccf488d2a730cf0c2 +Merge: dbd5cef729 d5abe7f975 +Author: wangyidong +Date: Thu Apr 15 09:43:40 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 6d92f44c4b4c36fa5ab46222261e1e5ec6a28c4f +Author: qiyu-xie +Date: Thu Apr 15 09:43:23 2021 +0800 + + * Fix an error. + +commit dbd5cef72947da79f3d8f4d02cfc69baa1f13fae +Author: wangyidong +Date: Thu Apr 15 09:43:12 2021 +0800 + + * finish task #37534. + +commit d5abe7f975b6b359be1e694b522376e7b668abaf +Merge: f2b30be51a 8d5ac5bbc5 +Author: tianshujie98 +Date: Thu Apr 15 09:42:54 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f2b30be51a64755744321ed4ad0c86fdff8adcaa +Author: tianshujie98 +Date: Thu Apr 15 09:42:40 2021 +0800 + + * Finish task #37537. + +commit 8d5ac5bbc51635d4cd202c890ce8fe8b36fd1915 +Author: qiyu-xie +Date: Thu Apr 15 09:37:48 2021 +0800 + + * Finish task#37525. + +commit 7f83505e7a5a9e64f4ba48a383b0e6616b409d4e +Merge: 656b745a3e cf1eb77f7a +Author: wangyidong +Date: Thu Apr 15 09:35:00 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 656b745a3e98a0b134a5a85ea751a5d43f22839b +Author: wangyidong +Date: Thu Apr 15 09:34:36 2021 +0800 + + * adjust for doc dropmenu. + +commit cf1eb77f7a4e742ba3f1b89b0e4589574b223169 +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 15 09:30:18 2021 +0800 + + * Finish task #37532. + +commit d5fcc2fc1ab8dde8273ffa72234e8321b647f8ac +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 15 09:21:53 2021 +0800 + + * Finish task #37536. + +commit b0c6c5eb2a6c452c5cc25ec1e97767857a800dd7 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 15 09:08:42 2021 +0800 + + * Fix bug #12058. + +commit 8c1de0863340827c3d0b5c70aa42a86a368729f2 +Merge: 985101a0f0 dc69fda25a +Author: tianshujie98 +Date: Thu Apr 15 08:21:32 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 985101a0f0eb604d362fbb15bb5f4ad1039c7602 +Author: tianshujie98 +Date: Thu Apr 15 08:20:46 2021 +0800 + + * Adjust the language items of the block module. + +commit 59e9eacc187d43742a1c6e850c213a90a730e127 +Merge: a31a271e69 38f23c454e +Author: Guanxiying +Date: Wed Apr 14 16:00:53 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit a31a271e6991e7ce2f78754796916ecc9cfdb97c +Author: Guanxiying +Date: Wed Apr 14 16:00:35 2021 +0800 + + * Fix bug 12038. + +commit 38f23c454e65ed94e67aa2d138a3f05c54d13e72 +Author: Yagami <976204163@qq.com> +Date: Wed Apr 14 15:52:22 2021 +0800 + + * Adjust code. + +commit b1f9e04904ae2e0ca417ac5503eee2f1fca57d88 +Author: Yagami <976204163@qq.com> +Date: Wed Apr 14 14:32:06 2021 +0800 + + * Remove unused code. + +commit 6453f7bed023d0ead1935c8f431d42b6116b11d7 +Author: Guanxiying +Date: Wed Apr 14 15:44:17 2021 +0800 + + * Fix bugs. + +commit 061bef299f7b74d629ceed81ea69ad35be435a64 +Author: Guanxiying +Date: Wed Apr 14 15:00:36 2021 +0800 + + * Fix save gitlab repo bug. + +commit 2b760a4d188f4836dc9493dbcef800af4b47b5a1 +Merge: 0357b59014 0568b470d3 +Author: Guanxiying +Date: Wed Apr 14 14:56:13 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 0357b5901430b7858f4b4d97cd4be7317f0d284a +Author: Guanxiying +Date: Wed Apr 14 14:55:43 2021 +0800 + + * Hide password when edit gitlab repo. + +commit 0568b470d3dcd0ef2d77b8ddb8b43339d859682f +Author: Yagami <976204163@qq.com> +Date: Wed Apr 14 13:19:11 2021 +0800 + + * Adjust case field width. + +commit dc69fda25aa368488080dbc94850fa6a3793d598 +Merge: 77f7031226 82c6522c97 +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 14 13:51:11 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 82c6522c97282c77c4b2dbab8760df69b75d8b1c +Author: leiyong <1549684884@qq.com> +Date: Wed Apr 14 09:28:36 2021 +0000 + + * Adjust code. + +commit 26aa38cf7e60fe2594aeec7affec8398ea840812 +Author: leiyong <1549684884@qq.com> +Date: Wed Apr 14 09:22:21 2021 +0000 + + * Adjust code. + +commit 5f325b5287c9e6f4dddf4a6424dfd76f0dac7a89 +Merge: 5b7e640d49 59e9eacc18 +Author: leiyong <1549684884@qq.com> +Date: Wed Apr 14 09:21:49 2021 +0000 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 77f7031226ab990e2f26b201adb13bfc52a7b7d2 +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 14 13:51:07 2021 +0800 + + * Fix a bug. + +commit 87f49eb3e18c225ebeeba30ff930036662800297 +Author: Guanxiying +Date: Wed Apr 14 13:19:33 2021 +0800 + + * Merge gitlab codes. + +commit 7a5d0100a7b399d15b087291023cf60a2fd40e99 +Merge: 291702e3f5 b9d0de87db +Author: Guanxiying +Date: Wed Apr 14 12:01:57 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 291702e3f50ca5216dcaa30671528dd6d1549e40 +Author: Guanxiying +Date: Wed Apr 14 12:01:10 2021 +0800 + + * Add gitlab type to repo type list. + +commit bffb33fcbcccac6f37c68ccb7a42247b768b79fb +Author: Guanxiying +Date: Wed Apr 14 12:00:32 2021 +0800 + + * Add gitlab config. + +commit b9d0de87db4a5a9d6a085b739e2367925175d169 +Author: tianshujie98 +Date: Wed Apr 14 11:45:12 2021 +0800 + + * Fix bug #11858. + +commit 5b7e640d4956a43f4d1bd39d89de4152e90e9d50 +Merge: e2dd43497c 20be4489cb +Author: leiyong <1549684884@qq.com> +Date: Wed Apr 14 03:35:56 2021 +0000 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 20be4489cbca54d49ddfda42f8f523d28c7c29c8 +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 14 11:19:13 2021 +0800 + + * Fix bug #11797. + +commit 5c810f2420702b8dd244124c1a37b40af77afa97 +Author: tianshujie98 +Date: Wed Apr 14 11:18:29 2021 +0800 + + * Fix bug #11005. + +commit 941304aae6130019c5ce475e038fa25ffd74b827 +Author: qiyu-xie +Date: Wed Apr 14 10:51:26 2021 +0800 + + * Fix bug#11371. + +commit 5d74fc96d26da990a390727dc9ef2b3d77872cfd +Author: tianshujie98 +Date: Wed Apr 14 10:46:54 2021 +0800 + + * Fix bug #12030. + +commit 068411733ce5d2ed016dbd73c597cc748b23c388 +Author: tianshujie98 +Date: Wed Apr 14 10:36:11 2021 +0800 + + * Fix bug #11060. + +commit 6dc7aa8f58b5bb145b10cadd19e17800914dc086 +Author: Yagami <976204163@qq.com> +Date: Wed Apr 14 10:12:51 2021 +0800 + + * Fix doc link. + +commit e2dd43497c13d017f435878bf48c970f1c8dba80 +Merge: 193924c498 eee47cabc8 +Author: leiyong <1549684884@qq.com> +Date: Wed Apr 14 02:10:59 2021 +0000 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 4b6f98f3cc8f880e57dd43ecaef5fd330147bcf3 +Author: tianshujie98 +Date: Wed Apr 14 10:10:54 2021 +0800 + + * Fix bug #6952. + +commit eee47cabc8f4b03d6e50e38fd740625b75bbb16a +Author: qiyu-xie +Date: Wed Apr 14 10:08:33 2021 +0800 + + * Fix bug#11396. + +commit 193924c4986f2fd933b9691da393ba7a729b8e93 +Merge: 84f243d051 352fcc29b9 +Author: leiyong <1549684884@qq.com> +Date: Wed Apr 14 02:06:41 2021 +0000 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 84f243d051dd5774405f404502e1d5e1be60ff68 +Author: leiyong <1549684884@qq.com> +Date: Wed Apr 14 02:06:35 2021 +0000 + + * Fix bug. + +commit 352fcc29b9864e1e1e676ea2d703a41ea9a4afc7 +Author: Yagami <976204163@qq.com> +Date: Wed Apr 14 10:01:20 2021 +0800 + + * Add upgrade logic. + +commit 18840c71a45c0f015252c9fe3e55f6c073838ba8 +Author: leiyong <1549684884@qq.com> +Date: Wed Apr 14 02:01:46 2021 +0000 + + * Adjust code. + +commit fd56c9d71ccb1d2330b9aaca1091f048d8f5710a +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 14 10:01:22 2021 +0800 + + * Fix bug #11915. + +commit 37791e8bfe0486d4c14e901a166681d08bb1407f +Merge: ba56961f03 16d12813c4 +Author: tianshujie98 +Date: Wed Apr 14 09:53:12 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit ba56961f03d8180cd1b79044192df5ad1e4d9516 +Author: tianshujie98 +Date: Wed Apr 14 09:52:47 2021 +0800 + + * Fix bug #11544. + +commit 16d12813c4394d5db6da333b92af7c9b89b14257 +Author: Yagami <976204163@qq.com> +Date: Wed Apr 14 09:48:03 2021 +0800 + + * Remove comment for execution setMenu. + +commit 909b3d9e13f25dc70adfe2d0d6a22076ad1d78d1 +Author: Yagami <976204163@qq.com> +Date: Wed Apr 14 09:43:53 2021 +0800 + + * Fix doc details. + +commit c9ae3314038be0d82b6b65c07b297f9abff3ef8b +Author: tianshujie98 +Date: Wed Apr 14 09:37:43 2021 +0800 + + * Fix bug #11495. + +commit 8f861c26afe09eec94de83711dcaa5a3e0c9c3d8 +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 14 09:37:09 2021 +0800 + + * Fix bug #11940. + +commit c946ff50b3e6193a7917633cd5720854159848d0 +Merge: 2d6c45d5b1 a581008314 +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 14 09:15:30 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2d6c45d5b13909cf1749b3911dd959f678821a4c +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 14 09:15:27 2021 +0800 + + * Fix bug #12028. + +commit a581008314a284191b3071f7787e1236fc74cffc +Merge: 198bffa755 0d6c6f10e8 +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 14 08:51:06 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 198bffa755ae52529ecaa367fa5365bd069120a2 +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 14 08:50:50 2021 +0800 + + * Fix bug #11842. + +commit 0d6c6f10e80a8ee51f91ece308493f9d77b07c96 +Merge: 47993648c4 86d44e25a6 +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 14 08:33:19 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 47993648c4b0458a47cb9f38c928bc970dac228c +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 14 08:33:16 2021 +0800 + + * Fix bug #12027. + +commit 86d44e25a680d484af6da5666e3f21ab3b9a0b07 +Author: leiyong <1549684884@qq.com> +Date: Tue Apr 13 16:00:45 2021 +0000 + + * Fix bug. + +commit 68bca5dcf6107fc3336783b70dded5ad74c2f78d +Merge: bcbf9b6ac4 025c95c77f +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 13 16:51:48 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bcbf9b6ac4ac606ae532a9446690b2b1ddbf08e1 +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 13 16:51:32 2021 +0800 + + * Fix bug #11966. + +commit eeeacce2934f191e1277339e8d8d4e2ab9f00ae9 +Author: Guanxiying +Date: Tue Apr 13 16:44:45 2021 +0800 + + * Add gitlab scm class. + +commit 025c95c77f8139e550043a4ff26ec7258d445b04 +Merge: bcc7a99a4b a1ee0caa3f +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 13 16:38:56 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bcc7a99a4bfedb6ae56c40390ff2b268d2d6e211 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 13 16:38:52 2021 +0800 + + * Fix bug #11128. + +commit a1ee0caa3f7ac913434b4dc83b7a8d6ac6c14954 +Author: Yagami <976204163@qq.com> +Date: Tue Apr 13 16:31:23 2021 +0800 + + * Adjust doc code. + +commit 1ccb76c4871641b5bc84bfa980e65014afae5e62 +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 13 16:18:46 2021 +0800 + + * Fix product doc lib acl error. + +commit 42bda4073530120eb2f4586fa177ab5b40d0c97c +Author: qiyu-xie +Date: Tue Apr 13 15:40:57 2021 +0800 + + * Fix bug#11075. + +commit 6061e2132c4ec7c0e6926fe917c2397bf1023fc1 +Merge: eb9cfcf41b d3cdf6f911 +Author: leiyong <1549684884@qq.com> +Date: Tue Apr 13 07:34:43 2021 +0000 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit eb9cfcf41bd110ed7b681e9aed61816fe8bceed8 +Author: leiyong <1549684884@qq.com> +Date: Tue Apr 13 07:34:25 2021 +0000 + + * Adjust session. + +commit d3cdf6f91116fbcfab985f0d1a528d5b029b6270 +Merge: 6db0f8b470 77de586587 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 13 14:34:19 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 6db0f8b4704bd2b42898857141e463eb6602e93b +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 13 14:34:13 2021 +0800 + + * Adjust the doc view width under the different resolutions. + +commit 77de5865874ee622e35e9a187df4f2ec53f022bc +Author: qiyu-xie +Date: Tue Apr 13 14:23:34 2021 +0800 + + * Fix bug#11066. + +commit 2743186999e6093518d8dec19b6e90a1ce1a9837 +Author: qiyu-xie +Date: Tue Apr 13 14:12:36 2021 +0800 + + * Fix bug#11054. + +commit 41d51e0a6a3c7b0a9daef65e79908aa6ab814a94 +Author: Yagami <976204163@qq.com> +Date: Tue Apr 13 14:11:10 2021 +0800 + + * Hide execution label in opensource. + +commit 2a6baf63abe866ab3f8077fdbcd0a09d9c9cd96f +Merge: 479586acfa c88a7f03a7 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 13 13:59:42 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 479586acfa7159dc090191cc37efce27a8b821de +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 13 13:59:39 2021 +0800 + + * Fix bug #11831. + +commit c88a7f03a7b403860f96840bd2d6386fce5dd248 +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 13 13:50:43 2021 +0800 + + * Restore setting button. + +commit fa5646b0eea02bef0ea553fe66e6ae3cb0a67091 +Merge: 908704230c 5353b69c7d +Author: wangyidong +Date: Tue Apr 13 13:26:57 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 908704230c91ccaf1e98e1b405465a22172025fc +Author: wangyidong +Date: Tue Apr 13 13:26:21 2021 +0800 + + * fix bug #3076. + +commit 5353b69c7dfde6b331df3481c7938291e4ef0a09 +Merge: 53f368609d 003fc32680 +Author: zhujinyong +Date: Tue Apr 13 11:30:54 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 52d505310cb98e19788c257957d84742b5634815 +Author: wangyidong +Date: Tue Apr 13 11:21:31 2021 +0800 + + * fix error. + +commit 003fc326801f8928e5b1cbc1442bf7333b9532dd +Author: leiyong <1549684884@qq.com> +Date: Tue Apr 13 02:56:00 2021 +0000 + + * Finish task#37389. + +commit 8ae1de9b82ee691669570b12b2dc2b8434cbe809 +Merge: 8006058853 9b27a03b94 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 13 10:44:37 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 80060588538a8fb994ad794fde82d9a17dae24ea +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 13 10:44:33 2021 +0800 + + * Adjust the code. + +commit 9b27a03b949bac8e9665a53c58f65f5e2f1b9c45 +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 13 10:42:14 2021 +0800 + + * Fix demo sql error. + +commit 53f368609d6c5e6dbb4b70c7a3bcad9f7e41bf24 +Author: zhujinyong +Date: Tue Apr 13 10:37:35 2021 +0800 + + * Add divider of product. + +commit ccbd1d3af5f03c89c342300091b0d834ddfc5f30 +Author: qiyu-xie +Date: Tue Apr 13 10:23:47 2021 +0800 + + * Display one button when create testcase under all products. + +commit 7a862998685e18154383fed5e3bff81771226d92 +Author: tianshujie98 +Date: Tue Apr 13 10:16:30 2021 +0800 + + * Fix testsuite problem. + +commit 74cb9e327ea94a8126d7a7ff891b91b0e4017088 +Merge: 2016b29a2f 5b22dca2d2 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 13 10:15:32 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2016b29a2fc011569047330cadefe203f46cef55 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 13 10:15:28 2021 +0800 + + * Adjust the link style of the more feature bar link. + +commit 5b22dca2d2e8b538d85bebd738e63e5631f3a924 +Author: leiyong <1549684884@qq.com> +Date: Tue Apr 13 02:08:02 2021 +0000 + + * Fix bug. + +commit 76034151b0020d24cea563e8cb1d87485ef970eb +Author: qiyu-xie +Date: Tue Apr 13 09:45:43 2021 +0800 + + * Delete execution drop menu icon. + +commit d5d7e33a4be0fc47df1f830991a215e2a246d0b5 +Merge: ac070f0654 2a6f1c1359 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 13 09:35:53 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit ac070f06549bffc1157772feceb33e6cff666c11 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 13 09:35:48 2021 +0800 + + * Fix a bug. + +commit 2a6f1c1359774f613448d21194fa3a16eb60e2e6 +Merge: 6d15bc4ed0 7b7b8dc671 +Author: wangyidong +Date: Tue Apr 13 09:16:52 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 6d15bc4ed091f7ce021d2c3b8de11295712d0375 +Author: wangyidong +Date: Tue Apr 13 09:16:32 2021 +0800 + + * finish task #37408. + +commit 7b7b8dc67185e14cfa38a93e10a4e01710160810 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 13 09:09:37 2021 +0800 + + * Fix bug #12010. + +commit 6077c2ea7f024e44f2b012eceab19d03d345e336 +Author: zhujinyong +Date: Mon Apr 12 22:15:45 2021 +0800 + + * Fix mainNav divider. + +commit 81a93f961abd22de5e35d928722b6a105d736c35 +Author: Catouse +Date: Mon Apr 12 21:16:57 2021 +0800 + + * fix search-list position on dropup with small distance to window top. + +commit 4aac098b3fdc0953e1591db4fd88b2bab45a301c +Author: zhujinyong +Date: Mon Apr 12 17:27:05 2021 +0800 + + * Fix menu divider. + +commit 28b24ac1cec25bb2d7b5afabd5b4402ecd9b401c +Author: Yagami <976204163@qq.com> +Date: Mon Apr 12 17:17:59 2021 +0800 + + * Remove program icon. + +commit 468bfcf4b79b62e6a541863441c12d68f0cae79c +Merge: 51da5b5b4e 39e069bec7 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 12 17:09:15 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 51da5b5b4ef448f603fd4c89c78c8271c76ecd1a +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 12 17:09:08 2021 +0800 + + * Finish task #37403. + +commit 39e069bec7a84cf6824c1b70ec9cc10d6855a7c1 +Merge: 2e73f5c071 134b8d21ef +Author: wangyidong +Date: Mon Apr 12 16:58:26 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2e73f5c0712b3c1f002befa876fe5c5d7e19d16e +Author: wangyidong +Date: Mon Apr 12 16:56:47 2021 +0800 + + * fix bug. + +commit 134b8d21effe4a96c493b3d7ca1fd41861502630 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 12 16:51:39 2021 +0800 + + * Fix demo.sql. + +commit 869f17550510f7941596c0b588bf7318c2f1557a +Author: Catouse +Date: Mon Apr 12 16:47:06 2021 +0800 + + * force to open user-login/logout in parent window. + +commit 4b0c06412dc9d17f3755f08e178c7e563b10db02 +Author: Catouse +Date: Mon Apr 12 16:39:45 2021 +0800 + + * fix search-list style in dropMenu. + +commit e6048dfe8dd5e42830a9397dd77bd3384951856f +Author: Yagami <976204163@qq.com> +Date: Mon Apr 12 16:27:45 2021 +0800 + + * Fix repo bug. + +commit 7a59c36eafa9d099af9c1ea355e6a9fb08c80814 +Merge: 805eae57f0 d8185adb63 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 12 16:27:23 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d8185adb63a0936ba4c38a1126e948d33714a22f +Author: Catouse +Date: Mon Apr 12 16:27:16 2021 +0800 + + * fix table sorter not work in block with rows count larger than 10 after refresh block. + +commit 805eae57f0e813eafd0058bf5fd64175594b1b30 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 12 16:27:19 2021 +0800 + + * Fix bug #12009. + +commit eef102a26bbe0a19b1217e18f3ceeca255ab1465 +Author: qiyu-xie +Date: Mon Apr 12 16:19:25 2021 +0800 + + * Fix bug#12006. + +commit bcc8fc401f02347dc68622b0845b90ca6a61bcf5 +Author: qiyu-xie +Date: Mon Apr 12 16:04:59 2021 +0800 + + * Finish task#37387. + +commit 8a6ec7e15212fff84b23c594ffd57ba37ba4af2f +Author: Yagami <976204163@qq.com> +Date: Mon Apr 12 15:59:15 2021 +0800 + + * Fix bug. + +commit 32ec8691e826c0bc3b0da7d73a0a261c93f7b094 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 12 15:48:54 2021 +0800 + + * Fix bug #11987. + +commit 75d1a75a5763a0b5f07aedc4806324fbb57940a1 +Merge: e558b28a24 09d1557787 +Author: leiyong <1549684884@qq.com> +Date: Mon Apr 12 10:23:01 2021 +0300 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit e558b28a2457537aaac686d8a8cf9b662169f531 +Author: leiyong <1549684884@qq.com> +Date: Mon Apr 12 10:22:56 2021 +0300 + + * Fix bug#11971. + +commit 09d1557787deb8418a7eb9e92126c2b05dff74d4 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 12 15:22:45 2021 +0800 + + * Fix stakeholder view link. + +commit a69c7d2125587eb4561287a4339d2adf0eb93500 +Author: tianshujie98 +Date: Mon Apr 12 14:56:25 2021 +0800 + + * Finish task 37381. + +commit 5b6353523fa30b7688de7f0db05c1b3559c431a5 +Merge: d6cbac7df4 fee3eff032 +Author: wangyidong +Date: Mon Apr 12 14:48:37 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d6cbac7df40d24e564bba5357e6048d84453ac42 +Author: wangyidong +Date: Mon Apr 12 14:47:50 2021 +0800 + + * fix bug. + +commit fee3eff03272afb65632df14f2cd14924b4df104 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 12 14:45:51 2021 +0800 + + * Fix sql. + +commit e47df9246c71af9c87ed82cdbf73706745852e92 +Author: tianshujie98 +Date: Mon Apr 12 14:13:32 2021 +0800 + + * Finish task #37391. + +commit 5a708667badf308d055365587f7266d4e4bab637 +Author: qiyu-xie +Date: Mon Apr 12 14:03:37 2021 +0800 + + * Finish task#37386. + +commit c97792dd902085093590b84da4827d89472afe49 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 12 13:31:07 2021 +0800 + + * Fix bug #11989. + +commit f200196ff00e00494063cc629ed071774db3a7c8 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 12 13:28:22 2021 +0800 + + * Finish task #37402. + +commit b2314e26ee93fa3024e9b92971d8820e88953823 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 12 13:18:28 2021 +0800 + + * Fix table assign css. + +commit a92b40e1b2a563c13596243b1f5d639a4e549ad6 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 12 13:15:53 2021 +0800 + + * Fix bug #37388. + +commit 2883c2e05c41811a2ed2e5b2110f5fd821e5a140 +Author: tianshujie98 +Date: Mon Apr 12 13:07:03 2021 +0800 + + * Finish task #37405. + +commit d75672885de1dd2cf9e541aa06330cba311bbfb1 +Merge: 403b4b3760 b8138c41cc +Author: wangyidong +Date: Mon Apr 12 10:31:20 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 403b4b376059c057d38a5b1319d4ed3d48a27673 +Author: wangyidong +Date: Mon Apr 12 10:31:00 2021 +0800 + + * finish task #37271. + +commit b8138c41ccf57c83e0f76a07aca9127e690ad42b +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 12 10:27:45 2021 +0800 + + * Fix bug #11953. + +commit 36c004af26c0b1ae848cc29014dbaade90d98d44 +Merge: 182f6b9acd 2220d9493a +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 12 10:14:34 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 182f6b9acde674e003c96b253b2a4a0621a1d371 +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 12 10:14:12 2021 +0800 + + * Fix bug #11980. + +commit 2220d9493aa4590dc756a78bfa57710d7fe3a2aa +Author: leiyong <1549684884@qq.com> +Date: Mon Apr 12 04:59:25 2021 +0300 + + * Repair error. + +commit 6f46353bd2901124587ffd45e310ad9526e40372 +Merge: ba26806e18 1f29a2c621 +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 12 09:54:00 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit ba26806e1834cacd1635be3f8b896be661fa88ab +Author: holan20180123 <56391770@qq.com> +Date: Mon Apr 12 09:53:41 2021 +0800 + + * Fix bug #11974. + +commit 1f29a2c621f073185b32ddf1c81a905074dc70f8 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 12 09:53:40 2021 +0800 + + * Fix bug #11979. + +commit ea67994c31a7feab5d82be751acca68d24be0918 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 12 09:48:57 2021 +0800 + + * Fix bug #11979. + +commit 72ce1729b90aa756994463d05dcec633d8426281 +Merge: 7528daadd1 02c4f87a96 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 12 09:31:17 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 7528daadd1b47194f09d9d60dac2a4cc9a6c6cb7 +Author: hufangzhou <746775970@qq.com> +Date: Mon Apr 12 09:31:13 2021 +0800 + + * Fix bug #11952. + +commit 02c4f87a9628674b4630daa6362d8fa3783490e8 +Author: tianshujie98 +Date: Mon Apr 12 09:09:29 2021 +0800 + + * Fix edit document error. + +commit a09f161ee93340833b12caeca5e682669e986d7e +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 9 13:33:43 2021 +0300 + + * Fix bug. + +commit d0e21dee63015805fbceb27cb2f3038bdda3f195 +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 9 13:16:24 2021 +0300 + + * Fix bug. + +commit b89e3d066526b36d853b873673c384176522fef0 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 9 17:13:25 2021 +0800 + + * Fix Version. + +commit 3da94c38fa4d777e191ffe5952fba26d50f2f533 +Merge: f1349cba2c dc0b429db4 +Author: wangyidong +Date: Fri Apr 9 16:53:57 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f1349cba2c6c1a502d7daf10e3340b094824cc4e +Author: wangyidong +Date: Fri Apr 9 16:53:43 2021 +0800 + + * adjust for error. + +commit dc0b429db4aef3bc453cfda6257ea2a068530f22 (tag: zentaopms_15.0.rc2_20210409) +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 9 11:47:15 2021 +0300 + + * Fix bug. + +commit f5dde0e5df5611ebd49762403eec5388fa76a77d +Author: Yagami <976204163@qq.com> +Date: Fri Apr 9 16:46:23 2021 +0800 + + * Fix bug. + +commit 76fd1b8a462e69cad9a473357bda96dc45a7d415 +Merge: 6d4e721cc6 2e20a06ffa +Author: tianshujie98 +Date: Fri Apr 9 16:44:25 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 6d4e721cc63423c590f16e3bf284b206f3688ae2 +Author: tianshujie98 +Date: Fri Apr 9 16:44:10 2021 +0800 + + * Fix bug #11926. + +commit 2e20a06ffa1cfb2ee5afb32afa4ffeb1eabc4412 +Merge: d348f06080 b003002dad +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 9 16:42:08 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d348f06080c86b7644ba86fe823259755fdeb9bd +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 9 16:42:02 2021 +0800 + + * Adjust the code. + +commit b003002dadb6723b0e63a19425792ccefdd855f7 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 9 16:40:37 2021 +0800 + + * Fix delete link. + +commit fdfd2c324a90823a0637eb9326fd7b50a57dd8d2 +Merge: 6d145002a1 7390d841e9 +Author: wangyidong +Date: Fri Apr 9 16:38:13 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 6d145002a13f1c8885ce9c3cbbcf3e19704cf5a9 +Author: wangyidong +Date: Fri Apr 9 16:37:57 2021 +0800 + + * adjust for lang. + +commit 7390d841e94996da71a81e7dcf70f4ecc4c1bdd1 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 9 16:37:23 2021 +0800 + + * Fix bug. + +commit 55f0c763c43b7f56c2ddb60638e65ddb1887ef3d +Merge: edd4825045 e3573e9627 +Author: tianshujie98 +Date: Fri Apr 9 16:34:42 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit edd482504518b47d0f2298f15d3991676930eceb +Author: tianshujie98 +Date: Fri Apr 9 16:34:26 2021 +0800 + + * Fix bug #11934. + +commit e3573e9627506525c782ef2376cd04765f153f99 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 9 16:34:23 2021 +0800 + + * Fix en lang. + +commit e99071291be742960007e5d8b384fd13a4b4524d +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 9 11:30:21 2021 +0300 + + * Fix bug#11925. + +commit e340901bea507e14ce8ede9e3fcd90e9df3ff176 +Merge: 2c40f2e7e7 8db49adccc +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 9 16:29:11 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2c40f2e7e793736021cbb208e92a9744f2b20488 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 9 16:29:08 2021 +0800 + + * Fix an error. + +commit 8db49adccc762a1643f0b022ab0fc4285ad23cbf +Author: Yagami <976204163@qq.com> +Date: Fri Apr 9 16:23:04 2021 +0800 + + * Fix bug. + +commit 81c54448d32678666c4d3a4eebe3a51b9612a1b7 +Merge: cb365dbfe7 c6ab53402e +Author: tianshujie98 +Date: Fri Apr 9 16:22:07 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit cb365dbfe7ecf33ef1cb3799a73389950568af15 +Author: tianshujie98 +Date: Fri Apr 9 16:20:17 2021 +0800 + + * Add execution doc lib menu. + +commit c6ab53402e2b6e7dc11813158b83b2388e47d115 +Merge: f8101d02b8 186b455fdd +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 9 15:46:47 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 186b455fddf3b6081b55ba6a1d2d2e375c458940 +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 9 11:16:22 2021 +0300 + + * Fix bug. + +commit d4400dd1cc0915c5d153f05f16e105a228e8b103 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 9 16:00:34 2021 +0800 + + * Fix execution all view style. + +commit f8101d02b825d4a4b062cef0ee58a33ed9f5e250 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 9 15:46:44 2021 +0800 + + * Fix bug #11948. + +commit 62bc93ee5893b29614f3b0e9e5a4bc9c6152a7f2 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 9 14:51:58 2021 +0800 + + * Fix bug. + +commit 142d6140867d03704a90b6e91d301e0f06ca19e6 +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 9 09:49:37 2021 +0300 + + * Fix bug. + +commit c33405683a5b81de6464996d130e8e3ebf226eb7 +Merge: e480de3f77 c710bcc6d4 +Author: tianshujie98 +Date: Fri Apr 9 14:29:11 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit e480de3f77ec747756b0f0e1f05b1e7e896a6e6f +Author: tianshujie98 +Date: Fri Apr 9 14:28:00 2021 +0800 + + * Remove create doc header. + +commit c710bcc6d48039548c79e1eafd904c09c9d3e065 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 9 14:10:54 2021 +0800 + + * Fix bug. + +commit ee8e74462fc441c4f2d7929e502f9f654667f2e8 +Merge: 3d57b26610 50054c62ae +Author: tianshujie98 +Date: Fri Apr 9 14:05:24 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 3d57b26610e580ce8a8816c1c19bc8872e46b13f +Author: tianshujie98 +Date: Fri Apr 9 14:05:05 2021 +0800 + + * Fix bug #11840. + +commit 50054c62aec87689d2f4e5afc43b4fd4aadf6838 +Merge: 2e749c1738 3390c97210 +Author: wangyidong +Date: Fri Apr 9 13:56:21 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2e749c1738a84ed41805aada848d379ce39c97fa +Author: wangyidong +Date: Fri Apr 9 13:56:08 2021 +0800 + + * adjust for create story. + +commit 3390c972106cad305562309198fbb482a6054584 +Merge: d40db92dbe 54d29dcafe +Author: tianshujie98 +Date: Fri Apr 9 13:41:26 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 54d29dcafe80216e8644e2d18c94acc6e01c9e87 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 9 13:40:54 2021 +0800 + + * Add upgrade logic. + +commit d40db92dbe91f1f3387db46a71ba390e9c91abe6 +Author: tianshujie98 +Date: Fri Apr 9 13:41:00 2021 +0800 + + * Fix bug #11893. + +commit fc8e2f35ed2bc8e4117b07fd0844669a08917510 +Author: qiyu-xie +Date: Fri Apr 9 13:10:39 2021 +0800 + + * Fix bug#11829. + +commit 1c3e2539a291b794f5e8ab1c47bbad9db33ae865 +Merge: 44a6ed5a8c bb810a8ec2 +Author: wangyidong +Date: Fri Apr 9 12:12:12 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 44a6ed5a8c090db33414e6dd28032d102cdd9617 +Author: wangyidong +Date: Fri Apr 9 12:11:48 2021 +0800 + + * fix for bug #11891. + +commit bb810a8ec24b383ce4c5d54e61a7e636c186a5dd +Author: qiyu-xie +Date: Fri Apr 9 11:28:20 2021 +0800 + + * Fix an error. + +commit aa5ecd72216b8db8206ec53bc687c792a5bacff0 +Author: qiyu-xie +Date: Fri Apr 9 11:26:35 2021 +0800 + + * Fix bug#11832. + +commit 6d33b31d012166d3cbbff34d9d79e238dfb3dfe8 +Merge: c03a9024a4 bf1db9630f +Author: wangyidong +Date: Fri Apr 9 11:06:44 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bf1db9630f885e9592d914c7d9fbb25ba14419a9 +Merge: f06e34b0fa c7c113de3f +Author: tianshujie98 +Date: Fri Apr 9 11:06:27 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f06e34b0fa60fb5842d5b7d6ba2639d98e8ce5a3 +Author: tianshujie98 +Date: Fri Apr 9 11:06:10 2021 +0800 + + * Fix bug #11913. + +commit c03a9024a40c947b4b364989274af354a8999e9f +Author: wangyidong +Date: Fri Apr 9 11:05:23 2021 +0800 + + * finish task #37314. + +commit c7c113de3f534d70479b348ae5fb6e2796586d7e +Author: Yagami <976204163@qq.com> +Date: Fri Apr 9 11:03:49 2021 +0800 + + * Merge code. + +commit 14dd2012ccb7250efca1cf757ac3bcc42bee03a9 +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 9 06:01:18 2021 +0300 + + * Finish task#37299. + +commit d6d855b9dcbca451819ccf175fc85b277b8df663 +Merge: 8e1ec6dd34 4504bfef23 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 9 10:59:34 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8e1ec6dd34b4f3168c2787a1b3e330da00ddc81d +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 9 10:59:30 2021 +0800 + + * Fix a bug. + +commit 4504bfef23e058d3fe3062de1d9abb7d887599a1 +Author: tianshujie98 +Date: Fri Apr 9 10:53:40 2021 +0800 + + * Fix bug #11912. + +commit 01de23b3b46262efd4028a275e587643154e99c4 +Author: qiyu-xie +Date: Fri Apr 9 10:33:42 2021 +0800 + + * Fix bug#11832. + +commit 506eaa5fdd8d9ba8f8156b02eaeeedfac392b944 +Author: tianshujie98 +Date: Fri Apr 9 10:30:21 2021 +0800 + + * Fix bug #11867. + +commit bee071938ea91937fee7fb5bfb5187c7832fedbe +Merge: b90487fb74 6f40a35d3d +Author: wangyidong +Date: Fri Apr 9 10:30:04 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b90487fb74c95896b0ac5e72990abbc6fb568d7b +Author: wangyidong +Date: Fri Apr 9 10:29:45 2021 +0800 + + * finish task #37280. + +commit 6f40a35d3d5e3d25dfc795555c023325a457ab31 +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 9 05:27:04 2021 +0300 + + * Finish task#37284. + +commit 3c72f70d36fc60eed9be63aae6e4ce268ef8bf48 +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 9 05:16:19 2021 +0300 + + * Finish task#37284. + +commit 49dd13be6313ba993ce2675a919d243f276225e2 +Author: qiyu-xie +Date: Fri Apr 9 09:28:41 2021 +0800 + + * Fix bug#11935. + +commit 43515c3c470462fd72783f0bfdc9ba6f2c23ffdb +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 9 08:30:52 2021 +0800 + + * Fix an error. + +commit 021249b73470da49958d595885a559c04bf2fde5 +Merge: 43583934fc 52511f5e7a +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 8 17:27:04 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 43583934fc3cce7c3eaa5289a4c41d1794097bb3 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 8 17:26:59 2021 +0800 + + * Fix bug #11451. + +commit 85bc4283cb9996ce48b8020e7654dd9fbd0b6d75 +Author: wangyidong +Date: Thu Apr 8 17:12:50 2021 +0800 + + * adjust for menu. + +commit 52511f5e7a7ed1c7a2f24ce6e3fd58fc7c6e7f8a (tag: zentaopms_15.0.rc1_20210408) +Author: Yagami <976204163@qq.com> +Date: Thu Apr 8 16:36:39 2021 +0800 + + * Fix todo calendar hight light. + +commit d79dc47720f551ac98420eb88c89f83da0beccd3 +Author: qiyu-xie +Date: Thu Apr 8 17:09:18 2021 +0800 + + * Fix bug #11834. + +commit df928c0223b049bd907aeec70024e5ca88a5c79c +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 8 12:09:21 2021 +0300 + + * Adjust file filter.class.php. + +commit 9e954a629e12edfa9543e4f3f17aba99cc94bf44 +Merge: 0a110fdc41 8a14ccf864 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 8 17:08:41 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 0a110fdc4135a4b24effe5d3ba539ded7e3bbfea +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 8 17:08:37 2021 +0800 + + * Fix bug #11834, #11835. + +commit 8a14ccf864942400db252f1f60b1826e34d17fd1 +Author: tianshujie98 +Date: Thu Apr 8 16:19:08 2021 +0800 + + * Fix bug #11914. + +commit b02d3d47e3f3001e54a2a782ec7d35628e39239d +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 8 11:12:54 2021 +0300 + + * Fix bug#11896. + +commit 8a9ef397f432ae7f5f2eb0675c652f3be8431384 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 8 16:11:10 2021 +0800 + + * Fix burn error. + +commit 058be5afda806f991adb2248d80d3833da736021 +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 8 11:06:49 2021 +0300 + + * Fix bug#11896. + +commit 0608b51fd7d3342daecb098c2a84f24ba3c4e678 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 8 15:58:59 2021 +0800 + + * Fix my-task view. + +commit 28486fac4e45c8c5ba8ccfb7faf67fdfa8e6aff5 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 8 15:54:00 2021 +0800 + + * Fix execution icon. + +commit 2017cb2c80ce9dce968dd74077d461ec37dfcf60 +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 8 10:51:43 2021 +0300 + + * Fix bug#11896. + +commit 703ed680db747d36df64a2919149d369a76017dc +Author: Yagami <976204163@qq.com> +Date: Thu Apr 8 15:42:43 2021 +0800 + + * Fix lang file. + +commit 6c23c0a1bc30c6b11df9f079d5b179a13d0bc8ba +Author: Yagami <976204163@qq.com> +Date: Thu Apr 8 15:29:49 2021 +0800 + + * Fix bug #11920. + +commit 9b05e05bb5692f484b5b6e58caf9f209166e9a2e +Merge: ee800c9b72 666748f707 +Author: tianshujie98 +Date: Thu Apr 8 15:24:45 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit ee800c9b72800857857ed29cde403093fd91671d +Author: tianshujie98 +Date: Thu Apr 8 15:24:14 2021 +0800 + + * Fix bug #11864. + +commit 666748f7077ab5558cdd0dc73f7cd5a85548d754 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 8 15:20:32 2021 +0800 + + * Fix bug #11162. + +commit 27931276a2ac744457a12cf2e331d73006e47d5f +Merge: e5dd0e98fc ba89a45150 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 8 15:19:30 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit e5dd0e98fc1fda07f0ae41c7a012e9c67619e564 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 8 15:19:25 2021 +0800 + + * Finish task #37288. + +commit ba89a451501093882fdaaeb369abca0ecb8c833f +Author: Yagami <976204163@qq.com> +Date: Thu Apr 8 15:13:48 2021 +0800 + + * Fix icon. + +commit 1bdc85422983525e7f09b1c7088a8c1416359d98 +Author: tianshujie98 +Date: Thu Apr 8 15:08:25 2021 +0800 + + * Fix edit doc error. + +commit b9736fc551822303d58362ed4e7ce6479a9e9d9d +Author: Yagami <976204163@qq.com> +Date: Thu Apr 8 15:02:34 2021 +0800 + + * Code for task #37122. + +commit ca96ce81e03a61397280499f0f8c453c78841a64 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 8 13:52:05 2021 +0800 + + * Fix icon size. + +commit 14d2e1b8aaf2d320127cb95f6e80f5e950c693db +Merge: 5e8fab3dd2 104b82e50f +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 8 13:51:25 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 5e8fab3dd2f5b8bf62c6e72260ca3966abd2f2c5 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 8 13:51:18 2021 +0800 + + * Finish task #37277. + +commit 104b82e50f82b37f1afbdc969d969b5d4dc941a5 +Merge: bb490ddbdc 7154d5113d +Author: wangyidong +Date: Thu Apr 8 13:35:09 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bb490ddbdcf7e056b7e5aad3e4426972f41b16cf +Author: wangyidong +Date: Thu Apr 8 13:34:47 2021 +0800 + + * Adjust for security leaks. + +commit 7154d5113d761c8549c2e328d367e0e0e080993f +Author: Yagami <976204163@qq.com> +Date: Thu Apr 8 13:29:38 2021 +0800 + + * Fix an error. + +commit 7e0c64726c4d73a8260f4152b695f34b73ed045f +Author: Catouse +Date: Thu Apr 8 13:02:55 2021 +0800 + + * auto adjust navbar position to prevent overlay with heading. + +commit 9ad024ce50c34ab7059155d0bc9f52c723ebbe19 (tag: zentaopms_15.0.rc1_20200408) +Author: Yagami <976204163@qq.com> +Date: Thu Apr 8 13:01:01 2021 +0800 + + * Fix block link. + +commit 94e2d9d56a56c87b70edf4e5012ddc9e94fea949 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 8 11:28:59 2021 +0800 + + * Code for task #37108. + +commit 8a114befb5883da68be3aa0e79b01186db334ce0 +Author: Catouse +Date: Thu Apr 8 11:24:28 2021 +0800 + + * auto adjust navbar position to prevent overlay with heading. + +commit 26de022cd1ee1b2d961677e4867a6d03cac0c484 +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 8 05:48:42 2021 +0300 + + * Fix bug. + +commit 8a031d2ca41c498da0d02fb33d29f553be1c702c +Author: wangyidong +Date: Thu Apr 8 10:45:52 2021 +0800 + + * fix bug #11889. + +commit 7ed7497a92355b5969ae82d0a7df606f87963245 +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 8 05:10:07 2021 +0300 + + * Add traditional language item. + +commit 4ff14d4a077de636fd15d38dc015ad6d199dbcb6 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 8 10:01:24 2021 +0800 + + * Add bug title min-width. + +commit 08305c6385c1663c41bac5fbca95ab0ec64fe7e2 +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 8 04:09:17 2021 +0300 + + * Fix bug#11837. + +commit 0dc863da3ac8c3a8cbd3422e311bf58fda3ecefa +Author: wangyidong +Date: Wed Apr 7 17:44:25 2021 +0800 + + * change for set cookie secure. + +commit c5cb1aa47924a22015cc7cf66f4d60641e61c296 +Merge: 4a902c7e75 4469f64918 +Author: wangyidong +Date: Wed Apr 7 17:41:07 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 4a902c7e75449611ed9047e98161d6c3191ba40d +Author: wangyidong +Date: Wed Apr 7 17:40:05 2021 +0800 + + * adjust for 15. + +commit 4469f64918461616da690b4a6e4be1239d2ecfa5 +Author: leiyong <1549684884@qq.com> +Date: Wed Apr 7 12:27:12 2021 +0300 + + * Fix bug#11837. + +commit 6701530b1d8497c00769e76336d7561b9e838887 +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 7 16:52:41 2021 +0800 + + * Finish task #37114. + +commit 1de3c951bf539c161821000d3ddd8f98d8b76e03 +Author: qiyu-xie +Date: Wed Apr 7 16:49:21 2021 +0800 + + * Finish task#37265. + +commit d0aeb07ac2f46f19e811202a630611bb0ce03508 +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 7 16:33:03 2021 +0800 + + * Fix bug #11869. + +commit 04068cd52f34cdeb1dd9e9d73d45b8673898a895 +Merge: d53140f21c 75425fc30b +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 7 16:20:23 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d53140f21c5d346189d564864f2b262414fcc5cb +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 7 16:20:20 2021 +0800 + + * Fix an error. + +commit 75425fc30b8e5e3ab7605d742f7f660e21581cfa +Merge: 9db96ad4d5 f196a7677b +Author: wangyidong +Date: Wed Apr 7 16:16:26 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 9db96ad4d5db31133c9be5f67b1e5b8a7aa068e0 +Author: wangyidong +Date: Wed Apr 7 16:15:45 2021 +0800 + + * adjust for get product project. + +commit f196a7677b8f67cd2e682c8aed1e7527104b5750 (tag: zentaopms_15.0.rc1_20210407) +Author: Yagami <976204163@qq.com> +Date: Wed Apr 7 15:55:07 2021 +0800 + + * Fix lang. + +commit 117c091bd88497a024effc6641437a2638c3b3c9 +Author: qiyu-xie +Date: Wed Apr 7 15:53:39 2021 +0800 + + * Adjust the code. + +commit 423374e11d5c071edc4a80013fecec01955935ce +Merge: a25955e575 7289ddbf26 +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 7 15:43:18 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit a25955e575ef364d46427663e376131e77c623ee +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 7 15:43:06 2021 +0800 + + * Fix bug #11006. + +commit 7289ddbf26ee130e0134c60343f89c678c4802de +Author: Catouse +Date: Wed Apr 7 15:38:18 2021 +0800 + + * skip handle modalTrigger which is inited from js on click to prevent show modal in page. + +commit 2aa8faf5998d9e5d33649a2fc5459b953c6b5057 +Author: Yagami <976204163@qq.com> +Date: Wed Apr 7 15:29:51 2021 +0800 + + * Remove iframe. + +commit ac02e2ed8737ea95fccc62b83e32c18759c55d4d +Author: qiyu-xie +Date: Wed Apr 7 15:25:18 2021 +0800 + + * Finish task #37040. + +commit 5aae5b88c1614bd65f4be6ffeb5fb4e74a64c34f +Merge: c1fdb0bbc0 cbb68c1f9e +Author: wangyidong +Date: Wed Apr 7 14:53:43 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c1fdb0bbc0d852f7d2f5df9c0d40baa43fb75ae5 +Merge: f7f7bdc651 b94fa22b92 +Author: wangyidong +Date: Wed Apr 7 14:53:01 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit cbb68c1f9ebe048372d7f816a424de5df9c7ba15 +Author: Yagami <976204163@qq.com> +Date: Wed Apr 7 14:51:36 2021 +0800 + + * Fix bug. + +commit f7f7bdc65127a81e8d72d70d6812b4148707123b +Author: wangyidong +Date: Wed Apr 7 14:50:40 2021 +0800 + + * adjust for upgrade. + +commit e0068f3bdca2f925fb860383dc839c4e0f1c6a97 +Author: wangyidong +Date: Wed Apr 7 14:45:44 2021 +0800 + + * adjust for flow. + +commit 0ca7f575aa4fbea6904d4e25c2ce953dd4b354fc +Author: wangyidong +Date: Wed Apr 7 14:45:13 2021 +0800 + + * adjust upgrade. + +commit b94fa22b92812c2e4a0fb789e23b77d34d300006 +Author: leiyong <1549684884@qq.com> +Date: Wed Apr 7 09:45:03 2021 +0300 + + * Fix bug#11837. + +commit df6440c3d5d3e5a9dad6f82f69067771e861842b +Author: tianshujie98 +Date: Wed Apr 7 14:44:08 2021 +0800 + + * Fix bug #11855. + +commit 1fc283cdc08a2b4e203f2e7eec4886eb6ef483ab +Merge: bcabffb94b 5d21cfb236 +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 7 14:39:49 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bcabffb94b911b372d1b91dd78af54f25be2efd0 +Author: hufangzhou <746775970@qq.com> +Date: Wed Apr 7 14:39:46 2021 +0800 + + * Adjust the code. + +commit 5d21cfb236db5a101d1e2e8eecedafa35c2bbe1b +Author: Yagami <976204163@qq.com> +Date: Wed Apr 7 14:35:11 2021 +0800 + + * Fix priv bug. + +commit b50c55ffc2da9e543851fd1074b608ebd357dc71 +Author: Yagami <976204163@qq.com> +Date: Wed Apr 7 14:18:01 2021 +0800 + + * Fix project icon. + +commit 82df33e2056d10490aa22ed166a49bcaac49fc90 +Author: Yagami <976204163@qq.com> +Date: Wed Apr 7 14:12:06 2021 +0800 + + * Fix bug. + +commit 7dae38a2a3564fa25c872ecaea32b22e89c7cd1f +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 7 14:05:37 2021 +0800 + + * Finish task #37295. + +commit 4794f0cb0b6e63ce159f3fdedb064696b003a43a +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 7 13:54:23 2021 +0800 + + * Finish task #37114,37115. + +commit a892be6db366f1e22fb58c680ecf72ad1545bd77 +Author: leiyong <1549684884@qq.com> +Date: Wed Apr 7 08:26:52 2021 +0300 + + * Fix bug#11020,task#37298. + +commit 3e31b3961aa2f793297c89dc14a6b6c15b14ec1f +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 7 11:43:56 2021 +0800 + + * Finish task #37114. + +commit f385acc4b5ab56bacbd3ba08cc23a2e1e2ae4d41 +Author: holan20180123 <56391770@qq.com> +Date: Wed Apr 7 11:35:04 2021 +0800 + + * Finish task #37114. + +commit a2f2b2ca693fc784f36fa5b21266c4c523f6b7b1 +Author: leiyong <1549684884@qq.com> +Date: Tue Apr 6 11:48:40 2021 +0300 + + * Fix bug#6943. + +commit a09d9f3cf39d652ac5d8d036e12b092adbea80f9 +Merge: 6b7f84c9ac eaa478eaa4 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 6 15:58:51 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 6b7f84c9ac0d33fb48725fa7b6dac6fcaf9d6cd0 +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 6 15:58:48 2021 +0800 + + * Fix bug #11162, #11261. + +commit eaa478eaa4d54844f0d6ef43f0c12ad18aef11cc (tag: zentaopms_15.0.rc1_20210406) +Author: Yagami <976204163@qq.com> +Date: Tue Apr 6 14:43:01 2021 +0800 + + * Fix bug. + +commit 6e53b91a98feb7e5c8e5cb576c4e3e22e9241a96 +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 6 14:39:13 2021 +0800 + + * Delete blank space. + +commit d0de1bf57af0f5e9736650183d94235b8a709e76 +Author: Yagami <976204163@qq.com> +Date: Tue Apr 6 13:26:26 2021 +0800 + + * Fix code error. + +commit c4596e90faa6152ff3d06c1c310e57049eea839c +Author: qiyu-xie +Date: Tue Apr 6 13:20:58 2021 +0800 + + * Fix bug#11721. + +commit bb96f95cdd6efa8680a2b43af763afcf2f369e47 +Merge: 0d17fad58d e9a2d382ea +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 6 13:08:39 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 0d17fad58d76ee75def03c0c720edd053775f2ca +Author: hufangzhou <746775970@qq.com> +Date: Tue Apr 6 13:08:35 2021 +0800 + + * Adjust the product view style. + +commit e9a2d382ea85347026b8279216f3f59d52d12049 +Author: leiyong <1549684884@qq.com> +Date: Tue Apr 6 06:46:21 2021 +0300 + + * Fix bug#11151. + +commit d743f24768702e2abfc660ae6d2fdebb50d4e67c +Author: Yagami <976204163@qq.com> +Date: Tue Apr 6 11:42:47 2021 +0800 + + * Fix upgrade error. + +commit bbf02b0ce94de239c66cbcf369387f70139e7215 +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 6 11:27:29 2021 +0800 + + * Fix testcase view error. + +commit f5d16cda67bec4a68ba46d53a77816b590c88c0d +Merge: 8f5471ebe6 9442e1d82f +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 6 11:21:40 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8f5471ebe68b6484d6a982a71fc60ce4d228a503 +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 6 11:19:09 2021 +0800 + + * Fix bug #11006,#11058. + +commit 9442e1d82f8f2107efc2a528a4bee5acb740dd8b +Author: qiyu-xie +Date: Tue Apr 6 10:54:20 2021 +0800 + + * Fix bug#11741,#11740. + +commit 3e6d2d7d902cd2bfe1a1f6359f43e47a4d9a483f +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 6 10:41:28 2021 +0800 + + * Fix bug #6974. + +commit f393c16577c34c5e1210aeab4ac6f2e619f1c7a7 +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 6 10:40:53 2021 +0800 + + * Fix bug 6974. + +commit 1eb45527c7276543e938ffc9d24ac8aff113fe2c +Author: Yagami <976204163@qq.com> +Date: Tue Apr 6 10:23:28 2021 +0800 + + * Fix bug #11807. + +commit cdf037df3371ca432d01224df506d36baa6b1710 +Author: Yagami <976204163@qq.com> +Date: Tue Apr 6 10:19:17 2021 +0800 + + * Fix bug #11805. + +commit b72b709435e7c86e2d580c25ed12894cd0c957e1 +Author: leiyong <1549684884@qq.com> +Date: Tue Apr 6 05:00:16 2021 +0300 + + * Fix bug#11595. + +commit 45df4dea290c249e9972849a59b7bb15d4c13ae4 +Author: Yagami <976204163@qq.com> +Date: Tue Apr 6 09:41:30 2021 +0800 + + * Fix bug #11363. + +commit 4e779d7927812d598e9c08a6c8ac0f4c2995c01b +Author: holan20180123 <56391770@qq.com> +Date: Tue Apr 6 09:39:47 2021 +0800 + + * Fix bug #11168. + +commit a0f8e233f453b7586ed61703196bffaba0eeb7f9 +Author: Yagami <976204163@qq.com> +Date: Tue Apr 6 09:17:34 2021 +0800 + + * Fix makefile. + +commit 389fea1fb99a493f688c9d178647f29b68f9851a +Author: tianshujie98 +Date: Tue Apr 6 09:02:52 2021 +0800 + + * Adjust code. + +commit 3d94ff5abade0fb52b82359f0f3f045f549ccfc1 +Author: tianshujie98 +Date: Tue Apr 6 08:50:03 2021 +0800 + + * Fix bug #11250. + +commit 2aca8db0c2849932c57d4725213734d95315df45 +Merge: a675f8793f 2129484682 +Author: gxy +Date: Mon Apr 5 14:30:51 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f01dbe25377adb27230fd236dfa66bb0455919ef (tag: zentaopms_15.0.rc1_20210404) +Author: zhujinyong +Date: Sun Apr 4 08:07:24 2021 +0800 + + + Add version for doc view. + +commit 30ac187e827da2d35c9d19c57547022678eac1d1 +Author: zhujinyong +Date: Sat Apr 3 17:22:29 2021 +0800 + + * Fix line-height. + +commit eaf5ff87950f3832b2665e7374dd8a7181ff43ed +Author: zhujinyong +Date: Sat Apr 3 17:14:57 2021 +0800 + + * Fix openApp in doc. + +commit a67d020489c6fc096701993a8fbb01dc28c466b0 +Author: zhujinyong +Date: Sat Apr 3 16:49:34 2021 +0800 + + * Fix doc dashboard. + +commit 4db0c00089c2e70c23adc3ed284783de99901fd4 +Author: zhujinyong +Date: Fri Apr 2 23:44:23 2021 +0800 + + * Fix no content. + +commit 235f4359273af22d6ac530b980587df6395d1c8f +Author: zhujinyong +Date: Fri Apr 2 23:39:01 2021 +0800 + + * Fix empty doc library. + +commit bf9b8eb986cb8d6388d1cde2a4f34486ef42e977 +Merge: 9f2fb440fc 7391916108 +Author: zhujinyong +Date: Fri Apr 2 22:12:34 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 9f2fb440fcfc174e9bf92498c0e749afaa9c53ca +Author: zhujinyong +Date: Fri Apr 2 22:11:46 2021 +0800 + + * Fix doc menu of execution. + +commit 73919161083db0f910d58ca80b95dbcb2deb5f8b +Author: sgm0422 <976204163@qq.com> +Date: Fri Apr 2 21:01:35 2021 +0800 + + * Add en lang. + +commit 1a8a95c24daeb53a6106114da4642c91897d23cf +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 2 14:29:21 2021 +0300 + + * Fix bug#11783. + +commit 5c2a4ac1f419cc04a963652fef4f86ea93a1f750 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 17:53:06 2021 +0800 + + * Add en lang. + +commit 46173c8c0769293ddd6b005a1f9d38bf90f3d961 +Author: tianshujie98 +Date: Fri Apr 2 16:56:42 2021 +0800 + + * Fix an error. + +commit bd758a93598f207437336177dfa6989b229f2f3e +Merge: fa6076a51e 0d960a60d9 +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 2 16:55:18 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit fa6076a51ef2a0f32b3cd7934fb5e5de56d9a67e +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 2 16:54:53 2021 +0800 + + * Fix sort story list error. + +commit 0d960a60d9cf4bafafef47dfc45cb740644b47c0 +Merge: fa574273ac 7a31966244 +Author: wangyidong +Date: Fri Apr 2 16:46:08 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 7a319662442b1ac059d27094e9e146b4b86e6dce +Author: tianshujie98 +Date: Fri Apr 2 16:30:37 2021 +0800 + + * Modify the navigation highlight problem. + +commit ad614bf635d5388a2f58e4d6d16e72d9edc46b11 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 16:28:26 2021 +0800 + + * Fix recent block. + +commit 8169f83607cc3208c1167219a453e1a0361621db +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 2 11:14:25 2021 +0300 + + * Fix bug. + +commit 200e7e54203acdaf6e124851dd748f11f60a2e32 +Merge: 24a37ce4c3 1484a837b3 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 2 16:13:21 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 24a37ce4c302cc85b779a04e639048ccc3b71f4a +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 2 16:13:18 2021 +0800 + + * Fix a bug. + +commit 1484a837b36e8fdae866114a1c5b3dd79412bba2 +Merge: 0aa9ea65ed 5a92a2b063 +Author: zhujinyong +Date: Fri Apr 2 16:05:27 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 0aa9ea65edb13824bcc13f9075f3d93c736b755e +Author: zhujinyong +Date: Fri Apr 2 16:05:08 2021 +0800 + + * Ajdust doc view. + +commit fa574273ac1a1ef32a1db4cb2101012271e445ea +Author: wangyidong +Date: Fri Apr 2 15:54:43 2021 +0800 + + * adjust for upgrade. + +commit 5a92a2b063c3973056116f3fd76c465837948002 +Merge: a75c2cc69b c71f232391 +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 2 15:32:28 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c71f23239181b9181853e0414367f350d569bb76 +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 2 10:32:17 2021 +0300 + + * Fix bug. + +commit a75c2cc69b8bea6bed5adfdf1e107bb0354cb282 +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 2 15:32:16 2021 +0800 + + * Fix bug #11795. + +commit 9ea3e4d3a404f821db429a51e1482b3237ad7a0a +Merge: 4488de2725 e8a06d842e +Author: wangyidong +Date: Fri Apr 2 15:26:24 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 4488de2725e23fcd30deba1a2ac187fdd5eb889e +Author: wangyidong +Date: Fri Apr 2 15:26:08 2021 +0800 + + * adjust for priv. + +commit e8a06d842eaa73695fdd03096e103f09cacde259 +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 2 15:16:53 2021 +0800 + + * Fix bug #11792. + +commit 644f70a6058391a08b7c4f6122a9f475ca0f687d +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 15:07:12 2021 +0800 + + * Fix detail. + +commit 7e7af669a53db57143328ffdeb67fb12872ee70e +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 14:58:12 2021 +0800 + + * Fix doc. + +commit 054cb8a1ab461f16781972af018e6e60d4f7ce4d +Author: qiyu-xie +Date: Fri Apr 2 14:50:54 2021 +0800 + + * Fix bug#11789.11790. + +commit b39583f1d522adea14faee6ed2ab3f1412ab2c34 +Merge: 985736b1ae d046d0a2f8 +Author: zhujinyong +Date: Fri Apr 2 14:34:10 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 985736b1ae95a6bfbc56b56cbe060ac69d2260a9 +Merge: fd047654f1 47d8b743d5 +Author: zhujinyong +Date: Fri Apr 2 14:34:02 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d046d0a2f88699118fd8e306895c83bfd39e77eb +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 2 14:33:26 2021 +0800 + + * Fix bug #11770. + +commit fd047654f16f78d570bc8d8bd62334175330b3d7 +Author: zhujinyong +Date: Fri Apr 2 14:31:30 2021 +0800 + + * Ajdust doc module. + +commit 47d8b743d53c7a8e3251a3c63053270d9758952d +Author: tianshujie98 +Date: Fri Apr 2 14:29:40 2021 +0800 + + * Fix bug #11787. + +commit 24d456221243fa1ed5bc56fdc5d215419fa23fc8 +Author: tianshujie98 +Date: Fri Apr 2 14:23:14 2021 +0800 + + * Fix popup problem. + +commit 4012fc1c981e661b00e40726ae1ced53e7a41b86 +Merge: 1d2b25fb99 00ec6ab21a +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 2 14:19:32 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 1d2b25fb9963ab784b5d7f4dc5899dfcc3b984c7 +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 2 14:19:19 2021 +0800 + + * Fix bug #10448. + +commit 00ec6ab21a09eb0df18b0991b594b328a3abee8d +Author: qiyu-xie +Date: Fri Apr 2 14:13:23 2021 +0800 + + * Fix error for batch create stories in project. + +commit 266ea3e8d22d4261c4f577fc5eebbf9dbc42b3be +Merge: 4a64b9df82 1a026eaafd +Author: wangyidong +Date: Fri Apr 2 14:07:24 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 4a64b9df8220c2cc6cac94c313564dd0f72dad3c +Author: wangyidong +Date: Fri Apr 2 14:06:34 2021 +0800 + + * adjust for project browse style. + +commit 1a026eaafd580ef00520f589e8bf61c59d7289c6 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 14:02:21 2021 +0800 + + * Fix bug. + +commit a5687126dc86625df8f27be8829eec1f36c72dbe +Merge: 3adec91392 7ef4ddb4c8 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 2 13:53:05 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 3adec9139236d6d1b07f1346579f3ff3f79e8925 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 2 13:53:01 2021 +0800 + + * Adjust the product getSwitcher link for manage module. + +commit 7ef4ddb4c8b1242902f2792afb27aa5b2e937cc0 +Merge: 2c3f528673 6b924b4ea1 +Author: tianshujie98 +Date: Fri Apr 2 13:49:52 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2c3f52867380312622f7ec3b8e0faccaec754125 +Merge: b1d9b5d1d4 4f617ea6cc +Author: tianshujie98 +Date: Fri Apr 2 13:49:47 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 6b924b4ea1bd6de4d595892daf2faa5659265eba +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 13:47:40 2021 +0800 + + * Fix error. + +commit b1d9b5d1d46fb32d82cfbcfb0c099e774786b450 +Author: tianshujie98 +Date: Fri Apr 2 13:43:14 2021 +0800 + + * Solve the problem of adding projects to the classic version. + +commit 4f617ea6cc650990db0db1bcadb068f71776d93a +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 13:22:52 2021 +0800 + + * Fix bug. + +commit ded2d9809c3bae8f7d9d2bbdadbb1487ded77647 +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 2 13:22:01 2021 +0800 + + * Adjust width of story browse. + +commit fdeab69b16bf905aefebdeef91745bc2f6881f6a +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 2 08:14:56 2021 +0300 + + * Fix bug. + +commit b8d2feb650777b513860b93195906621f0fa8ab3 +Merge: 1df0e580c4 27c9c799f8 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 2 13:13:55 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 1df0e580c4ff75b8fd7be96d14fc2e23a3c04333 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 2 13:13:49 2021 +0800 + + * Fix bug #11765. + +commit 27c9c799f801779a97ad5a3c611c3809ded78ee8 +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 2 11:45:00 2021 +0800 + + * Finish task #11761. + +commit c21142e7907ead8a5177fbeaeceb3f38985cb418 +Author: qiyu-xie +Date: Fri Apr 2 11:43:32 2021 +0800 + + * Fix bug#11588. + +commit b09b2127637f36a3cebbff536a0146bdddb8d690 +Merge: c1c5924dce 8cdbba8b90 +Author: tianshujie98 +Date: Fri Apr 2 11:41:49 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8cdbba8b90d24edbb71f459b064946aac7f20b8e +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 11:41:28 2021 +0800 + + * Fix sql. + +commit c1c5924dcede4993ed7c0c7b289e159acad6db25 +Author: tianshujie98 +Date: Fri Apr 2 11:41:25 2021 +0800 + + * Modify language items. + +commit 4f37bb55b328b11d9e7d4505e95e2fc125015eca +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 11:29:18 2021 +0800 + + * Fix code error. + +commit 29ff136e758833e81474649d68978ddb6519ef7e +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 2 11:28:03 2021 +0800 + + * Fix bug #11773. + +commit 20d9fa61e3ee09afb555d8d7a39621ee17c83a19 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 11:21:51 2021 +0800 + + * Add create jenkins btn. + +commit dd82d7f284fc2cdfb1645fa21b1a02245c1a9ef9 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 11:18:11 2021 +0800 + + * Fix code detail. + +commit 9f94ef80fc44f5bb9273914027954b4b9a25372a +Author: tianshujie98 +Date: Fri Apr 2 11:15:23 2021 +0800 + + * Adjust block style. + +commit 22a353533ee68342fbcb2b9a02f9ca863b6d7a46 +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 2 06:14:21 2021 +0300 + + * Fix bug#11206. + +commit 244a51469376c3d5d56ca6b5d3fa16d58efa0e1e +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 11:12:44 2021 +0800 + + * Fix xuanxuan error. + +commit b2ebfd51611253c76b85a97d6ad9d696b8410c39 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 11:10:22 2021 +0800 + + * Add install mode. + +commit caec97f1b84540e0f81b5f3fd46ce661d6107be1 +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 2 11:08:31 2021 +0800 + + * Fix bug #11382., + +commit 2d13d75ee8485fec9acdbd363ded32d7531b523a +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 10:53:54 2021 +0800 + + * Fix nav group. + +commit 19e9c5a9a2b92e53f7630c284f083f03fddb2fc3 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 10:50:52 2021 +0800 + + * Fix lang file. + +commit b7eba909827756892c37e9de619afdc8b1f8d3f9 +Author: tianshujie98 +Date: Fri Apr 2 10:51:41 2021 +0800 + + * Fix an error. + +commit dd435a669d9e8a2007605e5980a78679dbaea406 +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 2 10:41:57 2021 +0800 + + * Fix bug #11732. + +commit a85e503194f42097d741eac156c8fecf0b677219 +Merge: af872d39a0 fc355d6acc +Author: tianshujie98 +Date: Fri Apr 2 10:40:23 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit af872d39a0f7c025f1cdeaac98c1cc88dfa3da63 +Author: tianshujie98 +Date: Fri Apr 2 10:40:03 2021 +0800 + + * Adjustment block. + +commit fc355d6acc438f9d8c92b81cf0b7616d795a926d +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 10:33:25 2021 +0800 + + * Fix story concept. + +commit 8183e3bec615a01f230419791244ae2df60346f8 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 10:25:18 2021 +0800 + + * Fix doc order. + +commit 894968c11c31c88dd04b6004ac63969ba8b8419f +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 2 05:23:48 2021 +0300 + + * Fix bug#11271. + +commit 60f23ddb508d2ba8eb5d4e89c7ca22b55b3eb6e7 +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 2 05:13:34 2021 +0300 + + * Adjust code. + +commit 5860b1522fb1c9b23c00207c8d1b821e7028a6d0 +Merge: 85bf27a775 fbbb3b65ad +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 2 10:07:15 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 85bf27a7757e99b1854ff6eec5388b58d1c10e74 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 2 10:07:12 2021 +0800 + + * Fix bug #11769. + +commit fbbb3b65ad900816ad48b4da8981e7e3b1440594 +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 2 04:56:53 2021 +0300 + + * Fix bug#11056. + +commit f66b27f71b509a10b857460f39e6438335580785 +Author: qiyu-xie +Date: Fri Apr 2 09:48:49 2021 +0800 + + * Adjust code style. + +commit 0beaa1a96881cc38da7d6c288c4d6f2f22005888 +Author: zhujinyong +Date: Fri Apr 2 09:45:09 2021 +0800 + + + Sdd a sidebar in doc module. + +commit 4c9f9536586a0fd757aab38a44aab6b4e1342acc +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 09:35:25 2021 +0800 + + * Fix version. + +commit 86da04ad79c35e65f7a2f6a21039a970646f9f4d +Author: Yagami <976204163@qq.com> +Date: Fri Apr 2 09:35:04 2021 +0800 + + * Add upgrade version. + +commit b697bccff196f119a00ea2560fd83cb94b638a4b +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 2 09:33:00 2021 +0800 + + * Adjust the required style. + +commit 65fbc9738578a4c0bf7e62e23eefd5c60930280c +Author: wangyidong +Date: Fri Apr 2 09:29:00 2021 +0800 + + * fix for create lib when create project. + +commit 17e88449590cc1a3f93f99cc2032c3c507a99cc1 +Merge: 75415b2956 5f888f7b3f +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 2 09:26:51 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 75415b29569c34a479e7aab73beff648e0e0e735 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 2 09:26:47 2021 +0800 + + * Fix an error. + +commit 5f09cddd86402c508de421284669fd91afb1657a +Author: wangyidong +Date: Fri Apr 2 09:26:25 2021 +0800 + + * fix error when create bug. + +commit 5f888f7b3fc0d7331abe6007352408048cb62fba +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 2 09:15:01 2021 +0800 + + * Delete unused code. + +commit e02c9cb584f8e498557c502aa6864ad50c61835d +Merge: 752f08b3aa 2de4e634a5 +Author: tianshujie98 +Date: Fri Apr 2 09:09:16 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 752f08b3aa9ca8d7a327394cd87e2a0fb57ea381 +Author: tianshujie98 +Date: Fri Apr 2 09:09:03 2021 +0800 + + * Fix an error. + +commit 2de4e634a56641c070e4a5b1ef0e58063c16111c +Merge: ba3305842f aff0afbe13 +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 2 09:01:30 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit ba3305842ff7c97931acaa553f4adf3b39d61fbf +Author: holan20180123 <56391770@qq.com> +Date: Fri Apr 2 09:01:14 2021 +0800 + + * Adjust product view style. + +commit aff0afbe139e50dcb3ac79f6636f68977121c42f +Merge: 94973e7a13 f897503c01 +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 2 09:01:09 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 94973e7a1336d4dbfdff8a4ab3d6011764934d4e +Author: hufangzhou <746775970@qq.com> +Date: Fri Apr 2 09:01:06 2021 +0800 + + * Fix bug #11196. + +commit f897503c016ea19ed151da729b775c05f16a7456 +Author: tianshujie98 +Date: Fri Apr 2 09:00:09 2021 +0800 + + * Fix an error. + +commit 1537ff53d0a896cd479b2df6fb221b1c99f70dc6 +Author: tianshujie98 +Date: Fri Apr 2 08:47:15 2021 +0800 + + * Add link. + +commit 8d5421e83e2da32e340f87f07b9ff4df177fa969 +Author: tianshujie98 +Date: Fri Apr 2 08:22:48 2021 +0800 + + * Modify card style. + +commit c158526a2cf2362d81b287a698959028d8387087 +Author: leiyong <1549684884@qq.com> +Date: Fri Apr 2 03:20:15 2021 +0300 + + * Fix bug#11470. + +commit e584b329f378df24b00e3cdf6a62a4a12ea40bd8 +Author: zhujinyong +Date: Fri Apr 2 07:42:28 2021 +0800 + + - Remove sidebar. + +commit 1a45ed22ac3aac4945ffed891a3dcb85c1b128df +Author: zhujinyong +Date: Fri Apr 2 07:33:26 2021 +0800 + + * Fix doc create. + +commit 0a33e2e6ed8ba6a6f7a52aba05305e095fe4602e +Author: zhujinyong +Date: Fri Apr 2 00:02:51 2021 +0800 + + * Fix doc module. + +commit e0e999b4ace246696ae0160922779f37fb1e47f6 +Author: wangyidong +Date: Thu Apr 1 20:07:59 2021 +0800 + + * fix bug #11726. + +commit 09cb13310f025c6fec74dfd1cd1b288b586d30c5 +Merge: aa3085e485 e97e88f0c5 +Author: wangyidong +Date: Thu Apr 1 17:52:49 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit aa3085e485769d819d3e44e5ec9867b21655c106 +Author: wangyidong +Date: Thu Apr 1 17:52:38 2021 +0800 + + * adjust for repo. + +commit e97e88f0c5c238a40a7be75eeef7875484dbfc94 +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 1 12:52:15 2021 +0300 + + * Adjust language items. + +commit cb2f4c314d257a67b5b9180c61cd714043e472da +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 1 12:49:10 2021 +0300 + + * Fix bug#11101. + +commit 690d4aa32a51c52c8b7978582527d13a9d083a1a +Merge: d0b6699671 fb25508394 +Author: tianshujie98 +Date: Thu Apr 1 17:40:46 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit fb255083940a94fe6690026992ba3c44e970d64b +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 1 17:40:23 2021 +0800 + + * Adjust user menu style. + +commit d0b6699671c270ba3f2839b8fc111ac4e9579974 +Author: tianshujie98 +Date: Thu Apr 1 17:40:15 2021 +0800 + + * Finish task#37020. + +commit 82cc3f6ce4e4841b2a2dcbfeccc14b9b6c1b73e8 +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 1 17:12:59 2021 +0800 + + * Finish task #37015. + +commit 50b77c9dcd228e5e832fbb6bd93a8346095656f7 +Author: wangyidong +Date: Thu Apr 1 16:53:00 2021 +0800 + + * remove hiddenwin in index page. + +commit de99085844663dd9f4cf7e0ba4872ac974fc5402 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 1 16:43:01 2021 +0800 + + * Fix bug #11699. + +commit 48706314d7c0366aea19f6ed8cedc2fadb6d4bd9 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 1 16:25:14 2021 +0800 + + * Fix bug. + +commit e61e846e2577696448448957ad28ed72df0dd4cd +Merge: 7d73cbb545 060ec76000 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 1 16:21:16 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 7d73cbb545dc681231251e9144d5ac38f8367ffe +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 1 16:21:12 2021 +0800 + + * Fix bug #11702. + +commit 060ec76000de9aa44ea7316c5d854f79c2831556 +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 1 11:07:22 2021 +0300 + + * Fix bug. + +commit 00e1922daa260de246c36df463e4ed39ced97e71 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 1 16:04:40 2021 +0800 + + * Fix error. + +commit a8272728aabd84ebcb83d2fbd27a99c1d8ab4db6 +Merge: 25ff7250b0 68688736b5 +Author: wangyidong +Date: Thu Apr 1 15:58:39 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 25ff7250b0ba1514b65e92694252a75c07bee8b6 +Author: wangyidong +Date: Thu Apr 1 15:57:58 2021 +0800 + + * fix bug #11630. + +commit 68688736b59e47123c8fa3fefb0555fbe9973a7c +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 1 15:56:30 2021 +0800 + + * Fix bug #11742. + +commit ee4864a30a7591f518c36d165b493792ac170350 +Merge: 24e7dd0e61 fb8100655a +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 1 15:48:24 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 24e7dd0e61974763890c4c128752c793477df366 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 1 15:48:18 2021 +0800 + + * Finish task #37035. + +commit fb8100655a1f486304dbbc69a43464ea21ffc533 +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 1 10:42:38 2021 +0300 + + * Fix bug#11593. + +commit 992ad08c1770372c4411a0d1413fbc927a4da71d +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 1 15:39:24 2021 +0800 + + * Fix bug #11743. + +commit 6dc76629cd055ad6ae703a11324fb163884cc7b1 +Merge: d8e8b86a98 c9c22cdecd +Author: wangyidong +Date: Thu Apr 1 15:36:22 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d8e8b86a989bfe3f650a1c211e7b8acd29dad3e1 +Author: wangyidong +Date: Thu Apr 1 15:35:40 2021 +0800 + + * fix bug. + +commit c9c22cdecda4e9f8f9d5a4e5029828c97040fa21 +Merge: e6849940e9 3dd13d66c5 +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 1 15:30:00 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit e6849940e9cb3bb2e2ff35c18c3d520b20e5c6a8 +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 1 15:27:55 2021 +0800 + + * Finish task #37015. + +commit 3dd13d66c5b2db5c546f2fe4542469c5d9592cf5 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 1 15:26:06 2021 +0800 + + * Fix upgrade logic. + +commit f5b246545570b6c08528bff3fbfadd813b52c741 +Merge: 7567d4436a dfe3c61c65 +Author: wangyidong +Date: Thu Apr 1 15:23:15 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 7567d4436a0bf5d94e7aafc0e7a42b523eb68231 +Author: wangyidong +Date: Thu Apr 1 15:23:01 2021 +0800 + + * fix error. + +commit dfe3c61c65ce8f020665285c3213796f89b6aa9d +Author: tianshujie98 +Date: Thu Apr 1 15:06:04 2021 +0800 + + * Reduction. + +commit e420af7ad70fd2e569c131a09a9249f4c8128c3b +Author: Yagami <976204163@qq.com> +Date: Thu Apr 1 15:00:34 2021 +0800 + + * Fix lang menu. + +commit abd8af87a66caf4ec52240307034de24257c8fc1 +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 1 09:57:12 2021 +0300 + + * Fix bug. + +commit b24b6a274425af98ca793fa7ede3125981aa8095 +Merge: fd65b4ac28 d935b46f4a +Author: wangyidong +Date: Thu Apr 1 14:53:00 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit fd65b4ac28f2051017a5fd991fa6ce046f81d459 +Author: wangyidong +Date: Thu Apr 1 14:52:02 2021 +0800 + + * fix bug #11115 + +commit d935b46f4a14e5458d9bda3af1796bcf47b9776b +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 1 09:34:13 2021 +0300 + + * Fix bug. + +commit 9db0c514170e070ac73695d18dd1749bb128407d +Author: qiyu-xie +Date: Thu Apr 1 14:33:21 2021 +0800 + + * Finish task#37029. + +commit 0f859343192c4c405fa22d6f0a2e2f1184d39c78 +Author: tianshujie98 +Date: Thu Apr 1 14:32:02 2021 +0800 + + * Finish task #37022. + +commit b899ebc57d0d68e93de4642443bc6571f711519a +Author: Yagami <976204163@qq.com> +Date: Thu Apr 1 14:29:37 2021 +0800 + + * Fix sql. + +commit 4769457a36fed329b3e8b1a0a236e21d860f5434 +Author: tianshujie98 +Date: Thu Apr 1 14:26:12 2021 +0800 + + * Finish task #37023. + +commit ac932f0ad62374829e4f241324497b8c1b341ed4 +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 1 09:24:03 2021 +0300 + + * Adjust caselib module. + +commit 1aac135eb5446854fa7aafb6fb5874b91c4ab243 +Author: tianshujie98 +Date: Thu Apr 1 14:21:41 2021 +0800 + + * Finish task #37024. + +commit c720a37e5514821ca4440b999c9958cfa53f86d5 +Author: tianshujie98 +Date: Thu Apr 1 14:13:11 2021 +0800 + + * Fix bug. + +commit 5458688995e4e8aa03e28933f0a3b7560ad1fed2 +Author: tianshujie98 +Date: Thu Apr 1 14:09:21 2021 +0800 + + * Fix bug. + +commit ef9dd85d0ad9d81b4ae844857b24e25bf0e75ce4 +Author: tianshujie98 +Date: Thu Apr 1 14:02:36 2021 +0800 + + * Finish task #37006. + +commit 458e7dfc4f91290ee28fd120df9fe2d6dcee0f04 +Author: qiyu-xie +Date: Thu Apr 1 13:56:15 2021 +0800 + + * Finish task#37036. + +commit b6a9d36280c2116be837a78e71866bc499996c48 +Merge: 29cb438eb7 71c4c72b64 +Author: tianshujie98 +Date: Thu Apr 1 13:50:46 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 29cb438eb737faf83b106eb249a076d9dc651af2 +Author: tianshujie98 +Date: Thu Apr 1 13:50:20 2021 +0800 + + * Modify language format. + +commit 71c4c72b6433fcc3efba70e8451c38c7a06e02fe +Merge: 256dadcacc a700423fa0 +Author: wangyidong +Date: Thu Apr 1 13:48:57 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 256dadcacc265bfede84a3d3742eea86d07636f8 +Author: wangyidong +Date: Thu Apr 1 13:48:35 2021 +0800 + + * fix bug #11631. + +commit a700423fa0b377489fbdfa29fcd3ebfb601c14d8 +Author: tianshujie98 +Date: Thu Apr 1 13:46:14 2021 +0800 + + * Modify the display problem of creating and editing project permissions. + +commit a6fe7fdf341f26e706517ea6877620cbd0163cef +Author: Yagami <976204163@qq.com> +Date: Thu Apr 1 13:43:57 2021 +0800 + + * Fix upgrade view. + +commit 810fce9f91d412d3e147b6404f2cd30977c453c4 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 1 13:42:10 2021 +0800 + + * Fix todo bug. + +commit ee9084699c721535404d7e2ce5da12a0be6cfc88 +Merge: 15de086ca7 187181eab1 +Author: wangyidong +Date: Thu Apr 1 13:39:00 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 15de086ca771b81652c159b72d4f8969ee4a2372 +Author: wangyidong +Date: Thu Apr 1 13:38:46 2021 +0800 + + * fix bug #11630. + +commit 187181eab175c75e44fd5327f9dc7703df5e25f3 +Merge: bddbc3d7d1 4075817079 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 1 13:37:34 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bddbc3d7d1d25e1a4c41b33356451d731050c9ab +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 1 13:37:30 2021 +0800 + + * Finish task #37053. + +commit 4075817079ef580987ef1d13e28b147e9103c91d +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 1 08:32:26 2021 +0300 + + * Fix bug#11528. + +commit 8606de7f22f3a2022a46034262511ea5ff79393c +Merge: 8da3e5ed4a 3d705f840b +Author: zhujinyong +Date: Thu Apr 1 13:29:38 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8da3e5ed4a6090c70c94ef27bb49d74d412db95d +Author: zhujinyong +Date: Thu Apr 1 13:29:11 2021 +0800 + + - Remove sidebar and header in doc module. + +commit 3d705f840b5a08b7b236c69c5371ac1bd5a44caa +Merge: 82062bbe8a 5becfb3e31 +Author: tianshujie98 +Date: Thu Apr 1 13:28:38 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 5becfb3e3155a40d345d3619191a3fd8768cd81a +Merge: 7739b36a32 261e7ddbdc +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 1 13:27:09 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 261e7ddbdc1382cd93f24725950b8cdddd6e271a +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 1 08:26:55 2021 +0300 + + * Fix bug. + +commit 7739b36a32c9816054d807954c8af064a2bfe480 +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 1 13:26:54 2021 +0800 + + * Finish task #37007. + +commit 82062bbe8a3b4d725910280a19da7736cce8320b +Author: tianshujie98 +Date: Thu Apr 1 13:26:13 2021 +0800 + + * The classic version mode lists the execution list. + +commit fb9051a7755a7b210d572eeed9b0eca71a6c4790 +Merge: 1bad944701 c0b03188a1 +Author: wangyidong +Date: Thu Apr 1 13:25:18 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 1bad9447016ecb9b86b73bae744d1cf78dd053d8 +Author: wangyidong +Date: Thu Apr 1 13:25:05 2021 +0800 + + * merge from 12.x. + +commit c0b03188a1dcaf02f608ca3e5d230caf84857545 +Merge: 5b1a279c3d 8b2787d2d4 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 1 13:24:59 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 5b1a279c3d1fef9ec063354996a81f98fdb661b2 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 1 13:24:56 2021 +0800 + + * Finish task #37041. + +commit 8b2787d2d47796c436b62939a9fd47526ddee1a1 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 1 13:24:08 2021 +0800 + + * Fix sql. + +commit 935689e392e87d856c6970e05a6cc565db9e6f85 +Author: wangyidong +Date: Thu Apr 1 13:23:40 2021 +0800 + + * fix bug #11629. + +commit 59ef1127099749c9a3a6f5c42c2a96614b1fc466 +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 1 13:22:03 2021 +0800 + + * Finish task #37013. + +commit dad8fc8e7fcc397e85876c2745b9a64107f4d564 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 1 13:20:17 2021 +0800 + + * Fix upgrade details. + +commit cca579705ed88f22931449b086a34dc54ed524cd +Author: Catouse +Date: Thu Apr 1 13:17:44 2021 +0800 + + * skip handle a[data-url] on click to prevent show blank page. + +commit 76d635f7ad5500d9930583021a2bea42fe785b06 +Author: Catouse +Date: Thu Apr 1 12:33:16 2021 +0800 + + * skip handle [data-tab] on click to prevent show blank page. + +commit be4a821aba69ac9727bdb0c3beb5a90d908fca41 +Author: Catouse +Date: Thu Apr 1 12:30:00 2021 +0800 + + * skip handle [target="hiddenwin"] on click to prevent show blank page. + +commit 88b7632ac0a0765cfa674f18ca72e596aeb81cf5 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 1 11:43:13 2021 +0800 + + * Fix bug. + +commit e8e1b40d97c12ae52a425f677d838748916254f2 +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 1 11:40:01 2021 +0800 + + * Finish task #37008. + +commit 4e545c0a402a2e328c76df8b658910cd2a369c75 +Merge: 57f7d592ad ff3bb25320 +Author: wangyidong +Date: Thu Apr 1 11:35:41 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 57f7d592ad5f0a96be88d13673224acfac0d64ff +Author: wangyidong +Date: Thu Apr 1 11:35:23 2021 +0800 + + * adjust for upgrade. + +commit ff3bb25320c2081ada322b8b0f39f26b44d9954c +Author: tianshujie98 +Date: Thu Apr 1 11:32:55 2021 +0800 + + * Sort products. + +commit eab73f9546df52560408011fba433d77905637e9 +Author: qiyu-xie +Date: Thu Apr 1 11:30:36 2021 +0800 + + * Finish task#37039. + +commit e3b61172352bc7cd2e5581db9c3bd96fadb8ceb5 +Merge: 75a531c422 b04ca379f2 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 1 11:27:57 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 75a531c422f842a3cc3d87dc5bca04148e0a8771 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 1 11:27:53 2021 +0800 + + * Finish task #37051. + +commit b04ca379f23ab6de722da398c79d215fb7df529b +Author: qiyu-xie +Date: Thu Apr 1 11:25:29 2021 +0800 + + * Finish task#37050. + +commit 840a91effd852c23bfbc7296f060b2eaf28da4be +Merge: 8f2b381f5a 437b79eeea +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 1 11:14:00 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 437b79eeea12217b0806cc52ee129c3084c1ee48 +Author: qiyu-xie +Date: Thu Apr 1 11:13:47 2021 +0800 + + * Fix bug. + +commit 8f2b381f5ac4e36d4503a16b4ed30c2a70661996 +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 1 11:13:32 2021 +0800 + + * Hide program setting in project list. + +commit 227c8642de73cbb48fc531fc80c1b7860ce191bc +Author: tianshujie98 +Date: Thu Apr 1 11:12:23 2021 +0800 + + * Fix product custom whitelist upgrade issue. + +commit b12efb31ef30cbbafb5f39a90d1d5eb8949e313a +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 1 11:07:11 2021 +0800 + + * Finish task #37004. + +commit d026b0ba559dcb8249f76833c57058dc0589a226 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 1 11:00:09 2021 +0800 + + * Fix bug #11044. + +commit c80f7b2197128ee71accd930368efffe22697c1a +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 1 10:57:29 2021 +0800 + + * Fix bug #11051. + +commit 44963152121cd442c77fc6382c1b43df8d8f2b21 +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 1 05:57:20 2021 +0300 + + * Fix bug#11462. + +commit 74a1d60d910b3f86996febdc3342ec19d06b5a37 +Author: qiyu-xie +Date: Thu Apr 1 10:55:35 2021 +0800 + + * Finish task#37011. + +commit 8daec0e8f5dc57c87e7bbf67351f69ee77b59a2f +Author: tianshujie98 +Date: Thu Apr 1 10:47:51 2021 +0800 + + * Finish task #37003. + +commit 066e0a58c65085eddfd4efb7597a1f4c4e4b06dc +Merge: 14b00b3a58 7378c1d3b0 +Author: wangyidong +Date: Thu Apr 1 10:45:03 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 14b00b3a58b1adbd257f07a24ad626ef44d21632 +Author: wangyidong +Date: Thu Apr 1 10:44:49 2021 +0800 + + * fix bug #11454. + +commit 7378c1d3b0882bbb62a271c4cbad178086e1ccb0 +Merge: 2e6c336522 c9fb6d16c5 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 1 10:37:15 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2e6c336522eb9b04bae532bf446e968d62818515 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 1 10:37:12 2021 +0800 + + * Fix a bug. + +commit c9fb6d16c572c018089e994a9b3b344fe1a1a161 +Merge: c723069c1b f664192bbf +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 1 05:36:35 2021 +0300 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c723069c1bd0d690343e085c26c90b7a2d8048b3 +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 1 05:36:30 2021 +0300 + + * Fix bug#11644. + +commit f664192bbffd9bc14f857cb24259fe2b1becc480 +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 1 10:35:44 2021 +0800 + + * Fix bug #11729. + +commit 70553ac61d0b2314bbc68740b53673da87135a41 +Merge: 9d3c37f493 7558efce21 +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 1 10:35:23 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 9d3c37f49367fdaaf341f9d0e2107f312863846d +Author: hufangzhou <746775970@qq.com> +Date: Thu Apr 1 10:35:19 2021 +0800 + + * Fix a bug. + +commit 7558efce21c801d27f9eedc9370d70a049aa6888 +Merge: dbbd31f861 a1b0346114 +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 1 10:32:51 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit dbbd31f861d70a000bb950d8c59ff097be242580 +Author: holan20180123 <56391770@qq.com> +Date: Thu Apr 1 10:32:39 2021 +0800 + + * Finish task #37012. + +commit a1b034611484b14e1bff52a98cf262cc6be06564 +Author: wangyidong +Date: Thu Apr 1 10:32:12 2021 +0800 + + * fix error. + +commit 94045515a0a4bc565f80eafac5a73038885fabc4 +Author: wangyidong +Date: Thu Apr 1 10:26:52 2021 +0800 + + * fix bug #11064. + +commit a741a53553d649232d80d01d10b4e520b6699310 +Merge: 2df46bb90d 859bf0986f +Author: wangyidong +Date: Thu Apr 1 10:22:04 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2df46bb90d40001fa2cd0bc59ddf6cf915e35d0e +Author: wangyidong +Date: Thu Apr 1 10:21:36 2021 +0800 + + * fix bug #11145. + +commit 859bf0986fe8338eb6d7580f880d3ecdc929f141 +Author: tianshujie98 +Date: Thu Apr 1 09:28:29 2021 +0800 + + * Fix bug #11317. + +commit 98b0f084ad66f70d739708b09ec7a2a7519db35f +Author: tianshujie98 +Date: Thu Apr 1 09:25:16 2021 +0800 + + * Fix bug #11663. + +commit 81e67145b643a4fabfa9a45e594fbf4ab33a0f7a +Author: Yagami <976204163@qq.com> +Date: Thu Apr 1 09:23:07 2021 +0800 + + * Fix bug #11388. + +commit 64c1fe32e4da0a32bb3f993a93cb727240c40569 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 1 09:09:49 2021 +0800 + + * Replace waterfall lang. + +commit 6b518a55d76806a3e5b8e5809abbbfd9baad97ca +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 1 04:01:41 2021 +0300 + + * Fix bug. + +commit 918999b58b2b85e6f4b09157127853b7b0320ca6 +Author: zhujinyong +Date: Thu Apr 1 08:53:01 2021 +0800 + + * Fix testcase copy. + +commit b201a2137bba732e382fc39ae567c32c42488f34 +Merge: 3a03f8b613 6689b67538 +Author: zhujinyong +Date: Thu Apr 1 07:53:15 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 3a03f8b613e19a64e6c5edf25fb67444df6d0bbf +Author: zhujinyong +Date: Thu Apr 1 07:52:56 2021 +0800 + + * Fix menu switch. + +commit 6689b67538c2bd18605a519d8b1107de332c98d2 +Author: wangyidong +Date: Wed Mar 31 17:37:53 2021 +0800 + + * fix bug #11468. + +commit f381544c6fd727e1226831a08af0fd73e601e492 +Merge: a265197bb9 e17648144b +Author: wangyidong +Date: Wed Mar 31 17:33:40 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit a265197bb9a9114a457099bc4c379135d26839a6 +Author: wangyidong +Date: Wed Mar 31 17:33:06 2021 +0800 + + * fix bug #11467. + +commit e17648144b2134149d14f34c5dc34547c6e1b0db +Merge: 4c73b6a489 2296b03083 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 31 17:15:51 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 4c73b6a489a9e0e973c0a305d4baae600b2f4496 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 31 17:15:33 2021 +0800 + + * Adjust hour unit. + +commit 2296b03083f1df0c786d536e0be747dc5219728d +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 31 12:15:23 2021 +0300 + + * Adjust code. + +commit 4b37af11aaefad5676f2239a96542e31cb2a9c06 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 31 17:07:43 2021 +0800 + + * Fix lang. + +commit ad5f261a37495355b349acda973634d0cf001eb8 +Merge: 2537dd035b 32ce91bdde +Author: wangyidong +Date: Wed Mar 31 17:04:56 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2537dd035bb4c625e95aede14ba5c9135849eb19 +Author: wangyidong +Date: Wed Mar 31 17:04:11 2021 +0800 + + * fix bug #11352. + +commit 32ce91bdded1dafbb6a1845aa720e2f8aceb528b +Author: Yagami <976204163@qq.com> +Date: Wed Mar 31 17:02:10 2021 +0800 + + * Comment unused code. + +commit eeeca403d7f0e59739a3763a0ee1fd9e93a40256 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 31 17:00:56 2021 +0800 + + * Fix menu. + +commit e9f83475062e0932ab4303bd024cd05598db8a65 +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 31 11:58:18 2021 +0300 + + * Fix bug#11645. + +commit 1c9260eeca32c34fac225746450f5728c416499d +Merge: 5dd5f12b1f b1c24577ee +Author: wangyidong +Date: Wed Mar 31 16:49:56 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 5dd5f12b1f37ce4604bf3ca3f4f6a42096867ca8 +Author: wangyidong +Date: Wed Mar 31 16:49:34 2021 +0800 + + * fix bug #11115. + +commit b1c24577eed6551418f888f58e71ab39ecd3afe2 +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 31 11:49:23 2021 +0300 + + * Fix bug, + +commit 7b971221a4e9f20174938a3bc6584a313617aad7 +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 31 11:47:56 2021 +0300 + + * Fix bug#11646. + +commit eddd75f15af6c36813ae3e5d21ed965fa887da88 +Author: tianshujie98 +Date: Wed Mar 31 16:32:06 2021 +0800 + + * Fix bug #11157. + +commit 27317517dc8f22d38f1fd310297940d389175ea1 +Merge: 0a32be6e2e 819cec83ed +Author: wangyidong +Date: Wed Mar 31 16:27:40 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 0a32be6e2e729add5851e46aeea4f081c55a26ce +Author: wangyidong +Date: Wed Mar 31 16:27:26 2021 +0800 + + * fix bug #11064. + +commit 819cec83ed37f07175d32721811869e69978482c +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 31 16:26:48 2021 +0800 + + * Finish task #37010. + +commit 2b8d2a25039ef64a9f220d204d770da2687d02d5 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 31 16:24:24 2021 +0800 + + * Finish task #37002. + +commit 74a05d5e60b52524fedc9eb3e217c4af4101b5e1 +Merge: 66cee22b67 623ce6b32f +Author: wangyidong +Date: Wed Mar 31 16:12:50 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 66cee22b6743c3ef754da01c2a7301b74b85666b +Author: wangyidong +Date: Wed Mar 31 16:12:35 2021 +0800 + + * fix bug #11145. + +commit 623ce6b32f691720e2ecf925cfa596a08f34835b +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 31 11:12:25 2021 +0300 + + * Fix bug#11695. + +commit 9a010bf5ef48536c79ad0a93bc836f002a8f1137 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 31 16:08:35 2021 +0800 + + * Finish task #37126. + +commit 23d3e60c07c4c3326da72bfce00e86f166380391 +Merge: d966b2e214 06209850d5 +Author: zhujinyong +Date: Wed Mar 31 16:07:34 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d966b2e214ee2aab4579082aaff7868c48f32ee7 +Author: zhujinyong +Date: Wed Mar 31 16:07:11 2021 +0800 + + * Ajdust openApp logic. + +commit 06209850d5473941d066ff2819f08111220c0269 +Author: tianshujie98 +Date: Wed Mar 31 16:04:09 2021 +0800 + + * Fix bug #11132. + +commit a3e739956601824e3e3db9976d7e51156db7564a +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 31 15:51:06 2021 +0800 + + * Finish task #37027. + +commit 209b7a43b8f0d392b520c8439ba42debe3e55acd +Author: wangyidong +Date: Wed Mar 31 15:44:24 2021 +0800 + + * fix bug #11142. + +commit bd991f876e9410844e307c84bf4cc87b691be815 +Merge: 23fef68818 fcab5dd888 +Author: wangyidong +Date: Wed Mar 31 15:33:20 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 23fef6881870c6edb7ba17e0d48049675733cab7 +Author: wangyidong +Date: Wed Mar 31 15:33:03 2021 +0800 + + * fix bug #11131. + +commit fcab5dd888929b9b9ff8ed7eb94cb675fc0124b0 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 31 15:28:13 2021 +0800 + + * Fix bug #11300. + +commit be58f2de18db44855f04b7113babf615ddbb41ee +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 31 15:11:37 2021 +0800 + + * Adjust header menu style. + +commit bfe5c251cc030400bb49d2b70df01a5730a9f651 +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 31 10:11:07 2021 +0300 + + * Fix bug#11701. + +commit 7f359558c131440bafbe49ff84695193382d70f5 +Merge: 1f66357244 a859c4d23b +Author: tianshujie98 +Date: Wed Mar 31 15:10:20 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 1f66357244a67b7f23058b093b448a83844c26ef +Author: tianshujie98 +Date: Wed Mar 31 15:09:50 2021 +0800 + + * Fix bug #11015,11024. + +commit a859c4d23b9f437199f4f8cad8bf2dda53c8ec06 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 31 14:51:16 2021 +0800 + + * Adjust user menu style. + +commit 6d0d0141283b77ade489e6010370afad8b0e2f5c +Merge: 5763f0725f 287af9adf7 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 31 14:48:46 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 5763f0725f8ecfa3f79364b0699e37ca19761cca +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 31 14:48:42 2021 +0800 + + * Fix bug #11709. + +commit 287af9adf78699c0e2e375e1c712ac9a61940861 +Author: Catouse +Date: Wed Mar 31 14:44:03 2021 +0800 + + * fix some dialog shake caused by size changed on load. + +commit 10766ec2b2d0707e726a83c0a239cec81dfcdb9f +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 31 14:37:39 2021 +0800 + + * Adjust header style. + +commit 6997ad43af5a2499e0ff594cde566dfc54082e70 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 31 14:28:09 2021 +0800 + + * Fix bug. + +commit 72e975cbc7f6f2a5b955814502b8e81dbbe70a24 +Merge: b18abc006e 599c274c52 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 31 14:22:39 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b18abc006ef748c3a975682f1763eb381d75a13a +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 31 14:22:36 2021 +0800 + + * Fix bug #11706. + +commit 599c274c521f4363f7332ea85b8c64aa174a9a76 +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 31 09:19:03 2021 +0300 + + * Fix bug#11708. + +commit 6a349c336664d6d6db1fffd4dd0d16ca0edc0f2c +Merge: bf9d1737ff 84baa56389 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 31 14:04:58 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bf9d1737ff65be618701cf73ed876b108e06f808 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 31 14:04:54 2021 +0800 + + * Fix bug #11681. + +commit 84baa563894237f11dd3e73455b4f6ea0e954b29 +Author: qiyu-xie +Date: Wed Mar 31 14:00:57 2021 +0800 + + * Fix bug#11707. + +commit a8051fdbfec14f81797a59fd23569e1b193f9b6a +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 31 08:54:43 2021 +0300 + + * Adjust automation module. + +commit 399daad442566d8db5183ef0ea6666d492fa20c5 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 31 13:51:39 2021 +0800 + + * Fix bug #11257. + +commit 21ab7ec3b21d579563ce15b4bdb197feafa7c286 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 31 13:43:55 2021 +0800 + + * Finish task #37030. + +commit 17961041ca0fc6be17691aa56ebcf4a29ff6b191 +Merge: faf5134ab3 a6bf76a326 +Author: wangyidong +Date: Wed Mar 31 13:42:00 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit faf5134ab3a82360ae145ef62a8ecfbe887a9f34 +Author: wangyidong +Date: Wed Mar 31 13:41:37 2021 +0800 + + * fix bug #11064. + +commit a6bf76a3263eb7fa17decbe683f904ea97630230 +Author: Catouse +Date: Wed Mar 31 13:36:14 2021 +0800 + + * use $.apps.open instead of browser navigation on click links in pages. + +commit 71de6b2e96fd048046fc3a939ef49daa3732b623 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 31 13:33:59 2021 +0800 + + * Fix bug. + +commit 84166afde0f78062f1fcdfa199297d893a3c3957 +Merge: ea9cc9cb2f e325f99179 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 31 13:22:59 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit ea9cc9cb2f3cfc188b06dbb1dcf51a3598d3d9b8 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 31 13:22:46 2021 +0800 + + * Finish task #37099. + +commit e325f991793678cc6a44db8955e22876d8d535ce +Author: qiyu-xie +Date: Wed Mar 31 13:05:25 2021 +0800 + + * Fix bug#11057. + +commit 00093da4e89d9169afcae3b063b95cad12c13ad7 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 31 11:44:30 2021 +0800 + + * Fix bug #11698. + +commit b75fa5c4a2105a94950208d5457f3f7ad4685dba +Merge: 8270948126 b69c4a9a2a +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 31 11:35:18 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8270948126243a985fe2f6f89a2a5471a8f7224c +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 31 11:35:10 2021 +0800 + + * Fix a bug. + +commit b69c4a9a2a0307a276906ad6793a56ac650c85d2 +Merge: bbda48740f 647e3db31d +Author: wangyidong +Date: Wed Mar 31 11:31:08 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bbda48740fe16fe187762b96113d8bb2ad5c6d99 +Author: wangyidong +Date: Wed Mar 31 11:30:52 2021 +0800 + + * fix bug #11040. + +commit 647e3db31d91410ebd4b8035e84c24ecb7782bb5 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 31 11:16:23 2021 +0800 + + * Fix bug. + +commit d9910cc561df7bb4e53046256a104b5e658f54f2 +Author: Catouse +Date: Wed Mar 31 11:08:24 2021 +0800 + + * change minWidth to 250px for #dropMenu again. + +commit 95dcb759e05756ffed8c268e245cc247a008314c +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 31 11:02:09 2021 +0800 + + * Finish task #37103. + +commit 383649543749cae9bc45947657b5296a862db8ee +Author: Catouse +Date: Wed Mar 31 11:00:51 2021 +0800 + + * change minWidth to 250px for #dropMenu. + +commit 5c59c161e52ee5b2c9bb8e418606cccc0d5f74d2 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 31 10:57:28 2021 +0800 + + * Fix bugs. + +commit 810ef4a465a44237660adba51507890305080686 +Author: qiyu-xie +Date: Wed Mar 31 10:51:11 2021 +0800 + + * Fix bug#11660. + +commit 40d1401dcad2ba32c6fe5ee22117797b1bd04e75 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 31 10:41:39 2021 +0800 + + * Finish task #37111. + +commit 2034dbd3a3384c9ac4b642e71378557c6dc8c5a5 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 31 10:40:41 2021 +0800 + + * Fix bug #6954. + +commit cb439b1102765de2e310799040345241edbac029 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 31 10:24:40 2021 +0800 + + * Fix menu. + +commit 8e0491c487b8a2dd9deaa6fadbe02869f6176df3 +Merge: ddf27f277d 7db80d5dac +Author: wangyidong +Date: Wed Mar 31 10:39:13 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit ddf27f277df3e9176a0cae00a62a06758700644c +Author: wangyidong +Date: Wed Mar 31 10:38:52 2021 +0800 + + * fix bug #10996. + +commit 7db80d5dac2ac1f095135ce5604a75f737b26912 +Merge: 57d5f81c94 dd2c894dd6 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 31 10:19:36 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 57d5f81c94dfc42514131d7540d7993fb2b3b584 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 31 10:19:33 2021 +0800 + + * Adjust the case run icon. + +commit dd2c894dd6ef5499336a6b3a620c7834db757756 +Merge: 815043b8e9 a5b385fd9e +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 31 10:15:39 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 815043b8e9bc680c1ff6c0eaa3d90bf08d769651 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 31 10:15:07 2021 +0800 + + * Finish task #37128,#37127. + +commit a5b385fd9ef287676f11c62957a3e780a5549e83 +Merge: 09f19877a3 b77bce3a56 +Author: zhujinyong +Date: Wed Mar 31 10:11:37 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 09f19877a3993b3c9946429979cf18ffe030f87c +Author: zhujinyong +Date: Wed Mar 31 10:11:21 2021 +0800 + + * Fix language. + +commit b77bce3a5661a126e49892c2a9702e1676b71c93 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 31 10:10:23 2021 +0800 + + * Fix lang. + +commit abb944c6b7f7e407976ac727899231779208dab0 +Merge: a321030c63 bf327f58d2 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 31 09:58:10 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit a321030c637927a055fdae91aff127d86a293cc8 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 31 09:58:06 2021 +0800 + + * Fix bug #11674. + +commit bf327f58d211c17bf26a17c78d8c8e403c0f52fb +Author: Yagami <976204163@qq.com> +Date: Wed Mar 31 09:55:35 2021 +0800 + + * Fix bug #11526. + +commit b5eb595b0566b485da8cfed2f0f0e12c0037fe9f +Author: Yagami <976204163@qq.com> +Date: Wed Mar 31 09:50:42 2021 +0800 + + * Fix bug. + +commit b3b4d748b9ba5e87f84e81be2ba7c81caf122e74 +Merge: 68cef1c44d 553e6f549b +Author: tianshujie98 +Date: Wed Mar 31 09:49:20 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 553e6f549b1a8705465e10eaea2e20505be4376c +Merge: 5f68e5e31d f06361ffcc +Author: zhujinyong +Date: Wed Mar 31 09:49:02 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 5f68e5e31de93362f468e3244bd91675ceb95c6a +Author: zhujinyong +Date: Wed Mar 31 09:48:37 2021 +0800 + + * Fix bug#11690. + +commit 68cef1c44d7659e7c344aa24c14c3c8e3a900388 +Author: tianshujie98 +Date: Wed Mar 31 09:48:35 2021 +0800 + + * Fix bug #11689. + +commit 4e6133b733278b4a37852de459ac7c9b7f455090 +Merge: b994732b32 f06361ffcc +Author: tianshujie98 +Date: Wed Mar 31 09:48:30 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f06361ffcc33bb21fa586e4887676d199312b849 +Author: qiyu-xie +Date: Wed Mar 31 09:28:54 2021 +0800 + + * Fix bug#11665. + +commit afed7e78107232058f19dbeebcd0c0117dcac3de +Author: Catouse +Date: Wed Mar 31 09:23:06 2021 +0800 + + * fix chosen drop_direction=auto not work as expect. + +commit b994732b3289f5981df09f457c26017bef87d47b +Author: tianshujie98 +Date: Wed Mar 31 09:21:51 2021 +0800 + + * Fix bug. + +commit b734b5edccacc6d264d4a82ea398efea6caed8c3 +Author: tianshujie98 +Date: Wed Mar 31 09:15:01 2021 +0800 + + * Fix bug #11019. + +commit c142160044eaeb2ebc55b598db1454f8400f2d56 +Author: zhujinyong +Date: Wed Mar 31 09:13:06 2021 +0800 + + * Init object. + +commit 1e840b3266c07dd037a72a8ec054effcead0b52e +Author: Yagami <976204163@qq.com> +Date: Wed Mar 31 09:12:33 2021 +0800 + + * Fix bug #11469. + +commit 4f06701f6dedb1810f04614ce394583615d1ec8e +Author: qiyu-xie +Date: Wed Mar 31 09:11:41 2021 +0800 + + * Fix bug#11680. + +commit e61b1780f68090110cd1041eb66599d210820840 +Merge: bba3ca17c9 ba7ad3fc70 +Author: wangyidong +Date: Wed Mar 31 08:58:00 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bba3ca17c9b6a59d9f0ce67c14afe9c0ce0eb2a6 +Author: wangyidong +Date: Wed Mar 31 08:57:44 2021 +0800 + + * fix bug #6347. + +commit ba7ad3fc70855a704064c2abe6b74871cde011fd +Merge: e1b120bb0a 512ed4e390 +Author: tianshujie98 +Date: Wed Mar 31 08:21:11 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit e1b120bb0ae9d8eaf590c24a9842aa859ac3653c +Author: tianshujie98 +Date: Wed Mar 31 08:20:50 2021 +0800 + + * Fix bug. + +commit 512ed4e390163511427c2f5ee91d0cb280dc9264 +Author: Catouse +Date: Tue Mar 30 17:45:41 2021 +0800 + + * improve UI of main menu. + +commit d48d481888744c89686f6b0e73b5496c8a8cd531 +Author: Catouse +Date: Tue Mar 30 17:37:39 2021 +0800 + + * refactor: adjust alignment. + +commit b64bd42f8afbc915902c2ae1dfb67400c7132729 +Author: Catouse +Date: Tue Mar 30 17:32:32 2021 +0800 + + * refactor: comment. + +commit 216275f06acb54d10712400f5f1ba780f76504f3 +Author: Catouse +Date: Tue Mar 30 17:29:46 2021 +0800 + + * hide #menuMoreList on click items on it. + +commit 81d36e38b203b8ea9a7b21c99372d3e225db94cf +Merge: 8fead581a7 eb00b3a8cc +Author: wangyidong +Date: Tue Mar 30 17:06:54 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8fead581a722f689c9f59adadc3c939abe8324df +Author: wangyidong +Date: Tue Mar 30 17:04:59 2021 +0800 + + * revert Makefile and kindeditor. + +commit eb00b3a8cc9d696ba15d21e1da2dd8581cf56533 +Merge: 2ad6666fa9 d3063479fb +Author: tianshujie98 +Date: Tue Mar 30 16:59:03 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2ad6666fa9df64e6f19b2f47da0cf5898db92c3f +Author: tianshujie98 +Date: Tue Mar 30 16:58:44 2021 +0800 + + * Fix bug #11035. + +commit d3063479fbbaaff03936f00db152a448c8d2de96 +Author: Catouse +Date: Tue Mar 30 16:57:19 2021 +0800 + + * update icon-program. + +commit ff8880541e221996c0f4991aa99c24f860dc108b +Merge: 87cecd7fc5 9a48bd1ce8 +Author: zhujinyong +Date: Tue Mar 30 16:56:42 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 87cecd7fc57e659c459ef0c0b5e59271e727a32c +Author: zhujinyong +Date: Tue Mar 30 16:56:23 2021 +0800 + + * Use openApp instead of 'from'. + +commit 9a48bd1ce814889b6282e51b6f0f0198fd477244 +Merge: 34347209e9 21729df3ce +Author: wangyidong +Date: Tue Mar 30 16:55:30 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 34347209e917207dbee93fc769fa190ec2b12888 +Merge: 5e98a02375 53ef76a7c7 +Author: wangyidong +Date: Tue Mar 30 16:53:37 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 21729df3ce7f543916f8d67d3e895f3fb5b5ddf2 +Author: qiyu-xie +Date: Tue Mar 30 16:51:53 2021 +0800 + + * Fix bug. + +commit 5e98a023757e60af128cc06f7e86ac048696b752 +Author: wangyidong +Date: Tue Mar 30 16:41:22 2021 +0800 + + * finish task #36745. + +commit 53ef76a7c7e9760820cff88f34a32897519948ec +Author: tianshujie98 +Date: Tue Mar 30 16:41:15 2021 +0800 + + * Fix an error. + +commit 7b39ef98eadfc204a845cdc9842ebcfdea714e74 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 30 16:34:03 2021 +0800 + + * Finish task #11393. + +commit ea88a0bf9dc9343cbb805edb1739effb7421889b +Author: zhujinyong +Date: Tue Mar 30 16:34:19 2021 +0800 + + * Fix doc view. + +commit d371f402fcf282f328764f0d4ae185ff3a9a9072 +Author: qiyu-xie +Date: Tue Mar 30 16:28:05 2021 +0800 + + * Finish task#37011. + +commit 2295ffd01ccfba3b6cac9d0f0469583594e179f5 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 30 16:26:06 2021 +0800 + + * Fix block link. + +commit b291e3138cbff73ebacfd861df3f2ba25b626d1e +Merge: 5f646301eb 7dd002e764 +Author: tianshujie98 +Date: Tue Mar 30 16:24:58 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 5f646301ebd08b16e519d0e09ca400c0c275c881 +Author: tianshujie98 +Date: Tue Mar 30 16:24:35 2021 +0800 + + * Fix bug #11046. + +commit 7dd002e764f7fb9d97c1c52e7ef86ff475e1bfc8 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 30 16:14:44 2021 +0800 + + * Hide execution qa priv. + +commit c5031c82160fad3fd689059ecfe33ec4cc10ba7f +Author: Yagami <976204163@qq.com> +Date: Tue Mar 30 16:13:08 2021 +0800 + + * Fix code. + +commit 6fe0d38959a51b301d3c7e37238252842d39ab33 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 30 11:06:09 2021 +0300 + + * Adjust code. + +commit 04b84b54c9e858b5cf5ae7075e24dd11da5ebe8c +Merge: e55a7c8a4a 5a66f76019 +Author: zhujinyong +Date: Tue Mar 30 16:03:52 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit e55a7c8a4a2a9054820bd35c0f46cdf47365a44b +Author: zhujinyong +Date: Tue Mar 30 16:03:11 2021 +0800 + + * Fix copy bug. + +commit 5a66f76019695b0dae2f360790f8ad20d054f34f +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 30 15:46:07 2021 +0800 + + * Adjust long time project. + +commit 795b2aa045a6e92ac200ede54afcbef448ed2730 +Author: qiyu-xie +Date: Tue Mar 30 15:44:31 2021 +0800 + + * Fix bug. + +commit ac7703524057b0a1ef158106d453aa610d6178c2 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 30 15:40:11 2021 +0800 + + * Finish task #37098. + +commit 2c1d41da05f6c1e79fdd5ad275e776f18d14f4f1 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 30 15:36:25 2021 +0800 + + * Finish task #37096. + +commit 82142502e60d0f172cbf9259c7812db3dd8900bc +Author: tianshujie98 +Date: Tue Mar 30 15:35:24 2021 +0800 + + * Fix a bug. + +commit 975090d0e59481aee902f2930190af8c458f7665 +Author: tianshujie98 +Date: Tue Mar 30 15:22:04 2021 +0800 + + * Fix bug #11051. + +commit 93c412a48a8928a10d966570dc8b75d7cae4bbf7 +Merge: b53cae0ce6 7613b58cd2 +Author: zhujinyong +Date: Tue Mar 30 15:21:13 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b53cae0ce61f910671cfb830d88bd9c6505f00e4 +Author: zhujinyong +Date: Tue Mar 30 15:20:35 2021 +0800 + + * Fix bug: copy bug from project and execution. + +commit 7613b58cd2e35c47f2e2d4eff922fb7acadc7067 +Author: qiyu-xie +Date: Tue Mar 30 15:18:09 2021 +0800 + + * Fix bug#11149. + +commit a034f1fb4cfdb5c0cb5c4d9e9452b021a5ed4109 +Author: tianshujie98 +Date: Tue Mar 30 15:09:19 2021 +0800 + + * Fix bug #11065. + +commit 203ac45623343a0fc0ef00287761b0319857a1e2 +Merge: eb73c2f8fc 467bfd85b8 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 30 15:09:01 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit eb73c2f8fce01bd103a1d904cbf2fe09c2b412b1 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 30 15:08:47 2021 +0800 + + * Finish task #37098. + +commit 467bfd85b8ef75d1d7178ba8a3020f95bd7e06c2 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 30 10:02:44 2021 +0300 + + * Adjust code. + +commit 54f66b88e7eeeb5fa4a81c0734f80c2ea3fc04cd +Author: tianshujie98 +Date: Tue Mar 30 14:56:13 2021 +0800 + + * Fix bug #11093. + +commit 424a1cf2f0fa585652c20a3164e621821b98e6e6 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 30 14:52:13 2021 +0800 + + * Finish task #37126. + +commit 2f92f44ba015f3933f1855d365306c34a0385dbf +Author: qiyu-xie +Date: Tue Mar 30 14:46:43 2021 +0800 + + * Fix bug. + +commit 8b17c0addae12d01548038602bd184050eeac4d7 +Author: Catouse +Date: Tue Mar 30 14:42:36 2021 +0800 + + * fix auto jump for apps not work as expect. + +commit 118e255325314b5ecfab66acbd083f6afc76bd1f +Author: Yagami <976204163@qq.com> +Date: Tue Mar 30 14:41:34 2021 +0800 + + * Fix bug drop menu link. + +commit e3d91cccfae4f5d3bedd259c646bc00cd41b7232 +Merge: eb2b7f533b 7380a7af8c +Author: tianshujie98 +Date: Tue Mar 30 14:40:49 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit eb2b7f533b78510dbadbdd59bb082f318dd43c72 +Author: tianshujie98 +Date: Tue Mar 30 14:40:30 2021 +0800 + + * Fix bug #11109. + +commit 7380a7af8c03dbff5e34c5bde7100bf4d91256e9 +Merge: 8f41f85451 d5c019246a +Author: zhujinyong +Date: Tue Mar 30 14:21:17 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8f41f8545128b9beaec299b7cd94e15503c4e13b +Author: zhujinyong +Date: Tue Mar 30 14:20:32 2021 +0800 + + * Use modal instead of new page in my module. + +commit d5c019246a78a6e242ac2b3f211ab5c48ca3bbdb +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 30 14:15:07 2021 +0800 + + * Finish task #37216. + +commit e56dda2eea66ab6e15ea38452bfe001f84c94d1a +Author: Catouse +Date: Tue Mar 30 14:07:41 2021 +0800 + + * fix auto jump for apps not work as expect. + +commit 7dec6569594b8ca3fc10af5120c248aac10ccb3d +Author: tianshujie98 +Date: Tue Mar 30 13:50:48 2021 +0800 + + * Fix bug #11112. + +commit e4a9dcd7e188af2654aa303db2cc2002c02064f5 +Author: zhujinyong +Date: Tue Mar 30 13:37:52 2021 +0800 + + * Use modal for links in my module. + +commit 0c8a2982306974e6d0255ad32cb3879acf2e1724 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 30 13:31:46 2021 +0800 + + * Finish task #37028. + +commit 3cda55962aa45473f7c6e508c261bb97743f52c4 +Author: qiyu-xie +Date: Tue Mar 30 13:15:37 2021 +0800 + + * Fix bug#11641. + +commit 08edb88a3fc2080dd774bd49ad39d2e93f5ea7cb +Author: tianshujie98 +Date: Tue Mar 30 12:18:07 2021 +0800 + + * Finish task #37106. + +commit c0de976dc11fc6def442dfd06ce857498feac41c +Author: qiyu-xie +Date: Tue Mar 30 11:45:25 2021 +0800 + + * Fix bug#11197. + +commit e2e2c1a23d359a28a7b8d08637baab5e926a988e +Author: Yagami <976204163@qq.com> +Date: Tue Mar 30 11:37:39 2021 +0800 + + * Fix bug #11086. + +commit f72633d0044d11c88e712169d670af22fcf93f0c +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 30 11:35:21 2021 +0800 + + * Adjust case name. + +commit 8f386f8ed241faf9ec65f6b555b5a01f800cbdbc +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 30 11:30:51 2021 +0800 + + * Finish task #37014. + +commit 38b5999305dafc66fb6eed537b130aa8c7a2c971 +Merge: dffc1823c6 687ddf2606 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 30 11:30:40 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit dffc1823c63389e798288df335cdf0489d3bb4ed +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 30 11:30:35 2021 +0800 + + * Add lang item. + +commit 687ddf2606e86712f4583d2278773798961b811d +Author: Yagami <976204163@qq.com> +Date: Tue Mar 30 11:30:01 2021 +0800 + + * Fix bug #11067. + +commit 28c8d5f17533a820626d4d971c005e892144f2fc +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 30 11:29:37 2021 +0800 + + * Fix bug. + +commit b1291bc2478736ea6225caa3a20012635b218af9 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 30 11:19:38 2021 +0800 + + * Fix bug #11053. + +commit bb4cb5b0e42bebc93088c9b5bcf20c9961eb2439 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 30 10:29:16 2021 +0800 + + * Fix details. + +commit 416f9d23d5df83d11511488f16d9031ab344350d +Author: qiyu-xie +Date: Tue Mar 30 11:11:55 2021 +0800 + + * Fix bug#11181. + +commit fa9420a4bd2932abfe6fe0c4de29f3cd22170258 +Merge: c59d0bf227 6ac7575072 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 30 11:09:02 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c59d0bf227c2c2802a4804a1ce0999c74dd12262 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 30 11:08:57 2021 +0800 + + * Fix bug #10987。 + +commit 6ac7575072cab86d08569803f8acabbfacae79db +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 30 11:05:23 2021 +0800 + + * Finish task #37014. + +commit d8f20c23f59fe19b40f0dd3911230a79300b6335 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 30 10:51:38 2021 +0800 + + * Fix bug #11095. + +commit 08c68f58cb984d8df438b1ff86490f06e10cd4f6 +Merge: b5794a7a81 9ee57ff33d +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 30 10:41:58 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b5794a7a81d01e1965cf95b57e70b7136f9b0914 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 30 10:41:54 2021 +0800 + + * Fix bug #11159. + +commit 9ee57ff33d10f1c90afaee4fdc4a7ae71706397b +Author: qiyu-xie +Date: Tue Mar 30 10:29:52 2021 +0800 + + * Fix bug#11057. + +commit d484e31bc332c1754b3ce1bdaa3d84dbd532bba3 +Merge: a766a04ca7 2d94395695 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 30 10:29:54 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit a766a04ca7b31608bee1a0c8dca12db3a7c80ec9 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 30 10:29:51 2021 +0800 + + * Fix an error. + +commit 2d94395695499e00062b503b4b9175e17570a658 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 30 10:25:23 2021 +0800 + + * Adjust testreport module. + +commit e9ba9d603f8892c75cb4c890a284d23b15035833 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 30 10:22:46 2021 +0800 + + * Adjust code. + +commit ae6b46a65ebd66e76de85d0d416e3e141d00f92b +Merge: e96d0aa376 8c477f9ea4 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 30 10:19:55 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit e96d0aa376e79b1385bc5fd64494e2dc3d77467c +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 30 10:19:52 2021 +0800 + + * Fix bug #11251. + +commit 8c477f9ea4c8609e3f5010328b0e1d60fd91b32d +Author: Yagami <976204163@qq.com> +Date: Tue Mar 30 09:45:26 2021 +0800 + + * Fix menu. + +commit 50b75adb4fe9d750c8a14d4d1d20bd654fb4ed00 +Merge: 7e0f3aaf69 7283a46167 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 30 10:12:43 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 7e0f3aaf698544910e95b76c51d9372de0c191ce +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 30 10:12:40 2021 +0800 + + * Adjust the nav highlight. + +commit 7283a461670e164ff637f551812b3d46bfeab40e +Author: Catouse +Date: Tue Mar 30 10:08:38 2021 +0800 + + * inject [data-app] for pages without #mainHeader. + +commit 2ce46cdce84341ebbebc9627f8a68eef1927086e +Author: qiyu-xie +Date: Tue Mar 30 10:07:01 2021 +0800 + + * Fix bug#11213. + +commit a881b796ddd9933b8a19f47f5475a833ba0a7f14 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 30 09:58:48 2021 +0800 + + * Finish task #37033. + +commit 4f3a014698f2e9b5a8e84f02bdeb679cbf1be66b +Author: qiyu-xie +Date: Tue Mar 30 09:19:19 2021 +0800 + + * Fix bug#11274. + +commit 95c604cef66d01e2bb787e4e9662c460b42b64d9 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 30 09:31:32 2021 +0800 + + * Fix bug #11540. + +commit f8c83e6ab7ba1fbfd5ed11083620ace2f1a5bb74 +Author: tianshujie98 +Date: Tue Mar 30 08:31:20 2021 +0800 + + * Fix bug #11118. + +commit 902addc8231e5239b6e441463fd7ce377cca748a +Author: tianshujie98 +Date: Mon Mar 29 21:02:12 2021 +0800 + + * Fix bug #11134. + +commit b0e138fed4dad509e1c0f135a645d7908ce55e27 +Author: tianshujie98 +Date: Mon Mar 29 20:55:34 2021 +0800 + + * Fix bug #11143. + +commit 000db1c636df031b9456e9e760002eb0fe867208 +Author: tianshujie98 +Date: Mon Mar 29 20:39:41 2021 +0800 + + * Fix bug #11203. + +commit 36392f6b0cf304e868e4370bbc12eda191ecf7f2 +Author: tianshujie98 +Date: Mon Mar 29 20:20:45 2021 +0800 + + * Fix bug #11222. + +commit 39028c518cba89650088d665437d29971cfd66ad +Author: tianshujie98 +Date: Mon Mar 29 19:59:39 2021 +0800 + + * Finish task #37106. + +commit cf6f149d6a53371ca6b155ff8e307fa95d7741c6 +Author: leiyong <1549684884@qq.com> +Date: Mon Mar 29 18:25:15 2021 +0800 + + * Adjust testreport module. + +commit 905868cc2da686d026b71fd36ec04d1ccc2ea5d6 +Author: Yagami <976204163@qq.com> +Date: Mon Mar 29 17:21:39 2021 +0800 + + * Fix menu. + +commit 2116dd48f6667b93d0b9ab9415bb4761b3d88cd0 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 29 17:16:52 2021 +0800 + + * Finish task #37009. + +commit 16af36b6ae300670160e70c2cb53d70793f8a175 +Author: Yagami <976204163@qq.com> +Date: Mon Mar 29 17:16:17 2021 +0800 + + * Fix menu. + +commit 57dda6bb5094750f46c3db141b188b038d44f091 +Merge: fbb3ffaa05 39a4a0ce7c +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 29 17:04:28 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit fbb3ffaa055ccaed6303e5a28f20657f898dbae1 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 29 17:04:25 2021 +0800 + + * Adjust the code. + +commit 39a4a0ce7c653550c1e493ec92cff6fc8a5d3131 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 29 16:44:15 2021 +0800 + + * Finish task #37033. + +commit 669b0794abae4195aea576310798216a599fede2 +Author: qiyu-xie +Date: Mon Mar 29 16:41:50 2021 +0800 + + * Fix bug#11577. + +commit 75459b0472a1159b51f9f76d7b56216ac7183eb0 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 29 16:38:38 2021 +0800 + + * Finish task #37125,#37097. + +commit 85cda7c199357a94b1a230f5a720397d2d609803 +Merge: 19f5b6b974 dba7a2acdd +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 29 16:23:00 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 19f5b6b97488187475b1f2cec4e82217aa321883 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 29 16:22:57 2021 +0800 + + * Fix an error. + +commit dba7a2acdd087630edffd94bca750c0c2246406f +Author: tianshujie98 +Date: Mon Mar 29 16:21:14 2021 +0800 + + * Finish task #37107. + +commit fd7e0cf4e311f31ab94aace46bcdc79eb0766e3e +Author: Catouse +Date: Mon Mar 29 15:08:20 2021 +0800 + + * change style of id columns. + +commit cb79ac102629a58d8546a2935539de822e713303 +Author: leiyong <1549684884@qq.com> +Date: Mon Mar 29 11:40:07 2021 +0800 + + * Adjust code. + +commit 36fa5c17a4ecc86b6e873a7db77be577771e7bcd +Merge: 8beac103a4 f5a667ce24 +Author: zhujinyong +Date: Mon Mar 29 11:31:30 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8beac103a4fa8796e180b587b4c3a4215e90f94a +Author: zhujinyong +Date: Mon Mar 29 11:31:04 2021 +0800 + + * Fix bug#11637. + +commit f5a667ce243ffa7572338b69a681c2d2a4f7187d +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 29 11:29:45 2021 +0800 + + * Fix bug #11049. + +commit 9a20e0d2075d1e215b0511f15430c59ba5f10caa +Merge: 4c554408b7 e4b370cbc9 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 29 11:28:54 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 4c554408b7cb832fc2ea1f6cce0c204bd7cc6969 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 29 11:28:50 2021 +0800 + + * Fix bug #11592. + +commit e4b370cbc908e17fdc277e4d1c8b75bafc37960f +Author: leiyong <1549684884@qq.com> +Date: Mon Mar 29 11:27:25 2021 +0800 + + * Adjust code. + +commit 5aafe9256cf40d0ff167a3fdd312e2f117b22b43 +Merge: 9c9991204a 262824cb7e +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 29 11:14:54 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 9c9991204af151277de61b90114a314d95bfcc77 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 29 11:14:50 2021 +0800 + + * Adjust the code. + +commit 262824cb7e1d4e3033932a7cab31b36a0ffb94c5 +Author: tianshujie98 +Date: Mon Mar 29 11:08:14 2021 +0800 + + * Fix bug #11574. + +commit fbe234adca09df54dd3ffb4ff8e010253a7b2fe8 +Merge: 9f66557ae5 c32e8928c5 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 29 11:04:58 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 9f66557ae56a6d806b028ad92ee4902e4069babf +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 29 11:04:55 2021 +0800 + + * Fix bug #11518. + +commit c32e8928c52e9728af107d93fa6abb56e24105d2 +Author: tianshujie98 +Date: Mon Mar 29 11:00:03 2021 +0800 + + * Fix bug #11626. + +commit 23d7f4562d653cb8bf0786695dc6ecbed6674a9f +Merge: 52aab18643 05796ff5f9 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 29 10:57:43 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 52aab1864337adf5eba3b202cae3e89cd13affcd +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 29 10:57:12 2021 +0800 + + * Fix bug #11504. + +commit 05796ff5f9314c28d3d6ce554dd1c80381574a3d +Author: tianshujie98 +Date: Mon Mar 29 10:12:02 2021 +0800 + + * Fix bug #11627. + +commit a603b171e6cfd30c3b64d087784b6063f01380cd +Author: tianshujie98 +Date: Mon Mar 29 10:04:26 2021 +0800 + + * Fix bug. + +commit 9dd1b5af279aad8a5ca6ccf3e5031ae5739c4c1c +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 29 09:37:05 2021 +0800 + + * Fix bug #11422. + +commit b0901b0483f98574e46a0ff77aca185d67aef690 +Merge: a0beb20249 544bd72616 +Author: zhujinyong +Date: Mon Mar 29 09:36:39 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit a0beb20249ca1bfddb8a4de27ce793f4b49743a1 +Author: zhujinyong +Date: Mon Mar 29 09:36:28 2021 +0800 + + * Fix repo menu. + +commit 544bd7261672838e57f3b9ca887eefd3befdead9 +Author: tianshujie98 +Date: Mon Mar 29 09:31:18 2021 +0800 + + * Fix build popup problem. + +commit d3da37f1f4ef7e4b2aa7b3af237c12f714866aca +Author: Catouse +Date: Mon Mar 29 09:19:22 2021 +0800 + + * change position of fixed main-actions. + +commit efb5b51afbc043d6e839f2fea80dc506599ca55b +Author: Catouse +Date: Mon Mar 29 09:16:58 2021 +0800 + + * fix bug #11608, fix collapse icon style of sub programs. + +commit f77ee9c49b917365bf5f9d1afe99f79a176276ca +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 29 09:16:22 2021 +0800 + + * Fix bug #11443. + +commit 0a5525d9903bd23eac8a3145c787a00dbc98adfd +Author: tianshujie98 +Date: Mon Mar 29 09:13:47 2021 +0800 + + * Fix the error on the repository page. + +commit ba8ac6370202672c5ac03f12328361688b7753ba +Author: zhujinyong +Date: Mon Mar 29 09:09:40 2021 +0800 + + * Fix menu. + +commit 294efb7fc85cf59c4c90185b15dfa739a7cdbb5b +Author: leiyong <1549684884@qq.com> +Date: Mon Mar 29 09:07:42 2021 +0800 + + * Fix bug. + +commit 8abda99f0708df4a7bc3bf04e0db6bf01e6f90fd +Author: leiyong <1549684884@qq.com> +Date: Mon Mar 29 08:59:00 2021 +0800 + + * Finish task#11604. + +commit bf3ab301d8a2c05512444496216917720a45a7ab +Author: Catouse +Date: Mon Mar 29 08:57:43 2021 +0800 + + * change style of #menuMoreList. + +commit 8e94937c539dfc8a7640604ce048c6420c36f890 +Author: Catouse +Date: Mon Mar 29 08:23:33 2021 +0800 + + * change icon of more button in #menu. + +commit 5e0d13b050abc226d111bb10dc9d4c2a399cb22e +Merge: c27c964814 2f9fabc20e +Author: zhujinyong +Date: Sat Mar 27 09:02:37 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2f9fabc20eabe183dfa31bc0005e81801bf9a1ba +Author: tianshujie98 +Date: Fri Mar 26 17:36:01 2021 +0800 + + * Modify the repository drop-down menu. + +commit e9f561b477a117e718a51ae316b484542bd15d53 +Author: Yagami <976204163@qq.com> +Date: Fri Mar 26 17:33:30 2021 +0800 + + * Fix code details. + +commit c27c9648146da8c752835010e2a04e5f87cd9b8c +Author: zhujinyong +Date: Fri Mar 26 16:59:25 2021 +0800 + + * Fix bug#11625. + +commit b9e59d0078e88d3e49bcc0e3b408adedb0f3eced +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 26 16:51:40 2021 +0800 + + * Fix bug #11413. + +commit f2f7d0669ab140d98d489ae8404d7ed8630ec547 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 26 16:45:46 2021 +0800 + + * Fix bug #11422. + +commit e4e904e002ed2ab1ed72a5527812b5050b372e08 +Author: tianshujie98 +Date: Fri Mar 26 16:38:34 2021 +0800 + + * Fix bug #11635. + +commit 8f76b93882fa9d43ede2e2160f47086ca9e61634 +Merge: 0d6a2e1e6e 90ae2edc35 +Author: zhujinyong +Date: Fri Mar 26 16:21:43 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 0d6a2e1e6edc273ef4cbe335f1c84834c1873b4c +Author: zhujinyong +Date: Fri Mar 26 16:21:11 2021 +0800 + + * rename project list. + +commit 90ae2edc3566623aa234e59c61f501e43c6c3beb +Author: tianshujie98 +Date: Fri Mar 26 16:19:14 2021 +0800 + + * Fix bug #11202. + +commit 3ae152f42876fab762c1fd139a8ca26e33620a10 +Author: qiyu-xie +Date: Fri Mar 26 16:13:13 2021 +0800 + + * Fix bug#11611. + +commit dca912f0d05286ef85d132b6163ee56f1702a0be +Merge: 1f58f41bc2 619e216aaf +Author: zhujinyong +Date: Fri Mar 26 16:06:50 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 1f58f41bc2c173e4f2c63743ce40897199ace15a +Author: zhujinyong +Date: Fri Mar 26 16:06:22 2021 +0800 + + * Fix dropmenu. + +commit 619e216aaff684a8fab179273fc1e6fbeaf5eafc +Author: Yagami <976204163@qq.com> +Date: Fri Mar 26 15:59:48 2021 +0800 + + * Fix bug. + +commit 8182a8957af2c78b2f6902c2729d7792cad467bf +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 26 15:33:51 2021 +0800 + + * Adjust create test report button. + +commit a4307f0fc5061dfab87ac93dda6d7f588ac85664 +Author: tianshujie98 +Date: Fri Mar 26 15:32:34 2021 +0800 + + * Fix bug #11096. + +commit 0ff9689578e740f404d16d5ce8622d318ee36ad9 +Merge: c44cc79be5 fbcd1b2375 +Author: tianshujie98 +Date: Fri Mar 26 14:40:44 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c44cc79be5ce89f510fdca60f3acd37b889949de +Author: tianshujie98 +Date: Fri Mar 26 14:40:34 2021 +0800 + + * Fix bug. + +commit fbcd1b2375cd7fd70bbcf226bc78e151d738a786 +Author: leiyong <1549684884@qq.com> +Date: Fri Mar 26 14:27:18 2021 +0800 + + * Adjust code. + +commit 2b9f4f299c075421290334a489101b1a8bd67d7f +Author: leiyong <1549684884@qq.com> +Date: Fri Mar 26 14:24:45 2021 +0800 + + * Adjust QA menu. + +commit 54c9625c483cd6c2ddbd7da8a62a26e3a31794a1 +Author: tianshujie98 +Date: Fri Mar 26 13:47:25 2021 +0800 + + * Fix bug #11607. + +commit 4629e0c0fef8511f43c02437b9d1462994211aa6 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 26 13:32:03 2021 +0800 + + * Fix bug #11426. + +commit cebff820e5a8f1f1f45699b21f06de7219335500 +Merge: 0e40c50078 18575200a7 +Author: zhujinyong +Date: Fri Mar 26 13:23:05 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 0e40c50078bb22b8454bf848af444c2bac80b218 +Author: zhujinyong +Date: Fri Mar 26 13:22:46 2021 +0800 + + * Fix product line menu. + +commit 18575200a7666c9ca1d71978fc33cdf18565a2b5 +Author: tianshujie98 +Date: Fri Mar 26 13:20:06 2021 +0800 + + * Repair project dynamics and execution dynamics. + +commit 378f32288c69f0b55df8c9efc681994bd59fdf90 +Author: qiyu-xie +Date: Fri Mar 26 13:10:38 2021 +0800 + + * Fix bug#11611. + +commit 417fd0a18b5cf29b9a553279775001b88dbedeea +Merge: a4c865e7fd bfd0199939 +Author: tianshujie98 +Date: Fri Mar 26 12:18:05 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit a4c865e7fd66235ad96b283cd5ae7c2283593c16 +Author: tianshujie98 +Date: Fri Mar 26 12:16:56 2021 +0800 + + * Deal with more link issues in project blocks. + +commit bfd01999394e11b5c11a8f0248355ac1c1da4c42 +Author: Yagami <976204163@qq.com> +Date: Fri Mar 26 11:41:23 2021 +0800 + + * Fix code error. + +commit 6b0ba155d8fd088cbfd08a31953e6db4085affa0 +Merge: 4fea8898f1 f0738d72b4 +Author: hufangzhou <746775970@qq.com> +Date: Fri Mar 26 10:09:50 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 4fea8898f1d51840dab03d0cab1d9c7f548ca661 +Author: hufangzhou <746775970@qq.com> +Date: Fri Mar 26 10:09:47 2021 +0800 + + * Fix bug #11512. + +commit f0738d72b4a85d56d39d51c762d24fe3a614f1c3 +Merge: 54be2a4b4e 17b64df049 +Author: zhujinyong +Date: Fri Mar 26 09:35:41 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 54be2a4b4eaf31663f299e37ed5b308a86372a51 +Author: zhujinyong +Date: Fri Mar 26 09:35:30 2021 +0800 + + * Fix repo links. + +commit 17b64df0491cd81b264f4280815a17a371ff5f18 +Author: Yagami <976204163@qq.com> +Date: Fri Mar 26 09:27:01 2021 +0800 + + * Fix code error. + +commit 7a488de6a1be8b4cb88cf084fbea47de09e107c5 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 26 09:20:17 2021 +0800 + + * Fix bug #11598. + +commit aed1a0638ad6994a8c0b9434726af016eb152e0b +Author: qiyu-xie +Date: Fri Mar 26 09:12:41 2021 +0800 + + * Fix bug#11494. + +commit 4b4653920533fa9b0c214ef09d716c35fd6f4032 +Merge: 2e2395995c 22c1f66fdd +Author: zhujinyong +Date: Fri Mar 26 09:06:54 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2e2395995ced4722afa76d8000b132ecc26e8110 +Author: zhujinyong +Date: Fri Mar 26 09:06:06 2021 +0800 + + * Fix repo links. + +commit 22c1f66fddc1f846c4282fa3453bc17f8ec203b6 +Author: tianshujie98 +Date: Fri Mar 26 08:56:14 2021 +0800 + + * Fix bug #11514. + +commit d22cda8d1931b5556142539a036ca09474e1bdb9 +Author: tianshujie98 +Date: Thu Mar 25 21:08:09 2021 +0800 + + * Fix bug #11581. + +commit b5d0a6508c50dee6bec8b9830435a99c369663a4 +Author: leiyong <1549684884@qq.com> +Date: Thu Mar 25 18:47:03 2021 +0800 + + * Finish task#36357. + +commit 17180656c7b42d2ffeab008a11e757ff24f6c32a +Author: leiyong <1549684884@qq.com> +Date: Thu Mar 25 18:00:10 2021 +0800 + + * Finish task#36357. + +commit 65da8c5066f0b3d10eaa1df3d892b46d5c1f10cb +Merge: f8c36d5a0c 8b47077069 +Author: wangyidong +Date: Thu Mar 25 17:50:37 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f8c36d5a0c1a74ee3cceb2dc892f40c68eb474b4 +Author: wangyidong +Date: Thu Mar 25 17:49:59 2021 +0800 + + * fix bug for switch project in story-view page. + +commit 8b47077069a776861ebc95b8029ca0e12bf879d6 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 17:37:19 2021 +0800 + + * Fix bug #11601. + +commit 38fc8143513d16484cd89275a9dde2aee11ecc69 +Merge: 86686c96fd 0f2081c074 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 17:27:38 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 86686c96fd958898685bdc7d4c56f0ab04f8fcc0 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 17:27:35 2021 +0800 + + * Fix bug #11527. + +commit 0f2081c074f75ac2e92123370b29c128798fa381 +Author: qiyu-xie +Date: Thu Mar 25 17:17:26 2021 +0800 + + * Fix bug. + +commit 052fdeef88ca10d96b137e5c7ea6dc669d6a6b63 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 25 17:10:52 2021 +0800 + + * Fix lang error. + +commit 85b793455869373f598c2288afda29de9e653a9e +Author: Yagami <976204163@qq.com> +Date: Thu Mar 25 16:59:56 2021 +0800 + + * Fix bug #11559. + +commit f20f31396061bc921c9741b63bc6cbf515295512 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 25 16:55:42 2021 +0800 + + * Fix bug #11560. + +commit 1501d1db55a7ec4c86885d6a2a5ac83f688ae96a +Author: qiyu-xie +Date: Thu Mar 25 16:47:33 2021 +0800 + + * Fix bug#11600. + +commit 3d89f199faae7ebf60ef115bfd03167fb60008ed +Author: Yagami <976204163@qq.com> +Date: Thu Mar 25 16:40:06 2021 +0800 + + * Fix bug #11564. + +commit 1b20425cd13f5aabd5086a1d685d1e8325f72027 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 25 16:22:25 2021 +0800 + + * Fix code error. + +commit 4054d473c22c5d0197a70add9cf5e33a7b7f206c +Merge: c5ae12b2da 1600eb1ba4 +Author: zhujinyong +Date: Thu Mar 25 16:18:25 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c5ae12b2daf953fb3bcf4f4c0d4ea843a66bc97a +Merge: 0084d34097 9e5e24a687 +Author: zhujinyong +Date: Thu Mar 25 16:18:17 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 1600eb1ba4dbe3a7f100f040090911b10b5315d9 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 25 16:13:32 2021 +0800 + + * Fix menu error. + +commit bae7e7ce16ac8a01838eef285e9b9b59deec82ab +Author: qiyu-xie +Date: Thu Mar 25 16:17:20 2021 +0800 + + * Fix bug#11490. + +commit 0084d34097d6f1a0af15a31d935897f079e88ec6 +Author: zhujinyong +Date: Thu Mar 25 16:10:23 2021 +0800 + + * Ajust repo subMenu. + +commit 9e5e24a687f8576a6f91003fed675e57b19d9000 +Merge: a0323a2b37 ecee971a21 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 16:05:35 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit a0323a2b376bb3af0440b61795c5d1fc07b64a49 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 16:05:32 2021 +0800 + + * Fix a bug. + +commit ecee971a217d2e887e9ab1bd268cae9d27b629ca +Author: Yagami <976204163@qq.com> +Date: Thu Mar 25 15:50:08 2021 +0800 + + * Fix bug #11571. + +commit 30f0df86652a4a91b0d6a3e59f3d3ae3500808e1 +Author: qiyu-xie +Date: Thu Mar 25 15:47:21 2021 +0800 + + * Fix an error. + +commit 15a369df759021e680a0188c9d706ae258c91544 +Merge: 4336d6ee8f 7798d08be7 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 15:43:28 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 4336d6ee8fa3f803fe8a529eee2c3a69da7a87cc +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 15:43:24 2021 +0800 + + * Fix bug #11510. + +commit 7798d08be7a6eacdcc443fa9cc8e558d1fdb30a0 +Author: qiyu-xie +Date: Thu Mar 25 15:38:40 2021 +0800 + + * Fix bug#11572. + +commit 9848b5e275cc43cb8f0de77f2a33d9a14318a94b +Merge: 2c60644379 14ac058254 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 15:34:36 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2c60644379b97c41788d4450d3d1a1d43985cb6a +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 15:34:33 2021 +0800 + + * Fix bug #11493. + +commit 14ac058254a2813b0b530b024890320f7c854827 +Author: leiyong <1549684884@qq.com> +Date: Thu Mar 25 15:27:42 2021 +0800 + + * Fix bug. + +commit e63a80253f5732dd9175f225e19217eab64828c7 +Author: qiyu-xie +Date: Thu Mar 25 14:54:23 2021 +0800 + + * Fix bug#11488. + +commit f7c077e364f4dcd6614e8a5df122252905c5631d +Author: Catouse +Date: Thu Mar 25 15:25:29 2021 +0800 + + * task #36890, improve UI of nested table. + +commit 1cc238f01029d0af575e8af450f829ee5e037ec7 +Author: Catouse +Date: Thu Mar 25 15:20:08 2021 +0800 + + * refactor: format. + +commit 78940a54985ffdc830172616a2a74e48b7535e42 +Author: leiyong <1549684884@qq.com> +Date: Thu Mar 25 14:58:11 2021 +0800 + + * Fix bug. + +commit ca2c9403d3e3a898211df7b53c51de430789d059 +Merge: 92098c8717 8dcc7bcfc2 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 14:55:55 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 92098c87170c139dbeecbce5c906beddc56500c2 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 14:55:50 2021 +0800 + + * Fix a bug. + +commit 8dcc7bcfc21daedd7616684ce7005d3976a37223 +Author: Catouse +Date: Thu Mar 25 14:52:09 2021 +0800 + + * task #36881, add hint to more button. + +commit 4324798d20f92b8b4a7a67ae4220c76674609f80 +Author: Catouse +Date: Thu Mar 25 14:50:47 2021 +0800 + + * task #36881, move menu items to submenu when no space to show them. + +commit 9b25cc961efdd0a27f24c850a88fccd71f2d1de7 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 25 14:40:38 2021 +0800 + + * Fix detail for group. + +commit e46464f0e59156ae706a7eb5d5c205d290436ba3 +Author: qiyu-xie +Date: Thu Mar 25 14:37:32 2021 +0800 + + * Fix bug. + +commit 073e30dbd8bf9c797d69382f3af28175b80530ca +Merge: 6126983034 f7703f2506 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 14:12:20 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 61269830344ef851125023f10eb038d136a5506c +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 14:12:17 2021 +0800 + + * Fix bug #11486. + +commit f7703f2506db7011516646766bf15f656084f396 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 25 14:10:22 2021 +0800 + + * Fix common menu. + +commit 505fc0a09fb7caf8946f258d573f0144f25a3e2c +Author: qiyu-xie +Date: Thu Mar 25 14:03:10 2021 +0800 + + * Fix bug#11479. + +commit 963225e386057766732ed13ef47d28bddb9e96ec +Merge: be42a804ce 792416f4ad +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 13:43:50 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit be42a804ce568794f44d787d78dbf7646e5f3d83 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 13:43:46 2021 +0800 + + * Fix a bug. + +commit 792416f4ad6b96e46cdd713c170665fe15378894 +Merge: f5af9020c8 aea80f78f3 +Author: leiyong <1549684884@qq.com> +Date: Thu Mar 25 13:41:31 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f5af9020c8513070b3e65dcad8c9e175e44480d4 +Author: leiyong <1549684884@qq.com> +Date: Thu Mar 25 13:41:25 2021 +0800 + + * Finish task#36884. + +commit aea80f78f3cdf74cbb98c11c78d0e681f99137a4 +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 25 13:40:36 2021 +0800 + + * Fix error. + +commit bded3a590f4668d86b0972fe463b1b21e75e1405 +Merge: c4cfbc1e52 820fcf1e38 +Author: wangyidong +Date: Thu Mar 25 13:29:25 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c4cfbc1e52754f4021fdc57fca2f64b7941a9d04 +Author: wangyidong +Date: Thu Mar 25 13:29:08 2021 +0800 + + * fix error. + +commit 820fcf1e38b0f807c25635f15b1aece43912144a +Author: leiyong <1549684884@qq.com> +Date: Thu Mar 25 13:27:53 2021 +0800 + + * Fix bug. + +commit 891e456293297c3960e78c720390aa04e850c13d +Author: qiyu-xie +Date: Thu Mar 25 13:27:18 2021 +0800 + + * Fix bug#11475. + +commit b030aecf0f54007af7886d830c75a579ed372b77 +Merge: 13b50741a2 4c07f75939 +Author: wangyidong +Date: Thu Mar 25 13:21:59 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 13b50741a25bf7234d5bfb27dbe02e0876157c42 +Author: wangyidong +Date: Thu Mar 25 13:20:56 2021 +0800 + + * fix bug for edit dept. + +commit 4c07f7593950cac66459c1653e9f6b02590f3fad +Author: qiyu-xie +Date: Thu Mar 25 13:20:14 2021 +0800 + + * Fix bug#11475. + +commit 8f08b4aa1e8c02262ad4606062d92d7f28b78d04 +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 25 13:18:21 2021 +0800 + + * Fix bug view error. + +commit b0cfa0f2188c892e1d02f64fbb94e263189bf140 +Author: Catouse +Date: Thu Mar 25 13:12:55 2021 +0800 + + * task #36888, fix style of dropMenu when show scrollbars. + +commit 2e39ad4525b8ea192305e2f4bb77d58e6d7c59a4 +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 25 13:10:46 2021 +0800 + + * Fix bug view in project app. + +commit 5f7e004151680e67901dd582d191e8a40dca3ca9 +Author: qiyu-xie +Date: Thu Mar 25 13:06:14 2021 +0800 + + * Fix bug#11475. + +commit 6832646dbc9869527f198b24920784a02aa48f91 +Author: leiyong <1549684884@qq.com> +Date: Thu Mar 25 11:42:27 2021 +0800 + + * Fix bug. + +commit 63ebd77ff66b3c8e5d307f0dc1a15797b4945cc2 +Merge: ce1edb39fc 49d78a2bfb +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 25 11:41:36 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit ce1edb39fcd91d2ca0e6df38b3b02ccd26984c47 +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 25 11:41:09 2021 +0800 + + * Finish task #36875. + +commit 49d78a2bfb99101058cd6828bb94d215897cb163 +Author: leiyong <1549684884@qq.com> +Date: Thu Mar 25 11:38:45 2021 +0800 + + * Fix bug. + +commit 0870a7c49083ab36b1b0382fcf22f7ff7484dbf9 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 25 11:35:55 2021 +0800 + + * Fix details. + +commit bd6605bab83ab1ee9788674e45a1f4f0be6a5686 +Author: leiyong <1549684884@qq.com> +Date: Thu Mar 25 11:31:01 2021 +0800 + + * Fix bug. + +commit 92986ae8ea9fd1d32bcb75842ed3ae884d58e045 +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 25 11:20:50 2021 +0800 + + * Fix create build error. + +commit a75bafa59a60e251b0292ae5abfb04802f45e0d5 +Author: Catouse +Date: Thu Mar 25 11:19:20 2021 +0800 + + * task #36888, limit min width of #dropMenu. + +commit 0345b46810d5a2432bc14b575166650459b71ea0 +Author: Catouse +Date: Thu Mar 25 11:12:55 2021 +0800 + + * task #36888, make dropmenu to fit the size of list-group items. + +commit a755a532de2ea37607afaf8e2474d88f2a6af520 +Merge: ac4fd7be50 e4beeaf0cf +Author: zhujinyong +Date: Thu Mar 25 11:15:23 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit ac4fd7be506fbf204671548c27e0071855e26b3f +Author: zhujinyong +Date: Thu Mar 25 11:15:11 2021 +0800 + + * Fix bug of project. + +commit e4beeaf0cf75394b1b4b045272d8335c159f0996 +Merge: 5fed4cfffd 99992f2edb +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 11:04:02 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 5fed4cfffdd62873bd298713f77b558e4fcd2f67 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 11:03:59 2021 +0800 + + * Fix bug #11533. + +commit 99992f2edbca44fa3bbfa1b7cd88e6ab23e71abf +Merge: 42a46a9e5d 36f4fdd829 +Author: zhujinyong +Date: Thu Mar 25 10:57:41 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 42a46a9e5d879a687f3b3b5a30a26e8f0cd98c51 +Author: zhujinyong +Date: Thu Mar 25 10:57:01 2021 +0800 + + * Fix testreport menu. + +commit 36f4fdd829ac3773928d0615505d8fca098c5ae7 +Author: qiyu-xie +Date: Thu Mar 25 10:55:37 2021 +0800 + + * Hide batch create of all products. + +commit 36c99fed2fd64125f2cf692af93bc1962fe11a8f +Author: tianshujie98 +Date: Thu Mar 25 10:55:47 2021 +0800 + + * Fix bug #11534. + +commit 7af7034f026a5ccfa6eca9cd06843a352914f538 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 10:53:27 2021 +0800 + + * Fix a bug. + +commit 89a5416c45565818074d605e47e46f0281fe4cb2 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 10:21:39 2021 +0800 + + * Fix a bug. + +commit 4b1ca99a227101d87bc005a3835dfa7914a680c3 +Author: Catouse +Date: Thu Mar 25 10:13:17 2021 +0800 + + * fix js error on pop history state. + +commit 7a45c365b41ba82a9b59fa04a3d7b0e0b1ccacc5 +Merge: b2632de0a8 03702ceaed +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 10:09:28 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b2632de0a87f44d3d7bfe7c2e5320ffd3bd956f3 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 10:09:25 2021 +0800 + + * Fix a bug. + +commit 03702ceaed0f63e0d790a307989c5706387143a1 +Author: zhujinyong +Date: Thu Mar 25 10:03:15 2021 +0800 + + * Fix link of mangePriv. + +commit ef01113cec1dc51d7440298b39b40000535f526d +Author: tianshujie98 +Date: Thu Mar 25 09:56:41 2021 +0800 + + * Fix the issue of adding stakeholders. + +commit b4af7ae0025bfb3f044992e64a09b0a6c29db789 +Author: tianshujie98 +Date: Thu Mar 25 09:47:06 2021 +0800 + + * Fix the problem of project list operation. + +commit 0bea1eb1c4c81f89adb606af4587de6eafd4280b +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 25 09:46:17 2021 +0800 + + * Adjust session. + +commit 7db4a074457df3efcd68fdafb99d9410492f3389 +Merge: c9e522fd7d 113d8014d5 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 09:37:43 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c9e522fd7d19cded6bdf3027fe2797a230aed7ab +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 25 09:33:23 2021 +0800 + + * Fix bug #11531, #11530. + +commit 113d8014d59999946aafd95053083b7517e86a7d +Author: qiyu-xie +Date: Thu Mar 25 09:31:47 2021 +0800 + + * Adjust button of create story style. + +commit 5b0010f846a9e64bbc86a3dc135edc2c4090585d +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 25 09:30:02 2021 +0800 + + * Adjust session and project lang. + +commit fa855ed1bf6279fae8a7bf849430e0039830de0b +Author: tianshujie98 +Date: Thu Mar 25 09:15:37 2021 +0800 + + * Fix batch edit project bug. + +commit 60faa1d8beacb417aa05e83d8b0daf28a345de21 +Merge: d47b845897 1d1512e83a +Author: zhujinyong +Date: Thu Mar 25 09:11:05 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d47b845897b7bb98f72c290e080add375f0af915 +Author: zhujinyong +Date: Thu Mar 25 09:10:48 2021 +0800 + + * Fix bug#11523. + +commit 1d1512e83a990b61e6658593f81ba5d46134143e +Author: qiyu-xie +Date: Thu Mar 25 09:08:00 2021 +0800 + + * Finish task#36890. + +commit 26091d2bed1beb0e913e37bc98a1d90d5a5c95cc +Author: zhujinyong +Date: Thu Mar 25 09:02:57 2021 +0800 + + * Fix menu bug: testcase to project. + +commit 3063a692c381e5f1f9972271e7b14717b839fb0d +Author: zhujinyong +Date: Thu Mar 25 00:36:28 2021 +0800 + + * Fix stakeholder bug. + +commit f749e6a04306c613ae6058335808f99c6692a503 (tag: zentaopms_15.0.beta3_20210324) +Merge: 2d68f7dd45 800d33a25d +Author: zhujinyong +Date: Wed Mar 24 18:07:13 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2d68f7dd453335601d96a93ba6baf8ed4cf40c95 +Author: zhujinyong +Date: Wed Mar 24 18:06:47 2021 +0800 + + * Fix dynamic bug. + +commit 800d33a25d3f4ce3f186255eb9e9330577b3936b +Author: Yagami <976204163@qq.com> +Date: Wed Mar 24 17:20:25 2021 +0800 + + * Fix menu. + +commit 352a81ec1325152164193592feecda91556fe615 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 24 17:19:46 2021 +0800 + + * Adjust session. + +commit 9b84f059978bf6fd38c05e360a88c68f9c02a1c5 +Author: qiyu-xie +Date: Wed Mar 24 16:52:51 2021 +0800 + + * Finish task#36890. + +commit e69671ec3208126d6af8bcf121fb214b0610b4d0 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 24 16:43:54 2021 +0800 + + * Adjust session. + +commit c24d011380b232c37f522e0304a74bedf931a848 +Merge: 2a2ccf4a94 f297db5d01 +Author: zhujinyong +Date: Wed Mar 24 16:30:55 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2a2ccf4a94b44982b5239bce4c043f5f9d2ef8ff +Author: zhujinyong +Date: Wed Mar 24 16:30:23 2021 +0800 + + * Fix link error of whitelist. + +commit f297db5d01ad07c6941238c82f82e28197c2bb92 +Merge: 418b79df48 6a3a2a018f +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 24 16:19:51 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 418b79df48816cfa53065add9041644945810813 +Merge: 0eda0edd50 20cc1ae288 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 24 16:15:41 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 6a3a2a018ffc68e5202927dbf506fc935a5995be +Merge: 5121887ec1 c7782fdefd +Author: zhujinyong +Date: Wed Mar 24 16:14:50 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 5121887ec167dfe3db824ed252e18d5a433adeb3 +Merge: 1d9e0a8bf5 20cc1ae288 +Author: zhujinyong +Date: Wed Mar 24 16:14:40 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c7782fdefdc100dd5557c33a61b1b3a47e3c0289 +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 24 16:14:36 2021 +0800 + + * Adjust block module. + +commit 1d9e0a8bf57ed8e43192a7f356629a1b10425b0c +Author: zhujinyong +Date: Wed Mar 24 16:14:22 2021 +0800 + + * Fix action buttion bug. + +commit 0eda0edd50ff12d6fd7d4d0435c2e90f943cb741 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 24 16:12:48 2021 +0800 + + * Adjust session. + +commit 20cc1ae28807952910760d0a9bacfcdc6bf1129f +Author: Yagami <976204163@qq.com> +Date: Wed Mar 24 14:08:39 2021 +0800 + + * Fix code. + +commit 3b06053b11eb220ae1cedd3e7cdc53bf45c8bcb4 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 24 13:55:10 2021 +0800 + + * Fix link. + +commit 033fe94d635199552d8b1cd45b49d13780b0c7e4 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 24 13:22:38 2021 +0800 + + * Fix menu. + +commit 0afdfe0b60947f949b296b7b04a2bb0ea2de1bc8 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 24 15:54:53 2021 +0800 + + * Delete release of execution menu and adjust session. + +commit 7f289f5170ba36dc0265b1230004e85d84467595 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 24 15:53:59 2021 +0800 + + * Fix a bug. + +commit b180dde200a0ce24e70a02a55dc5f1dc5bab8810 +Merge: 6bd955cc0c 1a21525bb8 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 24 15:45:52 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 6bd955cc0ce54f17d00127b4826d3dc2a63c907f +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 24 15:45:49 2021 +0800 + + * Fix an error. + +commit 1a21525bb8f6ff7da2dbb15b8c9ba7a98aa626e8 +Merge: eb987f51ab e605137fd9 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 24 15:44:24 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit eb987f51ab514d5c34bce91ec7b563fdaf6ec663 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 24 15:44:05 2021 +0800 + + * Finish task #36880. + +commit e605137fd9e16aefbad09829c0353a5fa54b4ade +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 24 15:42:20 2021 +0800 + + * Finish task #36445. + +commit 5c67adbf0910dcb5e892917a52f65aa4e6762d5a +Merge: 1f780be529 83a59ac477 +Author: zhujinyong +Date: Wed Mar 24 15:27:01 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 1f780be5291d604bef4f318413cf34b4cfdab54f +Author: zhujinyong +Date: Wed Mar 24 15:26:45 2021 +0800 + + * Fix actions of program module. + +commit 83a59ac47744d4b49b2f8184e7d1385242f1c706 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 24 15:02:42 2021 +0800 + + * Fix create project release error. + +commit 79718f6ffdf26c402859ab841e0dcccc48f49034 +Author: qiyu-xie +Date: Wed Mar 24 14:57:04 2021 +0800 + + * Fix bug. + +commit 4c237e260175b7f796be22bf554446257bc8e136 +Author: zhujinyong +Date: Wed Mar 24 14:51:28 2021 +0800 + + * Fix dynamic logic. + +commit 534f2a947b0b33e30fbc78215f1da4d9a6da05ab +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 24 14:48:31 2021 +0800 + + * Adjust the sort of the testcase list. + +commit a3859bede9bf362498896c6afb9d085fc3e3a063 +Author: qiyu-xie +Date: Wed Mar 24 14:38:09 2021 +0800 + + * Adjust the cases of the all products. + +commit d6f12244f9c08e413a370edb17e17a351ebf5562 +Merge: 447ea11570 0849de155e +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 24 14:37:47 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 447ea11570817ae58428ccc0496f7836df15f603 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 24 14:37:36 2021 +0800 + + * Adjust session. + +commit 0849de155e65a9f4daf6f94e263990f6adacc33a +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 24 14:18:56 2021 +0800 + + * Delete the project testcase page. + +commit 082d6b46a60bf09b8b70612ae83866e28e2fcf97 +Merge: e361864ea5 7205b2c240 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 24 14:14:11 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit e361864ea5def90ff218fc5d5667ae725bf049c3 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 24 14:14:08 2021 +0800 + + * Adjust the cases of all products. + +commit 7205b2c2403d276b2d73c97f097e4e22d68fc576 +Merge: cea111abed fbde724d27 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 24 13:53:15 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit cea111abeda4ffdb0f2d9c65989028b784ebffd4 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 24 13:53:03 2021 +0800 + + * Adjust session. + +commit fbde724d276aa16df9a7e0b3097e29b600bc6b8e +Author: qiyu-xie +Date: Wed Mar 24 13:34:42 2021 +0800 + + * Finish task#36885. + +commit 98d8b82b3f10d19d7397be4284994491c37c0fe5 +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 24 13:18:26 2021 +0800 + + * Adjust code. + +commit 13b80c645b782bd4801205dd33d8a2d37404847c +Merge: 4a3065bed6 d1b2550fb1 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 24 13:11:04 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 4a3065bed6c77f8f92d6960cbda3059f36c1b00b +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 24 13:10:39 2021 +0800 + + * Adjust session. + +commit d1b2550fb17076cd3e314787f056e93cf1ef3c14 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 24 10:57:35 2021 +0800 + + * Fix common menu order. + +commit 81a90bc517a30edd8e22d0d95798a577e72dd57b +Author: qiyu-xie +Date: Wed Mar 24 11:03:09 2021 +0800 + + * Finish task#36861. + +commit 5be7566e47c3f1ab88f8048f0dfcb7f104f554a2 +Author: qiyu-xie +Date: Wed Mar 24 10:59:10 2021 +0800 + + * Finish task#36889. + +commit b183e13e0281d296b25576965c2266d56010afad +Author: zhujinyong +Date: Wed Mar 24 10:49:00 2021 +0800 + + * If program selected, display name. + +commit fe7fce95127899f8cadf190f7bc378be6b270a2a +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 24 10:29:10 2021 +0800 + + * Adjust code. + +commit 05a152abf704ca54b8c86d9bc0f2127dba9b511f +Author: wangyidong +Date: Wed Mar 24 10:15:58 2021 +0800 + + * change for menu. + +commit a07427943a33c8f94a3ae13e13fc0fdc4f9aa808 +Merge: 1555abd041 0e0b51d683 +Author: wangyidong +Date: Wed Mar 24 10:14:25 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 1555abd041a1c14a93e0f75c3c20df43a424d9dc +Author: wangyidong +Date: Wed Mar 24 10:12:50 2021 +0800 + + * fix error. + +commit 0e0b51d683ebb9f6067aaa22cfd83f98ceb3d6b6 +Author: qiyu-xie +Date: Wed Mar 24 10:11:21 2021 +0800 + + * Modify the problem of execution creat requirement jump. + +commit f697915115817b584e6c099c88200c5398c85b8e +Author: qiyu-xie +Date: Wed Mar 24 09:17:15 2021 +0800 + + * Fix bug. + +commit ee964cebbabd70b7e65b66aa6bdf0c5869c4baaa +Author: qiyu-xie +Date: Wed Mar 24 09:15:44 2021 +0800 + + * Finish task#36889. + +commit 7474979179001938fa388a9e8b67be141b314eef +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 24 09:06:17 2021 +0800 + + * Clear session when search oject. + +commit 6c4b446e52c18238c660449f2c06ba0490a19dbb (tag: zentaopms_15.0.beta3_20210323) +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 23 17:57:01 2021 +0800 + + * Adjust the cases of the all products. + +commit 800e6084efaece3ac70a7b230a62df71d87bf316 +Merge: 021233c8be c5c08a5059 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 23 17:49:56 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 021233c8beab90293b8f8e0eff491e828b887385 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 23 17:49:48 2021 +0800 + + * Finish task#36884. + +commit c5c08a5059f20254ed1d2a642ed562bda5adcd4b +Merge: 21a11d8d09 923d87589e +Author: zhujinyong +Date: Tue Mar 23 17:49:34 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 21a11d8d09508f88b02acbe5ac764a54bc80a124 +Author: zhujinyong +Date: Tue Mar 23 17:43:04 2021 +0800 + + + Add objectID param in doc module. + +commit 923d87589ea14e64245d47069419165b71f54d2c +Author: qiyu-xie +Date: Tue Mar 23 17:18:25 2021 +0800 + + * Finish task#36863. Adjust the Create button for the test case lib. + +commit 2ee463597f60d5742015510c32f5599943a9bf05 +Author: qiyu-xie +Date: Tue Mar 23 16:55:55 2021 +0800 + + * Finish task#36863. + +commit 1f60294a01fb814a0fc86183e005b4999c08690c +Author: qiyu-xie +Date: Tue Mar 23 16:26:37 2021 +0800 + + * Adjust style. + +commit afad42544004a014f147f66f402b603fa224e6c1 +Author: qiyu-xie +Date: Tue Mar 23 16:23:53 2021 +0800 + + * Finish task#36862. + +commit 5d2ffea599b0b3ade6a7f2897986b98b15af9fa6 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 23 16:03:59 2021 +0800 + + * Fix upgrade logic. + +commit 1167617573c7beaca474b050ef67acc918f8be9c +Author: Yagami <976204163@qq.com> +Date: Tue Mar 23 15:45:34 2021 +0800 + + * Fix repo error. + +commit 3501560f09c4bff71c3b36a74861bab530c5e6d3 +Author: tianshujie98 +Date: Tue Mar 23 15:40:12 2021 +0800 + + * Fix build of project bug. + +commit a5dada4578c74b8fb9fa85ac04e79f7152c56a90 +Merge: f8645f859e ac3d5ecd2e +Author: zhujinyong +Date: Tue Mar 23 15:34:02 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f8645f859efc7c25a2cb2625e738c35b255c6a16 +Author: zhujinyong +Date: Tue Mar 23 15:33:36 2021 +0800 + + * Fix english translation. + +commit ac3d5ecd2e1b999c4a04dcd16f6ccbf2151442d3 +Author: qiyu-xie +Date: Tue Mar 23 15:31:19 2021 +0800 + + * Finish task#36861. + +commit 8f84823080c453cc1c8f094c626ecbf05f59d65b +Merge: 84a4237ccc 3e8a1953be +Author: zhujinyong +Date: Tue Mar 23 15:10:12 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 84a4237cccd8fb88c970e67db81851e76e285e2c +Author: zhujinyong +Date: Tue Mar 23 15:09:54 2021 +0800 + + * Fix language error. + +commit 3e8a1953bedb185b61141d34bd2f578b37beaf2f +Author: Catouse +Date: Tue Mar 23 15:08:22 2021 +0800 + + * use $.apps.open in $.gotoObject. + +commit 80f4033409943147895e7e244f67e67e7216c79b +Author: Yagami <976204163@qq.com> +Date: Tue Mar 23 14:51:32 2021 +0800 + + * Fix bug. + +commit a9d4165f1158934bfd2208c58482eddaca32bca3 +Merge: 1e340e1040 02fb955dc2 +Author: zhujinyong +Date: Tue Mar 23 14:48:18 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 1e340e1040ceecebbe98b255fb16b810bfe79d83 +Author: zhujinyong +Date: Tue Mar 23 14:47:58 2021 +0800 + + * Fix programID in program module. + +commit 02fb955dc2826d08a3789df1c3e4050f1eaaefdc +Author: Yagami <976204163@qq.com> +Date: Tue Mar 23 14:37:03 2021 +0800 + + * Fix bug. + +commit 5af5c9a92c8d7e7a7a2760f8ae764d576dc6d311 +Merge: 543078c4ee 91642e47a2 +Author: zhujinyong +Date: Tue Mar 23 14:22:16 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 543078c4ee22ab8f8755ade5cf81e079deb3df67 +Author: zhujinyong +Date: Tue Mar 23 14:21:53 2021 +0800 + + * Fix linkstory bug. + +commit 91642e47a296668f03add3bb11fef299460ce25e +Author: Yagami <976204163@qq.com> +Date: Tue Mar 23 14:07:35 2021 +0800 + + * Fix repo menu. + +commit 29060925db39f1b33dacb6bcd8b88f814bc5b83f +Author: Yagami <976204163@qq.com> +Date: Tue Mar 23 13:13:36 2021 +0800 + + * Fix print home btn method. + +commit 50fe4e503300ad7b0a48a1307458693a22daae74 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 23 11:44:58 2021 +0800 + + * Finish add left top btn task. + +commit 0a7fe481aab29d572e711a8927f116df4c94b15e +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 23 11:24:56 2021 +0800 + + * Fix error when close app. + +commit 37c6ea994dd581c40669f3746f963b922cbf1cf6 +Author: qiyu-xie +Date: Tue Mar 23 11:18:07 2021 +0800 + + * Fix bug#11446. + +commit 771b940132eaaf5b8f56cfda0be259a3aa0997e7 +Merge: 382e32b234 7428dabadd +Author: tianshujie98 +Date: Tue Mar 23 11:18:09 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 7428dabadd5a43d434b4ee33f426cfa1ea85eac2 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 23 11:16:32 2021 +0800 + + * Adjust code. + +commit 382e32b234a6b7e15cfb16c674494fd162809c7f +Author: tianshujie98 +Date: Tue Mar 23 11:16:24 2021 +0800 + + * Adjust order of execution drop menu. + +commit 19e2da2def286b06b1416b729d45eced84d78532 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 23 10:51:51 2021 +0800 + + * Finish task#36874. + +commit 15f2e9f0da23d41a78f479305b7860874226690b +Author: qiyu-xie +Date: Tue Mar 23 10:40:34 2021 +0800 + + * Finish task#36859. + +commit 1ae6587b9e9eacaa38c64394abf2f498524d112e +Author: Yagami <976204163@qq.com> +Date: Tue Mar 23 10:24:11 2021 +0800 + + * Unset doc set menu params. + +commit d42c940edf885ef735a06f3f200188a2b177ab45 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 23 10:22:15 2021 +0800 + + * Finish task #36865. + +commit 26de34826da7c6b8d59a8eab3c4a1baea429a283 +Author: qiyu-xie +Date: Tue Mar 23 10:14:06 2021 +0800 + + * Finish task#36882. + +commit 822a06ae5640410b0e156bc1680705e8a2d0a35e +Author: Yagami <976204163@qq.com> +Date: Tue Mar 23 10:12:25 2021 +0800 + + * Finish task #36892. + +commit dc920be0911c82ee81907d9854ff377a7f832122 +Author: qiyu-xie +Date: Tue Mar 23 10:06:15 2021 +0800 + + * Fix bug. + +commit 50dd775bc31f3b806f8ed7052d0d68b148c43557 +Author: qiyu-xie +Date: Tue Mar 23 10:00:27 2021 +0800 + + * Add project permissions. + +commit cf31958f3ed2fd8abb36a1e3003f933e5f89a0c0 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 23 10:00:41 2021 +0800 + + * Fix bug. + +commit b07855549381a161bc7fe405b2123e86db86337d +Author: Yagami <976204163@qq.com> +Date: Tue Mar 23 09:53:34 2021 +0800 + + * Finish task #36856. + +commit 6b1524835a96ccd9f60acf1ac8eea89763e24eef +Author: Catouse +Date: Tue Mar 23 09:53:31 2021 +0800 + + * update icons: collapse-alt and expand-alt. + +commit 5081e53fa6108812140f3fbb92128d4c5dd4959a +Author: tianshujie98 +Date: Tue Mar 23 09:49:39 2021 +0800 + + * Fix order. + +commit 7873c809086af64e2ef19534a1de10e184d01a22 +Author: qiyu-xie +Date: Tue Mar 23 09:48:41 2021 +0800 + + * Finish task#36882. Modify the execution permission. + +commit e8ca3c6798003b3ed5e842b13e3836e242179e9f +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 23 09:49:02 2021 +0800 + + * Finish task#36886. + +commit ab87eafef81b84daac1e5c6bca8fd1c508f5b389 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 23 09:38:41 2021 +0800 + + * Fix bug. + +commit 21d43acda5c3f33f97793e6167023185b32bec34 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 23 09:27:01 2021 +0800 + + * Finish task #36880. + +commit e41c426bad5fdf26a4471011a2c5a152c8790e7b +Author: Yagami <976204163@qq.com> +Date: Tue Mar 23 09:23:10 2021 +0800 + + * Fix main nav menu order. + +commit 574ed806352108d7652c9a7c94fc83cab5bd082b +Merge: bcf7b323e2 3146fb6b3e +Author: tianshujie98 +Date: Tue Mar 23 09:03:09 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bcf7b323e2e587a5ec813bb4e01b7f66f600dec9 +Author: tianshujie98 +Date: Tue Mar 23 09:02:45 2021 +0800 + + * Finish task #36873. + +commit 3146fb6b3ebd8189ca24613a223c7cb59c5e9db5 +Author: zhujinyong +Date: Tue Mar 23 08:56:15 2021 +0800 + + - Remove function 'get_magic_quotes_gpc'. + +commit 6bc4afa8dcef1b325f4252922ee50c6676d613f5 +Merge: 2ee7594858 ea086296b0 +Author: zhujinyong +Date: Tue Mar 23 08:48:11 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2ee7594858dd8786d3933704bd009d7f6e16da72 +Author: zhujinyong +Date: Tue Mar 23 08:45:02 2021 +0800 + + * Fix menu. + +commit ea086296b0cec9083dc11a565c247b314ecaa9cc +Author: leiyong <1549684884@qq.com> +Date: Mon Mar 22 23:53:00 2021 +0800 + + * Adjsut QA menu. + +commit 03d986bd85d49b1dba1977979b6f45c5028d1f7a +Author: zhujinyong +Date: Mon Mar 22 18:10:03 2021 +0800 + + * Fix menu. + +commit 2b67792616877d81f86ed8e65fb286d90efe0400 +Merge: 06b7ff5c0d 7ae216c0e6 +Author: zhujinyong +Date: Mon Mar 22 17:47:53 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 06b7ff5c0dc1e50987e04c689a9b3fd1ddfccf65 +Author: zhujinyong +Date: Mon Mar 22 17:47:28 2021 +0800 + + * Fix menu of testtask. + +commit 7ae216c0e63b4fa16c7649ce1888e2ad1de120fb +Author: leiyong <1549684884@qq.com> +Date: Mon Mar 22 17:35:35 2021 +0800 + + * Fix bug. + +commit 411fe57ce8f91dcead6b56c4cdd5375ecf34d872 +Merge: 07d587b90a d664d60a7f +Author: zhujinyong +Date: Mon Mar 22 17:23:05 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 07d587b90a8a358d2bf66a7f3c1bcc99d2f804bb +Author: zhujinyong +Date: Mon Mar 22 17:22:50 2021 +0800 + + + Add menu of doc. + +commit d664d60a7f89aa81ffd1b9f29600b8ddd0acfac8 +Author: tianshujie98 +Date: Mon Mar 22 17:17:56 2021 +0800 + + * Finish task #36871. + +commit 98ad1b4529c68bbdae3164c311bad1c9afc6c035 +Author: Yagami <976204163@qq.com> +Date: Mon Mar 22 17:00:58 2021 +0800 + + * Fix project browse program list. + +commit 57012ae8ced2db7fcbefbf018661e334b8adb6ab +Merge: 157877f25c 1630022612 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 22 16:53:40 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 157877f25cc177b2d03781e36291f2ca1173884f +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 22 16:53:24 2021 +0800 + + * Adjust the project-type-label style. + +commit 163002261240510dc320fedd903e18c6a7403f20 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 22 16:43:40 2021 +0800 + + * Finish task #36857. + +commit 75b0cdac824ff23eab9761fd7875b0c74cf8928b +Merge: b56bfdb1a7 77ae16ae64 +Author: wangyidong +Date: Mon Mar 22 16:37:40 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b56bfdb1a7def791794b5a70c967a2a31a68c7d6 +Author: wangyidong +Date: Mon Mar 22 16:35:46 2021 +0800 + + * adjust for drop menu. + +commit 77ae16ae64acf8f67df0b209023e2c2f53017d0b +Merge: 342956e55d 253db3deac +Author: tianshujie98 +Date: Mon Mar 22 16:35:46 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 342956e55da3ca528b46183f88fb7b38362737b3 +Author: tianshujie98 +Date: Mon Mar 22 16:35:28 2021 +0800 + + * Fix bug #11420. + +commit 253db3deac01bbc97a0c105f7bb81e81c297022a +Merge: 105eda6ea6 7f7bfa5578 +Author: zhujinyong +Date: Mon Mar 22 16:32:52 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 105eda6ea6d3cfb63eec11b25e4125e002976abc +Author: zhujinyong +Date: Mon Mar 22 16:32:01 2021 +0800 + + + Add english translation. + +commit 7f7bfa5578632f2e3de74e9f3ed945671094eb80 +Author: Yagami <976204163@qq.com> +Date: Mon Mar 22 16:21:36 2021 +0800 + + * Drop no menu module. + +commit e6c2eb9bbd2ae3dfda00d85e7ad22da0a13243d8 +Author: qiyu-xie +Date: Mon Mar 22 16:17:20 2021 +0800 + + * Fix bug. + +commit 4574ffe64457929758bf1f23f4c02e27ce23b199 +Author: qiyu-xie +Date: Mon Mar 22 15:50:54 2021 +0800 + + * Fix bug. + +commit 9bd2cceeeb431993ce2384e13f6ebce95a058cab +Merge: d9b9d43e9f 5df11d8e8d +Author: wangyidong +Date: Mon Mar 22 16:17:08 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 5df11d8e8d12c9c7f31e52d5b7bb86c10d2a6668 +Merge: a3c9c3b57b 17051852d0 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 22 16:16:30 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit a3c9c3b57bd5731dc9a99d4dc1b8feaec44cb4ba +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 22 16:16:27 2021 +0800 + + * Fix a bug. + +commit 17051852d0ac49ffda2fd8c3d31ce12d1acd0ff7 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 22 16:06:32 2021 +0800 + + * Finish task #36860. + +commit 77a5d0a2005e9a5ff1ee12ad3d039b2ccbc903eb +Author: tianshujie98 +Date: Mon Mar 22 16:04:50 2021 +0800 + + * Fix the problem of the build under the project. + +commit 754bb25a0d798ea212c7a46356eca8b120943069 +Merge: 6f82d035a6 0d85f6e1f8 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 22 16:03:16 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 6f82d035a6e446cb2610aa4f2deafea50848c1da +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 22 16:03:12 2021 +0800 + + * Fix the related link of project story. + +commit 0d85f6e1f860b9f4dd7f91c28423053fae15f673 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 22 16:00:10 2021 +0800 + + * Finish task #36764. + +commit 58420d3e756d63f10794e8dca94cc7ba6b417ba4 +Merge: 5eb5171977 23360b940e +Author: zhujinyong +Date: Mon Mar 22 15:50:39 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 5eb5171977267ea9d99a41def1fe5b6053923075 +Author: zhujinyong +Date: Mon Mar 22 15:50:13 2021 +0800 + + + Add submenu of admin. + +commit 23360b940e81a4cf934d0108cf01eec7e35ed31d +Author: leiyong <1549684884@qq.com> +Date: Mon Mar 22 15:46:14 2021 +0800 + + * Fix bug. + +commit 6fec06012c90948a06659b20d7acf5ad652ec019 +Merge: a65793f897 9c29107a6b +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 22 15:44:47 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit a65793f897c4b5a1e04350239eb9bf469832dcdf +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 22 15:44:19 2021 +0800 + + * Adjust project qa menu. + +commit d9b9d43e9f346bc0d7e555f244a2ca01f23fc4ba +Merge: 1b08eee096 9c29107a6b +Author: wangyidong +Date: Mon Mar 22 15:42:30 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 1b08eee0965be957db7d244cccafec1be7c237cf +Author: wangyidong +Date: Mon Mar 22 15:42:01 2021 +0800 + + * add project field for zt_action table. + +commit 9c29107a6b0255b5cb5541f6d159bb5a90abbfb1 +Author: leiyong <1549684884@qq.com> +Date: Mon Mar 22 15:27:44 2021 +0800 + + * Fix bug. + +commit 8298c6b7299caa7251c1e57664ca1fbf95dbc98c +Author: zhujinyong +Date: Mon Mar 22 14:07:29 2021 +0800 + + * Fix menu of bug. + +commit 16fc58058a8d09f64cb9881a223743928b1369c5 +Author: zhujinyong +Date: Mon Mar 22 13:58:48 2021 +0800 + + * Fix menu of bug. + +commit 4a30c240a7b8786415fdee4e0e80d2930d9288b0 +Merge: 0839cdd27e faec7af4d6 +Author: zhujinyong +Date: Mon Mar 22 13:08:32 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 0839cdd27eebe6decbc518ca15808ad334c20ad2 +Author: zhujinyong +Date: Mon Mar 22 13:07:31 2021 +0800 + + - Remove the second productID defined. + +commit faec7af4d6201c110f097def5ca1119e221f3aaa +Author: Yagami <976204163@qq.com> +Date: Mon Mar 22 13:01:20 2021 +0800 + + * Merge code. + +commit a0aa5d1ef568e812ba35506ed6536007b3ca606b +Author: zhujinyong +Date: Mon Mar 22 12:33:05 2021 +0800 + + * Adjust menu. + +commit 82428349ad96dc80314b0cc7a40bfd75de3fba18 +Author: zhujinyong +Date: Mon Mar 22 12:03:10 2021 +0800 + + * Rename session->PRJ to session->project. + +commit 28017454fa4fec08f238bbda668cb4bac0753311 +Merge: c7313cefd6 f9ec1f84fb +Author: zhujinyong +Date: Mon Mar 22 11:47:44 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c7313cefd65c97307c2f3d465697e24786dcf1ca +Author: zhujinyong +Date: Mon Mar 22 11:44:09 2021 +0800 + + * Fix setMenu of execution. + +commit f9ec1f84fb948de913e566acc0a41561077ae3a5 +Author: leiyong <1549684884@qq.com> +Date: Mon Mar 22 11:42:12 2021 +0800 + + * Fix bug. + +commit f5fa0cbec8ee92713e34e1bdde7a104ee7d0d2df +Merge: 8f1f42f0c1 deae7f5f9d +Author: wangyidong +Date: Mon Mar 22 11:40:15 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8f1f42f0c103c9978386de13ed5e72f0a88702ce +Author: wangyidong +Date: Mon Mar 22 11:40:00 2021 +0800 + + * fix error. + +commit deae7f5f9d98664b3e3bc864c33ede59bdd227f5 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 22 11:37:11 2021 +0800 + + * Fix bug #11254. + +commit 3dee710bbaad6c160c2c51d1fc7053bc1ea8c3dc +Author: wangyidong +Date: Mon Mar 22 11:36:33 2021 +0800 + + * fix merege error. + +commit 3f56363e96255f66ae73e02119d217c840ede7d9 +Author: tianshujie98 +Date: Mon Mar 22 11:28:54 2021 +0800 + + * Fix bug #11421. + +commit d904871563aa11d63d41aa537682d679be8b423d +Merge: a81bfd3978 80e7cd6aee +Author: wangyidong +Date: Mon Mar 22 11:22:48 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit a81bfd39785e411ba1d4b6497e2c93c0860b4caf +Author: wangyidong +Date: Mon Mar 22 11:22:34 2021 +0800 + + * fix bug. + +commit 80e7cd6aee2a8b7836586386793e7a01b76bf78a +Author: qiyu-xie +Date: Mon Mar 22 11:10:09 2021 +0800 + + * Hide the option to execution the default landing page. + +commit a558122672878503a0ac142f2cee198c2ff2e333 +Merge: 9531c783de a66bf2a165 +Author: wangyidong +Date: Mon Mar 22 11:07:35 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 9531c783de38691aa9d446625dc535f7d53bcdcf +Author: wangyidong +Date: Mon Mar 22 11:04:27 2021 +0800 + + * finish task #36749. + +commit a66bf2a165d4855cc99e33f3ba65f8775525b3ab +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 22 11:03:35 2021 +0800 + + * Fix bug #11260. + +commit 6e74a14738a1e5dfb5468e322dd6c2ef057ced52 +Merge: 935e78dd70 64ed1af29f +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 22 10:52:14 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 935e78dd70157d1f792a42bd85b1477b81ddfb37 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 22 10:52:11 2021 +0800 + + * Fix an error. + +commit 64ed1af29f931e96349e059e8af0b9c439b65f57 +Merge: 163a736f99 01ef95c9a7 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 22 10:51:51 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 163a736f996746420fd7f5d961606da9d718a56f +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 22 10:51:40 2021 +0800 + + * Fix project index error. + +commit 01ef95c9a7db7ac42688703a8822239866794ce3 +Merge: e742810a1f 3af50442f6 +Author: tianshujie98 +Date: Mon Mar 22 10:46:53 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit e742810a1f45dba5af78c21625ba925919ba2dab +Author: tianshujie98 +Date: Mon Mar 22 10:46:37 2021 +0800 + + * Modify the build jump problem under the project. + +commit 1c4fcc83a6d59cde199a6046d097a5b9f58aee21 +Author: tianshujie98 +Date: Mon Mar 22 10:45:11 2021 +0800 + + * Modify the build jump problem under the project. + +commit 3af50442f6db244436c109a9c82e88f05ce1e34b +Merge: f94a272a2c 5dab6366e1 +Author: zhujinyong +Date: Mon Mar 22 10:43:46 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f94a272a2c8c35f2e59c4d6ee472f458ecbd417c +Author: zhujinyong +Date: Mon Mar 22 10:43:17 2021 +0800 + + + Add branch menu of product. + +commit 5dab6366e1cee002623e006e49bb57253eaa333a +Author: Yagami <976204163@qq.com> +Date: Mon Mar 22 10:33:45 2021 +0800 + + * Fix my-menu. + +commit 4b45d79941568ef3df0bf179fa7be441faa42273 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 22 10:28:59 2021 +0800 + + * Adjust my work and contribute menu. + +commit c34c4fbbfe7f4f87371a82334cb48daa08459d45 +Merge: 17c1af2c1b 5f67f9db7f +Author: zhujinyong +Date: Mon Mar 22 10:28:39 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 17c1af2c1b71e3babd2e82cafde4f283db58e45f +Author: zhujinyong +Date: Mon Mar 22 10:28:22 2021 +0800 + + * Fix undefined object. + +commit 5f67f9db7f3047d14b820f26708f407416ef88f7 +Author: qiyu-xie +Date: Mon Mar 22 10:24:04 2021 +0800 + + * Modify the drop-down list. + +commit e5f50c7886cc9c8b0f826f7be4199129306586ed +Author: zhujinyong +Date: Mon Mar 22 10:06:29 2021 +0800 + + * Fix admin menu. + +commit 0524f889228fa45fdd6bbcdb72cf115a3807e997 +Author: Yagami <976204163@qq.com> +Date: Mon Mar 22 10:03:14 2021 +0800 + + * Fix code error. + +commit 642e2bd59711890223c05ed61ef9e98fd5640662 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 22 10:01:38 2021 +0800 + + * Fix bug #11262. + +commit cb25df2e0658a825bec6aa787c01c395051a3864 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 22 09:42:12 2021 +0800 + + * Fix bug #11283. + +commit 749f890738561b1a1e0702c521c523c03a8fa0cf +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 22 09:30:04 2021 +0800 + + * Fix bug #11289. + +commit 5712e309bd15bea5843ee390c7cb23e630eb7baa +Author: tianshujie98 +Date: Mon Mar 22 09:02:17 2021 +0800 + + * Finish task #36750. + +commit 6231771f6c24867df6d3197ba7ddfa7a4a4e2069 +Author: zhujinyong +Date: Mon Mar 22 08:59:20 2021 +0800 + + * Fix repo. + +commit ec5b9b2ace4897962ef8a207f13b8e7b20cf4c87 +Merge: 26702af116 cb0d8872c2 +Author: wangyidong +Date: Mon Mar 22 08:29:55 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit cb0d8872c287de3abd025ccc7a79f0ebf1dcf3ee +Author: zhujinyong +Date: Mon Mar 22 00:43:59 2021 +0800 + + * Fix repo of project and execution. + +commit a08b5e4b4292d2bf0755b675aaa06dee7c897e51 +Author: zhujinyong +Date: Sun Mar 21 23:58:56 2021 +0800 + + * Fix menu. + +commit 3ae29c98c894686324eb30b27c2931d834185abc +Author: zhujinyong +Date: Sun Mar 21 18:08:45 2021 +0800 + + * Fix story of product. + +commit 4fe2ddb6832622255a679c978565517d9fbd2eb8 +Author: zhujinyong +Date: Sun Mar 21 17:53:43 2021 +0800 + + * Fix build of project. + +commit 4ebd5e6cc12f161b887474b871742dba87f030d0 +Author: zhujinyong +Date: Sun Mar 21 17:44:25 2021 +0800 + + + Add qa, bug, testcase, testtask of project module. + +commit 6582a700bb29424464f1f337fb04e141fdb2e071 +Author: zhujinyong +Date: Sun Mar 21 16:11:07 2021 +0800 + + * Fix story of project. + +commit a6eff425ca4c8224fcc8935929366a5f37d6ba1e +Author: zhujinyong +Date: Sun Mar 21 12:15:55 2021 +0800 + + * Adjust menu logic. + +commit c014179539de66ad446bda34db6d3314bc2c732f +Merge: dd35ed8c5b 781b378e57 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 19 17:59:21 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit dd35ed8c5ba4e4a05a85b1a04378ee2e59ba0144 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 19 17:59:08 2021 +0800 + + * Finish task #36756. + +commit 781b378e5711e961fabc5dace878a350b438e83a +Author: leiyong <1549684884@qq.com> +Date: Fri Mar 19 17:58:48 2021 +0800 + + * Adjust menu. + +commit c681e42bfb04f7d993d85c5bf5052f05b0db8a5e +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 19 16:09:06 2021 +0800 + + * Finish task #36755. + +commit e904c6b39a66efa4bd4bed1d73b8999e924a7aa6 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 19 16:00:56 2021 +0800 + + * Fix bug #36758. + +commit 6b74146cb22d80ee660878ed630d1a18616efbb4 +Merge: 81e74ec9e5 7413cbdbe2 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 19 15:41:20 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 81e74ec9e567814262584a16fcb480226483d9b2 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 19 15:41:05 2021 +0800 + + * Fix task #36754. + +commit 7413cbdbe29845c48dd004c838a331289f375b52 +Author: Yagami <976204163@qq.com> +Date: Fri Mar 19 15:39:18 2021 +0800 + + * Fix menu bug. + +commit 2f5eb04e08b0737a1c4365a7714c0420d674e2c9 +Author: Yagami <976204163@qq.com> +Date: Fri Mar 19 15:14:14 2021 +0800 + + * Merge code. + +commit c9279bdd56868dc0c5b72e3b3c6560621a28fa24 +Merge: b3ce0b4689 ab8f4e02db +Author: tianshujie98 +Date: Fri Mar 19 14:56:56 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b3ce0b4689cccfc0515bd7aa088607ebdf2dec94 +Author: tianshujie98 +Date: Fri Mar 19 14:56:43 2021 +0800 + + * Fix bug. + +commit ab8f4e02db9d54a739403f48c4f8eaf1bda4e718 +Author: qiyu-xie +Date: Fri Mar 19 14:55:34 2021 +0800 + + * Optimize the code. + +commit d7ead198c8f8036d5a164b3bea15a648daa1564f +Merge: 08de0fa073 d5665b54f7 +Author: hufangzhou <746775970@qq.com> +Date: Fri Mar 19 14:53:47 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 08de0fa0736f4348f8f82911e6e448a5cb4d17de +Author: hufangzhou <746775970@qq.com> +Date: Fri Mar 19 14:53:44 2021 +0800 + + * Adjust the label width. + +commit d5665b54f7f651fcaec6eb41c5815eb5ef5d993a +Author: tianshujie98 +Date: Fri Mar 19 14:51:01 2021 +0800 + + * Reduction. + +commit 1e1493d710a4b3421ae40f5412f316bee6ff5b1e +Author: hufangzhou <746775970@qq.com> +Date: Fri Mar 19 13:24:08 2021 +0800 + + * Fix bug #11397. + +commit 7bb301a8b25726074df0006fc74849179bd0c639 +Author: tianshujie98 +Date: Fri Mar 19 12:14:10 2021 +0800 + + * Fix menu bug. + +commit d5d4d07b397e06963648095d21f3c912c300f119 +Author: Yagami <976204163@qq.com> +Date: Fri Mar 19 11:29:42 2021 +0800 + + * Set session in app. + +commit 5fefa3449e2cd8033c4ea01e2b69bb8ef75e2e2f +Merge: 58bfee0374 3755648673 +Author: hufangzhou <746775970@qq.com> +Date: Fri Mar 19 11:22:35 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 58bfee037470bdb4d0d5667bccda72d5dbb317e3 +Author: hufangzhou <746775970@qq.com> +Date: Fri Mar 19 11:22:22 2021 +0800 + + * Fix a bug. + +commit 3755648673e0629d23339dc5239afafcb5af24da +Author: Yagami <976204163@qq.com> +Date: Fri Mar 19 11:20:35 2021 +0800 + + * Fix qa menu. + +commit eda33b8a78040f91c89856b41ef67fbe25933b05 +Author: Yagami <976204163@qq.com> +Date: Fri Mar 19 10:59:54 2021 +0800 + + * Fix menu. + +commit d492f01f0cf1a613bf2b80558d48ef4a83969eff +Merge: b5434ed770 a805f958b8 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 19 10:49:41 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b5434ed7707be09582944e2ccbc334fe64f6b095 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 19 10:49:08 2021 +0800 + + * Refresh block when finished todo. + +commit a805f958b895cffe539ae9c2466f3dadc4a9db3b +Author: tianshujie98 +Date: Fri Mar 19 10:35:18 2021 +0800 + + * Modify the method of linking products when creating a build. + +commit 26702af116f4cb3fb344751a1549bf4efd1a08b6 +Merge: 3579538412 08c42cf246 +Author: wangyidong +Date: Fri Mar 19 10:20:24 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 3579538412f7fbd4c8148ce1bd721fa549045c4d +Author: wangyidong +Date: Fri Mar 19 10:19:31 2021 +0800 + + * fix error. + +commit 08c42cf246dd5da998dcd89a652232e917ddbedf +Author: Yagami <976204163@qq.com> +Date: Fri Mar 19 10:04:40 2021 +0800 + + * Fix code. + +commit 57932ffec3f451ba448a9dc8e97e4925d63f4009 +Author: qiyu-xie +Date: Fri Mar 19 09:41:26 2021 +0800 + + * Fix bug. + +commit 322bd5dfb75041e60e279e2bf26abd66ee89c040 +Author: Yagami <976204163@qq.com> +Date: Fri Mar 19 09:35:08 2021 +0800 + + * Fix browse list session. + +commit 7f52574a2f2c8ff64096cfde4dcccb219dae7fae +Author: Yagami <976204163@qq.com> +Date: Fri Mar 19 09:31:44 2021 +0800 + + * Code for app session. + +commit 5ea5fa382911f9392bd536d64e93d9e99d36f621 +Author: qiyu-xie +Date: Fri Mar 19 09:06:04 2021 +0800 + + * Finish task#36498. + +commit 9ed9d2a7c21beb0e64554ded61e1eddab22d91b7 +Author: leiyong <1549684884@qq.com> +Date: Fri Mar 19 09:05:03 2021 +0800 + + * Adjust code. + +commit a24c58482ed1957918cf482c1c8ed122dde8d980 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 19 09:02:01 2021 +0800 + + * Fix get bug tree error. + +commit 09420abc9e72044886494e7ad03bf03bdeb5e0c6 +Author: tianshujie98 +Date: Fri Mar 19 08:50:16 2021 +0800 + + * Add permissions to the build of the project. + +commit 3d3f1825ad0d575447d2474c836d9efc7853ff5f +Merge: d3556572df e009d87903 +Author: zhujinyong +Date: Fri Mar 19 08:47:50 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d3556572df55cf9c69588e8153a9930f74baa1d9 +Author: zhujinyong +Date: Fri Mar 19 08:46:32 2021 +0800 + + * Fix bug: remove space for background url. + +commit e009d87903d3482792bee1b4431a2acaf8d52602 +Author: tianshujie98 +Date: Thu Mar 18 20:20:11 2021 +0800 + + * Fix build creation interface issues. + +commit 06fdc39972a53d41aa4632b42ad4f26b7d180d44 +Author: qiyu-xie +Date: Thu Mar 18 18:14:19 2021 +0800 + + * Fix bug. + +commit 38f8d31e7d18894ce6cf58edb79f31c65a8860d4 +Author: qiyu-xie +Date: Thu Mar 18 18:00:54 2021 +0800 + + * Fix bug. + +commit cab09e56898d777fb09833c0f2e66897f01499e4 +Merge: 52478c1ccf 861f3458f3 +Author: zhujinyong +Date: Thu Mar 18 17:47:32 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 52478c1ccf06bc3b9d30f83d490959966cf0360e +Author: zhujinyong +Date: Thu Mar 18 17:47:22 2021 +0800 + + * Fix menu. + +commit 861f3458f36cfd3b3c74d2fa1deb2781387237f3 +Author: qiyu-xie +Date: Thu Mar 18 17:46:42 2021 +0800 + + * Fix create execution. + +commit 4b9c4a3cdf1ca30d4d5eabadcd42094b04d9c766 +Merge: f591dd9311 f3ea3b3391 +Author: wangyidong +Date: Thu Mar 18 17:39:57 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit f591dd9311fad8363dfee3c00a1a6b2464dd773e +Author: wangyidong +Date: Thu Mar 18 17:30:01 2021 +0800 + + * change for PRJ. + +commit d36e5c9114afcd7e633d6c3dd1689ad39a027294 +Author: wangyidong +Date: Thu Mar 18 17:28:50 2021 +0800 + + * finish task #36727. + +commit f3ea3b3391ed2985ed8828a3bee311ed3d0d7f63 +Merge: d6e6641c1c bca95c87eb +Author: tianshujie98 +Date: Thu Mar 18 17:00:16 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d6e6641c1cb07315f1eb6f58fe8dff1e31789014 +Author: tianshujie98 +Date: Thu Mar 18 17:00:06 2021 +0800 + + * Fix bug. + +commit bca95c87eb1fd3a009d3790bfdd3c31052f214e9 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 18 16:58:40 2021 +0800 + + * Fix program drop link. + +commit 0bc5e1ddee364b7a7adc25fc9caf06c30606b782 +Merge: 53cf4ebdcd 7fa5a2dab0 +Author: tianshujie98 +Date: Thu Mar 18 16:57:38 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 53cf4ebdcd8b271a8d896f4ea32767dad9b28656 +Author: tianshujie98 +Date: Thu Mar 18 16:57:31 2021 +0800 + + * Fix bug. + +commit 7fa5a2dab0be287da4556dad0971e3a271ef5b6c +Author: Yagami <976204163@qq.com> +Date: Thu Mar 18 16:36:47 2021 +0800 + + * Fix session app. + +commit cceffa2106c12091d03c4ce3baba6a54f027f00b +Merge: 7760c6066d f4d38a929f +Author: zhujinyong +Date: Thu Mar 18 16:26:44 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 7760c6066d678b455da3b77c6e36f14d0f5349cd +Author: zhujinyong +Date: Thu Mar 18 16:26:17 2021 +0800 + + - Remove module menu of jenkins. + +commit f4d38a929fee56a15d8e72a9d1378d28d6dfdf12 +Merge: 2e737fe667 4a3282ea5b +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 18 16:25:09 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2e737fe6675f2408be18d5aac88abfb0b3377a40 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 18 16:25:03 2021 +0800 + + * Fix a bug. + +commit 4a3282ea5b3e20c30c7e1bf4d010dd42edf01f74 +Merge: 8749c2983d fdfa1e9acc +Author: zhujinyong +Date: Thu Mar 18 16:19:42 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8749c2983d64bf55ca5a49f92153b045bbf1a3fb +Merge: beadb99a54 947dbffcf6 +Author: zhujinyong +Date: Thu Mar 18 16:19:35 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 9a5f56ff471e0783e8816484c3902c9b4839f728 +Merge: e43b1fd89e fdfa1e9acc +Author: wangyidong +Date: Thu Mar 18 16:12:43 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit fdfa1e9acc250c74a7c85e1283dbdb4bbf5c40c2 +Merge: 199c0f0132 ca5b180515 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 18 16:09:12 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 199c0f013273d2b0e4034eafe4925af9b0bd75e0 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 18 16:09:08 2021 +0800 + + * Adjust the code. + +commit ca5b1805159925c600c1d43d1e3b82168139caa0 +Author: tianshujie98 +Date: Thu Mar 18 15:59:10 2021 +0800 + + * Change PRJ to pass parameter. + +commit fcf20e03ff64712d1ee56a5dde4cb219ed65b8c4 +Author: tianshujie98 +Date: Thu Mar 18 15:39:35 2021 +0800 + + * Fix bug. + +commit f5f19c135a8154a974c0329e31a34e28670df918 +Author: tianshujie98 +Date: Thu Mar 18 15:29:11 2021 +0800 + + * Fix bug. + +commit aa5157267f9e96f71eb1696cc0673dde6ded945e +Author: tianshujie98 +Date: Thu Mar 18 14:56:46 2021 +0800 + + * Modify the style of the drop-down menu. + +commit a2189695ad922577d666c22f23bd831d2fd8f81c +Author: qiyu-xie +Date: Thu Mar 18 14:52:54 2021 +0800 + + * Adjust execution list. + +commit d86cd514cfcf50a24ad6c19bf12e1a8cc782a3f4 +Merge: 372aa38934 1d09fea4a4 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 18 14:53:11 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 372aa38934ee510284cc521c375078a0b7b7a3d8 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 18 14:53:08 2021 +0800 + + * Adjust the code. + +commit 1d09fea4a48753d4484b5d4c0d3d02c77ffb915e +Author: Yagami <976204163@qq.com> +Date: Thu Mar 18 14:48:05 2021 +0800 + + * Fix bugs. + +commit a8608c697345ede8ce1a3f240639dbe6dc2f6981 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 18 14:27:34 2021 +0800 + + * Fix execution bug. + +commit f10dced1e83d6ea961c77c8dd7505aca9938e05d +Author: tianshujie98 +Date: Thu Mar 18 14:14:52 2021 +0800 + + * Repair program set drop-down menu. + +commit beadb99a54eba446cb26044c08ff49fa0e9ce072 +Author: zhujinyong +Date: Thu Mar 18 13:45:37 2021 +0800 + + * Fix link of my module. + +commit 947dbffcf6d2cb9df9dc1117122bb32689a298a3 +Merge: 14e247a05d ec38482e48 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 18 13:45:35 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 14e247a05dbcda7280636e9cfe187b82648fba20 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 18 13:45:32 2021 +0800 + + * Make the case link to the execution when link the testtask. + +commit ec38482e486cbaa09e196b436a0b365394eec273 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 18 13:41:18 2021 +0800 + + * Fix bug. + +commit a61fa90c18300a5e36faf38295027930db3a6123 +Author: qiyu-xie +Date: Thu Mar 18 13:38:47 2021 +0800 + + * Add repo navGroup. + +commit 84158aee078c78cb5ed1f127984dffa90ecab6f2 +Merge: c025042e95 26733c7ae3 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 18 13:24:19 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c025042e95bbc0c3c3c91dd512cca91cf21dd6ab +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 18 13:24:16 2021 +0800 + + * Adjust the code. + +commit 26733c7ae322fb62b8b57a7c004e870f65d4a7d2 +Author: qiyu-xie +Date: Thu Mar 18 13:22:57 2021 +0800 + + * Fix bug. + +commit f70697ac7433e219360947b4c8c0ae2c00062a2a +Author: qiyu-xie +Date: Thu Mar 18 13:18:40 2021 +0800 + + * Delete the left of the list in the project by execution. + +commit 8acff18969d52f34c0c071998695aecf784daa6d +Author: tianshujie98 +Date: Thu Mar 18 13:11:47 2021 +0800 + + * Fix add product jump error. + +commit d05dc1b8e2de24aca20b33b7eb92b4d6858cf9cd +Author: tianshujie98 +Date: Thu Mar 18 13:06:14 2021 +0800 + + * Add parameters to the link. + +commit 9641aeffd59ccc071e2c0cce59abea74079db105 +Author: tianshujie98 +Date: Thu Mar 18 13:04:05 2021 +0800 + + * Fix bug. + +commit 28a8bf60828bb2ed6d6dbed905b8710606bbfc59 +Merge: 6b69424799 368c921c45 +Author: tianshujie98 +Date: Thu Mar 18 11:25:00 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 6b69424799c08bcd2a218e3782465272303a51c3 +Author: tianshujie98 +Date: Thu Mar 18 11:21:56 2021 +0800 + + * Finish task #36750. + +commit 368c921c45e168376ba5f24ed330bacebf4884ac +Author: Yagami <976204163@qq.com> +Date: Thu Mar 18 11:13:24 2021 +0800 + + * Fix bug create build details. + +commit 7ab6365b3e2221bcdf242ee49db6937e8036cce0 +Author: qiyu-xie +Date: Thu Mar 18 11:09:59 2021 +0800 + + * Fix bug. + +commit 922dddcaa64c6bcc1af00b8d6ab4bbb25a8555a8 +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 18 11:06:32 2021 +0800 + + * Fix create todo error. + +commit 188910f08e9391660bc120c6ed7a219731b876f6 +Author: qiyu-xie +Date: Thu Mar 18 09:52:39 2021 +0800 + + * Add project select when creating an execution. + +commit a19459b290c81ad0a89383b08c7e79dc346c2c94 +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 18 09:47:02 2021 +0800 + + * Adjust create bug style. + +commit ccd93e4b5b74504b84e6b6ebbb45aabe36719060 +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 18 09:44:23 2021 +0800 + + * Fix task #36764. + +commit 006b551d016c7bb7f81f3ef1f36b21ddda784140 +Merge: 7fc2b74a53 0a9e80ab40 +Author: zhujinyong +Date: Thu Mar 18 09:22:17 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 7fc2b74a539b93926864e40667fba7d74ccf6649 +Author: zhujinyong +Date: Thu Mar 18 09:21:46 2021 +0800 + + * Set default program. + +commit 0a9e80ab406af89d6474d2b99f342139dd373525 +Merge: b537f12170 7a2c83f5bc +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 18 09:05:28 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b537f121708ba3e05c6af5252171e60d67b00070 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 18 09:05:23 2021 +0800 + + * Finish task #36742. + +commit 7a2c83f5bce4b740d8b36e7bda27733185d54e68 +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 18 09:02:48 2021 +0800 + + * Finish task #36760. + +commit 17aa4be732e488302d9b28dcb5299356952cc929 +Author: tianshujie98 +Date: Thu Mar 18 08:58:51 2021 +0800 + + * Modify the navigation of the project build. + +commit 997816490749605e55d88048032ce652b242278c +Merge: b6a27819f3 b4ea48a130 +Author: zhujinyong +Date: Thu Mar 18 08:55:51 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b6a27819f3024fa3237ec0528b4cea1ece160077 +Author: zhujinyong +Date: Thu Mar 18 08:55:22 2021 +0800 + + * Fix menu. + +commit b4ea48a13041cfa20bb6c9f3a9ff2ed88a363698 +Merge: 68b8659197 048ecf6850 +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 18 08:27:13 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 68b8659197eef803847cfa0aa4b3eea6178d940b +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 18 08:26:17 2021 +0800 + + * Code for task #36758. + +commit 048ecf6850ea8b8e0f7c94602f80746801d7c30b +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 17 17:31:42 2021 +0800 + + * Adjust code. + +commit c2795bd4ccac04c9fd732f69fe4316a3dbc2e5d1 +Merge: d48943c773 567ed90a6c +Author: zhujinyong +Date: Wed Mar 17 16:14:29 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d48943c77359377d09fc0681f6038065e9e32e0c +Author: zhujinyong +Date: Wed Mar 17 16:14:16 2021 +0800 + + * Fix project menu. + +commit 567ed90a6c23d06566094eaf4d062bdc0aa14766 +Merge: 93a4091401 2a28609e9e +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 15:57:58 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 93a40914010212b204d94d924abc82cf53d6b726 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 15:57:54 2021 +0800 + + * Fix a bug. + +commit 2a28609e9e5844621ffacd51dabc97b4e78c29c4 +Author: zhujinyong +Date: Wed Mar 17 15:54:38 2021 +0800 + + * Task method has been removed. + +commit 84076b79b6bc2d13f2e662f928cfdc74dbaa1488 +Merge: 35e168ac15 d1d488bebb +Author: zhujinyong +Date: Wed Mar 17 15:51:58 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 35e168ac156497d222f94e29e806b1f708a36126 +Author: zhujinyong +Date: Wed Mar 17 15:51:33 2021 +0800 + + * Fix PRJ param. + +commit d1d488bebbbf8c7c7cc7c885f12749c66527054c +Merge: ebd6e11985 584546c34c +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 15:48:26 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit ebd6e119859ebd63b6763c94c0e4294a4f6d2cbf +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 15:48:23 2021 +0800 + + * Fix an error. + +commit 584546c34cddc472adcf7f69d5deb45416b5e6cc +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 17 15:47:15 2021 +0800 + + * Adjust code. + +commit 064f5417571482430fcb54420968b5e4a85917d6 +Author: qiyu-xie +Date: Wed Mar 17 15:28:01 2021 +0800 + + * Fix bug of batch edit executions. + +commit eb618d1dcd1a663842e62be0935e4532b88dc18f +Merge: 8a29b09b3f e279dff340 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 15:27:15 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 8a29b09b3fb10be297a88d16c66be5b4b84ff7fc +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 15:27:12 2021 +0800 + + * Sync case to execution when create case under execution module. + +commit e279dff340a521a9530390d9bd624161777e0352 +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 17 15:24:33 2021 +0800 + + * Finish task#36767. + +commit 6a349f06603225969dde7c166ac7173005d6b0fd +Merge: 29b4f00f74 ec106bd4a3 +Author: zhujinyong +Date: Wed Mar 17 15:17:33 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 29b4f00f74409be7967f66a24325400e1c874132 +Author: zhujinyong +Date: Wed Mar 17 15:16:28 2021 +0800 + + * Fix bug: menu error when creating project. + +commit ec106bd4a3b9c6875623c481d763971f9869c248 +Merge: 9e1b6300d1 59441fbec1 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 15:13:25 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 9e1b6300d174b0671d9f35149216b6c95c96976f +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 15:13:21 2021 +0800 + + * Adjust the code. + +commit 59441fbec14ff367279f3abcea0ef82bb9ff0aff +Author: qiyu-xie +Date: Wed Mar 17 15:05:04 2021 +0800 + + * Remove the permissions to execution test report. + +commit 250c3c47c04beb7805eab6957ce0be5ec1d06a24 +Author: qiyu-xie +Date: Wed Mar 17 15:03:06 2021 +0800 + + * Fix bug. + +commit 35d831da4b465a592fce69488ea7b7d6980f61e2 +Merge: 511d621868 3f3cb6714e +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 15:02:30 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 511d621868ba39f73f5e7feb335137cad0e9e656 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 15:02:26 2021 +0800 + + * Fix a bug. + +commit 3f3cb6714eecb911f251cf47276ee7a3f0861e74 +Merge: 629bdb2342 7a1ce40291 +Author: tianshujie98 +Date: Wed Mar 17 15:00:02 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 629bdb2342d986ff8053a85065f37cca4c770823 +Author: tianshujie98 +Date: Wed Mar 17 14:59:50 2021 +0800 + + * Fix bug. + +commit 7a1ce40291488780e7d109a424d079acd1934505 +Merge: 1279902afb 879c7941d4 +Author: zhujinyong +Date: Wed Mar 17 14:55:03 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 1279902afb02f348a0f6740f7c2428b6d59810dd +Author: zhujinyong +Date: Wed Mar 17 14:54:07 2021 +0800 + + * Fix bug: create bug in execution module. + +commit 879c7941d4355a919247cbed554ce50cea6dae5f +Author: qiyu-xie +Date: Wed Mar 17 14:45:18 2021 +0800 + + * Fix bug. + +commit 782f967ab1b73b1603018a394dd1f9c0ce0dbe77 +Author: qiyu-xie +Date: Wed Mar 17 14:31:42 2021 +0800 + + * Fix bug. + +commit eef613fe6f56bc14b41d67496bfc391d9937158a +Author: zhujinyong +Date: Wed Mar 17 14:21:10 2021 +0800 + + * Fix menu. + +commit cbd3bde2780c198e05d0874df26d1de0a68ab280 +Merge: 691e9392f0 ab7616256d +Author: zhujinyong +Date: Wed Mar 17 14:13:42 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 691e9392f023b70211569cdff3aae5002bfe2a5b +Author: zhujinyong +Date: Wed Mar 17 14:13:22 2021 +0800 + + - Remove PRJ param in url. + +commit 2129484682d4d0d02953e1c0acabbd308eea484e +Author: Catouse +Date: Wed Mar 17 14:09:18 2021 +0800 + + Revert "* update icon-home." + + This reverts commit 12ebccab4064ec7ab86375c55ddd3433510e07f0. + +commit ab7616256d6cc1f5ad1c297f15f1566757a592b6 +Merge: 29d768c68d eef29b4ef0 +Author: tianshujie98 +Date: Wed Mar 17 14:08:26 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit eef29b4ef08ffadaeb8ba6bb014f564d5bc22646 +Author: Catouse +Date: Tue Mar 16 15:04:00 2021 +0800 + + * fix error on request mode=getconfig when visit at first time. + +commit 58bf5ac1c6a1523ecbdf00478b03d94a73b4d581 +Author: Catouse +Date: Tue Mar 16 15:03:29 2021 +0800 + + * update icon-home. + + # Conflicts: + # www/theme/zui/css/min.css + +commit 29d768c68de5c3af80a8f5be0c71526bee7bbc7c +Author: tianshujie98 +Date: Wed Mar 17 14:07:58 2021 +0800 + + * Restore page layout. + +commit f8bf4c2f8d2f7da33e0f34e4437e635fb9192f2f +Author: tianshujie98 +Date: Wed Mar 17 14:04:43 2021 +0800 + + * Modify language items. + +commit 7d5dd33879c843d2ee096547a325cfff5abca398 +Merge: 82c6e01251 56da31b345 +Author: tianshujie98 +Date: Wed Mar 17 14:01:57 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 56da31b345c3292b14b850e7de2c65579466390b +Author: Yagami <976204163@qq.com> +Date: Wed Mar 17 14:01:48 2021 +0800 + + * FIx bug. + +commit 82c6e01251dce474c9ad6ccec7bcf6b96326cacc +Author: tianshujie98 +Date: Wed Mar 17 14:01:40 2021 +0800 + + * Finish task #36765. + +commit 39ae71ddcb90916175be4f01cd0ebd57a32c5216 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 17 13:56:42 2021 +0800 + + * Remove all menugroup. + +commit d802f35bdc23b406b4e1a46385f41dc421fa6c5c +Author: Yagami <976204163@qq.com> +Date: Wed Mar 17 13:49:41 2021 +0800 + + * Fix branch menu. + +commit 9b63d380b0e3732a9e75179f4915f908599d725a +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 17 13:48:39 2021 +0800 + + * Finish task #36764. + +commit ebfa70d2d2caa3a540da88b569fd7a943303555e +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 17 13:47:31 2021 +0800 + + * Adjust code. + +commit 08ec8f2280d3c4092593a99c07350f987b930b45 +Author: qiyu-xie +Date: Wed Mar 17 13:44:40 2021 +0800 + + * Add a file name when export executions. + +commit 6d6ea9af3f784aeed273b11bbb9f00ac428489e0 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 17 13:36:33 2021 +0800 + + * Remove tree menugroup. + +commit e7d17f6e24aae847886c1a4fc200878bbc569933 +Merge: a86598cc89 b95a5ccdf0 +Author: zhujinyong +Date: Wed Mar 17 13:36:06 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit a86598cc890fe3281680b567c21c16c2da518f6a +Author: zhujinyong +Date: Wed Mar 17 13:33:55 2021 +0800 + + * Fix printModuleMenu. + +commit b95a5ccdf02b0f1792c3292dfe07703a60895576 +Merge: 62843dd5a0 9c243491c3 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 17 13:15:49 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 62843dd5a073de3f90e98e6c61e34164681b5ed9 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 17 13:15:36 2021 +0800 + + * Finish task #36756. + +commit 9c243491c3ad6761c4a1630901eaa29d8aae81f6 +Merge: 9268d6eba3 920c33a95e +Author: zhujinyong +Date: Wed Mar 17 12:13:50 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 9268d6eba38434f4cb8893eb3c481157946d07f0 +Author: zhujinyong +Date: Wed Mar 17 12:13:12 2021 +0800 + + * Fix menu when creating project. + +commit 920c33a95ee07a3af546ae88cbb6a942954a9d91 +Author: qiyu-xie +Date: Wed Mar 17 11:44:21 2021 +0800 + + * Fix bug. + +commit 437bc835928a02bce7ef2b730793aa83abab8d6c +Merge: 9f512843af fb943e01bd +Author: zhujinyong +Date: Wed Mar 17 11:39:56 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 9f512843afa4ac526aa6b9d0783d75c295742467 +Author: zhujinyong +Date: Wed Mar 17 11:39:32 2021 +0800 + + + Add setAppObjectID of program. + +commit fb943e01bd9e7e64628f77fd535d4f1593be58fd +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 17 11:39:10 2021 +0800 + + * Adjust code. + +commit c9dd75ef879368b4a1ae3a72e1575e14a75e4522 +Merge: 7ceee5250a a2cbb0e242 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 11:38:48 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 7ceee5250ac6020208a4990ea475bfa10a63790c +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 11:38:45 2021 +0800 + + * Adjust the requirement story review icon. + +commit a2cbb0e242279ea0e204fe69c13385306966f4ef +Merge: adeec9e34a 17536329c2 +Author: zhujinyong +Date: Wed Mar 17 11:34:25 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit adeec9e34a42d237675f149d788bbe7e401d2ff9 +Author: zhujinyong +Date: Wed Mar 17 11:33:57 2021 +0800 + + * Format code style. + +commit 17536329c288d7dedeb5aaa84ce8231b5ff3812b +Merge: bcc2cd9a26 a42e28c6ee +Author: tianshujie98 +Date: Wed Mar 17 11:33:46 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit bcc2cd9a2697b6b6bddcbe0d503f88181ba07f31 +Author: tianshujie98 +Date: Wed Mar 17 11:33:38 2021 +0800 + + * Fix bug. + +commit a81650c22d229824e123c0b636ab021c37b2c12e +Author: tianshujie98 +Date: Wed Mar 17 11:33:04 2021 +0800 + + * Fix bug. + +commit a42e28c6ee0fc3e84e559654353f9eb81e158988 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 17 11:30:55 2021 +0800 + + * Add group. + +commit d165d02b31813e7c3d9b002bbead5823a1af0c37 +Author: qiyu-xie +Date: Wed Mar 17 11:30:00 2021 +0800 + + * Delete the list settings of execution. + +commit c014e6812bdef1382be949fb6e35a304e5f715b7 +Merge: 608b0b3151 2149d5c39d +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 11:24:39 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 608b0b3151348b8e03ce5808b0826819993389ef +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 11:24:35 2021 +0800 + + * Adjust the story review icon. + +commit 2149d5c39de727608ad903371d3fe48cc493f444 +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 17 11:24:18 2021 +0800 + + * Finish task#36762. + +commit 5efb02cb36abe6843a78b24d3eea646534a37a12 +Merge: 632742ad95 7097394787 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 11:20:50 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 632742ad95ad6f75c1d576a3878a05f93365d04f +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 11:20:40 2021 +0800 + + * Finish task #36743. + +commit 709739478746ca5e24c9ade092ca1d76aa1e2346 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 17 11:17:19 2021 +0800 + + * Remove product browse btn in qa. + +commit 02c3db0e1cbecc40fa75f0f921058df7f70924e6 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 17 11:08:43 2021 +0800 + + * Merge code. + +commit 6c5d084938638fc849ad6661c87ae82d11504cc2 +Author: zhujinyong +Date: Wed Mar 17 10:57:37 2021 +0800 + + - Remove function: getMainAction. + +commit 31b15cbedc4036417b57df36db044bf4733f97ef +Author: Yagami <976204163@qq.com> +Date: Wed Mar 17 10:55:14 2021 +0800 + + * Fix story css. + +commit 70ae2251b0016252160d4922860113eec9128f6c +Author: Catouse +Date: Wed Mar 17 10:53:36 2021 +0800 + + * task #36769, change UI of buttons in header. + +commit 30fb46eea36ab3babedb82341f70e2be05f0c233 +Merge: d9a9083670 7dade3fa8f +Author: zhujinyong +Date: Wed Mar 17 10:43:28 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit d9a9083670d589762ccb9be697f4a37b15739cf4 +Author: zhujinyong +Date: Wed Mar 17 10:43:10 2021 +0800 + + - Remove viewMenu of product. + +commit 7dade3fa8f72faf3312416146c257220726ee205 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 17 10:39:21 2021 +0800 + + * Remove sql. + +commit ffd05e012368788f2def21748295457c9f989c3b +Merge: efbbf0a695 a16583ed97 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 10:34:37 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit efbbf0a69587bba4fa4d200a9da9584b8ff9e741 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 17 10:34:29 2021 +0800 + + * Finish task #36747. + +commit a16583ed974f4f15f43f9efe414a5973f2d83980 +Merge: c370c3ba54 013f00cd14 +Author: zhujinyong +Date: Wed Mar 17 10:33:21 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit c370c3ba54ae2e727222efab67cf4a84346e177b +Author: zhujinyong +Date: Wed Mar 17 10:31:26 2021 +0800 + + - Remove viewMenu of product. + +commit 013f00cd141eb7803d25e20f4c7c8af194aa6e53 +Merge: da81be9508 d58408ffbe +Author: tianshujie98 +Date: Wed Mar 17 10:24:37 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit da81be95083c943d82791efa4b32ee9575669e79 +Author: tianshujie98 +Date: Wed Mar 17 10:23:04 2021 +0800 + + * Adjust product ranking. + +commit d58408ffbe2657b27e0b221823fd64b0b18de456 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 17 10:20:01 2021 +0800 + + * Merge code. + +commit 28df323cc3f652fc0e11523c5c66a239e2a6473e +Merge: 409a8384dc 9df4cc58b9 +Author: zhujinyong +Date: Wed Mar 17 10:10:50 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 409a8384dcaea34093de87400a3fd7fe6a6dadec +Author: zhujinyong +Date: Wed Mar 17 10:10:33 2021 +0800 + + - remove viewMenu. + +commit 9df4cc58b906b536bb3919fb1530b6d51bab6d13 +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 17 10:09:28 2021 +0800 + + * Adjust index module. + +commit 383a47f254aad3f1073c2f277d538cd13c3f941d +Author: qiyu-xie +Date: Wed Mar 17 10:07:46 2021 +0800 + + * Navigation error. + +commit 140d96c1c56073668c7a4518cc0142a090ba2dad +Author: Catouse +Date: Wed Mar 17 10:04:15 2021 +0800 + + * fix error for "Duplicate entry * for key *". + +commit b958c45ed23594f23184c7975f4f72daf8db2bfb +Author: qiyu-xie +Date: Wed Mar 17 09:52:27 2021 +0800 + + * Removed the execution sort. + +commit 0816362706a53f2992486b1d6f56ab2f21c0f861 +Merge: a9015ba45d 04e0105468 +Author: zhujinyong +Date: Wed Mar 17 09:39:54 2021 +0800 + + Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit a9015ba45d5df28bad8e703a61e37c31dfb58851 +Author: zhujinyong +Date: Wed Mar 17 09:35:51 2021 +0800 + + * Adjust main menu. + +commit e43b1fd89e63d263049b97c7fd90529f4c02860e +Author: wangyidong +Date: Wed Mar 17 09:21:26 2021 +0800 + + * fix bug. + +commit 32b1b95f242727a65dcea617c9aeabe5241e3f2e +Author: wangyidong +Date: Wed Mar 17 09:20:17 2021 +0800 + + * fix for waterfall menu. + +commit 04e0105468db726600eedabb6d17a4326379d103 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 16 17:35:01 2021 +0800 + + * Fix a bug. + +commit a97ecda5b72cfbc52433c9223985d0aee5e5ba55 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 16 17:23:24 2021 +0800 + + * Fix a bug + +commit b9f67425473261cde6a22bb98e2b707b5edeb991 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 16 17:22:03 2021 +0800 + + * Fix a bug. + +commit 7395de3a92faf67c93902b6d027acec4c30410ea +Merge: cd589f789b 3ba8f84053 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 16 16:54:22 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit cd589f789bcb47f161e7c9f02c6065e8e7625c11 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 16 16:54:18 2021 +0800 + + * Fix a bug. + +commit 3ba8f84053451b8d649996bc54ca5a4149bd1075 +Author: qiyu-xie +Date: Tue Mar 16 16:34:38 2021 +0800 + + * Click the execution list to enter task. + +commit 86416b127d2d0d4c87a59d261726e7aadd8952a3 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 16 16:34:54 2021 +0800 + + * Code for task #36769. + +commit 99711f8a6de9f7b8d705bfbdf34609ee0fd2c2e1 +Merge: 5b731bfc89 bc2a53eae4 +Author: wangyidong +Date: Tue Mar 16 16:19:03 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 5b731bfc89406422153ba1a40c87b91eeed74d31 +Author: wangyidong +Date: Tue Mar 16 16:15:38 2021 +0800 + + * code for task #36745. + +commit bc2a53eae4d4ae245d0c9004a12a31b3290b3cf1 +Author: qiyu-xie +Date: Tue Mar 16 16:13:51 2021 +0800 + + * Finish task#36746. + +commit b9e5131414dd3eaffd8a0eeaf16af381c0338737 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 16 16:13:24 2021 +0800 + + * Finish task #36764,#36755. + +commit 73f30498156d7790958b1e814996a44299b3deab +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 16 16:04:16 2021 +0800 + + * Finish task #36755. + +commit 80d8aa7af6494912ec78cc255f1849f3d65b41c0 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 16 15:42:02 2021 +0800 + + * Finish task#36470. + +commit 1162b8fd055ecdf780c8ae0d6dce016a5a3f5cc3 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 16 15:30:18 2021 +0800 + + * Finish task #36754. + +commit f38adc2e05ae7e33720b61a296a6afe3ae230420 +Author: Catouse +Date: Tue Mar 16 15:04:00 2021 +0800 + + * fix error on request mode=getconfig when visit at first time. + +commit 12ebccab4064ec7ab86375c55ddd3433510e07f0 +Author: Catouse +Date: Tue Mar 16 15:03:29 2021 +0800 + + * update icon-home. + +commit 11db3b9d5c6301f23ae769f2e9cbd4624d0d5b3c +Merge: b36389c04d 6e6276bd60 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 16 14:52:52 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit b36389c04dd13967299bf3fcd89143348b745fef +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 16 14:52:49 2021 +0800 + + * Fix a bug. + +commit 6e6276bd60f3000a3f6cc986bb9ccf2eecdbcdf3 +Author: tianshujie98 +Date: Tue Mar 16 14:52:20 2021 +0800 + + * Finish task #36744. + +commit 07532a914cb2df8e5d702adbdcf9a7d9e959a981 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 16 14:36:45 2021 +0800 + + * Finish task #36764. + +commit 7fbc4a0e473f77af7dc5d769d3722b177f8f1789 +Author: tianshujie98 +Date: Tue Mar 16 14:25:48 2021 +0800 + + * Adjust page. + +commit 0d5bd902f47742e3922406b07618f75ac3c9fe0e +Author: Yagami <976204163@qq.com> +Date: Tue Mar 16 14:24:22 2021 +0800 + + * Code for task #36465. + +commit 38d56468fd1cb74ef5b9601fa37c8114a0f01341 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 16 13:56:40 2021 +0800 + + * Fix an error. + +commit 10710c629bef9263a96123db513beea8dbef3ebf +Merge: 2506afe376 05d469e703 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 16 13:12:44 2021 +0800 + + Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 + +commit 2506afe376bda0829f01a2abfaf004e94bc07e09 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 16 13:12:39 2021 +0800 + + * Adjust the case edit and batch edit. + +commit 05d469e703eb08d4f9e135a371935b22942705e7 +Author: qiyu-xie +Date: Tue Mar 16 13:10:50 2021 +0800 + + * Finish task#36761. + +commit 40da174eceb2afdcf6f654b2e75808a64f20ad05 +Author: qiyu-xie +Date: Tue Mar 16 11:41:24 2021 +0800 + + * Finish task#36759. + +commit d0ee50ff2203e1cb3f489681ac4d4ef4d7e78947 +Author: qiyu-xie +Date: Tue Mar 16 11:32:30 2021 +0800 + + * Finish task#36759. + +commit 2820ee43d7911bf5e0d148429286e3d1b91c187f +Author: Yagami <976204163@qq.com> +Date: Tue Mar 16 09:48:30 2021 +0800 + + * Fix testcase link. + +commit c47fd750dd385812a67fe26ad00f5fd0b5628537 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 16 09:46:39 2021 +0800 + + * Adjust the #userQueries width for different resolution. + +commit 07f43edb3f13b3a201de992a8f6442cca0a3a3c7 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 16 08:56:34 2021 +0800 + + * Adjust index module. + +commit a675f8793fc78633c9c9afa01290e2cbb9c5e6be +Merge: ba8220d34d a6822ac1cf +Author: Guanxiying +Date: Mon Mar 15 14:21:46 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit a6822ac1cf2dc64bcb19ff67416243af92d37d0c +Merge: 11aacd45d7 dd1d428c18 +Author: zhujinyong +Date: Mon Mar 15 12:36:21 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 11aacd45d7c4e3ec39dc4f552d57574f06fe5b1b +Author: zhujinyong +Date: Mon Mar 15 12:35:33 2021 +0800 + + - Remove 'from' param. + +commit dd1d428c185690ec73002f2317dcbf32c722f1b4 +Merge: 04603923e2 771cfdd124 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 15 12:30:40 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 04603923e2f69fd595996ae6bf6a887aaa8c7396 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 15 12:30:36 2021 +0800 + + * Fix a bug. + +commit 771cfdd124bbf470c840291c689c4e31c7614876 +Merge: 69b6599303 c780f1aa6f +Author: tianshujie98 +Date: Mon Mar 15 11:39:52 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 69b65993032cca1fa2544c12e58cf04c9f109e47 +Author: tianshujie98 +Date: Mon Mar 15 11:39:22 2021 +0800 + + * Fix export issue of execution list. + +commit c780f1aa6fa4632ab53edc495e8310b182e98c9c +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 15 11:37:51 2021 +0800 + + * Fix create execution error. + +commit 288703e362d4e285e98c83871b550c02334bbda9 +Merge: 5906c84357 7cbb6731e9 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 15 11:27:48 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5906c84357fbcc02177e1ca9b89bca842206b1ad +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 15 11:27:41 2021 +0800 + + * Adjust the code. + +commit 7cbb6731e9d4a47a51231ae55187a36660b096fb +Author: tianshujie98 +Date: Mon Mar 15 11:09:26 2021 +0800 + + * Remove duplicate codes. + +commit 19f6cbaab4bd4f973addcafa82b3f587a5de4f95 +Author: Yagami <976204163@qq.com> +Date: Mon Mar 15 11:00:40 2021 +0800 + + * Add comment. + +commit 17b906a55ff6eaefb19f19a058513d583cda80ee +Author: Yagami <976204163@qq.com> +Date: Mon Mar 15 10:56:42 2021 +0800 + + * Merge code. + +commit 98b4646825084f761407c82e7204ef0cec7377c6 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 15 10:40:06 2021 +0800 + + * Edit create project title. + +commit 14beaeea8c4de6b5cda413892c626787a2446e6c +Merge: 261a44bf86 53d6357305 +Author: tianshujie98 +Date: Mon Mar 15 10:23:58 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 261a44bf8638cc54fed2d2cf158521dd566daac3 +Author: tianshujie98 +Date: Mon Mar 15 10:23:45 2021 +0800 + + * Adjust page. + +commit 53d6357305f007a1437cce4c061ab419f0651e26 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 15 10:16:32 2021 +0800 + + * Fix create project error. + +commit 6531b5410d430b6617e56bd1d13a489b7965d121 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 15 10:09:15 2021 +0800 + + * Fix bug 11266. + +commit 96b402d30c777597f5cf0a11d1ad0634d34ebf5f +Author: qiyu-xie +Date: Mon Mar 15 09:50:22 2021 +0800 + + * Fix bug. + +commit 8182ff0022249fbc3081563744bd93e40bae8859 +Merge: 3ea60b0be2 256229cd2a +Author: zhujinyong +Date: Mon Mar 15 09:48:37 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3ea60b0be219b29c879a8e7b98020de354b5d2e8 +Author: zhujinyong +Date: Mon Mar 15 09:48:17 2021 +0800 + + * Fix language of parent program. + +commit 256229cd2a464629bbf3a83a989e288d69c4ad0b +Merge: e2027ac0d3 233335ff99 +Author: wangyidong +Date: Mon Mar 15 09:46:42 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 233335ff99c2c02bd13757d4ff6fb3290a29d4f8 +Author: qiyu-xie +Date: Mon Mar 15 09:45:11 2021 +0800 + + * Modify the problem of the left tree list flashing when changing the execution list label. + +commit e2027ac0d3e59bded84439734b6c12cb482ac2d6 +Merge: 7119fdea97 b0b09e53b2 +Author: wangyidong +Date: Mon Mar 15 09:45:09 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b0b09e53b2a66055b814205387cd8f0c162931d4 +Merge: b7cf68c746 81cd248b49 +Author: tianshujie98 +Date: Mon Mar 15 09:41:04 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b7cf68c746c2fe473b1343102598d61e90aef66b +Author: tianshujie98 +Date: Mon Mar 15 09:40:46 2021 +0800 + + * Finish task #36430. + +commit 81cd248b4904405eb6754156220ed428324cfd2a +Author: qiyu-xie +Date: Mon Mar 15 09:35:32 2021 +0800 + + * Fix batch edit executions. + +commit 2cf33c7be14b0f118cded0d812afe1e2cf49462a +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 15 09:19:48 2021 +0800 + + * Finish task #36316. + +commit f0365d75367317889468f873fa8bec0b4535d4b4 +Author: Yagami <976204163@qq.com> +Date: Mon Mar 15 09:17:39 2021 +0800 + + * Add qa lang. + +commit 8348604d9cc3a8c32307205fe87ed65337e6d138 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 15 09:10:55 2021 +0800 + + * Fix task #36447. + +commit af2eb3d2458493fe63b8c1f8ddfb36d6b9817aec +Author: qiyu-xie +Date: Mon Mar 15 09:08:27 2021 +0800 + + * Delete batch. + +commit 5e825cc28061be86f85ce118d6d748bb1855b40c +Merge: 52998051cb bc5b424d54 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 15 09:08:36 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 52998051cb9871390a6ce30ca3498f2c02063696 +Merge: f684e1f50a 35b436250d +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 15 09:06:00 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit bc5b424d54d7a95e637a58e59be7f0f3d9ac8196 +Author: qiyu-xie +Date: Mon Mar 15 09:05:58 2021 +0800 + + * Fix bug. + +commit f684e1f50aff364826c35d8a3fed1925d7a695aa +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 15 09:04:37 2021 +0800 + + * Fix task #36447. + +commit 35b436250d2d6cc075653e4a32e5730faaa3ce8c +Author: qiyu-xie +Date: Mon Mar 15 08:54:18 2021 +0800 + + * Finish task#36498. + +commit 3f88a4e65afd03492edce66a77b7e7c788f9a69e +Author: zhujinyong +Date: Sun Mar 14 23:12:06 2021 +0800 + + * Adjust menu of execution. + +commit d756a3f5d56ea4daa473af801c9fb0940c0ecadc +Author: zhujinyong +Date: Sun Mar 14 22:12:45 2021 +0800 + + * Fix bug: object undefined. + +commit 7119fdea97baeef12e8b39803fcf3552421faebb +Merge: 18e743c4ee fff023bf28 +Author: wangyidong +Date: Fri Mar 12 15:50:26 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 18e743c4ee4304d6e8c742cbc64028cb31eab2d2 +Author: wangyidong +Date: Fri Mar 12 15:49:48 2021 +0800 + + * fix bug for create bug. + +commit fff023bf282db9fbdc154680b67485c9745fbe0d +Author: Yagami <976204163@qq.com> +Date: Fri Mar 12 15:45:17 2021 +0800 + + * Add execution testcase method. + +commit 95def5d77c14ee9ca0a86b5d556ed1da573a8ab0 +Author: qiyu-xie +Date: Fri Mar 12 15:27:43 2021 +0800 + + * Modify execution order. + +commit 526fb0d7080c52515f7e5c2d5619eee1a8905754 +Author: Yagami <976204163@qq.com> +Date: Fri Mar 12 15:16:20 2021 +0800 + + * Add execution case. + +commit 6fd6f823a87fc889b2fb0fbb14af9443377d275a +Author: qiyu-xie +Date: Fri Mar 12 15:13:05 2021 +0800 + + * Modify execution list. + +commit 39a273978c3cc3fc99bce9103a937bf84d98a6d9 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 12 15:01:08 2021 +0800 + + * Fix task #36447. + +commit eee180eb5eec5c7eddac6121d455424e2d008bc0 +Author: qiyu-xie +Date: Fri Mar 12 14:42:50 2021 +0800 + + * Add the project when adding execution. + +commit 39bc7119317fc53ff0ce75911ca5ed6319bfa890 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 12 14:25:30 2021 +0800 + + * Add ajax get drop menu of bug method. + +commit 9ff48bdb534d41955e1a43339598623ce78177d3 +Author: leiyong <1549684884@qq.com> +Date: Fri Mar 12 14:14:56 2021 +0800 + + * Adjust code. + +commit 1241e1a7696632190981c3f93b809d399188fa5a +Author: Yagami <976204163@qq.com> +Date: Fri Mar 12 13:29:40 2021 +0800 + + * Fix code error. + +commit c4d48ed0b1d53dbcca6492108e94c7ab2948d378 +Merge: e86f744e86 7d1e377454 +Author: hufangzhou <746775970@qq.com> +Date: Fri Mar 12 13:28:47 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit e86f744e86b6390a5ef282d6c02d8d9d4e001d2f +Author: hufangzhou <746775970@qq.com> +Date: Fri Mar 12 13:28:43 2021 +0800 + + * Adjust the code. + +commit 7d1e3774542994a4f068aef6c325ea5fec9834ab +Author: Yagami <976204163@qq.com> +Date: Fri Mar 12 11:23:55 2021 +0800 + + * Rename function. + +commit 51944f67f5dc292a26e06fa23f851b0933666d15 +Author: Yagami <976204163@qq.com> +Date: Fri Mar 12 11:10:15 2021 +0800 + + * Code for personal. + +commit b6aed860942d552be5d4ba4350711c024d17510a +Author: leiyong <1549684884@qq.com> +Date: Fri Mar 12 10:59:14 2021 +0800 + + * Adjust common language item. + +commit 0b0cdcbda72dd98865a3cc5578ce9dd1b004df0e +Author: Yagami <976204163@qq.com> +Date: Fri Mar 12 10:56:47 2021 +0800 + + * Rename personnel. + +commit 79d200f692882c7f9bb753d5a74765aa44c5117e +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 12 10:41:27 2021 +0800 + + * Finish task #36447. + +commit 366f0608c358d8c8cf18883fdf4e35b5b47fa5f7 +Author: leiyong <1549684884@qq.com> +Date: Fri Mar 12 10:32:19 2021 +0800 + + * Adjust group moduel. + +commit 3bd0242fdeb7baa0647defcd3191c164db37acaa +Author: leiyong <1549684884@qq.com> +Date: Fri Mar 12 10:19:11 2021 +0800 + + * Finish task#36338. + +commit c55c18093cda5840660b2eccdb36e67581ee1bcf +Author: tianshujie98 +Date: Fri Mar 12 10:16:49 2021 +0800 + + * Fix the problem of creating bugs. + +commit 0149dd2aeeb7a9ab473a49f2ec60c2f2b70c8274 +Author: Yagami <976204163@qq.com> +Date: Fri Mar 12 09:58:22 2021 +0800 + + * Finish task #36489. + +commit 8ad207c3ecc688297f305af856abbc7be08bbe07 +Author: tianshujie98 +Date: Fri Mar 12 09:55:39 2021 +0800 + + * Fix bug. + +commit bcf500a081d28c2a9eacfbaeb44d9d848afd429f +Author: leiyong <1549684884@qq.com> +Date: Fri Mar 12 09:51:11 2021 +0800 + + * Finish task#36317. + +commit 1f52d98c8b18f7fb99ef7f24104eff3a6f3fe820 +Author: tianshujie98 +Date: Fri Mar 12 09:48:11 2021 +0800 + + * Fix the problem of creating bugs. + +commit 95fc092debe3ce698329414be7b5949884544823 +Author: qiyu-xie +Date: Fri Mar 12 09:36:00 2021 +0800 + + * Fix bug. + +commit efb90c0b8cdaf25747b6584ea4a686531a107097 +Merge: a5827af318 e9375c0569 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 12 09:35:44 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit a5827af318649c95b2479a3f93cf9ca1abbbc48b +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 12 09:35:14 2021 +0800 + + * Finish task #36473. + +commit e9375c056926a4a019c5ae36bd00d726196de6f3 +Author: tianshujie98 +Date: Fri Mar 12 09:08:49 2021 +0800 + + * Fix project editing issues. + +commit c0ca911a4f8d0a0786e20bd5b90559af6711575c +Author: Yagami <976204163@qq.com> +Date: Fri Mar 12 09:07:10 2021 +0800 + + * Finish task #36481. + +commit 0afece207e00916fec9b76b771d419710d77a4ab +Author: tianshujie98 +Date: Fri Mar 12 09:02:41 2021 +0800 + + * Fix project batch editing problem. + +commit 8f90591d45a6225f47cf5aa53b1ff72a46e89dee +Author: Yagami <976204163@qq.com> +Date: Fri Mar 12 09:01:52 2021 +0800 + + * Rename function. + +commit 578bca62b83c712d159ad31baa400efb5f29a198 +Merge: ff5c09c76f 70047ed2af +Author: hufangzhou <746775970@qq.com> +Date: Fri Mar 12 08:21:44 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ff5c09c76f3aa095d680e3d502ef2a06248693e5 +Author: hufangzhou <746775970@qq.com> +Date: Fri Mar 12 08:21:40 2021 +0800 + + * Adjust the code. + +commit 70047ed2af916a99284210b0506d34a74d8e83f5 +Author: qiyu-xie +Date: Fri Mar 12 08:11:48 2021 +0800 + + * Fix bug. + +commit 3610051e71df7381d5e67ff6daa6a5e7f06ef8e9 +Author: qiyu-xie +Date: Thu Mar 11 20:44:47 2021 +0800 + + * Delete the drop-down menu that execution's three-level navigation. + +commit 8fb5c794818c45e2384cbd94737b8ed8cccd0f73 +Author: qiyu-xie +Date: Thu Mar 11 20:38:45 2021 +0800 + + * Finish task#36497. + +commit b8885bc1eaeff95d8bb3d7abc219395e5846c969 +Author: qiyu-xie +Date: Thu Mar 11 20:18:10 2021 +0800 + + * Finish task#36500. + +commit a6764f4bc59a8ec9419a47ce6ef6a7824e82202f +Author: leiyong <1549684884@qq.com> +Date: Thu Mar 11 18:20:06 2021 +0800 + + * Adjust automation module code. + +commit 11d818c80ffb587a97704fdd3a748dfbe91c8a85 +Author: tianshujie98 +Date: Thu Mar 11 17:36:21 2021 +0800 + + * Adjust the project field of the zt_bug table. + +commit 57d5990c68a4f34e90d1fd6d21d0f06390c0871d +Author: Yagami <976204163@qq.com> +Date: Thu Mar 11 17:27:37 2021 +0800 + + * Fix execution menu. + +commit 20cf8a0c8d29b8290fa9f676cdb3054d5967e8fe +Author: Yagami <976204163@qq.com> +Date: Thu Mar 11 17:02:56 2021 +0800 + + * Fix menu group. + +commit 7d3d817e445ab62424f207c1499fe7d5f5ac9d22 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 11 16:57:36 2021 +0800 + + * Add group priv. + +commit 3f4392060554642d8ee677914917c31cd0c6fd70 +Author: tianshujie98 +Date: Thu Mar 11 16:50:41 2021 +0800 + + * Finish task #36457. + +commit 5cc07e20c11f37c123330cd6561048b8e6d7b017 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 11 16:46:12 2021 +0800 + + * Fix lang file. + +commit 5fcb3b94d34a6d8cc52167b03ee35ff85c79ad4a +Author: qiyu-xie +Date: Thu Mar 11 16:41:56 2021 +0800 + + * Finish task#36453. + +commit 06caf7da590a01be773e9ebaf723325b5915b3d6 +Author: qiyu-xie +Date: Thu Mar 11 16:35:40 2021 +0800 + + * Finish task#36498. Modify the header name of the execution list. + +commit 250b7401dcfea83bd3755798fcdc603dc60c4b03 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 11 16:32:30 2021 +0800 + + * Fix code bug. + +commit e7b7976fef3bf6fa539708c45cccac86f4836bf7 +Merge: 1e4b9124a9 f421ee4a11 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 11 16:18:11 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1e4b9124a96101a7fcd1fa601e3a21d5fef877b5 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 11 16:18:03 2021 +0800 + + * Adjust the divider style. + +commit f421ee4a114ed977e540041cfa544a4018a5b2a3 +Merge: e96cee99d2 ee0ba6ae45 +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 11 16:14:54 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit e96cee99d24c831d4087aa4d937a2d2985cdfb6a +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 11 16:14:30 2021 +0800 + + * Delete sql file of version 20. + +commit ee0ba6ae453d190547c5c16c968880825c59b49e +Author: tianshujie98 +Date: Thu Mar 11 16:14:27 2021 +0800 + + * Adjust style. + +commit aa26731aecc75038acc687acfef7c57dbf1b0948 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 11 16:13:29 2021 +0800 + + * Fix qa menu. + +commit ba8220d34d879d3ced42478ed44b9b66f569ad97 +Merge: e88eefba88 4169ae44c8 +Author: Guanxiying +Date: Thu Mar 11 15:52:46 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit e88eefba8864f17af2a3e8b276fbafc05d15acd9 +Author: Guanxiying +Date: Thu Mar 11 15:52:12 2021 +0800 + + * Add gitlab to scm list. + +commit 4169ae44c8f7dc5a2b2dbaeeb5b82aac6c58611b +Author: tianshujie98 +Date: Thu Mar 11 15:45:34 2021 +0800 + + * Fix bug. + +commit d5387d914aff8b1df410e888e19b07283a07efa1 +Author: leiyong <1549684884@qq.com> +Date: Thu Mar 11 15:41:34 2021 +0800 + + * Add automation module. + +commit 890e2ec829524e0da72430092236295033de7c77 +Merge: 273cc71e30 8fdbd5c5b6 +Author: tianshujie98 +Date: Thu Mar 11 15:39:11 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 273cc71e30708af1a7c6103dab6b37e3290c6025 +Author: tianshujie98 +Date: Thu Mar 11 15:38:43 2021 +0800 + + * Modify language items. + +commit 8fdbd5c5b6977d609c4c07dc9243d0965cba168e +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 11 15:38:21 2021 +0800 + + * Finish task #36432. + +commit a6548ee70de894d51eb0a83e9f172d1b9c15ed12 +Merge: aaace4b2de cca7342275 +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 11 15:33:21 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit aaace4b2dedf0953e5908a1085996e06aef8cf8b +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 11 15:32:59 2021 +0800 + + * Modify PRJMine to involved. + +commit cca73422756ef1e3081868c112fc7b8b0ae1bcef +Author: tianshujie98 +Date: Thu Mar 11 15:31:36 2021 +0800 + + * Merge. + +commit e71affe4c97b081ed74f7a3b4c900fbc58f43321 +Author: qiyu-xie +Date: Thu Mar 11 15:30:28 2021 +0800 + + * Finish task#36453. + +commit 775b25f90369ef210794ee109c336b05ed3892ab +Merge: ec01a855f3 1d40d2ecf4 +Author: tianshujie98 +Date: Thu Mar 11 15:29:27 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ec01a855f3d87816ff89ba0624f5fc491973d2e9 +Author: tianshujie98 +Date: Thu Mar 11 15:27:21 2021 +0800 + + * Finish task #36438. + +commit 1d40d2ecf4c4e0693ff8f8e80a407c7644c13e73 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 11 15:27:05 2021 +0800 + + * Add the cases to the project when create or batch create cases not in qa module. + +commit d0b8f6164bbfccd68a489f3026ce7a4e890a2b35 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 11 15:24:17 2021 +0800 + + * Add order by to user view. + +commit c46a398cd7380c46cad51a32da7a1f9450a36237 +Merge: c3eaf28e91 95dda02a08 +Author: tianshujie98 +Date: Thu Mar 11 14:57:10 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit c3eaf28e91f96f916e4e6d81b2436ba7c757c60a +Author: tianshujie98 +Date: Thu Mar 11 14:55:05 2021 +0800 + + * Finish task #36486. + +commit 95dda02a08426a9313b10219c9540657e4153624 +Merge: 2316458960 ae00791f4e +Author: leiyong <1549684884@qq.com> +Date: Thu Mar 11 14:50:52 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 2316458960a633292551455599d6874220908a8d +Author: leiyong <1549684884@qq.com> +Date: Thu Mar 11 14:50:38 2021 +0800 + + * Adjust menu. + +commit ae00791f4e896f4eb0b166cf11e77d5b063ebc12 +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 11 14:22:04 2021 +0800 + + * Finish task #11267. + +commit ce9688022357682dc69a2be2a03a0b3bf6aa84cd +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 11 14:17:06 2021 +0800 + + * Fix bug #11264. + +commit c18f43b922f19e9b39c1c8c7609116987df7d449 +Merge: b07a3ed597 3bb4210a0c +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 11 14:11:28 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit b07a3ed597b555af3dbe11080a556d0c023e799b +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 11 14:08:36 2021 +0800 + + * Fix create project error. + +commit 3bb4210a0c6bfceaacf9f53bee074af70c9c34cf +Merge: 3ce03aa442 f33c2b311d +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 11 14:02:00 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3ce03aa442264d88cb4a4179089d5840439585f3 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 11 14:01:57 2021 +0800 + + * Adjust the code. + +commit f33c2b311d705720ae99cb9822eed4140634b6cf +Author: qiyu-xie +Date: Thu Mar 11 13:56:18 2021 +0800 + + * Finish task#36500. + +commit fc9ae73dbf265f1b1487971b10e000fa2bb70ff7 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 11 13:47:46 2021 +0800 + + * Adjust the code. + +commit 83129d98ac4990bdc428bc21ca67ad1cbe0c3e91 +Merge: ae3f1cb1ed b8ee8cffe5 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 11 13:42:49 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ae3f1cb1edbb429387291aab15e928bf6fb57218 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 11 13:42:45 2021 +0800 + + * Adjust the code. + +commit b8ee8cffe5c386155e16b35ca83edbbd504b6a7a +Author: Yagami <976204163@qq.com> +Date: Thu Mar 11 13:26:54 2021 +0800 + + * Sort projects. + +commit e7a2c4119973e8a8edf53087a21a80a41c68ffee +Merge: 07fda9e004 254705774c +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 11 13:23:10 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 07fda9e004b274e0b3e538807f24ba325fd76a6f +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 11 13:22:52 2021 +0800 + + * Finish task #36447. + +commit 254705774c58b614066e2605058c1ac4a664ef51 +Author: tianshujie98 +Date: Thu Mar 11 13:13:05 2021 +0800 + + * Modify language items. + +commit ac0a9f20a88f80b880d13fc82d771448dac404c5 +Merge: a5152b5908 64c3c57748 +Author: tianshujie98 +Date: Thu Mar 11 11:51:23 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit a5152b5908eda85561523b91b0dec8a336bd1db6 +Author: tianshujie98 +Date: Thu Mar 11 11:51:01 2021 +0800 + + * Finish task #36467. + +commit 64c3c5774868467dc59628ffddd4a8285fcb606c +Merge: 4d6c389c24 d0016bab64 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 11 11:40:28 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4d6c389c244d565a8a8094a642ef5f938b3ed23e +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 11 11:40:23 2021 +0800 + + * Finish task #36446. + +commit d0016bab648b7879c50fd928ed5b0ca6296dd83d +Author: Yagami <976204163@qq.com> +Date: Thu Mar 11 11:30:00 2021 +0800 + + * Finish task #36465. + +commit 1f407babdccaf6f5941c12d04b4d199e242e49ec +Author: qiyu-xie +Date: Thu Mar 11 09:51:21 2021 +0800 + + * Fix bug. + +commit 777e609aa3038383387297e80f4e033840066a00 +Author: qiyu-xie +Date: Thu Mar 11 09:42:34 2021 +0800 + + * Finish task#36498. + +commit 60f8cadc084d44de080c736c6e2555597df985a3 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 11 09:31:39 2021 +0800 + + * Finish task #36435. + +commit 644e8b5855b0078353af4e42a157009d2b2663df +Author: Yagami <976204163@qq.com> +Date: Thu Mar 11 09:29:09 2021 +0800 + + * Fix commom menu and stakeholder btn position. + +commit 18ea33f62e2e0e327753e56b6875050cb481eac5 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 11 09:11:05 2021 +0800 + + * Finish task #36488. + +commit 80f6cf2fcac96c88ace405ab159c7255323b88ed +Merge: 8a5ae3141f 92ef264c1d +Author: zhujinyong +Date: Thu Mar 11 09:07:32 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8a5ae3141f091b325e6dda50ed67e851a71f90af +Author: zhujinyong +Date: Thu Mar 11 09:07:04 2021 +0800 + + * Fix error of creating execution. + +commit 92ef264c1dc3055f5a4f61cdffc61eb6c143fc4a +Author: tianshujie98 +Date: Thu Mar 11 08:12:34 2021 +0800 + + * Fix bug #11247. + +commit c869d88cc2c4c5e5736e285a0c76609de12766d0 +Author: zhujinyong +Date: Wed Mar 10 23:35:56 2021 +0800 + + * Fix css style of *.html.php + +commit f54307a4cce411cfa7b89e57c254025e772e526f +Author: zhujinyong +Date: Wed Mar 10 23:07:20 2021 +0800 + + * Fix code style. + +commit 5be8db8cb754ba62498af69640f6e4eb394eaa4b +Author: tianshujie98 +Date: Wed Mar 10 16:15:31 2021 +0800 + + * Fix bug. + +commit f07384115c19f7a89ef6a4f2224e2fe3495bb50b +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 10 15:59:13 2021 +0800 + + * Fix bug. + +commit 6d2495ce7784153c5b8ab6858c97477e63e6a70d +Merge: 6a78a6a326 7fafeec281 +Author: tianshujie98 +Date: Wed Mar 10 15:38:34 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6a78a6a3262c5b67eee53a12eea1579e83443b16 +Author: tianshujie98 +Date: Wed Mar 10 15:38:18 2021 +0800 + + * Adjust code. + +commit 7fafeec281ad2e467ed2f1b4e1f0c754fc81d49d +Merge: 0a9d1bb510 c50bce8a03 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 10 15:31:58 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0a9d1bb510340fb46776db5942f91ddf3b59b5f1 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 10 15:31:39 2021 +0800 + + * Finish task #36495. + +commit c50bce8a03d5d6f84943f75dbcfdb07fb3f63fa8 +Merge: b4fe162555 86b6950429 +Author: tianshujie98 +Date: Wed Mar 10 15:27:04 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b4fe16255515d7d16eb99c257300a0f50797217b +Author: tianshujie98 +Date: Wed Mar 10 15:26:32 2021 +0800 + + * Finish task #36501. + +commit 86b69504291991e3c3c158f4a0a1138bc60e6116 +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 10 15:16:59 2021 +0800 + + * Finish task#36038. + +commit c14f5696c3cf2eafa2d20cd7d0ff76852a299080 +Merge: 645f880f82 2d5b62de0b +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 10 14:42:20 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 645f880f825cdb8078564ec6efe6705b0176e776 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 10 14:42:15 2021 +0800 + + * Adjust the code. + +commit 2d5b62de0b856951c43cc3f52e1ac708f743c30d +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 10 14:33:34 2021 +0800 + + * Fix search. + +commit e526c540c8edbae24b566d2a0c616159351585c7 +Merge: cfbb1d8433 799dfff698 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 10 13:46:44 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit cfbb1d8433fbc3843ace4f008da894df63ee9db4 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 10 13:46:38 2021 +0800 + + * Fix a bug. + +commit 799dfff6986a872c0675eabfc44017ea7b620689 +Author: qiyu-xie +Date: Wed Mar 10 13:44:41 2021 +0800 + + * Modify data for execution list statistics. + +commit 1082a2425fd55dedb14ad83d8453b10a0713f2bd +Author: Yagami <976204163@qq.com> +Date: Wed Mar 10 13:43:15 2021 +0800 + + * Finish task #36436. + +commit 86055e545f0855486f0b9398b878b943d2423bf4 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 10 13:38:04 2021 +0800 + + * Fix execution list in project module. + +commit 0544b34a141fb6fc8148d9645a85c81e11a32991 +Author: Catouse +Date: Wed Mar 10 13:34:59 2021 +0800 + + * update picker files. + +commit c76099ae43148b5991075c9bb61e5e2d532c77f1 +Author: tianshujie98 +Date: Wed Mar 10 13:34:49 2021 +0800 + + * Fix bug. + +commit cdbb2760a4645c874a51eb80617672104764eaf1 +Merge: 9463211a2b 8693646031 +Author: tianshujie98 +Date: Wed Mar 10 13:28:51 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 9463211a2b9c334aade324b319c938cdc0a559b5 +Author: tianshujie98 +Date: Wed Mar 10 13:28:09 2021 +0800 + + * Fix the problem of associating stories as planned. + +commit 8693646031be55234d67026b5be983769b211534 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 10 13:20:51 2021 +0800 + + * Finish task #36451. + +commit fae9035f8f037f1305e503b1ca2d974c8ea57c7f +Merge: cdd8ef38b1 79de94c419 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 10 11:47:13 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit cdd8ef38b166099ae5195eb39fc281e2c4fabfff +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 10 11:47:09 2021 +0800 + + * Adjust the border color of the button. + +commit 79de94c419194d2544b3a4cec4c4e7f36742fe01 +Merge: f1428816b6 84689f67e3 +Author: tianshujie98 +Date: Wed Mar 10 11:46:23 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f1428816b661ef4fb3995b8df6cb82ba4811764d +Author: tianshujie98 +Date: Wed Mar 10 11:46:10 2021 +0800 + + * Fix bug. + +commit 84689f67e33590f16d1a282e6706ff319f4e743d +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 10 11:43:05 2021 +0800 + + * Finish task#36452. + +commit c745c2ca195bad9643f360a7d4dcbd1825780b82 +Author: tianshujie98 +Date: Wed Mar 10 11:41:49 2021 +0800 + + * Fix bug. + +commit b62c51539cb371cbda85da8c9f643b33cea18e6e +Merge: f5f179a2b6 6d281fdb23 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 10 11:32:03 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f5f179a2b6c91c47e1785eb01c24edfa1dbda5e0 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 10 11:32:00 2021 +0800 + + * Fix a bug. + +commit 6d281fdb2302d4e26ce3554091db746caa14cc7b +Merge: 16f043f693 9af18d203f +Author: tianshujie98 +Date: Wed Mar 10 11:30:40 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 16f043f69377ca21c2ce31fcbe287884d6ea2ae8 +Author: tianshujie98 +Date: Wed Mar 10 11:30:22 2021 +0800 + + * Fix link story bug. + +commit 42ae2394a76b6750046b82ef9d08a54f461c703e +Author: tianshujie98 +Date: Wed Mar 10 11:28:51 2021 +0800 + + * Finish task #36492. + +commit 9af18d203ff8f2a9c6e0205493d91cb8eb7705c1 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 10 11:23:54 2021 +0800 + + * Code for task #36436. + +commit 12f2552edf01a3bbca3c2fa033c2b16becd995d3 +Merge: 940d9cbed3 05bcdae622 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 10 11:17:28 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 940d9cbed30a4cfffcb9e98af9512993bdfe1265 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 10 11:16:49 2021 +0800 + + * Fix get dynamic error. + +commit 05bcdae622ae07a8431806022a447e5e194d4a6b +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 10 11:04:52 2021 +0800 + + * Fix a bug. + +commit 1b471ee51969867e440d866c60bd0b278be58fa0 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 10 10:44:05 2021 +0800 + + * Adjust the code. + +commit af05beb77882f6a564f2e8308fb3772dbddd026f +Merge: 4be2d39fc4 c09dfd6fd2 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 10 10:37:17 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4be2d39fc47b8759a77625278ee4926481943899 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 10 10:37:14 2021 +0800 + + * Fix a bug. + +commit c09dfd6fd20e5034b5f3a9f3f1da7ce462e8636f +Merge: eb6ddcaff0 b65006b8dd +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 10 10:37:00 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit eb6ddcaff05c9fd67fbe6c372485207f860a6b93 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 10 10:36:42 2021 +0800 + + * Finish task #36451. + +commit b65006b8dd2b68856e4db7bc7552d86444674577 +Merge: 4bd1ec2ceb 37800181de +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 10 10:32:00 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4bd1ec2cebf2cecdcd19dd6f5e391c4653528607 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 10 10:31:55 2021 +0800 + + * Fix a bug. + +commit 37800181deefd46d4260eab1f7f5910faa851409 +Author: qiyu-xie +Date: Wed Mar 10 10:25:11 2021 +0800 + + * Fix bug. + +commit bb7e95d47580e84a02ae09c769ba9438de8d7be7 +Merge: e434046f8a 183feb3936 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 10 10:24:36 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit e434046f8a6ea64d8a538d5d0c23e46d83848b18 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 10 10:24:33 2021 +0800 + + * Finish task #36468. + +commit 183feb39368b4cc0b44ea55e7baa7237f4b8c695 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 10 10:24:13 2021 +0800 + + * Finish task #36465. + +commit c8036c78900e2b1055551ef7bd7957787b0584ba +Author: qiyu-xie +Date: Wed Mar 10 10:23:54 2021 +0800 + + * Fix bug. + +commit b608fc809da5a74386bd1dc35223572c8b1f3965 +Author: qiyu-xie +Date: Wed Mar 10 10:11:46 2021 +0800 + + * Finish task#36497. + +commit d2734ecaccd115b3d40dd34162623d72c736d6ce +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 10 09:57:37 2021 +0800 + + * Finish task#36456. + +commit a98432e9580d40a9a00430cd2799218bc9c2fed0 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 10 09:29:05 2021 +0800 + + * Finish task #36496. + +commit 700c0481d710b2e7fa71c271c7f2fdf4e8e83b20 +Merge: 8f294074bb f5eee5d43d +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 10 09:14:13 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8f294074bb1eb2b7e87ccd4f2752eba776bbbffc +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 10 09:12:07 2021 +0800 + + * Finish task #36496. + +commit f5eee5d43d88f810ea3c2afa1189ffa4b1e17aed +Author: Yagami <976204163@qq.com> +Date: Wed Mar 10 09:11:03 2021 +0800 + + * Finish task #36479. + +commit c0617febd91e851118903a75fdae1e8f59ade537 +Author: qiyu-xie +Date: Tue Mar 9 17:41:05 2021 +0800 + + * Add the flag of the execution list. + +commit 33bcb0922e60d1a8bbc057a39025c32db784f4d6 +Author: tianshujie98 +Date: Tue Mar 9 17:28:23 2021 +0800 + + * Finish task #36438. + +commit a94f6b2ee98db34e8bf0658d07544fd0e6c5bf43 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 9 17:16:53 2021 +0800 + + * Adjust block module language item. + +commit a295e11e63d6533084f274372be311d2e73d3944 +Author: qiyu-xie +Date: Tue Mar 9 16:56:46 2021 +0800 + + * Finish task#36499. + +commit 074bce86fd1192151f671631a6c83f6064ac1931 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 9 16:55:09 2021 +0800 + + * Finish task #36459. + +commit 01419f2c94990a87f0273c704901de3231bf928a +Author: Yagami <976204163@qq.com> +Date: Tue Mar 9 16:15:03 2021 +0800 + + * Fix lang bug. + +commit 2abdf31ad8006ea17c0c1ec106a05c3c90baabd2 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 9 16:14:41 2021 +0800 + + * Fix lang bug. + +commit 1b42cb6ff6ce01697f453a7f888bcde8aa96b5b7 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 9 16:12:28 2021 +0800 + + * Merge code. + +commit c02b5e3b4a6a00c7456d91ff8c19d01fd47cd664 +Merge: 4ef5e5c188 f42db83745 +Author: tianshujie98 +Date: Tue Mar 9 15:50:00 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4ef5e5c1884a7a769d814c4958a1248a18475be7 +Author: tianshujie98 +Date: Tue Mar 9 15:49:43 2021 +0800 + + * Finish task #36460. + +commit f42db8374540a0f1b7a2b5c0c5200bcd755af7d6 +Merge: 8f29501814 52785d17b3 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 9 15:49:31 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8f295018147d20bdb6d70c429003c2ff7cb4907d +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 9 15:49:25 2021 +0800 + + * Adjust block module code. + +commit 52785d17b3fe0355e3214ac4707ba66db07755c8 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 9 15:48:53 2021 +0800 + + * Code for task #36496. + +commit 4341a64282b0abdf2fd776e160f67ae5959e8fe2 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 9 15:31:22 2021 +0800 + + * Fix framework. + +commit d1e6e9265bfd619a6817687fe870f84257ada3fe +Author: Yagami <976204163@qq.com> +Date: Tue Mar 9 15:29:06 2021 +0800 + + * Rename project session to PRJ. + +commit 9516eeafffe1cc7dc5bc438817368f3435b228cc +Author: Yagami <976204163@qq.com> +Date: Tue Mar 9 15:22:19 2021 +0800 + + * Finish task #36481. + +commit f0db2b971d12817655bd7142a690d0e6482ef742 +Merge: 032b89aaed fb89b18fd9 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 9 15:15:52 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 032b89aaedcabfee0b61fbf7146da248f8626b3e +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 9 15:15:28 2021 +0800 + + * Adjust all executions lanague. + +commit fb89b18fd928ae84c462dd2e2933b4aed837aa4c +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 9 15:03:25 2021 +0800 + + * Adjust block module code. + +commit bd061f23dde9a7e94c8f547e76723ffb241e84be +Author: Yagami <976204163@qq.com> +Date: Tue Mar 9 14:57:56 2021 +0800 + + * Finish task #36482 and fix bugs. + +commit e87a149ff7a2aac4d5c9ef1bc0d967d1faace8bd +Author: qiyu-xie +Date: Tue Mar 9 14:44:16 2021 +0800 + + * Fix bug. + +commit 28f54ef4c3c47f3133d308bfe0783f4868ce52b8 +Author: qiyu-xie +Date: Tue Mar 9 14:37:00 2021 +0800 + + * Fix bug. + +commit 3f4a0d9d5c61328a213db93528d4111fb793b3b0 +Author: qiyu-xie +Date: Tue Mar 9 14:18:48 2021 +0800 + + * Finish task#36499. + +commit 391b4dbdc0e2e57a7d6d0f384f1a1af8789fa848 +Merge: 73245d4f62 ffd4dc75b2 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 9 14:16:12 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit ffd4dc75b22f41f18443dd261b97bf8b58e78af5 +Merge: 6fcb8759c5 84622c3231 +Author: tianshujie98 +Date: Tue Mar 9 14:16:05 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 73245d4f625a362bb6a7c0ba0f76aca1a17d4bdc +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 9 14:15:48 2021 +0800 + + * Adjust other lanague of execution. + +commit 6fcb8759c52d4cc9fa971e0db9bd5f51297aae21 +Author: tianshujie98 +Date: Tue Mar 9 14:15:46 2021 +0800 + + * Finish task #36461. + +commit 84622c3231ae070b9a7a6ff1a530167d99339586 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 9 14:07:34 2021 +0800 + + * Fix project details. + +commit c8c64bd05da66bad50c4b373ee8028ed19cb9de4 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 9 13:50:43 2021 +0800 + + * Adjust code. + +commit 9098e727a54058c66df71e3d3c03eef5b877984e +Author: Yagami <976204163@qq.com> +Date: Tue Mar 9 13:44:22 2021 +0800 + + * Fix project code details. + +commit 52bcf357ec251944e5d2d7858132aba5be71d9ba +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 9 13:32:31 2021 +0800 + + * Adjust the code. + +commit 2b531ba5ca8f20488d9c9731db3d95c317f3349b +Merge: 1a75c3c3e1 2f9b738688 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 9 13:25:26 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1a75c3c3e188aecebbf1dd452632cc28ecb4257d +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 9 13:25:16 2021 +0800 + + * Finish task #36433. + +commit 2f9b7386884cfa0a716f402fd63373a970f5069f +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 9 13:24:28 2021 +0800 + + * Fix execution task error. + +commit 33475fb2d2ca09941f9bebb1a4b409275e82b743 +Merge: 90d0b61380 86b18553a7 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 9 13:06:56 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 90d0b61380cd7ec37dbba22a24fbcd0fb4d6ae96 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 9 13:05:37 2021 +0800 + + * Finish task #36431. + +commit 86b18553a7cadd45ff435659b2b3dfcb62cbb77b +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 9 12:30:23 2021 +0800 + + * Adjust block module code. + +commit 44b04fbe18eca3dc9f61a0fed507a7e39fbab577 +Author: tianshujie98 +Date: Tue Mar 9 11:34:20 2021 +0800 + + * Finish task #36462. + +commit 73380996ffe2a9f8161604e845ff11094481be96 +Author: tianshujie98 +Date: Tue Mar 9 11:29:28 2021 +0800 + + * Finish task #36476. + +commit c32dff1bc47a94c2f982af47f909c2b96f64850c +Merge: 523a414eed acad687e68 +Author: tianshujie98 +Date: Tue Mar 9 11:26:30 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 523a414eed67f9361bf09aa95fa3cec3740e70d2 +Author: tianshujie98 +Date: Tue Mar 9 11:26:07 2021 +0800 + + * Finish task #36477. + +commit acad687e685cf06ad419def0496aa21bcf9ed55e +Author: Yagami <976204163@qq.com> +Date: Tue Mar 9 11:18:08 2021 +0800 + + * Fix project block. + +commit f818396a252be53305db00cd822855cfe2dcee8e +Author: Yagami <976204163@qq.com> +Date: Tue Mar 9 10:39:52 2021 +0800 + + * Fix bug. + +commit 5b6dc5cee474b78521218fabf86735fcb4ea66e2 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 9 10:30:10 2021 +0800 + + * Finish task #36434. + +commit 18e47456050ee4c4c4e457e65e6dee698e0865db +Merge: 2766836522 4158cec2ae +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 9 10:07:27 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 276683652263a0f1ab07acbe270ba4f2cf154cac +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 9 10:07:23 2021 +0800 + + * Fix an error. + +commit 4158cec2aea6f2aa2aeb8926709c84aeff52ba51 +Author: qiyu-xie +Date: Tue Mar 9 10:05:55 2021 +0800 + + * Finish task#36471. + +commit 0f1492cad9b4cc0fe55735ea2da32d2b1c954016 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 9 10:05:15 2021 +0800 + + * Fix bug and execution menu. + +commit fd707d15a8399cd7cfdad7922fada5d811c73720 +Merge: e854a1ff4d de3fe54048 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 9 10:02:06 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit e854a1ff4d3111d96f33f43ee7f8e7a3ce2114f6 +Merge: 50c32a9c25 f6bc489e36 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 9 10:01:49 2021 +0800 + + * Merge code. + +commit de3fe54048794c3a82f6f4b8426f24954285a942 +Author: tianshujie98 +Date: Tue Mar 9 09:58:08 2021 +0800 + + * Finish task #36486. + +commit 50c32a9c25827da3de15bba17475df7078a71150 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 9 09:55:48 2021 +0800 + + * Finish task #36443. + +commit f6bc489e36d6d6f13c214a30e0fea2f6d3bceeed +Author: tianshujie98 +Date: Tue Mar 9 09:50:19 2021 +0800 + + * Finish task #36492. + +commit 80ad23f3b4be5c458ee507a1ce97ea0491f80d45 +Author: qiyu-xie +Date: Tue Mar 9 09:42:43 2021 +0800 + + * Finish task#36474. + +commit f565d4ab6f0aac5b539f579a43ec1fa7e7761a14 +Merge: c27068dbfa c53821b96c +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 9 09:28:27 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit c27068dbfa8f15358701746fd8d70156f4eaa7af +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 9 09:28:23 2021 +0800 + + * Finish task #36485. + +commit c53821b96c79814669ff9553b4c5c623bf7e9310 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 9 09:23:26 2021 +0800 + + * Finish task #36491. + +commit bc7b77611e1ed19319ce0398c8bb2e101441a67f +Author: qiyu-xie +Date: Tue Mar 9 09:13:04 2021 +0800 + + * Finish task#36453. + +commit a4c77f94e66afbeab8b9cf5c612ce782ec8fc484 +Merge: 21d1d64128 38ee1e1fd6 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 9 09:10:54 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 21d1d641285dc3c9d6e0c86e8c7765130b5d104b +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 9 09:10:50 2021 +0800 + + * Finish task #36473. + +commit 38ee1e1fd6098df71ca48f09decfcb0861907b95 +Author: qiyu-xie +Date: Tue Mar 9 09:01:03 2021 +0800 + + * Finish task#36458. + +commit ad93900d355b9b47fc6e16e0269560c52f292f89 +Merge: 0a39249189 d9109be219 +Author: zhujinyong +Date: Mon Mar 8 20:31:34 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0a392491899fcf3bc7b9a42df0a6ed1a37f16bac +Author: zhujinyong +Date: Mon Mar 8 20:31:14 2021 +0800 + + * Format style. + +commit d9109be2199bff8615c20fb658512f705fd7f2a9 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 17:11:53 2021 +0800 + + * Fix task list error. + +commit f2f1f0c69de661f2c854e4f80baa603c2ba87455 +Merge: 158f6e482d 1d5dca0c81 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 17:00:05 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 158f6e482df385f27e0f11f3363d7c7e3f1f5ecc +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 16:59:30 2021 +0800 + + * Modify method name getProductsByProject to getProducts. + +commit 1d5dca0c81bec4e6f13c0cba5c215bcc31b7dfeb +Merge: c10961bede f64e0a56c0 +Author: zhujinyong +Date: Mon Mar 8 16:55:25 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit c10961bedeaad87f47b6d7cfe4e4ae1b48ec3b89 +Author: zhujinyong +Date: Mon Mar 8 16:55:05 2021 +0800 + + * Fix index method of project. + +commit f64e0a56c0c09d61c2d4af544580fe8b7ef3abb1 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 16:48:24 2021 +0800 + + * Fix create project in my module. + +commit bcd3545ded1b71dbc6f92aa2aee96f32fd59f8de +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 8 16:47:15 2021 +0800 + + * Finish task #36454. + +commit a4073cb2e0ba859de9f11e22022686ad68f11743 +Merge: 41bc23fec5 6a72e67baf +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 8 16:34:32 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 41bc23fec5722c08c78ef292ff0f8fe1fe83014a +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 8 16:34:28 2021 +0800 + + * Fix an error. + +commit 6a72e67baf0a2440d94bd49d6dd59f7981a775d7 +Merge: 6eaec523d6 8294bc2235 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 16:28:08 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6eaec523d6a12120ef6b6afddae2469b6cf0c47b +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 16:27:53 2021 +0800 + + * Fix product error. + +commit 8294bc2235f3cbbbbe80e35055a49c2237a051f6 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 8 16:26:43 2021 +0800 + + * Fix an error. + +commit 244917f11142ed2662c30cd2968b8f83e2bc245c +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 16:17:30 2021 +0800 + + * Modify PGM to program at product module. + +commit 4caf65064c70857bccd73fea9ed09e8aa8a7fe3e +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 15:47:09 2021 +0800 + + * Fix product,project error. + +commit 2ee08d06dea538527454e12094d0a064465fdbb8 +Author: Yagami <976204163@qq.com> +Date: Mon Mar 8 14:03:40 2021 +0800 + + * Fix code for execution. + +commit 825ff044e29136176c716b0f39f8d8e949413ce0 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 13:15:12 2021 +0800 + + * Fix create program. + +commit 33da2fd4513eab1b7abd8d5529071bf53d751957 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 13:01:51 2021 +0800 + + * Remove unquiue key. + +commit 088006f85353e1ad25e6a1d92b0ded7b044470e8 +Merge: b2b617ff7d 0b5dcdba6c +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 11:46:54 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit b2b617ff7d720c5cf95b286a809482bf1942c949 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 11:46:44 2021 +0800 + + * Fix create program. + +commit 0b5dcdba6c51ffa7da71dce018c8377fdfa3c414 +Author: Yagami <976204163@qq.com> +Date: Mon Mar 8 11:36:37 2021 +0800 + + * Fix code for doc. + +commit e349884b8f83a5f6fdec331cab61f1741ac13b1e +Merge: f818b668a0 ff07ecad8e +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 8 11:27:40 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f818b668a017a825690b91519a154d2952eb16c9 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 8 11:27:36 2021 +0800 + + * Adjust the language files of bug module. + +commit ff07ecad8e13f9079683662a898efd0dedbcb5e1 +Merge: 616ee02c98 7a3c616400 +Author: zhujinyong +Date: Mon Mar 8 11:15:37 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 616ee02c98be99e756185a15fec1fc26b1f56171 +Author: zhujinyong +Date: Mon Mar 8 11:15:09 2021 +0800 + + * Fix create method of project. + +commit 7a3c6164001454bc0d39d95a9161e0c7163455b1 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 11:11:32 2021 +0800 + + * Finish task #36480. + +commit d02eee1c8a9442f1f11dc0e5fa00e59446955f8f +Author: qiyu-xie +Date: Mon Mar 8 11:05:17 2021 +0800 + + * Fix bug. + +commit 10bdfdb4ced2f9f685f29fdd7e0feb00c48ac741 +Merge: c435ec34cd b2e79a4bed +Author: zhujinyong +Date: Mon Mar 8 10:53:10 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit c435ec34cd98043dbe76031c16f992873a95267b +Author: zhujinyong +Date: Mon Mar 8 10:52:43 2021 +0800 + + * Move methods from execution to project. + +commit b2e79a4bedd4afff8a5fb59193947b232545c719 +Author: leiyong <1549684884@qq.com> +Date: Mon Mar 8 10:47:43 2021 +0800 + + * Adjust backup module code. + +commit 173ede51273751ce786bb4ea6a97dcab8e8fd1bf +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 10:46:57 2021 +0800 + + * Finish task #36490. + +commit c086c56ade174b024b36d8467a1efe9ca2d48f7a +Author: leiyong <1549684884@qq.com> +Date: Mon Mar 8 10:39:40 2021 +0800 + + * Adjust api module language item. + +commit e133e198e33bd53def0dc51a218c8f9fa48ea3b5 +Author: leiyong <1549684884@qq.com> +Date: Mon Mar 8 10:35:54 2021 +0800 + + * Adjust the language item. + +commit c2ff4415dc742303019b36120128f0d71909da7b +Merge: fc67746964 35423bae73 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 10:26:29 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 35423bae7364a86e73ff0af02feac1c0597a989b +Merge: 1ba4d3574b 6039a37c24 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 8 10:26:23 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1ba4d3574b226cd89a731d1fcb70214dba786fbc +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 8 10:26:20 2021 +0800 + + * Adjust the link. + +commit fc677469644598f8c1ce376dc4093876ab67fc37 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 10:26:14 2021 +0800 + + * Finish task #36472. + +commit 6039a37c24bac02eda0f31a1db3fedcd877b62b1 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 10:23:57 2021 +0800 + + * Finish task #36478. + +commit 6eaa3cddef0fc424bb35baafc9de5a8332dd2222 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 10:18:42 2021 +0800 + + * Finish task #36484. + +commit ce7c8385f5466744e8471d17cb1f3b4bdf836880 +Author: qiyu-xie +Date: Mon Mar 8 10:14:34 2021 +0800 + + * Fix bug. + +commit 1e7f269ae6e2e493f404c923d1020034b2eda254 +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 10:14:28 2021 +0800 + + * Finish task #36483. + +commit 6792baa5111d21b3d3235660ad0fd65295c87a7c +Merge: 4e1ac813a4 0770d7a3ee +Author: zhujinyong +Date: Mon Mar 8 10:10:51 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4e1ac813a48214212a415da074e5c3b572bd5863 +Author: zhujinyong +Date: Mon Mar 8 10:10:18 2021 +0800 + + * Adjust project/program module. + +commit 0770d7a3eed74584c3ac67cb881631c3a9658128 +Author: leiyong <1549684884@qq.com> +Date: Mon Mar 8 10:07:09 2021 +0800 + + * Adjust api module code. + +commit b970a5fb0923a1699ccae870d4a68495afad9789 +Author: qiyu-xie +Date: Mon Mar 8 09:52:39 2021 +0800 + + * Fix bug. + +commit b786e33e76f562f0b2c26e82e93c16a4b7e926dc +Author: qiyu-xie +Date: Mon Mar 8 09:48:17 2021 +0800 + + * Fix bug. + +commit 017a21b95b0176d0b7e95d031e276e3b33c891fc +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 09:48:02 2021 +0800 + + * Finish task #36475. + +commit 25e96b57bb878d1260ec2150f617bf2c6b4a045a +Author: qiyu-xie +Date: Mon Mar 8 09:41:23 2021 +0800 + + * Modify my module. + +commit 3728ea4bcb0ebdd32e635b68c9493d78530fb3c3 +Merge: 65ba71cec3 b755a07c82 +Author: leiyong <1549684884@qq.com> +Date: Mon Mar 8 09:37:09 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 65ba71cec315f57e04d8defcc803287b8bc3bcb2 +Author: leiyong <1549684884@qq.com> +Date: Mon Mar 8 09:37:03 2021 +0800 + + * Adjust admin module code. + +commit b755a07c8260652728eb30a4e22a51832b2f1711 +Merge: ea00c2b393 90baaf0585 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 8 09:36:45 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ea00c2b3934f69aa0e07569feee9aa6388b82790 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 8 09:36:36 2021 +0800 + + * Adjust the code. + +commit 90baaf058559f8a7eeb1c4dc29f751332d55a9bc +Author: tianshujie98 +Date: Mon Mar 8 09:35:50 2021 +0800 + + * Finish task #36493. + +commit cdfbebc58bcdfd816038480a839f68b87509d833 +Author: tianshujie98 +Date: Mon Mar 8 09:30:34 2021 +0800 + + * Fix bug. + +commit faf9dcaf50a1c2d3be6efa84512fe06d8c91324b +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 09:25:16 2021 +0800 + + * Finish task #36448. + +commit dc83f59df255d168c39adf483941b074f3c6f8f5 +Author: wangyidong +Date: Mon Mar 8 09:17:35 2021 +0800 + + * Merge for zdoo task #5007. + +commit 2cedf63ee2fe0bbebe601070d7f3d10a7054ca30 +Author: leiyong <1549684884@qq.com> +Date: Mon Mar 8 09:15:42 2021 +0800 + + * Adjust code. + +commit 951c76cd85c084f963b573cd3bb2c22f63223810 +Author: tianshujie98 +Date: Mon Mar 8 09:05:33 2021 +0800 + + * Fix release problems. + +commit ea214650794f947d07058aa2f008d80ecbc3773b +Merge: 187f4cd8d5 cf8a513190 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 8 09:04:49 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 187f4cd8d579932e62a3718556f44ed0cdda0dc2 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 8 09:04:45 2021 +0800 + + * Adjust the code. + +commit cf8a5131908198712dc00f0858a8071575d3813f +Author: holan20180123 <56391770@qq.com> +Date: Mon Mar 8 09:03:04 2021 +0800 + + * Finish task #36432. + +commit 22237402292965cfceff5887fe1f858a9394b566 +Author: hufangzhou <746775970@qq.com> +Date: Mon Mar 8 08:58:33 2021 +0800 + + * Adjust the code. + +commit 0194e07e47a802599d20edaf0a57526d9af87bbc +Merge: 22af1003d2 1dfda97a43 +Author: zhujinyong +Date: Mon Mar 8 08:43:05 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1dfda97a43ff7527d72fbdacca911ff98cab5746 +Author: leiyong <1549684884@qq.com> +Date: Fri Mar 5 18:12:21 2021 +0800 + + * Adjust action module. + +commit 22af1003d2d4f2d444e6f61182f608f69512a554 +Merge: d2742dd4ba ba5bf6720a +Author: zhujinyong +Date: Fri Mar 5 17:29:40 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit ba5bf6720a4b402352248a3a8fc2636a576b65ff +Author: Yagami <976204163@qq.com> +Date: Fri Mar 5 17:26:02 2021 +0800 + + * Rename doc var. + +commit c015dc59100fa103764c76a365c873eb42a068dd +Author: qiyu-xie +Date: Fri Mar 5 16:39:36 2021 +0800 + + * Remove redundant code. + +commit d2742dd4bad6efbb7194c28573b273d8b61b4b79 +Author: zhujinyong +Date: Fri Mar 5 16:36:17 2021 +0800 + + * Adjust code of productplan. + +commit 4fe3aa2f3a0090f55c7531af502a9bba1d565eb0 +Merge: 4dc8157f9a c6e51f5f1e +Author: zhujinyong +Date: Fri Mar 5 16:29:28 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4dc8157f9a14888d222411235658dc7e2270a035 +Author: zhujinyong +Date: Fri Mar 5 16:29:10 2021 +0800 + + * Adjust code of personnel. + +commit c6e51f5f1ef877dfec4747fbf7219521f1922043 +Author: qiyu-xie +Date: Fri Mar 5 16:24:32 2021 +0800 + + * Fix my task bug. + +commit 7d26f79cc92f0d223ee5661c8c52c6dd0fe8fdca +Merge: 426e118db1 5a96f4309e +Author: zhujinyong +Date: Fri Mar 5 16:09:55 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 426e118db1af3bbbd29545361b4790a4f2d4f0d7 +Author: zhujinyong +Date: Fri Mar 5 16:09:31 2021 +0800 + + * Ajdust project/program module. + +commit 5a96f4309ecd568e28677868cf4fb29a22419b06 +Author: hufangzhou <746775970@qq.com> +Date: Fri Mar 5 16:08:41 2021 +0800 + + * Adjust the common language files. + +commit df2ecf0c44529153d3ef1738d90a27fd5b36b01c +Author: tianshujie98 +Date: Fri Mar 5 15:52:38 2021 +0800 + + * Fix bug problems. + +commit a5516b66b28511d3500c6cf9555b72668de6a016 +Author: tianshujie98 +Date: Fri Mar 5 14:03:35 2021 +0800 + + * Fix search problems. + +commit 2275de3a13387ead1942abb5ce72def60b9727b2 +Author: qiyu-xie +Date: Fri Mar 5 13:48:32 2021 +0800 + + * Fix logout bug. + +commit 7e1c35f09d7a0475b9156ccae2daa8516f99ef3c +Author: tianshujie98 +Date: Fri Mar 5 13:35:01 2021 +0800 + + * Distinguish project execution from bug module. + +commit 21a340c39d113dcf8b435ce8ed76bc65505c43b7 +Author: wangyidong +Date: Fri Mar 5 13:30:38 2021 +0800 + + * Adjust code for webhook module. + +commit 407b4b1fc42dc2150b20d98d5eae52d3a921e9ea +Merge: 876a0be2eb 5f36d8dda0 +Author: hufangzhou <746775970@qq.com> +Date: Fri Mar 5 13:11:52 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 876a0be2ebf187bba4f4027d2301b9da012f9e9c +Author: hufangzhou <746775970@qq.com> +Date: Fri Mar 5 13:11:47 2021 +0800 + + * Adjust the custom module. + +commit 5f36d8dda01d5f7ad17a0c7c48dae94629a64dfb +Author: qiyu-xie +Date: Fri Mar 5 13:04:38 2021 +0800 + + * Fix user module click task bug. + +commit cc64eafe95e39635276bb29db169fb15a14162ea +Author: wangyidong +Date: Fri Mar 5 13:04:48 2021 +0800 + + * Adjust code for upgrade module. + +commit 8eef5aa4e8963e72966a5cff48a066b14bf90258 +Author: qiyu-xie +Date: Fri Mar 5 11:29:15 2021 +0800 + + * Modify user module bug. + +commit d829157cb172be628fde807015c4cc7a90a0ce97 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 5 10:56:34 2021 +0800 + + * Fix error of create test case. + +commit ac4fb734d5d57b1b9646cbda346056569645d19d +Author: tianshujie98 +Date: Fri Mar 5 10:32:03 2021 +0800 + + * Fix bug. + +commit d835ec871f20b41b9544eeddaaac3505a989a9e2 +Author: wangyidong +Date: Fri Mar 5 10:28:20 2021 +0800 + + * Adjust code for tutorial module. + +commit 55c539094a39f3cc6f3f56552a1d235db16dad86 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 5 10:21:09 2021 +0800 + + * Distinguish project execution from test reprot module. + +commit 46c8d2c9234efa6859722aa0cc56f6bb7c53c81a +Author: wangyidong +Date: Fri Mar 5 10:18:58 2021 +0800 + + * Adjust code for todo module. + +commit 028c7e14e6826c56b88e157ca77c0f7788d1ba69 +Merge: a849cfe72c af79ca252b +Author: wangyidong +Date: Fri Mar 5 10:11:55 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit a849cfe72c6c9cc87743234cf74bd13e73821589 +Author: wangyidong +Date: Fri Mar 5 10:11:38 2021 +0800 + + * fix error. + +commit af79ca252bee39e72037498a73bfe0fdf62fa6f0 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 5 09:47:30 2021 +0800 + + * Distinguish project execution from case module. + +commit 37a40191756edd604517566c43360487f1ee680d +Author: tianshujie98 +Date: Fri Mar 5 09:43:25 2021 +0800 + + * Distinguish project execution from build module. + +commit a41e43311a4e9bef29c1c6608d607f2b806a584a +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 5 09:35:40 2021 +0800 + + * Distinguish project execution from task module. + +commit 361af390939852b07fd4fdab9588fb02cd0ee62f +Author: wangyidong +Date: Fri Mar 5 09:25:26 2021 +0800 + + * adjust code for todo module. + +commit 993d852d2e0bc6cf7f7527023b5e4f9e489a218d +Author: qiyu-xie +Date: Fri Mar 5 08:57:39 2021 +0800 + + * Modify user module. + +commit 11e7b4b8dd7ab41f78c1c748837a05e7da207811 +Author: holan20180123 <56391770@qq.com> +Date: Fri Mar 5 08:40:43 2021 +0800 + + * Distinguish project execution from task module. + +commit 631f2b3e0fb5911184020e7df7ae9dc69ff4fe8f +Author: tianshujie98 +Date: Fri Mar 5 08:31:06 2021 +0800 + + * * Distinguish project execution from search module. + +commit 7cb63e2f1300ca19468db50e9648a1ddff24cea3 +Author: zhujinyong +Date: Thu Mar 4 17:34:15 2021 +0800 + + * Adjust code of my, project, user module. + +commit 48f926f1c1a1302616e3354a5e4cb5aab25d1e54 +Merge: b6b4635b7c af55b74c4d +Author: zhujinyong +Date: Thu Mar 4 17:32:49 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit b6b4635b7c363d43ed8fefe2451569cefb745e9a +Author: zhujinyong +Date: Thu Mar 4 17:32:32 2021 +0800 + + * Adjust css style of my module. + +commit af55b74c4d87334990979ae6764063d6af2143ed +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 4 17:27:26 2021 +0800 + + * Distinguish program/project/execution in story. + +commit 62ae17bb13d22a307c17ac09cabd42a5f54c5628 +Merge: 0bfb9145f6 d57451f20d +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 4 17:19:31 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0bfb9145f6c220944727cec6083f8e193c022f40 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 4 17:19:28 2021 +0800 + + * Adjust the convert module. + +commit d57451f20dac8dcda4c31f2a44a770096d7974dd +Author: qiyu-xie +Date: Thu Mar 4 17:18:22 2021 +0800 + + * Modify job module. + +commit effda2a128a0c446f2673ef405b918ce7614bd85 +Merge: c17cc14081 102c4ec874 +Author: zhujinyong +Date: Thu Mar 4 17:11:15 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 102c4ec87449654dbc9fe93b199fb189e5bc38d8 +Author: qiyu-xie +Date: Thu Mar 4 17:10:39 2021 +0800 + + * Modify install module. + +commit c17cc14081be5786e93e5acc0130d38c2393fec3 +Author: zhujinyong +Date: Thu Mar 4 17:10:43 2021 +0800 + + * Adjust getDynamic function of action. + +commit 729750ec7eb27acc1669555bc1bf9f70629afc00 +Author: Catouse +Date: Thu Mar 4 17:10:03 2021 +0800 + + * change icon for execution item in main menu. + +commit e70ab53ce557db75188baf6bce617b93a3844498 +Author: Catouse +Date: Thu Mar 4 17:08:08 2021 +0800 + + * fix help link not open in tabs. + +commit cca6e18362b581ee45a8b2bfc722515d3b95930b +Author: Catouse +Date: Thu Mar 4 17:07:33 2021 +0800 + + * fix $.apps.getAppCode not work. + +commit 9a3ebefeb35216cf77e6954a9f26278d638b056d +Author: tianshujie98 +Date: Thu Mar 4 17:00:24 2021 +0800 + + * Distinguish project execution from score module. + +commit a517b40fcea06f1a44c0ce4e88124f5101148eac +Merge: 392217b937 1a5f1402b3 +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 4 16:54:41 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 392217b9372285cf1621477429ed8b2b27269497 +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 4 16:51:17 2021 +0800 + + * Distinguish program/project/execution in stakeholder. + +commit 1a5f1402b3f589882f492fd14ac7cf39c7b4d715 +Merge: b43b822b92 ac6ed5dbf4 +Author: leiyong <1549684884@qq.com> +Date: Thu Mar 4 16:41:44 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit b43b822b92bede9db6e78f840ec43221b7eaafd9 +Author: leiyong <1549684884@qq.com> +Date: Thu Mar 4 16:41:39 2021 +0800 + + * Adjust lang file of action module. + +commit ac6ed5dbf49ca5adf16e8a2c258f33d30a9617f1 +Author: qiyu-xie +Date: Thu Mar 4 16:39:45 2021 +0800 + + * Modify resource.php . + +commit f891d40136086e72f7e766d9b1cec27ab7e44d7f +Author: Catouse +Date: Thu Mar 4 16:36:16 2021 +0800 + + * change testcase icons. + +commit c6d0cf82d86004aad93ee68c3fc9f8929f70ad6b +Author: Catouse +Date: Thu Mar 4 16:36:08 2021 +0800 + + * change nested table icons. + +commit 117f9b8a7c3e19a4c7339c472d1d96ccbbcac53a +Author: tianshujie98 +Date: Thu Mar 4 16:28:08 2021 +0800 + + * Fix bug. + +commit db3f22f28bb7564e9ac3b7dce5aebdef7ab1c86d +Merge: da0041cb40 3a4e274643 +Author: tianshujie98 +Date: Thu Mar 4 16:23:24 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3a4e2746433fb83a13f49cb7c5a3e7b7248d56aa +Author: Catouse +Date: Thu Mar 4 16:22:48 2021 +0800 + + * update url before load app content. + +commit 34babef3d2e884ed4b8e2ca5ab233bfca0a3843c +Author: Catouse +Date: Thu Mar 4 16:22:38 2021 +0800 + + * update icons. + +commit da0041cb4005f6a497a7885e29905a62310e1904 +Author: tianshujie98 +Date: Thu Mar 4 16:22:18 2021 +0800 + + * Distinguish project execution from report module. + +commit 51b21afbdcdd5dbf068a749583c68fe25b9bdd09 +Merge: b426464bc2 6824227418 +Author: zhujinyong +Date: Thu Mar 4 16:22:03 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit b426464bc21275c51522e4402962802fd33d9297 +Author: zhujinyong +Date: Thu Mar 4 16:21:46 2021 +0800 + + * Fix lang of project. + +commit 6824227418accc47ec2664d38303dd86f0f6b96c +Merge: 8ce9d8e273 59ed6b990e +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 4 16:04:05 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8ce9d8e2731dec9507ea75ce14f30a23e1182072 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 4 16:04:00 2021 +0800 + + * Adjust the compile module. + +commit 59ed6b990e8fb990e5029ab7240669f93aa68c6a +Author: wangyidong +Date: Thu Mar 4 16:01:15 2021 +0800 + + * Adjust code for testtask. + +commit 0dec3a7ffd4a8f2020a791895ec4c53134f921f3 +Author: wangyidong +Date: Thu Mar 4 15:03:36 2021 +0800 + + * Change undeleteFiles to undeletedFiles. + +commit 8b1c19184219481de34a886dd7974a33081deeb0 +Merge: 98417780b3 82e14779a5 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 4 15:57:28 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 98417780b308da24f3345a00193ab13c35dfa6ba +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 4 15:57:23 2021 +0800 + + * Adjust the company module. + +commit 82e14779a5c459fc9c031895af2adffc9e2af5bb +Author: Catouse +Date: Thu Mar 4 15:52:13 2021 +0800 + + * add top space to #menuNav. + +commit 3faa875faec8cd0f32b5a6407f732f55302d6a9b +Author: Catouse +Date: Thu Mar 4 15:51:06 2021 +0800 + + * support for going back between multi app tabs. + +commit 38cbc02c9593c4b90a80cee2784a13d98af7e207 +Author: zhujinyong +Date: Thu Mar 4 15:45:53 2021 +0800 + + * Fix lang of project and program. + +commit 34701d8922a4d93042cc17b64bbb9b632950bc05 +Merge: 74ddc1c73c c010c42b08 +Author: zhujinyong +Date: Thu Mar 4 15:23:11 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 74ddc1c73ccd76473861e7b77cc4a41d96c13a47 +Author: zhujinyong +Date: Thu Mar 4 15:22:40 2021 +0800 + + * Fix code style of misc. + +commit c010c42b08b6d7cb183d7657f3c03b9bb5aa7100 +Author: qiyu-xie +Date: Thu Mar 4 15:20:26 2021 +0800 + + * Modify group module. + +commit 00ae248d08e45d6c489ec7e389b1a4ffde098f10 +Author: qiyu-xie +Date: Thu Mar 4 15:17:17 2021 +0800 + + * Modify group module. + +commit b0d5278b77bc9a5daab0f82db25834a87d73b414 +Author: tianshujie98 +Date: Thu Mar 4 15:11:11 2021 +0800 + + * Modify button language. + +commit 419984f7f2db49445e63ba413a7105d5c70bc51f +Author: tianshujie98 +Date: Thu Mar 4 15:09:43 2021 +0800 + + * Distinguish project execution from repo module. + +commit 2b85fd21f4870a796c59123e9e1a30429210bdb3 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 4 15:07:28 2021 +0800 + + * Adjust the common module. + +commit 64fee8e9b1d8b37f7b44241254f592d222b30af7 +Author: Catouse +Date: Thu Mar 4 14:48:35 2021 +0800 + + * refactor: rename "tab" to "app", "group" to "appCode", "$openGroup" to "$openApp", "tabs" to "apps", "#open=" to "#app=". + +commit f57878ae9171fe16716f79be59ea241ac7adb2f7 +Merge: f2ed2c6465 83ace0235d +Author: wangyidong +Date: Thu Mar 4 14:42:00 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f2ed2c6465cde74800479a06343b94ca00e35f6a +Author: wangyidong +Date: Thu Mar 4 14:41:35 2021 +0800 + + * adjust code for testsuite. + +commit 83ace0235daa9716cc860fc458f7b9d4a3eaff16 +Merge: 7c2817b892 07a4850eb6 +Author: tianshujie98 +Date: Thu Mar 4 14:38:48 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 7c2817b8923312f262fc1f0e2719900b84a701b3 +Author: tianshujie98 +Date: Thu Mar 4 14:38:29 2021 +0800 + + * Distinguish project execution from release module. + +commit 07a4850eb6a89f4ef903e381ccf5c55a17dad198 +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 4 14:27:27 2021 +0800 + + * Distinguish program/project/execution in stakeholder. + +commit 93cdc7c84d25fd3b5415a06a7c53bd846074cab3 +Author: tianshujie98 +Date: Thu Mar 4 14:04:54 2021 +0800 + + * Distinguish project execution from qa module. + +commit 47a0413cdb0e62046c0f5a83e7998d058aaffefe +Merge: 3d669e33ab 984761e7ec +Author: tianshujie98 +Date: Thu Mar 4 14:01:46 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3d669e33abf1cd4b37506e57720aef801561bd9b +Author: tianshujie98 +Date: Thu Mar 4 14:00:59 2021 +0800 + + * Distinguish project execution from projectstory module. + +commit 984761e7ec9c168bbb160301a330917405491588 +Author: holan20180123 <56391770@qq.com> +Date: Thu Mar 4 14:00:37 2021 +0800 + + * Distinguish program/project/execution in stakeholder. + +commit 1566dce5854dca4421cbc000dc6753c80a0d7a8c +Author: Yagami <976204163@qq.com> +Date: Thu Mar 4 13:56:58 2021 +0800 + + * Fix sql and rename project. + +commit 3bc051ab4a938cd70d239b843cc48b4d26a6ead1 +Merge: 6adbb10ac4 7087231495 +Author: zhujinyong +Date: Thu Mar 4 13:58:09 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6adbb10ac40d40bf865e3505db700b705e5b2cb7 +Author: zhujinyong +Date: Thu Mar 4 13:57:44 2021 +0800 + + * Fix program and project module. + +commit 7087231495655f07189ef267b21e8ced939eb013 +Merge: 8a8fc330ca 14c36ca740 +Author: tianshujie98 +Date: Thu Mar 4 13:52:44 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8a8fc330ca9bc249c3a7e76ff8da5129c3c391c9 +Author: tianshujie98 +Date: Thu Mar 4 13:51:33 2021 +0800 + + * Distinguish program/project/execution. + +commit 14c36ca740232ae3728aba4b8bd9d863a69fc753 +Merge: b30d6a3d67 77341fc9e0 +Author: zhujinyong +Date: Thu Mar 4 13:48:59 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit b30d6a3d67dc6b649e3d781dbadf42d4b496734d +Author: zhujinyong +Date: Thu Mar 4 13:47:43 2021 +0800 + + * Resume getProjectTeamMemberPairs of program. + +commit 77341fc9e0d4a0a3c475603fd0d1e0547e10abb8 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 4 13:34:25 2021 +0800 + + * Adjust the ci module. + +commit 2575d812d4c5ef4cb4508ebe5c4841d93500c9e3 +Merge: 71054f44be b7339a5b6b +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 4 13:25:12 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 71054f44bed77738f701ca5d42c60773123474d6 +Author: hufangzhou <746775970@qq.com> +Date: Thu Mar 4 13:25:09 2021 +0800 + + * Adjust the caselib module. + +commit 8ddc85997e8f551aafc62564eba43ad866e32d94 +Merge: 08102f3151 b7339a5b6b +Author: zhujinyong +Date: Thu Mar 4 13:09:07 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit b7339a5b6b14176c8a4e0ae35ce021d9f4ac5e95 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 4 13:03:39 2021 +0800 + + * Rename project file. + +commit e24eab617464211e31ff602fdeee29404f201a16 +Author: wangyidong +Date: Thu Mar 4 13:02:00 2021 +0800 + + * adjust code. + +commit 08102f31518be9a2e4d6365cddfd9a86ca660730 +Author: zhujinyong +Date: Thu Mar 4 12:29:57 2021 +0800 + + - Remove ajaxSetUnfoldID function of misc. + +commit 1ad514e0b040be007bc36f60e34e5e148512cc29 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 4 09:59:05 2021 +0800 + + * Divide program/project/execution. + +commit 8188a3fb155237f1ad1d60d4e99366cb8f06e218 +Author: wangyidong +Date: Thu Mar 4 09:06:52 2021 +0800 + + * remove PRJ in method name for project module. + +commit 3bf7dd4c6f94bddcf70a03e97bf93f6d50e720f2 (tag: zentaopms_15.0.beta1_20210304) +Author: tianshujie98 +Date: Thu Mar 4 08:43:07 2021 +0800 + + * Fix bug. + +commit 76cb3cee0b7db62e6e1145d617d3fef31570e761 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 3 17:45:28 2021 +0800 + + * Divide program/project/execution. + +commit 76baa276fd4ba1904aea3adc3e3fb3ec4ed70516 +Author: zhujinyong +Date: Wed Mar 3 14:52:12 2021 +0800 + + * Adjust program and project module. + +commit 839cd7903e823eba2c731816818bfb70b42f7059 +Author: leiyong <1549684884@qq.com> +Date: Wed Mar 3 13:02:27 2021 +0800 + + * Fix bug + +commit 4cdad7e27ae0774ab9f00f74d684752d209a761c +Author: tianshujie98 +Date: Wed Mar 3 11:25:45 2021 +0800 + + * Finish task #36501. + +commit 7b03b87275a68b27dc69294d30fbda3d73a82b55 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 3 11:17:48 2021 +0800 + + * Finish task #36028. + +commit 9fc4ff6e32a894d0eb51fbc802d2d9abda4262a3 +Merge: b5a16df369 97c6420bf8 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 3 11:09:54 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit b5a16df369a89b0510fa44be8628217a270f0e80 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 3 11:09:34 2021 +0800 + + * Code for task #36028. + +commit 97c6420bf8594033693c35d38fa3af301f95f209 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 3 11:04:01 2021 +0800 + + * Fix project name. + +commit 8601b6e33632ac8d734397f4c08efcffc81d94aa +Author: tianshujie98 +Date: Wed Mar 3 11:02:05 2021 +0800 + + * Finish task #36373. + +commit 6579cf7459b6453c5afbb539a5d121755999e3d5 +Merge: d74e24474c bc0c65f776 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 3 10:53:49 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d74e24474c4d40b094927e96af5a722c02f42412 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 3 10:53:45 2021 +0800 + + * Finish task #36341. + +commit bc0c65f776e274dcecf846280f2a1f44dc2caabd +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 3 10:46:15 2021 +0800 + + * Code for task #36028. + +commit 53def3b867bd88570546e1e0a546288dddd6e117 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 3 10:36:50 2021 +0800 + + * Remove configure scrum method. + +commit 6ed1e6c8fdce0a3f1469a79886d3e8b8e4e8f061 +Author: qiyu-xie +Date: Wed Mar 3 10:29:03 2021 +0800 + + * Finish task#36330. + +commit 40925725339689d6ae9c34c2bac9ac65af176a44 +Author: qiyu-xie +Date: Wed Mar 3 10:20:11 2021 +0800 + + * Fix bug. + +commit 71795a6144e7c518d3d7440a0522c288e4703d90 +Author: tianshujie98 +Date: Wed Mar 3 10:12:06 2021 +0800 + + * Finish task #36419. + +commit 876d5bf434840959797fd18dfbebfbdd22b09050 +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 3 09:57:28 2021 +0800 + + * Adjust header of flow., + +commit 8a7d17e851314f4a2c9025a4db9d46aeed3b840e +Merge: 0d11a4dca3 025437dd2c +Author: tianshujie98 +Date: Wed Mar 3 09:41:59 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0d11a4dca3c9268417fbddb2d25543a8268eb4a4 +Author: tianshujie98 +Date: Wed Mar 3 09:41:35 2021 +0800 + + * Finish task #36375. + +commit 025437dd2c3248a75a63e115f0c2979cce1c0016 +Merge: 8070ae60b7 431e3b7ef7 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 3 09:32:24 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8070ae60b7fe3da08c30757ec8d659d855824513 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 3 09:32:20 2021 +0800 + + * Finish task #36349. + +commit 431e3b7ef744a0b74fd93c104cc8b5d6f3214aff +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 3 09:27:54 2021 +0800 + + * Fix error. + +commit dbc0a6c9bb68a2e1a73b62dd961da73b0fe8fd4e +Author: holan20180123 <56391770@qq.com> +Date: Wed Mar 3 09:05:46 2021 +0800 + + * Code for task #36060. + +commit 6f6bda28bbcfadb2b31134f52e5032f5c0909150 +Merge: 19abde98f5 76a08d3b34 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 3 08:41:02 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 19abde98f5051d1859a84f6fc2dfc51bc205ef67 +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 3 08:40:57 2021 +0800 + + * Finish task #36322. + +commit 76a08d3b344714ac4dd76d2ade9ecfc844c065ba +Author: qiyu-xie +Date: Wed Mar 3 08:33:36 2021 +0800 + + * Finish task#36328. + +commit 77d5ba4a2b438c210cd77de63918a25a72d9de0b +Author: hufangzhou <746775970@qq.com> +Date: Wed Mar 3 08:29:25 2021 +0800 + + * Finish task #36319. + +commit 269ea163ba7edfb6a8010ab20a1efb014e2853c6 +Author: qiyu-xie +Date: Tue Mar 2 17:28:38 2021 +0800 + + * Finish task#36331. + +commit 5e9755057bc34d0cf2484986d711852ad345ad94 +Author: qiyu-xie +Date: Tue Mar 2 13:58:58 2021 +0800 + + * Restore code. + +commit 3877cbe01b33fba0ae4c7a8b57c90db2a9234edf +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 2 13:33:33 2021 +0800 + + * Finish task#36324. + +commit 776e663928e77ddd69d6e2006de83cf016339b0b +Merge: 3b7de0fd0b 1058db3ebb +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 2 13:29:54 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3b7de0fd0b34860f884dac624e2cf3d908a33a28 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 2 13:29:47 2021 +0800 + + * Finish task#36359. + +commit 1058db3ebb8352542b3f2a5465ab582b62cf8b6f +Merge: 4849123957 05d70c2f78 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 13:28:46 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 484912395743a09b1780b41ca4b9bc661d92b467 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 13:28:43 2021 +0800 + + * Finish task #36356. + +commit 05d70c2f7823fc7ec31f5b92dfb356d365632303 +Author: qiyu-xie +Date: Tue Mar 2 13:18:48 2021 +0800 + + * Finish task#36327. + +commit 1742f063688ec4b84dba02cfb4c8236ae5714ff5 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 2 13:16:51 2021 +0800 + + * Finish task #36312. + +commit a4404e6ce8a6ea1b2bc975976040185a79190e78 +Merge: 772d3ef1d8 aab57d7d25 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 13:13:21 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 772d3ef1d8e7a395113daa2a9cf99a8339ab124c +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 13:13:17 2021 +0800 + + * Finish task #36345. + +commit aab57d7d252a43326cb84983645bf94578a67562 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 2 13:07:43 2021 +0800 + + * Finish task #36314. + +commit cdbed6ea70cc01ddfc0a7b396c51b689e0102768 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 2 10:58:20 2021 +0800 + + * Finish task #36326. + +commit f53deb3ca5d8ff66fd7131dcfd0f352de0ad4913 +Author: tianshujie98 +Date: Tue Mar 2 13:04:52 2021 +0800 + + * Finish task #36376. + +commit c72ba492cfb2fe5395ef56c06feb42e635577c8c +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 2 11:38:29 2021 +0800 + + * Finish task#36315. + +commit 738a86c53736a7cf7031e0836896fde33cf77ea0 +Merge: 148d4156f7 6df12d685b +Author: vimrus +Date: Tue Mar 2 11:19:57 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 148d4156f7703aaa71b7b84a8e451ba0846975c6 +Author: vimrus +Date: Tue Mar 2 11:17:35 2021 +0800 + + * `system` is reserved word in MySQL5.7 + +commit 6df12d685b64cd562a497ca062ea86302077a356 +Author: qiyu-xie +Date: Tue Mar 2 11:16:35 2021 +0800 + + * Finish task#36335. + +commit a08371bff9c9f0d516195cf05ffc0de7d299a58f +Merge: bcc5c3adae b429655f02 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 11:05:48 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit bcc5c3adae99ddb7b3a017540b23b7e4f41dd50c +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 11:05:32 2021 +0800 + + * Finish task #36364. + +commit b429655f02769f731741a473618423ba082627c4 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 2 10:45:59 2021 +0800 + + * Finish task #36340. + +commit 6d1ef76ff83d567d2a7686fec600b744cdc0794e +Merge: 08b944d473 d3d4358152 +Author: tianshujie98 +Date: Tue Mar 2 10:44:32 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 08b944d473a9391beaf563d332a9b35864700dc5 +Author: tianshujie98 +Date: Tue Mar 2 10:43:47 2021 +0800 + + * Adjust code style. + +commit d3d435815205fe67bbfca9be109739d7561ab24c +Merge: 75abf393f0 a3ba5f074f +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 10:35:55 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 75abf393f0bf473844ab2fff873bcd991fb06a48 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 10:35:52 2021 +0800 + + * Finish task #36365. + +commit a3ba5f074faaa6ec8494e06e76ec15835a4477c1 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 2 10:34:49 2021 +0800 + + * Finish task #36343. + +commit 24914d50e956be2d29e3e6399b9d2745fd6e96d3 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 2 10:28:30 2021 +0800 + + * Finish task #36342. + +commit 8be6b4f1d151052d8797ee9c584ba6e1e63f3827 +Merge: 6b3cb64cc9 c55aafd198 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 10:24:16 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6b3cb64cc9e5a5bfeea80e29023417af61233d60 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 10:24:10 2021 +0800 + + * Adjust the code. + +commit c55aafd198d93215d22a88c6a4b24e5653c3ccb1 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 2 10:22:57 2021 +0800 + + * Fix bug. + +commit 75fd274428f174aac738f966f3d65605f9b825a1 +Author: tianshujie98 +Date: Tue Mar 2 10:19:02 2021 +0800 + + * Finish task #36321. + +commit 927674932ec75dcfe00d65fe5eb0a5ef3db92d98 +Merge: ffb227243f d0ce1a1fcd +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 10:16:47 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit ffb227243f4d3d98138535b8c00be554d9223007 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 10:16:41 2021 +0800 + + * Adjust the code. + +commit d0ce1a1fcd9a8e7aaced967cac7767bbe03632a1 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 2 10:15:09 2021 +0800 + + * Finish task #36347. + +commit 294058ddcdde5c076b491a6c851acc39d842836c +Author: Yagami <976204163@qq.com> +Date: Tue Mar 2 10:13:36 2021 +0800 + + * Finish task #36358 and rename mode. + +commit c4e59946f17a476ec4e40f512331cf5dfe0c49ae +Author: Catouse +Date: Tue Mar 2 10:12:45 2021 +0800 + + * hide copy control before load to prevent shaking. + +commit 2098ef0e2d5a1df4036320e01f1d07af77d1c8da +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 10:08:11 2021 +0800 + + * Fix an error. + +commit e9eae41b3047ace10e6dc27d52952aef99f38f2f +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 09:57:18 2021 +0800 + + * Finish task #36368. + +commit ffa6a21aac8b3d6b9b72eb248bd9f2b269c39312 +Merge: 106bb9c004 3e5a2546d8 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 09:51:44 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 106bb9c004270376f8f2731865ca0703a1b8f4e7 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 09:51:42 2021 +0800 + + * Finish task #36366. + +commit 3e5a2546d8a69069f5c7e460426cd8b2c2df9f04 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 2 09:49:37 2021 +0800 + + * Finish task #36348. + +commit 53d1454d165a9b16c19d1a0630eaf1be7075c317 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 2 09:46:40 2021 +0800 + + * Finish task #36250. + +commit 44e31b78992cfc7456dc8b79cf51e1665c47c0f2 +Merge: 46df489385 32d050147d +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 09:40:45 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 46df489385ba35a3da40bf109e9f58f3b062b958 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 09:40:41 2021 +0800 + + * Finish task #36363. + +commit 32d050147d917993a1aa8c85328c160066213596 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 2 09:37:04 2021 +0800 + + * Finish task #36362. + +commit 72d695e8c8136df5b507e771d041a3da9f1a202c +Author: Yagami <976204163@qq.com> +Date: Tue Mar 2 09:12:28 2021 +0800 + + * Finish task #36361. + +commit c95910d1fa6fbdf17d00cfdcb604ffc76bb45fe4 +Merge: b83692f5f7 1c3975beb8 +Author: tianshujie98 +Date: Tue Mar 2 09:26:41 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit b83692f5f7307f60ba9e3b4ac0a7a527cef83fc4 +Author: tianshujie98 +Date: Tue Mar 2 09:26:12 2021 +0800 + + * Modify the variable name. + +commit 1c3975beb8439497ab2265919861fb70768baa09 +Author: vimrus +Date: Tue Mar 2 09:25:09 2021 +0800 + + * Add $app->openGroup to highlight left menu. + +commit c8654a8b9b72f24273d1f29060030d3131baecc3 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 09:21:00 2021 +0800 + + * Finish task #36344. + +commit 70cf865cd1b2c4452b47e547b585da92cfedb4ec +Merge: 68b2160651 948f9812f1 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 09:18:15 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 68b216065173d049efe98b31bf88657424bde114 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 09:18:12 2021 +0800 + + * Adjust the code. + +commit 948f9812f15fa077a434ad4470e3768677aae4b1 +Author: tianshujie98 +Date: Tue Mar 2 09:15:17 2021 +0800 + + * Add comment. + +commit a91cd25897cd6ab4c78f0efe643dad572b28d488 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 09:13:08 2021 +0800 + + * Finish task #36329. + +commit 04c4223acec7517a10c739b0b659af80851a743d +Merge: 579549e4a5 9a73de2723 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 09:10:13 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 579549e4a520b6f451d3b4f7d5c4be3895fd170d +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 09:09:37 2021 +0800 + + * Fix an error. + +commit 9a73de2723bf5fe14467dd7683adcba72b759657 +Author: tianshujie98 +Date: Tue Mar 2 09:09:17 2021 +0800 + + * Finish task #36336. + +commit 27908a30db67002e1934f855402be54e812d01d1 +Merge: 8eee062311 509fedf41b +Author: tianshujie98 +Date: Tue Mar 2 09:06:32 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8eee062311a043d724e4f86726f78036e57e3a06 +Author: tianshujie98 +Date: Tue Mar 2 09:05:36 2021 +0800 + + * Finish task #36339. + +commit 509fedf41b6a4c862bff50168b4e4f2f06a49866 +Merge: 94e6f58c80 4b7a9427a2 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 2 09:04:52 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4b7a9427a213566fe73b27ee1d757127cc8cdb7b +Author: Yagami <976204163@qq.com> +Date: Mon Mar 1 18:16:18 2021 +0800 + + * Reviewing code fix details. + +commit 94e6f58c809126cc320f094ba250222b75931cb4 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 2 09:04:21 2021 +0800 + + * Hide risk and issue. + +commit 37477cce692c414a36e40924644d472b22d32cd6 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 2 08:57:20 2021 +0800 + + * Add comment. + +commit a4391a005b50fbabb38f60c79fe5a052dd260826 +Merge: 35d4545745 c363ab1741 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 08:52:42 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 35d4545745e03bcee8f826b275bddce45967d54c +Merge: bff2090e94 134833fb18 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 08:52:32 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit bff2090e945f978f2882e4d8aaebc9d7f1b8c709 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 08:52:27 2021 +0800 + + * Finish task #36325. + +commit c363ab17418df1e3ae6eaef496162cdfdc7a430f +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 2 08:52:14 2021 +0800 + + * Finish task #36396. + +commit 134833fb18880340d72609a52d618fdaba169765 +Merge: eaaad7cc9a 72232b7f31 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 2 08:49:34 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 72232b7f31bb217aeeede0816b3a4b9ccca9bcf8 +Merge: 69b65bfcbd 4f0d110611 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 08:49:10 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit eaaad7cc9a33c44ecc15bc24c5d39df132521e3b +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 2 08:49:07 2021 +0800 + + * Fix task #36372. + +commit 69b65bfcbdc54b7a26661a13c550e09a9977c564 +Author: hufangzhou <746775970@qq.com> +Date: Tue Mar 2 08:49:07 2021 +0800 + + * Finish task #36320. + +commit 4f0d110611531cedff7b89b3c2842536e82bb4fb +Merge: 66e7b3b073 756d29a15b +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 2 08:45:24 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 66e7b3b073cd00ae2a8dcc56ea40ff2ffafe534c +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 2 08:45:06 2021 +0800 + + * Add comments. + +commit 756d29a15bf7ab393dc44700e0ea5f38166b54f7 +Author: tianshujie98 +Date: Tue Mar 2 08:37:35 2021 +0800 + + * Adjust code style. + +commit 1b559e66d91956d142c783093b7426ebe41be491 +Merge: 437e5247a1 ca0554c9ca +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 2 08:37:07 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 437e5247a16558fe7fa7a50bd19d2f7e70d16521 +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 2 08:36:33 2021 +0800 + + * Fix create testreport and testsuite. + +commit ca0554c9cad00a9291eda5b3d370bc0c5b1764db +Author: tianshujie98 +Date: Tue Mar 2 08:34:13 2021 +0800 + + * Finish task #36334. + +commit d50a7e02cc927adfd58f839079defe24271d661f +Author: holan20180123 <56391770@qq.com> +Date: Tue Mar 2 08:32:02 2021 +0800 + + * Delete unused codes. + +commit 63882542e0055c1bd08a8e63cde08d2f4eb2c587 +Author: tianshujie98 +Date: Mon Mar 1 08:51:36 2021 +0800 + + * Adjust the navigation list buttons. + +commit 0944ebb9bfab02f301fa1ff390492d9e84461608 +Author: qiyu-xie +Date: Mon Mar 1 08:18:20 2021 +0800 + + * Add other language items for budget unit. + +commit 79e1029298c5ac2e09972d228d372add5a3516d5 +Author: Yagami <976204163@qq.com> +Date: Fri Feb 26 17:33:50 2021 +0800 + + * Fix code review error. + +commit acf7d5f65a7ac95e10afc266caf971f6cd52a307 +Author: qiyu-xie +Date: Fri Feb 26 09:59:18 2021 +0800 + + * Fix bug. + +commit 7ad36da03333fb7313a0fd450d9ae7ebd006dcff +Author: tianshujie98 +Date: Fri Feb 26 09:57:55 2021 +0800 + + * Modify language items. + +commit 50e496f6d98261268d651a9a0641de9e69fce7cc +Author: Yagami <976204163@qq.com> +Date: Fri Feb 26 09:46:03 2021 +0800 + + * Fix program status logic. + +commit d28396eec5323cd777f3044bdf9a72bfe1a62a23 +Merge: 8850a2a22b 387eb06631 +Author: hufangzhou <746775970@qq.com> +Date: Fri Feb 26 09:25:10 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 8850a2a22b2ffc9db66d380afbb60bf3f8a83dfc +Author: hufangzhou <746775970@qq.com> +Date: Fri Feb 26 09:25:07 2021 +0800 + + * Adjust the language. + +commit 387eb06631dd156a915d06a5cede989cb5c069a1 +Author: leiyong <1549684884@qq.com> +Date: Fri Feb 26 09:20:37 2021 +0800 + + * Fix bug. + +commit 8a42ba0f6e0c81705872462fa3583fe7aca7e9d1 +Author: Yagami <976204163@qq.com> +Date: Fri Feb 26 09:19:41 2021 +0800 + + * Fix merge logic. + +commit 27d4ac77fe5d7eb575d806c19ad99a03d1a44390 +Author: qiyu-xie +Date: Fri Feb 26 09:18:04 2021 +0800 + + * Optimize code. + +commit 2c0cff484983e2aa7a01547e00c7fdaad5bd08cd +Author: hufangzhou <746775970@qq.com> +Date: Fri Feb 26 09:14:14 2021 +0800 + + * Fix bugs. + +commit 40863c0eccea0ca8b7eb69964787057d9bb99451 +Author: Yagami <976204163@qq.com> +Date: Fri Feb 26 09:10:33 2021 +0800 + + * Fix create project link. + +commit 1324bec03b81eb276c946e19db02bdfc1c9c3c55 +Author: holan20180123 <56391770@qq.com> +Date: Fri Feb 26 08:54:25 2021 +0800 + + * Fix task #36047. + +commit 70f4b8e931be9bc06afc8b8b198bcd6c4f7f8761 +Author: holan20180123 <56391770@qq.com> +Date: Fri Feb 26 08:48:08 2021 +0800 + + * Adjust create project link. + +commit 5cad1e3db7a7aa18311df6242a8e253fb185ed54 +Author: holan20180123 <56391770@qq.com> +Date: Thu Feb 25 17:28:51 2021 +0800 + + * Fix code error. + +commit 4559dd80fe8088c72b3308460bea40e0ea42ddba +Author: holan20180123 <56391770@qq.com> +Date: Thu Feb 25 17:25:37 2021 +0800 + + * Revert waterfall menu. + +commit 2cb76d4cecbe8b9c1a84a9d1cc7f3fb66921dec7 +Author: leiyong <1549684884@qq.com> +Date: Thu Feb 25 17:21:40 2021 +0800 + + * Finish task#36038. + +commit 29b34af6d20c74b7058a96a1276713789a8c7f13 +Author: holan20180123 <56391770@qq.com> +Date: Thu Feb 25 17:14:03 2021 +0800 + + * Adjust create project button. + +commit ca3ee258ad069d7798afdc16e4ae40c0817cc4dd +Author: tianshujie98 +Date: Thu Feb 25 17:05:03 2021 +0800 + + * Finish task #36070. + +commit 95dbdc51c23ab0806751bf5e47b7a19ebf590d61 +Author: Yagami <976204163@qq.com> +Date: Thu Feb 25 17:04:30 2021 +0800 + + * Fix prjbrowse priv bug. + +commit 7498a17df74636bba74628dca1348a8de6e8c52b +Author: holan20180123 <56391770@qq.com> +Date: Thu Feb 25 16:54:00 2021 +0800 + + * Finish task #36082. + +commit f5de3e15df8b00df4565033aeeadd292c976d0f0 +Author: qiyu-xie +Date: Thu Feb 25 16:10:11 2021 +0800 + + * Fix bug. + +commit 97ba541261a1c1128193fac6cfa2fc57bc73c599 +Author: Yagami <976204163@qq.com> +Date: Thu Feb 25 15:02:22 2021 +0800 + + * Finish task #36042. + +commit 566038223b7bbef1fc6e66658d992d5342990426 +Merge: 007296bd38 3353ac10e6 +Author: hufangzhou <746775970@qq.com> +Date: Thu Feb 25 14:57:32 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 007296bd38c7224b3cea31ee46cbaa1792b4c890 +Author: hufangzhou <746775970@qq.com> +Date: Thu Feb 25 14:57:26 2021 +0800 + + * Adjust the code. + +commit 3353ac10e671f30282e6cdf9d97e0c083957773b +Author: qiyu-xie +Date: Thu Feb 25 14:47:49 2021 +0800 + + * Click after sprint to set the program by product. + +commit a7c118d491f6707a90e2e91a7cce5e2182524dd1 +Author: Yagami <976204163@qq.com> +Date: Thu Feb 25 14:42:21 2021 +0800 + + * Code for old/new mode. + +commit 29abbb19ab8ed754a641450b7d4d1e4d40c1b940 +Author: qiyu-xie +Date: Thu Feb 25 14:27:02 2021 +0800 + + * The merged products will not be displayed without sprints. + +commit 3f3067b283f00aff95e9ba3a16d69882eef193e7 +Author: holan20180123 <56391770@qq.com> +Date: Thu Feb 25 14:14:48 2021 +0800 + + * Remove risk and issue. + +commit 347f56710f34e309c3e01ae224a9851b272d44cf +Author: tianshujie98 +Date: Thu Feb 25 14:11:11 2021 +0800 + + * Fix bug. + +commit 03309106f532f92f0cf3f7b1e6f1c54bb05e3a2f +Author: Yagami <976204163@qq.com> +Date: Thu Feb 25 14:04:59 2021 +0800 + + * Fix details. + +commit e4babbaa8d138944e9ddcfaa3d90bd80be37cd63 +Merge: 541cd5b91c f2a09089c2 +Author: tianshujie98 +Date: Thu Feb 25 13:47:09 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 541cd5b91cc4ceabaa548ab829d732022708560e +Author: tianshujie98 +Date: Thu Feb 25 13:46:52 2021 +0800 + + * Fix bug. + +commit f2a09089c2174652656d42ca01e51ebd2e96d270 +Author: Yagami <976204163@qq.com> +Date: Thu Feb 25 13:44:21 2021 +0800 + + * Hide priv. + +commit 412d8df328580469d579d80c653d7201e7ee5ba5 +Author: hufangzhou <746775970@qq.com> +Date: Thu Feb 25 13:38:43 2021 +0800 + + * Adjust the code. + +commit dc8b6b1e4cf775261fc60e7ad910b88e22d2f346 +Author: leiyong <1549684884@qq.com> +Date: Thu Feb 25 13:36:14 2021 +0800 + + * Fix bug. + +commit 4911a4c16fb0c311fe28033c4995bd22bcabe939 +Author: Yagami <976204163@qq.com> +Date: Thu Feb 25 13:34:37 2021 +0800 + + * Move workestimation menu. + +commit 774eceaf1dce5e54570dcad1cc6733555e6f9211 +Author: Yagami <976204163@qq.com> +Date: Thu Feb 25 13:28:21 2021 +0800 + + * Merge code. + +commit 5e9d124884d49842fc8f7d36ceb0677e6b6e420b +Merge: 569f5f0f7f cd59ba3da3 +Author: holan20180123 <56391770@qq.com> +Date: Thu Feb 25 13:23:33 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 569f5f0f7fccc1844f3317e2465f950918a74a4e +Merge: 3be7fd9a16 2c75e1bd67 +Author: holan20180123 <56391770@qq.com> +Date: Thu Feb 25 13:21:18 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit cd59ba3da3db876e9cd653d415adafb421e2e0e4 +Author: Yagami <976204163@qq.com> +Date: Thu Feb 25 13:11:30 2021 +0800 + + * Move workestimation. + +commit 3be7fd9a160dd35c1d1337a9c0b6350a3c977bd0 +Author: holan20180123 <56391770@qq.com> +Date: Thu Feb 25 13:10:54 2021 +0800 + + * Remove budget to max. + +commit 2c75e1bd672a466ec35b1cefc5a73eb173d5cb52 +Author: hufangzhou <746775970@qq.com> +Date: Thu Feb 25 12:28:02 2021 +0800 + + * Replace the icon of link cases. + +commit 8415d3831a346de0100b957682bc339b88547f75 +Author: Yagami <976204163@qq.com> +Date: Thu Feb 25 13:02:34 2021 +0800 + + * Move durationestimation to max. + +commit 69cc02257c8383ee439fe278a15cabf7f45700c7 +Merge: 811f4dc6c3 f846d3139a +Author: tianshujie98 +Date: Thu Feb 25 11:29:38 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 811f4dc6c35e6123b62babadb509e2ff4ba8b372 +Author: tianshujie98 +Date: Thu Feb 25 11:28:28 2021 +0800 + + * Finish task #36067. + +commit f846d3139a747fa23e8e3308e0f1886767c6a45b +Author: Yagami <976204163@qq.com> +Date: Thu Feb 25 11:25:32 2021 +0800 + + * Fix code detail. + +commit a2482e097b29ca69d6fe7e6ec2ffa03f25d146ef +Merge: 60922b9eb4 9d1157c813 +Author: holan20180123 <56391770@qq.com> +Date: Thu Feb 25 11:02:25 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 60922b9eb486aeeef6f3c19bc4cd713e4876ac24 +Author: holan20180123 <56391770@qq.com> +Date: Thu Feb 25 11:02:06 2021 +0800 + + * Remove issue and risk to max. + +commit 9d1157c813455e97e8445aa5be5faa374eab3832 +Author: tianshujie98 +Date: Thu Feb 25 10:54:02 2021 +0800 + + * Fix bug. + +commit 4d0a761314abbdd10aa3d1322bdf21f6207fb739 +Merge: be7b0343cf 73f991ba48 +Author: tianshujie98 +Date: Thu Feb 25 10:50:08 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit be7b0343cffdbf5c8c21de6e45cf884aae6029db +Author: tianshujie98 +Date: Thu Feb 25 10:49:58 2021 +0800 + + * Fix bug. + +commit 73f991ba4842362bad289ce24a5ec4b4ce4a232c +Author: leiyong <1549684884@qq.com> +Date: Thu Feb 25 10:36:37 2021 +0800 + + * Adjust code. + +commit 1f6e999a9424b7559ae5c87504c78377bebd11a1 +Merge: e6cbb7ca6d 1814445397 +Author: hufangzhou <746775970@qq.com> +Date: Thu Feb 25 10:30:41 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit e6cbb7ca6d33ec06582b19bf187d24485d4e9b11 +Author: hufangzhou <746775970@qq.com> +Date: Thu Feb 25 10:30:37 2021 +0800 + + * Adjust the code. + +commit 1814445397f7b9aaf05dd86cb50db08d10fe611f +Merge: 28573a0b2a 894a3c6a33 +Author: tianshujie98 +Date: Thu Feb 25 10:19:26 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 28573a0b2aae7a15849d758ca88e0b7978f75f58 +Author: tianshujie98 +Date: Thu Feb 25 10:19:11 2021 +0800 + + * Update sprints history. + +commit 894a3c6a334d44a1051bb1ff860a461604c7693c +Author: hufangzhou <746775970@qq.com> +Date: Thu Feb 25 10:18:07 2021 +0800 + + * Adjust the code. + +commit 379f863b411034bd57022d0d6ec4904b52c68fa3 +Merge: 567b25678b 0cae24f3ef +Author: hufangzhou <746775970@qq.com> +Date: Thu Feb 25 10:04:29 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 567b25678b6282e78fba8c8d147a55a68efdc412 +Author: hufangzhou <746775970@qq.com> +Date: Thu Feb 25 10:04:25 2021 +0800 + + * Fix an error. + +commit 0cae24f3ef4de4d4659938396a7a7b31b7ed1dae +Author: qiyu-xie +Date: Thu Feb 25 09:50:04 2021 +0800 + + * When merged product lines, default selected first products. + +commit ca9e3f907ed1e1127dccda5002d3a01294045231 +Author: Yagami <976204163@qq.com> +Date: Thu Feb 25 09:35:52 2021 +0800 + + * Move weekly to max. + +commit 6bd9b8a6bdaf7f2d852b22dd3da6f78b3a626475 +Merge: 0b8f4cb2ff 7303f17434 +Author: holan20180123 <56391770@qq.com> +Date: Wed Feb 24 17:19:15 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 7303f17434158d714e34a660636023c063613e9a +Author: Yagami <976204163@qq.com> +Date: Wed Feb 24 17:19:03 2021 +0800 + + * Fix bug. + +commit 0b8f4cb2ff48fce564c10904ff53bc036d5d85ab +Author: holan20180123 <56391770@qq.com> +Date: Wed Feb 24 17:19:02 2021 +0800 + + * Finish task #36041. + +commit 02a0fd6e662faa029ff58d65edc0e1f7e4d176b7 +Author: holan20180123 <56391770@qq.com> +Date: Wed Feb 24 17:11:33 2021 +0800 + + * Finish task #36041. + +commit efacb24d063fbd95a2350d127163ae69103143eb +Merge: 916b12d0bf f534192438 +Author: leiyong <1549684884@qq.com> +Date: Wed Feb 24 17:05:30 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 916b12d0bfbddb7c3c7a1226eee9c401d9399d7d +Author: leiyong <1549684884@qq.com> +Date: Wed Feb 24 17:05:24 2021 +0800 + + * Finish task#36038. + +commit f5341924380236cb76e661da6ad953c03fc0700c +Author: qiyu-xie +Date: Wed Feb 24 17:01:53 2021 +0800 + + * Process program when merging product lines. + +commit 9a0cc1a7477dd06ce307e361b01b761b0b41521a +Author: Yagami <976204163@qq.com> +Date: Wed Feb 24 16:55:07 2021 +0800 + + * Code for task #36042, move subject estimate stage holiday to max. + +commit 67832082d66238852c3a8f0f68322feb1c5926cf +Author: Yagami <976204163@qq.com> +Date: Wed Feb 24 16:28:44 2021 +0800 + + * Move holiday to max. + +commit 4c4d11feb21d9b2ba79d0058b4c91e0ef1644881 +Merge: 3372be4081 1bdb3c024d +Author: tianshujie98 +Date: Wed Feb 24 16:19:22 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3372be408167316b253c5519468eb86884157ded +Author: tianshujie98 +Date: Wed Feb 24 16:18:34 2021 +0800 + + * Finish task #36010. + +commit 1bdb3c024da8dfa4298b0cf81fbeabd20363be9c +Author: holan20180123 <56391770@qq.com> +Date: Wed Feb 24 16:11:28 2021 +0800 + + * Add default line when merge data. + +commit 27991541c590fa393abcb5975c2515563f09216c +Author: holan20180123 <56391770@qq.com> +Date: Wed Feb 24 15:43:49 2021 +0800 + + * Fix requeired fields of release. + +commit f724db20e0ca40185d5fa77a5eb5dde3f422f735 +Merge: 1ab1717597 360efac631 +Author: tianshujie98 +Date: Wed Feb 24 15:37:20 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1ab17175973e957312f283b62c18352dcfe5f5a4 +Author: tianshujie98 +Date: Wed Feb 24 15:36:40 2021 +0800 + + * Finish task #36010. + +commit 360efac631d097456fe67a428064d7a76f4bfa4f +Author: qiyu-xie +Date: Wed Feb 24 15:12:39 2021 +0800 + + * Delete redundant files. + +commit 0f23c8706d2410a02f41f62ce30ddc9a2d5613be +Author: qiyu-xie +Date: Wed Feb 24 14:58:21 2021 +0800 + + * Fix the program name when selected product already has program. + +commit 5c5bdc213e071540d4219bedcbbeb8223156b0ae +Author: Yagami <976204163@qq.com> +Date: Wed Feb 24 15:02:43 2021 +0800 + + * Adjust code style. + +commit 93421b3e4ca2be4ddb5d1a458230125e439babe3 +Author: Yagami <976204163@qq.com> +Date: Wed Feb 24 14:40:02 2021 +0800 + + * Remove unused code. + +commit e6829b09aabed50c2b8ee11c47c6ff79cb8049f6 +Author: holan20180123 <56391770@qq.com> +Date: Wed Feb 24 14:22:41 2021 +0800 + + * Fix required field of create story. + +commit 3eb5ffcc8b6963422a6b83cd99b46353728cf912 +Merge: 6285ae1b7a 0ab1fea6b1 +Author: hufangzhou <746775970@qq.com> +Date: Wed Feb 24 14:20:58 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 6285ae1b7a63508e034bfe4b4ce341ac1f5f20ed +Author: hufangzhou <746775970@qq.com> +Date: Wed Feb 24 14:20:54 2021 +0800 + + * Adjust the testtask browse page in qa. + +commit 0ab1fea6b153945860d4437de6a73ee3a58db7fa +Merge: 0bc35e1f0f b7d098546f +Author: tianshujie98 +Date: Wed Feb 24 14:12:54 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0bc35e1f0f1fbcfe6212ecbc1be6e972d32c8f33 +Author: tianshujie98 +Date: Wed Feb 24 14:12:27 2021 +0800 + + * Finish task #36004. + +commit b7d098546fc9c132db116181fe89a148a37c9011 +Author: holan20180123 <56391770@qq.com> +Date: Wed Feb 24 14:03:26 2021 +0800 + + * Finish task #36018. + +commit eaa13b4280d23f727b0a3863bb8dfdc9b45b5b38 +Author: holan20180123 <56391770@qq.com> +Date: Wed Feb 24 13:40:18 2021 +0800 + + * Finish task #36041. + +commit e2f6d864f95861a060f40b8db177ebf6c572e11f +Author: hufangzhou <746775970@qq.com> +Date: Wed Feb 24 13:31:52 2021 +0800 + + * Add the plus icon for create caselib. + +commit 49d5b33d8d7f249830b1578ec16c4752416fe4ea +Author: leiyong <1549684884@qq.com> +Date: Wed Feb 24 11:48:25 2021 +0800 + + * Fix bug. + +commit c37f583da0cdfc6d9f9832bb263c4c5795688384 +Merge: 1497a84b33 7a0a05259c +Author: hufangzhou <746775970@qq.com> +Date: Wed Feb 24 11:42:29 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1497a84b334a06d3617e38967fd95cef08ed7362 +Author: hufangzhou <746775970@qq.com> +Date: Wed Feb 24 11:42:17 2021 +0800 + + * Adjust the main nav highlight of build detail page. + +commit 7a0a05259c0f359ac2e0ed67e68a84d352170479 +Author: holan20180123 <56391770@qq.com> +Date: Wed Feb 24 11:37:22 2021 +0800 + + * Finish task #36069. + +commit f89c8bed9156b382620928714566936d361fd0e1 +Merge: f2606bb1e0 a7a841435b +Author: holan20180123 <56391770@qq.com> +Date: Wed Feb 24 11:33:02 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit a7a841435b1c0e26a3fb56ea9eb49d501618af17 +Author: leiyong <1549684884@qq.com> +Date: Wed Feb 24 11:32:44 2021 +0800 + + * Fix bug. + +commit f2606bb1e058f20c8580d7311726b705b3e42971 +Author: holan20180123 <56391770@qq.com> +Date: Wed Feb 24 11:32:01 2021 +0800 + + * Code for task #36041. + +commit f88d1035dcefe56bf09db5c7b48a577b64e599a0 +Merge: 2012da4fc9 13a304980d +Author: tianshujie98 +Date: Wed Feb 24 11:27:48 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 2012da4fc99cd0e312a7906c18bfb3be0c132a9b +Author: tianshujie98 +Date: Wed Feb 24 11:26:50 2021 +0800 + + * Finish task #36013. + +commit 13a304980de9d192377d11e93683694c19eafbec +Author: leiyong <1549684884@qq.com> +Date: Wed Feb 24 10:31:20 2021 +0800 + + * Finish task#36938. + +commit ad77275e2a68d34b4abfc276c035b35ed8a7299b +Merge: 31b11b7774 8b5ac13916 +Author: tianshujie98 +Date: Wed Feb 24 08:11:13 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 31b11b77747ce6dec80cf59e06db5be34efdd169 +Author: tianshujie98 +Date: Wed Feb 24 08:10:32 2021 +0800 + + * Convert product ID to int type. + +commit 8b5ac139169905665769745b125a1cd2c2c176de +Author: Yagami <976204163@qq.com> +Date: Tue Feb 23 17:15:12 2021 +0800 + + * Code for task #36042. + +commit add2456ccb743ce8775f9fe49c27d8259b63e75c +Merge: baf3dbefa7 4319d006b8 +Author: holan20180123 <56391770@qq.com> +Date: Tue Feb 23 16:40:22 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit baf3dbefa7a87afa6d05bb27586b81ddac041e1b +Author: holan20180123 <56391770@qq.com> +Date: Tue Feb 23 16:40:01 2021 +0800 + + * Code for project link product. + +commit 4319d006b815733b04edbcdcd685918f544b5396 +Author: Yagami <976204163@qq.com> +Date: Tue Feb 23 16:27:37 2021 +0800 + + * Fix bug. + +commit f59e9d2980011c3f46bd56d1a521de96c1bcf98f +Author: holan20180123 <56391770@qq.com> +Date: Tue Feb 23 16:26:30 2021 +0800 + + * Code for create project and task. + +commit a16d3e30aaad2c039799d20646a6c9bc43143eae +Author: holan20180123 <56391770@qq.com> +Date: Tue Feb 23 16:18:51 2021 +0800 + + * Code for task #36042. + +commit 252fb8d9424ed20ae59e54a681ceaa8bac3d296e +Merge: cacf93eb5d cbb38c2ae7 +Author: hufangzhou <746775970@qq.com> +Date: Tue Feb 23 15:38:26 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit cacf93eb5dc4e3e632bc5985286395e2be54b163 +Author: hufangzhou <746775970@qq.com> +Date: Tue Feb 23 15:38:20 2021 +0800 + + * Adjust the code. + +commit cbb38c2ae7eb86cfe4ce7b74960a6a95f469fd96 +Merge: 3ca1f79fd2 9ae184c762 +Author: holan20180123 <56391770@qq.com> +Date: Tue Feb 23 15:34:53 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3ca1f79fd22420ac02e0cb63333ab45ec26643f3 +Author: holan20180123 <56391770@qq.com> +Date: Tue Feb 23 15:33:23 2021 +0800 + + * Code for task #36042. + +commit 9ae184c762bc17a77e7dcbdca337c813ea92dcfe +Author: leiyong <1549684884@qq.com> +Date: Tue Feb 23 15:01:34 2021 +0800 + + * Finish task#36038. + +commit 20075135abc75d65bbe37e2f2becd8defa89e0ec +Author: leiyong <1549684884@qq.com> +Date: Tue Feb 23 14:36:54 2021 +0800 + + * Finish task#36038. + +commit 151760b145fbe89846c7d2d8b375bd8f2a39a854 +Author: holan20180123 <56391770@qq.com> +Date: Tue Feb 23 14:10:11 2021 +0800 + + * Code for task #36042. + +commit 95a32f10ae3b03240c82d6e3d6d5010179f53e9b +Merge: 467508d3fe f6c0564234 +Author: holan20180123 <56391770@qq.com> +Date: Tue Feb 23 14:00:56 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 467508d3fe0173a7a28d7d570fef6695282a00a8 +Author: holan20180123 <56391770@qq.com> +Date: Tue Feb 23 14:00:37 2021 +0800 + + * Code for task #36042. + +commit f6c0564234e1bab547c983e2a77d5235a6f4acc5 +Author: Yagami <976204163@qq.com> +Date: Tue Feb 23 13:58:43 2021 +0800 + + * Code for task #36042. + +commit e3fcb7c71067534ca5a30a3078d7e7bdd53d8833 +Author: holan20180123 <56391770@qq.com> +Date: Tue Feb 23 13:56:49 2021 +0800 + + * Code for task #36042. + +commit c8fcf59875019a7b8037f4b3b033703e15560958 +Author: holan20180123 <56391770@qq.com> +Date: Tue Feb 23 13:46:21 2021 +0800 + + * Code for task #36042. + +commit e7dee4482848d643b6f30ab661aaf906e787f3f5 +Author: tianshujie98 +Date: Tue Feb 23 13:06:40 2021 +0800 + + * Adjust style. + +commit 1c90a056431cc963dbe7482befcbebcf7855d933 +Author: tianshujie98 +Date: Tue Feb 23 11:38:45 2021 +0800 + + * Change the font size of navigation buttons. + +commit 9d17c0a8d3e6bfd80685f68a3ce5b772254299c0 +Author: qiyu-xie +Date: Tue Feb 23 11:14:40 2021 +0800 + + * Project list block budget unit conversion. + +commit e04881674ceb230cb6eaae64acb361c9f55262d5 +Author: hufangzhou <746775970@qq.com> +Date: Tue Feb 23 11:09:40 2021 +0800 + + * Adjust the code. + +commit 10996d2976a68bf43232c5d0f5d8015cd35b8b55 +Author: hufangzhou <746775970@qq.com> +Date: Tue Feb 23 10:57:57 2021 +0800 + + * Add the comment. + +commit 6547d09a913b00270783d14785a79f0076cc6ec9 +Author: qiyu-xie +Date: Tue Feb 23 10:31:01 2021 +0800 + + * Finish task#36046. + +commit b7395cca8c9280f992614a1cbd2d86ad0b765f8f +Merge: 2f9de80fe1 0f4d897eed +Author: tianshujie98 +Date: Tue Feb 23 10:29:39 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 2f9de80fe19aa5d5ac438de35ec7c75318c8a567 +Author: tianshujie98 +Date: Tue Feb 23 10:28:50 2021 +0800 + + * Adjust style. + +commit 0f4d897eeda5583854b88fd39778395751c20a9a +Author: leiyong <1549684884@qq.com> +Date: Tue Feb 23 10:26:10 2021 +0800 + + * Fix bug. + +commit 963c56ff7ae55b98bf9edb752e8bbe9bd5c97416 +Author: holan20180123 <56391770@qq.com> +Date: Tue Feb 23 10:22:26 2021 +0800 + + * Code for task #36041. + +commit cca32ee8091b2d6701081f15f070f9dbd23860f2 +Merge: bb8dd68ce0 f8b0e4e0e8 +Author: hufangzhou <746775970@qq.com> +Date: Tue Feb 23 10:18:22 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit bb8dd68ce0ca352962e13a601c4751ee282078bc +Author: hufangzhou <746775970@qq.com> +Date: Tue Feb 23 10:18:16 2021 +0800 + + * Fix a bug. + +commit f8b0e4e0e885bf6376bad6fc766d594a1e9cf0c9 +Author: tianshujie98 +Date: Tue Feb 23 09:59:53 2021 +0800 + + * Finish task #36087. + +commit b65ee0529934989cf5553b3319fd2d8a6ee2fd9f +Merge: 7bf34a29ed 4fa5fdb2a7 +Author: tianshujie98 +Date: Tue Feb 23 09:59:49 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 7bf34a29ed5c4b84d0feb7cc2d1a4930af99b345 +Author: tianshujie98 +Date: Tue Feb 23 09:59:26 2021 +0800 + + * Fix bug. + +commit 4fa5fdb2a7435228931bd40abb2d2b6cdd6e478a +Author: wangyidong +Date: Tue Feb 23 09:55:50 2021 +0800 + + * adjust code. + +commit ecfb315a37b5d70c73e2b5bc7087f2588d0ec8fb +Author: Yagami <976204163@qq.com> +Date: Tue Feb 23 09:45:04 2021 +0800 + + * Finish task #36018. + +commit 424c6ae400cc66976b96c4bdb92f55acf1eb848d +Author: Yagami <976204163@qq.com> +Date: Tue Feb 23 09:30:09 2021 +0800 + + * Code for details. + +commit 535fb750b3d81b977110104379960a3a195f9231 +Author: wangyidong +Date: Tue Feb 23 09:12:20 2021 +0800 + + * code for change after15mode to mode. + +commit 8a9fe39063dc6c828f37a3019a25165f6620f13e +Author: hufangzhou <746775970@qq.com> +Date: Tue Feb 23 09:08:56 2021 +0800 + + * Adjust the table style. + +commit 8a61ddef4f46cab380b3fdb77a36ed992be713a8 +Author: Yagami <976204163@qq.com> +Date: Mon Feb 22 17:20:07 2021 +0800 + + * Code for #36025. + +commit 0882f35bc65120d762896dc10045518d40813542 +Author: leiyong <1549684884@qq.com> +Date: Mon Feb 22 16:28:02 2021 +0800 + + * Finish task#36037. + +commit 4e1a36384ce830bb6c62ce0ada86d7f0f08e9025 +Author: Yagami <976204163@qq.com> +Date: Mon Feb 22 16:24:26 2021 +0800 + + * Code for task #36041. + +commit 2cde2057216a2884d6936b3e48ddc51318325879 +Author: wangyidong +Date: Mon Feb 22 16:17:39 2021 +0800 + + * finish task #36013. + +commit cbc7963ea8c85e4de934cebba250616b52f910e3 +Author: holan20180123 <56391770@qq.com> +Date: Mon Feb 22 16:09:07 2021 +0800 + + * Code for task #36041. + +commit 8f57e6b652acf5e6881f70b78447341b125f1901 +Author: wangyidong +Date: Mon Feb 22 15:30:47 2021 +0800 + + * finish task #36004. + +commit 3f9126301020fc2013dd88f63c453b8e14aca2ea +Author: qiyu-xie +Date: Mon Feb 22 15:23:24 2021 +0800 + + * Fix bug. + +commit 7f126289031519fe840afdd48384a3066a3f65f0 +Merge: 5cf387d16d 6be20bc631 +Author: holan20180123 <56391770@qq.com> +Date: Mon Feb 22 15:08:17 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 5cf387d16db8ddcaa7edc738cf69fe9c44483723 +Author: holan20180123 <56391770@qq.com> +Date: Mon Feb 22 15:08:01 2021 +0800 + + * Code for task #36041. + +commit 6be20bc6313d7bb762b7e0924b7f1fd030e3a8cc +Merge: 3bd01a1f26 05dda5ebb8 +Author: tianshujie98 +Date: Mon Feb 22 15:06:42 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3bd01a1f266598143691ec57849840f79e3b0123 +Author: tianshujie98 +Date: Mon Feb 22 15:06:08 2021 +0800 + + * Finish task #36036, 36035. + +commit 05dda5ebb8bfcb612e70310f2cae5aa3c9bc9c7a +Author: holan20180123 <56391770@qq.com> +Date: Mon Feb 22 14:35:53 2021 +0800 + + * Code for task #36041. + +commit 36d49f1cdfe2b9d594c4d25503742b1340c7ec76 +Author: Yagami <976204163@qq.com> +Date: Mon Feb 22 14:09:36 2021 +0800 + + * Code for task #36041. + +commit d4d819073ae0d8d020a9f1427cd7526afee29bef +Author: tianshujie98 +Date: Mon Feb 22 14:07:16 2021 +0800 + + * Finish task #36019. + +commit 183ee6bbc8903523fd65f7f122949f7f95cf42cc +Merge: 3ade008ce6 8ca0f10d06 +Author: hufangzhou <746775970@qq.com> +Date: Mon Feb 22 14:03:20 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 3ade008ce6fdc5d7acb24a8e6b275ac80652db05 +Author: hufangzhou <746775970@qq.com> +Date: Mon Feb 22 13:59:12 2021 +0800 + + * Finish task#36071. + +commit 8ca0f10d06edb4602fb1ab30f3a2e775a8dd6fbf +Merge: 76486af6cc 6787d19ac7 +Author: tianshujie98 +Date: Mon Feb 22 13:43:50 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 76486af6ccc30391fac949c5aefb2e478347df43 +Author: tianshujie98 +Date: Mon Feb 22 13:43:42 2021 +0800 + + * Fix bug. + +commit 6787d19ac7793db1755ff9196cc6614c65351297 +Author: wangyidong +Date: Mon Feb 22 13:03:46 2021 +0800 + + * finish task #36010. + +commit b668ce197024b36e7a20e6dcf654ac058be8bee0 +Author: Yagami <976204163@qq.com> +Date: Mon Feb 22 11:05:01 2021 +0800 + + * Finish task #36028,#36068,#36072. + +commit 98cea3e6436fa10f8742847ad5f00b33a788ff99 +Author: wangyidong +Date: Mon Feb 22 10:55:35 2021 +0800 + + * finish task #35998. + +commit a86e104e2ae5c73341abfa2439d553ac96cd7a48 +Author: tianshujie98 +Date: Mon Feb 22 10:42:24 2021 +0800 + + * Fix bug. + +commit 670929c15297dae8ccf9b239781f38aff5da000a +Merge: e6047b01cc f58b318ccd +Author: wangyidong +Date: Mon Feb 22 10:38:30 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f58b318ccd830685a8c99032b0a1506fb003d751 +Author: tianshujie98 +Date: Mon Feb 22 10:02:59 2021 +0800 + + * Fix bug. + +commit 56e42a7fb0760db564e3760419c6329ae3f4f361 +Author: tianshujie98 +Date: Mon Feb 22 09:40:35 2021 +0800 + + * Fix bug. + +commit 48075c526dce3ac40773768a9a2855a8285a1ba0 +Author: qiyu-xie +Date: Mon Feb 22 09:27:26 2021 +0800 + + * When merge data by product, add an arrow in the page. + +commit ff8bb44adabec9ea1fcfb972cbaaf70a0569dfb2 +Author: qiyu-xie +Date: Mon Feb 22 09:04:00 2021 +0800 + + * Fix bug. + +commit e6047b01cc9dcdff0efad100b4c64deb6884f909 +Author: wangyidong +Date: Sun Feb 21 17:54:52 2021 +0800 + + * finish task #36023. + +commit 2a29dc0c7ff718faaa456089b59c0792f7f13a49 +Author: wangyidong +Date: Sun Feb 21 16:46:34 2021 +0800 + + * finish task #35997. + +commit b0384bbc7f14ea5db93c433f6649f76be7c10d01 +Author: tianshujie98 +Date: Sat Feb 20 17:41:13 2021 +0800 + + * Batch editing project interface. + +commit 83c466928188a310eb28c24732efcfa00aaa3f80 +Author: qiyu-xie +Date: Sat Feb 20 16:59:41 2021 +0800 + + * Finish task#36086. + +commit 4027c87f5b580cf31c08724c0ae641babce42d60 +Author: Yagami <976204163@qq.com> +Date: Sat Feb 20 16:28:10 2021 +0800 + + * Finish task #36015. + +commit 0d07351cf3dbc80d8f235230ecfd800bffec7665 +Merge: 1b173f6f0d d1f2c3cabd +Author: tianshujie98 +Date: Sat Feb 20 16:02:10 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1b173f6f0df4ddacdc3f38cce60d27312a4fc1db +Merge: 8212de6cc3 734611b324 +Author: tianshujie98 +Date: Sat Feb 20 16:02:03 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit d1f2c3cabd11d5dca5bcbb02f23a5c98c911a35c +Author: Yagami <976204163@qq.com> +Date: Sat Feb 20 15:59:47 2021 +0800 + + * Finish task #36070/#36069. + +commit 8212de6cc3696b9c5e48649bd66c032b5dee2d9a +Author: tianshujie98 +Date: Sat Feb 20 15:57:10 2021 +0800 + + * Modify the logic of project editing. + +commit 734611b3249ad6791706846948213efb61f66d15 +Author: wangyidong +Date: Sat Feb 20 15:55:43 2021 +0800 + + * finish task #36017. + +commit effb16b0a6c7d331eef4edf28f31f91ebc4c7326 +Author: Catouse +Date: Sat Feb 20 15:52:24 2021 +0800 + + * add icon-test. + +commit ddb7175ea542e2740a697faa398bd3372924a4f6 +Author: wangyidong +Date: Sat Feb 20 14:55:11 2021 +0800 + + * finish task #36026. + +commit 7425414bb89aefa29f061405c3b02dcc81a6bc55 +Author: wangyidong +Date: Sat Feb 20 14:40:57 2021 +0800 + + * adjust for error. + +commit c710a65808a492788a3af6b62ebca4aeb3fdfd03 +Author: leiyong <1549684884@qq.com> +Date: Sat Feb 20 14:41:50 2021 +0800 + + * Finish task#36058. + +commit e4486ae6eb28e40f863c0e42353d8b5175af79a5 +Author: wangyidong +Date: Sat Feb 20 14:36:10 2021 +0800 + + * adjust for captcha. + +commit 45aeaca53983ed2ab3f573119fbe14bce3681174 +Author: Catouse +Date: Sat Feb 20 14:33:23 2021 +0800 + + * zoom in icon-product. + +commit 3e980f2e6fb7fcb9042a51d2b307867287eb86fa +Author: leiyong <1549684884@qq.com> +Date: Sat Feb 20 14:30:40 2021 +0800 + + * Finish task#36034. + +commit cc1591feccb1764c67f7bd98e05148e024d49539 +Author: leiyong <1549684884@qq.com> +Date: Sat Feb 20 14:30:19 2021 +0800 + + * Finish task#36020. + +commit 75136c6365377bd47e83591acb2f18cd052ff088 +Author: Yagami <976204163@qq.com> +Date: Sat Feb 20 14:12:15 2021 +0800 + + * Remove unused code. + +commit 878553e9aa6708ba7f100cec8754bc0c699865d9 +Merge: d89df79257 70a909c508 +Author: leiyong <1549684884@qq.com> +Date: Sat Feb 20 13:57:35 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit d89df792575281958dbe1b0d06b48dbe95aca230 +Author: leiyong <1549684884@qq.com> +Date: Sat Feb 20 13:57:27 2021 +0800 + + * Finish task#36061. + +commit 70a909c508e62784e9471a3d6150310eacaa4dac +Author: Yagami <976204163@qq.com> +Date: Sat Feb 20 13:56:24 2021 +0800 + + * Add program update order priv. + +commit 7a50a4512c0a97cbaeb2f3ca15d84a8f16b59126 +Author: Yagami <976204163@qq.com> +Date: Sat Feb 20 13:42:02 2021 +0800 + + * Upgrade programs add order. + +commit ef05506d95c8584d7d2a8c759defc0c9940108da +Merge: fce763fa42 eba69aa8b7 +Author: hufangzhou <746775970@qq.com> +Date: Sat Feb 20 13:36:07 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit fce763fa42142086e7bb4e8496b25eeace90bc50 +Author: hufangzhou <746775970@qq.com> +Date: Sat Feb 20 13:36:02 2021 +0800 + + * Finish task #36048. + +commit eba69aa8b783627597c29ea52d1889e3f75f6ee5 +Author: qiyu-xie +Date: Sat Feb 20 13:26:00 2021 +0800 + + * Finish task#36030.36047. + +commit 8d9a5c28303f356d6dcd0c1139f444ae4725ec65 +Merge: 0721d6900c 3d67f9fc94 +Author: holan20180123 <56391770@qq.com> +Date: Sat Feb 20 13:22:57 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 0721d6900ce6de9230e6675f0021b7a3015cecae +Author: holan20180123 <56391770@qq.com> +Date: Sat Feb 20 13:22:33 2021 +0800 + + * Finish task #36014. + +commit 3d67f9fc94f07a194f8c8bb41c8c2a7221eca16e +Author: leiyong <1549684884@qq.com> +Date: Sat Feb 20 11:27:52 2021 +0800 + + * Finish task#36040. + +commit 25e82dec6ac12b29eed9513e6f041f3e1449ea26 +Merge: 9d4900b30e 53655c7c16 +Author: holan20180123 <56391770@qq.com> +Date: Sat Feb 20 11:20:09 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 9d4900b30ef28afe063379afb2dfcd313b879ab2 +Author: holan20180123 <56391770@qq.com> +Date: Sat Feb 20 11:19:22 2021 +0800 + + * Finish task #36014. + +commit 53655c7c16581c620a54bd6648961df0220ee055 +Merge: c08df84c0c 6e16b35205 +Author: hufangzhou <746775970@qq.com> +Date: Sat Feb 20 11:17:27 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit c08df84c0c6f85e405db351d04e94b7c024caa58 +Author: hufangzhou <746775970@qq.com> +Date: Sat Feb 20 11:17:25 2021 +0800 + + * Finish task #36003. + +commit 6e16b35205c27fb9bc1fe0641c95ef8c4fe51794 +Author: Yagami <976204163@qq.com> +Date: Sat Feb 20 11:13:14 2021 +0800 + + * Fix story concept. + +commit 62e481747d5d84d0a280a0d9a0d351458d0615f0 +Merge: 81f261dd64 e4a47518ea +Author: hufangzhou <746775970@qq.com> +Date: Sat Feb 20 11:11:57 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 81f261dd6476bbdbdb71a357dc4027736c6b79d8 +Author: hufangzhou <746775970@qq.com> +Date: Sat Feb 20 11:11:43 2021 +0800 + + * Finish task #36088. + +commit e4a47518ea859ac4fcaf4eaa47b57766fdcca3fa +Author: qiyu-xie +Date: Sat Feb 20 11:10:16 2021 +0800 + + * Finish task#36154. + +commit 5579ce6db4cc27bc5496af0ee4fac2c156dddefc +Author: leiyong <1549684884@qq.com> +Date: Sat Feb 20 10:58:08 2021 +0800 + + * Finish task#36079. + +commit 6c7d50e9891637047568fbc0e0cc0ca9201a4776 +Author: holan20180123 <56391770@qq.com> +Date: Sat Feb 20 10:55:24 2021 +0800 + + * Finish task #36085. + +commit 05a30dd9aa793c58988ae354fb34478896ffba87 +Author: holan20180123 <56391770@qq.com> +Date: Sat Feb 20 10:45:43 2021 +0800 + + * Finish task #36029,#36084. + +commit 3435a2123c899f2a3d2887082e4f774bee661d89 +Author: qiyu-xie +Date: Sat Feb 20 10:40:41 2021 +0800 + + * Finish task#36050. + +commit a24ac5811375750186a07db35680b768e61b9819 +Author: qiyu-xie +Date: Sat Feb 20 10:40:07 2021 +0800 + + * Finish task#36051. + +commit 84ca928f7f4a5b07a7d1849b6563ee11a124eb17 +Author: qiyu-xie +Date: Sat Feb 20 10:25:31 2021 +0800 + + * Finish task#36052. + +commit 8203c0df125170a0b595dc09ad96b8e77a36f3a2 +Author: tianshujie98 +Date: Sat Feb 20 09:19:43 2021 +0800 + + * Finish task #35999. + +commit 2b422e243684640f2544a222558d4fcb1ea0af90 +Author: leiyong <1549684884@qq.com> +Date: Fri Feb 19 17:51:30 2021 +0800 + + * Finish task#36021. + +commit 85840a26b3e9a0cb33c35c5fc1db60a3a9e92cf2 +Author: holan20180123 <56391770@qq.com> +Date: Fri Feb 19 17:21:57 2021 +0800 + + * Finish task #36062. + +commit f093824f69d8f0ca7ff77f3e4f4f6d4ebe9b02c4 +Author: holan20180123 <56391770@qq.com> +Date: Fri Feb 19 16:42:32 2021 +0800 + + * Finish task #36025. + +commit bc54d81bc7babe6fb6e3e1288cf037c50b783b66 +Author: holan20180123 <56391770@qq.com> +Date: Fri Feb 19 15:50:55 2021 +0800 + + * Finish task #36024. + +commit 6bfcb89c36e66a3e7eecd35772a7c4463764f04e +Author: holan20180123 <56391770@qq.com> +Date: Fri Feb 19 15:39:04 2021 +0800 + + * Finish task #36000. + +commit b4d52edf2e017601d633d7f62db91f826e231b22 +Author: qiyu-xie +Date: Fri Feb 19 15:28:55 2021 +0800 + + * Finish task#36064. + +commit 58f48f13f8b71488b5f28120975acb0f125b44fd +Author: qiyu-xie +Date: Fri Feb 19 15:00:52 2021 +0800 + + * Finish task#36064. + +commit b6a4da380eb0a692e09af2b69115df59abbed7c7 +Author: qiyu-xie +Date: Fri Feb 19 13:43:24 2021 +0800 + + * Finish task#36063. + +commit b85e38ffa2b55c226c4579570b5aaabe4a93cb5d +Author: qiyu-xie +Date: Fri Feb 19 10:24:33 2021 +0800 + + * Finish task#36077. + +commit 80b1c44d4a283f8b455b15a7d5e96ab9596248af +Merge: 1e7beb09af 7323922916 +Author: holan20180123 <56391770@qq.com> +Date: Fri Feb 19 15:24:07 2021 +0800 + + Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms + +commit 1e7beb09afd3a2a462c8c314ac03ce20f8710430 +Author: holan20180123 <56391770@qq.com> +Date: Fri Feb 19 15:23:32 2021 +0800 + + * Finish task #36018. + +commit 732392291696b1839c8bddaab02bdeefee36c61a +Author: Catouse +Date: Fri Feb 19 14:18:44 2021 +0800 + + * add icon-list. + +commit 8a7983c5a0c4a6b2c810c5374760ab02ebc65211 +Author: leiyong <1549684884@qq.com> +Date: Fri Feb 19 13:31:18 2021 +0800 + + * Finish task#36031,task#36011,task#36012,task#36016. + +commit 6bf40e474d9ada4a8de094aaa89989792ae13152 +Merge: 3ee2aa34a7 fc28bbfc9e +Author: wangyidong +Date: Fri Feb 19 13:17:23 2021 +0800 + + Merge branch '12.x' + +commit 3ee2aa34a75ff98e59e99c30e1838a44160a9ad6 +Author: tianshujie98 +Date: Fri Feb 19 11:13:08 2021 +0800 + + * Finish task #35999. + +commit cd7a74ccbcbd610978b89b2818c912b4c5607e2d +Author: tianshujie98 +Date: Fri Feb 19 11:08:40 2021 +0800 + + * Finish task #36055, 36054, 36053. + +commit c289d0092c90bbd3afcad91f6b9c6434b8def8ab +Merge: 4045f13491 e624596b49 +Author: tianshujie98 +Date: Fri Feb 19 10:28:21 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit 4045f134915b58f5d4fad4f0d44cd95176a13980 +Author: tianshujie98 +Date: Fri Feb 19 10:26:51 2021 +0800 + + * Finish task #36067. + +commit e624596b49b01d4e25b7705c0f6981b374bdc7f7 +Author: holan20180123 <56391770@qq.com> +Date: Fri Feb 19 10:23:44 2021 +0800 + + * Finish task #36014. + +commit e3c57cbb2ddb93cafbd753675e5a3fd6a174650e +Author: wangyidong +Date: Fri Jan 29 17:47:56 2021 +0800 + + * adjust for feishu. + +commit 92251d2d0ec397881b9208fc300c29e7639d2a6d +Author: wangyidong +Date: Fri Jan 29 17:26:19 2021 +0800 + + + add encrypt password script. + +commit d3669d6ee509b7ca1b77630367030a16280f90b3 +Author: wangyidong +Date: Fri Jan 29 13:15:50 2021 +0800 + + * adjust for feishu webhook. + +commit a1c238496db861712f6b1fcc27eed56984c82734 +Author: wangyidong +Date: Wed Jan 27 16:55:26 2021 +0800 + + * finish task #9083,9108,9109. + +commit c7aa400995dcbb7457e0721e4482889bf67b9e8a +Author: wangyidong +Date: Tue Dec 22 08:12:25 2020 +0800 + + * fix bug for check decrypted password. + +commit dc7cf604e9d672e0b0cc8ac2a47b939251cfca15 +Author: wangyidong +Date: Mon Dec 21 09:11:04 2020 +0800 + + * fix bug #3746. + +commit c3bc4c3cdf22d3a5b83146a4485e9c1fa9f93061 +Author: qiyu-xie +Date: Thu Dec 17 17:27:47 2020 +0800 + + * Modify job view lable. + +commit 0dd31db0f059dc0430e498f8f1b4ddebd897ade8 +Author: wangyidong +Date: Thu Dec 17 15:22:00 2020 +0800 + + * fix for get extension license order file. + +commit 7fb71d6f9e9de625c1b6f4dafb4ebc2f84e4df10 +Author: tianshujie98 +Date: Wed Dec 16 15:42:20 2020 +0800 + + * Finish task #8683. + +commit 912c33229922920a2b457bea2f9d7ca0ec12e517 +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 15 10:04:06 2020 +0800 + + * Fix bug. + +commit ba205e23afc408da4d2fbf761507a5f20f3a95a9 +Author: qiyu-xie +Date: Fri Feb 19 09:06:54 2021 +0800 + + * Finish task#36081. + +commit 796d89c8e99add51a07f8bd44f6457090382ed5f +Merge: f821dad6d2 2d3e8e42b3 +Author: hufangzhou <746775970@qq.com> +Date: Fri Feb 19 09:37:30 2021 +0800 + + Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms + +commit f821dad6d2a8a5aa4fabc4ee3a39f5c59b35e964 +Author: hufangzhou <746775970@qq.com> +Date: Fri Feb 19 09:11:36 2021 +0800 + + * Finish task #36002. + +commit 2d3e8e42b36006b39336ea30f535ae8dcc33a2fc +Author: Yagami <976204163@qq.com> +Date: Fri Feb 19 09:10:29 2021 +0800 + + * Remove product change program condition. + +commit 40f64463b1c88459f759181143fa2118a400bdcd +Author: leiyong <1549684884@qq.com> +Date: Thu Feb 18 14:03:05 2021 +0800 + + * Fix bug. + +commit def14e0080242db73c00d905951eefc5722da4cb +Merge: 1205201de1 eddeec47cf +Author: hufangzhou <746775970@qq.com> +Date: Thu Feb 18 13:37:47 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 1205201de19939a2bb148fac81d6f043391b39f1 +Author: hufangzhou <746775970@qq.com> +Date: Thu Feb 18 13:37:44 2021 +0800 + + * Fix bug #10977. + +commit eddeec47cfaa3d3a44fa7b0cb2e8889fde9e0111 +Author: leiyong <1549684884@qq.com> +Date: Thu Feb 18 13:22:22 2021 +0800 + + * Fix bug. + +commit 154276a3f620efb28a1f55b6a3ffff427edea23d +Author: hufangzhou <746775970@qq.com> +Date: Thu Feb 18 09:59:44 2021 +0800 + + * Adjust the style. + +commit bf3874c53efa72ab1f2acfb390eb4e2fd5656dc7 +Author: hufangzhou <746775970@qq.com> +Date: Thu Feb 18 09:30:16 2021 +0800 + + * Adjust the submit button style. + +commit fa4c4c31c12cb097ecc98774d5fa1033005ac21e +Author: hufangzhou <746775970@qq.com> +Date: Thu Feb 18 09:12:39 2021 +0800 + + * Fix a bug. + +commit 94bacf0238b6e67dbcd6be22bcf15c2f36445ece +Author: holan20180123 <56391770@qq.com> +Date: Wed Feb 10 16:16:45 2021 +0800 + + * Adjust the style. + +commit fe39709e78ce32aa3327fa02da2e9b6f25e63b10 +Merge: 9b123a8c56 0f43ebdd34 +Author: hufangzhou <746775970@qq.com> +Date: Wed Feb 10 14:51:40 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 9b123a8c56bf29f1b72cdec1bc32eed9322556c0 +Author: hufangzhou <746775970@qq.com> +Date: Wed Feb 10 14:51:38 2021 +0800 + + * Fix a bug. + +commit 0f43ebdd34fd9f048b5dd1e66af66b34adc9cdb9 +Merge: aaabaabf4e 6470a77a4e +Author: sgm0422 <976204163@qq.com> +Date: Wed Feb 10 10:56:26 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit aaabaabf4e928ee1634d37965b782c85ee2905b4 +Author: sgm0422 <976204163@qq.com> +Date: Wed Feb 10 10:56:20 2021 +0800 + + * Fix bug. + +commit 6470a77a4e1bb4291a25f2a6792a5e943180656d +Author: leiyong <1549684884@qq.com> +Date: Wed Feb 10 10:07:47 2021 +0800 + + * Fix bug#10974. + +commit c90fdfc528dbe0c7c94722cad82515e62a7c6c7e +Author: holan20180123 <56391770@qq.com> +Date: Tue Feb 9 14:36:52 2021 +0800 + + * Remove duplicate code. + +commit 04d48a701d98c477a951a7f02430c0c99e67e895 +Author: holan20180123 <56391770@qq.com> +Date: Tue Feb 9 14:20:03 2021 +0800 + + * Remove duplicate code. + +commit e10844807b622238309b649085aff6edbbb9f366 +Merge: d013ea7a3f 440d8f440e +Author: hufangzhou <746775970@qq.com> +Date: Tue Feb 9 09:29:55 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit d013ea7a3fb7c45b1172e112911211c2987e4492 +Author: hufangzhou <746775970@qq.com> +Date: Tue Feb 9 09:29:51 2021 +0800 + + * Fix bug #10971. + +commit 440d8f440e144fbf0b044ee951ffdaa7b3457d65 +Author: holan20180123 <56391770@qq.com> +Date: Mon Feb 8 17:09:11 2021 +0800 + + * Delete duplicate code. + +commit 166f48a297b6cb454c51ce5f35d5e0b304036093 +Author: holan20180123 <56391770@qq.com> +Date: Mon Feb 8 17:01:10 2021 +0800 + + * Delete duplicate code. + +commit 5b69333ed15c7ed2327a72135e715a3c32587aa7 +Author: leiyong <1549684884@qq.com> +Date: Mon Feb 8 15:20:54 2021 +0800 + + * Fix bug. + +commit 67dd183b10ea4951187f39d736203a5f5e56105f +Author: holan20180123 <56391770@qq.com> +Date: Mon Feb 8 14:21:15 2021 +0800 + + * Fix bug #10966. + +commit 49148806aca842510d31466ef7acfac2cd07d350 +Author: hufangzhou <746775970@qq.com> +Date: Mon Feb 8 14:05:13 2021 +0800 + + * Adjust the date control style. + +commit a76ae26523f28648ab6a290290c221cc5a2b49b3 +Author: holan20180123 <56391770@qq.com> +Date: Mon Feb 8 10:53:11 2021 +0800 + + * Fix bug #10966. + +commit 4bc4aac3be7aee4e80c729a75ebe1da1ba7cad15 +Author: leiyong <1549684884@qq.com> +Date: Sun Feb 7 17:33:08 2021 +0800 + + * Fix bug. + +commit 86605772b0d464bf9acc378303c093c084310059 +Author: leiyong <1549684884@qq.com> +Date: Sun Feb 7 17:19:36 2021 +0800 + + * Fix bug. + +commit 80269b0d7fafddc5e1d262ce77ac7a7e5107417f +Merge: e961221f9d 73cc080ca2 +Author: hufangzhou <746775970@qq.com> +Date: Sun Feb 7 16:54:26 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit e961221f9d0898f77c4613df31f9bbbfc37f4726 +Author: hufangzhou <746775970@qq.com> +Date: Sun Feb 7 16:54:24 2021 +0800 + + * Fix a bug. + +commit 73cc080ca2a4dbe487edc466c7d1c59272ad1589 +Author: qiyu-xie +Date: Sun Feb 7 16:35:50 2021 +0800 + + * Modify the file name when export requirement. + +commit 600adeffa39921d4cd82165bd5cfa3fe8aca69d8 +Author: leiyong <1549684884@qq.com> +Date: Sun Feb 7 15:55:42 2021 +0800 + + * Delete ->navGroup->report. + +commit 7f988a76782fb4dbabbea231f3c9ccc31662b6a9 +Author: tianshujie98 +Date: Sun Feb 7 15:06:26 2021 +0800 + + * Fix bug. + +commit 161091b2059da1784083ecdba88c3ba62ce335d3 +Merge: 7b7e6ca1e2 e20edbd507 +Author: hufangzhou <746775970@qq.com> +Date: Sun Feb 7 14:40:56 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 7b7e6ca1e20806def78637ec0af839ce92bbd98c +Author: hufangzhou <746775970@qq.com> +Date: Sun Feb 7 14:40:53 2021 +0800 + + * Fix bug #10962. + +commit e20edbd507dd5c2cc9434e033bedea912040cc67 +Merge: 4d3549d213 7f91a9bfff +Author: holan20180123 <56391770@qq.com> +Date: Sun Feb 7 14:08:55 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 4d3549d213a2d4ef4654d111a0814e9b9482344b +Author: holan20180123 <56391770@qq.com> +Date: Sun Feb 7 14:08:38 2021 +0800 + + * Fix bug #10961. + +commit 7f91a9bfff5c6383c5f06742903b934e06a6789d +Merge: 84737561fd bc2cca510c +Author: hufangzhou <746775970@qq.com> +Date: Sun Feb 7 13:59:18 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 84737561fde4bedf7215548753c852c8c87540a0 +Author: hufangzhou <746775970@qq.com> +Date: Sun Feb 7 13:59:14 2021 +0800 + + * Fix bug #10947. + +commit bc2cca510cb958e0ab590cdebaf0ff742f68cd25 +Author: leiyong <1549684884@qq.com> +Date: Fri Feb 5 17:13:08 2021 +0800 + + * Fix bug#10949. + +commit abec7b041bb0ff830ebaadadd31190000c913830 +Author: holan20180123 <56391770@qq.com> +Date: Fri Feb 5 16:57:01 2021 +0800 + + * Fix bug #10950. + +commit b81164efe0b3234c563da52c41ed222848042378 +Author: qiyu-xie +Date: Fri Feb 5 15:54:00 2021 +0800 + + * Navigation error after click zeroCase. + +commit 4ce72a430baf04c6cc267ec1171c3baaedbc271e +Author: leiyong <1549684884@qq.com> +Date: Fri Feb 5 15:36:11 2021 +0800 + + * Fix bug. + +commit 21dd44fc924457321965ed0479e258f3ab426c77 +Merge: 21d9cd791d ba3337c6a0 +Author: leiyong <1549684884@qq.com> +Date: Fri Feb 5 15:35:55 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit ba3337c6a0dfab97f76c59adf20ebe92802f1b7c +Merge: 8c50f17c84 cf31720440 +Author: holan20180123 <56391770@qq.com> +Date: Fri Feb 5 14:15:37 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 8c50f17c84867c237ab9bb5189d577ca44923e89 +Author: holan20180123 <56391770@qq.com> +Date: Fri Feb 5 14:15:10 2021 +0800 + + * Fix bug #10950. + +commit 21d9cd791d436c2e6c9d79223b9a47a947ccbcf2 +Author: leiyong <1549684884@qq.com> +Date: Fri Feb 5 13:10:40 2021 +0800 + + * Fix bug. + +commit cf3172044031e21bcf89c9806354075ceca273b3 +Merge: 0a0babaf9b ab1a5067e0 +Author: hufangzhou <746775970@qq.com> +Date: Fri Feb 5 11:48:04 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 0a0babaf9b54bb646156660be58cd6643347370f +Author: hufangzhou <746775970@qq.com> +Date: Fri Feb 5 11:48:01 2021 +0800 + + * Adjust the code. + +commit ab1a5067e0d017ce9f659444dbde3dd24f3d5f0a +Author: leiyong <1549684884@qq.com> +Date: Thu Feb 4 16:25:02 2021 +0800 + + * Fix bug. + +commit 2401cc2b84883bc1f09aa86a55a433b2f0aec596 +Author: holan20180123 <56391770@qq.com> +Date: Thu Feb 4 15:39:43 2021 +0800 + + * Fix bug #3934. + +commit 68214fb34f0870285a6e915650fdc86107cb8dbd +Author: leiyong <1549684884@qq.com> +Date: Thu Feb 4 14:05:38 2021 +0800 + + * Fix bug. + +commit 059cdf430acdf93c3c241a8c2424f51d2b690a5c +Merge: 91048305df ab98818b58 +Author: holan20180123 <56391770@qq.com> +Date: Thu Feb 4 13:40:43 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 91048305df65d0be9bbe5ccc1b9a73b2d690144e +Author: holan20180123 <56391770@qq.com> +Date: Thu Feb 4 13:40:25 2021 +0800 + + * Fix bug #3932. + +commit ab98818b58723a1edeacbdc418035897d5ee91d6 +Merge: 2828fd499b 8583a43dbf +Author: hufangzhou <746775970@qq.com> +Date: Thu Feb 4 13:37:59 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 2828fd499b595b16fdd990fb0328a5c28ed364d1 +Author: hufangzhou <746775970@qq.com> +Date: Thu Feb 4 13:37:55 2021 +0800 + + * Fix bug #3930. + +commit 8583a43dbf450765145c079a06b990f4292e369a +Author: tianshujie98 +Date: Thu Feb 4 13:33:14 2021 +0800 + + * Fix bug. + +commit 63e432e7fff68494159c7b74acac668ce63533c6 +Author: tianshujie98 +Date: Thu Feb 4 11:51:44 2021 +0800 + + * Fix bug. + +commit da4c024c488230528bfb9291a42e064eaa35be74 +Author: hufangzhou <746775970@qq.com> +Date: Thu Feb 4 10:47:44 2021 +0800 + + * Fix a bug. + +commit 1625738053346bfc2f04b6ea52c35b58e3ef9e43 +Author: leiyong <1549684884@qq.com> +Date: Thu Feb 4 10:32:34 2021 +0800 + + * Fix bug. + +commit 27aeb9c4888c36c8531b1dc79b6ea1c9d313bc0c +Author: holan20180123 <56391770@qq.com> +Date: Wed Feb 3 15:51:07 2021 +0800 + + * Fix bug #3894. + +commit 1a8f14a0db06047f3bea86d81092a3cf73b946b1 +Author: tianshujie98 +Date: Wed Feb 3 15:48:05 2021 +0800 + + * Fix bug #3910, 3916. + +commit 2816753e1b8819ef9c23674025a2aad989268d95 +Merge: b0a831946c 34abe8eaeb +Author: holan20180123 <56391770@qq.com> +Date: Wed Feb 3 14:45:48 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit b0a831946cff66f2f38896ccd2430c6eb2ac1a1b +Author: holan20180123 <56391770@qq.com> +Date: Wed Feb 3 14:45:32 2021 +0800 + + * Fin bug #3917. + +commit 34abe8eaebccb8aabbbbd15aa51ed3410c86bbbc +Author: Catouse +Date: Wed Feb 3 14:14:37 2021 +0800 + + * add icon-devops. + +commit fc28bbfc9e73a19389a4bb0ca6345e9f0550c96d +Author: wangyidong +Date: Wed Feb 3 13:52:23 2021 +0800 + + * adjust for verify rand. + +commit 0d51f3cb7ef9f6006b4be6be048e189a29b8ebb2 +Author: leiyong <1549684884@qq.com> +Date: Wed Feb 3 10:47:32 2021 +0800 + + * Fix bug. + +commit 64bf0d2ba51e797f6af9a78d902bc5c3e74158f6 +Merge: 837ee705b0 6c487c43c2 +Author: hufangzhou <746775970@qq.com> +Date: Wed Feb 3 10:12:42 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 837ee705b09d1faa64c03c84b3c738a448f63bc8 +Author: hufangzhou <746775970@qq.com> +Date: Wed Feb 3 10:12:37 2021 +0800 + + * Fix a bug. + +commit 6c487c43c209233e1da6739e7c8f03a13ba646b5 +Author: holan20180123 <56391770@qq.com> +Date: Wed Feb 3 09:04:58 2021 +0800 + + * Fix bug #3901. + +commit f16b8001049eb8909a9c39364a8d970b1c77c02a +Author: holan20180123 <56391770@qq.com> +Date: Tue Feb 2 17:00:24 2021 +0800 + + * Fix bug #3899. + +commit 47b686c49df6f40c1432b724a39c77f0b0ef317e +Author: qiyu-xie +Date: Tue Feb 2 16:36:29 2021 +0800 + + * Fix bug#3900. + +commit d41832edc0165e0ced02cc2f80a54e857067af40 +Author: hufangzhou <746775970@qq.com> +Date: Tue Feb 2 14:58:27 2021 +0800 + + * Fix bug #3893. + +commit a09d58c76636178c4a09dd14c553c40c3ea3dbe5 +Merge: 4540c9a10f 404e764653 +Author: hufangzhou <746775970@qq.com> +Date: Tue Feb 2 14:25:43 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 4540c9a10f53053e9a95faaba568d8c4e2e8d040 +Author: hufangzhou <746775970@qq.com> +Date: Tue Feb 2 14:25:40 2021 +0800 + + * Fix bug #3892. + +commit 404e7646535ee216af8fcfc48b16e21375901ddb +Author: Catouse +Date: Tue Feb 2 13:31:22 2021 +0800 + + * refactor. + +commit 6cc5d25da9dad685a6840a8b6902e44c06dcfb08 +Author: leiyong <1549684884@qq.com> +Date: Tue Feb 2 13:10:08 2021 +0800 + + * Fix bug#3880. + +commit e8b2b40d3735019190d3297b73154d863ddb7342 +Author: Catouse +Date: Tue Feb 2 11:41:04 2021 +0800 + + * fix input height in todo/create form. + +commit 054104e3c319d6c4d71631b71dcba6d43959370e +Merge: e92cd6bf2a 4f9de3c10c +Author: tianshujie98 +Date: Tue Feb 2 11:27:18 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit e92cd6bf2aca461214ceca352c1c41eac80cfff5 +Author: tianshujie98 +Date: Tue Feb 2 11:26:54 2021 +0800 + + * Fix bug #3883. + +commit 4f9de3c10c5f0c8800bf0051150e1b27e9e34909 +Author: Catouse +Date: Tue Feb 2 11:20:46 2021 +0800 + + * remove footer. + +commit a7356a4998bb056f0964faad53c1531b4b93f110 +Author: Catouse +Date: Tue Feb 2 11:16:15 2021 +0800 + + * support for calling $.tabs.close() without params. + +commit 9a437c2dceeca9db098e58f8e7d9a2b9eaa2d997 +Merge: 6941ceb031 e91ba72da3 +Author: tianshujie98 +Date: Tue Feb 2 11:04:34 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 6941ceb031bbf1f1590cfe343e48e49f647a1a91 +Author: tianshujie98 +Date: Tue Feb 2 11:04:15 2021 +0800 + + * Fix bug #3883. + +commit e91ba72da39c10e6df76ac0c031790a23571b13a +Author: Catouse +Date: Tue Feb 2 10:46:03 2021 +0800 + + * fix bottom space of page tab. + +commit b5963211d9d2dffee128cab6fc2e6eeb0957e500 +Author: Catouse +Date: Tue Feb 2 10:28:10 2021 +0800 + + * bug #3882, fix angle button style in ie11. + +commit 3d833daad2d56cccccbcd4fda0588a4195f49ecf +Author: hufangzhou <746775970@qq.com> +Date: Tue Feb 2 10:24:16 2021 +0800 + + * Fix bug #3881. + +commit 73fe761bdfd10af323435b803201c48c46c5e44e +Author: leiyong <1549684884@qq.com> +Date: Tue Feb 2 10:06:46 2021 +0800 + + * Adjust common module code. + +commit 386f7c1006e5a308d9615daee6367ff0376c7670 +Author: leiyong <1549684884@qq.com> +Date: Tue Feb 2 09:52:23 2021 +0800 + + * Fix bug#3870. + +commit ffe87450ebb552222dfc48f2f4147687c1995f7b +Author: tianshujie98 +Date: Tue Feb 2 09:45:19 2021 +0800 + + * Fix bug #3878. + +commit f98bce89fbf98e1249e03b0c8d070d567b982ed6 +Author: tianshujie98 +Date: Tue Feb 2 09:08:18 2021 +0800 + + * Fix bug #3875. + +commit a5ae8af88db3c3a380b636c288767c9d7ee2f6ee (tag: zentaopms_20.0.beta4_20210202, tag: zentaopms_13.0.beta4_20210202) +Author: qiyu-xie +Date: Tue Feb 2 08:54:27 2021 +0800 + + * Fix bug#3869. + +commit c59bd5168f9294878ae1be879b83d9b918362d12 +Merge: c11c68997d 9434ea0860 +Author: sgm0422 <976204163@qq.com> +Date: Mon Feb 1 16:45:24 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit c11c68997d938e506d17c2c855166a8562892497 +Author: sgm0422 <976204163@qq.com> +Date: Mon Feb 1 16:45:15 2021 +0800 + + * Delete unused file. + +commit 9434ea0860c886ad0b9d1b17cf5fec83c87f7dff +Author: leiyong <1549684884@qq.com> +Date: Mon Feb 1 16:26:31 2021 +0800 + + * Fix bug. + +commit 940a46576c32337159e3e53444d01c76e2c3c225 +Merge: 469c97bdbb 4e4106dbac +Author: hufangzhou <746775970@qq.com> +Date: Mon Feb 1 16:23:13 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 469c97bdbbdc96336910b7293c0bcd3d74d745da +Author: hufangzhou <746775970@qq.com> +Date: Mon Feb 1 16:23:10 2021 +0800 + + * Fix bug #3868. + +commit 4e4106dbac2b3fca54f9ce201ade11ec5328d5e0 +Merge: 750e6ea3fc 3a43cf09a3 +Author: sgm0422 <976204163@qq.com> +Date: Mon Feb 1 15:57:48 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 750e6ea3fc68d8863ba9521f649a9c0f29526aaa +Author: sgm0422 <976204163@qq.com> +Date: Mon Feb 1 15:57:37 2021 +0800 + + * Fix upgrade logic. + +commit 3a43cf09a30597cfb9b4f5fff782b2fd4e9e6118 +Author: hufangzhou <746775970@qq.com> +Date: Mon Feb 1 15:44:28 2021 +0800 + + * Fix bug #3866. + +commit 9a2c6ebd2ecf007588b8c19881c94a9c9fe9649e +Merge: c9190e160b 73e95c0459 +Author: hufangzhou <746775970@qq.com> +Date: Mon Feb 1 15:25:03 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit c9190e160be72967ef773f56c3e37b8322c2b393 +Author: hufangzhou <746775970@qq.com> +Date: Mon Feb 1 15:25:00 2021 +0800 + + * Fix bug #3865. + +commit 73e95c045968b1a40b7148ff9bbbe68af9ef0a91 +Author: leiyong <1549684884@qq.com> +Date: Mon Feb 1 14:34:06 2021 +0800 + + * Fix bug. + +commit 98b22fb7f2721ef6d024efe1e00e6aa613c150e5 +Author: leiyong <1549684884@qq.com> +Date: Mon Feb 1 14:09:58 2021 +0800 + + * Fix bug. + +commit 7e733bfe27f42a4bc09fea97b392481a881fcf27 +Merge: df9e69a6ed 0ca1b70e01 +Author: hufangzhou <746775970@qq.com> +Date: Mon Feb 1 11:23:22 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit df9e69a6ed8713d182d19732c2b6fa2b9a60218d +Author: hufangzhou <746775970@qq.com> +Date: Mon Feb 1 11:23:19 2021 +0800 + + * Fix bug #3847. + +commit 0ca1b70e01cba33658250120d15ffa6cb596cd77 +Author: tianshujie98 +Date: Mon Feb 1 11:16:06 2021 +0800 + + * Fix bug #3853. + +commit a8a7cd6d7d424870913ecc93984900287cebe889 +Author: tianshujie98 +Date: Mon Feb 1 11:02:46 2021 +0800 + + * Fix bug. + +commit d2df19e920400591bff9a24e811ec9fb85865131 +Author: tianshujie98 +Date: Mon Feb 1 10:57:30 2021 +0800 + + * Modify language prompt. + +commit 1db34869620c317437f0c3aa0f3ad26e948ee793 +Merge: b1aa6c4d3e 3f8ddb1c88 +Author: sgm0422 <976204163@qq.com> +Date: Mon Feb 1 10:47:21 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit b1aa6c4d3ef8937c8d27aa7e05f2fbbcbdc5447e +Author: sgm0422 <976204163@qq.com> +Date: Mon Feb 1 10:47:09 2021 +0800 + + * Fix methodName. + +commit 3f8ddb1c88ede5204f4f9b040a0da2e90824a748 +Merge: 2df27f17e9 f91b227e02 +Author: tianshujie98 +Date: Mon Feb 1 10:41:20 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 2df27f17e9072134d0800c418dbe32011a51f9a2 +Author: tianshujie98 +Date: Mon Feb 1 10:32:19 2021 +0800 + + * Fix bug #3849. + +commit f91b227e02f8b3cccad29515c096a534ae5e9b68 +Author: tianshujie98 +Date: Mon Feb 1 10:32:19 2021 +0800 + + * Fix bug #3849. + +commit e48c66c1d422c2015ab875ba8efe1e8ed5fb60c4 +Author: holan20180123 <56391770@qq.com> +Date: Mon Feb 1 10:09:25 2021 +0800 + + * Finish task #9118. + +commit 497dcb9e194c7c2bd619c64cab8762a806e9fa66 +Author: hufangzhou <746775970@qq.com> +Date: Mon Feb 1 09:57:28 2021 +0800 + + * Adjust the code. + +commit 3ae818d322db29c292c31eb85d9c97b83ff7410d +Author: leiyong <1549684884@qq.com> +Date: Mon Feb 1 09:05:43 2021 +0800 + + * Adjust lang file. + +commit 162740eddc7c601d25334167cd9a28f5b00969bd +Author: leiyong <1549684884@qq.com> +Date: Mon Feb 1 08:28:25 2021 +0800 + + * Fix bug. + +commit 450aa98ce0e7c68434fb595c254db98ce40bb85e +Author: leiyong <1549684884@qq.com> +Date: Mon Feb 1 08:17:23 2021 +0800 + + * Fix bug. + +commit 458b1e09b00b03aba465eb18e3b483039348e1c6 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 29 18:40:01 2021 +0800 + + * Fix bug. + +commit 534a48e193aa1e867229dd6299a1ca2cae242f2e +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 29 18:37:46 2021 +0800 + + * Fix bug. + +commit a59dcf117b3ff3a8a302e4a40e43b8e127e58dac +Author: wangyidong +Date: Fri Jan 29 17:47:56 2021 +0800 + + * adjust for feishu. + +commit b1d4c5b73fe54329370c3677ea9318a83b320fdc +Author: wangyidong +Date: Fri Jan 29 17:26:19 2021 +0800 + + + add encrypt password script. + +commit fa8ac71eeede99fc012e75ac26418fc870e8cd27 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 29 17:10:24 2021 +0800 + + * Add version. + +commit 8fe650c9bfdc3906917fc804b8e95e4a39817dc7 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 29 16:52:00 2021 +0800 + + * Delete the nonuse code. + +commit 86bf33415e6e0cdc3cb92872fea69842f0258b1f +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 29 16:35:38 2021 +0800 + + * Adjust the code. + +commit 6f25b82c83e95ac3bee50182a5f39dc149c7f736 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 29 16:23:34 2021 +0800 + + * Fix bug #3845. + +commit d74361b03ab6291a0783c4584d57de45af5e2edd +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 29 16:01:03 2021 +0800 + + * Finish task #9097. + +commit a55c99931ef3f57816cf3ee38b04e84bc4d9f20c +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 29 15:40:01 2021 +0800 + + * Fix bug. + +commit b3670c56bdc41f1ef6d87b48d6531563db5f8df3 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 29 15:31:04 2021 +0800 + + * Fix bug. + +commit 608b1795f5f529bcd6708b2e808f8a85005311d6 +Merge: 0611a739fe 60cce4dbc8 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 29 15:24:46 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 0611a739fe1d62ee98c6a02583a53e24813eebdb +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 29 15:24:30 2021 +0800 + + * Finish task #9118. + +commit 60cce4dbc87140d072b35f11ccfc825988d78f78 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 29 15:17:15 2021 +0800 + + * Adjust code. + +commit 06d82b5847fe3f312d0ef1a1f192abec537a7c46 +Author: wangyidong +Date: Fri Jan 29 14:57:00 2021 +0800 + + * fix bug. + +commit ec275c61f58ee46e66b81367144ba74ba2dc631d +Author: tianshujie98 +Date: Fri Jan 29 14:42:56 2021 +0800 + + * Fix bug. + +commit d1cbf084d14bfc53c4fc069b7e49db14e17fbdbe +Merge: 115871a37e fc33d9e27a +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 29 14:41:14 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 115871a37e1109afb7658cd70a48c94a40b6d475 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 29 14:41:09 2021 +0800 + + * Adjust the modal style. + +commit e5b0134b22bdebc38f5b1215a738ed58d14c94d6 +Author: wangyidong +Date: Fri Jan 29 14:27:32 2021 +0800 + + * finish task #9114. + +commit fc33d9e27a0cc91d5187105c45d25e8938823006 +Author: qiyu-xie +Date: Fri Jan 29 13:44:21 2021 +0800 + + * Finish task#3833. + +commit fc5adc765c6732aa59bfdaf92e2029dbfa26e010 +Author: wangyidong +Date: Fri Jan 29 13:15:50 2021 +0800 + + * adjust for feishu webhook. + +commit ac62e5242e339432a1bede8bc02348f937ee38cc +Author: tianshujie98 +Date: Fri Jan 29 13:02:17 2021 +0800 + + * Adjust code style. + +commit 570078911bd80bf73983eb5fce1326513420a21f +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 29 11:18:53 2021 +0800 + + * Fix a bug. + +commit ce2816d0bb21105f03b84ca2bf0b9de81bc9b107 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 29 10:47:14 2021 +0800 + + * Adjust the style of profile. + +commit 3963d17f44fab7079af0dfc9794cb9205d4ba51c +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 29 10:29:07 2021 +0800 + + * Finish task #9097. + +commit f0d0183987ca52a992f7d181b3d2e81a7173e42d +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 29 09:16:10 2021 +0800 + + * Finish task#9092. + +commit f885d7afd64651674fb17c397b9f31943535d668 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 29 09:10:53 2021 +0800 + + * Fix bug #3832. + +commit 13e55eaf3eccd4cc1591d4b9a90058b44d979668 +Author: sgm0422 <976204163@qq.com> +Date: Thu Jan 28 21:52:25 2021 +0800 + + * Fix detail. + +commit 105cef004e62bb23e2aa20be8fb74efb1973edfe +Author: sgm0422 <976204163@qq.com> +Date: Thu Jan 28 21:42:43 2021 +0800 + + * Fix detail. + +commit fd0c57e1c0cc4972a9ac92d9d355a2a0af91e0ec +Author: sgm0422 <976204163@qq.com> +Date: Thu Jan 28 21:22:49 2021 +0800 + + * Add misc lang. + +commit 3993b015447e9dae2d8f87c1adb7f4518a3faf6a +Author: tianshujie98 +Date: Thu Jan 28 16:46:39 2021 +0800 + + * Reduction. + +commit 4b2f6c7671033fdd44d065955a1511cafbbaa808 +Merge: 729d85899e 7bd91e9b45 +Author: tianshujie98 +Date: Thu Jan 28 16:22:10 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 729d85899e39d6c0a31fb1853f10e88c150c813d +Author: tianshujie98 +Date: Thu Jan 28 16:21:42 2021 +0800 + + * Fix navigation issues. + +commit 7bd91e9b45a5a26fd34c899ba0154df23910a06c +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 28 16:12:39 2021 +0800 + + * Adjust the code. + +commit d1a4c28e5fa6ec27c787fc3749275cb0ac7abd2b +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 28 16:06:09 2021 +0800 + + * Finish task #9102. + +commit e5742b020625751cb3b197248da4c22ca1065175 +Author: Yagami <976204163@qq.com> +Date: Thu Jan 28 16:01:03 2021 +0800 + + * Fix upgrade. + +commit 037d1f37982095676954ac815b3b0c9cc14aeed1 +Author: leiyong <1549684884@qq.com> +Date: Thu Jan 28 15:48:16 2021 +0800 + + * Finish task#8964. + +commit 527763a1d8bfd651deb3c7feecdc75f2af818c51 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 28 15:31:37 2021 +0800 + + * Finish task #9097. + +commit a9b99b1f5ec0427126c60d3b393ee9bbc825b778 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 28 15:03:01 2021 +0800 + + * Finish task #9118. + +commit c26a63e7fb43a820b3723c96b0e8639f6eed2c8e +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 28 14:46:12 2021 +0800 + + * Finish task #9118. + +commit d8ac5728d84ce470d13a6c37d702a6e79947b9ee +Merge: 32e89fc96d 47731bb3c9 +Author: tianshujie98 +Date: Thu Jan 28 11:45:43 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 32e89fc96d936bcbc0be3cbdc1c49215064a6ace +Author: tianshujie98 +Date: Thu Jan 28 11:45:29 2021 +0800 + + * Adjust code style. + +commit 47731bb3c976ec5b92a8878b5d73ada9dfcfdcee +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 28 11:27:47 2021 +0800 + + * Finish task #9097. + +commit 5e88a396458aabcecdbdfd73efe2db8db1fac5dd +Author: Yagami <976204163@qq.com> +Date: Thu Jan 28 11:15:54 2021 +0800 + + * Fix client lang. + +commit 120797598feab63e060ab85464dbc9608b5bc769 +Author: tianshujie98 +Date: Thu Jan 28 11:14:35 2021 +0800 + + * Adjust code style. + +commit f44f079b91c1b92a78b3404c52524038aaae745d +Author: Yagami <976204163@qq.com> +Date: Thu Jan 28 10:38:30 2021 +0800 + + * Add default preference. + +commit a8eee241dd66e25ea7f9d39e1c2856ea07475990 +Author: leiyong <1549684884@qq.com> +Date: Thu Jan 28 10:35:51 2021 +0800 + + * Finish task#9059. + +commit 9b2a81d13f57970819c2b2ce688c6379e46f44b5 +Author: leiyong <1549684884@qq.com> +Date: Thu Jan 28 10:29:46 2021 +0800 + + * Fix bug. + +commit aaf0b3eae8b825868f71fd4e2c4d6abb03489145 +Author: leiyong <1549684884@qq.com> +Date: Thu Jan 28 10:15:01 2021 +0800 + + * Adjust code. + +commit ea719034425e1939cd55d0bd86032f44610bfdf6 +Author: tianshujie98 +Date: Thu Jan 28 10:10:47 2021 +0800 + + * Modify vars. + +commit 726eebbad6ccce846925c92e97fd4d689fb71789 +Merge: 8ef40239b4 069c237f39 +Author: tianshujie98 +Date: Thu Jan 28 09:39:20 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 8ef40239b48b00ffc8e9891a00bc418d90cfa359 +Author: tianshujie98 +Date: Thu Jan 28 09:39:06 2021 +0800 + + * Adjust code style. + +commit 069c237f3957b6ffd5c45722a27606489d1c5429 +Merge: bb1c8b8e01 3b1717a354 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 28 09:36:09 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit bb1c8b8e016a856240aa853e714e5ca3ea41a24a +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 28 09:36:05 2021 +0800 + + * Adjust the release table style. + +commit 3b1717a3548e33adcddeefc0af08d5edd8c11771 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 28 09:29:19 2021 +0800 + + * Finish task #9072. + +commit 46bd395d61b140099b3d72011dac94cede45bc9f +Author: Yagami <976204163@qq.com> +Date: Wed Jan 27 16:56:44 2021 +0800 + + * Code for details. + +commit 5db4e3a0f7a5b1a1ff12033f5ec219574f9bc54d +Author: wangyidong +Date: Wed Jan 27 16:55:26 2021 +0800 + + * finish task #9083,9108,9109. + +commit a3d8b0ed59a1a39971040efb96771f58e4bb8c17 +Author: wangyidong +Date: Wed Jan 27 16:54:30 2021 +0800 + + * change for sdk. + +commit 6743924733e5df9d0a1051d3b4f7db311137ac29 +Merge: db56b2920a e147f3edaa +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 27 16:53:58 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit db56b2920a340c9ca41a0b721e497c270e7a625b +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 27 16:53:55 2021 +0800 + + * Finish task#9061. + +commit e147f3edaa726df9a72832d62373bdbc24246f09 +Author: leiyong <1549684884@qq.com> +Date: Wed Jan 27 16:13:49 2021 +0800 + + * Fix bug. + +commit 8c4523e6fa98a5cc2bf6b2af0fe11bd18553c2fd +Merge: f6c559ecd6 810b7783bc +Author: tianshujie98 +Date: Wed Jan 27 16:09:10 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit f6c559ecd66faa5de1ea7a3f988dbcbdb7cbea03 +Author: tianshujie98 +Date: Wed Jan 27 16:08:34 2021 +0800 + + * Finish task #9112. + +commit 810b7783bcec3d1af59ddde2dba86435479bf9b8 +Author: leiyong <1549684884@qq.com> +Date: Wed Jan 27 15:58:47 2021 +0800 + + * Finish task#9070. + +commit 79fc98935b4ce7ff9bdbc90d03d4658501a442f1 +Author: holan20180123 <56391770@qq.com> +Date: Wed Jan 27 15:45:50 2021 +0800 + + * Finish task #9097. + +commit 1409281fd9b13120e0b14323ef767da062f6485a +Author: qiyu-xie +Date: Wed Jan 27 15:34:58 2021 +0800 + + * Finish task#9094. + +commit ac77fa3a15aaef6d02fec1ba7f6ed376088f0070 +Author: Yagami <976204163@qq.com> +Date: Wed Jan 27 15:20:27 2021 +0800 + + * Merge code. + +commit a986454abd01568c58a58cb57768ee7d4e9fd9ac +Author: qiyu-xie +Date: Wed Jan 27 15:13:04 2021 +0800 + + * Fix bug#3769. + +commit 1704f684f4567050503ab9e0889b571a4019f491 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 27 14:36:17 2021 +0800 + + * Adjust the code. + +commit 64e01f669fa9b08c7e3d8256a269c69b72cc2bfd +Author: qiyu-xie +Date: Wed Jan 27 13:46:52 2021 +0800 + + * Finish task#9094. + +commit 11a20e59405b219a99fc428421f70677b1d2bca6 +Merge: f04fe0dbd6 5ac548383e +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 27 13:26:04 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit f04fe0dbd62c17093921e9e0537903872a099fa5 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 27 13:26:00 2021 +0800 + + * Fix bug#3816. + +commit 5ac548383ed52d919788dd9bfc364ea06c0010e0 +Author: leiyong <1549684884@qq.com> +Date: Wed Jan 27 11:41:56 2021 +0800 + + * Finish task#9099. + +commit c0fef93f164cab903cfb310b192922eebd28941d +Author: holan20180123 <56391770@qq.com> +Date: Wed Jan 27 11:32:48 2021 +0800 + + * Modify the language of test case. + +commit 925cc23b81869624c7b01d95439c5f88a38e1c96 +Merge: 2f9bc2f43a e9d2711275 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 27 11:24:39 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 2f9bc2f43a6242441b5188d14297bd5b7eb53079 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 27 11:24:36 2021 +0800 + + * Fix bug#3817. + +commit e9d271127560b3bd9b27b8989ee8fddb0f1aea9c +Author: qiyu-xie +Date: Wed Jan 27 11:23:24 2021 +0800 + + * Finish task#9094. + +commit 25018625ce4c074565c1ccf2984bac87bd056d2e +Author: leiyong <1549684884@qq.com> +Date: Wed Jan 27 11:20:40 2021 +0800 + + * Fix bug. + +commit 6f5345b37633c5729f785f523e3c7a8e7a11bee4 +Author: leiyong <1549684884@qq.com> +Date: Wed Jan 27 11:02:29 2021 +0800 + + * Fix bug. + +commit 98fa578f023594e8316ea712213b6c268dda33d5 +Author: leiyong <1549684884@qq.com> +Date: Wed Jan 27 10:48:14 2021 +0800 + + * Fix bug. + +commit 49160e91af8dcbae4d403a1bf2418454727bf8f3 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 27 10:22:13 2021 +0800 + + * Adjust the code. + +commit fa2068798cf7e592275ef8482538594a99175a35 +Merge: b0d1b4ae08 2ece76d9dd +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 27 10:01:46 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit b0d1b4ae085d5531ef473095c6ebbef285df289c +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 27 10:01:41 2021 +0800 + + * Fix bug#3836. + +commit 2ece76d9dd00ad3aea4ed47a6f9bc1946ce9defe +Merge: de8de142e3 a8f6ba8bc4 +Author: tianshujie98 +Date: Wed Jan 27 09:58:14 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit de8de142e3deed8f70d0fd61a29ce18126a19d53 +Author: tianshujie98 +Date: Wed Jan 27 09:57:52 2021 +0800 + + * Optimize the prompt interface. + +commit a8f6ba8bc49e370ffd34fa0b4f7d1b872b32d9f6 +Author: leiyong <1549684884@qq.com> +Date: Wed Jan 27 09:49:49 2021 +0800 + + * Adjust code. + +commit 113c13977978932cb62498fb1ad61038b8961bd3 +Author: leiyong <1549684884@qq.com> +Date: Wed Jan 27 09:45:14 2021 +0800 + + * Adjust search. + +commit 4ac0cf5a5b66b512765b223e43f937bd7abb2e8a +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 27 09:23:06 2021 +0800 + + * Fix bug#3834. + +commit 0184cdf082563d670075108c4fbc5b7109f530a5 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 27 09:14:55 2021 +0800 + + * Adjust the code. + +commit fd7136c17a892d773a6828e76ef88ae9824b979e +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 27 08:26:41 2021 +0800 + + * Fix a bug. + +commit a4abc56c1a82dd3af4e2a74fb58033772cb5282b +Author: leiyong <1549684884@qq.com> +Date: Tue Jan 26 17:27:50 2021 +0800 + + * Fix bug. + +commit 3283132e7580177b583d5355bf4c777cf871fa49 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 26 16:30:57 2021 +0800 + + * Finish task #9091. + +commit 80771fe247a7c054ace1a09f373535c0ac1ee810 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 26 16:24:15 2021 +0800 + + * Finish task #9086. + +commit e86054b4f27d581fee4b3a9b1173a8493f76daa3 +Author: qiyu-xie +Date: Tue Jan 26 15:44:04 2021 +0800 + + * Finish task#9103. + +commit 37ae37da5e28def63c935df36c4694e077738862 +Author: qiyu-xie +Date: Tue Jan 26 14:57:49 2021 +0800 + + * Finish task#9094. + +commit c71548a97c769e95238cd9a9f765cdad76445099 +Merge: cd2d72e14d 5fc251da72 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 26 15:02:27 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit cd2d72e14d33c87dffba02045bc1797fa2e12940 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 26 15:01:49 2021 +0800 + + * Finish task #9091. + +commit 5fc251da72808ed120b6c4dd7d4d97d088945cd9 +Author: tianshujie98 +Date: Tue Jan 26 14:35:45 2021 +0800 + + * Fix bug. + +commit 59876b2256315f4541542e78d5901ccb61ff4c2f +Author: tianshujie98 +Date: Tue Jan 26 14:30:15 2021 +0800 + + * Add comment. + +commit 05e01bf85089a7d63ff7f27cd33a79964ec4ed55 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 26 14:28:22 2021 +0800 + + * Finish task #9091. + +commit b0e553081e2aef4a33ad8b7e324037c610af5766 +Merge: 6d810defb5 080f410be2 +Author: tianshujie98 +Date: Tue Jan 26 14:19:08 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 6d810defb58fda0889a017e6e2ed0840aa5c2281 +Author: tianshujie98 +Date: Tue Jan 26 14:18:57 2021 +0800 + + * Adjust code style. + +commit 080f410be2cbb5eb08566c78f643f0a295c61657 +Author: Catouse +Date: Tue Jan 26 14:17:23 2021 +0800 + + * update icon-split. + +commit 570b32a2d4a23e087537e2d77db9fc694d26e4ce +Author: tianshujie98 +Date: Tue Jan 26 14:10:23 2021 +0800 + + * Finish task #9095. + +commit 704c2b0bb067e832202bab6950c64de3021fae67 +Author: Yagami <976204163@qq.com> +Date: Tue Jan 26 13:42:31 2021 +0800 + + * Fix detail. + +commit b12d189779431813846d9c375afc3c5692be7f8f +Author: wangyidong +Date: Tue Jan 26 13:35:21 2021 +0800 + + * Merge from github. + +commit abc72eaee83070251faa8fed550624024513c039 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 26 12:59:27 2021 +0800 + + * Finish task#9081. + +commit 1cb9c73bcefd8677f3ca31eb7af66bf4d85f74ba +Author: qiyu-xie +Date: Tue Jan 26 11:48:21 2021 +0800 + + * Finish task#9094. + +commit fe5178670ededd7c3c9e438a6af0f9ee4a2e3e60 +Merge: 4af8364493 344fdf303d +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 26 11:24:51 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 4af8364493094b6e582cb3abb49807c3d849d159 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 26 11:24:48 2021 +0800 + + * Adjust the lang file. + +commit 344fdf303d89f81c62aa86f31f8013af7eefc6cd +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 26 10:41:07 2021 +0800 + + * Adjust the style of profile. + +commit 44b7b4d3d592bfdbe359d2944f1d04aae112369d +Author: leiyong <1549684884@qq.com> +Date: Tue Jan 26 10:02:57 2021 +0800 + + * Finish task#9098. + +commit 2289b1914a00110f586893c5309a73e88963b9cb +Author: leiyong <1549684884@qq.com> +Date: Tue Jan 26 09:55:46 2021 +0800 + + * Finish task#9090. + +commit 30f9f91f36b77f6053a2aad302b6026feeea7879 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 26 09:47:04 2021 +0800 + + * Add the project story view privilege. + +commit 32b660aac689e0918b2682286e213e2d97c5bbb6 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 26 09:28:20 2021 +0800 + + * Adjust the back link. + +commit 0c7af78f0f6cd13b925c50eae2ebe8a067b6d435 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 26 09:24:32 2021 +0800 + + * Adjust the sql to insert default currency. + +commit e09419b78531f26d9ea27027dbe3bf8cdbb15d84 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 26 09:21:41 2021 +0800 + + * Add sql to insert default currency. + +commit b951550557824c8f26f2e37ca41455f8229f859a +Author: leiyong <1549684884@qq.com> +Date: Tue Jan 26 09:03:59 2021 +0800 + + * Finish task#9074. + +commit d58f26a22ad92ac6fe67474f21cbc4d9581ca25d +Author: leiyong <1549684884@qq.com> +Date: Tue Jan 26 09:01:28 2021 +0800 + + * Finish task#9060. + +commit b6cc2dca064f685b4a4d2b26184a3da08870a1cf +Author: qiyu-xie +Date: Tue Jan 26 08:42:38 2021 +0800 + + * Finish task#8969. + +commit 3c3e1d43480ac607a0daf52854e868ea1f638d99 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 25 17:41:25 2021 +0800 + + * Adjust the code. + +commit fef3a4c410233efb6cf166ae985607f4e9fb3b4e +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 25 16:54:03 2021 +0800 + + * Finish task#9113. + +commit 24c4c1b309c2eb8f734f7277df384425332c2516 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 25 16:37:53 2021 +0800 + + * Finish task #9085. + +commit f885e82b2e3d29a543d6785dadc0436d5bd7feba +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 25 15:56:44 2021 +0800 + + * Fix bug when create release. + +commit 65715f2a0c3413e1b137a98c7cd395939f68aed5 +Merge: 672dde69b8 dccb551fb0 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 25 15:48:59 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 672dde69b828f704d0e36ba9264dd514ede42994 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 25 15:48:55 2021 +0800 + + * Finish task#9088. + +commit dccb551fb0fc8011b13f4b975cc7255929d410e1 +Merge: a4690bdc72 ca1da3f2a9 +Author: tianshujie98 +Date: Mon Jan 25 15:47:19 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit a4690bdc720223f011eff2ccd2622283180a5753 +Author: tianshujie98 +Date: Mon Jan 25 15:47:02 2021 +0800 + + * Finish task #9104. + +commit ca1da3f2a98b4a74c362f6d528013e4138ab8f43 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 25 15:44:55 2021 +0800 + + * Adjust the stylr of my profile. + +commit f20d91080dfc4b72d176ccd1e86d2de666cc3d73 +Author: tianshujie98 +Date: Mon Jan 25 15:28:57 2021 +0800 + + * Adjust width. + +commit 7d11253ff56ebb5caef6cd1a3afa1d0bb7aa4f4b +Merge: e9f68f8b9d 7de8e1fd89 +Author: tianshujie98 +Date: Mon Jan 25 15:12:06 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit e9f68f8b9dd38bdc3be01346ee46add6c97ad564 +Author: tianshujie98 +Date: Mon Jan 25 15:11:55 2021 +0800 + + * Adjust width. + +commit 7de8e1fd890bff601faf1f05c551044f25b2dcb3 +Author: qiyu-xie +Date: Mon Jan 25 15:05:28 2021 +0800 + + * Finish task#9101. Change whitelist return. + +commit 1fbe1ed653d6669b29237d8a07d3a147be81b834 +Merge: 4e2236c817 a0ef25a85a +Author: tianshujie98 +Date: Mon Jan 25 14:54:49 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 4e2236c817e41e2905c856c02b2f8a8de9273cfa +Author: tianshujie98 +Date: Mon Jan 25 14:54:22 2021 +0800 + + * Finish task #9093. + +commit a0ef25a85ae210c93b84a24c9f04237836e9f201 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 25 14:36:10 2021 +0800 + + * Finish task #9100. + +commit e3b203dbce358cf1283e6929a0558fe9e162e4be +Author: tianshujie98 +Date: Mon Jan 25 14:25:15 2021 +0800 + + * Add style. + +commit 0c2969963262e199e69cea7f1303d8270f5f2894 +Merge: 2879972efd 99f8c9b140 +Author: tianshujie98 +Date: Mon Jan 25 14:11:58 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 2879972efd88669187b3270d4830aba3bce9ccb9 +Author: tianshujie98 +Date: Mon Jan 25 14:11:40 2021 +0800 + + * Finish task #9093. + +commit 99f8c9b140e1c574fc1f1d7e51c73e1350f08d9c +Author: qiyu-xie +Date: Mon Jan 25 14:06:51 2021 +0800 + + * Finish task#9101. Change PRJManageProducts return. + +commit c5a003ab2c2910b5f6505bf365eb9b6d152f266a +Merge: d7f5868875 5e1b253d58 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 25 13:56:42 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit d7f586887503a513d9950143126f0dc69b9ddd1b +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 25 13:56:39 2021 +0800 + + * Adjust the code. + +commit 5e1b253d5802819d26fd07e24ea980d03271ed0f +Author: qiyu-xie +Date: Mon Jan 25 13:54:18 2021 +0800 + + * Finish task#9101. Change PRJEdit return. + +commit eb6de62f1105c1ccafdfbc2d325506575c98e0d4 +Author: tianshujie98 +Date: Mon Jan 25 13:35:29 2021 +0800 + + * Finish task #9096. + +commit 5b53075640535e75576d51deea65b7e6add9b07b +Merge: 5e8c94ef2e fad8d22add +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 25 13:27:31 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 5e8c94ef2e6a3932d302d48856412728fa7c050f +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 25 13:27:27 2021 +0800 + + * Adjust the code. + +commit fad8d22adde35e88f3c2fc9cb4e3f7c6ec086025 +Author: tianshujie98 +Date: Mon Jan 25 13:09:54 2021 +0800 + + * Finish task #9105. + +commit ca27fe52c96d476adaab7f1cf6d5c939978baff5 +Merge: 2502a01849 3e0b6f311f +Author: tianshujie98 +Date: Mon Jan 25 13:07:39 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 2502a01849a75fb7de2306834b35d40e545f0e0d +Author: tianshujie98 +Date: Mon Jan 25 13:07:23 2021 +0800 + + * Finish task #9106. + +commit 3e0b6f311f01d8151a5f350bcd4e9d11a46b6648 +Merge: a64c77c252 dc08fa025c +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 25 13:06:02 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit a64c77c252b658b0a9d04943e799e5a0db8d555b +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 25 13:05:59 2021 +0800 + + * Finish task#9087. + +commit dc08fa025ccd9afb67deb2c7220301df8bed11db +Merge: f045942e3d f62d3426b1 +Author: tianshujie98 +Date: Mon Jan 25 13:03:10 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit f045942e3d0e6f831fffee582acabb85aaa87699 +Author: tianshujie98 +Date: Mon Jan 25 13:02:56 2021 +0800 + + * Fix bug. + +commit f62d3426b1d0e30092924e70a82f299fde449dea +Author: Yagami <976204163@qq.com> +Date: Mon Jan 25 09:24:59 2021 +0800 + + * Fix code style. + +commit 6df21e56f3e1891a2d4e440adb3d9aa78784d8f3 +Merge: b5bd5ec421 4952dffe1f +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 25 09:22:44 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit b5bd5ec421ac657db3e2f9aa4fb1e6ca329a1285 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 25 09:22:41 2021 +0800 + + * Fix a bug. + +commit 4952dffe1fc1f4d20acddc416e0facf7a0146f39 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 25 09:03:46 2021 +0800 + + * Finish task #9069. + +commit b0f7ed171fac24416e98be523b48ff2e50fd1e0e +Author: Yagami <976204163@qq.com> +Date: Mon Jan 25 09:03:27 2021 +0800 + + * Fix bug. + +commit 4999b4ee2bed07121982770892f3552811fa8d21 +Author: Yagami <976204163@qq.com> +Date: Fri Jan 22 13:18:26 2021 +0800 + + * Fix code. + +commit 8fc2677452b51f0d9c8025abb97be39fe3f2d259 +Author: tianshujie98 +Date: Mon Jan 25 08:42:24 2021 +0800 + + * Finish task #9067. + +commit 2590fe1a626cea3d069e5c35fb5e999269a70863 +Author: tianshujie98 +Date: Mon Jan 25 08:37:49 2021 +0800 + + * Finish task #9066. + +commit 74e01d785ad51b2fa088bf3d73b0d479457926ae +Author: tianshujie98 +Date: Mon Jan 25 08:31:00 2021 +0800 + + * Finish task #9080. + +commit 840958c98bc9819de5cf4cc1026c72a9e9171a2b +Author: tianshujie98 +Date: Sun Jan 24 15:49:45 2021 +0800 + + * Finish task #9062. + +commit d8a64e86ba7ed9cb781c23c7693b238cb3ad6dc9 +Merge: 9ad0de0e4f 5d6e427ce9 +Author: tianshujie98 +Date: Fri Jan 22 13:28:48 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 9ad0de0e4fa02c3451088af69dc6464faad6dc0e +Author: tianshujie98 +Date: Fri Jan 22 13:28:21 2021 +0800 + + * Finish task #9062. + +commit 5d6e427ce9f34782bd53e6f278465d0e0776e2d3 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 22 13:25:52 2021 +0800 + + * Finish task #9079. + +commit e5bb7d808737dea45fac84ab505aadf6a0fc98ec +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 22 13:24:04 2021 +0800 + + * Finish task #9075. + +commit fc3cb48155d9e1ad7371fe7f85464af22eb318a0 +Merge: c28cf48fbf dd728dd0c5 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 22 13:18:35 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit c28cf48fbff93b9e741da01ff0cb63b972f0ddc1 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 22 13:18:30 2021 +0800 + + * Adjust code. + +commit dd728dd0c538c6dc000b5cdd9472249403f1b401 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 22 13:17:46 2021 +0800 + + * Finish task #9075. + +commit df42276c132f4ccbe7542af57073fb6500dee8e9 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 22 13:03:38 2021 +0800 + + * Adjust the code style. + +commit 19c1998021ec5d55527bde38961384094aac08dd +Merge: 45e0175d3f 12c7519260 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 22 12:28:39 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 45e0175d3f0d65604a45ba2e99a9cb426c65341a +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 22 12:28:35 2021 +0800 + + * Fix a bug. + +commit 12c7519260f0bc84e1ff2968f3585ca7372fca23 +Author: Catouse +Date: Fri Jan 22 10:26:02 2021 +0800 + + * fix anchor name missing after toggle fullscreen. + + see https://github.com/kindsoft/kindeditor/issues/218 + +commit 271cb73407e5132b15ce6a30b4bc5958a9482154 +Author: Catouse +Date: Fri Jan 22 09:16:25 2021 +0800 + + * refactor. + +commit fcfc52f4891afa163e1802016296eb242bf97771 +Author: Yagami <976204163@qq.com> +Date: Fri Jan 22 09:05:04 2021 +0800 + + * Fix minifyfront. + +commit 5e1ae62b5fd1c9e9b12efec46d0bca63e9d7e5a1 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 22 09:01:58 2021 +0800 + + * Add comments. + +commit a0490d8e7e574634bc2a41e4bc6e1628c70a3670 +Author: tianshujie98 +Date: Fri Jan 22 08:27:53 2021 +0800 + + * Adjust code style. + +commit 564b620906b93696a1011d65a29b134cad377ec0 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 21 17:29:47 2021 +0800 + + * Fix a bug. + +commit 64abc739e337a3dc63f1f994a7b4712c0107ed0f +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 21 16:59:09 2021 +0800 + + * Delete unused comments. + +commit dbb9e87fa20bd255874c9089ab45dbef2e8dff03 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 21 16:43:28 2021 +0800 + + * Adjust the code style. + +commit 18b7ddcfd90a3e99ca0ada1e11a758057a6e10af +Author: qiyu-xie +Date: Thu Jan 21 16:42:58 2021 +0800 + + * Fix bug. + +commit 3f427767f8a9415a69511a288e72b3360adf3eeb +Merge: 705a86a1ea f22f4ebf39 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 21 16:42:24 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 705a86a1ea58c595a98eaef77bace70a2caff69a +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 21 16:42:22 2021 +0800 + + * Fix a bug. + +commit f22f4ebf392cbf48435b917e50bf5dce85cef3d6 +Author: tianshujie98 +Date: Thu Jan 21 16:37:39 2021 +0800 + + * Change the variable name. + +commit aefd5fab9e10f27498ffe6bae80b90252030f94d +Author: tianshujie98 +Date: Thu Jan 21 16:29:43 2021 +0800 + + * Adjust code style. + +commit 19aeae1a68d090e9d60a6b102510542eff1e7409 +Author: Catouse +Date: Thu Jan 21 16:10:58 2021 +0800 + + * bug #3704, fix doc/edit not save to databse. + +commit 0f982c2b0caa8f285ceb5f208823a5aa99b1fdca +Merge: 1bfaba7751 eaaa9ec300 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 21 16:03:39 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 1bfaba775120e73f5158e1ec9e81d0df3c176478 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 21 16:03:34 2021 +0800 + + * Fix bugs. + +commit eaaa9ec3003f7f72ee4406bcd145bcf686d2318e +Author: Yagami <976204163@qq.com> +Date: Thu Jan 21 16:02:33 2021 +0800 + + * Fix detail. + +commit 6bc7e0cd9a0fd62f85d0e070a58c361d9c7419d8 +Author: Yagami <976204163@qq.com> +Date: Thu Jan 21 16:01:37 2021 +0800 + + * Fix bug. + +commit 8ca990dfb8b2359174d016218dd7b3f0d7ccae38 +Author: Yagami <976204163@qq.com> +Date: Thu Jan 21 15:55:42 2021 +0800 + + * Fix details. + +commit 57d0e8c5f06c71b7d009826c3776d64cecc8edfc +Merge: 9701a30c53 0950b6b189 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 21 15:48:15 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 9701a30c53411a3ee7709be3ea8e032b7d9a6fd0 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 21 15:47:20 2021 +0800 + + * Delete unused comments. + +commit 0950b6b189faae84ea5e8c299d9af105e6205f5b +Author: qiyu-xie +Date: Thu Jan 21 15:46:46 2021 +0800 + + * Fix bug. + +commit b04e04c186b80d47f307729bad163fe256f18d05 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 21 15:42:54 2021 +0800 + + * Finish task #8988. + +commit 4d6564925bf67bc3022928f7f87c51ff18bcc661 +Author: Yagami <976204163@qq.com> +Date: Thu Jan 21 15:38:39 2021 +0800 + + * Fix lang file. + +commit d03a71666921c75832d953dcb5bfafea72f57efd +Author: Yagami <976204163@qq.com> +Date: Thu Jan 21 15:12:45 2021 +0800 + + * Add lang file. + +commit 2ff675f7ece249f246e36451c731fe0010912a3b +Author: leiyong <1549684884@qq.com> +Date: Thu Jan 21 14:25:49 2021 +0800 + + * Adjust code. + +commit 1e324bbb1575b885621e59dafcb34ed1a4dcc205 +Author: leiyong <1549684884@qq.com> +Date: Thu Jan 21 14:13:30 2021 +0800 + + * Adjust code. + +commit 57aa7f9618ff8383beca7b46193e08a1605b47c5 +Author: qiyu-xie +Date: Thu Jan 21 13:22:48 2021 +0800 + + * Click the project operation button have error after login. + +commit 9988cbf6b88ada4dae23dd6d84db3f72fe452e27 +Author: Yagami <976204163@qq.com> +Date: Thu Jan 21 13:40:46 2021 +0800 + + * Fix details. + +commit fba5fa131e744bd2efa8c5838bd5ffeb7f1f62f3 +Author: Yagami <976204163@qq.com> +Date: Thu Jan 21 13:27:59 2021 +0800 + + * Finish task #8955. + +commit 105769df64464d2b34ccda93308d1ceb7d253b87 +Author: leiyong <1549684884@qq.com> +Date: Thu Jan 21 13:07:41 2021 +0800 + + * Adjust code. + +commit 39625cb3a11cef674b7a8727e946e4fb5660b0a9 +Author: Yagami <976204163@qq.com> +Date: Thu Jan 21 13:02:21 2021 +0800 + + * Add lang file. + +commit 9c7ee5298483c7db51d74ee89318476161b43bc7 +Merge: 96264555a2 54f89c88b9 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 21 11:34:56 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 54f89c88b971730dc031fe87481bcef08a16a6b8 +Author: Yagami <976204163@qq.com> +Date: Thu Jan 21 11:31:31 2021 +0800 + + * Fix details. + +commit 96264555a2e8f2535a9d77dfff93d6db37529760 +Merge: 563934da63 8a1924d518 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 21 11:30:47 2021 +0800 + + * Finish task#9003. + +commit 05795a8baf671f6e7dba3ffa6007f73c62d6bc29 +Author: qiyu-xie +Date: Thu Jan 21 11:29:10 2021 +0800 + + * Fix bug. + +commit 563934da6373d3c98e045238d3aff52627c9ec62 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 21 11:25:15 2021 +0800 + + * Finish task#9003. + +commit 8a1924d518f51d494f29915782997ec87c403370 +Author: qiyu-xie +Date: Thu Jan 21 11:18:43 2021 +0800 + + * Finish task#8973. PRJEdit use session. + +commit 29371689372deb93a9327b3a335967cfccffc0cd +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 21 11:10:18 2021 +0800 + + * Add comment. + +commit d5a55b1406489c00cc7e5f5431eda96545b52caa +Author: Yagami <976204163@qq.com> +Date: Thu Jan 21 11:05:39 2021 +0800 + + * Fix details. + +commit 79f6c655b7ff06f0fc65892eb48005ffa99a5c3a +Author: Yagami <976204163@qq.com> +Date: Thu Jan 21 09:52:57 2021 +0800 + + * Fix details. + +commit 68d4f91e9a6baf829ba4944698605b9d707d7907 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 21 11:03:51 2021 +0800 + + * Finish task #9002. + +commit d3af747bd99476538271be1adb44cb95bf1166b7 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 21 11:00:14 2021 +0800 + + * Fix a bug. + +commit 420e374bf5f1b1865c8cc6b382d52238659435e8 +Author: tianshujie98 +Date: Thu Jan 21 10:07:40 2021 +0800 + + * Finish task #9021. + +commit 41a0f7cb6b5b9324f6002e5e511ff918f96384bc +Author: leiyong <1549684884@qq.com> +Date: Thu Jan 21 10:02:02 2021 +0800 + + * Fix bug. + +commit b62e15cb355a057b9cf289bcd602e063a5cab2f4 +Author: leiyong <1549684884@qq.com> +Date: Thu Jan 21 09:43:19 2021 +0800 + + * Adjust CSS style. + +commit abcae7f7c3b2552f609e5907d4fa7bf87e85fc98 +Author: qiyu-xie +Date: Thu Jan 21 09:16:58 2021 +0800 + + * Use session when link product return. + +commit 69ac3461f6f195ce8182f396a762663402d19f5f +Author: leiyong <1549684884@qq.com> +Date: Thu Jan 21 09:14:17 2021 +0800 + + * Finish task#9007. + +commit 98967161f75ae3e3e1e86a206084d2dffd41a817 +Author: tianshujie98 +Date: Wed Jan 20 17:09:27 2021 +0800 + + * Finish task #9021. + +commit ee7c9937acedb57104f364318adaeb9af3ea5e69 +Merge: 9e6ff0a9b2 fd672669f7 +Author: tianshujie98 +Date: Wed Jan 20 16:44:56 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 9e6ff0a9b2558020f3d5a3fc63cd065ce0de586f +Author: tianshujie98 +Date: Wed Jan 20 16:44:30 2021 +0800 + + * Finish task #9021. + +commit fd672669f79a1251e88f68e374de9c068c9795ab +Author: Yagami <976204163@qq.com> +Date: Wed Jan 20 16:40:19 2021 +0800 + + * Fix details. + +commit d9158949c617209a2b5dc9b8dcb1084b2777cc4a +Author: holan20180123 <56391770@qq.com> +Date: Wed Jan 20 16:39:32 2021 +0800 + + * Adjust the style. + +commit a53536bfccb1485ca9de5b9760b759c4e3968932 +Author: qiyu-xie +Date: Wed Jan 20 16:32:45 2021 +0800 + + * Finish task#8969. + +commit aff132b1b1520e826951877b5c4eeec6415c0b5f +Author: holan20180123 <56391770@qq.com> +Date: Wed Jan 20 16:21:57 2021 +0800 + + * Adjust the style. + +commit 0385ff70c1e6aeb05b4357f7a5a3cda65443eef6 +Merge: 306382e483 d03194717d +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 20 16:12:27 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 306382e48328e40eff59468bb41002eaac6a4e6c +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 20 16:12:23 2021 +0800 + + * Fix bugs. + +commit d03194717db5f58df222e2e8012ca64edc1c6d0d +Author: Yagami <976204163@qq.com> +Date: Wed Jan 20 15:48:58 2021 +0800 + + * Remove hourunit. + +commit 36067c51cc3cac7d9c35641d0fc571b0a2cca0a8 +Author: Yagami <976204163@qq.com> +Date: Wed Jan 20 15:40:27 2021 +0800 + + * Code for project menu link. + +commit 92ecab90711c72289870b061eb61554f9f3faf26 +Author: holan20180123 <56391770@qq.com> +Date: Wed Jan 20 15:38:40 2021 +0800 + + * Fix bug of no executing sql. + +commit 5b089ec3dde0c01ec05676a9005b8dc8eb7becaf +Merge: 11cbb689a5 f172a5d9e2 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 20 15:22:37 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 11cbb689a551df34913687773996caa03a167364 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 20 15:22:33 2021 +0800 + + * Add the unlink story button for project story. + +commit f172a5d9e29573a37a714c1eff56322d0ae8213e +Author: tianshujie98 +Date: Wed Jan 20 15:00:56 2021 +0800 + + * Modify variable. + +commit 319b97430eaca65a9b2195219be4b26fba513a2d +Author: holan20180123 <56391770@qq.com> +Date: Wed Jan 20 14:32:24 2021 +0800 + + * Adjust the style. + +commit db6acf2cf2a1f658f44f2cc535eea7890ba0e180 +Author: qiyu-xie +Date: Wed Jan 20 13:24:11 2021 +0800 + + * Modify the milestone icon for the release. + +commit ccb8ad2fc5da3a77313ef47f78aa5f1acf13b3a7 +Author: holan20180123 <56391770@qq.com> +Date: Wed Jan 20 13:04:08 2021 +0800 + + * Adjust the style. + +commit 98fe1f70cb9f1a159afe51a1231744ed743c8728 +Merge: 560b17adf1 f7426ed013 +Author: tianshujie98 +Date: Wed Jan 20 11:33:04 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 560b17adf1e649ed16a3476142977c026e57aab1 +Author: tianshujie98 +Date: Wed Jan 20 11:32:29 2021 +0800 + + * Fix productivity issues. + +commit f7426ed01320d9bd53ed1b6c529705befe0e248f +Author: holan20180123 <56391770@qq.com> +Date: Wed Jan 20 11:22:01 2021 +0800 + + * Adjust the style. + +commit 0379c68c9e187e410992c57d75b767112b728398 +Author: tianshujie98 +Date: Wed Jan 20 11:15:32 2021 +0800 + + * Navigation highlight. + +commit 467562e85c219c7e4d3662c0a98cf3a849a7c3ca +Merge: fffa111543 912f727bd3 +Author: tianshujie98 +Date: Wed Jan 20 11:06:10 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit fffa111543c355f58fd507333e2d3778bf7fc026 +Author: tianshujie98 +Date: Wed Jan 20 11:05:53 2021 +0800 + + * Modify language item. + +commit 912f727bd3890f7cc37ddd5cbdc14dc0aeb5e2cd +Author: holan20180123 <56391770@qq.com> +Date: Wed Jan 20 11:03:26 2021 +0800 + + * Adjust the style. + +commit d8dc42d6c8ae094c7d4d328df00c61760fc06a04 +Author: qiyu-xie +Date: Wed Jan 20 10:57:38 2021 +0800 + + * Modify the milestone icon display of Gantt. + +commit 120d78c94239cf8ce0862c1ff0324999a4e11743 +Author: qiyu-xie +Date: Wed Jan 20 10:36:40 2021 +0800 + + * Modify the problem of test list in contribution. + +commit e774abce77527a39a601a87cb13fc85fb9ce2f58 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 20 10:27:24 2021 +0800 + + * Fix a bug. + +commit 76baef16c096cf21cf6727f9d5af7753acab912d +Author: Yagami <976204163@qq.com> +Date: Wed Jan 20 10:01:24 2021 +0800 + + * Fix deny btn. + +commit cebfbc62057b93c5429cb45c3f52e9d1a39762fc +Author: Yagami <976204163@qq.com> +Date: Wed Jan 20 10:00:00 2021 +0800 + + * Add group. + +commit 7cdeb0630ea17d59c12ad57d2b6fee6c0a2c88c4 +Author: Yagami <976204163@qq.com> +Date: Wed Jan 20 09:45:03 2021 +0800 + + * Finish task #8959. + +commit df01cbe76a79ba203a577c31cba8f896459997ba +Author: qiyu-xie +Date: Wed Jan 20 09:26:07 2021 +0800 + + * Finish task#8970. Change to use session to record URL. + +commit c9046ede6df7e90061d7c7aa8b7457143aa387ab +Author: holan20180123 <56391770@qq.com> +Date: Wed Jan 20 08:20:25 2021 +0800 + + * Finish task #8988. + +commit 017469206f9f9dbf133cc9960f6dfc31fb6039a2 +Author: leiyong <1549684884@qq.com> +Date: Tue Jan 19 22:05:19 2021 +0800 + + * Fix bug. + +commit 33e2fd4f4625588db6719bc76fbacf763b874604 +Author: Yagami <976204163@qq.com> +Date: Tue Jan 19 16:18:27 2021 +0800 + + * Fix details. + +commit 5f1cb585e3cccf274f5e2d6bdfbd85e99883406e +Author: Yagami <976204163@qq.com> +Date: Tue Jan 19 16:12:45 2021 +0800 + + * Code for task #9011. + +commit 0138f6394127d0ca5d973c18238ed0d6af8b8a60 +Merge: 04b481c6ce 1bb15a8b1a +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 19 16:15:11 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 04b481c6ce804402514de9831664027f3b6f3855 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 19 16:15:00 2021 +0800 + + * Finish task #9002. + +commit 1bb15a8b1a37dce40ff173cd8444dc9fbeba69af +Author: Yagami <976204163@qq.com> +Date: Tue Jan 19 16:09:21 2021 +0800 + + * Code for task #8959. + +commit 46e581d9fedb8cb3d4543848ad0bdba132815abe +Author: leiyong <1549684884@qq.com> +Date: Tue Jan 19 15:57:44 2021 +0800 + + * Fix bug. + +commit 3696cd673c257811361214eadba535dad7432ccb +Author: qiyu-xie +Date: Tue Jan 19 15:41:30 2021 +0800 + + * Finish task#8973. Modify project edit link in my module. + +commit c567300e9e336769f8ebb16742cd95af5d9e45bb +Merge: ce82f05142 1581fc71c4 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 19 15:39:02 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit ce82f051428b161c9aa874861b77c1eb4babc5fb +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 19 15:38:55 2021 +0800 + + * Finish task #9002. + +commit 1581fc71c46e45693debb186fb7a5771678ece91 +Merge: 94fe5243e6 f0edc5f0cc +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 19 15:08:13 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 94fe5243e68d88730f2d5f68805b04bb97d38284 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 19 15:08:10 2021 +0800 + + * Adjust the code. + +commit f0edc5f0ccc01ce41924d536bd1332a5c3c249bd +Author: qiyu-xie +Date: Tue Jan 19 15:01:13 2021 +0800 + + * Modify the language of the cost estimate. + +commit 93199e709c700c32292a7d1dd907504907f49adb +Author: qiyu-xie +Date: Tue Jan 19 14:47:06 2021 +0800 + + * Fix bug. + +commit 61e5bf8704158b130f4e6c6a7976e8573372e949 +Author: qiyu-xie +Date: Tue Jan 19 14:41:20 2021 +0800 + + * Finish task#8963.#8962. Deal with upgrade data. + +commit e94703ce083227ca13791dfa29a7dd405383ccff +Merge: ac739a6391 d962b0cc14 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 19 14:42:45 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit ac739a63911eb1e058ca5c121ad57f3f7892d322 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 19 14:42:39 2021 +0800 + + * Add the privilege of the project story. + +commit d962b0cc14e867e1d4dc257f53968ce1a985806e +Merge: c3ff341766 6df048c4f0 +Author: guanxiying +Date: Tue Jan 19 14:34:42 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 6df048c4f03e6edbf3d1b3bf7e55e5294a5d3fab +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 19 14:27:32 2021 +0800 + + * Adjust the width of ifram. + +commit c3ff341766602e8e47ef8e111a090cb9c4793942 +Author: guanxiying +Date: Tue Jan 19 14:25:36 2021 +0800 + + * Fix install error. + +commit 5165b1b363a02aa504bfef1bfc3d8ce8c0902b00 +Author: tianshujie98 +Date: Tue Jan 19 14:25:08 2021 +0800 + + * Adjust language item. + +commit d42e8219ae0cb8f3748f6b09e6d940839770b0b6 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 19 14:21:16 2021 +0800 + + * Adjust the style. + +commit 5afc6c990a40c83d444b92140677bc9c7e351987 +Author: leiyong <1549684884@qq.com> +Date: Tue Jan 19 13:53:51 2021 +0800 + + * Fix bug. + +commit e2cdc82af22af99f4deb9cd0318e8f420d21fe4d +Merge: 1ba2bf813d 1ee88480a1 +Author: tianshujie98 +Date: Tue Jan 19 13:52:46 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 1ba2bf813db5baeff59e329d11eabfd6e9751411 +Author: tianshujie98 +Date: Tue Jan 19 13:52:35 2021 +0800 + + * Fix bug. + +commit 1ee88480a1bd72cce2ce4b8d0ce2908bea851ea8 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 19 13:48:20 2021 +0800 + + * Fix a bug when required fields saved. + +commit 07872a872a1edf24891ec4ccbda7458bcb679db5 +Merge: 1471f7fc61 8b8f90e3e5 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 19 13:48:08 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 8b8f90e3e5082a53d52f57dd5058fd135c762c63 +Merge: e3b7008f50 cefdfeae47 +Author: tianshujie98 +Date: Tue Jan 19 13:34:39 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit e3b7008f50b61ef5e4d006115c5f542f98934c57 +Author: tianshujie98 +Date: Tue Jan 19 13:32:13 2021 +0800 + + * Add project linked story. + +commit cefdfeae4723e81d9454303983a68ea0b5bf3a5a +Merge: ce50aeecf9 0c2754266c +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 19 13:21:15 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit ce50aeecf94eedf950d4b50b336e462979eafcf7 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 19 13:21:12 2021 +0800 + + * Adjust the code. + +commit 0c2754266ce77ebc05f98e190b2d0d0980b75fea +Merge: 3076294278 b3058a8ad6 +Author: tianshujie98 +Date: Tue Jan 19 11:44:24 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 307629427806d7e6472f2c844aeef7def3cdda81 +Author: tianshujie98 +Date: Tue Jan 19 11:44:17 2021 +0800 + + * Fix bug. + +commit b3058a8ad67b02fc4a3393240649593cd6f981d4 +Author: Yagami <976204163@qq.com> +Date: Tue Jan 19 11:41:56 2021 +0800 + + * Fix details. + +commit 18cf73f84ea526fbca31c64d7aeb750e1a6d184a +Author: qiyu-xie +Date: Tue Jan 19 11:30:20 2021 +0800 + + * Finish task#8963.#8962. + +commit d2f2554ac402d272d105ce536a50fa5dd9e162dc +Merge: b124221fad b7d6c409d5 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 19 11:26:29 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit b124221fade6b5ab7ad3bc8e191e5b063637eec6 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 19 11:26:25 2021 +0800 + + * Adjust the code. + +commit b7d6c409d527c1047167df7ad42581780f28e56b +Author: Yagami <976204163@qq.com> +Date: Tue Jan 19 11:25:59 2021 +0800 + + * Add group. + +commit 1471f7fc6134ebd04edffa4b4ec7cb7ef5e63f0b +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 19 11:21:58 2021 +0800 + + * Finish task #8988. + +commit 66ef1c6fa3b164bc51184191b6b4a1d27b77b7ca +Author: leiyong <1549684884@qq.com> +Date: Tue Jan 19 11:13:23 2021 +0800 + + * Finish task#9005. + +commit 36bc9e9d02ace9e95ac1ae209c1a1d7e05404934 +Merge: a39034d186 097f76364e +Author: tianshujie98 +Date: Tue Jan 19 11:02:45 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit a39034d186435e5138ef9305f7b158b7db7e6a4d +Author: tianshujie98 +Date: Tue Jan 19 11:02:32 2021 +0800 + + * Adjust code style. + +commit 097f76364ec679741b48fc2f3ba43cfa0a2ea0bb +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 19 10:54:11 2021 +0800 + + * Finish task #9006. + +commit 2a65df963edda184de9d39d3153e9b2153da4b4a +Author: tianshujie98 +Date: Tue Jan 19 10:46:46 2021 +0800 + + * Adjust code style. + +commit 120838636037d1775a48e00811676d5aae11d629 +Merge: 46905cd0ce 00119c26f8 +Author: tianshujie98 +Date: Tue Jan 19 10:31:36 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 46905cd0ceae671cc8e29f99b1728d35230ec00d +Author: tianshujie98 +Date: Tue Jan 19 10:31:27 2021 +0800 + + * Fix bug. + +commit 00119c26f88ae44bffbfab703a25d246397eee41 +Merge: 0eb117442c a779349e56 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 19 10:30:39 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 0eb117442cffe4227095dfaf5de805b5e94d30e9 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 19 10:30:35 2021 +0800 + + * Adjust the nav high-light. + +commit a779349e56442c40f7bf4c346baa4444367c1dea +Merge: b106795c08 bcf4be71d1 +Author: tianshujie98 +Date: Tue Jan 19 10:21:37 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit b106795c083e9fe38c3a84010a72d185415b4d1c +Author: tianshujie98 +Date: Tue Jan 19 10:21:21 2021 +0800 + + * Modify language item. + +commit bcf4be71d1c0912223f5099c193d22f731244e1e +Merge: e6a9fec35c 2db4bb2c4a +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 19 10:13:23 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit e6a9fec35ce704b989761bd2bf555a441bb2d9c8 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 19 10:12:59 2021 +0800 + + * Finish task #9043. + +commit 2db4bb2c4ade3f9a4c8a6238eee38d9df65acc40 +Author: Yagami <976204163@qq.com> +Date: Tue Jan 19 10:10:33 2021 +0800 + + * Finish task #9023. + +commit dd9b052b2424d0dd3f948789e832e8d2493c92c8 +Merge: a75fa99132 84e973ac62 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 19 09:49:03 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit a75fa991322c364731686f8c2f53d1c3309a1ae9 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 19 09:48:58 2021 +0800 + + * Adjust the code. + +commit 84e973ac6279704107766f0910be1bac95c2406a +Merge: 029c157cc6 2d7fd95881 +Author: tianshujie98 +Date: Tue Jan 19 09:40:09 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 029c157cc6005d4bb1b84badb30daaad4d186fe9 +Author: tianshujie98 +Date: Tue Jan 19 09:39:53 2021 +0800 + + * Finish task #9048. + +commit 2d7fd95881324cfb07fb52e7ae1e57d25adcaad5 +Merge: bf5ba32e1b 3e0f61c8ce +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 19 08:55:17 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit bf5ba32e1bbc0779008c736e72ee0dd9bf8966ab +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 19 08:54:03 2021 +0800 + + * Link the stories of the plans to the project. + +commit 3e0f61c8ce71f0dadc8f8cba1df56246afebcda5 +Author: Catouse +Date: Mon Jan 18 17:30:29 2021 +0800 + + * add imgcutter files. + +commit 23f1c4b0247fa53abdff109e5c1d16a437ad8d69 +Author: Yagami <976204163@qq.com> +Date: Mon Jan 18 17:29:20 2021 +0800 + + * Code for task #5688. + +commit f5a19a1f029c51a14acf3e7240b1559379ff250b +Author: tianshujie98 +Date: Mon Jan 18 16:41:22 2021 +0800 + + * Finish task #9048. + +commit ff6589a60c068ccf539d474fff09fa1f90b960b0 +Author: tianshujie98 +Date: Mon Jan 18 16:38:58 2021 +0800 + + * Fix bug. + +commit b846cba424382dae8cf74c521e1fa0d97fc34af8 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 18 16:27:01 2021 +0800 + + * Finish task #8988. + +commit 00cc8ff2c30bb7931e2d1d7bd0d30bc1350d4a32 +Author: Yagami <976204163@qq.com> +Date: Mon Jan 18 16:15:39 2021 +0800 + + * Fix story lang. + +commit 1fdc90b1198abc26e3c9f6aaf2a77ad5aed92409 +Merge: a060f88a0d b0ff295e89 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 18 15:47:48 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit a060f88a0d92206f07feaed58d6e626fc1fc2310 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 18 15:47:45 2021 +0800 + + * Fix the search form of the story linked project. + +commit b0ff295e89bcebf0fbc090845325c115de1a4a20 +Author: qiyu-xie +Date: Mon Jan 18 15:32:09 2021 +0800 + + * Remove extra spaces. + +commit 6128f82d16f32967616c17c2681bd421dc6d5bc7 +Merge: 9d8ae60c7b 50c8836b97 +Author: tianshujie98 +Date: Mon Jan 18 15:09:36 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 9d8ae60c7b58170e18ca4f5566505329a7107ad2 +Author: tianshujie98 +Date: Mon Jan 18 15:09:15 2021 +0800 + + * Finish task #9021. + +commit 50c8836b971cefc5413cd790bd9132fa6238fd0d +Author: Catouse +Date: Mon Jan 18 15:05:54 2021 +0800 + + * add $.tabs.getLastTab method to index. + +commit 9c8fb2c131a60558f7b05dd9963fcdc00d98a53b +Author: qiyu-xie +Date: Mon Jan 18 14:58:41 2021 +0800 + + * Finish task#8963.#8962. Fix bug. + +commit fa2c0ff692894db08d9cba5db49a4acba58f19f0 +Merge: 8d77e71634 7a5e58e606 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 18 14:39:44 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 8d77e71634ac6c952d48d0ca091b4b662525aa36 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 18 14:39:16 2021 +0800 + + * Finish task #8957. + +commit 7a5e58e606a7815409814c6d31fde7458fd8cd5e +Author: Yagami <976204163@qq.com> +Date: Mon Jan 18 14:24:51 2021 +0800 + + * Add required. + +commit fdcbb2cf7c549d2dfdfd6e890cffa91ca94658fb +Merge: 44f7c95639 9c5cfa592d +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 18 14:21:55 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 44f7c956390535496fe8caa4947a188c0b7f8de1 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 18 14:21:52 2021 +0800 + + * Fix a bug for story view page. + +commit 9c5cfa592d9189818c4147b4f7010ddc40715cd1 +Author: qiyu-xie +Date: Mon Jan 18 14:17:44 2021 +0800 + + * Finish task#8963. + +commit 5d72faff4833464b7578913f681c83a565e12882 +Merge: dd341daed7 ebc5eccbed +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 18 13:26:01 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit dd341daed7d91cdf5745a99111a8637822ace75a +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 18 13:25:58 2021 +0800 + + * Fix the bug of the story filter. + +commit ebc5eccbed5c9bf0c57e24233af0af6f429a1e90 +Merge: e989d459fa 08a8b5f2e9 +Author: tianshujie98 +Date: Mon Jan 18 13:18:10 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit e989d459fa474b870c431d8c752af8188bf64287 +Author: tianshujie98 +Date: Mon Jan 18 13:17:54 2021 +0800 + + * Finish task #9049. + +commit 08a8b5f2e9ea3664963cc38b305ceda86cfee88e +Author: qiyu-xie +Date: Mon Jan 18 13:16:19 2021 +0800 + + * Finish task#8962. Fix bug. + +commit c907c0fad536e0ec6fec4cd52dc8ac95fe6e719f +Author: qiyu-xie +Date: Mon Jan 18 13:02:49 2021 +0800 + + * Finish task#8962. + +commit 999ca1631c29a25f591281d2cd307a02eb328e9b +Author: Yagami <976204163@qq.com> +Date: Mon Jan 18 11:39:25 2021 +0800 + + * Add icon to program tree. + +commit 25020888fa83725244f75dcc6b519bd7a44ac62a +Author: Yagami <976204163@qq.com> +Date: Mon Jan 18 11:35:15 2021 +0800 + + * Fix bug. + +commit 8f589d655dba9e151b1c568c9abf1b8b4eec8953 +Merge: 418039eecf bfe7766a3d +Author: tianshujie98 +Date: Mon Jan 18 11:34:19 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 418039eecf49a7f5695a327459801fd4a7a3f2df +Author: tianshujie98 +Date: Mon Jan 18 11:34:01 2021 +0800 + + * Finish task #9049. + +commit bfe7766a3d2c8636d38e8d0dd23d8b598f4c719d +Author: Yagami <976204163@qq.com> +Date: Mon Jan 18 11:32:36 2021 +0800 + + * Fix bug. + +commit f3d06bde9c449694d00be2a66e24576703cc5e1c +Author: Yagami <976204163@qq.com> +Date: Mon Jan 18 11:12:05 2021 +0800 + + * Add hour unit to project all. + +commit 8faf4a6c406fa09f639fa173e998f95088d590e9 +Author: Yagami <976204163@qq.com> +Date: Mon Jan 18 11:10:07 2021 +0800 + + * Finish task #8972/ + +commit c40e49b3c093325532237c34b258822914bf6bce +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 18 10:58:54 2021 +0800 + + * Finish task #9002. + +commit 02228d9f5ab6b351189b3d99866d4290bb4b01f2 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 18 10:58:18 2021 +0800 + + * Finish task #8988. + +commit dafb68b70c41346debc61a11a3c43587dabb6d49 +Author: Yagami <976204163@qq.com> +Date: Mon Jan 18 10:49:39 2021 +0800 + + * Code for hour unit. + +commit 0b7969de490c79a9b139ca9125f4ef0d5772ce4d +Author: Yagami <976204163@qq.com> +Date: Mon Jan 18 10:38:34 2021 +0800 + + * Finish task #9014. + +commit 92a559c37d3b76e5e58800728c0699e96bee1c5b +Author: Yagami <976204163@qq.com> +Date: Mon Jan 18 10:20:32 2021 +0800 + + * Fix story bug. + +commit 8d2aa37fadec4c37bddfd51382f579a42dc934cd +Merge: 242782e081 2ce5ef1d5b +Author: tianshujie98 +Date: Mon Jan 18 10:17:08 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 242782e08189fb8a2538941e061cc1b101b887e7 +Author: tianshujie98 +Date: Mon Jan 18 10:16:39 2021 +0800 + + * Modify language item. + +commit a5607fbb6b4433ce4a3e912caf6db349d8a1613c +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 18 10:16:36 2021 +0800 + + * Finish task #8988. + +commit 2ce5ef1d5b99208185eda2729cd05a6546303b2e +Author: Yagami <976204163@qq.com> +Date: Mon Jan 18 10:13:34 2021 +0800 + + * Fix story hour detail. + +commit e49e6d834f72b779e38454f4a3fb42f7709ac210 +Merge: ba5df886e3 e9f8ec68f6 +Author: tianshujie98 +Date: Mon Jan 18 10:11:26 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit ba5df886e32d5e5458c7dfca947a1e03c2dcfb26 +Author: tianshujie98 +Date: Mon Jan 18 10:11:14 2021 +0800 + + * Fix bug. + +commit e9f8ec68f689db2ff8e44cf5df99f362f64926e1 +Merge: 9019fbbc04 d6e060a114 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 18 10:01:12 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 9019fbbc0489f427c7cbc64c6a50148434bcb075 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 18 10:01:08 2021 +0800 + + * Fix a bug. + +commit d6e060a11420c468f0798425a9985eff55df9bf9 +Author: tianshujie98 +Date: Mon Jan 18 09:53:43 2021 +0800 + + * Fix bug. + +commit 27e8797364a2591bb32758802b4231c95ea3f4db +Author: Yagami <976204163@qq.com> +Date: Mon Jan 18 09:34:21 2021 +0800 + + * Finish task #9018. + +commit 8c6c006680a3244926f8f557b151b46268d2aaa5 +Author: Yagami <976204163@qq.com> +Date: Mon Jan 18 09:19:35 2021 +0800 + + * Finish task #9011. + +commit aff5fe33c7cd2df286b4002a72eedb7da69e0f6f +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 18 09:16:00 2021 +0800 + + * Fix an error. + +commit 1e9474c6f9fa4d17008c60d7cc482c51f7601563 +Merge: 4966757b9d 8b90a207c0 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 18 09:13:04 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 4966757b9df6decf7da21c7ab4165caddc1cda43 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 18 09:13:01 2021 +0800 + + * Fix a bug. + +commit 8b90a207c003848c8db36940b5d1432fe2adf882 +Author: Yagami <976204163@qq.com> +Date: Mon Jan 18 09:11:31 2021 +0800 + + * Finish task #9010. + +commit 954ce428e58f3a5640b1697c8b28518b18bc614d +Merge: 2f4c8a0efb ad1885be6a +Author: tianshujie98 +Date: Mon Jan 18 09:11:26 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 2f4c8a0efb820db0caeb823d1e7c0f7d7e411afa +Author: tianshujie98 +Date: Mon Jan 18 09:10:55 2021 +0800 + + * Finish task #8968,8967. + +commit ad1885be6af1fc9bcf43d65db9d5d42ecb46db09 +Author: Yagami <976204163@qq.com> +Date: Mon Jan 18 09:04:44 2021 +0800 + + * Finish task #9020. + +commit a85e679cc93234af4c8547efb60169b7028cace1 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 18 08:47:16 2021 +0800 + + * Adjust the code. + +commit cd2c7278b74a070268f226db506a1dafee9145d2 +Author: qiyu-xie +Date: Fri Jan 15 17:22:53 2021 +0800 + + * Finish task#9033. + +commit 269ec964e44ad1d4fe19b050b60f6c37016062c3 +Author: Yagami <976204163@qq.com> +Date: Fri Jan 15 16:56:13 2021 +0800 + + * Fix detail. + +commit 435194190b7da283100cac06d13182186d981080 +Author: Yagami <976204163@qq.com> +Date: Fri Jan 15 16:41:52 2021 +0800 + + * Finish task #8972. + +commit c8f1adb4e76d5b6eb92b513b0364924887fc90f0 +Author: Catouse +Date: Fri Jan 15 16:41:54 2021 +0800 + + * fix angle btn style. + +commit 2d14f0aec45662370c02e28c6fa01fcf1e38ecec +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 15 16:41:41 2021 +0800 + + * Finish task#8956. + +commit fe9553791492101fc2227a0ac15564be309a598a +Author: Yagami <976204163@qq.com> +Date: Fri Jan 15 16:22:27 2021 +0800 + + * Fix bug #3780. + +commit 9d6c2e618a9a7b0cf6ce4cda835fc1c6e30d2d7c +Author: Yagami <976204163@qq.com> +Date: Fri Jan 15 15:36:30 2021 +0800 + + * Finish task #9028. + +commit 554313dfd9d86d36ef9f5bea5caa19e7ac61a6f4 +Merge: e647640432 e9fe2d96d5 +Author: tianshujie98 +Date: Fri Jan 15 15:34:29 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit e647640432ff5763e438089c849dd7dcead07b4e +Author: tianshujie98 +Date: Fri Jan 15 15:33:49 2021 +0800 + + * Change color. + +commit e9fe2d96d55d5b8d8b18b53a366ca8966280a1eb +Author: Yagami <976204163@qq.com> +Date: Fri Jan 15 15:28:03 2021 +0800 + + * Finish task #8998. + +commit 820fb4cffe1ed487ba3e391b30f530f35d5c38c2 +Author: Yagami <976204163@qq.com> +Date: Fri Jan 15 15:20:26 2021 +0800 + + * Fix menu divider. + +commit c53e9ac526e24ad7ce585a91d9b5c8dfaa7915df +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 15 14:28:57 2021 +0800 + + * Finish task #9002. + +commit c131e1941e28079cb68ecb76b1958574e9e348e5 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 15 14:23:16 2021 +0800 + + * Finish task #8988. + +commit 907dfc23d787299ad78d4a54d5fe06da53fcec1a +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 15 14:17:46 2021 +0800 + + * Finish task #8988. + +commit 6da84d9cf1c4602382aebede33da4a72ef1433fe +Merge: 2b54b6dc63 ed625de092 +Author: tianshujie98 +Date: Fri Jan 15 11:38:34 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 2b54b6dc63f8d55c716b64bb259eeb3687f64157 +Author: tianshujie98 +Date: Fri Jan 15 11:38:23 2021 +0800 + + * Modify comment. + +commit ed625de0927d0025fb53cee2d04d99b22f941528 +Author: qiyu-xie +Date: Fri Jan 15 11:21:19 2021 +0800 + + * Finish task#8970. + +commit 8efd0e0e0aa96aa2a446c3fd698c94e5869d33d3 +Merge: 787f398b7b a8bf48d3c8 +Author: tianshujie98 +Date: Fri Jan 15 11:16:52 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 787f398b7bd6f6068a4d379d307e821f43fceeca +Author: tianshujie98 +Date: Fri Jan 15 11:16:44 2021 +0800 + + * Add comment. + +commit a8bf48d3c8f8ffd18a31774e6edb61ba1522d51e +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 15 11:13:01 2021 +0800 + + * Finish task #9002. + +commit e9590214b3142a6a1ba320857393a93b905d2745 +Author: tianshujie98 +Date: Fri Jan 15 11:12:16 2021 +0800 + + * Fix bug. + +commit 5f520092ba3ff04e4d38ab26a4c5b4a68d167ffe +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 15 11:06:14 2021 +0800 + + * Fix bug for task list. + +commit 7b5ea8ebb8abaed85a4a3ab45fe73aa170a6b846 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 15 10:46:33 2021 +0800 + + * Finish task #9002. + +commit 01339a7345d418adee8b075036e81a69ad603bd3 +Merge: 235c393707 0f2a7bce1b +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 15 10:20:09 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 235c39370759b997a30ff6b9cb076b1e2d202a93 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 15 10:20:03 2021 +0800 + + * Finish task#8964. + +commit 0f2a7bce1bdd63f8bc2b66ee9c77e53ed9feba6e +Merge: 857a41c3f1 4428e6443c +Author: tianshujie98 +Date: Fri Jan 15 10:19:35 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 857a41c3f1cd6b695337b477885bcdf0a7aa1662 +Author: tianshujie98 +Date: Fri Jan 15 10:19:16 2021 +0800 + + * Modify prompt. + +commit 4428e6443c9912cdf717746d5df957713fd599c5 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 15 10:13:27 2021 +0800 + + * Finish task #9002. + +commit b2e53cf935c7e390607bbef4a6d24c2771958fe4 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 15 09:49:16 2021 +0800 + + * Finish task #8986,#9002. + +commit 01e1008f29fc40bfbd59fdf572fc00e707015f28 +Author: tianshujie98 +Date: Fri Jan 15 09:45:19 2021 +0800 + + * Finish task #9001. + +commit 88043e53b3de5aa2f2a72faab71763121a8c9114 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 14 17:25:18 2021 +0800 + + * Finish task #9002. + +commit c9721cd0ce64c540ad96dd328fa43c69d7c11407 +Author: Yagami <976204163@qq.com> +Date: Thu Jan 14 16:26:38 2021 +0800 + + * Fix project drop menu. + +commit df07e062648b121bce5ed41aa485fb98e9416e9f +Author: Yagami <976204163@qq.com> +Date: Thu Jan 14 16:12:21 2021 +0800 + + * Finish task #9028. + +commit 791be0895b241e99c4ef4c29da1ae1059f0c5379 +Merge: c591e20aef 2c95668f2e +Author: tianshujie98 +Date: Thu Jan 14 16:01:51 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit c591e20aeffb035a9c07b2ccbecd48f536034ccc +Author: tianshujie98 +Date: Thu Jan 14 16:01:14 2021 +0800 + + * Finish task #8966,8965. + +commit 2c95668f2e2ab47a34b3ff6f271703821eb5c42c +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 14 15:46:23 2021 +0800 + + * Finish task #9002. + +commit 70e59fa27c81b322b871aed2381519d780585cfa +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 14 14:52:51 2021 +0800 + + * Modify the param of the link when module is user. + +commit 84331f875b6e630a9d1d9e8a26641a2f4afa2b1f +Author: tianshujie98 +Date: Thu Jan 14 14:47:23 2021 +0800 + + * Remove closed programs. + +commit d1d3ea624f07f74cccc9ad5f5151355facfc9585 +Merge: 8405f11600 4171b7eb63 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 14 14:45:41 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 8405f11600d7f17daf06ec7c25db747194221ff3 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 14 14:43:25 2021 +0800 + + * Finish task #8957. + +commit 4171b7eb63cf4e43e4381aa9fce0b8cce53caa50 +Author: tianshujie98 +Date: Thu Jan 14 14:39:44 2021 +0800 + + * Finish task #9000. + +commit b1a856423f1c1e2976a17483666be82b7a4acbd5 +Author: tianshujie98 +Date: Thu Jan 14 14:39:17 2021 +0800 + + * Finish task #9001. + +commit 47db2287b928d4be1c7be92dad1630f3e74bcdea +Author: qiyu-xie +Date: Thu Jan 14 10:51:57 2021 +0800 + + * Finish task#8971. + +commit c6ab1d380948c8f8a6c87ebd77bf60d6ad82787f +Author: Yagami <976204163@qq.com> +Date: Thu Jan 14 10:48:24 2021 +0800 + + * Code for task #9028. + +commit 4d6d78a080f543372e32731713dd8a872d8097b2 +Author: tianshujie98 +Date: Thu Jan 14 10:45:09 2021 +0800 + + * Adjust code style. + +commit d30ea794142148417fca5cc33a5198db2e99d87a +Merge: 1b2ae5c4cc 1e83bad2b2 +Author: tianshujie98 +Date: Thu Jan 14 10:39:43 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 1b2ae5c4ccb2ccc4f70000b08892ac43527ad5b6 +Author: tianshujie98 +Date: Thu Jan 14 10:39:15 2021 +0800 + + * Add digital judgment. + +commit 1e83bad2b241fe3fc0fbbb9d509c6fa31675ea79 +Author: qiyu-xie +Date: Thu Jan 14 09:38:19 2021 +0800 + + * Finish task#8973. + +commit 3159469466e35d27482c9bd8ff0ec227c0a3f6fc +Author: tianshujie98 +Date: Thu Jan 14 09:03:03 2021 +0800 + + * Adjust code style. + +commit 6a2505f02561cfb1af1c89a15551dc07f69e627e +Author: holan20180123 <56391770@qq.com> +Date: Wed Jan 13 17:24:38 2021 +0800 + + * Finish task #8989. + +commit 6d5a39201f69569f8083ee114826b9f84779a50f +Author: Yagami <976204163@qq.com> +Date: Wed Jan 13 17:23:26 2021 +0800 + + * Fix doc. + +commit 5a752c09dc4c04f9c6bfa11511dd2e7d15a52a94 +Author: tianshujie98 +Date: Wed Jan 13 17:16:40 2021 +0800 + + * Finish task #9004. + +commit eced7f1d3f94129b83f9498ebb45c12ca65c7dec +Merge: 347764eb91 3356b3c088 +Author: tianshujie98 +Date: Wed Jan 13 15:56:29 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 347764eb91793876365817760c544d99754b775f +Author: tianshujie98 +Date: Wed Jan 13 15:53:33 2021 +0800 + + * Add permissions. + +commit 3356b3c088d0fa0079e154f96df2d9b6acf57f30 +Author: holan20180123 <56391770@qq.com> +Date: Wed Jan 13 15:49:30 2021 +0800 + + * Finish task #9002. + +commit 5f4c596ea704122b2cbb48dbe670398847c3a52b +Author: holan20180123 <56391770@qq.com> +Date: Wed Jan 13 15:48:43 2021 +0800 + + * Finish task #8991. + +commit 2ed477ae565e328108c8507f0a4cb28377b42b59 +Author: Yagami <976204163@qq.com> +Date: Wed Jan 13 15:43:06 2021 +0800 + + * Code for task #9028. + +commit 81128047ccf58652cfc18bdafca0afacd4ba2ee5 +Author: holan20180123 <56391770@qq.com> +Date: Wed Jan 13 15:34:19 2021 +0800 + + * Finish task #8987. + +commit f7b3ea495aa547ddb9aeca661756ea8c0ddca228 +Author: leiyong <1549684884@qq.com> +Date: Wed Jan 13 15:33:20 2021 +0800 + + * Adjust code. + +commit 5b0f057ad2f85706787769d118f51d195c924b78 +Author: qiyu-xie +Date: Wed Jan 13 15:06:42 2021 +0800 + + * Finish task#8971. + +commit c9f06129242d6d2dabc42187060ea85bc8e0e20f +Author: holan20180123 <56391770@qq.com> +Date: Wed Jan 13 15:04:11 2021 +0800 + + * Finish task #9002. + +commit 2756ad7ab2198611e246580c18f846e435837e51 +Author: qiyu-xie +Date: Wed Jan 13 14:51:43 2021 +0800 + + * Finish task#8973. + +commit 07831a94c2d8dc9da98d9e42069153167d98830b +Author: Catouse +Date: Wed Jan 13 14:25:43 2021 +0800 + + * fix cdn links used by simplemde. + +commit 1ed7024c175f6b4487e4fc0a193d0c974c21f00f +Author: qiyu-xie +Date: Wed Jan 13 14:03:52 2021 +0800 + + * Finish task#8973. + +commit dada3eaa513f195a18bf9ed331b7a615620ca3fb +Author: leiyong <1549684884@qq.com> +Date: Wed Jan 13 13:17:41 2021 +0800 + + * Fix bug. + +commit 2c4c3105e56d395d39d453bc5396af229a873419 +Author: leiyong <1549684884@qq.com> +Date: Wed Jan 13 11:47:15 2021 +0800 + + * Adjust the programplan modue code. + +commit 21dbd833af0d363edc4330f21af70b48dbbda801 +Author: leiyong <1549684884@qq.com> +Date: Wed Jan 13 11:09:15 2021 +0800 + + * Adjust code. + +commit dcab84ac7df43446e52b49758de1459490d54c55 +Author: leiyong <1549684884@qq.com> +Date: Wed Jan 13 10:58:43 2021 +0800 + + * Fix bug. + +commit a5342624702482de961792aaea2ca6dd6b8b1388 +Merge: df0113d622 433b7ea6ce +Author: tianshujie98 +Date: Wed Jan 13 10:16:08 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit df0113d62249088569e103dc7cd88173d4137ebd +Author: tianshujie98 +Date: Wed Jan 13 10:15:51 2021 +0800 + + * Finish task #9021. + +commit 433b7ea6ce1fa865fe519726a8b08f7d5c7dab62 +Author: hufangzhou <746775970@qq.com> +Date: Wed Jan 13 10:04:31 2021 +0800 + + * Adjust the high-light nav for edit product. + +commit 5083c2ef3e5471acd66936027bad9ac92b298bef +Author: leiyong <1549684884@qq.com> +Date: Wed Jan 13 09:57:34 2021 +0800 + + * Adjust code. + +commit 38f623a6c9974233b8ca8be44e4d04dae061229a +Author: Catouse +Date: Wed Jan 13 09:54:00 2021 +0800 + + * support jump between tabs from result of ajax form. + +commit 9d450de2b842e9eaf2679253291e08b41420361e +Author: Catouse +Date: Wed Jan 13 09:46:39 2021 +0800 + + * improve style of header-angle-btn. + +commit 49d9e635206e982986d5092b7e207343afde2800 +Author: leiyong <1549684884@qq.com> +Date: Wed Jan 13 09:41:01 2021 +0800 + + * Adjust the score module. + +commit 55cfcacd12e265582abbe287d165867efca95ed9 +Merge: 7c01251225 49cc743405 +Author: tianshujie98 +Date: Wed Jan 13 09:37:52 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 7c012512259a88af14f962c0431b54ec6d4db3c2 +Author: tianshujie98 +Date: Wed Jan 13 09:37:36 2021 +0800 + + * Finish task #9034. + +commit 49cc74340599da734e16536a3e1cacde721eece4 +Author: leiyong <1549684884@qq.com> +Date: Wed Jan 13 09:31:26 2021 +0800 + + * Finish task#9008. + +commit 5cee8138aacedd1bd49acd7aa91db8005c021469 +Author: leiyong <1549684884@qq.com> +Date: Wed Jan 13 09:30:38 2021 +0800 + + * Adjust CSS style. + +commit b40608a040e96b700c190fe1ed9b70b261b8f45b +Author: tianshujie98 +Date: Wed Jan 13 09:14:28 2021 +0800 + + * Finish task #9034. + +commit be708e1706ce8501fd0653e97feee4deefaac925 +Merge: 5ba0b5aaee 334c071a1d +Author: tianshujie98 +Date: Wed Jan 13 09:10:29 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 5ba0b5aaeeead71f7640739b79fa5e747547c972 +Author: tianshujie98 +Date: Wed Jan 13 09:07:21 2021 +0800 + + * Finish task #9021. + +commit aa7d6a0e3fb2380bbb2248e0004d831f7dd10920 +Author: tianshujie98 +Date: Wed Jan 13 09:05:11 2021 +0800 + + * Finish task #9034. + +commit 334c071a1de669a50284414c0c02332873a6a8d2 +Author: qiyu-xie +Date: Wed Jan 13 08:29:13 2021 +0800 + + * Finish task#8961. + +commit 652aa74347b938136591807ec3058d3edfef549a +Author: holan20180123 <56391770@qq.com> +Date: Wed Jan 13 08:28:59 2021 +0800 + + * Finish task #9030. + +commit fb841c9b05214dd1ac38f6b43782bfd9e42ee0f1 +Merge: 31c4f5eb87 b262c171b9 +Author: leiyong <1549684884@qq.com> +Date: Tue Jan 12 16:57:34 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 31c4f5eb871edfaafffff21493a80ea2b0349967 +Author: leiyong <1549684884@qq.com> +Date: Tue Jan 12 16:57:27 2021 +0800 + + * Finish task#9035. + +commit b262c171b9982bc9329522453456dbda621e07e8 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 12 16:56:13 2021 +0800 + + * Adjust the stage icon. + +commit 34d628fd8523820f93dc1ec9def9e3316ef520af +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 12 16:34:14 2021 +0800 + + * Finish task #9030. + +commit 4f0bad8b6170ffc2fa51e06d53336187d41ca4e7 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 12 16:20:49 2021 +0800 + + * Finish task #9009. + +commit 71b30750dc61dc36b15853cff8197e61c984c332 +Merge: 2625abc693 797f353864 +Author: tianshujie98 +Date: Tue Jan 12 15:08:38 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 2625abc693c669c82a661a42429b766bbf0e07fa +Author: tianshujie98 +Date: Tue Jan 12 15:08:13 2021 +0800 + + * Finish task #9021. + +commit 797f353864924ded85d3cc8eb2dede889eff27a1 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 12 14:50:21 2021 +0800 + + * Finish task#8958, task#8960. + +commit ece2a9a4ee099ac11097f7d20694ef4c83ae4b9a +Author: qiyu-xie +Date: Tue Jan 12 14:37:43 2021 +0800 + + * Finish task#8953. + +commit 7b70e95e38bc31332f740c9fd8e0577d02fd65fc +Author: qiyu-xie +Date: Tue Jan 12 14:21:05 2021 +0800 + + * Adjust code style. + +commit e6160c0a8b25b6c2173ea5cc42bfe52b034cfc13 +Author: qiyu-xie +Date: Tue Jan 12 14:18:11 2021 +0800 + + * Finish task#8961. + +commit f7e659a32d971ecbf04796cf0124e3801dd0c161 +Author: qiyu-xie +Date: Tue Jan 12 14:10:40 2021 +0800 + + * Finish task#8974. + +commit a93608d807f4146a52cb40738aac46139e69f0bf +Author: tianshujie98 +Date: Tue Jan 12 13:15:04 2021 +0800 + + * Finish task #8975. + +commit 3c3a5b8eaa170f3aefcfc9d762dac1c218ca7cc2 +Author: tianshujie98 +Date: Tue Jan 12 13:08:17 2021 +0800 + + * Finish task #8979. + +commit e6f6050a6bdb497560c7a3babdfceec8686dcf0f +Author: tianshujie98 +Date: Tue Jan 12 11:44:56 2021 +0800 + + * Finish task #9026. + +commit 8946c7131adac64f82be2204a2dec261346cc879 +Author: tianshujie98 +Date: Tue Jan 12 11:33:58 2021 +0800 + + * Modify language items. + +commit 149f253a9556d77eca2a2fc42f5560b5b1d40d65 +Merge: 78612fc2ed ef37c1c9e8 +Author: tianshujie98 +Date: Tue Jan 12 11:24:07 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 78612fc2ed3ad8c0b1eb6947ebc87cbc3cb12ea4 +Author: tianshujie98 +Date: Tue Jan 12 11:06:35 2021 +0800 + + * Finish task #9027. + +commit ef37c1c9e8f6735da19e31c62d14e2c9bb9a0fac +Author: qiyu-xie +Date: Tue Jan 12 10:56:16 2021 +0800 + + * Finish task#8981. Add milestone flag color. + +commit 5b1d7704747ead0dfdd864617e06d2effc3f3bb4 +Author: qiyu-xie +Date: Tue Jan 12 10:34:56 2021 +0800 + + * Finish task#8978. + +commit 09914c28d6a94b2d910e0e5bfc2d23de672fc2f9 +Author: Catouse +Date: Tue Jan 12 10:21:22 2021 +0800 + + * update icon-flag. + +commit e1e5f97a858c76a26a83b3f5a31835407a011cea +Merge: d4844012bd 4eedf2f08e +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 12 09:57:50 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit d4844012bd809a1efa64bca5f9ae3e526ee17502 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 12 09:57:39 2021 +0800 + + * Finish task #9009. + +commit 4eedf2f08ee04ba456c1eb31ba3a94ebc7cfdb18 +Author: qiyu-xie +Date: Tue Jan 12 09:46:18 2021 +0800 + + * Finish task#8981. + +commit bab4f75d19cf0ff1ab45a13a5ffd27d923aeb344 +Author: Yagami <976204163@qq.com> +Date: Tue Jan 12 09:08:03 2021 +0800 + + * Finish task #9036. + +commit 8604a02b7a3a3b23c73949852ccd85566a12c26b +Author: qiyu-xie +Date: Tue Jan 12 09:06:45 2021 +0800 + + * Finish task#8980. + +commit 783680314c328f5d9cd70401a4d7216a7ca32573 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 12 09:05:12 2021 +0800 + + * Finish task#8952. + +commit df3d5186a76c820b442fd930a437a79a66cc0013 +Author: qiyu-xie +Date: Tue Jan 12 08:26:28 2021 +0800 + + * Finish task#8984. + +commit ed5f574e7f117f2ccea32f61e3d3da197a46f0e7 +Author: qiyu-xie +Date: Tue Jan 12 08:07:10 2021 +0800 + + * Adjust stage list column width. + +commit 691e9bfcf6792d73c653c7f632799805990d981e +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 11 16:54:05 2021 +0800 + + * Finish task 8999. + +commit c2f093ac5a5f078122a2042a7769e88d353d0b66 +Merge: a71a7bd758 937fc1f7e2 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 11 16:51:23 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit a71a7bd7589256e9bcd5a71bb3e05d20b61a64de +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 11 16:51:10 2021 +0800 + + * Finish task #9030. + +commit 937fc1f7e272e999d530fc4db62e630b633acc9f +Author: qiyu-xie +Date: Mon Jan 11 16:47:52 2021 +0800 + + * Finish task#8982. + +commit 3008fe0292b03e1851fcacf966548f82d064d850 +Author: Yagami <976204163@qq.com> +Date: Mon Jan 11 16:45:21 2021 +0800 + + * Finish task #8954. + +commit bae9c6ccece7597ed99ccb9ce4e58508bec4d25b +Author: qiyu-xie +Date: Mon Jan 11 16:41:24 2021 +0800 + + * Finish task#8985. + +commit de3a853e2c00f681cffd54ad141760f65a7fb772 +Author: qiyu-xie +Date: Mon Jan 11 16:37:45 2021 +0800 + + * Finish task#8983. + +commit 02e2c34235a1bf1c6b0ea003fb2d1f7d1e1a4872 +Author: qiyu-xie +Date: Mon Jan 11 16:29:41 2021 +0800 + + * Finish task#8985. + +commit bfca8fb7c0740861568c22f679b0c8bf752323e5 +Author: Catouse +Date: Mon Jan 11 16:25:45 2021 +0800 + + * task #9032, expand nest children after page load. + +commit 39ab0a01c0eca3763c53fb9ce651d7e69230e62a +Author: leiyong <1549684884@qq.com> +Date: Mon Jan 11 16:24:39 2021 +0800 + + * Adjust code. + +commit e104d8a3736d2d4da926f65c355137b22ba25a3d +Author: tianshujie98 +Date: Mon Jan 11 16:04:19 2021 +0800 + + * Finish task #9037. + +commit 1fbe393e7620d154459955d1853656151b95090f +Author: leiyong <1549684884@qq.com> +Date: Mon Jan 11 15:54:04 2021 +0800 + + * Finish task#9031. + +commit 23a63aa149c86c221c94043dd6cc4e48ec61dd8f +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 11 09:02:35 2021 +0800 + + * Adjsut the code. + +commit cb82d1a9c3e4b99e3a21fd8320db5b0aada3b25b +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 8 18:39:02 2021 +0800 + + * Fix a bug. + +commit f478fd2b09ffcd69c16af890f9bf107f23c30fcd +Merge: 4b3f4edd3c 5991783328 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 8 17:24:19 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 4b3f4edd3c7724e453113036c9db356b02b38c9e +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 8 17:24:15 2021 +0800 + + * Finish task#8932. + +commit 5991783328df9cd5ebf76d9aa39646d2a0bc7ca7 +Author: qiyu-xie +Date: Fri Jan 8 16:58:00 2021 +0800 + + * Modify program belong to project list at product. + +commit e58726f7abf949a696a2d715b1d529c491458dec +Author: Yagami <976204163@qq.com> +Date: Fri Jan 8 16:51:35 2021 +0800 + + * Fix makefile. + +commit a409feb54a935c07d3bde83997870a21e2c1236e (tag: zentaopms_20.0.beta3_20210108, tag: zentaopms_13.0.beta3_20210108) +Author: Yagami <976204163@qq.com> +Date: Fri Jan 8 16:31:31 2021 +0800 + + * Fix makefile. + +commit dff3f8a676f19198ee7bf971428d6ebf19d5209c +Author: Yagami <976204163@qq.com> +Date: Fri Jan 8 16:30:16 2021 +0800 + + * Fix details. + +commit f4d9fc7c1757a194ba514a4842291d6a0f84b3c0 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 8 16:27:31 2021 +0800 + + * Adjust code. + +commit 347cc63d7457257cfe161a55da5b8b44f08ab589 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 8 16:13:42 2021 +0800 + + * Adjust style. + +commit 019cbb291573f5592f7f99c5cbb5881bfb327b8f +Author: Catouse +Date: Fri Jan 8 16:06:29 2021 +0800 + + * fix modal not show after init sometimes. + +commit eee118f742d4609184be513d903e2ca99e59ff1d +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 8 15:49:21 2021 +0800 + + * Fix bug. + +commit 19717ee532071b890973e70410f78c5f20fa3793 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 8 15:27:06 2021 +0800 + + * Fix bug. + +commit e9ffa660c6d7c54876d3d351f3c51a1a822c8e4a +Author: tianshujie98 +Date: Fri Jan 8 15:22:58 2021 +0800 + + * Modify lang item. + +commit 95a8b485d8acc36c089ee3d47a030cd07d4777f4 +Author: Yagami <976204163@qq.com> +Date: Fri Jan 8 15:15:55 2021 +0800 + + * Fix details. + +commit fb232f503a79894ec70bdaec648987f1ce8da035 +Author: Catouse +Date: Fri Jan 8 15:08:33 2021 +0800 + + * fix url jumping rules. + +commit cc6a0eac860564be11050a6a33467559a9012289 +Author: Catouse +Date: Fri Jan 8 15:06:32 2021 +0800 + + * fix modalTrigger not work as expected sometimes. + +commit 895047c352be174b44c1181b403ccb9993741888 +Author: Yagami <976204163@qq.com> +Date: Fri Jan 8 15:04:23 2021 +0800 + + * Fix bug. + +commit c77ed521fd1640aa8818943e1f10418f84987804 +Author: Yagami <976204163@qq.com> +Date: Fri Jan 8 14:57:07 2021 +0800 + + * Fix details. + +commit 1b74e246b13e424bc9a8ce0d61a933afd0ab0ace +Merge: 7642717d2b 6141eb8ca0 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 8 14:52:42 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 7642717d2b1e276e9a63ca43dedbc51604390f04 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 8 14:52:38 2021 +0800 + + * Finish task#8934. + +commit 6141eb8ca0911dc4a6e1d6b72fd0ed1a4cc77dee +Author: Yagami <976204163@qq.com> +Date: Fri Jan 8 14:27:14 2021 +0800 + + * Add version. + +commit 65870829edb0d8aaf3b39f4a74a3ba9cd3643dbc +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 8 14:07:16 2021 +0800 + + * Adjust code, + +commit d5164338e6205c2bd20c7e106e249409a08ec105 +Author: Yagami <976204163@qq.com> +Date: Fri Jan 8 13:53:28 2021 +0800 + + * Add upgrade logic. + +commit 726c0e5336cadd8d178219597fa0cc5246e2aa06 +Author: tianshujie98 +Date: Fri Jan 8 13:49:44 2021 +0800 + + * Adjustment field. + +commit da82d34d9fd8934a5fb9e4e5c2aa0dfc497195bd +Author: Yagami <976204163@qq.com> +Date: Fri Jan 8 13:47:03 2021 +0800 + + * Fix common lang. + +commit 3173a7b53a91d593b65741d2ec22d11da9d4be43 +Author: Yagami <976204163@qq.com> +Date: Fri Jan 8 13:40:34 2021 +0800 + + * Fix details. + +commit 79beb03ce6384a498b1209b6ac70a6d860482668 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 8 13:40:11 2021 +0800 + + * Finish task #8938. + +commit 68709d8d055914821c598bec8317748d5a671f73 +Author: Yagami <976204163@qq.com> +Date: Fri Jan 8 13:33:59 2021 +0800 + + * Add lang file. + +commit aeee54b1f36bc529b6be4cec63fc5197b16aea2f +Author: Yagami <976204163@qq.com> +Date: Fri Jan 8 13:30:50 2021 +0800 + + * Add upgrade repo logic. + +commit 6b098e42b9e24f56b06f109ce64965a419848e5f +Author: qiyu-xie +Date: Fri Jan 8 13:28:16 2021 +0800 + + * Finish task#8948. + +commit 6239b084e7929dff6c25df84071cd978b9455314 +Author: tianshujie98 +Date: Fri Jan 8 13:09:00 2021 +0800 + + * Finish task #8929. + +commit 6dacf9797797b0135f4471974a8ee1bae136689a +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 8 11:06:16 2021 +0800 + + * Finish task #8949. + +commit 0652665993a82905e9ac54f2036a2af668803ecf +Author: qiyu-xie +Date: Fri Jan 8 10:40:47 2021 +0800 + + * Fix bug. + +commit a3be778fe164cd47fafde938256513435b798da3 +Author: qiyu-xie +Date: Fri Jan 8 10:36:10 2021 +0800 + + * Restore code. + +commit 1bf682414841579f69c092dffcaf7275a80445ff +Author: qiyu-xie +Date: Fri Jan 8 10:29:41 2021 +0800 + + * Acl list display error when create child program. + +commit 2341034e4d1e84c5095b969aa83a5e3ccc1e8218 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 8 09:53:47 2021 +0800 + + * Finish task #8935. + +commit e144b3f18bcc3c344ab18a64464d5115eab1d66c +Author: qiyu-xie +Date: Fri Jan 8 09:47:18 2021 +0800 + + * Fix bug: Create budget has error. + +commit fc866e6b10b8fddda1aa7df71b41d9a784f983ae +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 8 09:44:04 2021 +0800 + + * Finish task 8935. + +commit 79d5ace4e41b327a0830b2dbb674bad0e441506b +Author: qiyu-xie +Date: Fri Jan 8 09:31:06 2021 +0800 + + * Fix bug. + +commit d1a7d75584113634c7017690853fc364ddd4b663 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 8 09:30:28 2021 +0800 + + * Finish task 8936. + +commit f05ae3a3761615e1dbda2516aa6affd6a6d61e41 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jan 8 09:09:39 2021 +0800 + + * Finish task #8925. + +commit 3a7fdb72344afe78306e85dabe8c5108b7946b2b +Author: qiyu-xie +Date: Fri Jan 8 09:04:01 2021 +0800 + + * Finish task#8951. Delete useless files. + +commit 0e93f81de6c3453d40e52fa4702b75f16bd5fb88 +Author: qiyu-xie +Date: Fri Jan 8 08:58:04 2021 +0800 + + * Finish task#8951. + +commit 55902954b833d3e4fde61951630c950b3ee5977d +Author: tianshujie98 +Date: Fri Jan 8 08:25:41 2021 +0800 + + * Finish task #8931. + +commit 098fc50cc0af6ab1cb62c29fc1e45cf7aac5a11f +Author: Yagami <976204163@qq.com> +Date: Thu Jan 7 13:35:27 2021 +0800 + + * Fix program product and project details. + +commit 006dfcc733aca1e784c347e474f605879c4bccfa +Author: Yagami <976204163@qq.com> +Date: Thu Jan 7 13:15:36 2021 +0800 + + * Fix doc button. + +commit afa22848f706371383e23a7bd647d802cc66b28d +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 7 13:11:50 2021 +0800 + + * Finish task #8928. + +commit 7d9166bf8e13eb53e4a1d5e4a2e9b10474e18cc3 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 7 13:02:44 2021 +0800 + + * Finish task #8942. + +commit def447c084bdbb6e46d17af7797cc1e5625c961f +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 7 09:21:38 2021 +0800 + + * Finish task #8945. + +commit af4fe0b6ccbc0dd154001fb7e9971919c8f85b90 +Author: tianshujie98 +Date: Thu Jan 7 09:19:54 2021 +0800 + + * Finish task #8940. + +commit de3fe93b83f984a9c0f1d26ac1a3582bd9c8e7df +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 7 09:19:51 2021 +0800 + + * Finish task #8946. + +commit 1e0bc6d190cd896a5ec5327b1249fb4934e2ff79 +Merge: abfe2db327 782f3f1c07 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 7 09:18:52 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit abfe2db32718a1b005f10024cf70dfda52a30338 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 7 09:18:39 2021 +0800 + + * Finish task#8930. + +commit 782f3f1c0774f69cd384b5c1e92a7e4162792445 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 7 09:18:26 2021 +0800 + + * Finish task #8947. + +commit 6ce948e2d3d011c6474ffbc231beb43ea4fea97a +Author: holan20180123 <56391770@qq.com> +Date: Thu Jan 7 09:17:05 2021 +0800 + + * Finish task #8941. + +commit f3008106de33e3b904a6414fdfae73121b2b489b +Merge: 46d0097157 06d0fbd67f +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 7 09:15:33 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 46d00971576e859b213a2ddd6a1ddc8efe9b7ab9 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 7 09:15:27 2021 +0800 + + * Finish task#8939. + +commit 06d0fbd67fadc3e6c143f9527a9af761283f1bbc +Author: qiyu-xie +Date: Thu Jan 7 09:14:12 2021 +0800 + + * Finish task#8937. + +commit 2c6b6abcce8dbd7edf847b28f0fd4ad247defdc6 +Author: qiyu-xie +Date: Thu Jan 7 09:12:24 2021 +0800 + + * Finish task#8933. + +commit 97db0e270418c6de45f066d7787c31fafd59dd19 +Merge: 6561301b92 e2cb73bada +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 7 09:12:42 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 6561301b9266aab13df33b555c10d93946513375 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 7 09:12:37 2021 +0800 + + * Finish task#8943. + +commit e2cb73bada58288e22231fd24cb9e6b19275aed5 +Author: tianshujie98 +Date: Thu Jan 7 09:12:03 2021 +0800 + + * Finish task #8926. + +commit aeb2994043f8417c0ebd97f259e203947fb3454f +Merge: 743f3a455e 653fb58e9b +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 7 09:10:41 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 743f3a455ea14b866e5a1dc29e6d2db519b119c7 +Merge: 81f8145887 1e3eb4eec5 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 7 09:10:26 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 653fb58e9b821f02f19414082ffea0972f7cf7d4 +Author: tianshujie98 +Date: Thu Jan 7 09:10:06 2021 +0800 + + * Finish task #8924. + +commit 81f814588733a244c8c362cdc2472c5fd1f6664c +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 7 09:10:23 2021 +0800 + + * Finish task#8944. + +commit 1e3eb4eec55de15961cb48af9f28a32d52fa640e +Author: qiyu-xie +Date: Thu Jan 7 08:49:57 2021 +0800 + + * Fix notes. + +commit 16eb08ca696b11afa588331bae8e34361160689b +Merge: fdee734a29 650adb0792 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 7 08:48:08 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit fdee734a29d6aabce1604f5b6515fcc26f0739f8 +Author: hufangzhou <746775970@qq.com> +Date: Thu Jan 7 08:48:02 2021 +0800 + + * Add the icon. + +commit 650adb0792ae8496e429f94ceec1e857ba1951b1 +Author: Catouse +Date: Wed Jan 6 16:44:42 2021 +0800 + + * refactor. + +commit 99cb8398ccb07c7a3e559d56dd9a1ebfb49b6fb8 +Author: Catouse +Date: Wed Jan 6 16:36:13 2021 +0800 + + * fix $.parseLink not work. + +commit 917894f51d402b5ab25b652165ddd9c992ef6eb8 +Author: Yagami <976204163@qq.com> +Date: Wed Jan 6 16:21:29 2021 +0800 + + * Remove unused code. + +commit 31cf1afaa5e9e79e089a8c2eb95e0c727b99c560 +Author: Catouse +Date: Wed Jan 6 15:31:57 2021 +0800 + + * improve UI of index page for multi-languages and all themes. + +commit 34c0de63d5e55acede9a4f5ccf012f713e47e1c6 +Author: Catouse +Date: Wed Jan 6 14:34:24 2021 +0800 + + * task #8913, refactor UI of menu. + +commit 748942b9f92473c56ce3f6fb1918240259c2fd46 +Author: Catouse +Date: Wed Jan 6 11:21:34 2021 +0800 + + * update icons. + +commit 8d1415382c6f0d6b170621daf3cc216221d040d3 +Author: Catouse +Date: Wed Jan 6 10:18:56 2021 +0800 + + * refactor: remove empty line. + +commit ea2d83c2e9689e109314b4d4cfd4e58a3a82511c +Author: Catouse +Date: Wed Jan 6 10:17:16 2021 +0800 + + * add global jump rules. + +commit 8824691d13d27ada45b435a94d552689d05d4a1a +Merge: ec0e9caaea 01ee5d341a +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 5 17:00:46 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit ec0e9caaeab3fbaefa7b244c67effa981c8054e6 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 5 17:00:43 2021 +0800 + + * Finish task#8911. + +commit 01ee5d341afd426401174f983ceddb8fc0a58792 +Merge: 261aa99f68 e35c52fad5 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 5 16:51:47 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 261aa99f688e24ed983238f40c93d40a4cb26aac +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 5 16:51:31 2021 +0800 + + * Finish task #8913. + +commit e35c52fad5e8bd85475d03a28aa4f3d1d89d709e +Merge: c2d6514206 1101f8de43 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 5 16:32:42 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit c2d65142065295988ba973efb2feeab6f7e7af09 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 5 16:32:39 2021 +0800 + + * Adjust the button style. + +commit 1101f8de4318b7a353169ddb94ff532db6cf5519 +Author: tianshujie98 +Date: Tue Jan 5 16:28:26 2021 +0800 + + * Finish task #8908. + +commit e9ef2b399d08c2b06620f6a60058f44567dc65e5 +Author: qiyu-xie +Date: Tue Jan 5 16:21:27 2021 +0800 + + * Finish task#8909. + +commit cb0053e003daf89145181ddeebe37d0c93f3f2a8 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jan 5 16:07:14 2021 +0800 + + * Finish task #8910. + +commit e61df30aceb5139695bc1db9d166efa39d5251e6 +Author: qiyu-xie +Date: Tue Jan 5 16:04:04 2021 +0800 + + * Modify notes and adjust code style. + +commit 81abf09bcce1321efa6c049e3e812d65f273efe9 +Author: Yagami <976204163@qq.com> +Date: Tue Jan 5 15:17:09 2021 +0800 + + * Remove no used code. + +commit 6245d0a611a7f9e7d7ce5de6181610db839ea237 +Author: Yagami <976204163@qq.com> +Date: Tue Jan 5 14:48:38 2021 +0800 + + * Fix code style. + +commit d46fa6e7355de8aa27dbd73af0539fedf15d6b47 +Author: qiyu-xie +Date: Tue Jan 5 14:36:15 2021 +0800 + + * Adjust code style. + +commit 95c868c6cf317c47329b99c0a246fe10d2c70316 +Author: Catouse +Date: Tue Jan 5 13:53:17 2021 +0800 + + * open program/prjcreate in project group tab. + +commit 43e33362f11f572421ca83f8ed820d85e0053c0b +Author: Catouse +Date: Tue Jan 5 13:48:28 2021 +0800 + + * fix active wrong group on refresh page sometimes. + +commit f0bc10048c08afe151f58cdfd81df02a660c1a1f +Author: qiyu-xie +Date: Tue Jan 5 13:33:54 2021 +0800 + + * Modify notes and adjust code style. + +commit 9846e2e6969f7d3e232d0f01b05e065ad4e94ea8 +Author: tianshujie98 +Date: Tue Jan 5 13:23:29 2021 +0800 + + * Adjust table. + +commit 4f7f1ae1eaaf92d7444ef680fad154062fa36e43 +Author: Catouse +Date: Tue Jan 5 13:07:47 2021 +0800 + + * improve style of dropdown menu in userNav on mouse hover. + +commit be2bf287871a8219d4807a1c3620fc991c9845c5 +Author: Catouse +Date: Tue Jan 5 13:05:02 2021 +0800 + + * support for opening help page in tab. + +commit 5844c6d2035c483b6f3481a1cb53eeed8890f034 +Author: Catouse +Date: Tue Jan 5 11:22:01 2021 +0800 + + * fix update browser url after close tab. + +commit b38ae23b2648dc2b03b921dbe06e791270df96e6 +Author: Yagami <976204163@qq.com> +Date: Tue Jan 5 10:59:52 2021 +0800 + + * Remove no used code. + +commit 184e4cab12b743ed7f5c44fecdecdd94750683b1 +Merge: 241ce3fc53 7515d3359b +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 5 10:10:06 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 241ce3fc5345cd7e92627abbb7e92569b20d8d63 +Author: hufangzhou <746775970@qq.com> +Date: Tue Jan 5 10:10:02 2021 +0800 + + * Adjust the summary of the task hours in my module. + +commit 7515d3359bb9e4fbd6dc8e8c4b0b2f4dc33bfa9b +Author: Yagami <976204163@qq.com> +Date: Tue Jan 5 09:54:18 2021 +0800 + + * Fix divider style. + +commit d343a5c60ae07da62f6011f982804fce03019959 +Author: leiyong <1549684884@qq.com> +Date: Mon Jan 4 22:24:23 2021 +0800 + + * Adjust code. + +commit 1eecce1045355ef7d55c2c947f23befad57d83b1 +Author: leiyong <1549684884@qq.com> +Date: Mon Jan 4 22:10:41 2021 +0800 + + * Adjust icons; + +commit 2f55a982c80d2f1bf7d21512eab84d6e868c3442 +Author: leiyong <1549684884@qq.com> +Date: Mon Jan 4 18:37:32 2021 +0800 + + * Fix bug. + +commit 1be1fb5432ac8a71851869b4c3050f0414135226 +Author: qiyu-xie +Date: Mon Jan 4 17:27:54 2021 +0800 + + * Add future when proram budget is empty. + +commit be2dc5224564483df53fc14e12a82ba47ff970ce +Author: Catouse +Date: Mon Jan 4 16:52:14 2021 +0800 + + * fix setting of wrong data-nest-path. + +commit 0d0d76800cc4ece9b84cb97fc5fb801891966043 +Author: qiyu-xie +Date: Mon Jan 4 16:42:36 2021 +0800 + + * Fix notes and adjust code style. + +commit 020868ad47cb0804d0dc0eea5a230f4c1cb8b320 +Merge: 9884fe8e57 17e990131e +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 4 16:36:14 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 9884fe8e57b8d92c3562b4e7567670ad4fefdaab +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 4 16:36:12 2021 +0800 + + * Adjust the product branch switcher of the productplan and release. + +commit 17e990131e02196ed7d5c3cdc8c9054ffd9b4023 +Author: Catouse +Date: Mon Jan 4 16:29:43 2021 +0800 + + * update zentao icons. + +commit c0e9b9d1feabedd86cddfcced5246e8338d6196e +Author: Yagami <976204163@qq.com> +Date: Mon Jan 4 16:02:57 2021 +0800 + + * Add en lang. + +commit d1801f772bfe78358e06d82023302aca401c3b16 +Author: Yagami <976204163@qq.com> +Date: Mon Jan 4 15:42:23 2021 +0800 + + * Add program menu. + +commit 6ca76cebb8f6d3b3cefeab623a4c2621603aacfe +Author: Yagami <976204163@qq.com> +Date: Mon Jan 4 14:29:37 2021 +0800 + + * Fix detail. + +commit 51577dc1f38b1da5a96f6551dfedf1f4eeea1b07 +Author: leiyong <1549684884@qq.com> +Date: Mon Jan 4 15:32:21 2021 +0800 + + * Adjust my site story list style. + +commit ee27a466339fc4cae3f3f667fe35c8b2f561f3d3 +Author: tianshujie98 +Date: Mon Jan 4 15:19:36 2021 +0800 + + * Adjust code style. + +commit 65c7efd29e4373164116f74e7f1c4ef4337e1a55 +Author: leiyong <1549684884@qq.com> +Date: Mon Jan 4 14:40:59 2021 +0800 + + * Adjust the index module style. + +commit d83350c5e7a41c60f086a49b136bd3340ddfa467 +Author: leiyong <1549684884@qq.com> +Date: Mon Jan 4 14:22:54 2021 +0800 + + * Adjust code. + +commit 0d65efe2d5a207cd7f2d314ac3c3d9db93cf7357 +Author: qiyu-xie +Date: Mon Jan 4 14:10:02 2021 +0800 + + * Delete extra code. + +commit 09cb93271aa925fd18b5594931ff2751cc40df63 +Author: tianshujie98 +Date: Mon Jan 4 11:11:59 2021 +0800 + + * Two decimal places. + +commit 89a72ecbe60a39be3a83fd19ce76a011135ea661 +Author: tianshujie98 +Date: Mon Jan 4 10:59:49 2021 +0800 + + * Delete sort judgment. + +commit c0e0dc22474e8c4e53b05c20614812c71eda62a0 +Merge: 26c5429693 7145a20f23 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 4 11:00:06 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 26c5429693c80d0ac9fccfc5abc90be204621f65 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 4 11:00:03 2021 +0800 + + * Fix a bug. + +commit 7145a20f232edecb3e71df601bef202794c66bea +Author: qiyu-xie +Date: Mon Jan 4 10:42:50 2021 +0800 + + * Change close button. + +commit f0875ea27a49da353022d2f826301bdf4ea8a714 +Author: tianshujie98 +Date: Mon Jan 4 10:42:31 2021 +0800 + + * Restore code. + +commit b2c962d4d4082f99537331fd7d5eaa3072b90258 +Author: tianshujie98 +Date: Mon Jan 4 09:57:25 2021 +0800 + + * Reduction. + +commit 5fe3c416d0c691384ecd00497638651ed72ee33c +Author: Catouse +Date: Mon Jan 4 09:56:30 2021 +0800 + + * improve style of icons in pgm dropmenu. + +commit d5f35eb927e9ee9a569753798216d8deb6da8ff8 +Author: qiyu-xie +Date: Mon Jan 4 09:50:27 2021 +0800 + + * Finish task#8874. + +commit db4901cb351ea24c754c609bfe094fb15e0f4d4a +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 4 09:49:12 2021 +0800 + + * Fix a bug. + +commit dc2e0470e93e7268d258a164921d183d714c03f8 +Merge: bf980bc903 b56cd97100 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 4 09:22:27 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit bf980bc90351d2ab8297feb3d0516b0af3391922 +Author: hufangzhou <746775970@qq.com> +Date: Mon Jan 4 09:22:22 2021 +0800 + + * Fix a bug. + +commit b56cd971004cc277576687e18e0151921617b64b +Author: Catouse +Date: Mon Jan 4 09:12:24 2021 +0800 + + * fix program icon in index page. + +commit ed6226c6a4e5201afe11b3468201fd474a975c9e +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 4 09:05:04 2021 +0800 + + * Modify the style of the progress. + +commit 91614f02f5e402ae3151a4e44c332a677dd94e56 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 4 08:23:25 2021 +0800 + + * Finish task #8900. + +commit 6ac59d724e747ae68f4753f34403061dfcba16cf +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 4 08:19:40 2021 +0800 + + * Finish task #8886. + +commit 168829d4d32606c34b4be7ee78f5fe1cb7a311fc +Author: holan20180123 <56391770@qq.com> +Date: Mon Jan 4 08:17:36 2021 +0800 + + * Finish task #8886. + +commit 7d0de331709854e26eb5677017311c7aa34680ef +Author: Catouse +Date: Sun Jan 3 19:06:57 2021 +0800 + + * improve UI of menuToggle of index page. + +commit eeb59da6f5284a5be2d683e09e5598579f9fd403 +Author: leiyong <1549684884@qq.com> +Date: Sun Jan 3 17:31:40 2021 +0800 + + * Adjust logo. + +commit 698ef9ae277c0b363b9f1b3c1f95d6d624ccc977 +Merge: 4f55d2ca3e e8fe153bab +Author: hufangzhou <746775970@qq.com> +Date: Sun Jan 3 17:10:26 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 4f55d2ca3e415a4508a0be084f04ace192296aaa +Author: hufangzhou <746775970@qq.com> +Date: Sun Jan 3 17:10:24 2021 +0800 + + * Adjust the style. + +commit e8fe153babd3b08f59eb95ada76df864ae7f0af1 +Merge: 1d0f3a7f81 ce8ef6e73f +Author: sgm0422 <976204163@qq.com> +Date: Sun Jan 3 17:08:24 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 1d0f3a7f81ff8d3d698d1cb8810f33def20606ce +Author: sgm0422 <976204163@qq.com> +Date: Sun Jan 3 17:08:16 2021 +0800 + + * Fix details. + +commit ce8ef6e73f95a85c56f8de95639bd68f9e3506ad +Merge: c446e82726 3c46a33200 +Author: hufangzhou <746775970@qq.com> +Date: Sun Jan 3 16:54:44 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit c446e827260dd21f58a348d32bcb267c7264681c +Author: hufangzhou <746775970@qq.com> +Date: Sun Jan 3 16:54:41 2021 +0800 + + * Adjust the code. + +commit 3c46a33200db1e47c03aab2644335677ebc6eed0 +Author: leiyong <1549684884@qq.com> +Date: Sun Jan 3 16:37:43 2021 +0800 + + * Adjust code. + +commit 8ba4d56093aa9513ac59aa6413d4f3e030ccdaac +Merge: 7d03d80108 0168644d98 +Author: hufangzhou <746775970@qq.com> +Date: Sun Jan 3 16:25:37 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 7d03d801084494f48346d41c3fbb0ab36cc806da +Author: hufangzhou <746775970@qq.com> +Date: Sun Jan 3 16:25:35 2021 +0800 + + * Adjust the code. + +commit 0168644d98f24664cc5f5aa7a454dfba809f7972 +Author: leiyong <1549684884@qq.com> +Date: Sun Jan 3 15:49:00 2021 +0800 + + * Adjust code. + +commit edc0244e065825f350e5c6d86b63c1aa5330137d +Merge: 72666ee3c6 f08e8c0d2d +Author: hufangzhou <746775970@qq.com> +Date: Sun Jan 3 15:46:16 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 72666ee3c6f0155d9bb1306c5c1d3bd3ad5a8a07 +Author: hufangzhou <746775970@qq.com> +Date: Sun Jan 3 15:46:13 2021 +0800 + + * Adjust the code. + +commit f08e8c0d2d82a840ef16829f5d88d7a454538cc9 +Merge: ef4eaeff59 10a6c69402 +Author: sgm0422 <976204163@qq.com> +Date: Sun Jan 3 15:43:47 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit ef4eaeff5927fbbb542ca5d58911f6deea3654df +Author: sgm0422 <976204163@qq.com> +Date: Sun Jan 3 15:43:35 2021 +0800 + + * Fix details. + +commit 10a6c69402d92dd4831a95b869c6cfc0b888d9c5 +Author: leiyong <1549684884@qq.com> +Date: Sun Jan 3 15:35:36 2021 +0800 + + * Adjust the my module task. + +commit 09495180fdafd85353713cb38a157661526150ad +Author: leiyong <1549684884@qq.com> +Date: Sun Jan 3 15:31:13 2021 +0800 + + * Adjust testcase. + +commit 2acf62b3dcaff79d414b47d66aca8b3932cbd00f +Merge: 15c241feed d58b81a0c2 +Author: sgm0422 <976204163@qq.com> +Date: Sun Jan 3 15:06:15 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 15c241feed3752e4361876a81ee0f8ec3f06b699 +Author: sgm0422 <976204163@qq.com> +Date: Sun Jan 3 15:06:02 2021 +0800 + + * Reset URSR config. + +commit 9b08d19c22edbafa1f73e408fc117b4461df5038 +Author: sgm0422 <976204163@qq.com> +Date: Sun Jan 3 15:05:36 2021 +0800 + + * Fix details. + +commit d58b81a0c2fdef398b2073833c3a1646408462a2 +Author: hufangzhou <746775970@qq.com> +Date: Sun Jan 3 14:43:45 2021 +0800 + + * Adjust the nav. + +commit 81aa918aa37766134694296738cb47120efb4a23 +Author: leiyong <1549684884@qq.com> +Date: Sun Jan 3 14:20:55 2021 +0800 + + * Adjust testcase. + +commit a7dd5c51ea888ba11cee5eef942b9cbf8a26e093 +Author: leiyong <1549684884@qq.com> +Date: Sun Jan 3 14:17:56 2021 +0800 + + * Adjsut testtask. + +commit 48335d317f667428a9cc49ef0cd36185fa2b9cf8 +Merge: 6c6161562a 6c7b6f837d +Author: sgm0422 <976204163@qq.com> +Date: Sun Jan 3 14:08:49 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 6c6161562a09daee6f3541e07376b22a8085cbf3 +Author: sgm0422 <976204163@qq.com> +Date: Sun Jan 3 14:08:37 2021 +0800 + + * Fix program and project budget. + +commit 6c7b6f837d225d70b8cd203b89d91df2ff244b07 +Author: leiyong <1549684884@qq.com> +Date: Sun Jan 3 14:06:42 2021 +0800 + + * Adjust style. + +commit 7acd4a0ba32dfea1bb653e4a7493f9457c2a0e16 +Author: leiyong <1549684884@qq.com> +Date: Sun Jan 3 14:02:00 2021 +0800 + + * Adjust code. + +commit 670ea7c68aa9707f474f9d08a12e267bf847e0b3 +Author: sgm0422 <976204163@qq.com> +Date: Sun Jan 3 13:56:11 2021 +0800 + + * Fix menu. + +commit 7cb90754dff1cd07d402165bc2c6c93c17391547 +Author: sgm0422 <976204163@qq.com> +Date: Sun Jan 3 13:32:23 2021 +0800 + + * Fix details. + +commit 3b79f481e9d54a21c63c411dc18d6befeb55aa96 +Author: Catouse +Date: Sat Jan 2 16:15:22 2021 +0800 + + * task #8747, change icons style in programs list. + +commit e3ac1e6318c1cc47e9f3dbf757bbb97005033cfe +Author: Catouse +Date: Sat Jan 2 16:14:38 2021 +0800 + + * task #8747, change icons style in programs list. + +commit 09ccc2739decd29d21a0a47dd3ffd51168f22937 +Author: sgm0422 <976204163@qq.com> +Date: Sat Jan 2 15:08:54 2021 +0800 + + * Fix details. + +commit 28c5ce17b9b56e7a6fd55f547b4b1f9a61480bcb +Author: sgm0422 <976204163@qq.com> +Date: Sat Jan 2 11:10:01 2021 +0800 + + * Fix details. + +commit f0d41aacac3a8edfbe324cf68ff77923b193092a +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 1 16:43:53 2021 +0800 + + * Finish task#8891. + +commit 45428204be66a8851e9dbbfbdccb429cb9794cd7 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 1 16:35:27 2021 +0800 + + * Finish task#8888. + +commit 7a5de6696da86f291a604258b31e463fe46f721a +Merge: 2e0528134c fc314c104f +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 1 16:28:21 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 2e0528134cd851e01879419a8df9160f20f3ccfb +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 1 16:28:16 2021 +0800 + + * Adjust the code. + +commit fc314c104fc1fb900a9745a1afa8e4f1858eecd6 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 1 16:24:30 2021 +0800 + + * Finish task#8887. + +commit 91b3146bb507878d447f8b9a2392bf27d082d555 +Author: Yagami <976204163@qq.com> +Date: Fri Jan 1 16:16:02 2021 +0800 + + * Fix my story style. + +commit cc8d5d63f637f34040ce7101b61ad15cd47102e2 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 1 16:09:37 2021 +0800 + + * Finish task#8880. + +commit f2a39a0dbcf5857448b5db34df76941983e82e68 +Author: Yagami <976204163@qq.com> +Date: Fri Jan 1 16:03:51 2021 +0800 + + * Add product program project menu group. + +commit a624a499f26938cd0b62adc0e6f601312d584fb0 +Author: Yagami <976204163@qq.com> +Date: Fri Jan 1 09:29:30 2021 +0800 + + * Finish task #8879. + +commit 5baf41d5e3f66f11fcd042b0fb0936739241db64 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 1 15:49:59 2021 +0800 + + * Adjust icons. + +commit 211901563682b1b54d1b8d6b182aa81960275e5a +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 1 15:26:09 2021 +0800 + + * Add the product switcher to doc page. + +commit 3b6ad5e87151f49f1e0e61ff39a65b236315aad5 +Merge: abd9b39619 f353c56b70 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 1 15:16:37 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit abd9b396197880e417330e215f66402aa43c2b2c +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 1 15:16:34 2021 +0800 + + * Finish task#8868, task#8873. + +commit f353c56b70833fb220a8390f04e51880f10069ef +Author: tianshujie98 +Date: Fri Jan 1 14:50:53 2021 +0800 + + * Add PRJ. + +commit 9d7aa70bbb96244e871a1ae73722ec956c2fce05 +Author: tianshujie98 +Date: Fri Jan 1 14:45:43 2021 +0800 + + * Add PRJ. + +commit 80942a7de1d10265d0b0cb91509b5546671044a4 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 1 14:40:45 2021 +0800 + + * Finish task#8870. + +commit 32a097d03fdfff45b83bd37680bd4b7c435187bd +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 1 14:37:46 2021 +0800 + + * Finish task#8875. + +commit 970f3e11a532c8eebbc8306ef9b4929435214e63 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 1 14:37:16 2021 +0800 + + * Adjust the batchedit method icons. + +commit 5cc89dc76b0b628eccc7f13f24a7e10440f449aa +Author: tianshujie98 +Date: Fri Jan 1 14:25:26 2021 +0800 + + * Fix bug. + +commit cde1f2cdba2274cbc6e221eac591a28b15364aca +Author: tianshujie98 +Date: Fri Jan 1 14:24:55 2021 +0800 + + * Finish task #8902. + +commit d46ce9bf20e18ec18398be2cfc1ceed27666ffb5 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 1 13:42:51 2021 +0800 + + * Finish task#8869. + +commit 2c4392aeba2bc06939e9e8348c3e7b5b845a170a +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 1 11:37:20 2021 +0800 + + * Finish task#8869. + +commit ce7cf652d55318a9ba40beb61c354ce64707d6b8 +Author: tianshujie98 +Date: Fri Jan 1 11:34:53 2021 +0800 + + * Fix bug. + +commit 0c4afee4ee5f68356bb399a2c9d0f0fa06ed01a6 +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 1 11:34:11 2021 +0800 + + * Finish task#8865. + +commit de2769bc5f3e6871629310a2f13c7115b724c87d +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 1 11:26:56 2021 +0800 + + * Finish task#8896. + +commit 4c3f0875fbb339b1db8a6b4bc9951890dbd18dea +Merge: c2ca1dc4c2 1a2e8eb0c6 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 1 11:23:39 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit c2ca1dc4c2df00513ed3f126a538d2b79904b1e0 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 1 11:23:36 2021 +0800 + + * Finish task#8898. + +commit 1a2e8eb0c61cef319d705d2c92dec660a01f0f36 +Author: tianshujie98 +Date: Fri Jan 1 11:17:40 2021 +0800 + + * Finish task #8893. + +commit be531a9aae1a452486f9eef30e9f65f6447c4038 +Author: Catouse +Date: Fri Jan 1 11:11:53 2021 +0800 + + * only jump to group tab in links with [data-group] attribute. + +commit 68e7c6e199fe4a4153bc6d06e62ea0bb19acd1f1 +Author: tianshujie98 +Date: Fri Jan 1 11:07:34 2021 +0800 + + * Fix the issue of create build. + +commit a8cef73c9bfab9fc39b3629e426a0cab747fa50c +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 1 10:58:44 2021 +0800 + + * Finish task#8899. + +commit e5a59e3a84b086c501c8522e3a03a5f1410f9877 +Merge: bdd813d290 b042c940a5 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 1 10:40:12 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit bdd813d29094125bbdb0afbc5b26271cbb692263 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 1 10:39:53 2021 +0800 + + * Modify the statistic info of the task in my module. + +commit b042c940a51a75f23daeb3a5ca7bcf01a15b3949 +Author: tianshujie98 +Date: Fri Jan 1 10:35:27 2021 +0800 + + * Modify label style. + +commit 193d40fa022ae602ccff02a3bec23e6ae51a3a6e +Author: tianshujie98 +Date: Fri Jan 1 10:10:46 2021 +0800 + + * Finish task #8893. + +commit cf613fdbac2b372acf216528552f9016b3860860 +Author: tianshujie98 +Date: Fri Jan 1 09:54:09 2021 +0800 + + * Finish task #8882,8884. + +commit 40517fa1ec09ff8221f32639930411d39114541f +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 1 09:45:29 2021 +0800 + + * Finish task#8866. + +commit 4f61f2e6c44159c86d711c5a3326a8338113b1d1 +Merge: d85dc5ef20 6f8bcda4b0 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 1 09:36:50 2021 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit d85dc5ef20c7f6626160adb8cbd331ccd3b33bc8 +Author: hufangzhou <746775970@qq.com> +Date: Fri Jan 1 09:36:47 2021 +0800 + + * Finish task#8897. + +commit 6f8bcda4b0d3f32109d8fcc6f54b6cbbc0cdbfbd +Author: leiyong <1549684884@qq.com> +Date: Fri Jan 1 09:36:09 2021 +0800 + + * Finish task#8895. + +commit 41746f4b3ef36a4c0bf3fb9f370778b207f010ad +Author: Yagami <976204163@qq.com> +Date: Fri Jan 1 09:27:21 2021 +0800 + + * Finish task #8867. + +commit 19f9fa2571e3edd539f19f4c74c433b4400937c0 +Author: Yagami <976204163@qq.com> +Date: Fri Jan 1 09:12:03 2021 +0800 + + * Fix details. + +commit 3072b780eca570f0fbc1152650390a17d8b9895f +Author: tianshujie98 +Date: Fri Jan 1 08:43:38 2021 +0800 + + * Finish task #8881. + +commit 135f09a74829eaad1e70c04c772bf03656fa6180 +Author: Catouse +Date: Thu Dec 31 21:58:11 2020 +0800 + + * fix class name. + +commit 75af6f563dea665e6a5d076ee33d9e3302d18c94 +Author: Catouse +Date: Thu Dec 31 21:55:48 2020 +0800 + + * add style for btn-span in .header-angle-btn. + +commit dc19e5e031f6a4c75012e9fb495c828653edbcfd +Author: Catouse +Date: Thu Dec 31 21:54:53 2020 +0800 + + * adjust style. + +commit 992450f1b48ab49bb9a6fdc01e228eddefd881f5 +Author: Catouse +Date: Thu Dec 31 17:40:47 2020 +0800 + + * task #8747, change icons style in programs list. + +commit 5971d3f98cc4303538abe6ee8e2113c4ee37149d +Author: tianshujie98 +Date: Thu Dec 31 17:22:30 2020 +0800 + + * Finish task #8892. + +commit af1dc88f0fea21540bea8d3e3ae755db1dabd33c +Author: tianshujie98 +Date: Thu Dec 31 17:17:58 2020 +0800 + + * Finish task #8901. + +commit 6c3dc8d19e2a4c7cd5a42c23a6ccb91ae52dbd58 +Author: tianshujie98 +Date: Thu Dec 31 17:06:59 2020 +0800 + + * Finish task #8878. + +commit 803ecda3459be3bdcbb1219a8128d98d89928f36 +Author: Catouse +Date: Thu Dec 31 11:20:00 2020 +0800 + + * improve contextmenu position. + +commit ef0f12b3b7680104bbc7e279414463399fa18d39 +Author: Catouse +Date: Thu Dec 31 11:06:08 2020 +0800 + + * improve UI of ExecutionList in index view. + +commit cd12ec918700404145593177d76b4245dfef2edf +Author: Catouse +Date: Thu Dec 31 10:26:52 2020 +0800 + + * support for jumping between tabs. + +commit 5b1b5347eeae34ff9d9d51c76e8f14cb79bd6ca1 +Author: Catouse +Date: Thu Dec 31 10:23:34 2020 +0800 + + * fix js error. + +commit efb18a3464d19aad2e623f3d4bec4b993b4b0c22 +Author: Catouse +Date: Thu Dec 31 09:43:27 2020 +0800 + + * remove href from links in left menu and taskbar. + +commit 25897678547a162c1d73803391e50e8a3546bb14 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 31 08:13:24 2020 +0800 + + * Adjust code. + +commit fef12243f1dd0fc2559dcf92be5774c97a7e6c57 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 30 17:29:32 2020 +0800 + + * Finish task#8760. + +commit c57651813aed6d19f03ee69e9337a747c144c5d8 +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 30 17:18:07 2020 +0800 + + * Fix a bug. + +commit bc6f16714f80efca4ce674984796cb4181f2b02b +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 30 16:30:13 2020 +0800 + + * Adjust the language files. + +commit 3ac76d1d028833985231d5abc704fde1f38e1285 +Merge: 504ee5f6c3 8e5d9fcc44 +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 30 16:18:54 2020 +0800 + + * Adjust the code. + +commit 504ee5f6c364708287e311f09829fddb1cfe48a8 +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 30 16:03:55 2020 +0800 + + * Adjust the code. + +commit 8e5d9fcc44d1a6feb5df647c28739266775d0331 +Author: Yagami <976204163@qq.com> +Date: Wed Dec 30 15:58:26 2020 +0800 + + * Rename setting. + +commit c3ae3c9d1671894e36ee2d3512f3b18330964a94 +Author: qiyu-xie +Date: Wed Dec 30 14:00:51 2020 +0800 + + * Add budget tips when edit program. + +commit df03a729a4307a9e9dba253bad3ca77b3f82075a +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 30 14:01:46 2020 +0800 + + * Finish task #8744. + +commit dfc7a434d171eb312fd0fa0ea2d558dcd582fa62 +Merge: 5178b3693d b6b15b7a9d +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 30 13:54:42 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 5178b3693dbb009627a87eb7ec4ea987e99611aa +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 30 13:54:28 2020 +0800 + + * Finish task #8744. + +commit b6b15b7a9d8b72a510351fcab8a686a3cd43c866 +Author: Yagami <976204163@qq.com> +Date: Wed Dec 30 13:31:04 2020 +0800 + + * Fix bug #3780. + +commit 6b9fb543e2b8b0d050a69288573aa77da62d2adc +Author: Yagami <976204163@qq.com> +Date: Wed Dec 30 13:02:03 2020 +0800 + + * Fix project link. + +commit ef9fe6acee50616793256e089a025996e67cef6e +Author: Yagami <976204163@qq.com> +Date: Wed Dec 30 11:14:53 2020 +0800 + + * Fix details. + +commit 408a720605300c2bd3a229e89ae94b0bbfa39dc1 +Author: tianshujie98 +Date: Wed Dec 30 11:26:59 2020 +0800 + + * When editing products, add sorting uniqueness judgment. + +commit 71c32a05ed772c9a76a62d47e74e57ec73ad73e1 +Author: Yagami <976204163@qq.com> +Date: Wed Dec 30 10:22:01 2020 +0800 + + * Fix lang. + +commit 9c9a745f4c89c4250ca7cd07ffb941f82b935900 +Author: tianshujie98 +Date: Wed Dec 30 09:52:26 2020 +0800 + + * Modify ID format. + +commit 1f4fc494ae70d24c0daf4028ddb1ae0da7b26a19 +Author: Yagami <976204163@qq.com> +Date: Wed Dec 30 09:42:49 2020 +0800 + + * Fix divider menu. + +commit 02cf406a9caaee961c8c50e57e201c9e0310bc7b +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 30 09:35:20 2020 +0800 + + * Add title at execution name. + +commit 04358896800e0854697eda4851e499f60512199f +Author: Yagami <976204163@qq.com> +Date: Wed Dec 30 09:34:35 2020 +0800 + + * Add lang. + +commit 0855b3abd5d24f8bd181547c898d248f04bef6b0 +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 30 08:25:50 2020 +0800 + + * Adjust the language files. + +commit 4294a76f7889448fbca45201c8f1332c73990c55 +Merge: 7496200925 75567c78ac +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 29 16:28:17 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 7496200925a90a5a11183467b129c5843850365e +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 29 16:28:13 2020 +0800 + + * Finish task#8752. + +commit 75567c78ac4ab9adbf87380e3e031348f60eedf5 +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 29 15:58:25 2020 +0800 + + * Adjust style. + +commit f8f02f6d3425d1af7622a748c23621f855e998bf +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 29 15:54:54 2020 +0800 + + Change icon. + +commit 8d30c8eb78851967575f176333a05e99e640a2da +Author: Yagami <976204163@qq.com> +Date: Tue Dec 29 15:13:49 2020 +0800 + + * Code for feedback and ops menu. + +commit 01b8a3e9fa682a89f00ecae92531c871e64cd3d3 +Author: Yagami <976204163@qq.com> +Date: Tue Dec 29 14:14:08 2020 +0800 + + * Remove my-setmenu. + +commit c0677e554c8978d7fc028305878ca074f1dee9fb +Author: qiyu-xie +Date: Tue Dec 29 15:11:09 2020 +0800 + + * Restore Code. + +commit 3662d375939ff0f2b1ec7dc1e9bb54e88ba5a469 +Author: qiyu-xie +Date: Tue Dec 29 14:55:54 2020 +0800 + + * Finish task#8730. Add budget notes when change parent program. + +commit f126cc1ca2a09bb9ea091448cfaef0ea30950e95 +Author: Catouse +Date: Tue Dec 29 14:16:23 2020 +0800 + + * refactor. + +commit 8a51b10a6a381f4811ed8213182594e6e70a2ce9 +Author: Catouse +Date: Tue Dec 29 14:13:17 2020 +0800 + + * fix error on render menu items without icon. + +commit c969d44561e801b4bc59fc28cc8f84f1971e4f3e +Author: tianshujie98 +Date: Tue Dec 29 14:09:02 2020 +0800 + + * Fix the bug sorting of tasks on my module. + +commit 023a556f3df441ed22fe1e21469cec57d021833c +Author: qiyu-xie +Date: Tue Dec 29 14:01:48 2020 +0800 + + * Finish task#8769. Remove the fractional part of the progress. + +commit 1d26c12a50bbc8c88d388c0f9d732fd4f40d7b81 +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 29 14:01:36 2020 +0800 + + * Edit format. + +commit 678549f4e67e59d0ca9c203fa39b35bfaebeddd8 +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 29 13:46:24 2020 +0800 + + Change icon. + +commit 066bea52641821ca19888128c2b50578a847b621 +Author: tianshujie98 +Date: Tue Dec 29 13:38:10 2020 +0800 + + * Unified task time format. + +commit ab05cdc588c7b1f91e96bb5487a1b8b6616d584d +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 29 13:34:29 2020 +0800 + + * Finish task#8746. + +commit c5dae1cdf660ba4677e3fb37fd81aa20f08805d9 +Author: Catouse +Date: Tue Dec 29 13:30:56 2020 +0800 + + * update zui.js. + +commit ff4c84acb8e9cad5fe9fdc89a61e538251dd2285 +Author: qiyu-xie +Date: Tue Dec 29 11:40:29 2020 +0800 + + * Modify notes. + +commit 9591f0b962d13acd680648823f6cf69a64d83824 +Author: tianshujie98 +Date: Tue Dec 29 11:35:50 2020 +0800 + + * Modify language items. + +commit cbd49f89802e381903e88c2042accc251519aeaf +Author: tianshujie98 +Date: Tue Dec 29 11:33:03 2020 +0800 + + * Modify language items. + +commit a6026566b501219fd9e3f67de3dd2caf1d3f07b3 +Author: qiyu-xie +Date: Tue Dec 29 11:30:58 2020 +0800 + + * Finish task#8751. Add tips when batch unlink stakeholders. + +commit b7db818a89935c003cd609492f20e698c0d370ef +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 29 11:24:58 2020 +0800 + + * Add todo comments. + +commit a52c15dfa8cd1a9ccaaea49a9bc8c4f0b745fe06 +Author: tianshujie98 +Date: Tue Dec 29 11:11:00 2020 +0800 + + * Adjust code style. + +commit b2d661ea2f1abff6d38b94dfc72c9d679b7388d5 +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 29 11:08:43 2020 +0800 + + * Add release language. + +commit 2ee4afbe18f095826a483078338f6f96e872d06b +Author: Yagami <976204163@qq.com> +Date: Tue Dec 29 10:57:53 2020 +0800 + + * Fix menu. + +commit ad020011872050f5f1d89212503b20fa5a980deb +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 29 10:51:36 2020 +0800 + + * Add project language. + +commit 0176e3698b93a7fd0d222b9659f4fb0652075557 +Author: qiyu-xie +Date: Tue Dec 29 10:40:51 2020 +0800 + + * Change the notes. + +commit 8f2f51a3977d94c40a49db57b5664a80b572cb20 +Author: tianshujie98 +Date: Tue Dec 29 10:22:36 2020 +0800 + + * Adjust code style. + +commit 1ae6ec73ed2769ad685d73cab68c212f697c10fd +Author: qiyu-xie +Date: Tue Dec 29 10:06:51 2020 +0800 + + * Finish task#8738. Add budget notes when change parent program. + +commit f35ddda6b40c9d54d24a9ef736d4aa2909e904be +Author: Yagami <976204163@qq.com> +Date: Tue Dec 29 09:58:46 2020 +0800 + + * Fix details. + +commit 65f114b50055bc100e33a9ff445034d2df36ca13 +Author: Catouse +Date: Tue Dec 29 09:25:22 2020 +0800 + + * improve UI of tabsbar in index. + +commit 9e0628e2959c85600c651c1ae8fe2edb3591a187 +Author: Yagami <976204163@qq.com> +Date: Tue Dec 29 09:13:15 2020 +0800 + + * Fix user bar style. + +commit 864d6b7001b50952ba4e0ec28d3046b18d74e148 +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 29 09:00:50 2020 +0800 + + * Adjust code. + +commit b0f7f65f5edcdad166a3a8e34b730cfaf819d1ed +Author: Catouse +Date: Mon Dec 28 17:20:39 2020 +0800 + + * change zIndex of menu. + +commit ada715c2a956f19b100dc522f158806fd838bbc7 +Author: Catouse +Date: Mon Dec 28 17:18:56 2020 +0800 + + * improve menu style at index/index after change language setting. + +commit da4889ea50f94ee385d65ff60369f2d4e7e78f4a +Author: Yagami <976204163@qq.com> +Date: Mon Dec 28 17:16:12 2020 +0800 + + * Fix style. + +commit 86b6933fd6e4bea9e525f00d84a92a0d20e4db5c +Merge: 265dad7df6 825ccf2051 +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 28 16:33:48 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 265dad7df64e6b40a0eaa77070dfe37be0cce767 +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 28 16:33:35 2020 +0800 + + * Finish task #8744. + +commit 825ccf2051951f73b12fe8ea34847755c5cff8db +Merge: c3e3d3fc70 e0722687c2 +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 28 16:32:34 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit c3e3d3fc70377613792364292f66760c2a5ed8cf +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 28 16:32:32 2020 +0800 + + * Adjust the icon of stage and sprint for copy project. + +commit e0722687c2cc4ba4a95edb89a913817ec930178c +Author: Yagami <976204163@qq.com> +Date: Mon Dec 28 16:25:55 2020 +0800 + + * Fix bug. + +commit 1dc95856fb54745e592722d887165565e2666153 +Author: Yagami <976204163@qq.com> +Date: Mon Dec 28 15:53:29 2020 +0800 + + * Finish task #8791. + +commit 69561f500ca597e0de3d5c5b93b342f358556d96 +Merge: 4acf89e286 49134bc66b +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 28 15:35:32 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 4acf89e28658952e51221f9b8a0871f604475f01 +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 28 15:35:26 2020 +0800 + + * Finish task#8761. + +commit 49134bc66b9d4795ded0fd1c1fcf44768a99d35d +Author: leiyong <1549684884@qq.com> +Date: Mon Dec 28 15:27:36 2020 +0800 + + * Adjust to get recent executions. + +commit b8598ce6ce47a620a6eabbd5b8b5c17d84819feb +Author: tianshujie98 +Date: Mon Dec 28 15:17:10 2020 +0800 + + * Adjust code style. + +commit 4b1ae38ac0f268a7bebf66b44da992a8dd42f892 +Author: qiyu-xie +Date: Mon Dec 28 15:06:39 2020 +0800 + + * Optimize the code. + +commit b20054087c2f505d2c5fa3a53e389dfad121694c +Author: leiyong <1549684884@qq.com> +Date: Mon Dec 28 14:49:14 2020 +0800 + + * Fix bug. + +commit 494b5f549c42fd2fbbc43912bacb5c0f2060f65b +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 28 14:47:56 2020 +0800 + + * Adjust the function comment. + +commit f4771c3483d5740c4c6d4cbc873c0d0bfd8035ae +Merge: 507ae60194 9c8dc66eea +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 28 14:45:58 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 507ae60194a0893addc87226228d47b5a9a1f71d +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 28 14:45:55 2020 +0800 + + * Adjust the function comment. + +commit 9c8dc66eea31c260ece5cbb29dd52c9532380cda +Author: qiyu-xie +Date: Mon Dec 28 14:35:50 2020 +0800 + + * Modify language item of batch unlink stakeholder. + +commit ae134b8424daf50115f3770faa48ec93943cf4ae +Merge: cf23b03eb5 33db93c8e7 +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 28 14:29:32 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit cf23b03eb57d7ef8fbeb0c56aec12c48817a4462 +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 28 14:29:09 2020 +0800 + + * Finish task #8744. + +commit 33db93c8e77dbf194e56b1c92e85785177a24f54 +Author: qiyu-xie +Date: Mon Dec 28 14:24:07 2020 +0800 + + * Fix bug: Program error for new product when create project. + +commit 360752652891ca7b9871b56417246f6008f25932 +Merge: 3654bf7b87 0d35fb1643 +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 28 14:19:51 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 3654bf7b87d36e1e49012a6608c3ff1482ade61a +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 28 14:19:49 2020 +0800 + + * Adjust the code. + +commit 0d35fb1643b71e59afe488ea94477652d1be5054 +Merge: 222506cbd0 e3208f224a +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 28 14:12:40 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 222506cbd03b4bc8eff698f988ef985ebf4be44d +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 28 14:12:32 2020 +0800 + + * Modify the redirect link. + +commit e3208f224adbf64f531ea56607760de5a2a3e516 +Author: leiyong <1549684884@qq.com> +Date: Mon Dec 28 14:12:17 2020 +0800 + + * Finish task#8739. + +commit 3b96307d45e53d708283b4ffd35d158ccde0ecbc +Author: tianshujie98 +Date: Mon Dec 28 14:09:45 2020 +0800 + + * Adjust code style. + +commit 4ef32f3efc1d55287b8a1807a94d7f90c6d90831 +Author: Yagami <976204163@qq.com> +Date: Mon Dec 28 13:42:11 2020 +0800 + + * Add comment. + +commit 5b1bccd027c8670c266fd6642629958d5d8690a7 +Author: Catouse +Date: Mon Dec 28 13:42:15 2020 +0800 + + * fix UI of index page. + +commit 4ec1918473c2802ec0f065b592e5a2dfac1e03d6 +Merge: 4661eda869 ea890d584d +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 28 13:35:29 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 4661eda8693ee70cf2e1a7fcc83a6d220fb81a5c +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 28 13:35:26 2020 +0800 + + * Adjust the comment. + +commit ea890d584d31e0a3dcd191326475f51ef1e77aa5 +Author: Yagami <976204163@qq.com> +Date: Mon Dec 28 13:32:44 2020 +0800 + + * Add left doc menu. + +commit 12993d94ca4ae104a93796a6bc8812bf54fc8cb6 +Merge: 0bde3027f1 1490c1d526 +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 28 13:28:30 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 0bde3027f17981b984f28221b422ca0e1d4859bd +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 28 13:28:10 2020 +0800 + + * Add comments. + +commit 1490c1d526e8c4ce67794e030e737ffce21b032d +Author: tianshujie98 +Date: Mon Dec 28 13:27:18 2020 +0800 + + * Adjust code style. + +commit 6cb4f3918408036a63c6c57814f3cc4bd20b7ce1 +Author: qiyu-xie +Date: Mon Dec 28 13:21:01 2020 +0800 + + * Finish task#8738. Delete the space after budget. + +commit 62753525abab1b0321dec793033c95eb07ac727c +Author: Catouse +Date: Mon Dec 28 13:17:06 2020 +0800 + + * fix UI of index page. + +commit 2dc2b1a249ae132643881b9a07b750ea4ece66d9 +Author: Catouse +Date: Mon Dec 28 13:11:04 2020 +0800 + + * update zui.js. + +commit 11c8c42fa511fd9684b7c48d7685a88f68e1dcd2 +Merge: 5cfa65f36e c698011fa3 +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 28 13:10:47 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 5cfa65f36e5ee48e74986d6528b7cab3303b4fde +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 28 13:10:44 2020 +0800 + + * Adjust the code. + +commit c698011fa3a46b82198aeaed94da100adf393a0e +Author: Catouse +Date: Mon Dec 28 13:04:00 2020 +0800 + + * update zui.js. + +commit 78203f19b3bbba24cbd05bd070dd72f305d5e335 +Author: tianshujie98 +Date: Mon Dec 28 11:07:25 2020 +0800 + + * Adjust code style. + +commit 1729b8ff2f7a31e112541f3a57becbc24172364d +Author: leiyong <1549684884@qq.com> +Date: Mon Dec 28 10:56:46 2020 +0800 + + * Adjust todo related code. + +commit 31ed27877d1d44a18cb40879784b2e28eed078df +Merge: 325dc97fd0 b6e336e3cd +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 28 10:49:01 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 325dc97fd0e17ee67e135a8e0ecd3cba36b5d921 +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 28 10:48:58 2020 +0800 + + * Fix an error. + +commit b6e336e3cde100d9b5150c2242eccb35213a36fd +Merge: 18494b1af1 5b2cb528a3 +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 28 10:41:31 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 18494b1af11b858eec23d13c254b10b1c4c96037 +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 28 10:41:20 2020 +0800 + + * Finish task #8744. + +commit 5b2cb528a31aae45b70ede87cdc43414b8b7174c +Author: qiyu-xie +Date: Mon Dec 28 10:29:16 2020 +0800 + + * Modify program budget type. + +commit 9f24e092430f507d9001b82bef7641ccae2104ac +Author: Yagami <976204163@qq.com> +Date: Mon Dec 28 10:27:04 2020 +0800 + + * Add repo menu. + +commit ff395b12c44155fb298a8997e6ce065d5b21c701 +Author: Catouse +Date: Mon Dec 28 10:15:24 2020 +0800 + + * improve UI of jump strategy. + +commit 22b742d6127099eb2adb1aac50f1ee556864bee2 +Merge: 48e4241c47 b38732fc31 +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 28 09:55:43 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 48e4241c4726581f8358100e9baf31ad78fb3d37 +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 28 09:55:39 2020 +0800 + + * Adjust the code. + +commit b38732fc315ed9d6094933b2cb51e947f6f5ddad +Author: Catouse +Date: Mon Dec 28 09:52:29 2020 +0800 + + * add $.checkAndRedirect method and fix redirect in index error. + +commit 94356f18b488b114feeab4ce8c60230c4f0c034c +Author: qiyu-xie +Date: Mon Dec 28 09:42:16 2020 +0800 + + * Modify the language item of the program. + +commit fcc20b563346aeeef47fdf45a680fc15be5fdd19 +Author: qiyu-xie +Date: Mon Dec 28 09:14:17 2020 +0800 + + * Finish task#8751. Fix bug. + +commit 74c49d384a049f78c446fdfc1927e9f0b076f345 +Merge: 43aa256f8b 5c7acd9d9a +Author: tianshujie98 +Date: Mon Dec 28 09:02:50 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 43aa256f8b0ec270849f4e311418ec45e947226e +Author: tianshujie98 +Date: Mon Dec 28 09:02:39 2020 +0800 + + * Adjust code style. + +commit 5c7acd9d9a57ce2154ceabbff048841f79056557 +Author: Catouse +Date: Mon Dec 28 08:29:54 2020 +0800 + + * task #8711, add tabs menu for mdule groups. + +commit 6b0d4b50ffc39442b2753aa56f221a916e69ccc5 +Author: qiyu-xie +Date: Sun Dec 27 11:22:13 2020 +0800 + + * Finish task##8751. Fix bug. + +commit 95af1a50d7d73643aba411f0250a4fb047972a16 +Author: qiyu-xie +Date: Sun Dec 27 11:15:24 2020 +0800 + + * Finish task#8751. Modify program create stakeholder. + +commit dcca3d0c04586f22a2630f29e7c881bca92edeca +Author: qiyu-xie +Date: Sat Dec 26 16:13:10 2020 +0800 + + * Finish task#8751. Add batch unlink stakerholders. + +commit 33e2b79be2f8c2a22ba183c828e457b7a5fac556 +Author: tianshujie98 +Date: Fri Dec 25 17:18:29 2020 +0800 + + * Add comment. + +commit 8a98370c384684b0dfdf4a8d63140e0f89bbdacf +Merge: b33f64eb0c 14e6ddccfe +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 25 17:16:34 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit b33f64eb0c5c1606cf1c90db91905cc651dd1dd9 +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 25 17:16:29 2020 +0800 + + * Adjust the table style. + +commit 14e6ddccfe2c67de2560cd01665ac05729be1093 +Author: qiyu-xie +Date: Fri Dec 25 17:12:52 2020 +0800 + + * Finish task#8769. Add title to PRJPGM. + +commit 94fe3f7f5c27db5826bc40573be6a6486b229b89 +Author: tianshujie98 +Date: Fri Dec 25 17:06:38 2020 +0800 + + * Fix bug. + +commit ff2b599dc84655794b8c817c75edc32e80bbf78a +Merge: decfbdee58 30efec22cf +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 25 16:56:58 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit decfbdee58ff21f965c84578c28d35386d44d227 +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 25 16:56:55 2020 +0800 + + * Adjust the table style. + +commit 30efec22cfc59d3af1c327d78c00ea5c8615ee01 +Author: qiyu-xie +Date: Fri Dec 25 16:49:52 2020 +0800 + + * Finish task#8733.#8734. Judge the budget. + +commit ab6f951ebb2b220e55cdf1d097775892f9efc5eb +Author: Catouse +Date: Fri Dec 25 16:48:50 2020 +0800 + + * fix error on calling createLink with PRJ param. + +commit 402170d32602cf50634889a04b8c388ad7885307 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 25 16:47:36 2020 +0800 + + * Adjust code. + +commit d7b50873a015462caef7c02cfe8033c04d078397 +Author: tianshujie98 +Date: Fri Dec 25 16:32:23 2020 +0800 + + * Adjust code style. + +commit e060257a54f79dc989ba3d8fcee9991465f64588 +Author: tianshujie98 +Date: Fri Dec 25 16:30:24 2020 +0800 + + * Adjust code style. + +commit b4f621b3ec74fbc64be9d18f5e6ffc1cf85c14df +Merge: 167ba07155 7402b57363 +Author: tianshujie98 +Date: Fri Dec 25 16:11:39 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 167ba07155ef2120189f80de261e3ca0402be07b +Author: tianshujie98 +Date: Fri Dec 25 16:11:17 2020 +0800 + + * Put the sort in the operation. + +commit 7402b5736304717fd2fb1ef50d893cae73809326 +Author: Catouse +Date: Fri Dec 25 16:11:02 2020 +0800 + + * update window.createLink method. + +commit 7df92afd9be9c5f052aeddb5587a27ff3a234095 +Merge: 88f6dc6e10 b2357d4bac +Author: tianshujie98 +Date: Fri Dec 25 16:02:33 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 88f6dc6e10678ca14f0607bb13906e2debfc269b +Author: tianshujie98 +Date: Fri Dec 25 16:01:50 2020 +0800 + + * Modify language items. + +commit b2357d4bac8eacbed73592783c13914a3fb487ad +Author: Yagami <976204163@qq.com> +Date: Fri Dec 25 16:00:33 2020 +0800 + + * Code for repo. + +commit 538df6525d6110c9491c272cde46a4e31df23925 +Merge: 558b3ad1c3 4e734af787 +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 25 15:34:56 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 558b3ad1c399806ab04cdfa9332343e05986f853 +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 25 15:34:53 2020 +0800 + + * Finish task#8759. + +commit 4e734af78759f0d350c105e3e8cda61cc5d9b12d +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 25 15:34:06 2020 +0800 + + * Fix bug. + +commit 637db93350259fb29f3eca0e394630da83f0c9a8 +Merge: a1700dc03e 440bb99d86 +Author: holan20180123 <56391770@qq.com> +Date: Fri Dec 25 15:19:46 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit a1700dc03e17a026a45009382c9cb944ba378b01 +Author: holan20180123 <56391770@qq.com> +Date: Fri Dec 25 15:19:20 2020 +0800 + + * Finish task #8749. + +commit 440bb99d86755c99f921ce08325ce7b91a689f05 +Merge: 23e1b719b2 08434d82db +Author: tianshujie98 +Date: Fri Dec 25 15:12:48 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 23e1b719b20965da2913147ab8413c62a39f260b +Author: tianshujie98 +Date: Fri Dec 25 15:12:32 2020 +0800 + + * Adjust code style. + +commit 08434d82db4e9f87705e93d3a761b709da38c62f +Merge: d433bd32de c492894a27 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 25 15:11:10 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit d433bd32de7ef552e38964f4a3618746bbab5afa +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 25 15:11:04 2020 +0800 + + * Adjust code. + +commit c492894a2755031d3acd399a29ad157b28e06ae7 +Author: qiyu-xie +Date: Fri Dec 25 15:10:13 2020 +0800 + + * Adjust code style. + +commit 2a21445147dece5710999005073e5114a50e306f +Author: qiyu-xie +Date: Fri Dec 25 14:58:01 2020 +0800 + + * Fix bug. + +commit f70f13f8956a531ed11e760f56f93b359add113f +Author: tianshujie98 +Date: Fri Dec 25 14:54:55 2020 +0800 + + * Adjust code style. + +commit 2fe8912ece2b70fb19fb7d3cb9a9827f04d88e17 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 25 14:38:17 2020 +0800 + + * Adjust code. + +commit 45852a913128c28ba69cac2383e43060bb83ce00 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 25 14:31:09 2020 +0800 + + * Adjust code. + +commit aa074a506a12779af1aece86c7bd1676927bb244 +Merge: 59ede325e6 314eedb28c +Author: tianshujie98 +Date: Fri Dec 25 14:25:40 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 59ede325e6f3c5ffacf9f341bf3414ba65683180 +Author: tianshujie98 +Date: Fri Dec 25 14:25:00 2020 +0800 + + * Finish task #8783. + +commit 314eedb28cfbbf1617dec60dd87ca287b45c3a8c +Merge: bdc4f0e2f6 bbf30a2e88 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 25 14:17:30 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit bdc4f0e2f68bd0f44e5d07c19cbd72b3367861b5 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 25 14:17:25 2020 +0800 + + * Adjust code. + +commit bbf30a2e889f59edb6382b1756ae58a5f617ad38 +Author: Yagami <976204163@qq.com> +Date: Fri Dec 25 13:55:08 2020 +0800 + + * Fix repo menu. + +commit 355af26fb5e4d8eef38fae7f3f710c7ed024d8fa +Author: qiyu-xie +Date: Fri Dec 25 13:54:19 2020 +0800 + + * Finish task#8751. Add stakeholder type and key. + +commit 9679a30322f0eb1c8fa73bb5a45e0584aa193498 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 25 13:51:47 2020 +0800 + + * Adjust code. + +commit 6b0fa71217bf62485f48eb2f05d9e7ac4a9541be +Author: Catouse +Date: Fri Dec 25 13:49:19 2020 +0800 + + * refactor. + +commit ce30edb39db154a0d6d122f802392817d6d3858b +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 25 13:41:19 2020 +0800 + + * Adjust group. + +commit 576fa7d7bf3a51b09e8b8ac25f0f1fc43b510819 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 25 13:35:01 2020 +0800 + + * Adjust the program and project operation buttons. + +commit 73eb92159a1e4e3a99700890a6222f55c20c07a2 +Author: Catouse +Date: Fri Dec 25 13:28:23 2020 +0800 + + * fix error on init progressPie of invisible element. + +commit 72f18ea300c81e7380315d808498cfe2a5013e09 +Author: Catouse +Date: Fri Dec 25 13:26:51 2020 +0800 + + * refactor: add missing keyword "var" to define variable. + +commit 285320d95a491e238d60e30dac68889c27bd1bce +Author: Yagami <976204163@qq.com> +Date: Fri Dec 25 13:07:05 2020 +0800 + + * Let repo link product. + +commit 739994edbb91e1060af8333cc9311c7a0e807ea1 +Author: Catouse +Date: Fri Dec 25 11:39:38 2020 +0800 + + * fix progressPie not work in datatable. + +commit 464ba9aea976d8b0169f99b13aba516b57e40a9a +Author: qiyu-xie +Date: Fri Dec 25 11:24:15 2020 +0800 + + * Finish task#8769. Adjust progress button. + +commit e75c16becdce62321aef145a778e49fcb0bed8b6 +Author: Catouse +Date: Fri Dec 25 11:14:25 2020 +0800 + + * fix table not ride on program/pgmproject view. + +commit 51383630dbdcb58edd59c6f91d629886848183e3 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 25 10:51:32 2020 +0800 + + * Adjust code. + +commit d6236fe3b291a73f3e316ea17696317104860cbc +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 25 10:45:39 2020 +0800 + + * Adjust icon. + +commit 7e6c988351e3ca45f13ea974d3e51f9528acfd8b +Author: Catouse +Date: Fri Dec 25 10:31:15 2020 +0800 + + * add icon-sprint and icon-stage. + +commit c435fb0e5976c6d329350b6047a617c3bf8db889 +Author: qiyu-xie +Date: Fri Dec 25 10:21:30 2020 +0800 + + * Finish task#8769. Adjust the action button. + +commit f21eafe846515d1cc4a0e5a6820dcf8f61855192 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 25 09:58:57 2020 +0800 + + * Finish task#8735. + +commit 7e87e5cfd32c3f17331a3b3c5f9d73e35441bb4b +Author: qiyu-xie +Date: Fri Dec 25 09:07:11 2020 +0800 + + * Finish task#8731. + +commit 2d1b596097abe90adc801ec6e2e55eb0ef7641fa +Author: holan20180123 <56391770@qq.com> +Date: Fri Dec 25 09:05:37 2020 +0800 + + * Finish task #8749. + +commit 2c0278da8b7e2a1790f33d9b7d146ef155c75c16 +Author: tianshujie98 +Date: Fri Dec 25 09:02:38 2020 +0800 + + * Adjust style. + +commit c25fe31bd085aeef9037b264527065c1b877adcf +Merge: d0e04efef5 db18b9b3e9 +Author: tianshujie98 +Date: Fri Dec 25 08:26:33 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit d0e04efef5c6bf599761622e3fb5f0d42c3b60b9 +Author: tianshujie98 +Date: Fri Dec 25 08:26:02 2020 +0800 + + * Change label style. + +commit db18b9b3e95074492060331e71efd35098c3075b +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 24 22:16:49 2020 +0800 + + * Finish task#8781. + +commit bc5db7f6ed7dedb13fd0ba52377ada13ab35937f +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 24 21:27:53 2020 +0800 + + * Add getUserRiskPairs method. + +commit 4d308628099a853ec09f888c4be2a15d71ca0c4d +Author: Catouse +Date: Thu Dec 24 17:40:31 2020 +0800 + + * update icon-split. + +commit ec3104cd8ccab322f75d355fa456a9df07aded65 +Author: Catouse +Date: Thu Dec 24 17:18:15 2020 +0800 + + * task #8732, change size of popover. + +commit fee352ff3a245dca6e9c2c2d1f0b567195a06fe0 +Author: tianshujie98 +Date: Thu Dec 24 17:17:29 2020 +0800 + + * Adjust icon. + +commit c8177b7bd028bd37c6ab8acaa3a6393bcfd77d4c +Merge: 432b098257 fda220ed36 +Author: tianshujie98 +Date: Thu Dec 24 17:09:21 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 432b098257fe3dc58971eba7228ae9f2e649251e +Author: tianshujie98 +Date: Thu Dec 24 17:08:55 2020 +0800 + + * Add style. + +commit fda220ed36e4e458623b0305d25bbd9b252f46a6 +Author: qiyu-xie +Date: Thu Dec 24 16:59:10 2020 +0800 + + * Finish task#8769. + +commit 8f808b445f770b2ec82fb0a960a5dde52fd0f3eb +Author: Catouse +Date: Thu Dec 24 16:58:20 2020 +0800 + + * update progressPie component. + +commit c98317e049c816d314cbfe5536cc8d3599c92281 +Author: tianshujie98 +Date: Thu Dec 24 16:34:43 2020 +0800 + + * Finish task #8788. + +commit d4ebea5befab4c1cce9d89638268caca4dbed3b5 +Merge: 2b5ba601ee 0270f816e1 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 24 16:23:00 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 2b5ba601ee30fcd49e6680ff551ca07fbabd4f2b +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 24 16:22:54 2020 +0800 + + * Add getUserIssuePairs method. + +commit 0270f816e1130c3ebb39d474e8dc394e3e8ba466 +Author: Catouse +Date: Thu Dec 24 16:22:43 2020 +0800 + + * task #8732, change text in popover. + +commit 8ad9c0c245d9cab4c9b1b28bb33c62b342fa5543 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 24 16:21:11 2020 +0800 + + * Adjust todo module lang file. + +commit 1136d9202c0c170d699088dc16bba1bb679619a5 +Merge: 98090bcc33 d74eb05817 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 24 16:10:53 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 98090bcc33c89e4cb0ed5428e39477520be39990 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 24 16:10:47 2020 +0800 + + * Finish task#8763. + +commit d74eb0581793eb686c0e3672927266077b203a65 +Author: Catouse +Date: Thu Dec 24 16:04:55 2020 +0800 + + * add style for .icon-message.has-dot. + +commit 1a9c4911aae7eb663adeff5e09d5b10acfde20a9 +Merge: 1d4d29faa8 d9842af4f7 +Author: tianshujie98 +Date: Thu Dec 24 15:59:30 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 1d4d29faa8f3cfa71e0a9c77bb4c369f0c7c4d4d +Author: tianshujie98 +Date: Thu Dec 24 15:59:04 2020 +0800 + + * Finish task #8798. + +commit d9842af4f758146775e8e19a5dd255f515f37ccf +Author: Catouse +Date: Thu Dec 24 15:55:21 2020 +0800 + + * update zenicons. + +commit 9faaf9589bcb087a76d76defc10f1821b617f102 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 24 15:27:35 2020 +0800 + + * Adjust closeBy to ClosedBy. + +commit 40daab31ff2d8316b4c52ee9fed2a8e7cb089794 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 24 15:23:04 2020 +0800 + + * Adjust programID to projectID. + +commit 6171a16b0d294dd4c48d39191a97f1dda1700941 +Merge: 82f655fc82 c1defae092 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 24 15:22:38 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit c1defae09222b411ad0214aebef077df2e95fd46 +Author: Catouse +Date: Thu Dec 24 14:46:59 2020 +0800 + + * task #8732, improve style of popover. + +commit 82f655fc82f2e9437badf2a25366d870f4e1510a +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 24 14:44:01 2020 +0800 + + * Fix bug. + +commit 70e8b3f799c5114e26bd09ab9338381af8594195 +Merge: 075d0cfd56 f9dd2c4b00 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 24 14:42:08 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit f9dd2c4b0033d3a3a849343eda6a4d9c5a7cab91 +Author: tianshujie98 +Date: Thu Dec 24 14:39:22 2020 +0800 + + * Adjust code style. + +commit 075d0cfd564f671ec8601d2ab2c4e953671eb721 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 24 14:38:12 2020 +0800 + + * Adjust the table style. + +commit 178a469097487987ad0aa87fdb4efe53e6a7d322 +Author: tianshujie98 +Date: Thu Dec 24 14:27:03 2020 +0800 + + * Adjust code style. + +commit cc0aa7a1cebfbfd31ab81879dbc62d8400c7882e +Merge: 268c390aca d3fab4bc4b +Author: tianshujie98 +Date: Thu Dec 24 14:17:58 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 268c390aca9df662d52d9e322924eb56553fea17 +Author: tianshujie98 +Date: Thu Dec 24 14:17:42 2020 +0800 + + * Adjust code style. + +commit d3fab4bc4b5e3b0dd34a5e81c41c08f7f2ed552f +Merge: c1b8ebed09 af6d05cf29 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 24 13:55:29 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit c1b8ebed09ad3c2abb4ea56bfc50df8381bba470 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 24 13:55:24 2020 +0800 + + * Adjust the code. + +commit af6d05cf29c48cc4ab0644559affc46a46f5200e +Author: Yagami <976204163@qq.com> +Date: Thu Dec 24 13:45:29 2020 +0800 + + * Finish task #8799. + +commit 85efc009d2e5d3785e468f40dbb29ca9b8e68f28 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 24 10:49:08 2020 +0800 + + * Add btn color. + +commit 11981973287cbb6b71744ce0ad21a74001dc3ea4 +Merge: a263f32394 e9e74e0652 +Author: tianshujie98 +Date: Thu Dec 24 13:36:50 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit a263f32394a57fd6f3955b165abc4089af31ebe2 +Author: tianshujie98 +Date: Thu Dec 24 13:36:02 2020 +0800 + + * Modify the sorting problem. + +commit e9e74e06527299b6e78c2fef96cfa2695c5c8d17 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 24 13:30:14 2020 +0800 + + * Finish task#8737. + +commit 57729398f5c188cefe114a402e6dada2b7e83b5f +Merge: c257c59296 c1ab98e78f +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 24 13:16:38 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit c257c59296db0a4d51e9e3ec97c16de1e8ffc751 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 24 13:16:29 2020 +0800 + + * Adjust the style code for firefox and ie. + +commit c1ab98e78f6dee5824cfb572ccd32e6bc6feb335 +Author: tianshujie98 +Date: Thu Dec 24 11:32:52 2020 +0800 + + * Adjust code style. + +commit a1ad9de5d95f0ee87bc59a8180c5d7e8414fc331 +Merge: d5ea868580 7bda4d781e +Author: tianshujie98 +Date: Thu Dec 24 11:27:18 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit d5ea868580e8d603995649c7f3ededcab7d4365d +Author: tianshujie98 +Date: Thu Dec 24 11:26:58 2020 +0800 + + * Finish task #8765. + +commit 7bda4d781e9dfabf08ca1195860afe3f23f8a9af +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 24 11:25:59 2020 +0800 + + * Adjust the table style. + +commit 3542359112087df39de6b55cdd316de3d36dc9b3 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 24 11:16:30 2020 +0800 + + * Finish task#8750. + +commit 81f23ccd45cf7894817c67333ab5fe076d1d1cec +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 24 10:58:45 2020 +0800 + + * Finish task#8762. + +commit 7e05ff4a4cf0e451c0d8e54ed39b4c4c1ca30609 +Author: qiyu-xie +Date: Thu Dec 24 10:27:32 2020 +0800 + + * Finish task#8743. + +commit 57ebbb61b428a609e24abe4013a83d2f87aed98b +Author: qiyu-xie +Date: Thu Dec 24 10:19:31 2020 +0800 + + * Adjust budget when create program. + +commit 8e2ba0762edd29599b2ffd620ae4ef02a3fbf1a4 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 24 09:49:27 2020 +0800 + + * Fix bug. + +commit 38fd427535d7881ba2f06ff745dd59691ac280fd +Author: Yagami <976204163@qq.com> +Date: Thu Dec 24 09:26:36 2020 +0800 + + * Fix bug details. + +commit c0ac3ac5d1c81f5c261d47b81ebab79f6f2dfad6 +Merge: 5db867a5a0 bbc44ef3f2 +Author: tianshujie98 +Date: Thu Dec 24 09:16:56 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 5db867a5a0a9202e8abca2f9ba77611976fee739 +Author: tianshujie98 +Date: Thu Dec 24 09:16:35 2020 +0800 + + * Finish task #8765. + +commit bbc44ef3f2baf86e39c5543ec030058d22ac0e54 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 24 09:06:25 2020 +0800 + + * Finish task #8811. + +commit 1fcb3f9e8eab5d3795669492bea294fe2d1a5dbf +Merge: 143fb5a04c e9d4f9ae2e +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 23 16:32:25 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 143fb5a04ca7793e678e108d59fa1a3e3f8c9d3f +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 23 16:32:18 2020 +0800 + + * Adjust the program module code. + +commit e9d4f9ae2ecea95e71bb13e7d32e107277209646 +Author: qiyu-xie +Date: Wed Dec 23 16:31:43 2020 +0800 + + * Finish task#8734. + +commit 8ce295828e6f0f4028d72a253aac96f79a728652 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 23 15:57:49 2020 +0800 + + * Finish task #8776. + +commit 6ff7c513042c7343f3f8bd13daa64351fa3f33be +Author: qiyu-xie +Date: Wed Dec 23 15:54:50 2020 +0800 + + * Delete the judgment of code. + +commit db405554a89b5440c8fb214ca1d3f0c0877992fb +Author: qiyu-xie +Date: Wed Dec 23 15:42:23 2020 +0800 + + * Fix bug. + +commit 66a6cba93ed613ce62842cf398ff2ac551238dd6 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 23 15:40:38 2020 +0800 + + * Finish task #8776. + +commit 71cf4104860dca70409f92671469c7f43c3c6615 +Author: qiyu-xie +Date: Wed Dec 23 15:39:46 2020 +0800 + + * Finish task#8733. + +commit f8254ba4258fe3dbe5c1826e1ea6c9a5022a08aa +Merge: 45ecde5875 b5055829bb +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 23 14:57:11 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 45ecde5875657351fddcf888706ffaa5f356841e +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 23 14:56:56 2020 +0800 + + * Finish task#8742. + +commit b5055829bbac5fb902881a3b64d5cfad1521a0b0 +Merge: 6efc361133 60e6cdd115 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 23 14:29:07 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 6efc361133c5160215bfbef7efbae603da312a1e +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 23 14:28:44 2020 +0800 + + * Finish task #8797. + +commit 60e6cdd115b946f10ab73a269463f24bfefae3bc +Merge: 661c7433c8 084df075bf +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 23 14:22:49 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 661c7433c8c9bbeca31c2061d154153f9f370447 +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 23 14:22:45 2020 +0800 + + * Finish task#8741. + +commit 084df075bf58cc69abe430c6a5a53f539014037b +Merge: 3f968dac81 5038567a2c +Author: tianshujie98 +Date: Wed Dec 23 13:53:34 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 3f968dac819bc9e5de09a3726b9a4cbdea6e59ad +Author: tianshujie98 +Date: Wed Dec 23 13:53:26 2020 +0800 + + * Fix bug. + +commit 5038567a2c9d64ced1c71bf9fd5a39de0078e147 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 23 13:53:16 2020 +0800 + + * Finish task #8749. + +commit a431691425fce4c615b5def5499b683fcba79634 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 23 13:43:25 2020 +0800 + + * Remove build field from release of product. + +commit c343a738469f49efb414a94ceaa54fb298b3aea9 +Merge: de59aeebbb 40b5697be9 +Author: tianshujie98 +Date: Wed Dec 23 11:36:33 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit de59aeebbb14565a04d6f63f7b5b670ce43350ec +Author: tianshujie98 +Date: Wed Dec 23 11:36:23 2020 +0800 + + * Fix bug. + +commit 40b5697be9933a8b54fcd37ec231173c3404a232 +Author: qiyu-xie +Date: Wed Dec 23 11:30:32 2020 +0800 + + * Delete PGMCode and PO language item. + +commit fee40d2ffae7620a0aba6bc56bd5185410ae7e30 +Merge: 6c49ed72fa fb93bb1267 +Author: tianshujie98 +Date: Wed Dec 23 11:25:03 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 6c49ed72faca3e75d882541631d7c3c882b59834 +Author: tianshujie98 +Date: Wed Dec 23 11:24:48 2020 +0800 + + * Adjust code style. + +commit fb93bb126743dd118a26e1a43c804da22bb4b9d8 +Author: qiyu-xie +Date: Wed Dec 23 11:15:16 2020 +0800 + + * Finish task#8748. + +commit 0e13c3f8c796cc996d5bb8b06595ce3e98257b7d +Merge: 3eb898ea02 dab9e280eb +Author: tianshujie98 +Date: Wed Dec 23 11:12:59 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 3eb898ea02fe5930eed006fcee6256ce89e6254c +Author: tianshujie98 +Date: Wed Dec 23 11:04:08 2020 +0800 + + * Finish task #8798. + +commit dab9e280eb7a47272601379f850c78062d6318e2 +Author: Yagami <976204163@qq.com> +Date: Wed Dec 23 10:53:53 2020 +0800 + + * Code for task #8812. + +commit 08812688e65dd9f12b4e247acd42a46985a9a080 +Merge: 1aa43436a1 f4db6376b2 +Author: tianshujie98 +Date: Wed Dec 23 10:44:42 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 1aa43436a1c634910473ebe1bedff9c44f5c5018 +Author: tianshujie98 +Date: Wed Dec 23 10:38:54 2020 +0800 + + * Adjust code style. + +commit f4db6376b29c0024f5db96fc41aaece15f46114f +Author: Yagami <976204163@qq.com> +Date: Wed Dec 23 10:28:28 2020 +0800 + + * Finish task #8812. + +commit 58425400f4d06a2727771a87f17eab0412b128c0 +Author: tianshujie98 +Date: Wed Dec 23 10:01:38 2020 +0800 + + * Adjust code style. + +commit cdf405834fb47110e0408aada4ea7f8d2c3f6910 +Author: tianshujie98 +Date: Wed Dec 23 09:36:12 2020 +0800 + + * Finish task #8798,8729. + +commit 2aedf0c0d664f3a21857ddc9c5a93bddda330b35 +Author: qiyu-xie +Date: Wed Dec 23 09:27:42 2020 +0800 + + * Finish task#8730. + +commit 65989c2b59b378dd93661954914c460c7d158955 +Merge: cd5198479e 96ae3f9b96 +Author: tianshujie98 +Date: Wed Dec 23 08:22:18 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit cd5198479e6a23f8a236f4a3b578bca7412989f7 +Author: tianshujie98 +Date: Wed Dec 23 08:19:34 2020 +0800 + + * Finish task #8764. + +commit 96ae3f9b960546a70ff30a19af1f101e70343ac2 +Merge: 4ae0c99283 9ad2d2617e +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 22 17:52:58 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 4ae0c99283c192f963fbedebd49400869ac5ca26 +Merge: 3d64fbf7b7 b5ee1c762f +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 22 17:52:55 2020 +0800 + + * Adjust code. + +commit 9ad2d2617e2c6a45be45a748c80e04bf11be137e +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 22 17:19:21 2020 +0800 + + * Finish task #8785. + +commit 3d64fbf7b7ca13555164d131882b011e121f1f46 +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 22 17:00:54 2020 +0800 + + * Finish task#8767. + +commit b5ee1c762f58fa329e59bc8525c01ce28acdf6ee +Merge: 4cce16aed9 7ee2b358c7 +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 22 16:59:02 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 4cce16aed9676f0a9fa897ec12e5c94c8298f612 +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 22 16:58:44 2020 +0800 + + * Finish task #8789. + +commit 7ee2b358c749d0ca96d55b9ddd93a966eea20b17 +Author: Yagami <976204163@qq.com> +Date: Tue Dec 22 16:57:48 2020 +0800 + + * Code for my module details. + +commit aa208aca624b4a972747ab7183cd0666c5e779e0 +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 22 16:57:21 2020 +0800 + + * Finish task #8789. + +commit 32f8460cc05637c1172c0d71ed3c96dbc7c68cc6 +Merge: b2323b30ff 65ca07f0b3 +Author: tianshujie98 +Date: Tue Dec 22 16:38:52 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit b2323b30ff08984828ef429e51d91b2923b1856a +Author: tianshujie98 +Date: Tue Dec 22 16:37:58 2020 +0800 + + * Finish task #8753. + +commit 65ca07f0b3d7ef96e03ebd0993c07bbbe4424f70 +Author: qiyu-xie +Date: Tue Dec 22 16:36:06 2020 +0800 + + * Finish task#8738. + +commit 0c477305fa3c7b8e3593533c55ad55cc8e26543c +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 22 16:10:58 2020 +0800 + + * Finish task #8774. + +commit 9c73a943f5c4e440ffc0cfa7a18f4c198012d1b0 +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 22 16:07:13 2020 +0800 + + * Finish task #8797. + +commit 4563840ba78a834edbb31a87cfc87bc6a99c9a6f +Merge: 4ad1b0bb28 853fd8609f +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 22 15:46:19 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 4ad1b0bb28ed6670b6c7039d82786400a83855ab +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 22 15:43:46 2020 +0800 + + * Finish task #8797. + +commit 853fd8609f9645a55dd0e18087406bdfc684d2ac +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 22 15:24:31 2020 +0800 + + * Finish task#8735. + +commit 1a79fda2079940437b6f90327618921936de9a7a +Merge: 556bd939c7 312c39129a +Author: tianshujie98 +Date: Tue Dec 22 15:04:28 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 556bd939c7bae881d9388ab6804bb2526f9ca2d0 +Author: tianshujie98 +Date: Tue Dec 22 15:04:09 2020 +0800 + + * Adjust code style. + +commit 312c39129a4dae92f039fcea2bb4e8fa6f9ced6d +Author: Yagami <976204163@qq.com> +Date: Tue Dec 22 14:40:28 2020 +0800 + + * Finish task #8806. + +commit b005031cb6a41ae3f90c75d399b2ef6386effa20 +Merge: a0c99985b8 a727a4ad8c +Author: tianshujie98 +Date: Tue Dec 22 14:32:27 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit a0c99985b842aff7d128786c36238a864cca8b48 +Author: tianshujie98 +Date: Tue Dec 22 14:31:24 2020 +0800 + + * Fix bug. + +commit a727a4ad8c74f050a9c1b314a1ab0211fcc0764f +Author: Yagami <976204163@qq.com> +Date: Tue Dec 22 13:54:48 2020 +0800 + + * Code for task #8812. + +commit aff8cace6c505929fe0376f4aef3073fd3dfaa3e +Author: Yagami <976204163@qq.com> +Date: Tue Dec 22 13:52:20 2020 +0800 + + * Reset my menu. + +commit 8dfeec7b666f47c8d3c5c55de28f881b8c949b36 +Author: Yagami <976204163@qq.com> +Date: Tue Dec 22 13:52:03 2020 +0800 + + * Add issue and risk view. + +commit 3265ad92f498a91d3161443e939ae6a8ce9ad1fb +Author: qiyu-xie +Date: Tue Dec 22 13:33:42 2020 +0800 + + * Finish task$8766. + +commit 89817a6f8694be11e2cee25947c37b4de9cb4e78 +Merge: ca0df6f19b c9171ad5a3 +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 22 13:30:50 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit ca0df6f19b26f0c61ae4834ad14336413c41c85e +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 22 13:30:23 2020 +0800 + + * Finish task#8756. + +commit e8975e0fed2dddce5c5648a76c311baf0d9ac5eb +Author: tianshujie98 +Date: Tue Dec 22 11:37:14 2020 +0800 + + * Fix the user list sorting problem. + +commit c9171ad5a3e696fc916e7740d3f9d9647fdba5f9 +Author: tianshujie98 +Date: Tue Dec 22 11:08:27 2020 +0800 + + * Finish task #8764. + +commit ec63685cc5afcc5f8dc0f6a7c6ca598cff8cb832 +Author: tianshujie98 +Date: Tue Dec 22 10:17:11 2020 +0800 + + * Finish task #8768. + +commit 31a49021ec8d6351a40763f0b3256e964e4593a3 +Author: qiyu-xie +Date: Tue Dec 22 09:54:23 2020 +0800 + + * Finish task#8755. + +commit a1c5df7bae645a867f0b9db7e0af242ce493e94c +Author: tianshujie98 +Date: Tue Dec 22 09:49:25 2020 +0800 + + * Finish task #8790. + +commit 8194e7ebc54c1454d4c9c48e76ec7a0e3c96608e +Merge: 37ddc35615 d661c3d5b0 +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 22 09:42:54 2020 +0800 + + Merge branch 'master' of https://git.zcorp.cc/zentaopms + +commit 37ddc35615cc90888f9b02cbfe9281a4eae375f2 +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 22 09:42:51 2020 +0800 + + * Finish task#8740. + +commit d661c3d5b0f33942facd72c906c5e0a9937e33e4 +Author: tianshujie98 +Date: Tue Dec 22 09:37:24 2020 +0800 + + * Finish task #8775. + +commit 2b82cd81f8e9c00b120192cc985d4d2bd756f6de +Author: qiyu-xie +Date: Tue Dec 22 08:20:20 2020 +0800 + + * Finish task#8743. + +commit 4bd924b32819f46290a50d85f27837583a56c8e3 +Author: tianshujie98 +Date: Tue Dec 22 09:26:09 2020 +0800 + + * Finish task #8754. + +commit 9c1ffb8df24b87897a9de15511dc5a425f76971f +Author: tianshujie98 +Date: Tue Dec 22 09:16:42 2020 +0800 + + * Finish task #8777. + +commit 8c7265d603f35df622b33fd1b0b3ebc24ea8c275 +Author: tianshujie98 +Date: Tue Dec 22 09:10:17 2020 +0800 + + * Finish task #8800. + +commit 4a82bf6285093c8bd7c0ca2aef70e2399d2c4421 +Author: wangyidong +Date: Tue Dec 22 08:12:25 2020 +0800 + + * fix bug for check decrypted password. + +commit fead6140adade332883b988e614b7995711e5497 +Author: wangyidong +Date: Mon Dec 21 20:44:32 2020 +0800 + + * adjust for check. + +commit ee03da5f0415402e6d86fa524565ba49c58d77ce +Author: Catouse +Date: Mon Dec 21 17:27:45 2020 +0800 + + * update buttons style in btn-group. + +commit 1d8d62246ca71826b3d4e61b06a3cb921c944e45 +Author: Catouse +Date: Mon Dec 21 17:26:42 2020 +0800 + + * update buttons style in btn-group. + +commit 4458e57c9d2ba840f9335249ab45ba2fc197e6f5 +Author: leiyong <1549684884@qq.com> +Date: Mon Dec 21 10:39:49 2020 +0800 + + * Adjust code. + +commit de7a23eeb2161e0bf4fb570cb42e05a3677fcbe9 +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 21 10:07:17 2020 +0800 + + * Fix bug#3768. + +commit a549ab0b46f162bc54abf7a3056577821ca06e2d +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 21 10:02:53 2020 +0800 + + * Fix bug#3768. + +commit bee0d7518f7caa157c709fec2d2590cd06ed0215 +Author: wangyidong +Date: Mon Dec 21 09:11:04 2020 +0800 + + * fix bug #3746. + +commit 067bcaec3c4cc0c8f4a04b4b2154ee5a4b04b32f +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 18 17:27:09 2020 +0800 + + * Adjust the project module tree.css. + +commit 583354728d05b934db0dda5ecd64c9cd8072f3a5 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 18 17:20:54 2020 +0800 + + * Fix bug. + +commit 0ef98d965351134e58f19d17df1d16543c862c48 +Author: Yagami <976204163@qq.com> +Date: Fri Dec 18 16:57:10 2020 +0800 + + * Add title. + +commit 8089ffe9a678fd5a2e3097fd69fd35e5ae3dc328 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 18 16:18:41 2020 +0800 + + * Adjust code. + +commit 9429b4e285b8fafac6be62f43ae652f9577fc624 +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 18 15:54:54 2020 +0800 + + * Fix a bug. + +commit 8fc7117fb62e2fece2aa19bfabf1277564704cec +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 18 15:52:36 2020 +0800 + + * Fix bug#3765. + +commit 0878df628646a676ce07b3756c64ae296701db7b (tag: zentaopms_20.beta2_20201218, tag: zentaopms_13.beta2_20201218) +Author: Yagami <976204163@qq.com> +Date: Fri Dec 18 14:46:18 2020 +0800 + + * Remove unused code. + +commit 05fab16be61f3b257e9a8d8538de114f1e12a1b4 +Author: Yagami <976204163@qq.com> +Date: Fri Dec 18 14:34:34 2020 +0800 + + * Fix sql. + +commit 474d079bbc8e2c0d210ba6500764d9ae27446b7f +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 18 14:31:45 2020 +0800 + + * Add the sql for upgrade. + +commit ef7fa91f5cc2552c64248e2823fcce0bd7f0ee74 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 18 14:06:26 2020 +0800 + + * Fix bug#3765. + +commit bff36567c9d4e95bb69bd9986cdb91f1db514794 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 18 13:35:10 2020 +0800 + + * Adjust code. + +commit 3d3c38c476088377ec98ba1cf46edb914cc4dd61 +Author: Yagami <976204163@qq.com> +Date: Fri Dec 18 13:14:01 2020 +0800 + + * Change version. + +commit 499355027920f93d46007c3561ec8f6dfe7b1ff1 +Author: Yagami <976204163@qq.com> +Date: Fri Dec 18 13:09:36 2020 +0800 + + * Add en lang. + +commit 91b64fce084e4f6c67a791177fb6f50393377e21 +Merge: 45eb988020 48c725fe44 +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 18 11:56:31 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 45eb98802006bed9f8c1030b8907f69f2430cacd +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 18 11:56:09 2020 +0800 + + * Fix bug#3767. + +commit 48c725fe44d296ca8773af7327e937f32b7a4556 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 18 11:27:19 2020 +0800 + + * Adjust code. + +commit 830a63c70567ccd3faadee3b5fa2a797ee5a34c7 +Author: Yagami <976204163@qq.com> +Date: Fri Dec 18 11:08:50 2020 +0800 + + * Add lang file. + +commit 7916fffb7d6004366947f6fb09088673423faea4 (tag: zentaopms_12.5.2_20201218) +Author: wangyidong +Date: Fri Dec 18 10:39:40 2020 +0800 + + * add new version and upgrade. + +commit 93f96c665284a1403584a5d03b27b3b59ef83bcb +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 18 10:14:47 2020 +0800 + + * Adjust code. + +commit 66747a8069b55369a62ac5dbd22393e08a86490f +Author: Yagami <976204163@qq.com> +Date: Fri Dec 18 10:04:30 2020 +0800 + + * Rename project common to execution common. + +commit 8e6d6bad63f4a04f8c10dc884782a9de2374ebc3 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 18 10:03:32 2020 +0800 + + * Adjust executionCommon to execution->common. + +commit 46c6c94d67363e59efcfdc4f29dc093603af9be8 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 18 09:51:05 2020 +0800 + + * Fix bug.. + +commit 8d8290897b4c9de6d570125761c8b1d34978b5ac +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 18 08:14:52 2020 +0800 + + * Modify the code. + +commit 245db6881be47080feac9636d309cb26e11a5a27 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 17 17:41:35 2020 +0800 + + * Fix bug. + +commit 8efb436503ba5a6d316cd01e5b80f5c92b9203ae +Author: Yagami <976204163@qq.com> +Date: Thu Dec 17 17:32:40 2020 +0800 + + * Fix bug. + +commit 21299938d1835e3efb060e35ec48d4b57073e30d +Author: Yagami <976204163@qq.com> +Date: Thu Dec 17 16:48:02 2020 +0800 + + * Adjust get URSR pairs method. + +commit 7ee5b8aec40634434f980c50f0c227c53d58cbad +Author: qiyu-xie +Date: Thu Dec 17 17:27:47 2020 +0800 + + * Modify job view lable. + +commit 04b16e05d05b6da57ca1ef03210a8930d3f06781 +Author: wangyidong +Date: Thu Dec 17 17:25:11 2020 +0800 + + * Use isZeroDate function to check. + +commit d2783580cd1552ad52dd3526ea655d11f8eeea88 +Author: wangyidong +Date: Thu Dec 17 15:22:00 2020 +0800 + + * fix for get extension license order file. + +commit ea3300acf4837a0676e2ee565227467dd9a5c2c6 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 17 17:20:12 2020 +0800 + + * Replace ->planCommon. + +commit 335d2f606c870c314fd8765933d493ded12dc442 +Merge: 40a184c769 10f1cee5b9 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 17 16:19:53 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 40a184c769ff9d248f0d0cb1bac0b03f685152d7 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 17 16:19:43 2020 +0800 + + * Modify the code. + +commit 10f1cee5b914dd48f94e9a3fd21ca72b828e0688 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 17 16:13:00 2020 +0800 + + * Adjust code. + +commit b8873da77fa21b8825b91c9cd189e01eb9ce45f1 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 17 16:04:14 2020 +0800 + + * Finish task#8671,task#8670. + +commit f41736f24728a72820d3035a85b8ef155fa36d6d +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 17 15:42:32 2020 +0800 + + * Fix bug. + +commit b6b18d75134fbbc2b7b0e80fc47602e3aac1339b +Author: qiyu-xie +Date: Thu Dec 17 15:23:24 2020 +0800 + + * Finish task#8698. + +commit b7e12099f600ad63ec1994c666240072ba90aa26 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 17 15:15:30 2020 +0800 + + * Fix bug. + +commit bcd43618bfd108278b52680605c39513463d7fad +Author: qiyu-xie +Date: Thu Dec 17 15:14:18 2020 +0800 + + * Fix bug#3692. + +commit 521c98f11bb2246e139589394cb0078d394811f6 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 17 15:03:53 2020 +0800 + + * Adjust code. + +commit ef388e7528259506ede16ed2381359b585529c16 +Author: qiyu-xie +Date: Thu Dec 17 15:00:35 2020 +0800 + + * Fix bug#3692. + +commit 5d91eb77f4d2cc144029df443eecd3242a312dea +Author: tianshujie98 +Date: Thu Dec 17 14:43:18 2020 +0800 + + * Modify the variables of the user module. + +commit 7df940676077adb9f8fb78529b1a0a639d39ecad +Author: holan20180123 <56391770@qq.com> +Date: Thu Dec 17 14:03:06 2020 +0800 + + * Finish task #8666. + +commit d6d4aa3b551f212a8be9b23fde26e94880dfd2ed +Author: qiyu-xie +Date: Thu Dec 17 13:59:57 2020 +0800 + + * Fix bug#3692. + +commit 7c0132ae9b74d346fb49e67ff60fd8203ad06a92 +Author: tianshujie98 +Date: Thu Dec 17 13:49:30 2020 +0800 + + * Modify the variables of the story module. + +commit 3dc92c0c068935d43f1179e8891353385e38da09 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 17 13:46:43 2020 +0800 + + * Create project set story concept to product. + +commit 50678f6e1d62046ac84dc483c03b664545655d7c +Author: tianshujie98 +Date: Thu Dec 17 13:31:49 2020 +0800 + + * Modify the variables of the risk module. + +commit 915b7533cf4ed3a1122c4d688b33129f14168305 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 17 13:27:47 2020 +0800 + + * Fix bug. + +commit 447dacf8f926bf40bcea8b6bfa80d088e07bf1dd +Merge: 9e34f458a9 ec3ffde99c +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 17 13:25:49 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9e34f458a9723e1224991dc2e4179cf2e193f6de +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 17 13:25:34 2020 +0800 + + * Fix bug#3761. + +commit ec3ffde99c0b6c134d24566175d3e8186129aad9 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 17 13:23:52 2020 +0800 + + * Use the defined sprintcommon. + +commit 9e1e418e5a0ebfddcb8af996e5b3fdb576052aad +Author: wangyidong +Date: Thu Dec 17 09:27:33 2020 +0800 + + * code task #8701 + +commit 0ac623456fcb46f26c5914ef1ea3ad3f7c52d4c2 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 17 11:28:12 2020 +0800 + + * Adjust code. + +commit 03ff16a5d2f1191b58a7da555e97d31c743391a2 +Author: tianshujie98 +Date: Thu Dec 17 11:23:00 2020 +0800 + + * Modify the variables of the my module. + +commit 58faa489a173c8c600fdd39a24a6cdca0adf2953 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 17 11:17:59 2020 +0800 + + * Adjust code. + +commit 68c5c8b36073272e10a7463ab5bdcc2af05376b8 +Author: tianshujie98 +Date: Thu Dec 17 11:09:55 2020 +0800 + + * Modify the variables of the issue module. + +commit 6d61bc7129fb7797ea53fcdcae4c787e413f8f6f +Author: tianshujie98 +Date: Thu Dec 17 10:59:30 2020 +0800 + + * Modify the variables of the group module. + +commit 95acba9fdeb177bcc4a6f8833f54f13d6cf89fbb +Author: wangyidong +Date: Thu Dec 17 10:58:37 2020 +0800 + + * finish task #8668. + +commit b1ecc77991ee5b30bf323b5beda1b6a3f52f327b +Author: tianshujie98 +Date: Thu Dec 17 10:34:05 2020 +0800 + + * Modify the variables of the design module. + +commit 7c3a4053aa695637b1356394de5a5a1ae7377bb3 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 17 10:29:14 2020 +0800 + + * Recode story concept. + +commit 64a728eb6f6dedad69c2fc29719002518270a451 +Author: qiyu-xie +Date: Thu Dec 17 10:01:03 2020 +0800 + + * Fix bug#3692. + +commit 2802710a55836c9be7393cac653ae1eb5cfb6cdd +Merge: 70864b85e0 4bde79bc36 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 17 10:00:19 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit aaf3c65aecc77954661a764ad71117a01c19fa5d +Author: tianshujie98 +Date: Thu Dec 17 10:00:11 2020 +0800 + + * Fix bug. + +commit 70864b85e04e9b91a41f3eeb6ba98b67296fd7d6 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 17 10:00:02 2020 +0800 + + * Batch create the todos which type is story. + +commit 4bde79bc36af22a058ff33df9c9dfef2e76766c4 +Author: tianshujie98 +Date: Thu Dec 17 09:57:07 2020 +0800 + + * Fix bug. + +commit 46fb8e19ec22d7c0710e731b210bc9064dfe9866 +Author: tianshujie98 +Date: Thu Dec 17 09:52:16 2020 +0800 + + * Change variable name. + +commit 3663a1dd337a1d444eb18957bbc35ff343be1aa0 +Author: qiyu-xie +Date: Thu Dec 17 09:46:34 2020 +0800 + + * Finish task#8691. + +commit 5bd9adb5d6531fab639cc7c9761e69cde5ce78f7 +Merge: b6fde22ae4 167c13f47f +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 17 09:37:34 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b6fde22ae476f8008b239c17154cc1acffea653e +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 17 09:37:24 2020 +0800 + + * Modify the variable name. + +commit 167c13f47fcb475e4d6527d702fb629c853522da +Merge: 8b2007c564 451ed69d38 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 17 09:31:10 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 451ed69d38d89f5f75ab72bb9ce62b7b55a73f32 +Author: wangyidong +Date: Thu Dec 17 09:23:42 2020 +0800 + + * finish task #8701. + +commit 570132c5b5ba14723a613300fc7007c8c34116ac +Merge: 3c207004b1 2688718ee0 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 17 09:27:36 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3c207004b127f5ca8b7cdf2d5c0dfb7b820c7da9 +Merge: 27006dfc8e 9cc53ca106 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 17 09:27:10 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2688718ee0b0d522c38f342b41395de6c500383e +Author: holan20180123 <56391770@qq.com> +Date: Thu Dec 17 09:26:35 2020 +0800 + + * Finish task #8673. + +commit 27006dfc8e3e0f7838831381ee151aef7d5b0f25 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 17 09:26:32 2020 +0800 + + * Finish task#8665. + +commit 8b2007c56495ff61fdf8e7a3a61609ca874f7be7 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 17 09:20:41 2020 +0800 + + * Finish task#8655. + +commit 9cc53ca106bb9c2405871efcfd24d6e5936fca2b +Author: tianshujie98 +Date: Thu Dec 17 09:09:56 2020 +0800 + + * Fix bug. + +commit 47cebcb39b8812b67cae26359754af3e8599f710 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 17 09:14:13 2020 +0800 + + * Fix bug. + +commit f30d0a990ec332ef4d22f328716b16edeb414746 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 17 09:04:05 2020 +0800 + + * Finish task#8663. + +commit 2c4d89ed45dc199181368875d194b8902cdd991a +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 17 08:56:09 2020 +0800 + + * Adjust code. + +commit bb8556a296f489f18cf138fd0940ea0d4d8afc31 +Merge: 417cc0d800 16c921432d +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 17 08:45:44 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 417cc0d800077df8ed42cfaf473b3884e82ce0cd +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 17 08:45:26 2020 +0800 + + * Finish task#8661. + +commit 16c921432d8f84e45fefe87a515c44045552762d +Author: wangyidong +Date: Wed Dec 16 17:34:05 2020 +0800 + + * finish task #8682. + +commit 411fff6248e982200fe7c1c416e2e022b138c31b +Author: wangyidong +Date: Wed Dec 16 17:29:29 2020 +0800 + + * finish task #8681. + +commit 5866f61a86f1c48670f2df533264499103892345 +Author: wangyidong +Date: Wed Dec 16 17:36:29 2020 +0800 + + * Merge from master. + +commit 67aea6d89ec47c1fb328666ce5b2e7951d5631ec +Author: wangyidong +Date: Wed Dec 16 17:12:32 2020 +0800 + + * finish task #8653. + +commit 061abbd023b3217c9097d71ab3f94e43b58e5031 +Merge: 6029f1ac69 79359a5571 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 16 17:29:21 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6029f1ac69aa5c1aab4db29a89bb47517a385e2d +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 16 17:27:44 2020 +0800 + + * Adjust code. + +commit 79359a5571ad41f68c357dab89d3c4b1c5bf3194 +Author: wangyidong +Date: Wed Dec 16 17:25:45 2020 +0800 + + * code for task #8653. + +commit 687c85c539af43ab7d21d4ed14fbd04f7f8ec7f9 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 16 17:25:09 2020 +0800 + + * Finish task#8689. + +commit 8570e4fae9e596e30b3078c56731d6358006cd98 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 16 17:13:50 2020 +0800 + + * Finish task #8672. + +commit 1a245d7229dbb45ecf1ab9f12874a6b92d04626c +Author: tianshujie98 +Date: Wed Dec 16 16:50:18 2020 +0800 + + * Finish task #8686. + +commit ae552beafa9302ef076c021db8b01b37fbd90654 +Author: Yagami <976204163@qq.com> +Date: Wed Dec 16 16:52:37 2020 +0800 + + * Merge sql. + +commit b8d97f2f2dcf734dcada8df4a1fc9973d6acbb8c +Author: Yagami <976204163@qq.com> +Date: Wed Dec 16 16:51:58 2020 +0800 + + * Adjust code. + +commit 3c2d15a481d5a84e026c4f4643db845da7fc2203 +Author: Yagami <976204163@qq.com> +Date: Mon Dec 14 15:44:41 2020 +0800 + + * Fix lang. + +commit 8967a97964a8189f9f2eaf02807a551765469f3f +Author: tianshujie98 +Date: Wed Dec 16 16:28:53 2020 +0800 + + * Finish task #8686. + +commit 3c970489fa9e8c212e73499d73f8eebaf49d81ed +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 16 16:10:31 2020 +0800 + + * Finish task #8574. + +commit 187b665fd0da4b42b76349b2b768e8f1f5d5ad3a +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 16 15:49:17 2020 +0800 + + * Finish task #8677. + +commit d8fb7654be626e1801cd0ef9e640981b979dee83 +Author: tianshujie98 +Date: Wed Dec 16 15:42:20 2020 +0800 + + * Finish task #8683. + +commit 9f62bf3273fdd11883155f988194c0360be5b39d +Author: tianshujie98 +Date: Wed Dec 16 15:39:22 2020 +0800 + + * Finish task #8669. + +commit ae5ac873f1039ddb2f2d91dedc0e8b2b41ec30fc +Author: qiyu-xie +Date: Wed Dec 16 15:36:50 2020 +0800 + + * Fix bug#3692. + +commit b6fd197901b3d6dcf315f33c0da52a219bbca570 +Author: tianshujie98 +Date: Wed Dec 16 15:35:46 2020 +0800 + + * Finish task #8669. + +commit 9a214bbae274c7aeaa0c3bfa04fd7078a4b8a1c1 +Author: tianshujie98 +Date: Wed Dec 16 15:30:59 2020 +0800 + + * Finish task #8680. + +commit 54f6434a5c52147e6e19462292d8b11fc30f718c +Author: qiyu-xie +Date: Wed Dec 16 15:28:00 2020 +0800 + + * Finish task#8659. + +commit c6ce008774ed057880864b6656550c77e7ff9559 +Author: tianshujie98 +Date: Wed Dec 16 15:23:51 2020 +0800 + + * Finish task #8683. + +commit 51f12ade78230282558e661534958ffdc60bd4e3 +Author: tianshujie98 +Date: Wed Dec 16 15:01:24 2020 +0800 + + * Finish task #8688. + +commit d1b96633f160b26e2fd6c03bf5592abc8dc94b33 +Author: wangyidong +Date: Wed Dec 16 14:48:27 2020 +0800 + + * Change for compatible openssl and mcrypt. + * Fix error when no isset canBeChanged var. + +commit a7669d60f4a8124338aaffedb9de802990a45006 +Author: tianshujie98 +Date: Wed Dec 16 14:45:45 2020 +0800 + + * Change the program variable to project. + +commit 44c7bcbd59d443e12668a1674aec08e35d02e2ec +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 16 14:46:05 2020 +0800 + + * Finish task #8678. + +commit eac61b8182e27308a305348cca36db0570e80832 +Merge: 371ab04e09 3cc73fba99 +Author: wangyidong +Date: Wed Dec 16 14:40:29 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit c1fb6ddf0e15a803c4fd0f571a7bb29033fc737e +Author: tianshujie98 +Date: Wed Dec 16 14:38:47 2020 +0800 + + * Finish task #8651. + +commit 371ab04e09103b6b8ac315a88c68ec5362d8d517 +Author: wangyidong +Date: Wed Dec 16 14:39:02 2020 +0800 + + * fix for error when not isset canBeChanged var. + +commit 8a655945877da7a24f1629f6010f47727d1f0720 +Author: wangyidong +Date: Wed Dec 16 14:37:03 2020 +0800 + + * change for compatible openssl and mcrypt. + +commit 14ce1b7a909809a79281e4ed9a5ada9792b13c56 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 16 14:36:24 2020 +0800 + + * Finish task#8697. + +commit cf3ba0798f428a5b4e96b5142e78b0446bc2657e +Author: qiyu-xie +Date: Wed Dec 16 14:19:29 2020 +0800 + + * Finish task#8698. + +commit db3dccfe5e4188214dfe17de0990f7389105710a +Merge: 30e13a49c8 62bbdfa544 +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 16 14:22:45 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 30e13a49c886038c8ef3ebcb81df4bdad20fdb50 +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 16 14:22:32 2020 +0800 + + * Finish task#8687. + +commit 62bbdfa544ec6a339a4f260a0df91197342175ba +Author: tianshujie98 +Date: Wed Dec 16 14:20:17 2020 +0800 + + * Finish task #8695. + +commit 290e4fe73d5a41a39eb5034da4ca212104ea96b2 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 16 14:10:34 2020 +0800 + + * Finish task#8699. + +commit bc839b6e9b2f1cbdfedcd923c84280beb734d662 +Merge: 8b80e3b217 bc5decef6e +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 16 13:49:24 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8b80e3b2172def9c9287483c140141e224b06a81 +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 16 13:49:11 2020 +0800 + + * Finish task#8656. + +commit bc5decef6ef3d48ed0ee6747c9c02e580e6298dc +Merge: 61d69d5321 adac247b71 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 16 13:44:20 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 61d69d5321d057dfe30e91ae60df9217e5065fc1 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 16 13:44:00 2020 +0800 + + * Finish task #8679. + +commit adac247b71b448c5b2577e9b783017ca257fab17 +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 16 10:16:12 2020 +0800 + + * Finish task#8657. + +commit 18d59ed47872241829a920ca32e4026d830ef897 +Merge: f73812b3e1 3bc550e573 +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 16 10:07:12 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3bc550e573d1e4f84041c4863a611e67013ad88e +Author: tianshujie98 +Date: Wed Dec 16 13:26:22 2020 +0800 + + * Modify the commit field type. + +commit f73812b3e1a14bb1b4b5f7f9a10f4c781247a610 +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 16 10:07:02 2020 +0800 + + * Modify the function comment. + +commit b7f2235dc406bfec2eddda5e4934828378128d45 +Merge: cd5e4e1593 0d1b376fcf +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 16 09:04:35 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cd5e4e1593590aabb35d222038816d4dbf5fed5d +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 16 09:04:13 2020 +0800 + + * Adjust code. + +commit 0d1b376fcf99a83165a9b0bc42d14a343f8e75db +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 16 08:59:44 2020 +0800 + + * Adjust the code. + +commit 6583d98e15561ad8d04c03ad6aacb92a018e4003 +Merge: dbcc5c949b 90f9d9ad7c +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 16 08:26:01 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dbcc5c949b55f1a6be69c7412e02977c5735e197 +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 16 08:25:44 2020 +0800 + + * Adjust the code. + +commit 90f9d9ad7cac0f0abfaaba6aa7af7d2da661b867 +Author: tianshujie98 +Date: Tue Dec 15 17:29:59 2020 +0800 + + * Adjust code style. + +commit a173276115b15ce4fa1cd81f8d01cb4265054a97 +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 15 10:16:39 2020 +0800 + + * Fix bug. + +commit 3cc73fba99e47a1145c4344c456ca5032e08d70e +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 15 10:04:06 2020 +0800 + + * Fix bug. + +commit 8a1e26837d3306cc221c2f1cef9577ea710b56d2 +Author: qiyu-xie +Date: Tue Dec 15 09:34:58 2020 +0800 + + * Delete link. + +commit 2e747acb1fb3afd8a4f5ffbe3a3a9103ec635ac4 +Author: qiyu-xie +Date: Tue Dec 15 09:21:35 2020 +0800 + + * Adjust code style. + +commit 1bcadb52601605f9b6f317048ffe511e373502b2 +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 15 08:25:03 2020 +0800 + + * Fix an error. + +commit da9abb36883f82e527f3d9e90ef0e966ae6c3e00 +Author: qiyu-xie +Date: Tue Dec 15 08:09:33 2020 +0800 + + * Fix bug. + +commit 200410c2bbb9ded4db7d252951551e5fff80328e +Author: leiyong <1549684884@qq.com> +Date: Mon Dec 14 23:31:13 2020 +0800 + + * Delete PGMView method. + +commit c71a5b14bbae2420d07a6cf8a449ac5dbcb1ee01 +Author: qiyu-xie +Date: Mon Dec 14 17:20:24 2020 +0800 + + * Fix bug. + +commit db55458c1573c815eb980fa41cb0b7bbcdb46069 +Author: qiyu-xie +Date: Mon Dec 14 16:11:51 2020 +0800 + + * Modify the overview of the project, only one product is counted. + +commit ff67859fd0386c2472664b2996b1830a777b3666 +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 14 16:24:35 2020 +0800 + + * Fix bug #3708. + +commit 94202fdd896da14191214d4e3cb69673a52b18fb +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 14 16:21:45 2020 +0800 + + * Fix bug #3708. + +commit 49cb5fef8b90ea158e96945f549cb74a7dae6015 +Author: tianshujie98 +Date: Mon Dec 14 16:19:43 2020 +0800 + + * Add comment. + +commit 0d187a518b7ac1133da80b582609ed3862d97ebc +Author: tianshujie98 +Date: Mon Dec 14 14:45:22 2020 +0800 + + * Adjust code style. + +commit f4dc0e656cc9212654c642d0930c759cdac56b9c +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 14 16:10:47 2020 +0800 + + * Fix bug #3708. + +commit 8910eaba5df8b9db0ee7cb179fa35c0fa2102849 +Author: qiyu-xie +Date: Mon Dec 14 15:14:11 2020 +0800 + + * Fix bug#3729. + +commit f25e318ed0d05efa6de248ca00efe3958ca8bbbe +Author: qiyu-xie +Date: Mon Dec 14 13:59:32 2020 +0800 + + * Modify link. + +commit 7a4947d9703d96e17ebf525982e9b4e10e92699e +Author: leiyong <1549684884@qq.com> +Date: Mon Dec 14 14:47:51 2020 +0800 + + * Adjust code. + +commit 84a13edd5ea868d5b5198bfafa8324753477d510 +Author: Catouse +Date: Mon Dec 14 14:14:20 2020 +0800 + + * update $.gotoObject method. + +commit 129b727375e89992ab8efe060eb2b53a24a4c524 +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 14 14:10:56 2020 +0800 + + * Fix a bug. + +commit f60745172cdf2f4cf9309a7c7b5bf0b407fb0ba2 +Author: tianshujie98 +Date: Mon Dec 14 13:51:30 2020 +0800 + + * Delete duplicate fields. + +commit c745808f86016a5a577bb4ef5c9edc7efe90f30d +Author: Catouse +Date: Mon Dec 14 13:41:04 2020 +0800 + + * update $.gotoObject method. + +commit 0847f26429af0207ef43f90ba02f75441cffc8a2 +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 14 13:39:51 2020 +0800 + + * Fix bug #3759. + +commit 64fc9f5c84ce5ae56566fcee0fc739b8ec2a29d0 +Author: qiyu-xie +Date: Mon Dec 14 13:19:45 2020 +0800 + + * Fix bug#3757. + +commit 6a00a0981793a985b38196ad3c205ef0e5cea4c9 +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 14 11:19:43 2020 +0800 + + * Fix bug#3740. + +commit d6e26536a69fbaaa52120bbb355af7a9d15481ec +Author: qiyu-xie +Date: Mon Dec 14 10:49:37 2020 +0800 + + * Modify code for task#8591. + +commit a91ebce2fbcfa29dd5608d2df5d7e9040a5bb79a +Author: tianshujie98 +Date: Mon Dec 14 10:38:06 2020 +0800 + + * Fix bug. + +commit 6db741c5da6f45654acf7aefbe0ab71987f3fbf4 +Author: tianshujie98 +Date: Mon Dec 14 10:29:10 2020 +0800 + + * Fix bug #3758. + +commit e168ba731359ff7d04de9be7b1aa21d51bae9d3a +Merge: 119b89ef16 c771e1947c +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 14 08:47:06 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 119b89ef16d5145ebb0a299d6f144297437d47c5 +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 14 08:46:40 2020 +0800 + + * Adjust the code. + +commit c771e1947c1f962fe46860744bc449b3b534037e +Merge: a18ac6792e 5dbd8270bb +Author: wangyidong +Date: Fri Dec 11 20:42:10 2020 +0800 + + Merge branch '12.x' + +commit a18ac6792e6ac21b4fb9b63c510173e104b6c2aa +Author: qiyu-xie +Date: Fri Dec 11 17:32:29 2020 +0800 + + * Modify call a database query in foreach. + +commit f34457b20e2baad278207f8464e0e2f978fe705c +Author: tianshujie98 +Date: Fri Dec 11 17:26:46 2020 +0800 + + * Add comment. + +commit 5dbd8270bb9343532cd5109c9c9ef98bd8d17c04 +Author: wangyidong +Date: Fri Dec 11 17:22:40 2020 +0800 + + * fix bug #3744. + +commit eadd494a9b16126147409da49c7ccfcc21bdd939 +Author: wangyidong +Date: Fri Dec 11 16:55:52 2020 +0800 + + * fix bug. + +commit aa7c7c43c4e26a015cf72bdb2a649bf252ece915 +Author: wangyidong +Date: Fri Dec 11 16:48:37 2020 +0800 + + * fix bug. + +commit f734f15e7affacf1895eb9561ccbd032fb3fd6a4 +Author: tianshujie98 +Date: Fri Dec 11 16:52:33 2020 +0800 + + * Adjust code style. + +commit f0d0a807ee9fb19aecd814e130ffbdc1879acde6 +Author: tianshujie98 +Date: Fri Dec 11 16:38:05 2020 +0800 + + * Upgrade unified zt_build table format. + +commit 3ae0d546762ce3a115ef68fec7d0b0a56034c34c +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 11 16:26:47 2020 +0800 + + * Fix bug. + +commit feb8e765aee00b5f06704a1db96feda3ec070a60 +Author: qiyu-xie +Date: Fri Dec 11 16:07:43 2020 +0800 + + * Optimize the code. + +commit f7d642e8431393781408a417118f853b7e555c9f +Author: wangyidong +Date: Fri Dec 11 16:09:43 2020 +0800 + + * adjust for build by tag. + +commit 4b3e0928220a9a77f1540c0a9f47e9b2db8167e3 +Author: wangyidong +Date: Fri Dec 11 11:41:45 2020 +0800 + + * fix bug #3657. + +commit 9efabc5d051567fd4f06c71411fded4bb640ec99 +Author: Yagami <976204163@qq.com> +Date: Fri Dec 11 16:03:05 2020 +0800 + + * Adjust code. + +commit e82c98d242411aca2115bb643316ba2ffaf1f67a +Author: Catouse +Date: Fri Dec 11 16:03:17 2020 +0800 + + * update kindeditor to support transfer events from iframe to parent document. + +commit bc180ce00c1d99e9cc7bee8530f3b30993fd87e9 +Author: Yagami <976204163@qq.com> +Date: Fri Dec 11 15:08:04 2020 +0800 + + * Adjust code. + +commit 894da720a321be96edbf210883bc42508790d206 +Author: Catouse +Date: Fri Dec 11 16:03:17 2020 +0800 + + * update kindeditor to support transfer events from iframe to parent document. + +commit 1ef8caaca3472d218d70fd6cb3f8ea3d7e3be26d +Author: Catouse +Date: Fri Dec 11 16:02:07 2020 +0800 + + * update zui.js. + +commit 1eeb88a7231af5b311cefab0ac856574a4fb8eef +Author: tianshujie98 +Date: Fri Dec 11 15:53:20 2020 +0800 + + * Fix delete issue. + +commit b286abd39f4721072cdeb9888895971834b2e865 +Merge: 7af282b5f8 c858ae19e3 +Author: holan20180123 <56391770@qq.com> +Date: Fri Dec 11 15:53:07 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c858ae19e34aff11f167d821c846ef2f853f2e30 +Author: wangyidong +Date: Fri Dec 11 15:47:12 2020 +0800 + + * fix for undelete project. + +commit dabb2d003d082fce57de13b583dbfe968934e30b +Author: tianshujie98 +Date: Fri Dec 11 15:44:31 2020 +0800 + + * Adjust code style. + +commit 7af282b5f87af02b25ba0358b24c95f5aaf3e430 +Author: holan20180123 <56391770@qq.com> +Date: Fri Dec 11 13:09:13 2020 +0800 + + * Fix bug #3753. + +commit 38867fc96cb41c4e012218340c4cb5fd5f01742a +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 11 13:02:43 2020 +0800 + + * Fix bug#3749. + +commit 791f1201dd5d31e939d11b4591b46841401746a8 +Author: holan20180123 <56391770@qq.com> +Date: Fri Dec 11 11:42:55 2020 +0800 + + * Fix bug #3756. + +commit 4771e3c300eff3c714c9c1dc04d9cfa90d8710ef +Author: holan20180123 <56391770@qq.com> +Date: Fri Dec 11 11:31:57 2020 +0800 + + * Fix bug 3754. + +commit a1b53ed59b685a7dcf47daade7ef9d18bddd435d +Author: tianshujie98 +Date: Fri Dec 11 10:43:26 2020 +0800 + + * Fix bug. + +commit e63b3cdce0c1caa26909536f36f8a57b4cf00373 +Author: tianshujie98 +Date: Fri Dec 11 10:34:50 2020 +0800 + + * Adjust code style. + +commit 6d7fbdc21f9681ebbf12ef1ebfc7f793052c60d7 +Author: tianshujie98 +Date: Fri Dec 11 10:21:27 2020 +0800 + + * Fix version search problem. + +commit 51e91bc786d2abc244cfc796c1070c33ab5888f9 +Author: wangyidong +Date: Fri Dec 11 10:14:29 2020 +0800 + + * code bug #3568. + +commit 4696296c91c3469974e3dc7bac8a7d95ba9e1718 +Author: qiyu-xie +Date: Fri Dec 11 10:09:06 2020 +0800 + + * Fix bug. + +commit ad87de1b2310372cb03d71a8439a95fd532cf58d +Merge: 0aa9987f0c 0d492cdffd +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 11 10:06:47 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0aa9987f0c69c563717241a2110fbf1ddf72f26e +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 11 10:06:26 2020 +0800 + + * Fix bug#3755. + +commit 95470ded6e14dc6a1b3de6598610e7500ceed63f +Author: wangyidong +Date: Fri Dec 11 09:54:23 2020 +0800 + + * code bug #3688. + +commit 0d492cdffd0376d6214fc07e9b6ece2fdbcac61b +Author: tianshujie98 +Date: Fri Dec 11 09:41:55 2020 +0800 + + * Adjust code style. + +commit 5eda53df87b8ab3281529c7b1b173ee8a372f3e7 +Author: wangyidong +Date: Fri Dec 11 09:30:43 2020 +0800 + + * code for bug #3693. + +commit 4ea7be9c725fd9c92a01e57f906a5fdcbc405990 +Author: wangyidong +Date: Fri Dec 11 08:53:07 2020 +0800 + + * adjust lang. + +commit 57e87d637dbfbb8eda7054efb363e3aa1d087f83 +Merge: 54bea01825 36f23e3879 +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 11 08:47:32 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 54bea018256cc277e3abfbbec79957076bf0e2a2 +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 11 08:46:41 2020 +0800 + + * Fix bug#3751. + +commit 36f23e3879fdc7f64ff8e99ecdd05df62a8ad350 +Author: qiyu-xie +Date: Fri Dec 11 08:11:00 2020 +0800 + + * Optimize the code. + +commit 328a9683bae92a0c72c871da6ccfcd3e4742129f +Merge: 0c0ed3ca18 e82efd6291 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 10 17:37:22 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0c0ed3ca183a2633ef7b2a559cb68acd61b4c7f7 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 10 17:37:15 2020 +0800 + + * Fix an error. + +commit e82efd6291849f985f13ed622662026e2867fc76 +Author: qiyu-xie +Date: Thu Dec 10 17:29:45 2020 +0800 + + * Modify error when have custom docLib. + +commit 613f64a483f86124779c36afc9e64ca946ba15c1 +Author: qiyu-xie +Date: Thu Dec 10 17:16:52 2020 +0800 + + * Modify the sort of docLib. + +commit 197d1c03559b49f735e25f2aaec51bf0a45ca9ff +Author: wangyidong +Date: Thu Dec 10 17:22:21 2020 +0800 + + * adjust for en lang. + +commit 9fb5a40e8de0578bf4d3ce1ee778e7b5590429b4 +Merge: dafaae3321 3e00b81816 +Author: wangyidong +Date: Thu Dec 10 17:16:42 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b3244a73a34e6a7047fb03ea2ea7623828f41b98 +Author: wangyidong +Date: Thu Dec 10 17:15:34 2020 +0800 + + * adjust for en lang. + +commit dafaae3321d38482122e787b7108b472bf06dbdb +Author: wangyidong +Date: Thu Dec 10 17:14:17 2020 +0800 + + * adjust for en lang. + +commit 3e00b818160712af9fef39ee5ccb6d6ca0205d30 +Merge: cd9b90a541 5d505e3362 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 10 17:11:54 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cd9b90a54118d5ad926c3afd52530ca65e9f8096 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 10 17:11:41 2020 +0800 + + * Fix bug#3752. + +commit 28af1ae7e38b45457be8d9f809bd7f6052a1b94a +Author: wangyidong +Date: Thu Dec 10 17:06:50 2020 +0800 + + * adjust for notice one click safe. + +commit ecae390f75a5da3ec25e8c2ffb98b761378332df +Author: wangyidong +Date: Thu Dec 10 17:06:31 2020 +0800 + + * adjust style. + +commit 5d505e3362cd9a28c1d0073730bc06192ef37944 +Author: qiyu-xie +Date: Thu Dec 10 16:22:12 2020 +0800 + + * Modify the sort of docLib. + +commit 3dcd7efbd22db274a6a9ebbfc9da5ad234050b04 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 10 15:34:10 2020 +0800 + + * Fix search menu. + +commit 380fee26aa47d491f8b4d996b9ab944a9fb313ae +Author: tianshujie98 +Date: Thu Dec 10 15:25:28 2020 +0800 + + * Fix bug #3747. + +commit 81302ef084aadaa43289dfe75cf0574e68726d19 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 10 15:05:09 2020 +0800 + + * Finish task #8597. + +commit 3ecbf0262b44d1ea5e74beee28c7d3baa744d090 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 10 10:38:11 2020 +0800 + + * Code for task #8597. + +commit e8cfabe8df5bc3177db2540410da5844337ad232 +Author: tianshujie98 +Date: Thu Dec 10 14:40:42 2020 +0800 + + * Reduction. + +commit 9cbec051b230ec67e17a480c4837537875585dba +Author: qiyu-xie +Date: Thu Dec 10 14:50:06 2020 +0800 + + * Check product name when create project. + +commit 5182c4ed3b268befb51c60650714859a2bef33cb +Author: holan20180123 <56391770@qq.com> +Date: Thu Dec 10 14:37:36 2020 +0800 + + * Remove search type. + +commit 72713dfd6602911765765a0c113826359efb0e47 +Merge: 19946b927b 3444134266 +Author: holan20180123 <56391770@qq.com> +Date: Thu Dec 10 14:29:38 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 19946b927bbb1b3823a1e6e653b96c0d15565610 +Author: holan20180123 <56391770@qq.com> +Date: Thu Dec 10 14:28:57 2020 +0800 + + * Fix configure scrum error. + +commit 344413426686660432d1cc30033846ce76cabf5f +Author: tianshujie98 +Date: Thu Dec 10 13:52:51 2020 +0800 + + * Fix search bugID. + +commit 24522396906c02a44ee10f8805f010ed7df2bac2 +Author: tianshujie98 +Date: Thu Dec 10 13:22:52 2020 +0800 + + * Adjust linked products issues when creating independent projects. + +commit cf38a216e68ea2293b7794bfe9f76a37a5d6fa9e +Merge: 01774f22a3 80fd2fbaab +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 10 13:17:58 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 01774f22a351338678bde27ae9b1de1c04cd7735 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 10 13:17:48 2020 +0800 + + * Fix bug#3739. + +commit 80fd2fbaab1b368ebba0a5dd8b7428f02371dbfe +Author: holan20180123 <56391770@qq.com> +Date: Thu Dec 10 13:11:33 2020 +0800 + + * Fix caselib error. + +commit 7211b801eef5afdd7a1e9646c3b72932ba86b5fa +Author: qiyu-xie +Date: Thu Dec 10 11:13:47 2020 +0800 + + * Get sprints or stages order by begin time. + +commit 25234feeb93318ed4e07da8b83289d06c1e18d00 +Author: qiyu-xie +Date: Thu Dec 10 11:07:02 2020 +0800 + + * Finish task#8603. Add judgment. + +commit ba20f7e8f5a952341c98dc688ded974033f1fac4 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 10 10:56:56 2020 +0800 + + * Fix an error. + +commit 0bd25091a5b6eab2cfc4dbb1a576fc261a78db87 +Merge: 936647a9d8 55e7a7c316 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 10 09:59:03 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 936647a9d8ff3122648eea2a746730ecd17a0412 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 10 09:58:38 2020 +0800 + + * Fix a bug. + +commit 55e7a7c316139beb3e560e8efde6a0c90b1b63ef +Author: qiyu-xie +Date: Thu Dec 10 09:54:00 2020 +0800 + + * When select create new product, product name cannot be empty. + +commit b117ab60d202910b66fd6a54cfc578a2c95bf06f +Author: qiyu-xie +Date: Thu Dec 10 09:23:19 2020 +0800 + + * Finish task#8602. + +commit 5d2180de9048a63d684397ebb1cc594f7e71ac97 +Author: qiyu-xie +Date: Wed Dec 9 16:39:59 2020 +0800 + + * Fix lang. + +commit 4b95dd37d9d489e163cf21f9ad5c850d09f9b16d +Author: tianshujie98 +Date: Thu Dec 10 09:30:42 2020 +0800 + + * Adjust code style. + +commit 69e8548c1bf5e4634f608b6d7377264e594011e0 +Author: tianshujie98 +Date: Thu Dec 10 08:27:42 2020 +0800 + + * Adjust code style. + +commit 9c5a9dced5dc111bf319f9a929a721de19acf720 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 10 09:07:54 2020 +0800 + + * Finish task#8592. + +commit bf6dcd8481e83897fa88bdfda16ff4c4b9b4d3eb +Author: wangyidong +Date: Wed Dec 9 17:44:06 2020 +0800 + + * adjust for check one click package. + +commit e8fb07c9e39ead58a8482eff8ae8dc267dda18c7 +Author: qiyu-xie +Date: Wed Dec 9 21:06:21 2020 +0800 + + * Finish task#8602. + +commit 0493cae00d07400b620083aacd241a81d3bbe69e +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 9 17:52:50 2020 +0800 + + * Fix bug. + +commit 20f7d80e106eee141a30720ed6c612ee9d455da0 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 9 17:28:29 2020 +0800 + + * Fix bug, + +commit d30a395ec0dde522f77606d5b2a14d300390183c +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 9 17:20:55 2020 +0800 + + * Finish task#8590,task#8589. + +commit 8d48c923c69090497daa94b1d36f3033880f8fc9 +Author: qiyu-xie +Date: Wed Dec 9 16:31:06 2020 +0800 + + * Get stages order by begin time. + +commit 85080edae678cf2489a1549dea5d194fcf2cf185 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 9 16:27:31 2020 +0800 + + * Modify comments. + +commit d8a24428e001455c1e9f11db1bbc9263ee1264e7 +Author: Yagami <976204163@qq.com> +Date: Wed Dec 9 16:11:59 2020 +0800 + + * Finish task #8615. + +commit 1551ff77da4f151f7ac3b24d453fefe76a6c3ea2 +Merge: ecefa26034 20e61b5207 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 9 15:51:30 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ecefa26034c2df920c8ea8bd87f840974846deb0 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 9 15:45:48 2020 +0800 + + * Finish task #8621. + +commit 20e61b5207dd1cca80b10dff3b4ed5083e40c752 +Author: Yagami <976204163@qq.com> +Date: Wed Dec 9 15:39:10 2020 +0800 + + * Fix set story concept view. + +commit 0924720a8f0bd303497a3f1596456c027f450b61 +Author: Yagami <976204163@qq.com> +Date: Wed Dec 9 15:36:40 2020 +0800 + + * Merge code. + +commit c79aa30c87619d91a111e7d67536655d13829503 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 9 15:09:26 2020 +0800 + + * Finish task #8621. + +commit 686b2881a917bcf92f7c04e7cb73f7a75e613d20 +Merge: ca3b4960f0 752cdd463c +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 9 15:07:46 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 752cdd463cf596bf3e6ca02b8366f8cdfffcf76f +Merge: e279006f68 45301c4aa5 +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 9 15:03:33 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e279006f6860de3988fc6a24539cd80b11b8639f +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 9 15:03:04 2020 +0800 + + * Finish task#8612. + +commit 45301c4aa5d7db742d6ba14608cd94bfe1619a30 +Author: qiyu-xie +Date: Wed Dec 9 14:57:11 2020 +0800 + + * Finish task#8603. + +commit 97392669ffa1c3e3bb6eb8d3a751b0605459d36a +Author: wangyidong +Date: Wed Dec 9 14:15:47 2020 +0800 + + * finish task #8600. + +commit dd2381a1f64ad298d0fada79be788606d4ec5884 +Author: tianshujie98 +Date: Wed Dec 9 14:12:13 2020 +0800 + + * Fix product linked bugs. + +commit 65ba8b4e768fbe19c081abf8d6798c860d46516f +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 9 14:07:49 2020 +0800 + + * Finish task #8675. + +commit 7ffbc286fae9de4a42f20c84c0dc19948f6b7ab3 +Author: tianshujie98 +Date: Wed Dec 9 13:53:10 2020 +0800 + + * Finish task #8581. + +commit 8620b8471ca5ae46909cb890ae46194c3e63d686 +Merge: 95521e44a4 c64ea8fde8 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 9 13:49:17 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 95521e44a4cf04b09841de4287384d7e957932a7 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 9 13:48:51 2020 +0800 + + * Finish task #8613. + +commit c64ea8fde88ebcc34ee5e13a6183bbe2caf5ddc4 +Merge: 48b25d6970 f753d03fc5 +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 9 13:44:15 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 48b25d6970c9814b851134c82c4b3583a8fe33d5 +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 9 13:44:04 2020 +0800 + + * Finish task#8571, task#8572, task#8582, task#8583, task#8594. + +commit f753d03fc52661038d1d1f9646352c1e730a4239 +Author: Yagami <976204163@qq.com> +Date: Wed Dec 9 13:22:07 2020 +0800 + + * Finish task #8588. + +commit ca3b4960f04e5e4d96e16489da6cd5a2e467d110 +Merge: b734e39844 6cd56309e2 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 9 13:20:31 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6cd56309e2a3d554278c7316906cdebd45f1224b +Author: Yagami <976204163@qq.com> +Date: Wed Dec 9 13:18:46 2020 +0800 + + * Finish task #8585. + +commit f11c8319f7854852f28b34915057530d045f4f77 +Author: qiyu-xie +Date: Wed Dec 9 12:53:26 2020 +0800 + + * Finish task#8576. + +commit 2fa5e703b8b8df81307797d0252416a43273446a +Author: qiyu-xie +Date: Wed Dec 9 10:42:18 2020 +0800 + + * Finish task#8591. + +commit b734e3984485f1a36909154c2679d1f80a913023 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 9 11:43:58 2020 +0800 + + * Fix bug. + +commit fdd19cd2a1deb34b60e62d0213f54d389cb59e41 +Author: Yagami <976204163@qq.com> +Date: Wed Dec 9 11:41:21 2020 +0800 + + * Finish task #8580. + +commit d56406cbf2bb69ff9a28f850253299e00c14d196 +Author: wangyidong +Date: Wed Dec 9 11:29:59 2020 +0800 + + * finish for task #8579. + +commit 56e0fc621f0b78343eb84947e72d19d465a34005 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 9 11:28:54 2020 +0800 + + * Fix bug. + +commit e11004f2c53f36afa37b018a77bc916a13881643 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 9 11:14:42 2020 +0800 + + * Fix bug. + +commit ff9a3932ccc858076752e44726c28a5d7dc4b53f +Author: wangyidong +Date: Wed Dec 9 10:53:04 2020 +0800 + + * adjust for check one click package. + +commit e571c8a1da231ecf2347d73e45793bcac63667e9 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 9 10:40:11 2020 +0800 + + * Fix bug. + +commit bfe477426c9b7a2c23be0c812d027cc6091f2b29 +Author: Catouse +Date: Wed Dec 9 10:25:03 2020 +0800 + + * add active style for .header-angle-btn. + +commit 9ee27cb146f94689cc48b6b76c4c07d322e5fd60 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 9 10:20:43 2020 +0800 + + * Finish task #8608. + +commit 68fe0c6a78fc4116cada01aa527db127036bcdea +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 9 10:12:12 2020 +0800 + + * Finish task #8575. + +commit 05f287a2e15026911a71d2eb1352e74360d14275 +Author: qiyu-xie +Date: Wed Dec 9 10:03:29 2020 +0800 + + * Finish task#8587. + +commit f2a8cfd82830f06820b59a61462429181fdcce2f +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 9 09:59:05 2020 +0800 + + * Adjust code. + +commit efdf9de3a910714c500050207f493882921cdb6e +Author: tianshujie98 +Date: Wed Dec 9 09:45:53 2020 +0800 + + * Finish task #8601. + +commit 1d212e3eab99283f0f2dc3faa3dc4d115825cc5c +Merge: 53df6f14e0 f76973d4d2 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 9 09:42:29 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 53df6f14e0522a2d97f7fcda26c18c6b5d8fc723 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 9 09:42:15 2020 +0800 + + * Fix bug. + +commit f76973d4d2ac2583ea6774af6e2b4d36fca8e31f +Author: tianshujie98 +Date: Wed Dec 9 09:35:00 2020 +0800 + + * Finish task #8616. + +commit 467c593f20674f3a56260e7d4d33f328846d4fe2 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 9 09:34:20 2020 +0800 + + * Fix bug. + +commit ed422d025ca8b9c10addf1d0d41cc658a68fa9c8 +Merge: 32b2f62ba7 a5db689adf +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 9 09:30:15 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 32b2f62ba7ad256b2de120e88e5f7d416206a144 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 9 09:29:59 2020 +0800 + + * Adjust code. + +commit a5db689adf896ae68a88061cb1c35cfc0f15bb56 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 9 09:27:03 2020 +0800 + + * Finish task #8609. + +commit 89e0568619dba4c93c22e6dbfa4027ba0475eeef +Author: tianshujie98 +Date: Wed Dec 9 09:16:26 2020 +0800 + + * Finish task #8620. + +commit d7ede03687b95c349c80970f2d53d843ec65a49c +Author: qiyu-xie +Date: Wed Dec 9 09:04:09 2020 +0800 + + * Finish task#8573. + +commit bb485680aa9c4ba75711c37dd75649dc02b98b21 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 9 08:27:19 2020 +0800 + + * Adjust the budget module code. + +commit 5c77489f08f63e616152023e28c377d7b7fd8ac7 +Author: Yagami <976204163@qq.com> +Date: Tue Dec 8 17:30:52 2020 +0800 + + * Fix product block. + +commit 1654db7e6cfa6ecc587231b91e79894259696580 +Author: qiyu-xie +Date: Tue Dec 8 14:39:02 2020 +0800 + + * Fix bug. + +commit 0be576eba3f54068c776453607b9ecb6f9874224 +Merge: fa246c1173 58b718bfc0 +Author: wangyidong +Date: Tue Dec 8 14:53:01 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit fa246c117368a687409b0e4e1ddc3bbd4f62cd9b +Author: wangyidong +Date: Tue Dec 8 14:52:26 2020 +0800 + + * finish task #3688. + +commit 4cc2c70e66da054d63f64325e0b00e787d4daa65 +Author: qiyu-xie +Date: Tue Dec 8 14:48:17 2020 +0800 + + * Fix bug. + +commit f4d1880c5be4e26e972c813da3b83da9f2e5502a +Author: qiyu-xie +Date: Tue Dec 8 14:15:26 2020 +0800 + + * Delete the execution linked products that is not linked with the project. + +commit f4fb2b919a3ed021b9f9a3d2e4c7b48c4d947af9 +Author: tianshujie98 +Date: Tue Dec 8 14:41:41 2020 +0800 + + * Fix the bug search problem linked with the plan. + +commit 58b718bfc0c6a306c1c759131e6799f21746b370 +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 8 14:36:11 2020 +0800 + + * Fix bug #3644. + +commit 85791879930980fc1abb1b6d3a06b219bf22ad6b +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 8 14:32:25 2020 +0800 + + * Fix bug #3644. + +commit c31f294aac73a0a689d47c39f509e40f571d5827 +Author: tianshujie98 +Date: Tue Dec 8 13:23:15 2020 +0800 + + * Fix bug #3738. + +commit a9281522102081eabb396fff02d8929e0829d849 +Author: tianshujie98 +Date: Tue Dec 8 13:04:40 2020 +0800 + + * Fix bug #3704. + +commit a97a7df6d8f1a5fbf95ce60dd4d1c589e3b92246 +Author: tianshujie98 +Date: Tue Dec 8 11:41:25 2020 +0800 + + * Fix bug #3704. + +commit 8b291bc6da900a53a9baf798d0814df0ae0ed05f +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 8 11:34:35 2020 +0800 + + * Fix bug#3736. + +commit ad94534129cd644df9ce2f08a00b2d2263d6ed6e +Author: wangyidong +Date: Tue Dec 8 11:24:07 2020 +0800 + + * fix bug #3737. + +commit d2ddce5e7c1c4a8c0fca0d8663a71f269939b7e6 +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 8 11:08:32 2020 +0800 + + * Adjust the holiday module. + +commit 031134ae3f33fde876e4c28ab41d92b6fd631d58 +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 8 10:41:56 2020 +0800 + + * Fix bug 3642. + +commit 653f817e83bd543293d5f8fc24841ed1ae374c74 +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 8 10:28:35 2020 +0800 + + * Fix bug #3642. + +commit b5ad4665b4b8190d59aff59fd6e6c54515a66ba0 +Merge: 8de5f93c2b c33b130d05 +Author: wangyidong +Date: Tue Dec 8 09:26:47 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit 8de5f93c2be12c403388db114ab4d5d3b32db319 +Author: wangyidong +Date: Tue Dec 8 09:21:32 2020 +0800 + + * fix bug #3693. + +commit c33b130d057655cffad6343ae7652696e73a54fb +Merge: de8e4fc5ab 99359da6fd +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 8 09:11:28 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit de8e4fc5ab7082fb525914be9acde7688fa03047 +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 8 09:11:11 2020 +0800 + + * Fix bug#3715. + +commit 99359da6fd2e6f43b648d3566fcd7d30363b30ee +Author: tianshujie98 +Date: Tue Dec 8 08:29:08 2020 +0800 + + * Fix bug. + +commit bfce366ef1048c643a99174c873115656a6911bd +Author: tianshujie98 +Date: Tue Dec 8 08:24:07 2020 +0800 + + * Fix bug. + +commit badeb97dcac6d42ceca63d2f5174eceefceafb6f +Author: wangyidong +Date: Mon Dec 7 18:08:35 2020 +0800 + + * adjust for encrypt password. + +commit 83ed1f242396ed4fba37962c41e4ed733f4f409c +Author: leiyong <1549684884@qq.com> +Date: Mon Dec 7 17:55:45 2020 +0800 + + * Adjust code. + +commit 834aa60d879fc2ca24433b8e1084583321c67952 +Merge: 917e316962 75b0867e1d +Author: leiyong <1549684884@qq.com> +Date: Mon Dec 7 17:51:21 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 75b0867e1d1f7b13bcf31824ab538f2e3c0175b1 +Author: Catouse +Date: Mon Dec 7 16:42:38 2020 +0800 + + * fix padding of todo view in modal. + +commit e4b26a2a13e0fa2b9bff8f42ab6cade69c7f93fb +Author: qiyu-xie +Date: Mon Dec 7 15:40:49 2020 +0800 + + * Fix bug. + +commit 5be348e08e3a12b8a6d842ca76c762e4c12af274 +Author: tianshujie98 +Date: Mon Dec 7 15:34:35 2020 +0800 + + * Fix bug #3730. + +commit 917e316962f31b58b777979a0c55c045779eb07d +Author: leiyong <1549684884@qq.com> +Date: Mon Dec 7 15:21:38 2020 +0800 + + * Fix bug. + +commit 2b26da8044460dcc04635b5f01e34ace13fa2b17 +Author: tianshujie98 +Date: Mon Dec 7 15:20:24 2020 +0800 + + * Fix bug #3730. + +commit 2914b834b2fe79532671a07c97ecc8fcf70b1093 +Author: Yagami <976204163@qq.com> +Date: Mon Dec 7 15:07:28 2020 +0800 + + * Merge code. + +commit e1a40daddc12e79e1a3637b1a53b2d02b037c892 +Author: Yagami <976204163@qq.com> +Date: Fri Dec 4 08:50:06 2020 +0800 + + * Fix product menu. + +commit 7aaf8a9014e1fa48951c94eaa97e760f77c94b52 +Author: leiyong <1549684884@qq.com> +Date: Mon Dec 7 15:05:19 2020 +0800 + + * Adjust code. + +commit 611cda4fe73db4d43169371497162910e2847720 +Author: qiyu-xie +Date: Mon Dec 7 15:03:32 2020 +0800 + + * Fix bug. + +commit f5f3dcfc99ade15642ea77aa83200a17ce756a2c +Author: tianshujie98 +Date: Mon Dec 7 14:37:24 2020 +0800 + + * Fix bug #3707. + +commit 80a335e36f95414bb0f7e0575e532f60c1a085ed +Author: qiyu-xie +Date: Mon Dec 7 13:29:33 2020 +0800 + + * Fix bug#3667. + +commit d61e913cbf1f87eae7c0f8cf2835dfa791acc96a +Author: leiyong <1549684884@qq.com> +Date: Mon Dec 7 13:36:04 2020 +0800 + + * Fix bug. + +commit 9cdcd2a428686c50d501fba5fce935107111bbbd +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 7 13:10:59 2020 +0800 + + * Fix bug #3636. + +commit d9ab0caef0cf5ad4d9ad29894147d0bd68fbbd1d +Author: tianshujie98 +Date: Mon Dec 7 13:07:59 2020 +0800 + + * Fix bug #3720. + +commit bab45be34c9e3413ab3d3c92c103fe1562884fcf +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 7 13:06:35 2020 +0800 + + * Fix bug #3636. + +commit 63bd886a0c7b0615c86eab0c86b348c354015e3f +Author: leiyong <1549684884@qq.com> +Date: Mon Dec 7 13:06:05 2020 +0800 + + * Adjust code. + +commit 133d78bdc2f07942f55be4725c279668eaaafe1b +Merge: d990666ee6 2ae8463572 +Author: leiyong <1549684884@qq.com> +Date: Mon Dec 7 13:05:15 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f0a4efa0ad0c6a026fe1662ab36da9553bb3b3a8 +Author: tianshujie98 +Date: Mon Dec 7 11:38:18 2020 +0800 + + * Fix bug #3627. + +commit 2ae846357285d5a1299b03c6b22c295782fb98c6 +Merge: ab70c94671 6be1804519 +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 7 11:34:12 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ab70c94671285c9e7eadc64bfae042e7a97553fe +Author: hufangzhou <746775970@qq.com> +Date: Mon Dec 7 11:34:04 2020 +0800 + + * Fix bug#3734. + +commit b7fc85e6212a16fc0ac48dcb6b920d8446867bd0 +Author: qiyu-xie +Date: Mon Dec 7 10:17:47 2020 +0800 + + * Fix bug#3667. + +commit d990666ee659ccb349682063c8a14e818c55dd28 +Author: leiyong <1549684884@qq.com> +Date: Mon Dec 7 09:50:03 2020 +0800 + + * Fix bug. + +commit 6be180451940e5d2f132adbca7252e420dea3ecd +Author: tianshujie98 +Date: Mon Dec 7 09:46:28 2020 +0800 + + * Fix bug #3720. + +commit 475d9a5c270be3a5527cfff57d9fc998a805ad29 +Author: tianshujie98 +Date: Mon Dec 7 09:24:11 2020 +0800 + + * Fix bug #3627. + +commit 870dafd92fce394f4fc02b45b5ed5e6ce26d740f +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 7 08:59:11 2020 +0800 + + * Fix bug #3722. + +commit 7d3ec5a858f1a0dae197170d92b42592f45ec359 +Author: holan20180123 <56391770@qq.com> +Date: Mon Dec 7 08:56:58 2020 +0800 + + * Fix bug 3722. + +commit 5dbe3dd6d3e0c264f7cbce73909a7dbb4ee5b28e +Author: tianshujie98 +Date: Mon Dec 7 08:50:36 2020 +0800 + + * Fix bug. + +commit 6eec4a4a88fb7d29ed64c59a52eb78ae7e017ad2 +Author: leiyong <1549684884@qq.com> +Date: Mon Dec 7 08:16:23 2020 +0800 + + * Fix bug. + +commit 0dafa019a273a03a3c991e94be28a569908e2b75 +Author: tianshujie98 +Date: Fri Dec 4 16:33:54 2020 +0800 + + * Fix the problem detail page bug. + +commit 024057232b4c95345cd11719e17c16cd7fc092ec +Author: qiyu-xie +Date: Fri Dec 4 16:27:36 2020 +0800 + + * Add deleted label for the design. + +commit 6b445772dae1668fc7add60df4d413cbef5d6f1f +Author: qiyu-xie +Date: Fri Dec 4 16:19:31 2020 +0800 + + * Fix bug. + +commit 81807b4491853e64dcb5dd7d55a2dcfaa626b465 +Author: qiyu-xie +Date: Fri Dec 4 15:53:01 2020 +0800 + + * Modify select product of second navigation under product. + +commit 34735e675e5198709be49eba2a7b3833bb773e18 +Author: tianshujie98 +Date: Fri Dec 4 15:25:52 2020 +0800 + + * Adjust navigation highlight. + +commit f5b127e4279ece895bb22e0585f552cc0d7bde66 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 4 15:13:48 2020 +0800 + + * Adjust code. + +commit 64dace9b10cf0402c0260b312ee893c57e248b2a +Author: holan20180123 <56391770@qq.com> +Date: Fri Dec 4 14:53:03 2020 +0800 + + * Fix bug 3729. + +commit a0eae5552f880b01e6ab3452886a11a4e95c82fd +Author: tianshujie98 +Date: Fri Dec 4 14:42:34 2020 +0800 + + * Fix bug. + +commit 0d27dff1476fe67e8d3e0c01c1faa1fbc8458e6f +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 4 14:38:13 2020 +0800 + + * Fix bug. + +commit 82724613c489b900ee761e048adee1accd4b4848 +Author: qiyu-xie +Date: Fri Dec 4 14:34:21 2020 +0800 + + * Fix bug#3674. + +commit c9c9d9ba72b42be7c232286351b70e4e84571f26 +Merge: d6455e7f41 c0072603fd +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 4 14:21:47 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d6455e7f419500943aefebd6d866a3006f3ca682 +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 4 14:21:33 2020 +0800 + + * Fix bug#3726. + +commit c0072603fd7fc7fb2a0ba01b4ee6734c369a851e +Author: holan20180123 <56391770@qq.com> +Date: Fri Dec 4 14:05:57 2020 +0800 + + * Fix bug #3718. + +commit f7a2b2e4b3426013c32b8fbab9840abf7ae091fc +Merge: 48575713de 58f8f4b234 +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 4 13:56:19 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 48575713de138f4a3276b522b6eaa13ed04d1f33 +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 4 13:56:04 2020 +0800 + + * Fix bug#3727. + +commit 16b9563c2f8a62f9e8c4e6f74cde7b076f71a179 +Author: qiyu-xie +Date: Fri Dec 4 13:51:41 2020 +0800 + + * Fix bug#3674. + +commit 58f8f4b234e63488bac8158b83cc5138a10c2af5 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 4 13:48:23 2020 +0800 + + * Adjust code. + +commit 5dacb4172989e708b4ae664d66fbe755be756a2f +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 4 11:28:46 2020 +0800 + + * Fix bug. + +commit a50371c5775bf3624da4f1b9fe2cb16c346eaa36 +Author: tianshujie98 +Date: Fri Dec 4 11:01:29 2020 +0800 + + * Fix block bug. + +commit 15f795770983b7b9baeaa9e3fb20041f3a47af77 +Author: leiyong <1549684884@qq.com> +Date: Fri Dec 4 10:53:00 2020 +0800 + + * Adjust code. + +commit 49fb958b52f6d8992a92968e2cb73ce4d3fe99bf +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 4 10:40:55 2020 +0800 + + * Adjust the style of the table. + +commit 5de35bd943a60c4fbf3da408da9013b93c4e730f +Merge: 64f6e2303a c8a5eb24e4 +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 4 10:34:18 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 64f6e2303a8bc022650fea3d76dd931b23da210f +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 4 10:34:08 2020 +0800 + + * Adjust the style of the table. + +commit c8a5eb24e4d7f64b100e40074b46bfe06b5de9ae +Author: tianshujie98 +Date: Fri Dec 4 10:19:43 2020 +0800 + + * Fix the issue of creating build. + +commit 2e7632cb4097d1d500dea92b5d7811f87c59cd60 +Merge: b48842638e baec73a930 +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 4 10:21:43 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b48842638eb4e11891de3b0cc3e35710a3aa6ee1 +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 4 10:21:31 2020 +0800 + + * Fix bug#3728. + +commit baec73a9309384fa0cc01a455993d29814380ab1 +Author: holan20180123 <56391770@qq.com> +Date: Fri Dec 4 10:16:37 2020 +0800 + + * Fix bug #3718. + +commit 9fef0b00af0ea394d9736adfcf8246e0d46cbad9 +Author: hufangzhou <746775970@qq.com> +Date: Fri Dec 4 09:55:52 2020 +0800 + + * Show the products of the top program. + +commit 7222a2af856e7bef33a76ce82b1af39efe7e4cc3 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 3 17:55:42 2020 +0800 + + * Fix bug. + +commit 00260c58a945c3dfcb4034597f9b2982a8f5e0a3 +Author: qiyu-xie +Date: Thu Dec 3 17:14:49 2020 +0800 + + * Fix bug#3677. + +commit 5b787b6c2450ad6ee212ab4844596154b8048b02 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 3 16:49:12 2020 +0800 + + * Adjust code. + +commit d6fcf222900c51b4dac76ce8383b7ac7c8452931 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 3 16:27:16 2020 +0800 + + * Fix bug. + +commit 5d394844d657251342f66674390b99764d9faa74 +Author: wangyidong +Date: Thu Dec 3 16:23:32 2020 +0800 + + * fix bug #3688. + +commit 210dc4c8e68efd79f4c3f02dc8eae995c0f9f634 +Merge: 3cc044a116 f97d3c67b2 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 3 16:22:53 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3cc044a1168e2fe18453aaaa9df6326875623f61 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 3 16:22:31 2020 +0800 + + * Adjust language file. + +commit f97d3c67b2e8c0d7e0d19e01de5a0704ac12fd24 +Merge: fe08324566 c0239adda9 +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 3 16:11:59 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fe08324566bbf73ff49b6d196e1fc07d0db2e55b +Author: hufangzhou <746775970@qq.com> +Date: Thu Dec 3 16:11:43 2020 +0800 + + * Fix an error. + +commit c0239adda9e8c48f5f08191cda0d9231e6d3b2ac +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 3 16:02:29 2020 +0800 + + * Fix block module language item. + +commit 7c5381cadec20fbdddc1f7c34bce8ebe4f3a8fca +Author: qiyu-xie +Date: Thu Dec 3 15:45:06 2020 +0800 + + * Fix bug#3677. + +commit 4dbca79efb9639f16194313a67424d90be4092d0 +Author: tianshujie98 +Date: Thu Dec 3 15:49:58 2020 +0800 + + * Adjust table column width. + +commit ec3749dcad14779c8691c02a23b18dc6a1a8df60 +Author: tianshujie98 +Date: Thu Dec 3 15:34:06 2020 +0800 + + * Adjust language item. + +commit 4e295b2817b7bc639e09e0c09c29a009a7222ab0 +Author: tianshujie98 +Date: Thu Dec 3 15:27:33 2020 +0800 + + * Adjust language file. + +commit 2df361a5c07a326da75e9be2eab3c94d853d1cde +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 3 15:10:24 2020 +0800 + + * Adjust language file. + +commit 2c4ccb706edda05bb175e301933a548f46da0bae +Author: tianshujie98 +Date: Thu Dec 3 14:22:18 2020 +0800 + + * Adjust code style. + +commit 58ed917b466a365f01db27e3739eea382859622f +Author: tianshujie98 +Date: Thu Dec 3 14:05:15 2020 +0800 + + * Adjust code style. + +commit 6def730e2221ffdac0af9142e487e3de2496aac6 +Author: leiyong <1549684884@qq.com> +Date: Thu Dec 3 14:07:38 2020 +0800 + + * Fix waterfallgantt block. + +commit dbfd6464528809d46484be8d59f3e70ab3fcb851 +Author: tianshujie98 +Date: Thu Dec 3 13:17:24 2020 +0800 + + * Fix bug #3719. + +commit e1e314c297a649663dbe536570db182dfe858aa8 +Author: holan20180123 <56391770@qq.com> +Date: Thu Dec 3 13:24:46 2020 +0800 + + * Fix bug #3668. + +commit 467b6c6e3e579ebeee345e55d151ebfac03e79bc +Author: holan20180123 <56391770@qq.com> +Date: Thu Dec 3 13:16:40 2020 +0800 + + * Fix bug 3668. + +commit 41f8d0fbd3117bcee4561ee2d99d39acc9356fe6 +Author: qiyu-xie +Date: Thu Dec 3 11:16:39 2020 +0800 + + * Fix bug#3678. + +commit e427d764b45fc0d95d5b115341582ff90479d598 +Author: tianshujie98 +Date: Thu Dec 3 11:04:52 2020 +0800 + + * Fix bug #3719. + +commit fec2bc506e4092cd9d4be361aefa05dc64c1810c +Author: qiyu-xie +Date: Thu Dec 3 11:00:17 2020 +0800 + + * Fix bug#3678. + +commit 9021b5574a5a12eaadf38710a865e1747d76bae0 +Author: qiyu-xie +Date: Thu Dec 3 10:59:57 2020 +0800 + + * Fix bug#3678. + +commit 22370a74ecd10c02668348f427021cabfaf5bc7c +Author: tianshujie98 +Date: Thu Dec 3 09:16:45 2020 +0800 + + * Fix bug #3697. + +commit c7fa3309ad1e91a8fd119dd8effee45d4c39a0f5 +Author: qiyu-xie +Date: Thu Dec 3 09:16:51 2020 +0800 + + * Fix bug#3680. + +commit cace16df72346df7b4c7681a74b0daede0d4d0f7 +Author: qiyu-xie +Date: Thu Dec 3 09:15:25 2020 +0800 + + * Fix bug#3680. + +commit b8b305000ec446b2938303a76c4479c15bd13d29 +Author: tianshujie98 +Date: Thu Dec 3 08:59:51 2020 +0800 + + * Fix bug #3697. + +commit ac223cbe3f5c522a22c2f553d8dc3d5607417ce7 +Merge: cc2d1dc4a8 05dca799a0 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 2 17:05:24 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 05dca799a078c382e68bd1086a0f941f683acaa7 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 2 17:04:20 2020 +0800 + + * Fix bug 3718. + +commit cc2d1dc4a876b627371e27cccebc4ce1aecc82a9 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 2 17:03:59 2020 +0800 + + * Fix bug. + +commit b5e407a2442dca79545a558d8f351a84469cefe3 +Author: qiyu-xie +Date: Wed Dec 2 16:31:35 2020 +0800 + + * Fix bug#3685. + +commit 0e7570364a60cb0616e79f399635c099013fbe9f +Author: qiyu-xie +Date: Wed Dec 2 14:46:35 2020 +0800 + + * Fix bug#3692. + +commit 9d2cde28aeac5d0708896f2944ee037ce284c073 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 2 16:47:21 2020 +0800 + + * Adjust issue module code. + +commit f05389d7e90cfdb0d821415586f6a3bf6b96cb44 +Author: qiyu-xie +Date: Wed Dec 2 16:26:48 2020 +0800 + + * Fix bug#3685. + +commit 51b3acd60584e7dee47cb7b68332b7bb138f7aab +Author: tianshujie98 +Date: Wed Dec 2 16:15:15 2020 +0800 + + * Fix bug. + +commit b8e8e23532172d6076d30f540d6dbefeab5fa1c2 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 2 16:12:44 2020 +0800 + + * Fix bug #3717. + +commit 9f6ae6a81c5e68e80465b9b75aacadcb02adb238 +Author: qiyu-xie +Date: Wed Dec 2 15:48:49 2020 +0800 + + * Fix bug#3692. + +commit 977b4fa70047197994665b33e757902e38780d68 +Author: tianshujie98 +Date: Wed Dec 2 14:52:53 2020 +0800 + + * Fix bug #3660. + +commit 5986a102e9e65020a4b69bc2d98809df651b2101 +Author: tianshujie98 +Date: Wed Dec 2 14:44:41 2020 +0800 + + * Fix bug. Restart assigned to problem. + +commit b85c3b7abce4996e7639111c9bd50316dc571331 +Author: tianshujie98 +Date: Wed Dec 2 14:39:23 2020 +0800 + + * Fix bug #3686. + +commit af5b5b88ab7e675e8c14beadcea370021ed6389f +Author: tianshujie98 +Date: Wed Dec 2 14:35:40 2020 +0800 + + * Fix bug #3669. + +commit f1ab021bd233c244bdae9ffa77e251f3ceead966 +Author: tianshujie98 +Date: Wed Dec 2 14:31:38 2020 +0800 + + * Fix bug #3666. + +commit 1d431a1155e8edeb838604998337600ce413bc87 +Author: tianshujie98 +Date: Wed Dec 2 14:25:57 2020 +0800 + + * Fix bug #3687. + +commit cc08fbd602357046cccd7748988a8f3249e58757 +Author: tianshujie98 +Date: Wed Dec 2 14:20:41 2020 +0800 + + * Fix bug #3640. + +commit 90a3fd00c61cd997912c0cc3635dc404b73505b1 +Author: tianshujie98 +Date: Wed Dec 2 14:16:06 2020 +0800 + + * Fix bug #3703. + +commit 071e99b3a5c2dabbce65688b54b856392a72f769 +Author: tianshujie98 +Date: Wed Dec 2 14:08:08 2020 +0800 + + * Fix bug #3660. + +commit 27e9164878277c60f9b539af6abf53c2622d6dc2 +Author: tianshujie98 +Date: Wed Dec 2 13:19:49 2020 +0800 + + * Fix bug. Restart assigned to problem. + +commit cb288cd83349d4a936cfe9c014301580ca30bace +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 2 13:46:47 2020 +0800 + + * Fix bug. + +commit 708254c54de68f873606b13a747095c2e623c3ce +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 2 13:36:29 2020 +0800 + + * Fix bug. + +commit 2eab398805b58138ac7f37ce52b1a5e24497f454 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 2 13:14:52 2020 +0800 + + * Fix bug. + +commit 2cc9dfd17f41b33ca7d9fee38ffca9474f6e8769 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 2 13:13:11 2020 +0800 + + * Fix bug. + +commit 3d51aad302688a898ac73efd59bafdd08821f45e +Author: qiyu-xie +Date: Wed Dec 2 11:44:46 2020 +0800 + + * Fix bug#3712. + +commit 6017a4737c8e528c57dcb96a0bdd0f0e31363917 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 2 11:30:36 2020 +0800 + + * Adjust object type. + +commit 7fe992e67432b47d7cbb5d367431a9f6a82c851b +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 2 11:29:17 2020 +0800 + + * Adjust object type. + +commit b48f4d444d60db179272dcd14c0783125872ebab +Author: tianshujie98 +Date: Wed Dec 2 10:51:18 2020 +0800 + + * Fix bug #3686. + +commit 34ae30150bf5a96486f74497615d96a2f9895de6 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 2 10:44:35 2020 +0800 + + * Fix bug#3521. + +commit a679866a042c5c8b87333fb6d021ab8020b103d9 +Author: tianshujie98 +Date: Wed Dec 2 10:38:36 2020 +0800 + + * Fix bug. + +commit c4a2463e14a627d91a885c88145b34a2c3dc02b5 +Author: tianshujie98 +Date: Wed Dec 2 10:30:26 2020 +0800 + + * Fix bug. + +commit d27ce0f463c9a5a84d0a43e6947e4c8a2a3cab2b +Author: tianshujie98 +Date: Wed Dec 2 10:09:58 2020 +0800 + + * Fix bug #3687. + +commit 61e6eaa18610a8242f12553afb6b99c28c7d9f54 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 2 10:31:11 2020 +0800 + + * Fix bug. + +commit 603e5ce5333dec5c20ebc0dc9b6cf707b3b1e786 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 2 10:29:28 2020 +0800 + + * Fix bug. + +commit 5a40f88c8ce7de7237bed2366048039c457101af +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 2 10:15:17 2020 +0800 + + * Fix bug. + +commit 322e7112ccd2a1372661524ed411d744db24bad8 +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 2 10:14:28 2020 +0800 + + * Fix bug. + +commit b4f63971eba9e2298d893df623dcd49d4f54ca5a +Merge: 6ff60d1138 48fb4f32e9 +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 2 09:51:08 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 48fb4f32e93a2bb45060ff96c74f36f13fe4202d +Author: tianshujie98 +Date: Wed Dec 2 09:49:20 2020 +0800 + + * Fix bug #3669. + +commit 6ff60d113823b688e58b4c6515101635b7b0ef31 +Merge: 0e8c6b039f fc1d7e4d3b +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 2 09:50:25 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0e8c6b039fb9d7c7b6a0e9cecbc163ad8683cc47 +Author: hufangzhou <746775970@qq.com> +Date: Wed Dec 2 09:50:08 2020 +0800 + + * Fix a bug. + +commit fc1d7e4d3bc0b789f05d7f9f07232748bfe07aad +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 2 09:37:38 2020 +0800 + + * Fix bug #3709. + +commit 91368cc51f02da8c135cb604faf1489226ba28d6 +Merge: 4caa233f2c 197408a355 +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 2 09:32:00 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4caa233f2cd65104dc75402d9658f363bc1a38ac +Author: holan20180123 <56391770@qq.com> +Date: Wed Dec 2 09:31:09 2020 +0800 + + * Fix bug 3709. + +commit 197408a3555fa0142fe6c658f274ddb2ab2f4baa +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 2 09:20:55 2020 +0800 + + * Fix bug. + +commit 8ad0cfa4ba8bc6f1273fb09b761573b6ded6d8bb +Author: leiyong <1549684884@qq.com> +Date: Wed Dec 2 08:17:42 2020 +0800 + + * Adjust code. + +commit 033a2ae97dcea188428648ca9acdfd42b338a3cd +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 1 17:17:15 2020 +0800 + + * Fix a bug. + +commit a76735d8e0a54e4f269a8eb2241e87242e024b52 +Author: tianshujie98 +Date: Tue Dec 1 16:20:58 2020 +0800 + + * Fix bug #3640. + +commit 53a74eccd3f00659c0110d70d6249b20d60ac3c4 +Author: tianshujie98 +Date: Tue Dec 1 15:51:22 2020 +0800 + + * Fix bug #3666. + +commit 7619b32dee7ef4c038a5692c8e31208d4afe5e07 (tag: zentaopms_20.0.beta1_20201201, tag: zentaopms_13.0.beta1_20201201) +Merge: e9834ba5a5 916a9eef50 +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 1 15:20:34 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e9834ba5a583c79b9599ae3ce53099947b14a7c0 +Merge: e17c9fc362 628dbcf480 +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 1 15:18:52 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 916a9eef500bfb00c4b5f8b02d49cf95f5639b32 +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 1 15:18:46 2020 +0800 + + * Fix bug. + +commit e17c9fc362cec82361a1138b574e370c431dcd1c +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 1 15:18:44 2020 +0800 + + * Fix a bug. + +commit 628dbcf480817d5d32225ff5a78424fafc55f0c9 +Author: qiyu-xie +Date: Tue Dec 1 15:08:47 2020 +0800 + + * Add action lang. + +commit 4cacb32088c0a361b33cb9cee34554463b0df4a0 +Author: qiyu-xie +Date: Tue Dec 1 15:08:10 2020 +0800 + + * Modify notes. + +commit 96e42ee91509f7c3414ceef0c98f79328b133335 +Author: Yagami <976204163@qq.com> +Date: Tue Dec 1 15:10:21 2020 +0800 + + * Fix release bug. + +commit d46fbc76d3f7962acc43c78b3eec78f7f93d3c7a +Author: Yagami <976204163@qq.com> +Date: Tue Dec 1 14:40:51 2020 +0800 + + * Fix estimate error. + +commit f841d670dd9bfdda5785de56b07a639fd6990dc0 +Author: wangyidong +Date: Tue Dec 1 14:36:05 2020 +0800 + + * fix bug for change encoding. + +commit ae84cb3e33c5591f5c7d2a3bcbf9f1bca55e331a +Merge: 50a36a0700 92e501f6da +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 1 14:24:11 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 50a36a070050f7c25329db72f5804874638d2bac +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 1 14:24:01 2020 +0800 + + * Fix a bug. + +commit 92e501f6da6d0e204ea781642ae2e4fda12a51cf +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 1 14:21:00 2020 +0800 + + * Fix bug. + +commit 5809ad08e5844fafe7768d7976169543ca4a0157 +Merge: 30e752cd89 110f90567d +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 1 14:14:36 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 30e752cd8959e3e0f3a7876c69d5365838daf86c +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 1 14:14:14 2020 +0800 + + * Adjust block module lang file. + +commit 110f90567dc46fdbe234f836e0e8cae3a4ccf984 +Author: Yagami <976204163@qq.com> +Date: Tue Dec 1 14:09:53 2020 +0800 + + * Fix framework. + +commit f7673450a0a4e0097a730bec286bba6760c3ed56 +Author: Yagami <976204163@qq.com> +Date: Tue Dec 1 13:56:27 2020 +0800 + + * Fix upgrade module. + +commit e717f7e8b9b8915a9ba603442194ecc7074c2da3 +Author: Yagami <976204163@qq.com> +Date: Tue Dec 1 13:42:27 2020 +0800 + + * Fix project build logic. + +commit 98e37dbdf0e2e8ea3f607d0f8d35cb2d6fe07399 +Author: Yagami <976204163@qq.com> +Date: Tue Dec 1 13:31:03 2020 +0800 + + * Add block lang. + +commit 03524802789bf26420e8bdd8eb256ab38beb62cc +Author: wangyidong +Date: Tue Dec 1 13:31:01 2020 +0800 + + * fix bug. + +commit a1ae7b15bffe5e6520b40b75a7fb30a30da24fbd +Author: wangyidong +Date: Tue Dec 1 13:19:58 2020 +0800 + + * fix bug. + +commit 5c6b67879186fd14887023e103a866c598d4026d +Author: Yagami <976204163@qq.com> +Date: Tue Dec 1 13:16:24 2020 +0800 + + * Fix bug. + +commit af24aa136c28039c9bc72bccb4aab44d3b2e5bd2 +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 1 11:47:54 2020 +0800 + + * Finish task#8549. + +commit af9d4c2f9bf444e37796c8d88eca6ae99a6470b0 +Merge: bf0496a73c 53e0784d6a +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 1 11:22:25 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 53e0784d6a1a6005fd356fcb17f4af4115e6b1c2 +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 1 11:17:57 2020 +0800 + + * Finish task#8546 + +commit bf0496a73cc0737e98f7c474f6f63b67b4194a5d +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 1 11:16:37 2020 +0800 + + * Finish task #8540. + +commit 43804684d7a14f2f3a358c49b6a42980b8bbb8dc +Author: wangyidong +Date: Tue Dec 1 10:57:48 2020 +0800 + + * fix bug #3713. + +commit c8817eda62a12a6171708f3a738580d5eb75ce77 +Author: Yagami <976204163@qq.com> +Date: Tue Dec 1 10:59:30 2020 +0800 + + * Merge code. + +commit e8f207ffc104d4aee44dd667b2207cb7a3fadf56 +Author: wangyidong +Date: Tue Dec 1 10:43:52 2020 +0800 + + * adjust code. + +commit 0d8474b02ef8180dd4663bdca442da72eea6f89b +Merge: 542f2a933c c5050c08ae +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 1 10:26:05 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 542f2a933c177676acf270ed00ce0fe4e328fe4c +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 1 10:25:49 2020 +0800 + + * Finish task#8551. + +commit c5050c08ae45dc67c8c874d48987fe44b44853f8 +Author: qiyu-xie +Date: Tue Dec 1 10:19:05 2020 +0800 + + * When delete an sprint or stage, create action 'objectType' should be execution. + +commit c1a92cadbb26233948a4d48ab6c844cba56002ec +Author: wangyidong +Date: Tue Dec 1 10:01:12 2020 +0800 + + * fix bug #3713. + +commit 8add6bc6f16bafb80330c0653f4f3d99cd863cdd +Author: leiyong <1549684884@qq.com> +Date: Tue Dec 1 10:00:17 2020 +0800 + + * Finish task#8557. + +commit 9a30904f4e57b8e8d65fc4488ef5e64afadad7a5 +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 1 09:47:28 2020 +0800 + + * Finish task #8540. + +commit 7cc30b5bfb114b784365a98afbb3ad3ba7693d3f +Merge: d3f6be0e1a 6505c67bf9 +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 1 09:44:19 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6505c67bf9fceb8c249fb533d727637b8a9f183a +Author: qiyu-xie +Date: Tue Dec 1 09:39:46 2020 +0800 + + * PRJ not write to the database when create doc. + +commit d3f6be0e1aa0c6b33ca1e76cbe143ca5b1eb8828 +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 1 09:41:15 2020 +0800 + + * Finish task #8558. + +commit f0bd5d905773e445bcab765cd0cdfcef7bfbeab0 +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 1 09:19:28 2020 +0800 + + * Finish task #8550. + +commit 349aad6f33a0ebd447cae2db6ba653d3e8aaeb2d +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 1 09:17:11 2020 +0800 + + * Finish task #8554. + +commit e7e5443afb487f9fbecc2746daf55b82c6680d63 +Merge: f4dd039f76 bd9db2cf92 +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 1 09:16:11 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f4dd039f7611f6753a7d7061aeac39606350b85b +Author: holan20180123 <56391770@qq.com> +Date: Tue Dec 1 09:15:34 2020 +0800 + + * Finish task #8545,#8548. + +commit bd9db2cf9254fa51c5045cdfb61a3c199335e95d +Merge: 4ee0238d2a e10897a838 +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 1 09:15:20 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4ee0238d2ac9c5a9da7c1e314aabda504e8787fd +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 1 09:15:08 2020 +0800 + + * Finish task#8541. + +commit e10897a838189ef12acafca41f3b8c3f74e32372 +Author: wangyidong +Date: Tue Dec 1 09:03:13 2020 +0800 + + * fix bug. + +commit 7a69d802699bc2e41b64b0397932f9a00b03ced2 +Author: tianshujie98 +Date: Tue Dec 1 08:52:41 2020 +0800 + + * Adjust code style. + +commit f374d793f209ee17dfb3d99ba2fbaa4e4a7fa592 +Merge: fa1e4ef625 c6d9ec8b3a +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 1 08:53:51 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fa1e4ef625c1fbe8acb7884b3ab3e4a39d91ba4c +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 1 08:53:38 2020 +0800 + + * Finish task#8559. + +commit c6d9ec8b3a020c038e582894d1f662e9d253cbc6 +Author: tianshujie98 +Date: Tue Dec 1 08:25:46 2020 +0800 + + * Adjust code style. + +commit 1ade93088a150027477c19103a9e91c738d0c8ba +Merge: efdc35eafc 85b31c630d +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 1 08:21:21 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit efdc35eafccd6ae0c5c68885020244030b30bd44 +Author: hufangzhou <746775970@qq.com> +Date: Tue Dec 1 08:21:10 2020 +0800 + + * Finish task#8555. + +commit 85b31c630da9f4834df4cadc281d350eeab378e2 +Author: qiyu-xie +Date: Mon Nov 30 17:35:40 2020 +0800 + + * Restore the expect button. + +commit 5349a8263e8ceb7015cf532745c94c5c0ddf7342 +Merge: ba64e020ae d4553ab55f +Author: hufangzhou <746775970@qq.com> +Date: Mon Nov 30 17:39:53 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ba64e020ae87f8d70a6b7af3919e1b2d0237f5f7 +Author: hufangzhou <746775970@qq.com> +Date: Mon Nov 30 17:39:44 2020 +0800 + + * Finish task#8556. + +commit d4553ab55f0847238f8bbb2e9cf55418b623645f +Author: tianshujie98 +Date: Mon Nov 30 17:35:23 2020 +0800 + + * Finish task #8560. + +commit 273c2473792e60b092f73ebec228b157e4a03493 +Merge: 5911651967 6745b96e1f +Author: hufangzhou <746775970@qq.com> +Date: Mon Nov 30 17:27:34 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6745b96e1f337ae91adc6a91698b409b62df2982 +Author: qiyu-xie +Date: Mon Nov 30 17:26:20 2020 +0800 + + * Finish task#8544. + +commit ecf6f6643c76d5746ba672ed2020dd44590dd913 +Author: qiyu-xie +Date: Mon Nov 30 17:19:03 2020 +0800 + + * Finish task#8543. + +commit 8f6763c14c9b0657769a9e68cf2d4aaef37a15eb +Author: qiyu-xie +Date: Mon Nov 30 17:02:36 2020 +0800 + + * Remove expect. + +commit 59116519674ac908c5d60f0d3933110a1cc0116c +Merge: 1bcf0274af abc70f2bbd +Author: hufangzhou <746775970@qq.com> +Date: Mon Nov 30 17:26:41 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1bcf0274afe80deaca591a5f093ae08158e4b78c +Author: hufangzhou <746775970@qq.com> +Date: Mon Nov 30 17:26:33 2020 +0800 + + * Finish task#8561. + +commit abc70f2bbd7c12a57e8fbf1c37bd737b04b60cfa +Author: Yagami <976204163@qq.com> +Date: Mon Nov 30 17:17:55 2020 +0800 + + * Fix code detail. + +commit 61ba67361d97c8080dfa55d34d5e1d2a56824185 +Author: Yagami <976204163@qq.com> +Date: Mon Nov 30 14:40:25 2020 +0800 + + * Adjust code detail. + +commit 5e6cea9a2d733cbac06c531d33184b9c383ac130 +Author: Yagami <976204163@qq.com> +Date: Mon Nov 30 11:32:58 2020 +0800 + + * Add upgrade program. + +commit 491ea3a07088c90899d059028b9268d81bb89d15 +Author: hufangzhou <746775970@qq.com> +Date: Mon Nov 30 17:02:31 2020 +0800 + + * Fix a bug. + +commit f19b03ede0d576af0b7f78256aaa66ad69b93004 +Author: z +Date: Mon Nov 30 15:22:33 2020 +0800 + + * fix for check one clicke package. + +commit 7b8e7b4c65ace789d6465c509a9f7fa0522aab95 +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 30 13:04:37 2020 +0800 + + * Adjust product module. + +commit bfef3210cc68f053c2dd159817fe0d533990dfd5 +Author: qiyu-xie +Date: Mon Nov 30 11:33:32 2020 +0800 + + * Add class. + +commit 0dda441f023350d23c33c951dac1cfab0a520701 +Author: qiyu-xie +Date: Mon Nov 30 11:27:40 2020 +0800 + + * Remove expect. + +commit bbd45d46dc79f47cb566c206775b986df7b2f15d +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 30 11:13:53 2020 +0800 + + * Repair plan workload. + +commit 0c82b08a7f0c5648f78660a2b16c1c87835d25bb +Author: tianshujie98 +Date: Mon Nov 30 10:49:14 2020 +0800 + + * Adjust code style. + +commit 4acac3ef803aa1866fe646616492c62bed4cc31f +Author: tianshujie98 +Date: Mon Nov 30 10:43:33 2020 +0800 + + * Adjust code style. + +commit a80ae324cb816cc258076141d0359edf42419b4a +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 30 10:26:51 2020 +0800 + + * Finish task#8474. + +commit 63a75ede927d821e37c2478967d90bd20d5a002e +Author: Yagami <976204163@qq.com> +Date: Mon Nov 30 10:19:42 2020 +0800 + + * Fix code error. + +commit 8cde383f210fcaecac6b6b6309cf3ef425164f66 +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 30 09:42:55 2020 +0800 + + * Finish task#8491. + +commit 9d66e7c103a93a35a7c9ca891e996e564ff0d187 +Author: tianshujie98 +Date: Mon Nov 30 09:23:48 2020 +0800 + + * Add comment. + +commit fb45ee0c56ecb2c1b4fe72c81cb8b574e32d3bd2 +Merge: 3d5abfad05 998b692787 +Author: tianshujie98 +Date: Mon Nov 30 09:06:17 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3d5abfad0534aeab93e5d137e0469f3b31b77939 +Author: tianshujie98 +Date: Mon Nov 30 09:04:19 2020 +0800 + + * Add comment. + +commit 998b69278731e37fd2157e9c898aab80921dc0f1 +Author: hufangzhou <746775970@qq.com> +Date: Mon Nov 30 08:48:38 2020 +0800 + + * Add the product name before the stage name. + +commit a6dd395096880a5f295c45b6c4560d85ffb34ecd +Merge: a98557a3cc ec4256954a +Author: hufangzhou <746775970@qq.com> +Date: Mon Nov 30 08:47:12 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a98557a3ccb4d7a654b35cff1b1e902bf4638915 +Author: hufangzhou <746775970@qq.com> +Date: Mon Nov 30 08:46:59 2020 +0800 + + * Modify the variable name. + +commit ec4256954acc9ebf34b25e748463330dc0b66ddb +Author: qiyu-xie +Date: Mon Nov 30 08:31:46 2020 +0800 + + * Add expect action label. + +commit 98c7eb8bdfeae83399bc385b2cf11ef21989d725 +Merge: 85b2060d52 0c12ee5e94 +Author: tianshujie98 +Date: Mon Nov 30 08:21:13 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 85b2060d520f5a6f29aeff90260fb544803c1551 +Author: tianshujie98 +Date: Mon Nov 30 08:20:57 2020 +0800 + + * Adjust code style. + +commit 0c12ee5e94f8e76d9f1c79ab8948d0a1b6828ae9 +Merge: c38756c7fc d949e4e8e5 +Author: hufangzhou <746775970@qq.com> +Date: Mon Nov 30 08:20:09 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c38756c7fc63e3889deeeb5384680fe1ee539cfd +Author: hufangzhou <746775970@qq.com> +Date: Mon Nov 30 08:19:50 2020 +0800 + + * Fix a bug. + +commit ca26bfbfec53d17bcfa0c9b46db603b8597311cc (tag: zentaopms_12.5.1_20201130) +Author: z +Date: Sun Nov 29 17:20:30 2020 +0800 + + * fix bug and upgrade. + +commit 116c9fa5eb7cf1d5a630a1df4b1940676adf1e03 +Author: z +Date: Fri Nov 27 15:59:05 2020 +0800 + + * fix for restart session in install. + +commit c649903b8cedac542dc999a8b9c96aae4502dec4 +Author: z +Date: Fri Nov 27 15:58:07 2020 +0800 + + * fix bug for search in build. + +commit d949e4e8e5b5c86ed5acca0fd3fa05dffae29e79 +Author: qiyu-xie +Date: Fri Nov 27 18:19:33 2020 +0800 + + * Finish task#8500. Remove the question list button under the scrum module. + +commit 7600f463e9ac79b5f9e638d21baf2a5afa19d9b2 +Author: tianshujie98 +Date: Fri Nov 27 17:54:04 2020 +0800 + + * Adjust code style. + +commit efb7512d133127665459cbe9650e43a111aa589d +Merge: 920d3dfa40 702b8ef4da +Author: tianshujie98 +Date: Fri Nov 27 17:44:19 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 920d3dfa40e934d0f0f9a0151525232eb9c3523e +Author: tianshujie98 +Date: Fri Nov 27 17:43:07 2020 +0800 + + * Fix bug. + +commit 702b8ef4daf5b62960ee541b92ebf60834dc4a07 +Author: qiyu-xie +Date: Fri Nov 27 17:26:08 2020 +0800 + + * Finish task#8500. + +commit 00a098029376c4befa51ca5dc3d49a47f26a4b5a +Author: qiyu-xie +Date: Fri Nov 27 16:16:16 2020 +0800 + + * Add lang. + +commit fabd02ef527b74c5381a1930457b3f6c3f59ba88 +Author: jajasper +Date: Fri Nov 27 17:01:47 2020 +0800 + + * Fix bug #1484 of integrate zdoo. + +commit 175443edafbf2a5b5a75687344ddb0983eee1d4e +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 27 16:59:27 2020 +0800 + + * Adjust code. + +commit d587642cb16de48c6abba8db681d1750633365aa +Author: Yagami <976204163@qq.com> +Date: Fri Nov 27 16:49:32 2020 +0800 + + * Merge code. + +commit e1a011c87f248b96a533630b3c59a6b2b53599f8 +Author: tianshujie98 +Date: Fri Nov 27 16:45:41 2020 +0800 + + * Fix bug. + +commit 137d9b097fb4e124f54ca0162b3ed9588ed30bb5 +Merge: 6c5f8f0515 3842810456 +Author: tianshujie98 +Date: Fri Nov 27 16:35:55 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6c5f8f0515d4a3f024f0aba6bb6b32101d24d7bd +Author: tianshujie98 +Date: Fri Nov 27 16:32:53 2020 +0800 + + * Add required fields. + +commit 3842810456172f17dc0b287d37454a4ef93a3036 +Merge: 7aca388cd8 1d3c66547c +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 27 16:31:40 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7aca388cd8838e05d1cd0cd8f3967383439fe5f1 +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 27 16:29:43 2020 +0800 + + * Finish task #8497. + +commit 1d3c66547cbecdc4d40f0ac491efa34e48ba86b7 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 27 16:28:13 2020 +0800 + + * Fix project story lang. + +commit d0953b448429aeb4a035a51e0b86ca6b8fe578cd +Merge: d5f7193f3f 4840c5c500 +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 27 16:16:40 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d5f7193f3f969947ca764acf69e15e903108a024 +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 27 16:16:32 2020 +0800 + + * Modify the language file. + +commit 1804c803a0f0d1c2b1ba02a127d0e0098fa06c72 +Author: tianshujie98 +Date: Fri Nov 27 16:16:14 2020 +0800 + + * Add language item. + +commit 4840c5c500e037d9ba82994f5e59378bc3e87d57 +Merge: 4b97325873 eda2ace7bf +Author: tianshujie98 +Date: Fri Nov 27 16:08:57 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit eda2ace7bf56a0cc7eae1367d12a1cc60fa2f462 +Author: Catouse +Date: Fri Nov 27 16:06:01 2020 +0800 + + * fix position of #mainActions on menu show on left. + +commit 4b973258733dff72301ad9abda9f1d78443d120c +Author: tianshujie98 +Date: Fri Nov 27 16:08:30 2020 +0800 + + * Finish task #8479. + +commit eda9db6f171e6f464b547509fe17cf0b463ca3e5 +Author: qiyu-xie +Date: Fri Nov 27 16:06:15 2020 +0800 + + * Finish task#8500. + +commit 43d2c3392b03aaacc853b0ac50b75d8fdb4eabbc +Merge: c06df88c25 d1ff4f8ceb +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 27 15:54:06 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c06df88c25761c0f506d48c4b63c9d1483d83a65 +Merge: b6c175f837 46f52396ac +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 27 15:54:01 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d1ff4f8ceb3c134e3f32656f84db57c62fbfc305 +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 27 15:51:31 2020 +0800 + + * Modify common lang file. + +commit b6c175f837217e5abd610e13de76e8595df87a05 +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 27 15:49:52 2020 +0800 + + * Finish task #8497. + +commit 46f52396ac130650a5b093a0aa49adcb135c43f2 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 27 15:10:15 2020 +0800 + + * Fix detail. + +commit e06ce5f884a23c34b398197790f041dbfcbedb82 +Merge: 260f181829 671c4ef57d +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 27 14:55:27 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 260f18182941eca2d9530d9dcc5b2681233cbec7 +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 27 14:55:15 2020 +0800 + + * Finish task#8477. + +commit 671c4ef57d1e6b4cf21013efbc68235b970f3c7f +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 27 14:49:42 2020 +0800 + + * Fix product list links. + +commit 1e7021328abd77185372d32318baab267f3add36 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 27 14:36:35 2020 +0800 + + * Finish task #8502. + +commit 4b13262a15ed3cfd0854c0fbba66a8680989d23b +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 27 13:46:33 2020 +0800 + + * Fix bug. + +commit 79b2e6c830a3f4e934b49d844b826b1a6e81d019 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 27 13:35:40 2020 +0800 + + * Fix scrum menu divider. + +commit e39d68c14f73d0b3c49aa4604a2cdd520cba8e2d +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 27 13:11:58 2020 +0800 + + * Modify the language files. + +commit 82afdda6a376423e3139b54a8fe563aca4fec390 +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 27 13:02:46 2020 +0800 + + * Modify the language files. + +commit 9e358b59057f57788bd4950120ab468724166c69 +Merge: 4f24c7b17a faf5da4a8b +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 27 12:11:00 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4f24c7b17a6ffc02d1c3e1b734fc665509433819 +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 27 12:10:50 2020 +0800 + + * Delete the User Requirement when close the story concept. + +commit faf5da4a8bcc676958b79ae9f610ef1f147ef381 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 27 11:34:39 2020 +0800 + + * Fix project create view. + +commit 111f08ca4793e9798c9bb129d325d5d7deca80e0 +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 27 11:33:27 2020 +0800 + + * Modify the login time permission judgment + +commit e41208725de68666f6a1ed3322a458d5b7359238 +Merge: 8d04de9dd6 5236fa6d7d +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 27 11:30:17 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 8d04de9dd6d7c4efa2f33d81075cf225d44ef297 +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 27 11:28:05 2020 +0800 + + * Modify the login time permission judgment. + +commit 5bca0d4d44a8a4abb2ba0a9d462db8ee03e09375 +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 27 11:25:31 2020 +0800 + + * Finish task #8497. + +commit 82c880f6d8136c0e0edc45b327038b2b1296edf5 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 27 11:22:15 2020 +0800 + + * Fix product detail. + +commit 1f5c6ddb6bf5b3025e99960231f78093c6b1953d +Author: Yagami <976204163@qq.com> +Date: Fri Nov 27 11:12:45 2020 +0800 + + * Finish task #8453. + +commit e546bb6590c17f2ba356a10df566d44f86b9cee0 +Merge: 3ed0fbc7c5 36ab9238fd +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 27 11:19:38 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 36ab9238fd1004595604fff9edeb8869b2eda74a +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 27 11:18:08 2020 +0800 + + * Fix bug + +commit 3ed0fbc7c5f4c6b48ad035c320294d50985991d5 +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 27 11:17:58 2020 +0800 + + * Finish task #8497. + +commit 18b6a96226ca3fdb49d3edae9ded612577bc1327 +Merge: dc1fba4d33 f2110b3479 +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 27 10:51:13 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dc1fba4d33e2857bb803eaa9490b5072696d1402 +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 27 10:48:17 2020 +0800 + + * Finish task #8497. + +commit f2110b3479c08ef7423ae94f4d1353cc5e6be0f3 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 27 10:17:16 2020 +0800 + + * Fix task #8521. + +commit 10ed93c6017741406ba97d3c802b704512410a1a +Author: Yagami <976204163@qq.com> +Date: Fri Nov 27 09:37:40 2020 +0800 + + * Replace product story concept. + +commit 5f54932ddb8c2a16197bdc112de89b80c0476c78 +Merge: 2fdf26bc21 8ba77bc3bf +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 27 10:45:02 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8ba77bc3bf40db9852c7a90d0f405e7b0ccc7739 +Merge: 9ce4ed5e75 9ab336bf7d +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 27 10:30:06 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9ce4ed5e7591a1eed43cc6bb10127c96d206e96d +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 27 10:29:57 2020 +0800 + + * Fix an error. + +commit 2fdf26bc2155e410d4ed6abeb6ae3050864f559e +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 27 10:27:08 2020 +0800 + + * Finisht task #8497. + +commit 9ab336bf7df0864e0ca4a6ec7365332e96bb3a32 +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 27 10:07:47 2020 +0800 + + * Adjust the crumbs menu. + +commit 35a9ba78fa9e17c87ffb4fb72a0828e6e8f07119 +Merge: 49123aa8d8 6c6d177c84 +Author: tianshujie98 +Date: Fri Nov 27 09:38:54 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 49123aa8d8783b709b448d5f32103ed5994f6bcd +Author: tianshujie98 +Date: Fri Nov 27 09:36:31 2020 +0800 + + * Fix bug. Set-up stage permission issues. + +commit 6c6d177c8416e69608e83231cb520064ef0b4257 +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 27 09:19:25 2020 +0800 + + * Fix a bug. + +commit 7b866ec81590d64d908984987e1478038610c4f4 +Merge: be37148d14 70f360861f +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 27 09:07:50 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit be37148d14e95e3e933d50a29058df7ccb111b9a +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 27 09:05:06 2020 +0800 + + * Finish task#8454. + +commit 70f360861f5cedf1c74bb3968ed182a653d57546 +Author: qiyu-xie +Date: Fri Nov 27 08:49:26 2020 +0800 + + * Modify project links in the dynamic. + +commit 1a70a9f31173e7d48d5d055941d44466cda34fbb +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 26 17:52:30 2020 +0800 + + * Add projectstory module permissions. + +commit f7df060870415aac02ce28247dd41ea7568f6e65 +Author: qiyu-xie +Date: Thu Nov 26 16:36:36 2020 +0800 + + * Add lang. + +commit d16bd309b4cea7425d2f482e7ed80c792668e2e4 +Author: tianshujie98 +Date: Thu Nov 26 16:30:22 2020 +0800 + + * Finish task #8534. + +commit fbc1db39e1d7d1c11a6b956b3114b5397df1d82c +Author: qiyu-xie +Date: Thu Nov 26 16:13:33 2020 +0800 + + * Finish task#8487. + +commit 5236fa6d7d52f51cc364864853869b06770b33ed +Author: z +Date: Thu Nov 26 16:04:35 2020 +0800 + + * remove download extension. + +commit cb0043a49bfb51f1cd7123db6250565df9e6b01a +Author: Yagami <976204163@qq.com> +Date: Thu Nov 26 15:55:41 2020 +0800 + + * Finish task #8460. + +commit 15ce0b086bb550a15eaa1aa30ec5f0ae499ab88b +Author: Yagami <976204163@qq.com> +Date: Thu Nov 26 15:43:17 2020 +0800 + + * Fix details. + +commit da954e3766c4f58fc7bb0fdb5ec18b02af872e51 +Author: tianshujie98 +Date: Thu Nov 26 15:21:42 2020 +0800 + + * Finish task #8534. + +commit cd431a0d7835dfc202153c43d7080dea4573ff9a +Author: qiyu-xie +Date: Thu Nov 26 15:15:11 2020 +0800 + + * Finish task#8487. Modify dynamic links and notes. + +commit 04bfca5242b50e056c570f0e138a51ebe1b58b7b +Author: qiyu-xie +Date: Thu Nov 26 10:50:08 2020 +0800 + + * Modify the program link in the dynamic. + +commit 2a52eda19e6b0bd4590d2e687c1fa1c5fdbbb7a0 +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 26 14:46:13 2020 +0800 + + * Add comments to the projectstory module. + +commit 3e331c8c10c5b8a2932c52d032aaf56652596588 +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 26 14:28:36 2020 +0800 + + * Add comments to the projectstory module. + +commit 584938724b26df32e6ec0e66e5ccab90ff7fb242 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 26 14:18:00 2020 +0800 + + * Merge code. + +commit e10aed7e7db090343aeefbeda9357cb7728b98be +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 26 14:12:15 2020 +0800 + + * The scrum project temporarily hides the trace matrix. + +commit 49a33127e2de3b00a81f3363ad207f7999c37eda +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 26 13:57:36 2020 +0800 + + * Adjust the projectstory module. + +commit 124bbb2e8be5e693e26af8cf011260c2789f7ef7 +Author: z +Date: Thu Nov 26 13:53:44 2020 +0800 + + * adjust for X-Frame-Options. + +commit c79bd18b682d00317c6e599400a8ce35669ab2c2 +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 26 13:13:14 2020 +0800 + + * Finish task #8497. + +commit 4f2775d77a623d2312298560cebd0b5a8c1b5dbb +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 26 13:10:08 2020 +0800 + + * Adjust the projectstory module. + +commit 652caa08227441f96136f8333fc469321dcc8154 +Author: tianshujie98 +Date: Thu Nov 26 11:39:37 2020 +0800 + + * Finish task #8492. + +commit 32db97424aa23ccdd47c6026c0bb6fb15cee2baf +Author: jajasper +Date: Thu Nov 26 11:30:46 2020 +0800 + + * Fix bug #1484 of integrat zdoo by chrome. + +commit 60ba1e7b2ee08858432f5f50c3e6e912ccac0f68 +Author: tianshujie98 +Date: Thu Nov 26 11:29:41 2020 +0800 + + * Delete the tips to create a task. + +commit f0a812a946836cbf0a41550e7957db525f5edeb3 +Author: tianshujie98 +Date: Thu Nov 26 11:12:40 2020 +0800 + + * Finish task #8501. + +commit f651b8351d380381c2fe11fcc7b3a7c73c7da1cd +Merge: 5b0a2a341a 83c4f27330 +Author: hufangzhou <746775970@qq.com> +Date: Thu Nov 26 10:59:29 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5b0a2a341a9f4219dd3f1586778d1f8154190e2c +Author: hufangzhou <746775970@qq.com> +Date: Thu Nov 26 10:56:51 2020 +0800 + + * Finish task#8447. + +commit 83c4f27330791dee26232ed2404932947d9b4a71 +Author: Catouse +Date: Thu Nov 26 10:49:10 2020 +0800 + + * fix transferEvent not work as expect of contextDropdown by update zui.js. + +commit 2bc7e9281de16446ac3c5a95ecb8751fff9cae0b +Author: Catouse +Date: Thu Nov 26 10:48:45 2020 +0800 + + * fix UI of dropdownmenu in table actions cell. + +commit 17e525245b4aa25e7b9c3c4f6268ece31cff1014 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 26 10:05:14 2020 +0800 + + * Fix program get list logic and fix details. + +commit eacf05c9cf2d6f84c41b35760f72ee5c4afe8b5d +Merge: 4203dcc7ca 4e502a8df0 +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 26 09:32:45 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4203dcc7ca7814153e95fed3209414a1d182ae3d +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 26 09:32:23 2020 +0800 + + * Finish task #8497. + +commit 4e502a8df0ec027cdbf02fd7c2195756d06201c1 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 26 09:20:37 2020 +0800 + + * Fix testcase create error and project story lang. + +commit 47c46cefe944733ad2b72b709275fee0d09734f5 +Author: qiyu-xie +Date: Thu Nov 26 09:17:02 2020 +0800 + + * Modify program action button title. + +commit b14202f717610ae11d51f58f5441a603896c9a0d +Author: qiyu-xie +Date: Wed Nov 25 17:32:51 2020 +0800 + + * Add lang. + +commit 161c9d4b9a87fb56ee300bb180e648ea415e2123 +Author: tianshujie98 +Date: Wed Nov 25 17:27:18 2020 +0800 + + * Adjust code style. + +commit b167a908874c6299a121841eba8a20e245c5fc6f +Author: z +Date: Wed Nov 25 17:23:28 2020 +0800 + + * fix bug for import case from lib. + +commit 69962734128b8c8069b74e0316ac5636ff5f51f4 +Merge: 5a8d12aa74 010532a543 +Author: tianshujie98 +Date: Wed Nov 25 17:17:12 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5a8d12aa7480e215900904bfdde2ae11107f604a +Author: tianshujie98 +Date: Wed Nov 25 17:16:40 2020 +0800 + + * Adjust code style. + +commit 010532a543d111a37390f68c51ed50d4da4f4bea +Author: qiyu-xie +Date: Wed Nov 25 16:47:43 2020 +0800 + + * Finish task#8500. + +commit 58d127ba6ae8ba2484bba5c9341c6025a1961988 +Merge: 9c0d932ebf eee806c5f9 +Author: tianshujie98 +Date: Wed Nov 25 16:41:35 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9c0d932ebfd5f8641c6c357c5451c79d5e2931e6 +Author: tianshujie98 +Date: Wed Nov 25 16:41:18 2020 +0800 + + * Adjust code style. + +commit eee806c5f974f93cf3d6fbfc6dc090b8c5a34059 +Author: qiyu-xie +Date: Wed Nov 25 15:30:47 2020 +0800 + + * Restore changes. + +commit 2819ed09224de95a1cfadaafc3d6996dbe9fff55 +Merge: fc1583b6b0 f161d4133b +Author: tianshujie98 +Date: Wed Nov 25 16:18:56 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f161d4133b3a7b2b97a4a72cd3ccb64b51847a20 +Author: z +Date: Wed Nov 25 16:14:22 2020 +0800 + + * code for task #8496. + +commit 880e182c06c182ac808526b62b69e841c40f3ffb +Author: z +Date: Wed Nov 25 15:50:33 2020 +0800 + + * code for task #8496. + +commit 2998a36b17cd6c4cf4a30d23c5abed33c9507dbe +Author: z +Date: Wed Nov 25 15:41:52 2020 +0800 + + * finish task #8442. + +commit fc1583b6b05a0bd5c6bbcdaf7d5412001cfbacbc +Merge: 4049054ce4 cd9e3d7f29 +Author: tianshujie98 +Date: Wed Nov 25 16:14:31 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4049054ce4ecd9f45ba66ad9c1389e4bc8b426a1 +Author: tianshujie98 +Date: Wed Nov 25 16:13:51 2020 +0800 + + * Finsh task #8495. + +commit cd9e3d7f293480d2b6365f621940d0535a9eba7f +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 25 16:10:21 2020 +0800 + + * Finish task #8497. + +commit 1b4e82aa074763538deeebf81e81c09252c9b899 +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 25 16:06:05 2020 +0800 + + * Finish task #8459. + +commit 2036a537300183c8b96271660fb1ca09b2add4c0 +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 25 15:54:29 2020 +0800 + + * Finish task #8459. + +commit 67db77e2493e7ca902831cb4ebc9400e4cdaae05 +Author: Yagami <976204163@qq.com> +Date: Wed Nov 25 15:46:55 2020 +0800 + + * Finish task #8523. + +commit 2b8c9fa95dbd25d0160a7d791947b5006eb90a77 +Author: Yagami <976204163@qq.com> +Date: Wed Nov 25 14:30:38 2020 +0800 + + * Fix detail. + +commit 85660149adbb6bf59f965dd5b07d7cd0ecd86c41 +Author: Yagami <976204163@qq.com> +Date: Wed Nov 25 14:12:50 2020 +0800 + + * Finish task #8521. + +commit 61971243e93337edc6bec59f709368e75847378e +Author: leiyong <1549684884@qq.com> +Date: Wed Nov 25 15:39:25 2020 +0800 + + * Add projectstory module. + +commit 69d115af9200b6e957035a6ecb9ad166be0dd54b +Author: qiyu-xie +Date: Wed Nov 25 14:06:14 2020 +0800 + + * Fix task#8457. Modify actions field width. + +commit d70d73ce34e498187756554c3096ab728cd9984a +Author: qiyu-xie +Date: Wed Nov 25 14:02:12 2020 +0800 + + * Finish task#8457. + +commit 9d8fa5318d3a662ca8a611573e61f67ca1854675 +Merge: 01cdb9ca79 5a49cd76c7 +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 25 15:08:09 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 01cdb9ca79e37ba2c24497a88e149b01174328de +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 25 15:07:12 2020 +0800 + + * Finish task #8497. + +commit 5a49cd76c76255a1ef0367a2f770e3be6b6c29ec +Merge: 919bb4b484 18ee52ff86 +Author: tianshujie98 +Date: Wed Nov 25 14:46:33 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 919bb4b484e5b56bc5f5ee77ad193072f7c5b232 +Author: tianshujie98 +Date: Wed Nov 25 14:41:34 2020 +0800 + + * Remove the parent stage link. + +commit 18ee52ff8625b17a1f60e6423851cfa07a7e6a20 +Author: z +Date: Wed Nov 25 11:23:42 2020 +0800 + + * finish task #8442. + +commit 15331470ba1c2053d513738b2855208e3c457108 +Merge: 31e3787b42 aa45a82c72 +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 25 14:33:25 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 31e3787b42cb2931d51a7012bb954000ffcf2ae3 +Merge: 0d07b3abae 78facc12be +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 25 14:30:47 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit aa45a82c72f551411c4bc765834e5794b22e52d0 +Merge: 2ee93bc06b 78facc12be +Author: tianshujie98 +Date: Wed Nov 25 14:28:48 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2ee93bc06bd8bb8d4e6ce3f23c9b28e199cdcd43 +Author: tianshujie98 +Date: Wed Nov 25 14:25:16 2020 +0800 + + * Finish task #8481. + +commit 0d07b3abaed3d64d7583cbac87b67c049fe3bd11 +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 25 14:21:08 2020 +0800 + + * Finish task #8498. + +commit 78facc12be735c6b4c98b22090ca4dc78a4c7a76 +Author: jajasper +Date: Wed Nov 25 14:03:30 2020 +0800 + + * Fix bug of integrated zdoo need set X-Frame to allow-from. + +commit 3014981b9e82cb619a2756ce7748471b4bc08a53 +Author: Catouse +Date: Wed Nov 25 13:56:35 2020 +0800 + + * support transfer event for contextDropdown by update zui.js. + +commit 584450ed3944f805ccf9b8d6bcddf8306f97bbba +Merge: f198b6f0a6 fa5bef628a +Author: hufangzhou <746775970@qq.com> +Date: Wed Nov 25 13:44:53 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f198b6f0a6917d3f7030451b6b071b237fd52bde +Author: hufangzhou <746775970@qq.com> +Date: Wed Nov 25 13:44:44 2020 +0800 + + * Finish task#8448. + +commit fa5bef628a43c92c74d40f4c59951ac3038ccc6f +Author: qiyu-xie +Date: Wed Nov 25 13:05:38 2020 +0800 + + * Finish task#8457. + +commit 6cdd6d850bb035e6c47bce966a0ad5a30fba6018 +Merge: bfc2ec33ad 669994c706 +Author: hufangzhou <746775970@qq.com> +Date: Wed Nov 25 12:31:08 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bfc2ec33ad734f6ae1d64ded9738a1dfbf66d325 +Author: hufangzhou <746775970@qq.com> +Date: Wed Nov 25 12:27:04 2020 +0800 + + * Fix an error. + +commit 669994c706800f17c470ff9077274bca51cca043 +Author: tianshujie98 +Date: Wed Nov 25 12:13:04 2020 +0800 + + * Delete workload percentage judgment. + +commit ab815789d11cdb7263f6aa2f5a130aed2067214d +Author: leiyong <1549684884@qq.com> +Date: Wed Nov 25 11:38:26 2020 +0800 + + * Adjust project module code login. + +commit e7f95cf57b10433e0577f584f52188ced8436aaf +Author: tianshujie98 +Date: Wed Nov 25 11:21:13 2020 +0800 + + * Add button disabled attribute. + +commit 5ef321f149777609fc52968e39578a22529bb8ab +Author: leiyong <1549684884@qq.com> +Date: Wed Nov 25 10:59:41 2020 +0800 + + * Adjust code logic. + +commit 90446d239aa9bd43b00fc5e6357434fb9483f70b +Author: Yagami <976204163@qq.com> +Date: Wed Nov 25 10:36:12 2020 +0800 + + * Merge code and finish task #8475. + +commit 4541dcb42e17b9329398c59f89a8686860916cd1 +Merge: 3d636dc83f 78e3fdcad3 +Author: hufangzhou <746775970@qq.com> +Date: Wed Nov 25 10:32:55 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3d636dc83f02c914904a4fadb0ab4bc9a9dcfe69 +Author: hufangzhou <746775970@qq.com> +Date: Wed Nov 25 10:32:43 2020 +0800 + + * Modify the language file. + +commit 78e3fdcad3a7e933648801a42728a919f0c9c2db +Merge: 2cbe7b8a79 4f4df64957 +Author: qiyu-xie +Date: Wed Nov 25 10:24:24 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4f4df6495757c9bc4746bb4f7ce133b4fa313fb5 +Author: Catouse +Date: Wed Nov 25 10:09:41 2020 +0800 + + * update style of buttons in .c-actions and add .btn-action by update zui css. + +commit 2a77e1f29d80a8a880c844544ca49cfe3d30ab0b +Author: z +Date: Wed Nov 25 10:02:15 2020 +0800 + + * code for task #8496. + +commit 55fb0867cbacc33f6178de205e7738e1225b89b8 +Author: z +Date: Wed Nov 25 09:54:47 2020 +0800 + + * code for task #8496. + +commit 2cbe7b8a7944b0665e3dc1ae0b8531a51f31f190 +Author: qiyu-xie +Date: Wed Nov 25 09:42:13 2020 +0800 + + * Finish task#8464. + +commit 7c4908478c158033f09ecc95904846b5ee348577 +Author: tianshujie98 +Date: Wed Nov 25 09:34:08 2020 +0800 + + * Adjust the back button link. + +commit 69631e3dc35cfff18ce48d377c2c78400d44365d +Merge: 37f8d75f1e 29c953918c +Author: hufangzhou <746775970@qq.com> +Date: Wed Nov 25 09:15:40 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 37f8d75f1e08c2f1d4187f71c0fd92344b6d0f3a +Author: hufangzhou <746775970@qq.com> +Date: Wed Nov 25 09:15:28 2020 +0800 + + * Finish task#8455. + +commit 29c953918c9881340029c58f3ac1c067f5f6e40b +Merge: 0c4aee39c9 302a68291c +Author: tianshujie98 +Date: Wed Nov 25 09:13:32 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0c4aee39c91785038c2f3ba3ce96075e50d04eb3 +Author: tianshujie98 +Date: Wed Nov 25 09:13:08 2020 +0800 + + * Finish task #8479. + +commit 302a68291c087935dad3ef08d400873072a16691 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 24 23:23:54 2020 +0800 + + * Adjust getExecutionsByProject method. + +commit 3eafb1ac5da8850bf6c705e421a90c33209c6ef4 +Merge: 5a6f487faa 9a20bab153 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 24 23:22:27 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9a20bab153fb3333c3cd9f3d41b4ce47b57cd4fd +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 24 22:46:33 2020 +0800 + + * Finish task#8494. + +commit 888bd3721fe414743c4e8b37397564f0e87ed1de +Author: qiyu-xie +Date: Tue Nov 24 16:16:16 2020 +0800 + + * Finish task#8457. + +commit 424193e084ca2c7d5415d6f8251ba964f3bf7ccf +Author: Catouse +Date: Tue Nov 24 17:25:59 2020 +0800 + + * improve style of contextmenu in recentproject block. + +commit c1b1db4ae69e00172077a60f2ba8dbc270e55388 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 24 17:21:45 2020 +0800 + + * Delete field in program create page. + +commit 3d14cd6a521766bca189bd183096e61e9a9c267f +Author: Catouse +Date: Tue Nov 24 17:11:01 2020 +0800 + + * task #8506, change dropdown to context-dropdown and fix conflict of dropdown-menu with overflow style. + +commit a5ccc8a6e92a5b84fd82be6102dd2248aaec60f0 +Author: Catouse +Date: Tue Nov 24 17:09:45 2020 +0800 + + * improve style of recentproject block. + +commit c3c99947424b891e12a7700044e5a2364c4fd859 +Author: Catouse +Date: Tue Nov 24 17:09:26 2020 +0800 + + * fix drag-and-drop conflict when block content has panel-heading in dashbard page. + +commit 5a6f487faa4f3721cc254acc10d219e30f35c25f +Merge: ac5d658933 bef3194549 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 24 16:49:32 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 41716c9d153b11082d740b7f54c42d2a84e0c16c +Author: z +Date: Tue Nov 24 16:32:32 2020 +0800 + + * fix bug. + +commit ac5d6589336828d683f4a00665fc3ab13a34a374 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 24 15:58:26 2020 +0800 + + * Adjust getExecutionPairsByProduct method. + +commit bef31945493298705b2eba6b15942e6d7a16e50e +Author: z +Date: Tue Nov 24 15:34:00 2020 +0800 + + * code for task #8496. + +commit 3c7da6dc609dd9742bb807c9bf4f2cd0bd8fd901 +Author: z +Date: Tue Nov 24 14:15:37 2020 +0800 + + * code for task #8496. + +commit 7f0e4e13f8fa94ef6d957abc8bbce8969bc8a7f6 +Author: z +Date: Tue Nov 24 10:17:24 2020 +0800 + + * adjust for upgrade. + +commit 97ac6f0b9c0770f42a4c7fd39061785cff806bf3 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 24 14:45:52 2020 +0800 + + * Merge code. + +commit 9c59c495ee426fc9356ffc3f48c5220d9ebe5a7d +Author: Yagami <976204163@qq.com> +Date: Tue Nov 24 09:08:05 2020 +0800 + + * Finish task #8525. + +commit e7856c6d3239be914c4f1266ce51476fc890e421 +Author: qiyu-xie +Date: Tue Nov 24 14:32:33 2020 +0800 + + * Finish task#8493. + +commit e9fcbe9c21b8b86c57cb367412708109f511694c +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 24 14:11:09 2020 +0800 + + * Finish task #8507. + +commit 760733d902d50821b88e25658c9c12dd490561bb +Merge: 8ad7105f01 2be6076089 +Author: tianshujie98 +Date: Tue Nov 24 13:56:44 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8ad7105f01f4ddac156d017bb44da79b448483a3 +Author: tianshujie98 +Date: Tue Nov 24 13:51:42 2020 +0800 + + * Adjust the order. + +commit 2be6076089b64099e86721c4fe100b56c7da61dd +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 24 13:45:40 2020 +0800 + + * Finish task 8490. + +commit ad283b76c623e3f32e7eba59989617121e156704 +Merge: 600c28082a 8f11da1edd +Author: tianshujie98 +Date: Tue Nov 24 13:16:23 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8f11da1eddd54f2ee53aab29c69cafc3a7875777 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 24 13:15:27 2020 +0800 + + * Finish task#8461. + +commit 600c28082a4625c99380c97c1c51eed536feb62a +Merge: 247c687f49 54ffdaea7a +Author: tianshujie98 +Date: Tue Nov 24 13:13:09 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 247c687f49cf516fbe215646fccfc6745c6cd0f9 +Author: tianshujie98 +Date: Tue Nov 24 13:11:03 2020 +0800 + + * Adjust the order. + +commit 54ffdaea7a888ad47f34e1f5fe42e3fe87932de3 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 24 13:05:36 2020 +0800 + + * Fix edit stage error. + +commit 48c8c8b9a8d5d49f0a82fb3f3c4f967e22d1d6f3 +Author: qiyu-xie +Date: Tue Nov 24 12:24:45 2020 +0800 + + * Fix task#8483.#8484.#8485.#8486.#8487. + +commit 2160ae0958b88fafe040f180f88826c04d284d51 +Author: tianshujie98 +Date: Tue Nov 24 12:29:02 2020 +0800 + + * Adjust code style. + +commit 0697a67f160970732e205f7b24ae76173edc2b8e +Author: tianshujie98 +Date: Tue Nov 24 12:18:49 2020 +0800 + + * Merge. + +commit 2d4fd00f8d68c2b0b8187b931e30698224994ad0 +Merge: 73d99650ab 5288b68681 +Author: tianshujie98 +Date: Tue Nov 24 12:14:13 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 73d99650abe919dde55e973ba39f5a9ad3c6172a +Author: tianshujie98 +Date: Tue Nov 24 11:40:47 2020 +0800 + + * Finish task #8492. + +commit 5288b68681a814cb0f4f4a43c72eebacbbde9256 +Author: qiyu-xie +Date: Tue Nov 24 11:11:27 2020 +0800 + + * Fix task#8465. + +commit d6c3ea796716b286d1fdfb7166dc0bc691d27609 +Author: Catouse +Date: Fri Nov 20 15:59:08 2020 +0800 + + * update picker files. + +commit 7995d3486e9e31e75e245daf3352f0da404236ef +Author: qiyu-xie +Date: Tue Nov 24 11:08:16 2020 +0800 + + * Finish task#8483.#8484.#8485.#8486.#8487. + +commit 586bdc38c600e15f4fe63ec0debbc5e6baff07ed +Merge: 94586714e6 9a552de3f2 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 24 10:55:46 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 94586714e60443e92c222a774be68daad8d7f069 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 24 10:54:37 2020 +0800 + + * Finish task#8509. + +commit 371543edcd7ed3655ec4683d8d770f93c0c1f419 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 24 10:44:23 2020 +0800 + + * Add query condition. + +commit 9a552de3f2077905de2b87ca00dd9c93d63663bc +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 24 10:44:08 2020 +0800 + + * Finish task #8452. + +commit 8cead79b18fe37e477f46d03eb71e8b593d9a11e +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 24 10:40:18 2020 +0800 + + * Adjust getProjectPairs to getExecutionPairsByProduct. + +commit f83da3686b1b21bea3b576734f00e87de91217b1 +Author: z +Date: Tue Nov 24 10:22:55 2020 +0800 + + * fix error lang. + +commit 3ec0aacb61b511ae6d8ae111b819aaa03c8af368 +Merge: 1d26396b9d e9677d8db4 +Author: z +Date: Tue Nov 24 09:49:21 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e9677d8db46e8249a4c3b90fba2b9de2068ff5ad +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 24 09:21:06 2020 +0800 + + * The programplan module add language item. + +commit 09c4d927507dac5dd8753c04b8f6859d63fbe8cb +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 24 09:14:49 2020 +0800 + + * Fix bug. + +commit ef684a132a6bb7d7066da38b50255e8554818462 +Merge: 6d25f07fa8 40630c75a8 +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 24 09:08:26 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6d25f07fa895c806468bd90564a0df40faa2762e +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 24 09:08:13 2020 +0800 + + * Finish task#8467. + +commit 40630c75a881ceeeb24f847f2658171c4b1cb346 +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 24 09:05:28 2020 +0800 + + * Finish task #8451. + +commit 41b1d9931aa44d974af2787a8f1e99d304d67187 +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 24 08:56:14 2020 +0800 + + * Finish task #8450. + +commit 1d26396b9dec39a0319811427c9132e6183c571f +Author: z +Date: Tue Nov 24 08:49:08 2020 +0800 + + * adjust for merge. + +commit 6b6f4d95f4e9c7354bf05f8317a0a79940ae6ae5 +Merge: 7328fa8d30 6f8d41b767 +Author: z +Date: Tue Nov 24 08:42:31 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7328fa8d30cdea618a5c77379c2fcf417873aff0 +Author: z +Date: Tue Nov 24 08:30:29 2020 +0800 + + * adjust for merge. + +commit 6f8d41b767b8d0b3a31195d505357345bcbed0f6 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 24 00:17:32 2020 +0800 + + * Adjust install. + +commit fa4bb5a280e1f23d9b62ad9584ba16f4f4251ccb +Author: qiyu-xie +Date: Mon Nov 23 21:04:41 2020 +0800 + + * Conflict resolution. + +commit c658c271f4ea9706bf1a9aabfedcdabfb0d9f0f7 +Author: qiyu-xie +Date: Mon Nov 23 20:55:42 2020 +0800 + + * Finish task#8465. + +commit b42d47e2574dda11d8e30e4315f4a224c8d40095 +Merge: 6ce3a0345b a6b21d74b7 +Author: z +Date: Mon Nov 23 20:42:59 2020 +0800 + + Merge branch '12.x' + +commit 6ce3a0345b4ce160e62e4f129c636fc2a18a02b4 +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 23 17:56:19 2020 +0800 + + The sum of the workload of the child phases cannot be greater than that of the parent phase. + +commit 5d2c36b59a62d4763c032590d766ea15e547460f +Author: tianshujie98 +Date: Mon Nov 23 17:31:07 2020 +0800 + + * Adjust code style. + +commit 1b32a7385d52ed17b01f572ff5dcbf21337894b5 +Author: tianshujie98 +Date: Mon Nov 23 17:08:15 2020 +0800 + + * Finish task #8480. + +commit 021430208ea37572973e48e79ca28c4736643efd +Author: qiyu-xie +Date: Mon Nov 23 16:31:59 2020 +0800 + + * Finish task#8482. + +commit 12d61dd7807b730a858cb6bd80f15609098d9262 +Merge: da1466c600 eabbb2fd3f +Author: hufangzhou <746775970@qq.com> +Date: Mon Nov 23 16:23:50 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit da1466c6006f631f874e7698acaf917c85d65b41 +Author: hufangzhou <746775970@qq.com> +Date: Mon Nov 23 16:23:44 2020 +0800 + + * Finish task#8444. + +commit a6b21d74b7b0e028c50b8036b8db2d46a6ddd016 +Author: holan20180123 <56391770@qq.com> +Date: Mon Nov 23 16:23:20 2020 +0800 + + * Finish task #3591. + +commit eabbb2fd3f85edab2a2335f33be5fb7fc81373f3 +Author: holan20180123 <56391770@qq.com> +Date: Mon Nov 23 16:13:49 2020 +0800 + + * Finish task #8449. + +commit 6d5c727a66367a269cdad56ecfe0edd2d462e1fe +Merge: 8853626ead d2f0f46a07 +Author: tianshujie98 +Date: Mon Nov 23 15:48:47 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8853626ead03c3160d2efb395c6b6b4e4d405fc3 +Author: tianshujie98 +Date: Mon Nov 23 15:47:58 2020 +0800 + + * Finish task #8456. + +commit d2f0f46a0730dc51b6dd03365ccd8ad4e98de812 +Author: holan20180123 <56391770@qq.com> +Date: Mon Nov 23 15:34:51 2020 +0800 + + * Finish task #8445. + +commit 4051bc83531add1175bdf38bf70d57a61efdbb08 +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 23 14:41:52 2020 +0800 + + * Adjust block module code. + +commit 9dce9656fdff632b7518fe4ad2186a2537ecb933 +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 23 11:31:49 2020 +0800 + + * Adjust the language item of the my module. + +commit b464df460809eba35d7557190495e15592f4bc27 +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 23 11:07:50 2020 +0800 + + * Add Comments. + +commit 88440ff8cd7eb8d1af2c69f4ad437d948f9525c4 +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 23 09:03:37 2020 +0800 + + * Show search box. + +commit de0a5ba04a6e589d70d9a34da9b4dbc0afa23727 (tag: zentaopms_20.0.alpha2_20201123, tag: zentaopms_13.0.alpha2_20201123) +Author: leiyong <1549684884@qq.com> +Date: Sun Nov 22 22:27:16 2020 +0800 + + * Adjust PRJManageProducts method. + +commit e70ad43a6dba8ac9d37ed2005de10a42a0763699 +Author: leiyong <1549684884@qq.com> +Date: Sun Nov 22 21:55:52 2020 +0800 + + * Modify getPGMProduct to getPGMProductPairs.: + +commit 0dac0319f8cabf409e3744230ff83183bc8bcf23 +Author: qiyu-xie +Date: Fri Nov 20 16:38:18 2020 +0800 + + * Modify the method of get project in the report. + +commit 6481a780c36678a5042fd9338777e95b0f090e79 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 20 15:39:08 2020 +0800 + + * Fix doc error. + +commit 83f28e4aa3cf8544f7dc4597d477c2ae42d849ba +Merge: ea0cff9182 310bf2b2c3 +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 20 15:29:35 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ea0cff9182d4c61e190873c73dcaa62ace22967e +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 20 15:29:11 2020 +0800 + + * Modify upgrade model.php logic. + +commit 310bf2b2c3e696833ed8872d7381499497f52a51 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 20 14:52:59 2020 +0800 + + * Rename my project and program. + +commit 4f4f6cbf9d0d0c2f70a848775fb14f328d6bc1f2 +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 20 14:38:28 2020 +0800 + + * Adjust upgrade module. + +commit 9073099a7e2e30221d22d6e39009daf6e028799a +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 20 14:36:10 2020 +0800 + + * Modify executionPairs to executionIdList. + +commit 622a4ef4f43d2ff79b1a2ef175cbc74166b7b43a +Merge: 3834ae66ad 421bd118b1 +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 20 14:29:07 2020 +0800 + + Conflict resolution. + +commit 351b562cf55cc301794b63392574b697af8ae768 +Author: z +Date: Fri Nov 20 14:21:30 2020 +0800 + + * fix bug #3695. + +commit 421bd118b18310b6b9438b49f6b3c14f0222a7bb +Merge: 199646c315 90df7cd4dc +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 20 13:39:38 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 199646c3155b19254221df753aa7c695009710cc +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 20 13:39:20 2020 +0800 + + * Fix a bug. + +commit 90df7cd4dcd46a90ac3c217a46e3e398ea3e7c87 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 20 13:09:47 2020 +0800 + + * Merge code. + +commit 3e902392acc6c66a27f34e57182143b4fe5da282 +Author: z +Date: Fri Nov 20 13:09:02 2020 +0800 + + * search with account. + +commit f90a9dbe3d27d6f26596636370a331dbb910591f +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 20 11:23:46 2020 +0800 + + * Variable renaming 'project' to 'execution'. + +commit fdaa19f307c187f23ccf64227e3770c85cbc5053 +Author: tianshujie98 +Date: Fri Nov 20 11:16:47 2020 +0800 + + * Add project link product tips. + +commit 221a3ee96d78a928b3c6eb31fb0d92152e3c7dc3 +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 20 10:59:49 2020 +0800 + + * Method Renaming 'Project' to 'Execution'. + +commit 17653d50531b1f0109abb777821ebdefe17b74a8 +Merge: 541e72b2bd 45043bd0e3 +Author: tianshujie98 +Date: Fri Nov 20 10:09:22 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 541e72b2bd22c565aa62a44f37a65d1983dbd353 +Author: tianshujie98 +Date: Fri Nov 20 10:08:48 2020 +0800 + + * Modify variable name. + +commit 45043bd0e3ae4f1b41ed31f9fe17eb0c61c29fcd +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 20 10:02:07 2020 +0800 + + * Fix a bug. + +commit 3834ae66ade0a22c7f91bb6875aca5eb967ef4bb +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 20 09:59:57 2020 +0800 + + * Modify programID to projectID. + +commit 8d3ce4acdd4cbfc52f0771b04c413b83afebe2f4 +Merge: f49e756aca c9a91a432a +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 20 09:07:21 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f49e756aca3009cf79170da75484ffd1d585c027 +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 20 09:07:01 2020 +0800 + + * Fix a bug. + +commit c9a91a432a3d01ce73f8d0d91ba789ba8977d833 +Author: tianshujie98 +Date: Fri Nov 20 08:29:35 2020 +0800 + + * Change method name. + +commit 31032dfb66d853c325e5201e42f33bcd0dc4558a (tag: zentaopms_12.5.stable_20201120) +Author: qiyu-xie +Date: Fri Nov 20 08:27:36 2020 +0800 + + * Fix bug. + +commit 5960e245564614fc6d8cc990219abfee4ca250c4 +Merge: b31a5534ad 1bf0499e9b +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 20 08:22:16 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b31a5534ad6ed89538b90f23694d63b780b41fed +Merge: 6b0c12918d 22a0fb1922 +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 20 08:21:07 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1bf0499e9b12f64d951f1dfe5950139ccb3c07ea +Merge: 1fbe0e13a2 22a0fb1922 +Author: tianshujie98 +Date: Fri Nov 20 08:20:37 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6b0c12918daa494c335770e9c3a96462b795d495 +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 20 08:20:29 2020 +0800 + + * Repair code. + +commit 1fbe0e13a212b25649c944206404b66e205dfe2e +Author: tianshujie98 +Date: Fri Nov 20 08:20:20 2020 +0800 + + * Fix bug. + +commit eb3d6f71619d6a74cd48dc87ee72d6b3cf9c2513 +Author: qiyu-xie +Date: Fri Nov 20 08:15:20 2020 +0800 + + * Finish task#8375. + +commit 09e7734adfa83315e4cbd5a0c7d1dc62bab6f17b +Author: qiyu-xie +Date: Thu Nov 19 09:51:29 2020 +0800 + + * Finish task#8375. + +commit 22a0fb1922cc23457d7d69d0343b298e13900541 +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 19 17:50:18 2020 +0800 + + * Adjust the upgrade module mergeprogram.js file. + +commit 55976aeb2659f5f2b2a126e02fe235d7e4b1af8f +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 19 17:32:08 2020 +0800 + + * Query the program and project logic when upgrading. + +commit ec2c0c7a26014a147b6943809c212c0618b9a9bd +Author: Yagami <976204163@qq.com> +Date: Thu Nov 19 16:44:11 2020 +0800 + + * Adjust code. + +commit 9b5c484cf915f735b4f9699091e278aa3802b5d5 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 19 16:43:12 2020 +0800 + + * Add no product logic. + +commit 877bab91406f3fbd85e3be6f210d603ea49a9910 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 19 16:15:37 2020 +0800 + + * Fix program acl. + +commit 4d842f4ec7dc2a15cc0c5df6a618f5565dd19be7 +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 19 17:19:55 2020 +0800 + + * Init products. + +commit b9d0d22adaa245275a7e0d730d71fdb6d82295c7 +Merge: ec3a2ff4ff 121effd4f9 +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 19 16:46:44 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ec3a2ff4ff380fb2f3fcfadb566b89bb0e9660ee +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 19 16:44:58 2020 +0800 + + * Init products. + +commit 121effd4f94d3e0c38350a02b0e1131e2bf14802 +Author: tianshujie98 +Date: Thu Nov 19 16:37:54 2020 +0800 + + * Fix bug. + +commit c2d2f1335420bc4df9a744c000f25e1a24abde07 +Merge: 3617c47256 3f752243f6 +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 19 16:20:57 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3617c47256ed306483481958efab93ad766243cc +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 19 16:20:32 2020 +0800 + + * Show the source of the projects being copied. + +commit 3f752243f675265cc95c2cdb2f804a73f49ad4ed +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 19 16:14:04 2020 +0800 + + * Method renaming 'getPairs' to 'getExecutionPairs'. + +commit c5f8e7b2e4d3d7f1462e50ff5f4335472bb51bac +Merge: 77af51dacd def7c10ea5 +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 19 15:56:58 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 77af51dacd562335dbf33b8a0e1bdea2e767c73b +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 19 15:53:33 2020 +0800 + + * Method renaming 'getParis' to 'getExecutionPairs'. + +commit def7c10ea56c1663bbd216128be30a80791b5b33 +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 19 15:48:32 2020 +0800 + + * Modify replicable projects. + +commit 7c8ec20264337eb8fe543f07d8a889429c2ce3b1 +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 19 15:22:58 2020 +0800 + + * Rename project to execution. + +commit 2912170c06820ec91a42b94fe8231846eb0dafbf +Merge: b48d870e13 d2d690fd12 +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 19 15:15:39 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d2d690fd12e07ba9efdf4ca2411c4c51a0d4db6c +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 19 15:15:22 2020 +0800 + + * Adjust the block module language file. + +commit a615e511f5c73f8edaa18ac6036fb73653374bc0 +Merge: 54853f38fe 0dad2445f1 +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 19 15:12:55 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b48d870e135063d6cc3627ad5a5f71bae2e96f2a +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 19 15:07:44 2020 +0800 + + * Modify method 'getPairs' to 'getExecutionPairs'. + +commit 0dad2445f17cbde4d15aa5ec2451df2ca312b08a +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 19 15:03:50 2020 +0800 + + * Rename project to execution. + +commit 54853f38fecb5fa8df5359c6385e5f76d127a3de +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 19 14:59:51 2020 +0800 + + * Create waterfall projects with multi-product single product removal. + +commit bbe210c2a0502d54490b7fecdca599c3194d54d6 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 19 14:51:46 2020 +0800 + + * Fix create story bug. + +commit dcf420bd9cab30e0285177fd623f67ce9e092e87 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 19 14:31:23 2020 +0800 + + * Adjust code. + +commit d071fcae02e47145d023569c349766bdcd68f828 +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 19 14:27:29 2020 +0800 + + * Rename project to execution. + +commit 72a2b18c203cc50b328add9da58a56ad829cf4bc +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 19 14:07:58 2020 +0800 + + * Adjust the block module language file and model.php Logic. + +commit f2c6dba22643212cf5166c2554e976c02c212920 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 19 14:02:30 2020 +0800 + + * Rename project function name. + +commit 9b176b2e0e9b9fe9e2edc725043e1fae7494c5af +Author: tianshujie98 +Date: Tue Nov 17 13:19:49 2020 +0800 + + * Finish task #8413. + +commit 91c934529e033ff6927a336182bd1c2f38a567f4 +Author: z +Date: Thu Nov 19 13:12:46 2020 +0800 + + * add user type column. + +commit 5362b9367f00fe09bc5f50a9df1ee94ed35065fa +Author: z +Date: Thu Nov 19 11:20:03 2020 +0800 + + * add new version and upgrade. + +commit 4b20ebefbe939653709a069fe9ad6adcf520b7fa +Merge: f084b382ae 492381b860 +Author: z +Date: Thu Nov 19 11:06:05 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit d142a8a69b2bdffcbf8df25ed058409365d98f2d +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 19 10:54:29 2020 +0800 + + * Adjust the ajaxGetDropMenu method of the product module. + +commit aae58fea38984c86fdaf493d1517c4efd0a3c516 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 19 10:41:20 2020 +0800 + + * Adjust code details. + +commit 492381b86090cea7366711ed752e2aa0f582fdc8 +Author: qiyu-xie +Date: Thu Nov 19 09:31:30 2020 +0800 + + * Finish task#8421. Fix bug. + +commit f084b382aeda853c2c557654f3dade8db5488c21 +Merge: 025e1e039d 861b5e5d95 +Author: z +Date: Thu Nov 19 09:22:02 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit b919cc45b26dd49e0288d1ce5c08137bbd15551a +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 19 09:07:31 2020 +0800 + + * Adjust getProductPairsByProject to getProductByProject. + +commit 7eaf1d34e1bdb33c7e29c52c7f45484f7dd01d31 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 19 08:53:47 2020 +0800 + + * Adjust code. + +commit 861b5e5d956dab3582e6322690677ac0a988c661 +Author: qiyu-xie +Date: Wed Nov 18 16:51:13 2020 +0800 + + * Finish task#8421. + +commit f0e8bee3796b3e824f38764681fdba51e5cfc789 +Merge: 50561f9777 378d6245e8 +Author: qiyu-xie +Date: Wed Nov 18 16:38:18 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 025e1e039dabfe7489eda7fc5e152d70a5ae2034 +Author: z +Date: Wed Nov 18 16:37:13 2020 +0800 + + * adjust for setting xuanxuan. + +commit 50561f9777d7cf43bc2421c3c1fc8e2cf7113899 +Author: qiyu-xie +Date: Wed Nov 18 16:30:58 2020 +0800 + + * Finish task#8421. + +commit 540728e3facbe94a8d76c7c103f60d6228224e02 +Author: Yagami <976204163@qq.com> +Date: Wed Nov 18 15:32:46 2020 +0800 + + * Fix program detail. + +commit 460947ebceb81b3a8baa3590bea78ea42f5b4d57 +Author: Yagami <976204163@qq.com> +Date: Wed Nov 18 15:07:51 2020 +0800 + + * Change toString to zui function. + +commit 92b7885a8f3dfa272ee12f5021aad36e25f957c5 +Author: Catouse +Date: Wed Nov 18 15:32:44 2020 +0800 + + * change color of toggle icon in nested table. + +commit 455e828fce57696b46e58978b1ea51fc748a70e5 +Author: leiyong <1549684884@qq.com> +Date: Wed Nov 18 15:22:49 2020 +0800 + + * Adjust recent. + +commit 378d6245e84e68ef036bcadedf8ef0991638c9b6 +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 18 15:17:30 2020 +0800 + + * Finish task #8376. + +commit 38527c2b200263f342d671b174102b59ea1b3444 +Author: z +Date: Wed Nov 18 15:03:56 2020 +0800 + + * remove useless file. + +commit ec6ced01d562ac85b660a2c921502ac228cee08f +Author: Yagami <976204163@qq.com> +Date: Wed Nov 18 14:57:38 2020 +0800 + + * Fix program js. + +commit 0dc6b48d61b6afe555c0352ce29c7d3ee55d9193 +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 18 14:56:58 2020 +0800 + + * Finish task #8390. + +commit 903044dc3d1c2c966bc7ae4b35c182873142f62c +Merge: 4d4bb33d40 fac726a53c +Author: hufangzhou <746775970@qq.com> +Date: Wed Nov 18 14:55:26 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 4d4bb33d40ca959d4262482348c9c161feb4ff18 +Author: hufangzhou <746775970@qq.com> +Date: Wed Nov 18 14:55:17 2020 +0800 + + * Adjust the code indentation. + +commit 568c524c85a39de992c08777c4b37236d42f95b5 +Author: Catouse +Date: Wed Nov 18 14:38:36 2020 +0800 + + * fix checkbox and radio position. + +commit fac726a53cb91dddcb72901b5d1f81cf186774bd +Author: Catouse +Date: Wed Nov 18 14:37:54 2020 +0800 + + * fix checkbox and radio position. + +commit 557a5d5d62f24992d40e9c6bcf418133337b40ae +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 18 14:04:34 2020 +0800 + + * Finish task #8387. + +commit 0def3e0b08a04de66de011ff829231258fb8ec0f +Author: qiyu-xie +Date: Wed Nov 18 14:01:27 2020 +0800 + + * Finish task#8419. Fix bug. + +commit a55a5382705a60d6016a66c1fe6c7ee9d1afa726 +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 18 13:52:07 2020 +0800 + + * Finish task #8390. + +commit 0b855e68536e5b2bc70459289a522aabc20e41cc +Author: Yagami <976204163@qq.com> +Date: Wed Nov 18 13:31:27 2020 +0800 + + * Fix details. + +commit f9995e4362b398bb304c31acfc967b233d4fbad5 +Merge: d1bb42ad3a 48e4e31a30 +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 18 11:44:15 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit d1bb42ad3a80ed3e6428f2271f13b23598bad0c5 +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 18 11:34:41 2020 +0800 + + * Finish task #8376. + +commit 48e4e31a3045b527c9ec170d2a82725575ea1c28 +Author: tianshujie98 +Date: Wed Nov 18 10:32:57 2020 +0800 + + * Finish task #8397. + +commit 726bbc775bbcf3f0f129d7bfe09ee69bd7082153 +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 18 09:52:04 2020 +0800 + + * Finish task #8407. + +commit 4d38c4985dfc6e0b64a54bb0a3539466af2c0c8e +Merge: 76296225b4 b26569aa2d +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 18 09:51:58 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit b26569aa2d6a8041fa52b229d5b70872496f3939 +Author: hufangzhou <746775970@qq.com> +Date: Wed Nov 18 09:47:27 2020 +0800 + + * Fix a bug. + +commit db13a97dc10d047fb14968bde7e6227506cf1eaa +Author: hufangzhou <746775970@qq.com> +Date: Wed Nov 18 09:20:24 2020 +0800 + + * Finish task#8417. + +commit 2965ab0b5b2a6e62f870a83b621dfb3f9b6760ca +Author: leiyong <1549684884@qq.com> +Date: Wed Nov 18 09:17:20 2020 +0800 + + * Adjust the program module lang file. + +commit 55df1f202b0f3c01cdc4f22526adcb70c77a783a +Author: hufangzhou <746775970@qq.com> +Date: Wed Nov 18 09:09:16 2020 +0800 + + * Finish task#8387. + +commit 76296225b405f32c0c8eb215d0d44be7bb11ddd0 +Merge: 48d521f958 b611a6fdf0 +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 18 09:07:56 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit b611a6fdf01de12d1f9bc993d4c4faa640521f92 +Author: hufangzhou <746775970@qq.com> +Date: Wed Nov 18 08:52:50 2020 +0800 + + * Finish task#8401. + +commit e94ca07efe671cfc025396d93a5d35761d22ff87 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 17 17:36:20 2020 +0800 + + * Adjust code. + +commit bbea7497e8f7ebdd8308908fe69cb8952e8685a5 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 17 17:27:51 2020 +0800 + + * Fix project end date. + +commit 48d521f958607494a8fea9635894bd805df9d469 +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 17 17:21:58 2020 +0800 + + * Finish task #8392. + +commit a34b9be9051a81ba97a0caa5c98d7b7dfdc95551 +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 17 17:17:38 2020 +0800 + + * Finish task #8406. + +commit 8b15401fc5a7341318e3c3c8f2f9cb0411850d07 +Author: z +Date: Tue Nov 17 17:00:14 2020 +0800 + + * add HttpOnly for cookie. + +commit c72e9c7664749fcb0b5b5237a0da5b9ead97bca8 +Author: z +Date: Tue Nov 17 16:59:52 2020 +0800 + + * adjust for api-sql. + +commit e19f5296d71340ab92b01f487a37c12399bec446 +Author: z +Date: Tue Nov 17 16:24:54 2020 +0800 + + * fix bug. + +commit 3d85fc9346d57887ec96cd9b15d39949748fdebf +Author: qiyu-xie +Date: Tue Nov 17 16:58:46 2020 +0800 + + * Finish task#8423. + +commit 9e7d7aa91ad5722dce9011a22073c1406e35c00b +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 17 16:39:10 2020 +0800 + + * Finish task #8388. + +commit 3aee933db697bf4793a47dbb744f7c38d3c90860 +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 17 16:32:41 2020 +0800 + + * Finish task #8386. + +commit c8cf8ce440c07b1afc928329074c237862bb75c8 +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 17 16:28:27 2020 +0800 + + * Finish task #8382. + +commit aa54b07ab39327d93ca41fe716474be08e6d065e +Merge: cb8dc1bc3b ca7070b2cb +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 17 16:25:08 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 2d866bbd8bcfa84b0fdd14f4798a3f28e6ccd7d7 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 17 16:23:24 2020 +0800 + + * Fix bug. + +commit ca7070b2cb50bcbb1e7947c6a4d68067992ac76c +Author: qiyu-xie +Date: Tue Nov 17 16:21:38 2020 +0800 + + * Finish task#8419. + +commit cb8dc1bc3b4b62ee82bfcfc05378ef21a4994137 +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 17 16:11:06 2020 +0800 + + * Finish task #8389. + +commit 811e7a9de859f53aea0e7e285904cd5d7a8ede4c +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 17 15:28:12 2020 +0800 + + * Fix bug. + +commit 4943ce7bbe7fe7bd7e23d9f802716b6886cb0113 +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 17 15:25:16 2020 +0800 + + * Finish task #8387. + +commit f1423214eb31f99b0770b030ba7dcc3ffdbcbc91 +Author: tianshujie98 +Date: Tue Nov 17 15:12:09 2020 +0800 + + * Finish task #8402. + +commit ffc06ae5adeaa25be93a9a05f09d38c4dcd0e93d +Author: tianshujie98 +Date: Tue Nov 17 15:04:55 2020 +0800 + + * Finish task #8403. + +commit bddac7fe2d4418d438fb7622dfe6edd4c9b46a53 +Author: tianshujie98 +Date: Tue Nov 17 14:58:41 2020 +0800 + + * Finish task #8404. + +commit 5f299ebe402e719c21494535c523fdeaa4205e9d +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 17 14:49:24 2020 +0800 + + * Finish task #8377. + +commit 15c913d828c27b75b7c753f5c6e8e9cdeeabb640 +Author: qiyu-xie +Date: Tue Nov 17 14:04:44 2020 +0800 + + * Finish task#8410. + +commit 7c1f6c88f3882a7346cc5f253042b15f7893f068 +Author: qiyu-xie +Date: Tue Nov 17 13:48:36 2020 +0800 + + * Finish task#8399. + +commit b96129db798188c291fa9ca02d4e8a5f7d5429d6 +Author: tianshujie98 +Date: Tue Nov 17 14:42:09 2020 +0800 + + * Finish task #8420. + +commit d0c79808c315461e03a11d968e18beacf76638ce +Author: tianshujie98 +Date: Tue Nov 17 14:31:21 2020 +0800 + + * Finish task #8405. + +commit ed8dcc38cd862f9469e969d65b3bb71a987b486d +Author: tianshujie98 +Date: Tue Nov 17 14:29:34 2020 +0800 + + * Finish task #8422. + +commit f08fd31a2ebaf9e961a465400ce21819575800da +Author: tianshujie98 +Date: Tue Nov 17 14:21:59 2020 +0800 + + * Finish task #8408. + +commit fc6a6d198823b99323ffe777a20e27b9dc9b729c +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 17 14:40:47 2020 +0800 + + * Finish task #8391. + +commit 78afca36537c4043c43822a3e15f453116c39bb1 +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 17 14:34:48 2020 +0800 + + * Finish task 8391. + +commit 30228e26136c4ebc16ec855871c832b97749629d +Merge: 2c7eee240b 5357877612 +Author: z +Date: Tue Nov 17 14:32:06 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit 53578776120a125707db0561133d5e69b1247f35 +Merge: 298204a438 3695e64cf3 +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 17 14:26:20 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 298204a438094b4e91f8193c2c39d17c2360a987 +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 17 14:26:13 2020 +0800 + + * Finish task#8412. + +commit 03326e0d24a1e76dcd46f1d69634901757fd7df4 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 17 14:23:07 2020 +0800 + + * Fix error. + +commit 3695e64cf38e4ac565c2c30d72ced86e0bf8f25c +Merge: 206bb11f36 9111d82d0e +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 17 14:22:44 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 9111d82d0ea4deafca42e51fd647d9d32f68b370 +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 17 14:21:21 2020 +0800 + + * Finish task#8383. + +commit 206bb11f3687c67cf50095ca5445323779cd5a69 +Merge: 23362073ba cc65aa18ce +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 17 14:20:51 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit cc65aa18cedeb918623a6eb5cac7f96b2cd7c20d +Merge: 0552e787f0 581d8b349d +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 17 14:19:52 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 0552e787f0fad9fea41012f490bef427ea711e24 +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 17 14:19:44 2020 +0800 + + * Finish task#8381. + +commit 23362073ba3c181020a5258ec73769022aff9953 +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 17 14:15:32 2020 +0800 + + * Finish task #8378. + +commit 581d8b349d195127139914085abab6bbc9e8634b +Author: tianshujie98 +Date: Tue Nov 17 14:14:30 2020 +0800 + + * Finish task #8409. + +commit f7a28ef7e1685bbc6a4d590370716695bc513d8e +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 17 14:14:16 2020 +0800 + + * Fix bug module error. + +commit 2c7eee240ba37e6c73c7ae8a28afe24a46f3ec18 +Merge: 4ec88c316d bb34dfe79b +Author: z +Date: Tue Nov 17 14:13:16 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit 4ec88c316d1b8683e1be090045d4410ea69618c7 +Author: z +Date: Tue Nov 17 14:07:39 2020 +0800 + + * adjust for realStarted. + +commit bb34dfe79b36cb495a266dc863851a3bcf8e67dc +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 17 14:04:50 2020 +0800 + + * Finish task #8378. + +commit ef4db941b74e3f5d704a2794877a283b472872f3 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 17 14:03:10 2020 +0800 + + * Finish task#8301. + +commit 3def724cd56c2c998c3612374369571b1dd3e0bf +Merge: 526d2c1e75 b100ddeb0d +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 17 13:47:30 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 526d2c1e757157095e4460ad5da8a1c86c7463f9 +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 17 13:47:16 2020 +0800 + + * Finish task#8416. + +commit b100ddeb0d58857c494e788ad451921660311bcb +Author: qiyu-xie +Date: Tue Nov 17 13:45:36 2020 +0800 + + * Finish task#8398. + +commit 9d237be691d0906a223f3f0c9ba4d94d8c54a71e +Author: qiyu-xie +Date: Tue Nov 17 13:21:31 2020 +0800 + + * Finish task#8380. + +commit 8427681ba0a0b3f319c43286ab9dee49ff9f25e2 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 17 13:45:00 2020 +0800 + + * Remove project lifetime. + +commit 5244924ece6ad67ffacc69a39fb0576cf1dfab0b +Merge: 983927b6b9 ff1e2ac04b +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 17 13:38:04 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 983927b6b94bc38658143b1dcb48cdf1b9d5d858 +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 17 13:37:25 2020 +0800 + + * Finish task#8395. + +commit ff1e2ac04b131ab105df07192e58570e191fc93a +Author: tianshujie98 +Date: Tue Nov 17 13:32:44 2020 +0800 + + * Finsh task #8411. + +commit d974dbf169bb4af71b702817a13199bcd2680b38 +Author: tianshujie98 +Date: Tue Nov 17 13:19:49 2020 +0800 + + * Finish task #8413. + +commit 877dc32f8815c54115b3c1191942fc3a7930d7f0 +Author: tianshujie98 +Date: Tue Nov 17 13:14:06 2020 +0800 + + * Finish task #8393. + +commit e5fa6f7beddcff4112d1d81034eae32af3d8f761 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 17 13:22:34 2020 +0800 + + * Finish task #8307. + +commit 7e6e5c40ae1873759c8fabc351b2d850b6596cc6 +Merge: 97770dd00f ff69596dcd +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 17 13:19:24 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 97770dd00f7dbc975d1d2884ac4370167a462dc1 +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 17 13:17:15 2020 +0800 + + * Finish task #8379. + +commit ff69596dcd5b7988ebcf66b6acb93c0173d28276 +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 17 13:17:14 2020 +0800 + + * Finish task#8418. + +commit 34b41b1daf5ae2b2f99a6075e5087c02f7c57e13 +Author: tianshujie98 +Date: Tue Nov 17 13:06:00 2020 +0800 + + * Finish task #8385. + +commit abf1fbb3619042e7e85d28f58aca6b982d2b0a68 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 17 11:32:55 2020 +0800 + + * Fix program style. + +commit 219f0634632613dea0ea8206576faf33bd89403c +Author: Yagami <976204163@qq.com> +Date: Mon Nov 16 16:56:39 2020 +0800 + + * Fix tree menu. + +commit 91ac0d9add886a23e8e79e5c176358c2007d54b1 +Author: Yagami <976204163@qq.com> +Date: Mon Nov 16 15:56:40 2020 +0800 + + * Fix program details. + +commit d86cd9420c5a8bfa221fe2e1a04faeeb48d916fc +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 17 09:43:41 2020 +0800 + + * Modify document query error data. + +commit 316e813fbeef4141e0d953f7753ff611a281346b +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 17 09:23:06 2020 +0800 + + * Fix bug. + +commit 2e9d5d204f7b4b8a2e7b5d093a9b1dea3c39ae90 +Author: tianshujie98 +Date: Tue Nov 17 09:00:50 2020 +0800 + + * Modify variable name. + +commit 9607713ad3a9507be4942189318ea493b39b0276 +Author: tianshujie98 +Date: Tue Nov 17 08:54:06 2020 +0800 + + * Modify variable name. + +commit 48f7bf3bf306e09caf4fb34912b5c4fac9167c79 +Author: tianshujie98 +Date: Tue Nov 17 08:41:39 2020 +0800 + + * Adjust code style. + +commit 3d73b747515be92a64511a3ab65773843a36ff5f +Author: tianshujie98 +Date: Tue Nov 17 08:17:07 2020 +0800 + + * Modify language items. + +commit caba144ce02634cbca721b7fba1861b610edbf1b +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 16 17:47:21 2020 +0800 + + * Adjust code. + +commit 8a22402c7554cf26dbcf7228794a90bdbe728485 +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 16 16:26:10 2020 +0800 + + * Finish task#8331. + +commit af9359047838a320392be2dd242023bf9c862a0a +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 16 16:20:11 2020 +0800 + + * Finish task#8314. + +commit b0a9a38e1508f7c0de944d6daa0d525467526085 +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 16 15:37:08 2020 +0800 + + * Finish task#8310. + +commit 3272d0c4544cfd2a7d377a440dade531d3083b7e +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 16 14:50:04 2020 +0800 + + * Adjust the test module related code. + +commit fd6502b596b926fce9c83757e4329d1b8dc80a7f +Author: holan20180123 <56391770@qq.com> +Date: Mon Nov 16 11:31:29 2020 +0800 + + * Alignment format. + +commit 03a2a479cfa4fe2d1c20e9a62c1892c590dc5057 +Author: tianshujie98 +Date: Mon Nov 16 11:03:05 2020 +0800 + + * Adjust code style. + +commit e9750cfe2661a1a4f068bc18efa27194683a6975 +Author: holan20180123 <56391770@qq.com> +Date: Mon Nov 16 11:00:05 2020 +0800 + + * Finish task #8194. + +commit c0e6591afedc0736b12b1485adf29b6df47e9186 +Author: tianshujie98 +Date: Mon Nov 16 10:55:41 2020 +0800 + + * Adjust code style. + +commit 0c1c00c1607b2bf982720efd28f1699b7330b5ee +Author: qiyu-xie +Date: Mon Nov 16 10:12:38 2020 +0800 + + * View todo start-end times display in one line. + +commit 07030443ccc6e64352811d32949dbcc87a2d6b8b +Author: qiyu-xie +Date: Mon Nov 16 09:42:32 2020 +0800 + + * Fix bug. + +commit aba9dbc8cf25b53e1e8d41ace5af54b2d762bbc0 +Author: Yagami <976204163@qq.com> +Date: Mon Nov 16 09:35:15 2020 +0800 + + * Finish task #8299. + +commit fdc986d12f61543deab162187e970dd399769fa5 +Author: tianshujie98 +Date: Mon Nov 16 09:18:58 2020 +0800 + + * Edit comment. + +commit 5ca98d0eee62f452d8f81e49d1c9075a8fee7754 +Author: holan20180123 <56391770@qq.com> +Date: Mon Nov 16 09:13:06 2020 +0800 + + * Finish task #8194. + +commit 97e2891c4ab41415fb6043a8a72e40b126a5c621 +Author: tianshujie98 +Date: Mon Nov 16 09:00:56 2020 +0800 + + * Fix bug. + +commit 79918a7dd03e27ac7425cf1ab86a3894f76e59bc +Merge: 8eb9b0afb8 cef356a33b +Author: z +Date: Mon Nov 16 09:00:56 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit 8eb9b0afb83897e7dcd8e1b1432f20d9027f2ea2 +Author: z +Date: Mon Nov 16 08:58:44 2020 +0800 + + * adjust code. + +commit 263b92ef98498afec965bc0024926145030f5459 +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 16 08:30:25 2020 +0800 + + * Adjust the stakeholder lang file. + +commit cef356a33b52f72585d4907328b666eb059a4b37 +Merge: 95c2adcdb0 1f741b8d01 +Author: holan20180123 <56391770@qq.com> +Date: Sun Nov 15 22:39:48 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 95c2adcdb0f9ff0ff237e9b3f8678561307bfaac +Author: holan20180123 <56391770@qq.com> +Date: Sun Nov 15 22:39:26 2020 +0800 + + *Finish task #8194. + +commit 1f741b8d012cf7dc4a86b0749cd6684d241c35ef +Author: qiyu-xie +Date: Sun Nov 15 14:34:23 2020 +0800 + + * Finish task#8198. Add comments. + +commit f7b2e5378d69cc7a82d77f936945901a9a14b540 +Author: qiyu-xie +Date: Sat Nov 14 22:52:37 2020 +0800 + + * Finish task#8193. + +commit e42c5447a07fc1a159080b7a8e37508b433c300e +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 13 17:49:24 2020 +0800 + + * Adjust code. + +commit a4333ffdb746b74ac821b56bbfee9bd5de90101b +Author: Yagami <976204163@qq.com> +Date: Fri Nov 13 16:55:21 2020 +0800 + + * Finish task #8345. + +commit c0b7a35108d4c8518eb598eca48a0d899182a521 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 13 16:36:13 2020 +0800 + + * Rename function. + +commit ca280c6ab482d74612f0c9934e9f6ff72bbf40d6 +Author: Catouse +Date: Fri Nov 13 16:46:07 2020 +0800 + + * fix nest table not work as expected. + +commit 9b811e95cb946a8727197d3d2c45811afebbbbd7 +Author: tianshujie98 +Date: Fri Nov 13 16:43:50 2020 +0800 + + * Adjust code style and add language item. + +commit b13a57d82bd8e5200871081f1e62fe15c2c2c013 +Author: tianshujie98 +Date: Fri Nov 13 14:48:41 2020 +0800 + + * Adjust code style. + +commit 31898558c0b3242b024acc54071e59f20ca9cf0d +Author: Catouse +Date: Fri Nov 13 16:35:55 2020 +0800 + + * post original orders on sort. + +commit 08080a1761cc7c14eb9589df447e648704d230c7 +Author: Catouse +Date: Fri Nov 13 16:11:39 2020 +0800 + + * init nest table after sorted rows. + +commit 3ba19a556e1976c10e8b0bb88aa2e2f5a23de409 +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 13 15:57:54 2020 +0800 + + * Adjust the personnel module lang file. + +commit d8feaae09db4250de1c17d7a64e26fda2afe939d +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 13 15:48:58 2020 +0800 + + * Adjust recent sprit. + +commit 9950d24d49c41e3bc2584886c25949c5d0796f17 +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 13 14:56:59 2020 +0800 + + * Finish task#8309. + +commit 42878a4b4f583a08f6b0511fcc3f3a0bee13654b +Author: Catouse +Date: Fri Nov 13 14:21:05 2020 +0800 + + * update zui.js. + +commit bbfb174ce89cb17921f4edf6c1d2314ff87fbf44 +Author: Catouse +Date: Fri Nov 13 14:20:26 2020 +0800 + + * fix error for "cannot read property bind of undefined". + +commit 5a6f6f2609dd30d468232dfc6d48e61d619f8c88 +Author: Catouse +Date: Fri Nov 13 14:20:06 2020 +0800 + + * change left padding of main table in program/pgmbrowse page. + +commit ec58e2b528d95a4d20d77e07321b851d80880cd6 +Author: tianshujie98 +Date: Fri Nov 13 14:16:33 2020 +0800 + + * Adjust code style. + +commit 3cb814956315170b205be97f1ed06420bd972510 +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 13 14:02:11 2020 +0800 + + * Finish task#8313. + +commit bb489bfc39bd6753f38546da15afad8058ab3874 +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 13 13:34:56 2020 +0800 + + * Adjust the subject module code. + +commit 5835a7437825a42fe4017784105e3dcbf5c9e814 +Author: Catouse +Date: Fri Nov 13 13:27:57 2020 +0800 + + * limit max width of .header-angle-btn. + +commit a5eecec8aad61f598e113f5f78bb01bdc5028030 +Author: tianshujie98 +Date: Fri Nov 13 13:20:42 2020 +0800 + + * Adjust code style. + +commit 7d18efad0327d58add745dfbacb05451346ad2e7 +Author: tianshujie98 +Date: Fri Nov 13 13:11:10 2020 +0800 + + * Adjust code style. + +commit 32b1adc19552e1947c4e5e47646f27f327b6df0f +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 13 13:04:17 2020 +0800 + + * Adjust style. + +commit 3a00d645ecc6d706ea27be11abbad8c37312093d +Author: Yagami <976204163@qq.com> +Date: Fri Nov 13 11:34:08 2020 +0800 + + * Merge code. + +commit 13c924c5f5e6fd7a6ed60c57a56d8c427a66cf4c +Author: Yagami <976204163@qq.com> +Date: Fri Nov 13 11:33:11 2020 +0800 + + * Merge code. + +commit 1d9a0c736cd4ce68561dd3bc48a2c59813b50be3 +Author: Catouse +Date: Fri Nov 13 11:30:53 2020 +0800 + + * change global nest table toggle size. + +commit fb9c44d0a1269548f4b71ab60dcc97c67deb7b81 +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 13 11:28:25 2020 +0800 + + * Finish task #8194. + +commit a3f3ce5ee28b3b1c40646c44149b23b0bd4816dd +Author: Catouse +Date: Fri Nov 13 11:27:30 2020 +0800 + + * task #8347, add global nest toggle to table in page "program/pgmbrowse". + +commit b4b1ab7ae4bda5a61b187b230ce8db83246a1c2a +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 13 10:31:57 2020 +0800 + + * Add the update20.0.alpha1.sql file + +commit f98cba63ab4b217d210ed2e80adfbc4cca2b7805 +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 13 10:28:53 2020 +0800 + + * Adjust code. + +commit 015af00fcd711e0023dbf543182aea398c9531de +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 13 10:25:31 2020 +0800 + + * Adjust code. + +commit 90f9182ddca966d269bda808629bbe8b22f63b2a +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 13 09:58:53 2020 +0800 + + * Adjust the doc module. + +commit ea9c93ba1ce907c220475fa8904c1ef52ebd3d36 +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 13 09:18:26 2020 +0800 + + * Finish task #8194. + +commit 673693fbcdde12c010498bea94eba9b4149074e3 +Merge: 583790a08e 8a20821f92 +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 13 09:08:25 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 583790a08e9eaf3f6a5f8e40c7e710e56fc73115 +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 13 09:08:04 2020 +0800 + + * Finish task #8194. + +commit 8a20821f92ff6c01a2e1332d9187b2f5a77f64cc +Author: tianshujie98 +Date: Thu Nov 12 17:10:47 2020 +0800 + + * Adjust code style. + +commit 9c0b8b1d22660973205a1a1a97fb59db6f5ff8aa +Author: qiyu-xie +Date: Thu Nov 12 21:38:08 2020 +0800 + + * Finish task#8198. Fix bug. + +commit 1065817f17a73c6e004cb63608769c41a4e09223 +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 12 18:25:05 2020 +0800 + + * Adjust the doc module code. + +commit 3e28b36de766c1143a30dcf83ec64e1473fcc881 +Merge: 7e44e5b761 f08eaf98a1 +Author: z +Date: Thu Nov 12 17:21:38 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit 7e44e5b761e0b377fdaee3250efe51d335d95788 +Author: z +Date: Thu Nov 12 17:20:17 2020 +0800 + + * code for story #8776. + +commit f08eaf98a160cad7ac6a6b320f5ce120a296e56a +Author: tianshujie98 +Date: Thu Nov 12 16:48:40 2020 +0800 + + * Finish task #8203. + +commit eca30c5d4a77039e570f5a19444249296c71b0a9 +Author: qiyu-xie +Date: Thu Nov 12 16:24:11 2020 +0800 + + * Finish task#8198. Modify edit. + +commit 3ae9a9189e5062cf9c0274558a73a223311d6a13 +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 12 16:25:23 2020 +0800 + + * Finish task #8194. + +commit 4e69741e7013929d51b2bee99f44e232149acdcb +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 12 14:18:08 2020 +0800 + + * Finish task #8194. + +commit db4328a225d626dfaf63ea8678c3215d84964c46 +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 12 13:23:39 2020 +0800 + + * Finish task#8334. + +commit 70335707c8d256c0813daedfafa7b0b19b08ed7b +Author: z +Date: Thu Nov 12 11:31:03 2020 +0800 + + * finish task #2669. + +commit 29b585ba3537bfb64c4dee22b0c47211b1990f9b +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 12 11:27:36 2020 +0800 + + * Finish task#8338. + +commit 728ff92cf628c910c742a6850e523c4f5174fa97 +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 12 11:25:05 2020 +0800 + + * Finish task #8194. + +commit e9286e13d8a661ab645fef9bbb6fcf601b2089cf +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 12 11:04:17 2020 +0800 + + * Finish task #8194. + +commit 8acfd6867f2efe5a9fdaeb3da0ed745e60ad0172 +Author: hufangzhou <746775970@qq.com> +Date: Thu Nov 12 10:49:33 2020 +0800 + + * Finish task#8205. + +commit 4ea3dc9f6761f8c9b9c7bbae73a18e6663ab918a +Author: qiyu-xie +Date: Thu Nov 12 10:34:42 2020 +0800 + + * Finish task#8198. + +commit 3c0523d47ea4249d39c284942018601a48f1e098 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 12 10:32:49 2020 +0800 + + * Fix common lang. + +commit f3bee6424f583564c826d3448477f9f040c9b137 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 12 10:14:14 2020 +0800 + + * Finish task #8326. + +commit c01934f8ba25758cfe9ad7895af20853924d2a1e +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 12 10:20:06 2020 +0800 + + * Finish task#8339. + +commit 5fabab2a630166df4097b13a55d14d44c8f93d90 +Merge: a7533f722d 189617857c +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 12 10:13:05 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit a7533f722defad02952c5b86b0a95b7a533d9ac6 +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 12 10:09:16 2020 +0800 + + * Finish task #8194. + +commit e4dcf11d58c0b575be5b01ef97327dd64bd94f61 +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 12 09:48:18 2020 +0800 + + * Finish task#8340. + +commit adca539b5658dc317a3fbc34f700fa3949784aff +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 12 09:33:43 2020 +0800 + + * Finish task#8341. + +commit 189617857c0bd5ab25de1203d91fe7e4bcbdf48b +Merge: 154ace870a 547ecde44d +Author: z +Date: Thu Nov 12 09:26:11 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit 154ace870a0f09daae98e8ea2ef62828198cb4b9 +Author: z +Date: Thu Nov 12 09:25:13 2020 +0800 + + * finish task #8265. + +commit 37be45492b897901ab33f52cbeb81645da50870f +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 12 09:14:59 2020 +0800 + + * Finish task#8342. + +commit c1322442fd0d7c6016ef4ada3587895d15c37221 +Author: leiyong <1549684884@qq.com> +Date: Wed Nov 11 18:21:47 2020 +0800 + + * Adjust the holiday module. + +commit 547ecde44dcd16bef66aa8c10e93499a750b6706 +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 11 16:11:27 2020 +0800 + + * Finish task #8194. + +commit e330353df32444d45d670a1b9c4d5b42a9c37c51 +Merge: 9eeae95349 2d0ffc2b4a +Author: z +Date: Wed Nov 11 15:41:06 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit 9eeae95349f865efc8aa6a5ceb9b5195b4da8ec9 +Merge: 8021dd79c8 30637fbca1 +Author: z +Date: Wed Nov 11 15:40:47 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit 2d0ffc2b4a643f5052abbdee9ee3e05a1878054b +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 11 15:40:26 2020 +0800 + + * Finish task #8194. + +commit 8021dd79c84f2de928d3781d02af19e3fcb42a74 +Author: z +Date: Wed Nov 11 15:34:46 2020 +0800 + + * adjust for minifyfront. + +commit aa56f5567ff9676bed1f0a370ea5ff01d9242da7 +Author: Catouse +Date: Wed Nov 11 14:53:37 2020 +0800 + + * task #8244, bug #3543, fix recording wrong user ip on user login. + +commit 30637fbca1299950a60cd80dc8bf9becb18af29f +Author: Catouse +Date: Wed Nov 11 14:53:37 2020 +0800 + + * task #8244, bug #3543, fix recording wrong user ip on user login. + +commit 24e55f7d2f52ce8e5d293e067128684c15a2e4f3 +Author: z +Date: Wed Nov 11 14:45:45 2020 +0800 + + * fix bug for validater. + +commit 305ceda9377e808b9f2c3fbf4fd08d549081d539 +Author: z +Date: Wed Nov 11 14:43:05 2020 +0800 + + * finish task #3665. + +commit 03a29b0a90779e07c44524c6922887af8fc3f9a0 +Author: leiyong <1549684884@qq.com> +Date: Wed Nov 11 14:14:40 2020 +0800 + + * Adjust code. + +commit f814b46198213f850fa64a4e0518f555a9b301d8 +Author: leiyong <1549684884@qq.com> +Date: Wed Nov 11 14:11:38 2020 +0800 + + * The waterfall model displays hierarchies and associated products. + +commit c298d66d8669c01ed8f457b7d07cb3aeb0d5c216 +Author: Catouse +Date: Wed Nov 11 13:52:46 2020 +0800 + + * task #8233, bug #3567, fix server url in im/debug view. + +commit 279674a78ae0c3d2c5cd568e28a16ddc1d391e7b +Author: Catouse +Date: Wed Nov 11 13:52:46 2020 +0800 + + * task #8233, bug #3567, fix server url in im/debug view. + +commit c241b1051f7f7fb22799e6bd1aa3765aa1f13eb5 +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 11 13:32:01 2020 +0800 + + * Finish task #8194. + +commit e58df36f7aa54bc10f606faaddf86c30f8b49d76 +Author: leiyong <1549684884@qq.com> +Date: Wed Nov 11 11:45:14 2020 +0800 + + * Fix error. + +commit a5e562377f5527404a871cb1ccc799d988261314 +Merge: edc9e1593f 2760096a18 +Author: leiyong <1549684884@qq.com> +Date: Wed Nov 11 11:42:24 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit edc9e1593f5bc3f974a737ddbf588b8ba188ed28 +Author: leiyong <1549684884@qq.com> +Date: Wed Nov 11 11:42:03 2020 +0800 + + * Fix bug. + +commit 2760096a18163df1279c53c04a439e3ba71c729f +Author: Yagami <976204163@qq.com> +Date: Wed Nov 11 11:28:01 2020 +0800 + + * Fix detail. + +commit 55b26ce3cd583dc9a111dedfd40d8dcdeb2f755b +Merge: 15e8463347 2593bbe991 +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 11 11:18:31 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 15e84633478c2460378217c326d1fb83ad037876 +Author: holan20180123 <56391770@qq.com> +Date: Wed Nov 11 11:18:08 2020 +0800 + + * Finish task #8194. + +commit aac9e22af6367a957ddd9273d42bf0007467c649 +Author: Catouse +Date: Wed Nov 11 09:56:07 2020 +0800 + + * task #8234, bug #3565, fix stripedRows setting of table not work in kindeditor, see http://pms.zentao.net/bug-view-3565.html + + # Conflicts: + # www/js/kindeditor/kindeditor.min.js + +commit 2593bbe991ea280e5654723c175fc7c45909ca92 +Author: Catouse +Date: Wed Nov 11 09:56:07 2020 +0800 + + * task #8234, bug #3565, fix stripedRows setting of table not work in kindeditor, see http://pms.zentao.net/bug-view-3565.html + +commit 30efec994cfeeba5c317fc23033b077bf198c1fc +Author: Catouse +Date: Tue Nov 10 16:58:04 2020 +0800 + + * task #8225, bug #3577, improve UI of picker. + +commit 345a4d1a95650c9587772944789500ca643bb6e3 +Author: Catouse +Date: Tue Nov 10 15:37:50 2020 +0800 + + * task #8224, bug #3578, update zentao-integrated file for zentao client extension. + +commit 0a9544136e01dcc332c7025071955728a4f1ee88 +Author: Catouse +Date: Tue Nov 10 15:10:10 2020 +0800 + + * task #8227, bug #3575, enable submit button on check hours. + +commit 691048885f27ecca4dc00686702aed3cc973df31 +Author: Catouse +Date: Tue Nov 10 16:58:04 2020 +0800 + + * task #8225, bug #3577, improve UI of picker. + +commit de05a29a0608f5b6e693d09224b5fee9d3739b4b +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 10 16:53:29 2020 +0800 + + * Finish task #8255. + +commit 0024682188a1d7051fa729041067b1ef2046cffa +Author: Yagami <976204163@qq.com> +Date: Tue Nov 10 16:38:45 2020 +0800 + + * Fix detail. + +commit 759bf9e1e707d0272baa1ba0e71638bad11eefe4 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 10 16:38:19 2020 +0800 + + * Adjust code. + +commit 6e6761546e7352ce681bae8fa6fbe5edbdef060a +Author: Catouse +Date: Tue Nov 10 15:37:50 2020 +0800 + + * task #8224, bug #3578, update zentao-integrated file for zentao client extension. + +commit 1becf91146b4c7c7ddfba1d44afd620860fca030 +Author: Catouse +Date: Tue Nov 10 15:10:10 2020 +0800 + + * task #8227, bug #3575, enable submit button on check hours. + +commit 498256388a9ef500f602d41963922a2bdfd9bc24 +Merge: f80458f916 97e77a11bc +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 10 14:06:12 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit f80458f91613bc2d27558f06f88192d395b48720 +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 10 14:06:00 2020 +0800 + + * Finish task #8194. + +commit 35b0c16a060fc24a0153d822bf94965591749ff9 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 10 13:13:06 2020 +0800 + + * Fix create project link product logic. + +commit 97e77a11bc4554ec505b4b6b47d0f7e8bb17e8db +Author: tianshujie98 +Date: Tue Nov 10 11:43:48 2020 +0800 + + * Finish task #8202. + +commit 159cd5c41d6da9da2d78da429ece1294cfdc0f95 +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 10 10:34:08 2020 +0800 + + * Finish task #8194. + +commit a10b52f3c6f782277dceaecebc00546189229af5 +Merge: b35cd2d1f2 bff623a7bc +Author: tianshujie98 +Date: Tue Nov 10 10:10:01 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit b35cd2d1f254d2e075ec676af170d10d2ca7e935 +Author: tianshujie98 +Date: Tue Nov 10 10:09:50 2020 +0800 + + * Fix bug. + +commit bff623a7bc2d8b473c76ab72d2e9dbb438b2e17d +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 10 09:31:52 2020 +0800 + + * Finish task #8194. + +commit 60402b96297ddf8c6cc4c90a978d6318acc65c00 +Merge: 8b1e4808c2 449273a9b4 +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 10 08:49:26 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 8b1e4808c29f3e551c58ee1840b5738fd3f6300d +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 10 08:49:00 2020 +0800 + + * Finish task #8194. + +commit 449273a9b47acc4781b170835a5b7d7f5618d8cf +Author: tianshujie98 +Date: Tue Nov 10 08:30:52 2020 +0800 + + * Fix bug. + +commit d986bb6c97ec1979a9d69611873c2507cc7bd334 +Merge: b379b8fb33 6e4a3637b1 +Author: tianshujie98 +Date: Tue Nov 10 08:21:57 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit b379b8fb33004356ab967c67dbcd3671cdd6bb9b +Author: tianshujie98 +Date: Tue Nov 10 08:21:42 2020 +0800 + + * Fix bug. + +commit 6e4a3637b12d527e0bdf3786b51e53ef266fdd0a +Merge: b765cbc494 5d6312a1c4 +Author: z +Date: Mon Nov 9 17:32:33 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit b765cbc494a540e784678a563394cdb702022149 +Author: z +Date: Mon Nov 9 17:31:57 2020 +0800 + + * finish task #8242. + +commit 5d6312a1c444afd4c74ae96308faae255fc8a144 +Author: tianshujie98 +Date: Mon Nov 9 17:26:38 2020 +0800 + + * Fix bug. + +commit b12cf02ef08e0795009758d3caa2909908b17e3b +Author: Yagami <976204163@qq.com> +Date: Mon Nov 9 15:35:01 2020 +0800 + + * Code for UR name and SR name. + +commit 226e6738cfb9960df3332add7300c5ba906899f1 +Author: tianshujie98 +Date: Mon Nov 9 15:27:29 2020 +0800 + + * Finish task #8247. + +commit 320fda09339a53ab445c3d232de1709559a8ba5c +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 9 09:57:51 2020 +0800 + + * Adjust code. + +commit 1ac59794cb1224e914dc5c51e7580fab7dd9daba +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 9 09:55:25 2020 +0800 + + * Adjust code. + +commit dca05f8be2c7d284ea095a786269daf609e916a0 +Author: holan20180123 <56391770@qq.com> +Date: Mon Nov 9 09:53:18 2020 +0800 + + * Finish task #8226. + +commit 9adb0c9d383a3315c7ac3cad0b0b843941e761cc +Author: Yagami <976204163@qq.com> +Date: Fri Nov 6 13:23:11 2020 +0800 + + * Fix sql. + +commit da9abfa77cca1c32ab450f8f4c94c436d696f7bc +Author: Yagami <976204163@qq.com> +Date: Fri Nov 6 16:54:03 2020 +0800 + + * Fix bug. + +commit 2414c8b3eb66b7379674c01b87df01e17faaf8da +Author: Yagami <976204163@qq.com> +Date: Fri Nov 6 11:20:24 2020 +0800 + + * Fix bug. + +commit aaf01e4afd0a42316d8f6d73ac4cec42048303a7 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 5 14:13:03 2020 +0800 + + * Fix sql. + +commit 8767cd2382dc2add1619d453c3b22774a1ea9012 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 5 11:48:55 2020 +0800 + + * Add story track. + +commit c3d3745cdc080f0220154df68476f63da3647d12 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 5 10:57:57 2020 +0800 + + * Fix sql error. + +commit 89de3231b2e35794ddf70a5a4030bb47fc1c9661 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 5 09:27:50 2020 +0800 + + * Fix code error. + +commit f85b13e6968e928c2308b21965bc301ddab33058 +Author: Yagami <976204163@qq.com> +Date: Wed Nov 4 15:44:51 2020 +0800 + + * Fix sql. + +commit 3c1fe9d75ed33dbfe9a41adf158efbeb7a24388e +Author: Yagami <976204163@qq.com> +Date: Wed Nov 4 14:30:00 2020 +0800 + + * Fix sub menu. + +commit 0bfa64a2200cd914d49a37d6f7bfe5ad3051f85e +Author: Yagami <976204163@qq.com> +Date: Wed Nov 4 14:02:56 2020 +0800 + + * Fix common header. + +commit d5f2af0cfee8f9db6e834aea82686a1afdb54634 +Author: Yagami <976204163@qq.com> +Date: Wed Nov 4 13:13:01 2020 +0800 + + * Fix install error. + +commit 7c04c8bdb89b28292c3a613aa56148648d795fa0 +Author: z +Date: Fri Nov 6 16:34:58 2020 +0800 + + * adjust code for show extension. + +commit 2011451e51e09967fbd8133ad55d9ec02d45beed +Merge: 0c6e4dd435 6ec4c302ba +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 6 16:24:20 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 0c6e4dd435e90c79ab271fc6acaf2d2f30ec6466 +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 6 16:23:50 2020 +0800 + + * Finish task #8220. + +commit 6ec4c302baa86d53d88376750669178de9d01c18 +Author: tianshujie98 +Date: Fri Nov 6 15:03:19 2020 +0800 + + * Adjust code style. + +commit 3bc0854f51e5d32aafb6ee94ec76cb90903b5c6e +Author: tianshujie98 +Date: Fri Nov 6 14:58:32 2020 +0800 + + * Adjust code style. + +commit 447bb548247f8fdbc632c0c0b893fdb0a9f21c4e +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 6 14:34:29 2020 +0800 + + * Finish task #8222. + +commit 07d0f7c6d82bb5fc4a7cdb24ca0717508a8dd55f +Merge: 3fa970bc8c 97cc8034be +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 6 14:01:58 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 3fa970bc8cdeb7e953e1b6093ec8ca4e4265270a +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 6 14:01:32 2020 +0800 + + * Finish task #8194. + +commit 09d6f83f8598307ae321b38403c143301cb3be0d +Author: holan20180123 <56391770@qq.com> +Date: Fri Nov 6 14:01:01 2020 +0800 + + * Finish task #8194. + +commit 827a884575249a581d225e1e60300c83af68f76c +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 6 13:45:27 2020 +0800 + + * Adjust the program to PRJ. + +commit f561462a0e4898a956eb161cc00b4b3774b94391 +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 6 13:20:35 2020 +0800 + + * Adjust code. + +commit 97cc8034be693507673290cd4b4a5167ef4c1228 +Author: tianshujie98 +Date: Fri Nov 6 13:06:22 2020 +0800 + + * Adjust code style. + +commit 579891b10e2a95e5bc1ee9dcd7a44356ea6dfb0e +Author: leiyong <1549684884@qq.com> +Date: Fri Nov 6 11:48:29 2020 +0800 + + * Fix bug. + +commit 7bea80d42f8eb6eb227af655bf116cfd0e689407 +Author: tianshujie98 +Date: Fri Nov 6 11:43:36 2020 +0800 + + * Finish task #8209. + +commit 2a4927cfc6a68779de3b2b1cd80b5fd45bd5de2c +Author: tianshujie98 +Date: Fri Nov 6 10:08:23 2020 +0800 + + * Adjust code style. + +commit a8d9f1d7969b2b2e483d5ccd74e0d3cdba6de247 +Author: qiyu-xie +Date: Fri Nov 6 09:28:06 2020 +0800 + + * Finish task#8211. + +commit 838a05196d8ec27991804bc2fe500318acb2dda2 +Author: tianshujie98 +Date: Fri Nov 6 08:42:22 2020 +0800 + + * Adjust code style. + +commit 56c180f2ecc710c105cd3dcee0eaf1b63e2dcb14 +Author: hufangzhou <746775970@qq.com> +Date: Fri Nov 6 08:30:58 2020 +0800 + + * Finish task#8243. + +commit 981f8b25ad901c872502c17f1b97c53ed6bbe052 +Author: hufangzhou <746775970@qq.com> +Date: Thu Nov 5 17:39:08 2020 +0800 + + * Adjust the indent of the code. + +commit 4f61fbef1baa3d11f4fb922263e25f2774d74f22 +Merge: 0a30b6b09f dfb3c73551 +Author: hufangzhou <746775970@qq.com> +Date: Thu Nov 5 16:29:55 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 0a30b6b09f0b09f16a4a67a4838016254a52423d +Author: hufangzhou <746775970@qq.com> +Date: Thu Nov 5 16:29:43 2020 +0800 + + * Fix a bug. + +commit dfb3c735519116f3469aa9356089cc5f57d05198 +Author: tianshujie98 +Date: Thu Nov 5 16:28:46 2020 +0800 + + * Adjust code style. + +commit 6896823f78958776adf94e9ebd6ea5823cc3e3bb +Merge: 76a793ab03 8a15ec21d9 +Author: hufangzhou <746775970@qq.com> +Date: Thu Nov 5 16:05:24 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 76a793ab0337939ed58fbc047d89aafa1e756092 +Author: hufangzhou <746775970@qq.com> +Date: Thu Nov 5 16:05:03 2020 +0800 + + * Fix a bug. + +commit 8a15ec21d92374357a8f6b91e846c307b932df3d +Author: tianshujie98 +Date: Thu Nov 5 15:52:31 2020 +0800 + + * Fix bug. + +commit e57d95ed34a1ef6a85d2caf0ad6c39f6943b092a +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 5 15:41:07 2020 +0800 + + * Adjust code. + +commit 1db241cb431ddafdd98419c91e89d3765c44527f +Author: tianshujie98 +Date: Thu Nov 5 15:30:33 2020 +0800 + + * Fix bug. + +commit 25ac267c60a450ae5b4acb1cd7467a1096659f8d +Author: holan20180123 <56391770@qq.com> +Date: Thu Nov 5 13:59:51 2020 +0800 + + * Change field name `program` to `PRJ`. + +commit 98f37169e1d7ecc5a7e0bdd9aaa4e78d3e372205 +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 5 13:45:48 2020 +0800 + + * Adjust code. + +commit 592a6b6a5cc1c55d4bd528e13def723a8c2faefe +Author: tianshujie98 +Date: Thu Nov 5 13:22:46 2020 +0800 + + * Finish task #8197. + +commit 0c1e2de9bc74f801a4c331e04d63ef03d341a629 +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 5 11:48:18 2020 +0800 + + * Adjust code. + +commit 386114979d6f4e81102c3da76175a0d66c23dc6f +Author: qiyu-xie +Date: Thu Nov 5 11:28:35 2020 +0800 + + * Finish task#8230. + +commit 1ea321fea5f7b975656818fb391cee6d962f762f +Author: qiyu-xie +Date: Thu Nov 5 11:10:11 2020 +0800 + + * Finish task#8239. + +commit 1534428895f41ed45cbca1676406ae6e7e02763e +Author: hufangzhou <746775970@qq.com> +Date: Thu Nov 5 09:53:40 2020 +0800 + + * Finish task#8196. + +commit 2e52cd77c4879e3e2b0af6e483e1b983c7a91de6 +Author: leiyong <1549684884@qq.com> +Date: Thu Nov 5 09:51:26 2020 +0800 + + * Adjust code. + +commit 7a8e3bec381e82f3976bece456298b404deaba9a +Author: qiyu-xie +Date: Wed Nov 4 14:30:29 2020 +0800 + + * Finish task#8207. + +commit b400af6ffcef68eaf08adbb8c039c977f78e0307 +Author: tianshujie98 +Date: Wed Nov 4 14:07:15 2020 +0800 + + * Finish task #8262. + +commit f1c5b256bf84f4189d4e78557b4c26d40e3934c1 +Author: z +Date: Wed Nov 4 10:42:23 2020 +0800 + + * code for task #8279. + +commit 6bb99132e21fff3c99d92f10fe58efa7ab466dba +Merge: eb53d44b81 d3356b1675 +Author: z +Date: Wed Nov 4 10:38:43 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit d3356b16757480cdb685dc40aaf123fea93be487 +Author: tianshujie98 +Date: Wed Nov 4 10:36:36 2020 +0800 + + * Finish task #8228. + +commit eb53d44b810b77e1d941fe243f8ae2db37a511cc +Author: z +Date: Wed Nov 4 10:33:20 2020 +0800 + + * code for task #8279. + +commit 4ebb150e825766ec3bd98aa631a14ec4c3dc71e9 +Author: z +Date: Wed Nov 4 10:27:35 2020 +0800 + + * finish task #8232. + +commit 770309794d98419b44dfbf2397f337c8dc8155d0 +Author: tianshujie98 +Date: Wed Nov 4 10:12:49 2020 +0800 + + * Add comment. + +commit 1dd736e9ed03af3239eabab3fde4f001f3c2e6f1 +Author: tianshujie98 +Date: Wed Nov 4 10:05:03 2020 +0800 + + * Finish task #8264. + +commit 47aa8bd9b56608e628cb3199e879728c373309fd +Author: qiyu-xie +Date: Wed Nov 4 09:58:15 2020 +0800 + + * Finish task#8212. + +commit d325c15d42f0758fd23cfffac988f5474ae42fca +Author: leiyong <1549684884@qq.com> +Date: Wed Nov 4 09:23:15 2020 +0800 + + * Adjust code. + +commit 0e31686cdcad2e6983085d61409acb49de5ba327 +Author: qiyu-xie +Date: Wed Nov 4 09:14:57 2020 +0800 + + * Finish task#8219. + +commit 43174e39ec52627b3ba15e6ecae49c6405522f87 +Author: hufangzhou <746775970@qq.com> +Date: Wed Nov 4 09:06:41 2020 +0800 + + * Finish task#8200: Add the lib field for search testcase. + +commit 18bd8a6e2618f06ed358d40cbea95ba5496c4598 +Merge: 7ef58a2d40 fd4876f1d0 +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 3 17:41:51 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 7ef58a2d4020b62fe839d094c660ad1190debbf3 +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 3 17:41:31 2020 +0800 + + * Add the title of the doc. + +commit fd4876f1d02d1305887223c624677fcfc882a62f +Author: tianshujie98 +Date: Tue Nov 3 17:30:17 2020 +0800 + + * Adjust code style. + +commit 07ff6c4b8436c613a9f23e3af7673f4661f6da79 +Merge: a13f8cd4c0 a2a50698ee +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 3 17:27:04 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit a13f8cd4c0df9cd0137fe0e31c4f3f65bcce6c04 +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 3 17:26:51 2020 +0800 + + * Adjust the logic of the assigned to. + +commit a2a50698ee45d4f3cb3a692c0932f5f115400fb2 +Author: tianshujie98 +Date: Tue Nov 3 17:24:07 2020 +0800 + + * Finish task #8199. + +commit 4ea37d68a29a4c601e3acbbcdddc77744fc9f0b6 +Merge: a6e6f7a8a2 066046658d +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 3 16:49:19 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit a6e6f7a8a27edb0d4e813c3771cadf3f90656bff +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 3 16:49:03 2020 +0800 + + * Finish task#8201: Add the assignedTo field for the start task page. + +commit 2686debc302d0f9a12987723fbe40be29a1560ad +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 3 16:48:19 2020 +0800 + + * Adjust the lang file. + +commit 066046658d08bf37892ecd575079c80e8c31d6a5 +Author: qiyu-xie +Date: Tue Nov 3 16:10:02 2020 +0800 + + * Finish task#8240. + +commit e1616ab27db881934b0adbcd0e7880aee2b6c6df (tag: zentaopms_13.0.alpha1_20201103) +Author: Yagami <976204163@qq.com> +Date: Tue Nov 3 16:09:49 2020 +0800 + + * Fix video URL. + +commit 3b7cba9049ffddab97666d8b2193603c4a331a55 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 3 16:04:37 2020 +0800 + + * Fix bug. + +commit f60cc9d3745fa1a6b857c387caf523ce4beabbbf +Author: qiyu-xie +Date: Tue Nov 3 15:33:38 2020 +0800 + + * Finish task#8221. + +commit 1004009e7bb951c2be82fe14359bd7206ddcc79c (tag: zentaopms_20.0.alpha1_20201103) +Author: Yagami <976204163@qq.com> +Date: Tue Nov 3 15:29:11 2020 +0800 + + * Change demo url. + +commit 43089f346beec8cbed419c0a7945d39efccd12dc +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 3 14:58:17 2020 +0800 + + * Finish task #8235. + +commit 4eb32ead8b0c45ea4440b473e633732ba155244e +Author: Yagami <976204163@qq.com> +Date: Tue Nov 3 14:48:48 2020 +0800 + + * Fix webhook error. + +commit 4a5b1437c1e993342c07ac9c7cc7c4aad1092906 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 3 14:44:08 2020 +0800 + + * Fix detials. + +commit ab57b31bb4d7ebcd191507268dfe433e8c9a0248 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 3 14:48:50 2020 +0800 + + *Fix bug. + +commit 18db4d974088579de3fb3e49caf00c8431524484 +Author: holan20180123 <56391770@qq.com> +Date: Tue Nov 3 13:55:06 2020 +0800 + + * Finish task #8229. + +commit c9e05720eb9f3b8e38b0cb8029d46e8d8f445260 +Author: Catouse +Date: Tue Nov 3 13:38:05 2020 +0800 + + * update zui.js. + +commit 1b545986b29a6e09c9c4447d657deae580844045 +Author: Catouse +Date: Tue Nov 3 13:36:54 2020 +0800 + + * update zui.js. + +commit 9504775ee70fdca6e8c745b46b5245f7bc813071 +Merge: 835b4bf8a6 77b83a1718 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 3 13:35:53 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 77b83a1718212b432e2662a80458bfdaaa52e613 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 3 13:34:55 2020 +0800 + + * Fix details. + +commit 835b4bf8a6273915bad6b080400f08f29a4f26c5 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 3 13:34:49 2020 +0800 + + * Add the stakeholder module lang file. + +commit 5e6861d852e25d110375c47834a09e2079d4c806 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 3 13:23:29 2020 +0800 + + * Fix bugs. + +commit efeea142bc133193a1ee081b19a0502849e85d2b +Author: Yagami <976204163@qq.com> +Date: Tue Nov 3 10:43:34 2020 +0800 + + * Add video. + +commit f817727ef1ef9d62ee678418d840ac449dfc94c2 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 3 13:31:01 2020 +0800 + + * Fix bug. + +commit db06f613cdedbc23ba0ae9b5cdeb90f9e5fde8c2 +Author: Catouse +Date: Tue Nov 3 13:21:11 2020 +0800 + + * update zui.js. + +commit 6aa711cfa7286f7d42850f9cfb7ff54a575c7129 +Author: Catouse +Date: Tue Nov 3 11:52:39 2020 +0800 + + * support preserve row collapse state for nested table. + +commit 3e591a2d60621bc2bef6cb885dc0833175d62676 +Merge: 0669bbab5a 8be947a1e8 +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 3 11:31:07 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 0669bbab5ae2cc87005aacb948f04dabb2849f80 +Author: hufangzhou <746775970@qq.com> +Date: Tue Nov 3 11:30:54 2020 +0800 + + * Fix bug#3410: the display of the doc title. + +commit 10091b0b6dce3e62c6e18fafe4a786969a3c9007 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 3 11:28:32 2020 +0800 + + * Fixing team member query errors. + +commit 75277b62b90debd117adb5fa72bfe3b1953f883f +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 3 11:18:30 2020 +0800 + + * Fix bug. + +commit d308a7e9ea622b1ebe4d1477169e3985beab6ec2 +Author: leiyong <1549684884@qq.com> +Date: Tue Nov 3 11:00:27 2020 +0800 + + * Fix bug. + +commit 8be947a1e8652ee376d518c16eb987414dae1cb7 +Author: tianshujie98 +Date: Tue Nov 3 10:50:54 2020 +0800 + + * Finish task #8195. + +commit ef9a6db0ea2fb69fac8de25d60ba9451d0cd3dfb +Author: Yagami <976204163@qq.com> +Date: Tue Nov 3 10:07:55 2020 +0800 + + * Fix code detail. + +commit a0048a136c5eb9386bc204ed78bebf78bf882c36 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 3 10:05:28 2020 +0800 + + * Fix edit project logic. + +commit 0be65f795073391f6cd99828f0f27cafc029778c +Author: Yagami <976204163@qq.com> +Date: Mon Nov 2 17:32:24 2020 +0800 + + * Fix details. + +commit c9026fd5ca3762db6e7c9b0567c5857964541853 +Merge: 7bcea20380 37c672a2ed +Author: guanxiying +Date: Mon Nov 2 16:35:27 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit 7bcea2038075ee8489cd6968422143a565452c53 +Author: guanxiying +Date: Mon Nov 2 16:33:22 2020 +0800 + + * Add bind and oauth register function. + +commit 7f1029c349825872f3e152b4dadeaac199bce2e1 +Author: guanxiying +Date: Mon Nov 2 16:31:10 2020 +0800 + + * Add usermodel::login function + +commit b29244195c8483076bf5dd9f476c27edfea27e56 +Author: guanxiying +Date: Mon Nov 2 16:30:38 2020 +0800 + + * Add login function. + +commit 478d51813f78ecdd638b53ad9336a1d1d0d26af8 +Author: Yagami <976204163@qq.com> +Date: Mon Nov 2 16:17:39 2020 +0800 + + * Add sql. + +commit 37972d1acd018371e37ec69bfadf20cc197598e2 +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 2 16:08:53 2020 +0800 + + * Adjusting the project module's js. + +commit 2266bfee72d3cbe0a8f5e809ec69cac815a2a6b5 +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 2 15:33:07 2020 +0800 + + * Adjust the common module lang. + +commit 7eb6ba4755f0d568ec9c8272f644e6671de4d64d +Merge: ba3da8ccf0 227d6c8211 +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 2 15:28:35 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ba3da8ccf0bce9eb394a6dce53159e2e4a3e66ae +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 2 15:28:04 2020 +0800 + + Adjust css style. + +commit 227d6c8211cb8a4870d6e8ba31d0c0b19fc4c937 +Author: Yagami <976204163@qq.com> +Date: Mon Nov 2 14:31:21 2020 +0800 + + * Adjust code detail. + +commit 345413d23f7df80420c1e85567cc7bb48ee3847f +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 2 14:20:00 2020 +0800 + + * Add language file. + +commit aa7053f040db3b433011d6f0d7913b1c6a1dceba +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 2 13:23:34 2020 +0800 + + * Adjustment language files. + +commit 225189e217a0fdbdd05ce5ca5cc73f31bf828c65 +Author: Yagami <976204163@qq.com> +Date: Mon Nov 2 13:22:44 2020 +0800 + + * Fix details. + +commit c66f0f9bc5d66f35d981840762977fac5aecb3b6 +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 2 11:48:43 2020 +0800 + + * Adjustment language files. + +commit 3552c614324e93a05dcf3c1d218482d409f8c192 +Author: holan20180123 <56391770@qq.com> +Date: Mon Nov 2 10:11:43 2020 +0800 + + * Fix bug #2490. + +commit 18131e47ef2406e7b48dbe07e27f02effe9888ac +Author: Yagami <976204163@qq.com> +Date: Mon Nov 2 10:08:36 2020 +0800 + + * Fix bugs. + +commit 37c672a2ed3bd8671e21e9788ea72945be371798 +Author: holan20180123 <56391770@qq.com> +Date: Mon Nov 2 10:08:23 2020 +0800 + + * Fix bug #2490. + +commit a80fb13c7ba7f17d73ff73e4dee4d5eb5dc00909 +Author: leiyong <1549684884@qq.com> +Date: Mon Nov 2 09:07:14 2020 +0800 + + * Deleting duplicate sortStoriesOfPlan methods. + +commit 2c36700bc170a16df748c6da5564a111c1547c80 +Author: z +Date: Sun Nov 1 09:02:38 2020 +0800 + + * adjust for install. + +commit 43528283373884bac0c9b31b0fbe0e5e7797b2b0 +Author: Catouse +Date: Fri Oct 30 23:36:47 2020 +0800 + + * update zui.js to fix $.zui.uuid method not work as expect in ie11. + +commit c29fefc36f04728bc038510f3a484fc75db02807 +Author: Catouse +Date: Fri Oct 30 23:35:35 2020 +0800 + + * update zui.js to fix $.zui.uuid method not work as expect in ie11. + +commit 680c880b5a696f115447138f0c1ababb0ee0815f (tag: zentaopms_20.0.alpha_20201030_1) +Author: leiyong <1549684884@qq.com> +Date: Fri Oct 30 17:32:19 2020 +0800 + + * Fix bug. + +commit 5644b8140808bfa9d732e7595ebb639189bfe3c8 +Merge: 1767bfe6ea 1bccfd5744 +Author: z +Date: Fri Oct 30 16:58:47 2020 +0800 + + Merge branch '12.x' + +commit 1767bfe6ea6f28d2b769384fc1388063de21ad7f +Merge: f6ec62adba c78025b8cf +Author: leiyong <1549684884@qq.com> +Date: Fri Oct 30 15:02:25 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f6ec62adba6519f0eef5f95da71a2bfeb25cb2af +Author: leiyong <1549684884@qq.com> +Date: Fri Oct 30 14:55:36 2020 +0800 + + * Fix bug. + +commit c78025b8cf5a3816e80b5fa090515df27df94d5d +Author: Yagami <976204163@qq.com> +Date: Fri Oct 30 14:48:41 2020 +0800 + + * Fix upgrade logic. + +commit e92408baf41be7b2acc0a3751fb32864787e24c0 (tag: zentaopms_20.0.alpha1_20201030) +Author: Yagami <976204163@qq.com> +Date: Fri Oct 30 14:13:48 2020 +0800 + + * Add standard sql. + +commit 77a1d561a02712b55259003201f48e16c7519402 +Author: Yagami <976204163@qq.com> +Date: Fri Oct 30 14:10:14 2020 +0800 + + * Fix upgrade lang. + +commit f3270f48d395588063b4e4dd23b87bf210ca93eb +Author: Yagami <976204163@qq.com> +Date: Fri Oct 30 14:04:41 2020 +0800 + + * Add upgrade version. + +commit 7616d6e2603f863e0312746e736466e621cb00ad +Author: leiyong <1549684884@qq.com> +Date: Fri Oct 30 14:03:10 2020 +0800 + + * Fix program module bug. + +commit 10b4182206b885ebde5fccb21bacc9d75c5e1a36 +Author: Yagami <976204163@qq.com> +Date: Fri Oct 30 13:55:45 2020 +0800 + + * Fix upgrade error. + +commit 755513d9cd3617d04490a4859a714f05195eb8a6 +Author: Yagami <976204163@qq.com> +Date: Fri Oct 30 13:43:05 2020 +0800 + + * Fix details. + +commit c1e6180444d588e4f303132e016adbed25737588 +Author: Yagami <976204163@qq.com> +Date: Fri Oct 30 11:10:55 2020 +0800 + + * Change sprint link product logic. + +commit 6c4885cd24c94cd38f6e9c0c8815c567de9990d0 +Author: Catouse +Date: Fri Oct 30 11:07:01 2020 +0800 + + * task #8164, improve UI of upgrade/mergeprogram view. + +commit 1480098b5ef48e0a029e2147cf2a65b7809b0601 +Author: Yagami <976204163@qq.com> +Date: Fri Oct 30 11:00:02 2020 +0800 + + * Fix priv. + +commit 055d52f45e0ec3bc6d01c056acf3d0c609b66524 +Author: leiyong <1549684884@qq.com> +Date: Fri Oct 30 10:55:11 2020 +0800 + + * Project related products. + +commit 04c616468161c349ba0344fe02b680117127381c +Author: Yagami <976204163@qq.com> +Date: Fri Oct 30 10:47:16 2020 +0800 + + * Fix bug. + +commit 1bccfd57440cac980a7c900fc61426dc1681f2b3 (tag: zentaopms_12.4.4_20201030) +Author: z +Date: Fri Oct 30 10:39:28 2020 +0800 + + * add new version and upgrade. + +commit d1f2919365674212fb6e4f435e163cc707801481 +Author: Yagami <976204163@qq.com> +Date: Fri Oct 30 10:28:50 2020 +0800 + + * Fix details. + +commit a2fdaf94f92f621ffd74c27069a3d8203fa8a8b5 +Author: Catouse +Date: Fri Oct 30 09:51:31 2020 +0800 + + * update zui picker files. + +commit 34f4b5ecec1a73e8bea7c5b8d1dcea62878b68ef +Author: Catouse +Date: Fri Oct 30 09:51:31 2020 +0800 + + * update zui picker files. + +commit 59826874453f599ddec3b3c064434c2098ee822d +Author: Catouse +Date: Fri Oct 23 11:02:38 2020 +0800 + + * update zui picker files. + +commit 7e52b15bbb9197dae0a82e2352301542cbf8e696 +Author: Yagami <976204163@qq.com> +Date: Thu Oct 29 16:59:09 2020 +0800 + + * Fix details. + +commit 77e3053176f13f30f5c4c8c7bc0ade26e5e40c2c +Author: Yagami <976204163@qq.com> +Date: Thu Oct 29 15:07:58 2020 +0800 + + * Fix details. + +commit f409040e3cadf3a202487ed64fa2c39071aa1c19 +Merge: 71a6c3b318 b4ea03a2fd +Author: leiyong <1549684884@qq.com> +Date: Thu Oct 29 16:39:14 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 71a6c3b318d7be9c665c14783758cbb8d1621e8c +Author: leiyong <1549684884@qq.com> +Date: Thu Oct 29 16:37:02 2020 +0800 + + * Fix upgrade errors. + +commit b4ea03a2fde58be1831b4f9b3079eb62d34b4da9 +Author: Yagami <976204163@qq.com> +Date: Thu Oct 29 14:04:27 2020 +0800 + + * Fix details. + +commit 46d2d5c9e73776da1453bd9e6d6d1dd9ce46a005 +Author: leiyong <1549684884@qq.com> +Date: Thu Oct 29 13:51:19 2020 +0800 + + * Process accessible people list. + +commit bd59b4a92042659836a7df15163d3f1d6f951322 +Author: z +Date: Thu Oct 29 13:24:16 2020 +0800 + + * finish task #12974. + +commit 1ab465d4d7a567107a0a5f81da4af06fd299ddbc +Author: leiyong <1549684884@qq.com> +Date: Thu Oct 29 11:37:09 2020 +0800 + + * Modify upgrade whitelist. + +commit 35e793260e46ade048b800cc2ce90d2f67af0aeb +Author: holan20180123 <56391770@qq.com> +Date: Thu Oct 29 11:24:18 2020 +0800 + + * Fix bug #12955. + +commit b8166b7b84ac6bee7f8b984e7991fff40c9058e1 +Author: leiyong <1549684884@qq.com> +Date: Thu Oct 29 10:52:13 2020 +0800 + + * Modify the program icon. + +commit c4211ae32e3b50cf0ef3b96c4ffba9ea39c845cb +Author: leiyong <1549684884@qq.com> +Date: Thu Oct 29 09:43:20 2020 +0800 + + * Add Modify user view calculation. + +commit 68cdea8fe8697480402e6fcf812e2e2ea98143de +Author: holan20180123 <56391770@qq.com> +Date: Thu Oct 29 09:08:47 2020 +0800 + + * Fixed bug with menu bar not highlighted. + +commit 1e8076ad75576dded9f5136fadb7a55f154ba13a +Merge: d712b9726d d9f4ac717d +Author: z +Date: Wed Oct 28 17:31:06 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit d9f4ac717dfed9ab1f563ab6482e5faf4e2dd8cf +Author: holan20180123 <56391770@qq.com> +Date: Wed Oct 28 17:29:19 2020 +0800 + + * Finish task #12957. + +commit 7a955b1f46263084543f7a1dcdf2800437905e68 +Author: holan20180123 <56391770@qq.com> +Date: Wed Oct 28 17:18:07 2020 +0800 + + * Splice domain name for connection. + +commit 84ed3d28827d88f4e8acfa47a5d45ea79e5e0536 +Merge: e930c53b0d ef7c4ddd72 +Author: holan20180123 <56391770@qq.com> +Date: Wed Oct 28 17:15:24 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit e930c53b0d88eaacdb91c369a0ce2f44a9ba15b2 +Author: holan20180123 <56391770@qq.com> +Date: Wed Oct 28 17:14:08 2020 +0800 + + * Finish task #12957. + +commit cc61c5d69f70bfd8ddbe75e487a47c860b49c764 +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 28 16:52:13 2020 +0800 + + * Adjust lang file. + +commit eb845834ef972ce5fe3a138fd632f3ac25c79b05 +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 28 15:00:56 2020 +0800 + + * Adjust language item file. + +commit 30d7bb81b7f3340535bad383ab346fb789374a73 +Author: Yagami <976204163@qq.com> +Date: Wed Oct 28 14:39:36 2020 +0800 + + * Fix details. + +commit a049930953c4e4725057ee5fc3aabd7adbbfe372 +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 28 13:39:09 2020 +0800 + + * Adjust code. + +commit ac94baac172fa8ee87c3c26a83907903b6fd43b9 +Author: qiyu-xie +Date: Wed Oct 28 13:24:22 2020 +0800 + + * Finish task#12976. + +commit f6669285c6acd937f60b0e4dc8b584890e4f332f +Author: tianshujie98 +Date: Wed Oct 28 13:19:06 2020 +0800 + + * Edit comment. + +commit ef7c4ddd727a100ba3616722089a709bc031d4bd +Author: tianshujie98 +Date: Wed Oct 28 13:17:53 2020 +0800 + + * Edit comment. + +commit b42ad119134da176f7b6b27a8944a4202614d6fa +Author: qiyu-xie +Date: Wed Oct 28 13:11:03 2020 +0800 + + * Finish task#12976. + +commit a52a622ce4957c1de419b70d63eef9d236bd322e +Author: Yagami <976204163@qq.com> +Date: Wed Oct 28 11:45:26 2020 +0800 + + * Merge code. + +commit 593aab896706897870ffca9d7c54ce26d4db1db3 +Author: tianshujie98 +Date: Wed Oct 28 11:26:02 2020 +0800 + + * Adjust code style. + +commit 4de2a28ed4eb665f0beb7806b9bb8d7e289c752c +Author: qiyu-xie +Date: Wed Oct 28 10:50:15 2020 +0800 + + * Finish task#12961. + +commit 55b140c6219d73c53763daf0db754dd61f37bff7 +Author: qiyu-xie +Date: Wed Oct 28 10:44:44 2020 +0800 + + * Finish task#12961. + +commit a5fac81ec93ef0322263d96915c1460390767aed +Author: tianshujie98 +Date: Wed Oct 28 10:43:43 2020 +0800 + + * Edit comment. + +commit 7a84c2f8269823925ea0bfb2736a56072432ac58 +Author: tianshujie98 +Date: Wed Oct 28 10:41:16 2020 +0800 + + * Revert commit. + +commit 9b6fdf78ce82a15891254e0e8962af1df36ddef4 +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 28 10:41:46 2020 +0800 + + * Adjust whitelist setting logic. + +commit 03e866fe99381ad20016233b31c5132754133e77 +Merge: 4f3c482158 ffa192c299 +Author: holan20180123 <56391770@qq.com> +Date: Wed Oct 28 10:24:02 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 4f3c482158891873a6bd46b8c5ade4fbe14783ef +Author: holan20180123 <56391770@qq.com> +Date: Wed Oct 28 10:22:49 2020 +0800 + + * Splice domain name for connection. + +commit 8480361adb8536ccb187186e561ab1ebc351d8a8 +Author: tianshujie98 +Date: Wed Oct 28 10:20:35 2020 +0800 + + * Finish task #12964. + +commit ffa192c29949c4dc09d7765911a0e49852ce4f0f +Author: tianshujie98 +Date: Wed Oct 28 10:15:42 2020 +0800 + + * Finish task #12964. + +commit 8d3bb923e64d5e1ab8ec756330e6fdcd65835f03 +Author: tianshujie98 +Date: Wed Oct 28 09:46:17 2020 +0800 + + * Finish task #12965. + +commit f9f8d78437decc8977abc787e3a17daf51941156 +Author: hufangzhou <746775970@qq.com> +Date: Wed Oct 28 09:45:48 2020 +0800 + + * Fix bug#3484: Adjust the logic of the multiple task and modify the method name. + +commit e52a724b3586fb15aa53b5c0d8d98806ba189c0d +Author: tianshujie98 +Date: Wed Oct 28 09:40:21 2020 +0800 + + * Finish task #12965. + +commit 398e867dbf8272bd6b59179b3889cd83800c8f52 +Author: hufangzhou <746775970@qq.com> +Date: Wed Oct 28 09:28:24 2020 +0800 + + * Modify the variable name. + +commit adc1a6b66903f3fe984eab207a62f88f1e152810 +Author: hufangzhou <746775970@qq.com> +Date: Wed Oct 28 09:22:51 2020 +0800 + + * Finish task#12963. + +commit 0909592ea14a351d9cdb920f7af1e187ded4a622 +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 28 09:14:38 2020 +0800 + + * Adjust whitelist setting logic. + +commit 80307f24575fd4603656428fd223d626a03663d6 +Author: tianshujie98 +Date: Wed Oct 28 09:09:25 2020 +0800 + + * Finish task #12956. + +commit ea7090a5940716541f1ae337bc6030fa862b8d92 +Merge: 6d671c351a b42307a2ad +Author: hufangzhou <746775970@qq.com> +Date: Wed Oct 28 09:08:31 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 6d671c351adeeaa6ec0a34142af460b7c51b4ccc +Author: hufangzhou <746775970@qq.com> +Date: Wed Oct 28 09:08:22 2020 +0800 + + * Finish task#12962. + +commit b42307a2addd5272c72ae632c641ec2b07440444 +Author: tianshujie98 +Date: Wed Oct 28 09:00:59 2020 +0800 + + * Finish task #12956. + +commit 6188d2cebdce17428c13c425514d1be64727e015 +Author: hufangzhou <746775970@qq.com> +Date: Wed Oct 28 08:51:44 2020 +0800 + + * Finish task#12958. + +commit 909ac78af78a4c2338d176d6f1dffe149b13c52b +Merge: 0b72d7a26b 6c78d52930 +Author: hufangzhou <746775970@qq.com> +Date: Wed Oct 28 08:49:12 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 0b72d7a26b2cea1c8c311e417d256a82e54c135d +Author: hufangzhou <746775970@qq.com> +Date: Wed Oct 28 08:48:41 2020 +0800 + + * Add the indentation of the code. + +commit 6c78d52930f3e448ab1e937e27e74db847a7cd39 +Author: tianshujie98 +Date: Wed Oct 28 08:28:16 2020 +0800 + + * Finish task #12960. + +commit 104d25ff49e60fd22d5e2f6360183aa1532563e1 +Author: Yagami <976204163@qq.com> +Date: Tue Oct 27 16:01:40 2020 +0800 + + * Fix bug. + +commit abf386a1e3491c712d5d45610488c3ca020dff0a +Author: leiyong <1549684884@qq.com> +Date: Tue Oct 27 16:08:46 2020 +0800 + + * Adjust whitelist deletion logic. + +commit 0f3348ad2ad79824d4abf09ef3dfd96d9f5bdf76 +Author: Yagami <976204163@qq.com> +Date: Tue Oct 27 14:45:26 2020 +0800 + + * Finish task #8164. + +commit 5002be3199a833d4c85891ea453dfa0d4f16c7af +Author: leiyong <1549684884@qq.com> +Date: Tue Oct 27 13:10:54 2020 +0800 + + * Modify whitelist related logic. + +commit 27986da851f3e4e78b6a747e901b121873a72d36 +Author: Yagami <976204163@qq.com> +Date: Mon Oct 26 16:35:19 2020 +0800 + + * Code for task #8164. + +commit 6cafceeb0bd641d4297cb98c6f7e152cfdca7ce6 +Author: Yagami <976204163@qq.com> +Date: Mon Oct 26 09:00:07 2020 +0800 + + * Fix merge program js. + +commit 5082e5a913d4b903d54edc02f496e34d72b30049 +Author: Yagami <976204163@qq.com> +Date: Fri Oct 23 16:57:12 2020 +0800 + + * Add upgrade view. + +commit 13652d43cc77f26cb36325a24352056284882a18 +Author: hufangzhou <746775970@qq.com> +Date: Mon Oct 26 16:36:30 2020 +0800 + + * Adjust the format of the code. + +commit f56b5411295a0b401eea47a733cf573341db23cb +Author: tianshujie98 +Date: Mon Oct 26 15:13:47 2020 +0800 + + * Adjust code style. + +commit aff516e659898911ea1cb8d2596e9683a54833a9 +Author: leiyong <1549684884@qq.com> +Date: Mon Oct 26 14:38:41 2020 +0800 + + * Project add whitelist function. + +commit 969b52508ca3ec6b6be571f3c93233d4a069ccff +Author: leiyong <1549684884@qq.com> +Date: Mon Oct 26 13:04:56 2020 +0800 + + * Product add white list function. + +commit adad0cedfbd9014d971845aa2c4dcb17bcba6056 +Author: leiyong <1549684884@qq.com> +Date: Mon Oct 26 10:19:19 2020 +0800 + + * Add sync whitelist. + +commit d712b9726d56c8cbf05120e4f37434b462197af4 +Author: z +Date: Mon Oct 26 09:12:46 2020 +0800 + + * fix for install extension. + +commit d053d6c64f63331a48a384c23048ff090fdafcc9 +Author: z +Date: Mon Oct 26 09:12:17 2020 +0800 + + * fix for custom config in my.php. + +commit a4757e218a9dbbc745003197568a9afae3467c66 +Author: z +Date: Mon Oct 26 09:08:25 2020 +0800 + + * fix for wechatapi. + +commit 947c938b85eb567008d76ea7caa4d6e74b64716f +Author: leiyong <1549684884@qq.com> +Date: Sun Oct 25 19:11:47 2020 +0800 + + * Modify adding whitelist logic. + +commit c0f44f6465dd1356ba292ba6ce0561280e37b6f0 +Author: leiyong <1549684884@qq.com> +Date: Sun Oct 25 17:30:41 2020 +0800 + + * Adding a white list. + +commit f184bdd77baa19ce88a36ca5715d8239fbf0c702 +Author: leiyong <1549684884@qq.com> +Date: Sun Oct 25 17:29:49 2020 +0800 + + * Definition of new tables. + +commit dd304cd1044f5aad0df83e97c32827fa68153129 +Author: leiyong <1549684884@qq.com> +Date: Fri Oct 23 11:37:27 2020 +0800 + + * Finish task#8161. + +commit baddd03444bcff7d0d6a30fe0b77eb4a618d6c42 +Author: leiyong <1549684884@qq.com> +Date: Fri Oct 23 11:26:07 2020 +0800 + + * Adjust the all method of the project module. + +commit 1e6567abd07fd981a00bf96c500f600cfaf224f6 +Author: Catouse +Date: Fri Oct 23 11:02:38 2020 +0800 + + * update zui picker files. + +commit 442ab248bac2cd37965734911293bf6ca6829e10 +Author: Catouse +Date: Fri Oct 23 11:02:28 2020 +0800 + + * fix refreshPanel not work as expected sometimes. + +commit 6f25acbb873c556c43a5507d16256325654cccbd (tag: zentaopms_20.0._20201022, tag: zentaopms_13.0._20201022) +Author: Yagami <976204163@qq.com> +Date: Thu Oct 22 16:05:05 2020 +0800 + + * Fix details. + +commit 934a3278f523c0f59dc52aeed0185baf748ee57a +Author: leiyong <1549684884@qq.com> +Date: Thu Oct 22 16:49:40 2020 +0800 + + * Adjust project module code. + +commit 53059df964a078317b3cdd432ac91554ede6835e +Author: qiyu-xie +Date: Thu Oct 22 14:10:21 2020 +0800 + + * Fix bug. + +commit a1f4993517f28dc91208aed76c15c30bdf591340 +Author: qiyu-xie +Date: Thu Oct 22 14:02:07 2020 +0800 + + * Fix bug. + +commit 5be6471441b60c4ee99a5a91d40d36a07fcd10fa +Author: tianshujie98 +Date: Thu Oct 22 10:33:30 2020 +0800 + + * Fix bug. + +commit 3a75e4a436ea86383da342ef52e8024703de6134 +Author: tianshujie98 +Date: Thu Oct 22 10:29:37 2020 +0800 + + * Fix bug. + +commit a18eff2a3c34f4e38f65d7693b18297107af33c4 +Author: Yagami <976204163@qq.com> +Date: Thu Oct 22 09:34:40 2020 +0800 + + * Fix bug. + +commit 61365c9f78133eb12c4559b42be64b42f1686391 +Author: leiyong <1549684884@qq.com> +Date: Thu Oct 22 09:09:48 2020 +0800 + + * Adjusting the programplan module code. + +commit 5fabff2623c9c9551e30b5df83660f3f1b10a188 +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 21 18:01:06 2020 +0800 + + * Creators added to Phase and Project Teams. + +commit 70dadbd4755618ccf7731f47fa7afdae10cd810f +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 21 17:23:15 2020 +0800 + + * Duplicate sprint run names. + +commit 5cb55f242ed84d07683629bce6e0c62fe7d2cba8 +Merge: 46439d0f1d d6b59ef125 +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 21 17:17:10 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 46439d0f1dacdbae46f23f952b6b3fb1c1840c59 +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 21 17:16:47 2020 +0800 + + * Fix warnings for adding sub-stages. + +commit d6b59ef12549d041c313041da592b75a26a5a531 +Author: Yagami <976204163@qq.com> +Date: Wed Oct 21 16:01:26 2020 +0800 + + * Fix bugs. + +commit 700485be12aa3f071a7c6ba8391a305e016ad74d +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 21 16:00:49 2020 +0800 + + * Presentation sub stage. + +commit 8408afd4b79f20c7a969db3a37eaa7972b43ecdb +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 21 15:39:33 2020 +0800 + + * Fix error. + +commit 98917fe56fe9c8edd43c443bcc5efed2e0b9688a +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 21 15:38:50 2020 +0800 + + * Fix error. + +commit f89fde1a7eb19192b993c81caed6901a36890eef +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 21 15:35:38 2020 +0800 + + * Adjustment Code. + +commit 9cd4ea9835a637d9bda01f644e5e2f095735c745 +Author: tianshujie98 +Date: Wed Oct 21 14:38:03 2020 +0800 + + * Finish task #12818. + +commit 4dd0589417f89826ba9e94db66398dff805660a4 +Author: Yagami <976204163@qq.com> +Date: Wed Oct 21 14:30:53 2020 +0800 + + * Fix bug. + +commit 777956a658876dadcb7e261f9bfbe6791f5a4049 +Author: tianshujie98 +Date: Wed Oct 21 14:12:36 2020 +0800 + + * Finish task #12818. + +commit 21ba4055caf8d11323a286777ada132822902796 +Author: Yagami <976204163@qq.com> +Date: Wed Oct 21 13:16:12 2020 +0800 + + * Fix bugs and add lang. + +commit c625df4d6d4f0023e8202da3178b8038a81882bb +Author: tianshujie98 +Date: Wed Oct 21 11:49:06 2020 +0800 + + * Finish task #12813. + +commit 6896f65fd3ce4cb151af9862747ae1a4a431dcf6 +Author: tianshujie98 +Date: Wed Oct 21 11:44:45 2020 +0800 + + * Finish task #12813. + +commit cc5e8dcd968611262fa4b61d8fb2873a86f18efc +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 21 11:40:15 2020 +0800 + + * Fix error in type field when creating sprint. + +commit a9e778e6b888c29bf0802c6a02d226f89e0d7dfa +Merge: e8b6c85f25 35ecdc8290 +Author: tianshujie98 +Date: Wed Oct 21 10:48:22 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit e8b6c85f2530013ed410df1773aa87c3454927ae +Author: tianshujie98 +Date: Wed Oct 21 10:47:55 2020 +0800 + + I * Finish task #12794. + +commit ec4dd58fb7d701c43301b796d19edd91c1b0ed5c +Author: Yagami <976204163@qq.com> +Date: Wed Oct 21 09:36:59 2020 +0800 + + * Fix bugs. + +commit c0e5bf03f06b3ae424547c108320b4b6ac06f073 +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 21 09:48:40 2020 +0800 + + * Adjustment language files. + +commit 13038a9a5b9499890b0d7ae74a273bd0ca66acfd +Author: holan20180123 <56391770@qq.com> +Date: Wed Oct 21 09:42:17 2020 +0800 + + * Remove duplicate query code. + +commit 35ecdc8290398a19e8def911585b5018b44f335c +Author: holan20180123 <56391770@qq.com> +Date: Wed Oct 21 09:31:28 2020 +0800 + + * Remove duplicate query code. + +commit 6af8ff9971f9d3b87e59daf1c5f8a0f7a26a40e9 +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 21 09:17:33 2020 +0800 + + * modulePageActions is modified to TRActions. + +commit 7772cb6d63f066acda0620718e03fa1db1ac10ae +Author: Yagami <976204163@qq.com> +Date: Wed Oct 21 09:14:24 2020 +0800 + + * Add lang and priv. + +commit c1e6e6a82ce8107f3310213ed6e43dc3a069babb +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 21 09:11:19 2020 +0800 + + modulePageActions is modified to TRActions. + +commit 51d324ba33cef15b66da4e83ff2b488610a62cb4 +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 21 08:27:55 2020 +0800 + + *Adjust code. + +commit efd978eb95b7b1c9bc7d3bcc0b869f66c152fceb +Author: leiyong <1549684884@qq.com> +Date: Tue Oct 20 17:27:04 2020 +0800 + + * Adjustment Code. + +commit 376e1c7d6e7e223974391a84b7e1493b702f7274 +Author: holan20180123 <56391770@qq.com> +Date: Tue Oct 20 15:54:43 2020 +0800 + + * Add workflow fields. + +commit 10a781e0777591e618937d6b203ca9dd4df83509 +Author: holan20180123 <56391770@qq.com> +Date: Tue Oct 20 15:48:33 2020 +0800 + + * Add workflow fields. + +commit 4ba9acb39a9cd0522c1640ea814a8fbe255765c6 +Author: chenfeiCF +Date: Tue Oct 20 06:17:19 2020 +0000 + + * Adjust zfile class and extension copyPackageFiles method. + +commit a16da916abf84dc607317a086e6ce11999f9dff6 +Author: Yagami <976204163@qq.com> +Date: Tue Oct 20 14:18:39 2020 +0800 + + * Rename PRJadmin to PRJAdmin. + +commit 44f32d9ed5d7a74e88e3ba97b15a88d9e78cc9e0 +Author: Yagami <976204163@qq.com> +Date: Tue Oct 20 14:02:48 2020 +0800 + + * Rename openinside to program. + +commit 9113f3fd9606c6da950ec2ca2202b08e43603b75 +Author: Yagami <976204163@qq.com> +Date: Tue Oct 20 13:38:58 2020 +0800 + + * Merge stage and sprint to sprint in user view. + +commit 99f56a546c8174aa8fd4ccc8c99d3d6087639ddb +Author: holan20180123 <56391770@qq.com> +Date: Tue Oct 20 11:10:28 2020 +0800 + + * Add an empty value for the substatus option. + +commit a3b5536c6a6bcc61898ab4521872ded45f9312dc +Author: holan20180123 <56391770@qq.com> +Date: Tue Oct 20 10:59:26 2020 +0800 + + * Add an empty value for the substatus option. + +commit c400b4b9f38cdbb49897556121442fd1e3a0ccaa +Merge: 5dab208c02 a2dded7193 +Author: leiyong <1549684884@qq.com> +Date: Tue Oct 20 09:09:24 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5dab208c020b071c4e084592afd96571d833f0d9 +Author: leiyong <1549684884@qq.com> +Date: Tue Oct 20 09:08:45 2020 +0800 + + * Adding permissions and maintaining language files. + +commit a2dded719346cc4dc1f4c6679aa697a9c1122bbf +Author: Yagami <976204163@qq.com> +Date: Tue Oct 20 09:02:17 2020 +0800 + + * Add lang. + +commit 848c61cd9640947b5e841632de722f9b4b23bc2f +Author: leiyong <1549684884@qq.com> +Date: Mon Oct 19 23:15:57 2020 +0800 + + * Adjustment language files. + +commit add3f60813a0b60f08e9632e6ea0edacf4b7c659 +Author: leiyong <1549684884@qq.com> +Date: Mon Oct 19 17:24:52 2020 +0800 + + * Fix error warnings. + +commit df4a2acb64da581a2538bc09b2b8e10a5aaabb92 +Author: leiyong <1549684884@qq.com> +Date: Mon Oct 19 16:56:15 2020 +0800 + + * The programplan module calls the updateUserView method. + +commit 259618a484555a0ba22b578183dd9211e4c3fd58 +Merge: 00631c63f8 d0f2c2992f +Author: leiyong <1549684884@qq.com> +Date: Mon Oct 19 16:55:10 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d0f2c2992f233567e1a7c22b7c29b1a0cc3216dc +Author: holan20180123 <56391770@qq.com> +Date: Mon Oct 19 16:50:04 2020 +0800 + + * Determine if id is a number. + +commit b5ffeda25c675548448db356d38c605471b27100 +Author: Yagami <976204163@qq.com> +Date: Mon Oct 19 16:26:26 2020 +0800 + + * Fix bug. + +commit 84b0506fffd450cfa82aa8a13b7e3959e92bc7db +Author: holan20180123 <56391770@qq.com> +Date: Mon Oct 19 16:15:36 2020 +0800 + + * Finish task #12756. + +commit 00631c63f89bff56f744db911232d3dfeee059e8 +Author: leiyong <1549684884@qq.com> +Date: Mon Oct 19 16:05:11 2020 +0800 + + * Adjusting the left menu style. + +commit 2554993ae01e920e2c7616a8705afa007ab06272 +Author: leiyong <1549684884@qq.com> +Date: Mon Oct 19 15:49:46 2020 +0800 + + * Adjusting the left menu style. + +commit d5501b419cf0bc425d4d5c45f287823be7fc7d24 +Author: leiyong <1549684884@qq.com> +Date: Mon Oct 19 15:04:22 2020 +0800 + + * Adjust the program module code. + +commit 2fe5ec9993aafd9047ff944be1863f25dbb95a24 +Author: Yagami <976204163@qq.com> +Date: Mon Oct 19 13:56:01 2020 +0800 + + * Program/project edit page change acl. + +commit 62c8bb5b03c3c19d5bbbfdfcee7967fa7d713338 +Author: leiyong <1549684884@qq.com> +Date: Mon Oct 19 13:30:44 2020 +0800 + + * Adjusting the code of the personnel module. + +commit 8484f0437cb205bd852bffeea8e23a52ce06592e +Author: tianshujie98 +Date: Mon Oct 19 09:01:29 2020 +0800 + + * Finish task #12770. + +commit 4ec05062d17858ec6a86ddbee72c9a9099e084c7 +Author: tianshujie98 +Date: Mon Oct 19 08:56:23 2020 +0800 + + * Finish task #12770. + +commit dc706ed54a65e33f8116a41eb84eda2105138baa +Author: sgm0422 <976204163@qq.com> +Date: Fri Oct 16 22:43:54 2020 +0800 + + * Fix compute user view method. + +commit 316c8dbbfe2e7153c61ba6197c33328e51f5d212 +Author: Yagami <976204163@qq.com> +Date: Fri Oct 16 17:30:28 2020 +0800 + + * Add comment and fix sql. + +commit f21ea4477f2cce015613d013a343d228b990eab0 +Author: Yagami <976204163@qq.com> +Date: Fri Oct 16 16:42:19 2020 +0800 + + * Finish task #8122,#8117,#8115,#8114,#8113. + +commit 55e1126f0b9fb9e250b25ccef5d1a5c5e82dd125 +Author: leiyong <1549684884@qq.com> +Date: Fri Oct 16 14:28:52 2020 +0800 + + * Adjusting programplan and project and panel module code. + +commit 0cbfddb802352b122e8dfd30f005f301b4c7fc25 +Author: Yagami <976204163@qq.com> +Date: Thu Oct 15 17:34:30 2020 +0800 + + * Code for update user view. + +commit 72008ca2464459cebba246bf059ab740bd489ecd +Author: Yagami <976204163@qq.com> +Date: Thu Oct 15 09:48:18 2020 +0800 + + * Change program and project acl list. + +commit 7d7305bab8f45d660d3f4514765c29ed3c58e34a +Author: Yagami <976204163@qq.com> +Date: Thu Oct 15 09:07:04 2020 +0800 + + * Code for #8119. + +commit c615564a6f42ab3edc758a037b9aacf50324a9f1 +Author: z +Date: Wed Oct 14 14:01:27 2020 +0800 + + * adjust for compatible php5.4 + +commit 4aeeb5f5919e2c32a3ffc2af69223e6780fbd7c6 +Author: z +Date: Wed Oct 14 13:10:56 2020 +0800 + + * fix bug for picker. + +commit f674ff12efbb050eafa53c1c0b68781150ef38eb +Author: tianshujie98 +Date: Wed Oct 14 13:40:53 2020 +0800 + + * Add space. + +commit ff7e706d4d1ef6e977043196f93dc6f074e62bbe +Author: tianshujie98 +Date: Wed Oct 14 13:38:44 2020 +0800 + + * Delete blank lines. + +commit f996382d2bd318fe5fca78d7c1d5e9b5effc1600 +Author: tianshujie98 +Date: Wed Oct 14 13:37:41 2020 +0800 + + * Adjust code style. + +commit 42469b896debc2739e157af7088fb15019147037 +Author: tianshujie98 +Date: Wed Oct 14 13:34:48 2020 +0800 + + * Fix bug #3559. + +commit a2b459ebce911b18ea39e1b43509808fea5f4934 +Author: tianshujie98 +Date: Wed Oct 14 13:21:48 2020 +0800 + + * Fix bug #3559. + +commit 984e782595849f6675154e7858e935676dee985e +Author: leiyong <1549684884@qq.com> +Date: Wed Oct 14 10:37:41 2020 +0800 + + * Finish task#8117. + +commit 39e05a51ad4eac979f2308f408a34b61b6ff1bc8 +Author: hufangzhou <746775970@qq.com> +Date: Wed Oct 14 10:37:16 2020 +0800 + + * Fix bug#3560: Adjust the display of the table in different screen zoom. + +commit 7eecf4b27f3bfe5970ef4ff23fc2dd179519f468 +Author: Yagami <976204163@qq.com> +Date: Wed Oct 14 09:52:56 2020 +0800 + + * Finish task #8116. + +commit 00c8d463b75427fa1c345ac368befb3de433644b +Merge: ca2fcc79fb d5eba7b3ae +Author: hufangzhou <746775970@qq.com> +Date: Wed Oct 14 08:31:00 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit ca2fcc79fb7291b6a8f9bdb6ba1ff3a80a3c1b71 +Author: hufangzhou <746775970@qq.com> +Date: Wed Oct 14 08:30:45 2020 +0800 + + * Fix bug#3558: Modify the display of the colored fonts in bold. + +commit 6ac38da8c2258a36898433228042af59e1d59531 +Author: tianshujie98 +Date: Tue Oct 13 17:11:27 2020 +0800 + + * Fix bug #3556. + +commit c9ea9c7d2e44b7d65a1f1d5121b3c951771135e3 +Author: Yagami <976204163@qq.com> +Date: Tue Oct 13 16:56:13 2020 +0800 + + * Meger code. + +commit d5eba7b3ae3cac4a17acb70e804b599ccc6037d6 +Author: tianshujie98 +Date: Tue Oct 13 16:54:58 2020 +0800 + + * Fix bug #3556. + +commit 71d90736446c81833f42f9d7b7ed49165c436f14 +Author: leiyong <1549684884@qq.com> +Date: Tue Oct 13 16:55:24 2020 +0800 + + * Finish task#8124. + +commit 8f2cbcb62e449b49ca26cfee5267f5855486f4dd +Merge: 740db5ffa4 2ea6693cf6 +Author: hufangzhou <746775970@qq.com> +Date: Tue Oct 13 16:12:04 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit d4ecf61ac3804893178822b15d25a2cb432fa776 +Merge: 740db5ffa4 2ea6693cf6 +Author: hufangzhou <746775970@qq.com> +Date: Tue Oct 13 16:12:04 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 740db5ffa40d36c0436aecbe5a65c1149a6403b5 +Author: hufangzhou <746775970@qq.com> +Date: Tue Oct 13 16:11:55 2020 +0800 + + * Adjust the logic of the multiple task. + +commit 540fd9bd910ae933db52af71a399c92a34cf78ae +Merge: 64d260bbf6 e6e3c67811 +Author: holan20180123 <56391770@qq.com> +Date: Tue Oct 13 15:11:57 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e6e3c67811aaf752487bee5678075b64d06f7935 +Author: qiyu-xie +Date: Tue Oct 13 14:50:17 2020 +0800 + + * Fix bug#3555. + +commit 2ea6693cf6d1d99fcf2c63ae5480db94ce08857c (tag: zentaopms_12.4.3_20201013) +Author: qiyu-xie +Date: Tue Oct 13 14:33:06 2020 +0800 + + * Fix bug#3555. + +commit 64d260bbf61532e3c34194b71c1ca018259ac444 +Author: holan20180123 <56391770@qq.com> +Date: Tue Oct 13 14:34:42 2020 +0800 + + * Fix bug #3553. + +commit 048a386af707f18a5f59b91a315ac4a2d93b6d4f +Merge: 8988bbc16c 5e30da5817 +Author: holan20180123 <56391770@qq.com> +Date: Tue Oct 13 14:28:45 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 8988bbc16c0a046d9f0683e54694ea216f33bf47 +Author: holan20180123 <56391770@qq.com> +Date: Tue Oct 13 14:28:10 2020 +0800 + + * Fix bug #3553. + +commit 4c512289bb7b7543289b72300a343224990fc3dc +Author: tianshujie98 +Date: Tue Oct 13 14:21:40 2020 +0800 + + * Edit comment. + +commit 5e30da5817f57b208cb40ade3c9077b56794a44c +Author: tianshujie98 +Date: Tue Oct 13 14:17:58 2020 +0800 + + * Edit comment. + +commit 4bfe3e639b8df82753dd2f67c51b2820cf3c5ff5 +Author: hufangzhou <746775970@qq.com> +Date: Tue Oct 13 14:13:23 2020 +0800 + + * Adjust the interval between the buttons and the images. + +commit 0bd1778d8a823c53c263326a13d39fc793ba366c +Author: hufangzhou <746775970@qq.com> +Date: Tue Oct 13 14:07:08 2020 +0800 + + * Modify the content of the comment. + +commit 95222040056eed04c04b410d260bb132ae40f59c +Merge: 03f8cb6354 9a591fde1e +Author: hufangzhou <746775970@qq.com> +Date: Tue Oct 13 13:59:01 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 03f8cb6354b1609a3b104b4f8c3195d59ad5056b +Author: hufangzhou <746775970@qq.com> +Date: Tue Oct 13 13:58:52 2020 +0800 + + * Fix bug#3552: Remove the require field named story when edit a lib case. + +commit 9a591fde1e23616e7c92cd533d8d28035318f324 +Author: z +Date: Tue Oct 13 13:14:19 2020 +0800 + + * fix error sql. + +commit d72a3c33d178539bc28f47a363aa3abf31eb9fe1 +Author: z +Date: Tue Oct 13 11:45:30 2020 +0800 + + * adjust for japanese. + +commit 0410f7f8b5f86e0991b9084ac7dbeb12070c8f43 +Merge: bbfc2cab5e 61d117d486 +Author: hufangzhou <746775970@qq.com> +Date: Tue Oct 13 11:40:07 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit bbfc2cab5e2a3ec20fe37ceab1d05006e857e593 +Author: hufangzhou <746775970@qq.com> +Date: Tue Oct 13 11:39:53 2020 +0800 + + * Adjust the interval between the buttons and the images. + +commit 5d854af931006f65bce0d4a02e29fa75442e5b1d +Author: qiyu-xie +Date: Tue Oct 13 11:21:34 2020 +0800 + + * Fix bug#3545. + +commit 61d117d4869124bead8a48809ced8daea46d6833 +Author: qiyu-xie +Date: Tue Oct 13 10:56:04 2020 +0800 + + * Fix bug#3545. + +commit 7509e74182e78bb563aea1c2e4a6c312705f3771 +Author: z +Date: Tue Oct 13 10:44:41 2020 +0800 + + + add new version and upgrade. + +commit cbdaa882296ebf6a04e5bef45c555716c22e07e1 +Author: z +Date: Tue Oct 13 09:32:39 2020 +0800 + + * adjust code. + +commit 81ebb3e3237f3dbabfddb5c8f9175aa82b2ac017 +Author: z +Date: Tue Oct 13 09:17:05 2020 +0800 + + * Create fields separately. + +commit 35699d9779e80a7b3de29350e295b659670291da +Author: Yagami <976204163@qq.com> +Date: Tue Oct 13 09:11:03 2020 +0800 + + * Finish task #8123. + +commit 1eb3c5d8886b8c760032acc29cb7e226b344003e +Author: leiyong <1549684884@qq.com> +Date: Tue Oct 13 09:14:37 2020 +0800 + + * Finish task#8067. + +commit 1db4a6fd91ca51a2df3436020bde73377e06c027 +Author: tianshujie98 +Date: Tue Oct 13 09:08:17 2020 +0800 + + * Finish task #8154. + +commit 1457ba1b80f1b945cddcccdb6bc2a8e88864b375 +Author: tianshujie98 +Date: Tue Oct 13 08:57:50 2020 +0800 + + * Finish task #8154. + +commit eb01165a2e3a3de0ccb98003ce6d2b2c0b2a498a +Author: Catouse +Date: Mon Oct 12 20:09:53 2020 +0800 + + * storage template html as templateHtml property of keditor instance. + +commit 2c6d7d153bcffaa933f4066765f10a74e72e15d1 +Author: Catouse +Date: Mon Oct 12 20:08:20 2020 +0800 + + * storage template html as templateHtml property of keditor instance. + +commit ad73980c9f1e996abb55112fc71995d55538869c +Author: z +Date: Mon Oct 12 17:17:50 2020 +0800 + + * adjust for config. + +commit 7a1add17e8089e5dde49fc3e1f9795b055ee16bc +Author: z +Date: Mon Oct 12 17:14:48 2020 +0800 + + * remove repeated repo sql. + +commit 8dbf4ff9f5a274c26afec4ee9019bb51a95a9c7c +Author: hufangzhou <746775970@qq.com> +Date: Mon Oct 12 16:35:31 2020 +0800 + + * Finish task#8156: Optimize the structure of the code. + +commit e194689bca610479f17e7f75fa595a1111321c13 +Author: holan20180123 <56391770@qq.com> +Date: Mon Oct 12 16:29:22 2020 +0800 + + * Finish task #8158. + +commit 1d59f85b0fb68e336303dc4d4de0c5e3bed0ae36 +Author: holan20180123 <56391770@qq.com> +Date: Mon Oct 12 16:27:53 2020 +0800 + + * Finish task #8159. + +commit fb27b60d6426a87db73678d95b4c263e1a7e07bf +Author: holan20180123 <56391770@qq.com> +Date: Mon Oct 12 16:25:37 2020 +0800 + + * Finish task #8185. + +commit 2b2eba33eaf285d373f8a063f4d05243b564cec5 +Author: z +Date: Mon Oct 12 16:22:47 2020 +0800 + + * adjust for set plan. + +commit 050a8849626c457a6f2eca824fe6ac4ca9221eec +Author: holan20180123 <56391770@qq.com> +Date: Mon Oct 12 16:18:58 2020 +0800 + + * Finish task #8160. + +commit fecf78342ff29d82d6fd44a4f3f715a759d7dbc2 +Author: holan20180123 <56391770@qq.com> +Date: Mon Oct 12 16:17:47 2020 +0800 + + * Finish task #8159. + +commit e0bf6af6181a8a9da3a805d89c3e52425c9bd3a5 +Merge: 0001012632 6442248d68 +Author: hufangzhou <746775970@qq.com> +Date: Mon Oct 12 16:10:43 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 0001012632ec3602b8634f4ea51169389eb692f8 +Author: hufangzhou <746775970@qq.com> +Date: Mon Oct 12 16:10:28 2020 +0800 + + * Finish task#8156: Optimize the structure of the code. + +commit 6442248d68154062eaa7f8dc4857d545c56deae1 +Author: holan20180123 <56391770@qq.com> +Date: Mon Oct 12 16:06:04 2020 +0800 + + * Finish task #8158. + +commit 2f20925a47e3f640ac04b8baca1bb823f9be7d53 +Merge: 7f49f1f614 c7301bdf7a +Author: holan20180123 <56391770@qq.com> +Date: Mon Oct 12 15:50:22 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7f49f1f61498579f3eff82a16ea85b5ec3575d14 +Author: holan20180123 <56391770@qq.com> +Date: Mon Oct 12 15:49:46 2020 +0800 + + * Finish task #8085. + +commit c7301bdf7ac3de3ace03e739c5dc796428618b5e +Author: Yagami <976204163@qq.com> +Date: Mon Oct 12 14:52:37 2020 +0800 + + * Fix common en lang. + +commit f9502665770c62feb00a254bca8c882bff6d3a64 +Author: Yagami <976204163@qq.com> +Date: Mon Oct 12 14:54:02 2020 +0800 + + * Merge code. + +commit a8b95e3fa7840dde130ee2ff77f7a950a9e80ad7 +Author: Yagami <976204163@qq.com> +Date: Sat Oct 10 13:58:56 2020 +0800 + + * Finish task #8110. + +commit 5813c42a714c9a5f12c463e36c3ea0719f51fa0e +Author: Yagami <976204163@qq.com> +Date: Sat Oct 10 10:42:17 2020 +0800 + + * Finish task #8107,8108,8109. + +commit 36a1d27c323da57e5214fad1951faa50e2c71584 +Author: tianshujie98 +Date: Mon Oct 12 11:43:06 2020 +0800 + + * Edit comment. + +commit a7d9aa4cfaf97ff30a6bd263cbaff1c30678f105 +Author: tianshujie98 +Date: Mon Oct 12 11:40:27 2020 +0800 + + * Edit comment. + +commit 53ad99b932fbc5667af92b8d0f7a9f511feb5054 +Author: hufangzhou <746775970@qq.com> +Date: Mon Oct 12 11:39:17 2020 +0800 + + * Modify the icon of the download. + +commit d80b08e4e37a962ba540d298e9280c0ae8cb8112 +Author: hufangzhou <746775970@qq.com> +Date: Mon Oct 12 11:34:36 2020 +0800 + + * Finish task#8079. + +commit 74fb8fffa3ed06d278ce59c3f1429498a9f0dc20 +Author: hufangzhou <746775970@qq.com> +Date: Mon Oct 12 11:28:49 2020 +0800 + + * Finish task#8055: Modify the name of the param. + +commit fa86eaeb2f03d37b7cad87cd4c65853c8b4af725 +Merge: 8c2997f839 4141f6d8fa +Author: hufangzhou <746775970@qq.com> +Date: Mon Oct 12 11:24:47 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8c2997f8394d8c0cdaff6d4525241e2445e35d59 +Author: hufangzhou <746775970@qq.com> +Date: Mon Oct 12 11:24:38 2020 +0800 + + * Finish task#8065: Add a button for download images. + +commit 11d81b4ef1878ed946bac5137900208d95b50c98 +Author: tianshujie98 +Date: Mon Oct 12 11:24:06 2020 +0800 + + * Edit comment. + +commit 4141f6d8fa506a188fad53437fe0b295733e8362 +Author: holan20180123 <56391770@qq.com> +Date: Mon Oct 12 11:14:22 2020 +0800 + + * Finish task #8090. + +commit 6cac6051d1ed9ecf04dbcac73524ca68f67dd653 +Merge: d7a1941b7f 972c491f13 +Author: hufangzhou <746775970@qq.com> +Date: Mon Oct 12 11:09:19 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d7a1941b7f2483fff8c8438b7ce4d048232251bd +Author: hufangzhou <746775970@qq.com> +Date: Mon Oct 12 11:09:03 2020 +0800 + + * Fix bug #3491: Assign value to the manage products by the different request type. + +commit 972c491f134a7e450a4e851d992d987761bac922 +Merge: 0a489ccfd4 a1f2a80b76 +Author: holan20180123 <56391770@qq.com> +Date: Mon Oct 12 11:02:28 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a1f2a80b769e272e56930c8c93f1c77e72599d85 +Author: Catouse +Date: Mon Oct 12 10:55:37 2020 +0800 + + * bug #3483, fix dropdown in modal header not show. + +commit 0a489ccfd468608c86d8c7790250f2ff1d27b15c +Author: holan20180123 <56391770@qq.com> +Date: Mon Oct 12 11:01:53 2020 +0800 + + * Finish task #8090. + +commit 9d90cc954119f079940c6e73f8471b4104826e88 +Author: holan20180123 <56391770@qq.com> +Date: Mon Oct 12 10:57:49 2020 +0800 + + * Finish task #8090. + +commit 1a712f6851ca9cafcee019d8e69adc3358287124 +Author: Catouse +Date: Mon Oct 12 10:54:56 2020 +0800 + + * bug #3483, fix dropdown in modal header not show. + +commit 7c531be31f20af9c7e0ff01009a3eda68662be9e +Author: leiyong <1549684884@qq.com> +Date: Mon Oct 12 10:46:39 2020 +0800 + + * Restore css styles. + +commit 516b8566e9cb7296ed407dd2fda80c17bbe0bf06 +Merge: 90cfaad761 cf527ad972 +Author: hufangzhou <746775970@qq.com> +Date: Mon Oct 12 10:37:14 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 90cfaad7613a996fa2f92862094340885f0f02e0 +Author: hufangzhou <746775970@qq.com> +Date: Mon Oct 12 10:37:05 2020 +0800 + + * Modified the format of the code. + +commit 526b4753958a1c622a75a850d501074002313a90 +Author: leiyong <1549684884@qq.com> +Date: Mon Oct 12 10:22:41 2020 +0800 + + * Finish task#8112. + +commit cf527ad972ef77e60ad88cc788f02efa0cee6684 +Merge: 086252b0bd 5c015ea501 +Author: holan20180123 <56391770@qq.com> +Date: Mon Oct 12 10:19:42 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 086252b0bd1e89c18bdaa28c29d84c700c507b15 +Author: holan20180123 <56391770@qq.com> +Date: Mon Oct 12 10:19:19 2020 +0800 + + * Finish task #8090. + +commit 5c015ea501507a8f09d6dedb61553c5bd7412202 +Author: z +Date: Mon Oct 12 10:16:25 2020 +0800 + + * finish task #8046. + +commit 2aad5c96534c416f97072208a5d837957a3f07ed +Author: hufangzhou <746775970@qq.com> +Date: Mon Oct 12 09:59:18 2020 +0800 + + * Fix a bug with a variable name. + +commit eb0e0ad4a3fcd03ebb6cf144bbfd67d28c9cc9bc +Author: hufangzhou <746775970@qq.com> +Date: Mon Oct 12 09:10:14 2020 +0800 + + * Fix a bug about task#8073. + +commit 594eccb06752b932c7affa5bcc0c094714fff72f +Author: reneeteng +Date: Sun Oct 11 15:24:05 2020 +0800 + + * Lang file updated. + +commit 61dfd90a1d7210a19d83db36a580201fffb1fede +Merge: b764cd61b0 f3e32ab028 +Author: reneeteng +Date: Sun Oct 11 15:16:36 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 046241fa2cfbb835c38fdc57d0615079731376f8 +Author: tianshujie98 +Date: Sat Oct 10 17:17:15 2020 +0800 + + * Delete comment. + +commit f3e32ab0284e6062cbeace7add37a2bcd14f88ca +Author: Catouse +Date: Sat Oct 10 17:11:25 2020 +0800 + + * bug #3547, fix background style of statistic bar in table footer. + +commit 58e1634ae7d19473e7adc585d837e88c01c7e954 +Author: Catouse +Date: Sat Oct 10 17:10:05 2020 +0800 + + * bug #3547, fix background style of statistic bar in table footer. + +commit 2d46ae29d2597a93c07ec9034ea5112729ba066f +Author: tianshujie98 +Date: Sat Oct 10 17:09:25 2020 +0800 + + * Add notes. + +commit b8499990235e625958ef1e9fd7da1501b90f343f +Merge: 02eb03583d 294b3e0ccf +Author: holan20180123 <56391770@qq.com> +Date: Sat Oct 10 16:57:05 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 02eb03583d009ee28ee8ded600c05119cccd55d1 +Author: holan20180123 <56391770@qq.com> +Date: Sat Oct 10 16:56:36 2020 +0800 + + * Finish task #8085. + +commit 294b3e0ccfec958e4979af03d32d8f8f845de29b +Author: tianshujie98 +Date: Sat Oct 10 16:55:47 2020 +0800 + + * Add notes. + +commit 764ce592a2a133ce181208d4eea04f14050bce29 +Author: qiyu-xie +Date: Sat Oct 10 16:53:58 2020 +0800 + + * Fix bug#3544. + +commit 2ae42d3d16d51e95da0e25bfa6d8a791676a7020 +Author: qiyu-xie +Date: Sat Oct 10 16:38:17 2020 +0800 + + * Fix bug#3544. + +commit f5406588398346fdbab35c9029535f154cd1c105 +Author: leiyong <1549684884@qq.com> +Date: Sat Oct 10 14:58:16 2020 +0800 + + * Finish task#8106. + +commit d29da8f33d07f92a722c885ef6a59687729daa98 +Author: leiyong <1549684884@qq.com> +Date: Sat Oct 10 14:51:27 2020 +0800 + + * Finish task#8102. + +commit 5c81e807ce2e78fb728b6150314a51a7269405f5 +Author: leiyong <1549684884@qq.com> +Date: Sat Oct 10 14:02:41 2020 +0800 + + * Finish task#8118. + +commit b764cd61b0f8da00b625e7208202a3de6e0fd3bc +Merge: 021caa114d 9a8c2c6c56 +Author: reneeteng +Date: Sat Oct 10 13:51:46 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9a8c2c6c56689f8ee98ec016d5af8b63a4627472 +Author: tianshujie98 +Date: Sat Oct 10 11:32:09 2020 +0800 + + * Edit comment. + +commit 896c57edba5ccfa232341775013d3fd5c3ca6e08 +Author: tianshujie98 +Date: Sat Oct 10 11:23:37 2020 +0800 + + * Edit comment. + +commit 82c16625a5733ee1dfa3a65788648e13c62678c2 +Author: leiyong <1549684884@qq.com> +Date: Sat Oct 10 10:20:31 2020 +0800 + + * Fix error. + +commit ea40e7d63e8172b3b24b64b6bf15be17d263779b +Author: leiyong <1549684884@qq.com> +Date: Sat Oct 10 10:13:48 2020 +0800 + + * Finish task#8112. + +commit 021caa114d0c6bb6168c7fb65f1d61bd729bac41 +Author: reneeteng +Date: Sat Oct 10 10:10:36 2020 +0800 + + * Update password tips for adding a user. + +commit 6f625765cc2ddd8584b46b20e21e8c730d47715f +Author: tianshujie98 +Date: Sat Oct 10 09:53:09 2020 +0800 + + * Edit comment. + +commit cc3e48374d268200469bf65855a13d8c350d1d17 +Author: tianshujie98 +Date: Sat Oct 10 09:51:20 2020 +0800 + + * Finish task #8056. + +commit 26818e8814cc8c2cde9831773db9ebee9728ffff +Author: tianshujie98 +Date: Sat Oct 10 09:44:18 2020 +0800 + + * Edit comment. + +commit 75a7aecc3ef8f5201d92888d82e9e6340f94f92a +Author: tianshujie98 +Date: Sat Oct 10 09:43:44 2020 +0800 + + * Finish task #8056. + +commit 443bbd0cefae4881eb2aca649c5a30bbc824ead6 +Author: z +Date: Sat Oct 10 09:29:18 2020 +0800 + + * finish task #8069. + +commit ca54dacb023c2bdcdaf68d1a86cc9641be624592 +Author: tianshujie98 +Date: Sat Oct 10 09:17:43 2020 +0800 + + * Finish task #8061. + +commit fbdc9624fcfd2267ef9cc00f4a78a34114f778d2 +Author: qiyu-xie +Date: Sat Oct 10 09:11:12 2020 +0800 + + * Fix bug#3549. + +commit b6674ed079ad9178c8e9a32467634cd0fd8c4e47 +Author: tianshujie98 +Date: Sat Oct 10 09:06:11 2020 +0800 + + * Finish task #8061. + +commit cbd2748dcf76e8931263b1304c57085377328c04 +Merge: 1ebc3a9e3f 81d9b1de5d +Author: hufangzhou <746775970@qq.com> +Date: Sat Oct 10 08:33:30 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 1ebc3a9e3f51faff13cff9f08078ecc2a1336764 +Author: hufangzhou <746775970@qq.com> +Date: Sat Oct 10 08:33:20 2020 +0800 + + * Finish task#8073: Assign the value to the manage products. + +commit 81d9b1de5d97d43178c7e9ca32c128b77ce40d72 +Author: leiyong <1549684884@qq.com> +Date: Fri Oct 9 17:42:15 2020 +0800 + + * Finish task#8059. + +commit 695aaf5fceb8174bf5efe6cbad9e0281635d735e +Author: Yagami <976204163@qq.com> +Date: Fri Oct 9 16:34:13 2020 +0800 + + * Fix sql error. + +commit 437c7987d80c2285f2c366bb741a4ae671ef5640 +Author: qiyu-xie +Date: Fri Oct 9 15:36:56 2020 +0800 + + * Finish task#8084. + +commit d12a45cb02622193f7b22ec0a177f7a3540f50d2 +Author: qiyu-xie +Date: Fri Oct 9 15:30:27 2020 +0800 + + * Finish task#8084. + +commit c20b7e7a5c604cf8673574a234fb7c899c9ea2c6 +Author: z +Date: Fri Oct 9 13:20:00 2020 +0800 + + * finish task #8072. + +commit 12820bf546dd61275f25546049de8f9a29586e31 +Author: z +Date: Fri Oct 9 11:43:18 2020 +0800 + + * fix for task #8091. + +commit 1af3353ae1ab81ac084949858c83c0623198b67d +Author: z +Date: Fri Oct 9 11:02:01 2020 +0800 + + * adjust notice. + +commit d552c8b1ef3b9af7b2bb40dd3d880c579e091b16 +Author: z +Date: Fri Oct 9 09:33:55 2020 +0800 + + * finish task #8071. + +commit 388b84eb271e82ed254d6e97d4e6a7065a8839e7 +Author: z +Date: Fri Oct 9 09:20:51 2020 +0800 + + * finish task #8070. + +commit 78983014a3d09796a7dc35b73f15ee846dd9feec +Author: z +Date: Fri Oct 9 09:15:46 2020 +0800 + + * finish task #8066. + +commit 3d0ccb781dde50fb1dd072f32e8c280a7bb29bd0 +Author: z +Date: Fri Oct 9 09:12:50 2020 +0800 + + * finish task #8091. + +commit 677fa5286359c3eb5a4ed3c46b1128e38126dfa7 +Author: tianshujie98 +Date: Fri Oct 9 08:31:01 2020 +0800 + + * Revert submission. + +commit f7911a701378658b9335290e613ce1314327255b +Author: tianshujie98 +Date: Fri Oct 9 08:25:12 2020 +0800 + + * Revert submission. + +commit 48c178e9a61d827130460e6aec8fbb58b6f3bd74 +Author: tianshujie98 +Date: Fri Oct 9 08:19:55 2020 +0800 + + * Revert submission. + +commit 4262f4c782710f924a32de721e9bbf492c03da88 +Author: z +Date: Wed Sep 30 20:34:53 2020 +0800 + + * finish task #8051. + +commit 4209766be3136f4b5bcd57b0a8a72463bd1e2246 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 30 17:18:01 2020 +0800 + + * Rename var name. + +commit ccc77b5d6d83af957c418ad8fb9748940b9f6cfd +Author: z +Date: Wed Sep 30 17:12:20 2020 +0800 + + * remove repo client version file when save data success. + +commit 48be6e258d02422db6a7f06f8398cddfece67264 +Author: z +Date: Wed Sep 30 17:11:00 2020 +0800 + + * finish task #8049. + +commit 3430987b114d42192a08573aac5f48bf528cd76f +Merge: 2b45895486 d89c58c957 +Author: hufangzhou <746775970@qq.com> +Date: Wed Sep 30 16:45:09 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 2b458954863d71691090fecdd4f1e7a2780ae38d +Author: hufangzhou <746775970@qq.com> +Date: Wed Sep 30 16:45:00 2020 +0800 + + * Finish task#8065: Add a button for download images. + +commit 4f306b3b17de6ca384b756b0a026ce827d66bf0f +Author: tianshujie98 +Date: Wed Sep 30 16:44:14 2020 +0800 + + * Finish task #8082. + +commit d89c58c957d4d91767ad6acc6189187e25fd67da +Author: tianshujie98 +Date: Wed Sep 30 16:32:38 2020 +0800 + + * Finish task #8082. + +commit 0cb373ad56e9467f2ee2d85681406ca685b33f40 +Author: tianshujie98 +Date: Wed Sep 30 16:03:55 2020 +0800 + + * Finish task #8088. + +commit 4d3f4a393a054a6f679e125669d17aefd3bef2bf +Author: tianshujie98 +Date: Wed Sep 30 16:00:43 2020 +0800 + + * Finish task #8088. + +commit d09fd16754cdbc839db72d8b6aaaf2bd472595a4 +Author: tianshujie98 +Date: Wed Sep 30 15:52:49 2020 +0800 + + * Finish task #8077. + +commit 30fe8498d8dc80f14019e9bc3ac40465bbe188b9 +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 30 15:50:23 2020 +0800 + + * Finish task#8067. + +commit 1ef42034985b9afbf6efa06ad66ca4ca5a97d92a +Author: tianshujie98 +Date: Wed Sep 30 15:43:26 2020 +0800 + + * Finish task #8077. + +commit 9c58612f14667b0cd9f6f26599490ca265b053ee +Author: hufangzhou <746775970@qq.com> +Date: Wed Sep 30 15:25:58 2020 +0800 + + * Finish task#8079. + +commit 62a7ca90a2226ae3f9658ccfb59b4e9193128db9 +Merge: e06b270d22 53679403e7 +Author: hufangzhou <746775970@qq.com> +Date: Wed Sep 30 14:59:59 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit e06b270d22163be03167e7a03bb597015d15f66c +Author: hufangzhou <746775970@qq.com> +Date: Wed Sep 30 14:59:51 2020 +0800 + + * Finish task#8055: Modify the name of the param. + +commit 53679403e71b939c2447cabe140efad8435e544d +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 30 14:51:58 2020 +0800 + + * Finish task#8068. + +commit 27b421ad69fd30a1d7f9ed3cb719804c0c20b431 +Author: qiyu-xie +Date: Wed Sep 30 14:42:35 2020 +0800 + + * Finish task#8081. + +commit 19ec606bce2791d796d48847f12eb69edccb392b +Author: qiyu-xie +Date: Wed Sep 30 14:35:42 2020 +0800 + + * Finish task#8052. + +commit a2b9cf084c7145a5560d5b5cd880ed2510c1f03e +Author: qiyu-xie +Date: Wed Sep 30 14:21:26 2020 +0800 + + * Finish task#8081. + +commit b0d8a629b3b19084d5440542c6c24d782855025d +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 30 14:18:15 2020 +0800 + + * Finish task #8074. + +commit b60e13adffec8967a586d00c4dd1672b1d21eef6 +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 30 14:16:17 2020 +0800 + + * Finish task#8076. + +commit 0a7f82bc450619f4ab33a1ab5d02f8280a6fecce +Author: tianshujie98 +Date: Wed Sep 30 14:14:36 2020 +0800 + + * Finish task #8087. + +commit e024d848e16511275190678243f5afd51a271fec +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 30 14:10:20 2020 +0800 + + * Finish task #8089. + +commit 0f78f3f3515619ff22e615bc798745b1f2f6d78a +Merge: 2365e400f6 536b660528 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 30 14:08:28 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bfca760cfc486b3aeadcf678a325c4efe714b96b +Merge: bbf7424e40 ab01bc8cad +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 30 14:07:58 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit bbf7424e40607f39d0f8125734e0473373a212d6 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 30 14:07:33 2020 +0800 + + * Finish task #8089. + +commit ab01bc8cadf0ef3b4a9729457df4a1c8abc8da02 +Author: tianshujie98 +Date: Wed Sep 30 14:07:03 2020 +0800 + + * Finish task #8087. + +commit b43cb38a6c6f2fe54367bb3965cb118fc5f1ad99 +Author: qiyu-xie +Date: Wed Sep 30 13:54:51 2020 +0800 + + * Finish task#8052. + +commit 536b66052849a9cc429838780416087d0ef94bd8 +Author: tianshujie98 +Date: Wed Sep 30 13:54:15 2020 +0800 + + * Finish task #8086. + +commit 5bf6acc1cfb79aa60a08895983b88d83d257e2ef +Author: tianshujie98 +Date: Wed Sep 30 13:47:08 2020 +0800 + + * Finish task #8086. + +commit 738878d71ff6f8f73de41d899c501a38b1280c0b +Author: z +Date: Wed Sep 30 13:36:19 2020 +0800 + + * adjust code. + +commit a7b7d8da4ac5a77e5b2a5161a153f31cb8a8bec2 +Author: z +Date: Wed Sep 30 13:36:00 2020 +0800 + + * fix bug for set https. + +commit 37915f81e45f4b34d138442251f88e11b5f2f95a +Author: z +Date: Wed Sep 30 13:34:31 2020 +0800 + + * adjust code for storyModel batchChangePlan method. + +commit 2661667379a8dd4ca2a66e6855a079f6c36fed9b +Author: tianshujie98 +Date: Wed Sep 30 13:22:14 2020 +0800 + + * Finish task #7957. + +commit 9980b2fc7faa43ab6d9059b3cedd2102250d792d +Author: tianshujie98 +Date: Wed Sep 30 13:12:24 2020 +0800 + + * Finish task #7957. + +commit 2365e400f63ab4f750d78b27d8186c6435feec83 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 30 11:46:29 2020 +0800 + + * Finish task #8047. + +commit b8cd16bb07acb77d0ed296419c95676a61736905 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 30 11:44:26 2020 +0800 + + * Finish task #8047. + +commit 64e21fdf84ff01efbcdf79d289539c5cca721987 +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 30 08:28:06 2020 +0800 + + * Add a language entry to the program module + +commit d4e8a1ba84acd8d46321319d39a14dddd0e0bf1a +Author: Yagami <976204163@qq.com> +Date: Tue Sep 29 13:07:39 2020 +0800 + + * Fix project get pairs method. + +commit 8e74ba9677032894d7f281563736be7f39012ec6 +Author: leiyong <1549684884@qq.com> +Date: Tue Sep 29 09:47:25 2020 +0800 + + * Adjust code. + +commit f802c93bde1debbfb9556a42768502a74767394c +Author: z +Date: Tue Sep 29 08:53:55 2020 +0800 + + * finish task #12675. + +commit d066fef4e55fec47b9f144eff8e44d7ff52f825f +Author: leiyong <1549684884@qq.com> +Date: Tue Sep 29 08:31:27 2020 +0800 + + *Adjust code. + +commit 456dbffd68a46025e44d6ff32afc3cd8adf5119d +Author: tianshujie98 +Date: Tue Sep 29 08:25:38 2020 +0800 + + * Fix bug #2526. + +commit 347e52e0494e61c575b3915ac3127d17bfbf6e01 +Author: tianshujie98 +Date: Tue Sep 29 08:20:38 2020 +0800 + + * Fix bug #2526. + +commit fd0a11a8b127bd6256af75a4757fb8845f96328b +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 28 17:24:55 2020 +0800 + + * Adjust code . + +commit 719db21e0cfb90e31128408b9d8c30a057304984 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 28 17:17:57 2020 +0800 + + * Adjust code . + +commit 527a14aa3b17490fe35f965b8b1c63d7e515aadc +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 28 17:13:02 2020 +0800 + + * Adjust code. + +commit 8b00a7be21e6e48e267d6ef0aa980a80488d6305 +Author: tianshujie98 +Date: Mon Sep 28 16:52:07 2020 +0800 + + * Restore the previous version. + +commit e0ccf646f5e784452b35f01fc063aeb98be11840 +Author: tianshujie98 +Date: Mon Sep 28 16:50:02 2020 +0800 + + * Restore the previous version. + +commit af733f65fbf990bb2420722bc5d4c9a19f4f07bc +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 28 16:49:48 2020 +0800 + + * Finish bug#3537. + +commit 0a35276cb86497df3683c01f4200199e358e064e +Author: tianshujie98 +Date: Mon Sep 28 16:35:27 2020 +0800 + + * Unified format. + +commit 0fe2cd2e96e5003d13ba53a48e583474c9d28cdf +Author: tianshujie98 +Date: Mon Sep 28 16:32:59 2020 +0800 + + * Unified format. + +commit 7252aa61e34f11d5e3b29a7ef770836e68f8edc6 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 28 16:03:08 2020 +0800 + + * Adjust code. + +commit 710a2d6998ddd9d4aadacd333dae53499e8e15e3 +Author: Catouse +Date: Mon Sep 28 15:57:35 2020 +0800 + + * task #8025, bug #2540, fix default server address for downloading client. + +commit 56b72e9cdfc392c1d2a931f150f92e1f0f3d6d75 +Merge: 9dbedf957a 7eceb37427 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 28 15:48:10 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9dbedf957a413747c3c455cf412cda5107612c45 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 28 15:47:04 2020 +0800 + + * Adjust program module code. + +commit 965c5b7a224f00ee27c590f8efbfad3d08b498a2 +Author: Catouse +Date: Mon Sep 28 15:34:31 2020 +0800 + + * task #8030, bug #2528, fix container style after open debug modal. + +commit ee49c7512c647561d0c97fd5333a6835758976de +Author: Catouse +Date: Mon Sep 28 15:25:07 2020 +0800 + + * task #8030, bug #2528, add entry of debug modal for xuanxuan setting page. + +commit 7eceb37427fa7452d24fe42b7722d0e78dede291 +Author: tianshujie98 +Date: Mon Sep 28 14:59:16 2020 +0800 + + * Modify the logic of the batch change plan. + +commit 0071e61933d252e5a2f5b8b953450c4ebc4c5aa7 +Author: tianshujie98 +Date: Mon Sep 28 14:43:45 2020 +0800 + + * Modify the logic of the batch change plan. + +commit feb24928baad215dbcd4b214ed6d64b100c734e6 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 28 14:17:30 2020 +0800 + + * Fix bug #3494. + +commit 036ccf82f5029b33efe1aeab1d37b79c6e2583bf +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 28 14:14:28 2020 +0800 + + * Finish task#7864. + +commit dcbb62059c0d7ca106b42728fa8136d6aad739ab +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 28 14:13:43 2020 +0800 + + * Fix bug #3494. + +commit 2bcef878caf9a132785d038be9a3667ef360b900 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 28 13:56:42 2020 +0800 + + * Fix bug #3494. + +commit a65462ebd7f4218050fb61a1f2e8d639a2829b4b +Author: qiyu-xie +Date: Mon Sep 28 13:49:34 2020 +0800 + + * Fix bug#3531. + +commit 770971a9c37d39244f33105a02b8c2cbf5cb40cc +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 28 13:49:22 2020 +0800 + + * Finish bug#3486. + +commit 49ac23133a3ad25917df808702a999deeba91414 +Author: tianshujie98 +Date: Mon Sep 28 13:37:55 2020 +0800 + + * Fix bug #3487. + +commit 0c78a2e64419d30246e7fedbdbf332372ff28326 +Merge: 0a23eb2cf1 9869513998 +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 28 13:37:53 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 0a23eb2cf137dd620bc172a75e7757bb971a529f +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 28 13:37:43 2020 +0800 + + * Finish bug#3485. + +commit 9869513998088e55467c68a6c6b139d654733b60 +Author: tianshujie98 +Date: Mon Sep 28 13:33:57 2020 +0800 + + * Fix bug #3487. + +commit e41e7b49a7ec308aa61645cd8efc18b49c5cac2b +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 28 13:33:16 2020 +0800 + + * Fix bug #3494. + +commit a1d6646276cb2f04b3d6a6036ab1901a75d52bf8 +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 28 13:07:46 2020 +0800 + + * Finish bug#3491. + +commit 68024e01f75188a6ca4a40ee6ebd215a24c07946 +Merge: 770216e397 a0e1e77cd6 +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 28 11:49:25 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 770216e397bf81a1f6a973b409989cebfabfc538 +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 28 11:49:15 2020 +0800 + + * Finish bug#3498. + +commit a0e1e77cd6d2cc60cfb5e6f01dede3e6e027f7ed +Author: qiyu-xie +Date: Mon Sep 28 11:46:28 2020 +0800 + + * Fix bug#3531. + +commit da36997ef6658e3e8a0eedf45e07f8de8e10fedf +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 28 11:30:22 2020 +0800 + + * Finish bug#3488. + +commit 5ef282e0074d9ca1ce596baf7756431600cea1bb +Merge: 8052f2ce8f 0a9bdeb909 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 28 11:27:24 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8052f2ce8ffaa1c971499e21e307843af60a9e5e +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 28 11:27:06 2020 +0800 + + * Adjust product module code. + +commit 0a9bdeb9094471ee008d8279d30054e4f81b97cc +Author: tianshujie98 +Date: Mon Sep 28 11:24:06 2020 +0800 + + * Fix bug #3497. + +commit b787f19a2321a93a2cfdfbbb8e325ad0afc2f422 +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 28 11:22:51 2020 +0800 + + * Finish bug#3510. + +commit 2556a44a220623e6faa9809e71df043391d16868 +Author: tianshujie98 +Date: Mon Sep 28 11:13:08 2020 +0800 + + * Fix bug #3497. + +commit f18eb01eab841011c35bd56ac8b97ef8c246d846 +Author: qiyu-xie +Date: Mon Sep 28 11:03:42 2020 +0800 + + * Fix bug#3531. + +commit f0e98ca083b3549035f34fcda4c0f7bbde1f8912 +Merge: 36c2fdae0a abd35a44c5 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 28 11:00:06 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 36c2fdae0a5e66ff3dd1416c0836344a23e55b4d +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 28 10:59:47 2020 +0800 + + * Finish task#7893. + +commit abd35a44c5a5de5eb11414026b1d59e52f440f5e +Author: Yagami <976204163@qq.com> +Date: Mon Sep 28 10:50:52 2020 +0800 + + * Fix sql and add branch menu. + +commit a132d2ba4669d5b44da32587716b7e0f3aaef3ce +Merge: fd6f9f5ac9 1acd7023b5 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 28 10:46:34 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fd6f9f5ac9fc6be7fa37e540feb6fa1fa33a3a07 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 28 10:46:14 2020 +0800 + + * Finish task #7951. + +commit 1acd7023b5aeb82743b1b0fb716ca9054374e0f1 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 28 10:38:20 2020 +0800 + + * Project adjustment list. + +commit 5c57d79a8450e34553f64d505bbd7974bf482968 +Author: qiyu-xie +Date: Mon Sep 28 10:32:40 2020 +0800 + + * Fix bug#3533. + +commit 45aa11af9b2fd21851347379df7c7bc6be2a6de0 +Author: qiyu-xie +Date: Mon Sep 28 09:58:28 2020 +0800 + + * Modifying branches to all branches does not take effect. + +commit 31258a1ef23ba14323798a76924f18569c42b76f +Author: qiyu-xie +Date: Mon Sep 28 09:51:53 2020 +0800 + + * Modifying branches to all branches does not take effect. + +commit 9c83a0184b998cde164f9fb8929694efb222f983 +Merge: 72ad194da7 a9dd761b94 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 28 09:04:35 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 72ad194da731430c4a298e24c52fffc6d13d37aa +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 28 09:04:07 2020 +0800 + + * Finish task #7951. + +commit a9dd761b9495f9a6bdfe019e9261e1600eb46704 +Author: qiyu-xie +Date: Mon Sep 28 09:02:44 2020 +0800 + + * Fix bug#3533. + +commit 9e897e4ef3aeb4b9bee4295d9dfce5c6f4e06469 +Merge: ed523a1442 21c6eeac76 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 28 08:54:50 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit ed523a1442a5adf85a764e30b403259ad02f7dbb +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 28 08:54:14 2020 +0800 + + * Finish task #7951. Fix bug 3369. + +commit 21c6eeac761e0532da03d5bd0a7a3d0bcfdefd18 +Author: z +Date: Sun Sep 27 15:06:54 2020 +0800 + + * finish task #7926. + +commit 855d6650f981939b8219833b74a902e7d3cbd4c7 +Author: z +Date: Sun Sep 27 14:35:36 2020 +0800 + + * fix for bug. + +commit 8e5c1a84f477c117f2015640a5ab26f155f61b6c +Author: z +Date: Sun Sep 27 14:33:40 2020 +0800 + + * finish task #7996. + +commit f804db540fb81400cc12432f376c690a7304a753 +Author: z +Date: Sun Sep 27 14:08:51 2020 +0800 + + * code for task #7926. + +commit 265edb02d0cab026641ca2fbb95aa6608d7bb7a4 +Author: qiyu-xie +Date: Sun Sep 27 14:06:27 2020 +0800 + + * Fix bug#3531. + +commit d58e508fe0313eb35f0eeaa0e70658953aaf5bca +Author: qiyu-xie +Date: Sun Sep 27 14:02:05 2020 +0800 + + * Fix bug#3531. + +commit b84075ff726a7bfb8d8f2b32ff92c7e30fb80c43 +Author: Yagami <976204163@qq.com> +Date: Sun Sep 27 13:58:50 2020 +0800 + + * Delete unused sql and fix error. + +commit 5cce2eb83b69deeec938c396d15fe68cb4ba540d +Author: tianshujie98 +Date: Sun Sep 27 13:53:46 2020 +0800 + + * Fix bug #3478. + +commit f1ad35a5b1e1ab87928e197b10a6d26ac7ee1c9e +Author: tianshujie98 +Date: Sun Sep 27 13:41:36 2020 +0800 + + * Fix bug #3478. + +commit d942ceb6db4eb77a2f7e048451b0c298fb56a0d2 +Author: tianshujie98 +Date: Sun Sep 27 11:20:52 2020 +0800 + + * Fix bug #3497. + +commit 1b1eb4e9abe946c10349c81f9e97c9747ac4747e +Author: tianshujie98 +Date: Sun Sep 27 11:15:19 2020 +0800 + + * Fix bug #3497. + +commit 86f22e9a6b9ad529c3385302b5a7bba6fdfe1998 +Author: tianshujie98 +Date: Sun Sep 27 11:09:27 2020 +0800 + + * Fix bug #3497. + +commit faf6739724ef87f91809e6e42b545916cae41c87 +Author: qiyu-xie +Date: Sun Sep 27 11:08:21 2020 +0800 + + * Fix bug#3515. + +commit 213c662257ed60d854e6f41e1062dc190d7e8648 +Author: qiyu-xie +Date: Sun Sep 27 11:04:27 2020 +0800 + + * Fix bug#3515. + +commit ffc66d3f17c732fe7fc102941d8dfd5d088b9179 +Author: tianshujie98 +Date: Sun Sep 27 09:50:06 2020 +0800 + + * Fix bug #3508. + +commit d305a513bec03fc3f921f3b9f4481e0a39a61ad6 +Author: tianshujie98 +Date: Sun Sep 27 09:47:29 2020 +0800 + + * Fix bug #3508. + +commit 07c3ef43e9a0b6912388c8284123a995a73cbd56 +Merge: eb35c3112a 77739b6d92 +Author: hufangzhou <746775970@qq.com> +Date: Fri Sep 25 17:39:39 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit eb35c3112a2bc2e415e8773ea341eaa1ffd1d3ed +Author: hufangzhou <746775970@qq.com> +Date: Fri Sep 25 17:39:30 2020 +0800 + + * Finish bug#3419. + +commit 77739b6d9271f922763db40978788dc17f64d204 +Author: tianshujie98 +Date: Fri Sep 25 16:55:07 2020 +0800 + + * Adjust code style. + +commit dd3c2677b682a817769aada9baa39b40d77fed0a +Author: tianshujie98 +Date: Fri Sep 25 16:51:31 2020 +0800 + + * Adjust code style. + +commit 01ef99561110a703de176ddd7396192c7a564049 +Author: Yagami <976204163@qq.com> +Date: Fri Sep 25 16:41:50 2020 +0800 + + * Fix code error. + +commit cda4b2e32412ee3afa7ffdd653c79a672daa8664 +Author: tianshujie98 +Date: Fri Sep 25 16:39:08 2020 +0800 + + * Add notes. + +commit 35f538c5ce40e897fbb1592949197e2476452528 +Author: tianshujie98 +Date: Fri Sep 25 16:35:16 2020 +0800 + + * Add notes. + +commit 60e987754552eaf5168f73ffd95416874f662ee7 +Author: tianshujie98 +Date: Fri Sep 25 16:29:31 2020 +0800 + + * Fix bug #3529. + +commit a70c2d0fadf82513158cf040ac0912b97d42aaa2 +Author: tianshujie98 +Date: Fri Sep 25 16:26:10 2020 +0800 + + * Fix bug #3529. + +commit 37247db1ef8dff02a66bee1ec4ba99067a40d467 +Author: tianshujie98 +Date: Fri Sep 25 16:23:36 2020 +0800 + + * Fix bug #3529. + +commit 69f45681f44fd975bae17b96c6ade47df2c0090f +Author: tianshujie98 +Date: Fri Sep 25 16:18:47 2020 +0800 + + * Fix bug #3529. + +commit 401e7e7f443c3354349ae49ea788ac39615af470 +Author: Catouse +Date: Fri Sep 25 16:10:09 2020 +0800 + + * task #7959, bug #3341, change position of side content to 'fixed'. + +commit 06c3f67886f2bab90eda015f64ca957878adecad +Author: Catouse +Date: Fri Sep 25 16:10:09 2020 +0800 + + * task #7959, bug #3341, change position of side content to 'fixed'. + +commit 262b5b2520910618f02520f7fa36c93f0ec87164 +Author: qiyu-xie +Date: Fri Sep 25 15:19:26 2020 +0800 + + * Remove the templateID field from the bug module. + +commit bbe2fb689ad1a80a3859f3d72b3f6a460323047d +Author: qiyu-xie +Date: Fri Sep 25 15:15:33 2020 +0800 + + * Remove the templateID field from the bug module. + +commit 625cad2294a63f2e4062c379be13d2271697e69e +Author: Yagami <976204163@qq.com> +Date: Fri Sep 25 14:53:15 2020 +0800 + + * Fix durationestimation bug. + +commit a335a811f7276f85b5d4dc2177248a8156872d56 +Author: holan20180123 <56391770@qq.com> +Date: Fri Sep 25 14:52:32 2020 +0800 + + * Finish task #7932. + +commit 297bbd6f54b2c928c7cde72dd9346c1cbe981464 +Author: Catouse +Date: Fri Sep 25 14:37:50 2020 +0800 + + * fix pager and statistic not update as expect in table. + +commit c9784f693993832042b81795b79b825e138d05e4 +Author: qiyu-xie +Date: Fri Sep 25 14:34:58 2020 +0800 + + * Fix bug#3516. + +commit ba2f7a461f35fbef881746e9bb5a1b7b02b4c4dc +Author: Catouse +Date: Fri Sep 25 14:34:54 2020 +0800 + + * fix pager and statistic not update as expect in table. + +commit 6829e5236f209c839d557b8ca05b59e8f907332e +Author: qiyu-xie +Date: Fri Sep 25 14:32:18 2020 +0800 + + * Fix bug#3516. + +commit cdf36a7d01e8438bc1b3b57eef24e5a657f079bf +Author: qiyu-xie +Date: Fri Sep 25 14:22:25 2020 +0800 + + * Fix bug#3516. + +commit b0052129070c01c35d22ddb71302574131842923 +Merge: 5599fd31cc 6a952773e0 +Author: z +Date: Fri Sep 25 14:18:01 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit 5599fd31cc8c413891639b1503459e857e405d00 +Author: z +Date: Fri Sep 25 14:17:03 2020 +0800 + + * finish task #7955. + +commit 662c7f4545810a8d6d0076a17be7e6e4a42cc54f +Author: Yagami <976204163@qq.com> +Date: Fri Sep 25 13:27:46 2020 +0800 + + * Fix doc bug. + +commit 3b31984c72fe6b8e6a293101bfa431f85b2ea41c +Author: Yagami <976204163@qq.com> +Date: Fri Sep 25 10:21:17 2020 +0800 + + * Fix code style. + +commit 8ec9f7447715814293bee48765da2ac685596394 +Author: Yagami <976204163@qq.com> +Date: Fri Sep 25 10:19:19 2020 +0800 + + * Add custom user role list. + +commit 6145f558ba494ff4d54d9b94e43690a64b8d5be1 +Author: Yagami <976204163@qq.com> +Date: Thu Sep 24 13:10:29 2020 +0800 + + * Add story link requierment. + +commit d47a6cfae8e06e105d7c00f1a718a578fef9a5c1 +Author: hufangzhou <746775970@qq.com> +Date: Fri Sep 25 09:27:29 2020 +0800 + + * Finish task#7941. + +commit 4c08a1d011cfa7e484b8f7116cf58520bd0d37a0 +Merge: 8e018087d4 5e3a284c9b +Author: hufangzhou <746775970@qq.com> +Date: Fri Sep 25 08:20:29 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8e018087d4b59abe8fc8ee6548548a62f8311d0d +Author: hufangzhou <746775970@qq.com> +Date: Fri Sep 25 08:20:21 2020 +0800 + + * Adjust the display of the model. + +commit 5e3a284c9b2f1edea50fd4aeaa8206e553a8a8f4 +Author: Catouse +Date: Thu Sep 24 17:43:34 2020 +0800 + + * task #7962, bug #3329, fix autosize for textarea not work as expected. + +commit 6a952773e0ac6a5d6bd515f866e01a1609ec754d +Author: Catouse +Date: Thu Sep 24 17:42:57 2020 +0800 + + * task #7962, bug #3329, fix autosize for textarea not work as expected. + +commit 66c49c679edb0e162ac2c33f60bb5dfbb93f0da5 +Author: Catouse +Date: Thu Sep 24 17:12:13 2020 +0800 + + * improve style of pieIcon. + +commit a36cd7c6fcd0fecec54e0211cb866f5de6e3d03b +Author: Catouse +Date: Thu Sep 24 17:00:48 2020 +0800 + + * add $.fn.pieIcon method to draw progress pie icon in program/pgmproject page. + +commit 642e50921aac4f41885798c5a0ff209af348d72c +Author: z +Date: Thu Sep 24 16:17:40 2020 +0800 + + * finish task #7984. + +commit 4a80c0669a577d8fcf188bbbfcc2a913b5b5deb9 +Merge: c035b4c4ec 5966cb5cb5 +Author: hufangzhou <746775970@qq.com> +Date: Thu Sep 24 15:58:10 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c035b4c4ecc17f77d00adb838c08e3a8600e10ab +Author: hufangzhou <746775970@qq.com> +Date: Thu Sep 24 15:58:01 2020 +0800 + + * Finish task#7921. + +commit 5966cb5cb5d5ced915fa42d0dcd734d78717788e +Author: Catouse +Date: Thu Sep 24 14:55:05 2020 +0800 + + * task #7959, fix position of side column in tree view. + +commit 234e2de2ba6a5654c72cd882eba916be2ea01160 +Author: Catouse +Date: Thu Sep 24 14:55:05 2020 +0800 + + * task #7959, fix position of side column in tree view. + +commit 8c9bd180540470d4abe229ec294a3ef563090758 +Author: tianshujie98 +Date: Thu Sep 24 14:35:05 2020 +0800 + + * Finish task #7915. + +commit 1fe12f9aef971127ed2c3c9ab82d3483d6ac2927 +Author: leiyong <1549684884@qq.com> +Date: Thu Sep 24 14:21:11 2020 +0800 + + * Adjust style. + +commit 9f508d1d9a1add6d3bdad6b884ce7fbffbe19af3 +Author: Catouse +Date: Thu Sep 24 14:20:55 2020 +0800 + + * fix js error on no data in project tree. + +commit 557ff5320f046d5f34a7c2b90194a71cd60a9e4f +Author: tianshujie98 +Date: Thu Sep 24 14:14:49 2020 +0800 + + * Finish task #7915. + +commit 7c5e0a297b1881bffce73d8299555251a10be0ba +Author: Catouse +Date: Thu Sep 24 13:59:54 2020 +0800 + + * fix js error on no data in project tree. + +commit 6b649c8fbcf37e12918954ef4602c333ca24cb2b +Author: Catouse +Date: Thu Sep 24 13:53:43 2020 +0800 + + * task #7928, fix UI of waterfallprogress block. + +commit 91cab4543002ef26385e99e649dbc728e52b7049 +Author: leiyong <1549684884@qq.com> +Date: Thu Sep 24 13:57:14 2020 +0800 + + * Jump to project jump link. + +commit d59b3e85ceb87eaa022c5fdae5884634c11c2a91 +Author: leiyong <1549684884@qq.com> +Date: Thu Sep 24 13:34:34 2020 +0800 + + * Adjust recent function logic. + +commit 2a6e021191a6c7edaa0f09334404cced3b490062 +Author: z +Date: Thu Sep 24 13:24:14 2020 +0800 + + * finish task #7986. + +commit cdb3f000218919ba346dde47427e1e00dade4f18 +Author: tianshujie98 +Date: Thu Sep 24 13:20:03 2020 +0800 + + * The judgment of deleting two versions. + +commit be17c9d4946492f5cb49939f5932ea4ba225a476 +Author: tianshujie98 +Date: Thu Sep 24 13:05:04 2020 +0800 + + * The judgment of deleting two versions. + +commit 475c058ee1d15ab1110dedd12f86297033c15108 +Author: leiyong <1549684884@qq.com> +Date: Thu Sep 24 11:21:18 2020 +0800 + + * Adjust product batch editing. + +commit de47d1a2b2c07e81544fe2171beb5f625cee3830 +Author: Catouse +Date: Thu Sep 24 11:20:05 2020 +0800 + + * change width of menu to 96. + +commit 6c5c22087ecf5256ef43ee52bbf4049e79e64619 +Author: Catouse +Date: Thu Sep 24 11:08:00 2020 +0800 + + * fix style of angle button in header. + +commit 96332d10b2d26501cf99fbd008d956f782e676a1 +Author: Catouse +Date: Thu Sep 24 10:37:07 2020 +0800 + + * fix missing semicolon in sql file. + +commit 30a392cf022e10f4096d136fa94c310bbeaeda4f +Author: Yagami <976204163@qq.com> +Date: Thu Sep 24 11:02:07 2020 +0800 + + * Fix code error. + +commit c7e8b795195868092cf70045fae2a5876daa5008 +Author: Yagami <976204163@qq.com> +Date: Thu Sep 24 10:42:31 2020 +0800 + + * Add program priv. + +commit 7c1dcc5c5188d75650d88b06d64b1cdc4714e12b +Author: qiyu-xie +Date: Thu Sep 24 10:23:40 2020 +0800 + + * Finish task#8000. + +commit c43960d7c33a56f1da023d202af8838e75e82dc0 +Author: leiyong <1549684884@qq.com> +Date: Thu Sep 24 10:08:29 2020 +0800 + + * Adjust product list width. + +commit 6b5bf24e0836309371618fb382845d7a8924a2fa +Author: qiyu-xie +Date: Thu Sep 24 10:07:35 2020 +0800 + + * Delete spaces. + +commit f76fec1b54b8f8af45a9c03949567523007d03c3 +Author: qiyu-xie +Date: Thu Sep 24 10:03:06 2020 +0800 + + * Finish task#8000. + +commit 31687d685643b368975a27770d16f5e3c2e596f4 +Author: tianshujie98 +Date: Thu Sep 24 09:37:49 2020 +0800 + + * Finish task #8009. + +commit a3dac7266979abd1bfb9220a70af14d7e3402f9d +Author: z +Date: Thu Sep 24 09:33:23 2020 +0800 + + * finish task #7981. + +commit ac8ab8d868ab8bbdc3b838cedf4d834d98e7f07e +Author: tianshujie98 +Date: Thu Sep 24 09:28:51 2020 +0800 + + * Finish task #8009. + +commit 348059254271a2a18ac134f1ad6c932a5628e4e0 +Author: leiyong <1549684884@qq.com> +Date: Thu Sep 24 09:29:21 2020 +0800 + + * Adjust project list column width. + +commit 4398cbf3fdc3c770bf31e82451cf3dc964ec5748 +Author: leiyong <1549684884@qq.com> +Date: Thu Sep 24 09:21:10 2020 +0800 + + * Adjust the project list page. + +commit 261c7f900e45c32879c43ad23577a714a838b982 +Author: qiyu-xie +Date: Thu Sep 24 09:05:09 2020 +0800 + + * Finish task#8000. + +commit a6968f3171b413244fe2b4898596328d87796a04 +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 23 17:46:45 2020 +0800 + + * Add program project the delete method. + +commit be6bc36c8d725bb46b91c51accd6946edd0ae863 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 23 17:27:59 2020 +0800 + + * Fix branch menu. + +commit 37c4f1bff3295a35d281a866c4dcfbfbc73d165a +Author: Catouse +Date: Wed Sep 23 17:27:29 2020 +0800 + + * task #8043, improve UI of header buttons. + +commit e0143c553c03105acf9efc9992df73beeebfcb35 +Author: Catouse +Date: Wed Sep 23 17:24:54 2020 +0800 + + * task #8043, improve UI of header buttons. + +commit 8953a6170bac59272b7d6f716103a1cc6212cc4a +Author: Catouse +Date: Wed Sep 23 15:37:20 2020 +0800 + + * upgrade zui.js. + +commit 00dc2ad43a680ac29cb83ad059df5d1db4fd93d4 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 23 17:22:55 2020 +0800 + + * Restore task #7930. + +commit d9e57180de8a371eaec3e49ef677339abdc2947c +Author: Yagami <976204163@qq.com> +Date: Wed Sep 23 17:20:39 2020 +0800 + + * Add group. + +commit 096cbf52971db23ad35185f8b2d92dee186a73bd +Author: z +Date: Wed Sep 23 17:17:51 2020 +0800 + + * finish task #7975. + +commit ddfc52b61230b1b6859a390532eec4831839aa05 +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 23 17:13:29 2020 +0800 + + * Delete invalid code. + +commit 8325f0c29658033832556455364c2403385f59aa +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 23 17:08:46 2020 +0800 + + * Update program language items. + +commit 70e78fc672c1a1bc5e8d37bf0992b8076d0d064f +Author: z +Date: Wed Sep 23 16:18:31 2020 +0800 + + * finish task #7960. + +commit 6d4a3af6e1522b83022155397ed9244c70bf4954 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 23 16:14:43 2020 +0800 + + * Fix block data. + +commit b32d88eb2b9fdd69765fe2a0bfc66835d2451304 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 23 16:12:12 2020 +0800 + + * Adjust code style. + +commit 76146b0f6318dab5cb9018de8430162857ef4c99 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 23 16:07:55 2020 +0800 + + * Remove unused code. + +commit f12014703f6fa56a95470579bec7f872ee0df7be +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 23 16:07:06 2020 +0800 + + * Add program project method. + +commit ffccc96bfa17a8a46c841c6dac7d72faacc0c61a +Author: Yagami <976204163@qq.com> +Date: Wed Sep 23 15:32:30 2020 +0800 + + * Change project manage priv view. + +commit 2cc520cff7118b2f7df055284fa75c373ad64616 +Merge: 3fa53be319 d85d370800 +Author: z +Date: Wed Sep 23 15:09:36 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit 3fa53be319c03add273576fb0ff8def078d13d0b +Author: z +Date: Wed Sep 23 15:05:45 2020 +0800 + + * code for task #7939. + +commit b2494b1b9f3725a818993c1891429c1dd3efa842 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 23 15:01:00 2020 +0800 + + * Fix project drop menu link. + +commit 1b9c6b0e98ac6f091c2389b60ff6acf31e4780b8 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 23 14:54:16 2020 +0800 + + * Merge code. + +commit 4b1c0ced7b63ec60a7baf6cfe0719fb092c49861 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 23 13:55:32 2020 +0800 + + * Finish task #7932. Fix bug #3422. + +commit ab6ea6f7e012ca9d3fcbdee14350c7376c4b5830 +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 23 13:27:18 2020 +0800 + + * Project add sort. + +commit d85d370800c5fee848a1c12e1a7d110644048047 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 23 13:27:08 2020 +0800 + + * Finish task #7932. Fix bug #3422. + +commit 103a6d601119fc5c04694c0eb9e1db75f140b83c +Merge: 31d8bd2f44 d39955eb24 +Author: z +Date: Wed Sep 23 11:37:22 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit 23b3e9eb084f2e0fb60649b22ceafbb0661ecbee +Merge: c2ce6ab6f4 b106d3a95e +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 23 11:15:23 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c2ce6ab6f45beb217861611b7c7b4c027869bba9 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 23 11:14:47 2020 +0800 + + * Adjust English language. + +commit b106d3a95e32a110e3eca4d11abe417717668e26 +Author: tianshujie98 +Date: Wed Sep 23 11:10:02 2020 +0800 + + * Finish task #8009. + +commit d39955eb242fad079603d25704b03021eba294c9 +Author: tianshujie98 +Date: Wed Sep 23 11:04:18 2020 +0800 + + * Finish task #8009. + +commit 2d27ab24834f599d34ecef584c0ad5bec10584b3 +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 23 11:04:32 2020 +0800 + + * Delete swp file. + +commit 3dc97e71480ebc4c9cd68f9dc4c347d6a052894d +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 23 11:03:30 2020 +0800 + + * Adjust project creation and editing logic. + +commit 87ec019d60e45a4f60af576709a71bbc6ea87bfc +Author: z +Date: Wed Sep 23 10:39:58 2020 +0800 + + * merge from 12.x. + +commit c27a376f5b9085fd247953e7e718fd562893a0d9 +Merge: 76e319039d a95a72b579 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 23 10:37:03 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 31d8bd2f4486d86e31d4a4551c0b05d962f288df +Merge: 7d80bf3cdb f19e7c3220 +Author: z +Date: Wed Sep 23 10:36:53 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit 76e319039d5861eddb092871f7304248c48ed7fe +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 23 10:36:25 2020 +0800 + + * Finish task #7930. Fix bug #3430. + +commit 7d80bf3cdb51bb79f6b8321c73dbbad1b6e57d61 +Author: z +Date: Wed Sep 23 10:36:09 2020 +0800 + + * finish task #7920. + +commit a95a72b57936cbc5cbb3568f078be45deb03766f +Author: Yagami <976204163@qq.com> +Date: Wed Sep 23 10:27:35 2020 +0800 + + * Fix product lang. + +commit f19e7c32207478e60efa69aab3e7913123709e26 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 23 09:44:24 2020 +0800 + + * Finish task #7965. + +commit e25167b921ec8533df9d3963c192c75952dffcad +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 23 09:42:32 2020 +0800 + + * Finish task #7965. Fix bug #3325. + +commit 372d47f9aad80411a63343a14538674d040154f7 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 23 09:29:15 2020 +0800 + + * Finish task #7965. Fix bug #3325. + +commit 32744c0f25f7ab170d0ba84ee14a149504e03393 +Merge: f343d76f72 3296d751c4 +Author: qiyu-xie +Date: Tue Sep 22 17:14:30 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit f343d76f72a8a27cea2ea44ec2e97a89c058c513 +Author: qiyu-xie +Date: Tue Sep 22 17:14:01 2020 +0800 + + * Finish task#7970. + +commit b90777a735eee4820dffe1362b1219779ebacea6 +Author: leiyong <1549684884@qq.com> +Date: Tue Sep 22 16:54:50 2020 +0800 + + * Adjust zdata creation script. + +commit f9fae7ae93de55a15c127f7b9cd1c92868913502 +Author: Yagami <976204163@qq.com> +Date: Tue Sep 22 16:35:12 2020 +0800 + + * Add product left drop menu. + +commit 3296d751c43b6bf39180e8853b6878468512e054 +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 22 16:33:33 2020 +0800 + + * Finish task #7971. Fix bug #3296. + +commit dcede987898e98cde8af8abfc576697a55a00313 +Author: leiyong <1549684884@qq.com> +Date: Tue Sep 22 16:19:34 2020 +0800 + + * Modify product list sort. + +commit 73b9a880cb70d48f93465d48959ee326c93ad6b6 +Author: Yagami <976204163@qq.com> +Date: Tue Sep 22 16:12:08 2020 +0800 + + * Fix common menu. + +commit c1d1d71eafe303e8f11d945877beb8528d816d09 +Author: Yagami <976204163@qq.com> +Date: Tue Sep 22 15:44:05 2020 +0800 + + * Add menu active. + +commit 0f66457e034099faee39a3234277e3dda5c0ec9c +Author: leiyong <1549684884@qq.com> +Date: Tue Sep 22 15:43:40 2020 +0800 + + * Aajust style. + +commit f2640987a3d26389078bd1072e881dccdf4fbdeb +Author: leiyong <1549684884@qq.com> +Date: Tue Sep 22 15:16:15 2020 +0800 + + * Modify product list link. + +commit d42f90456d258c09351b584d5262e2262f12644f +Merge: 1d90888eb0 dd48623aaa +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 22 15:13:54 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1d90888eb09c8b8f28545a170f9fadc1ddd88dbe +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 22 15:12:54 2020 +0800 + + * Finish task #7943. Fix bug 3388. + +commit dd48623aaa0eb47479d6d6884af81d8087fe66fd +Author: Yagami <976204163@qq.com> +Date: Tue Sep 22 15:09:52 2020 +0800 + + * Delete unused file and add new file. + +commit 5bff3486d4759e8dee727edbf2b409121a338f10 +Author: Yagami <976204163@qq.com> +Date: Tue Sep 22 13:38:10 2020 +0800 + + * Rename program to PRJ. + +commit ffaf91d467c850df4d0ae48bcb83b4af791043c7 +Author: Yagami <976204163@qq.com> +Date: Tue Sep 22 13:33:52 2020 +0800 + + * Rename program to PRJ. + +commit 88a76e1efa2117d012fea8a67ca382901fe05928 +Author: Yagami <976204163@qq.com> +Date: Tue Sep 22 13:06:32 2020 +0800 + + * Fix details. + +commit 24cbde3b3d7ab403cc246afea8f54b586df58d3d +Author: leiyong <1549684884@qq.com> +Date: Tue Sep 22 15:09:15 2020 +0800 + + * Add a productlist method. + +commit 7d69e9e47956adcbe0d6fb194e518a31392db0d1 +Merge: 2e593e8a27 76f58d6879 +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 22 15:06:49 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 2e593e8a27ff0eb661eb0043e4f0d353e9c8ca1c +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 22 15:05:56 2020 +0800 + + * Finish task #7943. Fix bug 3388. + +commit 31de4972a5ad25fb06eb24c2aaff79963eca7ad0 +Author: hufangzhou <746775970@qq.com> +Date: Tue Sep 22 14:48:57 2020 +0800 + + * Finish task#7961. + +commit 76f58d68794a6ddd8c74f3503531ddb45be16780 +Author: hufangzhou <746775970@qq.com> +Date: Tue Sep 22 14:36:07 2020 +0800 + + * Finish task#7961. + +commit d671cd644cbfd496c73888a02a4fd79c90c3ba54 +Author: leiyong <1549684884@qq.com> +Date: Tue Sep 22 13:08:17 2020 +0800 + + * Adjust project creation logic. + +commit 92ee6ca3b20ae6a75ade9af9c52f986a2031996b +Author: Yagami <976204163@qq.com> +Date: Tue Sep 22 11:31:56 2020 +0800 + + * Rename program to prj. + +commit cec65da27196d80c95f6b00f5b24641c6a633434 +Author: Yagami <976204163@qq.com> +Date: Tue Sep 22 10:53:04 2020 +0800 + + * Fix program and project btn. + +commit c321a1181c92a20bbc8aa388198a46cd8561eaa1 +Author: hufangzhou <746775970@qq.com> +Date: Tue Sep 22 10:09:49 2020 +0800 + + * Adjust the display of the burn chart. + +commit e94b917f66c41031cfbdf4155479f49184dcade0 +Merge: 8f522653f6 bd93c680fa +Author: hufangzhou <746775970@qq.com> +Date: Tue Sep 22 09:59:05 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 8f522653f632d37be5d590a35bd4fbafc4cc6fe9 +Author: hufangzhou <746775970@qq.com> +Date: Tue Sep 22 09:58:55 2020 +0800 + + * Add the unit of the horizontal axis of the burn chart. + +commit c8d2c5957de51e8c7ab2656bba36eae5f9e7c096 +Author: leiyong <1549684884@qq.com> +Date: Tue Sep 22 09:46:46 2020 +0800 + + * Delete invalid method under product. + +commit 8dbfbdd6dbc18d8abd74dcd01ed720c2b527a320 +Author: Yagami <976204163@qq.com> +Date: Tue Sep 22 09:29:14 2020 +0800 + + * Fix product menu. + +commit 1bd79085aa27040b943aeb962312deb62b4b1363 +Author: leiyong <1549684884@qq.com> +Date: Tue Sep 22 09:28:26 2020 +0800 + + * Add ignore method judgmen. + +commit a96d77624ed5a34486466ec4803d5360ad9d3a16 +Author: leiyong <1549684884@qq.com> +Date: Tue Sep 22 09:25:09 2020 +0800 + + * Adjustment item drop down menu. + +commit 85d698582c561c174e87f58825db6e9af7f01582 +Author: leiyong <1549684884@qq.com> +Date: Tue Sep 22 08:54:03 2020 +0800 + + * Add item drop down menu. + +commit bd93c680fad094bb3b685878c26a1de6de316a48 +Author: qiyu-xie +Date: Tue Sep 22 08:52:24 2020 +0800 + + * Change lowercase to uppercase. + +commit 9b7d53c4c73ed5d8e30b361eb5adb5c64d4f2729 +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 21 17:32:16 2020 +0800 + + * Finish task#7934. + +commit 658e88e3706a7e4ff192f2c559c9a1a0c4d4bba4 +Merge: dbea650d61 d91c3b1361 +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 21 17:15:47 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit dbea650d61992ec5e250869574b7a5728f6a68a3 +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 21 17:15:39 2020 +0800 + + * Modify the code format. + +commit 6b2a0ff721ffa31ae284f7020358cec49dc98428 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 21 16:59:42 2020 +0800 + + * Finish task #8021. Fix bug #2550. + +commit d91c3b1361d725c78d0ef62d13edd9d2bd0c93fd +Merge: bcb0e7732c b92156a283 +Author: z +Date: Mon Sep 21 16:59:14 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit b92156a283ecbd133efffbca810aeac15d2309c5 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 21 16:56:01 2020 +0800 + + * Finish task #8021. Fix bug #2550. + +commit 1ba3e430b5242432c9573b196be4c9cda858540e +Author: Yagami <976204163@qq.com> +Date: Mon Sep 21 16:55:05 2020 +0800 + + * Add menu lang file. + +commit bcb0e7732c18100b79def9f79071e23e4a7dfcfc +Author: z +Date: Mon Sep 21 16:51:16 2020 +0800 + + * adjust for low php version. + +commit 51a487b8385572fad19a9ce949093a1ec9edc79a +Author: Yagami <976204163@qq.com> +Date: Mon Sep 21 16:46:01 2020 +0800 + + * Fix var name. + +commit 3cb892fc4e0967885e20da669b06decbc0e1b768 +Author: Yagami <976204163@qq.com> +Date: Mon Sep 21 16:45:06 2020 +0800 + + * Fix product menu. + +commit 566d03a3588d8e6e75488f3b0e1c9f65653b2cca +Merge: 5b83f2d3f6 55b0a94586 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 21 16:10:33 2020 +0800 + + * Fix project editing errors. + +commit 55b0a94586cf54ac3dcbc5442f7766a536bac722 +Author: Yagami <976204163@qq.com> +Date: Mon Sep 21 16:03:49 2020 +0800 + + * Fix code error. + +commit 9a5fccfa8a293bfacf25997865ed11757b81756b +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 21 15:53:48 2020 +0800 + + * Finish task #7931. + +commit 233e1ae7c7976d453c5d2b7f90596bf14c88c8e1 +Merge: 1033a3e484 2488c7ef93 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 21 15:52:23 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 1033a3e4843218edff10034331153c4cac39d6f8 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 21 15:51:39 2020 +0800 + + * Finish task #7931. + +commit 5b83f2d3f6c5c9f3c3ea5395f2ae0ec496634efd +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 21 15:48:34 2020 +0800 + + * Update project address. + +commit 264fb990a69111fa76a67da7a9203e4242ce0e46 +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 21 15:48:19 2020 +0800 + + * Adjust the display of the burn chart. + +commit 2488c7ef93a30fd7f9f46452d3f0c92add756f0b +Merge: 3f31a524b1 ef7027956d +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 21 15:43:58 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 3f31a524b14c275d6b4c70eaff4aa15c995dc4d5 +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 21 15:43:51 2020 +0800 + + * Adjust the display of the burn chart. + +commit cae62af3d049c3310e0f57df262887911fef3092 +Author: Yagami <976204163@qq.com> +Date: Mon Sep 21 15:28:34 2020 +0800 + + * Fix menu. + +commit ef7027956d2539ef0b8206c6e0a5eaa5ede50925 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 21 15:14:53 2020 +0800 + + * Finish task #8011. Fix bug 2610. + +commit a208608d8506032e72d84996e63258d7b70c6efe +Merge: 69ff276665 9d6cefd375 +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 21 15:10:51 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 69ff276665b8d43cb9ebababb0cbeaeccfed5e79 +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 21 15:10:42 2020 +0800 + + * Finish task#7934. + +commit 9d6cefd375fb671bc7c144e414ea3f0b66cac5c5 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 21 14:59:04 2020 +0800 + + * Create guide method to add comments. + +commit cc046270aaf21144dcd0dc84e1679767edf6a600 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 21 14:56:13 2020 +0800 + + * Project add type selection. + +commit 239ae2eefe9387812f50f7fc6bacc51048454378 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 21 14:39:35 2020 +0800 + + * Project add edit method. + +commit 7a7c587a6a4f3c5b6acbb6ab71104b994c42363b +Author: Yagami <976204163@qq.com> +Date: Mon Sep 21 14:36:04 2020 +0800 + + * Add create prj btn in program browse. + +commit 7c4cdf25a2270415d425807890828c4ad26b9e79 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 21 14:35:32 2020 +0800 + + * Finish task #7931. Fix bug #3424. + +commit 3af63928aa0b3ed9bb62356a257dc5bb05857b0c +Author: qiyu-xie +Date: Mon Sep 21 14:29:44 2020 +0800 + + * Finish task#7966. + +commit 52da0d9602550150f33ed7bab3df79487ebfdb09 +Author: qiyu-xie +Date: Mon Sep 21 14:25:37 2020 +0800 + + * Finish task#7966. + +commit 1e6785c1114eda00e6232ed156120422bf2fc03b +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 21 14:20:36 2020 +0800 + + * Finish task #7931. Fix bug #3424. + +commit 9757e21c75908b22fa8ed49018e9ad75e304f076 +Author: Yagami <976204163@qq.com> +Date: Mon Sep 21 13:20:57 2020 +0800 + + * Change program to PRJ. + +commit 911431ffaab263b529fd32d4d04614527cca36ae +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 21 11:20:42 2020 +0800 + + * Fixed the error of creating project page. + +commit 51819575063a83799ebcb20abe661ab6f6666b65 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 21 11:15:19 2020 +0800 + + * Perfect more projects. + +commit c867f000c9ecc44d20e9c0888045e6afd5404906 +Author: tianshujie98 +Date: Mon Sep 21 09:53:16 2020 +0800 + + * Finish task #8015. + +commit 3c93f0c5dc7db0c8188efc8a576d54c532a7814e +Author: tianshujie98 +Date: Mon Sep 21 09:48:41 2020 +0800 + + * Finish task #8015. + +commit 9297d89f3da43a85b2a158d2ec2aef8ad0ce47c5 +Merge: 81d2d87ca5 0f2633fcb3 +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 21 09:42:24 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0f2633fcb3a36c56eb9fbe729c7e544c9fdbc5cf +Author: tianshujie98 +Date: Mon Sep 21 09:37:16 2020 +0800 + + * Finish task #7923. + +commit 81d2d87ca5c1b5fc20ee2dd9ec496b2a0e01b174 +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 21 09:37:08 2020 +0800 + + * Finish task#7937. + +commit 56d2b29c1e9cde5894baa017767e6a59f497ea26 +Author: tianshujie98 +Date: Mon Sep 21 09:34:11 2020 +0800 + + * Finish task #7923. + +commit ebc6879d7c18c1cc75784d28a8147f1e9e145109 +Merge: 7462c9b885 e138e02ab0 +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 21 09:21:36 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 7462c9b885e8f9ca0656e99c3419d9a103ebd780 +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 21 09:21:25 2020 +0800 + + * Finish task#7937. + +commit d5bb93058915624c4e19ac6bcc77579d5ddd5cc8 +Author: leiyong <1549684884@qq.com> +Date: Sun Sep 20 23:27:44 2020 +0800 + + * Delete swp file. + +commit 94fae1d49ea71594f646e719b509bbaf084ef07e +Author: leiyong <1549684884@qq.com> +Date: Sun Sep 20 23:27:06 2020 +0800 + + * Add edit and copy method under project. + +commit 3550097dc8173dc224a06bb1090b6738f1af92d4 +Author: leiyong <1549684884@qq.com> +Date: Sun Sep 20 22:57:24 2020 +0800 + + * Add project authority management function. + +commit e138e02ab0a7c2f07db6df88cccac87dd29f6726 +Author: z +Date: Fri Sep 18 20:04:01 2020 +0800 + + * finish task #8019. + +commit 99fe956e4b3793d3f53253467a644fdef7d48b36 +Author: Yagami <976204163@qq.com> +Date: Fri Sep 18 16:48:19 2020 +0800 + + * Merge code. + +commit 4af76ea7f370c8ab7460a7bc9b8a19a5231653c6 +Author: Yagami <976204163@qq.com> +Date: Fri Sep 18 16:47:55 2020 +0800 + + * Merge code. + +commit c3dff67efc4927cb6e0cf9b330114cfa10b39da3 +Author: z +Date: Fri Sep 18 16:35:03 2020 +0800 + + * finish task #7925. + +commit 3351881259bd3676fec939df1e0e2df75e8dacc8 +Merge: 853fafe717 e9a11d4ee1 +Author: z +Date: Fri Sep 18 16:21:09 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit 853fafe71749d7d32af34b17f3cbcad0f52da591 +Author: z +Date: Fri Sep 18 16:20:14 2020 +0800 + + * finish task 7924. + +commit 04ad772d823c07ff310c4f912a077e03b2e12639 +Author: holan20180123 <56391770@qq.com> +Date: Fri Sep 18 15:18:47 2020 +0800 + + * Finish task #7956. Fix bug #3361. + +commit e9a11d4ee1c012305f7dfb76822688d6afa03e0a +Merge: c189483958 c23c2769f0 +Author: hufangzhou <746775970@qq.com> +Date: Fri Sep 18 15:15:23 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit c1894839580c3e857aa7faa72411bbac6da51abd +Author: hufangzhou <746775970@qq.com> +Date: Fri Sep 18 15:15:15 2020 +0800 + + * Finish task#7941. + +commit c23c2769f0956db365d9e150f96cde431c158d9c +Author: holan20180123 <56391770@qq.com> +Date: Fri Sep 18 15:13:40 2020 +0800 + + * Finish task #7956. Fix bug #3361. + +commit 09ee542ac95d8e8c442493b6f71b1aa761368e9f +Author: holan20180123 <56391770@qq.com> +Date: Fri Sep 18 14:47:25 2020 +0800 + + * Adjust get user function. + +commit a8103fd03e90a47746aab18517c90c92750772dc +Author: leiyong <1549684884@qq.com> +Date: Fri Sep 18 14:26:27 2020 +0800 + + * Add project creation method. + +commit ebc593c1c6b9fbaea172a0a2f41ad2c2ac626df5 +Author: holan20180123 <56391770@qq.com> +Date: Fri Sep 18 13:13:53 2020 +0800 + + * Finish task #7924. Fix bug #3446. + +commit 32444c956465259005535c16f015e3d1756e4ea6 +Author: tianshujie98 +Date: Fri Sep 18 13:10:48 2020 +0800 + + * Finish task #7990. + +commit 71632459fa33fcf7a32ecb7b648fdb4c9196b6c9 +Author: holan20180123 <56391770@qq.com> +Date: Fri Sep 18 13:06:54 2020 +0800 + + * Finish task #7924. Fix bug #3446. + +commit 2f12591e1380bf60e0fe089085344f97648f6cb9 +Author: tianshujie98 +Date: Fri Sep 18 11:38:03 2020 +0800 + + * Finish task #7990. + +commit 62e51b057a4962e6c436f877e6d5f7cccd7b7114 +Author: z +Date: Fri Sep 18 11:20:03 2020 +0800 + + * finish task #7922. + +commit 3e6c37b4dc852222ccfedd9e6cf590ad92bbe6a5 +Author: z +Date: Wed Sep 16 08:23:55 2020 +0800 + + * adjust include my.php position. + +commit dc52779039fa5d2b3ac35acc99be7fbbb36631e5 +Author: leiyong <1549684884@qq.com> +Date: Thu Sep 17 16:48:20 2020 +0800 + + * Improve project module. + +commit fc036c5d99b3bb6c61928db4f3926b11afc55dda +Author: Yagami <976204163@qq.com> +Date: Thu Sep 17 16:37:18 2020 +0800 + + * Finish task #7850,#7854. + +commit 001e036822f7f711a859e70ca54b1667b94203ba +Author: qiyu-xie +Date: Thu Sep 17 16:32:46 2020 +0800 + + * Finish task#7936. + +commit 1aca528db148d32fecba3753b89dc71f697e9a61 +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 17 16:20:04 2020 +0800 + + * Finish task #7917. + +commit 0a438c628d89ddb27317c02bbda4ba302471f947 +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 17 16:16:25 2020 +0800 + + * Finish task #7917. + +commit f7763163b0ec5dabe99505cb16c2ff30f3b547cd +Merge: e590c140b3 7397d07fbe +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 17 15:58:29 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit e590c140b3f51ec8a5ba2d157cc1d57d286a1148 +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 17 15:58:09 2020 +0800 + + * Finish task #7917. + +commit 04fe4a86c845ba534cc10c924ac610a6b213ff3f +Author: hufangzhou <746775970@qq.com> +Date: Thu Sep 17 15:03:30 2020 +0800 + + * Finish task#7969. + +commit 7397d07fbe3718bc47b473ae1ccb72bafed02c64 +Merge: f0e3a5e949 cb4b68c14b +Author: hufangzhou <746775970@qq.com> +Date: Thu Sep 17 14:55:55 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit f0e3a5e9493f14d4d019dfdeee8f0534058a8688 +Author: hufangzhou <746775970@qq.com> +Date: Thu Sep 17 14:55:47 2020 +0800 + + * Finish task#7969. + +commit cb4b68c14b40f6abc7298b96bd55c479d0cae52c +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 17 14:38:14 2020 +0800 + + * Finish task #7997. + +commit 4ce98a6eb1b2fe72ad34acce21abe4120e2405d7 +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 17 14:36:40 2020 +0800 + + * Finish task 7997. + +commit 8b01be5b0c2e2b158e865ca1539a322e3bf41783 +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 17 14:14:26 2020 +0800 + + * Finish task #7982. + +commit bb62616ba3086dc723e500d8767cca29b69a1f7a +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 17 14:11:50 2020 +0800 + + * Finish task #7982. + +commit 94c523972075f8237dd271d6e7af9b1f0098077f +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 17 11:37:14 2020 +0800 + + * Finish task #8018. + +commit 02ff58e4e1a8c982fba2990b08b1c96a67b202e2 +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 17 11:35:17 2020 +0800 + + * Finish task #8018. + +commit fa63b6dc43f9976c904f696674fdae3ab6e05601 +Author: qiyu-xie +Date: Thu Sep 17 11:20:05 2020 +0800 + + * Finish task#7948. + +commit 3298d24bbadbbfc3ad4471f159587983288745b3 +Author: qiyu-xie +Date: Thu Sep 17 11:13:43 2020 +0800 + + * Finish task#7948. + +commit 124647c340364820b21ae7681ef4c27d283b1043 +Author: qiyu-xie +Date: Thu Sep 17 10:40:25 2020 +0800 + + * Finish task#7948. + +commit 33004a4ba2417a9b68f7f7457a2af054020c591a +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 17 10:40:12 2020 +0800 + + * Adjust resource mistake. + +commit 3235db1db5fb5d25e135eed80a7ec0d56854010c +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 17 10:39:12 2020 +0800 + + * Finish task #7931. + +commit 72f203f0d196e11d0343928e475b9d174a46ba8d +Merge: e41293a86f be9537013f +Author: hufangzhou <746775970@qq.com> +Date: Thu Sep 17 10:38:05 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e41293a86f7dd9b755340f2b3415c7a3d03a3373 +Author: hufangzhou <746775970@qq.com> +Date: Thu Sep 17 10:37:57 2020 +0800 + + * Finish task#7938. + +commit b29a0798fcc7773000e27862e653ec4ba9c4db6a +Merge: 61bc92a6df 2842f00e51 +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 17 10:32:52 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 61bc92a6df929e28591de5a0c912c4583f77fa43 +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 17 10:32:29 2020 +0800 + + * Finish task #7931. + +commit 2842f00e51d26a94fb74d79d157d1e9982a67d86 +Author: tianshujie98 +Date: Thu Sep 17 10:23:19 2020 +0800 + + * Adjust code style. + +commit be9537013facabbd79147bb045439420549e040c +Author: tianshujie98 +Date: Thu Sep 17 10:22:02 2020 +0800 + + * Finish task #7946. + +commit 6479441957d3e06445b3075015ebe0bbf6b23bc2 +Author: tianshujie98 +Date: Thu Sep 17 10:17:34 2020 +0800 + + * Finish task #7946. + +commit 679f1a21514f2d79137df8f7a447361ec3a8b0f4 +Author: hufangzhou <746775970@qq.com> +Date: Thu Sep 17 09:56:45 2020 +0800 + + * Change chanzhi.ico. + +commit ac9998e67149f9f82754f9767023591918506f93 +Author: hufangzhou <746775970@qq.com> +Date: Thu Sep 17 09:55:39 2020 +0800 + + * Finish task#7950. + +commit 39b313ed53b94a877d4d10a3361a39b22b77aac7 +Merge: 93ace5a27d 4e67efa330 +Author: hufangzhou <746775970@qq.com> +Date: Thu Sep 17 08:46:11 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit 93ace5a27d5735a9cfe0f492ab84678acfd7d49e +Author: hufangzhou <746775970@qq.com> +Date: Thu Sep 17 08:46:03 2020 +0800 + + * Finish task#7950. + +commit 4e67efa330a8e3fd7e5d0fd025977769c1d065de +Author: tianshujie98 +Date: Thu Sep 17 08:23:11 2020 +0800 + + * Add notes. + +commit fec42aa3e5f02f44c514a5b7d8a000c5b3669088 +Author: tianshujie98 +Date: Thu Sep 17 08:21:04 2020 +0800 + + * Finish task #7944. + +commit e8875195b22e9cf9443eb4533636a094633cf2d7 +Author: tianshujie98 +Date: Thu Sep 17 08:14:38 2020 +0800 + + * Finish task #7944. + +commit 0d3cccda6340158b15ae5d90eed95b0ad91f11c7 +Author: hufangzhou <746775970@qq.com> +Date: Thu Sep 17 08:16:08 2020 +0800 + + * Add chanzhi.ico. + +commit b198528dfecf0c206149d7436e75e6919be1556d +Author: hufangzhou <746775970@qq.com> +Date: Thu Sep 17 08:15:00 2020 +0800 + + * Deleted chanzhi.ico. + +commit 779f9421af1c552afee2eb2dc61f6909860cd808 +Merge: ff19909161 1b911d2606 +Author: hufangzhou <746775970@qq.com> +Date: Wed Sep 16 17:40:14 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit ff1990916147907b8dee13dc0f8c998446b26073 +Author: hufangzhou <746775970@qq.com> +Date: Wed Sep 16 17:40:06 2020 +0800 + + * Finish task#7916. + +commit d15dfb9c67586a206e4cb46f207e2b25e1a47cac +Author: tianshujie98 +Date: Wed Sep 16 16:18:34 2020 +0800 + + * Finish task #7927. + +commit 1b911d260643d59aa150869c2c4af7c0a0258550 +Author: tianshujie98 +Date: Wed Sep 16 16:15:03 2020 +0800 + + * Finish task #7927. + +commit 99e966c4057914373c1194973b44c04e8b4e66ca +Author: qiyu-xie +Date: Wed Sep 16 16:03:48 2020 +0800 + + * Fix bug#3377. + +commit 681b6b4d9bb5604ca7a242e5071951a223d15e35 +Author: qiyu-xie +Date: Wed Sep 16 16:00:48 2020 +0800 + + * Fix bug#3425. + +commit 32fb838e3d948fe52930ad6055ee05aa08498777 +Author: tianshujie98 +Date: Wed Sep 16 16:00:21 2020 +0800 + + * Adjust the batch link stage code. + +commit 44eb729a9e9d58cc5983e3c228894adde5f89af9 +Author: qiyu-xie +Date: Wed Sep 16 15:58:22 2020 +0800 + + * Fix bug#3438. + +commit a53043cbf253f3d4e4d9d9e06f50d92c1890605d +Author: tianshujie98 +Date: Wed Sep 16 15:56:15 2020 +0800 + + * Add batch link stage judgment. + +commit 89cda99a6eea88424660b80d0a2fbe32dba2f752 +Author: qiyu-xie +Date: Wed Sep 16 15:52:36 2020 +0800 + + * Finish task#7929. + +commit a1fcff2a253de4f93160144628eccb42baf75ee9 +Author: qiyu-xie +Date: Wed Sep 16 15:45:19 2020 +0800 + + * Finish task#7929. + +commit 26b376fac8de9f744256444953c96940ac74c733 +Author: tianshujie98 +Date: Wed Sep 16 15:43:19 2020 +0800 + + * Restore the previous version. + +commit cfc4b6173b72ceee4ccc724bc083e8ead426db9b +Author: tianshujie98 +Date: Wed Sep 16 15:41:19 2020 +0800 + + * Restore the previous version. + +commit 7b7535237b4c827736acab1546ec17d1302efe22 +Author: tianshujie98 +Date: Wed Sep 16 15:15:09 2020 +0800 + + * Fix bug #3504. + +commit c840b9b857139225ea3e83410c9205fbba8b59e4 +Author: tianshujie98 +Date: Wed Sep 16 15:12:15 2020 +0800 + + * Fix bug 3405. + +commit 80dfeda677238c001026fa84ccbe369a5296ac86 +Author: tianshujie98 +Date: Wed Sep 16 15:01:20 2020 +0800 + + * Adjust code style. + +commit 7f4f1626db25ef8c83b3f616c0ccd5477971c17c +Author: tianshujie98 +Date: Wed Sep 16 14:58:44 2020 +0800 + + * Finish task #7994. + +commit a9013adc4ef7204e50fedee729992f611ef3c4ae +Author: tianshujie98 +Date: Wed Sep 16 14:55:06 2020 +0800 + + * Finish task #7994. + +commit 334260162aeed2cce474d01878b914c2e60058d6 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 16 14:50:55 2020 +0800 + + * Rename program lang. + +commit 685fbad61aab9b283ad2d510f1ed1546f2140596 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 16 14:53:48 2020 +0800 + + * Merge code. + +commit b55e9344ee1811039ba35cdb0103f9d9ae17cb24 +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 16 14:49:19 2020 +0800 + + * Adjust program lang . + +commit 97e787358b2563378aa8b6bfcbe0fa8cfab2146e +Merge: 831e4d7aff 2b9a3fb312 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 16 14:40:44 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 831e4d7aff6f95c7ddca8a98064fd916df819694 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 16 14:40:27 2020 +0800 + + * Finish task #7968. + +commit 5fdd5a4a9a5a803352ccecc40c2fdd28dc1d73d7 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 16 14:38:26 2020 +0800 + + * Finish task #7968. + +commit 2b9a3fb31236805fe860e5d0ceb7b2ed9b249a55 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 16 14:22:37 2020 +0800 + + * Move project list to program module. + +commit 0a0a23bac6118cbf454cb4dfe840dca73ec92d1f +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 16 14:14:39 2020 +0800 + + * Add page template. + +commit 484490eaa5f3dfa4b720c37e87963955af02cc8d +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 16 14:13:59 2020 +0800 + + * Add zdata to the database script automatically. + +commit d624251ab68579eb2b04d3dfe02f3987179c667e +Author: Yagami <976204163@qq.com> +Date: Wed Sep 16 14:05:13 2020 +0800 + + * Delete unused file and fix menu. + +commit c890125ee8e2a006b76abe895c33d1b4d072751b +Author: tianshujie98 +Date: Wed Sep 16 13:26:08 2020 +0800 + + * Finish task #7940. + +commit 51d4343a50d5273aa5063c2b64181f7dfcbf9bf8 +Author: tianshujie98 +Date: Wed Sep 16 13:22:15 2020 +0800 + + * Finish task #7940. + +commit 434c2d0616254c1cb90830dbe73f7331e71bc588 +Author: hufangzhou <746775970@qq.com> +Date: Wed Sep 16 13:07:41 2020 +0800 + + * Finish task#7918. + +commit cc36c64c5985f6a770b7000f0b8994d292623ecf +Author: hufangzhou <746775970@qq.com> +Date: Wed Sep 16 13:03:37 2020 +0800 + + * Finish task#7918. + +commit b945a8e30648b7f66159eb9ad17ddc1fce237080 +Author: tianshujie98 +Date: Wed Sep 16 11:30:56 2020 +0800 + + * Finish task #8031. + +commit 66f4f5403af45bb5eeb4a1f9736ab345aa27da23 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 16 11:28:39 2020 +0800 + + * Fix sql and rename program to PRJ. + +commit bd7838bebd562b9c233b28cf46864b1d909f9fc3 +Author: tianshujie98 +Date: Wed Sep 16 11:19:55 2020 +0800 + + * Finish task #8031. + +commit 143ada51062ce0db8320ff732fa46c8c4d89191f +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 16 11:09:57 2020 +0800 + + * Fix bug #8034. + +commit ee8d42ce3e83e4736eee78fba8f2db75a2dc036f +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 16 11:08:17 2020 +0800 + + * Fix bug #8032. + +commit 9c3d71fd04123b7777ca045db1edaf9ae52a1d9b +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 16 11:02:30 2020 +0800 + + * Fix bug 7914. + +commit 93c740c1ad5829b9e2d60eb85ad61756a375fa28 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 16 09:55:31 2020 +0800 + + * Fix bug #8032. + +commit 8edc1d2ec5ce469987e811ae51ef2a136019bdb8 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 16 09:55:10 2020 +0800 + + * Fix bug #8034. + +commit 1d7a38ab4ead0884d8f74f3da36b44dd47d22d76 +Author: tianshujie98 +Date: Wed Sep 16 09:28:02 2020 +0800 + + * Finish task #7957. + +commit 47b04f91b8e55509cffa8c71240f3bc5cdf9f250 +Author: tianshujie98 +Date: Wed Sep 16 08:53:47 2020 +0800 + + * Delete newline. + +commit e6fdef3c77d608c56a4f921bdc2074cd9f8e4487 +Author: tianshujie98 +Date: Wed Sep 16 08:46:44 2020 +0800 + + * Finish task #7957. + +commit ac8bb689b741db2a745f586821107a17ab061046 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 16 08:28:47 2020 +0800 + + * Change realStarted to realBegan. + +commit e6726d5b52eaa91eb197d0d0bb11a8566deca4f4 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 16 08:28:18 2020 +0800 + + * Change template to model. + +commit 6742ce5c157f58d0260edb226ae0baf9e59ebe48 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 16 08:27:29 2020 +0800 + + * Code for task #7901. + +commit 08c1428b30d535f635ff95b4714541f3db91f77f +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 15 17:20:19 2020 +0800 + + * Fix bug #7914. + +commit d82454cafb17f4e208329ed8eb5f994fc969892b +Author: Yagami <976204163@qq.com> +Date: Tue Sep 15 10:01:52 2020 +0800 + + * Finish task #7852. + +commit 93581b34b4edd3d42ab509cb401b946e562afcac (tag: zentaopms_12.4.2_20200915) +Author: z +Date: Tue Sep 15 09:52:17 2020 +0800 + + * add new version. + +commit 0940140b9d47da805610ce87e0defd36b3848896 +Author: z +Date: Tue Sep 15 09:06:36 2020 +0800 + + * adjust for ja lang. + +commit 36dcee74dac40cd9793051a8f3036c4d5d609af7 +Author: qiyu-xie +Date: Mon Sep 14 17:14:20 2020 +0800 + + * Fix bug#3377. + +commit c86d0327d66c405aada1fcfac2bfbfed07c311e9 +Author: qiyu-xie +Date: Mon Sep 14 16:35:12 2020 +0800 + + * Fix bug#3425. + +commit fe747783065e9200500db5c2cee988d54e4412fa +Author: qiyu-xie +Date: Mon Sep 14 16:11:53 2020 +0800 + + * Fix bug#3438. + +commit bdc908f858bce08322bf9ad282c138d140e5b6bd +Merge: bb3d5a2446 5df1ab65db +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 14 15:57:50 2020 +0800 + + Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x + +commit bb3d5a24463b2dca40f26961ec45461b85e26bf4 +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 14 15:57:41 2020 +0800 + + * Fix bug#3463. + +commit d3b3420aa1269895f5d5696ade03b818cd4f3734 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 14 15:44:30 2020 +0800 + + * Adjust zdata data. + +commit 03d1e43dac4d0c10a514a11ed7b3af4cdbca37d1 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 14 15:22:46 2020 +0800 + + * Fix add block type selection. + +commit fc526b3824732c3a760bfcf643c072c28744d74b +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 14 10:34:12 2020 +0800 + + * Add zoutput navigation menu. + +commit 753937ea45ce3c6092a6eda273282e8285e9a58d +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 14 10:31:55 2020 +0800 + + * Adjust block language items. + +commit 5df1ab65db0297bd331233db821ca255637cb0a0 +Author: tianshujie98 +Date: Mon Sep 14 10:10:05 2020 +0800 + + * Fix bug #3457. + +commit 1c02bd9377b1e11d8457d5bd85d81eb79e25dea9 +Author: tianshujie98 +Date: Mon Sep 14 10:04:31 2020 +0800 + + * Fix bug #3457. + +commit 9809766e12d8103c0adea2be66973736d07fe6f6 +Author: tianshujie98 +Date: Mon Sep 14 09:52:14 2020 +0800 + + * Fix bug #3457. + +commit 8405b4a70bbd1f328f6357eb1528b82880a31a0f +Author: tianshujie98 +Date: Mon Sep 14 09:47:54 2020 +0800 + + * Fix bug #3389. + +commit dda8e22f95cdb19ed3b61c8b67e500466d294324 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 14 09:26:00 2020 +0800 + + * Adjustment dashboard.js file comments. + +commit 859b8369165ff26e96836279d8a3208768b3dc81 +Author: z +Date: Sat Sep 12 10:53:36 2020 +0800 + + * adjust for ja lang. + +commit 5b8f0c4bc1ee5c1aebf342d79b4b6b3404046448 +Author: z +Date: Sat Sep 12 10:40:15 2020 +0800 + + + add ja lang. + +commit b9e61a1852a72c163535bcd39d57bf210c4fdfb9 +Author: tianshujie98 +Date: Fri Sep 11 16:53:16 2020 +0800 + + * Fix bug #3457. + +commit d5427507a6c38339e72d298b2f12ad82e2525730 +Author: leiyong <1549684884@qq.com> +Date: Fri Sep 11 16:20:04 2020 +0800 + + * Batch creation logic of adjustment problem module. + +commit dd4331be7c357f46a58ebb12d3efb92349926a9a +Author: tianshujie98 +Date: Fri Sep 11 15:33:57 2020 +0800 + + * Fix bug #3389. + +commit dc59b063a717edbba79ee9037df8d72ad3dd045d +Author: holan20180123 <56391770@qq.com> +Date: Fri Sep 11 15:23:23 2020 +0800 + + * Fix bug #3471. + +commit 76285c555610323900ee1806c9283007e5c683c9 +Author: tianshujie98 +Date: Fri Sep 11 14:53:54 2020 +0800 + + * Fix bug #3468. + +commit a40aad4a131a8707ef05ec5294924639519b43f8 +Author: tianshujie98 +Date: Fri Sep 11 14:47:52 2020 +0800 + + * Fix bug #3473. + +commit 5657235d84568d1a360ce7070539f4499318c765 +Author: tianshujie98 +Date: Fri Sep 11 14:44:29 2020 +0800 + + * Fix bug 3464. + +commit 64d45c32022723026232bccef696911c49f35c0b +Author: tianshujie98 +Date: Fri Sep 11 10:12:17 2020 +0800 + + * Fix bug #3468. + +commit ea578deb075dbfd6af479cab4816d6154da56676 +Author: hufangzhou <746775970@qq.com> +Date: Fri Sep 11 10:09:35 2020 +0800 + + * Fix bug#3469. + +commit 52f8271000b6e343b848bf07172729d1c519af2f +Author: tianshujie98 +Date: Fri Sep 11 09:53:13 2020 +0800 + + * Fix bug #3473. + +commit 66c636d771b95e0b15be8a2e2882d84e90061397 +Author: tianshujie98 +Date: Thu Sep 10 15:58:15 2020 +0800 + + * Fix bug #3464. + +commit ac196c81a8e6928b4e235b7f1fd0f9e6121f02ce +Author: Yagami <976204163@qq.com> +Date: Thu Sep 10 15:32:12 2020 +0800 + + * Fix zentao.sql. + +commit ce494052c51b8d2d1b486d6809b1d26f8837f87f +Author: Yagami <976204163@qq.com> +Date: Thu Sep 10 13:47:14 2020 +0800 + + * Fix my menu and framework control. + +commit 68b414ba7b57923d1bc779c67e130ea10701f30c +Author: Yagami <976204163@qq.com> +Date: Tue Sep 8 15:58:44 2020 +0800 + + * Fix zentao.sql. + +commit e21f170435c5277cb2f8c3c6c4b3daa105c0733b +Author: Yagami <976204163@qq.com> +Date: Tue Sep 8 15:40:57 2020 +0800 + + * Hide product menu when it's single program. + +commit c3fa50a5aaffe847b1cf87a0fbc22d6cebf1ecae +Author: leiyong <1549684884@qq.com> +Date: Thu Sep 10 09:03:03 2020 +0800 + + * Add a demo case for generating requirements. + +commit b856e8a2fcbf8a66eb8fddd6500d78591a672bfb +Author: leiyong <1549684884@qq.com> +Date: Thu Sep 10 08:56:41 2020 +0800 + + * Remove invalid fields in issue table. + +commit a2038434c72ee799aa03d2ba35e7235f56d551b9 +Author: Catouse +Date: Wed Sep 9 16:46:46 2020 +0800 + + * update jquery for security. + +commit bc25baec39ea27fe0de338c034e11aa3d8cb7640 +Author: Catouse +Date: Wed Sep 9 16:46:05 2020 +0800 + + * update jquery for security. + +commit fc71c2f4c47bf49a30a8d791a92ff76b7a19bb72 +Author: Catouse +Date: Wed Sep 9 16:29:26 2020 +0800 + + * fix dialog style. + +commit 9dcfeb12232428a2913fdaa71728618629c6bbcc +Author: Catouse +Date: Wed Sep 9 16:26:14 2020 +0800 + + * fix bug #3458, improve UI of navbar. + +commit d623ab7d505b638dedc0160e817dddeafe02b79f +Author: Catouse +Date: Wed Sep 9 16:19:47 2020 +0800 + + * fix UI of waterfallprogress block with some extreme data. + +commit e9a5fabe6558a145864d79cb14a09237774cb0df +Author: Catouse +Date: Wed Sep 9 15:59:51 2020 +0800 + + * improve UI of todo dialog view. + +commit a508f3d4b7e7f9532919d00b19805d0515ea0c51 +Author: z +Date: Wed Sep 9 15:01:30 2020 +0800 + + * code for task #7272. + +commit f368bfc28c9b385494781c3fcad176a7bc329a52 +Author: z +Date: Wed Sep 9 13:21:01 2020 +0800 + + * code for task #7846. + +commit 0e596fff881ebdae8601b03215bf4e8b7f22920a +Author: z +Date: Wed Sep 9 13:18:01 2020 +0800 + + * code for task #7846. + +commit b4ec0ccecc4034ed34a67844a5c5a850d04e967f +Author: z +Date: Wed Sep 9 11:15:11 2020 +0800 + + * finish task #7801. + +commit c7594b8f4affadffaa8456b6c3d5488c4fa177d7 +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 9 10:19:47 2020 +0800 + + * Adjust the GetList method of the program module. + +commit 9362e200b191860826065443ff3be0380183b29f +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 9 10:18:21 2020 +0800 + + * Add comments. + +commit a1c3ed392aae25b605dc1a07e7ffb22dce165851 +Author: z +Date: Wed Sep 9 10:12:45 2020 +0800 + + * finish task #7846. + +commit 9d263108e15dd26cc551343e318052c458e9547d +Author: tianshujie98 +Date: Wed Sep 9 09:54:42 2020 +0800 + + * Fix bug #3460. + +commit 34fb096e9674e34ef556d68db6180980357cc085 +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 9 09:47:39 2020 +0800 + + * Adjust issue operation button. + +commit d27efffa6d92a4ad13d7ee5a7b555a6c467c95c9 +Author: tianshujie98 +Date: Wed Sep 9 09:09:47 2020 +0800 + + * Fix bug #3464. + +commit 6b9473421a16cb4f760824c282c45b5e2a591a43 +Merge: fb1508af9b 72e9c907fe +Author: hufangzhou <746775970@qq.com> +Date: Wed Sep 9 08:15:43 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fb1508af9b62d6a2f6537dcaf502ac10a9b7148d +Author: hufangzhou <746775970@qq.com> +Date: Wed Sep 9 08:15:32 2020 +0800 + + * Fix bug#3462. + +commit 72e9c907fe0cd65167f477041155aedcb481d2d5 +Author: tianshujie98 +Date: Wed Sep 9 08:11:46 2020 +0800 + + * Delete duplicate defined variables. + +commit 10ba5601c399d7a1c181315c3866ff0ae9e73739 +Author: tianshujie98 +Date: Wed Sep 9 08:03:29 2020 +0800 + + * Delete duplicate judgments. + +commit 65347ec6b3bd0ac9a87b627285f3b6a0fd730e71 +Author: tianshujie98 +Date: Tue Sep 8 17:29:30 2020 +0800 + + * Fix bug #3442. + +commit d881eac76d3254d771bd9a0a427f2a38583d5ded +Merge: 5270efba7c f035d6af3e +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 8 17:26:57 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5270efba7c9dd8fa1c219fcae294a5e1980bb4e8 +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 8 17:26:30 2020 +0800 + + * Adjust block method name. + +commit f035d6af3ecfb002a41a72f534f91d81eab45b91 +Author: qiyu-xie +Date: Tue Sep 8 17:20:22 2020 +0800 + + *Fix testtask module lang. + +commit 31f210b184f21797b6b550ec0aad5f2f5e85f5ad +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 8 17:18:15 2020 +0800 + + * Adjust story create. + +commit d88aa36e4ebae41259f4830a47142658c9c0d524 +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 8 17:13:52 2020 +0800 + + * Adjust js create story. + +commit 05d004c96ca72184bca47ba346edae6c08ef04ec +Author: qiyu-xie +Date: Tue Sep 8 15:52:24 2020 +0800 + + * Modify story affected . + +commit 6edacf05784f46627ea2ab2f0edc98e1fc486da8 +Author: tianshujie98 +Date: Tue Sep 8 15:21:32 2020 +0800 + + * Solve the problem of manpower input block. + +commit abf06f36a7d1c8c67654b750f5b802ebb70b0a92 +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 8 14:55:09 2020 +0800 + + * Fix bug #3453. + +commit a041fc902782afe571685306d2be0aa5fc4f0a5c +Merge: 719e7dde6f dcd63631a4 +Author: tianshujie98 +Date: Tue Sep 8 14:16:30 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 719e7dde6f90a5f95e45d4bb8b2b4b72272031bf +Author: tianshujie98 +Date: Tue Sep 8 14:13:01 2020 +0800 + + * Search and add product conditions. + +commit c2c14a88c94ffcafe80f628290804f02a94273ed +Author: z +Date: Tue Sep 8 13:50:08 2020 +0800 + + * code for task #7799. + +commit dcd63631a4860b903181166994e8f4820c7aad2c +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 8 13:29:26 2020 +0800 + + * Adjust button for productplan. + +commit bc92db2f3f125d335dece378453c220e57b6398e +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 8 13:26:54 2020 +0800 + + * Adjust check project type. + +commit f4bdb1e553844367663de67a63f78c7736cc28af +Author: z +Date: Tue Sep 8 13:23:22 2020 +0800 + + * fix bug for copy task. + +commit 92e82e95fbabcd05a87a81632df4b78485b3979a +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 8 13:02:42 2020 +0800 + + * Adjust goback button story report. + +commit a9f583af1d6686890e49d8baef20c4d518f9b939 +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 8 10:37:50 2020 +0800 + + * Adjust create story. + +commit 3d2649560553ddf706402dc5fd32b515d898785c +Author: z +Date: Tue Sep 8 10:25:59 2020 +0800 + + * finish task #7806. + +commit 84739d8918ab518f3fc4d509f7c4fad5b237f214 +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 8 09:46:30 2020 +0800 + + * Adjust update SQL. + +commit 033b9bf2f47ff2c4e0523e6424768f4eebd96466 +Merge: f2bcc2f19c 21bffe7e69 +Author: tianshujie98 +Date: Tue Sep 8 09:28:56 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f2bcc2f19c95431f355d188e3d38caa12be2e0d7 +Author: tianshujie98 +Date: Tue Sep 8 09:27:22 2020 +0800 + + * Fix bug #3456. + +commit 21bffe7e6975d5a04e206873ed3a57ff0c8aa786 +Author: Yagami <976204163@qq.com> +Date: Mon Sep 7 17:05:57 2020 +0800 + + * Fix common en lang. + +commit 7327889f8b850b22e4ddc1ca54e62941647c7f05 +Author: qiyu-xie +Date: Mon Sep 7 16:55:52 2020 +0800 + + *Add custom module lang. + +commit 9d90298343b2177598add636b82f5a5961a7c8fe +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 7 16:47:16 2020 +0800 + + * Adjust issue solving jump page. + +commit af483277dfe952090b0362eacc3397de0fb57dd5 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 7 16:34:17 2020 +0800 + + * Repair transfer task get assignor. + +commit 8ea64aa593b241c5e34654a1758437622c8b550b +Author: qiyu-xie +Date: Mon Sep 7 16:30:43 2020 +0800 + + *Fix story module lang. + +commit d8b1dc61cbe834675b7081682c021c55657e1994 +Author: qiyu-xie +Date: Mon Sep 7 16:25:12 2020 +0800 + + *Fix programplan module lang. + +commit 0ccd1fd1440e800738bb336c2656e099b415825b +Author: qiyu-xie +Date: Mon Sep 7 16:22:18 2020 +0800 + + *Fix custom module lang. + +commit 53b9a2d3e04f4ec9633b8346fab63607f5f39a2f +Merge: 034173196c 4c2fe91237 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 7 16:16:06 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 034173196cde5dedf49f5f68affe33ab6da5b13d +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 7 16:15:45 2020 +0800 + + * Fix issue to story error. + +commit 4c2fe91237fbca9e921014484ea46a444ab71b81 +Author: qiyu-xie +Date: Mon Sep 7 16:08:25 2020 +0800 + + *Fix block module lang. + +commit ae38861944266a6880ca2d338974163a4d8b56a7 +Author: z +Date: Mon Sep 7 16:00:46 2020 +0800 + + * finish task #7809. + +commit e839e2df007f95746c106360b7060a97e7bc08a0 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 7 15:59:57 2020 +0800 + + * Finish task#7844. + +commit abd0dae91ac0812fede566c7ea81ff914e062365 +Author: z +Date: Mon Sep 7 15:57:43 2020 +0800 + + * fix notice. + +commit 5bce51622bbf718d2749740316e90174e0e58a06 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 7 15:35:54 2020 +0800 + + * Adjust estimate unit settings. + +commit 10a9a84dd360830131f71b74490eef420578214b +Author: tianshujie98 +Date: Mon Sep 7 15:22:05 2020 +0800 + + * Modify the judgment when the code base is empty. + +commit 36d7cb1c9d36002685422b3ba4d2ca717e6c3a87 +Author: Yagami <976204163@qq.com> +Date: Mon Sep 7 15:00:57 2020 +0800 + + * Fix progress report style. + +commit 11482ee6b7c2d474f078dd5bcfbdb6add35d7f73 +Author: Yagami <976204163@qq.com> +Date: Mon Sep 7 14:53:04 2020 +0800 + + * Change storyChanged to URChanged. + +commit d0a5deac9a954219f6e4142342510507314c04df +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 7 14:41:59 2020 +0800 + + * Fix errors in estimation settings. + +commit ad767645ffbb2800cae076412b30920039eebd18 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 7 14:28:05 2020 +0800 + + * Finish task #7824. + +commit aaab4f691aeadd08f9e3f40206c306ca2b667ef8 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 7 14:23:36 2020 +0800 + + * Finish task #7832. + +commit 075b9e6247a97204eeb3356ac94393ad0b102d7e +Author: Yagami <976204163@qq.com> +Date: Mon Sep 7 14:17:16 2020 +0800 + + * Fix menuorder. + +commit 37b7745daf34aef2989e978d04bc0de28b30cb09 +Author: Yagami <976204163@qq.com> +Date: Mon Sep 7 13:23:52 2020 +0800 + + * Finish task #7826. + +commit 11bc9076ac69dace191ad3a03f16b913d308c4fe +Author: Yagami <976204163@qq.com> +Date: Mon Sep 7 14:12:29 2020 +0800 + + * Code for task #7825. + +commit d63e8916ea2d3e1d9370a6041d003fbd074bf14c +Author: Yagami <976204163@qq.com> +Date: Mon Sep 7 09:06:15 2020 +0800 + + * Add empty line. + +commit 9a2bbae61983467dcfb7b5fc971e14f72ba7b267 +Author: tianshujie98 +Date: Mon Sep 7 14:13:42 2020 +0800 + + * Finish task #7813. + +commit dbd1c8ed229884176c743b83f6a3d1428f7e3b1d +Author: qiyu-xie +Date: Mon Sep 7 14:09:20 2020 +0800 + + *Click the start button in the programplan has no effect. + +commit 7b224fd95f1e101843d202685a3adabe02efdd3d +Author: z +Date: Mon Sep 7 14:06:04 2020 +0800 + + * finish task #7803. + +commit e6c5101606077c7243dc29b1a2be054733c7036b +Merge: 801aab0878 48f9be8177 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 7 13:54:37 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5a5119fdbcff661f5b65dc759e2edd97d4b83e11 +Author: z +Date: Mon Sep 7 13:48:31 2020 +0800 + + * finish task #7810. + +commit 48f9be817776a9fcfe0e7aa64dabea69890696ae +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 7 13:47:19 2020 +0800 + + * Finish task#7842. + +commit 801aab0878d4655e4c45e8f0d2e50485e2fc7040 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 7 13:34:13 2020 +0800 + + * Finish task #7820. + +commit 0d3d4f5e2e0209368141c90bd2b49d5d157c2b09 +Author: tianshujie98 +Date: Mon Sep 7 13:32:02 2020 +0800 + + * Fix comment. + +commit 310e44b47282d0fe304e1728932ff68f9d899379 +Author: z +Date: Mon Sep 7 11:39:54 2020 +0800 + + * finish task #7296. + +commit 6b28649bddda2019da6fc781979383cc23617cf7 +Author: z +Date: Mon Sep 7 11:38:56 2020 +0800 + + * adjust for get story version. + +commit 497ae934a80067473f1b8040946da38f13eb444d +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 7 11:30:15 2020 +0800 + + * Finish task #7817. + +commit 2db2b4012712724a06ec996ad53bc25178cc528b +Merge: 3dbbef7291 0eb5658bb7 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 7 11:08:57 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3dbbef729118d5d8c286995c9710189bebfeab9f +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 7 11:00:32 2020 +0800 + + * Finish task #7843. + +commit 0eb5658bb7b9dcb695a27c0151de631eeaf835b7 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 7 10:57:45 2020 +0800 + + * Finish task#7815. + +commit 74596b84e0f4ba4b15628547cab732d72bb71255 +Author: z +Date: Mon Sep 7 10:42:15 2020 +0800 + + * finish task #7286. + +commit 569e0e0e4be27ae953783189949cb9449fd045a3 +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 7 10:33:39 2020 +0800 + + * Finish task #7821. + +commit 229dc9bee802bf84bb6b8d8140baa0330cd47975 +Author: leiyong <1549684884@qq.com> +Date: Mon Sep 7 10:15:34 2020 +0800 + + * Finish task#7735. + +commit c5a6cfd5aa275edbe8f8f69f48ccc672b21ead72 +Author: z +Date: Mon Sep 7 10:09:59 2020 +0800 + + * finish task #7802. + +commit d769b870047ecb96564d803048501229b0288627 +Author: tianshujie98 +Date: Mon Sep 7 09:56:52 2020 +0800 + + * Finish task #7829. + +commit 2a95891667569ad5b9b7d93f43ab65fdf600eafd +Author: tianshujie98 +Date: Mon Sep 7 09:41:04 2020 +0800 + + * Finish task #7822. + +commit b3fa8984182bbc20868f94ce93e92dbb074c5d80 +Author: tianshujie98 +Date: Mon Sep 7 09:38:42 2020 +0800 + + * Finish task #7822. + +commit 2da0b392c2225605cdc9ff89f1e573cd2bc9689e +Author: tianshujie98 +Date: Mon Sep 7 09:31:30 2020 +0800 + + * Finish task #7830. + # Please enter the commit message for your changes. Lines starting + +commit c28874dc069f8ac55d8c616b2d78d20e77bffa54 +Author: tianshujie98 +Date: Mon Sep 7 09:24:03 2020 +0800 + + * Finish task #7836. + +commit d0ea3125b44142c9aaffb4a44d3fa21416a59657 +Merge: 97dc590a1b 8de41295ad +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 7 09:22:42 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 97dc590a1b1db73efd277398fb054e8ef19dd22f +Author: hufangzhou <746775970@qq.com> +Date: Mon Sep 7 09:22:32 2020 +0800 + + * Finish task#7818. + +commit 8de41295ad7eb75ee51994fb0518d735bc2983ae +Author: z +Date: Mon Sep 7 09:19:35 2020 +0800 + + * finish task #7819. + +commit df31aa463865852037a450e61af94ad3d1243612 +Author: z +Date: Mon Sep 7 09:17:15 2020 +0800 + + * finish task #7835. + +commit ab2f1d5b558bd0c2f28bc102abcfdd07729e870c +Author: holan20180123 <56391770@qq.com> +Date: Mon Sep 7 09:15:12 2020 +0800 + + * Finish task 7816. + +commit 04217aa2bb4a9336da28e17236890650d5f64e67 +Author: tianshujie98 +Date: Mon Sep 7 08:53:07 2020 +0800 + + * Add table fields. + +commit b257cd08dea6dd7a423e46675e4e1b6146fb7bde +Author: Yagami <976204163@qq.com> +Date: Mon Sep 7 08:17:11 2020 +0800 + + * Adjust code style. + +commit 05d84a4e6d48335ceed67e513a7c15b9b596551c +Author: holan20180123 <56391770@qq.com> +Date: Fri Sep 4 13:53:42 2020 +0800 + + * Adjust singular to plural for contribute. + +commit 7fd5c7d55c6b767ec10ac6b5aa8f81200d449257 +Author: tianshujie98 +Date: Fri Sep 4 13:47:52 2020 +0800 + + * Fix bug #3442. + +commit 966ec4c0c96bdcb1803bb099df413df62d0323cc +Author: leiyong <1549684884@qq.com> +Date: Fri Sep 4 13:46:53 2020 +0800 + + * Fix bug#7735. + +commit 6e2557024c5514b99316cbd553b881b40efdc352 +Author: leiyong <1549684884@qq.com> +Date: Fri Sep 4 13:23:36 2020 +0800 + + * Fix bug#3444. + +commit fa2690d046e5b1160ce40345054a5b71f4e57dbd +Author: qiyu-xie +Date: Fri Sep 4 09:53:58 2020 +0800 + + *Fix bug view and testcase view product jump issues. + +commit 73de383ff75686bd66a5ff97f63932587f82be9e +Merge: 70ea629f09 d5f08bea50 +Author: leiyong <1549684884@qq.com> +Date: Fri Sep 4 09:52:22 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 70ea629f0978faad57c432d12d3112923a48593d +Author: leiyong <1549684884@qq.com> +Date: Fri Sep 4 09:51:49 2020 +0800 + + * Issue transferred to risk record action. + +commit d5f08bea506e145c4521a17fd3e4b6b567f624be +Author: holan20180123 <56391770@qq.com> +Date: Fri Sep 4 09:51:09 2020 +0800 + + * Adjust risk comment. + +commit 9abef9b3c70b8c819e0fb144b6d7501b79f164e0 +Author: Yagami <976204163@qq.com> +Date: Fri Sep 4 09:48:36 2020 +0800 + + * Adjust var name. + +commit b47e7b39c0680980df419703526137dae883f31a +Author: tianshujie98 +Date: Fri Sep 4 09:47:29 2020 +0800 + + * Adjust create.html.php code. + +commit c6116c1b9e7e8ed988a0b4de95f958de9ab74761 +Author: z +Date: Fri Sep 4 09:45:42 2020 +0800 + + * finish task #7800. + +commit eb5925c6602ee5859daeddb9241f28a138fa10fd +Author: tianshujie98 +Date: Fri Sep 4 09:43:39 2020 +0800 + + * Adjust variable. + +commit 9361c2a9d95d8b056312899526f2434c634fc8df +Author: tianshujie98 +Date: Fri Sep 4 09:34:34 2020 +0800 + + * Modify sql statement. + +commit 946baefefb48c48ad8cce9f05892896f168633b2 +Author: leiyong <1549684884@qq.com> +Date: Fri Sep 4 09:27:23 2020 +0800 + + * Fix issue module resolve error. + +commit d1d4da95cab95bf22a8b6ddc1cca0934d6750523 +Author: tianshujie98 +Date: Fri Sep 4 09:25:06 2020 +0800 + + * Edit comment. + +commit d63be505c13a8e9d187170c991400bb3632f5d0a +Author: tianshujie98 +Date: Fri Sep 4 09:19:37 2020 +0800 + + * Edit comment. + +commit 831d27e2c09aa2cab6593a3e7ca42f9cbf73dde1 +Merge: f2b95366f9 e7c8de3964 +Author: z +Date: Fri Sep 4 09:16:09 2020 +0800 + + Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x + +commit e7c8de396476e71a2ed973ceff597739a0e84296 +Author: qiyu-xie +Date: Fri Sep 4 09:14:46 2020 +0800 + + * Fix bug #3342. + +commit f2b95366f9f8938ecdde0ae80fa0620437de36d6 +Author: z +Date: Fri Sep 4 09:13:31 2020 +0800 + + * fix bug #3439. + +commit 61d89e8073954ca04f0d1c3f6d406a81492e2e4f +Author: holan20180123 <56391770@qq.com> +Date: Fri Sep 4 09:09:36 2020 +0800 + + * Adjust risk comment. + +commit da83c442fd5381af61aff90983f3d7c078347468 +Author: tianshujie98 +Date: Fri Sep 4 08:31:41 2020 +0800 + + * Adjust code order. + +commit 24b8fe642b6d5e39a954ef5e69d7012a55cea361 +Author: tianshujie98 +Date: Thu Sep 3 17:43:46 2020 +0800 + + * Remove spaces. + +commit e61eb3eca16e5a2231796940dc1b34287201924c +Author: tianshujie98 +Date: Thu Sep 3 17:38:41 2020 +0800 + + * Remove spaces. + +commit 8c0ce02ac6ee1b662150c05e25134a83f27fb32c +Author: tianshujie98 +Date: Thu Sep 3 17:35:37 2020 +0800 + + * Remove spaces. + +commit 65c55d042f46ff0523d6c680c4b6d9f0f09b9c23 +Author: leiyong <1549684884@qq.com> +Date: Thu Sep 3 17:37:39 2020 +0800 + + * Fix bug#3395,bug#3394,bug#3393,bug#3392. + +commit 11115204812d242f615b4d7cdfd4498c2f70c09f +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 3 17:33:21 2020 +0800 + + * Adjust doc browse. + +commit d9db4ced519bab6a012c18ba89b40464a160d9df +Author: tianshujie98 +Date: Thu Sep 3 17:33:02 2020 +0800 + + * Modify English language items. + +commit b7eee0e41a47d6fc0ca7febdc50c560868daeaef +Author: tianshujie98 +Date: Thu Sep 3 17:31:43 2020 +0800 + + * Modify English language items. + +commit 29b606efdb6255ee96f1159a61f7c64896eca48a +Author: tianshujie98 +Date: Thu Sep 3 17:30:16 2020 +0800 + + * Modify English language items. + +commit d659b2aa48cb1386778cc3d0401b0c8fbd10a9a7 +Author: tianshujie98 +Date: Thu Sep 3 17:28:52 2020 +0800 + + * Modify English language items. + +commit adaf912eee8c019332865c3b936bbfadc65e11c4 +Author: tianshujie98 +Date: Thu Sep 3 17:27:15 2020 +0800 + + * Modify English language items. + +commit 05af2225ca89900d0b4128095e03c3dbe955f405 +Author: tianshujie98 +Date: Thu Sep 3 17:25:23 2020 +0800 + + * Modify English language items. + +commit 2bf2ce57a810106cd9ef906bd90fd72aa88e0893 +Author: tianshujie98 +Date: Thu Sep 3 17:24:41 2020 +0800 + + * Modify English language items. + +commit addd9323a153af17a10aaba546f97ee14c707ccb +Author: hufangzhou <746775970@qq.com> +Date: Thu Sep 3 17:22:33 2020 +0800 + + * Fix bug#3417. + +commit bcd72e4fabee4fad88efca257c95ad379768619f +Merge: c80bc3d36b 53c5f955f8 +Author: hufangzhou <746775970@qq.com> +Date: Thu Sep 3 17:00:24 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c80bc3d36bd044c5307ecf1e4cdb6286429ffca3 +Author: hufangzhou <746775970@qq.com> +Date: Thu Sep 3 17:00:13 2020 +0800 + + * Fix a bug. + +commit 0244080f1a78607fa802b60acb9e8b81dfd956a7 +Author: z +Date: Thu Sep 3 16:59:00 2020 +0800 + + * finish task #7798. + +commit 53c5f955f83319b245a0c9da19973ae631de22ca +Author: Yagami <976204163@qq.com> +Date: Thu Sep 3 16:54:11 2020 +0800 + + * Fix programplan create js error. + +commit 4a8bd8669f7e59d653bfb2369e4260a2c1288416 +Author: Yagami <976204163@qq.com> +Date: Thu Sep 3 16:32:40 2020 +0800 + + * Delete unused lang. + +commit 8e2f4654c4f04ff4895a94331a6b356da5eb98fa +Author: z +Date: Thu Sep 3 16:32:16 2020 +0800 + + * finish task #7795. + +commit 40dbb5b53a2deb5f44c9d4fd6f22fe0eb55ff527 +Author: z +Date: Thu Sep 3 16:01:51 2020 +0800 + + * code for task #12372. + +commit 442d4bedadf9f7849012cf9b6d7216a4b9413a5c +Author: qiyu-xie +Date: Thu Sep 3 16:13:32 2020 +0800 + + *Fix bug #3387. + +commit 669990f69f1cbfe2edbc511fe6221210f58e5494 +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 3 16:11:42 2020 +0800 + + * Adjust add testtask. + +commit 1239df269123eb76d7b204de092594c4739bb038 +Author: Yagami <976204163@qq.com> +Date: Thu Sep 3 15:54:07 2020 +0800 + + * Adjust testreport code style. + +commit 0a46aa55127d416a113d80b16ddc6b13171222ef +Author: hufangzhou <746775970@qq.com> +Date: Thu Sep 3 15:54:12 2020 +0800 + + * Fix problems found in code review. + +commit bfbd856b412bee2bc8c4814bf454758c847a3e69 +Author: Yagami <976204163@qq.com> +Date: Thu Sep 3 15:13:19 2020 +0800 + + * Fix comment and code style. + +commit 9ef26b65387434fa6c73d6c4602f2423ac833089 +Author: Yagami <976204163@qq.com> +Date: Thu Sep 3 15:13:00 2020 +0800 + + * Fix code logic. + +commit 27103141ef0530d8ca728fd103128ce3b075f4c2 +Author: Yagami <976204163@qq.com> +Date: Thu Sep 3 15:12:05 2020 +0800 + + * Adjust common lang code style. + +commit e584f2780b51daa5ac81b0866f82a433e11143bf +Author: Yagami <976204163@qq.com> +Date: Thu Sep 3 15:11:38 2020 +0800 + + * Adjust design code style. + +commit 4914626e51f7aee3483315c38173c59ae6783488 +Author: tianshujie98 +Date: Thu Sep 3 11:04:08 2020 +0800 + + * Add human input language item. + +commit 8041e2dc32049f89df9a0077d43883a2fdc47095 +Author: Yagami <976204163@qq.com> +Date: Thu Sep 3 10:47:43 2020 +0800 + + * Fix edit a block error. + +commit a3528943e759fea8cff602f41c778f9938350939 +Author: tianshujie98 +Date: Thu Sep 3 10:23:29 2020 +0800 + + * Checkout program block. + +commit afdf4c20c71f8222e44857694ffa5b573fb1388d +Merge: f0e7160544 9ccb3b9d02 +Author: Yagami <976204163@qq.com> +Date: Thu Sep 3 10:00:17 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f0e71605445c6f332d9259e82a95638359e3e870 +Author: Yagami <976204163@qq.com> +Date: Thu Sep 3 09:56:46 2020 +0800 + + * Delete plan config. + +commit 9ccb3b9d02ff5e02ac8191609d8d822964a1ce9e +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 3 09:54:25 2020 +0800 + + * Adjust select user for project tree. + +commit d2d82ad0679b8f76d8031d677bc50df2aabccc47 +Author: leiyong <1549684884@qq.com> +Date: Thu Sep 3 09:46:30 2020 +0800 + + * Fix add block error. + +commit aed7e1e4ab401774b06537fe702b52ec28bde20b +Author: leiyong <1549684884@qq.com> +Date: Thu Sep 3 09:43:52 2020 +0800 + + * Fix issue module error. + +commit b9ae235a03e9e4bc1cf057df837c239d62e6c637 +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 3 09:40:56 2020 +0800 + + * Adjust custom menu. + +commit daf0e233835a4f6da7577d79279c9364b6e1f05f +Author: tianshujie98 +Date: Thu Sep 3 09:22:38 2020 +0800 + + * Delete spaces. + +commit 105cd2bc9764bb609b664337f8ee347de90d7183 +Merge: 38dc923f6f 2a68c386aa +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 3 09:22:05 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 38dc923f6f226adb1d131450ab0bdead4691b8de +Author: holan20180123 <56391770@qq.com> +Date: Thu Sep 3 09:21:30 2020 +0800 + + * Adjust lang of common module. + +commit 2a68c386aa512fab418b92a41c5d6afb538503ed +Author: tianshujie98 +Date: Thu Sep 3 09:19:37 2020 +0800 + + * Checkout program block. + +commit f2d93a127a373e597118b22384f15bdbdd7bdc06 +Merge: 87eac32c1f 57aec25663 +Author: Yagami <976204163@qq.com> +Date: Thu Sep 3 09:19:52 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 87eac32c1f291ddc64dea3a222762edc2aaa6383 +Author: Yagami <976204163@qq.com> +Date: Thu Sep 3 09:19:33 2020 +0800 + + * Fix holiday iframe style. + +commit 57aec256630c11a78671704d542f3a32f94b8f7d +Author: qiyu-xie +Date: Thu Sep 3 07:55:58 2020 +0800 + + *Fix block module lang. + +commit 5c50e165a4764c97ed238aa35f5cbfb06cc40334 +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 2 23:27:55 2020 +0800 + + * Finish task#7746,task#7745,task#7743. + +commit 47642ededd4f9801187d954392f0c4131a139e21 +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 2 23:26:46 2020 +0800 + + * Adjust URAndSR Judgment condition. + +commit 082bb619a6b1334118351afebc7b42ccf5611a27 +Merge: 3fa7648dba 15e7671dec +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 2 23:23:40 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 15e7671dec39b7edfe0543c816bd38d022619223 +Author: tianshujie98 +Date: Wed Sep 2 17:39:39 2020 +0800 + + * Fix project estimate block and progress chart block. + +commit 938c6efe871b5531bb509de5d792a27f5aa36076 +Author: tianshujie98 +Date: Wed Sep 2 17:18:48 2020 +0800 + + * Fix project report block. + +commit 8d680c3969625664a33c0b1778a9e2b6b3d1d937 +Merge: 4e9e558ff1 9cf1201ae1 +Author: hufangzhou <746775970@qq.com> +Date: Wed Sep 2 16:40:58 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4e9e558ff145d63cfcef3d7306dca9224650b48b +Author: hufangzhou <746775970@qq.com> +Date: Wed Sep 2 16:40:47 2020 +0800 + + * Fix bug#3410. + +commit 9cf1201ae132202ad45d7f41bc28f818c17569d4 +Author: qiyu-xie +Date: Wed Sep 2 16:18:44 2020 +0800 + + *Fix story module lang. + +commit 1c6a07027f5d20786a666b7c3b89aad8ca413864 +Author: tianshujie98 +Date: Wed Sep 2 16:14:51 2020 +0800 + + * Fix project risk block. + +commit 6fd33f75b3b2e1564fe28f10432c84b991c04ae1 +Author: tianshujie98 +Date: Wed Sep 2 15:59:42 2020 +0800 + + * Fix project problem block. + +commit b0c696cc5bc4ea1bf169309d17f18bc6d8003af6 +Author: qiyu-xie +Date: Wed Sep 2 15:49:32 2020 +0800 + + * Fix bug#3387. + +commit 582101fe806fb4dcdf7e5386640b3b9cfa644df1 +Merge: 0c3c03cc9d 7a145d5086 +Author: hufangzhou <746775970@qq.com> +Date: Wed Sep 2 15:42:06 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0c3c03cc9d2b7030f524de67e20a5f3a62051510 +Author: hufangzhou <746775970@qq.com> +Date: Wed Sep 2 15:41:50 2020 +0800 + + * Fix bug#3415. + +commit 7a145d5086b8f1ffc126d0f818fe5b35a0272aa9 +Merge: 9840e40c0b f21aee1662 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 2 15:26:10 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9840e40c0bd11e5c7bf8c7350f1795570d9d47ed +Author: Yagami <976204163@qq.com> +Date: Wed Sep 2 15:25:40 2020 +0800 + + * Add story and requirement change method. + +commit f21aee1662b93e93a6dac64c61068295b28d0a6f +Author: tianshujie98 +Date: Wed Sep 2 15:17:30 2020 +0800 + + * Repair project manpower input block. + +commit f5f85325b5f083d44598839d5c134266ddf86700 +Author: z +Date: Wed Sep 2 14:45:40 2020 +0800 + + * fix for setSentStatus. + +commit 25ffb0c220edb07401c5de785f883f3bbf666a10 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 2 14:43:38 2020 +0800 + + * Adjust holiday modal style. + +commit d9dbbad25b7c480b14795d9ff35cb9995406c26d +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 2 14:37:50 2020 +0800 + + * Adjust story and testcase page for my module. + +commit 7877f31e6f885169f632d59ed7f502977495f96f +Author: qiyu-xie +Date: Wed Sep 2 14:19:09 2020 +0800 + + *Fix common module lang. + +commit 59fcfac22054d7e1cede150209cc274e876c96de +Author: qiyu-xie +Date: Wed Sep 2 14:10:29 2020 +0800 + + *Fix story module lang. + +commit bed1ed4c2ef0395c213138f27139f43a84d56c6a +Author: qiyu-xie +Date: Wed Sep 2 13:58:59 2020 +0800 + + *Fix misc module lang. + +commit 9d1a30a3d65fb4fc29656543fc52183b786987a1 +Merge: 3cb808bd22 d21075c1ba +Author: Yagami <976204163@qq.com> +Date: Wed Sep 2 13:59:15 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3cb808bd22580b922a0de07bab9c338198cca4bc +Author: Yagami <976204163@qq.com> +Date: Wed Sep 2 13:58:32 2020 +0800 + + * Adjust holiday modal style. + +commit d21075c1bac14ae91188ad1b0f72123fab300653 +Author: qiyu-xie +Date: Wed Sep 2 13:56:48 2020 +0800 + + *Fix custom module lang. + +commit 49ea5179a63d2298a01fac41d1803b4a9727092a +Author: tianshujie98 +Date: Wed Sep 2 13:47:19 2020 +0800 + + * Edit comment. + +commit 6e576929b7c814c70c58f59161e64a274b4be30d +Author: z +Date: Wed Sep 2 12:18:47 2020 +0800 + + * adjust for async send webhook. + +commit 3fa7648dbaf4858ddbb424a8e7a302d47396fe13 +Merge: 42ac41421a 6cf9958aec +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 2 11:30:30 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6cf9958aec255e4688fe6ea708233ce9bf79ae05 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 2 11:29:32 2020 +0800 + + * Code for task #7812. + +commit 3bf3187bfe3a65395753b53e490b494e12264947 +Merge: a1f4a8e7bb 4c7e7ae2e5 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 2 11:28:04 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a1f4a8e7bbc7ea1c4d580670fafd950fe7701031 +Author: Yagami <976204163@qq.com> +Date: Wed Sep 2 11:27:34 2020 +0800 + + * Finish task #7812. + +commit 4c7e7ae2e533c1f9d44e3df9883e94dccab6da4a +Author: qiyu-xie +Date: Wed Sep 2 11:09:15 2020 +0800 + + *Add design module resource. + +commit 0086f2d069478a0471e6367e4aba5f46b2f7ca3d +Author: qiyu-xie +Date: Wed Sep 2 10:18:25 2020 +0800 + + *Fix common module lang. + +commit fa93c2e6701e43ec8a171f026cfac6ae45c3a25a +Merge: 80caf5e0b1 9737d1bff2 +Author: hufangzhou <746775970@qq.com> +Date: Wed Sep 2 10:02:27 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 80caf5e0b115afd923bf46fe972a324ce69fca11 +Author: hufangzhou <746775970@qq.com> +Date: Wed Sep 2 10:02:11 2020 +0800 + + * Fix bug#3426 + +commit 9737d1bff2228303316e5c575230d1add461239b +Merge: f2d571b28d 08f823ce95 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 2 10:00:44 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f2d571b28d97e3d599a76bb3d10f925a5c8eb9b7 +Author: holan20180123 <56391770@qq.com> +Date: Wed Sep 2 09:59:35 2020 +0800 + + * Fix ajax get program menu. + +commit 08f823ce955ede711b6dfa76b986c2b05e90f447 +Author: tianshujie98 +Date: Wed Sep 2 09:50:40 2020 +0800 + + * Modify design dynamics. + +commit 4f8a19baf20c48bd3599eade9c86d38924043ff1 +Author: qiyu-xie +Date: Wed Sep 2 09:03:23 2020 +0800 + + *Fix block module lang. + +commit 94ca22e92c56321e1b473c9ca6db5a8d1c99aa80 +Author: tianshujie98 +Date: Wed Sep 2 08:56:18 2020 +0800 + + * Modify format and design delete issues. + +commit 42ac41421a25e39077f7f004085e09ca676aa0e0 +Merge: ad69f5c621 f88cccac65 +Author: leiyong <1549684884@qq.com> +Date: Wed Sep 2 08:56:28 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f88cccac6516c595786717ce21ceb559e94c3979 +Author: hufangzhou <746775970@qq.com> +Date: Tue Sep 1 18:37:45 2020 +0800 + + * Adjust block code. + +commit a6029d430fa9248bd0d014e0eae630718def1a40 +Author: tianshujie98 +Date: Tue Sep 1 17:47:33 2020 +0800 + + * Modify bottom refresh. + +commit ab578b96b1cbb64cbb1b8569bbb9baa3b71ad8ea +Author: z +Date: Tue Sep 1 17:15:14 2020 +0800 + + * fix error. + +commit 89bbfdfe22d9875f6b96350b020f2eea8d549186 +Author: tianshujie98 +Date: Tue Sep 1 16:54:47 2020 +0800 + + * Modify pagination. + +commit 2593f6cc3bf9f932c15777d7418ece4ae206554a +Author: tianshujie98 +Date: Tue Sep 1 16:52:11 2020 +0800 + + * Modify pagination. + +commit 494c995fcbb181717b2f65578931d0d67c4c629d +Author: tianshujie98 +Date: Tue Sep 1 16:30:27 2020 +0800 + + * Delete redundant variables. + +commit 9eba15e15ad3daf8419afd8e80521a2d27112071 +Author: tianshujie98 +Date: Tue Sep 1 16:17:57 2020 +0800 + + * Edit comment. + +commit 9406ae4b0740f3a1b1c363e2d18d6d251da0d947 +Merge: 20a09be88e 2a613daf36 +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 1 15:47:51 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 20a09be88e08d708103af998f6217a91c989fec3 +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 1 15:47:03 2020 +0800 + + * Finish task #7734. + +commit 2a613daf36445245d8404d1d5dbd54b56139f326 +Merge: 0c3d54efef d6db53dcee +Author: z +Date: Tue Sep 1 15:35:20 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0c3d54efef39a24bc86d050b21e492dee006fd63 +Author: z +Date: Tue Sep 1 15:34:52 2020 +0800 + + * finish task #7739. + +commit d6db53dcee69831746165d117fa7724956ffeaab +Author: tianshujie98 +Date: Tue Sep 1 15:13:43 2020 +0800 + + * Fix bug #3421. + +commit 5eb536073eee85c42f3d6dd30875f561346c968b +Author: tianshujie98 +Date: Tue Sep 1 15:13:09 2020 +0800 + + *Fix bug #3420. + +commit 7bf4e88a56015ea679f0d0f63d26684428862848 +Merge: 2045857098 e5d6cab545 +Author: Yagami <976204163@qq.com> +Date: Tue Sep 1 15:09:25 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e5d6cab545d1179303ad998828dd6dd45cf73c8f +Author: z +Date: Tue Sep 1 14:47:42 2020 +0800 + + * finish task #7741. + +commit defb5f4f1ae00d17fdfb5ec11b4b989b706282e1 +Merge: 0a6056ceac 075713b538 +Author: z +Date: Tue Sep 1 14:45:16 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0a6056ceacd65d59e719c235dfbb828d2d022384 +Author: z +Date: Tue Sep 1 14:44:09 2020 +0800 + + * finish task #7761,7766. + +commit 075713b5387c39a1f6184434aa91ee6a2bdc0b0e +Author: qiyu-xie +Date: Tue Sep 1 14:32:03 2020 +0800 + + *Fix misc module lang. + +commit 2045857098f9bcda3fcda9fc0e772dab76f0df08 +Author: Yagami <976204163@qq.com> +Date: Tue Sep 1 14:28:26 2020 +0800 + + * Finish task #7728. + +commit 477d5a0bedb46d71788d547a81f8ddd9668f5713 +Author: qiyu-xie +Date: Tue Sep 1 14:26:54 2020 +0800 + + *Fix common module lang. + +commit 336bded8512a2e9e22be9499bf6b9487192576c6 +Merge: fbfffd16f4 c5c9d0c155 +Author: chenfeiCF +Date: Tue Sep 1 06:26:07 2020 +0000 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fbfffd16f468f1230771028f6e3a9c9477bada67 +Author: chenfeiCF +Date: Tue Sep 1 06:23:43 2020 +0000 + + * Declare object and define object property. + +commit ad69f5c6210793f06de16767758036232c80db97 +Author: leiyong <1549684884@qq.com> +Date: Tue Sep 1 14:07:17 2020 +0800 + + * Finish task*7737. + +commit c5c9d0c15534be6deb24ad6a02d4db6c75fc935f +Author: qiyu-xie +Date: Tue Sep 1 14:04:16 2020 +0800 + + *Fix user module lang. + +commit 819c806aa8a7ba9777cd396b946f67ce74154658 +Author: qiyu-xie +Date: Tue Sep 1 13:57:15 2020 +0800 + + *Fix story module lang. + +commit 7c8f2c1d4eae1281fdb576184aea4e83daf4b209 +Author: qiyu-xie +Date: Tue Sep 1 13:53:43 2020 +0800 + + *Fix project module lang. + +commit 814bea0cd354a3a604f85ae15ec3b4dbc5cb65fe +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 1 13:43:38 2020 +0800 + + * Adjust track and edit for risk module. + +commit 1032d4a749a3802ad5f4d43bec322bd820ab905c +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 1 13:40:39 2020 +0800 + + * Finish task #7747. + +commit 12f4e5ead3111a0cc0146e0ad75914ccb9bd7e16 +Merge: 718b5835d1 3d9bc3a0c9 +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 1 13:27:30 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 718b5835d1a8f42857901893ca11441226a61cdb +Author: holan20180123 <56391770@qq.com> +Date: Tue Sep 1 13:26:59 2020 +0800 + + * Finish task #7753. + +commit 3d9bc3a0c96adf4cd43f1135ad075c315d02dfbf +Author: qiyu-xie +Date: Tue Sep 1 13:22:39 2020 +0800 + + *Fix my module lang. + +commit 75b03bc73cb2ab90729b4712c2aa9fe4d9a59103 +Author: qiyu-xie +Date: Tue Sep 1 13:16:53 2020 +0800 + + *Fix group module lang. + +commit 5c51b144cccee3b4ad60968d9bcd640600b16779 +Merge: 3ffa7c7846 1106371757 +Author: Yagami <976204163@qq.com> +Date: Tue Sep 1 04:03:10 2020 +0000 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1106371757cf64326c8c4774bd33d162c58e5813 +Author: qiyu-xie +Date: Tue Sep 1 11:31:14 2020 +0800 + + *Fix custom module lang. + +commit 2f194aabd9b0ee573bb31a249ac77fdd533e9ea4 +Author: tianshujie98 +Date: Tue Sep 1 11:31:14 2020 +0800 + + * Adjust lang/en.php + +commit f01ccecad8efa27c91bc77740943c342939ee4eb +Author: tianshujie98 +Date: Tue Sep 1 11:07:28 2020 +0800 + + * Add comments and date judgments. + +commit 798f834946c379fc8f2404ff22712b64f6ae502e +Author: qiyu-xie +Date: Tue Sep 1 11:03:45 2020 +0800 + + *Fix holiday module lang. + +commit 34da87a305672e46066091c227a0a75452ff9152 +Author: qiyu-xie +Date: Tue Sep 1 10:53:28 2020 +0800 + + *Fix block module lang. + +commit 7602304d8f591fae5552a13e02cbb099c30f28f4 +Author: leiyong <1549684884@qq.com> +Date: Tue Sep 1 10:51:53 2020 +0800 + + * Finish task#7768. + +commit 88abcc7930d8859379afa99f0f33fa66a3a1908e +Author: leiyong <1549684884@qq.com> +Date: Tue Sep 1 10:38:18 2020 +0800 + + * Finish task#7771. + +commit d2f93f5a7fa57138f0eb3c87c8ca83e1781442dc +Author: tianshujie98 +Date: Tue Sep 1 10:14:25 2020 +0800 + + *Increase bottom refresh. + +commit c73542e21e68834c005ebd29f52b5a389691e9c2 +Author: tianshujie98 +Date: Tue Sep 1 09:39:42 2020 +0800 + + * Increase pagination and Modify field size. + +commit 3ffa7c78464fed941c58220f8f088e2d93f5edf8 +Author: Yagami <976204163@qq.com> +Date: Tue Sep 1 09:32:48 2020 +0800 + + * Finish task #7727. + +commit 988b5f107638f1f5a897b760657facc295defc42 +Merge: 0e9de1a8be 8f79522dbf +Author: Yagami <976204163@qq.com> +Date: Tue Sep 1 09:14:48 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0e9de1a8bea31634543ceac08f83135ff1692f19 +Author: Yagami <976204163@qq.com> +Date: Tue Sep 1 09:13:59 2020 +0800 + + * Finish task #7725. + +commit 8f79522dbf7ed1fb33758d46256c9c247f07f13b +Author: qiyu-xie +Date: Tue Sep 1 08:32:22 2020 +0800 + + *Add action lang. + +commit 0a79ea5850c1a2e30247b0836d4d64479e23fa53 +Author: tianshujie98 +Date: Mon Aug 31 17:47:12 2020 +0800 + + * Finish task #7760,7759. + +commit 7ece145352a82e44a54fa3d33a4ed65e2cd823ab +Merge: 29a975bbb0 7772d188d9 +Author: hufangzhou <746775970@qq.com> +Date: Mon Aug 31 17:45:56 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7772d188d92429e5e57480976fbbe4fe3ec2b10c +Merge: e7cbe56f26 77d8f2255f +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 31 17:41:01 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 29a975bbb03d9d9dcfcbbdc2915d00451c1258b0 +Author: hufangzhou <746775970@qq.com> +Date: Mon Aug 31 17:40:56 2020 +0800 + + * Modify the getScrumprojectParams method to getSprintParams method + +commit e7cbe56f2621521e18f94c1005c29001ff9f8efe +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 31 17:39:26 2020 +0800 + + * Adjust batchCreate testcase. + +commit 1fb8b2cba4628b5bef5ba561f0d5b794453c219e +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 31 17:38:43 2020 +0800 + + * Finish task #7730. + +commit 245f1992dc0bb8a32b1f3853ac33611fde8d0c8b +Author: hufangzhou <746775970@qq.com> +Date: Mon Aug 31 17:36:36 2020 +0800 + + * Finish task#7715. + +commit 1de312892a468379bdf9bf571e52eaaea694ab73 +Author: hufangzhou <746775970@qq.com> +Date: Mon Aug 31 17:26:11 2020 +0800 + + * Finish task#7729. + +commit ef02c8fc684e07c16743fbffbb03658922291cea +Author: hufangzhou <746775970@qq.com> +Date: Mon Aug 31 17:22:18 2020 +0800 + + * Finish task#7740. + +commit 1cec43544127d7e3a8be8fa52aab1aa19743edbe +Author: hufangzhou <746775970@qq.com> +Date: Mon Aug 31 17:18:13 2020 +0800 + + * Finish task#7749. + +commit 4908bc492dda9e920d1088fb5a1a70638c0fdff8 +Author: hufangzhou <746775970@qq.com> +Date: Mon Aug 31 17:17:25 2020 +0800 + + * Finish task#7757. + +commit 5154d3bc0d7c007434e9f3bbd8254d8e4ae04b4d +Author: hufangzhou <746775970@qq.com> +Date: Mon Aug 31 17:16:44 2020 +0800 + + * Finish task#7764. + +commit 77d8f2255fe9505cfdf65102e56d6796e86284fb +Author: leiyong <1549684884@qq.com> +Date: Mon Aug 31 16:52:09 2020 +0800 + + * Finish task#7736. + +commit 63e462a885db6a1493a3809b5db3f0a578acbbaa +Author: Yagami <976204163@qq.com> +Date: Mon Aug 31 16:00:28 2020 +0800 + + * Finish task #7724. + +commit adc90a6bd0f9b1a65f629694f457ddfb72a2432d +Author: Yagami <976204163@qq.com> +Date: Mon Aug 31 15:37:03 2020 +0800 + + * Finish task #7723. + +commit a9df6f3b9c63c729a848f8852d0a45adee5ddd4f +Author: z +Date: Mon Aug 31 15:31:55 2020 +0800 + + * merge after 12.4.1 changes. + +commit ba32604be678954d8e5ba56c4f8809c3caf84bd5 +Author: z +Date: Mon Aug 31 15:17:40 2020 +0800 + + * fix for flow. + +commit 521cea28445a84673af3eabc9d9efa2b04cc8016 +Merge: 7a661001da fdf31941e1 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 31 15:04:28 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7a661001dad5392aba7a3499aebbd432aefc4819 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 31 14:57:44 2020 +0800 + + * Finish task #7758. + +commit fdf31941e1ac9c48d2624ca7fc27ef0c5ec87500 +Merge: 9baaf4c0c3 2288121953 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 31 14:29:43 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9baaf4c0c319040d2269913db2ce7d9ed2780d5a +Author: Yagami <976204163@qq.com> +Date: Mon Aug 31 14:29:06 2020 +0800 + + * Add story changed filed and finish task #7716. + +commit ad750e1f949582fcc8d57e193b6d53630c3f3af5 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 31 14:12:20 2020 +0800 + + * Finish task #7722. + +commit f696462213dd85a4eaa7ff48e0320818079a2246 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 31 14:01:45 2020 +0800 + + * Adjust code style. + +commit 228812195359809480c43b28fd30ab87b04f1402 +Author: qiyu-xie +Date: Mon Aug 31 13:41:29 2020 +0800 + + *Finish task #7738. + +commit 855b3fd8b51f90d025927ea4ae82d98054bbe617 +Merge: 19847b99f8 116a7e43b3 +Author: qiyu-xie +Date: Mon Aug 31 13:37:59 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 19847b99f803f319ffa3ba2bb12d15aa745d27d6 +Author: qiyu-xie +Date: Mon Aug 31 13:37:20 2020 +0800 + + *Finish task #7738. + +commit 116a7e43b3adf5d77308b733ea10935cc02bd595 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 31 13:34:32 2020 +0800 + + * Finish task #7721. + +commit 05a4a31426a2d6f2ad6080bb04aac0ebfd881a56 +Merge: bc69f6fb81 14724e003c +Author: Yagami <976204163@qq.com> +Date: Mon Aug 31 13:05:49 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bc69f6fb81a0ac62fd24d7688425b7305029254e +Author: Yagami <976204163@qq.com> +Date: Mon Aug 31 13:05:24 2020 +0800 + + * Finish task #7772. + +commit 14724e003c83c5037588fef24996c8bff1f3bf02 +Author: leiyong <1549684884@qq.com> +Date: Mon Aug 31 11:34:36 2020 +0800 + + * Fix bug#3396. + +commit e2adfa9152496359c58087713de075aa61fd0c9e +Author: leiyong <1549684884@qq.com> +Date: Mon Aug 31 11:30:05 2020 +0800 + + * Finish task#7718. + +commit 56113f328ed54d5378bb7372d1d22e88c5d8be78 +Author: leiyong <1549684884@qq.com> +Date: Mon Aug 31 10:32:48 2020 +0800 + + * Finish task#7748. + +commit 00241491c2f1d49f8fe1fa428a3864db7fa15d3a +Author: tianshujie98 +Date: Mon Aug 31 10:14:56 2020 +0800 + + * Same title format. + +commit d9dba4768eb9d0e7d95d714ea3b39f3ef20d93a3 +Author: leiyong <1549684884@qq.com> +Date: Mon Aug 31 10:02:28 2020 +0800 + + * Finish task#7742. + +commit ec4afb786313b41d3e5c5b67c8dc1ec5ba3b8516 +Author: tianshujie98 +Date: Mon Aug 31 09:46:42 2020 +0800 + + *Finish task #7770. + +commit 214dc23e335cfc8a470b0c2c39cc21361019c173 +Author: tianshujie98 +Date: Mon Aug 31 09:30:45 2020 +0800 + + * Adjust page. + +commit 19e7fb8801205e33d75ddf6c0cbbce70ca189ff7 +Merge: 14c6a36b0c e1c86c2c49 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 31 09:18:21 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 14c6a36b0c835650f9f0319d57ea9599e486bf5a +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 31 09:17:57 2020 +0800 + + * Finish task #7750. + +commit e1c86c2c49010125fff587916f9a4da1f3340d96 +Author: tianshujie98 +Date: Mon Aug 31 09:15:01 2020 +0800 + + * Fix lang/en.php. + +commit 3180528d91557b73bba76e4b760a801582ef7903 +Merge: a72a033748 c9aa3463d4 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 31 09:07:59 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a72a03374801854c73e3915e6976917bf3c394a9 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 31 09:07:19 2020 +0800 + + * Finish task #7717. + +commit c9aa3463d4633423595e7a3066485303219c3af3 +Merge: 857113e8fb 6b2147dbba +Author: Yagami <976204163@qq.com> +Date: Mon Aug 31 09:05:55 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 857113e8fb6336525ad1e57c7686c50aeb473ad8 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 31 09:05:35 2020 +0800 + + * Adjust risk code style. + +commit 46af34e8ba321becf7ead10e45dc3739eb449e71 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 31 09:04:51 2020 +0800 + + * Adjust code style. + +commit 2b0dfd8168b391fea529674e7d335f6b4ee3c034 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 31 09:04:25 2020 +0800 + + * Adjust code style. + +commit 85847ef42689ac1acca1b499c749ff0e8492128d +Author: Yagami <976204163@qq.com> +Date: Mon Aug 31 09:00:54 2020 +0800 + + * Adjust issue comment. + +commit 6b2147dbbaa66a819ce78d358532a746c1332e34 +Author: leiyong <1549684884@qq.com> +Date: Mon Aug 31 08:34:32 2020 +0800 + + * Operation record of repairing problems. + +commit 0956f7468d3c70e897c3b967436453e3014e0a8f +Author: Yagami <976204163@qq.com> +Date: Sat Aug 29 13:43:03 2020 +0800 + + * Fix program code detail. + +commit 1b2228a367f348bf00237ee9fe2d74b8aafae3cc +Author: Yagami <976204163@qq.com> +Date: Sat Aug 29 13:21:46 2020 +0800 + + * Adjust common/weekly code detail. + +commit 444ad3f31997136b84e5cd1b6880080420e9bdf9 +Author: Yagami <976204163@qq.com> +Date: Sat Aug 29 13:21:33 2020 +0800 + + * Rename design commit to link commit. + +commit 1f2f21e44bf3ab7efe95e2c7bfad7b1e446817d8 +Author: Yagami <976204163@qq.com> +Date: Sat Aug 29 13:20:50 2020 +0800 + + * Adjust code style. + +commit 49316f308b6cdf9577c5015307011453cb7497b2 +Author: Yagami <976204163@qq.com> +Date: Sat Aug 29 13:20:27 2020 +0800 + + * Rename program method name. + +commit 781cce231a199062a1824e52e925e772a33f7ad7 +Author: Yagami <976204163@qq.com> +Date: Sat Aug 29 13:19:58 2020 +0800 + + * Rename design commit to link commit. + +commit 98446b359ed9484359e906a6a3214648bc1e201e +Author: Yagami <976204163@qq.com> +Date: Fri Aug 28 13:49:13 2020 +0800 + + * Adjust design batch create method code style. + +commit 189c0928d250e57ef28f6a3656331663c874d71c +Author: Yagami <976204163@qq.com> +Date: Fri Aug 28 13:48:29 2020 +0800 + + * Remove empty options condition. + +commit 8a62797fb60d4b46ceec32da458eac6e6422e0df +Author: Yagami <976204163@qq.com> +Date: Fri Aug 28 13:35:48 2020 +0800 + + * Fix design browse view css style. + +commit 1818e3eef1ceeb5c98dcbb2450345f5df4ba5ba7 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 28 13:34:17 2020 +0800 + + * Rename design get pairs method and add required fields config. + +commit ca5d8d8bd2647331079851a8a63af93443691ac1 +Merge: 66ac39f706 697c7383bf +Author: Yagami <976204163@qq.com> +Date: Fri Aug 28 13:33:05 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 66ac39f706ad6e5bf5aa63f5ac2f114f7553de28 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 28 13:32:35 2020 +0800 + + * Fix design create method code style. + +commit 697c7383bfbe4fde4c6b48ed456d8deab02ecbff +Merge: 8fca750bdd fe63c96aee +Author: tianshujie98 +Date: Fri Aug 28 12:19:47 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8fca750bdd74c3dd0bb03075cb927f0a01f5e0ba +Author: tianshujie98 +Date: Fri Aug 28 12:19:22 2020 +0800 + + * Fix comment and lang. + +commit fe63c96aeeb9d7f6012afe7bfb6fa8129ef884d4 +Merge: 283acfe49f 51fb61bed3 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 28 11:38:51 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 283acfe49f466cae4323f2cb9cc1d569df0bede4 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 28 11:37:40 2020 +0800 + + * Fix code style. + +commit 51fb61bed304bf1ea290719785857d49284719e6 +Author: tianshujie98 +Date: Fri Aug 28 09:42:07 2020 +0800 + + * Fix comment. + +commit 9781bc5245058521325bfec0a0f68feffe785dad +Merge: 652f1becdb f579288f2c +Author: z +Date: Fri Aug 28 09:37:04 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 652f1becdb57e2ce8a577d5885c4aec655a2aa51 +Author: z +Date: Fri Aug 28 09:36:28 2020 +0800 + + * fix for branch with '-'. + +commit f579288f2ce7cd93d33b1d5a0458c876012a9d4d +Merge: 4e0040435f 23a7880bad +Author: tianshujie98 +Date: Fri Aug 28 09:17:30 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4e0040435f0769f7bf126a658bb3e7ba1e2b7854 +Author: tianshujie98 +Date: Fri Aug 28 09:17:10 2020 +0800 + + * Fix comment. + +commit 23a7880bad6ffe4db5f76b099541d918396b3d16 +Author: leiyong <1549684884@qq.com> +Date: Fri Aug 28 09:09:22 2020 +0800 + + * Adjust code. + +commit cde9e666162c5bb6022b06ffad9bc77fe22aebe9 +Merge: f6db670dbc 969e3cfb5d +Author: Yagami <976204163@qq.com> +Date: Fri Aug 28 08:55:21 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f6db670dbc17ff3da12ba3febf25e23f60409192 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 28 08:55:02 2020 +0800 + + * Fix block code style. + +commit 969e3cfb5dfb43711042146f42b763e09d8422dd +Author: leiyong <1549684884@qq.com> +Date: Fri Aug 28 08:54:36 2020 +0800 + + * Adjust code. + +commit 980edb8222a781d40ee6786fcda1af22f05acc0a +Merge: ffd197ad4e 4da6d4bfff +Author: tianshujie98 +Date: Fri Aug 28 08:52:22 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ffd197ad4e559a0ff81905065e1a8eab4eb2c571 +Author: tianshujie98 +Date: Fri Aug 28 08:51:47 2020 +0800 + + *Fix comment. + +commit 4da6d4bfffa9afa425e417132555f72eb0ba7667 +Author: leiyong <1549684884@qq.com> +Date: Fri Aug 28 08:33:27 2020 +0800 + + * Adjust code. + +commit 269b33eb13ec5fc3ee1d797045778e94c8863446 +Author: Catouse +Date: Thu Aug 27 15:31:25 2020 +0800 + + * fix data error in cmmigantt block. + +commit 3d44a40267a2567c183e50cf8324ab30d1103e8b +Merge: 2d3947e441 8fd7b0ad96 +Author: leiyong <1549684884@qq.com> +Date: Thu Aug 27 14:43:26 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2d3947e441209cc6561871b6c3cdd6517151b1e6 +Author: leiyong <1549684884@qq.com> +Date: Thu Aug 27 14:41:27 2020 +0800 + + * Fix bug. + +commit 8fd7b0ad962db1bffc3a6b192ad0b8e738490aa2 +Author: qiyu-xie +Date: Thu Aug 27 14:32:46 2020 +0800 + + * Add design module notes. + +commit 35289a78f9701d095500760a7751126c691bd368 +Author: Catouse +Date: Thu Aug 27 14:28:42 2020 +0800 + + * improve UI of program list and cards view. + +commit 34d0a92c9a835acb3cc5124ec4d880962638ef31 +Merge: b2c73e7a21 e4ebc510ed +Author: Yagami <976204163@qq.com> +Date: Thu Aug 27 14:26:11 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b2c73e7a21efbc038251ac60f5eb43d2b142e879 +Author: Yagami <976204163@qq.com> +Date: Thu Aug 27 14:25:58 2020 +0800 + + * Fix common menu. + +commit e4ebc510edb18df28144d835034fab6f0e7f3f81 +Merge: 4ab2be31d0 223d748f90 +Author: z +Date: Thu Aug 27 14:21:43 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4ab2be31d0c1ff1707b6ceb4a1fa519049d98bf1 +Author: z +Date: Thu Aug 27 14:21:12 2020 +0800 + + * adjust for end is 0000-00-00. + +commit 223d748f90665e508f67033324555506c02414c4 +Merge: 7cb74a6158 4f26fbc06a +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 27 14:07:13 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7cb74a61584ce3b5050a89231249204c66969d2c +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 27 14:06:35 2020 +0800 + + * Finish task #7711. + +commit 4f26fbc06a32a809f519d6b8e51e8d682ed986c2 +Merge: 48929ce58b 4be0cfdc8e +Author: z +Date: Thu Aug 27 14:04:27 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4be0cfdc8e56e9931786bb075b396d04a39efa22 +Merge: d20ca16a93 e5d595985e +Author: tianshujie98 +Date: Thu Aug 27 14:03:57 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 48929ce58b3c7fa2baac607e7e9e2cddec4e6c08 +Author: z +Date: Thu Aug 27 14:03:46 2020 +0800 + + * set recPerPage to 50 in program-browse page. + +commit d20ca16a93489dd851ccf185df0f3ac4421eb3a7 +Author: tianshujie98 +Date: Thu Aug 27 14:03:29 2020 +0800 + + * Add subject comment. + +commit e5d595985e17d684a4df8149f22f71e713d02851 +Author: qiyu-xie +Date: Thu Aug 27 14:03:13 2020 +0800 + + *Add weekly module notes. + +commit 21f6b2cdd27c11f20bf8c25c7809e3b263794105 +Merge: 5b5184b0ca 505ed7c1bf +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 27 13:56:13 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5b5184b0ca089dd3331b0a89b2649afbe5b8ae9b +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 27 13:55:46 2020 +0800 + + * Edit Risk lang file. + +commit 505ed7c1bf68ea8036ce5a01a584f796fedea0a5 +Merge: 4f47220347 6b275e872d +Author: z +Date: Thu Aug 27 13:54:46 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4f47220347969d5d152b7169d61fddb28fc8c795 +Author: z +Date: Thu Aug 27 13:54:23 2020 +0800 + + * finish task #7698. + +commit 6b275e872dfa91b766a45e18b7a3da73c939f2b1 +Merge: 5ac6d0540e 22f5c0b363 +Author: tianshujie98 +Date: Thu Aug 27 13:51:33 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5ac6d0540e7dda2c66ff3e7bdb1ba29dfcaeaa4a +Author: tianshujie98 +Date: Thu Aug 27 13:50:54 2020 +0800 + + * Add programplan comment. + +commit 22f5c0b363d017fe36657d0791b5dd6dfe354f5e +Merge: 1062033526 5c6c487580 +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 27 13:48:23 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1062033526d58af3f40da4789c08f2650c7e104f +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 27 13:42:16 2020 +0800 + + * Finish Task #7711. + +commit 5c6c487580a7a4a9494e04c007d3a367fdba632e +Author: leiyong <1549684884@qq.com> +Date: Thu Aug 27 13:34:36 2020 +0800 + + * Adjust menu。 + +commit 8a2aff88acfbd478e7e8897327a0552f321b135a +Merge: 08e776ae48 f4d53d4d80 +Author: qiyu-xie +Date: Thu Aug 27 13:32:22 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 08e776ae4889a992c32cfb124a9edda71647df37 +Author: qiyu-xie +Date: Thu Aug 27 13:31:38 2020 +0800 + + * Add issue module notes. + +commit f4d53d4d80f5d52a875e02c1aab00516b0a094ef +Merge: 8197765c51 02a33344f7 +Author: Yagami <976204163@qq.com> +Date: Thu Aug 27 13:22:03 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8197765c51e8872563b8ab914efcb95042f387f3 +Author: Yagami <976204163@qq.com> +Date: Thu Aug 27 13:21:50 2020 +0800 + + * Add cron sql. + +commit 02a33344f7e3fe8328f9f4a33debdd2156c30e6e +Merge: 840b7ab03a 9b5dc31850 +Author: tianshujie98 +Date: Thu Aug 27 13:20:16 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 840b7ab03afc9521bb24ad11427ff2df015d021d +Author: tianshujie98 +Date: Thu Aug 27 13:19:45 2020 +0800 + + * Add risk commit. + +commit 9b5dc31850768914a784e4fc21892d0306901b8f +Merge: 39f3fffed8 d51ab5893b +Author: Yagami <976204163@qq.com> +Date: Thu Aug 27 13:03:58 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d51ab5893bd17015faa4bd463edaa04158990be0 +Merge: 04508fa14c 17ba1e95e4 +Author: z +Date: Thu Aug 27 13:03:02 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 04508fa14c36da284417e0a377b097ea25ee9469 +Author: z +Date: Thu Aug 27 13:02:33 2020 +0800 + + * adjust code. + +commit 39f3fffed80144775d3fd99ae5ab9e01cb925ab9 +Merge: d117275c5b 17ba1e95e4 +Author: Yagami <976204163@qq.com> +Date: Thu Aug 27 13:02:29 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d117275c5baf8d160e52cd3eec54b87eca5f6e15 +Author: Yagami <976204163@qq.com> +Date: Thu Aug 27 13:01:57 2020 +0800 + + * Fix group programs. + +commit 17ba1e95e4b7c301040d353fdee48ca216f3a465 +Author: tianshujie98 +Date: Thu Aug 27 12:16:34 2020 +0800 + + * Add workestimation comment. + +commit b3b90ccbe21198533a47de34468675026ec5c9d7 +Merge: 9ca95ac3e6 13d2475a99 +Author: qiyu-xie +Date: Thu Aug 27 11:31:31 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9ca95ac3e6b418f8df2ad723a8bf37505c62961f +Author: qiyu-xie +Date: Thu Aug 27 11:30:45 2020 +0800 + + *Add design assignTo priv. + +commit 13d2475a99936ef9403476422bc887ad36d8d119 +Merge: 822bf9ecbd 042957fd1d +Author: tianshujie98 +Date: Thu Aug 27 11:28:29 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 822bf9ecbd853e6ea24d15ce3e8bb1a8f3687ead +Author: tianshujie98 +Date: Thu Aug 27 11:27:55 2020 +0800 + + * Add budget comment. + +commit 042957fd1dbc1160c608f2b3cfa4e26fb3701b37 +Author: Catouse +Date: Thu Aug 27 11:23:29 2020 +0800 + + * fix params type error in comments. + +commit f0276c001bbf62496e1dcf38ed8b0b37d6db53d6 +Author: leiyong <1549684884@qq.com> +Date: Thu Aug 27 11:18:30 2020 +0800 + + * Finish task#7705. + +commit 1e917bcb0fdb9d69d20487b5e2b2f35b7656718b +Merge: b3e27f70b3 6eb4d2b698 +Author: Yagami <976204163@qq.com> +Date: Thu Aug 27 11:17:40 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b3e27f70b3dabc71b47f73bbc07a5512cb898ab3 +Author: Yagami <976204163@qq.com> +Date: Thu Aug 27 11:17:22 2020 +0800 + + * Mv milestone to qc. + +commit 6eb4d2b698b1e454b61265eb4e34eb14af41dc50 +Merge: dd2f82a8de 6c9c62f233 +Author: tianshujie98 +Date: Thu Aug 27 11:14:19 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit dd2f82a8de50c7f3c8280fb8f788a71d2868ba15 +Author: tianshujie98 +Date: Thu Aug 27 11:12:53 2020 +0800 + + * Add stage comment. + +commit 6c9c62f23388329a866b23816f2cc3e7ba3148bd +Author: Catouse +Date: Thu Aug 27 11:01:39 2020 +0800 + + * improve UI of program list. + +commit e8c9a0ccf5f0984c15f22b0ec99f7abf0066dd54 +Merge: 5674cdbae8 065928fd20 +Author: z +Date: Thu Aug 27 11:00:14 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5674cdbae8217af15ba91919be2758e92fbc5cb2 +Author: z +Date: Thu Aug 27 10:59:38 2020 +0800 + + * finish task #7708. + +commit 065928fd20b641a89023f23e2d32fce03f32568e +Author: tianshujie98 +Date: Thu Aug 27 10:46:18 2020 +0800 + + * Fix assignTo. + +commit f0758c4634907747ff9704d11c3be7351128d868 +Author: tianshujie98 +Date: Thu Aug 27 10:37:43 2020 +0800 + + * Fix assignTo. + +commit 801efb0539396a7c1bd32a3bac9a806d63c4adb9 +Merge: 7fe0cba0c9 eb47645a67 +Author: tianshujie98 +Date: Thu Aug 27 10:29:03 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7fe0cba0c97843fe993345356a628325ff831563 +Author: tianshujie98 +Date: Thu Aug 27 10:28:20 2020 +0800 + + * Fix bug. + +commit eb47645a6787e6e5cefb285060af011ad2cb57c5 +Merge: 84cdafa606 1d2bdce37e +Author: Yagami <976204163@qq.com> +Date: Thu Aug 27 10:14:12 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 84cdafa606afc00c7491a3235ef836323475eead +Author: Yagami <976204163@qq.com> +Date: Thu Aug 27 10:13:31 2020 +0800 + + * Fix block weekly. + +commit 1d2bdce37edfd327d664e7504aaf9d26b344450f +Merge: 3d363c7f2e a5f004beab +Author: tianshujie98 +Date: Thu Aug 27 10:00:34 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3d363c7f2e8c1ba2e068e35a8277d6bad87c54ff +Author: tianshujie98 +Date: Thu Aug 27 09:58:21 2020 +0800 + + * Fix repo/view/revision.html.php bug. + +commit a5f004beabcc304d066d7df9732268ad54bbb90f +Merge: df1a9ee5ef 53503ab6fa +Author: Catouse +Date: Thu Aug 27 09:33:00 2020 +0800 + + Merge branch '20.x' + + # Conflicts: + # module/program/view/create.html.php + +commit df1a9ee5efdda1b262bc4169cb922a0f49c3c750 +Author: leiyong <1549684884@qq.com> +Date: Thu Aug 27 09:23:10 2020 +0800 + + * Finish task#7702. + +commit 06e5748f12da7e3133e6a15844ce113dd245bffb +Author: leiyong <1549684884@qq.com> +Date: Thu Aug 27 09:11:23 2020 +0800 + + * Adjust lang file. + +commit 113dbc40d95537c523e2736109433f72a2bd1b74 +Merge: be892d8966 426ff66d8f +Author: leiyong <1549684884@qq.com> +Date: Thu Aug 27 09:10:41 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 53503ab6fab271d58f2af38f45a2505342aa6c5d +Author: Catouse +Date: Thu Aug 27 09:02:30 2020 +0800 + + * task #7641, support show projects in nested list. + +commit 88a70977e6cccf35d80c36f96765ab2a51b7bbd4 +Author: Catouse +Date: Thu Aug 27 09:02:30 2020 +0800 + + * task #7641, support show projects in nested list. + +commit b10f3686a8cb73d5fb3132612b59c7f0b2abcaed +Author: Catouse +Date: Wed Aug 26 15:17:58 2020 +0800 + + * fix cannot submit form without parentprogram data on create one. + +commit 3712145ff9d2afcb029bb5b087d8f9fe3cf0852b +Author: Catouse +Date: Wed Aug 26 15:17:14 2020 +0800 + + * only show programs which status is doing in programteam block. + +commit 6040241c9436a52210f3c6c8a16aef6c4dc2e82b +Author: Catouse +Date: Wed Aug 26 15:16:37 2020 +0800 + + * hide products select control on count less than 2. + +commit be892d89666587ab0b20eedbb844fd4d1d6cca2b +Author: leiyong <1549684884@qq.com> +Date: Thu Aug 27 08:52:37 2020 +0800 + + * Finish task#7703. + +commit 426ff66d8f0434cef6594ff583ad8ff41bbfb7dd +Author: hufangzhou <746775970@qq.com> +Date: Thu Aug 27 08:52:21 2020 +0800 + + Fix a bug + +commit ae63696820b0ba376ca121855b87c27f8c50fefb +Merge: 7f89f3426e 61c374c456 +Author: hufangzhou <746775970@qq.com> +Date: Thu Aug 27 08:32:51 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7f89f3426e9f051f30347965db9948b27218795e +Author: hufangzhou <746775970@qq.com> +Date: Thu Aug 27 08:32:33 2020 +0800 + + Finish task#7704. task#7696. + +commit 61c374c456dca81507154e8799aed8d8ebdf0c41 +Merge: 235979ea72 9062b7e438 +Author: tianshujie98 +Date: Thu Aug 27 08:27:55 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 235979ea72fa844f85b68966a7f19cb1131a9ceb +Author: tianshujie98 +Date: Thu Aug 27 08:26:58 2020 +0800 + + * Add to the design assigned to. + +commit 9062b7e438b46722a2c99ce53c60ddd56f7774fe +Author: leiyong <1549684884@qq.com> +Date: Wed Aug 26 18:24:35 2020 +0800 + + * Adjust issue module code. + +commit fff00c9eb2ba04dac8cd1ecfccbeeddfdaffd4ef +Merge: c44189ae8f f13b0b9e1f +Author: Yagami <976204163@qq.com> +Date: Wed Aug 26 16:59:10 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c44189ae8fa43d0adab8a52532ad01ca412fd5ec +Author: Yagami <976204163@qq.com> +Date: Wed Aug 26 16:58:54 2020 +0800 + + * Add comment. + +commit 56dd7eca8398c31f3d3d507ed42d656c824db3b1 +Merge: 744dc06baa f13b0b9e1f +Author: leiyong <1549684884@qq.com> +Date: Wed Aug 26 16:58:44 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 744dc06baa1b50d35fa08f5eb492a8bf488b3772 +Author: leiyong <1549684884@qq.com> +Date: Wed Aug 26 16:56:53 2020 +0800 + + * Add scrum roadmap block. + +commit f13b0b9e1f72cd0df01bf2a31b1a155a772bbc82 +Merge: 4a3e5fcaf1 89a542e350 +Author: holan20180123 <56391770@qq.com> +Date: Wed Aug 26 16:49:57 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4a3e5fcaf1d942b1cc04d1aa40144bb9060a5742 +Author: holan20180123 <56391770@qq.com> +Date: Wed Aug 26 16:49:30 2020 +0800 + + * Finish Task #7694. + +commit 89a542e350db3780b1459901ecee3a8369f6273e +Author: z +Date: Wed Aug 26 16:46:12 2020 +0800 + + * finish task #7697. + +commit 8d4676de535f3185f60af6fd721bf407f11e2c2e +Author: Yagami <976204163@qq.com> +Date: Wed Aug 26 16:22:44 2020 +0800 + + * Merge zentao icon file. + +commit b909b261942c53732ea47ce486d76bbe91f2cbeb +Author: Yagami <976204163@qq.com> +Date: Wed Aug 26 16:19:28 2020 +0800 + + * Fix details. + +commit 7c9d838c8b673ea9a0cfc113c4b4c10c4e67857b +Merge: b3f9379148 2d290973e9 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 26 16:15:32 2020 +0800 + + Merge branch '20.x' + +commit 2d290973e9c8eb8c11c88b539260f51739e1bdea +Merge: b72a7dee43 0ba1cf2d4c +Author: Yagami <976204163@qq.com> +Date: Wed Aug 26 16:11:48 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit b72a7dee436db28c5b9e901207de1f458b57a74d +Merge: 0f7a173c85 b3f9379148 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 26 16:10:36 2020 +0800 + + Merge branch 'master' into 20.x + +commit 0ba1cf2d4ce5fdce0730d9fc44fe4bbd5ef4d1dd +Author: leiyong <1549684884@qq.com> +Date: Wed Aug 26 14:49:50 2020 +0800 + + * Adjust code. + +commit 0f7a173c85129745547c2a50625fbd4fe4dc1e3c +Merge: a5e8c67ca7 e0cd53d4cf +Author: Yagami <976204163@qq.com> +Date: Wed Aug 26 14:48:13 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit e0cd53d4cf3c9e5483b294964fb3c06ca6faf0f8 +Author: Catouse +Date: Wed Aug 26 13:52:18 2020 +0800 + + * task #7660, improve UI for cmmigantt block. + +commit 6f4f9a061eb47aa3d40abcd574735d74311d15ba +Author: Catouse +Date: Wed Aug 26 11:45:51 2020 +0800 + + * task #7660, improve UI for cmmigantt block. + +commit bd49215be595b64a4d66a1e5c5a5b515b9490803 +Author: Catouse +Date: Wed Aug 26 11:24:39 2020 +0800 + + * format code. + +commit 6265da18b97df72c2494fefbe9c9d3bcdea5d980 +Merge: 6b93c993aa 17744cc4b5 +Author: z +Date: Wed Aug 26 13:10:36 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit a5e8c67ca7c62ff38e420bf1a672e3477fab347e +Merge: d49a2f43c1 17744cc4b5 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 26 13:10:11 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 6b93c993aa155d5e0fd991d76b10fa203dd3e26e +Author: z +Date: Wed Aug 26 13:10:05 2020 +0800 + + * set default isCat in edit program. + +commit 17744cc4b57b53d60a86f8f45f8f0c05093d5529 +Author: leiyong <1549684884@qq.com> +Date: Wed Aug 26 13:09:51 2020 +0800 + + * Merger code. + +commit d49a2f43c10b77ceb9af56f0183c9d2a66e25ac8 +Merge: 8e4e53adfc 6252c1b0eb +Author: Yagami <976204163@qq.com> +Date: Wed Aug 26 13:08:08 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 8e4e53adfcc394148b10ca53118ba924458a48ad +Merge: d6cb4f1d75 704382ce01 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 26 13:07:41 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 6252c1b0eb1be4c2740666c8a68c97a99160c522 +Author: tianshujie98 +Date: Wed Aug 26 12:03:58 2020 +0800 + + * Fix sort bug. + +commit d6cb4f1d75176cd49396a77890e71f73e910df86 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 26 11:30:06 2020 +0800 + + * Fix menu order. + +commit 704382ce01b7c036944bec256ad0c290f7effe5c +Author: tianshujie98 +Date: Wed Aug 26 11:28:35 2020 +0800 + + * Add required field ID. + +commit a2851c968f0679b0985c5a3366f781e62889ca46 +Author: Catouse +Date: Wed Aug 26 11:18:56 2020 +0800 + + * fix dropmenu position of datetimepicker. + +commit 543e58ada0ce01dde619daa8d069f788606ce540 +Author: Catouse +Date: Wed Aug 26 11:15:19 2020 +0800 + + * fix task not show in cmmigantt block sometimes. + +commit a6828eaa077cb620da8002dce9e5d70ed1751554 +Author: Catouse +Date: Wed Aug 26 11:09:21 2020 +0800 + + * typo. + +commit 00266f91186b3aa523cd53a5f729e123f96151e1 +Author: Catouse +Date: Wed Aug 26 11:08:50 2020 +0800 + + * fix variable name typo. + +commit 295238a20379540de24aa363862414543c283543 +Author: Catouse +Date: Wed Aug 26 11:08:15 2020 +0800 + + * fix js object difinition error. + +commit b1def9c9cadd10f1c7042e697243e33ae64bffbe +Author: qiyu-xie +Date: Wed Aug 26 11:12:59 2020 +0800 + + * Add repo module lang. + +commit e8c9d1e5e94739c8579672e6d4329f0b54647474 +Author: qiyu-xie +Date: Wed Aug 26 11:03:00 2020 +0800 + + * Add story module lang. + +commit 4c4367f7fe41810aeb603466b4acc69d5e09c847 +Author: tianshujie98 +Date: Wed Aug 26 11:00:08 2020 +0800 + + * Remove duplicate definitions. + +commit 18153da73f1e7c6372b565896d535b1de6ce457a +Merge: aedaea4336 fe6c181224 +Author: tianshujie98 +Date: Wed Aug 26 10:55:15 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit aedaea43368f36e24fe915b957cd5c6978798143 +Author: tianshujie98 +Date: Wed Aug 26 10:52:51 2020 +0800 + + * Add English file content. + +commit fe6c181224b6e1b6c5998ac9587e9f2fc116f832 +Author: hufangzhou <746775970@qq.com> +Date: Wed Aug 26 10:42:31 2020 +0800 + + * Finish task#7652. + +commit dd49d9e613d122414dd1868f1f38b3ff887b2371 +Author: qiyu-xie +Date: Wed Aug 26 10:34:58 2020 +0800 + + * Add task module lang. + +commit 75df9a7300e44e1c6d763ff5faaea7262ffa2656 +Merge: 1a9df49057 971d2b0cfa +Author: qiyu-xie +Date: Wed Aug 26 10:33:45 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 971d2b0cfaa46069dc22253efd3c6d7adae0027c +Merge: 518ca3027e 31b533eac1 +Author: z +Date: Wed Aug 26 10:31:01 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 518ca3027e415cfb330b5885d06a6a634fdbbed6 +Author: z +Date: Wed Aug 26 10:30:41 2020 +0800 + + * adjust for en lang. + +commit 31b533eac1985cb4ea76bd27e97001222105443b +Author: holan20180123 <56391770@qq.com> +Date: Wed Aug 26 10:24:28 2020 +0800 + + * Fix bug #3404. + +commit f2238e567fd969ad300c75e468960eeddab43bf7 +Merge: c8e660380a e6879f283d +Author: holan20180123 <56391770@qq.com> +Date: Wed Aug 26 10:21:09 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit c8e660380a190ac8583bfdcb0abd201e8d5c8623 +Author: holan20180123 <56391770@qq.com> +Date: Wed Aug 26 10:20:32 2020 +0800 + + * Fix bug #3397,3398,3399. + +commit e6879f283d3fb3d10ed91af96ac4144c794d77c4 +Author: z +Date: Wed Aug 26 10:19:39 2020 +0800 + + * adjust code for update. + +commit 1a9df490573b7d1026824ef3541989ff5241dcb1 +Author: qiyu-xie +Date: Wed Aug 26 10:14:41 2020 +0800 + + * Add task module lang. + +commit 35304da79a2bb64601f40dc37c71ccacd7472a3d +Merge: b55ef50a46 aa6f7b5d5f +Author: z +Date: Wed Aug 26 10:11:44 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit b55ef50a46c721dadf724311520ed1da77d9cffa +Merge: 8eb7358131 2942519ed8 +Author: z +Date: Wed Aug 26 10:11:25 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit aa6f7b5d5f07c57b6be50baf0b9b8caac2ec171e +Author: leiyong <1549684884@qq.com> +Date: Wed Aug 26 10:11:20 2020 +0800 + + * Finish task#7654. + +commit 8eb7358131bf2687172d0fd0368abee971e37eac +Author: z +Date: Wed Aug 26 10:10:01 2020 +0800 + + * adjust for check begin and end. + +commit 2942519ed8794c826ba498b446895374b2dd7faf +Author: Catouse +Date: Wed Aug 26 09:56:29 2020 +0800 + + * improve UI of recentprogram block. + +commit 413a53019efdedd30fa008d217aea522971e4776 +Author: Catouse +Date: Wed Aug 26 09:56:16 2020 +0800 + + * refactor. + +commit 24064443ac2c358af5d7162bc6cabb8dd6d5d7eb +Author: Catouse +Date: Wed Aug 26 09:36:27 2020 +0800 + + * change font size to 14 in menu and navbar. + +commit d9e9623e072aff74c4647f44ab25df06273ac1a2 +Merge: ed353f7ebd 7b3c3b65a8 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 26 09:48:14 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit ed353f7ebdc160678a16337827af74345a905ee9 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 26 09:47:58 2020 +0800 + + * Fix en menu. + +commit 7b3c3b65a8bd4df6941258ebb849cadffb00c7a3 +Merge: f6ec68ffe8 5095245438 +Author: holan20180123 <56391770@qq.com> +Date: Wed Aug 26 09:46:50 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit f6ec68ffe878e2754c6da25736f6d4e7987f9e0e +Author: holan20180123 <56391770@qq.com> +Date: Wed Aug 26 09:46:17 2020 +0800 + + * Add English lang file for progranplan module. + +commit 5095245438797a637b98ee189cbc1d85b47c1560 +Merge: 82a3cdadde 4240f51ae5 +Author: tianshujie98 +Date: Wed Aug 26 09:32:30 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 82a3cdadde9d12410459c006e62027bfe70d9198 +Author: tianshujie98 +Date: Wed Aug 26 09:30:00 2020 +0800 + + * Unified action/lang file. + +commit 4240f51ae5619a54a4cfa6a9d52bcbb7d1f79b7d +Merge: 77cf55dd79 bd2cf28ff1 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 26 09:23:26 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 77cf55dd790f9121277a2e68a286482ec9510d4e +Author: Yagami <976204163@qq.com> +Date: Wed Aug 26 09:23:01 2020 +0800 + + * Fix system menu header. + +commit bd2cf28ff1971e1349f0ff8e7535f573181c7a34 +Merge: f4ccf99b1d 640bb8c7d3 +Author: holan20180123 <56391770@qq.com> +Date: Wed Aug 26 09:10:56 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit f4ccf99b1d9002c97f454537ef79eda4d7959a3b +Author: holan20180123 <56391770@qq.com> +Date: Wed Aug 26 09:10:23 2020 +0800 + + * Edit English lang file for user module. + +commit 640bb8c7d3047be6c412ebbb322d5a97a52483f2 +Merge: 41ecce79d5 76628a20a5 +Author: tianshujie98 +Date: Wed Aug 26 09:06:41 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 41ecce79d5e290f7ef122db1484ecd7c3a7e1266 +Author: tianshujie98 +Date: Wed Aug 26 09:05:49 2020 +0800 + + * Add comment. + +commit 76628a20a59485068e9f39ed0e14309c50a223e5 +Author: holan20180123 <56391770@qq.com> +Date: Wed Aug 26 09:02:43 2020 +0800 + + * Add English lang file. + +commit 2ea4545a7c18afa1b9376c227d639c3dad85f599 +Merge: 00fe28cc80 f73b816280 +Author: tianshujie98 +Date: Wed Aug 26 08:35:48 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 00fe28cc807a262c3af2663e19e2996b448cd832 +Author: tianshujie98 +Date: Wed Aug 26 08:33:11 2020 +0800 + + * Unified button format. + +commit f73b8162808d39dc01d6bcb807e44295fb28cd1f +Author: Catouse +Date: Wed Aug 26 08:26:45 2020 +0800 + + * improve UI of program cards view. + +commit f71882401e56763d0e53048dca0ec83698c182ba +Merge: 89f8a86f3f 7853944cea +Author: tianshujie98 +Date: Wed Aug 26 08:12:27 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 89f8a86f3fa1d57713eb88b9571b9035a18e6f1f +Author: tianshujie98 +Date: Wed Aug 26 08:11:21 2020 +0800 + + * Add judgment when the database is empty. + +commit 7853944ceaeaaff87e916d101b5ec16acf8f7851 +Author: leiyong <1549684884@qq.com> +Date: Tue Aug 25 18:51:53 2020 +0800 + + * Add scrum overview block. + +commit 784a002bc01f88437a6ee091405d53ca680e0d13 +Author: tianshujie98 +Date: Tue Aug 25 17:38:19 2020 +0800 + + * Fix bug. + +commit 11b3c29bb27e1a3cdce54a3ce9ccec2cef579adf +Author: qiyu-xie +Date: Tue Aug 25 17:25:42 2020 +0800 + + * Add en.php. + +commit 1b1ad2a3849ac443b0007388ea3e9ffa96a03cb4 +Author: tianshujie98 +Date: Tue Aug 25 17:24:32 2020 +0800 + + * Fix Bug #3400. + +commit 356ced18f5664eea7f40239e62b61716f6a27fc6 +Merge: dbba92d084 267ac8f0b7 +Author: tianshujie98 +Date: Tue Aug 25 17:00:21 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit dbba92d084280cf4ad3ffd22ee186b47176c0afc +Author: tianshujie98 +Date: Tue Aug 25 16:59:54 2020 +0800 + + * Fix Bug #3401. + +commit 267ac8f0b77a4e9e894579083e23cfdff9478f94 +Author: Catouse +Date: Tue Aug 25 16:54:51 2020 +0800 + + * task #7651, improve UI of programteam block. + +commit 17242608fe41ceefc16c9e2c1bb565d92f856d57 +Merge: a3cb36f6e3 cc901f28ee +Author: tianshujie98 +Date: Tue Aug 25 16:43:15 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit a3cb36f6e3403a5416cf1b47d05cee8802d3c81b +Author: tianshujie98 +Date: Tue Aug 25 16:42:25 2020 +0800 + + * Modified design/lang/en.php + +commit cc901f28eeba4bbf6f5c2ad133bacd513c67b617 +Merge: 22ab2f9599 05b1ffeb32 +Author: leiyong <1549684884@qq.com> +Date: Tue Aug 25 16:42:03 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 22ab2f9599fd828ed0180adc39dafd3d482bb78d +Author: leiyong <1549684884@qq.com> +Date: Tue Aug 25 16:41:40 2020 +0800 + + * Adjust code. + +commit 05b1ffeb32de2c22444b69c147944434046fe5bb +Merge: 639cd3ad87 1eb3af2a6d +Author: Yagami <976204163@qq.com> +Date: Tue Aug 25 16:41:03 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 1eb3af2a6dbb839210ddf5aa4c123b43b64207ad +Author: z +Date: Tue Aug 25 16:40:31 2020 +0800 + + * fix error. + +commit 639cd3ad875a1033cefe63bf093e4accff6f4d51 +Merge: 6831c27236 8667908ce3 +Author: Yagami <976204163@qq.com> +Date: Tue Aug 25 16:40:31 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 8667908ce3bfacc907fe98241d1878c11dd1c6fa +Merge: 9a11ace11e 943cb2a8fa +Author: z +Date: Tue Aug 25 16:39:02 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 6831c27236e4e9f5791dc81d955bb35436e872ec +Merge: 7e73b340d6 943cb2a8fa +Author: Yagami <976204163@qq.com> +Date: Tue Aug 25 16:38:35 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 9a11ace11ee3453faa275b3353565826a65a0639 +Author: z +Date: Tue Aug 25 16:38:17 2020 +0800 + + * adjust for getParentPairs with template. + +commit 7e73b340d68ec153c3a3ebdd54461ae43e48f8a7 +Merge: 58c0bc19a0 8fcccc4604 +Author: Yagami <976204163@qq.com> +Date: Tue Aug 25 16:38:02 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 943cb2a8fa20e2ec1dc5d68c8716fc1dd4bd3d77 +Author: hufangzhou <746775970@qq.com> +Date: Tue Aug 25 16:37:52 2020 +0800 + + * Add scrum overview block. + +commit 58c0bc19a06c249d8024eebe27bc48b7b8e393e1 +Author: Yagami <976204163@qq.com> +Date: Tue Aug 25 16:37:42 2020 +0800 + + * Fix menu. + +commit 8fcccc46040506706a1169ef7773506247c8a98f +Merge: fb263a1152 843e2f8579 +Author: tianshujie98 +Date: Tue Aug 25 16:35:01 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit fb263a1152cc0db44a1f82cfde1d5af2b296bfae +Author: tianshujie98 +Date: Tue Aug 25 16:27:11 2020 +0800 + + * Add lang/en.php + +commit 62d11a4516a7655c6aa0f488031f3852e0270c04 +Author: tianshujie98 +Date: Tue Aug 25 16:26:33 2020 +0800 + + * Add lang/en.php + +commit 843e2f85792ec25e0c1856402c8458735e58e945 +Merge: be2c3596a3 e908c152cb +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 25 16:18:02 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit be2c3596a35f88595bc534a9c3d2c3a01dab2d9c +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 25 16:17:17 2020 +0800 + + * Edit program lang en.php + +commit e908c152cb59c408a66ef06d9849b5ce993c0ebf +Author: Catouse +Date: Tue Aug 25 16:07:21 2020 +0800 + + * fix status filter not work in program/browse in grid view. + +commit 648934425c5d3a2b2b0bcd8527752950a0cc511a +Author: Catouse +Date: Tue Aug 25 16:02:14 2020 +0800 + + * task #7660, fix progress error in cmmigantt block. + +commit b3f937914800caf20aff3ac584e1200afe4dcafc +Author: z +Date: Tue Aug 25 15:59:42 2020 +0800 + + * adjust for check parse file. + +commit 57df12b6d15ff3f0b03d93e6319ecfa4a579620d +Author: Catouse +Date: Tue Aug 25 15:50:35 2020 +0800 + + * refactor. + +commit 27a76f92cd387c6168f4b4d308e1d480ee8c1c8e +Author: Catouse +Date: Tue Aug 25 15:50:26 2020 +0800 + + * updage zui.js. + +commit 79c2decff233f00c4a5428333f401f3575d51305 +Author: Catouse +Date: Tue Aug 25 15:50:18 2020 +0800 + + * task #7660, add UI for cmmigantt block. + +commit eae8fae1f14b6a2697800b89477afcb4c0ccf319 +Author: Catouse +Date: Tue Aug 25 09:59:27 2020 +0800 + + * task #7664, improve UI of cmmiprogress block. + +commit b837b742ab25852633c0582d6a099ccc6cbf947f +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 25 15:43:21 2020 +0800 + + * Edit program statistic block. + +commit fee6de0fd3658b19d3239c7403ad2886d8da1ed5 +Author: Yagami <976204163@qq.com> +Date: Tue Aug 25 15:39:54 2020 +0800 + + * Fix risk lang. + +commit 0e828097980811dd737758bd962531017abb18f3 +Merge: 1011f0cb0e 02794ed5c4 +Author: tianshujie98 +Date: Tue Aug 25 15:31:15 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 1011f0cb0e5a1c23195f61d2535658cc770e59d5 +Author: tianshujie98 +Date: Tue Aug 25 15:30:10 2020 +0800 + + * Checkout module/group/lang/resource.php xuanxuan/module/group/ext/lang/zh-cn/xuanxuan.php + +commit 02794ed5c43e4c9f141135efa527d1b1adde8241 +Merge: c2f4b9a9fb e94501758c +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 25 15:12:28 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit c2f4b9a9fbade5a28c1c37c56bd8c3a82d5a94f0 +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 25 15:11:09 2020 +0800 + + * Edit Programstatistic block. + +commit e94501758c269580a4ce73426984fec65cee69c9 +Merge: 4e0a3d0da5 60fcf05741 +Author: Yagami <976204163@qq.com> +Date: Tue Aug 25 15:00:16 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 4e0a3d0da575e6b6d311f094519f960088343f22 +Author: Yagami <976204163@qq.com> +Date: Tue Aug 25 14:59:24 2020 +0800 + + * Fix block details. + +commit 60fcf05741da151458984f6c5bba9f2bbcfa0f94 +Author: tianshujie98 +Date: Tue Aug 25 14:53:50 2020 +0800 + + * Delete empty line. + +commit 73c08aa197ddfc076366a64bd17563bd0038d9e7 +Merge: 36ca024811 cdcb944cbb +Author: tianshujie98 +Date: Tue Aug 25 14:52:27 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 36ca02481156ab429652504dc8ca9bc9d67fc486 +Author: tianshujie98 +Date: Tue Aug 25 14:51:07 2020 +0800 + + * Add stdclass. + +commit cdcb944cbb5305989212f54600cdaf1b1b3546b8 +Merge: 8a403a5f3b cf5c7e507c +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 25 14:14:04 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 8a403a5f3b6eb36b502ca7e157db518c88d018c6 +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 25 14:13:29 2020 +0800 + + * Add field in Assigned to me block. + +commit cf5c7e507cba83c88fde4250176ae73d519e34bb +Author: leiyong <1549684884@qq.com> +Date: Tue Aug 25 14:12:35 2020 +0800 + + * Finish task#7654. + +commit ee92307425483bf1326778ed5c8e1ac0286e31ee +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 25 14:06:08 2020 +0800 + + * Fix bug Assigned to me block. + +commit 80a20fa5de451e8a7ae50838efcd6d65de32481a +Merge: 2af996af25 669d6c31e8 +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 25 13:58:42 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 2af996af253f81bae56c0d35eb36071cecb478df +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 25 13:57:58 2020 +0800 + + * Fix bug Assigned to me block. + +commit 669d6c31e8db0b895db0bccec76de8d9cd9cf443 +Merge: 4e03358c25 78c467722a +Author: tianshujie98 +Date: Tue Aug 25 13:41:26 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 78c467722a031e8f3baf162b71b027e6d20430fe +Merge: 115612570d 8c6babfb24 +Author: Yagami <976204163@qq.com> +Date: Tue Aug 25 13:40:39 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 115612570d4c515feb63a49a7e98cbd1bf1a059c +Author: Yagami <976204163@qq.com> +Date: Tue Aug 25 13:40:25 2020 +0800 + + * Fix sql. + +commit 4e03358c2502e617829a29ed2ca8e733a1d37c94 +Author: tianshujie98 +Date: Tue Aug 25 13:39:50 2020 +0800 + + * Add group/lang/resource.php. + +commit 8c6babfb243775321ed2202a730fd3934a2ee180 +Merge: 1efa74380e dfa03cf8cd +Author: tianshujie98 +Date: Tue Aug 25 13:33:03 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit dfa03cf8cd42bd994947bac67e6fa8559443aaf1 +Merge: 865cda58f7 49717ef5bd +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 25 13:22:32 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 865cda58f7528681766e6f7f8357757d2ab0400a +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 25 13:21:39 2020 +0800 + + * Finish task #7627. + +commit 1efa74380eac1565de59a6d08ee25e9d88da7b44 +Author: tianshujie98 +Date: Tue Aug 25 13:21:18 2020 +0800 + + * Add group/lang/resource.php. + +commit 49717ef5bdd65a93fab2e55d2365c49c7d769b97 +Merge: 5885a75c2e eea72cf851 +Author: Yagami <976204163@qq.com> +Date: Tue Aug 25 13:17:18 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 5885a75c2e2de188ca2708ee506124149f080075 +Author: Yagami <976204163@qq.com> +Date: Tue Aug 25 13:15:56 2020 +0800 + + * Code for program mothod. + +commit eea72cf85175636349857f14d73d44ba29bf6bcd +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 25 13:03:07 2020 +0800 + + * Edit block lang. + +commit 2a49dfd4d13648ee864c492463cae4f6466af578 +Author: Yagami <976204163@qq.com> +Date: Tue Aug 25 11:27:34 2020 +0800 + + * Fix weekly bugs. + +commit 8a418a650345213282028c2365fed1d30ccfb489 +Merge: ad619c4909 1af4b600af +Author: Yagami <976204163@qq.com> +Date: Tue Aug 25 11:10:02 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit ad619c4909eeba97eb60e345c83fa8355a49fd82 +Author: Yagami <976204163@qq.com> +Date: Tue Aug 25 11:09:42 2020 +0800 + + * Code for story and requirement. + +commit 1af4b600af584d0e402867380163ebc93f956fb0 +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 25 10:48:54 2020 +0800 + + * Edit block lang + +commit 297be48bcc80f4682c7247476d4e0e15afeb7bca +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 25 10:06:32 2020 +0800 + + * Add unique field. + +commit 7f194f36ce54d2277831870b98c3385bdef02389 +Merge: 6abb1f2aae d1f4308b36 +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 25 09:40:17 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 6abb1f2aae6ebd05ee68aafae436d480c3f7d0d0 +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 25 09:37:08 2020 +0800 + + * Add block for program statistic. + +commit d1f4308b36591e360881f848d132c07f461f65c4 +Merge: d64667dc99 485eb371fe +Author: z +Date: Tue Aug 25 09:20:41 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit d64667dc996e02981fe0ac595c3e305ea002742f +Author: z +Date: Tue Aug 25 09:19:54 2020 +0800 + + * adjust for get parent pairs. + +commit 485eb371fec79f4537c1ed5d67404940d9f276bd +Merge: d62d93baa7 74bfa68346 +Author: tianshujie98 +Date: Tue Aug 25 08:58:20 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit d62d93baa73ed6d0fc0e75f16f0690525edc496a +Author: tianshujie98 +Date: Tue Aug 25 08:57:39 2020 +0800 + + * Finish task #7628. + +commit 7f4c8ac9ac10a65bd806e8f1b87eaf2b251c163b +Author: tianshujie98 +Date: Tue Aug 25 08:19:53 2020 +0800 + + * Finish task #7628. + +commit 74bfa6834627199dc43607242ca499181df42dc8 +Author: leiyong <1549684884@qq.com> +Date: Tue Aug 25 08:13:31 2020 +0800 + + * Adjust block lang. + +commit 907261749eddc76bcaeaa786a6143e35dc31eb71 +Author: Catouse +Date: Mon Aug 24 17:29:51 2020 +0800 + + * task #7664, improve UI of cmmiprogress block. + +commit d7e9aa82f7563ed91d939aa8804c9b7f28647334 +Author: leiyong <1549684884@qq.com> +Date: Mon Aug 24 17:59:08 2020 +0800 + + * Block add operation button. + +commit 1cadda27064517d671094366ca7d410e981aac17 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 24 17:21:59 2020 +0800 + + * Fix program link and weekly bug. + +commit a5c739d8cd2579f05081901c6c9c9eaf1634756f +Merge: 3603ff2623 9e95b1bb78 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 24 16:33:57 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 3603ff262388ed5e08b3b4c1f11ca93e7e4a2e1c +Author: Yagami <976204163@qq.com> +Date: Mon Aug 24 16:33:37 2020 +0800 + + * Add story and requirement. + +commit 9e95b1bb788b7e916d220e69ba1d87efbf909286 +Author: leiyong <1549684884@qq.com> +Date: Mon Aug 24 15:39:16 2020 +0800 + + * Fix bug. + +commit 74d5aa79811487a4671d24c4a7a88dea1ca06672 +Merge: 5d75ef450c a6937ad5bf +Author: Yagami <976204163@qq.com> +Date: Mon Aug 24 15:34:55 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 5d75ef450c604398acbef501b60ac5b8eda47a27 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 24 15:33:30 2020 +0800 + + * Add new block set method and more link. + +commit a6937ad5bf3ab41232122fb3e60f3b82e2a6e4b1 +Merge: 6ee48f38f7 56e7d2f7ce +Author: z +Date: Mon Aug 24 15:30:26 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 6ee48f38f70f1c7f09eb536bcd4fb4656546755a +Author: z +Date: Mon Aug 24 15:30:00 2020 +0800 + + * adjust for change isCat field. + +commit 56e7d2f7ce794f619d1f30578b16923801ba60d7 +Author: hufangzhou <746775970@qq.com> +Date: Mon Aug 24 15:21:12 2020 +0800 + + * Finish task#7656,task#7653. + +commit beb18250c40b30bfe1fadac18d9ace94d4ce9152 +Author: leiyong <1549684884@qq.com> +Date: Mon Aug 24 14:52:55 2020 +0800 + + * Highlight the dynamic. + +commit afb11b19de222c8a28d3357350dd673d1d0c3569 +Merge: d7ba21e035 fe575297f0 +Author: z +Date: Mon Aug 24 13:21:56 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit d7ba21e03591f934257b8ad3e4f0e2702f469378 +Author: z +Date: Mon Aug 24 13:16:54 2020 +0800 + + * finish task #7648. + +commit fe575297f0c4537ad6a84e40a5332a9d51f7ddb3 +Merge: 1ad65ade80 0b06025c15 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 24 11:45:10 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 0b06025c15f838f013973fb780106995f74a671d +Merge: 1a9c007fec da40782404 +Author: z +Date: Mon Aug 24 11:34:08 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 1a9c007fecf8203553755cedccf186f2936287a5 +Author: z +Date: Mon Aug 24 11:33:37 2020 +0800 + + * finish task #7648. + +commit 1ad65ade803a42aaec12c69ca7ca5461e47810b2 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 24 11:32:02 2020 +0800 + + * Fix progress error. + +commit da40782404413635fc560c7bd3291d7b6b565cd7 +Author: leiyong <1549684884@qq.com> +Date: Mon Aug 24 11:31:36 2020 +0800 + + * Finish task#7658. + +commit 7d44ad86a6b72706469ba82af72e1d26e5b7141a +Author: tianshujie98 +Date: Mon Aug 24 11:11:35 2020 +0800 + + * Finish task #7628. + +commit 82f771c4afb6ae5f5c79e748724bc207b72574eb +Merge: 4925070808 6257a82bf8 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 24 10:58:09 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 4925070808b74c2061861ac48ca328c9937adc75 +Merge: b12aef4e0f 6c8c7255f0 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 24 10:56:44 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 6257a82bf89220ede2a7019efab4cd8bdc7575e5 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 24 10:56:39 2020 +0800 + + * Edit isClickable for program model. + +commit b12aef4e0f5be3533f60d5d23ae932e3fb07835d +Author: Yagami <976204163@qq.com> +Date: Mon Aug 24 10:53:59 2020 +0800 + + * Code for task #7640. + +commit 6c8c7255f0c1e99394c4cc8c57a2acfdc8e6a723 +Merge: 33666bc545 ec46bb7bcc +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 24 10:52:24 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 33666bc545148a66823d8e2fe3c06ad62aa47424 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 24 10:50:52 2020 +0800 + + * Add risk list for assign to me block. + +commit ec46bb7bcc930499b541fe7506f270f485c0365b +Merge: 865d311df2 ccfe5c5ada +Author: Yagami <976204163@qq.com> +Date: Mon Aug 24 10:47:48 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 865d311df20b21a5558a31964fc5fbda945f3b41 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 24 10:45:30 2020 +0800 + + * Fix block details. + +commit ccfe5c5adac62c1b7f4a033c0b81ae602c8b83e2 +Merge: 23d070d622 be6daed1e6 +Author: z +Date: Mon Aug 24 10:19:56 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 23d070d62203f6f7d7f0fead40b102afd570f31e +Author: z +Date: Mon Aug 24 10:18:53 2020 +0800 + + * finish task #7643, + +commit be6daed1e665b971fca0da6205ad644884c24404 +Author: tianshujie98 +Date: Mon Aug 24 09:37:37 2020 +0800 + + * Finish task #7628. + +commit 9bf7cd19efaf93ff682608aa3331540729858884 +Author: tianshujie98 +Date: Mon Aug 24 09:21:49 2020 +0800 + + * Finish task #7628. + +commit 0b09a6a3fcb01845f917db157f5cb5c99148141e +Author: tianshujie98 +Date: Mon Aug 24 09:16:20 2020 +0800 + + * Finish task #7628. + +commit 83e0d78aef643adecb5cf331b5b3eb7bdd2d96ce +Author: leiyong <1549684884@qq.com> +Date: Mon Aug 24 08:11:20 2020 +0800 + + * Add issue lang file. + +commit ecbeb7f598192f8502eea72dc6aea3a9dcfd6801 +Author: sgm0422 <976204163@qq.com> +Date: Sun Aug 23 15:24:16 2020 +0800 + + * Fix code details. + +commit 1ecc8c46448ee17c1be197a5c0d8e20b88494ace +Author: sgm0422 <976204163@qq.com> +Date: Sat Aug 22 23:42:46 2020 +0800 + + * Fix code style. + +commit 51329f01b8f63e68704295b060f748b8c727a262 +Merge: 8b479c3cf5 57508a6634 +Author: tianshujie98 +Date: Fri Aug 21 17:04:01 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 8b479c3cf5f0eb8e3e6f86b811730fed3427e4dd +Author: tianshujie98 +Date: Fri Aug 21 17:03:25 2020 +0800 + + * Finish task #7628. + +commit 57508a6634d11998a88b5621955fcd3dc6d5950d +Merge: 87f36b0c39 23055c1ed6 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 21 17:01:29 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 87f36b0c3943c6743e944d427a7df68abdea8b81 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 21 16:59:10 2020 +0800 + + * Fix code style. + +commit 23055c1ed638cc8ee276ec2586b731b1525529d1 +Merge: bd27e5b0ed 7ceed7be4f +Author: z +Date: Fri Aug 21 16:02:26 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit bd27e5b0ed4bc3ec79ffda6a16962768c7a16a6f +Author: z +Date: Fri Aug 21 16:01:44 2020 +0800 + + * finish task #7645. + +commit 7ceed7be4fbbac5228c4d9c3040ec3ea7f3fe6f0 +Merge: d52f312fe0 ab623ffab6 +Author: holan20180123 <56391770@qq.com> +Date: Fri Aug 21 15:44:57 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit d52f312fe04a741a9c8b2a063612f5242d3f0549 +Author: holan20180123 <56391770@qq.com> +Date: Fri Aug 21 15:44:15 2020 +0800 + + * Edit css of recentprogram block. + +commit ab623ffab698593003fbc4eff44654b70e305d09 +Merge: bc831b9e94 29f9b687de +Author: Yagami <976204163@qq.com> +Date: Fri Aug 21 15:39:55 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit bc831b9e94e67dccafae6e595fc9570fa1ca5a35 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 21 15:39:39 2020 +0800 + + * Add program statistic. + +commit 29f9b687de8c573881c921020db6a1dc0f45891d +Merge: 848c7cf866 0c008cd016 +Author: holan20180123 <56391770@qq.com> +Date: Fri Aug 21 15:38:37 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 848c7cf866689748297e0c1a2e792c3976e5e2b0 +Author: holan20180123 <56391770@qq.com> +Date: Fri Aug 21 15:37:59 2020 +0800 + + * Add recent program block. + +commit 0c008cd016c526290026a26dab70f6675be0ba4a +Author: leiyong <1549684884@qq.com> +Date: Fri Aug 21 15:29:30 2020 +0800 + + * Issue add search. + +commit 586f34b10fcf94f6a805940a19bdadc7d97c91b4 +Author: chenfeiCF +Date: Fri Aug 21 07:18:54 2020 +0000 + + * Add toTask field to datatable. + +commit 83993c233eae7f02e384fed587ae923c010e375a +Author: jajasper +Date: Fri Aug 21 14:09:31 2020 +0800 + + * fix bug #12147. + +commit 970f03095d0e7b79a133d5a1a71bb3ea34c75508 +Author: jiadongdong +Date: Fri Aug 21 13:53:26 2020 +0800 + + * fix bug #12147. + +commit de2b16d64e48e25072987958018963c58467e7c7 +Merge: a245bb6954 af7e3883a5 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 21 13:51:40 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit a245bb69544df23848e8e824984080b546717fff +Author: Yagami <976204163@qq.com> +Date: Fri Aug 21 13:51:09 2020 +0800 + + * Fix welcome block. + +commit af7e3883a5948d62d0e752e4aae5604353476567 +Merge: 1b615eab97 a2dc263d7d +Author: holan20180123 <56391770@qq.com> +Date: Fri Aug 21 13:26:21 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 1b615eab97daf462a22db164c91c0b2181c2cdfa +Author: holan20180123 <56391770@qq.com> +Date: Fri Aug 21 13:25:54 2020 +0800 + + * Edit search risk. + +commit a2dc263d7ddfe48797895ada62595ff70fdaac44 +Merge: 3b9a6dbe09 7ac97c9e56 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 21 13:15:18 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 3b9a6dbe09b7840a14c35469be5d0600f75b12f5 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 21 13:14:51 2020 +0800 + + * Add block module list. + +commit 7ac97c9e567baf98a96a2003f5ea65c102c3e037 +Merge: 5769bf7c0f 88141954a6 +Author: holan20180123 <56391770@qq.com> +Date: Fri Aug 21 13:06:30 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 5769bf7c0f7a81be9137a71bc48ced660286657b +Author: holan20180123 <56391770@qq.com> +Date: Fri Aug 21 13:05:43 2020 +0800 + + * Add contribute block. + +commit 88141954a6d5b8da0a860caf487f57f68896cdd1 +Merge: 647b060875 648f5e84f8 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 21 11:25:58 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 647b0608754453ab30811e2893a287f49d245b52 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 21 11:25:39 2020 +0800 + + * Fix block get list method. + +commit 648f5e84f866da042b1856c59bb8ff7c48a7d813 +Merge: 463a7c24a8 c09e27a568 +Author: z +Date: Fri Aug 21 11:05:30 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 463a7c24a875df480490220ff66dc45c26965fe4 +Author: z +Date: Fri Aug 21 11:04:41 2020 +0800 + + * code for task #7644. + +commit c09e27a568e2a5b58c939868ea186425eab6aeb6 +Merge: 9c24b069d6 ea00a09d72 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 21 10:57:30 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 9c24b069d60930596e00da9d392008c16185ff48 +Author: Yagami <976204163@qq.com> +Date: Fri Aug 21 10:56:19 2020 +0800 + + * Add new block. + +commit 20d3cab2728a680ace73af80236e244a281fe7cd +Author: z +Date: Fri Aug 21 10:31:07 2020 +0800 + + * code for task #7646. + +commit ea00a09d72e5b280e3cad14020ea0df95df144c9 +Merge: 9c649028b5 91f3a21133 +Author: z +Date: Fri Aug 21 09:48:43 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 9c649028b53d72a63467f951ac7b4cb04a00f04b +Merge: cd364590d5 c6eeec553a +Author: z +Date: Fri Aug 21 09:48:23 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit cd364590d564ce5bc7712c6270289cc0e362b129 +Author: z +Date: Fri Aug 21 09:47:49 2020 +0800 + + * add lang item. + +commit 91f3a211332552ccbede73fc7f5b141c2387473b +Merge: 57afbd202f c6eeec553a +Author: Yagami <976204163@qq.com> +Date: Fri Aug 21 09:47:47 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 57afbd202ff8c6508f0fb4bff54427349f53ad6a +Author: Yagami <976204163@qq.com> +Date: Fri Aug 21 09:47:16 2020 +0800 + + * Add new block. + +commit c6eeec553a6c3cecd97f8bfb8a508e5de40dffa5 +Author: hufangzhou <746775970@qq.com> +Date: Fri Aug 21 09:29:33 2020 +0800 + + * Add Scrum dynamic. + +commit 539283311c58c4ee74835ec9ae2b65add3d551cc +Merge: 0f91511fe4 f035ecd861 +Author: Yagami <976204163@qq.com> +Date: Thu Aug 20 17:28:25 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 0f91511fe424d031130b1bb1864698950dc79e6c +Author: Yagami <976204163@qq.com> +Date: Thu Aug 20 17:28:02 2020 +0800 + + * Fix design details. + +commit f035ecd861f984edeb8804f5b3507d1ffc842586 +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 20 17:20:05 2020 +0800 + + * Code for block issue list. + +commit 671781aecbe6520eb863490778d4bbc94f04d3ee +Merge: f5319cee4e 80e5e35540 +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 20 16:27:55 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit f5319cee4e079f5bcffa5ccbe1bb0a5ffe9dbfe0 +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 20 16:27:26 2020 +0800 + + * Code for block riskList. + +commit 80e5e35540a10b4cd00acae71f881b71f031caf3 +Merge: b9c8d645f5 dd4896a0f2 +Author: Yagami <976204163@qq.com> +Date: Thu Aug 20 16:26:36 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit b9c8d645f547aeaa8466e174b0b0ad86d5fe1f05 +Author: Yagami <976204163@qq.com> +Date: Thu Aug 20 16:26:17 2020 +0800 + + * Add milestone module. + +commit dd4896a0f28690da7f5a32965a27fdd22d804c02 +Merge: e4b7c55620 90b6f05859 +Author: tianshujie98 +Date: Thu Aug 20 16:25:00 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit e4b7c55620a2bfd34aadd65589131075141dd2fd +Author: tianshujie98 +Date: Thu Aug 20 16:24:17 2020 +0800 + + * Finish task #7628. + +commit d5c8ab35c5b93eb3cb66c1615c43613eecea673a +Author: z +Date: Thu Aug 20 16:15:14 2020 +0800 + + * fix bug #3380. + +commit 90b6f05859bf0f78a97680510d3f98878138f783 +Merge: 09cfff0dbc c82fc3ff60 +Author: z +Date: Thu Aug 20 15:56:55 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 09cfff0dbc8d34f3d0f0597f6e4a1d34bb61bc19 +Author: z +Date: Thu Aug 20 15:52:07 2020 +0800 + + * finish task #7644,7642. + +commit c82fc3ff60e4e605b8a3c7f36d77461aad3b0319 +Author: leiyong <1549684884@qq.com> +Date: Thu Aug 20 15:49:26 2020 +0800 + + * Add scrum block module. + +commit 1cced1537d12732e026103c8731e3ac208ff7aca +Merge: 9c1ff185a2 f665df409b +Author: Yagami <976204163@qq.com> +Date: Thu Aug 20 15:06:27 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 9c1ff185a2db20a7f79bca12d66677a92f16be0c +Author: Yagami <976204163@qq.com> +Date: Thu Aug 20 15:06:08 2020 +0800 + + * Add issue block. + +commit f665df409bdf3648b741cb300af3726ebb2c771a +Merge: 1ed91ca918 d4950444ad +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 20 14:56:53 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 1ed91ca91869e67f4df60abfafc1150537fb9f02 +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 20 14:56:37 2020 +0800 + + * Add risk module. + +commit d4950444ad3568c277e5909a89c012be265b41ba +Author: leiyong <1549684884@qq.com> +Date: Thu Aug 20 13:36:25 2020 +0800 + + * Adjust sql. + +commit ad0f2a65a9e21a5570e2c8f3ab7201a6b4d6a8d0 +Author: leiyong <1549684884@qq.com> +Date: Thu Aug 20 11:15:31 2020 +0800 + + * Merger code. + +commit a39e00876e08cf5be6ece0a2bc44243ad2f4080f +Author: leiyong <1549684884@qq.com> +Date: Thu Aug 20 11:13:07 2020 +0800 + + * Merger code. + +commit de3c53ec94222426cb621f8ff56b8f2e4318dc8c +Author: Yagami <976204163@qq.com> +Date: Thu Aug 20 11:09:23 2020 +0800 + + * Add blocks. + +commit fc664a5bb0f3044ddcf044c55b76ac096165af19 +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 20 10:52:11 2020 +0800 + + * Code for risk. + +commit a3fa8d037112d8944f67d467660fcd43973a2ce8 +Merge: ed98c8e848 2c09d22979 +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 20 10:50:31 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit ed98c8e8486ed3ceed592c4f875e65dd4351c7c1 +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 20 10:50:14 2020 +0800 + + * Code for risk. + +commit 2c09d2297932523b119b2ce432bce21fcbb866f1 +Merge: 236880c4b6 b5f221814a +Author: tianshujie98 +Date: Thu Aug 20 10:25:48 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 236880c4b622bfac494243d79a6b6a10e54ebcd6 +Author: tianshujie98 +Date: Thu Aug 20 10:24:58 2020 +0800 + + * Finish task #7628. + +commit acb8d93ec47b65d2862606ac5b01e37bfa048ed6 +Author: tianshujie98 +Date: Thu Aug 20 10:22:00 2020 +0800 + + *Finish task #7628. + +commit c23c6e721c78426fdcb6fe65f3c1e7a3778312ad +Author: tianshujie98 +Date: Thu Aug 20 10:15:58 2020 +0800 + + * Finish task #7628. + +commit b5f221814a955672cc78a54b5bb1efe0a2819b70 +Author: leiyong <1549684884@qq.com> +Date: Thu Aug 20 09:33:01 2020 +0800 + + * Finish task#7626. + +commit 5789150b1cf2948403e4e2a1b7b70837fb8d52bc +Author: hufangzhou <746775970@qq.com> +Date: Thu Aug 20 09:28:21 2020 +0800 + + * Question details page. + +commit 2ccfb0d29c581c0975bb8fb3cdd72d6d1ea72f74 +Merge: cc7db91b5e 994ccd7246 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 19 17:34:49 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit cc7db91b5e03c09ac37745e318791a9179135060 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 19 17:34:22 2020 +0800 + + * Add program blocks. + +commit 994ccd7246deae48a1123ebd82c3b70dc8eb63c1 +Merge: 12220a0524 8e1c142bad +Author: holan20180123 <56391770@qq.com> +Date: Wed Aug 19 17:28:23 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 12220a05247700f586274dccf3a29e4f1d2e387c +Author: holan20180123 <56391770@qq.com> +Date: Wed Aug 19 17:28:09 2020 +0800 + + * Code for risk. + +commit 8e1c142badbfbe11aeb301dcf03ac8f8c0a5154f +Author: leiyong <1549684884@qq.com> +Date: Wed Aug 19 17:14:46 2020 +0800 + + * Add issue details page. + +commit f375b8a910926acc4a7ea150a29e350c45d4e270 +Author: leiyong <1549684884@qq.com> +Date: Wed Aug 19 16:57:25 2020 +0800 + + * Add issue details page. + +commit a95981f2a737209f22502949dc47aed243dda43c +Merge: 2d59fe5555 2f0946291f +Author: z +Date: Wed Aug 19 16:42:27 2020 +0800 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 2d59fe5555b140916a264aa6bc25e2ef6eb32fca +Author: z +Date: Wed Aug 19 16:41:58 2020 +0800 + + * finish task #7646. + +commit 538d6a9b40065186c7bafb9447a1da75b3f8abee +Author: z +Date: Wed Aug 19 16:29:04 2020 +0800 + + * finish task #7647. + +commit 2f0946291f07ccefd4cd7981599cb462b4678710 +Author: leiyong <1549684884@qq.com> +Date: Wed Aug 19 16:12:54 2020 +0800 + + * Adjust code . + +commit 0166d694113840ddd33ca1e9ba36e89892dcdd0c +Author: hufangzhou <746775970@qq.com> +Date: Wed Aug 19 16:03:16 2020 +0800 + + * Fix bug. + +commit f84599de14be71173946252ded456205d2feac58 +Author: leiyong <1549684884@qq.com> +Date: Wed Aug 19 15:54:32 2020 +0800 + + * Improve the problem function module. + +commit 1288cc0803e836cad1fd0b9902a50c5622493708 +Author: hufangzhou <746775970@qq.com> +Date: Wed Aug 19 15:40:59 2020 +0800 + + * Add batchCreate method. + +commit 06e0452d785c084e20c2746ce0a90114c998dbfc +Author: Yagami <976204163@qq.com> +Date: Wed Aug 19 14:51:57 2020 +0800 + + * Code for program index. + +commit a86cb318954ebc3ee6b7c302a8ad1812556ba577 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 19 10:58:29 2020 +0800 + + * Add holiday and fix project and product menu. + +commit 1635ea036162b89f844e5d1dff1ece941336494c +Author: z +Date: Wed Aug 19 09:07:11 2020 +0800 + + * adjust for checkCompileStatus times. + +commit bc65843452974f9337dd14268d18021190992adb +Merge: 5639a2a7f1 7dca4636cd +Author: Yagami <976204163@qq.com> +Date: Wed Aug 19 08:31:25 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 5639a2a7f1c8170c97ebe46a6cfa056f6998edd6 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 19 08:30:12 2020 +0800 + + * Fix details. + +commit 7dca4636cd69df0f5d1dc39a99f6c8d48f7eae1a +Merge: ed6d675d37 4056b73d6c +Author: holan20180123 <56391770@qq.com> +Date: Wed Aug 19 08:29:36 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit ed6d675d37746938d3ae91384603f21464a98376 +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 18 17:44:02 2020 +0800 + + * Code for risk. + +commit cc3a9aeb9e8fe21bf7500a1bd670ec4e2715cb66 +Author: z +Date: Tue Aug 18 15:03:09 2020 +0800 + + * fix bug #2729. + +commit 4056b73d6c1d4e22b01125aa79b9ea865bbd4cb1 +Merge: bfd9f8e5d1 c49f14443b +Author: Yagami <976204163@qq.com> +Date: Tue Aug 18 14:40:22 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit bfd9f8e5d1e7a3730e8d4b08e6c8d4223915840e +Author: Yagami <976204163@qq.com> +Date: Tue Aug 18 14:36:39 2020 +0800 + + * Code for task #7625. + +commit 6cdef8d7d3eaaeb1d3ad2f624ba2ef8babd65df9 +Merge: be28a89aea 0a32bb464f +Author: z +Date: Tue Aug 18 14:11:53 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit be28a89aeac4fd0b517f39f7c4c5f3a9383d52d9 +Author: z +Date: Tue Aug 18 14:09:30 2020 +0800 + + * fix bug for flow. + +commit c49f14443bb01a96430079a58e5fcb6831ebf148 +Merge: 4c058b4c4b e2378b2dde +Author: leiyong <1549684884@qq.com> +Date: Tue Aug 18 13:53:42 2020 +0800 + + * Conflict resolution. + +commit 4c058b4c4b846d6f1d34d166a116c62cc003fae7 +Author: leiyong <1549684884@qq.com> +Date: Tue Aug 18 13:36:15 2020 +0800 + + * Add issue module. + +commit e2378b2dded940ac0aff92ba9ef95269988d1d8b +Author: Yagami <976204163@qq.com> +Date: Tue Aug 18 10:38:30 2020 +0800 + + * Add risk browse method. + +commit 1d52ca7679039f8bdb21421e5c0192b7facc2509 +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 18 09:28:15 2020 +0800 + + * Code for risk. + +commit 4d97b28aa0bb1852b44166982ac0abdb4bd89bad +Merge: 0579a713c4 4ad3e6d979 +Author: Yagami <976204163@qq.com> +Date: Tue Aug 18 09:08:24 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 0579a713c402ba8998dfdf33bb32932bc7ef52ac +Author: Yagami <976204163@qq.com> +Date: Tue Aug 18 09:08:13 2020 +0800 + + * Add risk module. + +commit 4ad3e6d979b78bcbcf4f9505b78ff76eed75e383 +Author: holan20180123 <56391770@qq.com> +Date: Tue Aug 18 09:06:13 2020 +0800 + + * Code for stage. + +commit 8f7f158ad51820999df1c6e547a2aead422e77ee +Merge: 3b72ae8238 4c2d627fd9 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 17 17:29:19 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 4c2d627fd9c3b54ff3afb6dbb3807d7ffbd29254 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 17 17:27:42 2020 +0800 + + * Code for stage. + +commit 3b72ae82387dc5c37c3d9ad4f5f007317e6d2b3d +Author: Yagami <976204163@qq.com> +Date: Mon Aug 17 17:24:22 2020 +0800 + + * Add stage to 20.x. + +commit 2fef6e424d384e5af34bff7f327fed9b24022a88 +Merge: 0f4927728a d00955fafc +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 17 16:58:59 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 0f4927728a3ffeaceeef438fcea6596baaad44d9 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 17 16:58:34 2020 +0800 + + * Code for stage. + +commit d00955fafc63884d77d27ad16816b60cde2b784a +Merge: 3965976022 da8347f289 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 17 15:32:17 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 39659760227d0134a05df56c119ce00b7ef427fe +Author: Yagami <976204163@qq.com> +Date: Mon Aug 17 15:31:44 2020 +0800 + + * Code for task #7632. + +commit da8347f2898af81fbe2ff268f58ebf0cf118f2dd +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 17 15:16:19 2020 +0800 + + * Add stage model update method. + +commit 5f441606bbaecc6b4b67d41a75f2ab6703045b07 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 17 15:15:31 2020 +0800 + + * Edit footer path. + +commit 4fe2e5f2787b96dbbd276b9e0b7d7cec5780a4a4 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 17 14:41:58 2020 +0800 + + * Move stage method to zentaopms. + +commit 5ab40d872fd3c870882568aa8674c0579fd07564 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 17 13:50:12 2020 +0800 + + * Move programplan from qc to zentaopms. + +commit 9c8252a0c476557b1bd6047cec9fba703149bdb8 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 17 13:25:46 2020 +0800 + + * Move estimate from qc to zentao. + +commit 4812aa04d082d5e06797a46350c7bee0e8e952b4 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 17 10:26:57 2020 +0800 + + * Fix sql. + +commit 96cd6f5e6e283ca950cf4765330053cedaf37c87 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 17 10:14:42 2020 +0800 + + * Fix common. + +commit 0a32bb464f1faf962a17908c44e78ec053c785f0 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 17 09:46:45 2020 +0800 + + * Fix bug #3276. + +commit 89a4481f0b44fe2a373a6bd60c1717a4d594f7fa +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 17 09:45:55 2020 +0800 + + * Fix bug #3276. + +commit efb74c9aaff91bf158ddbfcac546713f423d79b8 +Merge: fdf35bcce8 4170ad49b5 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 17 09:23:37 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fdf35bcce8700c0a6cb1aeabc02ad10594b24268 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 17 09:23:14 2020 +0800 + + * Fix bug #2961. + +commit a25560c573cff8f249958a76a259e8455376435e +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 17 09:22:58 2020 +0800 + + * Fix bug #3276. + +commit b877163ef37914bcdd4e02a7a43f66f6fd72bb9e +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 17 09:22:33 2020 +0800 + + * Fix bug #3358. + +commit 3f48c5c4ba9ca3c8ce5876a8af56076d987accb8 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 17 09:21:49 2020 +0800 + + * Fix bug #3359. + +commit 8e964d56a1d96f7cb44a0e828a898b85d3fc7b9b +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 17 09:21:19 2020 +0800 + + * Fix bug #3365. + +commit 4170ad49b521613cb6ee1828a4544232001f6a6d +Author: qiyu-xie +Date: Mon Aug 17 08:59:45 2020 +0800 + + Fix bug #2582 + +commit 664f5618145f9b2ec80c5e5f6c15b3cdce317879 (tag: zentaopms_20.0_20200815, tag: zentaopms_13.0_20200815) +Author: leiyong <1549684884@qq.com> +Date: Fri Aug 14 16:57:40 2020 +0800 + + * Restore permissions + +commit de6403094b717675ee8dddd0370a14fa21145f18 +Author: Catouse +Date: Fri Aug 14 13:59:07 2020 +0800 + + * fix scrollbar position in batch action form. + +commit 89eb2e6f34edb40aa114186821e5465fe772338d +Author: Yagami <976204163@qq.com> +Date: Fri Aug 14 11:13:53 2020 +0800 + + * Code for qc. + +commit 03c00910aead4fb5750276f13e45e0601f7143b2 +Author: qiyu-xie +Date: Fri Aug 14 08:10:19 2020 +0800 + + Fix bug #3342 + +commit f92d70b3cbe92410aeb2bf2451b552cb31061f18 +Merge: 1562d44150 fb15224b42 +Author: qiyu-xie +Date: Thu Aug 13 13:59:46 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1562d4415091dbdd261b62ac50c7d28432e5aadd +Author: qiyu-xie +Date: Thu Aug 13 13:55:38 2020 +0800 + + Fix bug #3280 + +commit fb15224b4252a02113f81766d81e0ff12d97f76c +Merge: 2cecd03e0b 595e3e35c4 +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 13 13:53:57 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2cecd03e0bca8135d7765f488dfc2cff29d5cba7 +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 13 13:52:00 2020 +0800 + + * add new version and upgrade. + +commit 4ae5a267711a2e8855c860ae84b5b6e937aae3a3 +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 13 13:51:34 2020 +0800 + + * Fix bug #3364. + +commit 7ac81c9b32f86769250052d949c00f37cde4044b +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 13 13:49:15 2020 +0800 + + * Fix bug #3366. + +commit 99f7f0c4df5484bd7dac31af373421165589500e +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 13 13:48:29 2020 +0800 + + * Fix bug #3276. + +commit 4040cbf092e278982680ab8dee026e95cd12d0a0 +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 13 13:47:44 2020 +0800 + + * Fix bug #3292. + +commit b4512fd660459461ba9338550f4c488ed1cc96ad +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 13 13:47:23 2020 +0800 + + * Fix bug #3276. + +commit f9ec465c8b701fdeb8821db61a9c9015ba99c23f +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 13 13:45:41 2020 +0800 + + * Fix bug #3360. + +commit 595e3e35c4197313c79c4b89dd5b805bb427741b +Author: tianshujie98 +Date: Thu Aug 13 09:38:57 2020 +0800 + + * Fix bug #2573. + +commit ada770c79221c5dc25a824db4923a03a57b3040c +Merge: f3c3ad3647 d83123f10e +Author: tianshujie98 +Date: Thu Aug 13 09:36:32 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f3c3ad36477134276b29bf6a8ea141202656829e +Author: tianshujie98 +Date: Thu Aug 13 09:35:22 2020 +0800 + + * Fix bug #2577. + +commit d83123f10e97dd3ab8e3bf006467f40fab45bdd1 +Author: Yagami <976204163@qq.com> +Date: Thu Aug 13 09:30:00 2020 +0800 + + * Delete unuse file. + +commit ba50010878d17ae749590d91c1ca48dbf6676c2b +Author: Yagami <976204163@qq.com> +Date: Wed Aug 12 15:45:56 2020 +0800 + + * Fix main menu. + +commit db81c170d0a3d568dc03ada7932ce04a63b67b5d +Author: qiyu-xie +Date: Wed Aug 12 10:17:41 2020 +0800 + + Fix bug #2585 + +commit 29a2c25ef190905f1f7d48855ffc284b54084ac9 +Author: holan20180123 <56391770@qq.com> +Date: Wed Aug 12 08:15:40 2020 +0800 + + * Fix bug #3334. + +commit b6cd8c99a442947bdc530e30b9bec5fe98d358fe +Author: holan20180123 <56391770@qq.com> +Date: Wed Aug 12 08:14:44 2020 +0800 + + * Fix bug #2589. + +commit 3af0fb48dc2724e49a1b4594c1a3f4d801ce1ecd +Author: qiyu-xie +Date: Tue Aug 11 14:38:07 2020 +0800 + + Fix bug #2543 + +commit ff920c7d2dfb6e681b41310e73e01f6284505aad +Author: tianshujie98 +Date: Tue Aug 11 14:27:35 2020 +0800 + + * Fix bug #3293. + +commit 0f47a7f3572998c8d844d0934f95c2e9147c6272 +Author: tianshujie98 +Date: Tue Aug 11 10:02:28 2020 +0800 + + * Fix bug #2581. + +commit 320c98a3cb4a0c290023e1b69f65361f528c645b +Merge: fba9a11c58 0f644ba15a +Author: tianshujie98 +Date: Tue Aug 11 09:31:08 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fba9a11c580c60be67b2246e6576a90b4e7db62f +Author: tianshujie98 +Date: Tue Aug 11 09:30:12 2020 +0800 + + * Fix bug #2581. + +commit 120ffbff49f37780aaee8105af1ab9c5d406cff1 +Author: Yagami <976204163@qq.com> +Date: Tue Aug 11 09:21:25 2020 +0800 + + * Fix user model. + +commit 0f644ba15ab5fcbed315556fca515417ebcb1dce +Author: Yagami <976204163@qq.com> +Date: Tue Aug 11 09:04:49 2020 +0800 + + * Alert table zt_user. + +commit dcba3b07acf18b45aab86f9e31a04c8df7929c8d (tag: zentaopms_12.4.1_20200811) +Author: z +Date: Tue Aug 11 08:08:36 2020 +0800 + + * change zh-tw lang. + +commit c2ff9f6ef7a72b6600cf9903ec81421dce086370 +Merge: 73f5ccac58 7edd4ee1d7 +Author: z +Date: Tue Aug 11 08:05:56 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7edd4ee1d7a96a3de9c27278667493856ac3518c +Merge: afdf88d276 21fe8daa0d +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 10 17:34:06 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit afdf88d276b75a138b1b840a280f9f7458495c86 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 10 17:33:42 2020 +0800 + + * Fix bug #3340. + +commit 61d11bcc947250d676f01a6c32a37d7ad5e3ee6d +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 10 17:33:14 2020 +0800 + + * Fix bug #3340. + +commit bb8d5e954cc76d3fc344a90559ca05b9a9be8637 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 10 17:32:49 2020 +0800 + + * Fix bug #3176. + +commit 507ea33b82713b8ac85e1eb5c41c2c063f2327f8 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 10 17:31:56 2020 +0800 + + * Fix bug #2483. + +commit 21fe8daa0da7b7d31a169ec9aa7408ce3830b672 +Author: qiyu-xie +Date: Mon Aug 10 16:22:10 2020 +0800 + + Fix bug #3338 #3342 + +commit 73f5ccac588e50f6e31f175b3e8eb7494e7371fc +Author: z +Date: Mon Aug 10 16:18:06 2020 +0800 + + * fix for notice. + +commit 5b752451915c4b38b2a7b2d2b801d21a48a5795d +Author: tianshujie98 +Date: Mon Aug 10 16:13:52 2020 +0800 + + * Fix bug custom required testtask. + +commit 25667854a55a273f3255096a3c3b44f5124111cc +Author: leiyong <1549684884@qq.com> +Date: Mon Aug 10 16:09:03 2020 +0800 + + * Finish cmmi task#1187. + +commit 57051267201dd4441d1d5fa7d6a49a6e7217d481 +Author: z +Date: Mon Aug 10 13:43:04 2020 +0800 + + * add standard sql. + +commit 23fac7fee630b9ad9331f89169a0b846922c73a4 +Merge: f25c68666d 6489d03921 +Author: z +Date: Mon Aug 10 13:42:06 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6489d039218ca0a4adfe52f1061e96780e802d90 +Author: tianshujie98 +Date: Mon Aug 10 13:40:47 2020 +0800 + + * Fix bug #3293. + +commit f25c68666de1047f0d4fe79adecf4e4af3403dca +Merge: cad991a948 29bc6f6df5 +Author: z +Date: Mon Aug 10 13:38:06 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cad991a9480f98eb9b26868a9ca1211c0b931125 +Author: z +Date: Mon Aug 10 13:37:28 2020 +0800 + + * add new version and upgrade. + +commit 29bc6f6df587837a65acb3e6c6064c00d155d12a +Author: tianshujie98 +Date: Mon Aug 10 13:30:43 2020 +0800 + + * Fix Bug #3293. + +commit 3231ecff04da1d0aa4ff6faee924593082d15f8f +Merge: 5e9d47b062 ff8a781af5 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 10 11:32:21 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5e9d47b062a5e8edc722ae5d79594a78a2646593 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 10 11:31:50 2020 +0800 + + * Finish task #7613. + +commit 89922706ff395879ae792210ee20183f9196f65d +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 10 11:31:11 2020 +0800 + + * Finish task #7612. + +commit 910cfa370fff77613f44058f769805ab70c86bb1 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 10 11:30:17 2020 +0800 + + * Finish task #7611. + +commit f39f8d940416a0f5a32c7f93e12faf747436a160 +Merge: ad6fdd08dc ff8a781af5 +Author: z +Date: Mon Aug 10 11:27:48 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ff8a781af54c1b2d7f426257cd833145d493d21e +Author: tianshujie98 +Date: Mon Aug 10 11:14:07 2020 +0800 + + * Add remark. + +commit ad6fdd08dc4e653d2bc6296116b9e26231857f5b +Author: z +Date: Mon Aug 10 11:12:04 2020 +0800 + + * fix bug and adjust code. + +commit cc5679a475fabcd8f488e4e096a93ced6742b064 +Author: z +Date: Mon Aug 10 11:11:37 2020 +0800 + + * revert code for create task. + +commit 035744c5957da2106a2e405ad353a739f41284ea +Merge: 2d3c1ca5ad b38e6d0cf6 +Author: z +Date: Mon Aug 10 09:30:23 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2d3c1ca5add8a83065f862a25dba4df73e795380 +Author: z +Date: Mon Aug 10 09:26:23 2020 +0800 + + * adjust get unsync comment. + +commit b38e6d0cf6ada0aafc2d3eb4285ebc2089cea529 +Merge: 0bfb09736e 3eb3fcce02 +Author: tianshujie98 +Date: Fri Aug 7 17:33:29 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3eb3fcce0219d1ea93dffd216e4ce733d6efdc6a +Merge: a890c24077 0ac5ab572d +Author: holan20180123 <56391770@qq.com> +Date: Fri Aug 7 17:31:57 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a890c2407773468d6749fe9f6288800a468cd1f7 +Author: holan20180123 <56391770@qq.com> +Date: Fri Aug 7 17:31:38 2020 +0800 + + * Finish task #7614. + +commit ca73b53436e77bd968a65e0b47a1237bb7ff955e +Author: holan20180123 <56391770@qq.com> +Date: Fri Aug 7 17:31:13 2020 +0800 + + * Finish task #7613. + +commit 0bfb09736e5272ca3fe0417417c37386e77ee5bb +Author: tianshujie98 +Date: Fri Aug 7 17:31:04 2020 +0800 + + * Change back to the previous version. + +commit 28af4d63da93791c6181213f22cb26f1c70ce7da +Author: holan20180123 <56391770@qq.com> +Date: Fri Aug 7 17:29:16 2020 +0800 + + * Finish task #7613. + +commit 5755239f21d11430a93886e127276ae8676c9fa1 +Author: holan20180123 <56391770@qq.com> +Date: Fri Aug 7 17:28:45 2020 +0800 + + * Finish task #7612. + +commit 99e92ac05fd6b85d4b2211331a77d50090c2a6bd +Author: holan20180123 <56391770@qq.com> +Date: Fri Aug 7 17:27:54 2020 +0800 + + * Finish task #7611. + +commit 7de5503bbea0431a46a6c309f1f02990d7eb76a7 +Author: holan20180123 <56391770@qq.com> +Date: Fri Aug 7 17:25:54 2020 +0800 + + * add new version and upgrade. + +commit fdf70435de63cce71b88ce2ca3c1e144b7b0746b +Merge: c411761142 0ac5ab572d +Author: tianshujie98 +Date: Fri Aug 7 17:02:37 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c4117611423e9149d5a56d05116c65bb874b512a +Author: tianshujie98 +Date: Fri Aug 7 16:59:44 2020 +0800 + + * Finish task #7617,7615. + +commit 9e1fb72286f59c671dbb24f39024a84ea18f98a0 +Author: leiyong <1549684884@qq.com> +Date: Fri Aug 7 15:30:06 2020 +0800 + + * Adjustment of authority. + +commit 0ac5ab572d961aff3113699d4c9957e0d07ed8da +Merge: 4acf8e3990 14bc565253 +Author: z +Date: Fri Aug 7 15:14:55 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4acf8e3990028a88f607fc4d05b7ff7a6ba3ed56 +Author: z +Date: Fri Aug 7 15:14:20 2020 +0800 + + * finish task #7603,7603. + +commit 14bc5652537c90e71b61dca0ca028eb072dbfa1b +Author: Catouse +Date: Fri Aug 7 11:30:48 2020 +0800 + + * update picker files. + +commit f7e3cbe9f914b0eafd4983ba42baa3897a363002 +Author: leiyong <1549684884@qq.com> +Date: Thu Aug 6 19:25:28 2020 -0700 + + * Finish cmmi task#1191. + +commit 00f871efdb3d306c1a71327a892b0edfd2c0492c +Author: leiyong <1549684884@qq.com> +Date: Thu Aug 6 18:55:25 2020 -0700 + + * Delete authority. + +commit 35e78313a0550df4827f8839022fe29f96c05e4d +Author: Catouse +Date: Thu Aug 6 17:23:38 2020 +0800 + + * task #7591, auto refresh table statistic and pager after delete items. + +commit f3a5fc4ef9d5df14552c6b9fd00627282cc32820 +Merge: 9d7a93bda5 f423abddca +Author: z +Date: Thu Aug 6 17:22:21 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9d7a93bda5507aa18fbc1ec5db1b98d1c6c53d5a +Author: z +Date: Thu Aug 6 17:21:39 2020 +0800 + + * fix error. + +commit d1d918334aadddbbc825238066bf58c45b003598 +Author: z +Date: Thu Aug 6 17:21:19 2020 +0800 + + * fix bug #3337. + +commit f423abddcaec9ff93b9db358c35af5e70fbce77a +Author: tianshujie98 +Date: Thu Aug 6 17:13:45 2020 +0800 + + * Finish task #7577. + +commit 217b456bf95d6838383e16dfc72a970c7eef438b +Merge: 904543b48f dc04c92b2c +Author: qiyu-xie +Date: Thu Aug 6 16:29:16 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 904543b48ff84de65ad35d80d915db2b367c3c09 +Author: qiyu-xie +Date: Thu Aug 6 16:28:08 2020 +0800 + + * Fix bug #3324. + +commit dc04c92b2c528e2f5e63e64938c82b68a6678c28 +Author: Catouse +Date: Thu Aug 6 16:12:33 2020 +0800 + + * task #7563, bug #2481, refresh table statistic information after unlink bug or story in plan page. + +commit da4222a8f448b35ce02fd9015ec73db719ddb4f3 +Author: tianshujie98 +Date: Thu Aug 6 15:56:25 2020 +0800 + + * Fix bug #2564. + +commit ac56db19986ece2314f10929183e09ce22a6553e +Merge: 2134ee1b8f 2e98ef6a16 +Author: tianshujie98 +Date: Thu Aug 6 15:51:15 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2134ee1b8fe00ec92be86876ea26337bc48d1b03 +Author: tianshujie98 +Date: Thu Aug 6 15:49:29 2020 +0800 + + * Fix bug #2499. + +commit 2e98ef6a169814617018b635b5279208ebabc310 +Author: z +Date: Thu Aug 6 15:46:49 2020 +0800 + + * adjust style. + +commit b753e061491c61a8e19345bc41d6e830d6620a4a +Merge: 6aca289707 426a20faeb +Author: z +Date: Thu Aug 6 15:32:27 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6aca2897075451a913149b11d73ccb07b218c03f +Author: z +Date: Thu Aug 6 15:28:46 2020 +0800 + + * finish task #7585. + +commit 426a20faeb4435cab390fd9c46ae3c56e3fb0395 +Author: Catouse +Date: Thu Aug 6 14:52:15 2020 +0800 + + * task #7588, task #7561, bug #3317, bug #2433, fix chosen drop_direction=auto not work as expected. + +commit 533f677d5df59ce88a497eade6409ac415b6aa68 +Author: Catouse +Date: Thu Aug 6 14:42:04 2020 +0800 + + * fix chosen close icon position. + +commit 9b1a053f2695dce679cfa4762d397f8042241490 +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 6 14:26:07 2020 +0800 + + * Finish task #7560. + +commit 794534a0a16bc13946c6ed252232ae6a9b145a94 +Merge: 6f0fe410ad 4d660c547b +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 6 14:10:22 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6f0fe410ad4ad681697b3771954fbd3cb96747df +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 6 14:08:32 2020 +0800 + + * Finish task #7596. + +commit 6109e9c55adac4ece4209e7ce0baa140f5e30a8c +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 6 14:07:52 2020 +0800 + + * Finish task #7566. + +commit 6050a025c6a1dc5f0917fc9f1f7d8fb8f02a3483 +Author: holan20180123 <56391770@qq.com> +Date: Thu Aug 6 14:06:44 2020 +0800 + + * Fix bug #3335. + +commit 4d660c547bff237c34a760ff80d1f44e1ac8cd17 +Author: Catouse +Date: Thu Aug 6 13:42:58 2020 +0800 + + * task #7590, bug #3023, change color of links in article content. + +commit a3bba463061694da47d1b1d32466a579febf5601 +Merge: b1cd0ed599 152f2e6c73 +Author: z +Date: Thu Aug 6 13:37:44 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b1cd0ed599bc550bcd6a6c5e5084c04a66245c56 +Author: z +Date: Thu Aug 6 13:36:41 2020 +0800 + + * code for task #7600. + +commit 152f2e6c731c9292f3d798905e0898d71dadfbb9 +Author: Catouse +Date: Thu Aug 6 13:33:48 2020 +0800 + + * task #7588, task #7561, bug #3317, bug #2433, fix chosen drop_direction=auto not work as expected. + +commit 8511ff75961ced4966053fd99e4194b2e98151ab +Merge: 9ad6a18008 c2b35db7d1 +Author: z +Date: Thu Aug 6 11:01:36 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9ad6a18008680fc31ecbd78e4caf0f8838f79fa2 +Author: z +Date: Thu Aug 6 11:00:47 2020 +0800 + + * revert jquery and compatible this jquery. + +commit 01fada7c120ddc2ab5c720ae3cb7b92f19a116ef +Author: z +Date: Thu Aug 6 10:58:54 2020 +0800 + + * finish task #7585. + +commit 952c013ecae23e36178b504270eea6bf016891f4 +Author: z +Date: Thu Aug 6 10:51:43 2020 +0800 + + * fix for getModuleOwner. + +commit c2b35db7d106675d787361e986492a123dd06ae9 +Author: Catouse +Date: Thu Aug 6 10:48:30 2020 +0800 + + * fix picker undefined error in some pages without import picker js. + +commit e05fee759b516d864856198ac6c881f3e5eface9 +Author: Yagami <976204163@qq.com> +Date: Thu Aug 6 10:28:49 2020 +0800 + + * Fix user logic. + +commit c5ac96ef95659d7faddd852b6cac94586c1f4e7a +Author: Catouse +Date: Thu Aug 6 10:28:49 2020 +0800 + + * update picker file. + +commit a2d561f1ce55f00fd21fc7dc7560ed8d72c30ad8 +Author: Catouse +Date: Thu Aug 6 09:46:16 2020 +0800 + + * update zui and picker. + +commit bb3658ecf891398e0b008211b8e70b5459fbe168 +Author: tianshujie98 +Date: Wed Aug 5 17:58:17 2020 +0800 + + * Fix bug #2504. + +commit 51c1aaba82c91296f326f66977bb155e4eb794b7 +Merge: 548b5655b0 ae84a5dc24 +Author: tianshujie98 +Date: Wed Aug 5 17:25:56 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 548b5655b0b5cf18c4163d51f9961dccb3eb57be +Author: tianshujie98 +Date: Wed Aug 5 17:22:22 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a99aab00ea40138187c32f507a45f9d8ad3d2012 +Author: tianshujie98 +Date: Wed Aug 5 17:04:47 2020 +0800 + + *Finish task #7587. + +commit ae84a5dc249753a350eefdb0fe91ba1f1d986ea7 +Author: z +Date: Wed Aug 5 16:33:57 2020 +0800 + + * code for task #7600. + +commit 77328ef565b67c1a22b2036bb18d0cbd3eb05dd9 +Merge: 8b6579d4b2 fb752e34c8 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 5 15:46:41 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit 8b6579d4b270fba6b7370f17901576b0abeb1bd8 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 5 15:45:26 2020 +0800 + + * Fix common menu. + +commit fb752e34c821ddfb0594c3826521e2c2cedf20ea +Author: leiyong <1549684884@qq.com> +Date: Tue Aug 4 23:19:36 2020 -0700 + + * Finish task#1198. + +commit 7105e4cba5b4657322dfe769b5aa63195a1e395c +Author: Yagami <976204163@qq.com> +Date: Wed Aug 5 14:08:12 2020 +0800 + + * Fix menu order. + +commit 7c172bfcc21d06057e09cf29bdf6fe61c29330af +Author: Yagami <976204163@qq.com> +Date: Wed Aug 5 14:02:51 2020 +0800 + + * Fix common menu. + +commit cd5e8b3ad05ed592661626fb603aa6cd96bf4091 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 5 13:50:28 2020 +0800 + + * Delete unuse code. + +commit daff978429a1f7cdb0ad80753ef078696f526ed3 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 5 13:47:00 2020 +0800 + + * Fix router. + +commit d8ed76cff2cc678d303c861c14b975c578187406 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 5 13:42:59 2020 +0800 + + * Fix menu. + +commit 1be49bb2045aeb1bd10b50234c06d68bc3232111 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 5 13:37:40 2020 +0800 + + * Add menu. + +commit dc446c82254a902f61830ad42df835b07294b518 +Merge: b94f0e499f 3f5b97b526 +Author: leiyong <1549684884@qq.com> +Date: Tue Aug 4 22:12:19 2020 -0700 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit b94f0e499f21682b7cdb61b98efcd480cfee55ab +Author: leiyong <1549684884@qq.com> +Date: Tue Aug 4 22:11:46 2020 -0700 + + * Add menu. + +commit 3f5b97b5264e93f5a803672a7fffc3a94fc193a0 +Merge: f45dd79989 a25ac36e61 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 5 13:08:31 2020 +0800 + + Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x + +commit f45dd799892e5cba5bcc7ce3e1453da756d63104 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 5 13:08:14 2020 +0800 + + * Add stakeholder. + +commit a25ac36e61835eb283ac874da6cf8b6f577e7731 +Merge: 9cdb8ec0f8 683112acc6 +Author: leiyong <1549684884@qq.com> +Date: Tue Aug 4 22:06:47 2020 -0700 + + Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x + +commit 9cdb8ec0f8fed7ed9743773f89247de54fc3870f +Author: leiyong <1549684884@qq.com> +Date: Tue Aug 4 22:05:14 2020 -0700 + + * Adjust menu. + +commit 683112acc6efd60029edd3113635cabd57196086 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 5 11:27:05 2020 +0800 + + * Fix common lang. + +commit e81a73615056775cbc71ebaed0e19115516a3244 +Merge: 76381c1fd2 ae1a3396ba +Author: qiyu-xie +Date: Wed Aug 5 11:18:34 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 76381c1fd29cb9e0a0977d876f4a96635cd190a8 +Author: qiyu-xie +Date: Wed Aug 5 11:16:37 2020 +0800 + + * Merge. + +commit 575a430356cc8a17a20b08ea4b383a89b73a3690 +Author: Yagami <976204163@qq.com> +Date: Wed Aug 5 11:15:26 2020 +0800 + + * Fix common menu and program list. + +commit 15849794ec82653ad4dffde3cc2bb45d1fff9ccd +Author: Yagami <976204163@qq.com> +Date: Wed Aug 5 09:44:19 2020 +0800 + + * Fix common lang menu. + +commit ae1a3396ba30892097a615158c1a2d2e1c1aaf11 +Merge: 7dc09c5374 a748df7c3c +Author: tianshujie98 +Date: Wed Aug 5 09:41:47 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7dc09c5374719ec789044de7ad2ca9b74e93d4c7 +Author: tianshujie98 +Date: Wed Aug 5 09:29:53 2020 +0800 + + * Finish task #7584. + +commit a748df7c3ca9422de6c4ad9b3692211337bb1096 +Author: z +Date: Tue Aug 4 14:05:41 2020 +0800 + + * code for task #7600. + +commit bb3ad790d098c99633e0bee0bdfc59bd0e9280af +Merge: cbaa60d87f cdd728328c +Author: z +Date: Tue Aug 4 14:02:28 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cbaa60d87f89add3b7aa84c9cce0c15782139910 +Author: z +Date: Tue Aug 4 13:39:09 2020 +0800 + + * code for task #7595. + +commit cdd728328c92e032ecd013e02e68c03f03c98c8f +Merge: c92cc316d0 99aa236209 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 3 15:49:21 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c92cc316d0992f708ab84494cc11e5a4cde1191c +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 3 15:48:52 2020 +0800 + + * Finish task #7568. + +commit e1fc3eed58810559141c035129d7b3c3b76bb864 +Author: holan20180123 <56391770@qq.com> +Date: Mon Aug 3 15:48:15 2020 +0800 + + * Finish task #7575. + +commit 99aa236209e11c0df71b199bdbba6f583f044a16 +Author: tianshujie98 +Date: Mon Aug 3 15:41:26 2020 +0800 + + #Finish task #7562. + +commit fd01a1d7251a36af950e2d1e16203a69fcd52ada +Author: Yagami <976204163@qq.com> +Date: Mon Aug 3 15:28:31 2020 +0800 + + * Fix js error. + +commit e5e1002f8abccede43eecb4b79af54801f2800f8 +Author: z +Date: Mon Aug 3 15:03:51 2020 +0800 + + * Fixed security hole. + +commit 5b1d63ebf5badf29d224776e4fe052b1ae444d80 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 3 14:39:36 2020 +0800 + + * Fix program link. + +commit 541526e62d36b7cdcb87665678cb8d56b58bdc35 +Author: Catouse +Date: Mon Aug 3 14:07:59 2020 +0800 + + * fix icon-menu-users missing. + +commit 0ee24ac23c1c319d5b2787c77813812f8a09c525 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 3 13:42:48 2020 +0800 + + * Hidden product. + +commit 3d3b98769dd0e96abc7284b92c4eb85a525dceb8 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 3 13:14:41 2020 +0800 + + * Fix sql error. + +commit e42279b7925cbcae653136520138cf5772d1ce04 +Author: Yagami <976204163@qq.com> +Date: Mon Aug 3 11:04:26 2020 +0800 + + * Fix version. + +commit 9a17e562d8ea8a6013b5d32b8922226de6d9fc6a +Author: z +Date: Mon Aug 3 10:14:25 2020 +0800 + + * merge fr lang. + +commit 956f9e8f2bbfac3d9301e53a257998a4c1971c1f +Author: Yagami <976204163@qq.com> +Date: Sat Aug 1 13:53:49 2020 +0800 + + * FIx details. + +commit 8a046b4200b669a2d3a553ac5df691f1c1f561e2 +Author: Yagami <976204163@qq.com> +Date: Sat Aug 1 11:07:12 2020 +0800 + + * Fix program bug. + +commit ead7c9b8fd085dc43060d7404a08362a149f8be0 +Merge: c351b21b76 fdeb2e92a3 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jul 31 16:28:50 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c351b21b76781fef0a1985276a701c30ac71fb1e +Author: holan20180123 <56391770@qq.com> +Date: Fri Jul 31 15:53:40 2020 +0800 + + * Finish task #7571. + +commit 6b7e5520fb6d5464bded7c604c0f1e99588cdb72 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jul 31 15:52:49 2020 +0800 + + * Finish task #7580. + +commit 1805ded33e9cafbf424ced8a85ed1fd8695958e4 +Merge: dadf47b325 bc12606035 +Author: Yagami <976204163@qq.com> +Date: Fri Jul 31 15:17:31 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit dadf47b325c3a7aa676289e26d9f242d93a2cf18 +Author: Yagami <976204163@qq.com> +Date: Fri Jul 31 15:16:51 2020 +0800 + + * Delete unuse code. + +commit bf58755bc67d2967285212b71f5943f98f832c6c +Merge: ea9c4eceb5 fdeb2e92a3 +Author: z +Date: Fri Jul 31 13:05:23 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bc12606035b48f0cf93e4a56727bafaf63f3c090 +Author: Catouse +Date: Fri Jul 31 11:30:32 2020 +0800 + + * update zui to fix em style. + + see https://zentao.aiot.co.jp/bug-view-348.html + +commit fdeb2e92a3b9c7eabe7cd23838e4c09364ebce0b +Author: Catouse +Date: Fri Jul 31 11:29:11 2020 +0800 + + * update zui to fix em style. + + see https://zentao.aiot.co.jp/bug-view-348.html + +commit 96c494098a8601ba9fdd171d1ed131a63a56fc6a +Author: Yagami <976204163@qq.com> +Date: Fri Jul 31 11:14:32 2020 +0800 + + * Fix doc module. + +commit ea9c4eceb5eb612ac835019364287274411281ef +Author: z +Date: Fri Jul 31 11:11:22 2020 +0800 + + * fix bug. + +commit ebf78df2eaf3f2f06b645ba61578fac959918c61 +Merge: 17b11dd990 ab825e6cac +Author: Yagami <976204163@qq.com> +Date: Fri Jul 31 10:50:32 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit ab825e6cac7f1bde9e89273824dbc3dec284f9a1 +Author: leiyong <1549684884@qq.com> +Date: Thu Jul 30 19:49:17 2020 -0700 + + * Finish cmmi task#1171. + +commit 17b11dd990cd60c70ff6ac4f409ff4bd170714aa +Author: Yagami <976204163@qq.com> +Date: Fri Jul 31 10:47:41 2020 +0800 + + * Fix program link. + +commit 2e19ada0040554986742ba6f79adfbcca8d39a89 +Author: tianshujie98 +Date: Thu Jul 30 17:31:22 2020 +0800 + + *Adjust requiredModules. + +commit 700cbe5b484f414008ef4733442bd5419c74015c +Merge: b28ac76d62 6aba4d6304 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jul 30 16:27:00 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b28ac76d620c9008cbd73a91d246da284b57cf5f +Author: holan20180123 <56391770@qq.com> +Date: Thu Jul 30 16:26:30 2020 +0800 + + * Finish task #7569. + +commit 4aa88ed405c60e75db28f5f526e5065425c2cb5e +Author: holan20180123 <56391770@qq.com> +Date: Thu Jul 30 16:25:36 2020 +0800 + + * Finish task #7567. + +commit d86ada6071ceb8e8e0b6e1d71e90d4b43eaf8e16 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jul 30 16:25:04 2020 +0800 + + * Finish task 7573. + +commit 856259c60b585805759ce5d684e32e1e0a3519f7 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jul 30 16:23:48 2020 +0800 + + * Finish task #7572. + +commit 1cdfa7fe84daca400479a41a237c70719c7e4044 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jul 30 16:23:13 2020 +0800 + + * Finish task #7564. + +commit c3c0478561aeac890b90a92343ed0597a3673581 +Author: Catouse +Date: Wed Jul 29 17:42:13 2020 +0800 + + * fix paddingRight is not defined error cause by zui. + +commit 6aba4d63046977fffb29284c0ee68b1b63b9d795 +Author: Catouse +Date: Wed Jul 29 17:41:07 2020 +0800 + + * fix paddingRight is not defined error cause by zui. + +commit 917fedd266668c0b38d5523a88c644af600e73e6 +Author: leiyong <1549684884@qq.com> +Date: Wed Jul 29 01:51:43 2020 -0700 + + * Fix cmmi bug#332 + +commit 445e62278a648d6e3e8deb5b70c9dabd54efd5a5 +Author: leiyong <1549684884@qq.com> +Date: Wed Jul 29 01:35:01 2020 -0700 + + * Adjust task.html style. + +commit bfd01d5364be34e57486a0685d599aff97dee90c +Merge: 1ce528b3f9 02ea302679 +Author: holan20180123 <56391770@qq.com> +Date: Wed Jul 29 15:45:06 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1ce528b3f91aacbe434e426a1bd149be6c15be9f +Author: holan20180123 <56391770@qq.com> +Date: Wed Jul 29 15:44:43 2020 +0800 + + * Finish task #7578. + +commit 98d4541f1bf096d9981c2736ae62740db8a3282b +Author: holan20180123 <56391770@qq.com> +Date: Wed Jul 29 15:44:05 2020 +0800 + + * Finish task #7581. + +commit 89f637bb5ee19e99f8a951254308372b3df8e628 +Author: holan20180123 <56391770@qq.com> +Date: Wed Jul 29 15:42:37 2020 +0800 + + * Finish task #7582. + +commit 79099b04c15acbf1554883e06823fed7e3980ad5 +Author: leiyong <1549684884@qq.com> +Date: Tue Jul 28 23:52:33 2020 -0700 + + * Fix cmmi bug #332. + +commit 1e586ead66caf7374909d64cd09d694ff66e7c4c +Author: Catouse +Date: Wed Jul 29 11:20:47 2020 +0800 + + * fix page shake on open modal by update zui.js. + +commit 02ea30267901e020455b7fab665debc9dcda21df +Author: Catouse +Date: Wed Jul 29 11:20:13 2020 +0800 + + * fix page shake on open modal by update zui.js. + +commit 5a2a23f2cb9bf4c350301cc87efd33cb03c165e4 +Author: Catouse +Date: Wed Jul 29 11:07:54 2020 +0800 + + * fix modal size error cause by scrollInside option by update zui.js. + +commit 2986c64c4e08c1f54753b5ab5ea174f17b0440ae +Author: Catouse +Date: Wed Jul 29 10:58:23 2020 +0800 + + * fix modal size error cause by scrollInside option by update zui.js. + +commit 8232b543c65827a7baf3af81b88a00085958256d +Author: Catouse +Date: Tue Jul 28 14:39:07 2020 +0800 + + * fix ajaxform by update zui.js. + +commit 614dac6082c0deda301c1c99619b4bafd9d8b39f +Author: Catouse +Date: Tue Jul 28 14:27:03 2020 +0800 + + * fix ajaxform by update zui.js. + +commit 57c4849a3327240c059950d2bc11c50859897138 (tag: zentaopms_12.4.stable_20200728) +Author: z +Date: Tue Jul 28 14:12:30 2020 +0800 + + * rename standard sql name. + +commit 97e800bd9c8d6f834361c4f395e392d9f984261a +Author: z +Date: Tue Jul 28 14:05:45 2020 +0800 + + * change version to 12.4.stable + +commit 728e27af23d737bfff38e3bc7c4967fd3f45d7fa +Merge: 277ed6ca46 26b1a0fe92 +Author: z +Date: Tue Jul 28 08:43:34 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 277ed6ca46bcd3902d0d8951f032a0311dae22d1 +Author: z +Date: Tue Jul 28 08:42:29 2020 +0800 + + * fix dev-api and change zh-tw lang. + +commit 26b1a0fe92b39252142b5c35bbab258851de2b4f +Author: leiyong <1549684884@qq.com> +Date: Mon Jul 27 06:43:54 2020 -0700 + + * Fix bug,task#7549. + +commit edf7d6448bed976b81509a11223ba6aabbbb1d65 +Author: leiyong <1549684884@qq.com> +Date: Mon Jul 27 03:29:59 2020 -0700 + + * Fix bug,task#7549. + +commit e639fd43793867e3e115d6d20f15c3d68ff1ad73 +Author: leiyong <1549684884@qq.com> +Date: Mon Jul 27 02:29:36 2020 -0700 + + * Finish task#7481. + +commit 1cc523fd0106c8634d0259ea4f2857d1d9d96899 +Author: z +Date: Mon Jul 27 16:44:23 2020 +0800 + + * adjust code. + +commit d417a026f6cba55b343ee60c9bb46b6edf098202 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 27 15:58:08 2020 +0800 + + * Fix menu link. + +commit 9a0cb8d0cc3ee27cf748f8d214936455080b5f8c +Merge: 29e847c773 71209416b2 +Author: z +Date: Mon Jul 27 15:25:16 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 71209416b2919b5d425e501ce3703bf0c96bf4b7 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 27 15:20:45 2020 +0800 + + * Finish task #7554. + +commit 29e847c773ec4106855a2cd9e2a4b4a56e5e61a6 +Merge: 3c9fe4c071 b15539ed6a +Author: z +Date: Mon Jul 27 15:20:20 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3c9fe4c071c292d5e5945add2803aec8a9aa9afb +Author: z +Date: Mon Jul 27 15:02:48 2020 +0800 + + * fix bug for charts. + +commit b15539ed6a81a8d0dc0d7ba43ca41490e5348be5 +Merge: 4545fa25ca b216933653 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 27 14:53:42 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4545fa25ca7eb6ef42fda209cbe242f6f324d5a4 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 27 14:52:48 2020 +0800 + + * Finish task #7547. + +commit b2169336537c1ba8c38d5f696f85447146e10ed2 +Author: leiyong <1549684884@qq.com> +Date: Sun Jul 26 23:51:23 2020 -0700 + + * Adjust code . + +commit 38f62e399eb9d997a9d1ef48bbc8e708e651832c +Merge: db4a3db53d 1e932f160c +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 27 14:18:40 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit db4a3db53d819e32859b9dd333cefa11f1938a46 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 27 14:17:27 2020 +0800 + + * Finish task #7520; + +commit 1e932f160c63e6d4f06d0342a6573037e217e273 +Author: z +Date: Mon Jul 27 14:14:19 2020 +0800 + + * add new version and upgrade. + +commit 596bc86947d3eee81486b491002019c484262f3a +Merge: e9cfd48d18 88742a61c8 +Author: z +Date: Mon Jul 27 13:31:35 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e9cfd48d187d66f49cfa4fcc27b8984c1c64470a +Author: z +Date: Mon Jul 27 13:28:33 2020 +0800 + + * adjust for refreshPage and set closed for member. + +commit a6a2ddc4f9eba0e287259a5651df51ac6a541c39 +Author: z +Date: Mon Jul 27 13:25:16 2020 +0800 + + * add status in json. + +commit 3408eda6f491174f6c1f62883b769fc001875945 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 27 13:18:36 2020 +0800 + + * Fix install product link and logo. + +commit 88742a61c8be3451e417823328e60200a34d40ce +Merge: bfce52a580 e16356517e +Author: chenfeiCF +Date: Mon Jul 27 13:05:04 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e16356517e0244d31478db52932ec11a08cfc838 +Author: leiyong <1549684884@qq.com> +Date: Sun Jul 26 22:04:18 2020 -0700 + + * Finish task#7549. + +commit bfce52a5804acc80b6663947e045b24c9ec48394 +Author: chenfeiCF +Date: Mon Jul 27 13:04:09 2020 +0800 + + * Adjust lang item. + +commit a921dd62f3c9f4d4bebec1e4814ad686e2d1a0a7 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 27 11:11:15 2020 +0800 + + * Fix task closed. + +commit 6f304a843d95773a9982f04ac94eef33eb051e81 +Author: reneeteng +Date: Mon Jul 27 11:03:04 2020 +0800 + + * Lang files updated for new release. + +commit 7d1f51118fbea05497f3090147773986b5d41c91 +Author: Catouse +Date: Mon Jul 27 10:24:39 2020 +0800 + + * task #7372, bug #3196, fix datatable line height in firefox. + +commit 8852e9fe6731c9c109a04b63b9e62c57b88dc146 +Merge: f57247344e 94f98fa13a +Author: z +Date: Mon Jul 27 10:11:14 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f57247344eeeb13ef2829c843937eabc79808abf +Author: z +Date: Mon Jul 27 10:08:05 2020 +0800 + + * fix for create todo. + +commit 50d7645c96c77211d0a60366d0bfae826b035bda +Author: Yagami <976204163@qq.com> +Date: Mon Jul 27 10:07:09 2020 +0800 + + * Fix menu. + +commit 94f98fa13a445806ecb1912de0fb53127b40b619 +Author: tianshujie98 +Date: Mon Jul 27 10:05:11 2020 +0800 + + * Finish task #7536,7557,7558. + +commit 5c2a141a78ef618ca832f798199f478f2e211915 +Merge: d155cab896 049d27f689 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 27 09:51:56 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d155cab896e157d9ea685273414688bfef6cef1f +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 27 09:51:37 2020 +0800 + + * Finish task #7527. + +commit 049d27f689c715bc89a2baae436c778c5bfdd54c +Author: Yagami <976204163@qq.com> +Date: Mon Jul 27 09:42:56 2020 +0800 + + * Fix task assignedTo when closed. + +commit 5a3216dbf497a7e954e714b4c8b7c20b61b84a72 +Merge: 7a1b0b194f f39ed18962 +Author: z +Date: Mon Jul 27 09:36:19 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f39ed18962b8c7e15c336eba235100c748eb23c8 +Merge: 098a3ebebd 4502545269 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 27 09:35:52 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 098a3ebebd11fa98b9347dfe03aeb8a0fd63f8d7 +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 27 09:35:21 2020 +0800 + + * Finish task #7528. + +commit 7a1b0b194feaf6b74cbb67aa2a11d7c7303b6187 +Author: z +Date: Mon Jul 27 09:33:13 2020 +0800 + + * adjust for error. + +commit cb7931251b4e34895d26cd00a0e1386ceb75fc9a +Author: z +Date: Mon Jul 27 09:29:31 2020 +0800 + + * finish task #7535. + +commit 4502545269efc6de9b8715c2fb4c1c9f75ec483d +Author: z +Date: Mon Jul 27 09:15:41 2020 +0800 + + * revert datatable tr height. + +commit ba57175628acfbe3564d38c22ecfa67935e85b2b +Author: chenfei +Date: Mon Jul 27 08:07:21 2020 +0800 + + * Finish task #7523. + +commit 196cb6304bbb65b0203571fcf096c731548941bb +Merge: cb7ea554a4 101e36e485 +Author: holan20180123 <56391770@qq.com> +Date: Sun Jul 26 23:44:30 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cb7ea554a42ae11384039f46987bae88c934ff27 +Author: holan20180123 <56391770@qq.com> +Date: Sun Jul 26 23:43:58 2020 +0800 + + * Finish task #7520. + +commit 101e36e485be6ca98a12a967652c86b1e7ea675f +Merge: 7c2e311ac0 52bf76aa88 +Author: chenfei +Date: Sun Jul 26 22:09:02 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7c2e311ac0c70bebe52db9e149f4b450bdc85568 +Author: chenfei +Date: Sun Jul 26 22:07:38 2020 +0800 + + * Finish task #7552. + +commit 7e48d407198a34ff9c9037134a3cb553a6aeaf2c +Author: chenfei +Date: Sun Jul 26 21:52:31 2020 +0800 + + * Finish task #7543. + +commit 52bf76aa880347ef5919fe98140090fe3c440c05 +Merge: 0d3b0b4384 33db67ea2c +Author: holan20180123 <56391770@qq.com> +Date: Sun Jul 26 21:42:57 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0d3b0b438461503930c233a1610a8073bed04933 +Author: holan20180123 <56391770@qq.com> +Date: Sun Jul 26 21:42:06 2020 +0800 + + * Finish task #7530. + +commit 33db67ea2cd296eb3789ef4b62e88714fc714b12 +Merge: 29999a3689 87bd3143f3 +Author: chenfei +Date: Sun Jul 26 21:37:35 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 87bd3143f3dca7da091ac33ff30c2e1a692bd356 +Author: holan20180123 <56391770@qq.com> +Date: Sun Jul 26 21:19:04 2020 +0800 + + * Finish task #7531. + +commit d4d49466b4d275e8797632b41d39fbb39e91911d +Author: holan20180123 <56391770@qq.com> +Date: Sun Jul 26 21:16:48 2020 +0800 + + * Finish task #7521. + +commit 605753a2cbb8481531792a55de498fba2013a54b +Merge: 69ffb2d3c4 da5249b3c7 +Author: holan20180123 <56391770@qq.com> +Date: Sun Jul 26 14:45:19 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 69ffb2d3c4f78d42e5f8ba025b333bee9b30130e +Author: holan20180123 <56391770@qq.com> +Date: Sun Jul 26 14:44:40 2020 +0800 + + * Finish task #7527. + +commit da5249b3c754929ecdabc32f2049d049239c745e +Author: leiyong <1549684884@qq.com> +Date: Sat Jul 25 20:50:38 2020 -0700 + + * Finish task#7549. + +commit 29999a3689709f024a5f724f74e605965dd8a636 +Author: chenfei +Date: Sat Jul 25 22:30:50 2020 +0800 + + * Finish task #7550. + +commit fe91f8c9d666f986690face99575f685bbef89fc +Author: chenfei +Date: Sat Jul 25 22:16:40 2020 +0800 + + * Finish task #7556. + +commit 2e568d4001995578ef0dd4f38521372d499185ac +Author: chenfei +Date: Sat Jul 25 22:14:11 2020 +0800 + + * Finish task #7545. + +commit 6972e19d53fa6c835880b1fedd2d3d806e346f21 +Author: chenfei +Date: Sat Jul 25 22:13:30 2020 +0800 + + * Finish task #7522. + +commit deb448d2bb0df382fc386ac28a5306c194624c37 +Author: sgm0422 <976204163@qq.com> +Date: Sat Jul 25 18:49:20 2020 +0800 + + * Finish task #7551. + +commit 97bfc8fd50736e0cbd546c960e6370a022e81627 +Author: holan20180123 <56391770@qq.com> +Date: Sat Jul 25 12:19:12 2020 +0800 + + * Finish task #7547. + +commit a9cf557fde31f7f6a93f490fc19b874f57848654 +Merge: 657620244b 39aa4b6b34 +Author: holan20180123 <56391770@qq.com> +Date: Sat Jul 25 12:00:45 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 657620244b10baf28fa6368ae17b9334f83332e6 +Author: holan20180123 <56391770@qq.com> +Date: Sat Jul 25 11:59:55 2020 +0800 + + * Finish task #7515,7516,7517,7518,7524,7525,7526. + +commit 39aa4b6b34d7d4726a35a2c7fcdcc37f58a92187 +Author: z +Date: Sat Jul 25 11:24:56 2020 +0800 + + * finish task #7519. + +commit deed071f8e80f0415e98d927a5466abcf0f9f034 +Author: z +Date: Sat Jul 25 11:03:33 2020 +0800 + + * finish task #7539. + +commit f4987f4a048ce6dfdfaaab2766fed8b4ce9612f1 +Author: z +Date: Fri Jul 24 21:45:48 2020 +0800 + + * code for task #7548. + +commit 9b835f13fd4618ffbf7d32049cb142df3821eeba +Author: z +Date: Fri Jul 24 20:57:32 2020 +0800 + + * finish task #7534. + +commit d52b9c460acd6339062acb37425fb8b9e85f7f5b +Author: z +Date: Fri Jul 24 20:44:44 2020 +0800 + + * finish task #7538. + +commit 480b7df59db491347f4d96f3664866183c5f947a +Author: z +Date: Fri Jul 24 20:41:06 2020 +0800 + + * finish task #7533. + +commit 257afdf49ea278476e17405fa8d702a7aeae91b9 +Author: z +Date: Fri Jul 24 20:37:51 2020 +0800 + + * finish task #7542. + +commit 821739f6247d90bfca9cc7d92efc1c5662c759cf +Author: z +Date: Fri Jul 24 20:30:17 2020 +0800 + + * finish task #7553. + +commit a3f0f7ea58e2dcc742d3f31668adb0f54596b772 +Author: z +Date: Fri Jul 24 20:23:42 2020 +0800 + + * finish task #7555. + +commit 098dabfb114c2e8303cd845e7b5b12b3893168ba +Author: z +Date: Fri Jul 24 20:01:22 2020 +0800 + + * finish task #7559. + +commit a641250d7bb15530f4fa72e57d86796dc88a6930 +Merge: f66fa8105c 7056013d6b +Author: z +Date: Fri Jul 24 19:44:30 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ac90d68b4c0467eab59e1455882764f6370a3af0 +Author: leiyong <1549684884@qq.com> +Date: Fri Jul 24 02:22:31 2020 -0700 + + * Fix bug. + +commit 7056013d6bbab732b4782eedf18677396ef1270f +Author: Catouse +Date: Fri Jul 24 15:57:56 2020 +0800 + + * fix tooltip not correct after rename file in file input control. + + see http://ranzhi.5upm.com/bug-view-1459.html + +commit c75ed0548babb6423c9365bc836e7a9b1d40fa18 +Author: leiyong <1549684884@qq.com> +Date: Fri Jul 24 00:33:56 2020 -0700 + + * Fix bug. + +commit 841cb9eb1d1d604c734b474f943875d3cf278f9d +Author: Catouse +Date: Fri Jul 24 09:26:43 2020 +0800 + + * task #7373, bug #3191, fix table statistic information not update after dialog closed with datatable. + +commit 11f71b3cf4b14e74f1c8b7b8d93498d85106ac2b +Author: Catouse +Date: Fri Jul 24 09:26:16 2020 +0800 + + * fix table setting button now show after hot refresh table. + +commit f4c3b232b67bd071c924977976c853b2ba62a02e +Author: sgm0422 <976204163@qq.com> +Date: Fri Jul 24 09:25:22 2020 +0800 + + * Revert sql. + +commit fa5c856176b49f358c6aab795c2ec38f9d8a425e +Merge: 70ff66b0fb 809da4766b +Author: sgm0422 <976204163@qq.com> +Date: Fri Jul 24 09:22:45 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit 70ff66b0fb5c9e749001dcf2626dc911ac083177 +Author: sgm0422 <976204163@qq.com> +Date: Fri Jul 24 09:22:25 2020 +0800 + + * Delete unuse sql. + +commit f66fa8105cc340c2cd7f0c58ebd7dea2a5d37b03 +Merge: e3a73fe144 d4d0453a70 +Author: z +Date: Fri Jul 24 09:14:23 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d4d0453a7083804ea2764ca27fa5ad8b49fbeacf +Merge: 0d0412133e c0385c114b +Author: holan20180123 <56391770@qq.com> +Date: Fri Jul 24 09:01:40 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0d0412133ea399711669d6724f0092ebb835bc64 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jul 24 09:00:51 2020 +0800 + + * Fix bug #3199. + +commit e3a73fe144197c8f63af11fe299ea89ee5e5b9da +Author: z +Date: Fri Jul 24 08:58:42 2020 +0800 + + * adjust for flow with textarea. + +commit c0385c114bcf3284c96569c915d233cf5620fd07 +Author: Catouse +Date: Thu Jul 23 18:32:52 2020 +0800 + + * task #7477, bug #2957, fix testtask table is empty after execute case in dialog. + +commit 251e11f24d0a8e508d65b100f48ca50ab64fc9b3 +Author: Catouse +Date: Thu Jul 23 17:47:41 2020 +0800 + + * task #7373, bug #3191, fix table statistic information not update after dialog closed. + +commit 9f7a7c3a10c8c8fdc7c8750b9a01d50975330859 +Author: Catouse +Date: Thu Jul 23 17:10:39 2020 +0800 + + * task #7373, bug #3191, fix table statistic information not update after dialog closed. + +commit 1003f748d17637d5b7c38051cffd234810ce7088 +Merge: 1c8d874053 1374027cd1 +Author: z +Date: Thu Jul 23 16:55:10 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1c8d87405364d39a6c784a7c065afba169594e38 +Author: z +Date: Thu Jul 23 16:43:16 2020 +0800 + + * code for task #7469. + +commit 1374027cd152c304326f5a8d6252a8cd7d6f9c05 +Author: Catouse +Date: Thu Jul 23 11:09:22 2020 +0800 + + * update kindeditor style. + +commit 809da4766bf92c6bde69a498be587fe66a49d50c +Author: leiyong <1549684884@qq.com> +Date: Thu Jul 23 01:22:17 2020 -0700 + + * Fix menu. + +commit b832868f2ce33c70f2e886710748f516892d53b0 +Author: chenfei +Date: Thu Jul 23 16:12:49 2020 +0800 + + * Move tip lang item to bizext. + +commit e390ad4ab94d55e8b6a529c1454c8aa4f5c9e1ba +Merge: 7bca29aeec 8522665fdb +Author: z +Date: Thu Jul 23 15:59:55 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7bca29aeec44ac5ef8206f5dfef3cb373169403c +Author: z +Date: Thu Jul 23 15:59:18 2020 +0800 + + * code for task #7469. + +commit 8522665fdbc3fd7a6c4c0375558695d1de4bd46d +Merge: 78e714df92 36dfa2641c +Author: holan20180123 <56391770@qq.com> +Date: Thu Jul 23 15:53:47 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 78e714df92d6e6f13daf8a1027da48155a769413 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jul 23 15:49:13 2020 +0800 + + * Finish task #7361. + +commit 36dfa2641cc14eec56af3bb9d125cd7dc59c2121 +Merge: 01690a133a 852b4e5231 +Author: z +Date: Thu Jul 23 15:37:32 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 01690a133a2bed3a56203b4a2ad46ebbac88092f +Author: z +Date: Thu Jul 23 15:37:05 2020 +0800 + + + add xuanxuan standard file. + +commit 852b4e5231e36bead816678ed84c46a1a35d3602 +Author: chenfei +Date: Thu Jul 23 14:39:39 2020 +0800 + + * Finish task #7365. + +commit e022121f09e9ef3b1fcb9ee445aae73d17d3f9d8 +Author: chenfei +Date: Thu Jul 23 13:24:37 2020 +0800 + + * Finish task #7401. + +commit be145c47e6fa1d950630188ccfa9c78339e05164 +Merge: 2f6f314865 38a7d60b21 +Author: z +Date: Thu Jul 23 13:02:53 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2f6f314865dd1787935121687f00e5ef603f6884 +Author: z +Date: Thu Jul 23 13:01:56 2020 +0800 + + * code for task #7426. + +commit 38a7d60b21896801989da04eb591fe551d00603f +Author: Catouse +Date: Thu Jul 23 11:08:25 2020 +0800 + + * task #7414, bug #3095, fix file manager not work on upload images in kindeditor. + +commit 13a7e4802b1ae78cb9daef7659e927516efa17e1 +Author: z +Date: Thu Jul 23 11:04:02 2020 +0800 + + * finish task #7426. + +commit 5ee732bb22bc3c2532b274e9d7a2c37f78468b28 +Author: Catouse +Date: Thu Jul 23 10:50:22 2020 +0800 + + * bug #2973, task #7470, fix point hit detection not work as expected. + +commit a9a05363e1ff7bc5e15f26bc66d9bd297092c07a +Merge: 7d5d6bf35e 2961062d59 +Author: sgm0422 <976204163@qq.com> +Date: Thu Jul 23 10:29:12 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit 7d5d6bf35ea1fc9d0884ed685c32df9f59d30fe4 +Author: sgm0422 <976204163@qq.com> +Date: Thu Jul 23 10:28:57 2020 +0800 + + * Fix my module link. + +commit 227ccdd17d586e2f872f4fdc5b32138a6c4614d6 +Author: z +Date: Thu Jul 23 09:32:23 2020 +0800 + + * finish task #7372. + +commit 07919c671004e9057f04ad7d5c633ec593f94228 +Author: Catouse +Date: Wed Jul 22 22:09:07 2020 +0800 + + * task #7448, bug #2915, fix content not save after delete row in kindeditor. + +commit a6714b6180c7ff2f38125e8a1e3e2cbbfcb6b713 +Author: Catouse +Date: Wed Jul 22 21:35:12 2020 +0800 + + * task #7479, bug #2953, fix selectable in table not work as expected. + +commit d3f993952549dd7fbb6f1716fddd64b0ecc29c5c +Author: Catouse +Date: Wed Jul 22 17:55:37 2020 +0800 + + * task #7347, bug #3267, handle the case where the user enters a non-number in searchbox to prevent server error. + +commit bb6f8e994cbf70839e04e347e30fd2ce96450f18 +Author: Catouse +Date: Wed Jul 22 17:50:39 2020 +0800 + + * task #7347, bug #3267, handle the case where the user enters a non-number in searchbox to prevent server error. + +commit 073db145cf9a26d1d9d8bbe428f4871343f1510c +Author: Catouse +Date: Wed Jul 22 17:39:53 2020 +0800 + + * task #7443, bug #2987, fix insert row in merged cell not work as expected in kindeditor. + +commit 0391faec8d7c1d172b65cf6a18f4f22e57dbd6d9 +Merge: 96980aee50 229b3e2cec +Author: z +Date: Wed Jul 22 17:06:51 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 96980aee506020358d0bcd8a544a66a21e4ef436 +Author: z +Date: Wed Jul 22 17:06:16 2020 +0800 + + * adjust for canSearch flow field. + +commit 229b3e2cec7e02b3116f90b785fa2d5f4e3a879e +Merge: b7e6ca6467 4ea90f2f70 +Author: chenfei +Date: Wed Jul 22 16:47:21 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4ea90f2f70db695119b20f39738ab54804c46bac +Author: Catouse +Date: Wed Jul 22 16:31:01 2020 +0800 + + * task #7483, bug #2925, fix insert cell error in kindeditor. + +commit b7e6ca646745a34ff8b8edeb592ca5ccf0fda8e2 +Merge: 893a672c5a c1b08303ba +Author: chenfei +Date: Wed Jul 22 16:28:41 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 893a672c5ac97dde43bb45b1b9705badb4852ffd +Author: chenfei +Date: Wed Jul 22 16:28:09 2020 +0800 + + * Finish task #7473. + +commit 2961062d59694ab6020a96dcfad598e642379aee +Author: leiyong <1549684884@qq.com> +Date: Tue Jul 21 22:55:17 2020 -0700 + + * fix bug. + +commit 62d8cf9deb1d4b1fc6e0fdba34704e830b75e7f6 +Merge: 4494e97639 f88ff193b6 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 22 13:53:03 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit 4494e9763923f37cf0b02aa39b8dd0965c9277d8 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 22 13:52:46 2020 +0800 + + * Fix details. + +commit f88ff193b67150264a0f944d5079758b25886122 +Author: leiyong <1549684884@qq.com> +Date: Tue Jul 21 22:44:31 2020 -0700 + + * Aujust sql. + +commit 687f83d020c0123f197ae39c1e1d3c537fe97c88 +Author: leiyong <1549684884@qq.com> +Date: Tue Jul 21 22:05:03 2020 -0700 + + * Finish task#1144. + +commit a06785b1a424f1558199d846b7b20e63e243993b +Author: leiyong <1549684884@qq.com> +Date: Tue Jul 21 20:22:15 2020 -0700 + + * Adjust sql. + +commit c1b08303bae996e7c99181900a109eecffbef48a +Author: leiyong <1549684884@qq.com> +Date: Tue Jul 21 20:18:53 2020 -0700 + + * Adjust code. + +commit 1f0aeacf8b0851019e37272b2035b0d9488cc9de +Author: tianshujie98 +Date: Wed Jul 22 10:06:48 2020 +0800 + + * Finish task #7348. + +commit 5a96e8a5a5859f866739198454f42b25711b98c6 +Author: chenfei +Date: Wed Jul 22 09:26:49 2020 +0800 + + * Finish task #7411. + +commit 266a87d40bce236bb02ebb8ec960dcd67a623ef0 +Merge: ffabfbfbba 6c0eb72b10 +Author: z +Date: Wed Jul 22 09:06:40 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ffabfbfbbae15d9347be50be7adf1673b6e4e540 +Author: z +Date: Wed Jul 22 09:05:41 2020 +0800 + + * adjust for svn path has space. + +commit 21fcb26e301daee9c30bc29beaa3f8fcae6de3f7 +Author: z +Date: Wed Jul 22 09:05:05 2020 +0800 + + * adjust for create from import. + +commit 6c0eb72b109ff5341a0beb904bb5a6dad309e339 +Merge: 236a99519e 6e08756f0b +Author: holan20180123 <56391770@qq.com> +Date: Tue Jul 21 17:46:30 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 236a99519ee675e4cdc3c4b2c723df6c658890f0 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jul 21 17:46:01 2020 +0800 + + * Finish task #7374. + +commit 9ab20fdb172e7defbb495181937a8c8aa245391d +Author: sgm0422 <976204163@qq.com> +Date: Tue Jul 21 17:43:59 2020 +0800 + + * Fix details. + +commit cd6b5caa6137e7dbf3fc09debb2ee350ebbcc0b8 +Author: sgm0422 <976204163@qq.com> +Date: Tue Jul 21 14:35:48 2020 +0800 + + * Finish task #1160. + +commit 6e08756f0b26d4948c938d3a91394f2dab5abcb7 +Author: reneeteng +Date: Tue Jul 21 14:25:47 2020 +0800 + + * Minor change in lang files. + +commit 12e107d40a29e86d746c4592a267601dc451a828 +Author: Catouse +Date: Tue Jul 21 14:12:22 2020 +0800 + + * add program param to global method "createLink". + +commit 192abdb3482e073043e08328ac7e214d6e24f761 +Author: leiyong <1549684884@qq.com> +Date: Mon Jul 20 22:50:26 2020 -0700 + + * Adjust code. + +commit e4d29bf3efdc57eebaa02acffbd43ccd2d0ad366 +Merge: a0a0f0b082 388ee126ef +Author: sgm0422 <976204163@qq.com> +Date: Tue Jul 21 13:41:29 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit a0a0f0b082e75bbe9844f831d32b903f0c038fdd +Author: sgm0422 <976204163@qq.com> +Date: Tue Jul 21 13:41:02 2020 +0800 + + * Fix product and project select logic. + +commit 05ba543c230a87ce343346e50ff1ec33aa7f370e +Merge: ee2165bf06 bf7fc5a53b +Author: holan20180123 <56391770@qq.com> +Date: Tue Jul 21 10:09:22 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ee2165bf0675b6826af81ac7d9d2dc2db9de88f6 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jul 21 10:08:56 2020 +0800 + + * Finish task #7459. + +commit 388ee126efef6ac83253549474fbe950ecbfcb26 +Author: leiyong <1549684884@qq.com> +Date: Mon Jul 20 18:41:24 2020 -0700 + + * Fix bug + +commit 835b2bf717f0cf1a4ba2f6d006495f11cc7978b6 +Author: sgm0422 <976204163@qq.com> +Date: Tue Jul 21 09:19:19 2020 +0800 + + * Fix menu divider. + +commit bf7fc5a53bee21a9f8840c49184b7e3f4582953c +Author: leiyong <1549684884@qq.com> +Date: Mon Jul 20 17:20:29 2020 -0700 + + * Finish task#7350. + +commit e4059ed259b83d36de0a6b2424497319bc9aa434 +Author: sgm0422 <976204163@qq.com> +Date: Mon Jul 20 17:14:48 2020 +0800 + + * Fix sql. + +commit 932daf567f517d835c789b2849201a5d50bc2442 +Author: sgm0422 <976204163@qq.com> +Date: Mon Jul 20 17:07:26 2020 +0800 + + * Fix my-story pri width. + +commit ecb1f9b1289d0aa44518058a4221207e55cfd22a +Author: sgm0422 <976204163@qq.com> +Date: Mon Jul 20 16:08:13 2020 +0800 + + * Finish task #1102. + +commit 78888f1f81e8743da5c1b490242ab22b3659a65f +Author: chenfei +Date: Mon Jul 20 15:46:49 2020 +0800 + + * Adjust order in roadmap. + +commit 9358aa343bf1d96771b9eb293217287f1031e7e5 +Author: sgm0422 <976204163@qq.com> +Date: Mon Jul 20 15:34:32 2020 +0800 + + * Finish task #1087. + +commit 2a4b6bb2fce96085d207376c646009c5b48d8bf7 +Merge: 55dc4e1d29 a509bcdab0 +Author: z +Date: Mon Jul 20 15:11:32 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 55dc4e1d29fef5d905ffcf9f42da64f5c18cc91e +Author: z +Date: Mon Jul 20 15:10:55 2020 +0800 + + * adjust for edit testreport. + +commit 0864ced439c39f3c40a5c65918ce6ed8d42d9acc +Author: z +Date: Mon Jul 20 15:10:33 2020 +0800 + + * change for php7.2 + +commit cac3322a8df71004a5db4be75ebe43b5d034adfe +Author: z +Date: Mon Jul 20 15:09:41 2020 +0800 + + * adjust for workflow. + +commit a509bcdab008dec2310c2e6d4289df2ca57d05e4 +Author: leiyong <1549684884@qq.com> +Date: Mon Jul 20 00:03:23 2020 -0700 + + *Finish task#7379. + +commit a454abf6dae479530d67656f67362222c2567fe9 +Merge: 926f246386 87fd8cbc27 +Author: leiyong <1549684884@qq.com> +Date: Mon Jul 20 00:02:58 2020 -0700 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6df8b3e6f8229fdb8f3a482c449efc7ce5004ed0 +Author: sgm0422 <976204163@qq.com> +Date: Mon Jul 20 15:01:15 2020 +0800 + + * Finish task #1084. + +commit 8d2ddb26aae03dfbb193bad8b0a476cbf5308746 +Author: sgm0422 <976204163@qq.com> +Date: Mon Jul 20 14:45:49 2020 +0800 + + * Finish task # 1076. + +commit 87fd8cbc278cc92860a91dbe1bb95403335ad1d9 +Author: chenfei +Date: Mon Jul 20 14:30:20 2020 +0800 + + * Finish task #7436. + +commit 926f2463867aba85fccbac07b1fdec383a95a4a6 +Merge: 99690d0544 eeea421cf9 +Author: leiyong <1549684884@qq.com> +Date: Sun Jul 19 23:20:55 2020 -0700 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit eeea421cf901c28ffb02f39ec4250f1deff637ce +Author: tianshujie98 +Date: Mon Jul 20 13:13:41 2020 +0800 + + * Finish task #7487,7488. + +commit 99690d0544befdb19b36ee3810b4c752eb01c3f4 +Author: leiyong <1549684884@qq.com> +Date: Sun Jul 19 20:29:32 2020 -0700 + + * Finish task#7379. + +commit b2f7a2ee17590d6c313edc9ab2caa2f697c300ab +Author: chenfei +Date: Mon Jul 20 11:23:04 2020 +0800 + + * Finish task #7401. + +commit bb1d677e2544b3366a2e1bf8924901398be76781 +Merge: edfe4ccd97 61105ba53d +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 20 10:39:59 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit edfe4ccd976fc028a40f9b02c8bf072c90a9d4fe +Author: holan20180123 <56391770@qq.com> +Date: Mon Jul 20 10:39:29 2020 +0800 + + * Finish task #7433. + +commit 61105ba53dc85109f914bbbf718185797ddaaf81 +Author: Catouse +Date: Mon Jul 20 10:23:13 2020 +0800 + + * update zenicons. + +commit e6f5d6883f4f633c3ad368cc384257e18eb52433 +Merge: e0967b579f dcf45911d0 +Author: leiyong <1549684884@qq.com> +Date: Sun Jul 19 19:19:08 2020 -0700 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e0967b579f163eea1d7e92346ea8ec88acfeffcb +Author: leiyong <1549684884@qq.com> +Date: Sun Jul 19 18:42:54 2020 -0700 + + * Finish task#7376. + +commit dcf45911d0b2e06dc1919c8eaf31182de3f31abd +Author: leiyong <1549684884@qq.com> +Date: Sun Jul 19 18:42:54 2020 -0700 + + * Finish task#7376. + +commit 2dbbe8ab36537beab4c7d136a82ac28280aa609d +Author: leiyong <1549684884@qq.com> +Date: Sun Jul 19 18:14:00 2020 -0700 + + * Finish task#7481. + +commit 5819bb69b80514cabf5b8440a25d7fc0eab5ea77 +Author: chenfei +Date: Sat Jul 18 20:08:18 2020 +0800 + + * Finish task for dayup: http://vision.5upm.com/task-view-408.html + +commit 3cba60eb57c55f88f2d1d11a9aef3bd29f106519 +Merge: f574524f3f 7768b040d4 +Author: holan20180123 <56391770@qq.com> +Date: Fri Jul 17 17:19:47 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f574524f3fd415d1362e290c0f56af1affcd961b +Author: holan20180123 <56391770@qq.com> +Date: Fri Jul 17 17:19:12 2020 +0800 + + * Finish task #7407. + +commit 7768b040d4a1844a59dbf028e6ba3221009dbf90 +Author: chenfei +Date: Fri Jul 17 16:39:49 2020 +0800 + + * Finish task #7383. + +commit 9ebffe1e6e3f606c47d1294eed452aa6593e9561 +Author: leiyong <1549684884@qq.com> +Date: Fri Jul 17 00:08:24 2020 -0700 + + * Fix jenkins bug. + +commit 2455413bba045be8e0ebf5bd84bf68791deaabf3 +Author: sgm0422 <976204163@qq.com> +Date: Fri Jul 17 09:21:47 2020 +0800 + + * Finish task #7485. + +commit 8a4d7f98994b5a1b6d0ca807aed5d26381ad912b +Merge: 3b33a3cb1f a1db9d97bf +Author: sgm0422 <976204163@qq.com> +Date: Fri Jul 17 09:06:23 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3b33a3cb1f029b53d0fd4bde691db4c05141b2c6 +Author: sgm0422 <976204163@qq.com> +Date: Fri Jul 17 09:05:21 2020 +0800 + + * Fix my setMenu bug. + +commit a1db9d97bf0ed57f772f4c83c448bf4ea9db4952 +Merge: a9dcdea00d 054ee87fa8 +Author: tianshujie98 +Date: Fri Jul 17 09:00:05 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a9dcdea00d6bb99e0a47b316d9e94d42f6ae1420 +Author: tianshujie98 +Date: Fri Jul 17 08:58:18 2020 +0800 + + * Finish task #7472. + +commit 054ee87fa86f785fdb22e61eb024eddef910268f +Author: leiyong <1549684884@qq.com> +Date: Thu Jul 16 17:17:36 2020 -0700 + + * Fix jenkins exec。 + +commit 4cb09a3c0d141b92e4639d84382df68ea6e7c129 +Merge: 0979eaa590 c0f4c4108b +Author: holan20180123 <56391770@qq.com> +Date: Thu Jul 16 17:35:39 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0979eaa5905b0162407e59ad833b22b2fb585055 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jul 16 17:34:57 2020 +0800 + + * Finish task #7475. + +commit c0f4c4108bf49aa9772bb22b8adcb4d001c20d32 +Merge: 75837176a3 dd3486e6d4 +Author: sgm0422 <976204163@qq.com> +Date: Thu Jul 16 17:29:45 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 75837176a330bea370883a29bebe6aa9add08012 +Author: sgm0422 <976204163@qq.com> +Date: Thu Jul 16 17:29:29 2020 +0800 + + * Finish task #7139. + +commit 5eca3c956ecc459afde1cd96a45e1e97203ca813 +Author: leiyong <1549684884@qq.com> +Date: Thu Jul 16 01:33:28 2020 -0700 + + * Adjust style. + +commit dd3486e6d4013827a7733354cce2fa973818ca5c +Merge: 85ae968b10 fb97666ab2 +Author: chenfei +Date: Thu Jul 16 16:28:47 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 85ae968b10b5a4909a8eaed381788d05a2964eec +Author: chenfei +Date: Thu Jul 16 16:28:21 2020 +0800 + + * Finish task #7478. + +commit fb97666ab233462a86b68b360aff726673744858 +Author: leiyong <1549684884@qq.com> +Date: Thu Jul 16 00:48:54 2020 -0700 + + * Finish task #7378. + +commit 59d6baede005ac5cee3bda9887325926f925f536 +Author: leiyong +Date: Thu Jul 16 14:37:21 2020 +0800 + + * Fix jenkins password cannot contain @. + +commit 3faf6b391c0bee583cf9985a7d345afac0fb5dca +Author: sgm0422 <976204163@qq.com> +Date: Thu Jul 16 14:31:00 2020 +0800 + + * Finish task #7467. + +commit c2f3115c4ecafade37c7047ca9b5dd240902da6a +Merge: c4356f0eaa fff031bfbb +Author: sgm0422 <976204163@qq.com> +Date: Thu Jul 16 14:12:46 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c4356f0eaa106535f75b1d094466c948c3d1846d +Author: sgm0422 <976204163@qq.com> +Date: Thu Jul 16 14:11:22 2020 +0800 + + * Finish task #7466. + +commit fff031bfbbcfaf2a6cc82f5af2bce3738a716499 +Merge: d0a458160f c36872e009 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jul 16 13:07:58 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d0a458160ff04d688039c55227f7d24de0a4e56d +Author: holan20180123 <56391770@qq.com> +Date: Thu Jul 16 13:07:23 2020 +0800 + + * Finish #7471. + +commit fdc44afd2f850f9466d6c2a1d1fde9babe53da78 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jul 16 13:05:53 2020 +0800 + + * Finish task #7471. + +commit c36872e00907e8679438e9b8e4bea2681fe2e9c9 +Author: sgm0422 <976204163@qq.com> +Date: Thu Jul 16 10:46:16 2020 +0800 + + * Fix webhook bug. + +commit 5b91986b45cc47f273f5dd2a5182f7b2ce28e4b4 +Author: sgm0422 <976204163@qq.com> +Date: Thu Jul 16 10:19:57 2020 +0800 + + * Finish task #7461. + +commit 54097d246dc5964c7d7ed092f8a4817afa364c86 +Author: sgm0422 <976204163@qq.com> +Date: Thu Jul 16 09:58:00 2020 +0800 + + * Finish task #7460. + +commit 2fd9dd2290c451f6958e0c32957d1b8822fd3930 +Merge: 5b6f1a03e9 b2033343b1 +Author: sgm0422 <976204163@qq.com> +Date: Thu Jul 16 09:03:07 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5b6f1a03e9120cb8cf23da6505c4302d6e4f501e +Author: sgm0422 <976204163@qq.com> +Date: Thu Jul 16 09:02:58 2020 +0800 + + * Finish task #7458. + +commit b2033343b19670a613479e3e42dc8c1a05448768 +Merge: 1096a6678d 725a550aff +Author: z +Date: Wed Jul 15 17:32:26 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1096a6678d80b5d8b50fd3e3f88b5eb3056771da +Author: z +Date: Wed Jul 15 17:31:48 2020 +0800 + + * adjust for flow. + +commit 725a550affd228d145e9bb2afe6ab671f6bcf6f8 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 15 15:06:22 2020 +0800 + + * Finish task #7428. + +commit 4cc4be08e4e66b703c8b70894dc0f2cb7ea82d75 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 15 14:41:48 2020 +0800 + + * Fix doc view style. + +commit f682affa25ce9607c67f0f8dda43073ac0f2e014 +Author: Catouse +Date: Wed Jul 15 13:52:39 2020 +0800 + + * fix bug #3059, finish task #7423, fix active require field not work sometimes. + +commit 1cfb7aa6518600707e725881ab50cb19e4e00625 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 15 13:27:35 2020 +0800 + + * Finish task #7353. + +commit 9f7cabbed79becb5a35da07ed2fcbc9e8f9ee4ec +Author: chenfei +Date: Wed Jul 15 13:10:13 2020 +0800 + + * Finish task #7418. + +commit 936de54183a321e76717ad964ff7f05582ceeada +Author: leiyong <1549684884@qq.com> +Date: Tue Jul 14 20:14:24 2020 -0700 + + * Fix bug. + +commit 28f9ac65a2ebf380ee6bd95b29bef25d637741fa +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 15 10:13:12 2020 +0800 + + * Delete program priv group. + +commit 37f057475d6fc305433230b19c34ed5a84e26b98 +Author: tianshujie98 +Date: Wed Jul 15 10:12:15 2020 +0800 + + * Finish task #7439,7447. + +commit 4b1c0486791bc280595b125809c16eea4b656940 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 15 10:09:54 2020 +0800 + + * Add group priv. + +commit f33f5a87ba364e2c8ef8434f4261e2f37bab5dbb +Merge: cde7386405 64a6053c7e +Author: leiyong <1549684884@qq.com> +Date: Tue Jul 14 18:56:13 2020 -0700 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cde738640522ddb70a70856b4a95c7ddb7fc8acd +Author: leiyong <1549684884@qq.com> +Date: Tue Jul 14 18:55:52 2020 -0700 + + * Adjust style. + +commit 64a6053c7e95f9b0e6566b46f81646c6ce3567d8 +Merge: 8ae367c73f bda11a547a +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 15 09:49:32 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8ae367c73f0c9bbc995b51f007cd4bb8cea24a40 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 15 09:49:20 2020 +0800 + + * Finish task #7368. + +commit bda11a547aef011cab865b3169d57db3be01303f +Author: leiyong <1549684884@qq.com> +Date: Tue Jul 14 18:28:02 2020 -0700 + + * Finish task#7369. + +commit e3c5a1106ae4af44a5c95f5fe288a9c4ea090d7f +Merge: 66081ad48f 7eb1dbe6b6 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 15 09:24:50 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 66081ad48f66a574382261bb861dc722d9afe9da +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 15 09:24:33 2020 +0800 + + * Finish task #7450. + +commit 7eb1dbe6b6932fb359b6eb891939eefae4bf17db +Merge: 0dddf6deda 974f7ec1d6 +Author: leiyong <1549684884@qq.com> +Date: Tue Jul 14 02:03:33 2020 -0700 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0dddf6deda689aa13af669f4c15d09f62fc90d0f +Author: leiyong <1549684884@qq.com> +Date: Tue Jul 14 02:02:13 2020 -0700 + + * Finish task#7346. + +commit cdcd17b0fea1c61dfe34482d1ae259a4b9f70aed +Author: leiyong <1549684884@qq.com> +Date: Tue Jul 14 01:59:30 2020 -0700 + + * Finish task#7346. + +commit 974f7ec1d6a458648702ed8258ed3ce62919e461 +Merge: cd5959d815 e5550081e6 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jul 14 16:56:07 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cd5959d815706938c98b831d24775e45f090b831 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jul 14 16:55:05 2020 +0800 + + * Finish task #7367. + +commit e5550081e60c8d9aae7cf75c4f86ded1c90755d7 +Merge: bd44c7adf3 41e862d5cb +Author: sgm0422 <976204163@qq.com> +Date: Tue Jul 14 16:23:18 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bbaf3c038eded39431a300dc8a1fafc87b4be11e +Author: holan20180123 <56391770@qq.com> +Date: Tue Jul 14 16:23:14 2020 +0800 + + * Finish task #7406. + +commit bd44c7adf39b40f43acccb019e3bf1f4be1c6943 +Author: sgm0422 <976204163@qq.com> +Date: Tue Jul 14 16:23:04 2020 +0800 + + * Finish task #7446. + +commit 41e862d5cb09d3ecf6e4be05dc7c9b72f7e87eb3 +Author: chenfei +Date: Tue Jul 14 16:16:47 2020 +0800 + + * Finish task #5104. + +commit b96bfde2acc154b5f1f27f635a3f7d909523313c +Merge: 701ec00778 570657d4b4 +Author: sgm0422 <976204163@qq.com> +Date: Tue Jul 14 15:56:54 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 701ec00778e81db3440ed07fb631d263a3b25920 +Author: sgm0422 <976204163@qq.com> +Date: Tue Jul 14 15:56:36 2020 +0800 + + * Finish task #7445. + +commit 570657d4b42484f0a14175384531dcceaeec8831 +Author: chenfei +Date: Tue Jul 14 15:51:51 2020 +0800 + + * Finish task #7389. + +commit eeef4832034b819ea21da170ffa343fa30bac34b +Merge: 5e20ecc24c 9eb723689b +Author: sgm0422 <976204163@qq.com> +Date: Tue Jul 14 15:35:18 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5e20ecc24c4219a9b6396ef4657e90f885784e5b +Author: sgm0422 <976204163@qq.com> +Date: Tue Jul 14 15:35:08 2020 +0800 + + * Finish task #7434. + +commit 9eb723689b1c3f3ba699a13446ac6443b96e32d7 +Author: tianshujie98 +Date: Tue Jul 14 15:26:11 2020 +0800 + + * Finish task #7417. + +commit e13c326e5967b4d046c9cb8b3f5002bf5192d303 +Merge: d746374d83 022c55445f +Author: sgm0422 <976204163@qq.com> +Date: Tue Jul 14 15:19:28 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d746374d83052eb1d19584c57e60e31ae0fe3fcb +Author: sgm0422 <976204163@qq.com> +Date: Tue Jul 14 15:19:11 2020 +0800 + + * Code for dev api config. + +commit 022c55445f7c9c97e3565f6386151510246ba977 +Author: leiyong <1549684884@qq.com> +Date: Mon Jul 13 23:11:27 2020 -0700 + + * Finish task#7377. + +commit 4475db6cccd8d474bbf96df2ef24e2fa78e60418 +Author: chenfei +Date: Tue Jul 14 11:27:15 2020 +0800 + + * Finish task #7420. + +commit b56977c8ff431c62fbf8e4dd99e3263d92925aab +Merge: 2e454b1415 1a04618fd1 +Author: sgm0422 <976204163@qq.com> +Date: Tue Jul 14 11:21:23 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2e454b1415c8c44643c2f817c808741e063ae658 +Author: sgm0422 <976204163@qq.com> +Date: Tue Jul 14 11:21:12 2020 +0800 + + * Finish task #7429. + +commit 1a04618fd14962c548f43b8935f45512e69cb681 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jul 14 11:01:47 2020 +0800 + + * Finish task #7419. + +commit f1a657532552b1d4665a3304daf1de98907e4933 +Author: chenfei +Date: Tue Jul 14 10:33:23 2020 +0800 + + * Finish task #7435. + +commit 8c06f970608ea6b0075d3a0a5b5d435f60630823 +Author: chenfei +Date: Tue Jul 14 09:54:31 2020 +0800 + + * Finish task #7438. + +commit 063005a710f2937aa8427d03ee30a3928021072f +Merge: ff7730f4bd fbab402495 +Author: holan20180123 <56391770@qq.com> +Date: Tue Jul 14 09:44:44 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ff7730f4bd2f363c5619758c0af4acd3482c96df +Author: holan20180123 <56391770@qq.com> +Date: Tue Jul 14 09:43:36 2020 +0800 + + * Finish task #7444,7441. + +commit fbab402495b602ee3a19263521d827d19dbc41d3 +Author: leiyong <1549684884@qq.com> +Date: Mon Jul 13 18:25:26 2020 -0700 + + * Finish task#7371. + +commit 6dec915311c7bac3a396663f1f43b76972b0f3b9 +Merge: a235dd7718 37d55f1f36 +Author: z +Date: Tue Jul 14 08:13:49 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 37d55f1f36114aa2a0bfe38a16529bf99006a09c +Merge: 6e151fa735 6f0b0bfb1a +Author: sgm0422 <976204163@qq.com> +Date: Mon Jul 13 16:59:48 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6e151fa73512d989132fc131a879d2bebb306cda +Author: sgm0422 <976204163@qq.com> +Date: Mon Jul 13 16:51:53 2020 +0800 + + * Finish task #7421. + +commit 6f0b0bfb1abd0c0ceae6b4feb026cfa100964703 +Author: leiyong <1549684884@qq.com> +Date: Mon Jul 13 01:38:31 2020 -0700 + + * Finish task#7388. + +commit a235dd7718100fcbfc66ce5a6d421093beb75fad +Merge: a76b09bef2 f88acd63b8 +Author: z +Date: Mon Jul 13 16:27:06 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a76b09bef26ab19ef13b3c26dfc5152597867ba2 +Author: z +Date: Mon Jul 13 16:21:10 2020 +0800 + + * adjust code for flow. + +commit 75fe055826146493c78a331e74893b3bee103658 +Author: z +Date: Mon Jul 13 16:15:35 2020 +0800 + + * finish task #11727. + +commit f88acd63b87c462f38f343b5f39c17d1ccc6e96d +Author: sgm0422 <976204163@qq.com> +Date: Mon Jul 13 16:11:26 2020 +0800 + + * Finish task #7415. + +commit 2307463c80a9189f28330a535195090fe1f168c3 +Merge: da13e6b50a 1870cbcd09 +Author: sgm0422 <976204163@qq.com> +Date: Mon Jul 13 16:00:52 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit da13e6b50a40ceead52336ceda443aef00a0cdc2 +Author: sgm0422 <976204163@qq.com> +Date: Mon Jul 13 16:00:32 2020 +0800 + + * Finish task #7404. + +commit 1870cbcd0975b2201f075f0201bd1e2fe90e3d2d +Author: chenfei +Date: Mon Jul 13 14:59:05 2020 +0800 + + * Finish task #7395. + +commit 9bc64773db7935fb7b22338ad2192f9f25b28970 +Author: leiyong <1549684884@qq.com> +Date: Sun Jul 12 23:31:06 2020 -0700 + + * Finish task#7388. + +commit a4b52c7e87eb13182a3774612b588b564404ed4c +Author: tianshujie98 +Date: Mon Jul 13 14:21:29 2020 +0800 + + Finish task #7413,7394,7391,7384,7381. + +commit 74a1ac420d98a53b09618170576c61fb8fae653c +Merge: 9a1555f2ee 4d2ea42b42 +Author: sgm0422 <976204163@qq.com> +Date: Mon Jul 13 11:09:53 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9a1555f2eece2f3f90204c29cba2bcfca7b1411d +Author: sgm0422 <976204163@qq.com> +Date: Mon Jul 13 11:09:37 2020 +0800 + + * Add story stage title. + +commit 4d2ea42b421bdf8cfa4a2b8afddb513a823c975c +Author: leiyong <1549684884@qq.com> +Date: Sun Jul 12 19:33:25 2020 -0700 + + * Finish task#7392. + +commit c7bcfa651a2e9ffa5c29e8ab7334e39e3ccbf38b +Author: chenfei +Date: Fri Jul 10 16:50:49 2020 +0800 + + * Fix bug #2974. + +commit dd10375298d17639d898fe9dcdc84639d677906c +Merge: 95d668557e cfb87786d3 +Author: z +Date: Thu Jul 9 17:38:27 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 95d668557e328ed39d537430ec895ce207c62c75 +Author: z +Date: Thu Jul 9 17:38:04 2020 +0800 + + * fix error. + +commit 2d32ca509bca2c75a16f64347d653d83591fb240 +Author: z +Date: Thu Jul 9 17:37:05 2020 +0800 + + * change for save effort with comment. + +commit cfb87786d32524376d10572d4af7886de7b55541 +Merge: 797abba0c9 81fda346b6 +Author: tianshujie98 +Date: Thu Jul 9 17:26:48 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 81fda346b6852b171ccafccf77220e1205a7a348 +Author: chenfei +Date: Thu Jul 9 16:33:00 2020 +0800 + + * Fix bug #3278. + +commit 970d8bcc05da9ba7bdff5382eeadb632dbc5873e +Author: chenfei +Date: Thu Jul 9 15:59:20 2020 +0800 + + * Fix bug #3244. + +commit 6bb5cf37ced4c6a1fd7e5b1654f9b7026abaca09 +Author: z +Date: Thu Jul 9 15:25:03 2020 +0800 + + * fix bug for batch edit task. + +commit 1a4c6217e87ec3d4d018aae81d2ca7507f539e84 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jul 9 14:53:39 2020 +0800 + + * Fix bug #3221. + +commit 7cd810d3d1ea7c20f8c31203861258b50a679496 +Author: chenfei +Date: Thu Jul 9 13:57:20 2020 +0800 + + * Fix bug #3255. + +commit 36139551ed63343752a8269a982d32d55df26430 +Merge: 2499478e53 6f80a12fd8 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jul 9 13:42:34 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2499478e5337d93d4feef4d1932d782343ba0184 +Author: holan20180123 <56391770@qq.com> +Date: Thu Jul 9 13:40:53 2020 +0800 + + * Fix bug #3247. + +commit 6f80a12fd82472d5416519e06ea41b7d0e5eb42f +Author: chenfei +Date: Thu Jul 9 13:17:31 2020 +0800 + + * Fix bug #3262. + +commit 802d64a3cf672f1ad6f9ee666cf9e483468ef2fd +Author: holan20180123 <56391770@qq.com> +Date: Thu Jul 9 11:10:46 2020 +0800 + + * Fix bug #3206. + +commit 2eb7efb3147ea0e1fa5c56e2ae25e4752f8e4904 +Author: chenfei +Date: Wed Jul 8 16:38:14 2020 +0800 + + * Fix bug #3261. + +commit d71428b12d1873dc61e8b5d58eb1e24033f5d41a +Merge: 6d3d86286d 53cc2178cf +Author: z +Date: Wed Jul 8 16:14:10 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6d3d86286d608c4d9252a3594032397043f11081 +Author: z +Date: Wed Jul 8 16:13:24 2020 +0800 + + * adjust for lower version svn. + +commit 53cc2178cfec57f619b9f0ed8b7e7b935123c74c +Author: chenfei +Date: Wed Jul 8 15:35:55 2020 +0800 + + * Fix bug #3257. + +commit 4962154b8241fb32ab6c48eb3c65020dc9454f6f +Author: chenfei +Date: Wed Jul 8 15:04:37 2020 +0800 + + * Fix bug #3266. + +commit 83ada6a40c2bbb06020f445f6f9d1f4fc4da8023 +Author: leiyong <1549684884@qq.com> +Date: Tue Jul 7 23:57:44 2020 -0700 + + * Fix project switching issues. + +commit 2034b6ff8fc261b02561cfd3e8982c080eaf9ea5 +Author: chenfei +Date: Wed Jul 8 14:40:24 2020 +0800 + + * Fix bug #2988. + +commit 797abba0c9ccdc16f498c5f9d649a3ca992aa0f0 +Merge: 7d1b549059 18e976b3e4 +Author: tianshujie98 +Date: Wed Jul 8 11:06:32 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7d1b549059ba152766b45915703587996b32a6f9 +Author: tianshujie98 +Date: Wed Jul 8 11:06:08 2020 +0800 + + * Fix bug #3259. + +commit cc238ddbe87f2f773b1200e438ae5bfba2cb583d +Author: tianshujie98 +Date: Wed Jul 8 11:05:25 2020 +0800 + + * Code for bug #3260. + +commit 18e976b3e4c39ed02c5a927e110e4a7fb516bae4 +Author: chenfei +Date: Tue Jul 7 16:35:51 2020 +0800 + + * Fix bug #3272. + +commit 1aa8187ae898d30a31ba04bcc3875cf45e69c873 +Author: chenfei +Date: Tue Jul 7 16:25:08 2020 +0800 + + * Fix bug #3273. + +commit cb6dc09f96c7b6d29f332dc9d94d975ed6024e10 +Author: chenfei +Date: Tue Jul 7 16:20:20 2020 +0800 + + * Fix bug #3242. + +commit 7cd8ff8f4e6785041946b575f0d21dca899f4c91 (tag: zentaopms_12.3.3_20200707) +Merge: c43f0fd426 f314de7e59 +Author: z +Date: Tue Jul 7 11:25:41 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c43f0fd426786846c190c7914e5d71ba47c83969 +Author: z +Date: Tue Jul 7 11:24:23 2020 +0800 + + * adjust for zh-tw lang. + +commit 54e1e274360d79cd1ad042f4b6b7e77651459893 +Author: guanxiying +Date: Tue Jul 7 11:23:54 2020 +0800 + + * Fix request type of task. + +commit 18046a64f61eec829854b6fab91d143aa4e1333d +Merge: 1b9e88ca2b e4376791ef +Author: sgm0422 <976204163@qq.com> +Date: Tue Jul 7 11:03:52 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit 1b9e88ca2bb38a87e41a1b20ef880b41d3503ec5 +Author: sgm0422 <976204163@qq.com> +Date: Tue Jul 7 11:03:41 2020 +0800 + + * Add task type. + +commit f314de7e59c8807226fcc33fbb2e1c909ac51338 +Author: chenfei +Date: Tue Jul 7 10:56:06 2020 +0800 + + * Fix bug #3181. + +commit 604a766d012c4eab37473979c4fa42da125bac3e +Author: chenfei +Date: Tue Jul 7 10:03:51 2020 +0800 + + * Fix bug #3192. + +commit f39ee444938ddd87ba8bcfd179f2678483063968 +Author: chenfei +Date: Tue Jul 7 09:37:50 2020 +0800 + + * Fix bug #3194. + +commit ed9f6d1875dff05091a4dfae4536a491e278f4ff +Author: chenfei +Date: Tue Jul 7 09:06:38 2020 +0800 + + * Fix bug #3205. + +commit fd6298927516e941fa9fc4ecc4f19c062d2ee635 +Author: z +Date: Mon Jul 6 17:12:29 2020 +0800 + + * fix check requiredFields when batch create requirement. + +commit ac3e27aa046a5168d49f9b1bcafd591e605d50cc +Author: z +Date: Mon Jul 6 17:11:53 2020 +0800 + + * revert for recordZero. + +commit f3928cc326cd74650655e4aacc554085d9882e52 +Merge: 99a104ad55 3549b2a338 +Author: z +Date: Mon Jul 6 16:36:21 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 99a104ad55ff3c781c488d26d6d060c53cfb306f +Author: z +Date: Mon Jul 6 16:24:30 2020 +0800 + + * finish task #7318. + +commit 3549b2a3386fd2d81824778f12274373c2f3a99e +Author: chenfei +Date: Mon Jul 6 16:08:25 2020 +0800 + + * Fix bug #3210. + +commit f126903c636336e8563d670951264ad626ab9edf +Merge: d2b7beaabd 48e1b9becc +Author: z +Date: Mon Jul 6 16:03:19 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d2b7beaabd2c1ed7c9aff5d2206c9028b049dabd +Author: z +Date: Mon Jul 6 16:03:02 2020 +0800 + + * finish task #7311. + +commit 174f3b99ca5530be0bd91a881a8b90cf3cd218a3 +Author: z +Date: Mon Jul 6 15:57:58 2020 +0800 + + * finish task #7310. + +commit 60e1245029845a3c030f227d6372ed7b2cfbfe00 +Author: z +Date: Mon Jul 6 15:25:45 2020 +0800 + + * finish task #7309. + +commit 48e1b9becccaea9f0c1f107d2348cfd2feed6ef4 +Author: chenfei +Date: Mon Jul 6 15:20:59 2020 +0800 + + * Fix bug #3217. + +commit 838723a6cf91465c5d4b208b8d628e062aa61733 +Author: chenfei +Date: Mon Jul 6 15:12:51 2020 +0800 + + * Fix bug #3219. + +commit 5f8d829b8bf8267d6c49facbc07f61ba372e186f +Author: chenfei +Date: Mon Jul 6 15:09:12 2020 +0800 + + * Fix bug #3225. + +commit f2c36fb4aec9f2053e2979dc027c0a6c665c3e4a +Author: z +Date: Mon Jul 6 15:04:45 2020 +0800 + + * finish task #7308. + +commit 945eb9ac25e8aa1be4586e9da1637c6e70966eae +Author: z +Date: Mon Jul 6 15:00:10 2020 +0800 + + * finish task #7307. + +commit 984d130d006431430bdc5d6a9e973fb2730b87bb +Author: z +Date: Mon Jul 6 14:48:57 2020 +0800 + + * finish task #7306. + +commit 6a7945f9598f9ae801f6e5e7a6bd299c77c2eef7 +Merge: 2801f04e4c 642e1474f0 +Author: z +Date: Mon Jul 6 14:30:04 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2801f04e4c865c35265522103794a3b84f2d76a7 +Author: z +Date: Mon Jul 6 14:29:44 2020 +0800 + + * code for task #7305. + +commit 642e1474f01dd1bfd3cb3d82d6eda59bd09ef8c3 +Author: chenfei +Date: Mon Jul 6 14:22:58 2020 +0800 + + * Fix bug #3227. + +commit 9a168a057f6adaa702830ea16b422b896ce5fe66 +Author: z +Date: Mon Jul 6 13:21:13 2020 +0800 + + * finish task #7304. + +commit a7ab0a84a49600a6f9662cf800f95ae242d4b19f +Author: z +Date: Mon Jul 6 13:19:13 2020 +0800 + + * finish task #7303,7316. + +commit 07a98ed5d7b777f63dc0fe7261862c4744649f75 +Author: chenfei +Date: Mon Jul 6 11:14:08 2020 +0800 + + * Fix bug #3238. + +commit 6ab35f254a18fd1b368d8734b14b3d73444572b7 +Merge: 9b80f4d9de a28596cccc +Author: z +Date: Mon Jul 6 09:13:14 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9b80f4d9dea5fa659747a019d65694e9946f994d +Author: z +Date: Mon Jul 6 09:08:09 2020 +0800 + + * code for task #7302. + +commit a28596cccc3390c94139fb58582d61ce6c0919aa +Author: tianshujie98 +Date: Fri Jul 3 17:20:24 2020 +0800 + + * Fix bug #3260,3186. + +commit 29034b4a8201696caa8e94db6e3b7167a66dff40 +Author: chenfei +Date: Fri Jul 3 16:29:54 2020 +0800 + + * Fix bug #3264. + +commit 7e53e5a0346cde319098eeaae701396b19a64a31 +Author: z +Date: Fri Jul 3 15:19:16 2020 +0800 + + * adjust for sync commit. + +commit e4376791effa972b7fb6e70d8a4e9d312f30db82 +Author: guanxiying +Date: Fri Jul 3 14:55:11 2020 +0800 + + * remove redefine report menu code. + +commit 631d56ac00bc0a5ac9a0989ff64b9049e809536c +Merge: 394e263c87 60039b2b64 +Author: sgm0422 <976204163@qq.com> +Date: Fri Jul 3 13:45:14 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit 394e263c87500fbd9bd3cb03e529e0ef35022727 +Author: sgm0422 <976204163@qq.com> +Date: Fri Jul 3 13:45:04 2020 +0800 + + * Fix upgrade method. + +commit 0557eb78192c3f9df16bf1768751cd27757dd815 +Merge: 3aca3ee0cc 6b42a7cd32 +Author: z +Date: Fri Jul 3 13:09:14 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3aca3ee0ccec6db95238470e6722b8674c244dd4 +Author: z +Date: Fri Jul 3 13:07:49 2020 +0800 + + * finish task #7301. + +commit 60039b2b643cc584fc3bebcabab8e2c9ee8dbbd5 +Author: leiyong <1549684884@qq.com> +Date: Thu Jul 2 19:35:16 2020 -0700 + + * Hidden LDAP import user. + +commit f1a94d6f57ed627abb1ad30d0f032d31ad631653 +Author: z +Date: Fri Jul 3 10:03:16 2020 +0800 + + * finish task #7300. + +commit 5227d6926b6ddb2bd478e0d90765d69228276b3e +Author: z +Date: Fri Jul 3 09:33:59 2020 +0800 + + * finish task #7299. + +commit 6b42a7cd327fe1bdb66b2f23524b184a6c80b0b1 +Author: leiyong <1549684884@qq.com> +Date: Thu Jul 2 18:23:27 2020 -0700 + + * Delete zdata demo data. + +commit b9c52535ad95212a7f0680febc1690a62dae95e3 +Author: tianshujie98 +Date: Thu Jul 2 15:44:08 2020 +0800 + + * Fix bug #3249. + +commit ec7511df3554db7c6914c9c96ef52f47d7fe6b45 +Author: sgm0422 <976204163@qq.com> +Date: Thu Jul 2 14:32:05 2020 +0800 + + * Merge showimport to 15.x. + +commit 3785e3a4a58b19515e150a9e1ebda7539bc83435 +Merge: 1919e1d70d d5a2b481ee +Author: reneeteng +Date: Thu Jul 2 13:26:27 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1919e1d70d3d9a3e0e5b95adc64c0efd061aed9e +Author: reneeteng +Date: Thu Jul 2 13:25:31 2020 +0800 + + * Updated all QA to Testin lang files. + +commit 780e2ec0590f5eae3c2e3251ae9cbee58c257f0e +Author: sgm0422 <976204163@qq.com> +Date: Thu Jul 2 13:10:34 2020 +0800 + + * Fix sql and common lang. + +commit 4692e68eb87948fa4b70ae1c8a7f6e1c26ce2a0e +Author: Catouse +Date: Thu Jul 2 11:36:45 2020 +0800 + + * add alias methods $.disableForm and $.setAjaxForm; + +commit d5a2b481eeaf4b42e9bd27b3608891f0eab80232 (tag: zentaopms_12.3.3_20200702) +Author: z +Date: Thu Jul 2 10:14:16 2020 +0800 + + * add new version and upgrade. + +commit d2a7566f3ffe537ed3bb5b0eaf046b6e39087875 +Author: leiyong <1549684884@qq.com> +Date: Wed Jul 1 18:51:09 2020 -0700 + + * Finish cmmi task#869. + +commit e387bc69f61157dd63384aa67c6f721e375afb92 +Author: sgm0422 <976204163@qq.com> +Date: Thu Jul 2 09:13:18 2020 +0800 + + * Add program to edit repo. + +commit a2cd825d1f82b471bd3539e350871dc87b15a958 +Merge: 97429381e8 31a2245b00 +Author: tianshujie98 +Date: Wed Jul 1 17:51:06 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 31a2245b0051bf36eb14c82bfe3b92277db6bc5a +Merge: 36dfb8eb36 c3626788e7 +Author: z +Date: Wed Jul 1 17:48:22 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 36dfb8eb36eecbe9f71991c9419cbdc85e94fd8f +Author: z +Date: Wed Jul 1 17:47:54 2020 +0800 + + * adjust code. + +commit 97429381e854ad021c709a4d3b152295ad8ff4a6 +Author: tianshujie98 +Date: Wed Jul 1 17:46:52 2020 +0800 + + * Fix bug #3258. + +commit 218fd95fe5e2289ed2f142f9f9e846863684ee55 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 1 17:09:27 2020 +0800 + + * Fix get repos logic. + +commit adc0f071aa4f4a75902136db428785981d5e6a55 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 1 17:01:15 2020 +0800 + + * Fix pgmID to pgm. + +commit c3626788e738cbb4f509ffd1f92921449bf5e2d4 +Merge: 3562d51a6b 9c334315b5 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 1 16:58:40 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3562d51a6b4a4e72beac23b2758a97d885d02899 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 1 16:58:20 2020 +0800 + + * Delete useless code. + +commit 01d630040b770d86c7d14f8c0ab8aad979ce9cf3 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 1 16:57:13 2020 +0800 + + * Add program to repo. + +commit 0dc679641459d8f20d71c4d16c2808e7107df826 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 1 15:55:35 2020 +0800 + + * Fix pgmID to pgm. + +commit 8e159a56e5db814ac44cd00036458f620efc0eca +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 1 15:06:21 2020 +0800 + + * Code for program project product priv. + +commit 92e05060abe6914180d8feadb52d1c59fa808552 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 1 13:16:56 2020 +0800 + + * Delete program fields in list. + +commit 28e7d9794739b3be3bc2d40c516f282ea9b88b56 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 1 13:10:07 2020 +0800 + + * Fix website link. + +commit 3fda65010c725fbe8d2372567f5bd2a21ffbf6fa +Author: sgm0422 <976204163@qq.com> +Date: Wed Jul 1 13:05:14 2020 +0800 + + * Fix website link. + +commit ceecc582722453d0611bd94eec8e56d0a54c0152 +Author: z +Date: Tue Jun 30 17:33:41 2020 +0800 + + * fix error sql. + +commit 2adca4d7bd12198fefa5d63dcc23ec51b1a38b78 +Author: sgm0422 <976204163@qq.com> +Date: Tue Jun 30 17:13:38 2020 +0800 + + * Fix sql. + +commit 9c334315b5da70d32460395075083d446c8d78db +Author: tianshujie98 +Date: Tue Jun 30 17:04:05 2020 +0800 + + * Fix bug #3197. + +commit c94fc50e3bf33147aab2755aaa1c5fdadb6d8430 +Author: z +Date: Tue Jun 30 10:54:05 2020 +0800 + + * fix for change extension. + +commit 02e12e7874c723ca53174eae46e3e78e0815643a +Merge: 7fcb6338f6 66a396fb52 +Author: z +Date: Tue Jun 30 10:42:01 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7fcb6338f6165dacd93def0a66d85dba0ebf3a8a +Author: z +Date: Tue Jun 30 10:41:17 2020 +0800 + + * adjust for update testtask. + +commit 711ca149f4a7309ed6ec97674aa6646eca10f5f5 +Merge: cefa7b029b e2bad78065 +Author: sgm0422 <976204163@qq.com> +Date: Mon Jun 29 16:23:03 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit cefa7b029ba225a00d5691ddaa61ec343af65e03 +Author: sgm0422 <976204163@qq.com> +Date: Mon Jun 29 16:22:18 2020 +0800 + + * Fix change project and product error. + +commit 66a396fb52b40fdda3d7f3c533b3d53ee44bbd0a +Author: sgm0422 <976204163@qq.com> +Date: Mon Jun 29 14:57:22 2020 +0800 + + * Fix framework add program session. + +commit e2bad780657f3d23a33aee509f9853a65ec01ea0 +Author: leiyong <1549684884@qq.com> +Date: Sun Jun 28 22:10:50 2020 -0700 + + * Adjust code. + +commit a7afe0318cf86b95f0815056bbb3e33cde134bc0 +Author: z +Date: Sun Jun 28 16:57:34 2020 +0800 + + * fix for drag to todo. + +commit 0e70771cd8e8bc070e8cb3fcc71e798f4290c55e +Author: z +Date: Sun Jun 28 13:16:47 2020 +0800 + + * finish task #7274. + +commit 7ab4e53714164e1bdc6d9e7d9d9afee4db574722 +Author: z +Date: Sun Jun 28 11:26:54 2020 +0800 + + * finish task #7274. + +commit 2b0071469532e39a1e10614fbe972288c70adbac +Author: z +Date: Sun Jun 28 09:15:29 2020 +0800 + + * fix bug for requiredFields when create requirement. + +commit b6c9bc45f4a138d2a419ee8cc2fb66b1a2a01b18 +Author: z +Date: Sun Jun 28 09:14:55 2020 +0800 + + * add program field for zt_group table. + +commit eccd50afd8cf07f2fe8a24a48f1bfe81632e3c83 +Author: z +Date: Sun Jun 28 09:14:07 2020 +0800 + + * finish task #7295. + +commit 471b421760b32d94e21fd4df3225a0c4c9695b3b +Merge: e6854fd314 c4fd57f4d3 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jun 24 10:59:54 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit e6854fd3142bfed07c343010a0b7ec36f45e23f6 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jun 24 10:59:43 2020 +0800 + + * Fix product link. + +commit c4fd57f4d31367dc41cfc9e67c8cc61aa577eabc +Author: leiyong <1549684884@qq.com> +Date: Tue Jun 23 18:44:43 2020 -0700 + + * Fix cmmi bug#269. + +commit bf1912f0d6af147e99b91be08d9275f34b93285d +Author: z +Date: Tue Jun 23 16:59:41 2020 +0800 + + * fix bug for get groups with program. + +commit ef74268f70ca784f6a8df8ad260bfb9c4e2aedaf +Author: z +Date: Tue Jun 23 15:31:43 2020 +0800 + + * finish task #11620. + +commit 591e1e7604d805b122df155b81e400e5276f8d94 +Author: z +Date: Tue Jun 23 14:56:41 2020 +0800 + + * finish task #11620. + +commit 32f2fc287cb80fc9e4052d86fe09ba2a34a8dc06 +Author: z +Date: Tue Jun 23 14:30:31 2020 +0800 + + * finish task #11622. + +commit 0b1e3710e8482b3e96f9fce38d030f29b4423ca6 +Author: leiyong <1549684884@qq.com> +Date: Mon Jun 22 20:14:19 2020 -0700 + + * Fix cmmi bug#234. + +commit e90730d14819a5a3ee97fc3346ae635388c39388 +Author: leiyong <1549684884@qq.com> +Date: Mon Jun 22 19:42:46 2020 -0700 + + * Fix cmmi bug. + +commit 30415e3d520348a8ae244c158bf32122607faf75 +Author: z +Date: Tue Jun 23 09:26:47 2020 +0800 + + * fix for undelete project and product. + +commit 5093ded545c532a968cd2ed835522d71b28ec0a8 +Author: leiyong <1549684884@qq.com> +Date: Mon Jun 22 18:21:13 2020 -0700 + + * Fix bug#223. + +commit 35b544d4e1b1afb9a8b028ea74c6a47b9beeaebe +Author: z +Date: Tue Jun 23 08:48:58 2020 +0800 + + * fix for testcase select fields. + +commit 3a391ea83640962fd8a12457c737a2c3315dc393 +Author: z +Date: Mon Jun 22 14:30:52 2020 +0800 + + * finish task #7277. + +commit 70a0ace135191decb92883da5d5c2da805a9fb5c +Author: leiyong <1549684884@qq.com> +Date: Sun Jun 21 22:43:05 2020 -0700 + + * Fix cmmi bug#258. + +commit 807fa3c58a1a3b052c6117534e241783a903a06d +Author: z +Date: Mon Jun 22 10:59:10 2020 +0800 + + * finish task #7273. + +commit cab331d1fa6a57b9beb83be4393fa5b0acc94fb9 +Author: z +Date: Mon Jun 22 10:34:57 2020 +0800 + + * finish task #7268. + +commit 84f68d22237c2edd377b4bc33771afc52dd64fb8 +Merge: e480ce7902 eaea4c8901 +Author: sgm0422 <976204163@qq.com> +Date: Mon Jun 22 10:28:34 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit e480ce79022540c66315afd245a602dc085a4694 +Author: sgm0422 <976204163@qq.com> +Date: Mon Jun 22 10:28:20 2020 +0800 + + * Code for cmmi. + +commit eaea4c8901b42c7a26708a28a8d7b56379484ff6 +Author: leiyong <1549684884@qq.com> +Date: Sun Jun 21 18:39:14 2020 -0700 + + * Finish cmmi task#890. + +commit d523fe31aea36f8265f38b7213fee029f5cfcd60 +Author: z +Date: Mon Jun 22 08:25:24 2020 +0800 + + * finish task #7271. + +commit ca2f701ddc9d170e93c612da04761ec1454f60c4 +Author: z +Date: Fri Jun 19 17:33:51 2020 +0800 + + * finish task #7275, + +commit 24999055ca11b75886b6052155251c0917578b0c +Merge: 5b8e140c91 4ec79ae237 +Author: sgm0422 <976204163@qq.com> +Date: Fri Jun 19 17:16:31 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit 5b8e140c915c82402fce408251bba55bdede1c25 +Author: sgm0422 <976204163@qq.com> +Date: Fri Jun 19 17:16:11 2020 +0800 + + * Fix main menu. + +commit ebc9d9d998b27fa7784b1e8daced60d01d2975cf +Merge: 5907a27f8f b48c36712e +Author: z +Date: Fri Jun 19 16:48:49 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b48c36712e6b47bad93f05402e8ec5a5c504df74 +Author: leiyong <1549684884@qq.com> +Date: Fri Jun 19 01:44:03 2020 -0700 + + * Delete zdata demo data. + +commit 5907a27f8fd3976b2e1df80e567ac3320b93224e +Author: z +Date: Fri Jun 19 16:43:08 2020 +0800 + + * finish task #7278. + +commit 4ec79ae2379016630260a250487cf38708e50dd7 +Author: leiyong <1549684884@qq.com> +Date: Fri Jun 19 01:39:58 2020 -0700 + + * Finish cmmi task#866; + +commit 848456fd4170f4bacb4c22288406b04a1f016b51 +Author: z +Date: Fri Jun 19 15:08:09 2020 +0800 + + * fix bug. + +commit d05924db1722648dbabbb5778e36458fd937de09 +Author: z +Date: Fri Jun 19 15:01:22 2020 +0800 + + * finish task #7279. + +commit 02397f801de06e2226f50d47867a359f232f897f +Author: z +Date: Fri Jun 19 14:30:18 2020 +0800 + + * finish task #7282. + +commit 7b308610e59cb6e45ca2cec487a34ad4ddc15927 +Author: z +Date: Fri Jun 19 13:39:47 2020 +0800 + + * finish task #7289. + +commit 3a2626bab890ae1c52fb635a3558e1655a189b51 +Author: sgm0422 <976204163@qq.com> +Date: Fri Jun 19 13:39:19 2020 +0800 + + * Fix menu order. + +commit ee3597a4e521e50dc0559500a248ab2013605e1f +Author: z +Date: Fri Jun 19 13:06:18 2020 +0800 + + * finish task #7290. + +commit e4a3afc3a60336901d1d7d072bfc5bf101376430 +Merge: 3cdcc9b22c 91ecc5764b +Author: sgm0422 <976204163@qq.com> +Date: Fri Jun 19 10:39:13 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit 3cdcc9b22c47187b2359207019240e6fa6d46900 +Author: sgm0422 <976204163@qq.com> +Date: Fri Jun 19 10:38:58 2020 +0800 + + * Fix main menu. + +commit b15040adb81adb2eec19e896646d85a95522789f +Author: z +Date: Fri Jun 19 10:36:55 2020 +0800 + + * code for task #7296. + +commit 0158fdbccbaac5c8fe4721f7278d8d0b1339478b +Author: z +Date: Fri Jun 19 10:36:17 2020 +0800 + + * finish task #7292. + +commit 91ecc5764b6476c8ffa31a651728a501c3cf2ab5 +Author: leiyong <1549684884@qq.com> +Date: Thu Jun 18 19:16:47 2020 -0700 + + * Finish cmmi task#869. + +commit a822238342c897f1c7cadcb84be0b3d093e38fb1 +Merge: 63d0791138 942446b521 +Author: leiyong <1549684884@qq.com> +Date: Thu Jun 18 19:07:52 2020 -0700 + + Merge branch '15.x' of github.com:easysoft/zentaopms into 15.x + +commit 942446b521c981ba3fe21569bcdd2bd6bfd01b6b +Author: sgm0422 <976204163@qq.com> +Date: Fri Jun 19 10:00:30 2020 +0800 + + * Finish task #939. + +commit f4efdf5ca0e5ab60a533fb6a3cc9bcf6ba405c7c +Author: sgm0422 <976204163@qq.com> +Date: Thu Jun 18 17:00:16 2020 +0800 + + * Fix main menu. + +commit ab4ea17a997d5dfbf65163a0bdcc89916df93f91 +Author: z +Date: Thu Jun 18 16:26:11 2020 +0800 + + * finish task #7258. + +commit 63d07911380df249c53b68adb20e3cff581f7157 +Author: leiyong <1549684884@qq.com> +Date: Thu Jun 18 00:06:19 2020 -0700 + + * Adjust menu. + +commit 02caeb1437ffad8a4c1c0f02281434725941f1ce +Author: z +Date: Thu Jun 18 14:48:00 2020 +0800 + + * finish task #7256. + +commit fe63a13c209cd823c5067000f1c59622940dc527 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jun 17 17:32:57 2020 +0800 + + * Fix sql for qc. + +commit 396381af1a1a092ab821558d3404ff194627bab7 +Author: z +Date: Wed Jun 17 15:47:47 2020 +0800 + + * finish task #7255. + +commit c12a8c11a645a58a7bd6a62b440b5e0c9f6d7776 +Author: z +Date: Wed Jun 17 15:11:30 2020 +0800 + + * finish task #7259. + +commit 57500e21022aed5b6e57463df11311ca35b7193d +Author: sgm0422 <976204163@qq.com> +Date: Wed Jun 17 15:08:09 2020 +0800 + + * Fix bug and add program admin. + +commit 6b6c9a713e03b08024991a9bb99eb9b71d40bbd6 +Author: z +Date: Wed Jun 17 14:40:44 2020 +0800 + + * finish task #7260. + +commit ceea9745a1999f3ab3e814baf39d3c3106ad3c8e +Author: z +Date: Wed Jun 17 14:15:16 2020 +0800 + + * finish task #7261. + +commit ec7af0c7f6f76d701771c2078c10e76d57e0435e +Author: z +Date: Wed Jun 17 13:19:58 2020 +0800 + + * finish task #7262. + +commit 8e706b6e0c2401bd41f92098f473f462aeef478c +Author: sgm0422 <976204163@qq.com> +Date: Wed Jun 17 13:08:37 2020 +0800 + + * Add create project button. + +commit cb8d7502b7314c49867a50cd92f487839f8fb1b1 +Author: z +Date: Wed Jun 17 13:03:15 2020 +0800 + + * finish task #7263. + +commit d8ce393afa6dc2c2f23d1ed2240b1c3b9df1f8b7 +Author: z +Date: Wed Jun 17 10:48:37 2020 +0800 + + * finish task #7264. + +commit a90ceec8fd1af2b89ebb03bae54bf97add5df4c5 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jun 17 10:39:51 2020 +0800 + + * Fix program priv. + +commit b8252606421eab64044256d4e84ab9f8dd951c28 +Author: z +Date: Wed Jun 17 09:28:45 2020 +0800 + + * finish task #7265. + +commit 4357b866e5fde39348c18a862df1cca90b111cde +Author: z +Date: Wed Jun 17 09:15:33 2020 +0800 + + * finish task #7266. + +commit 7af773d82107e49d02d270d17415a79eb0d1ff82 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jun 17 08:32:53 2020 +0800 + + * Fix bug. + +commit 0e9b3e9609c1c0c97141d296b09b8022f80bcc63 +Author: sgm0422 <976204163@qq.com> +Date: Tue Jun 16 17:24:14 2020 +0800 + + * Fix details. + +commit 50c0b3d8ba8f357c66312b0293dbb99a8c3af3f0 +Author: z +Date: Tue Jun 16 16:30:30 2020 +0800 + + * fix bug #3155. + +commit 74a663af1111611d16103b44213e1f3e611fe8dd +Author: sgm0422 <976204163@qq.com> +Date: Tue Jun 16 15:15:47 2020 +0800 + + * Merge sql to zentao.sql. + +commit 956c0ab6e8743bb4efc76af6405ebc52ba9c13f9 +Author: sgm0422 <976204163@qq.com> +Date: Tue Jun 16 14:48:44 2020 +0800 + + * Merge code. + +commit c6132350812888cd4c193b18e6dfe6d0195ef01a +Author: z +Date: Tue Jun 16 14:32:57 2020 +0800 + + * fix bug #2542. + +commit 19a1db72df94020d797202750bf82db79a9b9e28 +Author: sgm0422 <976204163@qq.com> +Date: Tue Jun 16 14:15:22 2020 +0800 + + * Fix user view bug. + +commit bb92200ea5b73648c5d03c6547310564a8e28908 +Author: sgm0422 <976204163@qq.com> +Date: Tue Jun 16 13:38:41 2020 +0800 + + * Add en lang. + +commit 861a03ed7260468145a835036983d6bf02820372 +Author: sgm0422 <976204163@qq.com> +Date: Tue Jun 16 10:56:13 2020 +0800 + + * Add update user view to program. + +commit 316cc2b551e5c04e2c8c36235bdd93b32b5335ee +Merge: 8ecac0f6fb 4eff282d98 +Author: sgm0422 <976204163@qq.com> +Date: Tue Jun 16 10:49:52 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit 8ecac0f6fb08704ec22f1b094ba29106577a0ee0 +Author: sgm0422 <976204163@qq.com> +Date: Tue Jun 16 10:49:23 2020 +0800 + + * Fix group error. + +commit e3950d9bf3ba3ce2316770887137303fc0337df2 +Merge: 5eca2a6ca7 9a0afa53ba +Author: z +Date: Tue Jun 16 10:45:58 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5eca2a6ca751e57ea56f61f130c754aee8408891 +Author: z +Date: Tue Jun 16 10:45:19 2020 +0800 + + * adjust for change locate page when login. + +commit 4eff282d98cc811add13a4a2523ade2dd2105776 +Merge: 79db80e3b4 fc4d8db013 +Author: z +Date: Tue Jun 16 10:39:43 2020 +0800 + + Merge branch '15.x' of github.com:easysoft/zentaopms into 15.x + +commit 79db80e3b44f3aa28b229b2d847395cc6ab2c215 +Author: z +Date: Tue Jun 16 10:39:01 2020 +0800 + + * adjust for merge program style. + +commit 9a0afa53bab59ffc7a52cb3824ec40255b3c5eb6 +Author: leiyong <1549684884@qq.com> +Date: Mon Jun 15 18:59:02 2020 -0700 + + * Add zdata presentation data. + +commit fc4d8db0132be7ed1095a89a40aa821417558219 +Author: sgm0422 <976204163@qq.com> +Date: Mon Jun 15 17:12:17 2020 +0800 + + * Merge code. + +commit f28fd3f4cf04e5f5822627f3de66abf274c831cf +Author: Catouse +Date: Mon Jun 15 17:02:24 2020 +0800 + + * fix #dropMenu not work as expected. + +commit 70ed978c2dce60dcf907d519f9ac28ed8510c5bb +Author: z +Date: Mon Jun 15 16:24:00 2020 +0800 + + * adjust for merge program. + +commit e2663052edc98f7a33574ad27e39496e7c7e5605 +Author: sgm0422 <976204163@qq.com> +Date: Mon Jun 15 16:15:39 2020 +0800 + + * Fix bug. + +commit 284da39706679489887cbd90b33f74551e30b066 +Author: leiyong <1549684884@qq.com> +Date: Sun Jun 14 23:51:21 2020 -0700 + + * Add zdata presentation data. + +commit ca21685f4b4c4d9cd24bf5d7a742935288c47690 +Author: sgm0422 <976204163@qq.com> +Date: Mon Jun 15 14:35:21 2020 +0800 + + * Fix project set menu. + +commit 1f162f9c35d23bfbe6ce3161cda4fe4d5b6de0f0 +Author: sgm0422 <976204163@qq.com> +Date: Mon Jun 15 13:33:37 2020 +0800 + + * Add init user view method. + +commit 44f9274c995f5c5d28a99b912d723a405b1205cf +Author: sgm0422 <976204163@qq.com> +Date: Mon Jun 15 10:20:37 2020 +0800 + + * Fix sql and details. + +commit eb76e01d9320b1cfe604f05ab513e8d15f25c2ac +Author: leiyong <1549684884@qq.com> +Date: Sun Jun 14 19:04:08 2020 -0700 + + Add zdata presentation data. + +commit 84d7ff857be88b705e7db58db13c6bdd8a4c4336 +Author: sgm0422 <976204163@qq.com> +Date: Fri Jun 12 18:55:54 2020 +0800 + + * Fix detail. + +commit 09c2a265f4500b7e6be8564a4b0fd1cf703bb338 +Author: sgm0422 <976204163@qq.com> +Date: Fri Jun 12 17:16:55 2020 +0800 + + * Delete program in link. + +commit 09ced67812cc777617000adec0af3f4db39806f7 +Author: z +Date: Fri Jun 12 16:55:36 2020 +0800 + + * fix bug for show task module tree. + +commit c2a2a8ec8ffdc79a08a0be07b9ea7e13947c8785 +Author: z +Date: Fri Jun 12 16:53:28 2020 +0800 + + * fix for fetch self class. + +commit cac6606561db5ef2530f10605289ec6e1058bb1d +Merge: 957d1a5780 c9fe62bd3d +Author: z +Date: Fri Jun 12 16:47:39 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 317c04910422407020c2ae5503b7ccbb8f44fafe +Merge: 5c5ef4eb0c 1f42d3867d +Author: sgm0422 <976204163@qq.com> +Date: Fri Jun 12 16:42:12 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit 5c5ef4eb0c6bd4175a6e87d331d65ade5f5b729f +Author: sgm0422 <976204163@qq.com> +Date: Fri Jun 12 16:41:40 2020 +0800 + + * Fix acl and rights. + +commit 1f42d3867dd7878f5ce6a1b54b1552235f91082b +Author: z +Date: Fri Jun 12 16:40:26 2020 +0800 + + * set program team. + +commit c9fe62bd3dc14730060de4a97bf07f30ed2b9ce6 +Author: leiyong <1549684884@qq.com> +Date: Fri Jun 12 01:20:28 2020 -0700 + + * Add zdata presentation data. + +commit 957d1a5780e10ca2edaa5c069cace0bd5aa48862 +Author: z +Date: Fri Jun 12 11:02:14 2020 +0800 + + * fix bug #2530. + +commit 2327aa145ae8ca5306b2e8e4b37f80d10e4bd65c +Author: z +Date: Fri Jun 12 10:58:58 2020 +0800 + + * change for merge program. + +commit c156aff9a41805c4c71188d63e39bec276d6f982 +Author: z +Date: Fri Jun 12 10:55:33 2020 +0800 + + * fix bug #2530. + +commit 5670cb487ca6e1fbde9889e2306f1bc99a294617 +Author: leiyong <1549684884@qq.com> +Date: Thu Jun 11 19:06:00 2020 -0700 + + * Add zdata presentation data. + +commit cace41c441b7fca15e7d0af11a1467d2d15b66b1 +Merge: da8d8b55d3 2d97663c5d +Author: z +Date: Fri Jun 12 09:55:51 2020 +0800 + + Merge branch '15.x' of github.com:easysoft/zentaopms into 15.x + +commit da8d8b55d301703fd7b6066406029d4bbbdf0100 +Author: z +Date: Fri Jun 12 09:07:07 2020 +0800 + + * change for merge program. + +commit 4118a2387c435b9ac0065f439ffb40e2f8c967f7 +Author: leiyong <1549684884@qq.com> +Date: Thu Jun 11 02:44:40 2020 -0700 + + * Add zdata presentation data. + +commit 2d97663c5d61eff4cab7c958b36465bcd0ed302f +Author: sgm0422 <976204163@qq.com> +Date: Thu Jun 11 17:25:36 2020 +0800 + + * Compute program priv. + +commit 9d91392a184b6961ec0d493910e525f6ec082680 +Author: leiyong <1549684884@qq.com> +Date: Thu Jun 11 01:41:18 2020 -0700 + + * Add zdata presentation data. + +commit cb1fd2043c2433d7b10292af50a97c334e21959d +Author: leiyong <1549684884@qq.com> +Date: Thu Jun 11 01:32:19 2020 -0700 + + * Add zdata presentation data. + +commit cfbba4b4bbdef677cb8a4688aab77b081d2a2256 +Author: sgm0422 <976204163@qq.com> +Date: Thu Jun 11 14:41:08 2020 +0800 + + * Code for task #7235. + +commit c4fc2c99b1503749a3b4d0f1b918938ad3fb18f0 +Author: sgm0422 <976204163@qq.com> +Date: Thu Jun 11 13:23:03 2020 +0800 + + * Fix menu and add program group. + +commit cbe28d7e616241ed8e240df36b88397e86f9b025 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jun 10 17:33:13 2020 +0800 + + * Fix details. + +commit 4fbd9f6fd2a31d186d511a00cc0451c0c66577b4 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jun 10 14:10:09 2020 +0800 + + * Finish task #7234. + +commit 18337e6ae0198a18283aa1dc15a89111d778ec40 +Author: z +Date: Wed Jun 10 11:14:33 2020 +0800 + + * adjust for merge program. + +commit b25f67c5ba6360a959c8edb379e523df737f19e5 +Author: z +Date: Tue Jun 9 08:54:08 2020 +0800 + + * finish task #7221. + +commit 4fce5f0720343da3dd48c1884d9e28de69600307 +Author: z +Date: Mon Jun 8 16:39:14 2020 +0800 + + * fix bug. + +commit 3bdd3d8a2340fc3d61f8352cfb9bef92473a5305 +Author: sgm0422 <976204163@qq.com> +Date: Fri Jun 5 18:04:17 2020 +0800 + + * Fix error. + +commit c02319385c947439792e233087f37fd975fcd084 +Author: sgm0422 <976204163@qq.com> +Date: Fri Jun 5 15:48:57 2020 +0800 + + * Fix install and upgrade logic. + +commit 13597923a1c3aae084066806e686ae01933454fe +Author: sgm0422 <976204163@qq.com> +Date: Fri Jun 5 15:12:05 2020 +0800 + + * Fix install && upgrade sql. + +commit 485bc23dfdf3ae116b76336995c6ff88f5c8bc6a +Author: sgm0422 <976204163@qq.com> +Date: Fri Jun 5 13:29:45 2020 +0800 + + * Merge code. + +commit 804c3b34f63995db428820446f4597127eda119c +Author: z +Date: Fri Jun 5 08:45:58 2020 +0800 + + * fix bug. + +commit 99e8d2a9e99dc37582e874c6ca6743f67ee17b53 +Author: z +Date: Thu Jun 4 12:06:47 2020 +0800 + + * adjust for repo branch. + +commit 18c3752d9aa90d8449169193c9547fde685b911a +Author: sgm0422 <976204163@qq.com> +Date: Wed Jun 3 13:13:54 2020 +0800 + + * Delete program from repo. + +commit d633b72cfaf670716218a711312eed42971226f3 +Author: z +Date: Wed Jun 3 10:13:52 2020 +0800 + + * adjust code. + +commit bf1cdda8f59278de30f689f860348698c12b6744 +Author: sgm0422 <976204163@qq.com> +Date: Wed Jun 3 09:02:28 2020 +0800 + + * Add program to task and story. + +commit 3cc7f354369687169fe8916c2bb2972b3a3b754e +Author: sgm0422 <976204163@qq.com> +Date: Mon Jun 1 16:25:11 2020 +0800 + + * Add program condition. + +commit 9e1d7077ea3a1f5b78b1bf4b88b85c768113d234 (tag: zentaopms_12.3.2_20200601) +Author: z +Date: Mon Jun 1 15:23:39 2020 +0800 + + * adjust for getURI in flow. + +commit 2539193d305bbb7fcc6c809615076aff0cf0fd1a +Author: z +Date: Mon Jun 1 14:58:04 2020 +0800 + + * add new version and upgrade. + +commit 60e13af347031f6b56e6778db36284d2e3b182de +Author: Yagami <976204163@qq.com> +Date: Sun May 31 23:18:24 2020 +0800 + + * Fix menu. + +commit af6a2f26bc1c944c2406066ea9e41256d16fad7d +Author: wangyidong +Date: Fri May 29 13:45:41 2020 +0800 + + * code for batchcreate and batchedit with flow. + +commit 440f5100cef98643630398494e897fd18207ee18 +Author: wangyidong +Date: Fri May 29 13:43:18 2020 +0800 + + * move requirement method to pro. + +commit 6b0bd6878b35498e5191e5a6182811e0ad58f07e +Author: wangyidong +Date: Fri May 29 13:12:52 2020 +0800 + + * adjust for bind ding user. + +commit 77467388685a51d55dcae622057d46f782c151be +Author: leiyong <1549684884@qq.com> +Date: Thu May 28 19:59:03 2020 -0700 + + * Finish task#812. + +commit 42d74e958054af0f4b8eab710acc80629f10f584 +Author: wangyidong +Date: Fri May 29 10:11:36 2020 +0800 + + * fix for saveAction2PMS. + +commit c9be3210cd9e0794aae993cf1cb192c0d423af09 +Author: wangyidong +Date: Fri May 29 10:09:25 2020 +0800 + + * change for return error. + +commit 91de6e934ca9646303689760c8d5980968ae3dc9 +Author: wangyidong +Date: Fri May 29 10:08:11 2020 +0800 + + * add insert param for cover or insert exist data. + +commit 16609125c089903ed6a50ce9217e14c86bd14c12 +Author: leiyong <1549684884@qq.com> +Date: Thu May 28 17:20:16 2020 -0700 + + * Adjust menu. + +commit 7a9cc4070aef3b1e177aaf166ed02cf9b4272cfe +Author: wangyidong +Date: Thu May 28 09:52:41 2020 +0800 + + * fix for security weaknesses. + +commit 08b21f4336b0051b7aa639888d9476b874216b25 +Author: leiyong <1549684884@qq.com> +Date: Wed May 27 01:23:53 2020 -0700 + + * Adjust menu. + +commit 0fb4b5ce32b4f91aef7d4a3372a40f0d6b16fe82 +Author: zhaohaibo +Date: Wed May 27 14:34:57 2020 +0800 + + add param of currentProgram + +commit 53df7402db74ba4f8ed223545065084f5020ca60 +Merge: a9b0976c65 d4b09b733d +Author: sgm0422 <976204163@qq.com> +Date: Wed May 27 14:05:18 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit a9b0976c65ac2fdecfca05997de7d3900ed0cde8 +Author: sgm0422 <976204163@qq.com> +Date: Wed May 27 14:04:55 2020 +0800 + + * Fix menu. + +commit d4b09b733df4a65f6dacbd6f24dcf81a0688d114 +Author: zhaohaibo +Date: Wed May 27 13:26:08 2020 +0800 + + add param currentProgram + +commit 436a3343e75d2596e7fd35ed0e6d9dd6ad2b7a6a +Merge: afca97811e aca349b074 +Author: wangyidong +Date: Wed May 27 12:08:05 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit afca97811e7abc56c16848b8965542fce056d358 +Author: wangyidong +Date: Wed May 27 12:07:05 2020 +0800 + + * finish task #11305. + +commit aca349b074812cf3aff4c4ea2247bb2549eb89ed +Author: Catouse +Date: Tue May 26 16:23:35 2020 +0800 + + * fix UI error in kindeditor table dialog. + +commit 3842bd351d00c669e8f579289ba5e6941298cdd3 +Author: Catouse +Date: Tue May 26 16:21:36 2020 +0800 + + * fix UI error in kindeditor table dialog. + +commit c2cabc0d6474ebe42c2e9bb76be8ba3b03ac7642 +Author: zhaohaibo +Date: Tue May 26 15:53:12 2020 +0800 + + * add param currentProgram + +commit f486ac38fbe154d478ca4750a89ad06596028c88 +Author: zhaohaibo +Date: Tue May 26 15:44:08 2020 +0800 + + * add param of currentProgram + +commit 63809883f155b11e711ffd17f21e96c9dbe6030d +Author: zhaohaibo +Date: Tue May 26 14:12:00 2020 +0800 + + * fix bug + +commit e9b2a4bc32a5a3aff2ac4512d0ebd4f965fb1851 +Author: zhaohaibo +Date: Tue May 26 13:37:02 2020 +0800 + + add param $this->session->program + +commit ee52389234871c1e8893b5dcb0100150fc25b722 +Merge: d5a80a5718 2a44b295af +Author: zhaohaibo +Date: Tue May 26 13:33:33 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit 13067f801f4c58b8bd049f836752a2cc9d73a5a3 +Author: wangyidong +Date: Tue May 26 10:31:38 2020 +0800 + + * code for task #11318. + +commit d5a80a571808b4fb7e904ffbf949549032e8a41d +Author: zhaohaibo +Date: Tue May 26 10:02:45 2020 +0800 + + * add param of programID + +commit 2a44b295afe447113c26fc9589e6d95393c8a4e7 +Author: Catouse +Date: Tue May 26 10:02:28 2020 +0800 + + * update icon-qc. + +commit fd0da30d091e2ba4f95f3132a192eedc8ca11027 +Author: wangyidong +Date: Tue May 26 09:14:31 2020 +0800 + + * fix bug. + +commit 5d5dd33ac53bd43bf4973e3f464b74178fe7ea1d +Author: wangyidong +Date: Tue May 26 09:13:16 2020 +0800 + + * fix bug for toggle child task or story. + +commit 41308acca9e85e99f2cd74ffa1e335e8a68b18e2 +Author: wangyidong +Date: Tue May 26 09:11:59 2020 +0800 + + * fix bug for commit result. + +commit 23b04f625a38b6079cbed97dba07a755e600437e +Author: wangyidong +Date: Tue May 26 09:11:20 2020 +0800 + + * fix for copy hidden file. + +commit 488cd83cbaa22c0d494882779b1dfe16ee28dcf3 +Author: zhaohaibo +Date: Mon May 25 16:37:07 2020 +0800 + + * Fix link. + +commit 69e0bc35139f1e2cff29b84b8eb7b91394e80fa2 +Author: zhaohaibo +Date: Fri May 22 13:46:51 2020 +0800 + + * fix bug + +commit 4b5844e64ec2a56207b3db25555e45163c1ccb83 (tag: zentaopms_15.0_20200521) +Merge: 23a2df6a50 9a72a1e4cd +Author: sgm0422 <976204163@qq.com> +Date: Thu May 21 09:31:38 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit 23a2df6a50211fb16b68cab9ae927ec2d7914cd5 +Author: sgm0422 <976204163@qq.com> +Date: Thu May 21 09:31:25 2020 +0800 + + * Fix vars. + +commit 9a72a1e4cd8671f1c5dff6790b275f62f00722f2 +Author: zhaohaibo +Date: Wed May 20 18:22:26 2020 +0800 + + * fix bug + +commit 0606da04e1254c590d463ac19f83c88adf9da259 +Author: zhaohaibo +Date: Wed May 20 17:11:10 2020 +0800 + + fix bug + +commit 00cd8c535d19078b5e521bde38fc2ed2803e3f59 (tag: zentaopms_15.0_20200520) +Author: Catouse +Date: Wed May 20 15:00:57 2020 +0800 + + * add icon-qc by update zui icon fonts.. + +commit a5969ce26565fca7b73d9942694cd93dcef7755b +Author: sgm0422 <976204163@qq.com> +Date: Wed May 20 14:51:33 2020 +0800 + + * Fix menu. + +commit 48e0bf9043912346394ce8627277651458349679 +Author: sgm0422 <976204163@qq.com> +Date: Wed May 20 10:22:59 2020 +0800 + + * Change version. + +commit c6ebec092058f05ab81c4e6d450b725d38274ef5 +Author: sgm0422 <976204163@qq.com> +Date: Wed May 20 09:26:59 2020 +0800 + + * Fix admin menu. + +commit a14ad24aa7f8df5e97187c697a0c5f863e8852ed +Author: Yagami <976204163@qq.com> +Date: Tue May 19 22:02:09 2020 +0800 + + * Fix menu. + +commit f23e26cd8628a62d427946a6549592dc2798493e +Author: sgm0422 <976204163@qq.com> +Date: Tue May 19 19:32:08 2020 +0800 + + * Fix program managemembers and create link. + +commit 005eca6d81a31d5062ce5e00fb5e4ebad75c86e9 +Author: sgm0422 <976204163@qq.com> +Date: Tue May 19 19:13:14 2020 +0800 + + * Hide some menu. + +commit 260b0610da330249ab2e48e76e6625cf34d1f8c9 +Merge: 1402d09395 e49039bd29 +Author: sgm0422 <976204163@qq.com> +Date: Tue May 19 19:09:46 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit 1402d093955313669b8e49a694022833c4560740 +Author: sgm0422 <976204163@qq.com> +Date: Tue May 19 19:09:35 2020 +0800 + + * Fix program details. + +commit e49039bd2911d488e252c0b544b93467949de850 +Author: zhaohaibo +Date: Tue May 19 18:58:49 2020 +0800 + + * task #753 + +commit dbd749908cbf284043eb8636a9ce8edb80798c31 +Author: leiyong <1549684884@qq.com> +Date: Tue May 19 03:50:15 2020 -0700 + + * Adjust task module code. + +commit 37142586b4bc1de177c296f8759b39f75deebc59 +Author: zhaohaibo +Date: Tue May 19 18:44:34 2020 +0800 + + * task #728 + +commit 25543b6413a6a0f0f0883b590afed8b360426ec3 +Author: zhaohaibo +Date: Tue May 19 18:37:23 2020 +0800 + + * task #729 + +commit e553ffc0ba0ed46d35888e1922a41a55f78e8557 +Merge: 97c0e9f4f1 b10b019168 +Author: zhaohaibo +Date: Tue May 19 18:07:44 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + * task #731 + +commit b10b0191680e24b4ea3fd50d007a231768705d3e +Author: leiyong <1549684884@qq.com> +Date: Tue May 19 03:05:38 2020 -0700 + + * merger cmmi branch. + +commit 97c0e9f4f1c211838d65f4788a76234d84468f4a +Author: zhaohaibo +Date: Tue May 19 18:05:13 2020 +0800 + + * task #731 + +commit 2ecb5635096df9557a862eef4a37e3101e3dd95b +Author: zhaohaibo +Date: Tue May 19 17:42:39 2020 +0800 + + * task #736 + +commit 1bad49a04f85dac4ad40d25f2f8deb94d217a79c +Author: zhaohaibo +Date: Tue May 19 13:23:33 2020 +0800 + + * perfect code + +commit 1e69c201f896f4d8bad6e43cde915689ac27f3b7 +Author: zhaohaibo +Date: Tue May 19 13:11:46 2020 +0800 + + * modify function create edit finish + +commit 7cd2453f35a9ae7e3de6914f0caf870311e5e394 +Author: sgm0422 <976204163@qq.com> +Date: Tue May 19 10:39:39 2020 +0800 + + * Add program swapper. + +commit 5dc4fbcec8e02dee04c6f6b9a95203225ef86c5a +Author: sgm0422 <976204163@qq.com> +Date: Mon May 18 16:46:40 2020 +0800 + + * Fix menu and program. + +commit 7478fb8c30b5fd1db2a0495326f118925d58b3a0 +Author: sgm0422 <976204163@qq.com> +Date: Mon May 18 13:54:00 2020 +0800 + + * Fix details. + +commit 3a7d84aa55041ba924c30a040fb556b55d7254dc +Author: Catouse +Date: Mon May 18 10:16:42 2020 +0800 + + * remove menuHeader element. + +commit cf2d5cc26f40db57b36966cf44a6a1266ec1fa11 +Author: Yagami <976204163@qq.com> +Date: Fri May 15 17:11:30 2020 +0800 + + * Fix menu. + +commit 79882640d1b04b252d348eb8eee4253a511e7096 +Merge: bf3a99f151 65c64de03a +Author: reneeteng +Date: Fri May 15 14:45:46 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bf3a99f1519de64b1506a4e4f8f3c39d505b201d +Author: reneeteng +Date: Fri May 15 14:44:45 2020 +0800 + + * Repo lang file updated. + +commit 65c64de03abdb61452c31bfb5061efcf0b5e4dc5 (tag: zentaopms_12.3.1_20200515) +Author: wangyidong +Date: Fri May 15 13:03:14 2020 +0800 + + * add new version and upgrade. + +commit a1bbed1d5e1285554436baaa7a8ddcf3f2ca1afd +Author: wangyidong +Date: Fri May 15 11:24:09 2020 +0800 + + * fix for roadmap sort for product view page. + +commit 7dc69e1f83d08e6a2a0452afe10772fd8a5ab1df +Author: wangyidong +Date: Fri May 15 11:21:06 2020 +0800 + + * code for htmlspecialchars_decode branch name. + +commit d1e3e3184f0aa396577fc800c845991368c44e3d +Author: Yagami <976204163@qq.com> +Date: Fri May 15 09:20:20 2020 +0800 + + * Fix menu. + +commit b85560356eef7d1f1cadaa6ae2232689978f0854 +Author: wangyidong +Date: Fri May 15 08:21:18 2020 +0800 + + * fix for error. + +commit 173836383051ba9c2826f1f5bff79117f03c15e7 +Author: Yagami <976204163@qq.com> +Date: Thu May 14 16:50:39 2020 +0800 + + * Fix bug #577. + +commit 1c1d72114f43fada2d1d8a68143dfb053954f0b6 +Author: wangyidong +Date: Thu May 14 16:00:29 2020 +0800 + + * finish task #7067. + +commit 423d6b3a5dd3dbf8c1688b31094967d2953b0b5b +Author: wangyidong +Date: Thu May 14 15:47:11 2020 +0800 + + * code for task #7197. + +commit f70d59d5b1582f656d625eca531347036f2d5679 +Author: wangyidong +Date: Thu May 14 15:26:06 2020 +0800 + + * finish task #7197. + +commit 9f1e075c8271a5622cea7aad1e673f12a2a2abef +Author: Yagami <976204163@qq.com> +Date: Thu May 14 14:39:52 2020 +0800 + + * Fix program module. + +commit 3932514956e7e7103779eb4dd8d781b1950e4196 +Author: wangyidong +Date: Thu May 14 11:06:54 2020 +0800 + + * code for task #7089. + +commit 2f249572f767159da37e842c29bbbe0a1c130245 +Author: Yagami <976204163@qq.com> +Date: Thu May 14 10:14:02 2020 +0800 + + * Fix menu. + +commit 76d4a4b611bf30f3113d772dcecb567d5ad2b254 +Author: wangyidong +Date: Thu May 14 09:41:59 2020 +0800 + + * code for task #7167. + +commit 15b2d838e79b07315569019cc5d404c805e6534c +Author: wangyidong +Date: Thu May 14 08:29:21 2020 +0800 + + * finish task #7187. + +commit eee8e1d3de817d4d106a8bab09df4ba85aa15733 +Author: sgm0422 <976204163@qq.com> +Date: Wed May 13 20:50:19 2020 +0800 + + * Fix menu. + +commit e1dd1b8d1f54fcb4b8f96df3e944106528596ca9 +Author: wangyidong +Date: Wed May 13 17:39:17 2020 +0800 + + * change importFile to fileImport. + +commit be2033a859bb6d6d58d95f620337b787ee453e2c +Author: wangyidong +Date: Wed May 13 17:29:27 2020 +0800 + + * finish task #7183. + +commit d81da2876b89c5087fe645255d464f1b4c8ba8bf +Author: wangyidong +Date: Wed May 13 17:22:01 2020 +0800 + + * finish task #7180. + +commit 9e1220be5f6d2a60e3d45ec469d57017e54bc0a9 +Author: Yagami <976204163@qq.com> +Date: Wed May 13 17:05:27 2020 +0800 + + * Fix menu. + +commit 33c3308f5d040a34d10d6332ada7739aab10958f +Merge: d71d534a2a 7b9a2c2290 +Author: Yagami <976204163@qq.com> +Date: Wed May 13 16:31:23 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit d71d534a2a05736e4405a3994dc2377b5145b137 +Author: Yagami <976204163@qq.com> +Date: Wed May 13 16:31:10 2020 +0800 + + * Fix menu. + +commit 7b9a2c229032efdf14fbe41819b27c5d19d79581 +Author: chenfei +Date: Wed May 13 15:31:14 2020 +0800 + + * Add underline to checkcode method. + +commit 82945a1be15c9f5a7b58a14ec05e26efeba39582 +Author: wangyidong +Date: Wed May 13 14:20:02 2020 +0800 + + * finish task #7199. + +commit 7f131f1a4dcb321ff7edff9f16785f85621fb367 +Author: wangyidong +Date: Wed May 13 14:12:46 2020 +0800 + + * finish task #7196. + +commit 4ee81aa33eb0c09e5f6f8928b2d6e5c20e2278a8 +Author: wangyidong +Date: Wed May 13 14:10:10 2020 +0800 + + * code for task #7195. + +commit 0afd583d8f3603fdc166cd0aeee2bc1c8311aad9 +Author: wangyidong +Date: Wed May 13 14:07:20 2020 +0800 + + * finish task #7195. + +commit 51aede8d9d4e185eca4eda90df60b7b601174afc +Author: Catouse +Date: Wed May 13 12:49:21 2020 +0800 + + * fix body padding by update zui.css. + +commit 744a0bbd69a953e2a07ad524260e5ddf48acc80b +Author: Catouse +Date: Wed May 13 11:30:47 2020 +0800 + + * fix zui error. + +commit 1c6aefeb9ddf278cfb4ad07d1c5f579489ef63e7 +Author: wangyidong +Date: Wed May 13 11:18:19 2020 +0800 + + * finish task #7194. + +commit 5149270fdfb3771399b20a0cad1e725ec65622e1 +Author: wangyidong +Date: Wed May 13 10:56:05 2020 +0800 + + * finish task #7193. + +commit 6a91dcb12fce9f03986701315441f54efdae526f +Merge: f889168174 0cf30dfc80 +Author: wangyidong +Date: Wed May 13 10:50:59 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f889168174426066fb0875ac948a1dc90546f428 +Author: wangyidong +Date: Wed May 13 10:49:43 2020 +0800 + + * adjust code for toggle fold or unfold. + +commit 0cf30dfc8079f1aedb059c74a1715767b6381b4d +Author: Catouse +Date: Wed May 13 09:54:50 2020 +0800 + + * fix ajaxform by update zui.js. + +commit 59cb55790ff8796a7adb8b4066fc69a8faccd8ad +Author: Catouse +Date: Wed May 13 09:53:26 2020 +0800 + + * fix ajaxform by update zui.js. + +commit 2f78e6a4f10b4f77557973e79e17d46e2c1ab47d +Author: wangyidong +Date: Tue May 12 17:36:08 2020 +0800 + + * fix for get ding user. + +commit 6fe5f817801ba651d01937e04399eaaa9554e649 +Merge: 9e131109d0 d69f621d07 +Author: Yagami <976204163@qq.com> +Date: Tue May 12 17:29:57 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit f4e378e7c402f7e14cab05e5e955b90f85053a14 +Merge: fb453d0ace 27786ee7d2 +Author: wangyidong +Date: Tue May 12 16:25:37 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fb453d0ace5f26b9b3a175473f44a086ed0730c6 +Author: wangyidong +Date: Tue May 12 16:24:49 2020 +0800 + + * finish for backup. + +commit 27786ee7d211d712dcb8db04763a1a992e7802ce +Author: leiyong <1549684884@qq.com> +Date: Tue May 12 01:01:39 2020 -0700 + + Finish task#7198. + +commit 9e131109d011523ed187f9f8e2fd91911185a3c3 +Author: Yagami <976204163@qq.com> +Date: Tue May 12 14:30:57 2020 +0800 + + * Fix menu. + +commit d69f621d07c53beea4ecd97a9c99ef7d1726e1a0 +Author: Catouse +Date: Tue May 12 13:52:39 2020 +0800 + + * fix error on use english language data. + +commit 5e2a7e17583f88ad10f154907410921d3219edf9 +Author: Catouse +Date: Tue May 12 13:39:31 2020 +0800 + + * add english language data file. + +commit 24aef867c6adff74ea05d0726520ee692f41c1c8 +Author: Catouse +Date: Tue May 12 13:39:21 2020 +0800 + + * fix members count and working hours algorithm. + +commit 5a56b63e7ebd23cb98b6ac4e25322c289893ba16 +Author: wangyidong +Date: Tue May 12 10:28:02 2020 +0800 + + * code for story title for requirement. + +commit 7d7054b1ba43baa79f671c35cd689123e9603f78 +Author: Catouse +Date: Tue May 12 09:56:21 2020 +0800 + + * fix data-toggle in dropMenu not work. + +commit f9ea9e58016674d177ce65c82b1a0da9f3e47757 +Author: Catouse +Date: Tue May 12 09:34:01 2020 +0800 + + * remove debug code. + +commit 101432eb31a7f08b6f8a016502e4d0ba9871c3e0 +Author: Catouse +Date: Tue May 12 09:33:12 2020 +0800 + + * fix card style. + +commit d281099672cdf07c9fa835202dc1b9a9fc1d137c +Merge: d13750a5a4 3743b31df4 +Author: wangyidong +Date: Mon May 11 16:50:12 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d13750a5a4a234b0dbaa21c75d12246ce4cb943b +Author: wangyidong +Date: Mon May 11 16:48:41 2020 +0800 + + * finish task #7168. + +commit 3743b31df4083b443fc5844eba678d90364fb3b4 +Author: leiyong <1549684884@qq.com> +Date: Mon May 11 01:12:38 2020 -0700 + + * Adjust the code when adding bugs. + +commit b3b567bc8999e59362cd280969e1632656890e90 +Author: leiyong <1549684884@qq.com> +Date: Sun May 10 23:57:42 2020 -0700 + + * Finish task#7201,task#7189,task#7188,task#7185. + +commit 350d92dd3679d3bef68648b6e4acf81ce5f6ea58 +Author: wangyidong +Date: Mon May 11 14:48:22 2020 +0800 + + * finish task #7167. + +commit edc9766587a5a2989b52959a657622343e6fa622 +Author: wangyidong +Date: Mon May 11 11:22:11 2020 +0800 + + * finish task #7165. + +commit e11abdc27e98874ff33eb24cb3a16bd593a83a55 +Author: Catouse +Date: Mon May 11 10:55:14 2020 +0800 + + * fix page shake on load. + +commit 5aba9e2f4b3df3b22e5e58716d2d7e952a1f2ee7 +Author: Catouse +Date: Mon May 11 10:35:59 2020 +0800 + + * fix cards style with very long title. + +commit e1a22df6c4e9d521ec0d8cc0b832acf72bafcd33 +Author: Catouse +Date: Mon May 11 10:29:18 2020 +0800 + + * fix program/all not work. + +commit 80c1978afaaf25cddc9a11cf075f4db455658785 +Author: Catouse +Date: Mon May 11 10:27:50 2020 +0800 + + * task #7126, refactor all project/create btn to program/createguide. + +commit e4909221b4310bdd64b248b19bd86b428c9b28cd +Author: wangyidong +Date: Mon May 11 09:49:57 2020 +0800 + + * finish task #7164. + +commit 430bb5ee22ed3115711804b0b89fd61d977db517 +Merge: dcbb7e9eb5 9910e339c3 +Author: wangyidong +Date: Sat May 9 08:37:23 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit dcbb7e9eb5f4c9aa5213f6691ffe3ef774d0ed43 +Author: wangyidong +Date: Sat May 9 08:36:42 2020 +0800 + + + add extension link for en. + +commit 2a0b9d3f434127fdbdfd513cb2fa5460a890a48d +Author: wangyidong +Date: Sat May 9 08:23:34 2020 +0800 + + * finish task #7066. + +commit 9910e339c39da9d7a088a63824daa47339c2202b +Author: leiyong <1549684884@qq.com> +Date: Fri May 8 08:07:21 2020 -0700 + + * Fix bug#3117. + +commit 12718939a0e90ecc33c752d0be8b4a5871fd3089 +Author: wangyidong +Date: Fri May 8 16:43:30 2020 +0800 + + * finish task #7078. + +commit b0f8fb1495897d05d41f360f4341ddeea835a635 +Merge: 0da117dfe1 0d21d01206 +Author: wangyidong +Date: Fri May 8 16:30:33 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0da117dfe1a9574a3609a150d3bcdf1236f18a16 +Author: wangyidong +Date: Fri May 8 16:27:48 2020 +0800 + + * finish task #7098. + +commit f005903fd72665abf4a4462712d01e3d894b08a7 +Author: Catouse +Date: Fri May 8 13:56:06 2020 +0800 + + * improve UI of program swapper menu. + +commit 326d45d0c510de63d586bac7a8dbd76d6fad6ed1 +Author: Catouse +Date: Fri May 8 11:37:19 2020 +0800 + + * task #7131, task #7132, task #7133, add cards view for program index page. + +commit b55e3730f5624c7a3e159d51bec7777cc39ab7f8 +Merge: 27fc29b764 71eb6e7022 +Author: Yagami <976204163@qq.com> +Date: Fri May 8 08:58:39 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit 27fc29b764e82e83d3411cf0628097c5dfc83863 +Author: Yagami <976204163@qq.com> +Date: Fri May 8 08:51:32 2020 +0800 + + * Code for task #7121. + +commit 71eb6e70227d61def0f2743f78bbb3edc6e74f40 +Author: Catouse +Date: Thu May 7 17:38:40 2020 +0800 + + * fix menu state error on page load with cookie. + +commit cdf0d1a7589a748d1e7b297ee7309e84889735c4 +Author: Catouse +Date: Thu May 7 17:13:07 2020 +0800 + + * fix menu state error on page load. + +commit f497da5494280e35f3858f8b083c7dfcce899c45 +Author: Catouse +Date: Thu May 7 17:06:34 2020 +0800 + + * fix menu state error on page load. + +commit 4f4c9e9145314fb383753a306e464ba1a7dcf543 +Author: Catouse +Date: Thu May 7 16:42:32 2020 +0800 + + * fix menu. + +commit 58c44db0f7c490ed81b3595a231d01ab9e8f683b +Author: Catouse +Date: Thu May 7 16:40:32 2020 +0800 + + * task #7126, add program create guide modal page. + +commit 8c8b845cda366a2ec32f1c725c7551811e0f510a +Author: Catouse +Date: Thu May 7 15:08:20 2020 +0800 + + * improve UI of program swaper menu. + +commit 9ec635f85db4749547781c905f25f4e20ad6cf33 +Author: Catouse +Date: Thu May 7 15:02:07 2020 +0800 + + * improve UI of program swaper menu. + +commit 97474dcac5a9fc76ca176520f4a029daf5d53ab2 +Author: Catouse +Date: Thu May 7 14:50:46 2020 +0800 + + * task #7129, add program swapper menu to header. + +commit 8b45bf767d7c4e3442a0ec8425e4d060809b15a1 +Author: Catouse +Date: Thu May 7 14:50:06 2020 +0800 + + * refactor. + +commit 923a3cd538b58a877f387a59846fb05bddc7574f +Author: Catouse +Date: Thu May 7 11:03:02 2020 +0800 + + * fix main nav style. + +commit 9c7b057c4308849370124f01fc045f26ae957122 +Author: Yagami <976204163@qq.com> +Date: Thu May 7 11:29:42 2020 +0800 + + * Finish task #7123. + +commit 0d21d01206b681f71522052a04b2c01b766e2bfb +Author: leiyong <1549684884@qq.com> +Date: Wed May 6 02:58:26 2020 -0700 + + * Finish task#7077. + +commit ef44299d7ec7e00f29eb8aeb449e5c7f0c5bb793 +Author: Yagami <976204163@qq.com> +Date: Wed May 6 15:42:56 2020 +0800 + + * Finish task #7117/7125/7124. + +commit d0f61602a8eda009c03dd4d6e6a3d1677735336d +Merge: 5c25b21c55 9b61cfcd07 +Author: leiyong <1549684884@qq.com> +Date: Tue May 5 23:31:36 2020 -0700 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5c25b21c55fdd245e17601c97cba1c5e38c51d32 +Author: leiyong <1549684884@qq.com> +Date: Tue May 5 23:30:49 2020 -0700 + + * Fix bug#3073. + +commit 1c5a2dde2c3170c04f335aeaaec45598c7aed38a +Merge: 6d1a047b02 0689779ff0 +Author: Yagami <976204163@qq.com> +Date: Wed May 6 11:13:34 2020 +0800 + + Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x + +commit 6d1a047b02c34ac933be25d9b5d8e7526cfca9bc +Author: Yagami <976204163@qq.com> +Date: Wed May 6 11:13:13 2020 +0800 + + * Finish task #7119. + +commit 9b61cfcd073c33aa4807327f3aa00608e66cca01 +Merge: 026cc68970 5870c95ec4 +Author: wangyidong +Date: Wed May 6 10:42:55 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 026cc6897064766c3e18926990816a4f18173e5a +Author: wangyidong +Date: Wed May 6 10:42:26 2020 +0800 + + * finish task #7095. + +commit 5ea2467beead5855d259a291eca8d12ba575db71 +Author: wangyidong +Date: Wed May 6 10:38:09 2020 +0800 + + * finish task #7088. + +commit 0689779ff0eef9e228da69266b46e7fa47bd1298 +Author: Catouse +Date: Wed May 6 10:24:48 2020 +0800 + + * update zenicon files. + +commit 5870c95ec4b4b0dfc6b703de965510fef75e102d +Author: leiyong <1549684884@qq.com> +Date: Tue May 5 18:34:50 2020 -0700 + + Finish task#7109. + +commit bf33d10b9d7f4e234b95f87ead00940e6d10af56 +Author: Catouse +Date: Tue May 5 17:20:44 2020 +0800 + + * task #7116, task #7127, task #7128, task #7130, implement new menu. + +commit d369ccdab67d79d877e0042f0d570d62e96fe69f +Author: wangyidong +Date: Tue May 5 09:28:23 2020 +0800 + + * adjust for php error. + +commit b919ac88dd54797ed2dec8d5c0e22f48f7fddf3c +Author: chenfei +Date: Mon May 4 17:40:46 2020 +0800 + + * Optimize sql and code to improve query performance. + +commit 6a2ce5fade434ed81d414864d9e32c8ba752aaf4 +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 30 01:47:19 2020 -0700 + + * Finish task#7105. + +commit c3dcb85546f7940e76b38dc51da2cc4bc0dba416 +Merge: dfc8de0b65 d1c545d078 +Author: wangyidong +Date: Thu Apr 30 16:43:14 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit dfc8de0b652adb37b916f94acaa4f3a2b777097a +Author: wangyidong +Date: Thu Apr 30 16:42:52 2020 +0800 + + * finish task #7085. + +commit d1c545d07843c5758f611d31e60734fd27c67137 +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 30 00:56:51 2020 -0700 + + * Finish task#7104. + +commit 091ae4cf3daeed3d2d26df6efed88411a1f1ab45 +Merge: e8527692f5 576c22593d +Author: leiyong <1549684884@qq.com> +Date: Thu Apr 30 00:56:14 2020 -0700 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 576c22593de2f3fe45eda29543a6226cce1130e9 +Author: wangyidong +Date: Thu Apr 30 15:31:26 2020 +0800 + + * finish task #7076. + +commit e8527692f543a7234e7f6b5dc58d8b90eb907485 +Author: leiyong <1549684884@qq.com> +Date: Wed Apr 29 23:19:51 2020 -0700 + + * Finish task#7100. + +commit d299f0236b431ee689684a88a86ab26856e10a6e +Merge: 3e26e60560 3492d60def +Author: wangyidong +Date: Thu Apr 30 13:11:18 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3e26e60560a922591ab653d5383fff7cbe794a88 +Author: wangyidong +Date: Thu Apr 30 13:10:08 2020 +0800 + + * finish task #7091. + +commit 3492d60def805342ac69a3baa5846bbd8086b415 +Merge: 98e1d4f45b 1e5576a961 +Author: leiyong <1549684884@qq.com> +Date: Wed Apr 29 20:27:00 2020 -0700 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 98e1d4f45b27249b005e1bb0ac475b1534849813 +Author: leiyong <1549684884@qq.com> +Date: Wed Apr 29 20:26:49 2020 -0700 + + * Finish task#7102. + +commit 1e5576a961de5d9abdd982f18af4228702e1cf0a +Author: wangyidong +Date: Thu Apr 30 11:21:29 2020 +0800 + + * fix bug. + +commit 2a6cfab35e8e87c3c04f1241404f3b8d7f05d43b +Merge: 3e837dc80e 14e489b812 +Author: wangyidong +Date: Thu Apr 30 10:40:24 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3e837dc80e877fa9cc9f560a3e40959613d05ac2 +Author: wangyidong +Date: Thu Apr 30 10:31:49 2020 +0800 + + * finish task #7087. + +commit 14e489b812a68c1ed30699dc4eb35bc6f5614d1d +Author: leiyong <1549684884@qq.com> +Date: Wed Apr 29 02:54:46 2020 -0700 + + * Fix bug#7109. + +commit c551170d6b42016b3f9427f4ce27506db0bf82a1 +Author: leiyong <1549684884@qq.com> +Date: Wed Apr 29 02:02:51 2020 -0700 + + * finish task#7112,#7113,#7111. + +commit ad0c86afdecd2ef006a62f776c8acb56ac9fe5d2 +Merge: 85a55e41bd 3b21a74564 +Author: leiyong <1549684884@qq.com> +Date: Wed Apr 29 00:44:59 2020 -0700 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3b21a74564caca11d29eab29877e4c37cc21800a +Author: wangyidong +Date: Wed Apr 29 13:25:08 2020 +0800 + + * finish task #7081. + +commit 85a55e41bd2bbe1b0bf4266ea16d7c844d7b78cc +Author: leiyong <1549684884@qq.com> +Date: Tue Apr 28 02:29:20 2020 -0700 + + * Finish task#7109. + +commit 2d8fcc75e52e6a9ceed6996be60fe30ca1e84a54 +Author: wangyidong +Date: Tue Apr 28 16:56:34 2020 +0800 + + * adjust for get dingding user. + +commit 2372831886b81c1eefbbfc622e714bbdcf7f7729 +Author: wangyidong +Date: Tue Apr 28 16:31:18 2020 +0800 + + * finish task #7075. + +commit 1c29b742a06b315c3588b039f0dcefef161e405b +Author: wangyidong +Date: Tue Apr 28 13:26:10 2020 +0800 + + * finish task #7079. + +commit 43c181767b3a2ab467f289558c29ac6326d34db0 +Author: wangyidong +Date: Tue Apr 28 13:22:32 2020 +0800 + + * finish task #7083. + +commit 442d70773a5a384ae059d4a4e63c0f59ec0cd5aa +Author: wangyidong +Date: Mon Apr 27 14:22:20 2020 +0800 + + * finish task #7074. + +commit c92500975c87185dbc643839bb9679bc83f226d2 +Author: wangyidong +Date: Mon Apr 27 13:42:01 2020 +0800 + + * finish task #7071. + +commit 19b3819fd602ac9a20d18aa67883330114577f78 +Author: wangyidong +Date: Mon Apr 27 13:33:51 2020 +0800 + + * finish task #7070. + +commit 08c8461844cef7e69b3d907071122238ada0dace +Author: wangyidong +Date: Mon Apr 27 13:23:39 2020 +0800 + + * finish task #7069. + +commit 7ae499cf702eafdac90b41d3cc429c928cabe47f +Author: wangyidong +Date: Mon Apr 27 11:29:08 2020 +0800 + + * finish task #7068. + +commit e0b54c87efd659849058ba9bec9fa65aa2085dd8 +Author: wangyidong +Date: Mon Apr 27 11:13:03 2020 +0800 + + * fix bug for search testcase. + +commit 1a0090189adf26009047a31baa8ca1592aacf372 +Author: wangyidong +Date: Mon Apr 27 10:13:30 2020 +0800 + + * finish task #7064. + +commit 899cd6f78bcaac811e8c409473d896ca5a25727f +Author: wangyidong +Date: Sun Apr 26 17:35:15 2020 +0800 + + * fix bug #2404. + +commit 7407085500d0a06a91000cf382c0e33b2ac6ed65 +Author: wangyidong +Date: Sun Apr 26 17:33:42 2020 +0800 + + * adjust for show import. + +commit 1e54605dcccb345cee5556b13632811eff5a2388 +Author: wangyidong +Date: Fri Apr 24 16:30:26 2020 +0800 + + * fix bug #3109. + +commit 468c11e1c377a5ce72694cc87fc1632a760da86c +Author: wangyidong +Date: Thu Apr 23 15:30:52 2020 +0800 + + * code for bug #3099. + +commit fc5de2944e93f860a3f9bc3bc01146f5d1a5189b +Author: wangyidong +Date: Thu Apr 23 14:47:32 2020 +0800 + + * fix bug #3099. + +commit 3e1701b36098cf644e435f5399b8f54fa8528065 +Author: wangyidong +Date: Wed Apr 22 08:16:13 2020 +0800 + + * fix bug for show hignlight. + +commit df7c4cd39dff4385404e4fac020c6366f3e315d5 +Merge: 3e1795e257 ba78293a26 +Author: wangyidong +Date: Fri Apr 17 08:28:52 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3e1795e2576a225a9b04a172f5b5c49bd7c9fa8f +Author: wangyidong +Date: Fri Apr 17 08:19:55 2020 +0800 + + * fix bug and config ur and sr. + +commit ba78293a26d5831448d2f8417c4993d78c9ba504 +Author: Catouse +Date: Wed Apr 15 10:41:13 2020 +0800 + + * fix help link in ja language. + +commit a620a53fa5a19bbb811b99635d1a7bcfc77d66c7 +Author: Catouse +Date: Wed Apr 15 10:23:44 2020 +0800 + + * fix help link in ja language. + +commit 22489cc23b6ebdbc48649676a18104a0b5b1f66d +Author: chenfei +Date: Wed Apr 15 09:53:44 2020 +0800 + + * Could add extra attribute when create data by editor. + +commit 5f912e1a2f3247252c8b2737d1b31ccd7fe98297 +Author: wangyidong +Date: Mon Apr 13 14:19:36 2020 +0800 + + * fix for sync commit. + +commit 63f545f870bcdfa2f1bf14c56bfe78066cfde8e4 +Author: wangyidong +Date: Mon Apr 13 12:07:31 2020 +0800 + + * adjust var name. + +commit 2f3e0b319904e184fa3c841ccd80d837c38e7935 (tag: zentaopms_12.3.stable_20200413) +Merge: 3aded5bbff 4e54cf859f +Author: wangyidong +Date: Mon Apr 13 11:04:23 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3aded5bbffd06b9cb05e3270365ec5935a4e8266 +Author: wangyidong +Date: Mon Apr 13 11:03:40 2020 +0800 + + * fix vi lang bug. + +commit 4e54cf859fe6ddc8878f0becb10e978c97fc7563 +Author: Catouse +Date: Mon Apr 13 10:27:15 2020 +0800 + + * fix code syntax highlighter not work. + +commit 499c71fd713ccb1f83818c8605d3e2c3f6390419 +Author: Catouse +Date: Tue Mar 31 17:18:02 2020 +0800 + + * fix expand/collapse buttons in histories view not work as expected in modal. + +commit a6dc715a73b2e6887320ff293a5347739c5656ad +Author: wangyidong +Date: Mon Apr 13 09:40:09 2020 +0800 + + * fix bug. + +commit 04f23e6334a28629b54d561f5667a55155113bcd +Author: wangyidong +Date: Fri Apr 10 17:04:02 2020 +0800 + + * adjust for show result. + +commit 6c1c54d1037c211e3fe1785af02fca76ec05345e +Author: wangyidong +Date: Fri Apr 10 15:11:46 2020 +0800 + + * check unique case title. + +commit b5a15d964b1149df9de0248d367ff78cf955ec36 +Author: wangyidong +Date: Fri Apr 10 14:46:44 2020 +0800 + + * fix for error word. + +commit 40d372c2bf6a5ebb52b6ac5ef2faec44935bd228 +Author: wangyidong +Date: Fri Apr 10 14:42:29 2020 +0800 + + * fix for commit result from ztf. + +commit 544ba6e74f6c1156f7c64cd8167edfc908530fd1 +Merge: 523162eac5 744889dff3 +Author: wangyidong +Date: Fri Apr 10 14:00:46 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 523162eac5aa6848be7693f3f79f52cd861a485c +Author: wangyidong +Date: Fri Apr 10 13:55:45 2020 +0800 + + * add new version and upgrade and add vi lang. + +commit 744889dff3c837a74b5761efc76e029f3622516c +Merge: 110d90dcc2 523eb57d6a +Author: reneeteng +Date: Thu Apr 9 13:40:21 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 110d90dcc29d281288d00cb3f30404d81360d57b +Author: reneeteng +Date: Thu Apr 9 13:38:35 2020 +0800 + + * Misc lang update. + +commit 523eb57d6aff800da23c04e6ab60faf932a239d7 +Author: wangyidong +Date: Wed Apr 8 16:29:23 2020 +0800 + + * fix bug for check tag. + +commit 2b69daba378baf0dc8032e75de0f7816752f86ac +Author: wangyidong +Date: Wed Apr 8 15:31:04 2020 +0800 + + * fix bug for init job. + +commit 74bd767a6e623318a07bf0f37879a89887aa6053 +Author: wangyidong +Date: Wed Apr 8 14:36:37 2020 +0800 + + * adjust for en and zh-tw lang. + +commit 0c3970f4d100a9342c60f27ea97d171ff59dc8af +Author: wangyidong +Date: Wed Apr 8 13:17:58 2020 +0800 + + * adjust for create task page when linked stories too much. + +commit 54cb29a788ccaef4e21c834a7e67f319dfc501a9 +Author: wangyidong +Date: Wed Apr 8 10:39:28 2020 +0800 + + * adjust for highlight and add story reg. + +commit 44ed0273ea43b53c72da2c30d7a1ef669204f8dd +Merge: 08d40394b8 182ae42771 +Author: wangyidong +Date: Wed Apr 8 10:09:42 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 08d40394b8500b71727c1e7379877f9a8ca8462c +Author: wangyidong +Date: Wed Apr 8 10:06:47 2020 +0800 + + * adjust for onlyTest flow. + +commit 182ae42771a8c94f3e4b3421c30813648fd93022 +Author: sgm0422 <976204163@qq.com> +Date: Wed Apr 8 09:45:06 2020 +0800 + + * Fix bug #2361. + +commit 40fc4ad25bb811e7c23cf57b409497cfd437825b +Author: wangyidong +Date: Wed Apr 8 09:18:45 2020 +0800 + + * adjust code. + +commit ba8638758ecc18859c66396e8741d196b60fec25 +Author: wangyidong +Date: Fri Apr 3 14:29:47 2020 +0800 + + * adjust for parse xml. + +commit 10da9821ad299d0891076d40f0064017f7c76688 +Author: wangyidong +Date: Fri Apr 3 14:15:23 2020 +0800 + + * adjust for units dropdown. + +commit 30b7026a09821467fd7394ae3754ea37c41784d0 +Author: wangyidong +Date: Fri Apr 3 14:04:04 2020 +0800 + + * adjust for export unit. + +commit cd4f552347031ce036e7ad794b71f3a3e17d963e +Author: wangyidong +Date: Fri Apr 3 13:51:02 2020 +0800 + + * adjust for parse cppunit. + +commit 32bbf6ada803228585618f3eeb06cc53aec249ba +Author: wangyidong +Date: Fri Apr 3 09:53:07 2020 +0800 + + * adjust for commit result method. + +commit 57be1988f6602dc2b5f990c0fa8ffa3784368da8 +Author: wangyidong +Date: Fri Apr 3 09:08:37 2020 +0800 + + * add browse unit view html. + +commit c9ce71628fe042ff7f1747b81481c190bfc54205 +Author: wangyidong +Date: Fri Apr 3 09:01:47 2020 +0800 + + * add priv for commitResult. + +commit bbdef36c856920287f8da87480e703076fbc9d8c +Author: wangyidong +Date: Fri Apr 3 08:35:40 2020 +0800 + + * add note. + +commit 49d4d3dcc10d83551957168ef28c0dc17f71268f +Author: wangyidong +Date: Fri Apr 3 08:21:51 2020 +0800 + + * adjust param name. + +commit e8c1309e9234f8dd246908ef9feec2fa4765d806 +Author: wangyidong +Date: Thu Apr 2 17:50:57 2020 +0800 + + * adjust for tescase view. + +commit d649cbcbaaf1c14a057e1a687519c501ef17099b +Author: wangyidong +Date: Thu Apr 2 16:50:43 2020 +0800 + + * adjust for show unit. + +commit 3fae19d76b4a9fe39fc39713a866d092e8038260 +Author: wangyidong +Date: Thu Apr 2 16:45:26 2020 +0800 + + * adjust for parse comment not case sensitive. + +commit 3d2b9f29d9e608092f4358df1f62eed5877e1720 +Author: wangyidong +Date: Thu Apr 2 16:44:29 2020 +0800 + + * adjust for client lang. + +commit 86935b5339811eb05ef96d39019dcca80c9b3704 +Merge: 6040fa80fd a9811929e9 +Author: wangyidong +Date: Wed Apr 1 15:26:22 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6040fa80fda16be897dca004d5ecce825b8f0f08 +Author: wangyidong +Date: Wed Apr 1 15:23:13 2020 +0800 + + * adjust for commit result. + +commit 990e33afcce1ebf2f7d7a0c5d2a969267efe07a0 +Author: wangyidong +Date: Wed Apr 1 13:35:58 2020 +0800 + + * add commit result interface. + +commit a9811929e9809ed1fd84d8cba6a6a4bf85797dea +Merge: 38d1f96d59 7749555f92 +Author: daitingting +Date: Tue Mar 31 16:41:05 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 38d1f96d59f862309a8141a520f51034d7ecc21c +Author: daitingting +Date: Tue Mar 31 15:38:05 2020 +0800 + + * Adjust session for bugList,storyList,taskList and so on. + +commit 7749555f92757e60eb6518fe04e05f36826ffda8 +Author: wangyidong +Date: Mon Mar 30 16:11:36 2020 +0800 + + * code for task #7006. + +commit 2c60b64c13f4bfbd9015bb2a16a428d847a720b8 +Merge: 5c47c2117a 1f1ea54bdb +Author: QingDao Nature Easy Soft Network Technology Co,LTD +Date: Sat Mar 28 12:10:01 2020 +0800 + + Merge pull request #51 from Roskus/master + + Add some best practices from the open source comminty. Improve installation steps + +commit 1f1ea54bdbb76bc24b636081b526e81f99637199 +Author: Gustavo Novaro +Date: Fri Mar 27 19:40:05 2020 +0100 + + Improve install steps + +commit 58786078a16c5a40f393a0b2d9912215ee88ffef +Author: Gustavo Novaro +Date: Fri Mar 27 19:20:41 2020 +0100 + + Add basic composer file is a communoty standard in every php project... Need create account in packagelist... Add .editorconfig for mantain code style. Improve installation doc steps + +commit 5c47c2117a75b94eefc259696fa7cc522db04ea3 +Author: wangyidong +Date: Fri Mar 27 14:01:50 2020 +0800 + + * finish task #7001. + +commit e4b0a15eb04d64d0c5d46e056466a718995a41bd +Merge: 4126a8745f 747cda24e2 +Author: wangyidong +Date: Thu Mar 26 10:47:44 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4126a8745fc2be8a9e39e3658994b11392931500 +Author: wangyidong +Date: Thu Mar 26 10:46:53 2020 +0800 + + * code for task #7002. + +commit 747cda24e22c200fa7ef342916b65b37ea888fdb +Merge: bee95c1fd4 dff20b6a17 +Author: leiyong +Date: Thu Mar 26 10:10:12 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bee95c1fd4a1361c36323af6cf53c6a282c245a4 +Author: leiyong +Date: Thu Mar 26 10:09:41 2020 +0800 + + Repair SDK access failed under HTTPS request. + +commit dff20b6a1743768fb85b8a2e4c39ccfdccb3d647 +Merge: 066bf8b8f6 c76b7591b7 +Author: wangyidong +Date: Thu Mar 26 09:16:36 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 066bf8b8f623ff7437a12b7e629e8d69a1d1386e +Author: wangyidong +Date: Thu Mar 26 09:12:44 2020 +0800 + + * adjust for php5.3. + +commit c76b7591b709d1ca888d1a228ccac09fdb335e06 +Author: reneeteng +Date: Wed Mar 25 15:52:06 2020 +0800 + + * Cron lang updated. + +commit 1687ac4e65189fd7ba1fb6a4751a3c907230f2a1 (tag: zentaopms_12.2.stable_20200325) +Author: wangyidong +Date: Wed Mar 25 14:30:48 2020 +0800 + + * add new version and upgrade. + +commit a9024bd0bd24b9f1e9caec16a91f5bc973339afd +Author: wangyidong +Date: Wed Mar 25 11:43:19 2020 +0800 + + * fix bug #3046. + +commit 1fd1562f473450cdfc4e1fc5a6dfcb2cc50be608 +Author: wangyidong +Date: Wed Mar 25 11:38:29 2020 +0800 + + * fix bug #3045. + +commit 68155efe2534227fd9941d6a8312b1f2c0be5057 +Author: wangyidong +Date: Wed Mar 25 11:18:22 2020 +0800 + + * fix bug #3043. + +commit 4388bf9c7bbf14285e012e4bf5a5e845ff0677a4 +Author: wangyidong +Date: Wed Mar 25 10:57:14 2020 +0800 + + * fix bug #3038. + +commit 65945b7e9c63e604f6640606fcd9888cdec0a696 +Author: wangyidong +Date: Wed Mar 25 10:35:13 2020 +0800 + + * fix for create build when resolve bug. + +commit cf555e09a7eaf9e3898ec5380b181bed5a030f45 +Author: wangyidong +Date: Wed Mar 25 09:49:26 2020 +0800 + + * adjust for backup. + +commit d09eb3aff5486c73f9c3b5bdceddf89c1055430c +Author: wangyidong +Date: Tue Mar 24 16:52:54 2020 +0800 + + * fix bug for show task module. + +commit fe4cd3fd3e5417184e8636b162a07699404849d1 +Author: wangyidong +Date: Tue Mar 24 15:58:44 2020 +0800 + + * adjust for xuanxuan. + +commit 7f99fab3a7b4c3b617c0f1e723068b2753465e26 +Merge: a9558f90d2 305ace628b +Author: wangyidong +Date: Tue Mar 24 08:24:14 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a9558f90d2d607ce64758f46f81168a0b5fefe79 +Author: wangyidong +Date: Tue Mar 24 08:23:04 2020 +0800 + + * change for zh-cn svn. + +commit 305ace628bf1fa82345abb324a242e9d86a1bb3f +Merge: ac410c7ebe d12c6d75c6 +Author: liugang +Date: Mon Mar 23 17:30:24 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d12c6d75c68200366a7fe259f1c0839bbc5ba8db +Merge: 149d57e9f7 f7b78d7c83 +Author: wangyidong +Date: Mon Mar 23 17:23:18 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 149d57e9f7f5cd6b7f450dfc0101737d815cb456 +Author: wangyidong +Date: Mon Mar 23 17:22:36 2020 +0800 + + * fix bug for ci. + +commit ac410c7ebe8efe32bad840e7df0bec03b322ab43 +Merge: a08a5b7d96 f7b78d7c83 +Author: liugang +Date: Fri Mar 20 23:51:33 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f7b78d7c8397a5660cbec340b75f8a26398bedae +Merge: 46c856508e dc0420f4df +Author: reneeteng +Date: Fri Mar 20 23:38:59 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 46c856508ee2c4bde198e81677f97b6ecb18fbb2 +Author: reneeteng +Date: Fri Mar 20 23:37:57 2020 +0800 + + * Rule case in all lang files updated. + +commit a08a5b7d96cf3405ad1e50b86a8c279eb49ade3a +Merge: 35dd7a64f8 dc0420f4df +Author: liugang +Date: Fri Mar 20 17:00:07 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dc0420f4df437356942bb67f5923509215a22848 +Author: chenfei +Date: Fri Mar 20 16:52:48 2020 +0800 + + * Merge db process methods from xxb. + +commit 35dd7a64f80d79938f28aaa92e004000efae5e61 +Merge: d4ee7d8d8f 63458f7f85 +Author: liugang +Date: Fri Mar 20 10:20:07 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 63458f7f85412352ac667755c98ab17bf893e59f +Author: chenfei +Date: Fri Mar 20 09:30:39 2020 +0800 + + * Add get table fields for zdb class. + +commit d4ee7d8d8f657280f72db95626cc0a095cee453a +Author: liugang +Date: Thu Mar 19 15:40:42 2020 +0800 + + * Display the extend fields of testcase in cases page of the testtask module. + +commit 1e542ecbe59cf74f386932fb54a4950f585f1ea6 +Author: wangyidong +Date: Thu Mar 19 15:38:14 2020 +0800 + + * fix bug #2215. + +commit 7c2c59bc247e7dcec47fac802a0294360728c82f +Author: wangyidong +Date: Wed Mar 18 17:07:36 2020 +0800 + + * code for build zentaoxx. + +commit 36c0406829a09c08ef11a3c98401c5371f7271ac +Merge: 9e83e63996 f689b06e76 +Author: wangyidong +Date: Wed Mar 18 16:49:01 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9e83e6399616db5d07da516021bda9f14faf4d70 +Author: wangyidong +Date: Wed Mar 18 16:48:14 2020 +0800 + + * code for php7.4. + +commit f398db053d111bbd404604c8cd39c68adb058083 +Author: wangyidong +Date: Wed Mar 18 16:47:41 2020 +0800 + + * code for task #6994. + +commit f689b06e7634097242878e6b0abc35b32c580443 +Merge: 2ced016c37 f991752628 +Author: reneeteng +Date: Wed Mar 18 15:51:17 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2ced016c37938f1106d720bf508d9a995d3bf23b +Author: reneeteng +Date: Wed Mar 18 15:50:26 2020 +0800 + + * CI compile lang file changed. + +commit f991752628710583ceaf21b13c8cc025b9c73bc8 +Author: wangyidong +Date: Wed Mar 18 14:45:57 2020 +0800 + + * code for task #6990. + +commit 5681905c68ef36cfb36c44fab5e6fd8f163bdfdc +Author: wangyidong +Date: Wed Mar 18 14:39:02 2020 +0800 + + * finish task #6993. + +commit 43c757f13fbb3453247afdb21fec396124afdeb1 +Author: Catouse +Date: Wed Mar 18 09:54:50 2020 +0800 + + * fix bug #3006, fix datepicker not work as expected in Deutsch and Français language. + +commit 3f608337a0fae20dece7db9461db619024d32d36 +Author: Catouse +Date: Wed Mar 18 09:35:35 2020 +0800 + + * fix js error in french language. + +commit c7a1e71d27b05759860983e23eea6beccf703543 +Author: wangyidong +Date: Tue Mar 17 17:16:29 2020 +0800 + + * finish task #6991. + +commit f14dde277c3b581f90a2a9eb9a4967fa44f72e3c +Merge: cfa5261960 b0966e0faf +Author: wangyidong +Date: Tue Mar 17 16:40:55 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cfa5261960e4294d62ad94997cd7f6c5b79b78cf +Author: wangyidong +Date: Tue Mar 17 16:38:44 2020 +0800 + + * finish task #6902 and merge xuanxuan. + +commit b0966e0faf46556a33ebb18d75bf2b2f788adde3 +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 17 16:32:45 2020 +0800 + + Wechat can recursively obtain department users. + +commit 9e21c8638915699055130c5f3a6f845e896fcf2b +Author: reneeteng +Date: Tue Mar 17 15:38:35 2020 +0800 + + * Install lang updated. + +commit a9fbc3950d739f2d88a84aa3fac8db260cbe4f75 +Merge: d2d138869d 875caed3ed +Author: Yagami <976204163@qq.com> +Date: Mon Mar 16 15:29:14 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d2d138869de9415a448c9edc781fac72b17daf01 +Author: Yagami <976204163@qq.com> +Date: Mon Mar 16 15:28:45 2020 +0800 + + * Fix makefile and sql. + +commit 875caed3ede576a832704c645e5471f5bf1c27d0 +Merge: adc3b3c1c4 bc08702d32 +Author: reneeteng +Date: Mon Mar 16 14:19:06 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit adc3b3c1c4053cf862ea5adaa8bf58e10215890c +Author: reneeteng +Date: Mon Mar 16 14:16:29 2020 +0800 + + * Lang file update for ci and my. + +commit bc08702d32ae948b3267503379e37208a4e24b15 +Author: wangyidong +Date: Mon Mar 16 09:16:31 2020 +0800 + + * finish task #6970. + +commit ac9c8a95592fb20f626db74d56ef8fc4c087a36c +Merge: fd83116e1d 8dda089476 +Author: reneeteng +Date: Mon Mar 16 08:24:50 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8dda089476910f3812e39dcd0189c6eac42b8b5d +Author: sgm0422 <976204163@qq.com> +Date: Sun Mar 15 15:00:51 2020 +0800 + + * Fix isClickble for requirement. + +commit 17702081186ea116f76ae640c8812186e6cb70f9 +Author: sgm0422 <976204163@qq.com> +Date: Sun Mar 15 14:37:28 2020 +0800 + + * Code for requiment. + +commit fd83116e1d33f681a11946896f67a375dfb9fcdc +Merge: 6e9cc77ed7 da823eacb6 +Author: reneeteng +Date: Sun Mar 15 11:41:11 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit da823eacb666fd87b221ddcd5f7347c2cd057507 +Author: wangyidong +Date: Sat Mar 14 13:30:58 2020 +0800 + + * fix bug. + +commit 6e9cc77ed7abd1bee32c9b76b69e0ec246a09c9b +Merge: 56e566e786 054c41e2b8 +Author: reneeteng +Date: Fri Mar 13 15:37:13 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 054c41e2b8e1c429ff445df9d7f65c916ada1c70 +Author: wangyidong +Date: Fri Mar 13 14:59:09 2020 +0800 + + * adjust en lang. + +commit db2fc06f49d5daa8578cf2cafac5386f84670f14 +Author: wangyidong +Date: Fri Mar 13 14:38:37 2020 +0800 + + * change error word. + +commit 101679c6a50c1509ecb948fc7c2e31a77a6f3dc8 +Merge: 3ba2f42aef 8797f0bd90 +Author: wangyidong +Date: Fri Mar 13 13:23:13 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3ba2f42aefe5f2cc3c30eb82208ead17eb4726a3 +Author: wangyidong +Date: Fri Mar 13 11:22:54 2020 +0800 + + * show child label. + +commit 8797f0bd905a6108bb8f7b41cf687fb1f3b376b6 +Merge: ce1716feac 4905c7aef6 +Author: sgm0422 <976204163@qq.com> +Date: Fri Mar 13 10:09:28 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ce1716feacbbe3d7c1f79121a73332bec7d8cf8b +Author: sgm0422 <976204163@qq.com> +Date: Fri Mar 13 10:09:02 2020 +0800 + + * Code for requirement. + +commit 4905c7aef65a20315bee3c70ec349013e5aae90d +Author: wangyidong +Date: Fri Mar 13 10:01:02 2020 +0800 + + * fix bug. + +commit 82fff1b42f1a0c0e470022f8a7a0baa23775f007 +Author: wangyidong +Date: Fri Mar 13 10:00:43 2020 +0800 + + * finish task #6981. + +commit 8f3adf9e95f25699dff1b13b666a265dd9f140a3 +Merge: fcfe033f28 5aeea7572a +Author: wangyidong +Date: Fri Mar 13 08:51:45 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fcfe033f28af0a41f63a2536f390969d1a352b19 +Author: wangyidong +Date: Fri Mar 13 08:36:31 2020 +0800 + + * adjust for parent-child story. + +commit 5aeea7572a7b1b0d0cf3fb3321d77a31db53467f +Author: leiyong <1549684884@qq.com> +Date: Fri Mar 13 08:23:37 2020 +0800 + + Docking CMMI. + +commit 56e566e7869a6b83bcf8be2541f2d7be76e53a16 +Merge: 8a5a175f2c cb9fbd724e +Author: reneeteng +Date: Thu Mar 12 22:48:48 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cb9fbd724eaa48ce021412178ad516166b43bc2b +Author: sgm0422 <976204163@qq.com> +Date: Thu Mar 12 16:37:44 2020 +0800 + + * Add my-requirement view. + +commit 8a5a175f2cf5f212a2423b14b29825962e9ff204 +Author: reneeteng +Date: Thu Mar 12 16:22:47 2020 +0800 + + * Updated compile lang file. + +commit 38d3c169546cdf00a0390a0b85e4be27e7a6394d +Merge: 118fc78d25 58e43db063 +Author: reneeteng +Date: Thu Mar 12 16:16:15 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 58e43db063a58fbb5ad9ffed3cd48df1b4e84123 +Author: zbx +Date: Thu Mar 12 15:44:33 2020 +0800 + + * Code for requirement and story. + +commit b72ddf92d1051e5fd025d07b0f4d16bef1eced63 +Author: zbx +Date: Thu Mar 12 14:51:17 2020 +0800 + + * Code for requirement. + +commit aec712defd5c5ca5e4a7499814b6ad7c22f0b720 +Author: zbx +Date: Wed Mar 11 16:56:41 2020 +0800 + + * Add storyCommon to config. + +commit beaa6ff0b27c50fb8bc9fdc5d763219302a71039 +Author: wangyidong +Date: Wed Mar 11 08:58:27 2020 +0800 + + * adjust for save action to pms. + +commit 89ea58a4da02a0dbd21205e5e67165bf1b071d8f +Author: wangyidong +Date: Tue Mar 10 18:07:31 2020 +0800 + + * adjust for make zentaoxx. + +commit 26177e362ef4447188d9beec6f7f45999c58226f +Author: wangyidong +Date: Tue Mar 10 15:51:47 2020 +0800 + + * fix bug #6974. + +commit 5d36307c449ac59f7071c9ef54aaaf37153d8c3c (tag: zentaopms_12.1.stable_20200310) +Author: wangyidong +Date: Tue Mar 10 15:42:00 2020 +0800 + + + add fr.php and de.php. + +commit 904df3224b96d1c5410e70213f7a764890bb7a7c +Author: wangyidong +Date: Tue Mar 10 15:14:18 2020 +0800 + + * add new version and upgrade. + +commit f69d8231c98ca7f409b68f99ae607f9b1a8d4f07 +Author: wangyidong +Date: Mon Mar 9 17:49:40 2020 +0800 + + * adjust for parse comment for resolve bug. + +commit 5a3ea1e897e76b8fd2a455af02e8f4c4afecbb8c +Author: wangyidong +Date: Mon Mar 9 17:42:43 2020 +0800 + + * adjust for parseComment. + +commit 88ffd189e107e2d62d872f2caee20f608a0231a4 +Author: wangyidong +Date: Mon Mar 9 15:52:14 2020 +0800 + + * adjust setrule page. + +commit 0f1432cc5f60593f3ca90974b2b823508f442c64 +Author: wangyidong +Date: Mon Mar 9 15:10:02 2020 +0800 + + * adjust code. + +commit 224c383d007c908692eecdd3353f7897808d78b6 +Author: wangyidong +Date: Mon Mar 9 15:07:49 2020 +0800 + + * change saveRepo to importRepoFromConfig. + +commit 427a762bbcee1e6686b104caf998e1b1ccb414cb +Author: wangyidong +Date: Mon Mar 9 14:56:52 2020 +0800 + + * adjust for init when create or update job. + +commit 35a2251dcb19dd40bbd04389217a6c77442ebd1c +Author: wangyidong +Date: Mon Mar 9 14:13:16 2020 +0800 + + * adjust for get svnDir. + +commit e7b5d2d0a88b22037268921c77fd5817782f7968 +Author: wangyidong +Date: Mon Mar 9 09:44:31 2020 +0800 + + * adjust show log. + +commit aa07506688bfa50a66f10e0dd78ba9e84a8eccad +Author: wangyidong +Date: Mon Mar 9 09:13:24 2020 +0800 + + * adjust for compile each tag. + +commit 118fc78d2556c152e7b799f105b3cc15f779c02a +Author: reneeteng +Date: Sun Mar 8 16:02:49 2020 +0800 + + * CI, Jenkins lang updated. + +commit a694c8493fc2698b2c20cfffb88bb19a381c2471 +Author: wangyidong +Date: Fri Mar 6 18:27:21 2020 +0800 + + * change comment to commit. + +commit 14bb491ce5110c4853db7b5b3fa6d5476e22ab6a +Author: wangyidong +Date: Fri Mar 6 17:40:15 2020 +0800 + + * change job name. + +commit 31aba45ddc2e697050b992c15463cab206dcddd0 +Author: wangyidong +Date: Fri Mar 6 17:35:33 2020 +0800 + + * move integration to job. + +commit ae0e2344d293fd443ecc6b5427913c5333f9ba63 +Author: wangyidong +Date: Fri Mar 6 13:24:09 2020 +0800 + + * adjust code create and edit integration. + +commit 24ac4cca6bf00f131e17f9b8c83be407d3afb72a +Author: wangyidong +Date: Thu Mar 5 19:20:35 2020 +0800 + + * adjust for exec integration. + +commit 9d49c247f58c0c89e420ba02d0e921552428dac9 +Author: wangyidong +Date: Thu Mar 5 15:46:32 2020 +0800 + + * adjust for sync branch. + +commit 54cb7968f206379710964fc334712470468f288a +Author: wangyidong +Date: Thu Mar 5 11:33:06 2020 +0800 + + * code for task #6952. + +commit b7654d55ea51777bff7364b9405f0ed3c498a21b +Author: wangyidong +Date: Thu Mar 5 11:15:34 2020 +0800 + + * finish task #6930. + +commit a831026b2897d14122e3a97f1400565bfe9bb45f +Author: wangyidong +Date: Wed Mar 4 20:50:32 2020 +0800 + + * ignore exist repo. + +commit 8e2f609b4116b0be1ec89e2f0fda2e5a412cd3cb +Author: wangyidong +Date: Wed Mar 4 20:43:03 2020 +0800 + + * fix save commit bug. + +commit 79485845d5a42345240e2191e4600ee8a82f2f29 +Author: wangyidong +Date: Wed Mar 4 20:33:05 2020 +0800 + + * adjust code for save commit. + +commit 94b36752890b5bb69ff7a4b2fadb103b37dea1a7 +Author: wangyidong +Date: Wed Mar 4 18:34:37 2020 +0800 + + * fix bug. + +commit 718373cc067db04565e287c20003335399d18a69 +Author: wangyidong +Date: Wed Mar 4 18:21:46 2020 +0800 + + * finish task #6939. + +commit a6169ffec55532503199c532102913c80947fa1e +Author: wangyidong +Date: Wed Mar 4 16:05:08 2020 +0800 + + * finish task #6913. + +commit 012cbd54af96a1427e977389c530aa0621118f3d +Author: wangyidong +Date: Wed Mar 4 15:31:42 2020 +0800 + + * finish task #6951. + +commit 2e9c26b9ac04a2724a1fbfb4aa46de5064fb3155 +Author: wangyidong +Date: Wed Mar 4 15:11:07 2020 +0800 + + * code for task #6941. + +commit b9d709ccc4e2ad85c4f752cc991d3c39d3f44abb +Author: wangyidong +Date: Wed Mar 4 15:07:49 2020 +0800 + + * finish task #6953. + +commit 94f8bf2dfcc7c1b65340b01ca6034c8ac183dcb4 +Author: wangyidong +Date: Wed Mar 4 10:51:26 2020 +0800 + + * finish task #6934. + +commit 260065e225cc0c5b15466e324dbf13e70ad3a3f4 +Author: wangyidong +Date: Wed Mar 4 09:43:15 2020 +0800 + + * finish task #6937. + +commit 9ca7867c1244226b2295a8bcbd5bc398b93e7051 +Author: wangyidong +Date: Wed Mar 4 08:55:45 2020 +0800 + + * code for task #6928. + +commit 40602225770972d3a3bf3460d863755fccb47704 +Author: wangyidong +Date: Wed Mar 4 08:53:32 2020 +0800 + + * code task #6928. + +commit 341566e87d261d8f9ba72650ee12635349907b3d +Author: wangyidong +Date: Wed Mar 4 08:51:49 2020 +0800 + + * finish task #6950. + +commit d812c120b43f631b5755389c2d70ef4ca10a100d +Author: wangyidong +Date: Tue Mar 3 17:37:03 2020 +0800 + + * finish task #6955. + +commit 39177a85377ad6089f31dcf36d2d3e5f34155eb5 +Author: wangyidong +Date: Tue Mar 3 17:20:03 2020 +0800 + + * code task #6956. + +commit 4cd4c918a5f682702d2ba6446d3b8593f3624876 +Merge: cb25b5af7f 80be9ba625 +Author: wangyidong +Date: Tue Mar 3 16:12:48 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cb25b5af7f5e9c26df238e1bb622d9a70fecaf34 +Author: wangyidong +Date: Tue Mar 3 16:11:23 2020 +0800 + + * finish task #6956. + +commit 80be9ba6253182f481c91984ad1c552688c89bb4 +Merge: 8ed43fc9b4 fe0ecf13ec +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 3 13:50:44 2020 +0800 + + Code modification of issue 191 of zentao. + +commit 8ed43fc9b448bfc8f155fbc8e8776c56d3e6c31a +Author: leiyong <1549684884@qq.com> +Date: Tue Mar 3 13:47:52 2020 +0800 + + Code modification of issue 191 of zentao. + +commit fe0ecf13ec3b3aa05b97006c314a1d80948a8cc2 +Author: wangyidong +Date: Tue Mar 3 09:00:25 2020 +0800 + + * finish task #6932. + +commit cec55d0345751f011fb3179d3c168239608bf1bb +Author: wangyidong +Date: Tue Mar 3 08:55:01 2020 +0800 + + * finish task #6929. + +commit 68896b27b94df375057ac5ea56e55474dabb0e0d +Author: wangyidong +Date: Tue Mar 3 08:27:39 2020 +0800 + + * finish task #6924. + +commit bbb8510d25d3286ac8e390805bcc03117fc9d521 +Author: wangyidong +Date: Mon Mar 2 17:01:46 2020 +0800 + + * finish task #6923. + +commit 9d2d1a0b9d0b2dd9fca0ad423e6fede8f19c301b +Author: wangyidong +Date: Mon Mar 2 16:59:11 2020 +0800 + + * finish task #6922. + +commit 7c77155cedc49978bdbdfe861abe482b97a3a0aa +Author: wangyidong +Date: Mon Mar 2 16:53:12 2020 +0800 + + * finish task #6921. + +commit 05a34ff5f102fe049ae8f885a0bd600c27ac3538 +Author: wangyidong +Date: Mon Mar 2 15:50:53 2020 +0800 + + * finish task #6920. + +commit b1f757728dfc5776979316eb795810befe4fee58 +Author: wangyidong +Date: Mon Mar 2 14:19:08 2020 +0800 + + * finish task #6933. + +commit 653c4d5cf6f0a58e7ef0d2b0e5f212f1f0a48a0a +Author: wangyidong +Date: Mon Mar 2 10:04:38 2020 +0800 + + * finish task #6954. + +commit 154efa0b59d46207cf3521d81967a019eac0ff56 +Author: wangyidong +Date: Mon Mar 2 09:05:30 2020 +0800 + + * finish task #6957. + +commit 579b17dec167f3d5e31f73f4ed1880a4e447d1d4 +Author: wangyidong +Date: Mon Mar 2 09:03:17 2020 +0800 + + * finish task #6960. + +commit 420a60ea8bbf247dfbd42b0a7ddf3ca735a3553e +Author: wangyidong +Date: Fri Feb 28 16:25:59 2020 +0800 + + * finish task #6935. + +commit b8043c2fc31edb56e379ccc2c5308bb9c0fe9e78 +Author: wangyidong +Date: Fri Feb 28 16:16:54 2020 +0800 + + * finish task #6931. + +commit d0b2b962832b3eb2af12f1440902d74ccd0f1ba4 +Author: wangyidong +Date: Fri Feb 28 16:15:01 2020 +0800 + + * finish task #6919. + +commit fb8d617515815f77b42977323229159677bd4483 +Author: wangyidong +Date: Fri Feb 28 16:07:37 2020 +0800 + + * finish task #6918. + +commit aa70c177cce141e619b3292e9a546ef73553c456 +Author: wangyidong +Date: Fri Feb 28 15:26:39 2020 +0800 + + * finish task #6915,6917. + +commit 0ab2f01fd74e4f1e54e08bd179f30fddc4118eef +Author: wangyidong +Date: Fri Feb 28 15:14:54 2020 +0800 + + * finish task #6925. + +commit 172a9724e2989246d04125063e66c6d3cc659afa +Author: wangyidong +Date: Fri Feb 28 15:05:56 2020 +0800 + + * code for task #6912,6913,6914,6916. + +commit f41ce9cdaa802d0e611e634a7ba8e96e5366e572 +Author: Yagami <976204163@qq.com> +Date: Thu Feb 27 15:25:14 2020 +0800 + + * Fix bug #2980. + +commit 143d47c4adf50cffdf59c5b703d2b8182ca4527f +Author: leiyong <1549684884@qq.com> +Date: Thu Feb 27 07:59:23 2020 +0800 + + fix bug #2965. + +commit ae877bbd3048bd29682382f8165b72d761cbc139 +Author: wangyidong +Date: Wed Feb 26 18:55:32 2020 +0800 + + * change update sql for ci. + +commit 371d5434561856a08861058419c2fc43b2cc8adc +Merge: aa3dd14ee5 e2c02c246b +Author: wangyidong +Date: Wed Feb 26 18:28:07 2020 +0800 + + Merge branch 'zentaopms_12.0.1' + +commit e2c02c246b9e6dc72544f9d3e7783f5d66fcf85b +Merge: b1058886fe aa3dd14ee5 +Author: wangyidong +Date: Wed Feb 26 18:27:08 2020 +0800 + + Merge branch 'master' into zentaopms_12.0.1 + +commit b1058886fe4993edeb7339e1c2ad12224e03239c +Merge: fb9d64703b 3a55002f45 +Author: wangyidong +Date: Wed Feb 26 18:09:13 2020 +0800 + + Merge branch 'zentaopms_12.0.1' of github.com:easysoft/zentaopms into zentaopms_12.0.1 + +commit aa3dd14ee56ee05f36e5de91ac3ae46cd01cb88a +Author: wangyidong +Date: Wed Feb 26 18:01:56 2020 +0800 + + * finish task #6898. + +commit b018d1e78538b87d0923bd75e0d8dd1416873816 +Author: wangyidong +Date: Wed Feb 26 17:24:59 2020 +0800 + + * add notes for scm. + +commit 3a55002f45f970f012c6d5e72f6fa021709ea81c +Author: leiyong <1549684884@qq.com> +Date: Wed Feb 26 17:02:10 2020 +0800 + + completing task #6911. + +commit 39b127849a9af28fdb16cff1925baedae261c02b +Author: wangyidong +Date: Wed Feb 26 15:52:57 2020 +0800 + + * finish task #6909. + +commit f9867d5da6c3062dc05c07a3aa892b5189afdb26 +Author: wangyidong +Date: Wed Feb 26 15:05:24 2020 +0800 + + * adjust for merge. + +commit 35b9adf61f17fd69c779e0779a09d65a6832eba9 +Author: leiyong <1549684884@qq.com> +Date: Wed Feb 26 15:00:55 2020 +0800 + + Working with scrollbars. + +commit 758accbf094dda7362207a3b653629a42208fda0 +Author: leiyong <1549684884@qq.com> +Date: Wed Feb 26 13:44:17 2020 +0800 + + Working with scrollbars. + +commit 990ef6699a1ab8a0f6efb70e7173f59786f4190d +Author: wangyidong +Date: Wed Feb 26 13:42:26 2020 +0800 + + * code for task #6858. + +commit c00a40a60a08a475becc92757042ad3a62d0ee0e +Author: wangyidong +Date: Wed Feb 26 10:45:55 2020 +0800 + + * adjust for task #6893. + +commit c8721e83134864ef155de2314ff1d478e9997d43 +Author: leiyong <1549684884@qq.com> +Date: Wed Feb 26 10:04:26 2020 +0800 + + Complete tasks #6904,#6899. + +commit 152faf26202b994c738a51bfd1051d7bb4a06c13 +Merge: 2cdf9b3c78 b1c55c5b6b +Author: wangyidong +Date: Wed Feb 26 08:50:57 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2cdf9b3c7806c5bb5b4dfebd08e6bd430d37d491 +Author: wangyidong +Date: Wed Feb 26 08:49:23 2020 +0800 + + * finish task #6858,6895. + +commit b1c55c5b6b69714d52ca5a13d5528553668b32f7 +Author: Catouse +Date: Tue Feb 25 17:46:20 2020 +0800 + + * fix file-input size. + +commit e94de08b07b8335fbc2d99203384c75659359e8e +Author: wangyidong +Date: Tue Feb 25 08:40:28 2020 +0800 + + * code for task #6863. + +commit d9f45acdb510e40d58154dda5909ef3b6c67e17a +Author: wangyidong +Date: Mon Feb 24 17:32:11 2020 +0800 + + * code for task #6893. + +commit 998c17937d80a3de724e9de9c99fbdd349311b40 +Author: leiyong <1549684884@qq.com> +Date: Mon Feb 24 17:30:06 2020 +0800 + + Add the method of removing space. + +commit 17107567a5b4fd94068fa7582ba4490eae1339b0 +Author: wangyidong +Date: Mon Feb 24 17:24:29 2020 +0800 + + * code for task #6893. + +commit 73c47578bf0a5011570e8b386be17f1b9717ab5b +Merge: c4dc4b6545 6e046a1671 +Author: wangyidong +Date: Mon Feb 24 17:11:12 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c4dc4b6545bceb95cbfb396022535843b22a7bcb +Author: wangyidong +Date: Mon Feb 24 17:10:35 2020 +0800 + + * finish task #6893. + +commit 07a96f311b37021c2962812ef6cecff3c984393e +Author: leiyong <1549684884@qq.com> +Date: Mon Feb 24 16:32:40 2020 +0800 + + Fix enterprise wechat message notification. + +commit 1d02b02fff2e44a462bb09f25b30b96248ba382f +Author: leiyong <1549684884@qq.com> +Date: Mon Feb 24 16:16:14 2020 +0800 + + Fix enterprise wechat message notification + +commit 6e046a16717b171d4baee2196ee960e771e6fea1 +Merge: 7b2949916b c001e75780 +Author: Yagami <976204163@qq.com> +Date: Mon Feb 24 14:12:45 2020 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8ba462ff46fcfb6e36bbc8cfe47fb64a004a375c +Author: leiyong <1549684884@qq.com> +Date: Mon Feb 24 14:11:33 2020 +0800 + + Adjust enterprise wechat work message notice + +commit 7b2949916b1df4dc0cc6bc91a1272d759f1227ce +Author: Yagami <976204163@qq.com> +Date: Mon Feb 24 14:09:11 2020 +0800 + + * Fix for sql injection attack. + +commit 1edfbb8bc42656b8a324daa8c045137213f81605 +Author: leiyong <1549684884@qq.com> +Date: Mon Feb 24 14:03:08 2020 +0800 + + Adjust enterprise wechat work message notice + +commit 325dbe1a5a3924e8ead26a5101b00618fceff07d +Author: leiyong <1549684884@qq.com> +Date: Mon Feb 24 10:48:46 2020 +0800 + + Modify enterprise wechat work message notice + +commit f6a7fb114cc3031e02b77595d198dcb106817354 +Author: leiyong <1549684884@qq.com> +Date: Sat Feb 22 00:30:36 2020 +0800 + + Zentao docking enterprise wechat work message notice. + +commit c001e75780f17bb4afc1d705c45ed7e459a8fa99 +Author: wangyidong +Date: Fri Feb 21 12:27:05 2020 +0800 + + * finish task #6856. + +commit c99bc8209eb299dda334c8dde87288be976ca0c9 +Author: wangyidong +Date: Fri Feb 21 10:06:30 2020 +0800 + + * code for task #6889. + +commit cb6d24b7ff1f0c8720765a6a9cf39c6d82da2c3d +Author: wangyidong +Date: Thu Feb 20 15:34:00 2020 +0800 + + * code for task #6888. + +commit 928147ac9173105a8f324fbbdcd10c83ae50206c +Author: wangyidong +Date: Thu Feb 20 15:09:25 2020 +0800 + + * finish task #6891. + +commit a49b81b30c0027f9a6bf23b90105f1e3094be367 +Author: leiyong <1549684884@qq.com> +Date: Thu Feb 20 13:25:48 2020 +0800 + + fix bug 2635. + +commit ebc464f295ecaef5c58f8e9b05526a6c2736bc87 +Author: chenfei +Date: Thu Feb 20 09:21:59 2020 +0800 + + * Add story type to batch create method. + +commit 310c31b8ec18c930b252322e53bb02a760b2dd1f +Author: reneeteng +Date: Tue Feb 18 17:18:31 2020 +0800 + + * License contact changed. + +commit a9d970c1c0a426e18ee5f25faba928df9edcfb76 +Merge: e9e500efb2 c7395c8b44 +Author: leiyong <1549684884@qq.com> +Date: Tue Feb 18 15:34:07 2020 +0800 + + Merge branch 'zentaopms_12.0.1' of github.com:easysoft/zentaopms into zentaopms_12.0.1 + +commit 08858a22557faa2eb46d00107fbcf75a80aaed03 +Author: Yagami <976204163@qq.com> +Date: Tue Feb 18 15:32:56 2020 +0800 + + * Fix my-task list width. + +commit e9e500efb221084cac0c62f53d4ea9a9bd81b190 +Author: leiyong <1549684884@qq.com> +Date: Tue Feb 18 14:43:31 2020 +0800 + + fix bug #2939，#2912 + Finish the task #6901 + +commit a7120e1e4d71b90580948b224cf53b8e1ab634c6 +Author: wangyidong +Date: Tue Feb 18 13:15:06 2020 +0800 + + * code for task #6890. + +commit d0652826ac3edbe64d88dd38baf601bfb2c4c9f5 +Author: wangyidong +Date: Tue Feb 18 11:37:37 2020 +0800 + + * finish task #6905,6895. + +commit c7395c8b446f758fbc0b6a99904279ad5264d553 +Author: chenfei +Date: Mon Feb 17 14:02:00 2020 +0800 + + * Merge zentaopms_cmmi to zentaopms_12.0.1 + +commit 4214b8910be95a8ab355f7f226686d7c1562199e +Author: leiyong <1549684884@qq.com> +Date: Fri Feb 14 17:47:16 2020 +0800 + + fix bug #2958,#2955,#2635. + +commit 205245f86fb1faddcf44fdfa0c6b0c08e81fb297 +Author: wangyidong +Date: Fri Feb 14 13:36:50 2020 +0800 + + * add blame link. + +commit cb642cff44efa472687b1b4cfc910c2948ad5e52 +Author: wangyidong +Date: Fri Feb 14 11:48:47 2020 +0800 + + * code for task #6870. + +commit d8d4cbf890fafea73ed3af020d4da7bdfd4d924e +Author: wangyidong +Date: Fri Feb 14 10:45:35 2020 +0800 + + * finish task #6871. + +commit bf705c1f1c590e558046095de5c310db83a953ba +Author: wangyidong +Date: Fri Feb 14 09:29:43 2020 +0800 + + * finish task #6872. + +commit 24f67c7441871e1fcbbb005c5341d49895eb77ea +Author: wangyidong +Date: Thu Feb 13 17:18:44 2020 +0800 + + * change for priv. + +commit ec536afaa0cda11a081e2c8dd6e83457c0ab53b0 +Author: wangyidong +Date: Thu Feb 13 17:07:37 2020 +0800 + + * finish task #6859. + +commit 3b577dcc98e52c612e3763088ed220eb6bc6a60f +Author: wangyidong +Date: Thu Feb 13 16:52:10 2020 +0800 + + * finish task #6863. + +commit 785a479c5b73b65aac980410a87e9f1d1e7a3069 +Author: wangyidong +Date: Thu Feb 13 16:50:11 2020 +0800 + + * finish task #6863. + +commit fb9d64703b356ff363fc6e0ab0694f6bd50c3882 +Author: wangyidong +Date: Wed Feb 12 16:07:23 2020 +0800 + + * adjust for xuanxuan 3.1.1. + +commit e2454a097b8ced4849d6a191624da4630df677df +Author: Catouse +Date: Wed Feb 12 11:12:40 2020 +0800 + + * update zui.js. + +commit d24304332fb766019dbdc64442d7ee3c000747d3 (tag: zentaopms_12.0.1_20200212) +Author: wangyidong +Date: Wed Feb 12 09:48:05 2020 +0800 + + * add new version and upgrade. + +commit c13b25c3180ea5790b8996f1a64c124c9f8969ea +Author: wangyidong +Date: Wed Feb 12 09:00:25 2020 +0800 + + * adjust repo create and edit page. + +commit 3a3dfd146fa56c7a5ba61299cf14f5f66f79992e +Author: wangyidong +Date: Wed Feb 12 08:56:15 2020 +0800 + + * change for xuanxuan. + +commit fb15a7a9d181a8f536954ba0c4e6e3e27d78b7f3 +Merge: 2b89c9f5f6 60c64816eb +Author: leiyong <1549684884@qq.com> +Date: Tue Feb 11 18:06:15 2020 +0800 + + Merge branch 'zentaopms_12.0.1' of github.com:easysoft/zentaopms into zentaopms_12.0.1 + +commit 2b89c9f5f6ea10c87c3cb5706f67bb075f749214 +Author: leiyong <1549684884@qq.com> +Date: Tue Feb 11 17:58:46 2020 +0800 + + complete task #6886,#6884,#6882,#6880. + +commit 60c64816eb58a5ac00df272dffb7e063f5462eef +Author: wangyidong +Date: Tue Feb 11 17:28:57 2020 +0800 + + * change for buile zentaoxx. + +commit 62cb503271ad5e523f6774111d6b98a7fadeb436 +Author: wangyidong +Date: Tue Feb 11 17:19:08 2020 +0800 + + * finish task #6885. + +commit f1c5df1fdf83838c5bad882d1eea490d265e1ec1 +Author: wangyidong +Date: Tue Feb 11 16:16:20 2020 +0800 + + * finish task #6879. + +commit d433403d31915a47d6e9251addd741b9d52de1a5 +Author: wangyidong +Date: Tue Feb 11 16:14:11 2020 +0800 + + * finish task #6878. + +commit e993b98b6fc915c556ec22c3fb456f860f9a6984 +Author: wangyidong +Date: Tue Feb 11 15:44:07 2020 +0800 + + * finish task #6881. + +commit 8bb1c86464681ec59b2a5a8e941ac01ecbf0ec74 +Author: wangyidong +Date: Tue Feb 11 15:41:59 2020 +0800 + + * finish task #6883. + +commit 12875d87743fe45ddf6a54f160636f87918f0166 +Author: wangyidong +Date: Tue Feb 11 15:36:44 2020 +0800 + + * finish task #6887. + +commit 097e2af3a0a217110c524466c38f97f49655a4cf +Merge: 5d97280b3a da7eb8d364 +Author: wangyidong +Date: Tue Feb 11 15:13:47 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5d97280b3a165cfcf029de5d7619a0c73cd9d285 +Author: wangyidong +Date: Tue Feb 11 15:12:58 2020 +0800 + + * Fix error. + +commit da7eb8d364828f43b18981914bd04a48832ba347 +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 11 14:56:25 2020 +0800 + + fix issues report when code review + +commit bad736c081aab08cad28d6eef884f890c0129013 +Merge: 777d34a30f 6a91d77a31 +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 11 14:48:24 2020 +0800 + + Merge remote-tracking branch 'origin/master' + +commit 777d34a30f3b2e0ba7c045cb6ccccc54970f15bd +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 11 14:47:55 2020 +0800 + + fix issues report when code review + +commit 6a91d77a3159d6bf3a16a96453aa1cde9c505fb4 +Author: wangyidong +Date: Tue Feb 11 12:04:24 2020 +0800 + + * adjust code. + +commit b7f1e002c74d1eb9c29464abb5745aa8e1083f35 +Merge: 8705944e92 1a36b088c6 +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 11 09:35:46 2020 +0800 + + Merge remote-tracking branch 'origin/master' + +commit 8705944e92b0258fe96d7a3599272cb3631435a5 +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 11 09:35:36 2020 +0800 + + fix issues report when code review + +commit 1a36b088c6ce76a45d9063092152ac18234a9107 +Merge: 3111c7e36b e0ae913838 +Author: wangyidong +Date: Tue Feb 11 09:26:11 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3111c7e36bad2dcdfc751a0292b756e788422f15 +Author: wangyidong +Date: Tue Feb 11 09:25:38 2020 +0800 + + * change for build zentaoxx. + +commit e0ae913838f13f03fea2132750aedce855c3b1bb +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 11 09:03:09 2020 +0800 + + fix issues report when code review + +commit cf2ad7c12d98608da79af401f37fbc901930cbc9 +Merge: ac4248fbe8 5b4c2874e8 +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 11 08:46:35 2020 +0800 + + Merge remote-tracking branch 'origin/master' + +commit ac4248fbe8f3bdd28382b233a9aa4f836128ea14 +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 11 08:46:17 2020 +0800 + + fix issues report when code review + +commit 95b46e92fd8dc7ac3e07f2bc614551031b7a846c +Author: aaronchen2k <462826@qq.com> +Date: Mon Feb 10 15:27:20 2020 +0800 + + update + +commit 5b4c2874e835d3f229d2a70024b47c3e033a59ab +Author: wangyidong +Date: Mon Feb 10 15:15:08 2020 +0800 + + * fix error. + +commit 22a510b5fa9a20c8ef94b29b6917d34a95fab38a +Author: aaronchen2k <462826@qq.com> +Date: Mon Feb 10 15:08:52 2020 +0800 + + update + +commit 77eddecece1149e537c6bcf5fac5fbc0bbe8da28 +Author: aaronchen2k <462826@qq.com> +Date: Mon Feb 10 15:06:52 2020 +0800 + + update + +commit 457c6dd57801165eb15b1b720a9bab41125ffed4 +Merge: ab65bcd24f ac0edaa7b9 +Author: wyd621 +Date: Mon Feb 10 14:41:18 2020 +0800 + + Merge pull request #44 from easysoft/zentaopms_ci_dev + + Zentaopms ci dev + +commit ac0edaa7b98ac288cf295c88cf062db897f64b84 +Merge: 383538685b ab65bcd24f +Author: wyd621 +Date: Mon Feb 10 14:40:44 2020 +0800 + + Merge branch 'master' into zentaopms_ci_dev + +commit 383538685b0b77158675c358547e435013ca6174 +Author: wangyidong +Date: Fri Feb 7 14:11:23 2020 +0800 + + * fix bug for repo-view. + +commit 68b0fa26f3d7c1afe67457d1a2dbab7dbce48742 +Author: wangyidong +Date: Fri Feb 7 10:58:58 2020 +0800 + + * marge from master. + +commit 00799f1f7b3205f12f889836d284d1623ad95eed +Author: wangyidong +Date: Fri Feb 7 09:12:41 2020 +0800 + + * fix error. + +commit ab65bcd24f19524295952406fbeabf361d5821b4 +Merge: 03e06b6e7d 6560eff7d2 +Author: leiyong <1549684884@qq.com> +Date: Thu Feb 6 14:12:54 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 03e06b6e7de662e94a0a50ee431ed91ac50ee0af +Author: leiyong <1549684884@qq.com> +Date: Thu Feb 6 14:12:23 2020 +0800 + + Fix bug #2941,#2937. + +commit 6560eff7d201b9ceb7871b00b1ccc9e60d79b531 +Author: wangyidong +Date: Thu Feb 6 10:59:04 2020 +0800 + + * finish task #9790 for zentaobiz. + +commit 92f366b76754b17c57f51a6a9b376c6742dec945 +Author: wangyidong +Date: Thu Feb 6 09:01:41 2020 +0800 + + * code for task #6849. + +commit 12277bda9c6bb7861640f946dcd770db1330cd22 +Merge: 616d01b015 87df6db7ac +Author: wangyidong +Date: Wed Feb 5 17:33:58 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 616d01b015518928a78cec4cae1aa7f5b55d3d4f +Author: wangyidong +Date: Wed Feb 5 17:30:21 2020 +0800 + + * fix bug. + +commit 58f5936bae317490f48e0919f1d2519077863c38 +Author: wangyidong +Date: Wed Feb 5 17:29:21 2020 +0800 + + * finish task #6820. + +commit 87df6db7ac581446d0ab096fdf9c21022c378a39 +Merge: 7a56b4506d ef1f4483d2 +Author: leiyong <1549684884@qq.com> +Date: Wed Feb 5 15:55:21 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7a56b4506d4bf6c2a1d945be9735d326ed64c3da +Author: leiyong <1549684884@qq.com> +Date: Wed Feb 5 15:54:29 2020 +0800 + + Fix bug #2929,#2932,#2943 + +commit ef1f4483d2e95dfbf56ddfe8833f534f72b19477 +Merge: 58685284b8 cf294a7f10 +Author: wangyidong +Date: Wed Feb 5 15:23:12 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cf294a7f109460565770203c2a1776ad9fd81715 +Author: Catouse +Date: Wed Feb 5 14:29:25 2020 +0800 + + * task #6807, messager not work. + +commit 21b04fff1c42b33b25a8baff86510a0d6e375129 +Merge: c61f161423 3a61cc87e8 +Author: leiyong <1549684884@qq.com> +Date: Wed Feb 5 14:23:21 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c61f161423f28254311f11628afdcfc1c5b23ead +Author: leiyong <1549684884@qq.com> +Date: Wed Feb 5 14:22:35 2020 +0800 + + fix bug #2918 and #2922 + +commit 58685284b8a88e40e4b5f976781178e4257b7e3e +Author: wangyidong +Date: Wed Feb 5 13:44:58 2020 +0800 + + * finish task #6850. + +commit 3a61cc87e829868999be28c131dd366bc1fb62c8 +Author: wangyidong +Date: Wed Feb 5 11:31:59 2020 +0800 + + * finish task #6821. + +commit e88f364a0a83fde21398c6ac2be89b1cda0b95cf +Author: wangyidong +Date: Wed Feb 5 11:03:46 2020 +0800 + + * finish task #6824. + +commit 96adea19b97df2ee37b9f7ca8ea07b3f36bba9b2 +Author: wangyidong +Date: Wed Feb 5 10:57:50 2020 +0800 + + * finish task #6837. + +commit 4db7034029bf18478a432553c32e25dbe5238dbb +Author: wangyidong +Date: Wed Feb 5 10:06:14 2020 +0800 + + * finish task #6849. + +commit 543ca29c736d71540ce822c465cc0b1433243b14 +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 4 22:39:50 2020 +0800 + + ignore to exec jenkins job if not exist + +commit 038dc34c3b1194bfe8f3381c7025b00b166ab021 +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 4 22:24:29 2020 +0800 + + fix a icon bug + +commit a4081009e82b788c67f8cbed34175b13e1ebd2bb +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 4 20:20:30 2020 +0800 + + fix a icon bug + +commit 2a252bb16f650f8c908e6137f5277e50d8767ac9 +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 4 20:20:24 2020 +0800 + + fix a icon bug + +commit 8cf8cae1686dcb23335dea96356cade70f26c11e +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 4 20:19:44 2020 +0800 + + jenkins password encrypt + +commit 4d464543b38c14d69bd6c114d859ad64df76cad9 +Merge: 6fc074f237 2ed202d5a4 +Author: wangyidong +Date: Tue Feb 4 17:36:32 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6fc074f237b1e47380d214f72cbacda53e940aee +Author: wangyidong +Date: Tue Feb 4 17:34:13 2020 +0800 + + * code for task #9812. + +commit 2ed202d5a43acb7676108753fb7b22181a61738a +Author: leiyong <1549684884@qq.com> +Date: Tue Feb 4 17:33:26 2020 +0800 + + fix bug #2926 + +commit d9af838a9cc1a3e3f45865cc64c7f7fc8589efa6 +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 4 17:26:30 2020 +0800 + + fix a icon bug + +commit 8c05ec4e3ed1d3dbdce96f40d19165b72e745e86 +Author: wangyidong +Date: Tue Feb 4 17:11:01 2020 +0800 + + * finish task #9811. + +commit 90ec6f30df010c9cfb997c74267e02416107fa75 +Author: leiyong <1549684884@qq.com> +Date: Tue Feb 4 15:40:31 2020 +0800 + + 1.fix bug #2931 + 2.fix bug #2924 + 3.fix bug #2919 + 4.fix bug #2917 + 5.fix bug #2914 + 6.fix bug #2913 + 7.fix bug #2910 + 8.fix bug #2904 + 9.fix bug #2897 + 10.fix bug #2896 + 11.fix bug #2894 + +commit 9ecf575c3cbf3bdd8ef6755f1313389e9e61d1bc +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 4 14:30:41 2020 +0800 + + fix the bug about jenkins build request and status checking + +commit dbd4f4a960cf9d73c916b86a826fab9e62a8990e +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 4 14:25:07 2020 +0800 + + fix the bug about jenkins build request and status checking + +commit f10482e3ab744ab5f2b56f40b98e5be2e1877e6f +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 4 11:34:01 2020 +0800 + + update sql + +commit 86d47c5fd26a455090e4e77e137e08853d2eab21 +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 4 11:18:02 2020 +0800 + + update sql + +commit db4810a582acf822e0fe39c2014bd3a81211717d +Author: aaronchen2k <462826@qq.com> +Date: Tue Feb 4 10:11:04 2020 +0800 + + order by table header + +commit dda120936d54e932d5b99f5aabdec764c082b4a1 +Author: aaronchen2k <462826@qq.com> +Date: Mon Feb 3 17:42:48 2020 +0800 + + change git and svn to use the encoding defined in repo table + +commit a3a7b045312fcad26fd1cec2eb49477e162d31a1 +Author: aaronchen2k <462826@qq.com> +Date: Mon Feb 3 15:40:31 2020 +0800 + + english translation + +commit 4e08aed4f67615cb9918e2e795a9cfcf4e780659 +Author: aaronchen2k <462826@qq.com> +Date: Mon Feb 3 15:37:02 2020 +0800 + + english translation + +commit 56392dd1518d52f9e93e8496ea998f936f3aad6d +Author: aaronchen2k <462826@qq.com> +Date: Mon Feb 3 14:35:36 2020 +0800 + + english translation + +commit 354ac537c36b6b75fcfb8c3c6a875c5daea57a99 +Author: wangyidong +Date: Mon Feb 3 14:01:44 2020 +0800 + + * finish task #9799 for zentaobiz. + +commit 091a6b47434229b9522f6bb0a45e2ef257d9dc1b +Author: aaronchen2k <462826@qq.com> +Date: Mon Feb 3 10:57:14 2020 +0800 + + save tag build histories to db for svn repo + +commit b6ec537ec3f4ee3d4f94142ca6964673edc37abb +Author: aaronchen2k <462826@qq.com> +Date: Mon Feb 3 09:15:56 2020 +0800 + + hide account fields in create, edit page for git + +commit f8d9a16082c13528d9d272bbc5133b3892e491f4 +Author: aaronchen2k <462826@qq.com> +Date: Sat Feb 1 18:28:50 2020 +0800 + + jenkins password encrypt + +commit cc1bfffe4002f50af15ec2e910aeba325e222615 +Author: aaronchen2k <462826@qq.com> +Date: Sat Feb 1 17:52:38 2020 +0800 + + success to exec jenkins job via svn commit log + +commit 04711ab65a7fb5c4c74acce8d5198befb6bfacaf +Author: aaronchen2k <462826@qq.com> +Date: Sat Feb 1 16:58:24 2020 +0800 + + success to exec jenkins job via svn commit log + +commit 01a282a40caa5ae591e71353727c5f2213a6fcbb +Author: aaronchen2k <462826@qq.com> +Date: Sat Feb 1 16:29:07 2020 +0800 + + parse commit coments actions on log level and save + +commit a565b96d885dcbb73fb66936d2ca574ce9789679 +Author: aaronchen2k <462826@qq.com> +Date: Sat Feb 1 15:58:57 2020 +0800 + + parse commit coments actions on log level and save + +commit 575d7ce5497c363f3f4f993d2dfc41d371a25046 +Author: aaronchen2k <462826@qq.com> +Date: Sat Feb 1 15:52:03 2020 +0800 + + test svn sync and commit actions updating + +commit 2b0ca554152aecfccc3625c099afb6b0e83a47ad +Author: aaronchen2k <462826@qq.com> +Date: Sat Feb 1 11:33:33 2020 +0800 + + test jenkins job + +commit d6b640e9263e657d5124d114ba26c0d9948d4d9c +Author: aaronchen2k <462826@qq.com> +Date: Sat Feb 1 11:18:30 2020 +0800 + + add scmUtils class + +commit 6dd177d10406ff7fddc155da8d67cfde9c2b68cc +Author: aaronchen2k <462826@qq.com> +Date: Sat Feb 1 10:25:28 2020 +0800 + + test svn sync + +commit b713feabc5ea22927f5531f4fbbc5720757557eb +Author: aaronchen2k <462826@qq.com> +Date: Sat Feb 1 09:52:58 2020 +0800 + + test and fix issues about svn + +commit 4637b81362153870a9495b3d71f28b448e49fc1e +Author: aaronchen2k <462826@qq.com> +Date: Fri Jan 31 22:19:15 2020 +0800 + + fix bread crumb + +commit 1f970ba9af098c49ab2a6f580d988a87cc78174e +Author: aaronchen2k <462826@qq.com> +Date: Fri Jan 31 21:25:36 2020 +0800 + + add tips for git sync + +commit 045ce83aaac26112a1e997bca31bd963942d4dda +Author: aaronchen2k <462826@qq.com> +Date: Fri Jan 31 21:19:43 2020 +0800 + + enable git sync in sys.cron + +commit 90d169bb356efc9fd48575b08facec73a2f3db14 +Author: aaronchen2k <462826@qq.com> +Date: Fri Jan 31 21:00:03 2020 +0800 + + disable git sync in sys.cron + +commit 6d22828f9f816a2dba978232b17e075f02a0f877 +Author: aaronchen2k <462826@qq.com> +Date: Fri Jan 31 20:57:22 2020 +0800 + + disable git pull in git->run interface + +commit 57b0bd7c6aedf4da6c01fe42814afe53c8443dee +Author: aaronchen2k <462826@qq.com> +Date: Fri Jan 31 20:51:27 2020 +0800 + + changes for original repo and ci models combination + +commit b6d68f10b7cd5d0353a1fafdca071ae830b0827d +Author: aaronchen2k <462826@qq.com> +Date: Fri Jan 31 18:31:08 2020 +0800 + + changes for original repo and ci models combination + +commit 3b0625087b558bf3b01dd0be00bad6784ab766c9 +Author: aaronchen2k <462826@qq.com> +Date: Fri Jan 31 17:54:01 2020 +0800 + + update db schema + +commit da17966c41b7db1c55cfd555dd55377ec73fb6f9 +Author: aaronchen2k <462826@qq.com> +Date: Fri Jan 31 17:43:35 2020 +0800 + + update db schema + +commit 40bc31e0d1a2f884b478b650f55665117590a8b0 +Author: aaronchen2k <462826@qq.com> +Date: Fri Jan 31 17:14:52 2020 +0800 + + changes for original repo and ci models combination + +commit 62446a0d87d49e4be79b7124e010e9e7b6a143f3 +Author: aaronchen2k <462826@qq.com> +Date: Fri Jan 31 10:39:50 2020 +0800 + + changes for original repo and ci models combination + +commit a82cb65366ecdc99a30377daf18b2435a2c15d66 +Author: aaronchen2k <462826@qq.com> +Date: Fri Jan 31 10:34:29 2020 +0800 + + update codes for original repo and ci models combination + +commit 1c7790f003454e3955af6455cabf327febfd935d +Author: wangyidong +Date: Fri Jan 31 08:54:53 2020 +0800 + + * fix bug #2193 for backyard. + +commit 532b73008a47400e69118ebc49c5e593374af451 +Author: wangyidong +Date: Fri Jan 31 08:47:45 2020 +0800 + + * adjust for project burn. + +commit fcc21286d3835373ccd2b314c176057c920da8db +Author: wangyidong +Date: Fri Jan 31 08:45:20 2020 +0800 + + * adjust for doc file size. + +commit de8106ab82895ab1de0abe1fc857ecb446bf1c9e +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 23 17:16:00 2020 +0800 + + fix menu issues + +commit 96b6c17213b84caa0c734ccc95832825f9d7fdaf +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 23 16:47:26 2020 +0800 + + keep repoID in submenu link for bookmark + +commit deb95b19277c93f1448dc0b9daa1c3d653ad5683 +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 23 16:43:28 2020 +0800 + + combine repo, ci and jenkins modules under same top module + +commit b32e37edd16146bceb1c703403d84bc51f8773f0 +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 23 16:33:04 2020 +0800 + + update menu etc. + +commit 9e8b73a6e3987326606f28b069afcee6792f387a +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 23 16:30:22 2020 +0800 + + update menu etc. + +commit b6c5cb2170310d2cf858a41b333dea5d7e884433 +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 23 11:13:08 2020 +0800 + + show/hide repo dropdown-list + +commit 95759739c211401ebc99565e588d76d4ac5ca13d +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 23 09:25:27 2020 +0800 + + cp repo codes from pro version + +commit 165fb141d16b74664d5e1271a1bf6669860c3cee +Author: aaronchen2k <462826@qq.com> +Date: Wed Jan 22 14:10:50 2020 +0800 + + remove + +commit 4c12a5eb9874c75e870af57d7957cb4330add347 (tag: with_cicredentials) +Author: aaronchen2k <462826@qq.com> +Date: Wed Jan 22 10:27:27 2020 +0800 + + move common lang items to ci module + +commit d850fbb48f76bbdc1816f7ee8b550d49499f9ced +Author: aaronchen2k <462826@qq.com> +Date: Tue Jan 21 14:53:14 2020 +0800 + + show last build status in ci task list + +commit 06afbed435bda2747c1909e5c48c15110e343ff9 +Author: aaronchen2k <462826@qq.com> +Date: Tue Jan 21 11:09:49 2020 +0800 + + update breadcrumbs for ci module + +commit 63f4390c7afead244af27d3fc260a8ca8a8499af +Author: aaronchen2k <462826@qq.com> +Date: Tue Jan 21 10:50:54 2020 +0800 + + update breadcrumbs for ci module + +commit 05112f1f6b66c337ab5b5584f0f8043a6185e2e1 +Author: aaronchen2k <462826@qq.com> +Date: Tue Jan 21 10:40:06 2020 +0800 + + add jenkins task exec and logs view pages + +commit dda5956ad7636808eb9ab898df09ac2916f0908b +Author: aaronchen2k <462826@qq.com> +Date: Tue Jan 21 08:31:16 2020 +0800 + + fix a issue about check jenkins build status + +commit e99191ea74e01e3cb19135aa22c0358ea3c7bced +Author: aaronchen2k <462826@qq.com> +Date: Mon Jan 20 16:42:14 2020 +0800 + + config menu for each ci submodule + +commit 16c4973fc92c86a32883611b9c7084374bd984f5 +Author: aaronchen2k <462826@qq.com> +Date: Mon Jan 20 16:16:28 2020 +0800 + + remove settings and delete button in repo module + +commit 8ebb28364d4f0cfa203a5f52ba39841f99cb81ce +Author: aaronchen2k <462826@qq.com> +Date: Mon Jan 20 15:07:36 2020 +0800 + + split ci module to more than modules + +commit 872ed15283e5101a5514cd9796a1c09776156f22 +Author: aaronchen2k <462826@qq.com> +Date: Mon Jan 20 14:43:36 2020 +0800 + + split ci module to more than modules + +commit 128b85491c12eb428b1f8b8a3b5afb7bf5e1e63f +Author: aaronchen2k <462826@qq.com> +Date: Mon Jan 20 13:26:59 2020 +0800 + + split ci module to more than modules + +commit 0683dba9df0ca56253dba8fc45c1ec8759cd69c2 +Author: aaronchen2k <462826@qq.com> +Date: Mon Jan 20 12:27:42 2020 +0800 + + split ci module to more than modules + +commit c2ad881b2157569c601870ba0aff9edc9bbbaf3e +Author: aaronchen2k <462826@qq.com> +Date: Sat Jan 18 11:02:02 2020 +0800 + + success to build ci task by using tag like build_#15 + +commit 86af65c50f553134681cd64a0d74926cb368209c +Author: aaronchen2k <462826@qq.com> +Date: Sat Jan 18 10:47:28 2020 +0800 + + success to build ci task by using tag like build_#15 + +commit 59a4a2c894482e08e30edddd7cd65d47ef6e0561 +Author: aaronchen2k <462826@qq.com> +Date: Sat Jan 18 10:34:39 2020 +0800 + + fix isssue related to delete cron job + +commit 14557c09db3c38730d9dac4f90d21457623f395e +Author: aaronchen2k <462826@qq.com> +Date: Fri Jan 17 12:28:58 2020 +0800 + + analyze new tags and launch ci task if needed + +commit 25cd1dbc772162b64d81f713b5b74ed98271999a +Author: aaronchen2k <462826@qq.com> +Date: Fri Jan 17 09:47:18 2020 +0800 + + support cron expression + +commit 3d7e26a68ed47cae7e3864cfecbf993045acd7b4 +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 16 19:47:27 2020 +0800 + + to support muti-line and more than one commands in one commit + +commit 6377632586420c311fc505cce2eaec0053fddb7c +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 16 19:46:58 2020 +0800 + + to support muti-line and more than one commands in one commit + +commit e0d81af997ba5ae033209a86e7fbad843cd90c43 +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 16 18:39:41 2020 +0800 + + to support muti-line and more than one commands in one commit + +commit 74e29ce8be87b1479c16af6def7744a19dcd0fce +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 16 17:11:45 2020 +0800 + + to support muti-line and more than one commands in one commit + +commit 5436139ed6c7eff954195358c2a97f220e460b78 +Author: wangyidong +Date: Thu Jan 16 15:59:53 2020 +0800 + + * adjust caselib for workflow and fix bug. + +commit 55a78e0b79cf04c7e44b3c400bc5b10f3393a237 +Author: wangyidong +Date: Thu Jan 16 15:58:24 2020 +0800 + + * adjust for get branch. + +commit c907c58583eca69c9b9ff2753297770cdb29af78 +Author: wangyidong +Date: Thu Jan 16 15:56:36 2020 +0800 + + * fix bug #2194. + +commit 341171bf1ae27610fe4b90f009e5cf5f2b645d64 +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 16 15:23:50 2020 +0800 + + updte cron log format when output is empty or big + +commit fb7a45efe38da108df74a3cae002e8915661a121 +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 16 14:29:05 2020 +0800 + + retrive commands from code ci comments + +commit 2ce41370aabe2eb30f8374ab166977d95a8e1617 +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 16 10:20:26 2020 +0800 + + test and fix cron issue + +commit f32d591d7e6d2e2ad42fe9f54b7786d4fab8b50a +Author: aaronchen2k <462826@qq.com> +Date: Wed Jan 15 20:21:14 2020 +0800 + + add tips for repo clone + +commit 4ea43cbed7eefbf311d8daa4ef131a9a85ffaebb +Author: aaronchen2k <462826@qq.com> +Date: Wed Jan 15 20:18:56 2020 +0800 + + add tips for repo clone + +commit dbf2a285c2eaef98898ac8ca50647872757616c1 +Author: aaronchen2k <462826@qq.com> +Date: Wed Jan 15 20:18:52 2020 +0800 + + add tips for repo clone + +commit e7e9f8a86a143f38792da2667b3e14300a195fe1 +Author: aaronchen2k <462826@qq.com> +Date: Wed Jan 15 20:18:03 2020 +0800 + + update cron->ajaxExec method to support params + +commit 4d3f2abc9041fddc9ee600d1a385586ce6449dda +Author: aaronchen2k <462826@qq.com> +Date: Wed Jan 15 19:15:16 2020 +0800 + + update cron->ajaxExec method to support params + +commit 348cd174d1a82334780c5f7d3f8cb8962809f9ad +Author: aaronchen2k <462826@qq.com> +Date: Wed Jan 15 18:57:43 2020 +0800 + + update cron->ajaxExec method to support params + +commit a221caebbff0c61eeee1c7020f12f3e52435ffa6 +Author: aaronchen2k <462826@qq.com> +Date: Wed Jan 15 18:54:40 2020 +0800 + + update cron->ajaxExec method to support params + +commit e6ce735079ddb727e710f0d109e022de20aea6ab +Author: aaronchen2k <462826@qq.com> +Date: Wed Jan 15 18:54:21 2020 +0800 + + update cron->ajaxExec method + +commit c04650c507beeaf4969ecb09b155dc0889d85117 +Author: aaronchen2k <462826@qq.com> +Date: Wed Jan 15 16:12:48 2020 +0800 + + add regx for commit comments command to retrive action, entity type and id + +commit a2970bdacf3e09e65701022d2f4997e2a9c32a44 +Author: aaronchen2k <462826@qq.com> +Date: Wed Jan 15 15:40:39 2020 +0800 + + create, update, remove cron job for ci task + +commit 933ebacfb5b18927cbe2b1a81bcdd6cab16a2368 +Author: aaronchen2k <462826@qq.com> +Date: Wed Jan 15 13:43:10 2020 +0800 + + add job into zt_cron table to check citask status every 5 mins + +commit af258f8fdf26e0cd2904820a387b50bddfcee7df +Author: aaronchen2k <462826@qq.com> +Date: Tue Jan 14 17:33:41 2020 +0800 + + move exe button to edit citask page, add request success tips + +commit b0e0b7f9fae766695518e97356701685dc828e58 +Author: wangyidong +Date: Tue Jan 14 16:33:03 2020 +0800 + + * adjust for zentaobiz. + +commit 0b2e26085fb9beb117f689d0d95d175ed0c1157f +Author: aaronchen2k <462826@qq.com> +Date: Tue Jan 14 16:13:33 2020 +0800 + + retrive jenkins build status and logs via remote api, then save to db + +commit 9e6cc728347cc45830f6d082d32729256be8f2c1 +Author: aaronchen2k <462826@qq.com> +Date: Tue Jan 14 15:10:02 2020 +0800 + + get queueItem of jenkins task and save + +commit 725f6a93ff2fee40dc08effe0e56b1a920796ed2 +Author: aaronchen2k <462826@qq.com> +Date: Tue Jan 14 15:07:55 2020 +0800 + + get $queueItem = $this->sendBuildRequest($buildUrl); + +commit 9cfc73c4cadfebe87a0f8290f22e12a9a58ed6d8 +Author: aaronchen2k <462826@qq.com> +Date: Tue Jan 14 13:39:25 2020 +0800 + + save build into db + +commit 35d72f80e77e1df4f6efde7f9aca6e68e6092ffb +Author: aaronchen2k <462826@qq.com> +Date: Tue Jan 14 10:48:37 2020 +0800 + + support username/password credential + +commit e7b3c90be1c931f57b0de56c0846ca10c5a7180c +Author: aaronchen2k <462826@qq.com> +Date: Tue Jan 14 10:25:13 2020 +0800 + + support username/password credential + +commit 6d8b6d40459dd24075058593d7f12b7feeeaa681 +Author: aaronchen2k <462826@qq.com> +Date: Mon Jan 13 17:31:40 2020 +0800 + + success to build jenkins job by calling remote api + +commit 3409e84d8787886060607309f248f8444b55796e +Author: wangyidong +Date: Mon Jan 13 16:52:17 2020 +0800 + + * fix bug #2182. + +commit 3de40ee5b2d5435dfa1314074949ea5ef9a5e073 +Author: wangyidong +Date: Mon Jan 13 14:56:23 2020 +0800 + + * finish task #2201. + +commit bdbbebc7958c30cc7939ccb77dde67d56bd8cf4d +Merge: 0222add8d5 d761095adc +Author: wangyidong +Date: Mon Jan 13 14:31:33 2020 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0222add8d52f46e8a83ea6405a19152c3f727e92 +Author: wangyidong +Date: Mon Jan 13 14:22:53 2020 +0800 + + * fix bug for less than php5.6 for search. + +commit 91e680de2fc413bee6e899ddb33c1862e6a8137c +Author: aaronchen2k <462826@qq.com> +Date: Mon Jan 13 11:09:37 2020 +0800 + + sync repo by using a page button + +commit b6c7f38e1aa06d60e3167a7e13891c19e64ee5be +Author: aaronchen2k <462826@qq.com> +Date: Fri Jan 10 18:16:26 2020 +0800 + + exe git pull and retrive git log + +commit 46f9b8f33de45c3565f0b69f6fa7a10358e4a297 +Author: aaronchen2k <462826@qq.com> +Date: Fri Jan 10 08:54:25 2020 +0800 + + add ci related tables + +commit 1b39583477a1f0050802106b750246a7337a41a9 +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 9 17:09:09 2020 +0800 + + ci tasks form validation + +commit 0a4262a3108b61d9556841205aa6a5e851708269 +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 9 16:50:47 2020 +0800 + + ci tasks crud + +commit c1cd688f28bea5bedb28e32c7f227e979d88a865 +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 9 16:41:29 2020 +0800 + + edit ci tasks + +commit e6f7211ddd5e0a46b5b292eabc35f7e8391298e1 +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 9 16:18:39 2020 +0800 + + edit ci tasks + +commit 2d9115809710ce4cfd1bc34e752360e78aea94b5 +Author: aaronchen2k <462826@qq.com> +Date: Thu Jan 9 15:16:45 2020 +0800 + + list ci tasks + +commit d761095adcc5c2f54ac7deb8475130defbded116 +Author: reneeteng +Date: Thu Jan 9 10:35:00 2020 +0800 + + * Update company info on install to EasyCorp. + +commit 13aa690b33cd38419ee7e973f6872e92618a8821 +Author: Catouse +Date: Thu Jan 9 09:52:17 2020 +0800 + + * fix form setting in todo/batchcreate view not work. + +commit a786e50b33ea4b63fe53dbf4e6ba4f5849fdc1eb +Author: aaronchen2k <462826@qq.com> +Date: Wed Jan 8 20:24:31 2020 +0800 + + fix issues for code standards + +commit a90154075fd4182890708ee36a092b40050da860 +Author: aaronchen2k <462826@qq.com> +Date: Wed Jan 8 19:56:47 2020 +0800 + + fix issues for code standards + +commit 9140195e46b80edcd9f7c61be9209750dbdc82f1 +Author: Catouse +Date: Wed Jan 8 15:03:31 2020 +0800 + + * update ja language file. + +commit e2efd30948f61b661edf2c88ed180d3367cd0958 +Author: wangyidong +Date: Tue Jan 7 08:49:09 2020 +0800 + + * fix bug for show annual data. + +commit 89329621d37db4b9250a57c1ee53c84fed76c1db +Author: wangyidong +Date: Mon Jan 6 16:50:15 2020 +0800 + + * adjust for annual data. + +commit cc4f8f8b5898f182076efd6975bd7fdd7da5d290 +Author: wangyidong +Date: Mon Jan 6 09:21:40 2020 +0800 + + * fix get current version for xuanxuan. + +commit b9fda95ee7bf36c864dcfdc1e75154ebb5e001f2 +Author: wangyidong +Date: Fri Jan 3 17:29:45 2020 +0800 + + * adjust for show modal. + +commit 2669b7ecbc2c2c6dae7c5b928f6874308e1be3a7 +Author: wangyidong +Date: Fri Jan 3 14:21:59 2020 +0800 + + * adjust for misc lang. + +commit afaffd2a0c785e9fff9c8f7d93686b769d001934 +Author: wangyidong +Date: Fri Jan 3 13:31:19 2020 +0800 + + * fix bug for download client. + +commit 0350bba919b3b75ba31577621cb78afdaac613c9 +Author: wangyidong +Date: Fri Jan 3 11:21:04 2020 +0800 + + * fix bug. + +commit 3b46b721918d6789d3b32ed11b978d2d8f6d34c2 +Author: wangyidong +Date: Fri Jan 3 11:00:22 2020 +0800 + + * remove annualData priv. + +commit 762b02b73a2da3744c250f5225aa4f81616b78d8 (tag: zentaopms_12.0.stable_20200103) +Author: wangyidong +Date: Fri Jan 3 09:08:34 2020 +0800 + + * fix sql. + +commit 969b595647f3f5c34168c5e55f7dd979cbaa0e1f +Author: wangyidong +Date: Fri Jan 3 08:44:22 2020 +0800 + + * adjust standard sql. + +commit 5088fcc659ef12319908a21bba0df62b978e9082 +Author: wangyidong +Date: Thu Jan 2 16:53:24 2020 +0800 + + * add new version and upgrade. + +commit 469bf66645a0f0f1942329cf34aa1402001625d2 +Author: wangyidong +Date: Thu Jan 2 15:22:37 2020 +0800 + + * add for annual guide. + +commit 21eac24e811922c973972a080e7ebfdcf9cad529 +Author: wangyidong +Date: Thu Jan 2 13:51:33 2020 +0800 + + * add index for repobranch table. + +commit 83d1e91569c83926c4b20a4295b51394f9b191e8 +Author: wangyidong +Date: Thu Jan 2 13:50:51 2020 +0800 + + * adjust for sync latest comment. + +commit 6ca9be415b01eecc52b9eaecb320adfe51439f56 +Author: wangyidong +Date: Thu Jan 2 10:09:23 2020 +0800 + + * fix for create cycle todo. + +commit be62d9d8b7c30b9375402fa17197e8a91c74c829 +Author: wangyidong +Date: Thu Jan 2 10:02:20 2020 +0800 + + * change first char to upper. + +commit 3dabfc1b45dbb95bf2c2aec33be75ba22d09556b +Author: wangyidong +Date: Thu Jan 2 10:00:17 2020 +0800 + + * adjust code. + +commit 7af8e82c0d2b99bb37547d43c58017f7168f92aa +Author: wangyidong +Date: Thu Jan 2 09:45:21 2020 +0800 + + * code for upgrade. + +commit c32da306ee77f651bd8e94b07fd703d68b07adc1 +Author: wangyidong +Date: Thu Jan 2 09:12:37 2020 +0800 + + * revert for api sql. + +commit f1308dfb46bd904c28475219dca7d1f54ce3b173 +Author: wangyidong +Date: Thu Jan 2 09:10:04 2020 +0800 + + * adjust code and add note. + +commit 3e938c780f0612b306828f4ec9afdb5bf3ca7ee7 +Author: wangyidong +Date: Thu Jan 2 08:52:11 2020 +0800 + + * fix bug #2905. + +commit e8d68110569ee7904c13fcaa91ce0a4d883cd52e +Author: wangyidong +Date: Thu Jan 2 08:25:47 2020 +0800 + + * adjust for repo log page style. + +commit 56aee06518aa375de77161194ba70dcc5829b947 +Author: wangyidong +Date: Tue Dec 31 15:32:07 2019 +0800 + + * change QA to Test. + +commit 384b1b2f24069765dbd6f8bdc51286de5c1ce6d2 +Author: wangyidong +Date: Tue Dec 31 15:03:22 2019 +0800 + + * set default year. + +commit 59b479d21de4ee6d6cc280085318fcfe2fd215df +Author: wangyidong +Date: Tue Dec 31 14:47:30 2019 +0800 + + * Only get table for zdb. + +commit 6f3f653283e7d82963cceb3999dde47aa51974b1 +Author: wangyidong +Date: Tue Dec 31 14:41:26 2019 +0800 + + * delete nozip setting. + +commit 4af4dbc22b545e142850a9b0f2bdf09b28db5a3f +Author: wangyidong +Date: Mon Dec 30 16:51:02 2019 +0800 + + * set from cookie for doc-index page. + +commit ce6d2e8d0b02e165785df5651096aa2463ec88ac +Author: wangyidong +Date: Mon Dec 30 15:48:00 2019 +0800 + + * fix bug #2634. + +commit ac5dcd25e436c33eeb761bfebda277be2de6a418 +Author: wangyidong +Date: Mon Dec 30 15:11:24 2019 +0800 + + * fix bug #2898. + +commit c32bd3d3d692970966f465727e72f79eb3b83d33 +Author: wangyidong +Date: Mon Dec 30 14:29:33 2019 +0800 + + * fix bug #2906. + +commit ce7012569c054a9c161a590acbc2e7a7af111575 +Author: wangyidong +Date: Mon Dec 30 14:13:04 2019 +0800 + + * adjust for child plan. + +commit eed8f813be2084d1241568402bb3584e9f0db2a3 +Author: wangyidong +Date: Mon Dec 30 13:21:26 2019 +0800 + + * adjust for get finished task for annual data. + +commit 9c472e39e9d8b0e7f43b9ddbd926c0b8fa2a43a5 +Author: wangyidong +Date: Mon Dec 30 10:41:58 2019 +0800 + + * adjust for get finished tasks. + +commit b7b132baa575d879c219ded92b2e8ef2230f612a +Author: wangyidong +Date: Mon Dec 30 09:08:45 2019 +0800 + + * fix bug for error word. + +commit 9a795c4755b7b725fff44d5117b9c20799f870dc +Author: wangyidong +Date: Fri Dec 27 16:47:02 2019 +0800 + + * adjust for annual data. + +commit 683ee3a2b706a006c6603ae3041642dd1c7df74d +Author: reneeteng +Date: Fri Dec 27 16:29:34 2019 +0800 + + * Lang update for new features. + +commit 5232526ec5e41d76c57c86e486821bf0844e5c01 +Author: wangyidong +Date: Fri Dec 27 15:56:22 2019 +0800 + + * adjust code. + +commit 96e560a04b4882aa9e610b8d88af66f76a6d9b7f +Author: wangyidong +Date: Fri Dec 27 11:30:04 2019 +0800 + + * adjust for annual data page. + +commit cb60f926d91c1295c2645b0de49681ee55548543 +Author: wangyidong +Date: Wed Dec 25 17:35:52 2019 +0800 + + * adjust code. + +commit a1f9c6b4bd0f9b6fca68ab12886543e7ec88cf36 +Author: wangyidong +Date: Wed Dec 25 16:56:06 2019 +0800 + + * fix bug for search. + +commit b7fb920a88f93d4e3455091579483ea2d97bbc0a +Author: wangyidong +Date: Wed Dec 25 16:32:50 2019 +0800 + + * fix bug for search bug. + +commit 01c80aa46e587075a06282412b8e687e539c4ca0 +Author: wangyidong +Date: Wed Dec 25 16:04:59 2019 +0800 + + * fix bug. + +commit d3e0128a42ffa62e7f8caa7959780be6f3bb624f +Merge: 3bd354fa8d b713f4bdb8 +Author: wangyidong +Date: Wed Dec 25 15:54:57 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3bd354fa8d6ea8f4e0bb2e96dfa05463605a4b38 +Author: wangyidong +Date: Wed Dec 25 15:52:42 2019 +0800 + + * code other lang. + +commit b713f4bdb8a7f8ba661103ae87a6970f928500ce +Author: Catouse +Date: Wed Dec 25 15:10:02 2019 +0800 + + * fix zui.table multi-languages not work. + +commit 4cfa0b035bd36b96fa5bf51ed1dda3526dc6dd04 +Author: wangyidong +Date: Wed Dec 25 15:04:57 2019 +0800 + + * adjust for annualdata style. + +commit 67b1e6f7b1077a9570e17e144310c1ce08fe6945 +Author: wangyidong +Date: Wed Dec 25 14:25:33 2019 +0800 + + * add note for report module. + +commit fab5c4a9d8de3ef6b3db8e42922eec1b5d6488ef +Author: wangyidong +Date: Wed Dec 25 11:27:30 2019 +0800 + + * adjust for qa role annualdata. + +commit 9a30b4a9d4b71a7a70b02aa01d7a555a1725e576 +Author: wangyidong +Date: Wed Dec 25 10:36:32 2019 +0800 + + * add priv for annualData. + +commit a401599f7f13b97725a046589a02ed2bfbb6f7f7 +Author: wangyidong +Date: Wed Dec 25 09:52:49 2019 +0800 + + * adjust for send method. + +commit 734ad0477aabfe9a9a6aecb369b304e63729afec +Author: wangyidong +Date: Wed Dec 25 09:51:55 2019 +0800 + + * remove xhtml js for create project or product. + +commit 3504dfefa7cd0df39dcf1cbaf04d362996d6086f +Author: wangyidong +Date: Wed Dec 25 09:50:17 2019 +0800 + + * code for task #6759. + +commit 81e73e61f1b4a233a6d06d32730801d406ddd607 +Author: wangyidong +Date: Wed Dec 25 09:40:58 2019 +0800 + + * finish task #6759. + +commit 5eb7f1c04c8409e29a279fe9fbf3dea04db43cd6 +Author: wangyidong +Date: Wed Dec 25 09:33:40 2019 +0800 + + * finish task #6769,6768. + +commit 1c33392243cd7d71049ed364d5915d30be07a285 +Author: wangyidong +Date: Wed Dec 25 09:32:21 2019 +0800 + + * fix error for create doc in project or product. + +commit 0a52b546ababc49b331097e4ac5bbf51080463fc +Author: wangyidong +Date: Wed Dec 25 09:30:43 2019 +0800 + + * fix error. + +commit 4b36aae25e9c0c8b969e548db06b2b38af2a3fd0 +Author: Catouse +Date: Mon Dec 23 15:26:21 2019 +0800 + + * support export annual data to image file, task #6762. + +commit 19bf49917cded8057c6e5d912e2f1b40bc2faab7 +Author: wangyidong +Date: Mon Dec 23 14:31:09 2019 +0800 + + * fix bug for show doc. + +commit b52db4086ba0f6630d5bc0411b3d65964df76c88 +Author: Catouse +Date: Mon Dec 23 13:58:53 2019 +0800 + + * update report/annualdata view. + +commit 21175d9e759f58a48884120b9a570a158aaafdb5 +Author: Catouse +Date: Mon Dec 23 13:57:21 2019 +0800 + + * update report/annual data view.task #6762, task #6161. + +commit 9032cf27fd076bcce9f2fe30d760e92e2943b990 +Author: Catouse +Date: Mon Dec 23 10:44:16 2019 +0800 + + * update report/annualdata view. + +commit 9d5eb87b1a0e6b85a87fc7d2ca9dca04308a23cd +Author: Catouse +Date: Mon Dec 23 08:15:31 2019 +0800 + + * update report/annualdata view. + +commit dc96a7879a886f84d573b586fe32fc67dbdc0e8c +Author: Catouse +Date: Fri Dec 20 17:33:32 2019 +0800 + + + add report/annual data view.task #6762, task #6161. + +commit 1a77048053a440bd3b3b7bf6bea737d95616a36c +Author: wangyidong +Date: Fri Dec 20 14:25:33 2019 +0800 + + * fix bug for weixin note in webhook. + +commit 5771ab2a4b9da8dfb1de7dfa5863c5409399a7d5 +Author: wangyidong +Date: Thu Dec 19 13:19:11 2019 +0800 + + * code for task #6697. + +commit 0264e1bf1ecbbea15bc100b30d6765b24c007151 +Author: wangyidong +Date: Thu Dec 19 09:32:59 2019 +0800 + + * revert upgrade.php.tmp file. + +commit 33bcfd2fc8f2f558f27dd457eb881d07821fd863 +Author: wangyidong +Date: Thu Dec 19 09:31:17 2019 +0800 + + * finish task #6605. + +commit fffcd64aa0bb2a7df262e3bdde357f717b02875d +Author: wangyidong +Date: Thu Dec 19 09:15:43 2019 +0800 + + * finish task #6675. + +commit 3ed10d17f64bf7f99739ae336341447a5e47ee90 +Author: wangyidong +Date: Thu Dec 19 08:21:35 2019 +0800 + + * adjust style. + +commit 2ff8e8afbebc3da0cde66e5138e659af9106bed4 +Author: wangyidong +Date: Thu Dec 19 08:19:41 2019 +0800 + + * update zentao-integrated for xuanxuan. + +commit ed5f700a86c1887adc3f0cdbfece242566ef1361 +Author: wangyidong +Date: Thu Dec 19 08:17:01 2019 +0800 + + * finish task #6694. + +commit 44ca4924219d35e781815622b8a0209d090fe35d +Author: wangyidong +Date: Wed Dec 18 15:24:54 2019 +0800 + + * finish task #6697. + +commit 24dd889cf0660156614246529eb5014f26fe1c18 +Author: wangyidong +Date: Wed Dec 18 14:03:00 2019 +0800 + + * fix bug #2684. + +commit fff6abfaf697bdc7cd2cfb5813840bc62d341307 +Author: wangyidong +Date: Wed Dec 18 13:11:43 2019 +0800 + + * fix js error. + +commit f29fdfd106115c129ff0ac0bdc43e8d0c7398355 +Author: wangyidong +Date: Wed Dec 18 13:07:49 2019 +0800 + + * finish task #6760. + +commit d0c070436dcb25ff28da767f4d747b72a1857c1e +Author: wangyidong +Date: Wed Dec 18 13:05:52 2019 +0800 + + * code for story #4411. + +commit 8849f38d4ce787951e1ce847b83a8861fb85519d +Author: wangyidong +Date: Wed Dec 18 13:03:11 2019 +0800 + + * fix error. + +commit b0c98b5084cb914448519e8a5c3ee5d77852002f +Author: wangyidong +Date: Wed Dec 18 11:40:03 2019 +0800 + + * fix bug for login use api. + +commit 84bf1128415f759480bf13a6a1b031f646e4c049 +Merge: 28a7743f61 714b7e3585 +Author: wangyidong +Date: Wed Dec 18 10:17:13 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 28a7743f61aa1fd8e51da5bee0cfad0283187573 +Author: wangyidong +Date: Wed Dec 18 10:16:41 2019 +0800 + + * finish task #6675. + +commit 714b7e3585f767776bed1787d72530a376cf6547 +Author: Catouse +Date: Tue Dec 17 16:33:34 2019 +0800 + + * update zui.css, task #6748, bug #2401. + +commit 880d95175ddb2bca20f787f5ab3ff75b4f3eca8f +Merge: d1cbf5429a b3a214b819 +Author: reneeteng +Date: Tue Dec 17 15:04:52 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d1cbf5429ae921f7556f76ffe1a4e760d23b812c +Author: reneeteng +Date: Tue Dec 17 15:03:22 2019 +0800 + + * Xuan translation in ZenTao is updated. + +commit b3a214b819af5cf81fab35480d0ba5207122bb9d +Author: wangyidong +Date: Tue Dec 17 15:01:51 2019 +0800 + + * finish task #6668. + +commit 92e18a75f88362b7ee3ea12e2738b843a5b9c2fb +Merge: 251d465ea2 4517f9f4fd +Author: wangyidong +Date: Tue Dec 17 14:47:24 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4517f9f4fd0a17239bf93c972c8e5d13c465608d +Author: Catouse +Date: Tue Dec 17 14:37:38 2019 +0800 + + * fix cannot select text in kindeditor in ie11, task #6671, bug #2888. + +commit 251d465ea2a75ed55078690845b97f04282c8537 +Merge: 0ade42620c efa9ce5034 +Author: wangyidong +Date: Tue Dec 17 14:30:29 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0ade42620cca84e58a976727c0cb5212fd2c3a46 +Author: wangyidong +Date: Tue Dec 17 14:29:25 2019 +0800 + + * code for task #6759. + +commit efa9ce5034896bb95732543215cb64b203c86b06 +Author: Catouse +Date: Tue Dec 17 14:07:28 2019 +0800 + + * fix dropdown search list UI, task #6746, bug #2420. + +commit 9e14f6c61bfaa10c9a74fc9fff006a329b8bc9cc +Merge: bf3a4ba42c 914f3aaf19 +Author: wangyidong +Date: Tue Dec 17 11:19:01 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bf3a4ba42c31561a94e49db7dc79b07ead012576 +Author: wangyidong +Date: Tue Dec 17 11:07:04 2019 +0800 + + * finish task #6668. + +commit 914f3aaf19f98f44a19b86cb6f66bb4c58f01c76 +Author: Catouse +Date: Tue Dec 17 11:04:45 2019 +0800 + + * fix modal trigger error on load broken. + +commit 2f8beb146fc34d0e1aee8bc5e007abb568218b83 +Author: Catouse +Date: Tue Dec 17 10:13:11 2019 +0800 + + * fix clientLang undefined error. + +commit 4ea90b2f0d8abcdf8186b1e94d39d5dfd33ce509 +Author: Catouse +Date: Tue Dec 17 09:34:42 2019 +0800 + + * add ja language to zui and kindeditor. + +commit b45f5c8a68f779cf790acb7067ecca3e0638482a +Author: Catouse +Date: Mon Dec 16 17:41:28 2019 +0800 + + * add multi-language support, and fix UI of table statistic. + +commit a9f4bc8edd897ed38fbaa812c8d62be6d3b22a41 +Author: wangyidong +Date: Mon Dec 16 17:00:05 2019 +0800 + + * finish task #6760. + +commit 714835adaf0661cfb4f17d99cb0bb4012e46d7e7 +Merge: ee07401214 5d68dfefc0 +Author: wangyidong +Date: Mon Dec 16 15:55:33 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ee07401214f6440734cede705d36ae16dac4d9a8 +Author: wangyidong +Date: Mon Dec 16 15:55:10 2019 +0800 + + * fix bug. + +commit 5d68dfefc03a9cc7422729145a0a256e427f9721 +Author: liugang +Date: Mon Dec 16 15:06:31 2019 +0800 + + * Fix bug. + +commit 71bde53aa967f0114771efeeb7e34d7eacdd1d52 +Author: liugang +Date: Mon Dec 16 15:05:52 2019 +0800 + + * User can set id of a textarea. + +commit 2b2671e7abf41c8cff1eadea7f651df53d9fe5c3 +Author: wangyidong +Date: Mon Dec 16 13:50:56 2019 +0800 + + * finish task #6676. + +commit 76f4160ffcbbd79641cf3f74ea993df30fe3d309 +Author: wangyidong +Date: Mon Dec 16 13:13:48 2019 +0800 + + * finish task #6692. + +commit 784a0db6b66c78c071bed0bafed2433f18599b93 +Author: wangyidong +Date: Mon Dec 16 13:06:30 2019 +0800 + + * finish task #6697. + +commit 8e93cc95778803a96ad2ed079914ed67ee8c2493 +Merge: 7f056bc7e2 3f6ce05ee7 +Author: wangyidong +Date: Mon Dec 16 10:34:34 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7f056bc7e233b6647769bbadd101666ca9d63bfa +Author: wangyidong +Date: Mon Dec 16 10:34:05 2019 +0800 + + * finish task #6756. + +commit 80c7e0fa9bb4fa4eebd8b01f8b63bed1a418a384 +Author: wangyidong +Date: Mon Dec 16 10:10:39 2019 +0800 + + * finish task #6757. + +commit 3f6ce05ee76d42518ab666c381c5e2ceb89b7e83 +Author: Catouse +Date: Fri Dec 13 17:38:15 2019 +0800 + + * fix chosen drop_direction option not work as expected sometimes, task #6739, #bug #2443. + +commit 0451789e3aa9781a37020a92bd287dc041f1a7a6 +Author: aaronchen2k <462826@qq.com> +Date: Fri Dec 13 16:20:46 2019 +0800 + + watch branch + +commit b0782b1a26540c85c67558adabb6e7990141cf31 +Author: Catouse +Date: Fri Dec 13 16:14:32 2019 +0800 + + * improve UI of textarea autoresize, task #6742, bug #2429. + +commit 6ad8a814ce31661fcc32b5503c14754217b2eba8 +Author: wangyidong +Date: Fri Dec 13 16:13:50 2019 +0800 + + * adjust for branch. + +commit 39c8803c1e910b034453ec82b558c2db54209cc6 +Author: Catouse +Date: Fri Dec 13 16:05:20 2019 +0800 + + * fix input group border style in story views. + +commit 1925b1812e6c6dab63244253dcd3a243cde70ff9 +Author: wangyidong +Date: Fri Dec 13 15:11:40 2019 +0800 + + * finish task #2903. + +commit 1c6449df08febdf43d79d94eb4399d852db59704 +Author: Catouse +Date: Fri Dec 13 14:47:20 2019 +0800 + + * refactor code. + +commit 5b6839ac7bf876a194ab95ed5f61688ce46bbfd8 +Author: Catouse +Date: Fri Dec 13 14:47:13 2019 +0800 + + * querybox support get params from data-module and data-url attributes. + +commit 0f481a7f18ccba48f9dc064c6e694075d724bed4 +Author: Catouse +Date: Fri Dec 13 14:15:24 2019 +0800 + + * fix can click module tree on hidden, task #6683, bug #2857. + +commit f00f2bfa64649ee6ca0edc171ad3c47f9fe7781e +Author: aaronchen2k <462826@qq.com> +Date: Fri Dec 13 14:46:46 2019 +0800 + + git support + +commit 5e01c90a6e198489db4935fb0b9c372f12831cde +Author: aaronchen2k <462826@qq.com> +Date: Fri Dec 13 14:43:50 2019 +0800 + + git support + +commit 0fbb3d95b50427c9ae583302d337cbc70bfc60c0 +Merge: 4889c30d40 03203d01fb +Author: Yagami <976204163@qq.com> +Date: Fri Dec 13 14:39:01 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4889c30d405ad708ae9f48a8bf4e8e7d74afbae5 +Author: Yagami <976204163@qq.com> +Date: Fri Dec 13 14:38:42 2019 +0800 + + * Finish task #6678. + +commit ece270825290ae9ad73b703e69da2b403261a9c6 +Author: aaron <462826@qq.com> +Date: Fri Dec 13 14:37:53 2019 +0800 + + git support + +commit 93329f50fd7b3630cb9c0c1f25535678bc7d5f55 +Author: aaron <462826@qq.com> +Date: Fri Dec 13 14:34:43 2019 +0800 + + git support + +commit 4ec2ad34195d9a01d938083cc54061057c65060c +Author: aaron <462826@qq.com> +Date: Fri Dec 13 14:33:41 2019 +0800 + + git support + +commit 2b4fbf2355a0fad4768486b7e2bffcc0413de6b1 +Author: aaron <462826@qq.com> +Date: Fri Dec 13 14:32:24 2019 +0800 + + git support + +commit 03203d01fbe47b637eb5aa4006f43d6e21f54fd7 +Author: Catouse +Date: Fri Dec 13 14:11:42 2019 +0800 + + * fix auto scrolll page on search on #dropMenu. + +commit 3a12adb09cd9fc42cc78266e7788ccdadcc6fc72 +Author: Catouse +Date: Fri Dec 13 14:11:16 2019 +0800 + + * fix cannot resize image witch pasted from clipboard. + +commit a5a8751b8d8cd6df5084ddf7ec34d65a74aa9551 +Author: Catouse +Date: Fri Dec 13 14:10:31 2019 +0800 + + * finish task #6695, fix bug #2337. + +commit 76a7942daa32e6be0a78b08b226c847488e5f020 +Author: Yagami <976204163@qq.com> +Date: Fri Dec 13 13:21:12 2019 +0800 + + * Finish task #6679. + +commit 28a2ead76ab86745eb0d22f076a26eab5f4a42d4 +Author: aaron <462826@qq.com> +Date: Fri Dec 13 10:46:44 2019 +0800 + + git support + +commit 93e801dff4749ebd8eec0d34d060ffc1fab8bb0c +Merge: 4760eb835c 16b6da25af +Author: Yagami <976204163@qq.com> +Date: Fri Dec 13 10:20:01 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4760eb835c234337944d83bc82a3721184fb3ed1 +Author: Yagami <976204163@qq.com> +Date: Fri Dec 13 10:19:40 2019 +0800 + + * Fix project lang. + +commit 79591ae2f9b8ba5a291d3fd70892331ab122dde6 +Author: aaron <462826@qq.com> +Date: Fri Dec 13 09:49:46 2019 +0800 + + git support + +commit 98746091802da3ccf18f00ca73d4c29d73bf4506 +Author: aaron <462826@qq.com> +Date: Fri Dec 13 09:44:53 2019 +0800 + + git support + +commit d8676c8b89be9c6d499a672a2420cbb039c63f4c +Author: aaron <462826@qq.com> +Date: Fri Dec 13 09:40:58 2019 +0800 + + git support + +commit 1933a29ac602096dca62444fe74b8e7443adfa2f +Author: aaron <462826@qq.com> +Date: Fri Dec 13 09:38:19 2019 +0800 + + git support + +commit 8e146a8362d87a98517ae44254e17bcaf2e23a20 +Author: aaron <462826@qq.com> +Date: Thu Dec 12 20:04:00 2019 +0800 + + git support + +commit a325418a09d557284f822550556155babf753cd1 +Author: aaron <462826@qq.com> +Date: Thu Dec 12 19:43:32 2019 +0800 + + git support + +commit bd781151ce2426ff41225194105d76add17bea1e +Author: aaron <462826@qq.com> +Date: Thu Dec 12 18:23:16 2019 +0800 + + svn support + +commit 87c93dcfbaa01aabca5921c7e1ca333b97b9c78e +Author: aaron <462826@qq.com> +Date: Wed Dec 11 16:13:23 2019 +0800 + + jenkins server maintain + +commit 9fe8a6aba96076fa5b90b03d26c330471943f910 +Author: aaron <462826@qq.com> +Date: Wed Dec 11 16:08:00 2019 +0800 + + jenkins server maintain + +commit 2fda7c2a864fc2ce4eff218602d6f114cb91e255 +Author: aaron <462826@qq.com> +Date: Wed Dec 11 16:07:12 2019 +0800 + + jenkins server maintain + +commit 66dc0e1cb6fe5943afa5c17a8c78cda2053c92f1 +Author: aaron <462826@qq.com> +Date: Wed Dec 11 14:51:26 2019 +0800 + + jenkins GRUD + +commit 16b6da25afacf4038ffa60c1b48061f028f9c486 +Author: wangyidong +Date: Thu Dec 12 16:32:52 2019 +0800 + + * finish task #6685. + +commit fa83c252151c430c8554e78b35f8409c8735d9cd +Author: wangyidong +Date: Thu Dec 12 16:25:17 2019 +0800 + + * finish task #6715. + +commit f8ab23abf9d2039227489f8b324166b33e85ee44 +Merge: 739ecf718d b6604c1cb1 +Author: wangyidong +Date: Thu Dec 12 15:35:21 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 739ecf718dfb9f23a1858f083561ea44025c96a9 +Author: wangyidong +Date: Thu Dec 12 15:34:50 2019 +0800 + + * finish task #6670. + +commit b6604c1cb18cff66e08f26851fa729b915241629 +Merge: 99e7df4a91 cf814726d9 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 12 15:06:14 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 99e7df4a91e5c8852722aa542ca928715cb2d471 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 12 15:05:55 2019 +0800 + + * Finish task #6682. + +commit cf814726d9d7227e64bf3c9b170148093d0b23c3 +Author: guanxiying +Date: Thu Dec 12 14:50:05 2019 +0800 + + * Fix bug #2338. + +commit 4cd74bd08a2669ac2038ed336fc651a467f0735b +Author: guanxiying +Date: Thu Dec 12 14:49:02 2019 +0800 + + * Fix comments and add default referer. + +commit 192a412426cacb44fa333eb44eadbee0747ffcfd +Merge: ad947eb802 df74bb80cc +Author: wangyidong +Date: Thu Dec 12 14:38:39 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ad947eb802bab5c79b11c685af887f4a5ab445ab +Author: wangyidong +Date: Thu Dec 12 14:36:18 2019 +0800 + + * finish task #6668. + +commit df74bb80cc0b1a47bc9246eb5026395c7642d155 +Author: guanxiying +Date: Thu Dec 12 14:05:24 2019 +0800 + + * Finish task #6667. + +commit 4640b5dabb4e0c1feedc2f763a39cc8af5b6923c +Merge: 2ff715ce71 46b48a5363 +Author: wangyidong +Date: Thu Dec 12 13:50:08 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2ff715ce718907bcaae78c556bdddcbfbfb59e4e +Author: wangyidong +Date: Thu Dec 12 13:48:52 2019 +0800 + + * finish task #6672. + +commit 46b48a5363aa7ebeada30e734716cba2970c123b +Author: guanxiying +Date: Thu Dec 12 13:35:59 2019 +0800 + + * Fix bug #2462. + +commit f4e0e729f3420ddf7897a738335d62a8e225f8e0 +Merge: 3c2c1c4762 f487b70a36 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 12 13:17:56 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3c2c1c4762bd8669cd96a03fa8cd88c62961af3f +Author: Yagami <976204163@qq.com> +Date: Thu Dec 12 13:17:42 2019 +0800 + + * Finish task #6684. + +commit f487b70a363c135722fc4a233178550625f5b70d +Merge: e0c079e6c3 35d81782ac +Author: wangyidong +Date: Thu Dec 12 10:33:40 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e0c079e6c3f3aa46ee04000ad4b099cd2f788846 +Author: wangyidong +Date: Thu Dec 12 10:13:29 2019 +0800 + + * finish task #6697. + +commit 35d81782acf1aa2272ffdd937144f1b0788876b2 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 12 09:56:44 2019 +0800 + + * Finish task #6687. + +commit b0175bb868b552ec5d10622db766bde23ec58657 +Author: guanxiying +Date: Thu Dec 12 09:48:54 2019 +0800 + + * Fix bug #2475. + +commit afc452bc220caacc210d4aa8e11da7d4e86311e0 +Author: guanxiying +Date: Thu Dec 12 09:17:45 2019 +0800 + + * Fix bug #2460. + +commit 97ed76efde263ea320ce48ebf89fda1240ee4621 +Merge: d6f0dfb6bd a76611d906 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 12 09:04:04 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d6f0dfb6bde753fd63dda56cfa962764d16fe908 +Author: Yagami <976204163@qq.com> +Date: Thu Dec 12 09:03:47 2019 +0800 + + * Finish task #6688. + +commit a76611d9061f51145264fb1cca9d36e738881340 +Merge: b68c0ace0f 88415cc9cd +Author: wangyidong +Date: Thu Dec 12 08:59:43 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b68c0ace0fe050f632e3d1569bde77b62b248489 +Author: wangyidong +Date: Thu Dec 12 08:59:19 2019 +0800 + + * finihsh task #6669. + +commit 5688747029409fc449dfadc5638d34c2b4ec13c9 +Author: wangyidong +Date: Thu Dec 12 08:58:32 2019 +0800 + + * fix page count. + +commit 88415cc9cd558b4ab787286ab1d05270cfe0a911 +Merge: 83dbfde648 e4bcb12af3 +Author: guanxiying +Date: Wed Dec 11 17:39:30 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 83dbfde648ef2261762e36e9fb5bebfb67d6a8a5 +Author: guanxiying +Date: Wed Dec 11 17:35:43 2019 +0800 + + * Fix bug #2461. + +commit b5df580b608c72fef880635978928f59f706de67 +Author: guanxiying +Date: Wed Dec 11 16:41:43 2019 +0800 + + * update user view when delete a project. + +commit 8a7c25b6015cc031d64a6aedf8ef8e164594eb03 +Author: wangyidong +Date: Wed Dec 11 16:07:49 2019 +0800 + + * finish task #6673. + +commit e4bcb12af3fe6d3a8ac48144fa2b6108f41a2ca4 +Merge: 1553a3258c db77ddfd47 +Author: Yagami <976204163@qq.com> +Date: Wed Dec 11 17:15:05 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1553a3258c7c9da62dcb42dd6ecb367b9d7a1cb2 +Author: Yagami <976204163@qq.com> +Date: Wed Dec 11 17:14:47 2019 +0800 + + * Finish task #6689. + +commit db77ddfd4783631f26234d20c00bb858ed7413b8 +Author: guanxiying +Date: Wed Dec 11 16:41:43 2019 +0800 + + * update user view when delete a project. + +commit ca4b178c7d0fc26b8420cd463c17c0ce83d16dac +Author: wangyidong +Date: Wed Dec 11 16:09:03 2019 +0800 + + * adjust for get file by object. + +commit ddddf5881302851abeabbc6e8f710313cf6fb7e0 +Author: wangyidong +Date: Wed Dec 11 16:07:49 2019 +0800 + + * finish task #6673. + +commit f1444e22fb127a3cf9a305160885fe33622a33aa +Author: wangyidong +Date: Wed Dec 11 15:24:09 2019 +0800 + + * code for task #2335. + +commit f5fd7e5909a124703d7d99962e3052748438ec5c +Author: wangyidong +Date: Wed Dec 11 14:58:29 2019 +0800 + + * finish task #6698. + +commit 97c7515b4cd1640e213c42dafe83bd943a67f7ac +Author: wangyidong +Date: Wed Dec 11 14:19:31 2019 +0800 + + * finish task #6702. + +commit f4f330db30b15beba1c9a4a95466189763133777 +Author: wangyidong +Date: Wed Dec 11 14:04:11 2019 +0800 + + * finish task #6703. + +commit 3b767bcf5eed0fd279ee8ae5378ead6a8ba9339f +Merge: e619c68e58 125e2375f8 +Author: wangyidong +Date: Wed Dec 11 11:32:14 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e619c68e589d80a557eedc9d42c9c6ee4d4433f3 +Author: wangyidong +Date: Wed Dec 11 11:31:48 2019 +0800 + + * finish task #6705. + +commit 125e2375f89be2debad960195d32b41ebf5b0e3e +Author: chenfei +Date: Wed Dec 11 11:15:00 2019 +0800 + + * Adjust variable name. + +commit f686ca29be34c78fa51183a2fbccb3d62b896be0 +Merge: eac983c703 0b62823d89 +Author: Yagami <976204163@qq.com> +Date: Wed Dec 11 09:56:29 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit eac983c70340a796d1603e2166013618cd210ad5 +Author: Yagami <976204163@qq.com> +Date: Wed Dec 11 09:56:11 2019 +0800 + + * Finish task #6730. + +commit 0b62823d891de950e8679525940f7b64fb8319ec +Author: guanxiying +Date: Wed Dec 11 08:59:13 2019 +0800 + + * Fix bug #2463. + +commit 9d1e3969e87aba7f44bbbeb84a8ccce4ffab6d55 +Author: wangyidong +Date: Tue Dec 10 17:08:58 2019 +0800 + + * adjust for task #6709. + +commit df18cbefb042d09dff76e661a64d91439ca40d30 +Author: Yagami <976204163@qq.com> +Date: Tue Dec 10 16:36:52 2019 +0800 + + * Fix doc order. + +commit f8c530b3ee60628362e314c794ca9c7db47b267b +Author: wangyidong +Date: Tue Dec 10 15:52:57 2019 +0800 + + * code for task #6707. + +commit 52460dd80d5445ec27919173984e9feed5f7a35c +Author: wangyidong +Date: Tue Dec 10 15:45:06 2019 +0800 + + * code for task #6708. + +commit 2d979228ebd669c17a6b77b69ca95ba323ba40ff +Merge: cd5c44f211 727c591a68 +Author: wangyidong +Date: Tue Dec 10 14:20:19 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cd5c44f21147d72349e78a2af3824831f51266a0 +Author: wangyidong +Date: Tue Dec 10 14:07:42 2019 +0800 + + * rm useless code. + +commit 6630dd0bb73aefa8567dbe3f154ec52231e3573c +Author: wangyidong +Date: Tue Dec 10 13:55:01 2019 +0800 + + * code for task #6708. + +commit 727c591a68fa1ba082ab82721b47f8b3f2de9c4e +Author: guanxiying +Date: Tue Dec 10 10:58:07 2019 +0800 + + * Fix bug #2471. + +commit 0064f79335d04490cc070183b36d38859c80e6e6 +Author: guanxiying +Date: Tue Dec 10 10:39:45 2019 +0800 + + * Fix miss ) bug. + +commit 0c8fd46f7bb0260ded9b1f0a8ae0c20cbe7f6672 +Merge: 8d0f8521ba 85355b6498 +Author: wangyidong +Date: Mon Dec 9 14:30:35 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8d0f8521ba5d3aff8eac32a1d61e32dd1619a9eb +Author: wangyidong +Date: Mon Dec 9 14:29:43 2019 +0800 + + * finish task #6623. + +commit 85355b649871bcf7b5d75b867ad1aaaf0bfe0ad3 +Author: aaron <462826@qq.com> +Date: Mon Dec 9 14:06:56 2019 +0800 + + test + +commit cba972f895e9998edcf1d81e22bbc977958a2b16 +Author: aaron <462826@qq.com> +Date: Mon Dec 9 14:06:03 2019 +0800 + + test + +commit 1d0ce812f76e7ccc66ddd76c8f630b6f70eca6eb +Author: Catouse +Date: Mon Dec 9 11:06:42 2019 +0800 + + * fix error when .main-actions is empty. + +commit 0e897d7963849098df8be87a92923671c64d7b22 +Merge: 4e19d01118 995bfb84d5 +Author: reneeteng +Date: Fri Dec 6 14:50:57 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4e19d01118185679fb23a9b2ea35b34a89a3eea5 +Author: reneeteng +Date: Fri Dec 6 14:50:04 2019 +0800 + + * Update social media links. + +commit 995bfb84d573a4375ba7c2e5ab00e841e0633303 +Author: wangyidong +Date: Fri Dec 6 14:05:43 2019 +0800 + + * finish task #6651. + +commit f77442271ea4cd412bf3162d6c842345a43058f7 +Author: wangyidong +Date: Fri Dec 6 13:50:47 2019 +0800 + + * finish task #6616. + +commit 845ff37b238ddf4429c51efefbbb3031ae70342c +Merge: 7570923bc0 dfdb95be06 +Author: wangyidong +Date: Fri Dec 6 13:12:48 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7570923bc0c64d82842fdd212b71a84dd6ff5abb +Author: wangyidong +Date: Fri Dec 6 13:12:26 2019 +0800 + + * finish task #6651. + +commit dfdb95be06d188a5b8c6824567f33b51ab13203f +Merge: add871b1a8 bfe2535178 +Author: Catouse +Date: Fri Dec 6 11:19:03 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit add871b1a89032e8fdf1e4d19a4b477df0f85cce +Author: Catouse +Date: Fri Dec 6 11:18:58 2019 +0800 + + * prevent hotkey for navigation when page with modal opened, task #6643, bug #2240. + +commit bfe2535178dac1d54b07aefedb4e3c6fd74262d9 +Author: wangyidong +Date: Fri Dec 6 09:29:59 2019 +0800 + + * finish task #6649. + +commit ca9293ba980dd5ac4d1d3978f760e4b4027268a8 +Author: wangyidong +Date: Fri Dec 6 08:49:05 2019 +0800 + + * finish task #6627. + +commit 168ce9320390bfff9b5c82ddd64f1392f58eaf74 +Author: wangyidong +Date: Thu Dec 5 17:00:08 2019 +0800 + + * finish task #6620. + +commit 103568e62986400fcd70760cb47599658e3c431e +Author: wangyidong +Date: Thu Dec 5 15:01:11 2019 +0800 + + * finish task #6628. + +commit ae2c117104763d8cf683dcde6f8a7fec00337651 +Author: wangyidong +Date: Thu Dec 5 14:26:30 2019 +0800 + + * finish task #6640. + +commit 34fb809d3130c68ccbd6f4ad302a211760ba7376 +Author: wangyidong +Date: Thu Dec 5 14:25:42 2019 +0800 + + * die for apiModel sql method. + +commit bedeaaf39ef7084b9a455b9d9dba71e2db357201 +Author: wangyidong +Date: Thu Dec 5 13:16:27 2019 +0800 + + * code for tutorial. + +commit 7d6913d91c9bcf3d87059c03abad79ad26eccf72 +Author: wangyidong +Date: Thu Dec 5 11:25:12 2019 +0800 + + * finish task #6656. + +commit 2115b47e5975a10a8d9c9dba0064a63753825956 +Author: wangyidong +Date: Thu Dec 5 10:18:08 2019 +0800 + + * adjust style for edit module. + +commit ebde890513bd829602593dba86d0477d686cb170 +Author: wangyidong +Date: Thu Dec 5 09:58:47 2019 +0800 + + * finish task #6658. + +commit 5b2cdc573f7579a6d909ea709dd7fd3631f1978c +Author: wangyidong +Date: Thu Dec 5 09:33:32 2019 +0800 + + * finish task #6659. + +commit 3d68e30c6755a400d88e6e6f8dd18cdbb30eaae7 +Author: wangyidong +Date: Thu Dec 5 09:13:32 2019 +0800 + + * finish task #6650. + +commit a4cf41780cf20d6fe3d9da3c3dafb9ca0473e26d +Author: wangyidong +Date: Thu Dec 5 08:58:44 2019 +0800 + + * fix error. + +commit 329fa9056eebb0fb6e0908813cec7e7d002992c7 +Author: wangyidong +Date: Thu Dec 5 08:58:10 2019 +0800 + + * fix for pro login. + +commit 68de6d0ff244157c9f6009e41e0571b7aaf665e5 +Author: wangyidong +Date: Wed Dec 4 17:27:44 2019 +0800 + + * code for task #6638. + +commit e97a72469e96bdaa292b0e1d90c64774d759f0fd +Author: wangyidong +Date: Wed Dec 4 16:42:25 2019 +0800 + + * adjust bug for show task module. + +commit ef36818cad47071692310adcae20f0b075f1e96d +Author: wangyidong +Date: Wed Dec 4 16:33:31 2019 +0800 + + * fix sql error. + +commit 36c1a6d2c49014236eb1040dfe91c68f84d582d1 +Author: wangyidong +Date: Wed Dec 4 16:10:06 2019 +0800 + + * finish task #6647. + +commit 7276d8fbf82818eb13a4b3ead971e06c81cb1235 +Author: wangyidong +Date: Wed Dec 4 15:43:16 2019 +0800 + + * finish task #6646. + +commit 2bfbd7b122e095d284bfaf21680d8172d8713986 +Author: wangyidong +Date: Wed Dec 4 15:12:30 2019 +0800 + + * finish task #6641. + +commit 71fffa5458c29a1616a2d2e56fd69783892623e3 +Author: wangyidong +Date: Wed Dec 4 15:03:29 2019 +0800 + + * finish task #6638. + +commit de4818c724225bb68f9c8982c490360c6fa3f62b +Author: wangyidong +Date: Wed Dec 4 14:47:33 2019 +0800 + + * finish task #6637. + +commit 32d9b71668e2e75900a243a4419de4c2b74eb13f +Author: wangyidong +Date: Wed Dec 4 13:52:35 2019 +0800 + + * finish task #6630. + +commit 023ae5e5ac73a707197cb493b4606cb7a246ce6f +Merge: 6f205e288b d165267bc5 +Author: wangyidong +Date: Wed Dec 4 13:30:02 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6f205e288b462c0c85f3ba5951ec11912771df4c +Author: wangyidong +Date: Wed Dec 4 13:28:51 2019 +0800 + + * finish task #6629. + +commit d165267bc5a282a02cdb497c29f08db979f84b99 +Author: reneeteng +Date: Wed Dec 4 13:23:43 2019 +0800 + + * Update German and French install files. + +commit 41479d2d00cb320057f16cdc3c65f6ccab3af370 +Merge: eaf3d47dd0 c844b24c46 +Author: reneeteng +Date: Wed Dec 4 13:17:31 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit eaf3d47dd09fa1ac4a29e40d687732ce9973c333 +Author: reneeteng +Date: Wed Dec 4 13:17:01 2019 +0800 + + * Removed whatsapp group info. + +commit c844b24c469b0f218399c507ebc5b2d9d036bce9 +Author: wangyidong +Date: Wed Dec 4 13:15:44 2019 +0800 + + * finish task #6625. + +commit e8db459f5ff82141d410a2cedae252b5ba058fa2 +Author: wangyidong +Date: Wed Dec 4 11:33:00 2019 +0800 + + * finish task #6622. + +commit 9f558c040ba90a47fa4c7bd951a838309d30c30a +Merge: abbc224527 da0a587cdd +Author: wangyidong +Date: Wed Dec 4 11:25:38 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit abbc22452709590e7e0e0c5a762a6942e3b0b91b +Author: wangyidong +Date: Wed Dec 4 11:18:45 2019 +0800 + + * code for task #6621. + +commit b404be6e743712e35547bf68417828d961fd4d50 +Author: wangyidong +Date: Wed Dec 4 11:16:59 2019 +0800 + + * finish task #6621. + +commit da0a587cddb26887e75fc60bfbd7500addb45187 +Author: reneeteng +Date: Wed Dec 4 10:57:31 2019 +0800 + + * Update twitter account. + +commit c7f0afe4239c36444a9738bbea21d2a0839d270c +Author: wangyidong +Date: Wed Dec 4 10:32:42 2019 +0800 + + * finish task #6613. + +commit fd139c56a127f1a5ab5e23da7b32c51ce68f458f +Author: wangyidong +Date: Tue Dec 3 16:58:28 2019 +0800 + + * finish task #6616. + +commit 2241f96e679b370f5f18d08f1da866dff61a58ce +Author: wangyidong +Date: Tue Dec 3 16:53:22 2019 +0800 + + * finish task #6617. + +commit 5af6fc121891eaa5ab7ad1496c5f6706ecbb8320 +Author: wangyidong +Date: Tue Dec 3 11:45:28 2019 +0800 + + * finish task #6611. + +commit b0ed590dc9269b9ab1ee1af0f07882513b295201 +Author: wangyidong +Date: Tue Dec 3 11:11:42 2019 +0800 + + * fix bug. + +commit 0d4a3595d5201b9dfa4650515869175482328a4e +Author: wangyidong +Date: Tue Dec 3 10:07:24 2019 +0800 + + * finish task #6610. + +commit 2af0928cba6bab149a0a5415eb04fad537974227 +Author: wangyidong +Date: Tue Dec 3 10:02:06 2019 +0800 + + * code for task #6608. + +commit 0826cc3ca3ad591ae7d346aa2463d653a7f4d80f +Author: wangyidong +Date: Tue Dec 3 09:58:39 2019 +0800 + + * finish task #6609. + +commit 09a7bb11360a63159bb6c9c3f2f3fec663e30009 +Author: wangyidong +Date: Tue Dec 3 09:57:35 2019 +0800 + + * fix bug #2884. + +commit 9621e5e4fafff159fad9602d1e57280b16cd9467 +Author: wangyidong +Date: Tue Dec 3 09:33:12 2019 +0800 + + * finish task #6608. + +commit d4b9ccbab8661cd19b7b19cfd7f763b391026dca +Author: wangyidong +Date: Mon Dec 2 17:05:26 2019 +0800 + + * finish task #6606. + +commit e4ce5d1c02b0596482c684a8b3bf85743783c4a2 +Author: wangyidong +Date: Mon Dec 2 13:27:43 2019 +0800 + + * finish task #4438. + +commit d046d527074983d6353cb2228149d59848d05273 +Merge: 01e942c2c9 8a9ece9db2 +Author: wyd621 +Date: Fri Nov 29 16:34:23 2019 +0800 + + Merge pull request #41 from shus521/master + + [bug修复]当计划绑定多个项目时，计划列表显示的总条数(recTotal)不正确，需进行去重处理 + +commit 8a9ece9db22194b53ba29b0e943242d29c7e29c4 +Author: shilei <1780848749@qq.com> +Date: Fri Nov 29 16:16:40 2019 +0800 + + [bug修复]当计划绑定多个项目时，计划列表显示的总条数(recTotal)不正确，需进行去重处理 + +commit 01e942c2c93753983afa8ee9dc097fcde3616a24 (tag: zentaopms_11.7.stable_20191129) +Author: wangyidong +Date: Fri Nov 29 14:58:20 2019 +0800 + + * adjust for integrate xuanxuan. + +commit 1ff4817d159238f25ca36ee6560f07d61d99e23b +Author: wangyidong +Date: Fri Nov 29 14:27:48 2019 +0800 + + * fix for change password in xx. + +commit e6a04c0a6a153ba28927dd52548c02c64d4435af +Author: Catouse +Date: Fri Nov 29 13:31:11 2019 +0800 + + * fix getUserByUserID undefined error. + +commit 97f125b3b4a30625061385ceedc7e72b3e30dd55 +Author: wangyidong +Date: Fri Nov 29 13:15:21 2019 +0800 + + * change for merge xuanxuan. + +commit 7412623596d40b9f161c0b39648c6526c40d72f7 +Author: wangyidong +Date: Fri Nov 29 11:02:15 2019 +0800 + + * adjust for xuanxuan. + +commit a5ef283e58d4a320398c580f95a7fc3e9bbd005c +Author: wangyidong +Date: Fri Nov 29 10:19:51 2019 +0800 + + * adjust for xuanxuan. + +commit 67b96b8cb3296e2813e73ec0e65bb99db36f2b06 +Author: wangyidong +Date: Fri Nov 29 10:06:55 2019 +0800 + + * add btn-wide class for btn on install and upgrade page. + +commit d14ee18ef4de10946d4844ac6a0fb799972d8fe5 +Author: wangyidong +Date: Fri Nov 29 09:43:31 2019 +0800 + + * adjust for xuanxuan. + +commit 2033a0c0e9b0d10e91839874f2038a317ca6bd36 +Author: wangyidong +Date: Fri Nov 29 09:23:22 2019 +0800 + + * upgrade for xuanxuan. + +commit 6e825184bec5cb904f8f3af594459db056a50f77 +Author: wangyidong +Date: Fri Nov 29 09:08:55 2019 +0800 + + * fix bug for xuanxuan. + +commit f27516a1a52ad695c63d24dd13f434fa44a448a0 +Author: wangyidong +Date: Fri Nov 29 08:27:10 2019 +0800 + + * adjust for newest xuanxuan. + +commit f03a0975c2a04ab681e3a05fae5425169a93ec2c +Merge: 44f35afafe 8408648db5 +Author: wangyidong +Date: Thu Nov 28 17:33:27 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 44f35afafe93555064f7c6d80ede4023f3a74a9c +Author: wangyidong +Date: Thu Nov 28 17:30:57 2019 +0800 + + * Compatible xuanxuan newest version. + +commit 8408648db5e2dea33f05a7bde7b0ab006067b86c +Author: Yagami <976204163@qq.com> +Date: Thu Nov 28 10:52:35 2019 +0800 + + * Fix client create bug view style. + +commit e8e1357b909ce516a83520041c6ff7a1c02d7399 +Author: wangyidong +Date: Thu Nov 28 09:45:28 2019 +0800 + + * finish task #6601. + +commit 6040e2110965765c8e31e334cc663fd97a5a563a +Merge: 15014e63b4 3dd1428078 +Author: wangyidong +Date: Thu Nov 28 09:36:52 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 15014e63b4f66a86f44aee4155e66efc5d766e1a +Author: wangyidong +Date: Thu Nov 28 09:35:58 2019 +0800 + + * add standard sql. + +commit ecbf8220da9ce73c03e25c32a68b4899e2c3b0e4 +Author: wangyidong +Date: Thu Nov 28 09:29:36 2019 +0800 + + * add new version and upgrade. + +commit 3dd14280785fda00372193a3b8889210828148a2 +Merge: 97bae2e030 208852492f +Author: Yagami <976204163@qq.com> +Date: Wed Nov 27 17:14:21 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 97bae2e030916a56ea820bbfae54f5aac2e6801f +Author: Yagami <976204163@qq.com> +Date: Wed Nov 27 17:14:09 2019 +0800 + + * Fix code logic. + +commit 208852492f90d9118c46b673ec067c0fe3a0b6f0 +Author: guanxiying +Date: Wed Nov 27 15:14:30 2019 +0800 + + * Fix 。in en lang file. + +commit c31564f857d334b3b9be3974312eabe578f95a2c +Author: guanxiying +Date: Wed Nov 27 15:12:17 2019 +0800 + + * Strtoupper sp. + +commit 4c11de78338995c816daeb02ca1c3be294d763bf +Author: wangyidong +Date: Wed Nov 27 14:23:01 2019 +0800 + + * fix bug for update child task. + +commit 2604b595bac3e7d153d674a1cddeb1572486c1ad +Author: wangyidong +Date: Wed Nov 27 13:48:01 2019 +0800 + + * finish task #6589. + +commit 21483f1be5f1b038287dba007b0ccc5549cd4981 +Merge: 6764ead7a6 4e4281927a +Author: wangyidong +Date: Wed Nov 27 11:25:47 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6764ead7a6c3e698ad3c83b76fc820fe292c229b +Author: wangyidong +Date: Wed Nov 27 11:25:19 2019 +0800 + + * adjust for export with work flow. + +commit 4e4281927a9d7d7b83b3eff7f5291177bf939751 +Merge: d9531f33e7 f8f4db9098 +Author: Yagami <976204163@qq.com> +Date: Wed Nov 27 10:35:55 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d9531f33e7b80fc4a1bf716dc9b3d907f4cf5718 +Author: Yagami <976204163@qq.com> +Date: Wed Nov 27 10:35:29 2019 +0800 + + * Add key 0 to module pairs. + +commit f8f4db90982712884e8d742adef43dace706bf81 +Merge: 2452e992de c961d47610 +Author: wangyidong +Date: Wed Nov 27 10:24:49 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2452e992dee1f9db619139aff86161fcf73b37df +Author: wangyidong +Date: Wed Nov 27 10:24:17 2019 +0800 + + * code for task #6566. + +commit c961d4761071002ff428a919509826e68cc0e50e +Merge: 383a2e236b 2caa233687 +Author: Yagami <976204163@qq.com> +Date: Wed Nov 27 10:05:46 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 383a2e236b241688a7100ae1ea18e4c775263c4d +Author: Yagami <976204163@qq.com> +Date: Wed Nov 27 10:05:25 2019 +0800 + + * Finish task #6579. + +commit 2caa233687626fc58a28ba3299301b95eb7a40c6 +Author: wangyidong +Date: Wed Nov 27 09:32:49 2019 +0800 + + * finish task #6596. + +commit e00aa6c9fd7069a621d65e3ecbdf7fab9cead055 +Merge: 47955f9ec4 f1949ae5de +Author: wangyidong +Date: Wed Nov 27 09:27:47 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 47955f9ec4864b7c316e8e8226d4b5a7fe55a493 +Author: wangyidong +Date: Wed Nov 27 09:27:25 2019 +0800 + + * finish task #6597. + +commit f1949ae5de29f5044f12fb214217ebc6fe940888 +Author: guanxiying +Date: Tue Nov 26 17:38:52 2019 +0800 + + * Go to my index page when concept inited. + +commit e7df75ce8a9c1bc527f72c132f5e042a67cb1230 +Author: guanxiying +Date: Tue Nov 26 17:29:46 2019 +0800 + + * Set httponly false to projectMode cookie. + +commit 1f897b5309c34d44f61115a9add226b6c8b00a95 +Author: guanxiying +Date: Tue Nov 26 17:17:00 2019 +0800 + + * Fix missing ; . + +commit 8af89d802667876bc6ef36131a3d40a9a529c1f7 +Author: guanxiying +Date: Tue Nov 26 16:58:14 2019 +0800 + + * set httponly false for cookie written by js. + +commit d246b363d62a0988b1b50c7a88d3cd3c8570542e +Author: guanxiying +Date: Tue Nov 26 16:34:38 2019 +0800 + + * Set httpOnly false for downloading and selfClose cookie. + +commit 0e87a83f83b382650be94798285f894ddb5a491c +Merge: 5290e81623 f698d89d1c +Author: Yagami <976204163@qq.com> +Date: Tue Nov 26 15:50:16 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5290e8162362eb920d535c88eee84d30a14f7159 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 26 15:49:37 2019 +0800 + + * Finish task #6575. + +commit f698d89d1c9da40ce100f62e1890db2f87d7764c +Merge: 87218f6f02 7460f2f8fd +Author: wangyidong +Date: Tue Nov 26 15:46:46 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 87218f6f02e7ccdc5f73f29010e24988e248b52f +Author: wangyidong +Date: Tue Nov 26 15:43:58 2019 +0800 + + * finish task #6580. + +commit 7460f2f8fd46c435c85e32131122cf49ad062f18 +Author: guanxiying +Date: Tue Nov 26 15:40:49 2019 +0800 + + * Fix save story common bug. + +commit f2ed384e7aecb0e4f6c4081726ed374c952acdb5 +Merge: 549a677a87 fc7e7dc697 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 26 15:37:40 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fc7e7dc697c5c2c63014a23b12dcebd61c490849 +Author: guanxiying +Date: Tue Nov 26 15:25:59 2019 +0800 + + * Remove unused code. + +commit 0c2dd8d390a472f0f50c8ed13f5c8bea3a47db01 +Author: guanxiying +Date: Tue Nov 26 15:18:55 2019 +0800 + + * Add flow.js. + +commit 549a677a873fdce03e47e7b2764f8219e9f0ec4a +Author: Yagami <976204163@qq.com> +Date: Tue Nov 26 15:05:41 2019 +0800 + + * Finish task #6588. + +commit ef5afcf3b4ff4a37fb9566d81df5b5aa7071cf1a +Author: Yagami <976204163@qq.com> +Date: Tue Nov 26 14:34:12 2019 +0800 + + * Finish task #6585. + +commit 0509d13b9645ed3a3b07643d251958fd0bf06831 +Merge: 9358057416 fd51e64f48 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 26 14:31:37 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 93580574160bedb0d57a0c36253d4bc719b6ec24 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 26 14:31:22 2019 +0800 + + * Finish task #6492. + +commit fd51e64f4868cffd51b399205278c94fba29d564 +Merge: dfed1526d6 41c510df8d +Author: guanxiying +Date: Tue Nov 26 14:14:44 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit dfed1526d6c096f05ae32ead3d4673b2810b800b +Author: guanxiying +Date: Tue Nov 26 14:14:18 2019 +0800 + + * Finish task 6569. + +commit 9a74ca9c40ad66b5517e20ec8587f2f63f6af188 +Author: guanxiying +Date: Tue Nov 26 14:13:45 2019 +0800 + + * Finish task 6569. + +commit 41c510df8de5b48490f21cfb2bc04d32540e7c94 +Author: wangyidong +Date: Tue Nov 26 14:06:19 2019 +0800 + + * code for task #6584. + +commit 4c1bb0f6a80ad7bf55bf8e12cb14616b0d7b1d74 +Author: wangyidong +Date: Tue Nov 26 13:51:21 2019 +0800 + + * finish task #6584. + +commit 498868044931bf767d2fa2947769146a129514a7 +Author: wangyidong +Date: Tue Nov 26 13:49:20 2019 +0800 + + * finish task #6577. + +commit 8b755da228af617931d35563a868700b95f5e33e +Author: guanxiying +Date: Tue Nov 26 13:35:09 2019 +0800 + + * Finish task #6571. + +commit 01714d62e67ce7cc93a88fca4295dbec5ee472b0 +Author: wangyidong +Date: Tue Nov 26 13:23:23 2019 +0800 + + * finish task #6573. + +commit 7c3655d11d63c691998d928bb2662109a00be995 +Author: wangyidong +Date: Tue Nov 26 11:30:03 2019 +0800 + + * adjust code. + +commit 345a01ff1582430299908cd35209813115ae1c1a +Author: wangyidong +Date: Tue Nov 26 11:17:13 2019 +0800 + + * finish task #6583. + +commit 06d232c4aeef2d1ac906184126c091c61cece03a +Merge: eaba6528f1 d98082f597 +Author: wangyidong +Date: Tue Nov 26 11:05:10 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit eaba6528f1e688645cdfa445ad0761dcaaf10c49 +Author: wangyidong +Date: Tue Nov 26 11:04:47 2019 +0800 + + * finish task #6598. + +commit fff27470c1b00612340d093288f7a0be49f28e1a +Author: wangyidong +Date: Tue Nov 26 11:04:33 2019 +0800 + + * adjust code. + +commit 90122b67b971bba967c14d83c17e779203322d79 +Author: wangyidong +Date: Tue Nov 26 11:03:45 2019 +0800 + + * adjust code. + +commit d98082f59779eb53346919ecac8208fee9b421ad +Merge: 994823a24c 6976079958 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 26 10:45:11 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 994823a24ccf2eb864c8ec86bac2e1f6ff2153db +Author: Yagami <976204163@qq.com> +Date: Tue Nov 26 10:44:43 2019 +0800 + + * Code for task #6484. + +commit 6976079958b6473ac3940bec28f8f2234bcc9e8c +Merge: d260de3949 c76de78022 +Author: guanxiying +Date: Tue Nov 26 10:12:05 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c76de78022af38f982d5fd57f197c3bc473ed17c +Author: wangyidong +Date: Tue Nov 26 10:10:24 2019 +0800 + + * finish task #6593. + +commit f55e28a6fd82b50b751946a078c345fd49d79473 +Author: wangyidong +Date: Tue Nov 26 10:09:51 2019 +0800 + + * finish task #6592. + +commit d260de394986410d2dda3434112dccd5d9d0bf50 +Author: guanxiying +Date: Tue Nov 26 10:05:08 2019 +0800 + + * Finish task #6572. + +commit 57d676b8213a86722fb5f55b9d39fecbadb7cd65 +Merge: cbf2352e68 143310de0c +Author: guanxiying +Date: Tue Nov 26 09:37:08 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 143310de0cb7f24c1e88bfa310f62de8ab197c0e +Merge: 0763c4288d 33c26a81b8 +Author: wangyidong +Date: Tue Nov 26 09:36:17 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0763c4288d2473b6b979dfbff79cea15e19103c9 +Author: wangyidong +Date: Tue Nov 26 09:35:27 2019 +0800 + + * finish task #6567. + +commit cbf2352e6878bb74b52abc499c13f01d85f7bb7c +Merge: 0ec359908e 33c26a81b8 +Author: guanxiying +Date: Tue Nov 26 09:29:07 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 33c26a81b8167cb562432fb96f19ca5210fe5b85 +Merge: cadc64c628 685235c1e7 +Author: Catouse +Date: Tue Nov 26 09:28:29 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cadc64c62886b149b15f040175974b01df215a96 +Author: Catouse +Date: Tue Nov 26 09:28:22 2019 +0800 + + * fix chosen style in input-group. + +commit 0ec359908e36498ec039246339e11f4ae0f3e94a +Author: guanxiying +Date: Tue Nov 26 09:22:01 2019 +0800 + + * Finish task #6578. + +commit 685235c1e7ca2d8d7c716657053f12ed067635b0 +Author: guanxiying +Date: Tue Nov 26 09:20:26 2019 +0800 + + * Finish task #6581. + +commit cffb3761ba06590212e77bcdbd49c2777207094d +Author: guanxiying +Date: Tue Nov 26 09:11:10 2019 +0800 + + * Use " inatead of ' to quote storyCommon. + +commit 1385c7163ec936c1595561661fe4b0499e5f516c +Author: guanxiying +Date: Tue Nov 26 09:04:02 2019 +0800 + + * Use processStatus show testtask status. + +commit 37d0e1d89af33aa955a71e09b68dd4ef5b6f40d3 +Author: guanxiying +Date: Tue Nov 26 08:47:12 2019 +0800 + + * Add distinct to bug type query sql. + +commit 3dacf7d80eb02472bafbabaf4eaa670d2d16bee1 +Author: guanxiying +Date: Tue Nov 26 08:44:47 2019 +0800 + + * Add acl index of product and project table. + +commit 1188868ab8bd54500fd2126541520f862c1c519f +Merge: 5b02546da1 515adc12c8 +Author: Catouse +Date: Mon Nov 25 16:38:11 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5b02546da1a8604a01fb21803369819017e38013 +Author: Catouse +Date: Mon Nov 25 16:37:57 2019 +0800 + + Revert "* upgrade jquery to 3.4.1, task #6533, bug #2755, task #6528, bug #2787." + + This reverts commit f98ea2c6deb073a771e45b9643119c82a5ee40b5. + + # Conflicts: + # www/js/jquery/lib.js + +commit 515adc12c85260a6a73119cde67db0e909eb4c33 +Author: wangyidong +Date: Mon Nov 25 09:39:27 2019 +0800 + + * change for method name. + +commit 4345cf5451b28fea1f78b4683877a008b6096d2e +Merge: da02886078 1f26dce25e +Author: wangyidong +Date: Mon Nov 25 08:43:19 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit da02886078129b6272a461206585f1d581a12428 +Author: wangyidong +Date: Mon Nov 25 08:41:59 2019 +0800 + + * adjust update sql. + +commit 74cf15f54809375876d0e63e6fc2fbe13b2467f2 +Merge: 303b48c1bb 678487a9da +Author: wangyidong +Date: Fri Nov 22 17:01:04 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 303b48c1bb78532ea71f11cbd62aa381dd18f4cc +Author: wangyidong +Date: Fri Nov 22 17:00:02 2019 +0800 + + * code for bind dinguserid. + +commit 18a4c9220f07d6806eeab3250e238ee8feeefc3f +Author: wangyidong +Date: Fri Nov 22 16:59:07 2019 +0800 + + * adjust for getTaskOptionMenu method. + +commit 55c64d9efa3dcbbdfe7d5a87b9c5934cae5d1373 +Merge: 21b36247ff 294082c425 +Author: wangyidong +Date: Fri Nov 22 15:40:26 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 21b36247ffc4f13aeecd06d94421eca9fc5ca07d +Author: wangyidong +Date: Fri Nov 22 15:39:44 2019 +0800 + + * code for setConcept. + +commit 294082c425f6f9754518e2b4e26234c48978e3fe +Merge: 1bbb21bd11 d4f8465fe8 +Author: Catouse +Date: Fri Nov 22 15:35:34 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1bbb21bd1155fd33848f4f15ea5f6def76c1cf03 +Author: Catouse +Date: Fri Nov 22 15:34:48 2019 +0800 + + * fix scrollInside option not work as expectly in ie11. + +commit 1f26dce25eb52c999c24afa0e5384371a3380490 +Merge: 0665deed72 74cf15f548 +Author: guanxiying +Date: Fri Nov 22 14:45:56 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0665deed723c3fc153e6dfe2ec39428c9b635ae2 +Author: guanxiying +Date: Fri Nov 22 14:45:33 2019 +0800 + + * Adjust type and endList of sprint. + +commit 678487a9dac0be93f714746c564c37ff57f9b308 +Author: guanxiying +Date: Fri Nov 22 13:59:38 2019 +0800 + + * Fix ajax post of concept form. + +commit 35e0053b97e50906f36d446b645311899b0512fc +Author: guanxiying +Date: Fri Nov 22 13:55:44 2019 +0800 + + * Fix selected of hour and story point. + +commit a1ebb34bb5cb95e85e9fce43cd9908a2db6505af +Author: guanxiying +Date: Fri Nov 22 13:50:54 2019 +0800 + + * Fix quote of storyCommon. + +commit d4f8465fe868c5f2230f3c47affd6924d96044c6 +Author: guanxiying +Date: Fri Nov 22 12:08:31 2019 +0800 + + * Add forward concept setting codes. + +commit 5cfb8cc8d832a2f2d14bb8372918d66400b10e9a +Merge: f207e3e12d 35aa95d49e +Author: Yagami <976204163@qq.com> +Date: Fri Nov 22 13:10:19 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f207e3e12df7f490d6b395bd361fbaa30aa82065 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 22 13:09:44 2019 +0800 + + * Finish task #6495. + +commit 35aa95d49eb43fe6cf08bab28e9927fa522069bb +Merge: 0ad697012f 723b36f2e7 +Author: wangyidong +Date: Fri Nov 22 11:10:50 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0ad697012fbeafafd21d9087151dcd35448c3b2e +Author: wangyidong +Date: Fri Nov 22 11:10:09 2019 +0800 + + * set concept setted in upgrade. + +commit 723b36f2e7e17495ca866e98a43100faacf514d2 +Merge: a3a9897f6e 41c693d07a +Author: Catouse +Date: Fri Nov 22 11:07:01 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a3a9897f6e93b2a121554538a2733f2fb5797f9b +Author: Catouse +Date: Fri Nov 22 11:06:57 2019 +0800 + + * upgrade jquery. + +commit cfeda25b43ecc258f15edf4cb5e1559a88538cfe +Author: Catouse +Date: Fri Nov 22 11:06:48 2019 +0800 + + * task #6513, bug #2805. + +commit 41c693d07afc60a8788a3adf0fb244dfdefcade5 +Author: wangyidong +Date: Fri Nov 22 10:37:50 2019 +0800 + + * finish task #6488. + +commit e4d0ca4ff6ea0e7b8c253d224f1ca31b45c03e4b +Author: guanxiying +Date: Thu Nov 21 17:15:18 2019 +0800 + + * Fix bug 2790. + +commit 2d500ae75c81ab3d00ee55fc7b75afa74c709052 +Author: wangyidong +Date: Thu Nov 21 16:49:08 2019 +0800 + + * code for task #6566. + +commit c0e0423c092afcd35ae3e8127e5d651a1ff7dc4b +Merge: b93dd94b05 8833851bee +Author: wangyidong +Date: Thu Nov 21 16:20:45 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b93dd94b05bd279c138a0ff39de8e7e8be5d6192 +Author: wangyidong +Date: Thu Nov 21 16:19:59 2019 +0800 + + * code for task #6548. + +commit 8833851beed30f40becf22966fc026bb345e5cd3 +Merge: f98ea2c6de 0f74d12896 +Author: Catouse +Date: Thu Nov 21 16:15:49 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f98ea2c6deb073a771e45b9643119c82a5ee40b5 +Author: Catouse +Date: Thu Nov 21 16:15:44 2019 +0800 + + * upgrade jquery to 3.4.1, task #6533, bug #2755, task #6528, bug #2787. + +commit ebf78655dc4f9f61518ff1de9aac61f29b4ee485 +Author: wangyidong +Date: Thu Nov 21 16:03:39 2019 +0800 + + * fix error. + +commit 5ce0a2ca78219a7163f9b802a8be9fc1876ad3a5 +Author: wangyidong +Date: Thu Nov 21 16:02:44 2019 +0800 + + * code for task #6566. + +commit 0f74d12896613fa30d3ca521cd4f9619fe47f0c4 +Author: guanxiying +Date: Thu Nov 21 15:41:41 2019 +0800 + + * Revert httponly param when set lang and theme cookie. + +commit 4cba83d9ed573f380734303c75da6a1351d12a2f +Author: Catouse +Date: Thu Nov 21 15:20:42 2019 +0800 + + * update zui.js, disabled fixHeader and fixFooter option in ie11 in table. + +commit b374a515a14f66d0891f316ddf546b52043a2da0 +Merge: 4b53a604b8 62c2d8cb9d +Author: Catouse +Date: Thu Nov 21 15:19:23 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4b53a604b82b879cfd657d59a96f067a93e5fa10 +Author: Catouse +Date: Thu Nov 21 15:19:18 2019 +0800 + + * task #6530, bug #2782. + +commit 62c2d8cb9dede7a92b4165e51d5342c9e93a285b +Author: guanxiying +Date: Thu Nov 21 14:33:07 2019 +0800 + + * Add ini_set session.cookie_httponly. + +commit 5aa701c7470aa491c28737cf86c5c2c46b43e0ca +Merge: adcd079064 624cd00335 +Author: guanxiying +Date: Thu Nov 21 14:23:06 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 624cd003353e7015bf595bcecbb8b67f10effe8e +Merge: 7734d23fea 79271a23db +Author: Catouse +Date: Thu Nov 21 14:22:30 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7734d23fea71f6ca2064b81b0f1cc139882b56f0 +Author: Catouse +Date: Thu Nov 21 14:22:10 2019 +0800 + + * fix border of input-group controls in task/create view. + +commit adcd079064ba10ba7b2dd3673f0bc75d73ebfad4 +Merge: bad6bbd39c 827db2d03f +Author: guanxiying +Date: Thu Nov 21 14:21:08 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 79271a23db3ed1dff34b20579ef320be371a84d6 +Merge: 861ec58fcb 827db2d03f +Author: wangyidong +Date: Thu Nov 21 14:20:52 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bad6bbd39c46014d42aca31b65a40b849ad1fc9f +Author: guanxiying +Date: Thu Nov 21 14:20:11 2019 +0800 + + * Add httpOnly param when setcooki. + +commit 827db2d03fa96944fb5aa722aabc1a05ffef7361 +Author: Catouse +Date: Thu Nov 21 14:19:33 2019 +0800 + + * task #6525, bug #2791. + +commit 861ec58fcbb8faa09f963b1a3a0adf0e4b2c8d1f +Author: wangyidong +Date: Thu Nov 21 14:17:52 2019 +0800 + + * code for task #6566. + +commit 60f0192d57dd66ee810daaff70aeaf5544aca84e +Merge: e572742f27 9e46b973ad +Author: Catouse +Date: Thu Nov 21 14:03:32 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e572742f271282a1a8baa29c3cb18aaf69ed74e6 +Author: Catouse +Date: Thu Nov 21 14:03:07 2019 +0800 + + * task #6501, bug #2819. + +commit 9e46b973ad9d6e0d780c14c76fbd644a34f8c17b +Merge: 5888e67b28 79155cd834 +Author: reneeteng +Date: Thu Nov 21 14:01:21 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5888e67b28ba7dc87f991b08d3231c58c5155334 +Author: reneeteng +Date: Thu Nov 21 14:00:16 2019 +0800 + + * Dingding lang updated. + +commit 79155cd8346d9e253235f5b50b400f1c6752b5c3 +Merge: c0ab373ce7 abab3bb475 +Author: wangyidong +Date: Thu Nov 21 13:59:51 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c0ab373ce73bc44df43b1d3d56f23e00ead81555 +Author: wangyidong +Date: Thu Nov 21 13:57:49 2019 +0800 + + * code for task #6566. + +commit 742510a708064b453c7bc33d55934d0f89359f40 +Merge: afeab90aee abab3bb475 +Author: reneeteng +Date: Thu Nov 21 13:52:48 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit abab3bb475f28922e81ddbca0380c996a5730252 +Merge: 6a0af253dc 27e470b249 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 21 13:50:40 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6a0af253dc1882240ccdbaefd8f45455005d13d1 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 21 13:50:01 2019 +0800 + + * Fix task #6489. + +commit 27e470b2496cb0e8f24298acd3a306d27f6b336f +Merge: aa22a31176 e29bf8e2e9 +Author: guanxiying +Date: Thu Nov 21 13:35:12 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e29bf8e2e9b81d174c914115fbdd28d467b5c94f +Author: Catouse +Date: Thu Nov 21 13:34:34 2019 +0800 + + * task #6498, bug #2826. + +commit aa22a311769ee443f43b60f74d6e4aaf74283d28 +Author: guanxiying +Date: Thu Nov 21 13:32:27 2019 +0800 + + * Use projectCommon. + +commit 4e481bed19dbb2ed4578c85cc87711e572630a5b +Author: guanxiying +Date: Thu Nov 21 13:31:35 2019 +0800 + + * Add httpOnly param when setcookie. + +commit 230dcd7dd720cf6c40a06476e0b88694b5e9261f +Author: guanxiying +Date: Thu Nov 21 13:30:49 2019 +0800 + + * Setcookie with httpOnly param. + +commit cba8bc5b32190569be3af961eebc7aaa321b46ef +Merge: deea96e652 485fdde5e0 +Author: Catouse +Date: Thu Nov 21 13:22:19 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit deea96e6526ef985d31ed5d809c269366956f584 +Author: Catouse +Date: Thu Nov 21 13:22:10 2019 +0800 + + * task #6514, bug #2804. + +commit 485fdde5e005cb2ab5deffb005028aff4e912de2 +Merge: 006513e56f 7166433796 +Author: wangyidong +Date: Thu Nov 21 13:16:41 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 716643379699e5670926423b6f69ec5264f19fbb +Author: Yagami <976204163@qq.com> +Date: Thu Nov 21 13:15:08 2019 +0800 + + * Fix task #6489. + +commit 006513e56f323667e7f9bb7309a8e3a61c250594 +Author: wangyidong +Date: Thu Nov 21 13:15:06 2019 +0800 + + * finish task #6566. + +commit 8793027662bf245218d64e3ba7f224f46e9a3812 +Merge: 3945b01696 274be9c592 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 21 11:12:28 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3945b01696b559124cd5783dd06ee31667ec54c4 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 21 11:12:05 2019 +0800 + + * Fix js error. + +commit 274be9c592910a84a3ceddd86f3a5054eba534d1 +Author: guanxiying +Date: Thu Nov 21 11:07:16 2019 +0800 + + * Fix story type typeList of todo. + +commit 9720ffcf60d93b7c4ea6e498afcaf7c7f97d5ce2 +Author: guanxiying +Date: Thu Nov 21 10:06:57 2019 +0800 + + * Create index.html to every folder. + +commit 26a5faf5cd10e65219a2d667f2bdd15df6fd3520 +Merge: 97a65c43a7 84b7c6caf5 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 21 09:13:53 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 97a65c43a7de5a23f5bd57f35c10bf612a37ad99 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 21 09:13:31 2019 +0800 + + * Finish task #6489. + +commit 84b7c6caf5d6a98e3ba6e9f67e2bbafabc60f490 +Author: guanxiying +Date: Wed Nov 20 17:23:39 2019 +0800 + + * Add call of fix bug type list functon. + +commit 3c5c094b9fe2e63caaccbd579f0238faeda7bb81 +Author: guanxiying +Date: Wed Nov 20 17:10:19 2019 +0800 + + * Fix style when concept not setted. + +commit e899334745ce6c64a0f8ed499fae592a4992fb95 +Author: guanxiying +Date: Wed Nov 20 16:59:49 2019 +0800 + + * Highlight concept menu. + +commit 4c9b1d2d4daf1d0b349628568bffa06826cdb72b +Author: guanxiying +Date: Wed Nov 20 16:59:23 2019 +0800 + + * Fix style of concept page. + +commit c43dfdad099c99a5540f0b4d4dcb1336bc8c5797 +Author: guanxiying +Date: Wed Nov 20 16:57:54 2019 +0800 + + * Add concept menu. + +commit 92e32e8370d40e80669bb00d2aa74c1df0d439e9 +Merge: abc006a241 bff59d49ac +Author: wangyidong +Date: Wed Nov 20 16:52:34 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit abc006a241d8c0dd4cd13ba74c756d2045d3f4b2 +Author: wangyidong +Date: Wed Nov 20 16:44:19 2019 +0800 + + * finish task #6564. + +commit bff59d49acf7db0c1785401e498b7a9d781000ce +Merge: 31af2aaca0 cfe53bf05d +Author: Catouse +Date: Wed Nov 20 16:43:09 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 31af2aaca0854ead4846621ba71d2c7acf646c56 +Author: Catouse +Date: Wed Nov 20 16:43:05 2019 +0800 + + * fix bug #2804, finish task #6514, fix columns size of story kanban. + +commit cfe53bf05dba39bc4c804e897548c77f4c7d9908 +Author: guanxiying +Date: Wed Nov 20 16:32:25 2019 +0800 + + * Remove unused codes. + +commit 2ded3de5f17cf9d77c5d80d562b7c54d1e0078c4 +Author: guanxiying +Date: Wed Nov 20 16:24:52 2019 +0800 + + * Finish task #6562. + +commit 3480f175035963d69380dfc91cb9de76f81777ba +Merge: 071f28d748 66323f8833 +Author: Catouse +Date: Wed Nov 20 16:17:50 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 071f28d748eb4df62fd573ec28f3850ac1f8ab63 +Author: Catouse +Date: Wed Nov 20 16:17:41 2019 +0800 + + * fix calculation error of plan end date. + +commit 66323f8833910ae2d702136c1a18b6a1a3b5a659 +Author: Yagami <976204163@qq.com> +Date: Wed Nov 20 16:06:55 2019 +0800 + + * Finish task #6547. + +commit 7a442b0dc234a7e88729db46941db6ea78251bc2 +Author: Yagami <976204163@qq.com> +Date: Wed Nov 20 16:04:07 2019 +0800 + + * Finish task #6546. + +commit 4860a1849e2acc41993782571f576703f3d5deae +Merge: 23c78dece4 19d585f6c7 +Author: wangyidong +Date: Wed Nov 20 14:29:37 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 23c78dece4c8b845bd4d2b32463fa96e36754fd9 +Author: wangyidong +Date: Wed Nov 20 14:25:59 2019 +0800 + + * finish task #6548. + +commit 19d585f6c77c6945975e639746015cc5debfe61a +Author: guanxiying +Date: Wed Nov 20 13:53:09 2019 +0800 + + * Remove unused unset typeList codes. + +commit 35fe98169f321bba443569fb23ea5d026b10480d +Author: guanxiying +Date: Wed Nov 20 13:52:16 2019 +0800 + + * Clear unused unset bug typeList codes. + +commit fb5e0e8edc3bd4af264c0e83b1c327984824edbf +Merge: 8457058a91 e0f4d2be6a +Author: Yagami <976204163@qq.com> +Date: Wed Nov 20 13:34:33 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8457058a915a5fd2c0926a910135d1b79c63ffea +Author: Yagami <976204163@qq.com> +Date: Wed Nov 20 13:34:09 2019 +0800 + + * Finish task #6553. + +commit e0f4d2be6a91f4ceaade0104e3ccd92e53ab7dd5 +Author: guanxiying +Date: Wed Nov 20 13:21:42 2019 +0800 + + * Remove unused bug typeList. + +commit 27b0a26628ea23f1bd58813d3cb51e91605a2d65 +Author: Yagami <976204163@qq.com> +Date: Wed Nov 20 11:28:54 2019 +0800 + + * Fix testtask batchrun bug. + +commit 67c482275fad6d56f8db2b8877e949f8b756170a +Author: wangyidong +Date: Wed Nov 20 10:28:31 2019 +0800 + + * code for task #6506. + +commit a996954ccb3821dad2a6264723e7b2cf15cd858a +Merge: 192af3d23c 39e4ddb259 +Author: wangyidong +Date: Wed Nov 20 10:27:27 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 192af3d23c2338a4bb1ba2a01ab25182d9e3af87 +Author: wangyidong +Date: Wed Nov 20 10:26:58 2019 +0800 + + * finish task #6506. + +commit 39e4ddb2594eb398315f7fda0c005c34c982f511 +Author: Yagami <976204163@qq.com> +Date: Wed Nov 20 10:14:17 2019 +0800 + + * Finish task #6544. + +commit 24ca9fbc017156904f9949950a36fdf7017a9222 +Author: Yagami <976204163@qq.com> +Date: Wed Nov 20 10:00:56 2019 +0800 + + * Finish task #6542. + +commit e193e27ebce38caac62a3de1edad74aaa533a811 +Author: wangyidong +Date: Wed Nov 20 09:48:34 2019 +0800 + + * change for en lang. + +commit c9f10bfdc5b999eefc100587b824362f6aa7499c +Author: wangyidong +Date: Wed Nov 20 09:29:32 2019 +0800 + + * finish task #6509. + +commit fd436aca6bbdb945996b47fb38c7b3d4520514f7 +Author: wangyidong +Date: Wed Nov 20 09:16:25 2019 +0800 + + * adjust for dingapi style. + +commit 61e0a9d4f12b688762574c3ba75a1041123452f0 +Author: wangyidong +Date: Tue Nov 19 17:18:35 2019 +0800 + + * finish task #6505. + +commit 06a5e621d875158c6151f2eab9d73df774201ef1 +Merge: 97c0a65e21 a32fbf7a60 +Author: wangyidong +Date: Tue Nov 19 17:11:15 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 97c0a65e21d7e1da708fedcb62ae10f2fdc65c03 +Author: wangyidong +Date: Tue Nov 19 17:09:17 2019 +0800 + + * fix error varname. + +commit a32fbf7a602d0806027e700cfe18de9ed4817aa7 +Author: guanxiying +Date: Tue Nov 19 15:41:40 2019 +0800 + + * Finish task #6516. + +commit aa9fd639fb3468ebc0bdbf64ae3b696152f08cf8 +Merge: 8e66e7efab 5336c5e1c3 +Author: guanxiying +Date: Tue Nov 19 15:41:05 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5336c5e1c357c4e97ed7bdb53afcbc378595f212 +Merge: 546d4ae53d e85b63ec85 +Author: wangyidong +Date: Tue Nov 19 15:39:55 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 546d4ae53db495f19a14ae6020f8187b01d1a225 +Author: wangyidong +Date: Tue Nov 19 15:39:23 2019 +0800 + + * finish task #6543. + +commit 8e66e7efabfedd584b30da7ca76cbdfb405c0e4d +Merge: 39be2ba90e e85b63ec85 +Author: guanxiying +Date: Tue Nov 19 15:14:05 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 39be2ba90e5459c27195027342d64a705d3ec6b4 +Author: guanxiying +Date: Tue Nov 19 15:13:18 2019 +0800 + + * Fix bug #2812. + +commit e85b63ec8556a0b6663060ff5392fc183db93e2d +Author: Yagami <976204163@qq.com> +Date: Tue Nov 19 14:36:19 2019 +0800 + + * Finish task #6541. + +commit 6e6e9cce0c5942aa52b10a17417116df78e594e8 +Merge: 99e6b82715 a9a6068ec7 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 19 14:30:03 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 99e6b82715174492cb300367093c3c8e27e8ac8e +Author: Yagami <976204163@qq.com> +Date: Tue Nov 19 14:29:50 2019 +0800 + + * Finish task #6524. + +commit a9a6068ec77c0c7169293a09551ecc48b1df13b6 +Author: guanxiying +Date: Tue Nov 19 14:26:49 2019 +0800 + + * Fix legendPrjStoryTask. + +commit 3116bcf330c4ad0af054d3fe0e11aadfcc575d81 +Merge: 9b3afc02ce b4b96c2101 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 19 14:19:53 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9b3afc02ceb7598093f437df28ef1916f6414b94 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 19 14:19:33 2019 +0800 + + * Finish task #6523. + +commit b4b96c21010880652d67b2bd0c0203ee7566f6e1 +Author: wangyidong +Date: Tue Nov 19 13:56:45 2019 +0800 + + * finish task #6561. + +commit 08146afd3786631e4c848e4f38008bac08125a42 +Merge: 7244bcda02 a0ca607022 +Author: wangyidong +Date: Tue Nov 19 11:15:33 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3173f9a71f339c4b3d04675635af81f6aa1bd4e5 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 19 11:14:23 2019 +0800 + + * Finish task #6522. + +commit 7244bcda02978c855b93272c0d1437b6da3294ec +Author: wangyidong +Date: Tue Nov 19 11:13:17 2019 +0800 + + * code for task #6510. + +commit 3fd71d9708d7d58df08ab494d5399df8094df484 +Author: wangyidong +Date: Tue Nov 19 11:12:29 2019 +0800 + + * finish task #6531. + +commit a0ca607022725810a338f0c211a17fc8cd1466c2 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 19 11:01:13 2019 +0800 + + * Add case change tips. + +commit d59f9aa38a986557a2ef66123871ec0174d60773 +Merge: e91028bbb7 9b72dd4df3 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 19 10:13:49 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9b72dd4df301b32d74540f61790f86986e07b803 +Author: guanxiying +Date: Tue Nov 19 09:57:02 2019 +0800 + + * Fix miss ; bug. + +commit c3c8c4b80fe1ef41d06a6dc34ca4f6a071b346e3 +Author: guanxiying +Date: Tue Nov 19 09:49:22 2019 +0800 + + * Quote $lang->storyCommon with " . + +commit e91028bbb795511f9418d64c3035dd0984e1e40f +Author: Yagami <976204163@qq.com> +Date: Tue Nov 19 09:32:12 2019 +0800 + + * Finish task #6518. + +commit 4767fec8514f93aa0b84205e6f35435f93b5a947 +Merge: 4251a59f0d 1eca1b14c1 +Author: Yagami <976204163@qq.com> +Date: Tue Nov 19 09:16:23 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4251a59f0d0d33739e327b4b0c34045c2ea68a9e +Author: Yagami <976204163@qq.com> +Date: Tue Nov 19 09:15:55 2019 +0800 + + * Finish task #6512. + +commit 1eca1b14c1cd047cda03b25fe856d7f5d185d1e7 +Merge: 323fc07bab c43211716c +Author: wangyidong +Date: Mon Nov 18 17:13:35 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c43211716c1b1ceef54bf92214c5ce30ab20449c +Author: guanxiying +Date: Mon Nov 18 16:56:10 2019 +0800 + + * Remove deleted users from team. + +commit 323fc07bab770986692f4ded868014cf68203137 +Merge: aa471fff1b 4825707cae +Author: wangyidong +Date: Mon Nov 18 16:17:56 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b3c2163a26ec7bb652b86c8261692171fdcba38b +Merge: ceebffb6fe 4825707cae +Author: Yagami <976204163@qq.com> +Date: Mon Nov 18 16:17:55 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ceebffb6fe54ae57e5a09311a415f0ca5be1de5d +Author: Yagami <976204163@qq.com> +Date: Mon Nov 18 16:17:38 2019 +0800 + + * Finish task #6396. + +commit aa471fff1b4c782b7c335f2021ec8354f315c611 +Author: wangyidong +Date: Mon Nov 18 16:07:46 2019 +0800 + + * finish task #6540. + +commit 4825707cae69957455e1ae2dbe11542f4fff9dad +Author: guanxiying +Date: Mon Nov 18 16:00:56 2019 +0800 + + * Fix bug #2779. + +commit b8e8e4663797185d3fc099c6ad42b908c08b7a72 +Merge: 800bc78722 31a001c6c3 +Author: Yagami <976204163@qq.com> +Date: Mon Nov 18 15:43:22 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 800bc787229bdf6b0456a27d0908ef7ec3a3d42a +Author: Yagami <976204163@qq.com> +Date: Mon Nov 18 14:57:23 2019 +0800 + + * Finish task #6502. + +commit 31a001c6c3193b41b6c26f6ca74ca6b247879669 +Author: guanxiying +Date: Mon Nov 18 14:54:57 2019 +0800 + + * Replace story common. + +commit 871a6de666908a56440d03407c740e311b4888bc +Author: guanxiying +Date: Mon Nov 18 14:42:32 2019 +0800 + + * Fix ajax request. + +commit ec570321592f376c057afeae86424a516e17fab3 +Merge: be4a224c64 7d26078e3d +Author: guanxiying +Date: Mon Nov 18 14:21:51 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit be4a224c6494cf51786ca183861526f725f96c17 +Author: guanxiying +Date: Mon Nov 18 14:20:55 2019 +0800 + + * Fix hour point setting function. + +commit 7d26078e3de83db3f64ebf334ab47a855e037e68 +Merge: 6434e06342 c1942d154a +Author: wangyidong +Date: Mon Nov 18 14:15:10 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6434e063427acc72dd2f93a6ee4ce8fb77ce45ac +Author: wangyidong +Date: Mon Nov 18 14:14:03 2019 +0800 + + * finish task #6539,6537. + +commit c1942d154abae561c77beb90af8247db5aebc9a0 +Author: guanxiying +Date: Mon Nov 18 13:18:00 2019 +0800 + + * Fix story menu. + +commit bda037db5357274dffaf73700a5f97697e1c62f0 +Merge: 58357af226 029c22e0ac +Author: guanxiying +Date: Mon Nov 18 13:09:10 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 58357af226a60b8965b23dc12b100aed8366df27 +Author: guanxiying +Date: Mon Nov 18 13:06:50 2019 +0800 + + * Finish task #6549. + +commit 029c22e0ac5bdce3bb247bf7534feb1f3ae420ca +Author: Yagami <976204163@qq.com> +Date: Mon Nov 18 11:26:30 2019 +0800 + + * Finish task #6500. + +commit 5d2f8443ab7a528ffb2882559836cf8c00eacd0b +Author: Yagami <976204163@qq.com> +Date: Mon Nov 18 11:14:03 2019 +0800 + + * Finish task #6499. + +commit 34b52a68514c3437f326758b96dca00f73ec3203 +Merge: 926212cf06 6b485ddade +Author: guanxiying +Date: Mon Nov 18 09:48:07 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6b485ddade38531277564343f1b02e4f69105cbe +Merge: a418e6f42f fdc60a1da9 +Author: Yagami <976204163@qq.com> +Date: Mon Nov 18 09:47:11 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a418e6f42ffba4800f54dde7f4b7ce8d1e02fe8a +Author: Yagami <976204163@qq.com> +Date: Mon Nov 18 09:46:53 2019 +0800 + + * Finish task #6497. + +commit 926212cf06823e48d41762628b3beb3fd55a4fed +Author: guanxiying +Date: Mon Nov 18 09:41:52 2019 +0800 + + * Add set concept items. + +commit ed524799c38165b7e6eb9786682883ffc4234811 +Author: guanxiying +Date: Mon Nov 18 09:41:19 2019 +0800 + + * Set story common from db. + +commit fdc60a1da9e2747242e9e9ae4345632218a53ce4 +Author: guanxiying +Date: Mon Nov 18 09:40:19 2019 +0800 + + * Add story common. + +commit 4448827fca9a41bcdccb7f6d90879f628886e969 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 15 15:43:59 2019 +0800 + + * Finish task #6494. + +commit 504a490a65601720c9759d8007f81c96edcfc25a +Author: Yagami <976204163@qq.com> +Date: Fri Nov 15 13:41:25 2019 +0800 + + * Finish task #6492. + +commit 6cb659aea346ea45288f9b3313a24a0920bacb8d +Author: Yagami <976204163@qq.com> +Date: Fri Nov 15 13:19:49 2019 +0800 + + * Fix bug #2859. + +commit aed741992da826774375250a0fb00630ad697747 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 15 11:25:28 2019 +0800 + + * Fix module export. + +commit cc2c00797fd1aab26bf4e5bc22869ec3ab91ad8d +Author: Yagami <976204163@qq.com> +Date: Fri Nov 15 11:07:00 2019 +0800 + + * Finish task #6491. + +commit 043ecb81c775480e7e840007d2d28237578cf9d8 +Merge: a8f40667f9 eb1267ebe7 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 15 09:51:49 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a8f40667f98f5b5595c7dcdc1962bac8275ea987 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 15 09:51:25 2019 +0800 + + * Finish task #6489. + +commit eb1267ebe756e3a7532ec9eb85d506a7d3d9c114 +Author: wangyidong +Date: Fri Nov 15 09:04:48 2019 +0800 + + * finish task #6536. + +commit 64b8d04f77d9ba97c1f45c2400026ddaa5041fe7 +Merge: e6486f6c19 5716ae1c87 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 14 16:54:48 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e6486f6c19a15ed2c4629088a75fa5a3aa3b0efe +Author: Yagami <976204163@qq.com> +Date: Thu Nov 14 16:54:31 2019 +0800 + + * Finish task #6487. + +commit 5716ae1c87c004e39c076003a02caf576d92f452 +Merge: 1b3b228157 f540400cff +Author: wangyidong +Date: Thu Nov 14 16:39:39 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1b3b228157237aefafdd9b7065a5c97f93ad6728 +Author: wangyidong +Date: Thu Nov 14 16:38:32 2019 +0800 + + * adjust for build deb. + +commit 302e2bd7b20fb94e4056e8a0041a7344181146be +Author: wangyidong +Date: Thu Nov 14 16:37:53 2019 +0800 + + * fix bug 2856. + +commit f540400cff29274dcbf6ba64757a838b0cd10b6c +Author: Yagami <976204163@qq.com> +Date: Thu Nov 14 14:54:43 2019 +0800 + + * Finish task #6486. + +commit 6295c54071fe0865434a44e9f3e17d68eb0b123a +Author: Yagami <976204163@qq.com> +Date: Thu Nov 14 14:36:39 2019 +0800 + + * Finish task #6485. + +commit 51e84b63ee8e054f3cb65ba59e15131f8dc507b6 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 14 14:25:26 2019 +0800 + + * Finish task #6484. + +commit 55e0dc16c37f5698da589ffd058d205d0644db7e +Author: Yagami <976204163@qq.com> +Date: Thu Nov 14 13:06:42 2019 +0800 + + * Finish task #6483. + +commit 85fa678a6dbbf6e2a3337d3aebd6d7eeac4e613c +Author: Yagami <976204163@qq.com> +Date: Thu Nov 14 10:53:14 2019 +0800 + + * Finish task #6482. + +commit 8c75ca4b2dcee1093a04f8a9bf4da37f1ae28552 +Merge: 6a34209544 f2742668a5 +Author: Yagami <976204163@qq.com> +Date: Thu Nov 14 10:45:10 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6a3420954439f498193e278877132d5da53c8d0a +Author: Yagami <976204163@qq.com> +Date: Thu Nov 14 10:44:43 2019 +0800 + + * Finish task #6481. + +commit f2742668a547720dce1c1e4adc5905ba2927b439 (tag: zentaopms_11.6.5_20191113) +Author: wangyidong +Date: Wed Nov 13 10:27:34 2019 +0800 + + * add CHANGELOG and other lang. + +commit c8835a501564d6a1867dc387300289ffd6a5a150 +Author: wangyidong +Date: Wed Nov 13 10:08:17 2019 +0800 + + * adjust for check referer for api. + +commit 95c2e3b81027775324a7f16e6fc9cbb598cf7b33 +Author: wangyidong +Date: Wed Nov 13 09:09:51 2019 +0800 + + * finish story #4411. + +commit 714065a8bbecee01ee973f0e1aad4ebb341b624c +Author: wangyidong +Date: Tue Nov 12 11:29:53 2019 +0800 + + * adjust for check require flow field. + +commit 6d6f8cd86981727086185f48c214de1ac6b88632 +Author: wangyidong +Date: Mon Nov 11 08:17:41 2019 +0800 + + * fix bug. + +commit bd4b58d951ac22971b97fa2146499c8a49d776d8 +Author: wangyidong +Date: Fri Nov 8 14:26:28 2019 +0800 + + * fix bug for install. + +commit 793319d21bb88f567ea3398f67dce61d1a2b871d +Author: wangyidong +Date: Fri Nov 8 09:36:05 2019 +0800 + + * add new version and upgrade. + +commit edb0a6004165b9d3a6ba4083b79ff5ca766fa3ef +Author: wangyidong +Date: Thu Nov 7 15:57:31 2019 +0800 + + * fix bug for alert when save template name. + +commit 98a7da512fbd51036dcb2a740dfe3e3bd87acd15 +Author: wangyidong +Date: Thu Nov 7 13:53:30 2019 +0800 + + * fix bug #2064. + +commit 7c02a1f88af6ac63de93d595200746034a142a71 +Author: wangyidong +Date: Thu Nov 7 13:50:32 2019 +0800 + + * fix bug #2064. + +commit e181fa91c18bb7ec6501897a073b19e26f95af5e +Merge: c628ea60ef 6de3055964 +Author: wangyidong +Date: Thu Nov 7 11:31:52 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c628ea60efb2ea6c3eb9e70e23d07e2a9ae0705d +Author: wangyidong +Date: Thu Nov 7 11:31:33 2019 +0800 + + * adjust for style. + +commit a5411a8aca10644d7d68fd740ae11c85c99c8549 +Author: wangyidong +Date: Thu Nov 7 11:30:43 2019 +0800 + + * adjust for dashboard. + +commit 630c2a87e75682577c91e202e4c5d4b4aa61791c +Author: wangyidong +Date: Thu Nov 7 11:29:29 2019 +0800 + + * get all branch for workflowdatasource. + +commit edac0a4dd75c193608afab01ec6350b915385f0f +Author: wangyidong +Date: Thu Nov 7 11:29:03 2019 +0800 + + * adjust for caselib. + +commit 6de30559645ef25303b237da41a26f48bd53d874 +Author: Catouse +Date: Thu Nov 7 11:00:35 2019 +0800 + + * add ja language support by update zui. + +commit 53196a2677b7f3810828540bda08ca2b47ac5121 +Merge: 81a8539a36 fc0f30c34c +Author: Catouse +Date: Tue Nov 5 17:19:11 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 81a8539a360f9418683a5992ae752be33fbbdcf4 +Author: Catouse +Date: Tue Nov 5 17:18:56 2019 +0800 + + * add ja language data to kindeditor. + +commit afeab90aee3b9a514b40708ac61988331f534ca6 +Author: reneeteng +Date: Mon Nov 4 09:26:53 2019 +0800 + + * Lang changed. My-Mine on suggestions from user. + +commit fc0f30c34c1bc5f483d786d017f43e6d60b07680 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 1 15:25:29 2019 +0800 + + * Code for cmmi. + +commit d5a4b328480068c019216460a81c6b0f8aa6eb0e +Merge: f3b3199a8c e70fec4e04 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 1 15:08:08 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f3b3199a8cce4f4f9dd5f5069fb6a18ad108f438 +Author: Yagami <976204163@qq.com> +Date: Fri Nov 1 15:07:15 2019 +0800 + + * Code for cmmi. + +commit e70fec4e041eb802dc557acd079f84c792cd21f5 +Author: wangyidong +Date: Thu Oct 31 14:36:46 2019 +0800 + + * code for task #9246. + +commit e5c46baa1c1d8e95bc07628bf3bdc3bac96ade4c +Author: wangyidong +Date: Thu Oct 31 14:32:03 2019 +0800 + + * finish task #9246. + +commit e3e8ae17927b1d0d3bcbfb88c26347c3ee1246c7 +Author: wangyidong +Date: Thu Oct 31 11:08:41 2019 +0800 + + * change for dingding. + +commit ef3f6af06f148842a45d037643f1428d7fd3f15c +Author: wangyidong +Date: Wed Oct 30 17:24:10 2019 +0800 + + * adjust for task consumed for children task. + +commit 244043cebc825b7afea01863c1550b79590a7118 +Author: wangyidong +Date: Wed Oct 30 17:23:28 2019 +0800 + + * fix for caselib. + +commit 20573c1751fe2f169148ce1964dd46ceafbf174b +Author: wangyidong +Date: Wed Oct 30 17:22:30 2019 +0800 + + * adjust for flowchart and block actions. + +commit e85d4e63750e2e2408e99b58a731011b596e2538 +Author: wangyidong +Date: Tue Oct 29 14:02:33 2019 +0800 + + * code for task #9224. + +commit 315d5ed402e70b97df7fd8779b84b6aa22f62de0 +Author: wangyidong +Date: Mon Oct 28 10:44:59 2019 +0800 + + * finish task #9223. + +commit b039825514e8b4427da212a15bc801ce2e0cb219 +Author: wangyidong +Date: Mon Oct 28 09:20:40 2019 +0800 + + * adjust style and change translate. + +commit 9bee804d5d807e9a5c8fc363dab59ba2f8760d01 +Merge: 77d98ca9ba f24fa3a474 +Author: Yagami <976204163@qq.com> +Date: Fri Oct 25 09:55:35 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 77d98ca9ba6d38345421199d8ffeb9280effbbad +Author: Yagami <976204163@qq.com> +Date: Fri Oct 25 09:55:13 2019 +0800 + + * Finish task #2817. + +commit f24fa3a4742e141d22b9a2d51d0a583747959a95 +Merge: 0ae8d11d71 988176b1d4 +Author: QingDao Nature Easy Soft Network Technology Co,LTD +Date: Wed Oct 23 18:47:10 2019 +0800 + + Merge pull request #39 from paulvi/patch-1 + + README use markdown syntax that is shorter and rendered in GitHub + +commit 988176b1d4684d7f2b362fd6c990c0f831f1794b +Author: Paul Verest +Date: Wed Oct 23 10:27:35 2019 +0800 + + README use markdown syntax that is shorter and rendered in GitHub + + (remove ===== lines ) + +commit 0ae8d11d711223f89a2ca7f2d33f585f6d421c25 +Merge: d6d649bdb4 d7144680fc +Author: wangyidong +Date: Tue Oct 22 10:27:30 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d6d649bdb4cf4fcdc731b4227750468c405e9baf +Author: wangyidong +Date: Tue Oct 22 10:21:49 2019 +0800 + + * fix bug #1940. + +commit fb894e51fd60d5fae1654e40d8fd7b564846c2f6 +Merge: 907c7468b6 d7144680fc +Author: Catouse +Date: Tue Oct 22 09:49:36 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 907c7468b6cb43fdf766d33feb3719c5e32bb9ad +Author: Catouse +Date: Tue Oct 22 09:49:28 2019 +0800 + + * fix reload target after complete upload images, see http://ranzhi.5upm.com/bug-view-1241.html. + +commit d7144680fc17e8db3edc94dde44b2e8218d73f75 +Author: reneeteng +Date: Tue Oct 22 08:56:32 2019 +0800 + + * Lang bug fixed. + +commit edcb54fbe4c54277b4baacc413b05ed4828b0d36 +Author: liugang +Date: Thu Oct 17 15:14:44 2019 +0800 + + * The workflow function support batch operate. + +commit a5316c566792de33baa9392a941869c245f590ac (tag: zentaopms_11.6.4_20191017) +Author: wangyidong +Date: Thu Oct 17 10:29:41 2019 +0800 + + * adjust paperwork. + +commit 4f3eb17120bd0ac96103a48355fb2f1923ac21cc +Merge: 20a1c5b375 cfbb1c1108 +Author: wangyidong +Date: Thu Oct 17 10:15:51 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 20a1c5b375c8b7093c1188f64b22f6d0158d4682 +Author: wangyidong +Date: Thu Oct 17 10:14:57 2019 +0800 + + * add CHANGELOG and change de fr zh-tw lang. + +commit cfbb1c110855fb20b32ab3e633261b5606a75db7 +Merge: 26be63f937 51919ca195 +Author: Yagami <976204163@qq.com> +Date: Thu Oct 17 10:05:55 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 26be63f937740443ba5d0cd4552e899f3afe1acf +Author: Yagami <976204163@qq.com> +Date: Thu Oct 17 10:03:31 2019 +0800 + + * Finish code form #6408. + +commit 51919ca1959ae6c246e99ca878bdd68bc7870f11 +Author: wangyidong +Date: Thu Oct 17 08:50:39 2019 +0800 + + * add new version and upgrade. + +commit 6e2a0996d99b7f253e1380efdb2317ac7505dfef +Author: wangyidong +Date: Wed Oct 16 17:28:10 2019 +0800 + + + add for Françalang. + +commit 172964e9bf54ef95fb91df39ab5815ffb0ffb6b8 +Merge: cf3c318d07 499964122e +Author: wangyidong +Date: Wed Oct 16 17:18:41 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cf3c318d075511dd7564d7b44e8781cecb1403d4 +Author: wangyidong +Date: Wed Oct 16 17:14:40 2019 +0800 + + * adjust for find questions. + +commit 499964122e978a49e1a9039d857d1a11502cad75 +Author: Yagami <976204163@qq.com> +Date: Wed Oct 16 16:17:49 2019 +0800 + + * Code for task #1493. + +commit 36f688908b4bcaaf654b01545953bdc5dfede3f0 +Author: Yagami <976204163@qq.com> +Date: Wed Oct 16 15:40:41 2019 +0800 + + * Code for task #6394. + +commit 40fd784524cf05b0dd4a7202a7895c4b7ae0a5b9 +Author: Yagami <976204163@qq.com> +Date: Wed Oct 16 15:37:14 2019 +0800 + + * Code for task #6394. + +commit ac5b592e1fbf7beeecc3c7193580e465c5697900 +Author: Yagami <976204163@qq.com> +Date: Wed Oct 16 15:01:10 2019 +0800 + + * Reset productblock. + +commit 8ef5ab336c918ea92d7a88cf195ca805268e8a35 +Author: wangyidong +Date: Wed Oct 16 13:12:58 2019 +0800 + + * code for task #6421. + +commit e3845c10320c0394881fe6fbd2d4743d1c68e81c +Author: wangyidong +Date: Wed Oct 16 13:11:45 2019 +0800 + + * finish task #6421. + +commit 1142a5a52a33162b7284500925323d62048c9b52 +Author: wangyidong +Date: Wed Oct 16 10:16:50 2019 +0800 + + * finish task #6426. + +commit 56ae0ded09aca6f96faac1f1527517a0bfd676ae +Author: wangyidong +Date: Tue Oct 15 17:22:55 2019 +0800 + + * finish task #6401. + +commit 2487b420495bce4149ca658de0c1ec6999cb4386 +Author: wangyidong +Date: Tue Oct 15 16:44:27 2019 +0800 + + * finish task #6407. + +commit 4e520da6113b255a7ffc54128a1c6f9a1a658698 +Author: wangyidong +Date: Tue Oct 15 16:19:38 2019 +0800 + + * adjust for task #6430. + +commit 82ab8ddc1ef06de2212cfccee2f6a9c6b53b1f87 +Merge: 1bbf58412a 63cd3978ea +Author: wangyidong +Date: Tue Oct 15 16:18:35 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1bbf58412af5151fbff288565f5d82382a8fb17a +Author: wangyidong +Date: Tue Oct 15 16:17:44 2019 +0800 + + * finish task #6455. + +commit 63cd3978ea58a50e6ebfefa53c244bd65d4f99f0 +Author: Yagami <976204163@qq.com> +Date: Tue Oct 15 14:16:02 2019 +0800 + + * Modify .htaccess to prohibit directory browsing. + +commit fbae55624b117e04ab3b8954648aea3ba9cd509e +Merge: ea3fe5000e 0ae2cc74cd +Author: Yagami <976204163@qq.com> +Date: Tue Oct 15 13:40:35 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ea3fe5000e2cd0239cc07016e617644abb053c4d +Author: Yagami <976204163@qq.com> +Date: Tue Oct 15 13:40:08 2019 +0800 + + * Finish task #6464. + +commit 0ae2cc74cd3caba219dadd7c7209306def463087 +Merge: 1e3564a250 ad14136ea7 +Author: wangyidong +Date: Tue Oct 15 11:25:14 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1e3564a250ed68b7e49a267668a41a03258050fa +Author: wangyidong +Date: Tue Oct 15 11:24:50 2019 +0800 + + * finish task #6409. + +commit f522a796334867ec54c45c853a6af1a52ac27e07 +Author: wangyidong +Date: Tue Oct 15 11:23:31 2019 +0800 + + * change for CSRF. + +commit ad14136ea76c601b6c573523e7776db0c783b9cc +Author: Yagami <976204163@qq.com> +Date: Tue Oct 15 11:09:43 2019 +0800 + + * Finish task #6424. + +commit 74410cbc5a265b654e58bb7d12a4e74fa63b8249 +Merge: 7bb1662f9e 1928b036e4 +Author: Yagami <976204163@qq.com> +Date: Tue Oct 15 10:53:28 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7bb1662f9ef45ab4836c132670f49e65db423986 +Author: Yagami <976204163@qq.com> +Date: Tue Oct 15 10:52:57 2019 +0800 + + * Code for task #6424. + +commit 1928b036e434032bcfa1fd93fb87aac602d34c8c +Merge: ee1afb43ed 033e031ede +Author: wangyidong +Date: Mon Oct 14 17:34:43 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ee1afb43ed382c53a6d2e0b149589257e3bb382c +Author: wangyidong +Date: Mon Oct 14 17:33:52 2019 +0800 + + * code for task #6411. + +commit 033e031edebf2dd19c6c6f21ca2fde0972674f10 +Merge: 6282d8c6dd 4574c12dc3 +Author: Catouse +Date: Mon Oct 14 17:01:34 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6282d8c6dd789a57ff08f442bc089a9c683fb72f +Author: Catouse +Date: Mon Oct 14 17:01:18 2019 +0800 + + * format code. + +commit 496d059ed7d08b8e3b28a822f4b331aeb40c858f +Author: Catouse +Date: Mon Oct 14 17:00:48 2019 +0800 + + * finish task #6423, fix bug #2727. + +commit 4574c12dc3cb6cba4215b7bead62ba863d5f6d8f +Merge: 4ce472b509 d383adbb8b +Author: wangyidong +Date: Mon Oct 14 16:24:27 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4ce472b509bde9e5a738fc29a4bdc86ee8a82879 +Author: wangyidong +Date: Mon Oct 14 16:22:35 2019 +0800 + + * finish task #6414. + +commit d383adbb8b83e1e0fa255f7325d8cf85d257d7f7 +Merge: 697a1122ba 33f5465b54 +Author: Yagami <976204163@qq.com> +Date: Mon Oct 14 15:57:01 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 697a1122ba1d09f5c948b50d233779ee477d921f +Author: Yagami <976204163@qq.com> +Date: Mon Oct 14 15:55:30 2019 +0800 + + * Code for task #6410. + +commit 33f5465b54e016fa0f884488f23af309c29d0c29 +Author: wangyidong +Date: Mon Oct 14 15:43:58 2019 +0800 + + * finish task #6416. + +commit 42bcf59a23f9070f5bde44ba0ac5e0cd8547a90b +Merge: d6dc09c08a e408817726 +Author: wangyidong +Date: Mon Oct 14 15:25:36 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d6dc09c08add976b6a080a23e0d7af5e9e47e163 +Author: wangyidong +Date: Mon Oct 14 15:25:14 2019 +0800 + + * finish task #6418. + +commit e408817726e819a5c7e0c29c4a0bf259adb0da18 +Author: Yagami <976204163@qq.com> +Date: Mon Oct 14 15:07:41 2019 +0800 + + * Finish task #6420. + +commit 86c5222d365eb1449d3f704c2e82cf1113f7d1d0 +Merge: 31af090d1e 2be845e3ba +Author: Yagami <976204163@qq.com> +Date: Mon Oct 14 14:40:20 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 31af090d1ece8d2c7eb062d2f7984830ccbbc6e4 +Author: Yagami <976204163@qq.com> +Date: Mon Oct 14 14:39:56 2019 +0800 + + * Finish task #6410. + +commit 2be845e3ba932a26bd27d008d78ed221d369a136 +Merge: caec432f48 8286a06841 +Author: wangyidong +Date: Mon Oct 14 14:27:09 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit caec432f480f51525404ddc814b8545822a86608 +Author: wangyidong +Date: Mon Oct 14 14:26:37 2019 +0800 + + * finish task #6419. + +commit 8286a068416caba6ce493eab55b61f972e2e8c3e +Author: Yagami <976204163@qq.com> +Date: Mon Oct 14 14:04:42 2019 +0800 + + * Finish task #6440. + +commit 96983e4a009dce562fbe7e2301b9ad105cd47fea +Author: Yagami <976204163@qq.com> +Date: Mon Oct 14 13:45:41 2019 +0800 + + * Finish task #6436. + +commit 2f23d0ab1389a8862d2748f41d2e3b5c2c519592 +Author: Yagami <976204163@qq.com> +Date: Mon Oct 14 11:16:39 2019 +0800 + + * Finish task #6417. + +commit 1fa9e738f32e5377643846a65085738d29a4ad19 +Merge: b54f876279 5785118311 +Author: Yagami <976204163@qq.com> +Date: Mon Oct 14 10:58:12 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b54f8762792c7f2d5f7fe50db9c134e479574f89 +Author: Yagami <976204163@qq.com> +Date: Mon Oct 14 10:57:45 2019 +0800 + + * Finish task #6429. + +commit 578511831119f7ea712411656551d2c10750cf31 +Merge: e44a602127 888a34bcae +Author: wangyidong +Date: Mon Oct 14 10:47:46 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e44a6021278705c2d501eb2cb925b83c3f7592c0 +Author: wangyidong +Date: Mon Oct 14 10:47:20 2019 +0800 + + * finish task #6433. + +commit 888a34bcaeedffebbc3015d976bbf2a53b65998e +Author: Yagami <976204163@qq.com> +Date: Mon Oct 14 10:07:24 2019 +0800 + + * Finish task #6463. + +commit 188079c9c353d6a2815c3e0b1eb62d17f593dee4 +Merge: 71262e445b e5dad96cd2 +Author: Yagami <976204163@qq.com> +Date: Mon Oct 14 09:48:55 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 71262e445b1f1191a389ff92581d2046c2aa7ccb +Author: Yagami <976204163@qq.com> +Date: Mon Oct 14 09:48:40 2019 +0800 + + * Finish task #6462. + +commit e5dad96cd203ed6301195d7aa6cfe94e86311c90 +Merge: 8897e5ab4e 06738da7b7 +Author: wangyidong +Date: Mon Oct 14 09:36:34 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8897e5ab4e4acf549914bae7b237431cdccdab99 +Author: wangyidong +Date: Mon Oct 14 09:36:01 2019 +0800 + + * finish task #6434. + +commit 06738da7b708d1592b4b820a17b009e5328700df +Author: Yagami <976204163@qq.com> +Date: Mon Oct 14 09:27:21 2019 +0800 + + * Fix activate parent task logic. + +commit 1038f2a0695ec3ced1c44b062fe50c3ef03e8e66 +Author: Yagami <976204163@qq.com> +Date: Mon Oct 14 09:04:52 2019 +0800 + + * Fix delete template bug. + +commit e1d405f16b533d0eae8f170b735286f8abd2f567 +Author: Yagami <976204163@qq.com> +Date: Sat Oct 12 17:04:23 2019 +0800 + + * Fix bug. + +commit 89e99f4745b65411b453bf7ba149dfdd4772f710 +Author: wangyidong +Date: Sat Oct 12 16:19:12 2019 +0800 + + * code for task #6466. + +commit 4ba3b3949856920246281eb66b67f11fe5da390c +Merge: 5f5ab186af 650ff48474 +Author: wangyidong +Date: Sat Oct 12 16:02:54 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5f5ab186af7f5183d645163c8b0584cb938c91fb +Author: wangyidong +Date: Sat Oct 12 16:02:33 2019 +0800 + + * finish task #6439. + +commit 650ff484749b2ab592b7c37c526fad5cd5ef8529 +Merge: a11601eaff 71e90595da +Author: Yagami <976204163@qq.com> +Date: Sat Oct 12 15:40:57 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a11601eaff74e23777d7acf03fd92e0cb2621bf9 +Author: Yagami <976204163@qq.com> +Date: Sat Oct 12 15:40:25 2019 +0800 + + * Finish task #6459. + +commit 71e90595da3a4800d840bf662828a2602cd5604c +Author: wangyidong +Date: Sat Oct 12 15:08:29 2019 +0800 + + * finish task #6441. + +commit 4cbd15766f6f3ce9fdb9f77b7ea1431b6cb52438 +Merge: 2f62ecb51e f4375dc9f0 +Author: wangyidong +Date: Sat Oct 12 14:52:14 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2f62ecb51ed43f6507e224bacd4fd79b808055ca +Author: wangyidong +Date: Sat Oct 12 14:50:00 2019 +0800 + + * finish task #6444. + +commit f4375dc9f07484d600583d792cc6e5f8d75709c9 +Author: Yagami <976204163@qq.com> +Date: Sat Oct 12 13:56:51 2019 +0800 + + * Finish task #6457. + +commit 6f0586038bd27938100974ccc595c0b8963d3ece +Merge: 908d70ef34 219dbdb7f3 +Author: Yagami <976204163@qq.com> +Date: Sat Oct 12 11:09:55 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 908d70ef34622671e5e4dffaab534baa5f81712a +Author: Yagami <976204163@qq.com> +Date: Sat Oct 12 11:08:39 2019 +0800 + + * Finish task #6452. + +commit 219dbdb7f35d3c1886e018825a019672934e232c +Author: wangyidong +Date: Sat Oct 12 10:44:40 2019 +0800 + + * finish task #6446. + +commit b4ac34cfe44348179b9410709362bbc6782a279a +Merge: da2a9751dc 26bd0e996f +Author: wangyidong +Date: Sat Oct 12 10:29:08 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit da2a9751dcbdc382e385d2f2c685add62377c343 +Author: wangyidong +Date: Sat Oct 12 10:28:02 2019 +0800 + + * finish task #6447. + +commit 26bd0e996f7bb91c132d4f048bc406d1412d08d4 +Merge: 727c6f4fce b58151d72d +Author: Yagami <976204163@qq.com> +Date: Sat Oct 12 10:25:45 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 727c6f4fce2a4c4628c84ebec588b4124060b4f7 +Author: Yagami <976204163@qq.com> +Date: Sat Oct 12 10:09:27 2019 +0800 + + * Finish task #6451. + +commit b58151d72d4f5c40f2f447ba118af89ce9594436 +Merge: fc97ecc2da c0497a7935 +Author: wangyidong +Date: Sat Oct 12 10:01:41 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fc97ecc2dae4ad2a427dc07aecc213074964afb3 +Author: wangyidong +Date: Sat Oct 12 10:01:16 2019 +0800 + + * finish task #6466. + +commit c0497a7935f3fd3c4b132ad72cb2b6a18c9f91c8 +Author: Yagami <976204163@qq.com> +Date: Sat Oct 12 09:41:40 2019 +0800 + + * Finish task #6448. + +commit 19e55905417ebc75cde3e180cf861c4fd58fe826 +Author: Yagami <976204163@qq.com> +Date: Fri Oct 11 16:26:46 2019 +0800 + + * Finish task #6408. + +commit 98ac711d6d79e6f164418216b111fda216509963 +Author: Yagami <976204163@qq.com> +Date: Fri Oct 11 15:02:51 2019 +0800 + + * Finish task #6406. + +commit e0a667b5f8ee56ab846590077725db918a6d5f8c +Author: Yagami <976204163@qq.com> +Date: Fri Oct 11 14:20:22 2019 +0800 + + * Finish task #6405. + +commit 7116b062ea6495f9ab5f84c0b95be7238063fd16 +Author: Yagami <976204163@qq.com> +Date: Fri Oct 11 13:29:19 2019 +0800 + + * Finish task #6403. + +commit 55139fc8994ba91d2511e266eb9f15b8e7623425 +Author: Yagami <976204163@qq.com> +Date: Fri Oct 11 10:10:46 2019 +0800 + + * Finish task #6396. + +commit 03f04777e2864ee995277ff0b2ada93f2352b65c +Author: Yagami <976204163@qq.com> +Date: Fri Oct 11 09:15:37 2019 +0800 + + * Finish task #6395. + +commit 90f304a3fcdcde783741ea204234693b3bc3b4d7 +Author: Yagami <976204163@qq.com> +Date: Thu Oct 10 15:50:55 2019 +0800 + + * Finish task #6394. + +commit b16752383d060020cf3b583bdbbf946a51cd4afc +Author: Yagami <976204163@qq.com> +Date: Thu Oct 10 14:39:46 2019 +0800 + + * Finish task #6392. + +commit 8f10dc718a206223a7d2e95aa2ebad177c423cee +Author: Yagami <976204163@qq.com> +Date: Thu Oct 10 13:56:43 2019 +0800 + + * Finish task #6391. + +commit 59af2053bcb521f7d2e17bbc32f0d0771a33aeae +Author: Yagami <976204163@qq.com> +Date: Thu Oct 10 11:26:32 2019 +0800 + + * Finish task #6386. + +commit fe47c0600a5d1daf0e9ce03364698f7257d7bd9b +Author: Yagami <976204163@qq.com> +Date: Wed Oct 9 16:49:09 2019 +0800 + + * Finish task #6381. + +commit 4dd4fb8ea5edc57b262dd6513e4786754cf5264e +Author: Yagami <976204163@qq.com> +Date: Wed Oct 9 16:05:36 2019 +0800 + + * Finish taks #6385. + +commit 1821853a9f3cc39fcc2411502f05412615e6b11d +Author: Yagami <976204163@qq.com> +Date: Wed Oct 9 10:00:16 2019 +0800 + + * Finish task #6384. + +commit 2433ce4b44059528010a68f0e870659399ef84f2 +Author: Yagami <976204163@qq.com> +Date: Tue Oct 8 14:34:42 2019 +0800 + + * Finish task #6382. + +commit 54eaa0d545536229aa7b103f91e0c18e86a2d830 +Author: wangyidong +Date: Wed Sep 25 15:00:08 2019 +0800 + + * check timestamp for check entry token. + +commit 8dfe360c5c4521c4dbb465ba2d26ea565fbb13b3 +Author: wangyidong +Date: Wed Sep 25 08:51:01 2019 +0800 + + * adjust for computeHours4Multiple when update task. + +commit 09c04815ea910b962cfca00b4c486cfbfa643cde (tag: zentaopms_11.6.3_20190924) +Author: wangyidong +Date: Tue Sep 24 10:41:04 2019 +0800 + + * add changelog. + +commit c3cd2b7af71877f705a0b354f45c8761c0429b43 +Author: wangyidong +Date: Tue Sep 24 10:07:45 2019 +0800 + + * fix bug #2722. + +commit e41a21b40819479e2c871ec48cc500324daa78a1 +Author: wangyidong +Date: Tue Sep 24 09:17:49 2019 +0800 + + * fix bug #2766. + +commit a3ba864944d3ddf3cfd4e2f203c7b10406dfc6e1 +Author: wangyidong +Date: Mon Sep 23 17:02:10 2019 +0800 + + * add new version and upgrade. + +commit 0a0ce92796d4ba34c47a510cf158d3591eda6743 +Author: wangyidong +Date: Mon Sep 23 16:26:54 2019 +0800 + + * fix bug. + +commit 8177758b873e1beec6686fab0b4c09f8b04bb764 +Author: wangyidong +Date: Fri Sep 20 16:30:23 2019 +0800 + + * fix bug #2007. + +commit 8100b669d2137775b371af57bc3a70263d95606f +Author: wangyidong +Date: Fri Sep 20 15:27:48 2019 +0800 + + * adjust th width. + +commit 82b0d31096bb3d561c0dfff99d3463d14a584761 +Author: wangyidong +Date: Fri Sep 20 15:27:03 2019 +0800 + + * fix bug #2775. + +commit 8ebd5c0d640bc8afe37a541f990fd5d5800485ce +Author: wangyidong +Date: Fri Sep 20 15:25:51 2019 +0800 + + * fix bug #2757. + +commit 5fd54d028a236ed730985f8bd64a9c21dd41c02e +Merge: 9fc841dada 6109ccd641 +Author: wangyidong +Date: Thu Sep 19 14:27:07 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9fc841dadaa49067ded9852e6a1c8743250691a8 +Author: wangyidong +Date: Thu Sep 19 14:26:49 2019 +0800 + + * adjust for en lang. + +commit 729f73fe05a24811087ff778d2f24eb73c67fb03 +Author: wangyidong +Date: Thu Sep 19 14:26:01 2019 +0800 + + * add appendExec method for upgrade. + +commit b6a3307e41fabc33ee2da4d32e7ea77c631f79bd +Author: wangyidong +Date: Thu Sep 19 14:24:40 2019 +0800 + + * remove htmlspecialchars_decode for html block. + +commit 003f68c25d8a23c8e7a7c46d67eec420daa9007e +Author: wangyidong +Date: Thu Sep 19 14:20:48 2019 +0800 + + * adjust for convertEncoding. + +commit 38956c102f77732688a82cb5bb8b979951770cd1 +Author: wangyidong +Date: Thu Sep 19 14:20:03 2019 +0800 + + * fix for remove api-getmodel power. + +commit 2a81b74f81e6b4f065d124633e8d27faccf2bb81 +Author: wangyidong +Date: Thu Sep 19 14:19:38 2019 +0800 + + * fix bug. + +commit 501ac515ab45d0ba4f22e69f630f8347e9039bcb +Author: wangyidong +Date: Thu Sep 19 14:18:54 2019 +0800 + + * fix bug for check click runcase. + +commit 6109ccd6419b31ed28972a893a3b5e1ed491a0b4 +Author: Catouse +Date: Mon Sep 16 10:26:04 2019 +0800 + + * fix chosen ‘middle_highlight’ option not work on enable 'max_drop_width' option. + +commit 0b9a820ccc3516b2d8a684ea5b20488bea6b0a07 +Merge: 3eaacbd6e8 41a7eefa2f +Author: wangyidong +Date: Mon Sep 9 10:32:02 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3eaacbd6e820d528824655dd715bc17d676d94e0 +Author: wangyidong +Date: Mon Sep 9 10:31:16 2019 +0800 + + * adjust for merge table cell. + +commit 41a7eefa2f363f7ac3d5c9d3bb7aa9e6792c4c0a +Author: reneeteng +Date: Fri Sep 6 15:35:51 2019 +0800 + + * Update lang file turnon translation. + +commit 4d0347207b5317a8d47fc8fec549e353ca926840 (tag: zentaopms_11.6.2_20190906) +Author: wangyidong +Date: Fri Sep 6 11:16:34 2019 +0800 + + * fix error variable. + +commit 985a717f81b2fcb564cf87900783eaceb4237c00 +Author: wangyidong +Date: Fri Sep 6 10:37:44 2019 +0800 + + * change date. + +commit a01fbd52452c4d24964aad792ab25b530b317d82 +Author: wangyidong +Date: Fri Sep 6 10:28:50 2019 +0800 + + * add changelog. + +commit 533e9b7bcb9ca3e96ac786da75cff50f0f96b787 +Author: wangyidong +Date: Fri Sep 6 10:20:18 2019 +0800 + + * fix for upgrade. + +commit 6f38d68c1daa7deb528f0e573fa9eb2fe1dbaa78 +Author: wangyidong +Date: Fri Sep 6 09:44:58 2019 +0800 + + * fix bug #2726. + +commit 05d385aefeef2ccf0f919d69681a90f7f308ce5e +Author: wangyidong +Date: Fri Sep 6 09:34:09 2019 +0800 + + * adjust for zdoo logo. + +commit a29d2f9853378c3c2d56235678ce1a01233b11e4 +Author: wangyidong +Date: Thu Sep 5 17:27:51 2019 +0800 + + * adjust for zh-tw lang. + +commit 6385bdf9558310113230996809ebff275334c026 +Author: wangyidong +Date: Thu Sep 5 17:07:15 2019 +0800 + + * adjust for message-browser page. + +commit 7faea2a8d58dbd77d595e09de9ce210e8360a1fc +Author: wangyidong +Date: Thu Sep 5 16:58:19 2019 +0800 + + * code for task #6315. + +commit 53e6970362b9d3b222e6a603a91a089cd610f97c +Author: wangyidong +Date: Thu Sep 5 16:50:16 2019 +0800 + + * adjust for bybranch in project-story page. + +commit c16eeefa33cf8426dddee6797d61b6842c68d20d +Author: wangyidong +Date: Thu Sep 5 16:00:04 2019 +0800 + + * replace ne() function to notIN(). + +commit fd790da12ce3c6e38d9244bf97d6df6bc85d5e42 +Author: wangyidong +Date: Thu Sep 5 15:59:43 2019 +0800 + + * adjust for convert url. + +commit 3a716727760c59b86dbe95ddf3140ee1321e4918 +Author: wangyidong +Date: Thu Sep 5 15:51:40 2019 +0800 + + * add count for tab. + +commit ed71329e57851f1e8290959f910c6d548efe0d76 +Author: wangyidong +Date: Thu Sep 5 15:50:38 2019 +0800 + + * change doing to undone. + +commit 3d2623aa2d39b804a30bdbf8343a5b293ba06403 +Author: wangyidong +Date: Thu Sep 5 13:06:15 2019 +0800 + + * add new version and upgrade it. + +commit 26fef265205f93711c120205f47fc2cd65729f37 +Author: wangyidong +Date: Thu Sep 5 10:42:06 2019 +0800 + + * code for task #6290. + +commit 77873ce9d984bb34a26ee7c22aa6c6c7d1510efe +Author: wangyidong +Date: Thu Sep 5 10:31:55 2019 +0800 + + * code for task #6290. + +commit abd68e9428e633e81b1574bb04c2ea5fa005ed39 +Author: wangyidong +Date: Thu Sep 5 09:38:12 2019 +0800 + + * code for task #6337. + +commit 1ab959e73141c6a9f7f3a03364a28d44ceebbb8d +Author: wangyidong +Date: Wed Sep 4 17:27:45 2019 +0800 + + * finish task #6336. + +commit e841301ad5f46eac21341c7f17780b893fab2746 +Author: wangyidong +Date: Wed Sep 4 16:00:01 2019 +0800 + + * fix bug #2723. + +commit 48d6f5b58dbd0a60a9703d95843519e5911b257c +Author: wangyidong +Date: Wed Sep 4 14:40:31 2019 +0800 + + * finish task #6288. + +commit 334988c15adfcccc7cfd325ca52b1516df104a97 +Author: wangyidong +Date: Wed Sep 4 14:20:52 2019 +0800 + + * finish task #6335. + +commit 88bd364938665fad5bb46387d63c155ee2471882 +Author: wangyidong +Date: Wed Sep 4 11:18:54 2019 +0800 + + * finish task #6322. + +commit 2eaadb167bedba866e2ad1b7f2071b6062b7b79f +Merge: c02ab53c02 f90da50eb7 +Author: wangyidong +Date: Wed Sep 4 09:02:41 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c02ab53c025ae4e31d63e8921fa146390a2e1c8c +Author: wangyidong +Date: Wed Sep 4 09:02:11 2019 +0800 + + * finish task #6314. + +commit d2c577c6f6e739d57eccdb7d003e6c8b5772afa3 +Author: wangyidong +Date: Wed Sep 4 08:51:23 2019 +0800 + + * fix get plan list when product is null. + +commit f90da50eb773689bf668d76f33c8974eb8f4cf55 +Author: Catouse +Date: Tue Sep 3 17:33:22 2019 +0800 + + * fix bug #2608, task #6318, call convertURL immediately to kill bug. + +commit 95b38298e0d1a34b9915f02899dafa1aa6e46eff +Merge: 51fc8211a9 b72f3f5db3 +Author: Yagami <976204163@qq.com> +Date: Tue Sep 3 15:35:13 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 51fc8211a95a40c18f0f105e5471f738ccb3f6ac +Author: Yagami <976204163@qq.com> +Date: Tue Sep 3 15:34:58 2019 +0800 + + * Remove console. + +commit b72f3f5db3d9eb6d6ed58e944c06c7b3c467f090 +Author: wangyidong +Date: Tue Sep 3 14:31:48 2019 +0800 + + * code for tutorial. + +commit f6b7bc5c822de78f86e1912819278e72359c5bd9 +Author: wangyidong +Date: Tue Sep 3 14:28:48 2019 +0800 + + * fix error. + +commit 981d69a87e90edf947366c07f82d22d10d8f41aa +Author: wangyidong +Date: Tue Sep 3 13:18:55 2019 +0800 + + * code for task #6310. + +commit 2b78f532832d0f7cacf4ae6e14bf5909db377b82 +Author: wangyidong +Date: Tue Sep 3 13:17:45 2019 +0800 + + * finish task #6310. + +commit 485f4493f917606f58511f408d4b9ebaf09e5b23 +Author: wangyidong +Date: Tue Sep 3 13:06:45 2019 +0800 + + * finish task #6305. + +commit 2123c1556e3e33cae325730a9448f02616f8a266 +Author: wangyidong +Date: Tue Sep 3 12:14:01 2019 +0800 + + * fix bug. + +commit bf2df9018bdcaa716e6c34023259cdfc977888ea +Merge: f7841fd604 59aea35e14 +Author: wangyidong +Date: Tue Sep 3 11:21:54 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f7841fd6041cc4ad34bfe9b5aab7ed18e36baa12 +Author: wangyidong +Date: Tue Sep 3 11:21:29 2019 +0800 + + * code for task #6300. + +commit 59aea35e14eff214a4f8f033ee635de56e487bd2 +Merge: 21683d1115 5e29f3bde5 +Author: Yagami <976204163@qq.com> +Date: Tue Sep 3 11:19:41 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 21683d111569903be261af8adfe4b0e06c4be07f +Author: Yagami <976204163@qq.com> +Date: Tue Sep 3 11:19:26 2019 +0800 + + * Fix testsuite view icon. + +commit 5e29f3bde550a2407436e9e9e8f18a08d059d14c +Author: wangyidong +Date: Tue Sep 3 11:13:41 2019 +0800 + + * code for task #6300. + +commit bf449d22381103e9533872b246eb7ff94abb2ba1 +Author: wangyidong +Date: Tue Sep 3 11:12:21 2019 +0800 + + * finish task #6299. + +commit f7efb2c55448880b5aebb46bcd79c84f3e05bcd1 +Merge: 280ca6be64 6ac14da5d1 +Author: Yagami <976204163@qq.com> +Date: Tue Sep 3 10:19:44 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 280ca6be64b8ded00e8baea7701ae29b0716a1eb +Author: Yagami <976204163@qq.com> +Date: Tue Sep 3 10:19:28 2019 +0800 + + * Finish task #6300. + +commit 6ac14da5d1a60909bb6ac45984a438d99a2adedc +Author: wangyidong +Date: Tue Sep 3 10:15:20 2019 +0800 + + * finish task #6297. + +commit 751e0c88fbd9019f3365afaf009a05f006bd3494 +Author: wangyidong +Date: Tue Sep 3 09:59:47 2019 +0800 + + * adjust for ignore steps. + +commit 921a8f27d68dc8f6ca0914b65031d19701a95dd8 +Merge: afd1ca6b48 fadc04854d +Author: wangyidong +Date: Tue Sep 3 09:28:21 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit afd1ca6b48b3f30fa9e938764a9dcb0f18d72ca0 +Author: wangyidong +Date: Tue Sep 3 09:27:05 2019 +0800 + + * adjust for testreport result report. + +commit fadc04854d8adea8cf73c31322213b8a8ab7ac55 +Author: Yagami <976204163@qq.com> +Date: Tue Sep 3 09:21:56 2019 +0800 + + * Fix cases css. + +commit eb0f77ad7bcc419e53b679d1fd14dd0e1e054a96 +Merge: 6c2f090d9a f3620ab742 +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 17:29:41 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6c2f090d9a483608b32c483cfb417a14b558a36a +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 17:28:51 2019 +0800 + + * Finish task #6301. + +commit f3620ab742cedf68826328c3a6eb56f4715137cb +Merge: fabc6a6dd5 3fee807700 +Author: wangyidong +Date: Mon Sep 2 16:56:47 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fabc6a6dd5d8c49ff41c11c50b8532593f876ee2 +Merge: 88ce610272 5ee62cd458 +Author: wangyidong +Date: Mon Sep 2 16:45:44 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3fee80770046fb0cf22fad3d663561dfe3d5a9ed +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 16:45:34 2019 +0800 + + * Finish task #6302. + +commit 88ce61027278e283451ad86ff08ca69cf0f71d35 +Author: wangyidong +Date: Mon Sep 2 16:45:24 2019 +0800 + + * finish task #6295. + +commit 5ee62cd458e3eb541e12692bf4829f115e7dc41d +Merge: 626ac77395 7a29a3b98e +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 15:53:19 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 626ac77395fd8ac18925fe76d4bc1b5e378496c8 +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 15:53:08 2019 +0800 + + * Finish task #6303. + +commit 7a29a3b98eb9517c4f8376eec4c0c24d01cea12d +Author: wangyidong +Date: Mon Sep 2 15:40:16 2019 +0800 + + * codefor task #6291. + +commit c73849844f935575544eb90945abface62d41709 +Merge: e161871c4f f0702a44a9 +Author: wangyidong +Date: Mon Sep 2 15:38:52 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e161871c4f969e00dfb2d882ecf477bb36f0d4f2 +Author: wangyidong +Date: Mon Sep 2 15:38:05 2019 +0800 + + * code for task #6289. + +commit f0702a44a9c03d561364d115a566cddbc8e2ea5d +Merge: 95aed78ea7 a68675a69e +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 14:53:58 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 95aed78ea7a44f5e802522b3280360e71ce133b1 +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 14:53:43 2019 +0800 + + * Finish task #6298. + +commit a68675a69e7e890846a5a8128d32c45804622bbe +Merge: 399cb34274 2840f01585 +Author: wangyidong +Date: Mon Sep 2 14:40:10 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 399cb34274718d2bdcffcd55a2e8834a7508ab23 +Author: wangyidong +Date: Mon Sep 2 14:38:24 2019 +0800 + + * adjust for ignore steps when post has no steps. + +commit 2840f01585e1bf5cb2e05a1f96233f89dc8f178d +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 14:32:46 2019 +0800 + + * Finish task #6317. + +commit 3c77275523422d3056f71d70d6338fb8a2e95340 +Merge: 61b30b5649 da63d1684f +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 14:16:01 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 61b30b5649705910aa9953f61948531c0ea2cd6b +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 14:15:47 2019 +0800 + + * Finish task #6315. + +commit da63d1684f6953da41bec5d4c8131ed951cd4bf4 +Author: wangyidong +Date: Mon Sep 2 13:52:03 2019 +0800 + + * finish task #6294. + +commit d59d4ce086b1cc026e76d6a9a5973674b5154224 +Merge: 59e05ed701 79439f5546 +Author: wangyidong +Date: Mon Sep 2 11:47:13 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 59e05ed701ed732cf3a13d0e551a15040df1d1f2 +Author: wangyidong +Date: Mon Sep 2 11:33:45 2019 +0800 + + * finish task #6293. + +commit 79439f5546de1e4b2930e46cd4ca5c568fae9173 +Merge: d206d13913 efde0ab92f +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 10:49:55 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d206d13913cb9e1b571af4ae794254a6053cce09 +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 10:49:43 2019 +0800 + + * Finish task #6316. + +commit efde0ab92f6c84eee0eb1aa7c22dc5845b1f7820 +Merge: d19044bb33 cab21108dd +Author: wangyidong +Date: Mon Sep 2 10:48:29 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d19044bb33102e034c2cfe9a47ac67101048b4dc +Author: wangyidong +Date: Mon Sep 2 10:47:14 2019 +0800 + + * adjust for task #6291. + +commit 98f83c98f6cf94e4a4cfd1c998ea4ca5862d6c97 +Author: wangyidong +Date: Mon Sep 2 10:32:52 2019 +0800 + + * finish task #6292. + +commit cab21108dd2efe354ec19147403ec4c50a4361f2 +Merge: 6256fd35ab 141e10ec88 +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 10:28:15 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6256fd35ab50b564f6c71698223d7512c85d7e8c +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 10:28:05 2019 +0800 + + * Finish task #6308. + +commit 141e10ec8855b59d040104c71fa662b3079a339b +Merge: 5f6c55fa8d 1e948d433a +Author: wangyidong +Date: Mon Sep 2 10:26:38 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5f6c55fa8d41c5d529d04e46206d0f0c320be17f +Author: wangyidong +Date: Mon Sep 2 10:26:10 2019 +0800 + + * finish task #6291. + +commit 1e948d433a5010d6cd73e7c3b61a20559cdac158 +Merge: 6fc9c4b30d 2893b5b9fb +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 10:24:52 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6fc9c4b30d3bd5ddae9e63b4c256d26a38a9860e +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 10:24:23 2019 +0800 + + * Fix task #6323. + +commit 2893b5b9fbb061c77a32ab11632392d73efc9676 +Merge: dafc15c699 cd0bbd642a +Author: wangyidong +Date: Mon Sep 2 10:18:18 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit dafc15c699874018717485f8efc56c97388c0c7c +Author: wangyidong +Date: Mon Sep 2 10:17:35 2019 +0800 + + * finish task #6290. + +commit cd0bbd642a4a7e5ae4496bdb055e284315b6e38e +Merge: 83fcc6b265 eecb6a5020 +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 09:40:57 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 83fcc6b265b044b523c7d8ac70c979931f8d5e6d +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 09:40:28 2019 +0800 + + * Finish task #6323. + +commit eecb6a5020ccda02ccfd9c25f57fc118df406141 +Author: wangyidong +Date: Mon Sep 2 09:17:07 2019 +0800 + + * code for task #6289. + +commit 2e8d4ae45ecf7fad3a077d63c7da6bc5c5a5c253 +Merge: d29ac3a948 56173821a7 +Author: wangyidong +Date: Mon Sep 2 09:12:43 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d29ac3a948f18c3e5c4886e2319cc603d2e51b11 +Author: wangyidong +Date: Mon Sep 2 09:12:17 2019 +0800 + + * code for task #6288. + +commit 56173821a7308c63db8bce8b2ccbec6c017d81ec +Merge: ae57e370b2 bc919217ad +Author: Yagami <976204163@qq.com> +Date: Mon Sep 2 08:26:58 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bc919217adb1006700938485b1c842f997aaed69 +Author: wangyidong +Date: Fri Aug 30 15:02:15 2019 +0800 + + * finish task #6288. + +commit b0d08b4a895c5a968fc54a8abea7c25883206d42 +Author: wangyidong +Date: Fri Aug 30 15:01:50 2019 +0800 + + * finish task #6289. + +commit 6575a6eb8c09ba6de15440d8ae71aaf504916e74 +Author: wangyidong +Date: Fri Aug 30 14:07:50 2019 +0800 + + * finish task #6287. + +commit 7de530b5aeae9ddb628335c5aa6e83794240c8c4 +Author: wangyidong +Date: Fri Aug 30 13:28:21 2019 +0800 + + * finish task #6286. + +commit 5f96873413bb8bc614df6da3598a7e76631a26f1 +Author: wangyidong +Date: Fri Aug 30 10:00:15 2019 +0800 + + * finish task #6285. + +commit 92487e13d1a50bce139c12d7f2c942dbead7870a +Author: wangyidong +Date: Fri Aug 30 09:30:45 2019 +0800 + + * finish task #6284. + +commit f6b9c6f85f3543681616d95de224ad1715080e57 +Author: wangyidong +Date: Thu Aug 29 15:18:59 2019 +0800 + + * fix bug. + +commit cd5a27618594cd59c92508ffd61ea0e49f49b021 +Author: wangyidong +Date: Thu Aug 29 14:28:52 2019 +0800 + + * finish task #6283. + +commit e7cc7845346add53caf7e1acd4f564299f3b660d +Author: wangyidong +Date: Thu Aug 29 10:57:40 2019 +0800 + + * finish task #6281,6282. + +commit ae57e370b2731ed91b6ebe24187489321c500c0c +Author: Yagami <976204163@qq.com> +Date: Wed Aug 28 11:08:00 2019 +0800 + + * Add title to team role. + +commit 46a6444168e0228a81432f17c2bbabe754e10997 +Author: wangyidong +Date: Tue Aug 27 09:55:06 2019 +0800 + + * fix bug for undelete plan. + +commit c40fc9a762279737304f35405bcb6d9e2038fcfb +Author: wangyidong +Date: Mon Aug 26 11:13:46 2019 +0800 + + * fix bug. + +commit 240d306680e2f858a1c8a0addcb23748e6c822d3 +Author: wangyidong +Date: Mon Aug 26 10:42:02 2019 +0800 + + * fix bug for batch create user. + +commit 970b2bb9d9f7a895b6913c5e11b0a8bd066cb589 +Author: wangyidong +Date: Fri Aug 23 11:21:50 2019 +0800 + + * fix bug for create bug. + +commit ff7b160ae5d0c196246ebe94d32a075493edecc2 (tag: zentaopms_11.6.1_20190823) +Merge: 67a1f68cec 8e77bad47f +Author: wangyidong +Date: Fri Aug 23 09:12:10 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 67a1f68cecdd5566c6665e8a7d7cb2592b03bc1e +Author: wangyidong +Date: Fri Aug 23 09:11:45 2019 +0800 + + * add changelog. + +commit 8e77bad47f0209f0c7f14dc6a03a496504f4bbd8 +Author: liugang +Date: Thu Aug 22 17:52:51 2019 +0800 + + * finish task #6264. + +commit 9d586d5160539cc584d09c658111d029031d5655 +Merge: 2a83351760 f69849c5b8 +Author: wangyidong +Date: Thu Aug 22 17:35:11 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2a83351760a00b86d5326c9551b47a14e217fbc9 +Author: wangyidong +Date: Thu Aug 22 17:34:55 2019 +0800 + + * add en and zh-tw lang. + +commit f69849c5b80225bc9ae6cf989b6cd316980e1506 +Author: liugang +Date: Thu Aug 22 17:19:15 2019 +0800 + + * Add function to scroll kanban and fix side when scroll kanban. + +commit 6652663389b1ff6cd908fc90afba4c15033b347b +Author: wangyidong +Date: Thu Aug 22 16:44:36 2019 +0800 + + * code for task #6226. + +commit 2b360a177251c7fbda93352e75c67d0210f2eb1f +Author: wangyidong +Date: Thu Aug 22 16:44:04 2019 +0800 + + * adjust style. + +commit 4f989a68818feb9af40268d0dae18aa36593c636 +Author: wangyidong +Date: Thu Aug 22 16:06:40 2019 +0800 + + * finish task #6226. + +commit d9ec6fc752786019aff0968ba7324cc1ef231fc1 +Author: wangyidong +Date: Thu Aug 22 15:27:40 2019 +0800 + + * code for task #6226. + +commit 2987a833029cdf1368ab945b312739b15349e847 +Author: wangyidong +Date: Thu Aug 22 14:36:23 2019 +0800 + + * finish task #6232. + +commit 296d9ebc11ae0351f36736816a4b7a0f2ea1ceb3 +Author: wangyidong +Date: Thu Aug 22 13:46:32 2019 +0800 + + * code for task #6239. + +commit 6b9b77fd4ecf8a734b702a42f7952b43f7e2dbf3 +Author: wangyidong +Date: Thu Aug 22 13:33:01 2019 +0800 + + * finish task #6239. + +commit 5114ffe2b0f2004a91c7a231eafc20dea2fa6ef1 +Author: wangyidong +Date: Thu Aug 22 13:30:35 2019 +0800 + + * fix for hmac function in class.smtp.php. + +commit c16c150a40f31c60d1ee893545f3482d2c4e429c +Author: wangyidong +Date: Thu Aug 22 13:10:51 2019 +0800 + + * finish task #6255. + +commit 162887854f839e8ec0d37facdb81b6f782348a32 +Author: wangyidong +Date: Thu Aug 22 11:14:56 2019 +0800 + + * finish task #6233. + +commit 0ef65f16883a0c7d70544f1feedc2bf213407706 +Merge: 20fbf627ea 99c1cc37ef +Author: wangyidong +Date: Thu Aug 22 11:14:03 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 20fbf627ea6da2473114061482a74e0fb648cbc9 +Author: wangyidong +Date: Thu Aug 22 11:13:08 2019 +0800 + + * code for task #6238. + +commit 99c1cc37efa806dc4dc7736f60c0b1433712ada9 +Author: liugang +Date: Thu Aug 22 10:27:07 2019 +0800 + + * Finish task #6245. + +commit fb7445e0538b5188ad0c9d18b9cf0b6cc9676617 +Author: liugang +Date: Thu Aug 22 10:22:03 2019 +0800 + + * Finish task #6263. + +commit 5e462410b8ae7c16b482dbaf97b617e4432a39bc +Author: wangyidong +Date: Thu Aug 22 10:14:52 2019 +0800 + + * finish task #6230. + +commit 219f8da5632629d711084253d39234bd0314df91 +Author: wangyidong +Date: Thu Aug 22 10:04:42 2019 +0800 + + * fix bug. + +commit c3c34f4b4ac114080614dfc3f690cd5640a6735b +Author: wangyidong +Date: Thu Aug 22 10:04:22 2019 +0800 + + * finish task #6262. + +commit 4be242a50059485615afc81649390ccaa6785343 +Merge: 45943e3411 a14479678f +Author: wangyidong +Date: Thu Aug 22 10:00:50 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 45943e3411cecf9ff498fb91d1342e5f3e335d26 +Author: wangyidong +Date: Thu Aug 22 10:00:29 2019 +0800 + + * finish task #6236. + +commit a14479678fa3e3be464810f9f47acd2cf4390d68 +Author: liugang +Date: Wed Aug 21 17:39:44 2019 +0800 + + * Fix bug that the subStatus do not display the default value when drag a task from a lane to another. + +commit d1da47ff11edef7f70d54f19d53d20a4cdf2ac9f +Author: liugang +Date: Wed Aug 21 17:04:31 2019 +0800 + + * Adjust function getStatus to get status when update a testcase. + +commit 8dee6d79b8f62a20e0a49e7d69eaa1c29c17f6f5 +Author: liugang +Date: Wed Aug 21 17:03:48 2019 +0800 + + * Rename function changeSubStatus to ajaxChangeSubStatus. + +commit f8d8eecd9d5edc1dec819fc565ebd81661be9c11 +Merge: 12b217ffcb 190a83bc94 +Author: wangyidong +Date: Wed Aug 21 16:50:27 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 12b217ffcb65b498049eb8ec543a0e281ba8abe6 +Author: wangyidong +Date: Wed Aug 21 16:50:09 2019 +0800 + + * finish task #6227. + +commit 190a83bc94e3a8927209e1546f4e77ac4854c91d +Author: liugang +Date: Wed Aug 21 16:34:52 2019 +0800 + + * Adjust codes to display subStatus in kanban. + +commit 253e0ab3a89844411f1205a30dae593580422b3a +Author: wangyidong +Date: Wed Aug 21 15:32:29 2019 +0800 + + * finish task #6231. + +commit 8c239149e9beca14f071d655d0a8801aa270f5f7 +Author: wangyidong +Date: Wed Aug 21 10:32:50 2019 +0800 + + * finish task #6234. + +commit ab197cee1da029c4f37c624a4dd8d7cf4bab9b85 +Author: wangyidong +Date: Wed Aug 21 10:30:20 2019 +0800 + + * finish task #6235. + +commit 9e43c72ab8b85cd1ad54dc310c2c4a6bc29d5852 +Merge: afe1340323 aa1609117e +Author: wangyidong +Date: Wed Aug 21 10:29:11 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit afe13403239b825ffa7eade20905baa1809c912e +Author: wangyidong +Date: Wed Aug 21 10:28:23 2019 +0800 + + * finish task #6259. + +commit aa1609117e77aff667e15d2a3ecac791854deb43 +Merge: f1ef72dfbb c35167f38a +Author: jinianlan +Date: Wed Aug 21 10:27:32 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f1ef72dfbb6c9effa5b79dc40b003daec34f6416 +Author: jinianlan +Date: Wed Aug 21 10:25:32 2019 +0800 + + * code for task 6244,6242. + +commit c35167f38a8967574cefcd031ff34242afaae167 +Author: wangyidong +Date: Wed Aug 21 10:18:32 2019 +0800 + + * finish task #6238. + +commit f1684ad8e98624f47e0e9f7627da6fff159f52e4 +Author: wangyidong +Date: Wed Aug 21 10:15:58 2019 +0800 + + * finish task #6241. + +commit f71f9c35c63ee3378dea9e471d9a06c00c0b4975 +Author: wangyidong +Date: Wed Aug 21 10:12:08 2019 +0800 + + * adjust for english notes. + +commit 8bdcfef9801eb7f192f4eb0ccd17151b13562d29 +Author: wangyidong +Date: Wed Aug 21 10:11:44 2019 +0800 + + * finish task #6243. + +commit 336e6e2e3002a23ec954c236de850d3c00ad881e +Author: wangyidong +Date: Wed Aug 21 10:09:14 2019 +0800 + + * finish task #6246. + +commit 61a03933c3368db8732467d5b3171afd4d0d726c +Author: wangyidong +Date: Wed Aug 21 10:06:25 2019 +0800 + + * finish task #6247. + +commit 923a18f5d65aa8901c0af2105bdbaa7af7a841bc +Author: wangyidong +Date: Wed Aug 21 09:53:35 2019 +0800 + + * finish task #6248. + +commit 83525e61525b8cbe4c8e0eee48b35c592fd20954 +Author: wangyidong +Date: Wed Aug 21 09:40:35 2019 +0800 + + * finish task #6249. + +commit fb57ecdfd0181c91f821825a796845b5a2a54fae +Author: wangyidong +Date: Wed Aug 21 09:31:29 2019 +0800 + + * finish task #6250. + +commit 5182a0d9846819c5cc3601bff02885cfac3716fc +Author: wangyidong +Date: Wed Aug 21 09:30:01 2019 +0800 + + * finish task #6252. + +commit 6960c43352d4ee2e414b8c25cdcd989b2275cdb6 +Author: wangyidong +Date: Wed Aug 21 09:23:01 2019 +0800 + + * finish task #6256. + +commit 5f3ec326bf2cb37b1fa944eb8761477d5dcfd376 +Author: wangyidong +Date: Wed Aug 21 09:21:21 2019 +0800 + + * finish task #6257. + +commit e9a8c643b3694d3716768941eafc3d5c8af93373 +Author: wangyidong +Date: Wed Aug 21 08:59:50 2019 +0800 + + * finish task #6258. + +commit f24b888446c8988bf834bffa2165a6e7edf5c5df +Author: wangyidong +Date: Wed Aug 21 08:55:13 2019 +0800 + + * finish task #6259. + +commit 475fb0732acc7def3f617e67723766ac726c5782 +Author: wangyidong +Date: Wed Aug 21 08:47:53 2019 +0800 + + * finish task #6260. + +commit cd52f39438e5b57c7213d8bc3b5c3fa3ba32aa78 +Author: wangyidong +Date: Wed Aug 21 08:43:55 2019 +0800 + + * finish task #6261. + +commit 5afc39c8e7e004b0f59eac0aeb51fc78f915301a +Author: wangyidong +Date: Tue Aug 20 17:24:40 2019 +0800 + + * finish task #6229. + +commit f601e76a6ab561675a3a5eab750c681d0e9fd787 +Merge: 95fb1256d9 2ecbf865eb +Author: wangyidong +Date: Tue Aug 20 17:21:25 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 95fb1256d91c6aa3dbc7e5cf31b61c050365397d +Author: wangyidong +Date: Tue Aug 20 17:20:43 2019 +0800 + + * finish task #6228. + +commit 2ecbf865eb0d2a2c1f8c750f978cb83625f8cefe +Author: reneeteng +Date: Tue Aug 20 16:29:42 2019 +0800 + + * Lang file update. + +commit 19d6e2407f11540af3a7c126e1f1aca37b25d09c +Author: reneeteng +Date: Tue Aug 20 15:03:26 2019 +0800 + + * Lang file update. + +commit 5cde119e9d697b1d6e4e84147bd34f2ffa346b01 +Author: liugang +Date: Tue Aug 20 14:47:23 2019 +0800 + + * Fix bug of status. + +commit a098f9c515e92ac7852d62da777a4ff118ca4ea9 +Merge: fdec96cfa0 eab94efa07 +Author: wangyidong +Date: Tue Aug 20 09:56:14 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fdec96cfa0ed4f90780606a03bfb115e979be437 +Author: wangyidong +Date: Tue Aug 20 09:55:09 2019 +0800 + + * change error word. + +commit eab94efa07948bba6b46afc2fd209da27101d864 +Author: jinianlan +Date: Mon Aug 19 17:53:33 2019 +0800 + + * code for task #6186. + +commit 153e8b272dc07fae7511e22ab12f7c88038612fd +Author: wangyidong +Date: Mon Aug 19 11:34:29 2019 +0800 + + * add new version and upgrade. + +commit 56dd762c7a03cd5cda1f5a4384163c72617137b6 +Author: wangyidong +Date: Mon Aug 19 09:20:59 2019 +0800 + + * git commit for todo-time label width. + +commit a3354f303e27eadafcd267fa43a490204d33520f +Merge: c0451b593b 74825e33fe +Author: wangyidong +Date: Fri Aug 16 16:10:53 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c0451b593b8ecdf4f1e2d5362153171be6f2653f +Author: wangyidong +Date: Fri Aug 16 16:10:03 2019 +0800 + + * code for task #6180. + +commit c5ccb20195bb75cc196de8f3feaa7d46f31171a6 +Author: wangyidong +Date: Fri Aug 16 16:09:01 2019 +0800 + + * code for get bug filed options for auto test. + +commit 74825e33fe1df0dd5c7d9fe5ee857a3c89c33df5 +Merge: 255048e8ff d8d54f52ba +Author: Catouse +Date: Fri Aug 16 14:12:47 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 255048e8ffa2aac5f77225c1d00675e769e1104e +Author: Catouse +Date: Fri Aug 16 14:12:29 2019 +0800 + + * update kindeditor. + +commit d8d54f52ba61f5b661165b000cc4cd78e48c5ca4 +Author: wangyidong +Date: Fri Aug 16 13:06:26 2019 +0800 + + * code for task #6180. + +commit 66ce614c59fb5d312d286638788dcbc74be0f368 +Author: wangyidong +Date: Fri Aug 16 12:26:27 2019 +0800 + + * finish task #6180. + +commit f40bd1adb54f1c0f46bf25f1191b7ab9b0487094 +Author: wangyidong +Date: Thu Aug 15 15:26:15 2019 +0800 + + * fix bug #2688. + +commit 92d402f86d2a0db463dc1b5eba84a279de622052 +Author: wangyidong +Date: Thu Aug 15 15:03:31 2019 +0800 + + * code for task #6171. + +commit bd0eb7d8db575c1ccd30fafcd0a6f78131bb97fd +Author: wangyidong +Date: Thu Aug 15 13:51:44 2019 +0800 + + * code for task #6171. + +commit 68f4606648fdcc1423db2cf0b55349258569b7c8 +Author: wangyidong +Date: Thu Aug 15 11:14:27 2019 +0800 + + * adjust for task #6174. + +commit f2450252ac6198a345307273503f1b508bf46829 +Author: wangyidong +Date: Wed Aug 14 15:58:09 2019 +0800 + + * fix bug. + +commit 97fc94791397d0ee5329cc3dc6b1fc02b67e5aa9 +Author: wangyidong +Date: Wed Aug 14 15:34:43 2019 +0800 + + * computeWorkingHours has in updateParentStatus method. + +commit e0e6d677b242bf9040e81bfed3d5c2213a06bd6a +Author: wangyidong +Date: Wed Aug 14 15:27:40 2019 +0800 + + * adjust for update task status when undelete child task. + +commit 1ee6b158a1170682b915421c6d8d8d5d70e21464 +Author: wangyidong +Date: Wed Aug 14 10:01:48 2019 +0800 + + + add other logo. + +commit fa600971b58efffb748cf4eabe1e6ebb5663395d +Merge: 010e585550 fd0272d7da +Author: wangyidong +Date: Wed Aug 14 09:00:49 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 010e58555018aa3e4069ac54314413c21fbe24ab +Author: wangyidong +Date: Wed Aug 14 08:59:39 2019 +0800 + + * finish task #6176. + +commit fd0272d7da43ccdedec48da7f215669f5cb4f978 +Author: liugang +Date: Tue Aug 13 16:32:53 2019 +0800 + + * Display labels of user defined flows. + +commit dc022ad849d8fc7388a82d31d3762e207620fa50 +Author: liugang +Date: Tue Aug 13 14:58:15 2019 +0800 + + * Optimize function to printExtendFields. + +commit 901a2472036cb32de0e708830a89bad9c0ecdd15 +Author: wangyidong +Date: Tue Aug 13 10:57:58 2019 +0800 + + * code for task #6200,6189. + +commit 72504872ac23095901cefb510ba8febb74b7320c +Merge: 54df20147a b46091a3d1 +Author: jinianlan +Date: Mon Aug 12 16:13:39 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 54df20147a8ce1e95cf4dca361faef57390e991c +Author: jinianlan +Date: Mon Aug 12 16:11:48 2019 +0800 + + * finish task 6191 + +commit b46091a3d13b097c751112e3cbc2310e2a638643 +Merge: 2e66d11a67 ec6c3d78ec +Author: Catouse +Date: Mon Aug 12 16:07:53 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2e66d11a678ba8faceff57e1ddc3e9428ab76206 +Author: Catouse +Date: Mon Aug 12 16:07:43 2019 +0800 + + * update zui.js. + +commit ec6c3d78ec88264ba015e112bb20509898a8f67f +Author: wangyidong +Date: Mon Aug 12 11:56:21 2019 +0800 + + * code for task #6200. + +commit 9b6207141cdadd3a435ed75ee4af4e314d8cd138 +Merge: 72cd70ad88 968390978c +Author: wangyidong +Date: Mon Aug 12 10:39:24 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 72cd70ad88dc861912a3e25d58bf4a2a80e07596 +Author: wangyidong +Date: Mon Aug 12 10:39:00 2019 +0800 + + * finish task #6213. + +commit 968390978c85749a3bcba34350c654b67eda2616 +Merge: c6cba5483e 551acd6ddb +Author: jinianlan +Date: Mon Aug 12 08:25:42 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c6cba5483e6415438087da4b43d294555b1a3b4a +Author: jinianlan +Date: Mon Aug 12 08:23:00 2019 +0800 + + * finish task #6173,#6174,#6175,#6183,#6186,#6187. + +commit 551acd6ddbb412062968de6a47dae4a4b7c0cfbe +Author: liugang +Date: Fri Aug 9 17:35:34 2019 +0800 + + * Optimize. + +commit 9cf4d28a79cd68eb548e6f7ed98c4c406336d764 +Author: liugang +Date: Fri Aug 9 16:15:34 2019 +0800 + + * Add comment. + +commit 90422eb0e8a835ef2026586202b93d578e96c988 +Author: liugang +Date: Fri Aug 9 16:15:20 2019 +0800 + + * Remove useless codes. + +commit f5d7bd7697981651a06db314514ce48fc77a483f +Merge: 03c8fc5ba4 6c65cb0b48 +Author: wangyidong +Date: Fri Aug 9 15:53:12 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6c65cb0b484fd021620771fe939761aed79a4d5e +Author: reneeteng +Date: Fri Aug 9 15:43:43 2019 +0800 + + * Y disk and MeshIoT content edited. + +commit 03c8fc5ba4b19ef72b78896c409e463456d0071a +Author: wangyidong +Date: Fri Aug 9 15:42:45 2019 +0800 + + * code for task #6194. + +commit 9d4b78a8f2d3fe389bcf284b04139e656055509b +Author: wangyidong +Date: Fri Aug 9 10:29:57 2019 +0800 + + * finish task #6171. + +commit 083df68ae9d8725a8f1b4c031f0cb5576738065c +Author: wangyidong +Date: Fri Aug 9 10:28:48 2019 +0800 + + * code task #6180. + +commit 20ffb9bbbfcdfef2957c70bab79c141dc1b8c862 +Merge: ad844896d3 c6fbb324bc +Author: wangyidong +Date: Thu Aug 8 18:48:56 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ad844896d3583c565565073e285d6cca2599e414 +Author: wangyidong +Date: Thu Aug 8 18:48:09 2019 +0800 + + * code for task #6178. + +commit c6fbb324bc5c545be74b2823c654360c853be600 +Merge: 5e68baf8c5 bd9e0ce1f6 +Author: liugang +Date: Thu Aug 8 18:37:50 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5e68baf8c50b27c65b14352246071f027aa822a5 +Author: liugang +Date: Thu Aug 8 18:37:25 2019 +0800 + + * Add function to get columns, statusMap, statusList, colorList of kanban. + +commit bd9e0ce1f6410a4535c727f9459e061ea3bbf5b9 +Author: wangyidong +Date: Thu Aug 8 16:42:05 2019 +0800 + + * finish task #6188. + +commit dec97060a67c363cdd223bf5af325e2b1579c0c8 +Author: wangyidong +Date: Thu Aug 8 16:29:51 2019 +0800 + + * finish task #6205. + +commit ccb5ddd4744a3a6faea6b558e76464aaec9936da +Author: wangyidong +Date: Thu Aug 8 13:21:56 2019 +0800 + + * finish task #6209. + +commit 321b27c81b7f1cc8adebc40d05f0bd771d445817 +Author: wangyidong +Date: Thu Aug 8 13:12:49 2019 +0800 + + * finish task #6208. + +commit 2fbe7943f37ddb81894f9dd375869832b22c04a8 +Author: wangyidong +Date: Thu Aug 8 10:25:03 2019 +0800 + + * finish task #6212. + +commit d7f0dad090c1053ce576cb816bd6c3904b4e5681 +Merge: fd0bfd97e5 e27d2f4012 +Author: wangyidong +Date: Wed Aug 7 16:56:58 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fd0bfd97e5de79cfcd74a41ef4a2f35ecefbca04 +Author: wangyidong +Date: Wed Aug 7 16:56:37 2019 +0800 + + * finish task #6201. + +commit e27d2f401215119efc6d21b3e2fe8b68492fb4fb +Merge: 842667e0a0 7964ce412f +Author: reneeteng +Date: Wed Aug 7 16:21:23 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 842667e0a0a2c484084cd4afaa47842eb71d477f +Author: reneeteng +Date: Wed Aug 7 16:20:43 2019 +0800 + + * Lang testcase type. + +commit db78f99f3490e0e5d3868e27e8b3027cd1d38b41 +Author: wangyidong +Date: Wed Aug 7 15:51:33 2019 +0800 + + * finish task #6199. + +commit 13d46d92a1d688c250ac29ec4eea23602b72c0cc +Author: wangyidong +Date: Wed Aug 7 15:50:27 2019 +0800 + + * finish task #2662. + +commit 7964ce412ff8574be0c2faf989e68fdbc42f2794 +Author: wangyidong +Date: Wed Aug 7 15:27:39 2019 +0800 + + * finish task #6190. + +commit 7bdb12995a12b2f6ea913616e9f985c2360e8304 +Author: wangyidong +Date: Wed Aug 7 14:15:13 2019 +0800 + + * finish task #6185. + +commit f8647ef6ae4bb06c5fc2e9812f29af7209a302c4 +Author: wangyidong +Date: Wed Aug 7 13:19:19 2019 +0800 + + * finish task #6181. + +commit 0d11f9d8811d84fb3f68dea483e8c96767ffcbff +Author: wangyidong +Date: Wed Aug 7 13:10:07 2019 +0800 + + * code for task #6180. + +commit 2503a6bb1a3fe40951483df652ae0bc452463826 +Author: wangyidong +Date: Wed Aug 7 11:32:08 2019 +0800 + + * finish task #6180. + +commit beefd94f9d9cbe8f42cf1697d4e6d10a361f896c +Author: wangyidong +Date: Wed Aug 7 11:30:45 2019 +0800 + + * fix for compute password strength when login. + +commit 9e152a5620605e797ade9e29ca570272407c91bf +Merge: 53c6a6bc5c 506aaa3d74 +Author: wangyidong +Date: Wed Aug 7 09:51:34 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 53c6a6bc5c59476363f18b56f6ab7f0370d8e3d6 +Author: wangyidong +Date: Wed Aug 7 09:50:27 2019 +0800 + + * finish task #6179. + +commit 506aaa3d741ac578e0eab12bc786a8172867c99c +Author: liugang +Date: Tue Aug 6 18:05:31 2019 +0800 + + * Change sub status when status is changed and sub status is not set, and record the changes. + +commit 6cbd736ddc2209c5326b9f51a20b90fcf60955b2 +Author: jinianlan +Date: Tue Aug 6 17:33:46 2019 +0800 + + * finish task #6204. + +commit fc3dbd87ffcf6925a3813bad851ea46f909dc0ae +Merge: 4deb236c54 cd0e4ee3fe +Author: jinianlan +Date: Tue Aug 6 17:04:52 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4deb236c541bf4b168989cca147596f4ecf6db42 +Author: jinianlan +Date: Tue Aug 6 17:03:44 2019 +0800 + + * finish task #6193. + +commit cd0e4ee3fef6f3826221da379d4f7c00aa36f914 +Author: liugang +Date: Tue Aug 6 14:35:43 2019 +0800 + + * Adjust lang files. + +commit 8794e9c8df0c79358ee9929dfeb76c904be3c5e3 +Merge: b03634638a d2e807f127 +Author: jinianlan +Date: Tue Aug 6 10:46:12 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b03634638aba039e46ea4542ad1fec3dccb334f3 +Author: jinianlan +Date: Tue Aug 6 10:40:22 2019 +0800 + + * fix Bug #2679,#2637,#2590,finish task #6172,#6182 + +commit d2e807f127a95922f50cbae9d50e77f8c9b14ab4 +Author: liugang +Date: Tue Aug 6 09:41:45 2019 +0800 + + * Set function to get status by ajax. + +commit 9a55866871f14e3c0f87fc529543205df494cfe0 +Merge: 2c052fee90 ca3032e325 +Author: wangyidong +Date: Mon Aug 5 17:28:48 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2c052fee902a8875e4a47d70694ac76f78e5676c +Author: wangyidong +Date: Mon Aug 5 17:28:29 2019 +0800 + + * finish task #6177. + +commit ca3032e32593669fade0e807d9dec3b0b402e6b4 +Author: liugang +Date: Mon Aug 5 17:25:30 2019 +0800 + + * Set hidden status in pages. + +commit 8943de7c93ca7fc5ef50f9e2e0cdd5089c415ed0 +Author: wangyidong +Date: Mon Aug 5 14:15:31 2019 +0800 + + * adjust for auto height. + +commit 9c758a25ebdc70d3dacfd9a9cccc108ce6b7e181 +Merge: e78adb5f41 b69e070b59 +Author: wangyidong +Date: Mon Aug 5 14:05:32 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e78adb5f412dbfec54cf9795d3189cdcb4dce4b6 +Author: wangyidong +Date: Mon Aug 5 14:04:17 2019 +0800 + + * code for task #8446 + +commit b69e070b5998bdac19a6c9747a62a52f048c3793 +Author: jinianlan +Date: Fri Aug 2 18:36:43 2019 +0800 + + * fix Bug 2654 + +commit 6586422f9668c8b3c1835fffbe0c4eee9bcd45d2 +Author: wangyidong +Date: Fri Aug 2 14:48:14 2019 +0800 + + * finish task #8391. + +commit b71b877e2b124e34d5c946836b1bf016d4bc5ddf +Merge: 922800cb81 50ff9f7dd6 +Author: wangyidong +Date: Fri Aug 2 13:40:47 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 922800cb818c07c078eca9b09eeffc71dae03aa2 +Author: wangyidong +Date: Fri Aug 2 13:40:13 2019 +0800 + + * change for task #8445. + +commit 50ff9f7dd6095c77f20d0da49e8a277fc6f0a817 +Author: liugang +Date: Thu Aug 1 17:42:33 2019 +0800 + + * Add comment. + +commit fc2eda8fa645cb7b648087b309bdb26ce58715e0 +Author: jinianlan +Date: Thu Aug 1 17:38:49 2019 +0800 + + * fix Bug 2671 + +commit 7e0d1c74c9e6325d9d39e5c3256bb4dc043cbbbb +Merge: 6e75c8d644 1ea682dd89 +Author: reneeteng +Date: Thu Aug 1 17:23:48 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1ea682dd89f81663f3257c160f5948ca28b3e05f +Author: liugang +Date: Thu Aug 1 16:55:47 2019 +0800 + + * Optimize codes to get options of the subStatus field in search form. + +commit 6e75c8d6445c3fc722bcdbecf29ce664ff7b79bf +Author: reneeteng +Date: Thu Aug 1 16:30:10 2019 +0800 + + * Lang file update. + +commit d3a51bf7f43b0c4081a808b3460048202b19575f +Author: wangyidong +Date: Thu Aug 1 16:25:30 2019 +0800 + + * remove upper case letters for lang code. + +commit e7782435877725f887c7a8ee1e225e71975de7f9 +Author: wangyidong +Date: Thu Aug 1 16:24:48 2019 +0800 + + * replace fsockopen for don't validate remote hosts. + +commit 94e363f9d2131af1e12153e58c44c549f1cc0536 +Merge: 917dfe0696 182e0f7158 +Author: reneeteng +Date: Thu Aug 1 15:40:54 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 182e0f7158ad5dd660b31221985b017280b0f972 +Author: wangyidong +Date: Thu Aug 1 14:09:07 2019 +0800 + + * adjust for bug confirm style. + +commit 55143c8994d24fe33418ccaded8e31fd982feb7f +Merge: 14de95c847 1289533006 +Author: wangyidong +Date: Thu Aug 1 13:45:54 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 14de95c84711524b72a74afaff3eb27887a22d54 +Author: wangyidong +Date: Thu Aug 1 13:42:03 2019 +0800 + + * adjust for build lang file for translate. + +commit 1289533006f0af18064c2aca980f120d455ef478 +Author: jinianlan +Date: Thu Aug 1 09:07:46 2019 +0800 + + * fix Bug #2664 + +commit 917dfe069631481e9d3a0b4ff325674e0efac211 +Merge: e23d015afe b85198eef6 +Author: reneeteng +Date: Wed Jul 31 17:25:52 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b85198eef6a1808c7a7ed4e886a90a832810d43d +Author: wangyidong +Date: Wed Jul 31 17:15:57 2019 +0800 + + * finish task #8395. + +commit 1870ba51c0169f63555766b1838656173245cb9c +Author: wangyidong +Date: Wed Jul 31 16:14:33 2019 +0800 + + * finish task #8388. + +commit bb2ca5d5507def409da3061dec2fdb4778424d59 +Author: wangyidong +Date: Wed Jul 31 15:58:29 2019 +0800 + + * finish task #8393. + +commit bc003897a4c7030fa23f00986688ac9667345acd +Merge: 2430536531 b3ea0b9834 +Author: wangyidong +Date: Wed Jul 31 15:55:53 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2430536531baeecc0bc8323abbb898d0c680165f +Author: wangyidong +Date: Wed Jul 31 15:55:27 2019 +0800 + + * finish task #8397. + +commit b3ea0b9834ef4cfc9e308dc507f65b996a661fdf +Author: Yagami <976204163@qq.com> +Date: Wed Jul 31 14:17:54 2019 +0800 + + * Add lang for workflow. + +commit 3e8ea0bc982ac27dcf7b89fcc42043ebc8020049 +Merge: 693a0dfe3e 5eb2d402d0 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 31 14:13:50 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 693a0dfe3ed89a5a2b8d7edf1f7f08599e271400 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 31 14:13:32 2019 +0800 + + * Add lang for workflow. + +commit 5eb2d402d0bebab8cc3b838a0932ea3c0ee784f0 +Merge: de7d719459 48fb320604 +Author: wangyidong +Date: Wed Jul 31 14:03:24 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit de7d71945901e5ac62ef78f0cc2fe4c1e6c506de +Author: wangyidong +Date: Wed Jul 31 14:03:00 2019 +0800 + + * adjust for task #8280. + +commit 48fb3206048cb4dc46a8c17670ed1717aedfc1a1 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 31 14:02:02 2019 +0800 + + * Add lang for workflow. + +commit a1c8888cf49d15ba2fea519a23d41faf0abdd86c +Author: wangyidong +Date: Wed Jul 31 13:43:51 2019 +0800 + + * code for task #8280. + +commit b11645ec2cdc3666297d4ac81e56c3e9f1639305 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 31 13:33:39 2019 +0800 + + * Add lang for workflow. + +commit 63f9916a858cddb4d0aa6e4f700e95814f8626df +Author: Yagami <976204163@qq.com> +Date: Wed Jul 31 13:24:18 2019 +0800 + + * Add lang for workflow. + +commit 10752dbefb1274cd5ab361bc5460441174b7c7e9 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 31 13:17:51 2019 +0800 + + * Add lang for workflow. + +commit 26b203e20a6767be88b70388538439f782810913 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 31 09:28:00 2019 +0800 + + * Add lang for workflow. + +commit 73b82e2e00ed2a9d4b224613dd4377c6a095fc65 +Merge: 17bc28a65a 59ea86853c +Author: Yagami <976204163@qq.com> +Date: Wed Jul 31 09:11:34 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 17bc28a65aacb66b96f27a0a4ae7269a5c8d6aa2 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 31 09:11:13 2019 +0800 + + * Add lang for workflow. + +commit 59ea86853cdb8b1a82de2fce6df939cff68faadf +Merge: f3a57d65d7 5165052731 +Author: wangyidong +Date: Wed Jul 31 09:10:24 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f3a57d65d7ad53781aecfdfa9dcb01e43d869e54 +Author: wangyidong +Date: Wed Jul 31 09:10:00 2019 +0800 + + * finish task #8387. + +commit 51650527319e9687bf67b7a0053be934febdabfb +Merge: 6b10f0ca15 15c6c30ee4 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 31 08:58:03 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6b10f0ca152e7837511320cf7f918138dd53cce4 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 31 08:57:33 2019 +0800 + + * Add lang for workflow. + +commit 15c6c30ee4a47bda406d140e5444bfb9076f24a9 +Merge: 7e26346313 59251affd2 +Author: jinianlan +Date: Wed Jul 31 08:55:54 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7e2634631306a02241055327076d6123aac519ed +Author: jinianlan +Date: Wed Jul 31 08:54:16 2019 +0800 + + * finish task #6155,#6151,#6147,#6144 + +commit 59251affd2f6daada3f0bb775044f2122816969c +Author: Yagami <976204163@qq.com> +Date: Wed Jul 31 08:23:13 2019 +0800 + + * Finish task #6152. + +commit 9c53dd8e6b554b8754764e9c021d6800c75c9e1d +Author: liugang +Date: Tue Jul 30 17:33:59 2019 +0800 + + * Use the function zget to get users. + +commit 2a011d5d42227e34e1de9af77a9692729aef7a19 +Author: wangyidong +Date: Tue Jul 30 17:06:43 2019 +0800 + + * code for task #6145. + +commit b3163a8d37b3837cf35966cf289c322b6af1ad5b +Merge: 1b257668c4 f4f3b64d17 +Author: Catouse +Date: Tue Jul 30 17:03:22 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1b257668c44f3f6032e1fde027b90329db39bbf7 +Author: Catouse +Date: Tue Jul 30 17:03:08 2019 +0800 + + * update zui. + +commit f4f3b64d175e9a5aae961a730752ef33c2de622b +Author: wangyidong +Date: Tue Jul 30 16:53:42 2019 +0800 + + * revert group task js. + +commit 3f4a0d8016dd3164febc74b6670f8833ed9f89b0 +Author: wangyidong +Date: Tue Jul 30 16:34:39 2019 +0800 + + * fix for cron. + +commit 1cc1daa794242f479a1fb1e2dc6318c3839dc4c0 +Author: liugang +Date: Tue Jul 30 15:41:13 2019 +0800 + + * Use the function processStatus to get status of a record. + +commit 53ffb2ab7886468f96478cc89e89fa4dacea2d53 +Merge: 17b53acaa9 0ec5dadb1c +Author: wangyidong +Date: Tue Jul 30 15:39:19 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 17b53acaa98fcd74883318f3042d7afa6ae7d0ba +Author: wangyidong +Date: Tue Jul 30 15:38:49 2019 +0800 + + * finish task #6161. + +commit 0ec5dadb1c4a6319f75b39cbc1541dd58e09e925 +Author: liugang +Date: Tue Jul 30 15:17:27 2019 +0800 + + * Use the function processStatus to get status of a record. + +commit 9174165657e351d9cacaf19a3b797c731385e40a +Author: liugang +Date: Tue Jul 30 14:41:36 2019 +0800 + + * Use the function processStatus to get status of a record. + +commit c4d36eb77b2eb605786efe0e74c3c45a2a625cf2 +Author: liugang +Date: Tue Jul 30 14:36:44 2019 +0800 + + * Optimize. + +commit cd2162d54a29870a7917b2951b23f7d3cd80121c +Merge: 2a7007fdbb c66e1aca82 +Author: liugang +Date: Tue Jul 30 13:20:20 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c66e1aca82621fbad86c0fca139b97689082ddb9 +Author: wangyidong +Date: Tue Jul 30 13:18:57 2019 +0800 + + * finish task #6159. + +commit 2a7007fdbb30bbe6f8717bba8380a6fa93b0daf4 +Author: liugang +Date: Tue Jul 30 13:15:26 2019 +0800 + + * Use function processStatus to get status of a record. + +commit 884f0c1ecce2c85181a3dd82acee4f3f2719dad4 +Author: liugang +Date: Tue Jul 30 13:12:27 2019 +0800 + + * Use function processStatus to get status of a testcase. + +commit fc77a1c39e1f411faef6e3550f2227f0371439c9 +Author: liugang +Date: Tue Jul 30 13:09:49 2019 +0800 + + * User function processStatus to get status of a bug. + +commit 9df3aaf581a4029ae5c558f14649286293ba5f87 +Author: liugang +Date: Tue Jul 30 13:08:17 2019 +0800 + + * Use function processStatus to get status of a task. + +commit 729961d20508053924aaaf16ec03b14b135b7668 +Author: liugang +Date: Tue Jul 30 13:05:53 2019 +0800 + + * Use function processStatus to get status of a record. + +commit 63bc2c997cfff3ccf4c618e6cfe28429c9598500 +Merge: e9eac7a6b8 e37db0942f +Author: liugang +Date: Tue Jul 30 11:12:06 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e37db0942ff9845f630a98e8f0d71cdee4ec4a09 +Merge: f2b1fd85cc c27bfc290c +Author: wangyidong +Date: Tue Jul 30 11:11:45 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f2b1fd85cca60747d6a708c44b7ff9c9a2953f45 +Author: wangyidong +Date: Tue Jul 30 11:11:20 2019 +0800 + + * code for task #6154. + +commit e9eac7a6b86a958182d4280e36d765b6a01bcb2c +Merge: 2bf5424cb0 c27bfc290c +Author: liugang +Date: Tue Jul 30 11:11:04 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c27bfc290c801d5cd4296c255e0a786510ce6425 +Merge: 0976a004a8 63a3839104 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 30 11:10:28 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0976a004a8abc5f386a397fda2851169221c1714 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 30 11:10:14 2019 +0800 + + * Add lang file for workflow. + +commit 2bf5424cb07772198db4bc402aeac823a41c760f +Author: liugang +Date: Tue Jul 30 11:09:44 2019 +0800 + + * Use function processStatus to get status of a record. + +commit 5075275b61ec446e3356a849db2846ce58e44974 +Merge: d320fcc0c1 63a3839104 +Author: liugang +Date: Tue Jul 30 11:09:05 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 63a3839104ae207e81fd3f1a23fe7dde580d5420 +Author: wangyidong +Date: Tue Jul 30 11:08:11 2019 +0800 + + * finish task #6150. + +commit d320fcc0c103ad3e5a9a777660feef108c26c034 +Merge: b233d6e6f6 b3e0c2acdd +Author: liugang +Date: Tue Jul 30 11:00:07 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b3e0c2acdd5790144f72247095b9a96993f383dd +Merge: 82e99eaa8d 2a452c2750 +Author: wangyidong +Date: Tue Jul 30 10:59:01 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 82e99eaa8d9770b43be21a0c22def3003fac1f70 +Author: wangyidong +Date: Tue Jul 30 10:58:35 2019 +0800 + + * finish task #6142. + +commit b233d6e6f662595258f7cb3d6125889b41d5e285 +Merge: 3b88281cd2 2a452c2750 +Author: liugang +Date: Tue Jul 30 10:58:05 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2a452c2750380a36babe7de453d50d323a43c9b1 +Merge: 7c8428ba93 0174ccc8cd +Author: Yagami <976204163@qq.com> +Date: Tue Jul 30 10:57:32 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7c8428ba93293eba8af9ab63e691eeb5234f969b +Author: Yagami <976204163@qq.com> +Date: Tue Jul 30 10:57:06 2019 +0800 + + * Add project lang file for workflow. + +commit 3b88281cd289cf50dc66b6828ce9d279aa7668f3 +Merge: 0552f20bf0 0174ccc8cd +Author: liugang +Date: Tue Jul 30 10:52:04 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0174ccc8cd105a20423347e3bb16ac879148a18b +Merge: 1364cd2f91 0f3e4c54ab +Author: wangyidong +Date: Tue Jul 30 10:51:11 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1364cd2f91249056875dbf70badae68faa0d27f9 +Author: wangyidong +Date: Tue Jul 30 10:50:41 2019 +0800 + + * finish task #6140. + +commit 0552f20bf0e84752dcb74206fd27c4964caa4506 +Author: liugang +Date: Tue Jul 30 10:49:12 2019 +0800 + + * Use function processStatus to get status of a record. + +commit 77b2b6333861ca3c187dbe212d33141c140329cb +Merge: 0d6ec9a036 0f3e4c54ab +Author: liugang +Date: Tue Jul 30 10:42:05 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0f3e4c54ab5af64056c7b41c540238f3a89f5087 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 30 10:40:43 2019 +0800 + + * Add lang to story. + +commit 0d6ec9a0367901d3af39b5fe726cf668675af325 +Author: liugang +Date: Tue Jul 30 10:38:43 2019 +0800 + + * Use function processStatus to get status of a product or a project. + +commit 7d3818dd5afc6cd85318d4d79c0bdcf488207235 +Author: liugang +Date: Tue Jul 30 10:38:15 2019 +0800 + + * Add function to process status of a record. + +commit d8f65cf55f5be4ebb23d4bd9d76774cec5909d85 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 30 10:26:19 2019 +0800 + + * Add lang file to productplan. + +commit 0945ca833c7ea33ce6909ebadf5f3b072b6d8f5c +Merge: 4a544fb1c5 5e32ee1081 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 30 10:20:16 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4a544fb1c50b92a601e38a0a3a06fad547ee7d28 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 30 10:14:23 2019 +0800 + + * Add lang file to product. + +commit 5e32ee1081cf1c01fec251b3c190b180ea534f75 +Author: liugang +Date: Tue Jul 30 10:10:10 2019 +0800 + + * Add subStatus in lang files. + * Change sub status when status is changed and sub status is not set, and record the changes. + +commit ed8646a54a97987e0dfb346948135fa6f37a3361 +Author: liugang +Date: Tue Jul 30 09:06:18 2019 +0800 + + * Change zt_testcase to zt_case. + +commit 54a3aaf8ed0e67b7d062e77525d7337d9cd60268 +Merge: e6d6312405 c06773e491 +Author: liugang +Date: Tue Jul 30 09:03:36 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c06773e491651dd7fd54ea70ca70a47ea4bfd0fc +Author: Yagami <976204163@qq.com> +Date: Tue Jul 30 09:03:09 2019 +0800 + + * Finish task #6156. + +commit e6d63124057863afdb164cae3f79a04b9958e872 +Author: liugang +Date: Tue Jul 30 09:03:01 2019 +0800 + + * Add subStatus to database. + +commit f0671e2ead43146a904ee50896ca7c3ce6159108 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 30 08:39:39 2019 +0800 + + * Finish task #6165. + +commit 6a997c7fe13e656ac40b4e88d10c4af2d0ac3781 +Merge: 8d26d61fb1 5bb74f6ebc +Author: Yagami <976204163@qq.com> +Date: Mon Jul 29 16:54:04 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8d26d61fb1991fe4ffe389594ce490ea963345af +Author: Yagami <976204163@qq.com> +Date: Mon Jul 29 16:53:48 2019 +0800 + + * Finish task #6162. + +commit 5bb74f6ebcfafe5e94f4bf83dbdbb446cf0f63b3 +Merge: 190a4b468d dca5030a98 +Author: wangyidong +Date: Mon Jul 29 16:48:36 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 190a4b468db77e87e035cd80f939652a004459ef +Author: wangyidong +Date: Mon Jul 29 16:47:47 2019 +0800 + + * finish task #6158. + +commit dca5030a987dd383c6c3f226f1cd6216c1138412 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 29 16:39:55 2019 +0800 + + * Finish task #6153. + +commit 5c0a10d51d01888b70bb1ee372a2ccab34f04655 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 29 16:38:21 2019 +0800 + + * Finish task #6148. + +commit a7afbc7188dd6645b118093f4aa01a0b27898c63 +Merge: bb59fa9349 4fca901960 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 29 16:34:50 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bb59fa934931227dd149ad3cafaacf48d328a516 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 29 16:34:28 2019 +0800 + + * Finish task #6148. + +commit 4fca90196004ed2fe03afe1f483f41f40e81c2f7 +Merge: 6b3c34dba2 b6c4a32007 +Author: wangyidong +Date: Mon Jul 29 16:31:40 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6b3c34dba21be9d25afa89fa71e273030fdf14de +Author: wangyidong +Date: Mon Jul 29 16:30:55 2019 +0800 + + * finish task #6160. + +commit b6c4a32007a81a7635b674283ebed41d2c9143f0 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 29 16:30:22 2019 +0800 + + * Finish task #6146. + +commit 4e3df671e3817daf2294f721f715b3fbe78104f9 +Merge: ab6d63e87c b3b77d8b8d +Author: Yagami <976204163@qq.com> +Date: Mon Jul 29 16:05:02 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ab6d63e87ca4360247e394c1e665ac3ba230ba91 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 29 16:04:44 2019 +0800 + + * Finish task #5715. + +commit b3b77d8b8dafb29f0f20fb2c74b021b778b0124c +Merge: c90aac3512 782de27ac6 +Author: jinianlan +Date: Mon Jul 29 15:57:51 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c90aac3512463ad1f6257f4ef5e8d02635c8380d +Author: jinianlan +Date: Mon Jul 29 15:54:08 2019 +0800 + + * finish task #6166,#6149,6139 + +commit 782de27ac63b0c505b0016da3dfa215b1f5a5805 +Author: liugang +Date: Mon Jul 29 15:53:31 2019 +0800 + + * Optimize codes and add comments. + +commit a8d37d279f1d3d62c7733b3a9e748ae3aae7f61e +Author: Yagami <976204163@qq.com> +Date: Mon Jul 29 15:49:15 2019 +0800 + + * Finish task #6141. + +commit 282b43d42621ca53d5c203e0a9c9e91b16e66f86 +Author: wangyidong +Date: Mon Jul 29 14:53:14 2019 +0800 + + * finish task #6167. + +commit ca50ee698cdcb3bc836b3697387ac6087ddfad85 +Author: wangyidong +Date: Mon Jul 29 14:36:00 2019 +0800 + + * finish task #6168. + +commit d187bc851513125c83f2eb625535b0fc42ba85cd +Author: wangyidong +Date: Mon Jul 29 09:09:22 2019 +0800 + + * remove debug code. + +commit e701f45620cea0ee0a5d1abf38aa48f2cc3b6a1d +Author: wangyidong +Date: Mon Jul 29 08:46:55 2019 +0800 + + * adjust for setControlFile. + +commit 9c81da7069e83d3743ec398266860b20f269b6e3 +Author: liugang +Date: Fri Jul 26 19:04:38 2019 +0800 + + * Change width. + +commit 6c66211714f736e04de8145b67b5b7baa5d9009c +Merge: 5ace83db9a 8e0f54cf6e +Author: wangyidong +Date: Fri Jul 26 17:49:18 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5ace83db9a8da80d84f12fee6e4ea0d75c70cb1b +Author: wangyidong +Date: Fri Jul 26 17:48:52 2019 +0800 + + * adjust for sendmail. + +commit 8e0f54cf6edb917acfa42b7478ae8f9b0fd2e32d +Author: chenfei +Date: Fri Jul 26 16:04:09 2019 +0800 + + * Finish task: https://backyard.cnezsoft.com/pms/task-view-8372.html + +commit e258415f5a3dc33303fa029cd668b2dacf1af782 +Merge: 9b2174e001 935fc96403 +Author: wangyidong +Date: Fri Jul 26 15:49:20 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9b2174e0016b9a774e897f0096f5ca6ab75443de +Author: wangyidong +Date: Fri Jul 26 15:48:56 2019 +0800 + + * adjust for code style. + +commit 1b87f3c9c1ac79870b52b968244639b4959162da +Author: wangyidong +Date: Fri Jul 26 15:47:46 2019 +0800 + + * fix bug for parse float consumed when finish. + +commit 935fc96403c0dfb51e2dafae1c1f8703ae92aeca +Merge: 230c02ff1d 1928dc0e69 +Author: chenfei +Date: Fri Jul 26 15:45:30 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1928dc0e69c54cc910e0de6dc6bef47155633a8c +Author: Yagami <976204163@qq.com> +Date: Fri Jul 26 15:19:48 2019 +0800 + + * Finish task #8350. + +commit f333ad229a4eca0642f8edf21526a3d5a0e7b1dc +Merge: 8555d3ac21 973809cd73 +Author: Yagami <976204163@qq.com> +Date: Fri Jul 26 15:15:20 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8555d3ac21585974b9134cffdb2c54bb8eaff50e +Author: Yagami <976204163@qq.com> +Date: Fri Jul 26 15:15:07 2019 +0800 + + * Finish task #8349. + +commit 973809cd738ee474c102b3504edbd9e6db7b29fd +Merge: 964ab3bf31 5deed47298 +Author: wangyidong +Date: Fri Jul 26 15:06:50 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5deed47298cf7b784ab9442e75dd809015ae0244 +Author: Yagami <976204163@qq.com> +Date: Fri Jul 26 15:02:05 2019 +0800 + + * Finish task #8343. + +commit 815baa1cea3c067f7f2db6ef7ff3619fa4663e63 +Merge: aeda35218e e2e4090293 +Author: Yagami <976204163@qq.com> +Date: Fri Jul 26 15:01:11 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 964ab3bf31321f22e35ef6afd1f0a838b6e3a9fd +Author: wangyidong +Date: Fri Jul 26 15:01:05 2019 +0800 + + * finish task #8348. + +commit aeda35218e18e7529ef21c91ebb4247100ee17f0 +Author: Yagami <976204163@qq.com> +Date: Fri Jul 26 15:00:57 2019 +0800 + + * Finish task #8342. + +commit e2e40902938b29094b1b72e6b1f09581df6a930c +Merge: ae56637431 5c1b1f4453 +Author: wangyidong +Date: Fri Jul 26 14:57:17 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ae56637431353518e5c2ac637db807d65736132d +Author: wangyidong +Date: Fri Jul 26 14:56:12 2019 +0800 + + * finish task #8346. + +commit 11404183bb184707d8dbbf6b350ebd8144c1232d +Author: wangyidong +Date: Fri Jul 26 14:52:45 2019 +0800 + + * finish task #8344,8345. + +commit 230c02ff1de7db3a0208f35be68d868e2bcf94a0 +Author: chenfei +Date: Fri Jul 26 14:41:29 2019 +0800 + + * Finish task: https://backyard.cnezsoft.com/pms/task-view-8347.html + +commit 3367f7718d0dd25df34b3e98ed58a5f3dbb6bc06 +Author: chenfei +Date: Fri Jul 26 14:36:26 2019 +0800 + + * Finish task: https://backyard.cnezsoft.com/pms/task-view-8341.html + +commit 5c1b1f44532ade5f1638ebfec9551a5c974e140a +Merge: e8d577ec68 1e73865303 +Author: Yagami <976204163@qq.com> +Date: Fri Jul 26 14:34:35 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e8d577ec6802742f13bcefeb491f890b00ba4189 +Author: Yagami <976204163@qq.com> +Date: Fri Jul 26 14:34:07 2019 +0800 + + * Finish task #8340. + +commit 1e7386530378e316b5037a949eb7b4e8a89588a0 +Author: liugang +Date: Fri Jul 26 08:49:55 2019 +0800 + + * Change flowModel::printFields to control::printExtendFields. + +commit aac0ce255498f22c37eb95681046d6587e7d8435 +Author: jinianlan +Date: Thu Jul 25 17:57:15 2019 +0800 + + * fix Bug #2656,#2653 + +commit 621f338faa8ec51d5ca643a4a5e8cd0bf47a3701 +Author: liugang +Date: Thu Jul 25 13:02:18 2019 +0800 + + * Optimize the function executeHooks. + +commit d5e9999636c5ef2f3505fe0fcba58267c4e40e67 +Merge: b6b9901b82 821095baf7 +Author: jinianlan +Date: Wed Jul 24 20:05:55 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b6b9901b82bddf229cc6994e3c6674790d216261 +Author: jinianlan +Date: Wed Jul 24 20:04:35 2019 +0800 + + * fix Bug #2653 + +commit 821095baf76b3598d25a57692e6ec36fd456a85e +Author: chenfei +Date: Wed Jul 24 18:26:00 2019 +0800 + + * Adjust execute hook for workflow. + +commit 3d626b7026e946576f1b6e356ea4daa0c47a4840 +Author: chenfei +Date: Wed Jul 24 18:06:29 2019 +0800 + + * Fix bug of view a flow page by path_info. + +commit aecff9993270481cfd97d5d701452b51009d11c5 +Author: liugang +Date: Wed Jul 24 17:49:40 2019 +0800 + + * Fix bug of view a flow page by path_info. + +commit 55c45acae5edfafbc2e2414dbae982f7987cf1b3 +Author: jinianlan +Date: Wed Jul 24 16:24:15 2019 +0800 + + * fix Bug #2660 + +commit 409dd4680e77efaceb482753fa90e352a82fcd18 +Merge: ff55e2267f f70eef7789 +Author: wangyidong +Date: Wed Jul 24 13:44:40 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ff55e2267fe18ae2f4d89ceb7e796b51adb5e5ce +Author: wangyidong +Date: Wed Jul 24 13:44:01 2019 +0800 + + * add printExtendFields method. + +commit f70eef7789f01f45a2e0ac3eeb036c552ba4e091 +Author: liugang +Date: Wed Jul 24 10:49:41 2019 +0800 + + * Optimize function executeHooks. + +commit f1b0faf11b7714a042ae6db4d06b1831dc58cfd7 +Author: wangyidong +Date: Wed Jul 24 09:35:40 2019 +0800 + + * adjust sortable file. + +commit cdf0a7e6c5a62a47ab1d16682046ca59128cee0e +Merge: 65ca28c111 f858660ceb +Author: wyd621 +Date: Wed Jul 24 09:33:33 2019 +0800 + + Merge pull request #34 from easysoft/zentaopms_workflow + + Zentaopms workflow + +commit f858660ceb18ace078a704717266d57dd0f17885 +Merge: 6ef88595e1 65ca28c111 +Author: wyd621 +Date: Wed Jul 24 09:14:23 2019 +0800 + + Merge branch 'master' into zentaopms_workflow + +commit 65ca28c11195ebfcef940d37844986aeb43ecedd +Author: jinianlan +Date: Tue Jul 23 16:03:21 2019 +0800 + + * fix task #2651,#2642 + +commit 77d18538783abd6118daab9e152000658ff7b016 +Author: jinianlan +Date: Tue Jul 23 16:00:11 2019 +0800 + + * fix task #2651,#2642 + +commit 6ef88595e17fcd3202a1f4dfb0283282b4060bf6 +Author: liugang +Date: Tue Jul 23 14:17:56 2019 +0800 + + * Add codes of workflow. + +commit 0672bc7a0bb1007f4e4bfa77f690fb7218ce24c3 +Author: jinianlan +Date: Tue Jul 23 14:06:31 2019 +0800 + + * finish task #2656 + +commit ed834881b856a67d2d7fbc84e0a76628e64b250a +Merge: fbf7a7f073 a1bf91fb7b +Author: jinianlan +Date: Tue Jul 23 14:05:49 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a1bf91fb7b5c82325cac720c4417fa52912f3238 +Author: wangyidong +Date: Tue Jul 23 13:45:54 2019 +0800 + + * cache file read image. + +commit 7c989eaf12c6c3adb9a4e5e0644ad1a4a06bc092 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 23 11:11:09 2019 +0800 + + * Code for task #8292. + +commit fbf7a7f073868c27f8acd9dbd7349b8d05a04c31 +Author: jinianlan +Date: Tue Jul 23 09:46:54 2019 +0800 + + * finish task #2651,#2642 + +commit 3ce866ab083b1a33dbd1384e8e722be672358fa1 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 23 09:24:55 2019 +0800 + + * Fix filter class. + +commit 0d413b3f652c758c1ed8fef82f4191b1f7474d9d +Author: liugang +Date: Mon Jul 22 17:07:51 2019 +0800 + + * Rename extension to hooks. + +commit c8958a558185df44d8356a3e2ff17dd3824d5fcf +Author: liugang +Date: Mon Jul 22 16:36:53 2019 +0800 + + * Add function to execute extension. + +commit 7337f2814442e88f077f3bfedaef51663462a287 +Author: wangyidong +Date: Mon Jul 22 15:37:52 2019 +0800 + + * fix bug. + +commit aee1a01e28a2a008bc93953898f79e1ef034ca84 +Author: wangyidong +Date: Mon Jul 22 08:55:24 2019 +0800 + + * adjust for build lang file. + +commit 898fef566f16aaaf0b542ba3950787411166d545 +Author: wangyidong +Date: Fri Jul 19 11:49:21 2019 +0800 + + * fix translate model. + +commit b17d7c299973b58a765cddcb87a02b8849dea272 +Author: wangyidong +Date: Fri Jul 19 11:34:38 2019 +0800 + + * add checkeEnLang method. + +commit 169a0fa5fb8184eaa6a5df0aa911213eceec5d34 +Author: wangyidong +Date: Thu Jul 18 16:51:01 2019 +0800 + + * adjust for import js/css with js::import/css::import. + +commit a0dfd4985ce50755e787bd12bbabaa2a0ad26cad +Author: wangyidong +Date: Wed Jul 17 16:55:32 2019 +0800 + + * fix for alert noticeOkFile. + +commit e23d015afe50ff4185b19ec2209eb4f92992dec9 +Merge: cdd72c088f fc82d05224 +Author: reneeteng +Date: Wed Jul 17 14:13:08 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cdd72c088f87f756c44a10de67c2470ffa65eb9d +Author: reneeteng +Date: Wed Jul 17 14:12:45 2019 +0800 + + * Translate lang file update. + +commit fc82d05224ab76a06cf6b0e9b825fc4f6ce8d2c0 +Author: wangyidong +Date: Wed Jul 17 13:54:34 2019 +0800 + + * adjust for make zentaoxx. + +commit b11d886973d3930e5fc1e814b3ef6cd6994c933c +Author: Yagami <976204163@qq.com> +Date: Wed Jul 17 13:30:38 2019 +0800 + + * Add object to printField. + +commit c99584b24803e638e6be066b68080a94b1f45467 +Author: wangyidong +Date: Wed Jul 17 11:20:44 2019 +0800 + + * adjust for + +commit 276bb44453fc036c6ea02bda6ada6ee1e72910ce +Author: Yagami <976204163@qq.com> +Date: Wed Jul 17 10:36:01 2019 +0800 + + * Fix code error. + +commit 564562925c277c756ab8a53cd915206a9232e58f (tag: zentaopms_11.6.stable_20190717) +Author: wangyidong +Date: Wed Jul 17 09:20:46 2019 +0800 + + * fix bug #1824 in backyard. + +commit bc09bbb48ada269dc0c3ce8e1a0edd7ef10f3387 +Author: wangyidong +Date: Wed Jul 17 09:11:56 2019 +0800 + + * change for downloadxxd. + +commit fab4290b35680ddebe5b824dcd98638dcce53fed +Author: wangyidong +Date: Tue Jul 16 16:47:28 2019 +0800 + + * adjust for api lang. + +commit 0f82741d3676aee6fdc23e2a6bfdab899a36c356 +Author: wangyidong +Date: Tue Jul 16 15:30:30 2019 +0800 + + * fix bug for check project lib priv. + +commit 4cc39880120f03d35684aad5555b9c0a447d07b1 (tag: zentaopms_11.6.stable_20190716) +Author: wangyidong +Date: Tue Jul 16 14:04:30 2019 +0800 + + * change review name. + +commit eb51c0fda2f807a21d208c442d08a615c8a8a9da +Author: wangyidong +Date: Tue Jul 16 13:39:35 2019 +0800 + + * change for zh-tw lang. + +commit f6411e0aeb92d788c4349fdd994dc8c594414f0f +Author: wangyidong +Date: Tue Jul 16 13:20:35 2019 +0800 + + * fix bug for page style. + +commit 69578d0e49ba2fea6385078d94a4c78d7cde99bf +Author: wangyidong +Date: Tue Jul 16 12:07:17 2019 +0800 + + * finish task #6083. + +commit c242294d4efc10a1dac40a475d3420e21c6ba089 +Merge: 34a0fa9d7f be9d543c44 +Author: wangyidong +Date: Tue Jul 16 12:03:50 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 34a0fa9d7fa5b2dbb5e8edba9dce6e9ad0a4840e +Author: wangyidong +Date: Tue Jul 16 12:01:53 2019 +0800 + + * adjust for editor and translate. + +commit 853fbbd18e3a6d946ff1b73a5ceb3c57d9ca7120 +Author: wangyidong +Date: Tue Jul 16 12:00:25 2019 +0800 + + * adjust for aiux link. + +commit be9d543c44dc4d7c435fe626e6ea4af29791a885 +Merge: 5f6f1dc63f 0052275e90 +Author: jinianlan +Date: Tue Jul 16 11:29:56 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0052275e90b5d6d102941cbc9e8869922f1f2df4 +Author: Catouse +Date: Tue Jul 16 11:19:10 2019 +0800 + + * update kindeditor. + +commit 5f6f1dc63f1731a96c17a882da1c470b6d3fadad +Merge: ea8e12fa28 632a099b7f +Author: jinianlan +Date: Tue Jul 16 11:15:02 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 632a099b7fdaa8eec500082c7ae0b6f47672ee6a +Author: Catouse +Date: Tue Jul 16 11:10:45 2019 +0800 + + * use english text as default language in zui components. + +commit ea8e12fa2876c7ea32acd47adeecbcfdff256297 +Author: jinianlan +Date: Tue Jul 16 11:07:23 2019 +0800 + + * fix task #6096* fix task #6096* fix task #6096* fix task #6096* fix task #6096* fix task #6096* fix task #6096* fix task #6096 + +commit 6ee6194783e6ceb2d1ad3795c6855778bd029fa2 +Merge: a31d6c47d6 4150fceb21 +Author: Catouse +Date: Tue Jul 16 10:58:26 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a31d6c47d6406ea2926f40346c8d34ceace6ca52 +Author: Catouse +Date: Tue Jul 16 10:58:20 2019 +0800 + + * add icon-share by update icon fonts. + +commit 4150fceb217e7028db38de398f45dac0451aa06c +Author: jinianlan +Date: Tue Jul 16 09:11:07 2019 +0800 + + * fix task #6108 + +commit f26fb450647f50b1f8cda7ddc18077b8a99a9eb8 +Merge: e2a7da40af cb87a2b0cf +Author: jinianlan +Date: Tue Jul 16 08:51:59 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e2a7da40afcdf3e8a0b5b5c95cb89299165bebf7 +Author: jinianlan +Date: Tue Jul 16 08:29:38 2019 +0800 + + * finish task #5103,6102 + +commit cb87a2b0cfa3958587f4420fbf77fa3283d376be +Author: wangyidong +Date: Mon Jul 15 17:10:52 2019 +0800 + + * finish task #6087. + +commit c383da7a8c695d7b2beaba9aca8af75774ceb3a6 +Author: jinianlan +Date: Mon Jul 15 17:07:26 2019 +0800 + + * finish task #6097,#6103,#6108,#6100 + +commit ae935b46b1b0200ef45145c0c52b2d23c952646f +Author: wangyidong +Date: Mon Jul 15 16:29:32 2019 +0800 + + * finish task #5965. + +commit 141d5c1f8c00740b89104372a5207aaeedfac2b6 +Author: wangyidong +Date: Mon Jul 15 16:18:53 2019 +0800 + + * finish task #6094. + +commit f0be1fb448916a66a38b734a978d46905e252c02 +Author: wangyidong +Date: Mon Jul 15 16:11:46 2019 +0800 + + * finish task #6093. + +commit 20a984becc7a40de67dcef5a2ea0a0d0aae2418a +Author: wangyidong +Date: Mon Jul 15 16:06:37 2019 +0800 + + * finish task #6092. + +commit de4447829c284d214986f580eec5d349dfa646b0 +Merge: 37bda2cb51 0fc983d890 +Author: wangyidong +Date: Mon Jul 15 16:01:26 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 37bda2cb510665db7063cf442a46fadd0c0edace +Author: wangyidong +Date: Mon Jul 15 16:00:41 2019 +0800 + + * finish task #6091. + +commit 2671f7a044687573e5a6dbdb58cc9c131e38a978 +Author: wangyidong +Date: Mon Jul 15 15:56:31 2019 +0800 + + * finish task #6090. + +commit b66672a42be9589a6238aa16f87a945420202dea +Merge: bda1031eca 707b8c7507 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 15 15:25:23 2019 +0800 + + Merge branch 'zentaopms_workflow' of https://github.com/easysoft/zentaopms into zentaopms_workflow + +commit bda1031eca65bede4aa9f570db4c4dec3cc07891 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 15 15:23:29 2019 +0800 + + * Fix bug for doc. + +commit 600a4fd8c157af2a38b0e4042c3aa8fbe6f3626b +Author: jinianlan +Date: Mon Jul 15 14:47:17 2019 +0800 + + * finish task #6088 + +commit 8dc80beb9f622a6235aff40d6790c76c953fc68f +Author: jinianlan +Date: Mon Jul 15 14:44:18 2019 +0800 + + * finish task #6088 + +commit 0fc983d89032c4b940e2b7b781b9aecbf28e7920 +Merge: 8507b22977 29a97a4f1c +Author: reneeteng +Date: Mon Jul 15 14:43:13 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8507b229779a7b204fb2c44c8ed908d5bdf823f7 +Author: reneeteng +Date: Mon Jul 15 14:42:36 2019 +0800 + + * Lang file update. + +commit 89f9507638fdc704f287541487fd1389848008e6 +Author: reneeteng +Date: Mon Jul 15 14:38:58 2019 +0800 + + * Lang file optimized. + +commit 1a508d3a97833e6e9365bda091a5a6e493b2dca3 +Author: jinianlan +Date: Mon Jul 15 14:23:39 2019 +0800 + + * finish task #6096 + +commit f047de96cb95fffe71a69bddc96636b308100250 +Author: jinianlan +Date: Mon Jul 15 13:59:50 2019 +0800 + + * finish task #6105 + +commit 29a97a4f1cb6138a7a360d0b50cbb53bec07fe09 +Author: wangyidong +Date: Mon Jul 15 13:41:14 2019 +0800 + + * finish task #6085. + +commit 56dfe5030dccdce76c52bf0f0db429357546f0c1 +Author: wangyidong +Date: Mon Jul 15 13:37:59 2019 +0800 + + * finish task #6084. + +commit c05813c0d928e3f770472b0e6d097fc4c82e7844 +Author: wangyidong +Date: Mon Jul 15 13:20:59 2019 +0800 + + * change for task #6082. + +commit afad39685f6e62c539a358645665a5c224c803e5 +Merge: 4f3b6de567 136e68e3dc +Author: reneeteng +Date: Mon Jul 15 09:12:33 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4f3b6de567d5b2f2bfa7d9fdb6146016df9cb2b2 +Author: reneeteng +Date: Mon Jul 15 09:10:29 2019 +0800 + + * Lang file update. + +commit 00a096c5eee2a1a7adfe143f27d4977b68d806ee (tag: zentaopms_11.6.stable_20190715) +Author: wangyidong +Date: Mon Jul 15 08:07:30 2019 +0800 + + * change for en to de lang. + +commit 707b8c7507e50faf42ad5228490526d413a9a09f +Merge: 90014ee5cc 549b0a85b0 +Author: chenfei +Date: Sat Jul 13 13:35:28 2019 +0800 + + Merge branch 'zentaopms_workflow' of https://github.com/easysoft/zentaopms into zentaopms_workflow + +commit 90014ee5ccea12d5782c439bfc7532085ff0cb9e +Author: chenfei +Date: Sat Jul 13 13:31:44 2019 +0800 + + * Code for task #8278 of inner backyard pms. + +commit 549b0a85b00c76501fb23ec08272a15ea85fff7c +Author: liugang +Date: Fri Jul 12 17:37:46 2019 +0800 + + * Add codes to print labels set by workflow. + +commit 136e68e3dca59fc63902684c2adecd758db66f02 +Author: wangyidong +Date: Fri Jul 12 17:24:42 2019 +0800 + + + add de css. + +commit 760a4cde762d9933cff0bd4683dcebc978919d8d (tag: zentaopms_11.6.stable_20190712) +Author: wangyidong +Date: Fri Jul 12 17:08:13 2019 +0800 + + * fix bug #1837. + +commit e40bb305df3b7127d60326ee77ab5028d68c3e2b +Author: wangyidong +Date: Fri Jul 12 16:50:07 2019 +0800 + + * adjust for upgrade. + +commit a621ff9037511bd355dc3c1b7a54b9822fa22149 +Author: wangyidong +Date: Fri Jul 12 16:44:30 2019 +0800 + + * add new version and upgrade. + +commit 55e6dd58883f811757825adb995cef4bd55220fb +Merge: b65e00d0f8 9143f4e38f +Author: wyd621 +Date: Fri Jul 12 15:55:35 2019 +0800 + + Merge pull request #33 from easysoft/11.5 + + 11.5 + +commit 9143f4e38f71315faf69ade6944291777d46e5fe +Merge: 50b7ac7516 b65e00d0f8 +Author: wyd621 +Date: Fri Jul 12 15:55:04 2019 +0800 + + Merge branch 'master' into 11.5 + +commit b65e00d0f8ba5486d7a62e5c3db9d2d9168140b2 +Merge: e71d8fa75f c6e8ef42ad +Author: wangyidong +Date: Fri Jul 12 15:23:42 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e71d8fa75fd3205c730099387614726b14d14167 +Author: wangyidong +Date: Fri Jul 12 15:23:14 2019 +0800 + + * fix bug for select table. + +commit c6e8ef42add7885b75eb936e5e51195f9c014e47 +Author: Catouse +Date: Fri Jul 12 14:54:53 2019 +0800 + + * update zui. + +commit 0722210180dd4381f7047a04bd81b84fb88eb54b +Author: wangyidong +Date: Fri Jul 12 14:49:19 2019 +0800 + + * code for task #5997. + +commit c51eac4776cc6ca3226207bb788daa32c2210224 +Author: wangyidong +Date: Fri Jul 12 14:44:39 2019 +0800 + + * finish task #5997. + +commit 48b2ba98258c6a97cefd0f86c32c44e337c4f7fa +Author: wangyidong +Date: Fri Jul 12 14:42:16 2019 +0800 + + * finish task #5993. + +commit 05bb51f8309707885b25800ea9993bd22e36f026 +Merge: 2f3bf3f63a 743edff885 +Author: wangyidong +Date: Fri Jul 12 14:40:30 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2f3bf3f63ae19782120989be8c777aa459515fb2 +Author: wangyidong +Date: Fri Jul 12 14:39:02 2019 +0800 + + * finish task #5992. + +commit 1c87bcf7b638b7e9e6dd73aa34c37062c8c76d0b +Author: wangyidong +Date: Fri Jul 12 14:23:09 2019 +0800 + + * adjust for report. + +commit 743edff8857df599d59258542c318dc9884e62e8 +Merge: e80eed1007 43e58d64a6 +Author: reneeteng +Date: Fri Jul 12 14:16:33 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e80eed10071bca8cf0542b16f13d3b4afb569ad0 +Author: reneeteng +Date: Fri Jul 12 14:15:54 2019 +0800 + + * Lang file update. + +commit 43e58d64a6866d329c8d6939ecc443655414dbee +Merge: a1ebc953e8 068a38a9c4 +Author: Catouse +Date: Fri Jul 12 13:27:08 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a1ebc953e8d7564b066f1fd900ab53a21fce4135 +Author: Catouse +Date: Fri Jul 12 13:26:05 2019 +0800 + + * update zui. + +commit 068a38a9c4d7f4f83e642b5c5f306dd1442865f5 +Author: wangyidong +Date: Fri Jul 12 13:25:15 2019 +0800 + + * finish task #5960. + +commit 56666d927f456694ab1c44cf70282d69d7b15b25 +Merge: f85d506938 0bc93a387f +Author: reneeteng +Date: Fri Jul 12 13:21:11 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f85d506938a8865d158cf195c3735efbb68ac9c7 +Author: reneeteng +Date: Fri Jul 12 13:19:30 2019 +0800 + + * Lang file update. + +commit 8a313c4ef43b4142bcd871fc23a01a56ade415b0 +Author: Yagami <976204163@qq.com> +Date: Fri Jul 12 11:19:23 2019 +0800 + + * Fix param for printFields. + +commit 0bc93a387fff38657e30053c868615ceb9760116 +Author: wangyidong +Date: Fri Jul 12 11:15:23 2019 +0800 + + * finish task #5929. + +commit 49d3fce657a5c3f777668cfd6744be310a49d146 +Author: wangyidong +Date: Fri Jul 12 10:29:44 2019 +0800 + + * code task #5569. + +commit be23395e4e5a2f036a16be355a838772556d488b +Merge: eaf02b97ce 318a73e989 +Author: wangyidong +Date: Fri Jul 12 10:27:09 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit eaf02b97ce3c4b573c68ceeb2fa8ea9fe4dd65f9 +Author: wangyidong +Date: Fri Jul 12 10:26:13 2019 +0800 + + * adjust for mailto. + +commit 318a73e98963cbc17ac0d5c9a7df1d5f84273040 +Author: Catouse +Date: Fri Jul 12 10:13:51 2019 +0800 + + * update kindeditor. + +commit 77f6dca0ef55899d83626f6bf7bf1d85635e697b +Merge: 5e5ac2c12b d27f5a513a +Author: Catouse +Date: Fri Jul 12 10:07:17 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5e5ac2c12b58f3f1f30cd18bcea704d05cad36c5 +Author: Catouse +Date: Fri Jul 12 10:07:04 2019 +0800 + + * update kindeditor. + +commit d27f5a513ad3b668e730332614b3f7761794101f +Author: wangyidong +Date: Fri Jul 12 09:58:14 2019 +0800 + + + add Deutsch lang. + +commit 983d77b58dc7f54bd5d2bd1492854f96a1805fdd +Author: wangyidong +Date: Fri Jul 12 09:57:15 2019 +0800 + + * add Deutsch lang. + +commit ca6b89220b54c0e3c210ca34f41759813c29e7ca +Merge: 081d21302a 7bcbb43707 +Author: wangyidong +Date: Fri Jul 12 09:56:19 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 081d21302aceee9124fa25c7ffe06159b76fdddd +Author: wangyidong +Date: Fri Jul 12 09:55:44 2019 +0800 + + * finish task #6048. + +commit 45448fdd69533c8bf2bcbd1518472a4b4cabeebf +Author: wangyidong +Date: Fri Jul 12 09:54:29 2019 +0800 + + * finish task #5944. + +commit 7bcbb4370741c1b2ebd091d2cf32a3a645dd42aa +Author: Catouse +Date: Fri Jul 12 09:39:08 2019 +0800 + + * update zui. + +commit 89b338947aa173daddccbbd5b995f300220d1f83 +Merge: b0fafc0ba1 29fe42ca80 +Author: wangyidong +Date: Fri Jul 12 09:34:59 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b0fafc0ba1ddcdc0ccec9b4e105779b9eac79d75 +Author: wangyidong +Date: Fri Jul 12 09:34:18 2019 +0800 + + * finish task #6044. + +commit b570abd5b6fa11ba34beeae75cbb880d4a433739 +Author: Yagami <976204163@qq.com> +Date: Fri Jul 12 09:34:12 2019 +0800 + + * Finish task #8285. + +commit 29fe42ca80397d57aa88bb8056aeec6395db1c4b +Merge: 1c5352888f 959d82222f +Author: jinianlan +Date: Fri Jul 12 09:20:49 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1c5352888f4c63b8133b8e21ab72da81f08c796a +Author: jinianlan +Date: Fri Jul 12 09:19:01 2019 +0800 + + * finish task #5934 + +commit 959d82222f8f17b8f267f0af44cae62d34d24b53 +Author: wangyidong +Date: Fri Jul 12 09:03:00 2019 +0800 + + * finish task #5992. + +commit 5bf20a96ffa128412952b5f41e5f101b96818d84 +Author: wangyidong +Date: Fri Jul 12 08:59:45 2019 +0800 + + * finish task #5993. + +commit 8c8bd5acee0c5c8fe9e408ac4408996848b8d80a +Author: wangyidong +Date: Fri Jul 12 08:54:10 2019 +0800 + + * finish task #5994. + +commit f577da645db200fedf1b8747563cb12fcb676fcd +Author: wangyidong +Date: Fri Jul 12 08:23:27 2019 +0800 + + * finish task #6053. + +commit 7234603458a9928df501c1594e45bc68bcc09322 +Author: wangyidong +Date: Thu Jul 11 17:14:19 2019 +0800 + + * finish task #5569. + +commit 3a2c9e1e1b4359df472b44826548052dc2eb1ae4 +Author: wangyidong +Date: Thu Jul 11 16:43:59 2019 +0800 + + * finish task #5710. + +commit 6d434b7ed57a9465ec8b311e2f627f0501d03ccd +Author: wangyidong +Date: Thu Jul 11 16:26:40 2019 +0800 + + * finish task #5717. + +commit 142d505325bae124bbbb13ebc34feecf5a10613a +Author: wangyidong +Date: Thu Jul 11 16:03:49 2019 +0800 + + * finish task #5960. + +commit 24bfb201855efd9548f2f93c908c46b7331490e6 +Author: wangyidong +Date: Thu Jul 11 16:00:05 2019 +0800 + + * finish task #5978. + +commit 004b69fa4e0cd480c5f90339ce05c189a04a481d +Merge: 6b58d9a1cf b19d42966c +Author: wangyidong +Date: Thu Jul 11 15:58:12 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6b58d9a1cfa2fbf11c5242e771ab4b53019d43b3 +Author: wangyidong +Date: Thu Jul 11 15:57:45 2019 +0800 + + * finish task #5982. + +commit b19d42966c4c9880c5179d7dbcb4abe28b427c37 +Merge: 8678256c4c d1846f9a53 +Author: jinianlan +Date: Thu Jul 11 15:54:09 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8678256c4cbb3023a82f4c298f640227e7e3cf83 +Author: jinianlan +Date: Thu Jul 11 15:52:20 2019 +0800 + + * finish task #6020 + +commit d1846f9a53e61741dc8d1190ee416e5153612496 +Author: wangyidong +Date: Thu Jul 11 15:37:46 2019 +0800 + + * finish task #5991. + +commit f578ad80e75d7e8fc3f385dede3b7bb480360fb6 +Author: wangyidong +Date: Thu Jul 11 15:07:14 2019 +0800 + + * finish task #5992. + +commit 01674bdde51ad854a7440f807bb6d3aa0f58333e +Author: liugang +Date: Thu Jul 11 15:02:19 2019 +0800 + + * Fix bug of sortable.html.php. + +commit c5a1c58168055c87856fa80c8609ca6f72232975 +Author: Yagami <976204163@qq.com> +Date: Thu Jul 11 14:43:06 2019 +0800 + + * Finish task #8290. + +commit f01121bb7c171ee8b6c380f59627696142a4f997 +Merge: bfb979c4fe 26643f3b79 +Author: wangyidong +Date: Thu Jul 11 14:35:45 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bfb979c4fe99d6bbfb0f51d0d175488dbd18ca24 +Author: wangyidong +Date: Thu Jul 11 14:35:15 2019 +0800 + + * finish task #5993. + +commit 26643f3b798ea08108c46bab78d7a6e255dcf494 +Merge: 22de5cc42c 92a3d4519c +Author: Catouse +Date: Thu Jul 11 14:29:40 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 22de5cc42c553facc7c4e17dca8f559dfe2abc7a +Author: Catouse +Date: Thu Jul 11 14:29:33 2019 +0800 + + * fix orders incorrect. + +commit 92a3d4519cadd22741b35dfd75e897c607281509 +Author: wangyidong +Date: Thu Jul 11 13:49:24 2019 +0800 + + * finish task #5997. + +commit d8076812d17a097b25fadef55d3557b780dc1509 +Author: wangyidong +Date: Thu Jul 11 13:46:43 2019 +0800 + + * finish task #6016. + +commit f47be36c0c4bc7ebb3ab96033760b729be54cc47 +Author: wangyidong +Date: Thu Jul 11 13:41:06 2019 +0800 + + * finish task #6017. + +commit 98c5ebb29e3c7a400eafb7004ebe47df96015400 +Author: Yagami <976204163@qq.com> +Date: Thu Jul 11 13:21:26 2019 +0800 + + * Add workflow code to printhead. + +commit ecaf5cd872d9173251ae517b48c80bcebd75a706 +Author: wangyidong +Date: Thu Jul 11 11:44:33 2019 +0800 + + * finish task #6046. + +commit 6baea29991c8cf5e39380d3fc729055281c5beb9 +Merge: 5672a29d64 3a52611b0d +Author: wangyidong +Date: Thu Jul 11 10:38:03 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5672a29d64b5cc77c9a82d515c69f0007da1e797 +Author: wangyidong +Date: Thu Jul 11 10:36:00 2019 +0800 + + * finish task #5928, #5911. + +commit 3a52611b0d697cb037554010ccbbe0f5e5d8c3ad +Merge: ebbd1bcb94 0682f928ac +Author: jinianlan +Date: Thu Jul 11 09:50:25 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ebbd1bcb948a2398cb6cedcc9ebdb133c586cbd1 +Author: jinianlan +Date: Thu Jul 11 09:49:10 2019 +0800 + + * finish task #5933 + +commit 0682f928ac03da487aff8b5b1fd3880b0a087908 +Merge: d55f0d9407 5315f8e3e5 +Author: wangyidong +Date: Thu Jul 11 09:45:47 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d55f0d9407c5f2553c764c4fc8024cf447d1006b +Author: wangyidong +Date: Thu Jul 11 09:45:20 2019 +0800 + + * finish task #5932. + +commit 5315f8e3e508123b8316b729559bc97bcb218503 +Merge: 580a926e73 bf9f78d040 +Author: jinianlan +Date: Thu Jul 11 09:31:21 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 580a926e7388021a2993d587c524e6be7bae627a +Author: jinianlan +Date: Thu Jul 11 09:27:47 2019 +0800 + + * finish task #5933 + +commit bf9f78d040b32cf5ea8409a6973e29c28384cd6c +Author: wangyidong +Date: Thu Jul 11 09:10:31 2019 +0800 + + * finish task #5940. + +commit 19f83c0bb82c34340f949fab95dc842ca4bd2d9f +Author: Yagami <976204163@qq.com> +Date: Thu Jul 11 08:58:24 2019 +0800 + + * Fix search method. + +commit bf47c90326ca9399e250448f5f24bfb442f619fc +Author: wangyidong +Date: Wed Jul 10 17:39:31 2019 +0800 + + * finish task #5935. + +commit 07f976db1a02c36aba862086ea7680214c691770 +Author: wangyidong +Date: Wed Jul 10 17:28:58 2019 +0800 + + * finish task #5939. + +commit 55875dec1c5594bae0a5d70d06ebc42617234673 +Author: wangyidong +Date: Wed Jul 10 17:23:11 2019 +0800 + + * finish task #5942. + +commit ec9aaab1e220a07ce5b662c520f8a97b30834b07 +Merge: 4453ebcac0 093e3de746 +Author: wangyidong +Date: Wed Jul 10 17:16:11 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4453ebcac0dbbe6a0f9a73a097f0514d629fed7e +Author: wangyidong +Date: Wed Jul 10 17:15:43 2019 +0800 + + * finish task #5943. + +commit 093e3de746273b82f39b35c6755b1e27a02d8b29 +Merge: 673656fe47 549828eaca +Author: jinianlan +Date: Wed Jul 10 16:31:53 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 673656fe47d03f5d985f44ba16ca1af56cfc4fbf +Author: jinianlan +Date: Wed Jul 10 16:19:09 2019 +0800 + + * finish task #5953 + +commit 549828eaca99ccaa6e2777bf5f2dba542cff8092 +Author: wangyidong +Date: Wed Jul 10 16:09:11 2019 +0800 + + * finish task #5950. + +commit 01bc03d1c0781499a1d25718eca036eb353f2e57 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 10 16:06:15 2019 +0800 + + * Finish task #8279. + +commit be2b3b1dd35dd1f0204656b265cc788360b77370 +Author: wangyidong +Date: Wed Jul 10 16:03:16 2019 +0800 + + * finish task #5951. + +commit 2f203d698560be6c26fac4ec55b77caf7a3d119f +Author: reneeteng +Date: Wed Jul 10 16:02:55 2019 +0800 + + * Lang file update. + +commit 836c00918baa0477103085d1942a79b4caecb460 +Author: wangyidong +Date: Wed Jul 10 15:56:35 2019 +0800 + + * finish task #5956. + +commit eee86c0de3371cd2fb525070347f48317184bf42 +Author: wangyidong +Date: Wed Jul 10 15:37:18 2019 +0800 + + * adjust for zh-cn by en. + +commit 47e23892c0a7a64e07af3ce8e890afc44346c64c +Author: wangyidong +Date: Wed Jul 10 14:42:54 2019 +0800 + + * finish task #5957. + +commit 4e85182b8f0e2b9f71bf94a75a2e3f2a51d809ea +Author: wangyidong +Date: Wed Jul 10 14:38:38 2019 +0800 + + * finish task #5959. + +commit f74deb1497285f54c61c2ec140baec76f9aa595d +Author: chenfei +Date: Wed Jul 10 14:24:33 2019 +0800 + + * Code for task #8276 of inner backyard pms. + +commit 514e0a679e5ba282facc36f08a2b983dca108166 +Author: wangyidong +Date: Wed Jul 10 14:20:58 2019 +0800 + + * finish task #5960. + +commit cc28630782b4b7f79636454cafb920f5f06aca53 +Author: wangyidong +Date: Wed Jul 10 14:19:07 2019 +0800 + + * finish task #5961. + +commit 833e8b75ae41f45cd15b3c783ce76f3684ac2c38 +Author: wangyidong +Date: Wed Jul 10 14:01:52 2019 +0800 + + * finish task #5962. + +commit 2277a17ee6f0e6d444df3701fe641f693cd5202b +Merge: 81b6a7036f 60e7014ef7 +Author: wangyidong +Date: Wed Jul 10 13:51:59 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 81b6a7036fe5448b7913c49492ba48fb7c96f3c9 +Author: wangyidong +Date: Wed Jul 10 13:51:27 2019 +0800 + + * finish task #5965. + +commit 60e7014ef76ae2bdd9adc6ba8ae8a7bac8f45b5b +Author: jinianlan +Date: Wed Jul 10 13:41:13 2019 +0800 + + * finish task #6020,#6009,#6007,#5949 + +commit e5bdaba463306b737fd6e49e8949d722894e66fe +Author: wangyidong +Date: Wed Jul 10 13:27:10 2019 +0800 + + * finish task #5967. + +commit eb5e30e2faf13762366847234128cfc47d37bf7a +Author: wangyidong +Date: Wed Jul 10 13:14:31 2019 +0800 + + * finish task #5968. + +commit 014c61e4e68f6fa691fd76ac109cedddc77c21de +Author: wangyidong +Date: Wed Jul 10 13:04:12 2019 +0800 + + * finish task #5969. + +commit f4153b762371762b7f36631b7ab9d984043f1c44 +Merge: 23922ac917 4fc6ae4314 +Author: wangyidong +Date: Wed Jul 10 12:15:52 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 23922ac9179ceba04869ab7127965c0972e90b63 +Author: wangyidong +Date: Wed Jul 10 12:15:19 2019 +0800 + + * finish task #5993. + +commit 675a36b6e7d1a36cb5287c10e9668e2a89c0bfd4 +Merge: b2dc2024ce 13eef8faff +Author: Yagami <976204163@qq.com> +Date: Wed Jul 10 09:23:53 2019 +0800 + + Merge branch 'zentaopms_workflow' of https://github.com/easysoft/zentaopms into zentaopms_workflow + +commit b2dc2024ce0da483bdbed38dfefbf9f6d8f1fb26 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 10 09:22:06 2019 +0800 + + * Add select menu to lang file. + +commit 4fc6ae431476eba1fd3c4f7beb6afbd8dbd4ea2d +Author: reneeteng +Date: Tue Jul 9 16:45:18 2019 +0800 + + * Lang file update. + +commit c1fd84b6f8666a53ae36c9e3de959a2dbe3b59fd +Author: reneeteng +Date: Tue Jul 9 16:25:10 2019 +0800 + + * Drag lang file update. + +commit d082ebafadbdfbc83be2817e3043158ce39c1949 +Author: reneeteng +Date: Tue Jul 9 16:12:03 2019 +0800 + + * Remove space in lang file. + +commit 29b399cbebe8da9b4a605dbee895336183a76c09 +Merge: a0a9d0fb39 a407d26b84 +Author: reneeteng +Date: Tue Jul 9 16:05:13 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a0a9d0fb3948ad5569d1ca423f2055e38925eb28 +Author: reneeteng +Date: Tue Jul 9 16:03:50 2019 +0800 + + * Lang file update. + +commit 13eef8faff677aff047b51ad9da72e13385737a9 +Author: chenfei +Date: Tue Jul 9 13:47:57 2019 +0800 + + * Code for task #8274 of inner backyard pms. + +commit 5ac44619262d904dc0180d7b381b5605bd845f48 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 9 13:40:21 2019 +0800 + + * Finish task #8274. + +commit a407d26b848e66d6ac4b484069ff437928a854d3 +Merge: 124da7e5ab fee4f2d5c6 +Author: wangyidong +Date: Tue Jul 9 13:33:30 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fee4f2d5c60a29d8388d9651182309ae628d63ff +Merge: 4bfd3962c6 61beb0fa31 +Author: Catouse +Date: Tue Jul 9 13:31:10 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4bfd3962c68d6c493f5218c7debad67a14048731 +Author: Catouse +Date: Tue Jul 9 13:31:00 2019 +0800 + + * update chosen in zui.js. + +commit 802af56fe2d3236251cb1445566a891215079313 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 9 13:13:43 2019 +0800 + + * Add code to stroy view for workflow. + +commit 4e78adee0be69c94eb6b7450c76aa0f95f3cecca +Merge: 93525b5abf 32d7fd7bc3 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 9 11:23:25 2019 +0800 + + Merge branch 'zentaopms_workflow' of https://github.com/easysoft/zentaopms into zentaopms_workflow + +commit 32d7fd7bc39251ca4a6655ed2f22bb9c5a3153db +Author: chenfei +Date: Tue Jul 9 11:19:21 2019 +0800 + + * Adjust for task #8275 of inner backyard pms. + +commit 124da7e5ab28d8ab3d4159a0ffa11f2a51bc4406 +Author: wangyidong +Date: Tue Jul 9 11:13:53 2019 +0800 + + * finish task #5989. + +commit 0655c5f22d71066e2f1d405ef19a241de9636a7b +Merge: b884536307 61beb0fa31 +Author: wangyidong +Date: Tue Jul 9 11:09:26 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b88453630711f18e377dc242323061d35f684d26 +Author: wangyidong +Date: Tue Jul 9 11:08:21 2019 +0800 + + * finish task #5990. + +commit 93525b5abf8295a97779ca178e6fbce7b01fcae6 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 9 10:39:22 2019 +0800 + + * Add code to testtask testsuite view for workflow. + +commit f99dd1f01b74e3e7ad48a8797a17dd509ac2219d +Author: Yagami <976204163@qq.com> +Date: Tue Jul 9 10:27:49 2019 +0800 + + * Add code to task and case module for workflow. + +commit 149d4b4244e1f2fbe119c5dffcb3b0001156a14f +Author: Yagami <976204163@qq.com> +Date: Tue Jul 9 09:44:16 2019 +0800 + + * Add code to bug view for workflow. + +commit 61beb0fa31b5423d76c3b63bf6c58ca51cfd8e3c +Merge: 7efd22a0ab 6abbbf5955 +Author: reneeteng +Date: Tue Jul 9 09:43:38 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7efd22a0ab75a20bdc5168eee2268397cd95fb07 +Author: reneeteng +Date: Tue Jul 9 09:42:01 2019 +0800 + + * Lang file update. + +commit bf9679181afb9ebf1eb8f9335fa5572126b0f0bb +Author: liugang +Date: Mon Jul 8 17:37:43 2019 +0800 + + * If the module and method is defined in workflow, run workflow engine. + +commit 6abbbf5955e28e2515612cc57b879cf2f336e4d1 +Author: liugang +Date: Mon Jul 8 17:27:58 2019 +0800 + + * Refactor function to check the module and method is defined in workflow. + +commit a600039a67878b20aeb5d909c6a3bb324d95f375 +Merge: ef17ab7f01 13ae00955c +Author: wangyidong +Date: Mon Jul 8 17:16:53 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ef17ab7f01543c2d8cd0b0e9e0570cdb8a12cbf5 +Author: wangyidong +Date: Mon Jul 8 17:16:20 2019 +0800 + + * finish task #5992. + +commit 13ae00955ca78661cc64639dda0b7d0947d66a8a +Merge: 23d5f2bd3e 6e1774bdc2 +Author: jinianlan +Date: Mon Jul 8 16:33:31 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6e1774bdc2be3193048e74395ed8b7c4535c3072 +Author: wangyidong +Date: Mon Jul 8 16:22:56 2019 +0800 + + * finish task #5996. + +commit 4aad227e76a37c97d7f1d66f6c34406f08c57bca +Author: wangyidong +Date: Mon Jul 8 16:20:03 2019 +0800 + + * finish task #5997. + +commit 526682cffebdae38fc2cdb718bd76c8277750789 +Author: chenfei +Date: Mon Jul 8 15:57:03 2019 +0800 + + * Finish task #8257 for zentao inner backyard. + +commit 8f7a54de05e5bd6191174afb6c7f8a604755fe7f +Author: wangyidong +Date: Mon Jul 8 15:44:40 2019 +0800 + + * finish task #5999. + +commit f5fccb3cf7e85fc29756e8fcc62fd8b7cdf43eef +Merge: ecacabac70 19e1ddabae +Author: wangyidong +Date: Mon Jul 8 15:19:20 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ecacabac70ef6b32430bab214ccd8646836f9bfa +Author: wangyidong +Date: Mon Jul 8 15:15:55 2019 +0800 + + * finish task #6004. + +commit 23d5f2bd3e5c98700c4a6e1302665c395daf3a61 +Author: jinianlan +Date: Mon Jul 8 15:05:26 2019 +0800 + + * finish task #6021,#6009,#6007,#6006 + +commit 19e1ddabae1fbd561e80ec17015b8bdabeb425c6 +Merge: befec1fc06 1754966886 +Author: reneeteng +Date: Mon Jul 8 14:59:43 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit befec1fc0666d99e37eeaade6982b74cbb6484c7 +Author: reneeteng +Date: Mon Jul 8 14:58:48 2019 +0800 + + * Lang file update. + +commit 79b7a06c0ddb5faf6fdfa604e2c8a7dc0032dbae +Author: wangyidong +Date: Mon Jul 8 14:48:02 2019 +0800 + + * finish task #6005. + +commit 17549668862cb217622882ebd114d36b331fd4ef +Merge: 42ecf57a99 c04441a40d +Author: wangyidong +Date: Mon Jul 8 14:41:39 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c04441a40db6199bdb6312d646f60a88c769c2cc +Author: reneeteng +Date: Mon Jul 8 14:37:09 2019 +0800 + + * Lang file update. + +commit 42ecf57a99d2f9228ea5cdb85ae6b0999790659b +Merge: bbd9ffdb07 af1093c597 +Author: wangyidong +Date: Mon Jul 8 14:36:59 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bbd9ffdb0778469fc94d48db3bf0b7f5b82d6e01 +Author: wangyidong +Date: Mon Jul 8 14:33:14 2019 +0800 + + * finish task #6012. + +commit af1093c597d33f92c7291a96a66df4dcba9c4b9c +Merge: 45cfad82d6 e5a0a6c859 +Author: reneeteng +Date: Mon Jul 8 14:27:26 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 45cfad82d65545128b9f79aafe28ea7d21d132f0 +Author: reneeteng +Date: Mon Jul 8 14:25:48 2019 +0800 + + * Lang files update. + +commit e5a0a6c859a9d7ff7898b215818c69ce2cf7ee5c +Author: wangyidong +Date: Mon Jul 8 14:21:12 2019 +0800 + + * finish task #6013. + +commit 066bc73dfd6159bf8b7d990fb9548e04e03db750 +Merge: f5f1107026 91f9847238 +Author: wangyidong +Date: Mon Jul 8 14:15:40 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f5f110702625ce0024919d160c8bbddc6805dd06 +Author: wangyidong +Date: Mon Jul 8 14:14:23 2019 +0800 + + * finish task #6019. + +commit 91f984723872e648691e3e0ce1b8c443efc2326f +Merge: 3122bab037 1fe889d697 +Author: reneeteng +Date: Mon Jul 8 11:31:10 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3122bab037bfcdf8c0e95a6f797390a15e9bcc9a +Author: reneeteng +Date: Mon Jul 8 11:30:43 2019 +0800 + + * Lang file updated. + +commit 1fe889d697f23647b5056ac75721be92dcd95079 +Merge: 308bb3d1be 6253eac328 +Author: liugang +Date: Mon Jul 8 10:58:56 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 308bb3d1bef5eca596aea52a8a046722c166fa64 +Author: liugang +Date: Mon Jul 8 10:56:47 2019 +0800 + + * If the module and method if defined in workflow, run workflow engine. + +commit 6253eac32809befffb1e742cddbbceb4be407773 +Merge: a3e86de815 d8d90d83f3 +Author: reneeteng +Date: Mon Jul 8 10:49:00 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a3e86de815d2fa12d31d77ef53dbade1715e1f55 +Author: reneeteng +Date: Mon Jul 8 10:48:13 2019 +0800 + + * Lang file update. + +commit d8d90d83f313d41ed97ddd88eb3970ea0ca711b9 +Merge: 2267a99a65 9e634fcd63 +Author: liugang +Date: Mon Jul 8 10:16:25 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2267a99a65cab791a0e9c9c9fdd6ea88604e8f89 +Author: liugang +Date: Mon Jul 8 10:15:48 2019 +0800 + + * Add default error lang for url. + +commit 9e634fcd6373d67fce65c9371e56d174f43c1ef1 +Merge: 9d624513e4 00cb0df3bf +Author: reneeteng +Date: Fri Jul 5 18:06:51 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9d624513e4b2392e65665b3b128c480c92cb15c3 +Author: reneeteng +Date: Fri Jul 5 18:05:13 2019 +0800 + + * Lang file update. + +commit 00cb0df3bf38dbbc7e033365b659ca97ed6cd509 +Author: wangyidong +Date: Fri Jul 5 17:32:55 2019 +0800 + + * finish task #5998. + +commit c3ba4e8b3ebc91eade20112ed0726d8b9209233c +Author: wangyidong +Date: Fri Jul 5 17:03:54 2019 +0800 + + * adjust for th width. + +commit 19eb87e0be9d74b139dbc8e708cce1ffcd58e5ae +Merge: 268a4fa2c2 af8ff0b270 +Author: wangyidong +Date: Fri Jul 5 16:43:50 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit af8ff0b2707c947d10dd89c8fc98c5c7c190e129 +Merge: c1f342e0bb dc87304782 +Author: reneeteng +Date: Fri Jul 5 16:30:16 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c1f342e0bba981d3c1ab347fbf3f12f8a375264b +Author: reneeteng +Date: Fri Jul 5 16:28:38 2019 +0800 + + * Lang file update for proj. + +commit 268a4fa2c22daddd1eb0f19ed9baba9f258f4a6b +Author: wangyidong +Date: Fri Jul 5 16:02:10 2019 +0800 + + * finish task #6024. + +commit dc87304782e3d54fbee0b2fb5b44a3f347b71c1f +Author: wangyidong +Date: Fri Jul 5 15:35:13 2019 +0800 + + * finish task #6025. + +commit 3c102bb3e9dfdfd8abcc5617995417adaa69355c +Author: wangyidong +Date: Fri Jul 5 11:31:32 2019 +0800 + + * finish task #6026. + +commit 870b5491750901b78582d91e7c922a1bd928ed56 +Author: wangyidong +Date: Fri Jul 5 11:22:26 2019 +0800 + + * finish task #6029. + +commit ae89e7e9a4153d4cf9ba2d3c8cdf78e4e0e0907d +Author: wangyidong +Date: Fri Jul 5 11:20:53 2019 +0800 + + * finish task #6030. + +commit d9b43a8c5ee36ff3c0608a1eba3ac563427d7937 +Author: wangyidong +Date: Fri Jul 5 11:09:08 2019 +0800 + + * finish task #6033. + +commit 9910fa461ce37cc0ae2629d1e4ecb6f6eab72506 +Author: wangyidong +Date: Fri Jul 5 10:52:30 2019 +0800 + + * finish task #6034. + +commit e3da7312f2199585e36c3a8a21ed9920e5dc5609 +Author: wangyidong +Date: Fri Jul 5 10:23:08 2019 +0800 + + * finish task #6035. + +commit dabd65f171f47abd769a1e785c7c5a1ab9aae52c +Author: wangyidong +Date: Fri Jul 5 09:53:43 2019 +0800 + + * finish task #6037,6038. + +commit 3c76568ca9bc72fc6fdfad565ccef3614ab25dc6 +Author: wangyidong +Date: Fri Jul 5 09:19:58 2019 +0800 + + * finish task #6039. + +commit 6d1dbcebc4c21dda7d6e0feeee5c47c68223cadb +Author: wangyidong +Date: Fri Jul 5 09:13:01 2019 +0800 + + * finish task #6042. + +commit 4df1ef92ffedfb164726be4627619d21b609358a +Author: wangyidong +Date: Fri Jul 5 08:59:55 2019 +0800 + + * finish task #6043. + +commit 32956373675486970bfbb8cba041a1298a5d42f7 (tag: zentaopms_11.6.0.beta1_20190705) +Author: wangyidong +Date: Fri Jul 5 08:20:04 2019 +0800 + + * finish task #6047. + +commit c3fb6b69fd5d3c23009e531f3b1e17cd7008d9d5 +Author: wangyidong +Date: Thu Jul 4 17:37:24 2019 +0800 + + * finish task #6048. + +commit 7ce8398936eecf9a5c312626ee36425861a1a458 +Author: wangyidong +Date: Thu Jul 4 16:33:13 2019 +0800 + + * finish task #6053. + +commit c5187c2328bba7fc038b082f507f0d44e794f0e3 +Author: wangyidong +Date: Thu Jul 4 15:31:57 2019 +0800 + + * finish task #6051. + +commit 486bc640b7c20acc84e8321f9db5a52985208116 +Author: reneeteng +Date: Thu Jul 4 14:22:52 2019 +0800 + + * Testreport lang file updated. + +commit a9ef4789e6730de411203a2da233ff76bc01cbb5 +Author: wangyidong +Date: Thu Jul 4 14:17:58 2019 +0800 + + * finish task #6052. + +commit b426af31b72725b81575cdb6cb82efe4fcf948db +Author: wangyidong +Date: Thu Jul 4 14:13:12 2019 +0800 + + * finish task #6053. + +commit ea1c011786c9c6337a9b46137640fc2d4d92afe0 +Merge: 402bda7579 9a0698b347 +Author: wangyidong +Date: Thu Jul 4 13:41:59 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 402bda75794d87a64d274bb36cf4b79fea0a0740 +Author: wangyidong +Date: Thu Jul 4 13:40:37 2019 +0800 + + * finish task #6055. + +commit bdda1f889ddc8915276f9716e3a324c1c3f5ab6e +Author: wangyidong +Date: Thu Jul 4 13:40:03 2019 +0800 + + * adjust for build lang file. + +commit 9a0698b347f90c91ea15a927cb9987e1e536e145 +Author: reneeteng +Date: Thu Jul 4 10:12:43 2019 +0800 + + * Lang optimized. + +commit ab6e312dbaecd61831d2d7452d0011ea07d65284 +Author: chenfei +Date: Wed Jul 3 15:17:50 2019 +0800 + + * Adjust confirmed text-align. + +commit 5e64bde9328138fb1bfce847224cf0f0cfb0cc39 +Merge: a2a845a50b eb30035917 +Author: wangyidong +Date: Wed Jul 3 11:34:21 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a2a845a50b9f0537b5e2f7179cb646f2c23da1f7 +Author: wangyidong +Date: Wed Jul 3 11:33:55 2019 +0800 + + * adjust for build lang file. + +commit eb30035917b250faff72d2bad5d546ae70dcacc2 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 3 09:32:47 2019 +0800 + + * Finish task #5925. + +commit 73282021871cacf0e1091c915deabe82d623d29f +Author: wangyidong +Date: Wed Jul 3 09:26:02 2019 +0800 + + - delete useless file. + +commit 49eddc115cd519908947212a0ea8ce9b2cc3cd2f +Author: Yagami <976204163@qq.com> +Date: Wed Jul 3 08:57:32 2019 +0800 + + * Finish task #5924. + +commit 6cc1b9a7f10e2fa160d2d67d88172676141106cf +Author: Yagami <976204163@qq.com> +Date: Tue Jul 2 16:18:03 2019 +0800 + + * Finish task #5917. + +commit e598880de9b01f53ed7041e4df3c60939d6d94d6 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 2 16:15:07 2019 +0800 + + * Finish task #5923. + +commit b99a15631ad2581202a6ff94fa47a737b857db2e +Merge: 68dc518853 655c961a8b +Author: Yagami <976204163@qq.com> +Date: Tue Jul 2 16:10:59 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 68dc51885390b369ebe69791f3247a7b55894cf0 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 2 16:10:37 2019 +0800 + + * Finish task #5922. + +commit 655c961a8be868d32899d1b8686ebe246c33d20c +Merge: 052389abad 93ff748dbf +Author: chenfei +Date: Tue Jul 2 15:56:43 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 93ff748dbf936ce1db82807840d51e38e587f985 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 2 15:53:27 2019 +0800 + + * Finish task #5921. + +commit 052389abad11025a5d2cd3a25df3aeb65ca6033e +Author: chenfei +Date: Tue Jul 2 15:51:19 2019 +0800 + + * Finish task #5938. + +commit 3253089e1f7ae549a8db11b00a9c97c127406251 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 2 15:41:28 2019 +0800 + + * Finish task #5920. + +commit a5650354ad691458c487cb11dafde7afc33e921a +Author: Yagami <976204163@qq.com> +Date: Tue Jul 2 15:33:26 2019 +0800 + + * Finish task #5919. + +commit 925eccb94dcdedc9af63d668e1541e3d20146ac8 +Author: chenfei +Date: Tue Jul 2 15:16:31 2019 +0800 + + * Finish task #5931. + +commit 412dd5efd3a69785939ffe1f41abebc7ee79da1c +Merge: b5b299fb21 be9a9cbeba +Author: Catouse +Date: Tue Jul 2 09:49:55 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b5b299fb2158c3d0d223b6df1d9bd020d10fe47a +Author: Catouse +Date: Tue Jul 2 09:49:48 2019 +0800 + + * fix chosen drop width autoresize not work on first open in testcase/batchCreate view. + +commit be9a9cbeba4d07c79cb781a7d645ec25e4aa35c1 +Author: wangyidong +Date: Tue Jul 2 09:47:13 2019 +0800 + + * adjust for index page. + +commit d71e263751ff9ee0eda1b6a8218835b54f6e465d +Author: wangyidong +Date: Tue Jul 2 08:33:50 2019 +0800 + + * add notes for translate. + +commit e8460026fa84bea685e894dcadb7316e7c6eecff +Author: wangyidong +Date: Mon Jul 1 17:48:47 2019 +0800 + + * adjust en lang for translate. + +commit 5b416daab74dbc6a3d49616bb18bd347fe98a0a3 +Merge: a03bac8e44 b6eef9472d +Author: reneeteng +Date: Mon Jul 1 17:23:57 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b6eef9472de5cf5431a577f13c8d02b3708cb7f9 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 1 17:23:09 2019 +0800 + + * Fix table position. + +commit a03bac8e4464d8098f22318a23ebc96471d04619 +Author: reneeteng +Date: Mon Jul 1 17:22:36 2019 +0800 + + * Translation file update. + +commit f05fc9450c3165e752cd9f8ad585f00072c651b5 +Merge: 642c438d47 c55db3c118 +Author: reneeteng +Date: Mon Jul 1 17:07:34 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c55db3c1182255ad7b6dec4f6efdfadfc00024bd +Author: Yagami <976204163@qq.com> +Date: Mon Jul 1 17:01:19 2019 +0800 + + * Fix code name. + +commit 9a7e58571fa86bdc929adc6a2c889d56f8ea0b3f +Merge: 70449c2b83 47e52d2fb2 +Author: chenfei +Date: Mon Jul 1 16:24:22 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 47e52d2fb25c10db5a1117cf3d5ab0f855b4e62c +Merge: 7976c974e4 70a5521dd7 +Author: wangyidong +Date: Mon Jul 1 16:23:31 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 70449c2b836176374eec2ed2d20fc8be33108d4d +Merge: 141346bd52 70a5521dd7 +Author: chenfei +Date: Mon Jul 1 16:22:29 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7976c974e4e30e6deb1410321dad53879cdb4cd4 +Author: wangyidong +Date: Mon Jul 1 16:22:08 2019 +0800 + + * adjust translate index page and copy zh-cn.php to en.php. + +commit 141346bd52b6864cba298fa544059294498dc95d +Author: chenfei +Date: Mon Jul 1 16:19:38 2019 +0800 + + * remove editor module. + +commit 70a5521dd7e02d336acc01239887b6d5408246e3 +Merge: f3fe328188 49359caf22 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 1 16:17:19 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f3fe328188734e04a7825be210a653af39c86355 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 1 16:15:52 2019 +0800 + + * Finish task #5914. + +commit 49359caf22137aba960b2c16b966fd6a369979e6 +Merge: 65821a7a42 e1404a2f5c +Author: Catouse +Date: Mon Jul 1 15:40:56 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 65821a7a42521f29842c7a488137c16f1231b83f +Author: Catouse +Date: Mon Jul 1 15:40:51 2019 +0800 + + * change navbar style in english version by update zui.css. + +commit e1404a2f5cd123ffde322fdddeb3a268ee81f8bc +Merge: 4d685b6a44 878519c620 +Author: wangyidong +Date: Mon Jul 1 15:36:55 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4d685b6a444801cd54de35dcb96a1a841264edf9 +Author: wangyidong +Date: Mon Jul 1 15:36:08 2019 +0800 + + * code for task #5833. + +commit 878519c620a6e5153b44c2d3d9e3c90e2bc4b423 +Merge: e481cba1e7 0a2bd459a9 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 1 15:35:38 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e481cba1e70014a032e9ac9a6c0cbe3ca2c6729b +Author: Yagami <976204163@qq.com> +Date: Mon Jul 1 15:35:19 2019 +0800 + + * Fix css file. + +commit 0a2bd459a91f73bae7950108eb2d7d5c2c4fcd64 +Merge: 731b395734 97c498aeef +Author: wangyidong +Date: Mon Jul 1 15:17:48 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 731b395734a770e5a44331b4a885fc4845e3dddc +Author: wangyidong +Date: Mon Jul 1 15:17:12 2019 +0800 + + * finish task #5828. + +commit 94d5b9789ef1c6f5a317daa5032059a35b5d823a +Author: wangyidong +Date: Mon Jul 1 15:06:14 2019 +0800 + + * change for task #5825. + +commit 97c498aeef35b0ab7d7a071ecd24963c77965f4d +Author: Yagami <976204163@qq.com> +Date: Mon Jul 1 15:05:49 2019 +0800 + + * Fix finish view style. + +commit f7d4f5ff7171ca7d4d8f033181c872f0c6bb5a70 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 1 14:37:50 2019 +0800 + + * Code for task #5892. + +commit 368775a796266d7679cbcc1d803ee9e28e1168a8 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 1 14:18:23 2019 +0800 + + * Finish task #5892. + +commit 642c438d47b03b80081a04c84324ede7d9ea9885 +Author: reneeteng +Date: Mon Jul 1 11:01:28 2019 +0800 + + * Bug lang changed. + +commit dc33a59896dc4388127d503a5a5cb55c05eb721f +Author: Yagami <976204163@qq.com> +Date: Mon Jul 1 10:15:01 2019 +0800 + + * Fix export style. + +commit 2c28909140b1fc9e2350d89c7eedd29d1c3dea98 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 1 10:12:02 2019 +0800 + + * Fix case list style. + +commit 83a143251f976f4ab1973eff7823c7657af47884 +Merge: e7556ce41f bdacbfc0da +Author: wangyidong +Date: Fri Jun 28 16:11:24 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e7556ce41f55d0ae93f7a51e0717e5460a52be66 +Author: wangyidong +Date: Fri Jun 28 16:08:26 2019 +0800 + + * adjust for translate. + +commit bdacbfc0da25e11e1005fc35d4bb21f80ced00d6 +Author: Yagami <976204163@qq.com> +Date: Fri Jun 28 15:42:08 2019 +0800 + + * Fix batch run case style. + +commit 9f666d3a4e1f2987b46efe54f8d3f1940600d26f +Author: Yagami <976204163@qq.com> +Date: Fri Jun 28 15:34:46 2019 +0800 + + * Fix report style. + +commit 4296bd1291523009086afca5423328de14b98a35 +Author: Yagami <976204163@qq.com> +Date: Fri Jun 28 15:16:41 2019 +0800 + + * Finish task #5892. + +commit 7f690beb0ba8631cd5f9ba286b64224b37499b54 +Author: Yagami <976204163@qq.com> +Date: Fri Jun 28 13:32:47 2019 +0800 + + * Finish task #5840. + +commit a8714375116d42d154c8eae6ce0c8930b0195b61 +Author: Yagami <976204163@qq.com> +Date: Fri Jun 28 11:30:21 2019 +0800 + + * Finish task #5844. + +commit c8a349e214ac3304529134fd082c6569293db591 +Author: Yagami <976204163@qq.com> +Date: Fri Jun 28 10:51:37 2019 +0800 + + * Finish task #5846. + +commit 29fda43c77d517c88284fab624a89fc0609d843f +Author: Yagami <976204163@qq.com> +Date: Fri Jun 28 10:49:19 2019 +0800 + + * Finish task #5847. + +commit 0170ef219eadc715f0d2ead753abe22fe2de7484 +Author: Yagami <976204163@qq.com> +Date: Fri Jun 28 10:42:06 2019 +0800 + + * Finish task #5848. + +commit 0047c15f19e0b72ef32c2db507b17c0e4cce20e5 +Author: Yagami <976204163@qq.com> +Date: Fri Jun 28 10:22:34 2019 +0800 + + * Finish task #5852. + +commit 1d3e3d11e762b22cd40202d2fa6d5d6335abeb7a +Author: Yagami <976204163@qq.com> +Date: Fri Jun 28 09:19:45 2019 +0800 + + * Finish task #5856. + +commit fed53be575cc1837a509570623c6f1a7815d4343 +Author: Yagami <976204163@qq.com> +Date: Thu Jun 27 16:52:46 2019 +0800 + + * Add create test report view. + +commit f09167f379589540a64b4bde8a717ae982791077 +Author: Yagami <976204163@qq.com> +Date: Thu Jun 27 16:43:35 2019 +0800 + + * Finish task #5858. + +commit 25380e6ff8fd89a6675c48f99e17b75db64b6a80 +Author: Yagami <976204163@qq.com> +Date: Thu Jun 27 15:59:17 2019 +0800 + + * Finish task #5859. + +commit 7766afbc2d835088453d1189568c8ad6652a4696 +Author: Yagami <976204163@qq.com> +Date: Thu Jun 27 14:44:01 2019 +0800 + + * Finish task #5865. + +commit 72b3cfced5feac70378cef105260e36d6aad3545 +Author: Yagami <976204163@qq.com> +Date: Thu Jun 27 13:39:08 2019 +0800 + + * Finish task #5837. + +commit 80683b35d3cd7878107214a3d7929fbb1c0e4da4 +Author: Yagami <976204163@qq.com> +Date: Thu Jun 27 09:59:51 2019 +0800 + + * Finish task #5877. + +commit 50b7ac7516d117c14a062a2b67fea8d9b929f244 (tag: zentaopms_11.5.2_20190626) +Author: Yagami <976204163@qq.com> +Date: Wed Jun 26 17:37:06 2019 +0800 + + * Add code for 11.5.2. + +commit 09ae1056ea559b5246f21144c04c73f1c7c38b78 +Author: Yagami <976204163@qq.com> +Date: Wed Jun 26 17:24:41 2019 +0800 + + * Fix code for user module. + +commit 8ada663477bafb7786481e7d7a981a3558f48a84 +Author: Yagami <976204163@qq.com> +Date: Wed Jun 26 16:18:49 2019 +0800 + + * Finish task #5884. + +commit 09be77dc795f43d2542f1792d7a8d0f19c4155e6 +Author: Yagami <976204163@qq.com> +Date: Wed Jun 26 16:05:21 2019 +0800 + + * Finish task #5880. + +commit d13e13e8de019acaf5c3949b3821b341c908794b +Author: Yagami <976204163@qq.com> +Date: Wed Jun 26 15:21:36 2019 +0800 + + * Finish task #5883. + +commit e355f4501ed0a7ed6226a973e35eb01bda6a17cf +Author: Yagami <976204163@qq.com> +Date: Wed Jun 26 15:12:40 2019 +0800 + + * Finish task #5885. + +commit 09d823a777a8ea797b313cf778a7dc649b0bb53d +Author: Yagami <976204163@qq.com> +Date: Wed Jun 26 13:54:47 2019 +0800 + + * Finish task #5889. + +commit a7d947d81284d31300e14427e42f420190b2e467 +Author: Yagami <976204163@qq.com> +Date: Wed Jun 26 13:47:34 2019 +0800 + + * Finish task #5890. + +commit 270aecfc0a33ef92e308b6270cc72ea3a3485984 +Author: Yagami <976204163@qq.com> +Date: Wed Jun 26 13:40:04 2019 +0800 + + * Finish task #5891. + +commit e450870c55bff50b505f824e3ea35afc23bd65e6 +Author: Yagami <976204163@qq.com> +Date: Wed Jun 26 13:30:34 2019 +0800 + + * Finish task #5894. + +commit 50769be86cc6f75ed8f251f711162ba17995f37d +Author: Yagami <976204163@qq.com> +Date: Wed Jun 26 13:16:11 2019 +0800 + + * Finish task #5895. + +commit 7b0762218b3c0599460e943c593bbfbe3debaacd +Author: Yagami <976204163@qq.com> +Date: Wed Jun 26 10:32:06 2019 +0800 + + * Finish task #5896. + +commit dd47aa559ca5938e1e69597e9bf7b114ad278eaa +Author: Yagami <976204163@qq.com> +Date: Wed Jun 26 09:22:24 2019 +0800 + + * Finish taks #5902. + +commit 910ea1e96f1f94357029cbd9e11b798ce2338095 (tag: zentaopms_11.5.1_20190625) +Author: Yagami <976204163@qq.com> +Date: Tue Jun 25 09:33:56 2019 +0800 + + * Fix details before release. + +commit 9805983a14b6b7cae2f887442c09a6b7515510e5 +Author: wangyidong +Date: Mon Jun 24 17:41:36 2019 +0800 + + * add for priv. + +commit 2d73bfdd7d39a1196dc6dd53cb53f9685df4e252 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 24 17:31:55 2019 +0800 + + * Fix checkentry method. + +commit 195b894bc4ec2a5a8a945fd87bd0141c31ff47d7 +Author: wangyidong +Date: Mon Jun 24 15:46:28 2019 +0800 + + * finish task #5834. + +commit d302f839d7db0014faacfd146b000c40531a6eab (tag: zentaopms_11.5.1_20190624) +Author: Yagami <976204163@qq.com> +Date: Mon Jun 24 13:42:59 2019 +0800 + + * Fix my.full.js. + +commit dbec517d35e783db2ba3306f709244b929610647 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 24 13:41:04 2019 +0800 + + * Fix burn.js. + +commit a74139ac0c43371070d0141b669dfca0a844331d +Author: Yagami <976204163@qq.com> +Date: Mon Jun 24 13:37:54 2019 +0800 + + * Add standard sql. + +commit 005e845118346741324acaf72ea49c00d7828189 +Author: wangyidong +Date: Mon Jun 24 09:49:04 2019 +0800 + + * finish task #5829,5828,5826,5825. + +commit a54180c49f17794d1764b14033f97ccbe90fdfc8 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 24 09:17:17 2019 +0800 + + * Finish task #5821. + +commit 7beed222b9905e7b5ff804811742e357950cdedb +Author: wangyidong +Date: Fri Jun 21 16:49:57 2019 +0800 + + * ajdust for task #5833. + +commit d95272a45b3b38b187216f95407ac9abfd4a92a4 +Author: wangyidong +Date: Fri Jun 21 16:21:49 2019 +0800 + + * code for task #5827. + +commit e4ca8efe7b04e500783967e2419cb8904d4ed99f +Author: wangyidong +Date: Fri Jun 21 16:12:00 2019 +0800 + + * finish task #5827. + +commit 38608263d3fe3bc131f76f37076a5c972ca5a610 (tag: zentaopms_11.5.1_20190621) +Author: Yagami <976204163@qq.com> +Date: Fri Jun 21 15:52:34 2019 +0800 + + * Add entry edit.js. + +commit 2034c4237156f1ea9899bf8dbdbd2ee066a8477d +Author: Yagami <976204163@qq.com> +Date: Fri Jun 21 15:06:30 2019 +0800 + + * Fix upgrade method. + +commit a19ad0358419fd28e4842339c745f55f625ace95 +Author: Yagami <976204163@qq.com> +Date: Fri Jun 21 14:37:19 2019 +0800 + + * Add package info. + +commit 7b41c11c32c7ab1849c992d3e3a635c17767745b +Author: Yagami <976204163@qq.com> +Date: Fri Jun 21 14:08:23 2019 +0800 + + * Finish task #5804. + +commit df0f71d7e83dd029f4d3063732f5002bcc26d042 +Merge: c14993f5bb d75b6a435c +Author: wangyidong +Date: Fri Jun 21 08:22:44 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c14993f5bb865962f1cdbb4f0adf6f4744dd75f3 +Author: wangyidong +Date: Fri Jun 21 08:21:53 2019 +0800 + + * finish task #5833. + +commit d75b6a435c112716a8e279bfd087ee6d9e947ed6 +Author: Yagami <976204163@qq.com> +Date: Thu Jun 20 16:19:56 2019 +0800 + + * Finish task #5819. + +commit 4d646e12bda9019daf6ddbd4328f804d57274948 +Merge: 6dfbe25641 327c4438d6 +Author: Catouse +Date: Thu Jun 20 16:12:51 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6dfbe256415d322218a9ad0c2018c465abe3bb59 +Author: Catouse +Date: Thu Jun 20 16:12:22 2019 +0800 + + * improve style of exported burn image. + +commit df6b60bd53dec5efa0a523e2c4a4a3b0c143ce7d +Author: Yagami <976204163@qq.com> +Date: Thu Jun 20 16:06:33 2019 +0800 + + * Fix php wraning. + +commit c54c18924b7f7ce75a451c1fda54a7222c7b6a95 +Author: Yagami <976204163@qq.com> +Date: Thu Jun 20 13:22:03 2019 +0800 + + * Finish task #5816. + +commit 7e805210d231a127e7edfac567d73589e1b60726 +Author: Yagami <976204163@qq.com> +Date: Thu Jun 20 10:44:56 2019 +0800 + + * Finish task #5817. + +commit 76c29a431688dc05566b4432dfba0f0a750a26cf +Author: Yagami <976204163@qq.com> +Date: Thu Jun 20 09:48:30 2019 +0800 + + * Finish task #5821. + +commit 7157e51ea6bf4708de3cd63eec5b740a40175e9b +Author: Yagami <976204163@qq.com> +Date: Thu Jun 20 09:18:18 2019 +0800 + + * Finish task #5815. + +commit 327c4438d63864835489f51fc02718e36486d4aa +Author: wangyidong +Date: Wed Jun 19 17:15:37 2019 +0800 + + * finish task #5828. + +commit e56cdbebae668c81bcbd92b3f0252f6509045301 +Author: Yagami <976204163@qq.com> +Date: Wed Jun 19 15:58:03 2019 +0800 + + * Finish task #5811. + +commit e851644131a91197df603c467dbebc6930d88025 +Merge: 008d376edc 0b09771eef +Author: wangyidong +Date: Wed Jun 19 14:39:51 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 008d376edce753a1b6e52496996af2e66977e591 +Author: wangyidong +Date: Wed Jun 19 14:39:19 2019 +0800 + + * finish task #5832. + +commit adbd46fce6a32dfd813056ca0edc6480d06c92a2 +Author: Yagami <976204163@qq.com> +Date: Wed Jun 19 13:50:20 2019 +0800 + + * finish task 5810. + +commit 0b09771eef197e8b9a35819a103c720f290000a9 +Merge: 9072e52365 e0c5b25b7b +Author: Yagami <976204163@qq.com> +Date: Wed Jun 19 13:10:53 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9072e52365aef124363a8489b4994bcd69a6e0ce +Author: Yagami <976204163@qq.com> +Date: Wed Jun 19 13:10:28 2019 +0800 + + * Finish task #5808. + +commit e0c5b25b7bb50df322e539ab18d3a03288b5b253 +Author: reneeteng +Date: Wed Jun 19 11:16:24 2019 +0800 + + * Lang file update. + +commit 7c56ccda6c29e5ccfdc65053890ec478f031cb73 +Merge: 482e49c21a 771a81bc5e +Author: reneeteng +Date: Wed Jun 19 11:14:46 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 482e49c21afcf0dad44df19312a62a7a8b8b70a2 +Author: reneeteng +Date: Wed Jun 19 11:14:11 2019 +0800 + + * Lang file update. + +commit 14ce4572e58070e59ebca99ce0fa3a7152181b27 +Merge: f813cda32e 811d68443c +Author: reneeteng +Date: Wed Jun 19 11:05:48 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 771a81bc5e5fa7934e811883f8645bcf3d8368ec +Author: Yagami <976204163@qq.com> +Date: Wed Jun 19 10:55:33 2019 +0800 + + * Fix menu. + +commit f0e6ad5643c5c774465d86bd3cf9270f57b04fac +Merge: 5c83f0e085 2f8b47362d +Author: Yagami <976204163@qq.com> +Date: Tue Jun 18 18:00:34 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5c83f0e085c91299347abdca9114f22843bc9af2 +Author: Yagami <976204163@qq.com> +Date: Tue Jun 18 18:00:12 2019 +0800 + + * Add for trainpost. + +commit 2f8b47362d2e749e5d1ad336c34f6ee925ce7a36 +Author: wangyidong +Date: Tue Jun 18 16:10:28 2019 +0800 + + * code for task #5831. + +commit 66861ccf0b72c3f35781159c9de76be1ea028c39 +Author: wangyidong +Date: Tue Jun 18 15:57:22 2019 +0800 + + * finish task #5831. + +commit b7749f73a9256aa47452a1886dce6b18633d289d +Author: wangyidong +Date: Tue Jun 18 15:23:54 2019 +0800 + + * create diff lang. + +commit 2302643306f69dba6a6a0e8beb6a72cff6851308 +Author: wangyidong +Date: Tue Jun 18 15:23:14 2019 +0800 + + * ch + +commit 10ca8bf0e04fdde7896ff25e06f543f83919340c +Author: wangyidong +Date: Tue Jun 18 11:10:07 2019 +0800 + + * finish task #5824. + +commit 50cb4f7ea103a507e3d734af4f54676d5dafeb9a +Author: wangyidong +Date: Tue Jun 18 10:52:46 2019 +0800 + + * fix bug. + +commit f43dc5c082c6de354e16aaee5e4e1caa4c6c4414 +Author: wangyidong +Date: Mon Jun 17 09:46:27 2019 +0800 + + * adjust for bug. + +commit f813cda32ef7f4cc4c26a62eba71ab965672aa99 +Author: reneeteng +Date: Fri Jun 14 15:38:54 2019 +0800 + + * Lang file update. + +commit 811d68443ca24d3a7d686b938b61661eab12ac8e +Author: wangyidong +Date: Fri Jun 14 11:18:18 2019 +0800 + + * adjust for style. + +commit dcac58b007aaf6403f1982098442fce72da5bef6 +Author: wangyidong +Date: Thu Jun 13 14:11:56 2019 +0800 + + * revert dynamicAction lang. + +commit a439ef9a26020564916e1ea0e20807ce33f2fbc2 +Merge: f937f4cb65 22ab119017 +Author: wangyidong +Date: Wed Jun 12 13:15:09 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f937f4cb65b1aba478d8b062f4f2f0b2d2f9de21 +Author: wangyidong +Date: Wed Jun 12 13:14:38 2019 +0800 + + * adjust for page style. + +commit 22ab119017a66cd4c0dcac8f9b6c7a808de68c27 +Author: reneeteng +Date: Tue Jun 11 16:26:22 2019 +0800 + + * Lang file update. + +commit f48d62a430ec3007e4112e78ba885d4c6972e1c4 +Merge: 2146affb82 fa412abc6a +Author: reneeteng +Date: Tue Jun 11 15:06:45 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2146affb823e4edad36034b197c3410bf190105d +Author: reneeteng +Date: Tue Jun 11 15:06:27 2019 +0800 + + * Lang file update. + +commit fa412abc6ac8d8b2dbd531bb5aafde41a698e56c +Author: wangyidong +Date: Tue Jun 11 13:24:19 2019 +0800 + + * adjust for style. + +commit 0594c430eda362d8f28f7edf34a8bf9e3833f6e4 +Merge: 96d2cdca60 80fe80c41c +Author: wangyidong +Date: Tue Jun 11 13:13:39 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 80fe80c41cb63d0b14454c40a79d7a3ac3c31389 +Author: reneeteng +Date: Tue Jun 11 13:09:45 2019 +0800 + + * Change module lang file. + +commit 04c138ba061220475ae4e56f8920c3961fa6f4a3 +Author: reneeteng +Date: Tue Jun 11 11:30:44 2019 +0800 + + * Lang file update. + +commit e5e51fa82f9f9e4dee49dd60c2f8be644622e173 +Author: reneeteng +Date: Tue Jun 11 11:29:50 2019 +0800 + + + add en lang. + +commit d4b7a9ac4cfec9f63ce815badba483b40a04dcc0 +Merge: 520d121bdf 3b54364860 +Author: reneeteng +Date: Tue Jun 11 11:16:22 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 96d2cdca605a6611eca1fa9cb0f9472d77d1f897 +Author: wangyidong +Date: Tue Jun 11 10:04:25 2019 +0800 + + * adjust for style. + +commit 520d121bdf11459c0e5796603059f91024245f99 +Author: reneeteng +Date: Tue Jun 11 09:53:11 2019 +0800 + + * Lang file optimized. + +commit 3b543648607bda2fb549233ad6458ceb7e25add4 +Author: wangyidong +Date: Tue Jun 11 08:20:49 2019 +0800 + + * code for task #5673. + +commit 292e24acb15c702700604c720e60bf0422424548 +Merge: 307a19cb0a b578ba3c53 +Author: reneeteng +Date: Mon Jun 10 17:35:07 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 307a19cb0aad6486b430c13beccfb92929ab2b87 +Author: reneeteng +Date: Mon Jun 10 17:34:41 2019 +0800 + + * Lang file update. + +commit b578ba3c53083bb4de5d9635efad771912a7dc58 +Merge: 1a93ba3bcb 31f6ccb02c +Author: Catouse +Date: Mon Jun 10 16:17:31 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1a93ba3bcb544ebad169959bd89d7731a90e7e93 +Author: Catouse +Date: Mon Jun 10 16:17:24 2019 +0800 + + * update zui js file. + +commit 31f6ccb02c71928c2e194154610baa7b4295dffd +Merge: ca5cf5f905 4ecd2b4373 +Author: reneeteng +Date: Mon Jun 10 16:14:32 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ca5cf5f90591a77aa9c271bbf5994d4f3fdc008e +Author: reneeteng +Date: Mon Jun 10 16:14:13 2019 +0800 + + * Lang file update. + +commit 4ecd2b437345fb7af63fef4012c210a074f32bd5 +Author: wangyidong +Date: Mon Jun 10 13:21:26 2019 +0800 + + * code for task #5717. + +commit 16d810d460c3ba7292a24800608a55000db1d929 +Author: wangyidong +Date: Mon Jun 10 11:17:19 2019 +0800 + + * code for task #5713. + +commit 293ef1bef7fbebf6b2be2b9a14c2231e2560082d +Author: wangyidong +Date: Mon Jun 10 11:14:24 2019 +0800 + + * code for task #5706. + +commit 23084f2a167fc5afca3aaad9cc5217dc4ccf7688 +Merge: 7f2f6748e3 718111bbb8 +Author: wangyidong +Date: Mon Jun 10 11:12:19 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7f2f6748e3e2dada594268cebeaaa9731505bf2e +Author: wangyidong +Date: Mon Jun 10 11:11:53 2019 +0800 + + * code task #5667. + +commit 718111bbb851a57a6d49c8c56f47e5ef4b39c1fd +Merge: 01cf64b4d9 1251039735 +Author: reneeteng +Date: Mon Jun 10 10:46:45 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 01cf64b4d99f44c2b3db8615d949d066bb17519e +Author: reneeteng +Date: Mon Jun 10 10:46:22 2019 +0800 + + * Lang file update. + +commit 125103973519fb991c924f00a80a720329f8eecf +Author: wangyidong +Date: Mon Jun 10 09:21:09 2019 +0800 + + * code for task # + +commit 20ebda13e287b7324433eac3da1d600a8dcc0a63 +Author: wangyidong +Date: Mon Jun 10 09:18:21 2019 +0800 + + * code for task #5627. + +commit d71a5c685e6d03a0d8dad07ffdd19116939a496c +Merge: 141cd4dce3 5ea8134459 +Author: wangyidong +Date: Mon Jun 10 09:10:16 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 141cd4dce326d27d482fca80dbb8533e49dc22f0 +Author: wangyidong +Date: Mon Jun 10 09:09:28 2019 +0800 + + * finish task #5801. + +commit 5ea813445986a180869326bfc6dc5ed0e1c66516 +Merge: 3c7a49d6a9 8438decfc6 +Author: reneeteng +Date: Thu Jun 6 16:28:25 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3c7a49d6a9d7fb69d36b4fef91fee42b1a2a5693 +Author: reneeteng +Date: Thu Jun 6 16:28:00 2019 +0800 + + * Lang file update. + +commit 8438decfc617baffa20259e45ef2b0bf06f9ac26 +Author: wangyidong +Date: Thu Jun 6 16:17:19 2019 +0800 + + * finish task #5640. + +commit 0e7bd0522eb34778f279c8a8ef45749601a9c667 +Author: wangyidong +Date: Thu Jun 6 16:03:26 2019 +0800 + + * finish task #5641. + +commit febe820a1aa054532f6561ad898ebcc78b387177 +Merge: c3f0fd4714 c9074b43a9 +Author: wangyidong +Date: Thu Jun 6 15:15:01 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c3f0fd4714d611c15dcd6725fd67a817fd20ee23 +Author: wangyidong +Date: Thu Jun 6 15:14:36 2019 +0800 + + * finish task #5628. + +commit c9074b43a9f1836d2385efde84cf37a7f94cb891 +Merge: a990d767f7 75d5b18f20 +Author: reneeteng +Date: Thu Jun 6 14:29:10 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a990d767f7cf3d33cdf8a98e37a714a60b01efd8 +Author: reneeteng +Date: Thu Jun 6 14:28:46 2019 +0800 + + * Action langu update. + +commit 75d5b18f207a7938b6395f0598db89106d44d3a9 +Author: wangyidong +Date: Thu Jun 6 13:24:20 2019 +0800 + + * finish task #5659. + +commit 1756eb5daa621ffd56988b2bd39207d0591fb45a +Author: wangyidong +Date: Thu Jun 6 13:06:08 2019 +0800 + + * finish task #5686. + +commit a96eae5c3ebce68a33267119b2a781bdc2f91dbd +Merge: 91a5a805dd bfbeb04e98 +Author: wangyidong +Date: Thu Jun 6 11:21:27 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 91a5a805dd3a93daf1ea3dbb09c27bf0ef0ec60f +Author: wangyidong +Date: Thu Jun 6 11:21:01 2019 +0800 + + * finish task #5706. + +commit bfbeb04e9840028dcf9745165a3384a8278bf036 +Merge: 176f776614 02b6bfc8b6 +Author: reneeteng +Date: Thu Jun 6 11:19:22 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 176f776614b9cc25113c59fc4f5b293d03dc8550 +Author: reneeteng +Date: Thu Jun 6 11:18:57 2019 +0800 + + * Lang file update. + +commit 02b6bfc8b69facdfe1748356b24f9dc5cbbd2481 +Author: wangyidong +Date: Thu Jun 6 11:03:41 2019 +0800 + + * finish task #5667. + +commit 16ae56ee9ae63dbaa989f78dcfec0ed350e97d7e +Author: wangyidong +Date: Thu Jun 6 10:57:33 2019 +0800 + + * finish task #5698. + +commit e1e7b3f2d05e0de502b6421386afa259dab54ce5 +Merge: 835b85ba89 ea44cee1f7 +Author: wangyidong +Date: Wed Jun 5 17:33:39 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 835b85ba8985f29744f53964837db5cfea4fb576 +Author: wangyidong +Date: Wed Jun 5 17:32:40 2019 +0800 + + * finish task #5641. + +commit ea44cee1f73d0dba4936a514bfa02a4aeebaec2b +Merge: de2725da3b a3de0b750a +Author: reneeteng +Date: Wed Jun 5 17:23:25 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit de2725da3b928297fdb999032be4975ee58f6d27 +Author: reneeteng +Date: Wed Jun 5 17:22:34 2019 +0800 + + * Lang file update. + +commit b590c371bbf2900c66e3cf5806367686ac6271b8 +Merge: cf2fc309ac a3de0b750a +Author: Yagami <976204163@qq.com> +Date: Wed Jun 5 17:16:29 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a3de0b750a322b78c0f656b9c2b3081f943d0d6c +Author: wangyidong +Date: Wed Jun 5 17:01:00 2019 +0800 + + * finish task #5639. + +commit 1026dda4617c84c146e49d0807110e96d4ad6297 +Author: wangyidong +Date: Wed Jun 5 16:52:42 2019 +0800 + + * adjust main-actions for en lang. + +commit bbb65f79afa151d80610b3ffcb42b07065616302 +Author: wangyidong +Date: Wed Jun 5 16:52:16 2019 +0800 + + * finish task #5723. + +commit c01b68c0a6c5b939fd590758a2a81f7cd8ba713d +Author: wangyidong +Date: Wed Jun 5 16:24:25 2019 +0800 + + * finish task #5706. + +commit 1fbf720cae6849f8575641effd0a52113f830755 +Author: wangyidong +Date: Wed Jun 5 16:16:21 2019 +0800 + + * adjust for task #5783 + +commit 4feb3090e39bf6a391f5a0771c753a53ec9302ea +Merge: e3a96d34d8 a93b17a0d0 +Author: reneeteng +Date: Wed Jun 5 16:06:23 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e3a96d34d811287c909e43f096634f42f832fc9a +Merge: c27f1e3758 10e0c46c71 +Author: reneeteng +Date: Wed Jun 5 16:05:13 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a93b17a0d0f18f8e25c09dfa7d61f74852e77c6f +Author: wangyidong +Date: Wed Jun 5 15:48:49 2019 +0800 + + * finish task #5657. + +commit c27f1e3758cd0c461c037b78ef9eff957e54b9c7 +Author: reneeteng +Date: Wed Jun 5 15:19:49 2019 +0800 + + * Lang file update. + +commit 10e0c46c717357a938473ad63b4fce485c870ebd +Author: wangyidong +Date: Wed Jun 5 15:11:31 2019 +0800 + + * finish task #5784. + +commit 5e0e6a7b581afe95f93b8757b2d116fa842cb9bd +Author: wangyidong +Date: Wed Jun 5 14:16:40 2019 +0800 + + * code for task #5766. + +commit 6540832d10c112314798b62d5fae20398ab361bc +Author: wangyidong +Date: Wed Jun 5 14:14:22 2019 +0800 + + * finish task #5766. + +commit abe2f202015a75db0af0994da518b5017eef08da +Author: wangyidong +Date: Wed Jun 5 14:01:42 2019 +0800 + + * finish task #5741. + +commit 72e7dcd80bd9e725a48fdf19080c1f14e34ce077 +Author: wangyidong +Date: Wed Jun 5 13:38:14 2019 +0800 + + * finish task #5702. + +commit 5248ba0efbcd10472a6a15ed9fbcf98ec143e738 +Author: wangyidong +Date: Wed Jun 5 13:04:32 2019 +0800 + + * finish task #5703. + +commit a8063e8b1925e7212f04dc95748b90c8eca82782 +Author: wangyidong +Date: Wed Jun 5 11:51:58 2019 +0800 + + * adjust for side width. + +commit 5b758946106e5a026d5ce2921347886ee456bb29 +Author: wangyidong +Date: Wed Jun 5 11:25:42 2019 +0800 + + * finish task #5690. + +commit 228333562a9f83dc742326ed4f87d4fd691f99ee +Author: wangyidong +Date: Wed Jun 5 11:15:36 2019 +0800 + + * finish task #5689. + +commit 8faa10f22b762e114b6724df93a54a4a74b00356 +Author: wangyidong +Date: Wed Jun 5 11:00:11 2019 +0800 + + * finish task #5684. + +commit 36f249a02bc9bc82a5c9f1e6eda1eacbd9e79974 +Author: wangyidong +Date: Wed Jun 5 10:36:27 2019 +0800 + + * adjust for task #5781. + +commit 7fcd65e9a73fba2ba971a51d6c54dc8481d9147e +Author: wangyidong +Date: Wed Jun 5 10:30:03 2019 +0800 + + * code for task #5780. + +commit 483d481e39a0df602663686d631b9bc2270a4f46 +Author: wangyidong +Date: Wed Jun 5 09:58:55 2019 +0800 + + * finish task #5749. + +commit 8468aca152c68d16bbab879578564c855a53e241 +Author: wangyidong +Date: Wed Jun 5 09:43:28 2019 +0800 + + * finish task #5730. + +commit a35a3719695598572e8034a71d2ca027d74401f5 +Merge: 48949c3bfa 164cb065af +Author: wangyidong +Date: Wed Jun 5 09:43:15 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 48949c3bfad4f261bb017546a1c9025adb681880 +Author: wangyidong +Date: Wed Jun 5 09:42:42 2019 +0800 + + * finish task #5685. + +commit 164cb065af1c8d888dd2e7d7c846412763603c56 +Author: reneeteng +Date: Tue Jun 4 17:20:35 2019 +0800 + + * Lang file update. + +commit 46502d5fbade2c0c9c6678323a061468e74f9cf6 +Author: wangyidong +Date: Tue Jun 4 14:31:16 2019 +0800 + + * code for task #5681. + +commit 61e29f8a280aa6ceebd830c542f44291a524df9d +Author: wangyidong +Date: Tue Jun 4 14:24:36 2019 +0800 + + * code for task #5664. + +commit 053652cc92a3d086ff2c16cf61eea589bbefce1f +Author: wangyidong +Date: Tue Jun 4 14:23:56 2019 +0800 + + * + +commit d490cfbaef36eed020273545c6bc5c7dc231aedf +Merge: e9dc74bfda 608a56b71e +Author: wangyidong +Date: Tue Jun 4 14:21:22 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e9dc74bfda427eda225934173051bd5983f5a5d9 +Author: wangyidong +Date: Tue Jun 4 14:20:33 2019 +0800 + + * code for task #5626. + +commit 608a56b71ede36fb94e7a98a8ada5c8573c37aed +Merge: cc233d2517 db5c3c6998 +Author: reneeteng +Date: Tue Jun 4 14:16:56 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cc233d25172d15d750b9d533ba9ff51c7a3ac406 +Author: reneeteng +Date: Tue Jun 4 14:16:36 2019 +0800 + + * Lang file update. + +commit db5c3c6998ea9c12ef6f01f01e5558a4ad581156 +Merge: 570ba2faaa 3217808ff5 +Author: wangyidong +Date: Tue Jun 4 13:46:42 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 570ba2faaabfc20e6249ffafe84902c36295fd61 +Author: wangyidong +Date: Tue Jun 4 13:46:15 2019 +0800 + + * code for task #5656. + +commit cf2fc309ac242973f3d5074ec82e11e17fc65fce +Merge: 2aeb751159 3217808ff5 +Author: Yagami <976204163@qq.com> +Date: Tue Jun 4 11:31:32 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2aeb751159397c02552e26f35f0477b6aaa875c0 +Author: Yagami <976204163@qq.com> +Date: Tue Jun 4 11:30:18 2019 +0800 + + * Fix Est(h) to Est. + +commit 3217808ff528e55a52486d344936d8a041af55a2 +Merge: ecb028a4c3 3a6ae1c09f +Author: reneeteng +Date: Tue Jun 4 11:26:40 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ecb028a4c3143ba50adbdb7ac95f738334e70e0b +Author: reneeteng +Date: Tue Jun 4 11:26:20 2019 +0800 + + * Lang file update. + +commit 3a6ae1c09f5661211f2ac4590dbd0610d78cfde2 +Author: Yagami <976204163@qq.com> +Date: Tue Jun 4 11:22:07 2019 +0800 + + * Fix tree task style. + +commit de2771f15afc83ff469e7640496a1fcc8ae4403d +Author: Yagami <976204163@qq.com> +Date: Tue Jun 4 11:13:13 2019 +0800 + + * Finish task #5769. + +commit 0c947479596351432eb0be814526999ccf5e0820 +Merge: b1ea561cd5 fe9c2c277b +Author: Yagami <976204163@qq.com> +Date: Tue Jun 4 10:41:20 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b1ea561cd5d1f7b1342ff47fe2dfc0899cc30da0 +Author: Yagami <976204163@qq.com> +Date: Tue Jun 4 10:40:56 2019 +0800 + + * Fix bug create table style. + +commit fe9c2c277b4bf15b4f80ce5fb751479f9c525688 +Merge: b561598c63 32e5c9bea5 +Author: wangyidong +Date: Tue Jun 4 09:44:48 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b561598c63779269fe1dfa26cd4b300f37086ebb +Author: wangyidong +Date: Tue Jun 4 09:44:24 2019 +0800 + + * finish task #5668. + +commit 32e5c9bea550a0151ebd55fd8709b2a3ade28ef3 +Merge: 23eb8f03cb fb50db20f5 +Author: reneeteng +Date: Tue Jun 4 09:35:37 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 23eb8f03cb9274ec868bc885b24b574ea8b315e9 +Author: reneeteng +Date: Tue Jun 4 09:35:12 2019 +0800 + + * Lang file update. + +commit fb50db20f5ab026694dc5a90811011bfacb5c689 +Merge: 963da6ba24 f0a13339b8 +Author: Yagami <976204163@qq.com> +Date: Tue Jun 4 08:52:02 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 963da6ba24d3768e3ec566b5c03d38834b1a2f52 +Author: Yagami <976204163@qq.com> +Date: Tue Jun 4 08:51:42 2019 +0800 + + * Finish task #5752. + +commit e8fb0c8fdff5dc163f6af6a17f81edcbc33edebb +Author: wangyidong +Date: Tue Jun 4 08:31:42 2019 +0800 + + * finish task #5656. + +commit f0a13339b8647571588c1fbe5b2dc0bcb783f116 +Merge: 029572d70a d317c9c7b6 +Author: reneeteng +Date: Mon Jun 3 17:25:32 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 029572d70ad1b930a7ea9a55f3971648a55bdd92 +Author: reneeteng +Date: Mon Jun 3 17:25:06 2019 +0800 + + * Lang file update. + +commit d317c9c7b652a11c3eb65618eedb5edc99dc5c58 +Merge: 9a6c02867d 0ac509d4a1 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 17:12:41 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9a6c02867de507cf9e274fe24268d7ed2dc60143 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 17:12:25 2019 +0800 + + * Fix testcase view style. + +commit 0ac509d4a1fb185dc4158bf751bcb4dfbf2c3a99 +Author: wangyidong +Date: Mon Jun 3 17:08:54 2019 +0800 + + * finish task #5452. + +commit d6e153913742661b591afeb59af2c84c64008a01 +Merge: 4b1d132e4d 9e5652df97 +Author: Catouse +Date: Mon Jun 3 16:37:49 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4b1d132e4daabbb97c5bbd20b8910889ce844f91 +Author: Catouse +Date: Mon Jun 3 16:37:40 2019 +0800 + + * update kindeditor. + +commit 9e5652df9793fc4422dafa97e346a6b6f4579fac +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 16:30:36 2019 +0800 + + * Finish task #5792. + +commit 9a4bc756544107fee4e58922d0d1e83e4724cf61 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 16:25:02 2019 +0800 + + * Finish task #5788. + +commit 819163431718a6d15733427260411bbe61fda4a6 +Merge: a9634dcfc7 56a2960b2f +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 16:22:22 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a9634dcfc7a10d3077990d0aca71a472819801e4 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 16:22:10 2019 +0800 + + * Fix my-bug style. + +commit ae136f06a4cce1439e986c49afc355afc85605ce +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 16:20:45 2019 +0800 + + * Fix my-bug style. + +commit 56a2960b2f81dbe9f50d93ab6ae65e0f9ba21ab4 +Merge: 4b4a252289 74d4fbd87a +Author: wangyidong +Date: Mon Jun 3 16:20:25 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4b4a25228907c119f253c8cf688c3fb1444f0e9f +Author: wangyidong +Date: Mon Jun 3 16:20:07 2019 +0800 + + * finish task #5675. + +commit 74d4fbd87a3419a262f1845150123adb6f53d1e7 +Merge: fa047a15c4 02c3470bb1 +Author: reneeteng +Date: Mon Jun 3 16:15:23 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fa047a15c4bea05189bfa80f25bafdc55982954d +Author: reneeteng +Date: Mon Jun 3 16:14:42 2019 +0800 + + * Lang file update. + +commit 02c3470bb12cf1874cabc67f15567bef422cb50c +Merge: fbcd6db31c 293f706a58 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 16:09:22 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fbcd6db31c62aff0026b505c9977af689c3c0213 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 16:09:10 2019 +0800 + + * Finish task #5769. + +commit 293f706a5879bc53fef40a65989e72d0971e18ed +Merge: 39fdc99340 83452e21ea +Author: wangyidong +Date: Mon Jun 3 15:51:34 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 39fdc99340983e4c9973fa770ca6587f08bb0f4a +Merge: fab38881f2 2a5f6b3603 +Author: wangyidong +Date: Mon Jun 3 15:50:22 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fab38881f2478c31b96daf0cce72c2fb9be62926 +Author: wangyidong +Date: Mon Jun 3 15:50:02 2019 +0800 + + * finish task #5647. + +commit 83452e21ea7fde9bf53309b32330a0f1b78682b4 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 15:49:27 2019 +0800 + + * Fix pri and severity style. + +commit 2a5f6b3603a2b627ace611a88f38081742ee2c29 +Merge: d204dfe24d ecea70cf3c +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 15:41:11 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d204dfe24da42b232465f2ea422add398897f1de +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 15:40:33 2019 +0800 + + * Finish task #5529. + +commit ecea70cf3cd8d5eb7aaf26e28bba146c2c5e7efd +Merge: 4cb966c553 53ee56bfe7 +Author: wangyidong +Date: Mon Jun 3 15:38:52 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4cb966c553fbc91a073727604133be41f192a989 +Author: wangyidong +Date: Mon Jun 3 15:38:26 2019 +0800 + + * finish task #5634. + +commit 53ee56bfe7d1b327d03de0e2451bfc89aa6e58d9 +Merge: 7cd0307f89 e56e932723 +Author: Catouse +Date: Mon Jun 3 15:35:16 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7cd0307f8948f1e9613497d6bf3b30f07b1b37ce +Author: Catouse +Date: Mon Jun 3 15:35:10 2019 +0800 + + * fix ajax modal trigger not work in datatable. + +commit e56e9327233db146bef89f8876de2cbfb37a437a +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 14:49:16 2019 +0800 + + * Finish task #5759. + +commit 0fd9967fa82b4071331ea579c9811f6bba82bb77 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 14:38:24 2019 +0800 + + * Finish task #5751. + +commit 969a5c8d3b496c27ef0862a7fcf1ca40221c42c6 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 14:17:04 2019 +0800 + + * Finish task #5750. + +commit 56f6d0e2e19ad531c51414a7476d2acbab7e52f3 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 14:10:26 2019 +0800 + + * Finish task #5737. + +commit 8136066f1608be10c033b529335e5bd9ac903d48 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 14:06:40 2019 +0800 + + * Finish task #5736. + +commit faf7a8149cee5f8f9dd194b58c646e4c7045eb08 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 13:59:56 2019 +0800 + + * Finish task #5735. + +commit 6f5e5b2c13b6f86471b019fe71d6c9c4da229394 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 13:56:12 2019 +0800 + + * Finish task #5729. + +commit 57f527b2c49a0ab2b4e57bb35ce5086b8a8f7f89 +Merge: edd857f5c2 c307349f43 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 13:47:53 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit edd857f5c2d9e98837dde0f950e00463daa6caf6 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 13:47:18 2019 +0800 + + * Finish task #5726. + +commit c307349f43c4ebfaf43e7fa653df86a45c3a077e +Merge: 38fe643f7e e9c4a84f9c +Author: wangyidong +Date: Mon Jun 3 13:10:24 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 38fe643f7ea07fbf480d0fd14a78043b5b8771fd +Author: wangyidong +Date: Mon Jun 3 13:10:02 2019 +0800 + + * finish task #5632. + +commit e9c4a84f9cf6456efba2e8467d8cf479c24ed74b +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 13:06:22 2019 +0800 + + * Finish task #5725. + +commit 67f21ea76e2eeb3d5a0fa69595dbf9107325d4f0 +Author: wangyidong +Date: Mon Jun 3 11:52:54 2019 +0800 + + * finish task #5626. + +commit 4084a54ef5f6dcb4815e80cc551c3c804751a010 +Merge: 5e9c564075 e42d06670a +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 11:25:26 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5e9c5640750314c73c6689f06d63422e25ec4040 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 11:25:12 2019 +0800 + + * Finish task #5724. + +commit e42d06670a0ee833af032b5c70e75dda6dba39ec +Merge: 19a9ae9925 bf2e40e67d +Author: reneeteng +Date: Mon Jun 3 11:10:56 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 19a9ae99254f5f790d952fd237729754b8eef2e1 +Author: reneeteng +Date: Mon Jun 3 11:09:52 2019 +0800 + + * Lang file update. * Lang file update. * Lang file update. * Lang file update. * Lang file update. * Lang file update. * Lang file update. * Lang file update. + +commit bf2e40e67d33e0017d33bc7adb540f1a5b3727d1 +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 10:00:14 2019 +0800 + + * Finish task #5716. + +commit 608cf1bab88aa6681951c47fc93bd4b09cb1b89e +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 09:50:31 2019 +0800 + + * Finish task #5715. + +commit 9db0b6f1dd2168bf6ebb71fea09b1a8699c75870 +Merge: 20f309eb1f 6c721bb4cf +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 08:59:17 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 20f309eb1f855ac83e7b340de6b70bdce374a20b +Author: Yagami <976204163@qq.com> +Date: Mon Jun 3 08:58:56 2019 +0800 + + * Finish task #5705. + +commit 6c721bb4cf7056b7d18fe210ca2e2c891247a70a +Merge: a62b8fffcb 4b8b0a5f27 +Author: wangyidong +Date: Fri May 31 16:54:42 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a62b8fffcbc9f2731d5d7930f31120d234072b10 +Author: wangyidong +Date: Fri May 31 16:54:18 2019 +0800 + + * fix bug for get product and project. + +commit 4b8b0a5f2755e531a1b7bb27cd2ddcb14fff7746 +Author: reneeteng +Date: Fri May 31 16:23:56 2019 +0800 + + * Add h to story summary. Lang file. * Add h to story summary. Lang file. * Add h to story summary. Lang file. * Add h to story summary. Lang file. * Add h to story summary. Lang file. * Add h to story summary. Lang file. * Add h to story summary. Lang file. * Add h to story summary. Lang file. + +commit 766b5a32fa7dde395ddfd2d1a3b15d09a9a86d87 +Merge: 6070d75858 a86a212e76 +Author: reneeteng +Date: Fri May 31 16:16:36 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6070d75858573306bb0da2c9cb10074e57d6ce1f +Author: reneeteng +Date: Fri May 31 16:15:55 2019 +0800 + + * Lang file total update. + +commit a86a212e7641ada05a0f306068b299374eb82d25 +Merge: 65467ed5d9 f122d6977d +Author: Catouse +Date: Fri May 31 16:13:54 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 65467ed5d92e38228903b799516f4ab7b613cbc0 +Author: Catouse +Date: Fri May 31 16:13:47 2019 +0800 + + * fix table checkbox not work. + +commit f122d6977d5ba37d4e76ad8b7f2dc759360b6976 +Author: wangyidong +Date: Fri May 31 15:59:03 2019 +0800 + + * change ueditor to kindeditor. + +commit 92c223589f7794a9fce5b02f328c04dc3f105774 +Author: wangyidong +Date: Fri May 31 15:51:39 2019 +0800 + + * adjust for task #5563. + +commit 453e282c9042b44e86a18e658ba18006443d3905 +Author: reneeteng +Date: Fri May 31 15:38:26 2019 +0800 + + * Add space to story type. + +commit 7e4ce0bde477c335c03f3abb877e36fa33a88da2 +Merge: 9c47092329 82f70b85f1 +Author: reneeteng +Date: Fri May 31 15:19:08 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9c47092329761bed1c3ad0de64254693fca7daa0 +Author: reneeteng +Date: Fri May 31 15:18:42 2019 +0800 + + * Color column lang file update. + +commit 82f70b85f1f9f49e042e7288d5e9f12f6f1d92a3 +Author: Catouse +Date: Fri May 31 15:09:37 2019 +0800 + + * update chosen css file. + +commit 0c9df8fdfcf901cd13b6defb35a60d41c78d5be2 +Merge: ec7839d30c 747a6a638f +Author: Catouse +Date: Fri May 31 15:08:09 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ec7839d30c536d336e59f4baadbdc79727b436ac +Author: Catouse +Date: Fri May 31 15:08:02 2019 +0800 + + * update chosen files. + +commit 747a6a638ffb4b119d4b5cf403c964d2e1461bba +Author: reneeteng +Date: Fri May 31 15:00:02 2019 +0800 + + * No changing lines. Lang file update. + +commit bb5b2774a1f57756a4fb6297ecde96e7eecde2ca +Author: reneeteng +Date: Fri May 31 14:43:01 2019 +0800 + + * LastRun remove space. Lang file update. + +commit 00a0e5cc0ff46fc42ad6ecf6290c88639dff4afe +Merge: 629b0a651f 9fe7a5ef55 +Author: reneeteng +Date: Fri May 31 14:35:39 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 629b0a651f7ed99d4c6e9d077bfbb5096dd46f84 +Author: reneeteng +Date: Fri May 31 14:35:05 2019 +0800 + + * Created date lang file change. + +commit 9fe7a5ef556d03cc90b7ad78a5daceb4d7b6e692 +Merge: e462f7fbe9 7953743124 +Author: Catouse +Date: Fri May 31 14:27:55 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e462f7fbe9368262d173253135ab79f3e59879e8 +Author: Catouse +Date: Fri May 31 14:27:49 2019 +0800 + + * change default value of chosen option 'max_drop_width' by update zui js file. + +commit 79537431247c8d6aff5b7506500cd8595cd04c7d +Merge: 0c17194bab bdef4303b5 +Author: Yagami <976204163@qq.com> +Date: Fri May 31 14:20:12 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0c17194bab615eeecf4389426562151bd2cb4ea4 +Author: Yagami <976204163@qq.com> +Date: Fri May 31 14:20:00 2019 +0800 + + * Fix pager align. + +commit bdef4303b5efd318833bba13c3b39f53715ea869 +Merge: 61e480a12f d117625361 +Author: reneeteng +Date: Fri May 31 14:15:21 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 61e480a12fa266f77b43bc67a71ec7d64f8fd97e +Author: reneeteng +Date: Fri May 31 14:14:43 2019 +0800 + + * Lang file update. + +commit d11762536102563529a522282c6251a3c5744b7b +Merge: c16de529c1 6302b957ba +Author: wangyidong +Date: Fri May 31 11:03:53 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c16de529c1bbef076f53f5778baebbc7e008b159 +Author: wangyidong +Date: Fri May 31 11:03:33 2019 +0800 + + * adjust for merge xuanxuan. + +commit 6302b957ba88f38c864e3f8610f647d7c2b57fc3 +Merge: c4e897ac15 3dd89c46d0 +Author: reneeteng +Date: Fri May 31 10:57:42 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c4e897ac15e0ec21213b60055215fb49fd88d0dc +Author: reneeteng +Date: Fri May 31 10:57:24 2019 +0800 + + * Lang file update. + +commit 3dd89c46d02e11708963e2726e6c5b309711f97d +Author: Catouse +Date: Fri May 31 10:56:43 2019 +0800 + + * change kindeditor usage. + +commit e24659b6af86875719471c9d95ce3e588af36d60 +Merge: 84bbe0da93 7aa9cb1be3 +Author: Catouse +Date: Fri May 31 10:42:42 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 84bbe0da93fcd75ffe555070715c1aef7a096064 +Author: Catouse +Date: Fri May 31 10:42:34 2019 +0800 + + * update zui kindeditor files. + +commit 6143a0ae5bc292c8c7e4d1cdd7a381136b8540aa +Author: wangyidong +Date: Fri May 31 10:31:00 2019 +0800 + + * adjust for user contact. + +commit 7aa9cb1be3490b247c9089e9687413d382ae1674 +Merge: cf6c4f9359 f15df4e8c6 +Author: Yagami <976204163@qq.com> +Date: Fri May 31 10:14:50 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cf6c4f9359730a1084a033c81cfd49e5debcc4e7 +Author: Yagami <976204163@qq.com> +Date: Fri May 31 10:14:18 2019 +0800 + + * Fix story and doc span style. + +commit f15df4e8c6777e4764196ac89c5a45287792a08c +Author: Catouse +Date: Fri May 31 10:11:51 2019 +0800 + + * upgrade zui files. + +commit 76b8e28e83ffbac52be8a5fee070c65962364af9 +Author: Catouse +Date: Fri May 31 10:11:22 2019 +0800 + + * update zentao logo in login view for english version. + +commit c397d5d5453e75631d4c80e05c8373e481c61b56 +Author: Catouse +Date: Fri May 31 10:10:54 2019 +0800 + + * update zentao logo for english version. + +commit f98cad1eaff02ab36a1860ca25119827b5b8d0e4 +Merge: 9c1416edea a6dde2652b +Author: wangyidong +Date: Fri May 31 09:20:06 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9c1416edead0771ba6f4cd446b6e95cd0d57128d +Author: wangyidong +Date: Fri May 31 09:19:45 2019 +0800 + + * finish task #5565. + +commit a6dde2652b68375c6138f59e92399db54776f7b6 +Merge: cb78bc7afe 01286bd284 +Author: Yagami <976204163@qq.com> +Date: Fri May 31 09:13:21 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cb78bc7afecb7538574197507d1b98c6ac041284 +Author: Yagami <976204163@qq.com> +Date: Fri May 31 09:13:03 2019 +0800 + + * Finish task #5459. + +commit 01286bd2840426ddc29e7e64b1a4e32e93095722 +Author: wangyidong +Date: Thu May 30 17:44:03 2019 +0800 + + adjust for fixFeatureBar. + +commit 0d2d17e9ad1ae458f658e4478842216612616a1b +Merge: aca82aeded 9ab09b0a2b +Author: wangyidong +Date: Thu May 30 17:42:00 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit aca82aeded2a3b9e9a8f1e4795b35c8bef3a8bb6 +Author: wangyidong +Date: Thu May 30 17:41:44 2019 +0800 + + * finish task #5578. + +commit 9340af15980ef007413c57ab52753fd054ac0c6f +Author: wangyidong +Date: Thu May 30 17:41:15 2019 +0800 + + * support ntlm. + +commit 2939be79aa7c6835934baac6d609fb522170d2e0 +Author: wangyidong +Date: Thu May 30 17:40:48 2019 +0800 + + * adjust for profile page. + +commit 9ab09b0a2ba566283932169a1f7152820c131f4b +Author: reneeteng +Date: Thu May 30 16:42:44 2019 +0800 + + * To lang update. + +commit 78c230adeaebcb97f489df3f594518fa5bfae1f7 +Merge: 02245a104d fe465ed8d6 +Author: reneeteng +Date: Thu May 30 15:45:37 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 02245a104d30036c9e07450c59230acc425fd161 +Author: reneeteng +Date: Thu May 30 15:45:17 2019 +0800 + + * Lang file update. + +commit fe465ed8d64d6e9108dff30ebc7c1d6d4bcfc48c +Author: Yagami <976204163@qq.com> +Date: Thu May 30 15:01:38 2019 +0800 + + * Finish task #5610. + +commit 66e4e3baf116fb1b08ad171e6198047a5bc96931 +Author: Yagami <976204163@qq.com> +Date: Thu May 30 14:50:08 2019 +0800 + + * Finish task #5457. + +commit 09bddc2b30bc9093e18d652caff2a37c7df92401 +Author: Yagami <976204163@qq.com> +Date: Thu May 30 14:22:32 2019 +0800 + + * Finish task #5457. + +commit 6df4c62727050db008034619bd50fd5e46a7cb40 +Author: Yagami <976204163@qq.com> +Date: Thu May 30 14:10:04 2019 +0800 + + * Finish task #5457. + +commit c42f48895b1e62caaa8026fece94564290b76afa +Merge: 495d38d0c3 c461480ec3 +Author: Yagami <976204163@qq.com> +Date: Thu May 30 14:00:34 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 495d38d0c3bc1035ba87d5ca22554e91a23549bc +Author: Yagami <976204163@qq.com> +Date: Thu May 30 13:59:02 2019 +0800 + + * Finish task #5533. + +commit c461480ec3cafa4962e65247e8c4345171e65b8e +Merge: c2eba72a2c 59b2ea802d +Author: reneeteng +Date: Thu May 30 13:53:57 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c2eba72a2ca6180055ecbab15f5c7c6f59ae93bd +Author: reneeteng +Date: Thu May 30 13:53:16 2019 +0800 + + * Privilege lang file. + +commit 59b2ea802d7e5b606f51b309bd6c04688501b436 +Merge: 5e9c7c10ea 048556cc39 +Author: Yagami <976204163@qq.com> +Date: Thu May 30 13:41:49 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5e9c7c10ea0b9f4b092492a5925e283f75f43639 +Author: Yagami <976204163@qq.com> +Date: Thu May 30 13:41:33 2019 +0800 + + * Finish task #5533. + +commit 048556cc39656a577791d904a04bc9b7c89732d8 +Merge: a3b6cfc687 eaba2135ad +Author: wangyidong +Date: Thu May 30 11:50:42 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a3b6cfc687e074e9881a730bc83123a7971d4980 +Author: wangyidong +Date: Thu May 30 11:50:21 2019 +0800 + + * finish task #5446. + +commit eaba2135adf171564b944bf10a508898613788be +Author: reneeteng +Date: Thu May 30 11:22:13 2019 +0800 + + * Finish for proj 100 lang files. + +commit 52e0bea0c0720d7c8f5dffe254ad403a6ea20d59 +Merge: aacf02572b 9643076c38 +Author: reneeteng +Date: Thu May 30 10:51:22 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit aacf02572b584703eb1bdb5fb572867838d57189 +Author: reneeteng +Date: Thu May 30 10:50:56 2019 +0800 + + * Lang file update. + +commit 9643076c383c7b9b7a7b410183186ad1186005a8 +Author: Yagami <976204163@qq.com> +Date: Thu May 30 10:45:37 2019 +0800 + + * Finish task #5535. + +commit 8b0cd09d92ba4bce70b1d7f413bdff9679666fda +Author: Yagami <976204163@qq.com> +Date: Thu May 30 10:30:59 2019 +0800 + + * Finish task #5534. + +commit 81c23f698444cb37e7b77471172bd0622008ed21 +Merge: 6fdcdb2280 603fcb23be +Author: Yagami <976204163@qq.com> +Date: Thu May 30 10:27:45 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6fdcdb228070749a2408b4df86faafdaae24d39b +Author: Yagami <976204163@qq.com> +Date: Thu May 30 10:26:53 2019 +0800 + + * Finish task #5532. + +commit 603fcb23beb6f9189a3ac7ae64ed1160b50ce72c +Merge: fb1e8d10b1 d0fcd2d149 +Author: reneeteng +Date: Thu May 30 10:19:32 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fb1e8d10b1bf1917a11ff6241aef9097ef5257f9 +Author: reneeteng +Date: Thu May 30 10:19:10 2019 +0800 + + * Lang file update. + +commit d0fcd2d149e198c04fc6ddb3b4aaef179b66d968 +Merge: 1a83466094 760bddd948 +Author: Yagami <976204163@qq.com> +Date: Thu May 30 10:14:17 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1a83466094c088a5cc05712fb56d644ca5cbad88 +Author: Yagami <976204163@qq.com> +Date: Thu May 30 10:13:54 2019 +0800 + + * Finish task #5517. + +commit 760bddd94847573c5b610ccaf5f81f18f27a73ae +Merge: 36487eb12d 45c19a716a +Author: reneeteng +Date: Thu May 30 09:44:49 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 36487eb12de15c95046a6d84a2c41c4ebd3b65c6 +Author: reneeteng +Date: Thu May 30 09:43:19 2019 +0800 + + * Lang file update. + +commit 45c19a716a41eb45ade8fe2b37c3a72af97b51e6 +Author: Yagami <976204163@qq.com> +Date: Thu May 30 09:16:55 2019 +0800 + + * Finish task #5526. + +commit 5a0d9916328bed5f2d42ba8653ecb50c6b0c2874 +Merge: beb330f8e2 441135cdab +Author: Yagami <976204163@qq.com> +Date: Thu May 30 09:14:06 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit beb330f8e27ec24088325122a6e2a022ffb78887 +Author: Yagami <976204163@qq.com> +Date: Thu May 30 09:13:30 2019 +0800 + + * Finish task #5525. + +commit 441135cdabd2e9ddd3093bc875ecaf60d592241c +Merge: cc4d468c15 bbfe47008c +Author: reneeteng +Date: Thu May 30 07:58:29 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cc4d468c1598861fd3aa540dd15109ed110fe778 +Author: reneeteng +Date: Thu May 30 07:58:01 2019 +0800 + + * Lang file update. + +commit bbfe47008ceaf9e27ccbc09831c01f21e55ad498 +Merge: ee327afadb eaa6cc00d4 +Author: wangyidong +Date: Wed May 29 17:11:14 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ee327afadb9bb3825d6486087917bea55a89e65e +Author: wangyidong +Date: Wed May 29 17:10:47 2019 +0800 + + * adjust for profile page. + +commit eaa6cc00d48b014096c35d1dd7397a134a5bfe24 +Merge: 16a92b51cb 05b941d2fd +Author: reneeteng +Date: Wed May 29 17:08:34 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 16a92b51cbe36a7aa7c204983cc25559e2f72167 +Author: reneeteng +Date: Wed May 29 17:07:58 2019 +0800 + + * Lang file update. + +commit 05b941d2fdbc05c6458f528e3702d39d2d59884d +Author: Yagami <976204163@qq.com> +Date: Wed May 29 16:58:09 2019 +0800 + + * Fix doc style. + +commit e50a8af4f503ddefd35649773eb864feec9b126d +Author: Yagami <976204163@qq.com> +Date: Wed May 29 16:55:31 2019 +0800 + + * Add edit doc view style. + +commit 8d6a4415ef87d9ffd2095cc3181d5c87f5a42f92 +Merge: d7ccf46cfa 858d27525d +Author: Yagami <976204163@qq.com> +Date: Wed May 29 16:53:14 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d7ccf46cfae61511c0a4013b95f77ac17d430537 +Author: Yagami <976204163@qq.com> +Date: Wed May 29 16:52:56 2019 +0800 + + * Fix task table header width. + +commit 858d27525d19dcf4d8c50ef632370742bfd17955 +Merge: 6f6e714413 db14457799 +Author: wangyidong +Date: Wed May 29 16:22:04 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6f6e7144134cc3f34bb16c409784b04f0072d0aa +Author: wangyidong +Date: Wed May 29 16:21:23 2019 +0800 + + * finish task #5621. + +commit db14457799cd3e826342895d353e65b666198de7 +Author: Yagami <976204163@qq.com> +Date: Wed May 29 16:16:01 2019 +0800 + + * Finish task #5529. + +commit 8dec6b8bca6612ad1f1ca3d071b010a2de78f10b +Author: Yagami <976204163@qq.com> +Date: Wed May 29 16:01:28 2019 +0800 + + * Finish task #5527. + +commit 74c85776b938dc4d3cba3247e3d5ba767c7458ea +Author: Yagami <976204163@qq.com> +Date: Wed May 29 15:50:43 2019 +0800 + + * Finish task #5520. + +commit aa6ead33895eeb16b95ac4455b1854cdd56cf28d +Author: Yagami <976204163@qq.com> +Date: Wed May 29 15:19:17 2019 +0800 + + * Finish task #5516. + +commit 7b43c62e2ab39f58f33e1a448981cda73c76cdf1 +Merge: e2ddf9275d d38f319d4f +Author: Yagami <976204163@qq.com> +Date: Wed May 29 14:12:37 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e2ddf9275d0a1912dd8e4216a42237fe6a1a5bce +Author: Yagami <976204163@qq.com> +Date: Wed May 29 14:12:21 2019 +0800 + + * Finish task #5513. + +commit d38f319d4f1a5c773f4d4b61df20678fd35bb681 +Author: wangyidong +Date: Wed May 29 14:09:32 2019 +0800 + + * finish task #5575. + +commit 4c652cb2bf9fab85902b50fbc72b99fdfb5bae04 +Merge: 5e45f69d0b 1253acb39e +Author: reneeteng +Date: Wed May 29 14:05:50 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5e45f69d0b8d49f4d150fe22f7cd9cc5c072b835 +Author: reneeteng +Date: Wed May 29 14:05:23 2019 +0800 + + * Statuslist translation updated. + +commit 1253acb39ed733288a9663ef8af4f46ec10a130c +Author: Yagami <976204163@qq.com> +Date: Wed May 29 13:38:29 2019 +0800 + + * Finish task #5502. + +commit 705ff57fd70a4e62c9753dcab3f1799950f349bb +Author: Yagami <976204163@qq.com> +Date: Wed May 29 13:27:21 2019 +0800 + + * Finish task #5500. + +commit d0b6386ca7a5f1edc008fed18fb1e77308391cd7 +Merge: bd025b6bf3 8f0385a0c4 +Author: reneeteng +Date: Wed May 29 11:23:19 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bd025b6bf35a423a2e6feada9948ca9d0705d4f5 +Author: reneeteng +Date: Wed May 29 11:22:29 2019 +0800 + + * Lang file update. + +commit 8f0385a0c4bb29f130675df4386daf0181380a2b +Author: Yagami <976204163@qq.com> +Date: Wed May 29 11:09:49 2019 +0800 + + * Finish task #5496. + +commit dfc0bd6913613cf002c8f074ba9a22deb8efd66d +Author: Yagami <976204163@qq.com> +Date: Wed May 29 10:16:56 2019 +0800 + + * Finish task #5540. + +commit e60e1e3d9269454b343e14df3fefd9880f37c57d +Author: Yagami <976204163@qq.com> +Date: Wed May 29 10:03:47 2019 +0800 + + * Finish task #5541. + +commit 98c038aaaed79077ab70156528db3e7bccb6be2d +Merge: 7fd493a1c3 f5d2f4d030 +Author: Yagami <976204163@qq.com> +Date: Wed May 29 09:58:00 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7fd493a1c3eca5c294c768c3e20f38547174fe02 +Author: Yagami <976204163@qq.com> +Date: Wed May 29 09:55:05 2019 +0800 + + * Finish task #5546. + +commit f5d2f4d0303d61a233d9d1a46210299805b204b5 +Merge: ccb1aa75a3 e29b7d93d2 +Author: reneeteng +Date: Wed May 29 09:38:17 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ccb1aa75a3c0aaa11f8b44c01b2a2f59eeb3c88b +Author: reneeteng +Date: Wed May 29 09:37:52 2019 +0800 + + * Lang file update. + +commit e29b7d93d2d55bd7fa1cdd34f6ebceb97cdeb22e +Author: Yagami <976204163@qq.com> +Date: Wed May 29 09:01:02 2019 +0800 + + * Finish task #5547. + +commit 2ba14afddadbfe969a8bed236999df5183453b23 +Author: wangyidong +Date: Tue May 28 17:10:43 2019 +0800 + + * finish task #5616. + +commit 774df4494f3a3b33d90519d1f3e9a0fce0094b75 +Merge: 9aee87117c 3ee2c4048d +Author: reneeteng +Date: Tue May 28 17:09:53 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9aee87117cc1868c9218ec3f000fd7e06c7c40b8 +Author: reneeteng +Date: Tue May 28 17:09:27 2019 +0800 + + * Lang file. + +commit 3ee2c4048d3a94f1c8d6414ff6aa6064d7107fda +Merge: f0800c27a7 02290075dd +Author: wangyidong +Date: Tue May 28 16:41:06 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f0800c27a75511e34d4d3bea29680798af997849 +Author: wangyidong +Date: Tue May 28 16:40:44 2019 +0800 + + * finish task #5570,5571. + +commit 13e6d03e1e641e6aba8dc3eb40965f8e796194b1 +Author: wangyidong +Date: Tue May 28 16:40:12 2019 +0800 + + * add for fix featureBar. + +commit 02290075dd7007a112a8d7ef27b820ee16a3de4b +Author: Yagami <976204163@qq.com> +Date: Tue May 28 16:33:59 2019 +0800 + + * Finish task #5479. + +commit 2b8c9976c882a364bb2a65f10d9ff2bfc9bc18c1 +Merge: 0d85b8c62d b6f4b1b02f +Author: reneeteng +Date: Tue May 28 16:25:24 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1f9ed3ae903a741328273ae4264f15a59ee0e1bd +Author: Yagami <976204163@qq.com> +Date: Tue May 28 16:25:08 2019 +0800 + + * Finish task #5476. + +commit 0d85b8c62d8a42e317a82a1ffd9b90f35397bd1c +Author: reneeteng +Date: Tue May 28 16:25:04 2019 +0800 + + * Lang update. + +commit b6f4b1b02fc1f773cceff2eb61236f1c9ed70921 +Merge: cdaec1a613 d0da535125 +Author: Yagami <976204163@qq.com> +Date: Tue May 28 16:22:10 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cdaec1a6133307e9dca6cfe20cf487233fe8ca9e +Author: Yagami <976204163@qq.com> +Date: Tue May 28 16:21:50 2019 +0800 + + * Finish task #5475. + +commit d0da5351255da7282d4f0b0e759017155c4646fa +Merge: 38033b3f54 9a8396b94f +Author: wangyidong +Date: Tue May 28 16:00:28 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 38033b3f54182fbf8a0dff589d43d4ea21144830 +Author: wangyidong +Date: Tue May 28 15:59:58 2019 +0800 + + * finish task #5445. + +commit 9a8396b94f56822ad3c970dc7bd5d075b6cd1297 +Author: Yagami <976204163@qq.com> +Date: Tue May 28 15:56:25 2019 +0800 + + * Finish task #5470. + +commit 289eae85210b8af14d20d0a27d44de90daa567af +Author: Yagami <976204163@qq.com> +Date: Tue May 28 15:40:33 2019 +0800 + + * Finish task #5460. + +commit 1986ce272ece8c8ad5e35ce9d1992515d57766b0 +Author: wangyidong +Date: Tue May 28 14:21:01 2019 +0800 + + * finish task #5579. + +commit 8f069e202aa65e909d02a7da3adf7116656c1249 +Author: wangyidong +Date: Tue May 28 14:16:27 2019 +0800 + + * finish task #5580. + +commit 4ba742dd9517a442c5ecf6b2a523d3814abb04e7 +Author: wangyidong +Date: Tue May 28 14:00:19 2019 +0800 + + * finish task #5581. + +commit 4d4093e703724f48190b9e59aaa1764ee9f4cb6c +Author: wangyidong +Date: Tue May 28 13:44:32 2019 +0800 + + * finish task #5583. + +commit 539f5077eb60e88c735b74c7cfac649218ad2be4 +Author: wangyidong +Date: Tue May 28 13:41:20 2019 +0800 + + * finish task #5611. + +commit a45e4867255645c34e21d83f89082b9a4483aef7 +Author: reneeteng +Date: Tue May 28 13:13:17 2019 +0800 + + * Lang files update. + +commit d4a669511b384892e94dce1466b5ee2951f5cbbd +Merge: 8265162711 fe37489ac7 +Author: wangyidong +Date: Tue May 28 11:33:47 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8265162711fcd28f58d3ecea79209fb18d81e3ce +Author: wangyidong +Date: Tue May 28 11:32:35 2019 +0800 + + * finish task #5618. + +commit 9e281a9b1539e26ca1c85c354f58cd09ce3da80e +Author: wangyidong +Date: Tue May 28 11:20:57 2019 +0800 + + * finish task #5587. + +commit c83902cb926eef935e08cdf8f8bc3fe4de5cf6bf +Author: wangyidong +Date: Tue May 28 11:20:30 2019 +0800 + + * finish task #5585. + +commit fe37489ac7788412e271ae262b81bbd08f4720d0 +Merge: 97b3cc8c6f 9a29937259 +Author: Yagami <976204163@qq.com> +Date: Tue May 28 11:08:47 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 97b3cc8c6fbf663ecd7a8d7eac32503930a53cc8 +Author: Yagami <976204163@qq.com> +Date: Tue May 28 11:08:33 2019 +0800 + + * Finish task #5548. + +commit e611cf476dca9356644a4b9ef396b2677c597cbd +Author: reneeteng +Date: Tue May 28 11:08:00 2019 +0800 + + * Lang update. + +commit 9a29937259369a4f16dd1050d5ef69c0412b6c51 +Merge: 16931f4048 1c0dcf4cfa +Author: reneeteng +Date: Tue May 28 10:45:43 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 16931f404822b936855ae45564b6c736a3df3d6c +Author: reneeteng +Date: Tue May 28 10:45:12 2019 +0800 + + * Lang file update. + +commit 1c0dcf4cfac430104367bdbd1a78c8db888fd839 +Author: Yagami <976204163@qq.com> +Date: Tue May 28 10:21:32 2019 +0800 + + * Finish task #5549. + +commit 0b9cbd75bf4c4025943791e24b9cb6f2add4d927 +Author: Yagami <976204163@qq.com> +Date: Tue May 28 10:18:46 2019 +0800 + + * Finish task #5554. + +commit b8a0e7494f41490f423b80c0c10e033cac46afb4 +Author: Yagami <976204163@qq.com> +Date: Tue May 28 10:03:39 2019 +0800 + + * Finish task #5557. + +commit 94a17592c8dce329bbdefa1a808e4b8808afa2b6 +Merge: 96bda94f57 5aa8b55e66 +Author: Yagami <976204163@qq.com> +Date: Tue May 28 10:00:18 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 96bda94f57a4a431c59a51df1abfb1a6200899c9 +Author: Yagami <976204163@qq.com> +Date: Tue May 28 09:59:47 2019 +0800 + + * Finish task #5557. + +commit 5aa8b55e6689fa3dc3c95255501ac039b60f9203 +Merge: 672a73dfad f0f52d3bc6 +Author: wangyidong +Date: Tue May 28 09:52:40 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 672a73dfad04e9add4159f9dc4ca8a5ec27ccdfd +Author: wangyidong +Date: Tue May 28 09:52:24 2019 +0800 + + * finish task #5611. + +commit f0f52d3bc632f2a78d3de75a4cd192a0e7526f49 +Author: Yagami <976204163@qq.com> +Date: Tue May 28 09:21:23 2019 +0800 + + * Finish task #5558. + +commit e8a1ee93f3af937855c6448b9d6588e4ac21a218 +Author: Yagami <976204163@qq.com> +Date: Tue May 28 09:08:28 2019 +0800 + + * Finish task #5560. + +commit 09245b6f2f33024ed2a86b54b40cbe9357de2f63 +Author: Yagami <976204163@qq.com> +Date: Tue May 28 08:59:09 2019 +0800 + + * Fix productstatisticblock width. + +commit 95222fa49b13d319f023d21210cc49974325a784 +Merge: f5f8e0df06 ad457bdb2b +Author: reneeteng +Date: Mon May 27 17:02:52 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f5f8e0df062fa365c081da724b7fbc1402df1b6f +Author: reneeteng +Date: Mon May 27 17:01:57 2019 +0800 + + * Lang file update. + +commit ad457bdb2b289405473519b261b265e107bb1d6b +Author: Yagami <976204163@qq.com> +Date: Mon May 27 16:47:30 2019 +0800 + + * Fix detail. + +commit 1607193c434830a3bf91cf6e350b88b8a3129150 +Author: Yagami <976204163@qq.com> +Date: Mon May 27 16:42:44 2019 +0800 + + * Code for dayup. + +commit 57591a17ed5579b0039c7db29b567001b60d3817 +Merge: 723394fd3b 6872573a7e +Author: Yagami <976204163@qq.com> +Date: Mon May 27 15:17:16 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 723394fd3b9ab5e7c5d9862a3db69029c879432f +Author: Yagami <976204163@qq.com> +Date: Mon May 27 15:17:03 2019 +0800 + + * Finish task #5458. + +commit 6872573a7e950c9fe030d3581142baa1154a8923 +Author: wangyidong +Date: Mon May 27 14:57:54 2019 +0800 + + * finish task #5588. + +commit 2538f2d786d0b5700344fa39a4927a4ea2cacc47 +Author: wangyidong +Date: Mon May 27 14:47:01 2019 +0800 + + * finish task #5593. + +commit ba70ee73f7cb2dcb50e476b124f843b2b65bddd1 +Merge: 14b41f4373 111d8d9afc +Author: wangyidong +Date: Mon May 27 14:45:40 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 14b41f4373f6fbb90830741613806e7b39cbd821 +Author: wangyidong +Date: Mon May 27 14:45:20 2019 +0800 + + * finish task #5594. + +commit 111d8d9afca0aeb17f0f4094a2ff0e314deebf92 +Merge: 05289b06c9 663c975538 +Author: Yagami <976204163@qq.com> +Date: Mon May 27 14:35:46 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 05289b06c96f5a606559e33c6f5809b385540760 +Author: Yagami <976204163@qq.com> +Date: Mon May 27 14:35:31 2019 +0800 + + * Finish task #5454. + +commit 663c975538638672652799390c39d004a0476fa9 +Author: wangyidong +Date: Mon May 27 14:17:36 2019 +0800 + + * finish task #5603. + +commit 7679a9d7f3d972920626e2ef32b1fac5ba1685a7 +Author: wangyidong +Date: Mon May 27 14:14:17 2019 +0800 + + * finish task #5604. + +commit 3c61de8e74472f0df5b30f5eedbab2a5fb15cc28 +Author: wangyidong +Date: Mon May 27 14:12:15 2019 +0800 + + * finish task #5605. + +commit b948ee4cb66c38df44f1e6e1490a7a66f490f033 +Merge: 8f36146059 9cf8241de6 +Author: Yagami <976204163@qq.com> +Date: Mon May 27 14:06:15 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8f36146059d69422e2969514137e3d54c8667414 +Author: Yagami <976204163@qq.com> +Date: Mon May 27 14:05:43 2019 +0800 + + * Finish task #5448. + +commit 9cf8241de602358e71bc7bbbe042147b0699cfcd +Author: wangyidong +Date: Mon May 27 14:01:09 2019 +0800 + + * finish task #5615. + +commit 6a970871becb864ec5f06ef042cdee0b89bbe944 +Merge: faf0003840 c724ee8fac +Author: wangyidong +Date: Fri May 24 14:22:34 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit faf00038408a11daa706d12241e9089b3ab17236 +Author: wangyidong +Date: Fri May 24 14:22:04 2019 +0800 + + * fix bug #2570. + +commit c724ee8fac5a0535f10a293e4f582c4454615b23 +Author: reneeteng +Date: Fri May 24 10:04:23 2019 +0800 + + * Lang file update. + +commit 2eadd680d7eb84cc4d83663b4a83a2cd0bc874fc +Merge: 819778ee27 787172c3b8 +Author: reneeteng +Date: Thu May 23 09:38:37 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 819778ee274159b7b4006cf1f66f8e1035c0bf03 +Author: reneeteng +Date: Thu May 23 09:37:22 2019 +0800 + + * Calendar lang file update. + +commit 787172c3b8aa1b9cbc2be0c8fdee9148b27176c7 +Author: Yagami <976204163@qq.com> +Date: Wed May 22 14:14:18 2019 +0800 + + * Fix en lang file. + +commit 5d360e97bf83fa0b73b2e08922818cd3e4d37b37 +Merge: 3bdd40ece0 594501f676 +Author: wangyidong +Date: Tue May 21 13:30:40 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3bdd40ece0437d8ce555b786bb8e918ad3843746 +Author: wangyidong +Date: Tue May 21 13:28:11 2019 +0800 + + * adjust for plan desc in browse. + +commit 594501f67690c2b4c397983073a863862e4881ca +Author: reneeteng +Date: Tue May 21 10:37:04 2019 +0800 + + * Lang update. + +commit fd632d5389483d3acef8daa5667cbae964f5915b +Author: reneeteng +Date: Mon May 20 15:10:34 2019 +0800 + + * Lang update. + +commit c94b2f94cda6c009d545c1802c51bbb9650475be +Author: reneeteng +Date: Fri May 17 15:51:31 2019 +0800 + + * Lang updated. + +commit cd352a105b429ace161cc017b9652205b132dc2d +Merge: 340636b0b3 27b5991f94 +Author: reneeteng +Date: Fri May 17 14:45:13 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 340636b0b3220ae976174385e9d6f856743be3ba +Author: reneeteng +Date: Fri May 17 14:44:40 2019 +0800 + + * Lang change. + +commit 27b5991f94d3740a2afbd3166ff003b38d3e4ca7 +Author: wangyidong +Date: Fri May 17 09:33:00 2019 +0800 + + * fix bug. + +commit 027c72c80aaeebb9ef77711cf8335c2494e25a75 +Author: reneeteng +Date: Thu May 16 13:23:18 2019 +0800 + + * Lang update. + +commit 69797316cff452ce04d1da8087bbbb82d39d5ced +Author: reneeteng +Date: Wed May 15 16:10:32 2019 +0800 + + * Lang file is updated. + +commit 500d35753e7ee87e181a3087ae66ccd0b7a77a29 +Merge: c4c756e0de 2f795511ac +Author: reneeteng +Date: Wed May 15 14:49:24 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c4c756e0dec1c1e0fc709d6d0a5680de63152617 +Author: reneeteng +Date: Wed May 15 14:48:59 2019 +0800 + + * Update lang file. + +commit 2f795511ac58688a7456b394f5b2f1e83d8335a2 +Merge: 2c1931e508 be2e7dcf47 +Author: Catouse +Date: Wed May 15 11:50:33 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2c1931e5088f9c73543e940edb807d5d2b93c51b +Author: Catouse +Date: Wed May 15 11:50:27 2019 +0800 + + * fix tableChart error when row value less than 1. + +commit be2e7dcf479046876b7ab7632f2cf4f4b8714410 +Author: reneeteng +Date: Tue May 14 14:19:50 2019 +0800 + + * Lang update. + +commit ecfb7578a36fe8c1cc6654c3f0a591e3b6634905 +Author: reneeteng +Date: Tue May 14 14:13:47 2019 +0800 + + * Lang file update. + +commit a6c2eb6d67b9a102f3b623ac0166441d812c841b +Author: reneeteng +Date: Tue May 14 13:43:59 2019 +0800 + + * Lang update. + +commit d4b7114d0b0ac672f30bc36a8ff2583576d504dc +Author: reneeteng +Date: Tue May 14 11:24:41 2019 +0800 + + * Lang update. + +commit a79faea9a1f860bdd261a0adbd0a13ea0803abcc +Author: reneeteng +Date: Mon May 13 17:00:47 2019 +0800 + + * Update lang. + +commit c213d45dff45c6a132263c8f36d21d48da9763c0 +Author: reneeteng +Date: Mon May 13 16:12:59 2019 +0800 + + * Lang update. + +commit 5ddc98d8d72c3f27240492603ebd39e0d8c94931 +Author: reneeteng +Date: Mon May 13 14:55:18 2019 +0800 + + * Lang update. + +commit 8a94d3781c9d2570a7c40a015767b3fe16f64eb3 +Author: reneeteng +Date: Mon May 13 14:14:46 2019 +0800 + + * Lang update. + +commit 2e6e00a61fb6b74a1017b6aa3f68ad9c01d9c7ea +Author: reneeteng +Date: Mon May 13 13:19:55 2019 +0800 + + * Lang update. + +commit 130209edaa8c5960563596ed93b6872311bb6378 +Author: reneeteng +Date: Mon May 13 11:19:37 2019 +0800 + + * Lang change. + +commit ad6bdc17d7151410203d3926fccdc45dac35ea8a +Author: reneeteng +Date: Mon May 13 09:32:26 2019 +0800 + + * Lang update. + +commit 7b58ee0721a83224b151f708f7515e800342c1ce +Merge: 9d7cafc47d 70c43a7c2d +Author: reneeteng +Date: Fri May 10 16:56:11 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9d7cafc47d8090926e46f2665749cde1ab0b36d5 +Author: reneeteng +Date: Fri May 10 16:55:21 2019 +0800 + + * Lang update. + +commit 70c43a7c2ddcfd875612559f2ed277dd6de0c6e8 +Author: wangyidong +Date: Fri May 10 16:04:11 2019 +0800 + + * adjust for convert url. + +commit a83f3ca95eedd02400303e7f47bc7506c3055089 +Author: wangyidong +Date: Fri May 10 12:26:26 2019 +0800 + + * fix for upgrade. + +commit 60dc40cdba8b14879b1cdb499a15081d804b83cd +Author: wangyidong +Date: Thu May 9 17:02:18 2019 +0800 + + * adjust for upgrade. + +commit a8850305589979ef564452494bdd5fb300a9221d +Author: wangyidong +Date: Thu May 9 11:53:36 2019 +0800 + + * adjust for xuanxuan menu. + +commit 7ceebbb2ab953702f88cbc4fbbc1303e9b125002 +Author: reneeteng +Date: Thu May 9 10:23:15 2019 +0800 + + * Xuan file update. + +commit 81bd7174af076a876412166358785144525ed7d0 +Author: wangyidong +Date: Thu May 9 09:11:51 2019 +0800 + + * adjust for style. + +commit 2bcaaf792996d44efcb63c8acaaba16d7ebbc04d +Author: wangyidong +Date: Wed May 8 18:10:09 2019 +0800 + + * adjust for build en rpm. + +commit fe5866bea043cb5f4829e6c86faa3af7e797003c (tag: zentaopms_11.5.stable_20190508) +Author: wangyidong +Date: Wed May 8 16:09:29 2019 +0800 + + + add new version and upgrade. + +commit f8bf7715621fb6cefae106de3fa14ba382bc717b +Author: wangyidong +Date: Wed May 8 14:32:33 2019 +0800 + + * adjust for xuanxuan. + +commit 610a19d880754d59f42646470d9075dc831318db +Merge: 5bebd42783 9205c7d685 +Author: wangyidong +Date: Wed May 8 13:27:02 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5bebd42783a7a876b2f8b388f90afe39f5162b3f +Author: wangyidong +Date: Wed May 8 13:26:25 2019 +0800 + + * add for xuanxuan priv. + +commit 9205c7d685489ad6145a63f77350ee8442e7cd8e +Author: yfl <554665488@qq.com> +Date: Wed May 8 13:02:47 2019 +0800 + + *Modify action lang + +commit 821cfb2b4be66a7756b48ef5643281b83d4eca39 +Author: wangyidong +Date: Wed May 8 12:00:49 2019 +0800 + + * add xxb index. + +commit 8203570b891baeaa4f590c0bde16af022788116a +Author: Yagami <976204163@qq.com> +Date: Wed May 8 10:38:35 2019 +0800 + + * Change save zentaoclient dir. + +commit f2b2e99e6c13087312b53c50f4c65f5edd749cc2 +Merge: 478c9dd1f5 f35eefa307 +Author: yfl <554665488@qq.com> +Date: Wed May 8 10:09:30 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 478c9dd1f5ff2dcd5f2a8d1ac1d9c4be9dac7ba9 +Author: yfl <554665488@qq.com> +Date: Wed May 8 10:08:44 2019 +0800 + + * Modify action lang + +commit f35eefa30781d681b5ff892428d27ea6e1eb0ace +Merge: f8d42efeec 920855f5df +Author: Yagami <976204163@qq.com> +Date: Wed May 8 09:57:51 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f8d42efeecbc5ceec3bc5e3b0e09ddc613c8ee23 +Author: Yagami <976204163@qq.com> +Date: Wed May 8 09:57:15 2019 +0800 + + * Fix admin menu order. + +commit 920855f5df6f41f86bd33f400963bab423b9b807 +Author: wangyidong +Date: Wed May 8 09:02:09 2019 +0800 + + * adjust for manage actions. + +commit bd1e152306f30050ca3b9e9e35d796fd3512a0c9 +Merge: 9a846c0a93 093a1ab171 +Author: yfl <554665488@qq.com> +Date: Tue May 7 19:05:54 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9a846c0a93f61673db165d168807f00a4cfcb619 +Author: yfl <554665488@qq.com> +Date: Tue May 7 19:04:48 2019 +0800 + + * Modify lang + +commit 093a1ab171ba2b1e2c85760c56c29d1f94723c84 +Merge: 861115d3b7 38c6241b12 +Author: wangyidong +Date: Tue May 7 17:13:18 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 861115d3b78bb69de7d3558df23786284b6079a4 +Author: wangyidong +Date: Tue May 7 17:09:35 2019 +0800 + + * adjust for all checker. + +commit 38c6241b122c66fcfd05c178352a4b41354215d0 +Author: yfl <554665488@qq.com> +Date: Tue May 7 16:57:13 2019 +0800 + + * Modify action lang + +commit b770ef4ebfce64f96e593ea8da41793a7a481f0d +Author: yfl <554665488@qq.com> +Date: Tue May 7 16:43:46 2019 +0800 + + * Modify action module lang + +commit fba2b6ce8fe7aa480644180ee596356d235bc6e4 +Author: yfl <554665488@qq.com> +Date: Tue May 7 16:38:32 2019 +0800 + + *Action lang + +commit ae0e35b2a184d1b10902119b06b9d122b9bfa526 +Merge: ec413172c9 d20b485935 +Author: reneeteng +Date: Tue May 7 15:28:31 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d20b4859353f25eb0d8f37477a2936ef16ec8c8f +Merge: db00e46eb5 a5de92262e +Author: wangyidong +Date: Tue May 7 15:27:55 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ec413172c9e4d9739579abbe84dace0aee64a636 +Author: reneeteng +Date: Tue May 7 15:27:38 2019 +0800 + + * Lang file update. + +commit db00e46eb508cf295f995fa47d4d4258d8f9b550 +Author: wangyidong +Date: Tue May 7 15:27:24 2019 +0800 + + * adjust for merge xuanxuan. + +commit a5de92262e7813409ef60d0877c14fa47d693b4f +Author: yfl <554665488@qq.com> +Date: Tue May 7 15:25:38 2019 +0800 + + * dynamic search filter by action where + +commit 07e7b725fb6b7b51ea9a9a70fdcde6b31b13733a +Merge: e84d11b603 05d169eead +Author: yfl <554665488@qq.com> +Date: Tue May 7 15:24:09 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 05d169eeadfc89679aa50667d5f7958c768178f1 +Author: reneeteng +Date: Tue May 7 15:20:07 2019 +0800 + + * Lang changed for new realease. + +commit e84d11b603d16829d187fb434c2aff7e01142973 +Author: yfl <554665488@qq.com> +Date: Tue May 7 14:50:29 2019 +0800 + + * add action lang + +commit b0f8172d4617c8cd1ff7aea8ea806d82ed154eb6 +Author: wangyidong +Date: Tue May 7 14:08:56 2019 +0800 + + * adjust for key width. + +commit 5a6a91b21b0a41f77332efa9254fdca1f4caccb0 +Author: wangyidong +Date: Tue May 7 13:43:15 2019 +0800 + + * adjust for action lang. + +commit 134f2fb68c77a424c5ad763101ceb6a01d71d2e6 +Merge: 7fdfe38de1 4f485c6dfb +Author: wangyidong +Date: Tue May 7 13:36:05 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7fdfe38de1b6b12de6c959426e7aea6dffe493f9 +Author: wangyidong +Date: Tue May 7 13:35:48 2019 +0800 + + * add for en lang. + +commit 4f485c6dfb02cb36f7932351e51d71e793602458 +Author: yfl <554665488@qq.com> +Date: Tue May 7 11:25:03 2019 +0800 + + * Fix bug dynation + +commit 9312d9edd62bfade162975b751c215cf7dbc5b98 +Author: yfl <554665488@qq.com> +Date: Tue May 7 11:03:53 2019 +0800 + + * Fix bug of dynamic action + +commit e2fd154aca005d30675da427b312f31098eeb9b7 +Merge: 7cf950a2eb e144fe8e37 +Author: wangyidong +Date: Tue May 7 10:49:36 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7cf950a2eb96303f5bd1808e2a2dc5fcf5c9bde7 +Author: wangyidong +Date: Tue May 7 10:49:03 2019 +0800 + + * hide update xuanxuan. + +commit e144fe8e37a06ea0e4c00157d36a75c4ef6f8ef4 +Author: yfl <554665488@qq.com> +Date: Tue May 7 08:50:34 2019 +0800 + + * Fix bug of dynamic + +commit 58701fb54a982057ef736a661fd253acac1f9308 +Author: wangyidong +Date: Tue May 7 08:50:25 2019 +0800 + + * adjust for update last edit time. + +commit 4baf52bb81c37ecacea0e6e63ec9c3867920153f +Author: wangyidong +Date: Mon May 6 18:25:35 2019 +0800 + + * adjust for merge xuanxuan. + +commit 4a2f7199bbeae9eb1195a0c1151ece0d7e442a07 +Merge: 6db8a4e7b2 583a194eda +Author: yfl <554665488@qq.com> +Date: Mon May 6 16:34:18 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6db8a4e7b24f9bc6a7b0da4511fedb7e980ebcb2 +Merge: 9e3477100a e29bb78fd3 +Author: yfl <554665488@qq.com> +Date: Mon May 6 16:33:10 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + * Task #5423 + +commit 583a194edae294e9e292f23b86deabe4d5211495 +Author: wangyidong +Date: Mon May 6 13:45:31 2019 +0800 + + * merge xuanxuan. + +commit d9ed289e5ad488d99a9e2b79e709e2632fe95c2c +Merge: df42c87ac2 f4c923b9dc +Author: wangyidong +Date: Mon May 6 13:06:06 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f4c923b9dce521a0de28ea8ff62795b5f7a46b98 +Merge: 50023bec34 5c1574b844 +Author: Yagami <976204163@qq.com> +Date: Mon May 6 13:05:19 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit df42c87ac2006126e110b3da16a76cf7ed484521 +Author: wangyidong +Date: Mon May 6 13:04:54 2019 +0800 + + * adjust for merge xuanxuan. + +commit 50023bec34f5976b7a8beb8dacc373439d4ad750 +Author: Yagami <976204163@qq.com> +Date: Mon May 6 13:04:47 2019 +0800 + + * Fix export parent task bug. + +commit 5c1574b84495bcfdbe1d95f1f52948cc1394f518 +Author: wangyidong +Date: Mon May 6 10:24:28 2019 +0800 + + * change db and finish task #5431. + +commit 9e3477100aab1a0b95c5618d78b8a0038d1fad5e +Author: yfl <554665488@qq.com> +Date: Mon May 6 09:14:32 2019 +0800 + + * Task #5423 + +commit e4952b3eb20feff2360bc51ea9656e88cbd2cf21 +Author: yfl <554665488@qq.com> +Date: Sun May 5 18:40:51 2019 +0800 + + * Task #5423 + +commit e29bb78fd3938f9204579d49c7f4ffd9080931d3 +Merge: 0936df0edc 0208e8a975 +Author: wangyidong +Date: Sun May 5 17:53:25 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0936df0edc852beff107aef035378ea7799e08b4 +Author: wangyidong +Date: Sun May 5 17:52:54 2019 +0800 + + * adjust for change parent status. + +commit 0208e8a975498353c6ef74189f8bf0d2b5c3e968 +Author: reneeteng +Date: Sun May 5 16:42:11 2019 +0800 + + * Lang changed. + +commit 1615686c56533ffa64e2e0fa1035cded90e3a46c +Merge: 140984502c cb5a219b31 +Author: wangyidong +Date: Sun May 5 16:41:12 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 140984502c74d6c5a341f6a7c33047ad9fdff712 +Author: wangyidong +Date: Sun May 5 16:40:22 2019 +0800 + + * code for task #5428,5379. + +commit cb5a219b31022aa8024fa2706490446330875ec0 +Merge: 17cefd3177 b860286d04 +Author: reneeteng +Date: Sun May 5 15:36:19 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 17cefd317703ef98292278d772401efd3358cfce +Author: reneeteng +Date: Sun May 5 15:19:37 2019 +0800 + + * Lang changed. + +commit 3d45499974c39da59da2be5c3b8d17ee79db63eb +Merge: 4f1223ca73 b860286d04 +Author: wangyidong +Date: Sun May 5 10:54:49 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4f1223ca73e2523982ae0ba86e1d9ab11182f352 +Author: wangyidong +Date: Sun May 5 10:54:13 2019 +0800 + + * adjust for printAction and fix error. + +commit b860286d0467eba743e9ba6887750e84c5746cb8 +Merge: 94aa0ca8a6 195b8e742a +Author: yfl <554665488@qq.com> +Date: Sun May 5 08:40:25 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 94aa0ca8a6369c797c34ec9ead1f04cd4a110e94 +Author: yfl <554665488@qq.com> +Date: Sun May 5 08:38:23 2019 +0800 + + * Finish task #5443,#5442,#5441 + +commit 195b8e742a803298a62bce0cda4c09fda10681e0 +Merge: df4580208e 7d0494051b +Author: Yagami <976204163@qq.com> +Date: Tue Apr 30 14:41:04 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit df4580208e2030d42106227f2bdb115e44a9460e +Author: Yagami <976204163@qq.com> +Date: Tue Apr 30 14:40:40 2019 +0800 + + * Fix export sql bug. + +commit 7d0494051b0cb9bb9ecf329929f84a6224c8aa00 +Author: wangyidong +Date: Tue Apr 30 14:13:58 2019 +0800 + + - delete useless file. + +commit 139021e03766cc91dba7a928b214285a89af5c21 +Author: wangyidong +Date: Tue Apr 30 14:13:03 2019 +0800 + + * finish task #5424. + +commit 05b35c73919b27a5d445a685ba19aa8b57a6c854 +Merge: 1dfd857601 ce437c6de6 +Author: wangyidong +Date: Tue Apr 30 10:54:05 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1dfd85760184ffa90359f1b1dff49dc8d42fc4b9 +Author: wangyidong +Date: Tue Apr 30 10:53:38 2019 +0800 + + * finish task #5435. + +commit ce437c6de6e87cc8809b4dc31ab4197c4a278a1a +Author: Yagami <976204163@qq.com> +Date: Tue Apr 30 09:07:53 2019 +0800 + + * Fix create todo locate. + +commit 83ef9700c4da789c406d59cf0f4decb1662b4152 +Author: wangyidong +Date: Mon Apr 29 16:42:22 2019 +0800 + + * finish task #5433. + +commit 3463d4bff9d78588ae4cbf02d8c0111b40935d4d +Author: wangyidong +Date: Mon Apr 29 16:15:10 2019 +0800 + + * finish task #5432. + +commit 14cde536ecc62e2c6acd0b821346e8a2c562b7c6 +Author: wangyidong +Date: Mon Apr 29 16:11:27 2019 +0800 + + * code for task #5434. + +commit 7de6eba7723d320501c0665fe5dd88c0ce8d4ec0 +Author: wangyidong +Date: Mon Apr 29 16:04:48 2019 +0800 + + * finish task #5436. + +commit ea8394ad1050a43d254fcebc8ff53a5729754ef8 +Author: wangyidong +Date: Mon Apr 29 15:54:02 2019 +0800 + + * finish task #5437. + +commit f08d1deb400d9439b32e93cafa9bf00bb9a40959 +Author: wangyidong +Date: Mon Apr 29 15:44:17 2019 +0800 + + * finish task #5441. + +commit 5c90c57f46c6cb41cbacbd3052dc15c6ddf22d3d +Author: wangyidong +Date: Mon Apr 29 15:36:17 2019 +0800 + + * adjust code. + +commit 060559f1aed386c25f588d3f453b98c729bdf357 +Author: wangyidong +Date: Mon Apr 29 15:35:04 2019 +0800 + + * finish task #5439. + +commit 0bedfad8a5100d1753c264fa7a4ddcb7365a141e +Author: wangyidong +Date: Mon Apr 29 12:03:17 2019 +0800 + + * fix for en lang. + +commit 1d1f43d2cde074ab01e40d710c3864a9a5293700 +Author: wangyidong +Date: Mon Apr 29 09:03:04 2019 +0800 + + * change for task #5384. + +commit 77346a6d664b4b20749c65a3bc7eb0b0e7e4f2a1 +Merge: 726a412270 b61f20d071 +Author: wangyidong +Date: Mon Apr 29 08:57:30 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 726a412270ab642337f123e95183dee7afe5de6a +Author: wangyidong +Date: Mon Apr 29 08:57:00 2019 +0800 + + * code for task #5384. + +commit 8c78ea161298a65cc48885936be31b44eecce341 +Author: wangyidong +Date: Mon Apr 29 08:52:08 2019 +0800 + + * adjust for task #5387. + +commit b61f20d071f15d4ab3b02e80271e9b63caa96e0a +Author: yfl <554665488@qq.com> +Date: Mon Apr 29 08:43:54 2019 +0800 + + * Modify batchCreate task link + +commit 052ef61fe64bcf3fdff7e5e16f44d0f17c06a873 +Author: yfl <554665488@qq.com> +Date: Mon Apr 29 08:39:53 2019 +0800 + + * Fix task #5380 + +commit 526e5298b48c857b24ea468d118f2ecd371c7b6c +Author: yfl <554665488@qq.com> +Date: Sun Apr 28 17:44:49 2019 +0800 + + * Finish task #5380 + +commit 3da462675abc79a349ff8cc4a542e6e2b9f91057 +Merge: a7e7e81b32 6afe04a2b2 +Author: wangyidong +Date: Sun Apr 28 17:16:06 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a7e7e81b3234a799932e4fe225811ee9c6c8eb4c +Author: wangyidong +Date: Sun Apr 28 09:47:05 2019 +0800 + + * adjust for merge xuanxuan. + +commit 6afe04a2b2af741939ff9518337463aa0eb6ea38 +Merge: 602a7af067 240c241282 +Author: yfl <554665488@qq.com> +Date: Sun Apr 28 08:47:36 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 240c2412822d238e3761e424231e87a8b32fb629 +Author: wangyidong +Date: Fri Apr 26 17:58:15 2019 +0800 + + * move sendDownHeader method to model. + +commit 9bc0c3d7f26b545130cd1d63f0a8961904688a47 +Merge: ab3da55671 92fecca3c6 +Author: wangyidong +Date: Fri Apr 26 17:54:19 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ab3da55671d8dfeeecfb8472a6e1c7d8bd1c19a1 +Author: wangyidong +Date: Fri Apr 26 17:43:55 2019 +0800 + + * fix bug. + +commit 602a7af067ba64e3dd78c78965373f7735365e29 +Author: yfl <554665488@qq.com> +Date: Fri Apr 26 15:52:03 2019 +0800 + + * Finish task #5399 + +commit 43ffe4b49f74e36ce7055ae878b474c5624c0e00 +Author: yfl <554665488@qq.com> +Date: Fri Apr 26 15:25:22 2019 +0800 + + * Finish task #5401 + +commit 92fecca3c6d1bd9b6ad2e9badbba9a291b50ef38 +Merge: b47d53fee6 bd90f185d8 +Author: yfl <554665488@qq.com> +Date: Fri Apr 26 15:08:00 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b47d53fee63114b4f67cd2f7b600ecbdb8ba4266 +Author: yfl <554665488@qq.com> +Date: Fri Apr 26 15:00:16 2019 +0800 + + * Finish Task #5379,#5398 + +commit bd90f185d85efac5ecdd43a36ed3d239bdef1c1a +Author: wangyidong +Date: Fri Apr 26 14:59:07 2019 +0800 + + * fix bug for doc crumb title. + +commit c5920e112a7b92fed9c33d64a53ba2b9ea47b713 +Author: wangyidong +Date: Fri Apr 26 14:58:30 2019 +0800 + + * finish task #5404. + +commit dff082a3e717c95f3f2c801d266e600c99c66d84 +Author: wangyidong +Date: Fri Apr 26 14:17:48 2019 +0800 + + * code for task #5392. + +commit e825abcc977401fb8b8a5bf3a01c1f7cd2b2426f +Author: wangyidong +Date: Fri Apr 26 13:59:45 2019 +0800 + + * finish task #5410. + +commit a76aa3d43e26491b06467b60b923df1918d877d9 +Merge: 917e54d4df 33cd15e960 +Author: reneeteng +Date: Fri Apr 26 09:49:41 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 917e54d4df63692d3350819cfc139a8b807d1e36 +Author: reneeteng +Date: Fri Apr 26 09:48:57 2019 +0800 + + * U-W lang changed. + +commit fdc4d29d3c834d142e51d4b0c283f4e3134f5d0e +Author: yfl <554665488@qq.com> +Date: Fri Apr 26 09:40:57 2019 +0800 + + * Finish Task #5405 + +commit 33cd15e960c857eb2fe6d0b483f54da050bd8cdc (tag: zentaopms_11.4.2_20190426) +Author: wangyidong +Date: Fri Apr 26 09:32:48 2019 +0800 + + * change for en lang and zh-tw lang. + +commit 94e5db67899e7662a5239aed902e0e336a46be2f +Author: wangyidong +Date: Fri Apr 26 09:07:07 2019 +0800 + + * upgrade for xuanxuan. + +commit 36a5af36d87ce90c6f969b2be944ac50d3917ffe +Merge: 81ea311f66 c8e9c0dc20 +Author: wangyidong +Date: Thu Apr 25 17:10:49 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 81ea311f661da1b3598f6129ab79121be46c97d5 +Author: wangyidong +Date: Thu Apr 25 17:10:15 2019 +0800 + + * code for task #5381. + +commit c8e9c0dc20d7fb66d2b1c9d1d342520fd7604035 +Author: reneeteng +Date: Thu Apr 25 16:56:22 2019 +0800 + + * R-T lang files changed. + +commit 969986590601d5df845907ca9b0601b48a0c6292 +Merge: d5a11709c4 e44484c7b4 +Author: reneeteng +Date: Thu Apr 25 10:59:34 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d5a11709c4d347bf8d08786162718046aee8c8f2 +Author: reneeteng +Date: Thu Apr 25 10:54:41 2019 +0800 + + * Q-S file lang changed. + +commit e44484c7b44d48b3b192431abb84e0bfc72a3b94 +Merge: 75ebcb18dc 76c8a2d56b +Author: wangyidong +Date: Thu Apr 25 09:11:22 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 75ebcb18dc7b188afad263eddc57d7de673f1903 +Author: wangyidong +Date: Thu Apr 25 09:10:42 2019 +0800 + + * code for task #5387. + +commit 1daead8b6c93ad7d30a72f5f792d992e941ee43b +Author: wangyidong +Date: Thu Apr 25 08:20:49 2019 +0800 + + * code for task #5388. + +commit 76c8a2d56bbb146b7a25619fa372c3a07655f8d7 +Author: yfl <554665488@qq.com> +Date: Wed Apr 24 17:29:44 2019 +0800 + + * Finish Task #5396 + +commit 1c67650da62220fbc07e3f0a709d478ab9d37816 +Merge: d35eb8dfaf afb83acbb1 +Author: yfl <554665488@qq.com> +Date: Wed Apr 24 16:02:01 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d35eb8dfafeaef4787a857f544362b5fa3d51236 +Author: yfl <554665488@qq.com> +Date: Wed Apr 24 15:59:56 2019 +0800 + + * Finsish task #5379,#5385,#5389,#5393,#5403,5409 + +commit afb83acbb184412abe3be99c1f8548844a3da954 +Author: wangyidong +Date: Wed Apr 24 14:41:32 2019 +0800 + + * adjust for lang. + +commit 4a6ec0367231e2a270bacd71c4b44b289482a48b +Merge: bd29dcdf7d 49a0969c0e +Author: wangyidong +Date: Wed Apr 24 13:32:07 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bd29dcdf7d4204ab37b1a101da3bd4850a72ff58 +Author: wangyidong +Date: Wed Apr 24 13:30:42 2019 +0800 + + * finish task #5390. + +commit 49a0969c0ec367c06122fbce5a05f30069220207 +Author: reneeteng +Date: Wed Apr 24 11:17:17 2019 +0800 + + * M-P lang file updates. + +commit 0a944337b49c74692036e5a18dc61618592ce99f +Merge: 7d759bbc1d 1432c13d18 +Author: reneeteng +Date: Tue Apr 23 16:40:44 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7d759bbc1dac60d1a70b5fdba99514ad996693e8 +Author: reneeteng +Date: Tue Apr 23 16:40:15 2019 +0800 + + * Lang updated. * Lang updated. * Lang updated. * Lang updated. * Lang updated. * Lang updated. * Lang updated. * Lang updated. + +commit 1432c13d18135ec02930ade477183640aff6b645 +Author: Yagami <976204163@qq.com> +Date: Tue Apr 23 16:24:49 2019 +0800 + + * Fix lang file error. + +commit ca08c6879d80f68e2cc307f1ead83e8ca989ee6d +Merge: 5def55e016 e5ff8615cb +Author: Yagami <976204163@qq.com> +Date: Tue Apr 23 16:24:02 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e5ff8615cb569545816becd902b57f9aaeef87db +Merge: 4988a7450e b865fe4c37 +Author: reneeteng +Date: Tue Apr 23 16:21:02 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4988a7450ede273603f853cd97723d24bfb80b7e +Author: reneeteng +Date: Tue Apr 23 16:20:29 2019 +0800 + + * Solved lang file conflicts. + +commit b865fe4c37b52b7087b7eac401d7d03da57bdc53 +Author: wangyidong +Date: Tue Apr 23 15:37:38 2019 +0800 + + * change moule to module. + +commit 5def55e016acba2a45d3dd64399e243aa0f24393 +Author: Yagami <976204163@qq.com> +Date: Tue Apr 23 15:21:21 2019 +0800 + + * Fix code style. + +commit 70935c1874fa7fcceb1db5d8f9b4b54df8282305 +Author: yfl <554665488@qq.com> +Date: Tue Apr 23 14:52:45 2019 +0800 + + * add function note + +commit 31f688c2c7517a62dd2149f5085cf2e14a260fa9 +Author: Yagami <976204163@qq.com> +Date: Tue Apr 23 14:49:53 2019 +0800 + + * Fix code style. + +commit 098b1e586851559907a8609d0e955b420c2eb86a +Merge: e1b2d576c9 11460f53a6 +Author: wangyidong +Date: Tue Apr 23 13:33:26 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e1b2d576c9442d2ba217f446dbf6d7d4f2350428 +Author: wangyidong +Date: Tue Apr 23 13:32:57 2019 +0800 + + * adjust mail browse page. + +commit 11460f53a65a332da63ee3103eef65556e801733 +Merge: b3c6cce763 d64f748d3e +Author: reneeteng +Date: Tue Apr 23 10:33:39 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b3c6cce763f57e34ad8447838dea912ac2f2bfbb +Author: reneeteng +Date: Tue Apr 23 10:32:55 2019 +0800 + + * C D lang files are changed. + +commit d64f748d3e6b1a645960a7ec8e665c7ffaf460c9 +Merge: b8b7890da4 34ce6af6a8 +Author: yfl <554665488@qq.com> +Date: Mon Apr 22 17:56:42 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b8b7890da4e7f8c38d2352bae129bcbbf26c0e02 +Author: yfl <554665488@qq.com> +Date: Mon Apr 22 17:55:38 2019 +0800 + + * task view.html + +commit 34ce6af6a8c89528e45918ab24c891c20e6b16ea +Author: wangyidong +Date: Mon Apr 22 17:17:01 2019 +0800 + + * fix for set mainViewFile in mobile. + +commit 22013a7379ec103825f85b66a6af6b32f86139c9 +Merge: 0a2ab6ce27 5931dfe101 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 22 16:06:44 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0a2ab6ce2776c02fcdc058aa3f2eda8440f094c7 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 22 16:06:20 2019 +0800 + + * Fix doc fade view. + +commit 5931dfe101f087cdf4eaa26690dabe2c290fdceb +Author: reneeteng +Date: Mon Apr 22 13:52:06 2019 +0800 + + * D lang is reviewed and changed. + +commit cdf257e48e07cccfc10e150018ccd45f0f5c822f +Merge: 2b2abf0260 cfa8147618 +Author: reneeteng +Date: Mon Apr 22 11:15:11 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2b2abf026001eb7b32b7bc1e09b96da3b94f974e +Author: reneeteng +Date: Mon Apr 22 11:14:27 2019 +0800 + + * C lang is changed. + +commit cfa8147618c9118d60c765ec995e9c48f4f80dc8 +Author: yfl <554665488@qq.com> +Date: Mon Apr 22 09:30:41 2019 +0800 + + * Fix Bug + +commit ee1d1b6aabc60e539d49ce7d561fd04cf32b3a25 +Author: yfl <554665488@qq.com> +Date: Fri Apr 19 15:33:45 2019 +0800 + + * export all bug show module + +commit 85670b26e4af85e2125119e9392dee2a2653a433 +Merge: f468d76d9e 37ef2e5dab +Author: yfl <554665488@qq.com> +Date: Fri Apr 19 14:39:36 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f468d76d9e0c3d76e47c3593943df78769a36924 +Author: yfl <554665488@qq.com> +Date: Fri Apr 19 14:38:33 2019 +0800 + + * export testcase by moodule chosen story + +commit 37ef2e5dabb944a69dcbfb983846c2fbe7ab3941 +Merge: 0bcb41f489 a60f376f1f +Author: Yagami <976204163@qq.com> +Date: Fri Apr 19 13:03:57 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 17b87ba461ef22859ca6cf32d8a218e09f241886 +Author: yfl <554665488@qq.com> +Date: Fri Apr 19 13:00:22 2019 +0800 + + * product auth to feedback + +commit a60f376f1f222ed900af79baabb38239231051d0 +Author: yfl <554665488@qq.com> +Date: Fri Apr 19 11:32:04 2019 +0800 + + * except feedback user mv zentaobiz + +commit fd307b44679076f5797168aff311956a1df737a5 +Merge: a9aab79f65 5e6f7b93e2 +Author: yfl <554665488@qq.com> +Date: Fri Apr 19 11:18:37 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a9aab79f65ea0f98a85ddab1a965ae93ce949a6a +Author: yfl <554665488@qq.com> +Date: Fri Apr 19 11:17:29 2019 +0800 + + * project team expect feedback + +commit 0bcb41f4894557bc8d40aa9bcac623beb42d6b63 +Merge: f9a6f49edd 618a3239b3 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 19 10:37:47 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f9a6f49edd584f16d3b64b9c123df24a93e83875 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 19 10:37:16 2019 +0800 + + * Fix feedback action. + +commit 5e6f7b93e2d4d28028dcb5cc74bb9761a1ca80f4 +Merge: 9cad7d87d2 618a3239b3 +Author: reneeteng +Date: Fri Apr 19 10:36:19 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9cad7d87d24598a3a19648f83d593879b8d9ed4a +Author: reneeteng +Date: Fri Apr 19 10:35:56 2019 +0800 + + * Lang change b. + +commit 61df3aadd6c46ac793db11a71a7019d21866b5e6 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 19 10:32:57 2019 +0800 + + * Fix doc side-col width. + +commit 618a3239b3387fa8f0f1476b9652dc2151d2005c +Author: wangyidong +Date: Fri Apr 19 10:21:32 2019 +0800 + + * fix bug. + +commit d41d55246773f126304b26b33b3e4a897ed95188 +Author: reneeteng +Date: Thu Apr 18 15:57:00 2019 +0800 + + * Lang change. + +commit a0dabe51f39e737bb8c72365f4e319000891cfc2 +Author: reneeteng +Date: Thu Apr 18 15:25:49 2019 +0800 + + * Lang changed. + +commit 6d414d84b36148f866fed81212fc715440ce49f2 +Merge: 992d5fa425 1f8899a848 +Author: reneeteng +Date: Wed Apr 17 11:14:48 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 992d5fa425effdead236ed8444d0abe337ff8427 +Author: reneeteng +Date: Wed Apr 17 10:47:23 2019 +0800 + + * Lang changed. + +commit 1f8899a84819dad5ffe811c8eb667fd33e01136f +Merge: 25294fc6e4 204390100d +Author: yfl <554665488@qq.com> +Date: Wed Apr 17 09:39:25 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 25294fc6e40e2490db6233237040f72a3788bcb3 +Author: yfl <554665488@qq.com> +Date: Wed Apr 17 09:38:10 2019 +0800 + + * task #7840 + +commit 204390100d5d727e5ee90fbde057b8b4259b94dd +Merge: 91d16c04ee 9c46bf4aa6 +Author: Yagami <976204163@qq.com> +Date: Wed Apr 17 08:50:54 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 91d16c04eea2233d1ef5e93b56c0e37c4a2c10c2 +Author: Yagami <976204163@qq.com> +Date: Wed Apr 17 08:50:26 2019 +0800 + + * Code for traingoal. + +commit 9c46bf4aa692763df4424e27ffd15f36c1e57e17 +Merge: 5dfca3a73e 58a5ce3d92 +Author: reneteng +Date: Tue Apr 16 15:17:46 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 58a5ce3d921a17cce37484db7696956508f5d454 +Merge: e8420fc3a7 3639a74cb7 +Author: Catouse +Date: Tue Apr 16 11:29:08 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e8420fc3a732f177af015742a98eeda153901a4e +Author: Catouse +Date: Tue Apr 16 11:29:01 2019 +0800 + + * refactor codes. + +commit 3b8f22232899c6398b64629a1ee9e2b13be4068c +Author: Catouse +Date: Tue Apr 16 11:28:19 2019 +0800 + + * fix lastComment editor not work after reverse history list. + +commit e110d289e59fc680d0a0131bbf2fea4db7e059eb +Author: yfl <554665488@qq.com> +Date: Mon Apr 15 16:54:08 2019 +0800 + + * team except feedback + +commit 57205959d76795f8ae6b22f9caf99017167b003f +Merge: 396e7f42d7 3639a74cb7 +Author: yfl <554665488@qq.com> +Date: Mon Apr 15 16:53:25 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3639a74cb713ca55e739e85d2307544cf19abb4e +Merge: 58761b1d45 590112e66c +Author: Yagami <976204163@qq.com> +Date: Mon Apr 15 16:33:38 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 58761b1d45f78d42f899bd03a6ce3cb388537231 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 15 16:33:05 2019 +0800 + + * Fix width for doc view. + +commit 590112e66c62c16d045c301caaa889cc9bd55fba +Merge: b9dc6d629b c534d4602c +Author: reneeteng +Date: Mon Apr 15 15:42:22 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 396e7f42d7677a1be5449d6496c25eaa51cbd1ba +Author: yfl <554665488@qq.com> +Date: Mon Apr 15 13:55:54 2019 +0800 + + * task #7863 + +commit c534d4602c1de0f15b8129a311a202c2a4ac3198 +Author: Yagami <976204163@qq.com> +Date: Mon Apr 15 10:50:21 2019 +0800 + + * Code for task #7805. + +commit b9dc6d629ba157ae94f22d18e27d132ae53190ef +Merge: d29d77ac06 c72ff92d48 +Author: reneeteng +Date: Mon Apr 15 09:23:53 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d29d77ac06eff4ccd53499e6e30885daf9cb87e9 +Author: reneeteng +Date: Mon Apr 15 09:23:02 2019 +0800 + + * Lang changed. + +commit c72ff92d4889ad86a5c9d7fd6fb77e091ae9f63a +Merge: bfcb9f536a 2b922b2a31 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 12 14:38:11 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bfcb9f536a291e8b0f23a65452acaa9b84718e4b +Author: Yagami <976204163@qq.com> +Date: Fri Apr 12 14:37:27 2019 +0800 + + * Fix locate after create todo. + +commit 2b922b2a3152576118be8f125315519b6e974a83 +Author: yfl <554665488@qq.com> +Date: Fri Apr 12 13:59:36 2019 +0800 + + * Task #7859 + +commit eec411e1457d9c9d824905220285853dd5cd38c5 +Merge: 8b77b8cd4b a321266757 +Author: yfl <554665488@qq.com> +Date: Fri Apr 12 10:24:39 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8b77b8cd4bbf0c69f693b7da472ff1e61b4ef381 +Author: yfl <554665488@qq.com> +Date: Fri Apr 12 10:23:59 2019 +0800 + + * task #7860 + +commit a321266757fe5c8f5e0b6f04c2b0164631259af3 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 12 09:40:07 2019 +0800 + + * Code for task #7807. + +commit 0cd90d123f9ab3ac2d25bb0057ae7ac4bee64557 +Author: Yagami <976204163@qq.com> +Date: Fri Apr 12 09:28:28 2019 +0800 + + * Code for task #7807. + +commit 21e65f670c05141f442994d219b87a5b9cb689b0 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 11 14:04:22 2019 +0800 + + * Code for task #7820. + +commit 550c5168c138fb402e71c9ed148fa3472486b2a0 +Merge: 14eb93ef75 36602c4d9b +Author: yfl <554665488@qq.com> +Date: Thu Apr 11 13:13:55 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 14eb93ef752ecc96e67455690439b491b2544d2d +Author: yfl <554665488@qq.com> +Date: Thu Apr 11 13:13:19 2019 +0800 + + * Task # 7894 + +commit 36602c4d9bc4c1e98b55caa8cbffbb6a42fc1503 +Merge: 8bd5e075d1 a391f110c1 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 11 10:49:30 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8bd5e075d1c62e13f803595c4a1758ff906c7032 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 11 10:49:00 2019 +0800 + + * Fix parent task button. + +commit 11654030709af8d74051bfbc188c568f50b65a14 +Merge: 7a75a922f1 a391f110c1 +Author: yfl <554665488@qq.com> +Date: Thu Apr 11 08:52:43 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7a75a922f1041001feb8c5af6a2b7749c8662294 +Author: yfl <554665488@qq.com> +Date: Thu Apr 11 08:52:06 2019 +0800 + + * Fix Bug + +commit a391f110c1eeeabb5844c5013b0a067f7985eb75 +Merge: 676ddf02bf c56b754028 +Author: reneeteng +Date: Wed Apr 10 15:22:48 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 676ddf02bf08b394e4033bd5e1b62472c9cb3f3e +Author: reneeteng +Date: Wed Apr 10 15:22:19 2019 +0800 + + * Lang change. + +commit c56b75402858af7ba24ef122b00ad03650e8fea5 +Author: Yagami <976204163@qq.com> +Date: Wed Apr 10 14:07:40 2019 +0800 + + * Delete biz lang. + +commit 2c800ede789cd0c6f156a309c213f17ebd51b611 +Author: Yagami <976204163@qq.com> +Date: Wed Apr 10 11:07:08 2019 +0800 + + * Finish task #7801. + +commit f21b0ad11be499d8d7d9724d04e42a998520e01f +Merge: 263fcd1bbc fcf101fa3c +Author: Yagami <976204163@qq.com> +Date: Wed Apr 10 10:39:58 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 263fcd1bbcd16fe30d4ffcde56ea68084dbdcd26 +Author: Yagami <976204163@qq.com> +Date: Wed Apr 10 10:39:35 2019 +0800 + + * Add feedback to todo. + +commit fcf101fa3c0cf0855072cadb91aa551dba896a63 +Merge: b557a8c45a 95b66f9229 +Author: reneeteng +Date: Tue Apr 9 15:48:19 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b557a8c45a7083e912bf343749c80f696ea30b2a +Merge: 75dc4d1bde 49933c0fcb +Author: reneeteng +Date: Tue Apr 9 15:47:33 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 95b66f922979531c38055aad4569dc1aeebab5d3 +Author: wangyidong +Date: Tue Apr 9 12:01:42 2019 +0800 + + * fix bug. + +commit b554bea1d3cca52f340a9499fa960ab4191c284f +Author: wangyidong +Date: Mon Apr 8 15:20:53 2019 +0800 + + * adjust for change block. + +commit 289fc113b40bac2fca6f9ddcf59de2622b45b25d +Author: yfl <554665488@qq.com> +Date: Mon Apr 8 11:15:18 2019 +0800 + + * backup button loading + +commit bee17125adcaf917aea2d006dea524adb263cb64 (tag: zentaopms_11.4.1_20190406) +Author: chenfei +Date: Sat Apr 6 13:49:21 2019 +0800 + + * Prepare for upgrade 11.4.1 + +commit 2384b7f7135686f5047021434d98a34130fff039 +Author: chenfei +Date: Thu Apr 4 16:16:39 2019 +0800 + + * Adjust custom header to be convenient to extend. + +commit 585ad591d97b05a70cac302ab16473d96808e46b +Author: Yagami <976204163@qq.com> +Date: Thu Apr 4 16:06:36 2019 +0800 + + * Fix icon. + +commit 1d000c9edc86cb1e4ee171d8c326a81b32af9207 +Merge: 559095ff58 b1f2a64f8e +Author: wangyidong +Date: Thu Apr 4 14:53:40 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 559095ff58256b2abdf82b3c2ffeea21da715603 +Author: wangyidong +Date: Thu Apr 4 14:52:29 2019 +0800 + + * adjust children actions for task-view page in modal. + +commit b1f2a64f8e70303ad42252962de199f8f5dab6f7 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 4 14:33:18 2019 +0800 + + * Fix table style. + +commit 490d692b8cf6b7b1a79d764b24bbea7e7d66ec99 +Merge: f7e7d32ef9 7cfd358cd8 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 4 14:15:52 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f7e7d32ef9920dc56fda85dfc754186a8a008a88 +Author: Yagami <976204163@qq.com> +Date: Thu Apr 4 14:14:22 2019 +0800 + + * Fix text center. + +commit 7cfd358cd803bcd6275daad5533699032636609a +Author: chenfei +Date: Thu Apr 4 11:53:59 2019 +0800 + + * Set default pri for story and testcase. + +commit 99e32fec3bc2296941de3fe676fae81491b96e0c +Merge: 916128d515 e5d12effc1 +Author: wangyidong +Date: Thu Apr 4 10:40:16 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 916128d515edc2ad52c56e4728c4db63b3dc7b56 +Author: wangyidong +Date: Thu Apr 4 10:39:18 2019 +0800 + + * adjust for create task in modal. + +commit e5d12effc1e2dc5d9e3d4a2170e21ad7d7971697 +Author: chenfei +Date: Wed Apr 3 19:39:18 2019 +0800 + + * Adjust tree module for dayup extension. + +commit 0954dacad00559b3f1597b4a8b3a4e3c36a14a0f +Author: yfl <554665488@qq.com> +Date: Wed Apr 3 17:03:02 2019 +0800 + + * backup view modify + +commit 75dc4d1bde0e8e8e8a2ebdd044a5ab6a7dc44439 +Author: reneeteng +Date: Wed Apr 3 15:43:20 2019 +0800 + + * Lang change. + +commit 49933c0fcb7f076b5948bc4dba29468ed23927ec +Author: Yagami <976204163@qq.com> +Date: Wed Apr 3 11:10:31 2019 +0800 + + * Fix productsummary report style. + +commit 5894ed4e67b2bdd90bc10000977d5f857264a8e3 +Merge: 96fd2a0f4d 989e5fb6da +Author: wangyidong +Date: Tue Apr 2 17:13:20 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 96fd2a0f4d8754d5cb349d60eec416e8d933535d +Author: wangyidong +Date: Tue Apr 2 17:12:13 2019 +0800 + + * adjust for task view page in modal. + +commit 989e5fb6da353b80f737e53ac096cba20fb496db +Author: Yagami <976204163@qq.com> +Date: Tue Apr 2 09:15:03 2019 +0800 + + * Fix lang bug. + +commit 8ec382365c397348ef64e7b10d3ccc792c292b38 +Merge: 4c899b45eb 9e52b96b0c +Author: 滔哥 +Date: Mon Apr 1 20:41:23 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4c899b45ebe9b5992756270fa1d312ac50d002fe +Author: 滔哥 +Date: Mon Apr 1 20:41:13 2019 +0800 + + * Fix bug. + +commit 9e52b96b0c6fc399065277733bf11553ab9d266d +Merge: 1004916a0e 24427df0df +Author: yfl <554665488@qq.com> +Date: Mon Apr 1 14:35:36 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1004916a0ede3f345dbc7acf86dd5b89dcbbf06b +Author: yfl <554665488@qq.com> +Date: Mon Apr 1 14:35:00 2019 +0800 + + * Modify link icon + +commit 24427df0df7bc43261b5aa4e3e1cb37cc55c52b7 +Merge: 4308ae4a70 6480a6f76a +Author: wangyidong +Date: Mon Apr 1 13:59:34 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4308ae4a709caa9099c8ff40102d4ee872861611 +Author: wangyidong +Date: Mon Apr 1 13:57:58 2019 +0800 + + * fix for update user view. + +commit 6480a6f76ae51ea4bb6a3b5b4f0dcad675bde64a +Author: yfl <554665488@qq.com> +Date: Mon Apr 1 09:43:35 2019 +0800 + + * Modify link icon + +commit e6f4028a0a7e955aa596cb2dea4a8941f4127b48 +Author: yfl <554665488@qq.com> +Date: Fri Mar 29 17:33:42 2019 +0800 + + Finish Task 7705 + +commit 28faf0a1d417889a10b6292f2c4bb76609b8db91 +Merge: c7c59c30bf f5b587034f +Author: Yagami <976204163@qq.com> +Date: Fri Mar 29 14:05:36 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c7c59c30bf568d526a6d9cd97eecddb34073c09c +Author: Yagami <976204163@qq.com> +Date: Fri Mar 29 14:03:53 2019 +0800 + + * Finish task #7707. + +commit f5b587034f578ecd14afe48218778011ae6dbae6 +Author: wangyidong +Date: Fri Mar 29 14:00:56 2019 +0800 + + * fix bug #1655. + +commit 53403f561070267e8a5c280cd60b219219f766ab +Merge: df6db87458 f2bdb6ae56 +Author: wangyidong +Date: Fri Mar 29 11:28:44 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f2bdb6ae56d36f54de645844243c7458d44882cf +Merge: fb90d68eae 63e0202313 +Author: Catouse +Date: Fri Mar 29 10:40:26 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fb90d68eae065f8fa3c9ebe7a34b2750db05197f +Author: Catouse +Date: Fri Mar 29 10:40:19 2019 +0800 + + * update zui. + +commit df6db874581505a6c1de2d753bec6174d4789cc4 +Author: wangyidong +Date: Thu Mar 28 16:56:46 2019 +0800 + + * fix for show client notice. + +commit 910dfe2b946f338f9da2cd3f17bf49088bec608c +Author: wangyidong +Date: Thu Mar 28 16:56:17 2019 +0800 + + * fix bug #1701. + +commit 63e02023131bdaa3c0e7a8c2f3e9b953e9577c60 +Merge: 670fb65ca0 9c311dec62 +Author: wangyidong +Date: Thu Mar 28 11:24:11 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 670fb65ca0b364fc6566bda7342b54be743cc639 +Author: wangyidong +Date: Thu Mar 28 11:21:52 2019 +0800 + + * fix for include defaultvalue. + +commit 8d06d00235b0cee59f53978dd9c3b781c9a37067 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 28 11:20:22 2019 +0800 + + * Fix project warning. + +commit 9c311dec62c606b2f5c81eb65dc3ee4b7756b057 +Merge: bcfbd81bef bf97231962 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 28 10:55:25 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bcfbd81bef9334e67bbad3aa4027b4d94d7c9b0d +Author: Yagami <976204163@qq.com> +Date: Thu Mar 28 10:54:58 2019 +0800 + + * Fix taskleft sql. + +commit bf97231962a2800ac864097d4448002287c8036e +Author: wangyidong +Date: Thu Mar 28 10:28:26 2019 +0800 + + * adjust for task getProjectTaskPairs method. + +commit bd0098ef0816ec5d3b8d6b000e06ddd829b75588 +Merge: 055340062f 44ffa8ebb6 +Author: wangyidong +Date: Wed Mar 27 13:52:40 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 055340062f1e5f50b0516d311e4e83f7caa2af3b +Author: wangyidong +Date: Wed Mar 27 13:51:04 2019 +0800 + + * adjust for print subMenu. + +commit 44ffa8ebb62c1f67bd80dcca03b51112fbaf8593 +Merge: 81da2b6326 9f42f0b0d4 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 27 10:59:15 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 81da2b6326ad2138369785412c2d23741764f356 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 27 10:58:42 2019 +0800 + + * Fix burn select condition. + +commit 9f42f0b0d471746d54281c8ea1d6e1e55c8b365a +Author: wangyidong +Date: Wed Mar 27 09:21:30 2019 +0800 + + * fix bug. + +commit d1014dd0184765cd1b2727bdd3f14c17ac347ef6 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 26 15:50:15 2019 +0800 + + * Carry back xuanxuan lang. + +commit 71f948d3774a0d856e876eedd6bb7a5abac351bb +Author: Yagami <976204163@qq.com> +Date: Tue Mar 26 15:31:07 2019 +0800 + + * Fix testcase confim change. + +commit 87b804f40f5ddf37bbcc7d272dc5948cb8a247da +Merge: 0b0882cba8 395004bc6d +Author: Yagami <976204163@qq.com> +Date: Tue Mar 26 15:01:41 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0b0882cba89bb7fc42a3eaf9568dbc2a080a9c40 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 26 15:01:01 2019 +0800 + + * Fix block delete. + +commit 395004bc6da5d88e31ab2b947c0276daa9b11f52 +Author: wangyidong +Date: Tue Mar 26 14:58:52 2019 +0800 + + * adjust for convert url. + +commit 7d783617182e3749705923ba137bf7cf5c5e9cc3 +Author: wangyidong +Date: Tue Mar 26 08:21:39 2019 +0800 + + * adjust for field width. + +commit a16d4f3c674fb515f872727f1aa872b45fece4cc (tag: zentaopms_11.4.stable_20190325) +Merge: fcf80e8675 8e14295791 +Author: Yagami <976204163@qq.com> +Date: Mon Mar 25 14:02:20 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fcf80e86758aa98c409f788b1fba843612590f00 +Author: Yagami <976204163@qq.com> +Date: Mon Mar 25 14:01:56 2019 +0800 + + * Fix task lang file. + +commit 8e142957911b803b66435a65ed7a2b7229dfb3a3 +Merge: 84955d15ab c97f30969a +Author: wangyidong +Date: Mon Mar 25 13:46:30 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 84955d15abcde2f32320c77092e2abe01e65c51b +Author: wangyidong +Date: Mon Mar 25 13:45:59 2019 +0800 + + * adjust for testStory. + +commit c97f30969ad247b65f66286747d5d70c764ee91f +Merge: 8563882212 fe6d7b1f1e +Author: Yagami <976204163@qq.com> +Date: Mon Mar 25 13:40:46 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 85638822128d0143758e49e56990691d61130667 +Author: Yagami <976204163@qq.com> +Date: Mon Mar 25 13:36:04 2019 +0800 + + * Fix en task menu. + +commit fe6d7b1f1e3fa7c89aab57432643a6d26ea91f6a +Author: chenfei +Date: Mon Mar 25 11:18:54 2019 +0800 + + * Adjust code. + +commit d39a315e7984d1f3bd4f70822462f97a833d065d +Author: chenfei +Date: Fri Mar 22 17:36:42 2019 +0800 + + * Prepare for zentao 11.4 upgrade. + +commit 54c488ba00004ced53bd8634719bdaa9ecf35f6e +Merge: 4ef4fb4e5d 4cec1e3e01 +Author: Yagami <976204163@qq.com> +Date: Fri Mar 22 16:56:54 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4ef4fb4e5d41fd09f681e7f56309f347980a3ff9 +Author: Yagami <976204163@qq.com> +Date: Fri Mar 22 16:56:31 2019 +0800 + + * Fix group lang. + +commit 4cec1e3e01d16629235679054817b826575a2063 +Merge: d78546eea5 d5f201fd49 +Author: wangyidong +Date: Fri Mar 22 16:50:31 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d78546eea54d8d3d8fc6daa9252abe9b65ce0cd8 +Author: wangyidong +Date: Fri Mar 22 16:49:47 2019 +0800 + + * adjust for task #5357. + +commit d5f201fd496deb64ef484a4784f03c4a54666f5d +Author: Yagami <976204163@qq.com> +Date: Fri Mar 22 16:44:33 2019 +0800 + + * Fix sql. + +commit e2520978d133de93efd57969b0765bca62cd8bcf +Author: chenfei +Date: Fri Mar 22 15:58:04 2019 +0800 + + * Adjust edit and delete button in view page of plan, release and build module. + +commit 5f6df0bcdbcc4546d77e5ca05a069f04f96fadbc +Merge: 884b7b9c18 50eea70d01 +Author: wangyidong +Date: Fri Mar 22 15:26:24 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 50eea70d0104ac328bb73a04ef06c71f2015a33d +Author: Yagami <976204163@qq.com> +Date: Fri Mar 22 15:23:56 2019 +0800 + + * Fix project task button. + +commit 884b7b9c185a5f22e0eca10741255b5d2e91bf19 +Author: wangyidong +Date: Fri Mar 22 15:13:50 2019 +0800 + + * adjust for 5325. + +commit fc5a8396a15b285f9789df4056dfac5d8bff5f9b +Author: Yagami <976204163@qq.com> +Date: Fri Mar 22 15:02:37 2019 +0800 + + * Fix INT zentao button. + +commit f23fd9e0d439f7d972214f3929aeade6084d6e89 +Author: Yagami <976204163@qq.com> +Date: Fri Mar 22 14:00:14 2019 +0800 + + * Fix user field and add sql. + +commit 6e932dcb2fbfb459dc6e0e1f32669990e624e76a +Author: Yagami <976204163@qq.com> +Date: Fri Mar 22 13:20:40 2019 +0800 + + * Fix file lang file. + +commit 955bbf3345e88674c36cbf425b9f1f2a007dcdee +Author: Yagami <976204163@qq.com> +Date: Fri Mar 22 13:08:23 2019 +0800 + + * Fix block lang file. + +commit be952195ce5193859d6107403e447aa327213a6f +Author: Yagami <976204163@qq.com> +Date: Fri Mar 22 13:02:03 2019 +0800 + + * Fix burn select width. + +commit 0e0f0af55536448c7d1ce7c38d2ab9ac079191e1 +Author: Yagami <976204163@qq.com> +Date: Fri Mar 22 11:19:44 2019 +0800 + + * Finish child task. + +commit 0344580fff3047c075cc8a7148c1dafe7e658d1e +Author: Yagami <976204163@qq.com> +Date: Fri Mar 22 10:42:00 2019 +0800 + + * Fix task lang file. + +commit a90b9240800bf97e19c50907c3694b5988059bf0 +Author: wangyidong +Date: Fri Mar 22 08:54:44 2019 +0800 + + * finish task #5371. + +commit a761be89b640c01a661f080963b2d0883c186e43 +Merge: 82bd6bacd6 796cd9e29a +Author: wangyidong +Date: Thu Mar 21 15:57:23 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 82bd6bacd66b59b3935791a480036d2c64039c92 +Author: wangyidong +Date: Thu Mar 21 15:56:43 2019 +0800 + + * fix for upgrade. + +commit 796cd9e29a6076cae45e9a74588fcc497fe5ed9f +Author: Catouse +Date: Thu Mar 21 14:57:34 2019 +0800 + + * finish task #5236. + +commit 7f3a571872ac1fc80167e4d38dced1aff1eea968 +Author: Catouse +Date: Thu Mar 21 14:32:29 2019 +0800 + + * update zui js. + +commit e8a14d2a489abf036e0cdb183520d612fb37747d +Author: Catouse +Date: Thu Mar 21 14:32:22 2019 +0800 + + * finish task #5315. + +commit 6aa434a9caacdf3a1e615a414192dc5b83aa6969 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 21 13:43:38 2019 +0800 + + * Fix closeModal js. + +commit 1523c62182a11d4f1cfda5f9a7316b020d91c44b +Author: Catouse +Date: Thu Mar 21 13:36:04 2019 +0800 + + * update ajaxform component in zui. + +commit 92c12f259a690033f8f84dff341b1934e6c411b0 +Author: wangyidong +Date: Thu Mar 21 10:39:40 2019 +0800 + + * fix bug #2468. + +commit 8ce54d2408abaa90c4e2dd93d5f8fb726720fe82 +Merge: 169dfdbd4d aacbf38b9a +Author: Catouse +Date: Thu Mar 21 10:04:50 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 169dfdbd4d1666a3f9a2b6e6ab4aac6ba6f6affb +Author: Catouse +Date: Thu Mar 21 10:04:44 2019 +0800 + + * fix chosen UI not work as expected. + +commit aacbf38b9a8bd8f4aa629fcb46e4f7deea079542 +Merge: 8c6015a5ea 50c5e99d90 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 21 09:54:41 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8c6015a5ea58f296f42ba45d80b467f28288bc33 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 21 09:53:46 2019 +0800 + + * Finish task #5346. + +commit 50c5e99d90171f0ad8b229074d389c0d321c88d9 +Merge: 4a5dce8ade 6afeb34bcc +Author: wangyidong +Date: Thu Mar 21 09:33:12 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4a5dce8ade93520d7bf4ccf5d672fc4e32c230a5 +Author: wangyidong +Date: Thu Mar 21 09:32:17 2019 +0800 + + * adjust for getServer in chat. + +commit 6afeb34bcce4c11c8e1e7c4756aa951f6c6fe788 +Merge: 2fb0cae1e7 aa3e8cd3b0 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 21 09:28:39 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2fb0cae1e75adbf0b0a29b4274315b69f5051500 +Author: Yagami <976204163@qq.com> +Date: Thu Mar 21 09:28:11 2019 +0800 + + * Finish task #5341. + +commit aa3e8cd3b01fae21f70dda796183fc7b0c224513 +Merge: 39dd90a740 1f6c2206c3 +Author: wangyidong +Date: Wed Mar 20 17:31:40 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 39dd90a740606a7e00aaab2d9fb40189588958a5 +Author: wangyidong +Date: Wed Mar 20 17:31:15 2019 +0800 + + * finish task #5359. + +commit 1f6c2206c3278a6ffdeb30e7ec38ef920ace3864 +Author: chenfei +Date: Wed Mar 20 17:20:22 2019 +0800 + + * Finish task #5335. + +commit fa5f377d5246c3548d30ca633e6c0c63b9475107 +Author: chenfei +Date: Wed Mar 20 15:58:19 2019 +0800 + + * Code for task #5343, #5346. + +commit 7242802aa44d276d3bd0a0bfc2c4e882a5d6947c +Merge: 7df289c7ee 559ff6b3b0 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 20 15:53:03 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7df289c7ee60dd6e7a65243ab25baed4aada1ced +Author: Yagami <976204163@qq.com> +Date: Wed Mar 20 15:52:40 2019 +0800 + + * Fix burn target. + +commit 559ff6b3b01ab1c8d25ecc1d6c8dcacec62ca7df +Author: wangyidong +Date: Wed Mar 20 14:39:55 2019 +0800 + + * finish task #5364. + +commit 310b4c22a4d5a0ae9131469cc1e90e98a0d84752 +Author: wangyidong +Date: Wed Mar 20 13:47:40 2019 +0800 + + * finish task #5334. + +commit 1d7b68ac1393090998bce1ce547945abaefac28c +Merge: 7dfdbe841d d83ab362f5 +Author: wangyidong +Date: Wed Mar 20 13:33:36 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7dfdbe841d6806772e0cf8b8c84e5c2e393d6658 +Author: wangyidong +Date: Wed Mar 20 13:33:17 2019 +0800 + + * finish task #5357. + +commit d83ab362f59bbe9b640a59df03cfef2f6f4613e2 +Merge: 0e41e9db83 c15a094736 +Author: Yagami <976204163@qq.com> +Date: Wed Mar 20 13:27:58 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0e41e9db83e95f50b48514733a3cebd9662c282a +Author: Yagami <976204163@qq.com> +Date: Wed Mar 20 13:27:37 2019 +0800 + + * Finish task #5344. + +commit c15a09473636c142bad0cde53791b4a1c9550012 +Author: wangyidong +Date: Wed Mar 20 11:29:48 2019 +0800 + + * finish task #5371. + +commit f11a91e43c2811393d54a994a56ec083e71b2ac2 +Merge: ff426c094e 1be6a10681 +Author: wangyidong +Date: Wed Mar 20 11:20:17 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ff426c094e6b9cf3d01e8624a34694cb27603fc8 +Author: wangyidong +Date: Wed Mar 20 11:19:40 2019 +0800 + + * finish task #5362. + +commit 1be6a10681fb66e3b2c5bf29560dc9b06835607e +Author: Yagami <976204163@qq.com> +Date: Wed Mar 20 10:51:21 2019 +0800 + + * Finish task #5361. + +commit aec278668af6589a064fa6d1bc9940b3c0cd0b4c +Merge: 54463d153a b66c5ec7fa +Author: Yagami <976204163@qq.com> +Date: Wed Mar 20 10:06:39 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 54463d153a45167abe056809a6f42835acdecd4e +Author: Yagami <976204163@qq.com> +Date: Wed Mar 20 10:06:24 2019 +0800 + + * Finish task #5367. + +commit b66c5ec7fa6330ee6a10fd9870a59ce6f0c43755 +Author: chenfei +Date: Tue Mar 19 17:23:35 2019 +0800 + + * Finish task #5330. + +commit 48bb8fea4e53f4a7aa67cb6f120b8910d286cdb8 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 19 16:59:36 2019 +0800 + + * Finish task #5342. + +commit e7449725927bf8426455b092f39733b58b94f0f8 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 19 16:25:36 2019 +0800 + + * Finish task #5340. + +commit f5f6e96d447a5007ed06f0cac5d9cfed7d51b588 +Merge: 2882633c31 1ebbf2150c +Author: wangyidong +Date: Tue Mar 19 13:40:47 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2882633c31a9584bd2dbc030042152c531ea3a16 +Author: wangyidong +Date: Tue Mar 19 13:40:07 2019 +0800 + + * finish task #5337. + +commit 1ebbf2150ccc8d7a35a636e942c892e2f9be5d81 +Merge: 602e8244de a79b4ec70b +Author: Yagami <976204163@qq.com> +Date: Tue Mar 19 10:25:32 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 602e8244de7f9a975ba8a9a17db04a5ac7be06b5 +Author: Yagami <976204163@qq.com> +Date: Tue Mar 19 10:25:17 2019 +0800 + + * Finish task #5339. + +commit a79b4ec70b5235679d6a3d29198c01bd1866074e +Merge: f621ab60de d790b5e942 +Author: wangyidong +Date: Tue Mar 19 10:22:36 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f621ab60de4c92f855b78849563e803535526916 +Author: wangyidong +Date: Tue Mar 19 10:22:09 2019 +0800 + + * finish task #5336. + +commit d790b5e9421fbd62989df5dffaefcf77b32d232e +Author: Yagami <976204163@qq.com> +Date: Tue Mar 19 09:37:46 2019 +0800 + + * Finish task #5329. + +commit ef572902a6eeb8a90d2e9e567a18a3358fc597a7 +Merge: 96f8fefdf7 12e732816e +Author: Yagami <976204163@qq.com> +Date: Tue Mar 19 09:24:36 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 96f8fefdf7126fed2784a8474d815030a9a7c83f +Author: Yagami <976204163@qq.com> +Date: Tue Mar 19 09:24:20 2019 +0800 + + * Finish task #5328. + +commit 12e732816eece909468b63173665911aff27896d +Merge: 3e0a57ac7d 5e32a88966 +Author: wangyidong +Date: Tue Mar 19 08:27:12 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3e0a57ac7ddc21ae9f782bd2601cceffa8027e20 +Author: wangyidong +Date: Tue Mar 19 08:26:43 2019 +0800 + + * adjust dropmenu width when search. + +commit 5e32a889664f2ac1a9c32d6c53c5425b69c097e7 +Author: chenfei +Date: Tue Mar 19 08:11:58 2019 +0800 + + * Finish task #5372. + +commit 58d5f35e2656ae7df779600d4d6bb96c7545d50c +Author: chenfei +Date: Tue Mar 19 08:04:39 2019 +0800 + + * Finish task #5324. + +commit b78df3b7a75221175e4c8c667922c9f47c9bc690 +Author: wangyidong +Date: Mon Mar 18 16:56:56 2019 +0800 + + * update zentao-integrated package. + +commit 3cd2f30ad83303b66bfbcc1ca757871b383355df +Merge: e925ae51e9 dddd4d0c72 +Author: wangyidong +Date: Mon Mar 18 16:56:38 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e925ae51e9327427d9492c134c1ca9116d2cf889 +Author: wangyidong +Date: Mon Mar 18 16:55:58 2019 +0800 + + * finish task #5325. + +commit dddd4d0c72c56f16a579c93ef44a1784942276bc +Author: Yagami <976204163@qq.com> +Date: Mon Mar 18 16:48:05 2019 +0800 + + * Add showdoc type. + +commit 7004af89d90c784396e6a73fb730e56a31d538c4 +Author: Yagami <976204163@qq.com> +Date: Mon Mar 18 15:48:30 2019 +0800 + + * Finish task #5327. + +commit 62249b0782a406ccd42cd1ea2b5f54958c342e84 +Author: Yagami <976204163@qq.com> +Date: Mon Mar 18 11:17:57 2019 +0800 + + * Finish task #5316. + +commit 641c3d5890bc45809b75a4e272502a240084af1c +Author: wangyidong +Date: Mon Mar 18 09:51:28 2019 +0800 + + * finish task #5358. + +commit 7e304d67181b2e03b541bcf1d14654a43c32d006 +Merge: 12cd13270b e741e9e3b2 +Author: wangyidong +Date: Mon Mar 18 09:48:30 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 12cd13270b35aa048c49b72a90f5c79a4a572b9c +Author: wangyidong +Date: Mon Mar 18 09:46:41 2019 +0800 + + * adjust for office. + +commit cb2f2d34efe0dabfb9ec3a708e14a329c5b4245d +Merge: eadba8d52e e741e9e3b2 +Author: reneeteng +Date: Fri Mar 15 14:47:02 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit eadba8d52edbfa343d98bf46b1137f914f620491 +Author: reneeteng +Date: Fri Mar 15 14:39:36 2019 +0800 + + * Lang change. + +commit e741e9e3b2886dd375e23a2f9dbd5afa4d26cc4d +Merge: 08f9a09730 817d27221a +Author: Yagami <976204163@qq.com> +Date: Fri Mar 15 13:28:08 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 08f9a09730f22f900cf0915ccfb54a42f82de55f +Author: Yagami <976204163@qq.com> +Date: Fri Mar 15 13:27:22 2019 +0800 + + * Fix bug #2467. + +commit 817d27221a86c0d9f9580040de37d823281c2469 +Author: reneeteng +Date: Thu Mar 14 16:07:28 2019 +0800 + + *Lang change. + +commit 76ece9e5ebc27d65a6abe82f24c085c5042780b8 +Author: reneeteng +Date: Thu Mar 14 14:20:48 2019 +0800 + + *Lang change. + +commit 305d9cb99877a1a0ed9c7e463f6ff6f142022e03 +Author: reneeteng +Date: Thu Mar 14 09:53:18 2019 +0800 + + *Lang change. + +commit 84e5d056976c69ab989c3dba90130c6daacd3935 +Author: reneeteng +Date: Thu Mar 14 09:40:46 2019 +0800 + + *Lang change. + +commit e1d0caecc1b5ede22dc310497884288958571be6 +Merge: e7eac913f7 e05ed035f6 +Author: reneeteng +Date: Tue Mar 12 14:48:54 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e7eac913f788875989e1fb4d090c2f58a7926d5c +Author: reneeteng +Date: Tue Mar 12 14:48:24 2019 +0800 + + *Lang change. + +commit abcf5282285e81485568b51344a321684baaa29f +Author: reneeteng +Date: Tue Mar 12 14:44:29 2019 +0800 + + *Lang change. + +commit e05ed035f67ea8d23a6e25a076a2bffc626c93a4 +Author: Yagami <976204163@qq.com> +Date: Mon Mar 11 17:17:11 2019 +0800 + + * Fix lastEditDate bug. + +commit bdde3be91e9a8e022c6f03e427679c950503b023 +Author: reneeteng +Date: Mon Mar 11 15:48:46 2019 +0800 + + *lang change. + +commit d2d5b68e4d692c443948673ca84d6fc64d0bd74b +Author: reneeteng +Date: Mon Mar 11 14:48:37 2019 +0800 + + *lang change. + +commit 625f60db4ceaf973a8d00a50fd9557a83c1cf64b +Merge: 5ddda7b3af 3ff00a6e3c +Author: reneeteng +Date: Mon Mar 11 14:37:29 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5ddda7b3af31ebb42e53a7491b0d45afec7ff601 +Author: reneeteng +Date: Mon Mar 11 14:37:03 2019 +0800 + + *Lang change. + +commit 3ff00a6e3c9002f516a3874d7185ac9a3676d3ff +Author: Catouse +Date: Sat Mar 9 15:47:39 2019 +0800 + + * update zui css file. + +commit ef5a3f7652110e0decb3888cb462b7e9e7318a6f +Merge: bcd7340a59 1db41e5805 +Author: Yagami <976204163@qq.com> +Date: Fri Mar 8 15:20:05 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bcd7340a59d8121e140d505644553e22da8f93c8 +Author: Yagami <976204163@qq.com> +Date: Fri Mar 8 15:19:38 2019 +0800 + + * Fix bug #2452. + +commit 1db41e58050329a8f9d497bb805934e6c7fe1f27 +Merge: 487e802420 5598c283cf +Author: wangyidong +Date: Fri Mar 8 14:50:00 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 487e80242003c69d4a1d5bfd3380e886c981b997 +Author: wangyidong +Date: Fri Mar 8 14:48:50 2019 +0800 + + * finish task #7499. + +commit 5598c283cf38b5e2794cad51e0ead212c4e5f79a +Author: reneeteng +Date: Thu Mar 7 10:52:59 2019 +0800 + + *Lang change + +commit c829383362e1186c8e0a421f617f5c7863bd2669 +Author: reneeteng +Date: Wed Mar 6 17:21:35 2019 +0800 + + *Lang change. + +commit cba64ef5a7f212466cd06b6b61b357d3839d6652 +Merge: c0184eca09 64cce4dbb0 +Author: reneeteng +Date: Tue Mar 5 16:47:18 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c0184eca0921743fb71539aabb2601173f2718f3 +Author: reneeteng +Date: Tue Mar 5 16:46:10 2019 +0800 + + * Lang change. + +commit 64cce4dbb04daad12445a5f6e9abf67434049bb9 +Merge: 0c9b5eb208 ad09223066 +Author: Yagami <976204163@qq.com> +Date: Thu Feb 28 15:49:27 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0c9b5eb208b59c83793fc5e4ecba6a9b1d1bd505 +Author: Yagami <976204163@qq.com> +Date: Thu Feb 28 15:48:52 2019 +0800 + + * Fix user icon. + +commit ad09223066a90da9fac4c4dcccb4504c4bef08e3 +Author: wangyidong +Date: Thu Feb 28 10:41:31 2019 +0800 + + * adjust for demo data. + +commit 296290f9c8953191df8b1074494f53791e478320 +Author: chenfeiCF +Date: Thu Feb 28 09:55:45 2019 +0800 + + * Set acl default when create product or project. + +commit 57a491bbc63e17c7fb94373aaaada413bb321a7a (tag: zentaopms_11.3.stable_20190228) +Author: wangyidong +Date: Thu Feb 28 08:40:55 2019 +0800 + + * fix for check priv. + +commit e17129030060b08d0dea25180ba1ba17ead2eb35 +Author: chenfeiCF +Date: Wed Feb 27 17:03:16 2019 +0800 + + * Adjust code. + +commit 5861a3cbd9a3564835bb4a686d07a0cdd28c2438 +Merge: dcc120573d ab8550d762 +Author: Yagami <976204163@qq.com> +Date: Wed Feb 27 17:01:44 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dcc120573d752f8fabacb0bdfae6bef613d6cbd6 +Author: Yagami <976204163@qq.com> +Date: Wed Feb 27 17:00:49 2019 +0800 + + * Fix get user data method. + +commit ab8550d7626d3349db85d66c276136eb29e5dd49 +Author: chenfeiCF +Date: Wed Feb 27 14:47:04 2019 +0800 + + * Adjust edit view of doc lib. + +commit 22ca9b8fa450482090cd93aad71be7ba3f4fde77 +Author: wangyidong +Date: Wed Feb 27 14:28:15 2019 +0800 + + * adjust standard sql. + +commit 00ce24a83b5e585068be9fabeca8cbf07ae961c7 +Author: wangyidong +Date: Wed Feb 27 14:17:18 2019 +0800 + + * adjust for zentao db. + +commit d119c79739284a8bfedd6b4102a4ebf884324b62 +Merge: 8846db5269 fb4b4ad844 +Author: wangyidong +Date: Wed Feb 27 14:10:09 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8846db52698acd38ec4f2a1d25642037a1beb0c3 +Author: wangyidong +Date: Wed Feb 27 14:09:34 2019 +0800 + + * fix error. + +commit fb4b4ad8445b23fa2035d18ffbfd8cc4280d6d35 +Merge: b784b389a2 330c083dd2 +Author: Yagami <976204163@qq.com> +Date: Wed Feb 27 13:55:40 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b784b389a2ed27d743a83c6f05e74b11bf90590e +Author: Yagami <976204163@qq.com> +Date: Wed Feb 27 13:55:03 2019 +0800 + + * Fix case title. + +commit 7c612806dde4c5657c96a92e20d9d47c85378d04 +Author: Yagami <976204163@qq.com> +Date: Wed Feb 27 13:53:39 2019 +0800 + + * Fix testcase buttoni title. + +commit 330c083dd2fc1c336c110c6d127ab29bdb64ed71 +Merge: bf2e434f2c 7162d7782b +Author: wangyidong +Date: Wed Feb 27 13:48:43 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bf2e434f2cfe132ba0893f708f342788da16a1d1 +Author: wangyidong +Date: Wed Feb 27 13:48:19 2019 +0800 + + * revert upgrade xuanxuan. + +commit 7162d7782bf42b02e11e288aa6883548c63aae8a +Merge: 35c33e50ed 366a7de5c5 +Author: chenfeiCF +Date: Wed Feb 27 13:35:19 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 35c33e50ed768564d249710d3a6f7f110b908b17 +Author: chenfeiCF +Date: Wed Feb 27 13:34:35 2019 +0800 + + * Adjust en lang. + +commit 366a7de5c5d08aa32140a952a51bad2dfbb50161 +Author: wangyidong +Date: Wed Feb 27 13:27:09 2019 +0800 + + * adjust for execute xuanxuan. + +commit 40062df83fc683ca3018b0cfcd0ff543208b3ff0 +Author: wangyidong +Date: Wed Feb 27 13:11:25 2019 +0800 + + * adjust for zh-tw lang. + +commit 050e369d2a001604f4e53939dcdaba599a95407c +Author: wangyidong +Date: Wed Feb 27 12:03:05 2019 +0800 + + * adjust for upgrade. + +commit 484b1c5979d15fdce6b05c05be9bbacb02568d10 +Merge: c39d922321 da31d14cbf +Author: wangyidong +Date: Wed Feb 27 11:16:36 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c39d922321f32fb13b4de3c81ca36ab411f265ed +Author: wangyidong +Date: Wed Feb 27 11:15:34 2019 +0800 + + * adjust for create doc. + +commit da31d14cbfa3c2fff6db99d78b6c07dcfdc57795 +Author: chenfeiCF +Date: Wed Feb 27 11:13:57 2019 +0800 + + * Adjust lang of doc. + +commit ee7a90ed2b2722f74ae17f6d677159fe9292e798 +Author: wangyidong +Date: Wed Feb 27 11:10:24 2019 +0800 + + * adjust for zh-cn lang. + +commit 97e3e68add35c983fe35f4ad3e9d6715ed443e46 +Merge: e3f51c9a19 230f1fd18d +Author: wangyidong +Date: Wed Feb 27 10:53:50 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e3f51c9a19c3ce8ff912a59bca654b0e30fe2101 +Author: wangyidong +Date: Wed Feb 27 10:53:30 2019 +0800 + + * adjust for copy title. + +commit 230f1fd18d0c819cf4d618933542481122a16f69 +Author: chenfeiCF +Date: Wed Feb 27 10:49:29 2019 +0800 + + * Show acl tips when create doc lib. + +commit a92e598a0933cef095e6f6c6ebc73a9c47b90692 +Merge: 9010446b9e 8ec8643dd6 +Author: wangyidong +Date: Wed Feb 27 10:41:31 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9010446b9eab9465b7477df7987a3ef458f77014 +Author: wangyidong +Date: Wed Feb 27 10:41:08 2019 +0800 + + * adjust for get git author. + +commit 8ec8643dd6e7493f040ce76bc985e2e34aec56da +Author: chenfeiCF +Date: Wed Feb 27 10:22:53 2019 +0800 + + * Adjust doc lib acl. + +commit a9d0721eb7492dc93e216aaa1bb5e99c8a7ba90d +Merge: 8f1b0fe119 02a52aec5a +Author: wangyidong +Date: Wed Feb 27 09:44:09 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8f1b0fe119d58c19f9b24e467b245172dadc8cf2 +Author: wangyidong +Date: Wed Feb 27 09:43:14 2019 +0800 + + * adjust table width for en lang. + +commit 02a52aec5abc7a0f7ed9665ca6898bc9e870c173 +Author: Yagami <976204163@qq.com> +Date: Wed Feb 27 09:29:27 2019 +0800 + + * Fix button. + +commit 5b2fd6932fe4d0878cffafb60db63ff307d7048e +Merge: 79b3576354 4bc280c4e4 +Author: Yagami <976204163@qq.com> +Date: Wed Feb 27 09:23:40 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 79b35763543bf0c55fa0271d97c2f63c1d057e13 +Author: Yagami <976204163@qq.com> +Date: Wed Feb 27 09:23:03 2019 +0800 + + * Finish task #5267. + +commit 4bc280c4e417fd5efc58ccdc328823f624fe8ea0 +Merge: c9a7fa9d64 1bcf0a3b53 +Author: wangyidong +Date: Wed Feb 27 09:12:33 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c9a7fa9d64cc86d4f779a73cc59e7c0510396d0d +Author: wangyidong +Date: Wed Feb 27 09:11:49 2019 +0800 + + * add office doc. + +commit 1bcf0a3b53b331b05df87a4919db54f56b857908 +Author: Yagami <976204163@qq.com> +Date: Tue Feb 26 17:09:20 2019 +0800 + + * Fix module icon. + +commit f6a7d0b07fb4a76b0ecbc55e9bbe9851154b4aeb +Merge: a22d3b6c30 7cd83b47da +Author: Yagami <976204163@qq.com> +Date: Tue Feb 26 17:03:45 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a22d3b6c303c6c7605f17569276c98cadd429b68 +Author: Yagami <976204163@qq.com> +Date: Tue Feb 26 17:00:58 2019 +0800 + + * Remove some testcase code. + +commit 7cd83b47da1fd970f7c042c0d4c252a4f2976054 +Merge: 216c6f5c0e 8505e577ac +Author: wangyidong +Date: Tue Feb 26 16:50:14 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 216c6f5c0e2ff055be5ffabdb4776d72cfdced2d +Author: wangyidong +Date: Tue Feb 26 16:49:49 2019 +0800 + + * adjust for custom timezone. + +commit 8505e577ac599c617080397e4dc0b62a7bf84b3b +Author: Yagami <976204163@qq.com> +Date: Tue Feb 26 16:40:34 2019 +0800 + + * Code for task #5295. + +commit 21ed530feed191d2e7c4530996ed2fe366e5955d +Author: Yagami <976204163@qq.com> +Date: Tue Feb 26 15:24:26 2019 +0800 + + * Code for task #5306. + +commit efe734f04af9b880c9249fcb25827090dfa6daf9 +Author: Yagami <976204163@qq.com> +Date: Tue Feb 26 14:28:26 2019 +0800 + + * Code for task #5284. + +commit e35a268a319aafa5904e908fdb73a851aa22a718 +Author: Yagami <976204163@qq.com> +Date: Tue Feb 26 14:11:37 2019 +0800 + + * Code for task #5294. + +commit a238cff296ac472b214ad546f94e8803c9c4138b +Merge: c31b04da67 fbc7a9c274 +Author: Yagami <976204163@qq.com> +Date: Tue Feb 26 14:06:55 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c31b04da6772e45f22f8e390bb4344ef41dc24bc +Author: Yagami <976204163@qq.com> +Date: Tue Feb 26 14:06:07 2019 +0800 + + * Code for task #5267. + +commit fbc7a9c27416909737fd0ca534fcbfbe33754f23 +Merge: 97f55a77fa 337e3771e5 +Author: reneeteng +Date: Tue Feb 26 13:42:09 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 97f55a77fa75af31026cc0d5ba2e509d7b42cb62 +Author: reneeteng +Date: Tue Feb 26 13:41:41 2019 +0800 + + *Lang change. + +commit 2d9d78fd8c79d4ba67afab6376cc22028c3cacdd +Author: wangyidong +Date: Tue Feb 26 11:45:18 2019 +0800 + + * adjust for sort lib. + +commit 337e3771e5f89538059deb4984cd70ac725390d1 +Merge: 62513a6045 ce28283a5a +Author: wangyidong +Date: Tue Feb 26 11:03:27 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 62513a604575cc5b6d8ad57eb7915893ac0327a8 +Author: wangyidong +Date: Tue Feb 26 11:01:38 2019 +0800 + + * adjust for remove gtalk field. + +commit ce28283a5af60542aecb28d94e90611f11bb50db +Merge: c05c534b12 b9b7fbdceb +Author: reneeteng +Date: Tue Feb 26 10:30:28 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c05c534b1284500053af15e73ba8d311fb37c18e +Author: reneeteng +Date: Tue Feb 26 10:29:53 2019 +0800 + + * Lang change. + +commit b9b7fbdceb93e4e887fc7ef2ccd24ae15bbb5dcd +Author: wangyidong +Date: Mon Feb 25 17:35:38 2019 +0800 + + * adjust for doc dropdown-menu max-height. + +commit 916844595b821761bc3d08f0c93206fc6244fbaf +Merge: 750550d9ed 8c83211b1a +Author: wangyidong +Date: Mon Feb 25 16:42:34 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 750550d9ed9ce94ef0e7e778ef1125b14f01f506 +Author: wangyidong +Date: Mon Feb 25 16:42:02 2019 +0800 + + * code task #5302. + +commit 8c83211b1a9b90bd48262a18a8540994b34d2346 +Merge: 6d62d929c8 0226ae1a9e +Author: reneeteng +Date: Mon Feb 25 16:11:38 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6d62d929c81fdce1212905c39f97d2f174a1327b +Author: reneeteng +Date: Mon Feb 25 16:11:00 2019 +0800 + + *Lang change. + +commit 0226ae1a9e3385c2f821bb44414d4a2aa5f79350 +Author: wangyidong +Date: Mon Feb 25 14:52:40 2019 +0800 + + * code for task #5302. + +commit 0f7f6d4e9acafbc223d7771e70e2ef1fefe6271d +Author: wangyidong +Date: Mon Feb 25 14:23:48 2019 +0800 + + * adjust for hidden module item in tree page. + +commit 373aedfc0b91f7fccfafd460b2b9e303a6334919 +Author: wangyidong +Date: Mon Feb 25 14:09:57 2019 +0800 + + * finish task #5297. + +commit 5ed0ed92fdf9bd9aef5bfa0c0f044219d236365d +Author: wangyidong +Date: Mon Feb 25 13:59:27 2019 +0800 + + * code for task #5302. + +commit b392cde94802251b94b65799ecfc5e3aba0820a3 +Author: wangyidong +Date: Mon Feb 25 11:46:34 2019 +0800 + + * code for task #5302. + +commit 178527100ce800c4a4e17e1a7a55d1136b4d2fcf +Author: wangyidong +Date: Mon Feb 25 11:26:51 2019 +0800 + + * code for task #5271. + +commit 5b23f6aba9e4234553fad0257628aa428d299faf +Author: wangyidong +Date: Mon Feb 25 10:51:49 2019 +0800 + + * finish task #5275. + +commit 62386800f20ff61216ad032a0b72d030a1181e70 +Author: wangyidong +Date: Mon Feb 25 10:46:10 2019 +0800 + + * finish task #5308. + +commit a1ed14507fd57553a99729768b91633cc2e96f35 +Author: wangyidong +Date: Mon Feb 25 09:13:49 2019 +0800 + + * finish task #5302. + +commit 7d1a2d4d7faee34fcab180c687c401a779636e0a +Author: wangyidong +Date: Mon Feb 25 09:01:30 2019 +0800 + + * remove useless code. + +commit 36de63e1fee0e2efd827e9a4c311bbdd91a68a10 +Merge: 3e7caa0da1 79659b0282 +Author: wangyidong +Date: Mon Feb 25 08:54:56 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3e7caa0da1a0820caa7b4cb82c4f7fcfcb785523 +Author: wangyidong +Date: Mon Feb 25 08:43:53 2019 +0800 + + * finish task #5271. + +commit 79659b0282f4a898b634f347101345c3596f6b30 +Author: Yagami +Date: Sun Feb 24 09:39:12 2019 +0800 + + * Fix common lang. + +commit 8278e84b873bbb36ddc7ff94aaad57970cfcfab5 +Author: Yagami +Date: Sat Feb 23 16:19:17 2019 +0800 + + * Code for task #5271. + +commit 07fe8907686e24e092fc95ffa95f684259e2651c +Author: Yagami +Date: Sat Feb 23 14:43:24 2019 +0800 + + * Code for task #5271. + +commit 3daae171f027709c1cad885cc18d1dee59b5a66d +Author: Yagami +Date: Sat Feb 23 13:44:51 2019 +0800 + + * Delete yahoo and wangwang field. + +commit 447b20b53b62aec8fa73f4ce992762b08798fbac +Author: Yagami +Date: Sat Feb 23 13:21:57 2019 +0800 + + * Finish task #5298. + +commit 6225b8aecb913ee79fa7c51c857ddfc3a99788fb +Author: Yagami +Date: Sat Feb 23 13:16:24 2019 +0800 + + * Finish task #5306. + +commit 7d53d7779955ba3eb34898854060a179f4619c20 +Author: Yagami +Date: Sat Feb 23 09:28:39 2019 +0800 + + * Fix createLib width. + +commit 68799f265e2dafdb68323433aa7631250aecfd45 +Author: Yagami +Date: Fri Feb 22 17:16:53 2019 +0800 + + * Finish doc type width. + +commit 344ed8f38bb64c92ee2856d2b64a706d2618b723 +Author: Yagami +Date: Fri Feb 22 15:31:40 2019 +0800 + + * Finish task #5290. + +commit 3656c218a9709ff9d682ed1319a47625b5a6e7f5 +Author: Yagami +Date: Fri Feb 22 15:25:22 2019 +0800 + + * Finish task #5292. + +commit 466667de7e73243828f1242167ab30c95d2dab96 +Author: Yagami +Date: Fri Feb 22 15:01:32 2019 +0800 + + * Finish task #5294. + +commit 3e857beeaecb9f3a76f00b2d1abf80ec5244636d +Merge: fb9ce6edfc 903b7f0c58 +Author: Yagami +Date: Fri Feb 22 14:21:27 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fb9ce6edfcaaea39362888ce6df093ec2f1d4093 +Author: Yagami +Date: Fri Feb 22 14:21:09 2019 +0800 + + * Finish task #5293. + +commit 903b7f0c5865cfe65ef183efa82cdde96682cf6a +Merge: 9ffa540195 11393c442e +Author: wangyidong +Date: Fri Feb 22 14:06:17 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9ffa540195d950491ec9467ec8b01248c0f90268 +Author: wangyidong +Date: Fri Feb 22 14:05:47 2019 +0800 + + * finish task #5285. + +commit 11393c442e8f2bd6e3b2490d0638a9b154f3fb5b +Author: Yagami +Date: Fri Feb 22 13:30:14 2019 +0800 + + * Finish task #5295. + +commit 1d1d64f6009b4ceb1fbde6a3f6e169c209b5a4f2 +Author: Yagami +Date: Fri Feb 22 13:20:24 2019 +0800 + + * Finish task #5296. + +commit 34555b1e8d39d9eace14e3ac93a160ce160cfc88 +Merge: 4305c3a54c 838bb873b9 +Author: Yagami +Date: Fri Feb 22 11:16:57 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4305c3a54ca67e7cd6e27459d3906e257661a17f +Author: Yagami +Date: Fri Feb 22 11:16:32 2019 +0800 + + * Finish task #5299. + +commit 838bb873b98f3d51c1841ee229418651e92ce378 +Author: wangyidong +Date: Fri Feb 22 10:43:23 2019 +0800 + + * code for task #5275. + +commit c39f83177b0545f5fe06b06fbf74613fce2308b3 +Merge: adfd61aa66 3124321ab5 +Author: wangyidong +Date: Fri Feb 22 10:36:54 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit adfd61aa66aceca34ed464125fc00723ea7d6ebb +Author: wangyidong +Date: Fri Feb 22 10:36:16 2019 +0800 + + * finish task #5275. + +commit 3124321ab5dab31d380f0183a0f0ab2e87f6bc13 +Merge: 46cdd5a5f9 d771b4fcd3 +Author: Yagami +Date: Fri Feb 22 09:47:14 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 46cdd5a5f953afd9d986523fceaaf781937cb581 +Author: Yagami +Date: Fri Feb 22 09:46:57 2019 +0800 + + * Finish task #5300. + +commit d771b4fcd3c16b2b22c6217b546143e02f4e0b18 +Merge: 2c46679d26 c41e0a89ab +Author: reneeteng +Date: Fri Feb 22 08:54:21 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2c46679d26fd3b2c153ca80dc0ff6a0ee6fbc28b +Author: reneeteng +Date: Fri Feb 22 08:53:46 2019 +0800 + + * Lang change. + +commit c41e0a89ab405b13fae0a8ee6ae746e32282e47c +Author: Yagami +Date: Fri Feb 22 08:44:08 2019 +0800 + + * Finish task #5304. + +commit 70f6eafd06388ce1ee58520713fbc1e3064f8664 +Author: Yagami +Date: Thu Feb 21 17:18:44 2019 +0800 + + * Code task #5287. + +commit 6de8f45c44d90100b59afd5d20783f2d9ba73038 +Merge: c15a28e3c4 47e9ea309d +Author: wangyidong +Date: Thu Feb 21 16:21:51 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c15a28e3c4495a2a185c450e370401f74d46957f +Author: wangyidong +Date: Thu Feb 21 16:17:26 2019 +0800 + + * finish task #5274. + +commit 47e9ea309df75b8c259d8970dc23be5c15f24d1e +Author: Yagami +Date: Thu Feb 21 16:14:07 2019 +0800 + + * Code for task #5284. + +commit 231d341e18943af94e60355f2c86c808a62b7c8b +Author: Yagami +Date: Thu Feb 21 15:57:02 2019 +0800 + + * Code for task #5284. + +commit 405311c1f90e0303f88bf87f7ed81c881c04372e +Merge: 1918e73a36 eba05eff7c +Author: Yagami +Date: Thu Feb 21 15:46:57 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1918e73a36dc00c37731688d5d152742e36dccee +Author: Yagami +Date: Thu Feb 21 15:46:40 2019 +0800 + + * Finish task #5287. + +commit eba05eff7c4d84842356ab497735cfbc55d866e1 +Merge: 1b80201a5d 806cf6761a +Author: wangyidong +Date: Thu Feb 21 15:36:25 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1b80201a5d6488cf84a0fd3247733d0e02359dea +Author: wangyidong +Date: Thu Feb 21 15:35:08 2019 +0800 + + * fix for show icon. + +commit 806cf6761a9931ffd5db22373d8beeb7b4d52c8f +Author: Yagami +Date: Thu Feb 21 15:29:31 2019 +0800 + + * Code for task #5284. + +commit d1a1dba7f110604572b0a8ee740311ac01a2f795 +Merge: a594321eb5 f49b2cb69a +Author: wangyidong +Date: Thu Feb 21 15:23:18 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a594321eb5fd3c2a5174bdb2e651999a136381db +Author: wangyidong +Date: Thu Feb 21 15:23:03 2019 +0800 + + * fix bug. + +commit f49b2cb69ac0e922b8811fe6ca1184bf4d5cf506 +Author: Yagami +Date: Thu Feb 21 15:15:17 2019 +0800 + + * Code for task #5284. + +commit 1a09bbb3bbb094f8fd5626368702fc42ddceba40 +Author: Yagami +Date: Thu Feb 21 15:13:09 2019 +0800 + + * Code for task #5284. + +commit 9eccbad277514f1f642737f9a1c4bf2a3f9a5296 +Merge: c78b5cac38 373eb7dc03 +Author: Yagami +Date: Thu Feb 21 14:47:50 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c78b5cac383aa9058133a4d758166197cfe0daed +Author: Yagami +Date: Thu Feb 21 14:47:17 2019 +0800 + + * Code for task #5284. + +commit 373eb7dc03c156cb854451c37fe94119f0dbcc80 +Merge: 8460f65864 413652c19f +Author: wangyidong +Date: Thu Feb 21 14:24:40 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8460f6586453b643730b5ed7e9444e1668136239 +Author: wangyidong +Date: Thu Feb 21 14:20:43 2019 +0800 + + * fix for safe. + +commit 9e2926aaa81433e946a4db5d20d93f16cecc11d1 +Author: Yagami +Date: Thu Feb 21 14:15:08 2019 +0800 + + * Finish task #5286. + +commit 413652c19f40d4fd720cf37abb732abfa57736b6 +Merge: b623c536da 91c2085bc0 +Author: Yagami +Date: Thu Feb 21 13:49:29 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b623c536da99df58796d0f2eceb69cf8333106a8 +Author: Yagami +Date: Thu Feb 21 13:49:04 2019 +0800 + + * Finish task #5284. + +commit 2fe7444d266516329f6c8704f4ea869367fae416 +Author: wangyidong +Date: Thu Feb 21 13:33:42 2019 +0800 + + * finish task #5303. + +commit 91c2085bc0037a97555cb1806a1bd759c9761982 +Author: wangyidong +Date: Thu Feb 21 13:13:17 2019 +0800 + + * finish task #5298. + +commit f102fd782c4b4e4d239f88855cb15b217841a527 +Author: wangyidong +Date: Thu Feb 21 10:55:22 2019 +0800 + + * finish task #5281. + +commit 399a57078e4ace98caa978f71ad6f2f9ed22d1e2 +Merge: 4d03b12428 2a1f8df6cb +Author: wangyidong +Date: Thu Feb 21 10:07:33 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4d03b12428f83e3cb5c8d1bb1a79a79710b72884 +Author: wangyidong +Date: Thu Feb 21 10:06:52 2019 +0800 + + * adjust for custom menu. + +commit 2a1f8df6cb88c4f74f77eaed722b1f88e3872616 +Merge: 79ad5af58c fce2b3241b +Author: Yagami +Date: Thu Feb 21 09:58:50 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 79ad5af58ca2f4a355b2eb5e7c732e6828da7412 +Author: Yagami +Date: Thu Feb 21 09:58:08 2019 +0800 + + * Finish task #5283. + +commit fce2b3241bc8af3cadffd5b74b641e6867200f24 +Author: reneeteng +Date: Thu Feb 21 09:42:41 2019 +0800 + + * Lang changed. + +commit 22759f3c567abd4d79df75b19d63f3dedec1f31b +Author: Yagami +Date: Thu Feb 21 09:30:59 2019 +0800 + + * Finish task #5280. + +commit 97dce2aa93fcb5a3073b0add6f7c1a6186ac1fc6 +Author: Yagami +Date: Thu Feb 21 09:12:53 2019 +0800 + + * Finish task #5273. + +commit e0bc5ae107dbb6fad9ec6faab91a655ce2a163a3 +Merge: fd95328b4d 9e3bdec8f8 +Author: Yagami +Date: Thu Feb 21 08:54:56 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fd95328b4dbb13417e5871e5f9aabdba4ac91233 +Author: Yagami +Date: Thu Feb 21 08:54:34 2019 +0800 + + * Fix task #5272. + +commit 9e3bdec8f84a9dfe8cfabe77f60cca9ca85f0525 +Author: wangyidong +Date: Wed Feb 20 19:58:03 2019 +0800 + + * finish task #5301. + +commit 1d317c5fb3eb53aff6fc5afe764965281c3db7c5 +Author: wangyidong +Date: Wed Feb 20 18:01:00 2019 +0800 + + * finish task #5278. + +commit 4820641b365c0113341f68765d34d23cfdc8c4ad +Merge: 6efbe82455 17fdbf84b8 +Author: Yagami +Date: Wed Feb 20 15:54:37 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6efbe8245555985961de56cffbd1eb1db4f87e22 +Author: Yagami +Date: Wed Feb 20 15:53:47 2019 +0800 + + * Finish task #5309. + +commit 17fdbf84b8544e35f4b10455495502d34ecd94f7 +Merge: 7bcd62dfdc b5987e61a1 +Author: wangyidong +Date: Wed Feb 20 14:35:02 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7bcd62dfdcce45e158881be9cecbe74604fc7373 +Author: wangyidong +Date: Wed Feb 20 14:34:22 2019 +0800 + + * finish task #5279. + +commit b5987e61a12a77babe82ffaffceecc152280da4f +Author: Yagami +Date: Wed Feb 20 14:27:38 2019 +0800 + + * Add autocomplete to front class. + +commit 75c0f11b4f9a3806aab2874635fa756467866da9 +Author: Yagami +Date: Wed Feb 20 13:59:05 2019 +0800 + + * Finish task #5272. + +commit 8f3604ec7ccc4b3b7d31bfe3cf3b48030f495495 +Author: Yagami +Date: Wed Feb 20 13:46:33 2019 +0800 + + * Finish task #5270. + +commit b7651df91ead760bb24dbf4960e271f2e12a852d +Author: Yagami +Date: Wed Feb 20 10:52:47 2019 +0800 + + * Finish task #5268. + +commit ec66da7ced8130170f944c9c7f7083c1fd7ad26b +Merge: 1480e324af 17853c172a +Author: Yagami +Date: Wed Feb 20 10:48:20 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1480e324af786fcfae02b596803b6205239c066f +Author: Yagami +Date: Wed Feb 20 10:47:39 2019 +0800 + + * Change the note. + +commit c2121de201788d7b24e459cb791fd6bea07d0ddc +Author: Yagami +Date: Wed Feb 20 10:47:06 2019 +0800 + + * Finish task #5267. + +commit 17853c172a195c5640474142816c05d4a7525a3d +Merge: ddf2014f10 ac221ac35f +Author: reneeteng +Date: Wed Feb 20 09:59:15 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ddf2014f105d5bf7c3e4507d69e6c72cd66f209d +Author: reneeteng +Date: Wed Feb 20 09:58:28 2019 +0800 + + *Upgrade lang changed. + +commit ac221ac35f1bc53c6f7731305f80900449e947f1 +Merge: e8d05a79bf c8cc3619d9 +Author: wangyidong +Date: Tue Feb 19 17:18:43 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e8d05a79bf4efa10c4c145cb90b8a1743c838617 +Author: wangyidong +Date: Tue Feb 19 17:17:07 2019 +0800 + + * finish task #5310. + +commit c8cc3619d994712a6abadfa2c7d2c28aaec980e6 +Merge: aec2573603 2ef4099e1a +Author: Yagami +Date: Tue Feb 19 17:14:19 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit aec2573603bec5f84c5fb09f9e8780ebf90e20ef +Author: Yagami +Date: Tue Feb 19 17:13:56 2019 +0800 + + * Finish task #5311. + +commit 2ef4099e1aa608d9d13d563d2c3ecde635336ce1 +Author: Catouse +Date: Tue Feb 19 14:22:38 2019 +0800 + + * update zui and code for story #3578. + +commit 33b36fbabf3cd86879c40dc7655aa7e3a92fe633 +Merge: b309c4a9c7 df175bb702 +Author: wangyidong +Date: Tue Feb 19 11:26:39 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b309c4a9c77639fa81668b9139e534dc515c37af +Author: wangyidong +Date: Tue Feb 19 11:25:50 2019 +0800 + + * adjust for children plan. + +commit df175bb7025ffeaae4691a819420c15f4939e998 +Merge: 7d62e6582e 9147f6700f +Author: Catouse +Date: Tue Feb 19 11:09:08 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7d62e6582e7db1cb22f533dae21865c40a494126 +Author: Catouse +Date: Tue Feb 19 11:09:02 2019 +0800 + + * update zui and fix HTTP_X_REQUESTED_WITH param in ajax form. + +commit 9147f6700f675ed9a687603b5956747a59acf73d +Merge: c870ffde06 ab68c71dfb +Author: Yagami +Date: Fri Feb 15 16:43:48 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c870ffde06aff86729962b016dde7801737647f9 +Author: Yagami +Date: Fri Feb 15 16:43:23 2019 +0800 + + * Fix module bug. + +commit ab68c71dfb3f9cf0e57234f58246c278457db489 +Author: wangyidong +Date: Thu Feb 14 17:17:15 2019 +0800 + + * fix bug. + +commit 5390c9cf9e0ed6874f19e9c7e4134162bdc1bb7a +Author: wangyidong +Date: Thu Feb 14 16:55:08 2019 +0800 + + * adjust code. + +commit deade1f213cf1abc5f57e4730df196947cf6b322 +Author: wangyidong +Date: Thu Feb 14 16:53:30 2019 +0800 + + * fix bug. + +commit a59f56c86eb0b6499f74e39052e6acf295b38b60 +Author: wangyidong +Date: Thu Feb 14 11:28:25 2019 +0800 + + * code for task #7312. + +commit 10418ad027b1bf254d95b0f73f5589419a2e65ce +Author: wangyidong +Date: Wed Feb 13 17:27:58 2019 +0800 + + * finish task #7313. + +commit 7481bb097cf864d32273adf008a286287b2df3ab +Author: wangyidong +Date: Wed Feb 13 16:55:50 2019 +0800 + + * finish task #7312. + +commit 74e2bed5872fc662b55a31d958efb40f9cc6c312 +Author: wangyidong +Date: Wed Feb 13 16:21:40 2019 +0800 + + * code for task #7312. + +commit 1dc41066bba44118733dc460c2f5e16c90c0c418 +Merge: bdde42e761 e0f6fd556b +Author: wangyidong +Date: Wed Feb 13 16:14:04 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bdde42e76163b7b39cb359180f0497e1e901829e +Author: wangyidong +Date: Wed Feb 13 16:13:25 2019 +0800 + + * finish task #7311. + +commit e0f6fd556b0d40ee68ea38a8811578038e8583ce +Merge: 230d5b38be 1b97693e0d +Author: reneeteng +Date: Tue Feb 12 11:00:31 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 230d5b38be597d4931f8a1ee918a2ca5ad17195d +Author: reneeteng +Date: Tue Feb 12 11:00:02 2019 +0800 + + * Lang changed. + +commit 1b97693e0d21d00a38505180244431e01ed60987 +Merge: 767de3e234 448fb14e25 +Author: wangyidong +Date: Tue Feb 12 10:11:40 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 767de3e2349bd0ff024701fdcb34415643692e00 +Author: wangyidong +Date: Tue Feb 12 10:10:21 2019 +0800 + + * fix bug for custom. + +commit 448fb14e25983da39dce7fc4e7ea4d220fb4e0f0 +Merge: 98002efb3f 60a408fe48 +Author: Yagami +Date: Tue Feb 12 09:38:36 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 98002efb3f391f79984c361a46bdd4ee09e790db +Author: Yagami +Date: Tue Feb 12 09:38:11 2019 +0800 + + * Fix bug #2365. + +commit 60a408fe48534183dd1621121be41fc49476a30d +Merge: d5b54a356e 32d984b180 +Author: wangyidong +Date: Tue Feb 12 09:15:01 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d5b54a356edeccdb0176a858690c489b8886355e +Author: wangyidong +Date: Tue Feb 12 09:13:36 2019 +0800 + + * fix bug #2408. + +commit 32d984b180805792a059fec24cdfd29683f1b02d +Author: Yagami +Date: Tue Feb 12 09:10:14 2019 +0800 + + * Fix bug #2395. + +commit 0a3a17595be825875fed5bd751b9dcb3a9814ef3 +Author: wangyidong +Date: Mon Feb 11 17:20:03 2019 +0800 + + * fix bug #2409. + +commit cdb260043d1b8fa6844d5ef186f251b46fc38299 +Author: wangyidong +Date: Mon Feb 11 15:43:02 2019 +0800 + + * change for english lang. + +commit 100f9bb80fcc86f8fa600b39e60ec9875da24fe1 +Merge: d95ba0b181 e4322d65b6 +Author: wangyidong +Date: Mon Feb 11 15:23:56 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d95ba0b181752717353934572e327f194cf0a1a4 +Author: wangyidong +Date: Mon Feb 11 15:23:32 2019 +0800 + + * fix bug #2419. + +commit e4322d65b6c006d902b196f06ab98b0b6ae15dec +Merge: 287b4a04ac 41dd1959c4 +Author: Yagami +Date: Mon Feb 11 14:56:24 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 287b4a04ac9811db1f8f5c95fa8b765f7d5737b7 +Author: Yagami +Date: Mon Feb 11 14:55:59 2019 +0800 + + * Fix bug #2409. + +commit 41dd1959c49d6475ea753a12a19a47215735eed5 +Merge: 6d30d1814f ad642ab62d +Author: wangyidong +Date: Mon Feb 11 14:53:33 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ad642ab62d13d03bca2207c08ea7ced78f4570df +Author: Yagami +Date: Mon Feb 11 14:18:45 2019 +0800 + + * Fix bug #2414. + +commit 6109ba1950c3d9befd8cf52fc99d932d3a41e906 +Author: Yagami +Date: Mon Feb 11 09:09:08 2019 +0800 + + * Fix download client group. + +commit 6d30d1814fa7cd64de53965fe1ad8839dbed451c +Author: wangyidong +Date: Fri Feb 1 14:59:30 2019 +0800 + + * adjust for count project task. + +commit 66bbff8ab151d383131b841965287a2dbbd751fb +Merge: bb591824cb e2fcccf013 +Author: wangyidong +Date: Fri Feb 1 10:18:03 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bb591824cb83b201aff7043c0c6f85ad0cbb244f +Author: wangyidong +Date: Fri Feb 1 10:17:06 2019 +0800 + + fix bug #2333. + +commit e2fcccf013c5f4328bffe3ebe8ea8fc734a4c748 +Merge: 73521c2b74 9706530521 +Author: reneeteng +Date: Thu Jan 31 13:48:24 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 73521c2b7420027fb52a430eb7989625d1a17a2d +Author: reneeteng +Date: Thu Jan 31 13:43:27 2019 +0800 + + * Lang en change. + +commit 970653052143e0cecc72323617f8a2d9d76f15ca +Author: wangyidong +Date: Thu Jan 31 13:26:36 2019 +0800 + + * adjust for get commiter in git. + +commit d9fe07cb9ab0884c20bcea9de78a6a86bf86ba91 +Author: wangyidong +Date: Thu Jan 31 09:53:17 2019 +0800 + + * adjust for upgrade. + +commit bcdfc60b2ab5e0ebeca3dae5e28434f1cd3a98c5 +Author: wangyidong +Date: Wed Jan 30 15:00:24 2019 +0800 + + * adjust for cn2tw when make zentaoxx. + +commit f60a6c481a9f6914f34f82b93feabc2a9a7ef313 +Author: wangyidong +Date: Wed Jan 30 11:38:29 2019 +0800 + + * adjust for build package. + +commit e156be97f43a01b36a050dc627d2779f09f8b976 +Author: wangyidong +Date: Tue Jan 29 15:55:05 2019 +0800 + + * fix bug. + +commit 84ddbd48df238578e15111726c7b78f4f152a97c +Author: wangyidong +Date: Tue Jan 29 15:50:28 2019 +0800 + + * fix for upgrade. + +commit 4c07c912605070faf07c21c0025a3d94d6e3bbb1 (tag: zentaopms_11.2.stable_20190129) +Author: chenfeiCF +Date: Tue Jan 29 14:39:08 2019 +0800 + + * Adjust for task #5214. + +commit 4092d8209412b9d7e2112ff679c3c36f7387bb89 +Author: wangyidong +Date: Tue Jan 29 13:28:44 2019 +0800 + + * fix bug. + +commit 1457a3242f0361f82e88a8add10c73aa080ca76a +Merge: 4316f627ba 3d7a3d0de6 +Author: wangyidong +Date: Tue Jan 29 11:38:15 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4316f627bafd70b3c0be863eaeb23c1fa526766c +Author: wangyidong +Date: Tue Jan 29 11:37:43 2019 +0800 + + * adjust for change password in xuanxuan. + +commit 3d7a3d0de68d7c3f107f52c03c8bc36fdaa8c6a2 +Author: chenfeiCF +Date: Tue Jan 29 11:33:25 2019 +0800 + + * Add change log. + +commit 890ea0e0f39a59a5a1dfae5c8e0358128f97be1f +Author: wangyidong +Date: Tue Jan 29 11:27:16 2019 +0800 + + * change xuanxuan.php to x.php. + +commit 699dc4fc37a89cea078fcc985aa48d2469ace9e1 +Merge: 204cd00e3e 4e897f0914 +Author: wangyidong +Date: Tue Jan 29 10:37:08 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 204cd00e3e670c007f417126aaeb201e12462849 +Author: wangyidong +Date: Tue Jan 29 10:36:34 2019 +0800 + + * adjust for xuanxuan. + +commit 4e897f0914d91a2e6e3c6c62f5e1cc4761cb1374 +Author: Yagami +Date: Tue Jan 29 10:31:34 2019 +0800 + + * Finish task #5258. + +commit f76185bab51946c9f438e070e6b41b77d140e7f1 +Merge: 8eb79bba13 d0f2e14326 +Author: Yagami +Date: Tue Jan 29 09:41:27 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8eb79bba13d936c8746e8b7c6cae2f1a256e167c +Author: Yagami +Date: Tue Jan 29 09:40:35 2019 +0800 + + * Finish task #5258. + +commit d0f2e143264a2635587eef489800b26bba8c7621 (tag: zentao_11.2_build1_20190128) +Merge: c760545647 6924b5359d +Author: chenfeiCF +Date: Mon Jan 28 16:34:52 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c760545647f1459e42e3e446531f708de10bb0e2 +Author: chenfeiCF +Date: Mon Jan 28 16:31:27 2019 +0800 + + * Change version and prepare for upgrade. + +commit 6924b5359d20a6cae295b9d0b8fc98b7f7d400f2 +Merge: cf27f925ac 7b5768932c +Author: Yagami +Date: Mon Jan 28 15:56:25 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cf27f925ac4c95d77f365b059554af2aeaa33b2a +Author: Yagami +Date: Mon Jan 28 15:55:56 2019 +0800 + + * Fix project modules. + +commit 7b5768932c13f32f833efe19264f48ee1db47735 +Author: wangyidong +Date: Mon Jan 28 15:52:17 2019 +0800 + + * fix for backup. + +commit 851b4d32c18c078d7d76e394b3379e6662daadec +Merge: 0e8e7f4bf6 4e82acf5e7 +Author: wangyidong +Date: Mon Jan 28 11:19:20 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0e8e7f4bf68b8928594946bc96d7119aa01d914b +Author: wangyidong +Date: Mon Jan 28 11:18:48 2019 +0800 + + * fix bug #2008. + +commit 9534cd636e51ed12deb4954598ae0aff6324da28 +Author: wangyidong +Date: Mon Jan 28 11:08:24 2019 +0800 + + * fix bug #2008. + +commit 4e82acf5e78e391c68d660a2110c9ae73e621f90 +Merge: 4a0c061c1f 577fb61a2e +Author: Yagami +Date: Mon Jan 28 10:52:30 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 577fb61a2e053e036b82ffadd3573e77ac0d84da +Merge: 4a3b76de13 7c658705e1 +Author: wangyidong +Date: Mon Jan 28 10:20:30 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4a0c061c1f52fc08c55c146f05d1571a4426f2da +Author: Yagami +Date: Mon Jan 28 10:18:42 2019 +0800 + + * Finish task #5259. + +commit 4a3b76de13788cdab1250552c83596a04cc50179 +Author: wangyidong +Date: Mon Jan 28 10:17:41 2019 +0800 + + * adjust code for entry visit. + +commit 7c658705e1b3ff56d0f20e360e88663789abda38 +Author: chenfeiCF +Date: Mon Jan 28 10:13:12 2019 +0800 + + * Code for task #5218. + +commit 0906b11d2b823956ee745321b40aa55413fd88b5 +Author: wangyidong +Date: Mon Jan 28 10:07:37 2019 +0800 + + * finish task #5241. + +commit 8099c45eec912935b05eb6ef764a03813f09755f +Merge: 97659beb32 57f0779ec8 +Author: wangyidong +Date: Mon Jan 28 10:04:23 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 97659beb324d1059384fa606819c65fb1b21eb65 +Author: wangyidong +Date: Mon Jan 28 10:03:32 2019 +0800 + + * adjust for backup. + +commit 57f0779ec8495550dbd7c8657ad3ce1cb08aca83 +Merge: 23bb5d7f54 1b83338698 +Author: Yagami +Date: Mon Jan 28 09:37:58 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 23bb5d7f54a3eca75f7ebf64a115bb2ec3b05e7b +Author: Yagami +Date: Mon Jan 28 09:37:09 2019 +0800 + + * Finish task #5234. + +commit 1b833386985f504d0e8b00094ef78776fb44aa91 +Author: chenfeiCF +Date: Fri Jan 25 18:58:56 2019 +0800 + + * Finish task #5253. + +commit 8e27c95499297e2d18882d5d2c6783962067b622 +Merge: c995214ff6 8f1c20d5ed +Author: Catouse +Date: Fri Jan 25 17:00:07 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c995214ff65b9417cbb566b7d55ebd65b7d29e98 +Author: Catouse +Date: Fri Jan 25 16:59:57 2019 +0800 + + * fix bug #2379 and finish task #5247. + +commit 8f1c20d5ed185f8413e59a27c5c25319b403ab92 +Merge: dda3b52de0 ab9f7bf52d +Author: wangyidong +Date: Fri Jan 25 16:15:27 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit dda3b52de064340901a4c6de3b049336d7591831 +Author: wangyidong +Date: Fri Jan 25 16:13:58 2019 +0800 + + * finish task #5221. + +commit 9f557ce8dd0bcb5b716ac8e2258a13bb4695a51c +Merge: c2bd7de9b9 ab9f7bf52d +Author: Catouse +Date: Fri Jan 25 16:01:49 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c2bd7de9b9792eb1776f12af8a0abbf5198c9b67 +Author: Catouse +Date: Fri Jan 25 16:01:30 2019 +0800 + + * finish task #5254 and fix bug #2371. + +commit ab9f7bf52d630f1f0447b931b5cb5d63cab97f06 +Merge: c5bf9cf987 0afdc5d71d +Author: Yagami +Date: Fri Jan 25 15:16:55 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c5bf9cf98766fcb66b5363c636200971fd0217ba +Author: Yagami +Date: Fri Jan 25 15:02:34 2019 +0800 + + * Finish task #5235. + +commit 0afdc5d71d10cac2bb282317cd70c6063b22cda3 +Merge: 19629d507c d1ace922a5 +Author: wangyidong +Date: Fri Jan 25 14:14:46 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 19629d507cd90db9ac0c5f8558d4932ee26449e4 +Author: wangyidong +Date: Fri Jan 25 14:08:55 2019 +0800 + + * change for task #5228. + +commit 3e0c68db85ef57d24253ea7eb4ece29d9ccb8827 +Author: wangyidong +Date: Fri Jan 25 13:27:15 2019 +0800 + + * finish task #5222. + +commit d1ace922a52995d829d7e1a12acec439d6cf9aa2 +Author: chenfeiCF +Date: Fri Jan 25 13:17:29 2019 +0800 + + * Finish task #5261, #5262, #5265. + +commit 9a19b8a177fd0992cf67a97d9c01f7400bdac843 +Author: Yagami +Date: Fri Jan 25 11:06:46 2019 +0800 + + * Fix bug getproducts. + +commit c13ea666352e05ad5a932db18729253871efd5c8 +Merge: 0484785235 66ce378726 +Author: Yagami +Date: Fri Jan 25 10:50:40 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0484785235e862e5c296497537da11b195b1c920 +Author: Yagami +Date: Fri Jan 25 10:42:55 2019 +0800 + + * Fix user loadlang. + +commit 66ce378726d8bc4a76b7b11c49a78926b4f9171d +Author: chenfeiCF +Date: Fri Jan 25 10:36:56 2019 +0800 + + * Fix bug #5248, #5260, #5263, #5266. + +commit 4842c965bca638f50aef5172b0e40dde7dcead23 +Merge: e4fd49e0f6 f3f9b64932 +Author: wangyidong +Date: Fri Jan 25 10:05:43 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e4fd49e0f6ff4514890ebd377767346e0849acbb +Merge: 03d3c82301 a19de16123 +Author: wangyidong +Date: Fri Jan 25 10:04:23 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 03d3c8230193ab4c3f14db278fd2ca1da5c92d57 +Author: wangyidong +Date: Fri Jan 25 10:03:51 2019 +0800 + + * finish task #5236. + +commit f3f9b64932a0a1537b4ae58e789bfd49ae94dd83 +Author: Yagami +Date: Fri Jan 25 10:03:39 2019 +0800 + + * Finish task #5250. + +commit a19de161237a0524f2cffb23acdb1adee4915e68 +Author: Yagami +Date: Fri Jan 25 09:56:48 2019 +0800 + + * Finish task #5246. + +commit 69413ff785bfdb9df019444d28d95d879e356503 +Merge: 93701f583a d81a106fad +Author: wangyidong +Date: Fri Jan 25 09:21:06 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 93701f583a2c619c660c7f125f08279e3b1e2e15 +Author: wangyidong +Date: Fri Jan 25 09:18:48 2019 +0800 + + * finish task #5252. + +commit d81a106fad98f6f32315302ac3ea3bdfe13017b3 +Author: Yagami +Date: Fri Jan 25 09:07:13 2019 +0800 + + * Fix makefile. + +commit faaf0dd1cb3c289072553b5e8c7d8555da84259d +Merge: 9922370141 857871042a +Author: Yagami +Date: Fri Jan 25 09:00:11 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9922370141feec7ccf64c849e4381e789ef46fc1 +Author: Yagami +Date: Fri Jan 25 08:59:13 2019 +0800 + + * Finish task #5249. + +commit 857871042aecee5afa3ee5001ab814c9dbbb4587 +Author: wangyidong +Date: Thu Jan 24 17:30:55 2019 +0800 + + * finish task #5238. + +commit 421a130e63be86f85870f83c016186fe632f3b36 +Author: wangyidong +Date: Thu Jan 24 16:46:18 2019 +0800 + + * finish task #5233. + +commit de0e1186cae3199739ff22041c4f70b204504627 +Author: Yagami +Date: Thu Jan 24 16:17:18 2019 +0800 + + * Finish task #5255. + +commit e9d8249ac89893bfc11efabcecc7605dc2ea7bf1 +Author: Yagami +Date: Thu Jan 24 14:24:03 2019 +0800 + + * Finish task #5259. + +commit 289160ca45519f3eaf0bb5e87915590a9851ed61 +Author: Yagami +Date: Thu Jan 24 09:26:42 2019 +0800 + + * Finish task #5229. + +commit 976bc31271ac619a129eea04edf0d4fc769f29ec +Author: Yagami +Date: Thu Jan 24 09:24:17 2019 +0800 + + * Finish task #5229. + +commit fad09a3916d2ee33b90c09ff3d37489265c1d420 +Author: Yagami +Date: Thu Jan 24 09:08:34 2019 +0800 + + * Finish task #5225. + +commit b85628a43aa7f3ec933878b86538b93204ddc536 +Author: Yagami +Date: Wed Jan 23 16:16:27 2019 +0800 + + * Fix makefile. + +commit 2678ec3433272af4520978f563f4ed5c1c648dca +Author: Yagami +Date: Wed Jan 23 16:06:18 2019 +0800 + + * Fix xuanxuan https options. + +commit 9fef22ee4c368470de4da5c7fda89efe2a94d421 +Author: Yagami +Date: Wed Jan 23 15:56:03 2019 +0800 + + * Fix makefile. + +commit 2ced50d58a154c38f8fbc3594812bb85978bfa22 +Author: Yagami +Date: Wed Jan 23 15:37:22 2019 +0800 + + * Move xuanxuan method. + +commit 9d464ca6d542090627a02e71f18812e60bfbf4c1 +Merge: 353fa681cd 2f5909ee29 +Author: Yagami +Date: Wed Jan 23 15:28:01 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 353fa681cd903905b614c16aa11b8eba4d5e1caf +Author: Yagami +Date: Wed Jan 23 15:27:37 2019 +0800 + + * Finish task #5213. + +commit 2f5909ee29c8d7b251719916c5a3104445581fab +Merge: a97b9deca2 068773ddf4 +Author: wangyidong +Date: Wed Jan 23 15:22:21 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a97b9deca2590d802b02afd6a810aff99d60f538 +Author: wangyidong +Date: Wed Jan 23 15:21:49 2019 +0800 + + * finish task #5219. + +commit 068773ddf418a27a23a179919a3315f931a06119 +Author: Yagami +Date: Wed Jan 23 14:58:53 2019 +0800 + + * Fix release marker bug. + +commit eff13683fb93b30d30449ec1c753ac95678f7ba3 +Author: Yagami +Date: Wed Jan 23 13:44:49 2019 +0800 + + * Finish task #5223. + +commit dfb6a386dd2f8ac0d88dec4c87152abc9938ae95 +Author: Yagami +Date: Wed Jan 23 13:07:37 2019 +0800 + + * Finish task #5208. + +commit 8e566448b1ed305c5b5c639ed1d1e49a35abcf31 +Author: Yagami +Date: Wed Jan 23 10:43:46 2019 +0800 + + * Finish task #5205. + +commit 6c8a9a1d00bd17603dcbafbce8837e442ac07dd0 +Merge: 42e8537e0f b7f7e7c484 +Author: Yagami +Date: Wed Jan 23 09:56:04 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 42e8537e0f532a05cf6d0612087aef7f23eede64 +Author: Yagami +Date: Wed Jan 23 09:55:41 2019 +0800 + + * Finish task #5206. + +commit b7f7e7c4840a9bc9907112f3479cb1975aad9061 +Merge: 7a5e06ba65 eb05f0a745 +Author: reneeteng +Date: Wed Jan 23 09:54:32 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7a5e06ba65d9261097a1b87c79892a5140853c94 +Author: reneeteng +Date: Wed Jan 23 09:54:00 2019 +0800 + + *Lang chane. + +commit eb05f0a745f1a2375f89fd9f1b60ee1ce5a0ee79 +Merge: bace517b74 2e35f9b4cd +Author: wangyidong +Date: Wed Jan 23 09:15:16 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bace517b74b88f9e283c15356dde812f4fa84506 +Author: wangyidong +Date: Wed Jan 23 09:14:36 2019 +0800 + + * adjust code for saveLogs. + +commit 2e35f9b4cd325c3389dec4c99ee72af67e45460c +Merge: 71e04e17ae 097c1ec481 +Author: Yagami +Date: Wed Jan 23 08:59:26 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 71e04e17ae413c4c0fa7d3d55868310c8a8a3717 +Author: Yagami +Date: Wed Jan 23 08:59:04 2019 +0800 + + * Finish task #5211. + +commit 097c1ec481307605b90afd7dcd74cf5ac8c0cdce +Merge: 30fc17cb14 057f9d8ece +Author: wangyidong +Date: Tue Jan 22 16:27:10 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 30fc17cb144906f0a9fdbdc3739f2110819cab5a +Author: wangyidong +Date: Tue Jan 22 16:26:45 2019 +0800 + + * finish task #5207. + +commit 057f9d8ece4b3d29be7a3b70d739f342de965fcd +Author: Yagami +Date: Tue Jan 22 15:58:32 2019 +0800 + + * Finish task #5209. + +commit 7ebc83744342724a5d5ed859dd6df0943674f76d +Author: Yagami +Date: Tue Jan 22 15:45:20 2019 +0800 + + * Finish task #5213. + +commit 235b242290de5aea2c268a234f5e0b5594cf939b +Author: wangyidong +Date: Tue Jan 22 14:29:05 2019 +0800 + + * finish task #5203. + +commit 36fced872a0450860ecf6cb63c4b3e1a3b0854c2 +Author: reneeteng +Date: Tue Jan 22 13:16:06 2019 +0800 + + * Lang change. + +commit ed6172aab012b96aadebd7142112efa1ae593d87 +Author: Yagami +Date: Mon Jan 21 15:55:36 2019 +0800 + + * Finish task #5210. + +commit 042f217f27a54540e2387d5ce7f209ec918bfa5d +Author: Yagami +Date: Mon Jan 21 15:31:22 2019 +0800 + + * Finish task #5214. + +commit 5eb78a12461ee6e29222576206464cf1e5be93f2 +Merge: ad15fff7ee e01d3f34cc +Author: Yagami +Date: Mon Jan 21 15:09:00 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ad15fff7eec1c9aa48f65bb3dc89e713fc1c3c7c +Author: Yagami +Date: Mon Jan 21 15:08:33 2019 +0800 + + * Finish task #5217. + +commit e01d3f34cc3dc038b60ac3f9aae2d8155cd9dc6d +Merge: 2ba3fbfa8a 91bb4a4ae2 +Author: reneeteng +Date: Fri Jan 18 10:45:18 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2ba3fbfa8ad03b5bf8affb36c45ab108eba7642e +Author: reneeteng +Date: Fri Jan 18 10:44:50 2019 +0800 + + *Change lang. + +commit 91bb4a4ae23d55843eb23974b64f7604e7b1e44c +Author: wangyidong +Date: Fri Jan 18 10:33:06 2019 +0800 + + * change init lang of svn and git to common. + +commit 28f014d766453c4b44601e5fe6befaa0aa943876 +Author: chenfeiCF +Date: Thu Jan 17 13:35:50 2019 +0800 + + * Adjust Makefile. + +commit 608257fdb0f36dfbed3a38df8ae054017b89fb30 +Author: Yagami +Date: Thu Jan 17 10:30:18 2019 +0800 + + * Delete some file which move to xuanxuan. + +commit 8beb1b1459af3729b0212ea643820a0df79c4e53 +Merge: 885dbd44b0 574f7fba01 +Author: reneeteng +Date: Thu Jan 17 09:52:44 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 885dbd44b07f27b362d2c2f7bf3a1d8d028efc90 +Author: reneeteng +Date: Thu Jan 17 09:52:15 2019 +0800 + + * Lang change. + +commit 574f7fba015f27b88b3d7cb862b73640728950f9 +Merge: 2b2fb9840f cd3422f865 +Author: Yagami +Date: Wed Jan 16 16:52:43 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2b2fb9840f3e66750825cdeb172523a0d8c7e7cb +Author: Yagami +Date: Wed Jan 16 16:52:18 2019 +0800 + + * Fix chat lang. + +commit cd3422f865a83dac858cf9556829e26a9acaf6ea +Author: chenfeiCF +Date: Wed Jan 16 16:50:41 2019 +0800 + + * Modified Makefile. + +commit 4b33485a7fed7013f01807e450942ba0993f4ad2 +Author: Yagami +Date: Wed Jan 16 15:05:00 2019 +0800 + + * Change xuanxuan lang file. + +commit f5cdd0a16e65077760f5792fe1e8b4f949016d33 +Merge: 29659ce40f 7418523c13 +Author: Yagami +Date: Tue Jan 15 14:25:09 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 29659ce40f364ff94c00aa4c5ac851df44b497bd +Author: Yagami +Date: Tue Jan 15 14:24:48 2019 +0800 + + * Delete chat/downloadxxd.php. + +commit 7418523c136857a2b01857e86903e3af3d8d4170 +Author: wangyidong +Date: Tue Jan 15 10:20:54 2019 +0800 + + * adjust code. + +commit ee4766e6990ec491e7ef1a6658a4dda5ef2059a5 +Author: wangyidong +Date: Tue Jan 15 10:03:38 2019 +0800 + + * Adjust for copy story desc when batch create task. + +commit cada6c243b72b67a2e9f7dbeb99c0f4384f8c728 +Author: wangyidong +Date: Fri Jan 11 15:57:01 2019 +0800 + + * adjust for showDeleted custom. + +commit 426073c758a5cb344e9dfbac5cac49460808db6f +Merge: b0e8cd02cb b2d8a9537f +Author: reneeteng +Date: Wed Jan 9 15:36:03 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b0e8cd02cb071a708534e82e0c5c181e55a92f8d +Author: reneeteng +Date: Wed Jan 9 15:35:10 2019 +0800 + + * Lang change for 11.1. + +commit b2d8a9537ff818448dbeaaac91a1395c7edc7e7c +Author: wangyidong +Date: Wed Jan 9 14:23:19 2019 +0800 + + * fix bug #2345. + +commit 9285458d46e46efdf33d5ccadcaa3d529cb5f2f8 +Merge: 8d2e67a507 04312accd6 +Author: wangyidong +Date: Wed Jan 9 10:10:54 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8d2e67a507fc40ff4b424cf3cb2c6699f4503270 +Author: wangyidong +Date: Wed Jan 9 10:09:57 2019 +0800 + + * fix for delete product and project. + +commit 04312accd617417b6b8b911180bf1ef321aa2305 +Author: chenfeiCF +Date: Mon Jan 7 09:06:33 2019 +0800 + + * Fix bug: When edit module tree should show product. + +commit 87d021776d8c59976bd7905af269e742d7e31e29 +Merge: 0b348c617c f4ec5d266e +Author: reneeteng +Date: Fri Jan 4 15:11:36 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0b348c617ce55339782fa0fdcce411fbe6f486ec +Author: reneeteng +Date: Fri Jan 4 15:10:35 2019 +0800 + + * Upgrade lang change. + +commit f4ec5d266e9e7d5c4c2349169b20586864f27448 (tag: zentaopms_11.1.stable_20190104) +Author: wangyidong +Date: Fri Jan 4 13:25:22 2019 +0800 + + * change new version and upgrade. + +commit 6824d95b43cbdfa62b9901b9aee7277c6fde8547 +Merge: 3684846de8 4ead396cf1 +Author: wangyidong +Date: Thu Jan 3 17:38:54 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3684846de8c9b00e21c57efd08ef24bf109181f5 +Author: wangyidong +Date: Thu Jan 3 17:38:13 2019 +0800 + + * finish task #7209. + +commit 4ead396cf16d32f56eed38df48fe694341c6d88e +Merge: da39a96bd2 aba75b1083 +Author: Yagami +Date: Thu Jan 3 16:38:23 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit da39a96bd2613df3412d4ebf288cc6a2f4f34ec2 +Author: Yagami +Date: Thu Jan 3 16:37:47 2019 +0800 + + * Delete feedback in open source. + +commit aba75b1083cb131622c93cf2bde379fe7106ba61 +Author: wangyidong +Date: Thu Jan 3 16:36:24 2019 +0800 + + * adjust code. + +commit b1e410f79e23f4efe64f828f9c492e687366554e +Author: wangyidong +Date: Thu Jan 3 16:35:59 2019 +0800 + + * adjust for show case import page. + +commit e648230b19b512b56ea6dc62efd335ecf2304adb +Merge: 7cafcbdabd 0f17b4d16a +Author: wangyidong +Date: Thu Jan 3 13:52:41 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7cafcbdabd870bc9099de67e027973d1e9b1ed76 +Author: wangyidong +Date: Thu Jan 3 13:51:08 2019 +0800 + + * fix error for empty class and count task. + +commit 0f17b4d16a4f81db99ee6f13e0afa41e22c1abfb +Author: Yagami +Date: Thu Jan 3 10:47:47 2019 +0800 + + * Fix xuanxuan config lang. + +commit de32295a354c7329b3960df69fcba7d9acbeb5ab +Merge: 44f689ed65 4d38384b41 +Author: Yagami +Date: Thu Jan 3 10:21:16 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 44f689ed652649f3d9844b5d83da6944724f6849 +Author: Yagami +Date: Thu Jan 3 10:20:55 2019 +0800 + + * Fix caseheader. + +commit 4d38384b4148315d07bad2361970c7d945ff5d93 +Author: wangyidong +Date: Thu Jan 3 09:25:37 2019 +0800 + + * finish task #7228. + +commit 38387b8320c9f3ddee29e5fcae9d17bb249f5d69 +Merge: 5ec47edcfc 6c5d47915a +Author: wangyidong +Date: Wed Jan 2 16:34:56 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5ec47edcfccc09648e8ecf5ada68db79c214400c +Author: wangyidong +Date: Wed Jan 2 16:34:27 2019 +0800 + + * fix error. + +commit 6c5d47915a43704f70588b5a0ba72f1b259afd43 +Merge: c0d4da2f0d d1c12ca383 +Author: Yagami +Date: Wed Jan 2 15:26:47 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c0d4da2f0df80d628fb03f13996c51a8afb758a1 +Author: Yagami +Date: Wed Jan 2 15:26:26 2019 +0800 + + * Finish task #7232. + +commit d1c12ca383cc1847cc322bcd5bc0b4a515bfad15 +Merge: d45b7a8ce9 20bf14db9c +Author: wangyidong +Date: Wed Jan 2 15:16:11 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d45b7a8ce97140041fe08d24c39854133d3f858e +Author: wangyidong +Date: Wed Jan 2 15:14:56 2019 +0800 + + * finish task #7227. + +commit 20bf14db9cc4ac1277cc43983410a9d4592e90a8 +Author: Yagami +Date: Wed Jan 2 13:50:40 2019 +0800 + + * Finish task #5196. + +commit 0dceba2e102242ed989c9ba6b972f1b0b370f82a +Author: Yagami +Date: Wed Jan 2 13:13:10 2019 +0800 + + * Finish task #5195. + +commit 936c2157df8748a8eab67ec29b0f81031cff1002 +Author: Yagami +Date: Wed Jan 2 10:39:21 2019 +0800 + + * Finish task #5197. + +commit 82ab82136fb0c0fb7508c6da43ce91b9c1f8afa5 +Merge: ed0692a545 92f79a59ad +Author: Yagami +Date: Wed Jan 2 10:08:27 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ed0692a545bbafcebff211bb51a3dc60226a1404 +Author: Yagami +Date: Wed Jan 2 10:08:12 2019 +0800 + + * Finish task #5194. + +commit 92f79a59adbc27d19d94ce96fcd094f3c5a91f06 +Merge: 2b15b8d3c6 c163f11b0f +Author: wangyidong +Date: Wed Jan 2 09:51:48 2019 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2b15b8d3c6f340009809c2e430bddb555b49cca7 +Author: wangyidong +Date: Wed Jan 2 09:51:06 2019 +0800 + + * finish task #5201. + +commit c163f11b0fd01710010e27b8da4cdf9d9305cefc +Author: Yagami +Date: Wed Jan 2 09:46:49 2019 +0800 + + * Finish task #5198. + +commit cecc728d16133de0fe264436d5d38a1931b3698e +Author: Yagami +Date: Wed Jan 2 09:27:16 2019 +0800 + + * Finish task #5200. + +commit 844c63cac5306b25abf02c51502e2ae66f785cbe +Merge: 700fffb442 7965361268 +Author: Yagami +Date: Wed Jan 2 09:24:00 2019 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 700fffb44287d6323fd677d1b2cd35bb7c956484 +Author: Yagami +Date: Wed Jan 2 09:23:35 2019 +0800 + + * Finish task #5199. + +commit 79653612686c30a50a81d9a5fdafc8d171c8c5ce +Merge: ca688aa2f8 78a2fc9099 +Author: wangyidong +Date: Sat Dec 29 14:55:23 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ca688aa2f80f7111908e0d146fcdbcb14fd7edac +Author: wangyidong +Date: Sat Dec 29 14:54:51 2018 +0800 + + * finish task #5182. + +commit 78a2fc909998247fafe115160d3fd6e723e6e643 +Merge: dcf2c80951 0435d14b74 +Author: Yagami +Date: Sat Dec 29 14:43:05 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dcf2c8095136ea6ada9586751f47a426ade08d71 +Author: Yagami +Date: Sat Dec 29 14:42:45 2018 +0800 + + * Finish task #5193. + +commit 0435d14b74bce8f85dc9a96315046d3e5d22529e +Merge: 0e3ef4a715 e8c04da4b0 +Author: wangyidong +Date: Sat Dec 29 14:24:59 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0e3ef4a715cfa9ea796664b908801246be7916db +Author: wangyidong +Date: Sat Dec 29 14:24:31 2018 +0800 + + * finish task #5185. + +commit e8c04da4b0581feea955515746b091b5e97eea86 +Merge: 851bcc28b3 4e2a7e8189 +Author: Yagami +Date: Sat Dec 29 14:04:27 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 851bcc28b33457fc46cb0c144fc33da77553b53d +Author: Yagami +Date: Sat Dec 29 14:04:09 2018 +0800 + + * Finish task #5192. + +commit 4e2a7e81894d71ff7be45d6e98f804be04e55d50 +Merge: 0db6ff757c 3d850bdc0a +Author: wangyidong +Date: Sat Dec 29 13:58:39 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0db6ff757c6618a1b141aa5146ace7fcf310eb61 +Author: wangyidong +Date: Sat Dec 29 13:58:07 2018 +0800 + + * finish task #5189. + +commit 3d850bdc0a111831be9d173ff4bf5e74716857c4 +Author: Yagami +Date: Sat Dec 29 13:43:29 2018 +0800 + + * Fix task 5190. + +commit 3d34eb42e868b50d7049ec33dd3c75bebe840d05 +Author: Yagami +Date: Sat Dec 29 13:41:36 2018 +0800 + + * Finish task #5190. + +commit 5f5ee0f9cd765791ec717af1c153cba9c13b7781 +Merge: 659b454228 16e6d54a97 +Author: wangyidong +Date: Sat Dec 29 09:11:37 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 659b4542287d5282bdd0f84198509a93735ff27e +Author: wangyidong +Date: Sat Dec 29 09:10:58 2018 +0800 + + * finish task #5168. + +commit 16e6d54a97f7284343242cdb8af1f8c2ee39de59 +Author: Catouse +Date: Fri Dec 28 21:01:51 2018 +0800 + + * finish task #5173 and bug #2325. + +commit 00b075ad9cd4444cc2bab1dd21bb32e98ef0d8db +Author: Catouse +Date: Fri Dec 28 20:35:21 2018 +0800 + + * finish task #5175 and fix bug #2304. + +commit 125fecef580de293bcd69a86e4e363a6997995f7 +Author: Yagami +Date: Fri Dec 28 14:27:38 2018 +0800 + + * Fix task #5170. + +commit 5b98a87dddaf2698d1e079abcd96bf6611773996 +Author: Yagami +Date: Fri Dec 28 10:57:41 2018 +0800 + + * Finish task #7219. + +commit b883da3ec9667883e730ff2d55599f757e009591 +Merge: 8735d788e6 798350dc73 +Author: wangyidong +Date: Wed Dec 26 15:53:19 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 798350dc733cb9a3425dd3f718dbc42c9bf46b94 +Merge: 841cb608cc e5f728c77b +Author: Catouse +Date: Wed Dec 26 15:52:58 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 841cb608ccc318fdf2423509e9f265ccfbbc688f +Author: Catouse +Date: Wed Dec 26 15:52:47 2018 +0800 + + * hide sidebar when collapsed. + +commit 8735d788e66a06e9ca7bfaafc67d465b7685ac55 +Author: wangyidong +Date: Wed Dec 26 15:51:53 2018 +0800 + + * adjust for task #5180. + +commit e5f728c77b8505b07b63353d9b684586fb6122c2 +Merge: 0063b4a86d 923e4fb8fb +Author: wangyidong +Date: Wed Dec 26 11:08:00 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0063b4a86d581394dc97f629cc8bef7cdf4ac62a +Author: wangyidong +Date: Wed Dec 26 11:07:21 2018 +0800 + + * update zentao-integrated. + +commit 923e4fb8fb986b756a6235b9e5b1db21e5b74579 +Merge: da57fc447d 4554a44aae +Author: Yagami +Date: Wed Dec 26 10:30:57 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit da57fc447d805056c240e3b929c6cbb35bd1f3c5 +Author: Yagami +Date: Wed Dec 26 10:30:34 2018 +0800 + + * Finish task #5170. + +commit 4554a44aae8fdf5123536c57e05fdd5dd447386b +Author: wangyidong +Date: Wed Dec 26 09:47:05 2018 +0800 + + * finish task #5172. + +commit 2bd37a479ecf65976fd00bff6e0f740f1b7bd68f +Author: wangyidong +Date: Wed Dec 26 09:34:26 2018 +0800 + + * fix bug for tutorial. + +commit d2a90b028748adb9eadf461ab9eb5127a31ea1f8 +Merge: a7996d0b51 e724e43770 +Author: wangyidong +Date: Tue Dec 25 17:41:25 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a7996d0b51571119fd98fe5f7018f41fc2821f01 +Author: wangyidong +Date: Tue Dec 25 17:40:42 2018 +0800 + + * adjust for xx server. + +commit e724e43770d22f60c47f4f33c97ad1be0a60a9a4 +Merge: b17a9b5262 5a36a96970 +Author: Yagami +Date: Tue Dec 25 17:16:05 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b17a9b526232ee7ff4e7484a6690e27a17eeaeaf +Author: Yagami +Date: Tue Dec 25 17:15:30 2018 +0800 + + * Fix xuanxuan priv. + +commit 5a36a969708ac4d46df692155ca9a5b4e093bdb8 +Merge: 46cfd4c19a 267834a69e +Author: wangyidong +Date: Tue Dec 25 14:15:37 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 46cfd4c19a95a11f08e11718d0ce969a937c35e9 +Author: wangyidong +Date: Tue Dec 25 14:14:08 2018 +0800 + + * adjust for xuanxuan server. + +commit 267834a69effd27a9288acad49dde74a176221dd +Merge: be7391f643 f0e2285964 +Author: Catouse +Date: Tue Dec 25 13:56:40 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit be7391f64311ab917e3362c391355744c6c6b561 +Author: Catouse +Date: Tue Dec 25 13:56:22 2018 +0800 + + * fix close button not show when open datetimepicker panel by update zui. + +commit f0e22859649b32acf4c9434df0af3c7e51c55027 +Merge: b390c49da8 815b60d9e4 +Author: Yagami +Date: Tue Dec 25 13:02:38 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b390c49da8d2d0fc8823a8c321a674efcb606004 +Author: Yagami +Date: Tue Dec 25 13:02:09 2018 +0800 + + * Finish task #5167. + +commit 815b60d9e4a2f71f887a0b5a9e618ba09d2617ca +Author: wangyidong +Date: Tue Dec 25 09:05:13 2018 +0800 + + * update zentao-integrated.zip. + +commit 184bb7114d1558c52e9bd604af4e59364832ea40 +Merge: 55a9c65279 2e8e82f65e +Author: Yagami +Date: Mon Dec 24 16:38:43 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2e8e82f65ebba122cb3800b93a2e6bae994be31b +Author: Catouse +Date: Mon Dec 24 16:37:04 2018 +0800 + + * update zui css file. + +commit 55a9c652796b4fac90653882cc5322e120d18aca +Author: Yagami +Date: Mon Dec 24 15:05:54 2018 +0800 + + * Fix task create view. + +commit 9602746cab1c1655646633b67d38b2b1c03e690a +Author: wangyidong +Date: Mon Dec 24 14:48:00 2018 +0800 + + * replace zentao-integrated. + +commit 3f7d659bcc8115ccdf8cc3145c2da02e7af03367 +Author: Yagami +Date: Mon Dec 24 10:45:02 2018 +0800 + + * Move my/ext/view to block/ext/view. + +commit 60cbbfe8a1f7641b8005eaa939142d0e4332d36d +Author: wangyidong +Date: Mon Dec 24 10:32:06 2018 +0800 + + * fix bug for onlybody. + +commit 89efeaca7f54f07a346b55d6558db1992ac28e30 +Author: wangyidong +Date: Fri Dec 21 15:02:48 2018 +0800 + + * adjust for with xuanxuan. + +commit 391d407c9f2d482c7ef9826a7cbfd01a37a5098b +Author: chenfeiCF +Date: Fri Dec 21 14:27:12 2018 +0800 + + * Adjust submit lable. + +commit 94af546018bd040ee69c919a24bcc97946989b36 (tag: zentaopms_11.0.stable_20181221) +Author: wangyidong +Date: Fri Dec 21 13:49:22 2018 +0800 + + * hide back button in xuanxuan. + +commit 4fd5c5f4ef31b74901ab4cf7dbf66ee3e1acdb53 +Author: wangyidong +Date: Fri Dec 21 13:37:59 2018 +0800 + + * change for zh-tw lang. + +commit ba46426f03014dcdb4d6a5e0d3aaedee6aa31945 +Author: chenfeiCF +Date: Fri Dec 21 13:36:30 2018 +0800 + + * Add client help manual link. + +commit 0db5be7da12b7e7fd539b3ed8c972a868242eee5 +Author: wangyidong +Date: Fri Dec 21 13:19:34 2018 +0800 + + * fix for upgrade. + +commit 1586f7428c0bdd13b7454be90af38f4ce5419ae2 +Author: wangyidong +Date: Fri Dec 21 13:06:14 2018 +0800 + + * add zh-tw lang. + +commit 73ef25cd9cad4d83cb8992b65053640db771cf63 +Author: wangyidong +Date: Fri Dec 21 12:03:36 2018 +0800 + + * add for xuanxuan group. + +commit 7e44c4b9c3fe4166cc02bf567c3399fb5e29adbe +Author: Yagami +Date: Fri Dec 21 11:17:59 2018 +0800 + + * Fix my index notice. + +commit 627e93343804176599d75376804599f30a3fc378 +Author: wangyidong +Date: Fri Dec 21 10:32:26 2018 +0800 + + * add new version and upgrade. + +commit 680a7d0a4e7068a1abe27fdab352237b5a12086b +Merge: 92e61922e3 d7c6f34288 +Author: wangyidong +Date: Fri Dec 21 10:31:59 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 92e61922e3b23513e594c55b1575da239a3422aa +Author: wangyidong +Date: Fri Dec 21 10:22:42 2018 +0800 + + * adjust for locate page after create. + +commit d7c6f3428861e35dd3927a6df1e0f5bfdb3ea72c +Author: Yagami +Date: Fri Dec 21 09:58:52 2018 +0800 + + * Fix book link. + +commit 0e4885cb0d29d157e7fb39f7ec12d263b3153968 +Merge: 091301181a 1864c50468 +Author: Yagami +Date: Fri Dec 21 09:11:17 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 091301181af294121e23e3a033bbdbf7c478109d +Author: Yagami +Date: Fri Dec 21 09:10:31 2018 +0800 + + * Fix download xxd file name. + +commit 1864c50468d547f0d91091103500dd0de5700835 +Author: wangyidong +Date: Thu Dec 20 17:40:58 2018 +0800 + + * adjust textarea height. + +commit b7b2504040c1b5ad8df71ef846be675442f54e5c +Merge: b8647efe18 46bf4c9baa +Author: chenfeiCF +Date: Thu Dec 20 17:19:56 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b8647efe18273c8e28e00ac9b85f33805ce311ab +Author: chenfeiCF +Date: Thu Dec 20 17:18:25 2018 +0800 + + * Add notify help manual link. + +commit 46bf4c9baa72c070b36bb7e6c0f11641f8132832 +Merge: 920490847e dd1c5e0715 +Author: wangyidong +Date: Thu Dec 20 17:18:20 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 920490847ed7d5910b321fe409724ca50b3f6eca +Author: wangyidong +Date: Thu Dec 20 17:18:01 2018 +0800 + + * adjust for xuanxuan. + +commit 5ebceea09a114788d74667c1be5f3bb23edb26bf +Author: wangyidong +Date: Thu Dec 20 17:16:50 2018 +0800 + + * add project field for create task. + +commit dd1c5e071560d3198fa1df778389a4afe1d0414f +Merge: ac162d1c15 ae10b5ad4d +Author: Yagami +Date: Thu Dec 20 16:49:41 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ac162d1c1555e5dd5a88c645b617c7ed3940ece0 +Author: Yagami +Date: Thu Dec 20 16:49:13 2018 +0800 + + * Move xuanxuan notice file to my-index. + +commit ae10b5ad4da37df8b5afd44736bbd4d1c15745e9 +Author: chenfeiCF +Date: Thu Dec 20 16:27:39 2018 +0800 + + * Fix bugs. + +commit f2a11b2aca4a65bde133c55934fc0ad7b341a90d +Merge: 46f9eef6bf 6af2460b0b +Author: reneeteng +Date: Thu Dec 20 16:04:15 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 46f9eef6bfda5a96951b7a6265d319b4d7e9bcb6 +Author: reneeteng +Date: Thu Dec 20 16:03:55 2018 +0800 + + * Lang change. + +commit 6af2460b0b305937d346c79d1eb203d4ea6c5403 +Merge: 7a8cc5c077 557039cb07 +Author: wangyidong +Date: Thu Dec 20 14:55:44 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7a8cc5c077f9689ef70855bb84a2b7262ea4934e +Author: wangyidong +Date: Thu Dec 20 14:35:11 2018 +0800 + + * adjust for check priv. + +commit 557039cb078e95cc195533f85f74d62810df4fd3 +Author: chenfeiCF +Date: Thu Dec 20 14:13:50 2018 +0800 + + * Perfect the notify api. + +commit 78873c708445b94a0fc96e9a6e5ef255f60d97ef +Merge: 8c2ea9f91a 176472a7a8 +Author: Yagami +Date: Thu Dec 20 14:05:53 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8c2ea9f91a0779a829dc6cd8bb84287e541fd62c +Author: Yagami +Date: Thu Dec 20 14:05:42 2018 +0800 + + * Fix lang file. + +commit 176472a7a833ca57a71bdf2cf405313c9e5ec6f2 +Merge: 422a87421a 1490b69ac9 +Author: wangyidong +Date: Thu Dec 20 13:53:40 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 422a87421a91089de50a9631cab17dfd31befc69 +Author: wangyidong +Date: Thu Dec 20 13:52:06 2018 +0800 + + * update zentao-integrated package. + +commit 1490b69ac91c0282491851488ab9bf02751aa6ad +Merge: 563ece6990 501a5cbc4a +Author: Yagami +Date: Thu Dec 20 13:28:37 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 563ece6990920be71edd1d2af791c5b80f6b05e6 +Author: Yagami +Date: Thu Dec 20 13:28:24 2018 +0800 + + * Fix bugs. + +commit 501a5cbc4a8344182ae2d4ad48d36274f2e3e904 +Author: wangyidong +Date: Thu Dec 20 13:12:11 2018 +0800 + + * adjust for download xxd. + +commit c9b2e5cc2b629c0626f55e2ec41f8c8ef76286da +Merge: 4eb64d59e2 096ea509f0 +Author: Yagami +Date: Thu Dec 20 11:18:48 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4eb64d59e21981865356818968742b8037c23dde +Author: Yagami +Date: Thu Dec 20 11:18:25 2018 +0800 + + * Fix uploadFile size. + +commit 096ea509f07ca3d5d23892df27ee681d48833d16 +Author: wangyidong +Date: Thu Dec 20 11:10:28 2018 +0800 + + * adjust for entry log page. + +commit e35503d49345b1ac5eabc34dc849c2dd2f06edfe +Author: wangyidong +Date: Thu Dec 20 11:01:27 2018 +0800 + + * adjust message setting for xuanxuan + +commit c72430be59defff9cfd1a959e882e7b34227c55c +Author: Yagami +Date: Thu Dec 20 10:43:56 2018 +0800 + + * Add setting xuanxuan help. + +commit 19daa2b0b7e368d82bc6ab79e2ed872143fd90d0 +Author: wangyidong +Date: Thu Dec 20 10:43:44 2018 +0800 + + * adjust for message setting. + +commit 8f76ce4538c397b8feb8f5240c233dfb89c97172 +Author: Yagami +Date: Thu Dec 20 10:16:08 2018 +0800 + + * Change xuanxuan info alert to iframe. + +commit 5b8ef9e9b759e11b60c4b5f5098cdc95ea6c471b +Merge: 9b05905dc1 df6ca19290 +Author: Yagami +Date: Thu Dec 20 09:09:51 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9b05905dc13411ea9be75831e86c48363a2e3e7b +Author: Yagami +Date: Thu Dec 20 09:09:13 2018 +0800 + + * Fix notice xuanxuan and add xuanxuan lang. + +commit 5dfca3a73e52eb6639f3896a8eafab8410567a90 +Merge: c37acdc8e7 df6ca19290 +Author: reneteng +Date: Wed Dec 19 16:53:41 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit df6ca192906bc896108ff3453bdc66e4ebdb41b5 +Author: wangyidong +Date: Wed Dec 19 16:44:41 2018 +0800 + + * adjust for xuanxuan locate page. + +commit c37acdc8e79f0881787a90f8c87aceb75bc7558b +Merge: ae4364a311 d3fa148cb3 +Author: reneteng +Date: Wed Dec 19 16:43:12 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ae4364a311b513ed2ba9f9b158ddcab9fcb4e818 +Author: reneteng +Date: Wed Dec 19 16:22:14 2018 +0800 + + * Test lang change. + +commit d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f +Author: wangyidong +Date: Wed Dec 19 13:44:31 2018 +0800 + + * close modal in xuanxuan. + +commit 06e898ea57143a5d40a3430dc1f44b2bc99bad59 +Merge: 48593cf917 e525c1c731 +Author: wangyidong +Date: Wed Dec 19 13:19:51 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 48593cf917177bf36f9adcd4488c9e07f9446b51 +Author: wangyidong +Date: Wed Dec 19 13:18:56 2018 +0800 + + * change zentao integrated package. + +commit e525c1c73145724d9064c31765c905ce65b525b8 +Merge: f768c24ffd abca247e8a +Author: chenfeiCF +Date: Wed Dec 19 11:22:02 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f768c24ffd94ce813ecfedddced310f002c9ad41 +Author: chenfeiCF +Date: Wed Dec 19 11:21:44 2018 +0800 + + * Adjust for task #5162. + +commit abca247e8aab363efbd0a52265d6f64f9c196c64 +Author: Yagami +Date: Wed Dec 19 11:20:44 2018 +0800 + + * Fix lang root. + +commit e0e412504ad6e3cdce70a2f06e1c25b56bf718fe +Merge: 400a6b9313 4ac74dddf9 +Author: Yagami +Date: Wed Dec 19 11:17:44 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 400a6b9313564f9a22330312e3706a64de7a3276 +Author: Yagami +Date: Wed Dec 19 11:17:17 2018 +0800 + + * Fix common config bug. + +commit 4ac74dddf9bcd498b7a345292e87e93f20c88f28 +Merge: 252ad1ef8e f5dbf291cb +Author: chenfeiCF +Date: Wed Dec 19 11:13:15 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 252ad1ef8e2aa726543eb08d810feeee0361baf9 +Author: chenfeiCF +Date: Wed Dec 19 11:12:28 2018 +0800 + + * Adjust for task #5162. + +commit f5dbf291cbaf30190e678356eb01a9dbb7d7066d +Merge: 20f7e52241 9844466a49 +Author: Yagami +Date: Wed Dec 19 11:11:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 20f7e52241e46ada43b3424a36e7412a3d5c1470 +Author: Yagami +Date: Wed Dec 19 11:10:45 2018 +0800 + + * Fix download xxd bugs. + +commit 9844466a49d219616e19f95ed92c4489d0c29885 +Author: wangyidong +Date: Wed Dec 19 10:41:53 2018 +0800 + + * adjust construct for pclzip. + +commit 619a8302626fde3dfb801b0276ad304ecc611b2f +Merge: ad609850ab 8543a1458b +Author: wangyidong +Date: Tue Dec 18 17:21:57 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ad609850ab132c282ad9d14078f014b5decf7603 +Author: wangyidong +Date: Tue Dec 18 17:20:57 2018 +0800 + + * code for task #5156,5147. + +commit 8543a1458b71f69b6eaa02ea18809aa0ecc64eb7 +Merge: 9795502bae 7eab5eefa8 +Author: reneeteng +Date: Tue Dec 18 16:57:14 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9795502bae074c7a1253faf4c5329318600593e4 +Author: reneeteng +Date: Tue Dec 18 16:56:15 2018 +0800 + + * COST lang change. + +commit 7eab5eefa86e98ba70cf64baae17c6e231218ce7 +Merge: 37c96cbfa6 b8b0a777f8 +Author: chenfeiCF +Date: Tue Dec 18 14:32:49 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 37c96cbfa67c2c59da850deb55cea139886ea47b +Author: chenfeiCF +Date: Tue Dec 18 14:32:10 2018 +0800 + + * Code for task #5156. + +commit b8b0a777f8f8444576fdc5af2e7c80b508680f47 +Merge: da8ab3422b d055231fde +Author: Yagami +Date: Tue Dec 18 14:17:29 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit da8ab3422b33f0b439ef0747e10bbe7fe8ec2916 +Author: Yagami +Date: Tue Dec 18 14:17:09 2018 +0800 + + * Add common lang. + +commit d055231fde5878c3cb351603121d24a3b6ec89f0 +Merge: 5b611cd068 893d43841b +Author: chenfeiCF +Date: Tue Dec 18 14:16:52 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5b611cd068722daaaa2c7974f66052a59119b06d +Author: chenfeiCF +Date: Tue Dec 18 14:15:14 2018 +0800 + + * Code for task #5156. + +commit 893d43841b604b634a4de3626bdaf35946c2c131 +Merge: d347e5c4a8 85b1d94fc7 +Author: Catouse +Date: Tue Dec 18 14:08:16 2018 +0800 + + Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms + +commit d347e5c4a824999c928144b2aec4ecdedb6d8887 +Author: Catouse +Date: Tue Dec 18 14:08:09 2018 +0800 + + * fix position of highlight item in chosen menu. + +commit 85b1d94fc74a9d96de525dd7ac1585d5dd9a912b +Merge: 841aa291f1 c118412647 +Author: Yagami +Date: Tue Dec 18 13:55:26 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 841aa291f109f87343e6b7ba384d51528117c99b +Author: Yagami +Date: Tue Dec 18 13:55:08 2018 +0800 + + * Fix bug,story create view. + +commit c1184126475e79fdc1aaf5260d0ea734a2af512d +Merge: bd7ed14146 859dd51596 +Author: wangyidong +Date: Tue Dec 18 13:51:34 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bd7ed141464d181050dd00249a7fadd129c33a35 +Author: wangyidong +Date: Tue Dec 18 13:50:56 2018 +0800 + + * delete useless file when upgrade. + +commit 859dd5159620149ef0224ccab075fda94ab15b24 +Author: Yagami +Date: Tue Dec 18 13:39:09 2018 +0800 + + * Fix bug and story js file. + +commit da327c30ae9189d74b64572f6fc30fa3a4ec9d08 +Author: Yagami +Date: Tue Dec 18 13:35:48 2018 +0800 + + * Finish bug, story view css. + +commit 5e749b2171e71b9f01f2e1bb18cd2655b1d7b861 +Merge: 857b71ffec e6bd9c4ae9 +Author: Yagami +Date: Tue Dec 18 13:08:20 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 857b71ffecae0289effbff8075de795b5e85e90c +Author: Yagami +Date: Tue Dec 18 13:07:37 2018 +0800 + + * Fix xuanxuan card header width. + +commit e6bd9c4ae935be4995ff8bf39f3b22387da97ceb +Author: wangyidong +Date: Tue Dec 18 13:03:50 2018 +0800 + + * adjust for doc and testcase view page in card. + +commit bcf24e9f50343c93b0eea36a6b801384ec65acdf +Author: Yagami +Date: Tue Dec 18 11:15:10 2018 +0800 + + * Finish xuanxuan bug view. + +commit 25ffec7ee2d45ad638e61d227abcfd325302ac63 +Author: Yagami +Date: Tue Dec 18 10:24:49 2018 +0800 + + * Finish xuanxuan bug view. + +commit 7c74014d005a1b4e5cae47ab97b716a66c88cd5d +Author: wangyidong +Date: Mon Dec 17 17:17:34 2018 +0800 + + * adjust for get css and js in xhtml. + +commit cb3a387e15263910d46955a8269f02f7c5375924 +Author: wangyidong +Date: Mon Dec 17 16:58:14 2018 +0800 + + * fix for getJS and getCSS in xhtml. + +commit 48fde44e1f29d3f28a13c6069047681c933ddf9e +Author: wangyidong +Date: Mon Dec 17 16:32:55 2018 +0800 + + * adjust for display param. + +commit 3f7603a48370d3e266f3c0d9a6f548cb0d978184 +Merge: 201e157ffd 64d1c0b3b9 +Author: wangyidong +Date: Mon Dec 17 15:42:29 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 201e157ffd435feb7f98c4d137ab86cf1a958e68 +Author: wangyidong +Date: Mon Dec 17 15:39:49 2018 +0800 + + * adjust for doc and testtask view for xuanxuan. + +commit 14bb43df14e14612516d2d42fcace9ef8bb83025 +Author: wangyidong +Date: Mon Dec 17 15:34:33 2018 +0800 + + * adjust for card. + +commit 64d1c0b3b96921139fde4e63ef4014707783c314 +Author: Yagami +Date: Mon Dec 17 13:38:50 2018 +0800 + + * Fix xuanxuan config. + +commit 480883e61a450924148369b0318759e2ce1a090e +Merge: a0313f93e1 619f3970bb +Author: Yagami +Date: Mon Dec 17 10:50:30 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a0313f93e106e5be6df0d3b99aaf6afdf37f79f9 +Author: Yagami +Date: Mon Dec 17 10:50:12 2018 +0800 + + * Finish xuanxuan bug view. + +commit 619f3970bb62749a1abff8a2deacb47b2fb6fdeb +Author: wangyidong +Date: Mon Dec 17 10:41:00 2018 +0800 + + * adjust for get extensions. + +commit d8fcc19b6042e04938e370e095f1071eb89e2aaa +Author: chenfeiCF +Date: Fri Dec 14 16:24:59 2018 +0800 + + * Show download client title instead of the icon. + +commit b77b5b00558799f7db36b017da5b05c1e936986c +Author: chenfeiCF +Date: Fri Dec 14 16:11:11 2018 +0800 + + * Finish task #5164. + +commit c254b9acbad9f31a8ac620d7800be25b42046d25 +Author: wangyidong +Date: Fri Dec 14 15:55:35 2018 +0800 + + * adjust for xuanxuan card. + +commit d20dfa0b0550240916c945ea9ff200b7e2df5377 +Merge: ee83d6b495 f60f5b5bfb +Author: wangyidong +Date: Fri Dec 14 15:43:57 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ee83d6b495bebcf80f4bf750c65606fab31b8ae1 +Author: wangyidong +Date: Fri Dec 14 15:41:01 2018 +0800 + + * adjust for testcase xx view page. + +commit dba1cbb7a116f80da19891cef01b9ff0c93ed10e +Author: wangyidong +Date: Fri Dec 14 15:37:52 2018 +0800 + + * add for doc/testcase/todo xuanxuan view page. + +commit 2eb32fd6ba922c20eca22dcdfbca2dd702e742f0 +Author: wangyidong +Date: Fri Dec 14 15:37:15 2018 +0800 + + * fix bug for block. + +commit 8f9fea0cd8bcaf1159146f581e223934eaab5894 +Author: wangyidong +Date: Fri Dec 14 15:30:43 2018 +0800 + + * adjust for link xuanxuan. + +commit f60f5b5bfb46fb680a29a6d363b5ac5e19520e43 +Author: Yagami +Date: Fri Dec 14 14:50:34 2018 +0800 + + * Fix xuanxuan lang file. + +commit ca19df46c1e40e820fb3aedf823924ef5c2f4647 +Merge: 80a896dbc4 6c48f06b07 +Author: Yagami +Date: Fri Dec 14 14:34:14 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 80a896dbc406b9e45fe1d42708d37c144aba7cbd +Author: Yagami +Date: Fri Dec 14 14:33:38 2018 +0800 + + * Fix setting xuanxuan method. + +commit 6c48f06b07a0724110f15d26df710b4932b0364d +Merge: 7a31343c09 a1f0e21fd2 +Author: wangyidong +Date: Thu Dec 13 17:23:01 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7a31343c0946969112b20bd92b5716cd93133ec1 +Author: wangyidong +Date: Thu Dec 13 17:22:31 2018 +0800 + + * remove display param. + +commit 552920fb6f5c8356bdbf65bbb053ef6646fdeeb7 +Author: wangyidong +Date: Thu Dec 13 17:20:10 2018 +0800 + + * add zentao-integrated package. + +commit a1f0e21fd21a0369985d7d7560c4c789bad62f60 +Merge: 6b72b4b62d 412e7e5bc3 +Author: reneeteng +Date: Thu Dec 13 17:03:24 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6b72b4b62defcdc7dee7f445b5a261df1a6d3f67 +Author: reneeteng +Date: Thu Dec 13 17:01:22 2018 +0800 + + * Change lang. + +commit 3cb9c120fbff4aeb73820f15e0704d65aa9d8016 +Author: wangyidong +Date: Thu Dec 13 16:28:02 2018 +0800 + + * adjust for xuanxuan. + +commit 412e7e5bc359b253b48e763a1267c2969362dc4d +Merge: c6c0e2fd11 e93eba9bff +Author: Yagami +Date: Thu Dec 13 15:50:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c6c0e2fd115e80650aad99dcf248f3763de86775 +Author: Yagami +Date: Thu Dec 13 15:49:39 2018 +0800 + + * Change common footer to hook. + +commit e93eba9bff3c05bfd4e550a28e49b759966bc5d6 +Merge: f214a07e3f b04606130d +Author: wangyidong +Date: Thu Dec 13 15:31:11 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f214a07e3f56220fb43bf179b5985030011eb56d +Author: wangyidong +Date: Thu Dec 13 15:29:47 2018 +0800 + + * change for xx sso zentao. + +commit b04606130d0ba05ed2e24f11e80f7add89decc7c +Merge: fe128e1c95 0e2e1f57ed +Author: Yagami +Date: Thu Dec 13 09:58:04 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fe128e1c95a909bbdf2bfec51d8b6f8ba41f9ba7 +Merge: 369a40c242 79b442d71a +Author: Yagami +Date: Thu Dec 13 09:26:40 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0e2e1f57ed700fcbf17236ad100429f070399202 +Author: wangyidong +Date: Thu Dec 13 09:25:54 2018 +0800 + + * finish task #2340. + +commit 369a40c24265f652a01275e0a2a7c95d5193bc38 +Author: Yagami +Date: Thu Dec 13 09:24:53 2018 +0800 + + * Finish task #5160. + +commit 79b442d71a3071e506e05139efdc0b8e2414d41a +Author: wangyidong +Date: Wed Dec 12 17:55:24 2018 +0800 + + * adjust for task #5152. + +commit 699e5458d02dc5ce543cdd9d2658e2e9bf18fb55 +Author: Yagami +Date: Wed Dec 12 17:12:43 2018 +0800 + + * Finish task #5149. + +commit 83465688f87639565d9e79f4bbdeffdcbb359623 +Author: Yagami +Date: Wed Dec 12 16:56:08 2018 +0800 + + * Finish task #5148. + +commit 55d9d0fb6f72e0479ddba4508db6d024014ae632 +Merge: 87209adcb7 5307a1fd6c +Author: wangyidong +Date: Wed Dec 12 16:40:38 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 87209adcb7ccb55160ebb17d86f1edd9bd1fe91e +Author: wangyidong +Date: Wed Dec 12 16:39:34 2018 +0800 + + * finish task #5152. + +commit 5307a1fd6c6f64a0cf0110bbbfde2f5e77fedd50 +Author: Yagami +Date: Wed Dec 12 15:20:52 2018 +0800 + + * Finish task #5150. + +commit 8208a1ea42ab7c7e8befbfa09f4228e1e15ccfea +Merge: 9f48f58bb0 89409fe3ef +Author: Yagami +Date: Wed Dec 12 10:58:05 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9f48f58bb01b01735eb81ebde1cbdea4ce16c782 +Author: Yagami +Date: Wed Dec 12 10:57:54 2018 +0800 + + * Fix xuanxuan bug. + +commit 89409fe3efcb6da35b7b3851949e4308bb6da685 +Author: wangyidong +Date: Tue Dec 11 16:38:03 2018 +0800 + + * change for supper xhtml. + +commit dfe6066d78f941521d0a9b06db9e9ae58d7a8274 +Merge: 672b811fe0 d0637a83c3 +Author: wangyidong +Date: Tue Dec 11 08:55:20 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d0637a83c3a9f81556898d93190e3009ae3ad85a +Author: chenfeiCF +Date: Mon Dec 10 15:04:05 2018 +0800 + + * Finish task #5162. + +commit 672b811fe0640661ecdb47b9e1139c9dd135a5f2 +Author: wangyidong +Date: Mon Dec 10 10:25:11 2018 +0800 + + * fix bug #2320. + +commit a46b37266c27fb8dfdf9408cb14c13d56d20c679 +Author: wangyidong +Date: Mon Dec 10 10:01:53 2018 +0800 + + * fix bug #2247. + +commit 641e48d2d66a448a09475d3a45d07e1cfd3765fd +Merge: 71e7c86e3a 1974dc2c17 +Author: wangyidong +Date: Mon Dec 10 09:45:38 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 71e7c86e3ab9c5e5b992f2d966aab796a374e7a9 +Author: wangyidong +Date: Mon Dec 10 09:44:44 2018 +0800 + + * fix bug #2318. + +commit 1974dc2c1779440db1c2444374b8156196cfe6e1 +Merge: e08e8fa353 7e5e4577ec +Author: Yagami +Date: Mon Dec 10 09:15:16 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e08e8fa353fdcc7ef8eb781d18431fd9b1491057 +Author: Yagami +Date: Mon Dec 10 09:14:57 2018 +0800 + + * Fix downloadxxd view. + +commit 7e5e4577ec3887abf92d5bf0a037572f62aaf3e1 +Merge: 462e273a9c ba34a24db6 +Author: wangyidong +Date: Mon Dec 10 09:11:40 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 462e273a9ce5e49b170836b11212e4ccdc300c22 +Author: wangyidong +Date: Mon Dec 10 09:11:07 2018 +0800 + + * finish bug #2330. + +commit ba34a24db6a7898cef6af5bb88599d677ad820f5 +Author: chenfeiCF +Date: Sun Dec 9 19:16:09 2018 +0800 + + * Code for task #5162. + +commit 3e74b163984954998b0373e6554af4c2603324d7 +Author: wangyidong +Date: Fri Dec 7 14:52:59 2018 +0800 + + * adjust for Notification. + +commit a34f925fc57b57f8927638b07122ad224fa480ed +Author: wangyidong +Date: Fri Dec 7 14:51:47 2018 +0800 + + * finish task #5158. + +commit f476a0acc91877f435c98747b46c259dae53b565 +Author: chenfeiCF +Date: Thu Dec 6 18:58:15 2018 +0800 + + * Code for task #5162. + +commit 0a8622231fba0d56421958617bc3cc112d93886b +Author: Yagami +Date: Thu Dec 6 10:53:16 2018 +0800 + + * Finish task #5163,5160. + +commit 930bca4a119da209553ab7a088e44a75426018c0 +Merge: adc63ba1fb 0c8f891767 +Author: Yagami +Date: Wed Dec 5 14:58:45 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit adc63ba1fb08dc9395e60f72c8fb33ed2ba53ed7 +Author: Yagami +Date: Wed Dec 5 14:57:48 2018 +0800 + + * Finish task #5163. + +commit 0c8f891767dd3b7bfd88bf09b26dbb5b9e851a48 +Author: wangyidong +Date: Wed Dec 5 14:49:13 2018 +0800 + + * finish task #5158. + +commit efdce81b193d9a9e11fa9ba2c79032f1d3a2875e +Author: chenfeiCF +Date: Wed Dec 5 10:43:17 2018 +0800 + + * Add zentao extension for xuanxuan and modified Makefile. + +commit a05b7d4d4e6b814ba5df0fc94a5e8046152dd3f0 +Author: chenfeiCF +Date: Tue Dec 4 15:52:00 2018 +0800 + + * Add download client method. + +commit aab0d16d1418c8fc205cf15dcbeb917fbbf3513b +Merge: d4b4e911c0 854caa780e +Author: chenfeiCF +Date: Tue Dec 4 14:52:03 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d4b4e911c06b0f5c7046729d316edfcaa740cca3 +Author: chenfeiCF +Date: Tue Dec 4 14:46:34 2018 +0800 + + * Code for task #5162. + +commit 854caa780e446d4a3955ac7ce10aefe37d5fb1d2 +Author: wangyidong +Date: Tue Dec 4 14:15:16 2018 +0800 + + * adjust for 10.1 standard sql. + +commit 8e296a179b0105ca64e812a50e0696ccd7a443c9 +Author: Yagami +Date: Tue Dec 4 10:42:33 2018 +0800 + + * Delete message modified. + +commit 930c89e6f9c0f3148205bd352e48048bbc3a812c +Author: Yagami +Date: Tue Dec 4 10:16:45 2018 +0800 + + * Add zentao client setting. + +commit ae1466a9d4cc80bafc5364586ebef89df2028271 +Author: Yagami +Date: Mon Dec 3 10:16:18 2018 +0800 + + * Fix bug #2313. + +commit 9db7dbd35cfb74323e27063f253609290b0ac56e +Author: Yagami +Date: Mon Dec 3 09:33:27 2018 +0800 + + * Fix doc view css. + +commit e77c2831ebe4ded67d69031d6af23f5e194ebc23 +Merge: 1616c75317 c6d628164e +Author: Yagami +Date: Mon Dec 3 09:05:49 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1616c75317f052e6d5d1a1fa887957ff38ca0913 +Merge: 10f320c56c 326fb72494 +Author: Yagami +Date: Mon Dec 3 08:57:06 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c6d628164e24d3097c20026bc6870aa1453b1434 +Author: wangyidong +Date: Fri Nov 30 10:57:43 2018 +0800 + + * change for zh-tw lang. + +commit 9dece26563a2e83818a53a29910420ffafce5f3f +Merge: b0734bc5b8 326fb72494 +Author: wangyidong +Date: Thu Nov 29 09:53:02 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b0734bc5b8afce351d1d6ec2bbbc83c192b0165c +Author: wangyidong +Date: Thu Nov 29 09:52:36 2018 +0800 + + * fix bug. + +commit 10f320c56c210bfcf2273498e13dc85910334cdc +Author: Yagami +Date: Wed Nov 28 17:24:50 2018 +0800 + + * Fix feedback bug. + +commit 326fb7249407fd61ad6ab30a8d305966187d7181 +Merge: 732f7caa68 ddef43324a +Author: reneeteng +Date: Wed Nov 28 15:49:24 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 732f7caa68a45ff65761e7dc7b8e7f398974fa62 +Author: reneeteng +Date: Wed Nov 28 15:48:58 2018 +0800 + + *Minor change. + +commit ddef43324afcd11163b75c9e2faffc15b1fb1a3a +Author: Yagami +Date: Wed Nov 28 15:12:03 2018 +0800 + + * Fix feedback moudle placeholder. + +commit a287a86e8588c69cb3680fb924909656a1b594e0 +Author: Yagami +Date: Wed Nov 28 13:49:10 2018 +0800 + + * Fix module for feedback. + +commit fb9e498ef6392b48df08b444fac96ae7e0a5861c +Merge: f65f6db2a4 c617950ac2 +Author: Yagami +Date: Wed Nov 28 13:05:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f65f6db2a4eefa5fb70dfa93fe21b8c7d9ff1d90 +Author: Yagami +Date: Wed Nov 28 13:04:45 2018 +0800 + + * Add module to feedback. + +commit c617950ac20cb38b2b7e341b2dba2d88f5cb02fd +Author: wangyidong +Date: Wed Nov 28 08:57:04 2018 +0800 + + * adjust code. + +commit f69fd87feb9bc9cd32ce20e86a4ea2d512641d44 +Author: wangyidong +Date: Tue Nov 27 09:03:01 2018 +0800 + + * fix bug. + +commit 78441e51f97505fceb928b9871d79ab6f7ff02ce +Author: wangyidong +Date: Mon Nov 26 10:46:25 2018 +0800 + + * adjust for product statistic block. + +commit 4aa5c9e11b73ac7189ca95af556c55f0da3ffb96 +Merge: 2ffaaa91a7 7bc823d490 +Author: reneeteng +Date: Mon Nov 26 09:55:15 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2ffaaa91a7e83bcc6b89bf56efc37b0b8a5be139 +Author: reneeteng +Date: Mon Nov 26 09:54:27 2018 +0800 + + * Extension lang changed. + +commit 7bc823d4902e8de5c80938c2a5fbb165a237e2d2 +Author: wangyidong +Date: Mon Nov 26 09:01:16 2018 +0800 + + * fix bugs. + +commit 83f8947ef734a01982c9b0c7fec94f13978cdd64 +Merge: d7dde0bc00 8fb75c353a +Author: Yagami +Date: Fri Nov 23 14:56:44 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d7dde0bc00a25c0783e9f25f8a179b6c3a3165bf +Author: Yagami +Date: Fri Nov 23 14:56:23 2018 +0800 + + * Fix bug #2307. + +commit 8fb75c353a879f1949b210cb63bc4c10437a2c6b +Merge: 92854b5e5b 0009f5cc66 +Author: wangyidong +Date: Fri Nov 23 10:48:28 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 92854b5e5b477b8e91708c6988200b5df0fe98c5 +Author: wangyidong +Date: Fri Nov 23 10:48:01 2018 +0800 + + * adjust for zbox curl. + +commit 0009f5cc6616dcde3edd9bfbfc28ae5954a4e528 +Author: Yagami +Date: Fri Nov 23 09:18:39 2018 +0800 + + * Fix bug #2305. + +commit 78b165cd62d12f8d08f0bf36fad23b6aaa71c033 +Author: wangyidong +Date: Thu Nov 22 16:22:25 2018 +0800 + + * adjust for check consistency. + +commit ad0eb0a7ba37569224c327f418834665257fd711 (tag: zentaopms_10.6.stable_20181120) +Author: wangyidong +Date: Tue Nov 20 15:05:36 2018 +0800 + + * add new version and upgrade. + +commit 4473c05556a55ca0fe571e32e9d1559fdd2f7b2e +Merge: 1a3c4f7af5 47f0af8005 +Author: Yagami +Date: Tue Nov 20 14:12:59 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 47f0af80057a4a5d105aef6230c24cf21a8095eb +Merge: 6df216b795 6b1f94243f +Author: wangyidong +Date: Tue Nov 20 14:06:43 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6df216b795a8239b6a13fb919b36eb4bc4f13764 +Author: wangyidong +Date: Tue Nov 20 14:05:56 2018 +0800 + + * adjust code for link doc. + +commit 1a3c4f7af55116792666a6329e4fb73e2fab1218 +Author: Yagami +Date: Tue Nov 20 13:58:29 2018 +0800 + + * Fix qa index css and doc lang. + +commit 6b1f94243f4cc3c41ecaacb3fd8ffd9424577f54 +Author: Catouse +Date: Tue Nov 20 13:35:46 2018 +0800 + + * improve severity label style. + +commit 652fdcba6ead7e664050d78117c9be9d2c40e1a6 +Author: Catouse +Date: Tue Nov 20 12:09:01 2018 +0800 + + * code for task #5116. + +commit 001d8109845823993fa7c58c5f8eac23f274a6d8 +Merge: f570a5872f e3e0e17a5e +Author: Catouse +Date: Tue Nov 20 11:57:01 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + # Conflicts: + # module/block/view/productstatisticblock.html.php + # module/block/view/projectstatisticblock.html.php + +commit f570a5872fa557b17c8cf99fcdc5f9adde2479d8 +Author: Catouse +Date: Tue Nov 20 11:56:33 2018 +0800 + + * code for task #5116. + +commit e3e0e17a5ee404ef358f09ca89a13a73a56a2424 +Merge: 7e871f2e95 95408a4142 +Author: Yagami +Date: Tue Nov 20 11:18:21 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7e871f2e95dfea196df86a43105ad65a57b0f93d +Author: Yagami +Date: Tue Nov 20 11:14:52 2018 +0800 + + * Fix index project block. + +commit 95408a4142559d5b18d1b8015e94b3ac2d01a438 +Author: chenfeiCF +Date: Tue Nov 20 11:14:06 2018 +0800 + + * Adjust code. + +commit 470e5d4e86e0feb6ea93e3a5ac75d3a232b0c70d +Author: Catouse +Date: Tue Nov 20 10:49:54 2018 +0800 + + * improve UI of statistic blocks. + +commit 391838d5b52ae39d6ee70fb9c7e11a506316110b +Author: Catouse +Date: Tue Nov 20 10:43:18 2018 +0800 + + * code for task #5074. + +commit 5a74a30ec3bfaebed29fd336a69e56ae0a497da2 +Merge: 6480f58375 3563237275 +Author: Catouse +Date: Tue Nov 20 10:34:59 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6480f583752e7e7973a0a944e0fb1ba66369b86f +Author: Catouse +Date: Tue Nov 20 10:34:54 2018 +0800 + + * improve create btn style in dashboard. + +commit 35632372759a329ab1abf27f6c384148944c2788 +Author: Yagami +Date: Tue Nov 20 10:19:53 2018 +0800 + + * Fix doc fullscreen. + +commit 8cd37c37e19f51a9d86ffe43265e4918b4b96d07 +Author: chenfeiCF +Date: Tue Nov 20 10:12:15 2018 +0800 + + * Adjust code for task #5060. + +commit 58ddcf54896166b7fca07daead9c3586ba7c6980 +Author: wangyidong +Date: Tue Nov 20 09:53:44 2018 +0800 + + * code for get extensions by api. + +commit 1bd0234675aabcd75f7678851969bc261d539477 +Merge: c32562cc46 68840fe795 +Author: Catouse +Date: Tue Nov 20 09:43:27 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c32562cc46e12bee8f09002654908b281de376dd +Author: Catouse +Date: Tue Nov 20 09:43:22 2018 +0800 + + * fix divider in actions toolbar. + +commit 68840fe795718de887e799214242d4a4352d3793 +Merge: 56e8978654 07053781c6 +Author: Yagami +Date: Tue Nov 20 09:30:21 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 56e8978654ea1eae7372187af69d9254ab13d0d7 +Author: Yagami +Date: Tue Nov 20 09:29:50 2018 +0800 + + * Fix doc fullscreen. + +commit 07053781c64ed519d23e60070d77105b6511e192 +Merge: 56b5881790 00c74cba26 +Author: wangyidong +Date: Tue Nov 20 09:25:29 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 56b5881790b9f9a5c855d41a38caa0801f13b617 +Author: wangyidong +Date: Tue Nov 20 09:24:28 2018 +0800 + + * adjust for url card position. + +commit 00c74cba2699e448daaa556aa983dad1bc123212 +Author: Catouse +Date: Tue Nov 20 09:10:51 2018 +0800 + + * code for task #5086. + +commit b8ccb1542e27dbc8c709d851ab5e5b2dc118ea96 +Author: Catouse +Date: Tue Nov 20 09:10:12 2018 +0800 + + * code for task #5074. + +commit e87f44e6af53a84e596509714d847c16b7ebeb2c +Author: Catouse +Date: Tue Nov 20 08:59:00 2018 +0800 + + * code for task #5086. + +commit 6c447de480012e1dbfb65c58a86760e87569e834 +Author: wangyidong +Date: Mon Nov 19 17:25:29 2018 +0800 + + * code for dev group. + +commit e576594489db6ae80b2cd662a93d33f854b838e1 +Author: wangyidong +Date: Mon Nov 19 16:54:02 2018 +0800 + + * code for remove isdoing param. + +commit b58fb37eb3b1a3ae32e1e7b1bfdda4d6e3033aa2 +Merge: 81c64773b4 043189a376 +Author: wangyidong +Date: Mon Nov 19 16:37:42 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 81c64773b43f716e266d35d0d1c6cd3f7f345348 +Author: wangyidong +Date: Mon Nov 19 16:37:21 2018 +0800 + + * adjust code for backup. + +commit 043189a3763f1586094305f5877b3619297732e4 +Merge: 6fbc3adee1 18452bba9c +Author: Yagami +Date: Mon Nov 19 16:14:34 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6fbc3adee10c14a30dd565fd99825d9b8a1a8efc +Author: Yagami +Date: Mon Nov 19 16:13:53 2018 +0800 + + * Fix upgrade 10.6 logic. + +commit 18452bba9c0d3738b0ac88a25ef0c48d0b8189fe +Author: chenfeiCF +Date: Mon Nov 19 16:07:45 2018 +0800 + + * Adjust for task #5106. + +commit 6e71947629f2d47353d5615467c01414ff543628 +Author: Yagami +Date: Mon Nov 19 16:00:52 2018 +0800 + + * Fix testtask action. + +commit 7b89f7a1fcf6013cb85d071124813c3dd88907be +Author: Catouse +Date: Mon Nov 19 15:53:48 2018 +0800 + + * fix #module dropdown not hide when #lib chosen dropdown show. + +commit 8be7a334bf741ccbb540aef4fd20836127cc27fa +Merge: fbcbf1d364 dddbb2e523 +Author: Catouse +Date: Mon Nov 19 15:46:57 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + # Conflicts: + # module/tree/view/edit.html.php + +commit fbcbf1d364a2a64d792d7815faf9219d757d3110 +Author: Catouse +Date: Mon Nov 19 15:46:31 2018 +0800 + + * fix #parent dropdown not hide when #root chosen dropdown show. + +commit dddbb2e523b7662db2d8c260052208a9b0a7ac11 +Merge: e510114d28 9f94105a8c +Author: wangyidong +Date: Mon Nov 19 15:44:54 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e510114d287bf225fb0376bd53aac84df9807c8c +Author: wangyidong +Date: Mon Nov 19 15:44:30 2018 +0800 + + * adjust code for backup. + +commit 9f94105a8c0f6a80af9f36e6bf2190ab96b3f776 +Author: Yagami +Date: Mon Nov 19 15:36:21 2018 +0800 + + * Fix review story field display. + +commit c147ea7296e89bbe4120ddd1c38f0c4bd0a8ed0b +Author: Yagami +Date: Mon Nov 19 15:27:29 2018 +0800 + + * Fix doc view css. + +commit 1d72c2ef7108aab2f210425ebb28427a159b04fd +Merge: ecf4ffafe1 af1124ab3f +Author: Yagami +Date: Mon Nov 19 15:23:44 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ecf4ffafe16a9fef415e8d1f138502bbc6e30b2f +Author: Yagami +Date: Mon Nov 19 15:23:21 2018 +0800 + + * Fix doc getlibs method. + +commit af1124ab3f4958fbbdef5b0660ec219a4221180b +Author: chenfeiCF +Date: Mon Nov 19 15:18:56 2018 +0800 + + * Code for task #5081. + +commit 0a1f17db54099647a92157f349fcf42baf2245f4 +Merge: defe22ca46 072f46710c +Author: Yagami +Date: Mon Nov 19 14:51:00 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit defe22ca46f77c7e20e177054e0a725016bf65a0 +Author: Yagami +Date: Mon Nov 19 14:50:32 2018 +0800 + + * Fix block link. + +commit dd334ee1610212c2738fe6d9583b9e5b8d7b3c36 +Merge: 4809e3d1ea 072f46710c +Author: wangyidong +Date: Mon Nov 19 14:44:53 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4809e3d1ea95e494e218ddf4c7b403973163e7b6 +Author: wangyidong +Date: Mon Nov 19 14:43:49 2018 +0800 + + * adjust code. + +commit 072f46710cf581e8a8f2ee84ce129a58097e5aaa +Author: chenfeiCF +Date: Mon Nov 19 14:37:48 2018 +0800 + + * Finish task #5132. + +commit 7e7a6a1ba578ebdc4250ce4d50730e71d28d6927 +Merge: a3513f0b34 18aada4921 +Author: Catouse +Date: Mon Nov 19 10:14:42 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a3513f0b3485b072d904cc8e435024fbba6ea9bf +Author: Catouse +Date: Mon Nov 19 10:14:36 2018 +0800 + + * code for task #5094. + +commit 18aada49217d7b4620dabd764c07c6916be36032 +Author: Renee +Date: Mon Nov 19 10:07:32 2018 +0800 + + Update README + + Update urls and lang + +commit f9db113a0b53423b3d17d190b84a59677e5c8a30 +Merge: b6e41d22c3 8f0288be13 +Author: Catouse +Date: Fri Nov 16 16:34:18 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b6e41d22c325dfc2113bb2418793308994290dee +Author: Catouse +Date: Fri Nov 16 16:34:12 2018 +0800 + + * code for task #5060. + +commit 8f0288be1307a7dd55a5191dc8bebbb50ae93e5e +Merge: 9c8bdabaaa 5f8caaec24 +Author: wangyidong +Date: Fri Nov 16 16:24:42 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9c8bdabaaa3c9d9ccf3261b95b396e61c44ba226 +Author: wangyidong +Date: Fri Nov 16 16:24:14 2018 +0800 + + * fix bug #2298. + +commit 5f8caaec24c9253a01d76215b651cd267f27a6dd +Author: Yagami +Date: Fri Nov 16 16:23:30 2018 +0800 + + * Fix bug #2278. + +commit a2b8ad8957e4bcb06aaa7a73263f0b89254f0991 +Merge: 6ca663dc51 3fd9896407 +Author: Yagami +Date: Fri Nov 16 15:30:52 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6ca663dc5173f7d38ed7243a767e70974e61d622 +Author: Yagami +Date: Fri Nov 16 15:05:42 2018 +0800 + + * Fix bug #2279. + +commit 3fd9896407f52da2bda60a085ccc5211be71ae8d +Merge: 57f9f1322e 190398b7d9 +Author: wangyidong +Date: Fri Nov 16 15:00:24 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 57f9f1322e894ef33d7d786bc3c5a481226ca166 +Author: wangyidong +Date: Fri Nov 16 14:57:41 2018 +0800 + + * fix bug for testreport edit. + +commit 190398b7d9c3418a432cd214afd24a6a1e581ccc +Author: Yagami +Date: Fri Nov 16 14:56:01 2018 +0800 + + * Fix bug #2280. + +commit 03fb21c7106c85170a68d1cfe86f0a2ecca90956 +Merge: 0cedebe922 051db182d8 +Author: chenfeiCF +Date: Fri Nov 16 13:24:59 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0cedebe922c4e10c972e6f35619e59ee6fad685c +Author: chenfeiCF +Date: Fri Nov 16 13:23:28 2018 +0800 + + * Set min-width for groupAndOr of search form. + +commit 051db182d8d8e113c19ab3b21b03a8104b4ca053 +Author: wangyidong +Date: Fri Nov 16 13:23:19 2018 +0800 + + * fix bug #2283. + +commit 250088121ddf4ec7efa92602e9cabe4f7e9229f4 +Merge: a60bf79ba3 be110033d6 +Author: wangyidong +Date: Fri Nov 16 13:13:59 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a60bf79ba3a389dbbea4db421b6ae957f194fade +Author: wangyidong +Date: Fri Nov 16 13:13:32 2018 +0800 + + * fix bug #2285. + +commit be110033d6af5f4795bb043db484041ff4eb16b1 +Merge: 0d376d0f52 8c2c63bb63 +Author: Yagami +Date: Fri Nov 16 13:07:17 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0d376d0f5214a25dee2023d66d5556b0e764a26a +Author: Yagami +Date: Fri Nov 16 13:06:59 2018 +0800 + + * Fix bug #2288. + +commit 8c2c63bb6326c85aeeddf646047e863e8ed16e18 +Merge: 87b17af92c 8c17b6c61b +Author: Catouse +Date: Fri Nov 16 11:28:48 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 87b17af92c2f5973576bce4a3d339cc868d29b67 +Author: Catouse +Date: Fri Nov 16 11:28:42 2018 +0800 + + * finish task #5063. + +commit 8c17b6c61b58ed550e099d6a517a073942a94007 +Author: wangyidong +Date: Fri Nov 16 11:25:16 2018 +0800 + + * fix bug #2290. + +commit 22a149dd4432f368a80cf793ee5bd87d5704deab +Author: wangyidong +Date: Fri Nov 16 11:18:33 2018 +0800 + + * fix bug #2230. + +commit 1a39d023f38e0caae6991abb26e7c1ce99b2f291 +Merge: e1bccfb4c0 93bde020e2 +Author: wangyidong +Date: Fri Nov 16 11:02:52 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e1bccfb4c0301754d7ad73acb1eded85896dc649 +Author: wangyidong +Date: Fri Nov 16 11:02:21 2018 +0800 + + * fix bug #2257. + +commit 17365e9a6d43439045fc791a24cb4fca5b193314 +Merge: 7154e289b6 93bde020e2 +Author: Catouse +Date: Fri Nov 16 11:00:50 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7154e289b637acdeee0b85f340c9ffa06c915e1b +Author: Catouse +Date: Fri Nov 16 11:00:43 2018 +0800 + + * adjust style of .article-content element. + +commit d8250402c4f500faa96096daea7259833983fe0d +Author: Catouse +Date: Fri Nov 16 11:00:26 2018 +0800 + + * finish task #5074. + +commit 93bde020e27f03b01cfdc61b3f0581cf4a9de4fc +Author: Yagami +Date: Fri Nov 16 10:19:09 2018 +0800 + + * Fix bug #2294. + +commit 6d03636c693f5ed0e4a1c537dce4e2d162ac2159 +Merge: cdbf1487ac 05a48efe90 +Author: Yagami +Date: Fri Nov 16 09:48:22 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cdbf1487ace2c829b6d0bde90d7a76b16f1192f3 +Author: Yagami +Date: Fri Nov 16 09:47:55 2018 +0800 + + * Fix report empty value. + +commit 05a48efe9089d2dc09e1138e0a51fe7cd7679ac4 +Merge: 0c4c90cfdd 6bb2a93ffc +Author: Catouse +Date: Fri Nov 16 09:46:05 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0c4c90cfddcf8efafc8e3c342d65a34973542a37 +Author: Catouse +Date: Fri Nov 16 09:45:55 2018 +0800 + + * finish task #5094. + +commit 6bb2a93ffcbf875de003fab189c33fe2b353900e +Author: chenfeiCF +Date: Fri Nov 16 09:35:56 2018 +0800 + + * Declare array. + +commit 239644b36285d72887a1b4609aa6697051ab8c2d +Author: chenfeiCF +Date: Fri Nov 16 09:35:30 2018 +0800 + + * Adjust lang item. + +commit f3fe52df6d8216e8d9a459ecfa421d2946dc3237 +Author: Yagami +Date: Fri Nov 16 09:14:58 2018 +0800 + + * Fix bug #2296. + +commit 976e644f9f13817cdb86bc9fa09baf6c2326b4d8 +Merge: bd38aa3e86 f34441056e +Author: wangyidong +Date: Fri Nov 16 08:45:05 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bd38aa3e86d08d496041f5627460677500046174 +Author: wangyidong +Date: Fri Nov 16 08:41:19 2018 +0800 + + * adjust for count method with group by. + +commit f34441056e66fb142063fa84dd6187072fc9f31a +Author: Catouse +Date: Thu Nov 15 18:38:53 2018 +0800 + + * finish task #5089. + +commit 8e1eb69722edb9cbee6b80236719289fa87d7637 +Author: Catouse +Date: Thu Nov 15 18:19:57 2018 +0800 + + * code for task #5103. + +commit daa4c9c7cff6673984860641a73efc89fd85aa43 +Author: Catouse +Date: Thu Nov 15 17:49:06 2018 +0800 + + * format code. + +commit 95e6ca3a604bfd290b2ffc83b613109fc302a00f +Author: Catouse +Date: Thu Nov 15 17:48:57 2018 +0800 + + * fix ajaxform error. + +commit 4385c74bc8890306d31fdebd46ba8a791deae0f0 +Merge: 35dff92f83 d9c1232bd8 +Author: Catouse +Date: Thu Nov 15 17:26:43 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 35dff92f83ac010e0787baca7766b01089ee96c6 +Author: Catouse +Date: Thu Nov 15 17:26:38 2018 +0800 + + * finish task #5107. + +commit d9c1232bd82670304f586cc55e212fb35623d562 +Merge: 1cb6d3b4d0 630d47d93b +Author: wangyidong +Date: Thu Nov 15 16:53:02 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1cb6d3b4d0ced937dfb83dc7c5e11d8f71ce1649 +Author: wangyidong +Date: Thu Nov 15 16:52:32 2018 +0800 + + * adjust for check consistency. + +commit 630d47d93b809d2c6087b412b2f3ac4d36f92b8e +Merge: 3e17336831 514b23c7f4 +Author: Yagami +Date: Thu Nov 15 16:38:43 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 514b23c7f42f2c0deaff5e71d54149e170b5c8f8 +Author: Catouse +Date: Thu Nov 15 16:34:13 2018 +0800 + + * finish task #5115. + +commit 138b2bdafbfbd4fff60856430cf40a96f4520c9a +Author: Catouse +Date: Thu Nov 15 16:25:55 2018 +0800 + + * fix bug #2035 and finish task #5134. + +commit 3e17336831b060741c9b507b72ca90da61338cf4 +Merge: 66ac1b9012 66f6f1d761 +Author: Yagami +Date: Thu Nov 15 16:25:53 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 66ac1b9012452504289ba4456841e2034f0aacbd +Author: Yagami +Date: Thu Nov 15 16:25:37 2018 +0800 + + * Finish task #5116. + +commit 66f6f1d76147a5bfce1d5b61123e735076198c57 +Merge: ceed1e4821 3241b0a970 +Author: Catouse +Date: Thu Nov 15 15:40:03 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ceed1e4821e5d18ab78b15a51ebdaedbb05f3098 +Author: Catouse +Date: Thu Nov 15 15:39:42 2018 +0800 + + * finish task #5141. + +commit 3241b0a970ea169263e0cbf5904d6deecfcf7a8e +Merge: e8af92a166 d2d421c9fb +Author: wangyidong +Date: Thu Nov 15 15:39:03 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e8af92a1669b75d43283780c7122fff613f8f08f +Merge: 8bef03e8f3 8387e49602 +Author: wangyidong +Date: Thu Nov 15 15:38:34 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d2d421c9fb4adc27c31c7ef6ecfa53d0d99ec627 +Merge: e481a5496f 8387e49602 +Author: Yagami +Date: Thu Nov 15 15:36:48 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e481a5496f1f53dccce621ad6110d039ee1966e8 +Author: Yagami +Date: Thu Nov 15 15:36:11 2018 +0800 + + * Finish task #5116. + +commit 8bef03e8f306f247449fd9116d3c918fab922e74 +Author: wangyidong +Date: Thu Nov 15 15:35:19 2018 +0800 + + * finish task #5057. + +commit 8387e4960222a061e66d4df26fba11d00c2bf484 +Merge: 2cf4be7d7b 496964c1b0 +Author: Catouse +Date: Thu Nov 15 15:30:25 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2cf4be7d7b4c619d291403bb46fafd7bdfa9a79f +Author: Catouse +Date: Thu Nov 15 15:29:48 2018 +0800 + + * finish task #5088. + +commit 496964c1b0f724ee2f0a5acc7ae98cc8c653440e +Merge: cefdbaa5d3 9fc889340f +Author: chenfeiCF +Date: Thu Nov 15 15:21:16 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cefdbaa5d36873bb010f03d05d52bc90f8aa6ead +Author: chenfeiCF +Date: Thu Nov 15 15:20:42 2018 +0800 + + * Finish task #5133. + +commit 9fc889340f4e4abbd48d835bf66f7a56f557a9c8 +Author: Catouse +Date: Thu Nov 15 15:19:39 2018 +0800 + + * finish task #5086. + +commit 52ecb55c52bdea3ecdbc4e6cfccfcc2da8d7475e +Merge: aa5031778d 1650ba3592 +Author: Catouse +Date: Thu Nov 15 14:22:49 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit aa5031778d8be54a7ee7e98fbf28a9722cb21187 +Author: Catouse +Date: Thu Nov 15 14:22:43 2018 +0800 + + * finish task #5060. + +commit 1650ba3592eb0695ec698a96a5c49e4086f473d5 +Author: chenfeiCF +Date: Thu Nov 15 14:10:27 2018 +0800 + + * Finish task #5129. + +commit 48f425f1806d52106378e2e1c0a017273b070be9 +Author: chenfeiCF +Date: Thu Nov 15 13:43:28 2018 +0800 + + * Finish task #5128. + +commit c4e1908371524eb2aca013dcb2cccac41abff92d +Author: wangyidong +Date: Thu Nov 15 13:32:54 2018 +0800 + + * adjust for backup. + +commit 691cd7646e5041e6e46ede221dade61694baea20 +Merge: f1db7cd1a8 263153b6c8 +Author: Yagami +Date: Thu Nov 15 13:09:29 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f1db7cd1a8e0d6909fa1f012e14e7141a4e8f9bf +Author: Yagami +Date: Thu Nov 15 13:09:05 2018 +0800 + + * Finish task #5114. + +commit 263153b6c87e7ca6f47b9965c68bcbba995e43cb +Author: chenfeiCF +Date: Thu Nov 15 11:19:33 2018 +0800 + + * Adjust for task #5126. + +commit 4cfcbd291e2ad3e9dcf26fbd6454f4a216a46ac5 +Merge: 9367e36fb9 d2398049d2 +Author: Catouse +Date: Thu Nov 15 11:03:58 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9367e36fb97c3127a8a7678b5106131560c985dd +Author: Catouse +Date: Thu Nov 15 11:03:52 2018 +0800 + + * update ajaxform. + +commit d2398049d2a8ca63299c0091a3d04277d08f42e2 +Merge: ba3430ad67 b94614c9c7 +Author: wangyidong +Date: Thu Nov 15 11:01:33 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ba3430ad67d19c75c6bc19c91921f93b29ffda29 +Author: wangyidong +Date: Thu Nov 15 11:00:50 2018 +0800 + + * adjust for en lang. + +commit b94614c9c762502a6917ba96d64f7cce867aac5f +Author: chenfeiCF +Date: Thu Nov 15 10:59:48 2018 +0800 + + * Finish task #5126. + +commit fa7e25f966368e889d36b21fbb5c583892d8c2f7 +Merge: f772d46bcc 419afb8509 +Author: Yagami +Date: Thu Nov 15 10:35:46 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f772d46bcccb88eeb2641167f8ce4953e7ac1137 +Author: Yagami +Date: Thu Nov 15 10:35:27 2018 +0800 + + * Finish task #5068. + +commit 419afb85090f6eae1df1d8c566d7370851539857 +Author: chenfeiCF +Date: Thu Nov 15 10:34:20 2018 +0800 + + * Finish task #5135. + +commit 22644614e61d9323eccbbbec75032541534af7b6 +Merge: c8c769427a 37e2c1205a +Author: Catouse +Date: Thu Nov 15 10:18:41 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c8c769427af656009e1c6d1dce704c8a49bdabf2 +Author: Catouse +Date: Thu Nov 15 10:18:36 2018 +0800 + + * fix UI of testcase/create view. + +commit f724c7ddb63eebcc28d03cdacd883880ad9c7166 +Author: Catouse +Date: Thu Nov 15 10:18:14 2018 +0800 + + * fix ajaxform not work. + +commit 0c736904d47f98f3b6ee51d60519536263b48a6b +Author: Yagami +Date: Thu Nov 15 10:04:39 2018 +0800 + + * Finish task #5090. + +commit 37e2c1205afd6e3bac87afeb6a7f2134ed587c9f +Merge: b9e4f1c766 43816350b0 +Author: reneeteng +Date: Thu Nov 15 09:57:57 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b9e4f1c766c9442d1542e9da7bec35e5cc6434fa +Author: reneeteng +Date: Thu Nov 15 09:57:30 2018 +0800 + + * Lang optimized. + +commit 43816350b0c361f27db7c7ec8eecd4b11b4af68f +Author: Yagami +Date: Thu Nov 15 09:10:17 2018 +0800 + + * Fix project menu order. + +commit 7bda99a84be063cdd32e39bc44991e793e01a192 +Merge: e6feb5f675 0f455e04bf +Author: Yagami +Date: Thu Nov 15 09:08:25 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e6feb5f675ac1b427098aacec453a0c6222cb4d6 +Author: Yagami +Date: Thu Nov 15 09:08:01 2018 +0800 + + * Fix project menu. + +commit 0f455e04bf8d2015fbff9e85f369cb8499eb74f3 +Merge: f8b08d842b 94c6ecedf6 +Author: reneeteng +Date: Wed Nov 14 16:58:15 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f8b08d842be5c6eaf4aae6601a34e4946ed87bb9 +Author: reneeteng +Date: Wed Nov 14 16:57:42 2018 +0800 + + *Change lang. + +commit 94c6ecedf6730c602351d210bb409838eda51c74 +Merge: 8b71c1ea3a e3efb2e5af +Author: Yagami +Date: Wed Nov 14 16:28:24 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8b71c1ea3aa44765d9d6519de3ddc70091af41ba +Author: Yagami +Date: Wed Nov 14 16:28:07 2018 +0800 + + * Finish task #5142. + +commit e3efb2e5af593542d8309b9bb1ecabd56d2137c9 +Merge: d383aeb1a8 d81aef132c +Author: Catouse +Date: Wed Nov 14 15:30:33 2018 +0800 + + Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms + +commit d383aeb1a8ec7b1493078bf52be909a0b47a5a33 +Author: Catouse +Date: Wed Nov 14 15:30:19 2018 +0800 + + * fix title attribute int datatable not work. + +commit d81aef132ce568f791e8886b2919cb30a5d4e461 +Merge: 65ba8a4786 2771600905 +Author: Yagami +Date: Wed Nov 14 15:21:01 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 65ba8a478688a77429642c8fedff90f9a81778da +Author: Yagami +Date: Wed Nov 14 15:20:39 2018 +0800 + + * Finish task #5077. + +commit 2771600905472ca9f215a8f393aa5aadf34a0e72 +Author: chenfeiCF +Date: Wed Nov 14 15:20:26 2018 +0800 + + * Finish task #5124. + +commit 4a021cb8a5e9f4de23c2d09372fea6be53ba67e3 +Author: chenfeiCF +Date: Wed Nov 14 14:52:00 2018 +0800 + + * Finish task #5123. + +commit f37251a73485da41b39475df16523a39a6c2578c +Author: chenfeiCF +Date: Wed Nov 14 14:34:04 2018 +0800 + + * Finish task #5119. + +commit 2d26caad2e710f79a6e67f7fba69e4b1cebe94b4 +Author: Yagami +Date: Wed Nov 14 14:10:23 2018 +0800 + + * Finish task #5084. + +commit bf1dc7be3f93c4d8d52eace184e6e29d49afc885 +Author: Yagami +Date: Wed Nov 14 13:52:02 2018 +0800 + + * Fix child task bug. + +commit 1024ca63764d3902fd99f962fd5e54a3c9665419 +Author: Yagami +Date: Wed Nov 14 10:51:40 2018 +0800 + + * Fix task main menu. + +commit 581584286b432e83030fc3e916790e178dc5cff5 +Merge: 669aa803ae 55d5719369 +Author: Yagami +Date: Wed Nov 14 10:48:06 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 669aa803ae2e2bb41a9646aaebfdf4fd5cfef641 +Merge: d4d9cef1df c487cbcf9b +Author: Yagami +Date: Wed Nov 14 10:47:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d4d9cef1dfa4ed8aeca9b790d0d7f9585a5436d8 +Author: Yagami +Date: Wed Nov 14 10:47:00 2018 +0800 + + * Fix testsuite createcase view. + +commit 55d571936914f244de960239cfc7408e3f969cc2 +Author: wangyidong +Date: Wed Nov 14 10:46:44 2018 +0800 + + * code for task #5066. + +commit c487cbcf9b71895f174f2af0fe560ddaa68a7200 +Merge: 80f3dca2ad ca70a83395 +Author: wangyidong +Date: Wed Nov 14 09:25:00 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 80f3dca2ad8c3115574ba6905db9a6a6e871b069 +Author: wangyidong +Date: Wed Nov 14 09:23:13 2018 +0800 + + * finish task #5066. + +commit ca70a83395ce3e52ac13628176faf0416f75540a +Author: chenfeiCF +Date: Tue Nov 13 17:28:12 2018 +0800 + + * Adjust for task #5111, #5106. + +commit cae5cb78c52773f889994416b9c021f0adcb8535 +Author: chenfeiCF +Date: Tue Nov 13 17:23:51 2018 +0800 + + * Finish task #5118, #5122, #5125. + +commit 54b8536e8b31613be0f41ba863974b8535d6b3dd +Author: Yagami +Date: Tue Nov 13 17:00:17 2018 +0800 + + * Fix parent task bug. + +commit 5d1e76c14d7e8150f8117640394de94fe6d0fd38 +Author: Yagami +Date: Tue Nov 13 16:41:08 2018 +0800 + + * Fix edit parent task bug. + +commit 95d6bf9c6b5ec9d8cb6cf8f11436dfe98388a8cf +Author: Yagami +Date: Tue Nov 13 15:36:15 2018 +0800 + + * Add custom filed to testtask. + +commit 635499b55184ad92176f8b59c81c206f9b2c1232 +Merge: 1c7e1a6ece 4639de2307 +Author: Yagami +Date: Tue Nov 13 15:32:56 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1c7e1a6ece094c4f0889c8c82ef59e99a0d5636a +Author: Yagami +Date: Tue Nov 13 15:32:15 2018 +0800 + + * Finish task #5112. + +commit 4639de2307ea1f731ce828f0f6e387f3cfd7a704 +Merge: 643316db3f 7c348ba665 +Author: wangyidong +Date: Tue Nov 13 14:50:33 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 643316db3f2170c83c0b886ada3fd3a262f18409 +Author: wangyidong +Date: Tue Nov 13 14:22:20 2018 +0800 + + * code for task #5055. + +commit 7c348ba6655c961dd3e19f3ec43ad495ab113e84 +Merge: 424a98db4a 05cf1e5a34 +Author: chenfeiCF +Date: Tue Nov 13 13:49:29 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 424a98db4ada5ebcb0775d90944aeebefa1550a6 +Author: chenfeiCF +Date: Tue Nov 13 13:49:08 2018 +0800 + + * Finish task #5111. + +commit b88d9ecc0712d14757bba9fb86ec0ed838c6837e +Merge: 72a92afde7 05cf1e5a34 +Author: wangyidong +Date: Tue Nov 13 11:26:00 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 72a92afde72884c539da55b6eb7196c2c34ee1c7 +Author: wangyidong +Date: Tue Nov 13 11:25:33 2018 +0800 + + * finish task #5076. + +commit 05cf1e5a346f4579983053db45dc9cd9a61c3d4d +Author: Yagami +Date: Tue Nov 13 11:12:23 2018 +0800 + + * Finish task #5110. + +commit 30353dc9d45dfd04f9e4d63eb9139b62c344d84b +Author: Yagami +Date: Tue Nov 13 10:04:31 2018 +0800 + + * Finish task #5113. + +commit 834dc8e2faff3a9a1c0501127315ab64ba146203 +Merge: 3f5f48fd50 c30ce17efc +Author: wangyidong +Date: Tue Nov 13 09:51:50 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3f5f48fd50c7753f08121f004d7b5f8a273af9c7 +Author: wangyidong +Date: Tue Nov 13 09:51:17 2018 +0800 + + * finish task #5078. + +commit c30ce17efc325a03e291a2d311ce0c7988d9ecc4 +Author: chenfeiCF +Date: Mon Nov 12 17:41:30 2018 +0800 + + * Fix error variable name. + +commit b9604429996e8cd34c3cee6494a6c75e76e05ce6 +Merge: 70e0591023 12eb5a8b6f +Author: Yagami +Date: Mon Nov 12 17:10:42 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 70e0591023a47e141bb976357e1cc04a2144ef0e +Author: Yagami +Date: Mon Nov 12 17:09:27 2018 +0800 + + * Fix parent task status. + +commit 12eb5a8b6f03d9278d49f9ba186d99599b58d9df +Merge: 92ce72bfad b863fe5f92 +Author: chenfeiCF +Date: Mon Nov 12 17:00:52 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b863fe5f92e354101cab49c9febb2b57e390e7c7 +Author: Yagami +Date: Mon Nov 12 17:00:22 2018 +0800 + + * Finish task #5109. + +commit 92ce72bfadd95ad9d17a83a898b006f3a098e7b8 +Author: chenfeiCF +Date: Mon Nov 12 17:00:22 2018 +0800 + + * Finish task #5106. + +commit ca488859261aa930523891fc709b4090fda6b9a3 +Author: Yagami +Date: Mon Nov 12 16:39:56 2018 +0800 + + * Fix project warning. + +commit e29d9990aa71611abea04b537cbfa678e1d584f2 +Author: Yagami +Date: Mon Nov 12 15:55:47 2018 +0800 + + * Fix module orderBy. + +commit 9a2a2b234ddc10541a62db6cfbbb7ff3c71847e3 +Author: Yagami +Date: Mon Nov 12 15:52:20 2018 +0800 + + * Fix module orderBy. + +commit dd052ef32cd9cd1e9b87a110345ca7f4b7bc7ce8 +Merge: 59071fe947 f51cdbbae4 +Author: Yagami +Date: Mon Nov 12 15:39:58 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 59071fe947564d52c0c5d054f431d73dd1af65d5 +Author: Yagami +Date: Mon Nov 12 15:39:46 2018 +0800 + + * Finish task #5108. + +commit f51cdbbae4de334e40d8ea2ebc2e6eb735987711 +Merge: 191c720d50 b22c8ca558 +Author: reneeteng +Date: Mon Nov 12 15:26:29 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 191c720d506acc7f92f6fd505d6816a3b1865d40 +Author: reneeteng +Date: Mon Nov 12 15:24:51 2018 +0800 + + * Change project view lang. + +commit b22c8ca558ba39c4532e87e3e6d2ef4ff2bdeaff +Merge: bff8f0161a cfeb9b483e +Author: Yagami +Date: Mon Nov 12 14:44:39 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bff8f0161af7932cd3eeb4fc0933a490cbdc2143 +Author: Yagami +Date: Mon Nov 12 14:44:27 2018 +0800 + + * Finish task #5105. + +commit cfeb9b483e3c33b4aeebf2a2550f3b0f84787505 +Merge: 2b47dbed37 470c97a7cd +Author: chenfeiCF +Date: Mon Nov 12 14:21:54 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2b47dbed37e5fbea617d497d11332ad559a3cff5 +Author: chenfeiCF +Date: Mon Nov 12 14:20:59 2018 +0800 + + * Finish task #5085. + +commit 470c97a7cd89d3c9cab2a400a71e4222a887bccf +Merge: 4c5e97cb2e 7f5616c709 +Author: wangyidong +Date: Mon Nov 12 14:18:26 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4c5e97cb2e4f20a3eba32b9049ee0c6b24e0c443 +Author: wangyidong +Date: Mon Nov 12 14:17:59 2018 +0800 + + * code for task #5062. + +commit 7f5616c709dc0256f62aeefcbd6589231b1541bd +Merge: d95fb0ced5 e054c9b475 +Author: reneeteng +Date: Mon Nov 12 14:12:40 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d95fb0ced564ffccfc97bb8f24c68fdd2b1c14e3 +Author: reneeteng +Date: Mon Nov 12 14:11:40 2018 +0800 + + * Change group desc. + +commit e054c9b475e751a64559cc19aa298d0f4c35f3b2 +Merge: 764287bf07 4e005e989b +Author: Yagami +Date: Mon Nov 12 14:06:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 764287bf074061fe15accfa0c6a2138bbbc6a7a6 +Author: Yagami +Date: Mon Nov 12 14:06:19 2018 +0800 + + * Finish task #5104. + +commit 4e005e989bdf7b19f1d788afdf6cffeca3781f7e +Merge: 501440338a 9d5f919e3d +Author: wangyidong +Date: Mon Nov 12 13:41:41 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 501440338a94ff922bf4b81860c336b5e5885a0c +Author: wangyidong +Date: Mon Nov 12 13:40:28 2018 +0800 + + * finish task #5062. + +commit 9d5f919e3db3c3ae883e0024fb8384197e3f6970 +Author: Yagami +Date: Mon Nov 12 11:21:34 2018 +0800 + + * Finish task #5103. + +commit 222009a2c30b92256fe20d788ed1c5e22e36cd1e +Author: Yagami +Date: Mon Nov 12 11:05:28 2018 +0800 + + * Finish task #5102. + +commit a5ee35e792ce679c7034f6a7fe66c68c7933a643 +Merge: d0744054f5 d6abc51b21 +Author: Yagami +Date: Mon Nov 12 10:47:43 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d0744054f557677014fa991bc55571ff4a84d187 +Author: Yagami +Date: Mon Nov 12 10:47:27 2018 +0800 + + * Finish task #5096. + +commit d6abc51b218fbc4edd1751d17ddc5ffbb2931ce1 +Author: chenfeiCF +Date: Mon Nov 12 10:36:25 2018 +0800 + + * Finish task #5064. + +commit 2d582681b4f4a5d5bd961d66dd270bc4f5a049ec +Author: Yagami +Date: Mon Nov 12 10:24:16 2018 +0800 + + * Finish task #5095. + +commit b6a296c3fdadc645f584b310701c3dc88691d8a6 +Merge: 9dc991fc16 c2e4508ec4 +Author: Yagami +Date: Mon Nov 12 10:12:18 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9dc991fc16c11e4e7d3c268c294937c21d8d8456 +Author: Yagami +Date: Mon Nov 12 10:11:49 2018 +0800 + + * Fix task module display. + +commit c2e4508ec4ba59a6f01a0ce08a6f1de332e4678f +Author: wangyidong +Date: Mon Nov 12 09:03:07 2018 +0800 + + * fix bug for product statistic block. + +commit 94ed04b58f9f377fb12017cebf9f500b3b2c9632 +Merge: 0acb1cb4ce 5cc4c04930 +Author: wangyidong +Date: Fri Nov 9 16:22:49 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0acb1cb4ce2da71a6cd5d97b13943beb8458cdab +Author: wangyidong +Date: Fri Nov 9 16:22:23 2018 +0800 + + * finish task #5100. + +commit 5cc4c04930a6246763b1a6d89b05eb55e442ccb9 +Author: Yagami +Date: Fri Nov 9 16:17:05 2018 +0800 + + * Fix task search option. + +commit a9f4c51ca7a6664171c919356508dcfcf979cae7 +Author: Yagami +Date: Fri Nov 9 15:41:54 2018 +0800 + + * Finish task #5095. + +commit dade0abdaa290288cfeec03daaa28aaafa32664f +Merge: 394df4295f 155bb957c5 +Author: Yagami +Date: Fri Nov 9 15:05:43 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 394df4295ff3208d37c8086a6f04457e006dc265 +Author: Yagami +Date: Fri Nov 9 15:05:24 2018 +0800 + + * Finish task #5092. + +commit 71204f5c36dd6c121ee8b3e78ec02b9ad31227be +Author: Yagami +Date: Fri Nov 9 13:25:07 2018 +0800 + + * Finish task #5091. + +commit 155bb957c56fe6c4855a95a509623e75d49b6974 +Merge: da7534e589 2c2830d018 +Author: wangyidong +Date: Fri Nov 9 13:12:16 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit da7534e5895753f5afb90afd40f45f2435f0986e +Author: wangyidong +Date: Fri Nov 9 13:11:46 2018 +0800 + + * finish task #5082. + +commit 2c2830d018759b212b5c5c0025ea1f00add0e5bd +Author: Yagami +Date: Fri Nov 9 11:06:28 2018 +0800 + + * Finish task #5087. + +commit 7d609dc2ebd5de1e627ed5978bd25a92c28f1461 +Author: Yagami +Date: Fri Nov 9 10:43:15 2018 +0800 + + * Finish task #5083. + +commit 640ad7448171ddc0ea95c0a1dfa339c43a20c1fd +Author: Yagami +Date: Fri Nov 9 10:29:50 2018 +0800 + + * Finish task #5081. + +commit 9d68afa9f7bf24787e7f22d43a097479ca92563c +Author: Yagami +Date: Fri Nov 9 10:08:04 2018 +0800 + + * Finish task #5080. + +commit e8bdc75103ba35f01881d694d1c604983f1d712a +Author: Yagami +Date: Fri Nov 9 09:54:03 2018 +0800 + + * Finish task #5079. + +commit 447ae8768e22fc28cf7c63314518bf1ed57b5e2b +Author: Yagami +Date: Fri Nov 9 09:16:46 2018 +0800 + + * Finish task #5075. + +commit 8b499257ab4979af8010089d92c8d779bb62227f +Author: Yagami +Date: Fri Nov 9 09:06:07 2018 +0800 + + * Finish task #5071. + +commit 3026609b079d24cb9c95e45974d98aa516f17ad2 +Author: Yagami +Date: Thu Nov 8 17:34:52 2018 +0800 + + * Fix runcase view stepID align. + +commit 3693dde77497a05e60524759a9b3715e97ae5d71 +Author: Yagami +Date: Thu Nov 8 17:18:13 2018 +0800 + + * Fix case step align middle. + +commit 188b911698e2778b6161daf3db74bb8cfe8acb2d +Author: Yagami +Date: Thu Nov 8 17:04:25 2018 +0800 + + * Finish task #5072. + +commit 4a71022c730188b1943d64be5f4801f48d0777f3 +Author: Yagami +Date: Thu Nov 8 16:33:41 2018 +0800 + + * Finish task #5070. + +commit 443d17d75d4708fe57aa29561267d71c5d063392 +Merge: a478cfdba5 6d3514387c +Author: Yagami +Date: Thu Nov 8 16:15:26 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a478cfdba520aed28d1583a49f7c095840deb7a4 +Author: Yagami +Date: Thu Nov 8 16:15:09 2018 +0800 + + * Finish task #5067. + +commit 6d3514387c21842e7f8fd3025a4e3659e6a78cbf +Merge: 3a2155ae11 cfa64fdc4e +Author: wangyidong +Date: Thu Nov 8 14:58:31 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3a2155ae11342dc45b3a45f3b50f32c9bc62db06 +Author: wangyidong +Date: Thu Nov 8 14:57:58 2018 +0800 + + * finish task #5073. + +commit cfa64fdc4eeb75ad1ed4d7fb2df90297e1bf9561 +Author: Yagami +Date: Thu Nov 8 14:20:46 2018 +0800 + + * Finish task #5065. + +commit 9976978d8aa241b8db04c1eb005fd1b372382b30 +Merge: 83961260a5 004f1fc6fa +Author: Yagami +Date: Thu Nov 8 13:21:28 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 83961260a5da22e032b547e897e16de56d9b7b3b +Author: Yagami +Date: Thu Nov 8 13:20:54 2018 +0800 + + * Fix case title field width. + +commit 004f1fc6fa96ef4a37017ceb12f0458ddc2c585d +Merge: 6c6e84c52d afdb05d184 +Author: wangyidong +Date: Wed Nov 7 11:59:11 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6c6e84c52d7a8795d04d20d4e56fcec0de388f31 +Author: wangyidong +Date: Wed Nov 7 11:58:40 2018 +0800 + + * finish task #5061. + +commit afdb05d184347aa4cdba088e91d9783be4e8c519 +Author: Yagami +Date: Wed Nov 7 10:59:07 2018 +0800 + + * Finish task #5059. + +commit 9b68e5c1aedf4e862e0d0e73eeb095344994bcb2 +Author: Yagami +Date: Wed Nov 7 10:42:27 2018 +0800 + + * Fix doc button. + +commit 13cd5d57bea4d9ef1c72201ea9064619ff56504d +Author: Yagami +Date: Wed Nov 7 10:38:34 2018 +0800 + + * Finish task #5058. + +commit 32a4715fa6d4c6ed13741aa0838ce65cbdc5021c +Merge: 361ea2b415 4865ebe9f4 +Author: Yagami +Date: Wed Nov 7 09:13:38 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 361ea2b4154cf828b871a2fd40b9b7add1ef1a0d +Author: Yagami +Date: Wed Nov 7 09:13:13 2018 +0800 + + * Finish task #5056. + +commit 4865ebe9f4833bb101d9b8355e601e8837153cc8 +Author: reneeteng +Date: Tue Nov 6 14:29:19 2018 +0800 + + * Change resolution. + +commit d50c526aeb6d7a12f64c4666672c44ad9582c96e (tag: zentaopms_10.5.1_20181105) +Author: reneeteng +Date: Mon Nov 5 14:18:16 2018 +0800 + + *Change on. + +commit b8527f6988e188807fa3d0c1f7a3e1bb0ebb446a +Merge: cabb96f338 b0559c4214 +Author: reneeteng +Date: Mon Nov 5 11:25:40 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cabb96f338650bc7b7f07063dfe873e129d44157 +Author: reneeteng +Date: Mon Nov 5 11:25:11 2018 +0800 + + * Change date prep. + +commit b0559c4214773a6c8de1679cf374319b55b872f8 +Merge: 7a6e458de1 73d9b94261 +Author: wangyidong +Date: Mon Nov 5 09:05:44 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7a6e458de1a7dec8d7a85816db486cdb05a7546c +Author: wangyidong +Date: Mon Nov 5 09:05:01 2018 +0800 + + * add version and upgrade it. + +commit 73d9b9426134934b095dbd550855332ead449ca7 +Author: Yagami +Date: Mon Nov 5 09:01:10 2018 +0800 + + * Fix doc lang. + +commit ec4a92aec6c28b6f777504416e7c310b1cd184ba +Author: Yagami +Date: Fri Nov 2 16:59:21 2018 +0800 + + * Fix fastmenu dropmenu position. + +commit 13ef9f3dd793fd3f145e8b9c285f6852a0e81202 +Merge: 1cad1f72b4 339709737b +Author: reneeteng +Date: Fri Nov 2 15:51:57 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1cad1f72b4fb60588a01ceba05a0ea595d7619dd +Author: reneeteng +Date: Fri Nov 2 15:51:30 2018 +0800 + + *Lang change. + +commit 339709737b185710edba001f76dcd4e635c5c6c7 +Merge: 1f80d9edf1 3ef43d8df7 +Author: Yagami +Date: Thu Nov 1 17:14:30 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3ef43d8df77524be91ac300dca5ecb120b089597 +Merge: 85f9a45688 be7e7096a5 +Author: wangyidong +Date: Thu Nov 1 15:07:03 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 85f9a45688fc0e7aff1d90ddecb19aebb1987659 +Author: wangyidong +Date: Thu Nov 1 15:06:31 2018 +0800 + + * finish task #7017. + +commit 1f80d9edf12e2dde92d16c219696adf483a4daf3 +Merge: 38b342032d be7e7096a5 +Author: Yagami +Date: Thu Nov 1 13:24:53 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 38b342032db65196c5209afea6f7f0cc45ac7b31 +Author: Yagami +Date: Thu Nov 1 13:24:39 2018 +0800 + + * Fix task lang. + +commit be7e7096a52f550a0261b15fa1743e1d0cb214a0 +Merge: e875096104 abffe2d649 +Author: reneeteng +Date: Thu Nov 1 10:27:21 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e875096104c786dd7a64369a30029d6ce1eb8c44 +Author: reneeteng +Date: Thu Nov 1 10:26:09 2018 +0800 + + * Chang lang. + +commit abffe2d6494fab1ff0d6d913be28721baac20f61 +Merge: dae378d7c3 7632a61cc1 +Author: Yagami +Date: Thu Nov 1 10:03:03 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dae378d7c3d9a49642f89a5714d2c7e470b4f31c +Author: Yagami +Date: Thu Nov 1 10:02:45 2018 +0800 + + * Add task lang. + +commit 7632a61cc186e78a66135f8be3d19ffd1d41c2c7 +Merge: 396c02a4d1 f7db7a39ec +Author: reneeteng +Date: Thu Nov 1 09:50:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 396c02a4d17b7ce32efdf97a9f3e8c3ca5aa97f9 +Author: reneeteng +Date: Thu Nov 1 09:49:34 2018 +0800 + + * optimize lang. + +commit f7db7a39ec39bc5629904fe02ad4855d4e5c14d1 +Merge: 6a9fa87552 537f484576 +Author: Catouse +Date: Wed Oct 31 16:56:44 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6a9fa8755234462af4cec25daf2fba6bfaeabb48 +Author: Catouse +Date: Wed Oct 31 16:56:31 2018 +0800 + + * update zui and finish backyard task #7081. + +commit 537f484576db7354b9eeb0ea0d7996c98bcd1626 +Author: yfl <554665488@qq.com> +Date: Wed Oct 31 16:38:34 2018 +0800 + + * add title + +commit eb05c611228781eee983a093f48e39ff3de03c77 +Merge: 19cbf6c7e3 8f93ca7875 +Author: yfl <554665488@qq.com> +Date: Wed Oct 31 16:22:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8f93ca78751c16da10f49d6a7eade2db99365925 +Author: Catouse +Date: Wed Oct 31 15:46:10 2018 +0800 + + * finish task #7106 and fix bug #1430. + +commit fb27ad277555b9a8d30a555bfe88d0dce7e68a4d +Merge: 9687651633 01fa8a628e +Author: wangyidong +Date: Wed Oct 31 14:23:49 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 96876516339a4e0116bca7aaf5d267867fdd5778 +Author: wangyidong +Date: Wed Oct 31 14:23:13 2018 +0800 + + * adjust for export word. + +commit 01fa8a628e1f948aed9135b12ee4786bfb9d5767 +Author: Yagami +Date: Wed Oct 31 09:30:57 2018 +0800 + + * Finish task #7095. + +commit 178905fccdfd62276563278c9c1d531a914aa0eb +Merge: ec15e13b25 fb9a368cea +Author: Yagami +Date: Tue Oct 30 10:28:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ec15e13b255a924802d1ba2c1484d0e8d94953b8 +Author: Yagami +Date: Tue Oct 30 10:28:09 2018 +0800 + + * Finish task #7080. + +commit fb9a368cea0c866d6851433b5c67f99a76a86f6e +Author: wangyidong +Date: Mon Oct 29 14:09:39 2018 +0800 + + * fix bug #2256. + +commit fb1e83ffdc9425fcd48a030b1f4c801655e75b0c +Author: Catouse +Date: Mon Oct 29 13:49:52 2018 +0800 + + * fix bug #2255. + +commit e0a74890958b06b6a0754c1180d71bc707cf6049 +Merge: f9dcfd9323 30c66ff864 +Author: reneeteng +Date: Mon Oct 29 11:13:49 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f9dcfd9323d65d24e735281aa36147381626292e +Author: reneeteng +Date: Mon Oct 29 11:13:05 2018 +0800 + + * Bbug lang change. + +commit 30c66ff864b0fa43c2b85edc1e211ab9aa6e74b8 +Author: Yagami +Date: Mon Oct 29 10:08:03 2018 +0800 + + * Fix child task export name. + +commit 57a736820d9f8b92d91895c3e7257bf8ed7c04ea +Author: reneeteng +Date: Fri Oct 26 14:27:12 2018 +0800 + + * Change lan. + +commit e394e2c5a658ecb4294d064e017d37417745890c +Merge: 47abbc3e87 617c1a40ac +Author: reneeteng +Date: Fri Oct 26 14:22:50 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 47abbc3e87262404254ea30b1e6491741945812c +Author: reneeteng +Date: Fri Oct 26 14:21:51 2018 +0800 + + * Change lang + +commit 617c1a40ac3446ef73ec892126b1901dfebbb60a +Merge: f22ed2b6c2 9466e7193e +Author: 滔哥 +Date: Fri Oct 26 11:18:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f22ed2b6c27a049cf10d2022abaae34cbe83d6b5 +Author: 滔哥 +Date: Fri Oct 26 11:18:12 2018 +0800 + + * Fix bug. + +commit 9466e7193e4f073212e35695bea3e26baa6904ce +Merge: bcaaed2692 487bc83361 +Author: wangyidong +Date: Fri Oct 26 10:49:10 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bcaaed26926c61a904257a8421f0c16d80931016 +Author: wangyidong +Date: Fri Oct 26 10:48:43 2018 +0800 + + * change for doc custom. + +commit 1b2965d3ad825fc3f75c31a67da67e3fc41febba +Author: wangyidong +Date: Fri Oct 26 10:48:23 2018 +0800 + + * fix bug for php5.3. + +commit 487bc8336138db9fef7943d0985cb2b052f5e407 +Author: Catouse +Date: Thu Oct 25 14:03:39 2018 +0800 + + * add fade effection. + +commit d13b06db7ab4a976583517a43fc642aeb634434e (tag: zentaopms_10.5.stable_20181025) +Merge: faddacafef 4d8a4f3aff +Author: Catouse +Date: Thu Oct 25 13:55:23 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit faddacafef4c8c2fcb8a7851c9f26c65fd009697 +Author: Catouse +Date: Thu Oct 25 13:55:17 2018 +0800 + + * improve kanban UI. + +commit 4d8a4f3aff88fcaaea7470a80c04c2de1e2efb6c +Merge: d6c0786d6e 3314fb028d +Author: reneeteng +Date: Thu Oct 25 11:16:01 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d6c0786d6e3f46f6ed4a005f9f90883fdfdbcd9b +Author: reneeteng +Date: Thu Oct 25 11:15:21 2018 +0800 + + * Lang changed. + +commit 3314fb028de768f6ab7877081b91bd3a459a6e4f +Merge: 25f860c6ef a0fbccf7ce +Author: wangyidong +Date: Thu Oct 25 10:48:25 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 25f860c6efaa6b6eaf8dfd6da11c6a8805edb607 +Author: wangyidong +Date: Thu Oct 25 10:48:03 2018 +0800 + + * fix for upgrade. + +commit a0fbccf7ce2d701bcea322ea4e89a1e10833203a +Merge: 33cfcdea08 0944c9e8c9 +Author: Catouse +Date: Thu Oct 25 10:32:37 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 33cfcdea08097e6b176affa670a906d47dac4c44 +Author: Catouse +Date: Thu Oct 25 10:32:31 2018 +0800 + + * improve kanban UI. + +commit 0944c9e8c9b7dfc5f5d7ed7c9581d82af8625afe +Author: wangyidong +Date: Thu Oct 25 10:21:08 2018 +0800 + + * round estimate in browse page. + +commit d7e0222b1bd3bc77948780d705dc5c3bf9bfae7a +Author: wangyidong +Date: Thu Oct 25 10:08:19 2018 +0800 + + * adjust for show queryBox by search. + +commit 0a19fbec295bec9d75f190cc8ff41e1eb0fbf9e9 +Merge: 223db4372e 78182537b1 +Author: wangyidong +Date: Thu Oct 25 09:33:38 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 223db4372e28ab25474b16bc3dba4b0d2900d392 +Author: wangyidong +Date: Thu Oct 25 09:33:16 2018 +0800 + + * fix bug for upgrade. + +commit 2cd31f731e1f2947758a5c3abe34473822cec675 +Author: wangyidong +Date: Thu Oct 25 09:30:44 2018 +0800 + + * change version and upgrade. + +commit 78182537b1000b5500aab1ad550ccd8694b5e789 +Author: Yagami +Date: Thu Oct 25 09:06:31 2018 +0800 + + * Delete doc search condition. + +commit 4077923c224656f674fd2db656d2dcd9491b6544 +Merge: 51fb6934f1 8ddea902dc +Author: 滔哥 +Date: Thu Oct 25 07:57:42 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 51fb6934f15b25b32c70630b6f1be55b7b8f4a89 +Author: 滔哥 +Date: Thu Oct 25 07:57:36 2018 +0800 + + * Fix bug. + +commit 8ddea902dc0ae4b46c830ac013ae30d52bc50ef9 +Author: Catouse +Date: Wed Oct 24 20:13:48 2018 +0800 + + * improve UI of kanban, finish task #5053. + +commit e72654b33557952a90efa96d068ee693237828c6 +Author: Catouse +Date: Wed Oct 24 19:59:52 2018 +0800 + + * code for task #5039. + +commit af0e3b1670cce3c4b7da9313ea502ad7a713fac9 +Author: Catouse +Date: Wed Oct 24 19:48:58 2018 +0800 + + * finish task #5039. + +commit 8b483f751c715c51b03ab07cc1182e35f1c3ef7d +Author: wangyidong +Date: Wed Oct 24 17:36:40 2018 +0800 + + * fix for appendOrder when orderby is empty. + +commit ca214c3a27eb73a5adc41e7180ef5c0055558895 +Merge: 2a0a11bb92 af842dfddb +Author: wangyidong +Date: Wed Oct 24 17:23:13 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2a0a11bb929b933398a4e2d53c9004dfc2f5d979 +Author: wangyidong +Date: Wed Oct 24 17:22:25 2018 +0800 + + * add projectID for export tree and calendar. + +commit af842dfddba99aa09362dd54fefdfb38c7aeb853 +Author: 滔哥 +Date: Wed Oct 24 16:18:41 2018 +0800 + + * Format code. + +commit 033044acca91fc4941296c2586f61670a62ddb12 +Merge: 8c0940c039 b3540188da +Author: 滔哥 +Date: Wed Oct 24 16:13:56 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8c0940c0393432af1309d03dfeb26a6f5ffd7e1f +Author: 滔哥 +Date: Wed Oct 24 16:13:50 2018 +0800 + + * Fix bug. + +commit b3540188da2ece7fba96f6bb5de551495db316cb +Merge: c901155dfa 3e26c07d0f +Author: Yagami +Date: Wed Oct 24 15:21:26 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c901155dfacf3898b12f7986e4f1b507cd29758f +Merge: e83d8e1be9 02a35cf0a1 +Author: Yagami +Date: Wed Oct 24 15:16:50 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e83d8e1be9ca3493757097d34d9ab8dd59d68b93 +Author: Yagami +Date: Wed Oct 24 15:16:34 2018 +0800 + + * Finish task #5040. + +commit 3e26c07d0f1245b58e5bd0ef3ae1565a38ec9823 +Merge: 657857571b 02a35cf0a1 +Author: wangyidong +Date: Wed Oct 24 15:16:04 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 657857571bc503658a3f0abd6d27a62a1d816d9d +Author: wangyidong +Date: Wed Oct 24 15:14:16 2018 +0800 + + * fix bug for delete lib. + +commit 02a35cf0a106ca3cdb5c3fee614466c757a8cd5f +Author: Catouse +Date: Wed Oct 24 14:48:12 2018 +0800 + + * adjust style of custom/ajaxmenu view. + +commit fa40b441180a26857bc01a6d7f939eb9c083d22c +Merge: eac9682bd7 a45aeff47e +Author: wangyidong +Date: Wed Oct 24 14:24:41 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit eac9682bd7cb5cc7782a75e071a78f21a6393bef +Author: wangyidong +Date: Wed Oct 24 14:23:19 2018 +0800 + + * adjust for task #5044. + +commit a45aeff47e675bbd9b203e5bb87233e5bec8fac5 +Author: Catouse +Date: Wed Oct 24 14:21:37 2018 +0800 + + * fix iframe modal auto size not work sometimes. + +commit fc480d0a01ac85beff157d801f25c024ea712ed0 +Merge: b2b5ed0a5e 346a928562 +Author: wangyidong +Date: Wed Oct 24 13:51:02 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b2b5ed0a5ec904b2ca8735f0ee6ec9e9699dfa0d +Author: wangyidong +Date: Wed Oct 24 13:50:42 2018 +0800 + + * fix error. + +commit 346a9285622c52ef29ee6fb2c3a37b9af025c5d3 +Author: Yagami +Date: Wed Oct 24 13:29:20 2018 +0800 + + * Finish task #5043. + +commit 3b03bc1547d57989a78904a96b5a580a63f16e4b +Author: Yagami +Date: Wed Oct 24 13:25:26 2018 +0800 + + * Delete doc gt lang. + +commit 9e78e6f8bc32c204fe60d81f2c4e18bc3143380a +Merge: 91596ab288 12238a6768 +Author: Yagami +Date: Wed Oct 24 13:19:58 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 91596ab288584e288ac11b20396af5801f53f2cc +Author: Yagami +Date: Wed Oct 24 13:19:42 2018 +0800 + + * Finish task #5047. + +commit 12238a6768f795337c880e9617085bd3c772e62a +Merge: 1bfaece647 8723563496 +Author: wangyidong +Date: Wed Oct 24 13:10:37 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1bfaece647a9be1c88bb8c02e781e244aeb254e1 +Author: wangyidong +Date: Wed Oct 24 13:10:12 2018 +0800 + + * finish task #5036. + +commit 8723563496a260f468e1bd3f01f00aa4e470cc9f +Merge: 1e95075550 49c61607ef +Author: Yagami +Date: Wed Oct 24 13:04:43 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1e9507555039455143a00e56403982009a748f5c +Author: Yagami +Date: Wed Oct 24 13:04:24 2018 +0800 + + * Finish task #5040. + +commit 49c61607efae7ff21d93ad8df7a4f2e10b2c34ec +Merge: 7acf9fb3f4 912f125517 +Author: 滔哥 +Date: Wed Oct 24 11:39:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7acf9fb3f4be34751b59ba36698b86522189a79d +Author: 滔哥 +Date: Wed Oct 24 11:37:07 2018 +0800 + + * Finished task#5052. + +commit 912f125517b2602edbca6df0a79493032fab595c +Author: chenfeiCF +Date: Wed Oct 24 11:23:06 2018 +0800 + + *　Finish task #5000. + +commit 34bc2fedb00e0a72ab437c53c1465072649f2fcf +Merge: b8a8cfbc6a 7973e341e4 +Author: wangyidong +Date: Wed Oct 24 11:17:44 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b8a8cfbc6abc0545fdd9b2db20c3161902fe2da7 +Author: wangyidong +Date: Wed Oct 24 11:17:03 2018 +0800 + + * finish task #5046,5041. + +commit 7973e341e4a11c56f60515d6a2ef5df5fdd28078 +Author: chenfeiCF +Date: Wed Oct 24 11:06:17 2018 +0800 + + * Finish task #5048, #5049, #5050, #5054. + +commit b048e98b49b6cbecad92b9bd9551d9b2bdc4f1ed +Author: 滔哥 +Date: Wed Oct 24 10:56:37 2018 +0800 + + * Fix bug. + +commit 15effe206d714bdd41e4e7df05c6f3bd6e4a76af +Merge: 673549a895 9495614038 +Author: wangyidong +Date: Wed Oct 24 10:09:36 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 673549a89588a4f94cb59a4bab798c798704fa25 +Author: wangyidong +Date: Wed Oct 24 10:09:00 2018 +0800 + + * change for en lang. + +commit 3676747f10a0df1eba121301576aa41c2f58c6c3 +Author: wangyidong +Date: Wed Oct 24 10:06:20 2018 +0800 + + * finish task #5044,5045. + +commit 9495614038b65ca1272d5be2d2bea80b8a5b5d75 +Author: Yagami +Date: Wed Oct 24 09:52:56 2018 +0800 + + * Delete xuanxuan file. + +commit 6106c692b969a506f92f617b527f5ebf53603ced +Merge: 5afccb24a5 5b3b956a8a +Author: Yagami +Date: Wed Oct 24 09:37:29 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5afccb24a58b5d1a20f3e8247ac4c84e36c8445f +Author: Yagami +Date: Wed Oct 24 09:36:57 2018 +0800 + + * Finish task #5037. + +commit 5b3b956a8ab9e788173deb247115c92295c159c5 +Merge: a0aa700f18 8cae97da93 +Author: Catouse +Date: Wed Oct 24 09:27:13 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + # Conflicts: + # module/custom/lang/en.php + # module/doc/js/browse.js + +commit 8cae97da93dc45f50206fcf87bb5d29b43274770 +Author: wangyidong +Date: Tue Oct 23 17:02:32 2018 +0800 + + * change border for product chosen with branch. + +commit ca1b69768179cfb27155ba62516e484efd5f44f2 +Merge: 63a1a2601d 6ec315b2fe +Author: wangyidong +Date: Tue Oct 23 16:35:06 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 63a1a2601df8149ccca3e66ad7fa4afdaf9be49b +Author: wangyidong +Date: Tue Oct 23 16:30:55 2018 +0800 + + * fix for block by priv. + +commit 6ec315b2fe4525ef84fdb1c994bb261b69fb577d +Merge: 1473f6de30 d64306aa90 +Author: reneeteng +Date: Tue Oct 23 16:25:06 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1473f6de3068ce58066f1bfe8a87309c994cc81d +Author: reneeteng +Date: Tue Oct 23 16:23:17 2018 +0800 + + * Modify lang. + +commit d64306aa901158d7a2c97e0511d8b88754f65c2c +Author: wangyidong +Date: Tue Oct 23 16:18:30 2018 +0800 + + * adjust code. + +commit ccfb1b9e4a1b1a9ca00c77deecb11f4381ba80e2 +Author: wangyidong +Date: Mon Oct 22 16:12:03 2018 +0800 + + * add create lib in index page. + +commit 93e0cbe6eba261ddbe230b87dc38b9c9e1dbdeda +Author: wangyidong +Date: Mon Oct 22 14:34:45 2018 +0800 + + * fix error. + +commit e2ed6070d12678242e418ee6698e489239b40a80 +Author: wangyidong +Date: Mon Oct 22 14:32:45 2018 +0800 + + * fix bug for batch child. + +commit 253415e200796f33dc4f9338900a0df8036e65df +Author: wangyidong +Date: Mon Oct 22 09:35:02 2018 +0800 + + * fix bug #2241. + +commit 458d56c283dc50becce5c1592520883631c718ee +Author: wangyidong +Date: Mon Oct 22 09:02:37 2018 +0800 + + * fix bug #2243. + +commit 19cbf6c7e3fd0bb81911c673c06198fb7b65cdf0 +Merge: 4a527f54bd eda6dd648b +Author: yfl <554665488@qq.com> +Date: Fri Oct 19 16:03:48 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit eda6dd648ba9bd07621bbd366a9566da74ed855b +Merge: cf167ce697 99038ca227 +Author: wangyidong +Date: Fri Oct 19 14:57:59 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cf167ce697fe1a7696a05c03e8d45ff722b4b687 +Author: wangyidong +Date: Fri Oct 19 14:57:21 2018 +0800 + + * adjust code for task. + +commit 4a527f54bdc6e2fea5e413c345daf8e173575324 +Merge: 134a4a4cb9 99038ca227 +Author: yfl <554665488@qq.com> +Date: Fri Oct 19 14:52:28 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 99038ca227c146b77ac1b8d28fbc8d093f36b05d +Author: Yagami +Date: Fri Oct 19 14:18:45 2018 +0800 + + * Fix project doc display. + +commit 29ae62225a6dc041474144b5b282b5ee3e980fa0 +Author: chenfeiCF +Date: Fri Oct 19 13:48:50 2018 +0800 + + * Adjust doc side page to apply to zentaobiz. + +commit 3775f0165e4bbc2890bb5ed9225a2ffe42c15a8c +Merge: 32d073bb74 e259b0d337 +Author: Yagami +Date: Fri Oct 19 13:15:48 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 32d073bb7417d0552ca95afcd14bd65e69cb813e +Author: Yagami +Date: Fri Oct 19 13:15:24 2018 +0800 + + * Fix drop menu position. + +commit e259b0d3373e0ee25c7e53121b3f6c38efaab306 +Merge: 00133df918 290f2fefdf +Author: reneteng +Date: Fri Oct 19 10:43:28 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 00133df918914bf00b04bec4394144d1084e7820 +Author: reneteng +Date: Fri Oct 19 10:42:58 2018 +0800 + + * p change + +commit 290f2fefdfa005618d1508dea9f8e581981fbedf +Author: chenfeiCF +Date: Fri Oct 19 10:05:20 2018 +0800 + + * Adjust doclib drop menu. + +commit 134a4a4cb9eff39c5be088d24e026e215aa4cbfc +Merge: 7f3427c4b5 183eb059ec +Author: yfl <554665488@qq.com> +Date: Fri Oct 19 09:42:43 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 183eb059ec19e60c5e0342713982ad6557d6ec58 +Author: chenfeiCF +Date: Fri Oct 19 09:38:18 2018 +0800 + + * Add book side html to apply to zentaobiz. + +commit 7f3427c4b5e1e12554e5842bec96709fa4c2847e +Merge: aa72fd9fe5 39215211b3 +Author: yfl <554665488@qq.com> +Date: Fri Oct 19 09:21:57 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit aa72fd9fe59d68217e92c33529903bf4b2595425 +Author: yfl <554665488@qq.com> +Date: Fri Oct 19 09:15:21 2018 +0800 + + * solve bug #1462 + +commit 39215211b3706f83b9c775d6b606c4323ff52e1d +Author: Yagami +Date: Fri Oct 19 09:07:32 2018 +0800 + + * Fix doc drop menu width. + +commit 446b27ff70b1051001c8f04b4c8eb9a85d234d1a +Merge: 7e98a2cc87 ec7fdf9290 +Author: Yagami +Date: Thu Oct 18 17:18:24 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7e98a2cc8767f0af6fd57a1a9eff59f86f8c6271 +Author: Yagami +Date: Thu Oct 18 17:18:04 2018 +0800 + + * Fix doc search btn. + +commit ec7fdf9290702a69d65e89f3259b9f7a021805f0 +Author: reneteng +Date: Thu Oct 18 17:16:20 2018 +0800 + + *update + +commit a0aa700f1859e5370c966dedadc92bcfe2ea3d3f +Merge: 7c4eb6a7c8 44999cf250 +Author: Yagami +Date: Thu Oct 18 15:00:06 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7c4eb6a7c85ecc337e6b0fa6e67f45b802352c60 +Author: Yagami +Date: Thu Oct 18 14:59:29 2018 +0800 + + * Fix searchbox display. + +commit 44999cf25043e8139de6775e3c3b8e97fc79c2f0 +Merge: 25db11e12d 5c71ee281d +Author: reneteng +Date: Thu Oct 18 14:09:42 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5c71ee281d24987337018f5f35ae2aa4e2a30dca +Author: Yagami +Date: Thu Oct 18 14:08:30 2018 +0800 + + * Finish task #5026. + +commit 25db11e12d56d7a8655af7e355e145e8843aa340 +Author: reneteng +Date: Thu Oct 18 14:08:08 2018 +0800 + + *update + +commit 213ea0af503f0b1574cab844eb141454ee7aecd3 +Merge: 55a7d3004a 0f77eab271 +Author: Yagami +Date: Thu Oct 18 10:13:47 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 55a7d3004af5bcb26bed0c0e1187425db07d1759 +Author: Yagami +Date: Thu Oct 18 10:13:09 2018 +0800 + + * Fix doc fastmenu. + +commit 0f77eab271d4f8cf357a7530e2e055e8b5f41947 +Merge: 98ec5b63e7 9a22dcfc51 +Author: 滔哥 +Date: Thu Oct 18 09:22:40 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 98ec5b63e7ea9bcda91d5175a8ea5ccc14026803 +Author: 滔哥 +Date: Thu Oct 18 09:22:29 2018 +0800 + + * Finished task#7021. + +commit 9a22dcfc51af6887e3d455c6ee65da854f9322d4 +Merge: 6119cf2a52 321d069c96 +Author: Yagami +Date: Thu Oct 18 09:12:42 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6119cf2a52cd155686e292f9477556036e656e6c +Author: Yagami +Date: Thu Oct 18 09:12:02 2018 +0800 + + * Finish task #5033. + +commit fc318f817f409b451a9e3843a2b5ef8e2299682d +Author: 滔哥 +Date: Thu Oct 18 07:01:02 2018 +0800 + + * Finished task#7022. + +commit 321d069c9663c0d259aaaa9a106c238c23082d44 +Author: chenfeiCF +Date: Wed Oct 17 17:01:10 2018 +0800 + + * Adjust code for book of doc module. + +commit fd752977937af75768a8b04dd5c2bde48eaec400 +Merge: 84f178f3aa 34570184ce +Author: wangyidong +Date: Wed Oct 17 15:16:04 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 84f178f3aa4a7d5708c5228f4648efb9e36370ae +Author: wangyidong +Date: Wed Oct 17 15:14:31 2018 +0800 + + * finish task #5031. + +commit 34570184ce683cf41a75f826b16ef9a22687cadb +Author: Yagami +Date: Wed Oct 17 14:46:45 2018 +0800 + + * Fix empty line. + +commit 3296b6e6a00ee0c20218053469fa617c1dc9893a +Author: Yagami +Date: Wed Oct 17 14:43:47 2018 +0800 + + * Finish task #7032. + +commit 727e58fe336e7546b098da8e629f25715b73134e +Merge: d9222b25f9 d04664227c +Author: Yagami +Date: Wed Oct 17 14:18:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d9222b25f919679e299066550212cd84209ccf35 +Author: Yagami +Date: Wed Oct 17 14:17:39 2018 +0800 + + * Fix doc button. + +commit d04664227ce627ae0b62b8675691a4ab322af7b8 +Merge: 524fa40fc5 24a5fb6f35 +Author: Catouse +Date: Wed Oct 17 14:08:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 524fa40fc5977e3d8c36a34b4cb4404fd8e7eb31 +Author: Catouse +Date: Wed Oct 17 14:07:59 2018 +0800 + + * add .icon-book. + +commit 24a5fb6f3546cb82d69a2d02cc3de3ded78c6bfc +Author: chenfeiCF +Date: Wed Oct 17 11:20:49 2018 +0800 + + * Adjust for type of doc library. + +commit d0981de17dd89f83d5d26090ab77cc0b78872029 +Author: wangyidong +Date: Wed Oct 17 09:34:27 2018 +0800 + + * fix bug for user priv. + +commit cb7e95e6546fd46d81d6cc379c8e0cd365104126 +Author: wangyidong +Date: Wed Oct 17 09:00:35 2018 +0800 + + * code for task #5030. + +commit f236b416a2ae266757d718c5fad853a3903ea97f +Merge: f74a4b1e36 76e1065c0a +Author: wangyidong +Date: Tue Oct 16 16:42:21 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f74a4b1e361fbbc6efd81b9e8d1a3670a95a6956 +Author: wangyidong +Date: Tue Oct 16 16:41:40 2018 +0800 + + * finish task #5030,5029. + +commit 76e1065c0af7e8b881e4014cb246b638c27dd2bb +Merge: b07711fd6e 6d90d291cf +Author: 滔哥 +Date: Tue Oct 16 14:11:40 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b07711fd6e33ccec3533095d9cade66051bf3432 +Author: 滔哥 +Date: Tue Oct 16 14:11:26 2018 +0800 + + * Add change sql for parent value. + +commit 6d90d291cfe95fd7ce27c16ccb76bdda484b0224 +Author: chenfeiCF +Date: Tue Oct 16 13:25:21 2018 +0800 + + * Add type field for doc lib. + +commit 32866fcaf291abd39a6b14a9a6ee9e50b4019d31 +Author: Yagami +Date: Tue Oct 16 10:48:22 2018 +0800 + + * Fix sql. + +commit e2e9b6cab804533f6240b2d3f5858bb985ed0e06 +Author: Yagami +Date: Tue Oct 16 10:27:12 2018 +0800 + + * Finish task #5028. + +commit a8b94bb6c043eab45e734ddb187647ab2f9297f4 +Merge: fe66a0f7d9 bee5804559 +Author: Yagami +Date: Mon Oct 15 16:58:11 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bee580455961def373b320a390231d2382923f77 +Author: Catouse +Date: Mon Oct 15 16:50:53 2018 +0800 + + * improve UI of dynamic block. + +commit fe66a0f7d941c85f38edd3c69b5bdfa544b746e6 +Merge: 7e6dedaf87 8e8444421e +Author: Yagami +Date: Mon Oct 15 16:49:51 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7e6dedaf87db511859d41de0e8a263d5bcce391d +Author: Yagami +Date: Mon Oct 15 16:49:34 2018 +0800 + + * Finish task #5035. + +commit 8e8444421e585692cd3de2384b00c08cc3c5949f +Author: Catouse +Date: Mon Oct 15 16:28:50 2018 +0800 + + * improve UI of project/kanban. + +commit aa505cceb74eee972aeb999753d4f6b61244d2f5 +Author: Catouse +Date: Mon Oct 15 16:11:49 2018 +0800 + + * finish task #4997. + +commit cb039d46e2cdf8303e9b92c20fc38081de500675 +Author: Catouse +Date: Mon Oct 15 15:54:40 2018 +0800 + + * improve UI of testtask/linkcase view. + +commit 27df9f9e0b4d12f9f7746b71b9b9110f0c95b7cb +Author: Catouse +Date: Mon Oct 15 15:45:32 2018 +0800 + + * fix helpContent style. + +commit e3da989eb20d39c5105fe06b49896916951077fc +Author: Catouse +Date: Mon Oct 15 15:43:13 2018 +0800 + + * improve UI of doc views, code for task #5032. + +commit aa81eda77ead696a26ed0bd764dce827f4ee159e +Author: Catouse +Date: Mon Oct 15 15:41:26 2018 +0800 + + * improve UI of doc views, code for task #5032. + +commit 7717c422d7ee510eb6bd1f7d72279b7e6a393cba +Author: Catouse +Date: Mon Oct 15 15:36:01 2018 +0800 + + * improve UI of doc views, code for task #5032. + +commit 75b189c2c362a8feac93d5efb501ff8ebebc2dd6 +Merge: 819f035bd9 44124129dc +Author: Catouse +Date: Mon Oct 15 15:35:31 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 819f035bd96d78b31b515bc950dbe27d85506533 +Author: Catouse +Date: Mon Oct 15 15:35:25 2018 +0800 + + * improve UI of doc views, code for task #5032. + +commit 44124129dc1f94ffc9e8b8cdf831fbee1fc416a6 +Author: Yagami +Date: Mon Oct 15 15:24:11 2018 +0800 + + * Finish task #5034. + +commit e05656dadf4321abbe755615c46440ec2aead26c +Merge: 676f67aa73 fad1de14df +Author: Catouse +Date: Mon Oct 15 15:06:49 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 676f67aa7378e6fb64885f885964101f1da4b5ce +Author: Catouse +Date: Mon Oct 15 15:06:43 2018 +0800 + + * update themes. + +commit fad1de14df3c85ed6aa3f6672a03d3c590083530 +Merge: f6882a40b5 6230618909 +Author: yfl <554665488@qq.com> +Date: Mon Oct 15 15:03:15 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6230618909e8f6a546af9d1be40e5ba3916b043f +Merge: efaf41683c 31b39b1750 +Author: Yagami +Date: Mon Oct 15 14:55:32 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit efaf41683c8dcae748333ea6755c4b54972aedb3 +Author: Yagami +Date: Mon Oct 15 14:55:15 2018 +0800 + + * Fix doc side height. + +commit f6882a40b5cd732546b016ad03e0abdfdecd5653 +Author: yfl <554665488@qq.com> +Date: Mon Oct 15 14:53:27 2018 +0800 + + * add list title attribute #5005 + +commit 31b39b1750528452e823017a2c51c05962e63ce9 +Author: Catouse +Date: Mon Oct 15 14:32:30 2018 +0800 + + * fix module select not use chosen. + +commit e5f10d8100dbf31e15421ddb8537c30f37bc3cb7 +Merge: 94547ee4c7 d65f144060 +Author: Catouse +Date: Mon Oct 15 14:27:14 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 94547ee4c70baec99f29c59b6f5e9d86e23b8872 +Author: Catouse +Date: Mon Oct 15 14:27:08 2018 +0800 + + * update kindeditor, finish task #5014 and fix bug #2082. + +commit d65f14406072469fe1f95abb9be3babc304d0840 +Author: Yagami +Date: Mon Oct 15 14:05:16 2018 +0800 + + * Doc back button add background-color. + +commit de4083d6ec506d7da4fd0a119c3974f0c9d7012e +Author: Catouse +Date: Mon Oct 15 13:33:43 2018 +0800 + + * set css 'overflow: auto' to .article-content. + +commit fdf4f5a77e721a422402a8a83b84d5d7d5d03924 +Author: Catouse +Date: Mon Oct 15 13:16:40 2018 +0800 + + * finish task #5019 and fix bug #2039. + +commit f4591138c1a0c73e5d2f2e4c69f40d6b6862e4af +Author: Catouse +Date: Mon Oct 15 13:15:58 2018 +0800 + + * improve UI of custom/ajaxmenu view. + +commit e493534ca3ac527ef37bbca9daf553ae80803f5a +Author: Catouse +Date: Mon Oct 15 11:30:21 2018 +0800 + + * improve chosen UI. + +commit 8ffb30d6d0406007128cdb01dd6747a89636bc11 +Author: Catouse +Date: Mon Oct 15 11:26:43 2018 +0800 + + * set default value of search_compact for chosen by update zui files. + +commit c50c3cc37b42674a31177f37a2a271436abec09f +Author: Catouse +Date: Mon Oct 15 10:03:22 2018 +0800 + + * fix chosen UI. + +commit 3819918ab4d62395ccb658ae6e0085e3cf9f3673 +Merge: 9af98861a8 101e035ad4 +Author: Catouse +Date: Mon Oct 15 09:49:40 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9af98861a83ebebdbe7f48ebbab1b1bb8e9f929b +Author: Catouse +Date: Mon Oct 15 09:49:35 2018 +0800 + + * finish task #5012 and fix bug #2123. + +commit 101e035ad4e00c2cd3fb3aac3fb2afc008fad5bc +Author: Yagami +Date: Mon Oct 15 09:28:47 2018 +0800 + + * Add sql. + +commit 958e94dfa43930c6674896fbb93e559ac1026217 +Author: Yagami +Date: Mon Oct 15 09:27:59 2018 +0800 + + * Change file name length. + +commit 025c6e344efcd9acb3824d81dd82f8c3c23ab3ae +Author: Catouse +Date: Mon Oct 15 08:41:29 2018 +0800 + + * finish task #4994 and fix bug #2193. + +commit ceece4b829e334c0825040b27ed06cda49cb1cfd +Author: Catouse +Date: Mon Oct 15 08:28:52 2018 +0800 + + * update zui js and css files. + +commit c69d4ff01b1e60308801d8c1705c408ded9a5dda +Author: Catouse +Date: Mon Oct 15 08:28:41 2018 +0800 + + * add scrollbar-hover effection to dynamic block in project/product view. + +commit aeb940041fb30b8153a1d3ed0f802c83796cfce8 +Author: Catouse +Date: Fri Oct 12 17:22:07 2018 +0800 + + * fix divider in main actions toolbar. + +commit 51f918837f2343d3cab76d907fbded9591a75281 +Merge: 1a24e94fee 0b1751b3ee +Author: Catouse +Date: Fri Oct 12 17:19:59 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1a24e94fee76e438253066375e06183e02104f72 +Author: Catouse +Date: Fri Oct 12 17:19:53 2018 +0800 + + * finish task #4991 and fix bug 2197. + +commit 0b1751b3ee90b30b6e5ad24c313556697ae852ea +Merge: e2e7a0c694 87de60cb68 +Author: 滔哥 +Date: Fri Oct 12 16:43:14 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e2e7a0c694e300a178dbf969cf44bd9c3a20cf09 +Author: 滔哥 +Date: Fri Oct 12 16:43:01 2018 +0800 + + * Fix bug. + +commit 87de60cb68d4174e8c5f87891af15494f4f57dab +Author: Catouse +Date: Fri Oct 12 16:37:06 2018 +0800 + + * add hover effection to scrollbar in dynamic block. + +commit 6a83bdc4be456fe9597ed6aa01c65857fe23ed1b +Author: Catouse +Date: Fri Oct 12 16:26:26 2018 +0800 + + * finish task #4984 and fix bug #2212. + +commit 2842816afba51a81ff3d41bd9c113393b642783b +Merge: 1daf14c32f 1a897653a8 +Author: Catouse +Date: Fri Oct 12 16:10:55 2018 +0800 + + Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms + +commit 1daf14c32f20b9415bc34de4b98bb639c1548b45 +Author: Catouse +Date: Fri Oct 12 16:10:41 2018 +0800 + + * finish task #4977 and fix bug #2223. + +commit 1a897653a8112fe4e343fe37e4cce55f9f453a3a +Merge: addb812be3 8959c34335 +Author: wangyidong +Date: Fri Oct 12 16:10:17 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit addb812be33d8cc6118c29bad8520cf994a9753f +Author: wangyidong +Date: Fri Oct 12 16:09:53 2018 +0800 + + * finish task #5002. + +commit 8959c343354236cb0c09026b007fc07b5cc556d8 +Merge: b4b4317d35 6cd7ec2b1b +Author: Catouse +Date: Fri Oct 12 15:35:38 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b4b4317d35f013dce989acad6d9e79e2b885286e +Author: Catouse +Date: Fri Oct 12 15:35:23 2018 +0800 + + * finish task #4980 and fix bug #2218. + +commit 6cd7ec2b1bfed90f2b38b59fb24369232f26d26d +Merge: d68a97ec12 8c232bd2c5 +Author: wangyidong +Date: Fri Oct 12 15:27:48 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d68a97ec12636997ec80f75da76dcf6669f2033e +Author: wangyidong +Date: Fri Oct 12 15:27:05 2018 +0800 + + * adjust for import case use csv. + +commit 8c232bd2c593f36f3f7857d5a176707a8eb6a76a +Author: Catouse +Date: Fri Oct 12 15:18:32 2018 +0800 + + * finish task #4956. + +commit f1317bd1d85aff0626fe5bb42621c01236c6171d +Author: Catouse +Date: Fri Oct 12 15:16:26 2018 +0800 + + * finish task #4990 and fix bug #2199. + +commit a2a70bb688592276fe9c83e9549510836519b39b +Author: Catouse +Date: Fri Oct 12 15:11:47 2018 +0800 + + * fix bug #2179 and finish task #5001. + +commit e179c99ebcc0699b3760cb2e7f4b174c2ac0cd2b +Author: wangyidong +Date: Fri Oct 12 14:23:57 2018 +0800 + + * finish task #4969. + +commit dbca08eb695a66351e2eca05b7540260829f9282 +Merge: 8f7c3f8c4e e3380f2fc8 +Author: wangyidong +Date: Fri Oct 12 14:16:17 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8f7c3f8c4e868ca25c8af28365b2fcdc07703281 +Merge: 0558da4e38 8ae969da56 +Author: wangyidong +Date: Fri Oct 12 14:16:04 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e3380f2fc8041a36379cd0d96362e379b61637cc +Merge: 17a82250d4 af96722cc7 +Author: yfl <554665488@qq.com> +Date: Fri Oct 12 14:11:57 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit af96722cc7657f76afd2cae7808c9401bca71133 +Merge: 88ebfa6bc0 505cafc736 +Author: 滔哥 +Date: Fri Oct 12 14:11:27 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 88ebfa6bc0ecb4c99947d9cfdc3ca777ac8ae486 +Author: 滔哥 +Date: Fri Oct 12 14:11:20 2018 +0800 + + * Finished task#5009 + +commit 17a82250d492987fd47082e9c8dcd74e82673ac8 +Author: yfl <554665488@qq.com> +Date: Fri Oct 12 14:09:05 2018 +0800 + + * Finish task #5003 + +commit 505cafc736e45fc3c9b60e6d640902c5265d8903 +Author: Catouse +Date: Fri Oct 12 14:05:52 2018 +0800 + + * change text align to left of dropdown menu in subNabvar. + +commit 0558da4e38911ca58563787cc27a938fcb056fb2 +Author: wangyidong +Date: Fri Oct 12 14:00:09 2018 +0800 + + * finish task #4967. + +commit 8ae969da56d6aaadbe98ef4d49aee5d31ce7afbc +Author: Catouse +Date: Fri Oct 12 13:58:53 2018 +0800 + + * finish task #4959. + +commit d76b38ea17c01d64fc69f00ee6913a3a2835c522 +Author: Catouse +Date: Fri Oct 12 13:56:01 2018 +0800 + + * finish task #4975. + +commit 33a0cdf634f730d41f217084e05d1021476079cc +Author: Catouse +Date: Fri Oct 12 13:51:47 2018 +0800 + + * finish task #4670. + +commit 07405dd60af73e95ec27274538ec286a1b098a80 +Author: Catouse +Date: Fri Oct 12 13:40:43 2018 +0800 + + * finish task #4955. + +commit f8aa405f153ff31a60e2cfdd62634677d9dd6a49 +Author: Catouse +Date: Fri Oct 12 13:38:38 2018 +0800 + + * change assing button style. + +commit 2c82053a03d6ae341e764f216628f83c07b9f30f +Merge: 4e0f092cb9 6e1262c050 +Author: Catouse +Date: Fri Oct 12 13:34:52 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4e0f092cb9aeef925ed798e6bed587e9d121a2b7 +Author: Catouse +Date: Fri Oct 12 13:34:47 2018 +0800 + + * change modal background. + +commit 6e1262c050b58903fb04461b858d8ad4adb50c0a +Merge: 65308fb508 1fa4ce5460 +Author: Yagami +Date: Fri Oct 12 13:16:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 65308fb50814b2e4d2c1f4fe8e5e02f4d1d654bd +Author: Yagami +Date: Fri Oct 12 13:16:18 2018 +0800 + + * Finish task #5024. + +commit 1fa4ce546076b4cf69910f8c5f4d516dc6124d31 +Author: 滔哥 +Date: Fri Oct 12 12:37:24 2018 +0800 + + * Finished task#5007 + +commit c368bd0e7c7bc6af932365d965736b362d67c7b8 +Author: 滔哥 +Date: Fri Oct 12 11:48:32 2018 +0800 + + * Finished task#4995. + +commit 7ff955c0e14d9983124dca02727c3100a566fcd5 +Author: 滔哥 +Date: Fri Oct 12 11:31:26 2018 +0800 + + * Finished task#4986. + +commit f002405662ddd63531dbfab172654aa331b0daeb +Merge: bd5d253791 a45e0ecd41 +Author: 滔哥 +Date: Fri Oct 12 11:18:17 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bd5d2537914e780597fee664f45d3aeb1fad8b27 +Author: 滔哥 +Date: Fri Oct 12 11:18:08 2018 +0800 + + * Finished task#4970. + +commit a45e0ecd415dd3b8c5ed0cbd771b4d83cfce3c22 +Merge: 2037cbd47a f7a59c0bfc +Author: yfl <554665488@qq.com> +Date: Fri Oct 12 10:54:50 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2037cbd47a2ac8c35883d65c4d9e13911af22890 +Author: yfl <554665488@qq.com> +Date: Fri Oct 12 10:52:09 2018 +0800 + + Finish task #5025 + +commit f7a59c0bfc4d5b443d73e8049a80663e8e79100c +Author: Yagami +Date: Fri Oct 12 09:58:27 2018 +0800 + + * Finish task #5020.* Finish task #5020.* Finish task #5020.* Finish task #5020.* Finish task #5020.* Finish task #5020.* Finish task #5020.* Finish task #5020. + +commit d1cd60221b1d1492f5e275cffad47ef4c3bf2f37 +Author: yfl <554665488@qq.com> +Date: Fri Oct 12 09:49:55 2018 +0800 + + Remove test print + +commit cf118ebee2419aa588b2c847c2e66b974d45af05 +Merge: a393d105d3 d72a662553 +Author: Yagami +Date: Fri Oct 12 09:30:56 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a393d105d3809a5b6525986db57968c4ecc19e28 +Merge: 9e8ee6e8b8 fbe9d854e5 +Author: Yagami +Date: Fri Oct 12 09:30:21 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9e8ee6e8b889ee0b635f7851590df79cc260532d +Author: Yagami +Date: Fri Oct 12 09:30:00 2018 +0800 + + * Fix doc lang file. + +commit d462fc3324f7cb1a20dbc6fc3fab6bbd1d2bc824 +Author: 滔哥 +Date: Fri Oct 12 09:26:45 2018 +0800 + + * Fix BUG#2215. + +commit d72a6625534109ef588b830b93df824eb897ea73 +Author: yfl <554665488@qq.com> +Date: Fri Oct 12 09:25:39 2018 +0800 + + Finish task #5021,#5018,#5017,#5016,#5015,#5005,#5003,#4987,#4985,#4653 + +commit fbe9d854e57f32e7d0e7c6134499b994e845fb6e +Merge: bbfdb5a32e a32b331e12 +Author: 滔哥 +Date: Fri Oct 12 09:15:31 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bbfdb5a32e17b143d952ba5af649ff42efab337a +Author: 滔哥 +Date: Fri Oct 12 09:15:18 2018 +0800 + + * Change file name. + +commit a32b331e12b073f0a1073d3c7ed2c430930f2d5b +Merge: d98adeccba 9f115f2a8e +Author: wangyidong +Date: Fri Oct 12 09:08:51 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d98adeccbaa1612b4e90adae51727aeb920884d5 +Author: wangyidong +Date: Fri Oct 12 09:08:12 2018 +0800 + + * finish task #4976. + +commit 9f115f2a8ecefbd25293361666f3c7fca0d95493 +Author: 滔哥 +Date: Thu Oct 11 21:33:57 2018 +0800 + + * Finished task#4968. + +commit 1b93b8a28a5df67fd145ddc138f24d91d7b5c2c0 +Author: 滔哥 +Date: Thu Oct 11 21:02:39 2018 +0800 + + * Finished task#4971. + +commit 8754aa0dc1172a6a3e7af3d16bacfc9bc9b62841 +Author: Yagami +Date: Thu Oct 11 17:02:51 2018 +0800 + + * Adjust doc orderby. + +commit 34e019677f5aae7d06646e61a208d607b6f40083 +Merge: 75e0e6555b 2dfb4aeeda +Author: wangyidong +Date: Thu Oct 11 15:44:22 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 75e0e6555bd184567d687fa6273cebbf075a64f5 +Author: wangyidong +Date: Thu Oct 11 15:38:26 2018 +0800 + + * finish task #4976. + +commit 2dfb4aeeda813723e9cf1eda30ffec0eb6908873 +Author: yfl <554665488@qq.com> +Date: Thu Oct 11 10:48:18 2018 +0800 + + * Finish task #4978,#4979,#4985,#4992,#4998,#5003,#5004,#5005,#5006, + +commit 9263cafb611b1ce365a5ece1142df6267d1f27ec +Merge: 763bb3601d 98b8f1097f +Author: yfl <554665488@qq.com> +Date: Thu Oct 11 10:47:09 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 98b8f1097fd6ee678588ed46976410dcf0526b68 +Merge: 5375f74140 148f54ce2e +Author: Yagami +Date: Thu Oct 11 09:40:31 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5375f74140d5b832aa53b05815d8dc0867630c0f +Author: Yagami +Date: Thu Oct 11 09:40:15 2018 +0800 + + * Finish task #4953. + +commit 148f54ce2e543dfac587aa8b41665f1919737ef0 +Author: wangyidong +Date: Thu Oct 11 08:57:50 2018 +0800 + + * change for bind ranzhi and fix error. + +commit 254b69382c8d9e0312b1e00e097bb08fdc91ebb9 +Author: wangyidong +Date: Wed Oct 10 16:50:58 2018 +0800 + + * finish task #4989. + +commit a66d70cb55845caf68dc3b5aa28a70e3aa4a18a0 +Merge: 070bfe25a0 c5f73613da +Author: wangyidong +Date: Wed Oct 10 16:11:48 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 070bfe25a09414fcce376e4dc570844a82da7f4a +Author: wangyidong +Date: Wed Oct 10 16:11:25 2018 +0800 + + * finish task #4988. + +commit c5f73613dad87abad71fa94358a624695a3d629a +Merge: f50be29252 d4f0c7c72e +Author: Yagami +Date: Wed Oct 10 15:18:02 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f50be29252934f75de4fcc22f011b0d50404adfa +Author: Yagami +Date: Wed Oct 10 15:17:47 2018 +0800 + + * remove doc change. + +commit d4f0c7c72e83545f3c7b5c2507a3bfb1d5fa9668 +Author: wangyidong +Date: Wed Oct 10 15:14:56 2018 +0800 + + * finish task #4981. + +commit 105487e3e8f977bd0a589845aab085fdaa22aa33 +Merge: c69784a466 d53cf25a2d +Author: wangyidong +Date: Wed Oct 10 15:02:54 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c69784a466cdc271b7f8a987efc68531861607d9 +Author: wangyidong +Date: Wed Oct 10 15:01:13 2018 +0800 + + * change for zentaopm. + +commit 7db8e54bcfa64f72d6932d2bf292ff7f09c1c33e +Author: wangyidong +Date: Wed Oct 10 15:00:23 2018 +0800 + + * fix bug #2224. + +commit 40efdc4d17811190424e56235178a1241becf78f +Author: wangyidong +Date: Wed Oct 10 14:59:47 2018 +0800 + + * finish task #4983. + +commit 763bb3601d1f4cf1b97bd399bd61c05223aa2498 +Merge: 55d78e4f8e d53cf25a2d +Author: yfl <554665488@qq.com> +Date: Wed Oct 10 13:26:12 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 12f52a42a1d644203a5ed653851ab324de865920 +Author: Yagami +Date: Wed Oct 10 10:57:11 2018 +0800 + + * Finish task #4953. + +commit 55d78e4f8e44061175737e98a8e7626bf1469a90 +Author: yfl <554665488@qq.com> +Date: Wed Oct 10 10:56:19 2018 +0800 + + welcome block count data + +commit d53cf25a2d9a96e88b58b226bc3937872128c44a +Author: Yagami +Date: Wed Oct 10 10:01:04 2018 +0800 + + * Finish task #4961. + +commit 2e367fa89ae7ef6d0eb55f002573e69ce717f5f1 +Merge: 5ec4610e30 18dbdd7f36 +Author: yfl <554665488@qq.com> +Date: Wed Oct 10 09:41:53 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5ec4610e30bd00b3a82b3ee56decd7636ea4890b +Author: yfl <554665488@qq.com> +Date: Wed Oct 10 09:40:52 2018 +0800 + + modify time format + +commit 18dbdd7f36fc629a07fef71fabb659506afb4748 +Author: Yagami +Date: Wed Oct 10 09:35:12 2018 +0800 + + * Finish task #4963. + +commit d2095fa96110ccc8362e76e2bf924516755e1e97 +Author: Yagami +Date: Tue Oct 9 16:52:08 2018 +0800 + + * Fix icon. + +commit 5c24ece14a7d6bd693df9db5074d395246f9fdae +Author: Yagami +Date: Tue Oct 9 16:28:33 2018 +0800 + + * Fix pri width. + +commit 043052609365ed078c0e23058b8fa26b2e33b675 +Author: Yagami +Date: Tue Oct 9 15:10:00 2018 +0800 + + * Finish task #4954. + +commit f401d41aee7a565595834e80e08e87452eade45b +Author: Yagami +Date: Tue Oct 9 15:04:31 2018 +0800 + + * Finish task #4954. + +commit 980af6044d9b75d89035367ec0b751601c96bda2 +Author: Yagami +Date: Tue Oct 9 14:23:11 2018 +0800 + + * Finish task #4957. + +commit f8dc98b1963885fe624d97f16f2665f65902ec71 +Author: Catouse +Date: Tue Oct 9 14:16:31 2018 +0800 + + * change theme names. + +commit ba473b7ef698f6c792502fe426392ce88eebb69f +Author: Catouse +Date: Tue Oct 9 14:11:53 2018 +0800 + + * update classic themes. + +commit c1a63defe4cfe1e009c32725fe0c80aaff758937 +Merge: 8f5b47ab85 24c7b0a2dd +Author: Catouse +Date: Tue Oct 9 14:07:09 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8f5b47ab852c85d7180d0cc251bc644b5748d3d6 +Author: Catouse +Date: Tue Oct 9 14:07:04 2018 +0800 + + * fix font-size of assignto button. + +commit 24c7b0a2dd6c5d13d8fed73d4d14a78b4338cf73 +Author: wangyidong +Date: Tue Oct 9 13:13:50 2018 +0800 + + * fix bug #2224. + +commit 4e7ae0f8ac5533cdabfa459a650d58a4baeade17 +Merge: 92f1947583 903c46d821 +Author: wangyidong +Date: Tue Oct 9 11:27:44 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 92f194758319328503cfdaa0c4c34b637c34e1ac +Author: wangyidong +Date: Tue Oct 9 11:26:53 2018 +0800 + + * finish task #4962. + +commit 903c46d821b42296fe5faff73333041333a223f7 +Author: Yagami +Date: Tue Oct 9 11:13:27 2018 +0800 + + * Finish task #4965. + +commit 3657f64d05eb07c5f0641643c80c4c7a4e5669ce +Author: Yagami +Date: Tue Oct 9 11:04:57 2018 +0800 + + * Finish task #4966. + +commit fe8154ed3c9563bba6bf9c4379064066663e4cf2 +Merge: 7cc5d54833 c96b787060 +Author: Yagami +Date: Tue Oct 9 10:55:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c96b78706037fff6c221f60427e4e245e475e576 +Merge: 6b2957fb14 f1c761f50d +Author: wangyidong +Date: Tue Oct 9 10:53:27 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7cc5d548337da0900ef95ddb5d0f3646b89ebf36 +Author: Yagami +Date: Tue Oct 9 10:53:19 2018 +0800 + + * Finish task #4974. + +commit 6b2957fb14b9da8b37d26a5fdfefc443a73fa728 +Author: wangyidong +Date: Tue Oct 9 10:53:07 2018 +0800 + + * finish task #4964. + +commit f1c761f50d1275eaf68214b0c2c08d5e1fb3f3c5 +Merge: 4b8a44f68b 733c093b03 +Author: Yagami +Date: Tue Oct 9 10:21:26 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4b8a44f68b2b0f1872540eac53c322c89cae6084 +Author: Yagami +Date: Tue Oct 9 10:21:11 2018 +0800 + + * Finish task #4972. + +commit 733c093b035658aceccfb6813406a6a3a28d2911 +Author: wangyidong +Date: Tue Oct 9 10:11:36 2018 +0800 + + * finish task #4973. + +commit af4d64807b32684ddf3ace3913d7c70e642d812e +Author: wangyidong +Date: Tue Oct 9 09:17:48 2018 +0800 + + * fix for datatable in bug browse page. + +commit 3987bac511f527a7b391447dbc1122192f1b3847 +Author: chenfeiCF +Date: Mon Oct 8 14:09:34 2018 +0800 + + * If bug severity has customed, show severity value not the key. + +commit f48a0491a4f9b545baa4753569af8802962952f2 +Merge: 3a35aa4435 7965e91653 +Author: Catouse +Date: Mon Oct 8 13:48:54 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3a35aa4435b7bb54fcad8fcb3232894f1f190bd6 +Author: Catouse +Date: Mon Oct 8 13:48:48 2018 +0800 + + * update severity label style. + +commit 7965e916536cbd574ae0331f15aaee108d52d375 +Author: wangyidong +Date: Mon Oct 8 11:22:07 2018 +0800 + + * fix for get plan bugs. + +commit d3983268b3d0e20b178c8b727b3d522f9fae8210 +Author: Catouse +Date: Mon Oct 8 10:34:57 2018 +0800 + + * update zui theme. + +commit c4e4dc42b70a87abda8105eeeac2dee18c8a19a2 +Author: Catouse +Date: Mon Oct 8 10:33:59 2018 +0800 + + * update zui theme. + +commit 8adf2567015282594e3dc8d5b80d722672ebcfdd +Author: Catouse +Date: Mon Oct 8 10:27:11 2018 +0800 + + * fix assignto button style. + +commit fb44467b26e8df1818dbcf4882ae484399ee4364 +Author: Catouse +Date: Mon Oct 8 10:15:38 2018 +0800 + + * change success color. + +commit 55fecfe0be7252da01e9a16f46593b37a3819f0b +Author: Catouse +Date: Mon Oct 8 10:14:56 2018 +0800 + + * change status label colors. + +commit e427eb88d9fe9253fdc537af964ae9f2f819cff8 +Author: Catouse +Date: Mon Oct 8 09:31:36 2018 +0800 + + * fix table list scroll to bottom on page load. + +commit d5b555b51ba4128d49d60a85eca6beba752afb50 +Author: Catouse +Date: Mon Oct 8 09:23:51 2018 +0800 + + * fix icon color in dropdown menu in daskboard page. + +commit 1df5ef509ee5ce3aab3897ba197b6c39606c334f +Merge: 33ceeeee28 6bdf752fbd +Author: wangyidong +Date: Sun Sep 30 17:33:54 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 33ceeeee281d050b03cc7db92dc817be74db925e +Author: wangyidong +Date: Sun Sep 30 17:22:45 2018 +0800 + + * adjust for bind ranzhi. + +commit 8c11529b7f2b3d062fdc6727028d2eb6d4afede8 +Author: wangyidong +Date: Sun Sep 30 15:59:51 2018 +0800 + + * fix bug for checkPriv method. + +commit 6bdf752fbdd80a2ac6144289ef5bcc88815f3873 +Merge: b04a810b30 a856f8d0a3 +Author: Catouse +Date: Sun Sep 30 13:39:38 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b04a810b30c09304971e1e015b8f8173d5429681 +Author: Catouse +Date: Sun Sep 30 13:39:32 2018 +0800 + + * change font size of subnavbar. + +commit a856f8d0a33b773f65af993a6627a0f061464b68 +Merge: 4ff3c8fca8 1e45782198 +Author: wangyidong +Date: Sun Sep 30 10:27:53 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4ff3c8fca8cebb3f44cddee9b04967844582ea1d +Author: wangyidong +Date: Sun Sep 30 10:27:32 2018 +0800 + + * adjust for main actions. + +commit 1e45782198b3e8ba5b62524c3638a30d55ede303 +Author: 滔哥 +Date: Sun Sep 30 07:54:08 2018 +0800 + + * Fix bug#2216. + +commit fd13cdeccfda8b2c59f70fd63fbe980516c59105 +Merge: cce187c7e4 6cf88f8999 +Author: wangyidong +Date: Sat Sep 29 14:44:28 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cce187c7e4fcf49b50d0e610b5c84332a73263b8 +Author: wangyidong +Date: Sat Sep 29 14:44:04 2018 +0800 + + * fix for upgrade. + +commit 6cf88f899904972a61b7b35aa317bc804178d754 +Author: Catouse +Date: Sat Sep 29 10:20:45 2018 +0800 + + * fix lines style of tree menu. + +commit 03d1a532651f1ee081b57cddc3f0bbe20abb0188 +Merge: ccd24f1ed2 62e2c02d3b +Author: Catouse +Date: Sat Sep 29 10:10:14 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ccd24f1ed24769aa035df58391727d45c6b540e3 +Author: Catouse +Date: Sat Sep 29 10:10:08 2018 +0800 + + * update zentao icon in footer with classic style image. + +commit 62e2c02d3b3065b15dfa0d90b5d21ddffd244ff6 +Author: 滔哥 +Date: Sat Sep 29 08:18:09 2018 +0800 + + * Fix bug. + +commit bf0624329e35f8523d7fb90697ee141e29f86177 +Author: 滔哥 +Date: Sat Sep 29 07:59:29 2018 +0800 + + * Fix bug. + +commit af4b70e86085f0346d6d19461dc366eb33809966 +Author: 滔哥 +Date: Sat Sep 29 07:38:08 2018 +0800 + + * Fix bug. + +commit b18c3e6d13c0de7a5444c9a4ee044779f12b5869 +Author: 滔哥 +Date: Fri Sep 28 14:16:04 2018 +0800 + + * Fix bug. + +commit 4cf95b16e2d648e2cd2663dad6dc974415036853 (tag: zentaopms_10.4.stable_20180928) +Author: wangyidong +Date: Fri Sep 28 10:46:51 2018 +0800 + + * change for zh-tw lang. + +commit fdea2bca2750a40c6c652106d7d2e5afa1d865d8 +Author: wangyidong +Date: Fri Sep 28 10:44:26 2018 +0800 + + * fix bug for snoopy. + +commit 2d25ad825aa27bf0226fc131977a6baf91a8444e +Author: wangyidong +Date: Fri Sep 28 09:35:12 2018 +0800 + + * adjust code for upgrade. + +commit 3423acdcc39c927c7606b5b9752515915ec502b4 +Author: wangyidong +Date: Fri Sep 28 09:03:52 2018 +0800 + + * adjust code. + +commit 12e366d54dbbac536d8971082bf10fe4f4f773bc +Author: 滔哥 +Date: Thu Sep 27 22:30:07 2018 +0800 + + * Finish task#4796. + +commit 72ba0ddf1ef73102196817cc71a55ca6a2bbaf91 +Merge: 8d1370c2c8 51cff9e6d9 +Author: 滔哥 +Date: Thu Sep 27 22:18:06 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 51cff9e6d9a863f0fb9c4107ebedbdb0b3160dc6 +Author: Catouse +Date: Thu Sep 27 18:12:59 2018 +0800 + + * finish task #4927. + +commit 8b1dab3bd9ea0384065c2409001fdcaaba868d74 +Author: Catouse +Date: Thu Sep 27 18:10:31 2018 +0800 + + * finish task #4927. + +commit 2a81053dd68e00b4002435a2bffbeaed19b943aa +Author: Catouse +Date: Thu Sep 27 18:03:07 2018 +0800 + + * change tabs style in side column of detail views. + +commit 1b7631714e266522478cc86166d1deb2294aeb69 +Author: Catouse +Date: Thu Sep 27 18:02:02 2018 +0800 + + * change style of dropdown menu. + +commit 86e54205ed7e9635f138fff3722085704a9b2e67 +Author: Catouse +Date: Thu Sep 27 17:13:52 2018 +0800 + + * finish task #4930. + +commit a24fd6eca6b667e7b4b09c9894867fb7e9f4a428 +Author: Catouse +Date: Thu Sep 27 16:58:58 2018 +0800 + + * finish task #4923. + +commit 165b8899c98e4647a8baf18f0ad55551a68c7e06 +Author: Catouse +Date: Thu Sep 27 16:41:27 2018 +0800 + + * change module label style in task list. + +commit ea932f7f9ffe1ecae38e8a9e4528e629ba69b8c2 +Author: Catouse +Date: Thu Sep 27 15:51:12 2018 +0800 + + * finish task #4913. + +commit c9e22b099e4e8f3625b48ce93089744d3f6cc03f +Author: Catouse +Date: Thu Sep 27 15:50:59 2018 +0800 + + * finish task #4917. + +commit 2694f09d8c9810926d25b3f0d01efc88b80f4ac3 +Merge: 942e8f8788 c045bd8b11 +Author: Catouse +Date: Thu Sep 27 15:42:26 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 942e8f8788210cade92edc058932bc275c37ed7d +Author: Catouse +Date: Thu Sep 27 15:31:04 2018 +0800 + + * change timeline style. + +commit c045bd8b119f7cd0b58b0a829b61ce9984e6f0ea +Merge: deff332223 499eee1fa1 +Author: Yagami +Date: Thu Sep 27 15:23:33 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3d68e51ec13759263b09e89e5679a2fa6023c4db +Author: Catouse +Date: Thu Sep 27 15:23:24 2018 +0800 + + * finish task #4914. + +commit deff332223a43a954c79ebce282d3942a8947a3a +Author: Yagami +Date: Thu Sep 27 15:23:14 2018 +0800 + + * Fix action view. + +commit 9e262c512faab21fa0035d93129443435493ea17 +Author: Catouse +Date: Thu Sep 27 15:12:08 2018 +0800 + + * finish task #4951. + +commit 499eee1fa1fd5b71a82958da79bd6f64fdfc171a +Author: Catouse +Date: Thu Sep 27 14:54:02 2018 +0800 + + * refactor code for task #4912. + +commit 85fd278ea7d423f3c4d8dab289d8bb4e663a3c45 +Merge: f921f8fc69 41d058bd2b +Author: Catouse +Date: Thu Sep 27 14:47:28 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + # Conflicts: + # www/theme/default/style.css + +commit f921f8fc69a1de6c7fcec6538151fcbca360b774 +Author: Catouse +Date: Thu Sep 27 14:46:51 2018 +0800 + + * refactor code for task #4912. + +commit 41d058bd2bb02a2ddd7d504e2a63578434469fef +Merge: 401123654c 6277a12f3f +Author: wangyidong +Date: Thu Sep 27 14:40:20 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 401123654c27e3610a6783a28d1997d465fb017c +Author: wangyidong +Date: Thu Sep 27 14:39:29 2018 +0800 + + * finish task #4911. + +commit 6277a12f3fc813cb0bcab6700e96a2f4edf417df +Merge: 90242f5d6b 1d1abd0cfc +Author: Catouse +Date: Thu Sep 27 14:29:58 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 90242f5d6b5478bbe9f82c4e0c761cb568a5e172 +Author: Catouse +Date: Thu Sep 27 14:29:53 2018 +0800 + + * refactor code for task #4769. + +commit 1d1abd0cfc4332d2d5dd82fd2ccb7a553be8a408 +Author: Yagami +Date: Thu Sep 27 14:04:34 2018 +0800 + + * Fix craete case view pri span border. + +commit 4f718b379614600cff6d1c5bc83528227bbfcdd9 +Merge: bb3c7e82e3 b4407c7529 +Author: Yagami +Date: Thu Sep 27 14:00:02 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bb3c7e82e305768ed8286440b1b2e2e7d1903ff5 +Author: Yagami +Date: Thu Sep 27 13:59:21 2018 +0800 + + * Fix create case view pri span border. + +commit b4407c7529affd4170b162c50c1b529490252e99 +Author: Catouse +Date: Thu Sep 27 13:42:11 2018 +0800 + + * refactor code for task #4918. + +commit 7652f8bc1cf6b83051c0201f21caf26f265e5025 +Author: Catouse +Date: Thu Sep 27 13:33:58 2018 +0800 + + * refactor code for task #4769. + +commit 389b7d77c0de7b03531f91a25eaa420ba1b8cb52 +Merge: f8064bb042 059ed26f8d +Author: Catouse +Date: Thu Sep 27 11:27:22 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f8064bb042ee19bf17d153cd74665120878955d3 +Author: Catouse +Date: Thu Sep 27 11:27:17 2018 +0800 + + * finish task #4950. + +commit 059ed26f8d7de504c34de6eab108bd221fd50934 +Author: wangyidong +Date: Thu Sep 27 11:22:22 2018 +0800 + + * code for task #4943. + +commit ef550c58fa2a9a0031c67768c3b0313725220e68 +Author: wangyidong +Date: Thu Sep 27 11:19:03 2018 +0800 + + * finish task #4943. + +commit cc8c0a4344f505cb695980bc61e45df0d2cd43d3 +Merge: 25c19f97b3 6e0554f970 +Author: wangyidong +Date: Thu Sep 27 10:53:26 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 25c19f97b31ca5761ad47aaf05d56b737a06785a +Author: wangyidong +Date: Thu Sep 27 10:52:54 2018 +0800 + + * finish task #4948. + +commit 6e0554f97078efae75b9d2e1b7396c42d33ceb25 +Author: Catouse +Date: Thu Sep 27 10:42:00 2018 +0800 + + * fix table style on fixed footer on page bottom. + +commit 235d88576a245b19379ee71c6cdbece208d3576c +Author: Catouse +Date: Thu Sep 27 10:34:43 2018 +0800 + + * fix line-height of '' element in table. + +commit 9656fdd2ba18e4f8416e01948fccd902732db890 +Author: Catouse +Date: Thu Sep 27 09:46:50 2018 +0800 + + * fix modal-iframe with double scrollbar. + +commit e23a6e61d5a186f479f1d619a4b1ca82df592897 +Author: Catouse +Date: Thu Sep 27 09:40:01 2018 +0800 + + * code for task #4910. + +commit 3e881d281b9b2e24fe1a3edeaf1b88d58080aff7 +Merge: 4ec5a294c1 f8f85fd857 +Author: Catouse +Date: Thu Sep 27 09:09:15 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4ec5a294c1a0f0b5ef862cf0c60b4e7a5988ef01 +Author: Catouse +Date: Thu Sep 27 09:09:09 2018 +0800 + + * fix dynamic block style. + +commit f8f85fd8579abd59e66ddf93d45e7fd2694b1285 +Author: wangyidong +Date: Wed Sep 26 17:09:27 2018 +0800 + + * finish task #4949. + +commit 6ccd172703cee5f0224df1f303086bedd5b693a8 +Author: wangyidong +Date: Wed Sep 26 17:01:14 2018 +0800 + + * finish task #4909. + +commit bc75d033260f2aa1a82eae9764e1fe48a8bab3d2 +Author: wangyidong +Date: Wed Sep 26 16:13:45 2018 +0800 + + * finish task #4925. + +commit e0950c3e8b911c63b4e32864cc83ba8030fcdff7 +Author: wangyidong +Date: Wed Sep 26 15:11:54 2018 +0800 + + * finish task #4940. + +commit d9810596bc242c96409f5b79afbe4d507a79f511 +Author: wangyidong +Date: Wed Sep 26 14:34:35 2018 +0800 + + * finish task #4922. + +commit ce9d11cef5ec3868a0cc37809e0149f7f3e67932 +Author: wangyidong +Date: Wed Sep 26 14:26:11 2018 +0800 + + * finish task #4919. + +commit 2d637bed3991ec94852a70024cc2cc311a9a0841 +Merge: 9401b9b250 8534f7b26d +Author: wangyidong +Date: Wed Sep 26 14:20:01 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9401b9b2505ca94847372fcc5bcfd2b0fd2fe5c5 +Author: wangyidong +Date: Wed Sep 26 14:19:30 2018 +0800 + + * finish task #4932. + +commit 8534f7b26d644952eab02d3eef6e2c7b3825bcb9 +Merge: 373741ee78 e9282d1410 +Author: Yagami +Date: Wed Sep 26 14:16:26 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 373741ee78fc982b2347132d6a1ca45d2815b0f9 +Author: Yagami +Date: Wed Sep 26 14:15:33 2018 +0800 + + * Change report default button icon. + +commit e9282d14106fbfe5c3d8c8741abb2dd0b76a05c2 +Author: wangyidong +Date: Wed Sep 26 14:10:26 2018 +0800 + + * finish task #4933. + +commit f22139501a66bf7e5e6590d9e1b33c3d8ec11879 +Merge: 07377dd65a 56ff1b8d09 +Author: wangyidong +Date: Wed Sep 26 14:08:25 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 07377dd65a6efa84e9ffce98a8c475c6adefd7d3 +Author: wangyidong +Date: Wed Sep 26 14:08:00 2018 +0800 + + * finish task #4924. + +commit 56ff1b8d097de958697e6c94f13bbc20601a49e0 +Merge: 73108b8261 1ad541dd7e +Author: Yagami +Date: Wed Sep 26 14:07:47 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 73108b8261460ef3ed1960082102409532a6f547 +Author: Yagami +Date: Wed Sep 26 14:07:34 2018 +0800 + + * Finish task #4942. + +commit 1ad541dd7ef06b368f4acbdadc5cb6128c3d7acc +Merge: a9540d8443 f149100e71 +Author: wangyidong +Date: Wed Sep 26 14:06:06 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a9540d84438409aabc6d39ff4e6897601bd7bf1e +Author: wangyidong +Date: Wed Sep 26 14:05:18 2018 +0800 + + * adjust style for misc-about. + +commit f149100e718d2cf350e0175f3d832134ec33cbb7 +Merge: 55511987f1 e79e05665b +Author: Yagami +Date: Wed Sep 26 14:00:16 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 55511987f131a7060821e1d9583cdd97f1971bfd +Author: Yagami +Date: Wed Sep 26 13:59:57 2018 +0800 + + * Finish task #4946. + +commit e6fee33490ceabffab8e3d1c345f886a725cf200 +Author: wangyidong +Date: Wed Sep 26 13:57:03 2018 +0800 + + * finish task #4937. + +commit e79e05665b31511e628706ab874caf199af6285c +Author: wangyidong +Date: Wed Sep 26 13:53:53 2018 +0800 + + * finish task #4941. + +commit 267a659feae1919e8e6c7e2472d01013fd9870e7 +Merge: 556af243fa d836b77324 +Author: wangyidong +Date: Wed Sep 26 13:50:38 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d836b773247701bd4697f7a897ce411084605316 +Author: Yagami +Date: Wed Sep 26 13:49:16 2018 +0800 + + * Finish task #4944. + +commit 556af243fa5eeac33d06ee7dc9f955b4937e0f2b +Author: wangyidong +Date: Wed Sep 26 13:49:02 2018 +0800 + + * finish task #4912. + +commit db497301f0226758da5e556184c5c66aa36be45f +Merge: 55442097f7 c2168541f3 +Author: Yagami +Date: Wed Sep 26 13:46:31 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 55442097f75f802b55c94bd681c79e3b930f6e77 +Author: Yagami +Date: Wed Sep 26 13:45:36 2018 +0800 + + * Finish task #4916,#4918,#4929. + +commit c2168541f32e78481696609d9de672dabd02378d +Merge: 8f9944bc9f 14285ef43a +Author: Catouse +Date: Wed Sep 26 11:36:47 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8f9944bc9f4c34209db33360d011a397cb1c511b +Author: Catouse +Date: Wed Sep 26 11:36:41 2018 +0800 + + * update datatable. + +commit 8d1370c2c82599509cdc797d5dbb789e911d9da3 +Author: 滔哥 +Date: Wed Sep 26 11:12:20 2018 +0800 + + * Finish task#4773. + +commit ce3a23585d5663a5bd5ed5c75acc52f4f8084bdd +Merge: e1c38885bd 14285ef43a +Author: wangyidong +Date: Wed Sep 26 11:08:55 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e1c38885bd63ee887c5d839a97f539ceaa65e25e +Author: wangyidong +Date: Wed Sep 26 11:08:34 2018 +0800 + + * finish task #4910. + +commit 14285ef43a53ff21d0a727e0793201117ab82da6 +Author: 滔哥 +Date: Wed Sep 26 11:00:14 2018 +0800 + + * Finish task#4935. + +commit f4c684a481892c61187103108deae0dae9bebafc +Merge: 5fa19b78ca 6c64a21900 +Author: 滔哥 +Date: Wed Sep 26 10:50:58 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5fa19b78ca3cdf281177ef596a111a14b83cc394 +Author: 滔哥 +Date: Wed Sep 26 10:50:52 2018 +0800 + + * Finish task#4926. + +commit 6c64a21900b695ecbb31c30c521e7bf5ff348560 +Author: wangyidong +Date: Wed Sep 26 10:45:35 2018 +0800 + + * adjust code. + +commit 00e4fb31673ffa79ec2b99343610c00a17509453 +Author: wangyidong +Date: Wed Sep 26 10:44:50 2018 +0800 + + * fix bug for editor tree. + +commit 6357b9173d1db9c1dce85ab3fa141edbe985ef0f +Author: wangyidong +Date: Wed Sep 26 10:43:33 2018 +0800 + + * change ranzhi to zentao in Notes. + +commit 330b21b2e317924ee380a6cf4b22848e6e93edd8 +Author: 滔哥 +Date: Wed Sep 26 10:43:23 2018 +0800 + + * Change Copyright Ranzhi to ZenTaoPMS. + +commit 3561a659c7cd2569cd1c7a09c58f1ba1e6ab2085 +Author: wangyidong +Date: Tue Sep 25 13:27:30 2018 +0800 + + * add changelog. + +commit 8f2a64c023d7fbd739c00dca95374609ddbe89c9 +Merge: f6cb04cd44 1627f13044 +Author: wangyidong +Date: Tue Sep 25 13:11:29 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f6cb04cd44539a8a3c6c02246de21034e3cfe8e5 +Author: wangyidong +Date: Tue Sep 25 13:11:06 2018 +0800 + + * change http to https. + +commit 1627f130449fd12a2fae72bc2bf939cdc01ea2b3 +Author: 滔哥 +Date: Tue Sep 25 12:14:53 2018 +0800 + + * Task#4796. + +commit 57137612e1b5937d2929ad0fa62f130792d68bc3 +Author: 滔哥 +Date: Tue Sep 25 11:44:53 2018 +0800 + + * Finish task#4795. + +commit 0520b7e34033956ca35bdabc0d8a81c86439b6e5 +Author: 滔哥 +Date: Tue Sep 25 11:39:15 2018 +0800 + + * Finish task#4795. + +commit f32fa0e58c89d99ed6f51d73eacad37981611d99 +Merge: d3a5ed2030 756ef36066 +Author: 滔哥 +Date: Tue Sep 25 10:54:34 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 756ef3606669c26a12315e86a30914f7b0f5a447 +Author: Catouse +Date: Tue Sep 25 10:50:47 2018 +0800 + + * remove label-info class from module label in task table. + +commit cb492059fea9abc46225e5d55ee216da8a4be0a0 +Merge: 1350c2c856 4fee520df1 +Author: Catouse +Date: Tue Sep 25 10:27:18 2018 +0800 + + Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms + +commit 1350c2c856f6f92c3419a83d84ed4fb380cc4387 +Author: Catouse +Date: Tue Sep 25 10:27:00 2018 +0800 + + * change text align format in task table. + +commit 4fee520df159a6d75d597c87f4257e8f0f0eefd3 +Merge: bb85d12961 7e63bc430a +Author: Yagami +Date: Tue Sep 25 09:55:02 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bb85d129615f8438e6e607079ff7a4a94915d1ac +Author: Yagami +Date: Tue Sep 25 09:54:42 2018 +0800 + + * Fix create case view css. + +commit 7e63bc430a6f307d0fdc9a94aa3f227636cb02f2 +Merge: 290be6534b 2f757f2649 +Author: Catouse +Date: Tue Sep 25 09:47:34 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 290be6534b899002cb31fbbb63f6051fa5c57961 +Author: Catouse +Date: Tue Sep 25 09:47:14 2018 +0800 + + * refactor codes. + +commit 2f757f264942051e2c41a771c1d1f247ffd55db0 +Merge: b196ad9704 0cdaeda9ab +Author: Yagami +Date: Tue Sep 25 09:40:44 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b196ad97043e804b52cea0f7ab37afe1bd3b675c +Author: Yagami +Date: Tue Sep 25 09:40:20 2018 +0800 + + * Fix case datatable action field width. + +commit 0cdaeda9ab059fbd90284450bf7ff793de553614 +Merge: 94adf90943 f05b78cd55 +Author: Catouse +Date: Tue Sep 25 09:36:56 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 94adf90943de71a68c7165f66231043fcc55e9b1 +Author: Catouse +Date: Tue Sep 25 09:36:50 2018 +0800 + + * improve UI of table. + +commit f05b78cd5520da132e06db6f0497e5c6e01113f0 +Merge: 44b9825154 4b3b8c4ef2 +Author: Yagami +Date: Tue Sep 25 09:34:13 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 44b982515463d87b98825773ee00d8dcec35e5db +Author: Yagami +Date: Tue Sep 25 09:33:52 2018 +0800 + + * Fix create testsuite view. + +commit 4b3b8c4ef237de6a1f2046a41fa48aee466e3fdb +Author: Catouse +Date: Tue Sep 25 09:22:42 2018 +0800 + + * refactor code. + +commit 7e70839e21f5d0eba41472f912664bd55cacf2a3 +Author: Catouse +Date: Tue Sep 25 09:22:34 2018 +0800 + + * change scrollbar position in datatable. + +commit d3a5ed203020f9fa8b44350c9a125f2570980913 +Merge: c75eae3907 d6558a392b +Author: 滔哥 +Date: Tue Sep 25 09:22:26 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d6558a392b890f2f6eab871ad9dd2a74c84193d6 +Merge: ce80ed9c4e 83f20943f4 +Author: Yagami +Date: Tue Sep 25 09:06:23 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ce80ed9c4e5e9097c0c75d89dc2d54b4fe8d6fce +Author: Yagami +Date: Tue Sep 25 09:06:00 2018 +0800 + + * Fix groupcase view css. + +commit 83f20943f4e59d1b01b0fdc916716035f8cf9e3d +Merge: d3220869b4 91f7c2c699 +Author: Catouse +Date: Fri Sep 21 18:19:26 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + # Conflicts: + # www/theme/default/style.css + +commit d3220869b49746d188cd16bb241bf5de9308096b +Author: Catouse +Date: Fri Sep 21 18:19:01 2018 +0800 + + * improve UI of project/testtask view. + +commit 91f7c2c6993f6deab0e4afba9d08d5e6ace24d21 +Merge: f93677d156 202d4b2644 +Author: wangyidong +Date: Fri Sep 21 18:10:55 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f93677d1567601eccdb6026553d3012da539cb46 +Author: wangyidong +Date: Fri Sep 21 18:09:34 2018 +0800 + + * revert for assignTo. + +commit c7775aff276e43e31251e721b94d2b033f69dc6a +Author: Catouse +Date: Fri Sep 21 17:59:23 2018 +0800 + + * refactor code for task #4888. + +commit 202d4b2644d27e12c2865dbb580286693f4affdd +Author: Catouse +Date: Fri Sep 21 16:44:08 2018 +0800 + + * finish task #4849. + +commit e45a1e4d34d1fda6cdfc5d4b675b9962a2cc02ee +Author: Catouse +Date: Fri Sep 21 16:39:10 2018 +0800 + + * finish task #4791. + +commit dacefbf8447192c16e41625dd68061d7146a6c97 +Merge: 1588e380b6 e38601e5ee +Author: Catouse +Date: Fri Sep 21 15:32:30 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1588e380b62bbb559f47e28147d88b112c12c55d +Author: Catouse +Date: Fri Sep 21 15:32:24 2018 +0800 + + * finish task #4855. + +commit e38601e5ee6e0c4c4ea811c5073809f7870e8d0e +Author: wangyidong +Date: Fri Sep 21 15:17:09 2018 +0800 + + * finish task #4865. + +commit 7c992e499858342908b8c14a0edbdcb39958e0cb +Merge: e6b8ac6a2b a34cc77a91 +Author: wangyidong +Date: Fri Sep 21 15:15:45 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e6b8ac6a2bf91c0126c82630b59644f909b27b92 +Author: wangyidong +Date: Fri Sep 21 15:15:13 2018 +0800 + + * fix for link zentao site. + +commit a34cc77a91076e05c5c7e66b2677be235f2b1aab +Author: Catouse +Date: Fri Sep 21 15:11:39 2018 +0800 + + * fix sidebar UI. + +commit 9753ef3218f695e2c3ddf253a39d37bd04108a6b +Author: Catouse +Date: Fri Sep 21 15:00:11 2018 +0800 + + * finish task #4861. + +commit 84262dfaea1d493531c9e4d72d8e0ea36e544a4a +Author: Catouse +Date: Fri Sep 21 14:24:01 2018 +0800 + + * update zui themes. + +commit d6342e7e4cf3692177795fbc2cf1d2ff0c1846fb +Author: Catouse +Date: Fri Sep 21 14:23:44 2018 +0800 + + * fix style in firefox of project/groupedtask view. + +commit 9e573987b2605f5c8974c8c992d06b91245c53f3 +Author: Catouse +Date: Fri Sep 21 11:52:45 2018 +0800 + + * finish task #4860. + +commit 21c8c13db0a1dbd827af5b560b4184cadf873ac4 +Author: Catouse +Date: Fri Sep 21 11:43:16 2018 +0800 + + * finish task #4862. + +commit 623d9246e7d1677dae6f28bbfa2e1430bbf7fade +Author: Catouse +Date: Fri Sep 21 11:40:30 2018 +0800 + + * improve UI of project/grouptask view. + +commit f93ea0088bc66fc630ebbe4f71fb670326a2f2a6 +Merge: 9b616f7524 8f3e524be5 +Author: Yagami +Date: Fri Sep 21 11:29:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9b616f7524f51a51044ea4210cc3a6c866c62782 +Author: Yagami +Date: Fri Sep 21 11:29:21 2018 +0800 + + * Fix task #4860. + +commit 8f3e524be511396f124164a850d5c810149fef45 +Author: Catouse +Date: Fri Sep 21 11:28:46 2018 +0800 + + * improve UI of grouped table. + +commit a7152e64969261322fffdf7637eb75132e70aa88 +Author: Catouse +Date: Fri Sep 21 11:09:08 2018 +0800 + + * finish task #4906. + +commit c386061532397b3744b5d9c88058379396ce4118 +Author: Catouse +Date: Fri Sep 21 11:00:04 2018 +0800 + + * improve UI of main table. + +commit 82d4229202156b179be3f80cf783082d7dfacbea +Merge: 12ea080d7f a500d57bfe +Author: Catouse +Date: Fri Sep 21 10:53:56 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 12ea080d7f2b16eba130549e5cd4822c24918bae +Author: Catouse +Date: Fri Sep 21 10:53:49 2018 +0800 + + * change back btn style type. + +commit 2c2ece7c343f7754555d22ae183cbb0e77073fdf +Author: Catouse +Date: Fri Sep 21 10:18:42 2018 +0800 + + * finish task #4763. + +commit ba9ad595da43c7c9d5817bc67929a36991c868eb +Author: Catouse +Date: Fri Sep 21 09:13:00 2018 +0800 + + * finish task #4766. + +commit a500d57bfe0318582bb821d9be743ff7b5876a58 +Merge: e03981b8d7 e01aef954e +Author: chenfeiCF +Date: Fri Sep 21 08:30:30 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e03981b8d7b7fc79304f2e4838d2d8241f128584 +Author: chenfeiCF +Date: Fri Sep 21 08:29:26 2018 +0800 + + * Finish task #4872, #4873. + +commit e01aef954e9eea469f48599a773222c98ecf6c35 +Merge: ffd09f700c 692f81fd9d +Author: Catouse +Date: Thu Sep 20 17:59:21 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ffd09f700cf9a7e12ee940f99295e18ce24e5d4f +Author: Catouse +Date: Thu Sep 20 17:59:16 2018 +0800 + + * change color of bug severity badge. + +commit c75eae3907d59166159f70402e36fe623f1cc825 +Merge: 6276bfb339 692f81fd9d +Author: 滔哥 +Date: Thu Sep 20 17:58:25 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 692f81fd9ddf1c32d28ef13d96a41a00dcec21ff +Merge: a4e7756fd5 f4c032e5cc +Author: wangyidong +Date: Thu Sep 20 17:35:33 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a4e7756fd5deb19d285b83d5f4d44db7a443e389 +Author: wangyidong +Date: Thu Sep 20 17:34:53 2018 +0800 + + * finish task #4851. + +commit 6276bfb33901aa1d1ab2c4bc6ba55a28c87fc14b +Merge: 52936c13be f4c032e5cc +Author: 滔哥 +Date: Thu Sep 20 16:59:58 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f4c032e5cc396c915c9754e9aefbb734860f5e29 +Author: Yagami +Date: Thu Sep 20 16:35:24 2018 +0800 + + * Finish task #4866. + +commit f4e565ea93d7a9f9190d5a14c7b4bbb30de69a79 +Author: Yagami +Date: Thu Sep 20 16:33:39 2018 +0800 + + * Finish task #4867. + +commit 36ced4814768a14b2e558143ae562ba7158ed319 +Author: wangyidong +Date: Thu Sep 20 16:31:32 2018 +0800 + + * adjust for block. + +commit fbeb037011c0b6e4d6033498de75e3bba65781c6 +Merge: e359e72a9e 21746c43a2 +Author: Yagami +Date: Thu Sep 20 16:30:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e359e72a9ed266454bb455fe37ad30ca1a8a38bc +Author: Yagami +Date: Thu Sep 20 16:29:45 2018 +0800 + + * Finish task #4868. + +commit 21746c43a216381945406000cd2e8bcfb8f4f587 +Author: Catouse +Date: Thu Sep 20 16:26:25 2018 +0800 + + * fix cannot click submit button in hiddenwin form when trigger a error from remote server. + +commit c29e88f04922f8e1f1db891f68a857db78b877b7 +Merge: 6559c72721 ab890a2606 +Author: Catouse +Date: Thu Sep 20 15:47:15 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6559c72721eec47307cc862d7983bd8b16173da9 +Author: Catouse +Date: Thu Sep 20 15:47:09 2018 +0800 + + * improve UI of main table. + +commit 77a55743dadb0d86a82f782e854d494be4b3072f +Author: Catouse +Date: Thu Sep 20 15:46:33 2018 +0800 + + * finish task #4889. + +commit ab890a2606b3881ae9fa38abe64fca81853b4e22 +Author: wangyidong +Date: Thu Sep 20 15:02:50 2018 +0800 + + * adjust for task #4895. + +commit c3f808434e11ece4c605c73e62d7b33e7bb12983 +Merge: 2f468832aa 8e8b464f48 +Author: Yagami +Date: Thu Sep 20 14:43:16 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2f468832aa943e89c7bff8b68c459a07793d5741 +Author: Yagami +Date: Thu Sep 20 14:42:37 2018 +0800 + + * Fix groupModel-updateUser method. + +commit 8e8b464f48d566aeb25bed8a2bb94013950a415a +Author: wangyidong +Date: Thu Sep 20 14:39:36 2018 +0800 + + * code for task #4874. + +commit 6a892e2b13d0bb1287cdbd3a1b587d0782c4c2d5 +Merge: c85a3d61da f3e026d2da +Author: Catouse +Date: Thu Sep 20 14:39:32 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c85a3d61daae76c457becdb9d81d9dd8e3250b7b +Author: Catouse +Date: Thu Sep 20 14:39:25 2018 +0800 + + * change style of sub task toggle icon. + +commit f3e026d2dab5235a828a7d4cb809f46e90ad2256 +Merge: 0b085311b4 bcca340d54 +Author: wangyidong +Date: Thu Sep 20 14:25:50 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0b085311b405a166286d665e6915738addd3aa9f +Author: wangyidong +Date: Thu Sep 20 14:25:28 2018 +0800 + + * finish task #4874. + +commit bcca340d54c122f8a10298db3eaf813519c13cc6 +Merge: 4b794de459 3e6f30bf9a +Author: Catouse +Date: Thu Sep 20 14:20:56 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4b794de45971c3abbbd6676b64cd193693c678cf +Author: Catouse +Date: Thu Sep 20 14:20:50 2018 +0800 + + * change UI of list-group. + +commit 3e6f30bf9afdbee23765b003ac0fd9859ede04db +Merge: 9f1abd17e6 c3e5709701 +Author: Yagami +Date: Thu Sep 20 14:10:29 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9f1abd17e6614664d05eb0d7f1a066d48641b48d +Author: Yagami +Date: Thu Sep 20 14:10:13 2018 +0800 + + * Finish task #4723. + +commit c3e5709701f4b96bec60063b665c91ff9a5f1a4e +Merge: 8618df7b57 ef95081be3 +Author: Catouse +Date: Thu Sep 20 13:42:59 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8618df7b576101037d23ae9634f80392ae888b74 +Author: Catouse +Date: Thu Sep 20 13:42:54 2018 +0800 + + * change UI of flowchart block. + +commit 3559387c5fa10f71c688cebab5ca790e18cf7f3e +Author: Catouse +Date: Thu Sep 20 13:42:39 2018 +0800 + + * fix style of list-group in dropdown-menu. + +commit 89461901504c1aed03e7d591dc17202fc2bdb5ef +Author: Yagami +Date: Thu Sep 20 13:35:33 2018 +0800 + + * Finish task #4879. + +commit ea149d56fd3005f55bfb0bd5382ca500052c87db +Merge: fa38ced902 ef95081be3 +Author: wangyidong +Date: Thu Sep 20 13:18:16 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fa38ced902ed35fa0a1277bd1e1d9653d4de1929 +Author: wangyidong +Date: Thu Sep 20 13:17:27 2018 +0800 + + * finish task #4897. + +commit ef95081be3c1b2ace37f69317f186b63c47be86f +Merge: b874048996 d8bab691b5 +Author: Yagami +Date: Thu Sep 20 13:15:39 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b8740489960425d4d9f1cb00f025234898bc1de4 +Author: Yagami +Date: Thu Sep 20 13:15:12 2018 +0800 + + * Fix block count status css. + +commit d8bab691b57068a8dfe062a84bc27f0686be362a +Author: Catouse +Date: Thu Sep 20 13:07:10 2018 +0800 + + * finish task #4772. + +commit 52936c13beccc68a87ed83285bd0591252e6ff07 +Merge: 6cedbefacc 9f42286dd0 +Author: 滔哥 +Date: Thu Sep 20 10:54:24 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6cedbefacc0a79bdb4f7740158a2105cc3af9d7a +Author: 滔哥 +Date: Thu Sep 20 10:54:18 2018 +0800 + + * Finish task#4864. + +commit 9f42286dd0e0fe68e3cf94b3d7cf54d377d1d7b7 +Merge: 2c45b05e28 e3a1b2f2a2 +Author: Catouse +Date: Thu Sep 20 10:44:50 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2c45b05e28276cba5f336bd8adf4d5ba86f08a82 +Author: Catouse +Date: Thu Sep 20 10:44:44 2018 +0800 + + * change table footer style when footer fixed on bottom. + +commit e3a1b2f2a22228fd6b06283b020234ff12412577 +Merge: 46173702a5 57493f698f +Author: wangyidong +Date: Thu Sep 20 10:24:19 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 46173702a5c91aa5c68f433ac15b7fadbc8a7a21 +Author: wangyidong +Date: Thu Sep 20 10:23:53 2018 +0800 + + * finish task #4887. + +commit c345950c698201fc7bb4fde92675f5454c7d75f7 +Merge: 78aa4d5f68 57493f698f +Author: 滔哥 +Date: Thu Sep 20 10:21:51 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 78aa4d5f688779e6cfcb19fd5a22a85f007bc9bd +Author: 滔哥 +Date: Thu Sep 20 10:21:46 2018 +0800 + + * Change for task#4773. + +commit 57493f698fc88ff7cc3e3ad876a3c9dc16a1b9e9 +Author: Catouse +Date: Thu Sep 20 10:14:57 2018 +0800 + + * finish task #4716. + +commit 46f141c6e45d60b6c1c9e113900e41d89a71b394 +Merge: 975604db6f 663577b1ad +Author: Catouse +Date: Thu Sep 20 09:53:40 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 975604db6f69606521ff5f377d0add78e357ec87 +Author: Catouse +Date: Thu Sep 20 09:53:34 2018 +0800 + + * fix background color of .table-grouped. + +commit 663577b1adace659d42fa23b0aa80ab9e2e1a8fc +Author: 滔哥 +Date: Thu Sep 20 08:26:01 2018 +0800 + + * Fix task#4846. + +commit 3cb02d06ceccb2f62a5612fb7ef861ac8541c686 +Author: 滔哥 +Date: Thu Sep 20 07:55:40 2018 +0800 + + * Fix task#4845. + +commit 82456f64383b5fd68ec2b4b7691ab6a38bd3d434 +Author: Catouse +Date: Wed Sep 19 20:58:24 2018 +0800 + + * update zui themes. + +commit ad8468037d50da89b0350d083f73ee1f421d4097 +Author: Catouse +Date: Wed Sep 19 17:55:43 2018 +0800 + + * finish task #4842. + +commit 251e350375d9533127af92ff5a4ebbf7174b17fb +Author: Catouse +Date: Wed Sep 19 16:59:26 2018 +0800 + + * finish task #4753. + +commit 27e1bdd753fd99422e33c09a1709c5699b4a01c0 +Author: Catouse +Date: Wed Sep 19 16:58:55 2018 +0800 + + * change login background color. + +commit 576752be697dd0209ef57c96e53d8042c68f41bb +Merge: 232eb30f5c 40d662e996 +Author: Catouse +Date: Wed Sep 19 16:47:47 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 232eb30f5cf63c40ca0d0f2c107e52e57bbf9dbd +Author: Catouse +Date: Wed Sep 19 16:47:41 2018 +0800 + + * change pri and severity label badge color. + +commit 7bdf2996f228553b1a0d4ca3c10249a07f5d0827 +Author: Catouse +Date: Wed Sep 19 16:47:21 2018 +0800 + + * finish task #4844. + +commit 40d662e996d069b990fc75b2ac084eb0967290f9 +Merge: 1148ff0f7c 6684f4a817 +Author: wangyidong +Date: Wed Sep 19 16:01:07 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1148ff0f7cbd0db69609e9b7a85c1deec790a1d8 +Author: wangyidong +Date: Wed Sep 19 16:00:38 2018 +0800 + + * finish task #4892. + +commit 6684f4a8178a05af6218800cf6808343d5ba4b8f +Author: Yagami +Date: Wed Sep 19 15:57:00 2018 +0800 + + * Finish task #4738. + +commit 42d3cd0e5ee0507ba734cec186fd75281da5f919 +Merge: fbeef27821 2fa7eb9e83 +Author: Yagami +Date: Wed Sep 19 15:16:32 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fbeef27821136be1eb414f905e0601dbeecfb058 +Author: Yagami +Date: Wed Sep 19 15:16:18 2018 +0800 + + * Finish task #4790. + +commit 2fa7eb9e835964c446e3568da678d35b0e499a46 +Author: chenfeiCF +Date: Wed Sep 19 15:12:59 2018 +0800 + + * Finish task #4863. + +commit d91291455bd86b1313c767ce4ebdb718f70396ad +Author: chenfeiCF +Date: Wed Sep 19 15:04:04 2018 +0800 + + * Fix float action button on actions column. + +commit 933660e633851060a1920cb84954480d5e4f3360 +Merge: 9e19e3fc85 c52c99a1fa +Author: chenfeiCF +Date: Wed Sep 19 14:59:34 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9e19e3fc859ecd4cc86ccfc5806edc30b0875a90 +Author: chenfeiCF +Date: Wed Sep 19 14:58:48 2018 +0800 + + * Remove label-dot which in list page. + +commit c52c99a1fa66ccb011da6f6bef1f538d7ed74cea +Merge: 16bd3fadee f7bfe9fab2 +Author: Catouse +Date: Wed Sep 19 14:44:11 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 16bd3fadee42f1a4d35a9edf78b32377843017b3 +Author: Catouse +Date: Wed Sep 19 14:44:05 2018 +0800 + + * fix btn class in productplan/browse view. + +commit f7bfe9fab297c16c0a03ff7446af3f06fca98a2b +Merge: dc9eb1fff7 c6bef0c536 +Author: Yagami +Date: Wed Sep 19 13:58:30 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dc9eb1fff743c686c2e9564207f40c2ec7cf6793 +Author: Yagami +Date: Wed Sep 19 13:58:16 2018 +0800 + + * Finish task #4847. + +commit c6bef0c5361446c9e07b3195a411464091b7b40e +Merge: 000c08e943 4e7d9a8ab7 +Author: 滔哥 +Date: Wed Sep 19 13:42:49 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4e7d9a8ab76ec11434905efb24bd8245a921e7e8 +Merge: 9044c9569e 41c563bf32 +Author: Yagami +Date: Wed Sep 19 13:29:48 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9044c9569e13e1a3dd8498cd9f43ce184ee2a6ec +Author: Yagami +Date: Wed Sep 19 13:29:21 2018 +0800 + + * Finish task #4856. + +commit 41c563bf3262acd263850537af9cfec13ab11e77 +Author: Catouse +Date: Wed Sep 19 12:20:15 2018 +0800 + + * change color of colorpicker btn. + +commit 551c1415c58300aac117da495752ada4b95e921e +Merge: 3e8707c177 76db6e160c +Author: Catouse +Date: Wed Sep 19 11:37:37 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3e8707c177c969aac8fff3d61ebc9e7274db3e4c +Author: Catouse +Date: Wed Sep 19 11:36:14 2018 +0800 + + * change UI of page header. + +commit 76db6e160c915253ce03f08227ee0c9852942edd +Merge: e16f9853f4 8a19206927 +Author: chenfeiCF +Date: Wed Sep 19 11:23:58 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e16f9853f4df5bed636335b3c4dfc767b898ef28 +Author: chenfeiCF +Date: Wed Sep 19 11:22:18 2018 +0800 + + * Move the assignTo btton to actions column and remove label-dot near status. + +commit 8a192069272c0e5754e4787411789a2c7a5eb677 +Author: wangyidong +Date: Wed Sep 19 11:18:49 2018 +0800 + + * finish task #4876. + +commit 4426e73fcc9cebdb9d617cee0f94331dfba1d851 +Author: wangyidong +Date: Wed Sep 19 11:08:21 2018 +0800 + + * finish task #4875. + +commit c9db0cac7a89199747b646effbebcfe9e286c1c1 +Merge: c78de38680 8bcac87dc1 +Author: wangyidong +Date: Wed Sep 19 10:48:36 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c78de38680f13b8e01a0359520d8bd8e5f659261 +Author: wangyidong +Date: Wed Sep 19 10:48:18 2018 +0800 + + * finish task #4896. + +commit 8bcac87dc118d7c9cc5e836b48b54d79d2b7eae2 +Merge: 9983b0ff19 4949606cbe +Author: Catouse +Date: Wed Sep 19 10:26:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4949606cbeed274159583a9641a102d34e18d934 +Author: wangyidong +Date: Wed Sep 19 10:24:57 2018 +0800 + + * finish task #4904. + +commit 9983b0ff19c9b291d362b79dad5a02b2fb194377 +Author: Catouse +Date: Wed Sep 19 10:23:29 2018 +0800 + + * improve UI of table, datatable and tablesorter. + +commit 6366242f71f177d0ca11e262a3a63a0f529a9d1b +Author: wangyidong +Date: Wed Sep 19 10:21:48 2018 +0800 + + * finish task #4894. + +commit e09ee91ba8a8488e539501f6d9fe737a0da530a8 +Author: wangyidong +Date: Wed Sep 19 10:16:05 2018 +0800 + + * finish task #4901. + +commit 1880a093ced421dfa5b947882313f3b83ef4a3c6 +Author: wangyidong +Date: Wed Sep 19 10:13:12 2018 +0800 + + * finish task #4899. + +commit ce39bafc251f1219bf5623a09cb132dda38d27a4 +Author: wangyidong +Date: Wed Sep 19 10:09:05 2018 +0800 + + * finish task #4891. + +commit 53b046a698d74ed968d1e43887762509660481a6 +Author: wangyidong +Date: Wed Sep 19 09:36:23 2018 +0800 + + * finish task #4880. + +commit e839c7bf528e465c482de65fa83a2f7937945fc0 +Merge: cbf94b4be9 946dd1d9ce +Author: wangyidong +Date: Wed Sep 19 09:13:26 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cbf94b4be9d86299affa880ac4669813cb6dda3d +Author: wangyidong +Date: Wed Sep 19 09:12:26 2018 +0800 + + * finish task #4841. + +commit 000c08e9439dd0b69b8269aa9eb6baa40f80b194 +Author: 滔哥 +Date: Wed Sep 19 08:11:25 2018 +0800 + + * Finished task#4890 + +commit 946dd1d9ce0871252e227f422c131a6099cc129f +Author: 滔哥 +Date: Wed Sep 19 07:52:35 2018 +0800 + + * Fix task#4854. + +commit cd0554b2f36880a63f8e6419fb7ecd7be460e719 +Merge: 0b83fffbe0 bf8199a5bb +Author: 滔哥 +Date: Wed Sep 19 07:41:53 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0b83fffbe012e31d75ec74bc6f2620636931443d +Author: 滔哥 +Date: Wed Sep 19 07:41:28 2018 +0800 + + * Finished task#4854 + +commit bf8199a5bb60419186ed4fe3eb5906ed2356ddf7 +Author: Catouse +Date: Tue Sep 18 17:17:09 2018 +0800 + + * improve UI of testcase/edit view. + +commit 4b5e0f071a273c397470ecfa355ee6f2ae5481db +Author: Catouse +Date: Tue Sep 18 17:13:03 2018 +0800 + + * fix js error when auto set height of textarea. + +commit 60ec826bd9e108fb8e9ebb9d1ee3f1bca6c17132 +Author: Catouse +Date: Tue Sep 18 17:02:34 2018 +0800 + + * refactor codes. + +commit f823562aa38bcdd5cb6ff26bb71d813789f7decd +Author: wangyidong +Date: Tue Sep 18 14:26:26 2018 +0800 + + * code for task #4733. + +commit 6974aa5496302ffb15853cbac5cc786ca63000e9 +Merge: 893f3b42a6 232213ef31 +Author: wangyidong +Date: Tue Sep 18 13:50:41 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 893f3b42a657717091ef93336cb39b3de83a55f8 +Author: wangyidong +Date: Tue Sep 18 13:50:22 2018 +0800 + + * finish task #4733. + +commit 232213ef318e331094d4c558e5dfd42be6f646fa +Author: Yagami +Date: Tue Sep 18 13:42:05 2018 +0800 + + * Del style.css line 20. + +commit 1ce6e698b91af9175d01493d32c4f039f3fb169d +Author: Yagami +Date: Tue Sep 18 11:13:21 2018 +0800 + + * Finish task #4881. + +commit cd4083a7d11ad7f09be9f44a55a8404a5c18c799 +Merge: 406c4dfc7e 75fcdf94ae +Author: Yagami +Date: Tue Sep 18 11:05:17 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 406c4dfc7e0816e79db38f16b80a5245914dade5 +Author: Yagami +Date: Tue Sep 18 11:05:05 2018 +0800 + + * Finish task #4882. + +commit 75fcdf94ae52f0fb91eb63b470001b4a7a55f2f8 +Author: chenfeiCF +Date: Tue Sep 18 11:01:55 2018 +0800 + + * Finish task #4869. + +commit 62400ea9c0a7841f67c19c4f158e6c626bc6ced8 +Merge: 67bfd87a0c f505297ac7 +Author: chenfeiCF +Date: Tue Sep 18 10:40:23 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 67bfd87a0cc9376848878ef80de8d0058e477c17 +Author: chenfeiCF +Date: Tue Sep 18 10:39:27 2018 +0800 + + * Finish task #4843, #4883. + +commit f505297ac7b388fa62f944acfa69e580d3462d97 +Merge: a4e6685feb a550d8b634 +Author: wangyidong +Date: Tue Sep 18 10:38:25 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a4e6685feba7e25410f2acb4bc8b362627381093 +Author: wangyidong +Date: Tue Sep 18 10:37:06 2018 +0800 + + * finish task #4751. + +commit a550d8b634dec337261793307d7c8cd8b8f51162 +Merge: d5bdf6d834 7f32317e28 +Author: Yagami +Date: Tue Sep 18 10:26:00 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d5bdf6d83403ca15b45f81cd80b4b58ccc8147dd +Author: Yagami +Date: Tue Sep 18 10:25:41 2018 +0800 + + * Finish task #4902. + +commit 7f32317e287ec6daae5e08b81471fa9a981a93f4 +Author: wangyidong +Date: Tue Sep 18 09:49:46 2018 +0800 + + * adjust code. + +commit 1c6f89403271141a180338b030f2a1d0bc9491ec +Author: wangyidong +Date: Tue Sep 18 09:49:30 2018 +0800 + + * finish task #4884. + +commit 9a8d0e8ab040f8f6e75353433cd810c8b5084cc3 +Merge: a242759f78 75978f3cc1 +Author: wangyidong +Date: Tue Sep 18 09:49:08 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a242759f78afae6cbf5c29531df9c648d59327bb +Author: wangyidong +Date: Tue Sep 18 08:56:57 2018 +0800 + + * adjust code for tree checkUnique. + +commit 75978f3cc1f4a9febee7141f45c6bd1969bcd0e8 +Author: Yagami +Date: Tue Sep 18 08:52:41 2018 +0800 + + * Finish task #4898. + +commit 30eb2ce98f081b19ecc45d0c3cc559a38cf44111 +Author: wangyidong +Date: Mon Sep 17 15:53:06 2018 +0800 + + * change $_SERVER to $this->server. + +commit 0e7f83df8a61d8092067f930cf124dc33699c8f5 +Author: Yagami +Date: Mon Sep 17 15:07:13 2018 +0800 + + * Finish task #4859. + +commit d75be50cd7e0dea6773b51e2988f1ca2346d74d2 +Author: wangyidong +Date: Mon Sep 17 11:30:31 2018 +0800 + + * adjust for user view. + +commit ad5c25e84321502cf08b58e39fb05de60e2afffd +Author: wangyidong +Date: Mon Sep 17 09:19:16 2018 +0800 + + * adjust for code format. + +commit 17d997c44eba56580436fc22b780a633b42fbc81 +Merge: 2f5a511644 500f39e290 +Author: wangyidong +Date: Mon Sep 17 09:18:19 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2f5a5116447f412d3fbb78448f859a687ca4b177 +Author: wangyidong +Date: Mon Sep 17 09:17:47 2018 +0800 + + * finish task #4696. + +commit 500f39e290a6d1b50175d6600e6cfd17156f2eef +Author: 滔哥 +Date: Sat Sep 15 22:48:15 2018 +0800 + + * Fix bug for task#4806. + +commit ecf8935ccf41a6766be25f3cf3666b068cbb20a9 +Author: 滔哥 +Date: Fri Sep 14 22:09:31 2018 +0800 + + * Fix bug. + +commit a0dc6189743a2a64523524afbe473b44372e6e90 +Merge: 64b34ba5c6 fa40143a8f +Author: 滔哥 +Date: Fri Sep 14 14:27:01 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 64b34ba5c6a7c109856da1ea2ee61ee1e89ce3c2 +Author: 滔哥 +Date: Fri Sep 14 14:26:54 2018 +0800 + + * Finish task#4806. + +commit fa40143a8ffd6f25af9f166466ebcd7efe4962d4 +Merge: ade2ddfc8b 39efa87c5d +Author: Yagami +Date: Fri Sep 14 13:53:56 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ade2ddfc8b5d46b73cb96bbde71abf6f07a5fb70 +Author: Yagami +Date: Fri Sep 14 13:53:36 2018 +0800 + + * Fix create bug view. + +commit 39efa87c5d380dce451ba19a08caa54d920fd283 +Merge: 5b858a5aed d003415bd5 +Author: Catouse +Date: Fri Sep 14 13:27:35 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5b858a5aedeecbec925aeb37d03c8d497dea3b21 +Author: Catouse +Date: Fri Sep 14 13:27:26 2018 +0800 + + * add fade effection to bug/create form view. + +commit d003415bd5d74ea3bc0daeb3b86f5c37ede9e13b +Merge: 05ab77a4cd c8005b396b +Author: Yagami +Date: Fri Sep 14 13:25:52 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 05ab77a4cd3b26a56f4f490f616c2e97d4095720 +Author: Yagami +Date: Fri Sep 14 13:25:01 2018 +0800 + + * Fix create bug view. + +commit c8005b396b57ec7da995f16f9238cbac04e2a2ea +Merge: caebe27379 a208aaabe0 +Author: Catouse +Date: Fri Sep 14 13:24:25 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit caebe27379a12d38a0f0c5a56e4e29bf5571c883 +Author: Catouse +Date: Fri Sep 14 13:24:16 2018 +0800 + + * fix UI of bug/create view. + +commit a208aaabe0f1400a8da169d66c63d04a08e5df89 +Merge: 61c96a07eb 7a6319653a +Author: Yagami +Date: Fri Sep 14 13:08:40 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 61c96a07eb0ef77d9eca468107b3fc7f58a29732 +Author: Yagami +Date: Fri Sep 14 13:08:17 2018 +0800 + + * Finish task #4780. + +commit 7a6319653acd9c32228406323fca52dbfdcc50b1 +Merge: 10a69fdafe dd282e82cb +Author: wangyidong +Date: Fri Sep 14 11:28:54 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 10a69fdafe5951a167f9304e741c3214a340b0d2 +Author: wangyidong +Date: Fri Sep 14 11:26:06 2018 +0800 + + * adjust for new get projects. + +commit dd282e82cb22215717b8dd12bf1fd99da0270400 +Author: 滔哥 +Date: Fri Sep 14 10:55:43 2018 +0800 + + * Fix bug. + +commit e47515aa62804a2b01e264e3b2956aca413f8c56 +Author: 滔哥 +Date: Fri Sep 14 10:52:58 2018 +0800 + + * Finish task#4794 + +commit 4cb3594c13c6b10bc43656fedce8bf2951394021 +Author: Yagami +Date: Fri Sep 14 09:14:21 2018 +0800 + + * Finish task #4774. + +commit 27a71dbb14a09d80646d7a0eed439068f22270ff +Author: Catouse +Date: Thu Sep 13 19:03:29 2018 +0800 + + * finish task #4758. + +commit 55213c63b87873b00dba3f1d9b3d949a1fd4343d +Author: Catouse +Date: Thu Sep 13 17:27:40 2018 +0800 + + * change themes. + +commit ef8317accc17b769d690033838ad7d14a57fd5d1 +Author: Catouse +Date: Thu Sep 13 16:29:06 2018 +0800 + + * finish task #4741. + +commit dd3cc0c2d11b4c7262e2c3f3e67aa50a5371d168 +Author: Catouse +Date: Thu Sep 13 16:16:46 2018 +0800 + + * finish task #4802. + +commit b8af440e132a8e52ea0e041f1a9900ae4fa23e54 +Author: Catouse +Date: Thu Sep 13 15:42:46 2018 +0800 + + * change header UI. + +commit bfd12b895fdbfb90462d80d0e46f267de3474d97 +Merge: 2e81d3925c 3bbcc85003 +Author: Catouse +Date: Thu Sep 13 15:34:44 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2e81d3925c4c6ba7677248c38b09e34acae35946 +Author: Catouse +Date: Thu Sep 13 15:32:21 2018 +0800 + + * change default theme. + +commit 64738f17ed51aa11385287a2258d5eb473be6974 +Author: Catouse +Date: Thu Sep 13 15:32:10 2018 +0800 + + * change pri badge style in kanban. + +commit 3bbcc850033ddb4fa6c6956841986b18ec5c4483 +Merge: 99a5cdc13c 8ed63f50ba +Author: Yagami +Date: Thu Sep 13 15:31:22 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 99a5cdc13c77cee6617c8f74508e66a78b57cbe6 +Author: Yagami +Date: Thu Sep 13 15:31:04 2018 +0800 + + * Finish task #4776. + +commit 8ed63f50ba36313bc10d5e157920376a2cfbb0d7 +Author: wangyidong +Date: Thu Sep 13 14:58:45 2018 +0800 + + * code for dynamic. + +commit e7e540ba326a8a371230650296faa64ee0edb169 +Merge: 8dde46e1b6 76cf85df7a +Author: wangyidong +Date: Thu Sep 13 14:53:48 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8dde46e1b672b6fede233554e3dc5fc9542ee5dc +Author: wangyidong +Date: Thu Sep 13 14:52:17 2018 +0800 + + * finish task #4700. + +commit 3d18ffc88ec4a1a5e13bb349b1ef4944d2833d4a +Merge: a26357eb15 76cf85df7a +Author: Catouse +Date: Thu Sep 13 14:45:22 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a26357eb15c7cb954d6204d0c32ffdade140cc67 +Author: Catouse +Date: Thu Sep 13 14:44:40 2018 +0800 + + * finish task #4814. + +commit 76cf85df7a14ebf61a80247cb8c62c64acaf8df1 +Author: Yagami +Date: Thu Sep 13 14:36:25 2018 +0800 + + * Add a param to datatable printHeader method. + +commit 8c2294909cfb49bfbb1c90e4c10e5f2053d408bb +Merge: ac395e6311 c1e0231ef1 +Author: Catouse +Date: Thu Sep 13 14:35:25 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ac395e6311b52129d77dd082b122dda0aeb82bfe +Author: Catouse +Date: Thu Sep 13 14:35:17 2018 +0800 + + * refactor bug/create view and finish task #4732. + +commit c1e0231ef12f0bf81d061f943197605e8d10629b +Merge: aef5e21479 69091fc300 +Author: wangyidong +Date: Thu Sep 13 13:36:04 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit aef5e21479557ad6f35cbb6e41d1e224a82e3237 +Author: wangyidong +Date: Thu Sep 13 13:34:32 2018 +0800 + + * finish task #4711. + +commit 69091fc300102963d2e8a40056c0e22eb6071690 +Merge: a22350a027 4a8dc230ab +Author: Catouse +Date: Thu Sep 13 12:03:29 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a22350a0278205cb3323bf8c7d6883737671ca0c +Author: Catouse +Date: Thu Sep 13 12:03:03 2018 +0800 + + * finish task #4728. + +commit 4a8dc230ab6ad6c1f9bd0ed9852b913123450df6 +Merge: d3f8dac3d4 a98a04033c +Author: 滔哥 +Date: Thu Sep 13 11:25:28 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d3f8dac3d4154920846dbb5a5013a1f6ff00c8f7 +Author: 滔哥 +Date: Thu Sep 13 11:25:21 2018 +0800 + + * Fix bug. + +commit 01fbb94e2f37c6237049cc1512775397c59f169b +Author: Catouse +Date: Thu Sep 13 10:56:18 2018 +0800 + + * refactor codes. + +commit e2ee522bf172833800a926fc056fa04c7847ccc1 +Author: Catouse +Date: Thu Sep 13 10:56:08 2018 +0800 + + * refactor autoResize textarea. + +commit a98a04033c7dbf548eb2e8bdf639eda908d80586 +Merge: 5e5dd8f21a ae2183f901 +Author: wangyidong +Date: Thu Sep 13 10:55:43 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5e5dd8f21a624db6c8e1ae446911d9a51599ddb2 +Author: wangyidong +Date: Thu Sep 13 10:55:03 2018 +0800 + + * finish task #4688. + +commit ae2183f901063500b6ef088caa918f997d322da9 +Author: Yagami +Date: Thu Sep 13 10:42:30 2018 +0800 + + * Fix testtask groupcase pri width. + +commit ded432d258f5ad093f26e0870320de5fae7d93c9 +Merge: 2ddb4a35d1 020b26d2d9 +Author: Yagami +Date: Thu Sep 13 10:29:48 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2ddb4a35d12d7f43d127114f73af05179a20ea20 +Author: Yagami +Date: Thu Sep 13 10:29:23 2018 +0800 + + * Fix report default button. + +commit e7d358eeedff0f43cc6b7aeed0223db478ca7ff5 +Merge: b5f660d2f5 020b26d2d9 +Author: Catouse +Date: Thu Sep 13 10:27:47 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b5f660d2f502d64d5b02513e4ef15a1ff677d819 +Author: Catouse +Date: Thu Sep 13 10:27:42 2018 +0800 + + * finish task #4726. + +commit 020b26d2d91455110be6c3ab7baadd7ac6b8dba6 +Author: 滔哥 +Date: Thu Sep 13 09:52:28 2018 +0800 + + * Fix bug. + +commit 74f956c522771c879913b478215e644e162b436b +Merge: 24cb0d757e b9d608d902 +Author: wangyidong +Date: Wed Sep 12 17:13:56 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 24cb0d757edc0ddd1c91f1a16fbf7d03579ddecd +Author: wangyidong +Date: Wed Sep 12 17:12:58 2018 +0800 + + * finish task #4724. + +commit b9d608d90261433de32d42ce0f81cb380e0a02ab +Author: Yagami +Date: Wed Sep 12 17:09:46 2018 +0800 + + * Fix detail-content margin. + +commit 56f49c64feeb002bf5e8fba71c647e4c3eb65d28 +Merge: c22696976c 464e8ebadf +Author: Yagami +Date: Wed Sep 12 16:58:22 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c22696976ce48b5c309a88ce5cd3bfa28e450b4f +Author: Yagami +Date: Wed Sep 12 16:52:42 2018 +0800 + + * Finish task #4721. + +commit 464e8ebadf546baa6e454324adb775141e1f57af +Author: wangyidong +Date: Wed Sep 12 16:51:56 2018 +0800 + + * code for task #4743. + +commit 3c50648d3b95f86da60b602dc31ebcdd1d7e3a94 +Author: wangyidong +Date: Wed Sep 12 16:51:27 2018 +0800 + + * code for task #4701. + +commit c2d3aa9662f3c346e46ff3051df4c80ec0befcd9 +Author: wangyidong +Date: Wed Sep 12 16:05:33 2018 +0800 + + * code for task #4702. + +commit f9c77a1a69a82399a66877c7ec8c9c03dc93024d +Author: wangyidong +Date: Wed Sep 12 16:03:43 2018 +0800 + + * finish task #4719. + +commit bd7e6c0d0fbaaca57fa3243782492c1a8cfbb6b6 +Author: wangyidong +Date: Wed Sep 12 16:01:05 2018 +0800 + + * finish task #4705. + +commit 78a5318cae399ae05f625895db6d99287fa6affc +Merge: 2d30ee8a97 518ac856c9 +Author: wangyidong +Date: Wed Sep 12 15:00:47 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2d30ee8a97a3a855e345c2fab9df5dd36db5225b +Author: wangyidong +Date: Wed Sep 12 15:00:21 2018 +0800 + + * finish task #4725. + +commit 518ac856c9b9831a3cf6264d97079891e150c97e +Merge: 976b7770fc 39afe7c3fc +Author: Yagami +Date: Wed Sep 12 13:54:29 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 976b7770fcdf02257775b0029e506bdab44c757a +Author: Yagami +Date: Wed Sep 12 13:53:08 2018 +0800 + + * Finish task #4782. + +commit 39afe7c3fc8c5eee9ff336545548b1a1705f41a7 +Author: wangyidong +Date: Wed Sep 12 13:34:28 2018 +0800 + + * finish task #4743. + +commit 8fb91427a5a3edb762d199c094c157cf26d1e045 +Author: wangyidong +Date: Wed Sep 12 13:19:28 2018 +0800 + + * finish task #4718. + +commit d83493953b3ab25f942fc0a8003a7e785858d123 +Author: wangyidong +Date: Wed Sep 12 13:10:50 2018 +0800 + + * finish task #4698. + +commit 60fe102e21c51e2ad58080389961d01c131fe102 +Merge: 23023030c0 c6ce4c9e39 +Author: wangyidong +Date: Wed Sep 12 13:09:39 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 23023030c0f53d112c6563363402acd20a505a12 +Author: wangyidong +Date: Wed Sep 12 13:07:17 2018 +0800 + + * finish task #4702. + +commit c6ce4c9e39e9e4d7dea8005e55980671c8033bab +Merge: 3558d47333 e934f95c36 +Author: Catouse +Date: Wed Sep 12 11:38:13 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3558d473331bf2d09e79f81131f6d12844dbfe41 +Author: Catouse +Date: Wed Sep 12 11:38:07 2018 +0800 + + * fix chosen not focus search input on open drop menu. + +commit e934f95c361b71b686096093d65855999573f61b +Merge: 87b9ed502a 0742e37f89 +Author: wangyidong +Date: Wed Sep 12 11:31:23 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 87b9ed502ae5dbca44e02628d2e87b6601063d46 +Author: wangyidong +Date: Wed Sep 12 11:31:11 2018 +0800 + + * fix bug. + +commit 0742e37f8981fcaa89c54bafce3fa3c54bebdca5 +Author: Yagami +Date: Wed Sep 12 11:02:40 2018 +0800 + + * Finish task #4715. + +commit dcce714fdc4899aa0b5edc929b9020b0a75cdeeb +Merge: 586a9265ac 4eccc84fbf +Author: Yagami +Date: Wed Sep 12 10:41:04 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 586a9265ac0793855b545c9a2a61ea12d4115943 +Author: Yagami +Date: Wed Sep 12 10:40:47 2018 +0800 + + * Finish task #4713. + +commit 4eccc84fbff3aed81f7da8227d3d700559b40784 +Merge: d82e59ead9 451a2f3e41 +Author: wangyidong +Date: Wed Sep 12 10:25:13 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d82e59ead9941cee726aa6acac8a3536f3610f02 +Author: wangyidong +Date: Wed Sep 12 10:24:12 2018 +0800 + + * finish task #4706. + +commit 451a2f3e41c1e5b2d9854f9c9cd79f489cdb5c98 +Author: Yagami +Date: Wed Sep 12 09:46:07 2018 +0800 + + * Fix common lang. + +commit 8373b4649de8a66e35765c968b15d1924b437d7b +Merge: a6f4cb1227 c4e473df14 +Author: Yagami +Date: Wed Sep 12 09:45:03 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a6f4cb1227010e7df0c556f9761af20939291b91 +Author: Yagami +Date: Wed Sep 12 09:43:11 2018 +0800 + + * Finish task #4694,#4693. + +commit c4e473df148639a9cb9f22676ae4a9bdc6e640ac +Author: wangyidong +Date: Wed Sep 12 09:32:24 2018 +0800 + + * finish task #4712. + +commit 8c5a015c6ce8f1a75c333ffa5bc48f45c0635333 +Merge: 7883005c1f 694c2976e6 +Author: wangyidong +Date: Wed Sep 12 09:28:28 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7883005c1fdcc7eac45879285e3c3157dfedc1d3 +Author: wangyidong +Date: Wed Sep 12 09:28:02 2018 +0800 + + * finish task #4737. + +commit 694c2976e639b2f7178ee592da148f340989add1 +Merge: 8a4cf98a21 2c249e3c8c +Author: Yagami +Date: Wed Sep 12 09:13:57 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8a4cf98a21fc425784836073393ccaf79253dcc5 +Author: Yagami +Date: Wed Sep 12 09:13:28 2018 +0800 + + * Finish task #4692. + +commit 2c249e3c8cdd178e462f6738461c72fa31c0ed98 +Merge: 83b6c68be4 0e47ac3bbd +Author: 滔哥 +Date: Tue Sep 11 17:43:55 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 83b6c68be46b1c6bb6607c6bf6168ce686f52183 +Author: 滔哥 +Date: Tue Sep 11 17:43:46 2018 +0800 + + * Finish task#4660 + +commit 0e47ac3bbdb1b8329e94ceed8cc5554046f2f191 +Merge: 831fdfdeb0 52b22fa382 +Author: wangyidong +Date: Tue Sep 11 17:25:09 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 831fdfdeb0d0371ab12b908dabb4cabeef4834f9 +Author: wangyidong +Date: Tue Sep 11 17:24:18 2018 +0800 + + * finish task #4689. + +commit 52b22fa382d2dde56b1963c476788883bc67787b +Author: 滔哥 +Date: Tue Sep 11 17:14:21 2018 +0800 + + * Finished task#4658 + +commit 9b2d30e4404fd10e2959336ad8d8efa2a212619d +Merge: 841de31266 cd3b8ce746 +Author: 滔哥 +Date: Tue Sep 11 17:08:23 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 841de3126608382aeb7ce2bbd88f975acbc56d0a +Author: 滔哥 +Date: Tue Sep 11 17:08:03 2018 +0800 + + * Fix bug for php7.2 + +commit cd3b8ce746d960a2f94999b95a23b1bd80e51d57 +Merge: e699098db4 59c66f81c4 +Author: Yagami +Date: Tue Sep 11 16:48:47 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e699098db46ca18aefc679657303323b30194210 +Author: Yagami +Date: Tue Sep 11 16:48:25 2018 +0800 + + * Finish task #4714. + +commit 59c66f81c4805fce9e13adb07fe95c03d263c22e +Merge: 2e908786f3 33e48bb6a5 +Author: 滔哥 +Date: Tue Sep 11 16:45:18 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2e908786f3be8c1149310b8d71e18347a5de95af +Author: 滔哥 +Date: Tue Sep 11 16:44:45 2018 +0800 + + * Finished Task#4805. + +commit 33e48bb6a5146b07bbf1e5eab4a27433cdab675f +Author: wangyidong +Date: Tue Sep 11 16:42:32 2018 +0800 + + * finish task #4707. + +commit 569a18aae50d844004d1b58807878aebd0ee0d99 +Author: 滔哥 +Date: Tue Sep 11 16:36:05 2018 +0800 + + * Fix bug. + +commit 30239402f5f1a37f2aa59ab05944aa3d82302e41 +Author: wangyidong +Date: Tue Sep 11 15:53:20 2018 +0800 + + * finish task #4697. + +commit 37204773e4225c33d3ad58d9d93c2e3ed003ace3 +Author: wangyidong +Date: Tue Sep 11 15:38:36 2018 +0800 + + * finish task #4708. + +commit 5c3bc3023d8cad1b7e27cb8fb7a20f19622951ca +Merge: 5edd76800f be25ee3bd3 +Author: wangyidong +Date: Tue Sep 11 15:36:48 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5edd76800f688898ff0866aece215c293304582c +Author: wangyidong +Date: Tue Sep 11 15:36:21 2018 +0800 + + * finish task #4719. + +commit be25ee3bd3ff9cb6928cc62e08bc9dc242e39128 +Author: Yagami +Date: Tue Sep 11 15:33:07 2018 +0800 + + * Finish task #4717. + +commit 60111262d30adc3fb5f94c613365a6d2ac3b8ca1 +Merge: c62eecae78 1282563671 +Author: Yagami +Date: Tue Sep 11 15:22:39 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c62eecae7808f38f1c6fae5616d5634ee3d638d2 +Author: Yagami +Date: Tue Sep 11 15:22:20 2018 +0800 + + * Finish task #4732. + +commit 1282563671ca29d1169486149f2443e73b53570a +Author: wangyidong +Date: Tue Sep 11 15:11:12 2018 +0800 + + * finish task #4748. + +commit 26c8269c7b76da7a027c9b19b2ec1e373b54fcb1 +Author: wangyidong +Date: Tue Sep 11 14:59:10 2018 +0800 + + * finish task #4705. + +commit 6cc36e819f0f5c0c7da5392369d6afd12a810b10 +Author: wangyidong +Date: Tue Sep 11 14:51:32 2018 +0800 + + * finish task #4704. + +commit 239ff3a256ddc49901ff852ab3f7ba917aa06ca5 +Author: wangyidong +Date: Tue Sep 11 14:47:25 2018 +0800 + + * finish task #4755. + +commit 68746993ba72efe199c645126df3458a97b1d606 +Author: wangyidong +Date: Tue Sep 11 13:29:47 2018 +0800 + + * finish task #4752. + +commit cb5b94697cf9d02280756725ff6b65f1df5d403b +Author: wangyidong +Date: Tue Sep 11 13:26:17 2018 +0800 + + * finish task #4757. + +commit 60dcfab013eab64ed199774f2d6f30e3f2f554c0 +Merge: 285be81a9c a3dd13ddc0 +Author: wangyidong +Date: Tue Sep 11 13:18:20 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 285be81a9c0fa69d5f8f05b2d55dab8fb88b6e5a +Author: wangyidong +Date: Tue Sep 11 13:17:30 2018 +0800 + + * finish task #4761. + +commit a3dd13ddc0e697d521d14dec2767b8d073799003 +Author: chenfeiCF +Date: Tue Sep 11 13:01:31 2018 +0800 + + * Finish task #4727, #4756. + +commit 9ef2f028c284467871f4cb956ead9abbde560cfd +Author: Yagami +Date: Tue Sep 11 10:20:56 2018 +0800 + + * Fix groupcase method. + +commit d01b60f37b86a25a735acf228c65a1105e7f6c7d +Merge: 3d0258a6d9 967174a419 +Author: Yagami +Date: Tue Sep 11 08:54:13 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3d0258a6d91df721dfb0393b1820237ee567f2f6 +Author: Yagami +Date: Tue Sep 11 08:53:45 2018 +0800 + + * Fix task #4836. + +commit 967174a41917ce31763205a17611cd176b4bdfd4 +Merge: 11bc6c1695 22b97cb830 +Author: wangyidong +Date: Mon Sep 10 16:06:17 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 11bc6c16954d098f9896672b41829b079a50c2ee +Author: wangyidong +Date: Mon Sep 10 16:05:09 2018 +0800 + + * finish task #4760. + +commit 22b97cb83074902314515397638827622791c822 +Merge: 222296f3ba 7b5878531b +Author: Yagami +Date: Mon Sep 10 15:39:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 222296f3ba506452d4286c620965ce8a4748bb2a +Author: Yagami +Date: Mon Sep 10 15:37:36 2018 +0800 + + * Finish task #4735,#4736,#4739,#4734. + +commit 7b5878531b53601e9fe0ba2d6ed3f7351b159718 +Merge: 800a77fff6 7aa81ab2ad +Author: wangyidong +Date: Mon Sep 10 15:25:06 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 800a77fff669e8d8a6d794f47f7a715295c5f83f +Author: wangyidong +Date: Mon Sep 10 15:23:59 2018 +0800 + + * finish task #4764. + +commit 7aa81ab2ad2323cfdf39615b164c3faca4a7d40b +Author: Yagami +Date: Mon Sep 10 13:11:03 2018 +0800 + + * Finish task #4742. + +commit 3dcc616f4812fe23d8374ef831e81cc3f811e8db +Author: Yagami +Date: Mon Sep 10 10:42:34 2018 +0800 + + * Finish task #4746. + +commit eb780db5ab127942c5c472bd92d9a2ef5a91ebf7 +Author: Yagami +Date: Mon Sep 10 09:53:34 2018 +0800 + + * Finish task #4762. + +commit 0524666092c264863ff0c338d6a84ae89dd9bc24 +Merge: 5b7398eb3c 4877b2d2a9 +Author: Yagami +Date: Fri Sep 7 16:30:24 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5b7398eb3cf2b4d6be90fb6b9f5a775cd66f3bd7 +Author: Yagami +Date: Fri Sep 7 16:30:04 2018 +0800 + + * Fix table-header css. + +commit 4877b2d2a94a84926883d61774682e2ac6ee9f88 +Author: wangyidong +Date: Fri Sep 7 16:11:04 2018 +0800 + + * adjust for project-activate style. + +commit 909155c8f7ace77e7a8f5b9d7f123bf8e0093cb0 +Author: wangyidong +Date: Fri Sep 7 15:59:25 2018 +0800 + + * finish task #4821. + +commit 86ec6cd9826aaeec58a0db3e7596a9a3f646c8d3 +Author: wangyidong +Date: Fri Sep 7 15:14:16 2018 +0800 + + * code for task #4815. + +commit c0557029abe13de44693998ea13b6b9643f2f2e0 (tag: zentaopms_10.3.1_20180907) +Author: wangyidong +Date: Fri Sep 7 14:49:32 2018 +0800 + + * fix bug for check priv. + +commit 4fb50d5132b49fcbe7b12ea066d3da3f066daeb6 +Merge: f2d58faaf1 c2907dc63a +Author: wangyidong +Date: Fri Sep 7 14:39:13 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f2d58faaf16da186841dd4df0d42f83c28514b0e +Author: wangyidong +Date: Fri Sep 7 14:37:45 2018 +0800 + + * change for upgrade. + +commit c2907dc63a4022181fb6ededa35cda1bc679d183 +Merge: 6be860c4d2 fb9e21ffa4 +Author: Catouse +Date: Fri Sep 7 14:11:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6be860c4d2719c4a6b998c3851cce295b86a160f +Author: Catouse +Date: Fri Sep 7 14:10:56 2018 +0800 + + * change style of active item in tree. + +commit fb9e21ffa4a055e6e86bc7267bbce00d7462a00b +Author: wangyidong +Date: Fri Sep 7 14:10:14 2018 +0800 + + * adjust code. + +commit f87ff72f2a47006aa3a0a2de0c477b64f11da6a7 +Merge: 21d96d54d3 d45210d7bc +Author: Catouse +Date: Fri Sep 7 14:05:42 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 21d96d54d3c0fbc8ce71e2a844d4a4592d0533fd +Author: Catouse +Date: Fri Sep 7 14:05:37 2018 +0800 + + * finish task #4788. + +commit d45210d7bcf30f7d4fbdabb6eae956c3a9afe454 +Merge: cd3ab96967 def4a53d04 +Author: Yagami +Date: Fri Sep 7 10:19:31 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cd3ab969679b256a0cd9acd5eb3c9d01d710528e +Author: Yagami +Date: Fri Sep 7 10:18:56 2018 +0800 + + * Finish task #4767. + +commit def4a53d04b45c1e843094723fafd45323e4d6ae +Author: 滔哥 +Date: Fri Sep 7 01:44:22 2018 +0800 + + * Finished task#4801 + +commit 05b9275e14122602c9b881e5698f3861b848a3eb +Author: 滔哥 +Date: Fri Sep 7 00:41:41 2018 +0800 + + * Finished task#4802. + +commit eb38ccc2702340e8828e9a8258f9199d64c3ef4c +Author: Catouse +Date: Thu Sep 6 18:05:17 2018 +0800 + + * finish task #4695. + +commit ff3ff14d4c1847594e28c6577eeee49f8772f7d4 +Author: Catouse +Date: Thu Sep 6 18:05:04 2018 +0800 + + * improve UI of doc/view. + +commit a6fe7e73cfb20e2a9749da09eb92379df0b71c6c +Merge: b538734033 e261f646e4 +Author: Catouse +Date: Thu Sep 6 17:43:57 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + # Conflicts: + # module/build/view/linkbug.html.php + # module/build/view/linkstory.html.php + # module/release/view/linkbug.html.php + # module/release/view/linkstory.html.php + +commit b53873403365fd0118150dbeadfa67e411b64136 +Author: Catouse +Date: Thu Sep 6 17:42:59 2018 +0800 + + * finish task #4781. + +commit e261f646e41a90d425ffed3bb9320f733898572e +Author: wangyidong +Date: Thu Sep 6 17:38:20 2018 +0800 + + * finish task #4766. + +commit 2217278a006919860c333586c23ed7316c7418da +Merge: 0c5a8851f6 184ac37fd2 +Author: wangyidong +Date: Thu Sep 6 17:34:26 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0c5a8851f6c6f7e321a2b64463c29d2b42adcc08 +Author: wangyidong +Date: Thu Sep 6 17:34:08 2018 +0800 + + * finish task #4785. + +commit 00c0ece2dcd577ceec445868cb97242a772fa931 +Author: Catouse +Date: Thu Sep 6 17:27:02 2018 +0800 + + * improve search form UI. + +commit 184ac37fd24ff4db8432777818021dec2fa60de4 +Merge: 8a3002eae0 3bf970be26 +Author: Catouse +Date: Thu Sep 6 17:13:05 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8a3002eae064b70e2c96d7fb680b3415e3e5fe53 +Author: Catouse +Date: Thu Sep 6 17:12:59 2018 +0800 + + * finish task #4730. + +commit 3bf970be26c8746261c441af5630deb175428b36 +Merge: d5eddfdbbf 0f1a436771 +Author: wangyidong +Date: Thu Sep 6 16:49:09 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d5eddfdbbf954c7e4dd71765f65028e5f187dcf3 +Author: wangyidong +Date: Thu Sep 6 16:48:27 2018 +0800 + + * finish task #4765. + +commit 0f1a436771710d37f0268babf0dfab67bb8293ae +Author: Catouse +Date: Thu Sep 6 16:31:33 2018 +0800 + + * finish task #4814 and fix bug #2158. + +commit a39a70cc5ccf56c74c11255c3274358d99ba4c1f +Merge: c18b40d9fd 83771d20a9 +Author: Catouse +Date: Thu Sep 6 16:12:05 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c18b40d9fdf67fcf378b8eb96e045686f3a920b6 +Author: Catouse +Date: Thu Sep 6 16:11:58 2018 +0800 + + * finish task #4817 and fix bug #2149. + +commit 83771d20a9c4c7e3183e7abcb389a4f95624901d +Author: wangyidong +Date: Thu Sep 6 14:40:14 2018 +0800 + + * finish task #4787. + +commit 6cba9e3fd7fbe77ad2ebd9963392be417d6507d2 +Merge: 0dcb3c898b 3df464a583 +Author: wangyidong +Date: Thu Sep 6 14:15:30 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0dcb3c898b0d1dd36f236180cf710a1805e3cb05 +Author: wangyidong +Date: Thu Sep 6 14:06:36 2018 +0800 + + * finish task #4809. + +commit 813a3f5ca0e8214c33641f601cd492b211beb583 +Author: wangyidong +Date: Thu Sep 6 14:03:49 2018 +0800 + + * finish task #4819. + +commit 3df464a583205cf622d64d8ba8872b0982638200 +Merge: 8128f97863 3b4c510290 +Author: Catouse +Date: Thu Sep 6 13:51:57 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8128f97863de38705047318f337613f789c39b75 +Author: Catouse +Date: Thu Sep 6 11:38:45 2018 +0800 + + * finish task #4826 and fix bug #2129. + +commit 3b4c5102906f8c6eae55537cb31d7b7664ff9b53 +Merge: f2ef810386 bf7db07f4e +Author: wangyidong +Date: Thu Sep 6 11:36:46 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f2ef8103865283269a75a7409a57c30401145d27 +Author: wangyidong +Date: Thu Sep 6 11:36:26 2018 +0800 + + * finish task #4809. + +commit bf7db07f4e6eb070bfde009986dcf0e2e130e594 +Author: Catouse +Date: Thu Sep 6 11:33:20 2018 +0800 + + * finish task #4825 and fix bug #2126. + +commit 51a7178fa03ec580cce918c3a82ec89a0fb3416a +Author: Catouse +Date: Thu Sep 6 11:03:13 2018 +0800 + + * finish task #4833 and fix bug #2090. + +commit f4bcaa625820cda71fbb18e4f7f33cf88f992631 +Author: Catouse +Date: Thu Sep 6 10:44:17 2018 +0800 + + * fix noticeBox style. + +commit f588b7fc27165698648f041fa85eb7d45ed77af7 +Merge: 7a49b3b6c7 37230abc6d +Author: wangyidong +Date: Thu Sep 6 08:52:03 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7a49b3b6c717dbe772d32b79b12aa23b3398f4a4 +Author: wangyidong +Date: Thu Sep 6 08:51:26 2018 +0800 + + * finish task #4834. + +commit 37230abc6d35aa23a9f5d8eaedf722ac761abb11 +Author: Yagami +Date: Wed Sep 5 16:37:13 2018 +0800 + + * Finish task #4770. + +commit 7fce5f23dfa77e1bb8d961b2b41b53734d14a08c +Merge: 7af638e14c 30f8957593 +Author: Yagami +Date: Wed Sep 5 15:39:09 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7af638e14ca5b80b01c1a3fd0776a644b7e6bc35 +Author: Yagami +Date: Wed Sep 5 15:38:34 2018 +0800 + + * Fix task #4783. + +commit 7e70c106ebabf8a2946f5aa6162d4615ed50323f +Author: wangyidong +Date: Wed Sep 5 15:35:51 2018 +0800 + + * change for kanban height. + +commit 30f895759397130cc00e152399d66fb713f5be3d +Merge: 5d4675c428 a32c1e6433 +Author: wangyidong +Date: Wed Sep 5 14:41:41 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5d4675c42806261939c3f72790a6cc7acc3293f2 +Author: wangyidong +Date: Wed Sep 5 14:41:21 2018 +0800 + + * finish task #4840. + +commit a32c1e643385d6247837bd4e2fc1a8c3372831d1 +Merge: acd78f289e 985fbf9bd9 +Author: Catouse +Date: Wed Sep 5 13:54:13 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit acd78f289e6f8bb8f0469dab7d4f9063668b3ab2 +Author: Catouse +Date: Wed Sep 5 13:53:59 2018 +0800 + + * change arrow image in flowchart block. + +commit 985fbf9bd9fa0ee298230e1ac3bc5e1e792e363a +Author: Yagami +Date: Wed Sep 5 13:31:15 2018 +0800 + + * Finish task #4779. + +commit 4a49230495c8d705a5257cde72a8c95a38490eaa +Author: wangyidong +Date: Wed Sep 5 12:08:52 2018 +0800 + + * finish task #4807. + +commit 2f5e741284a140b20e9bd7454b161f4aea188f0a +Author: wangyidong +Date: Wed Sep 5 11:27:08 2018 +0800 + + * finish task #4807. + +commit 64984eb2ff0ee5a1866d6a3a4dfe7eb00cea0c13 +Merge: f3d9444cfb c36b588174 +Author: wangyidong +Date: Wed Sep 5 11:23:49 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f3d9444cfba80918e52c53136a1e06bf58d344af +Author: wangyidong +Date: Wed Sep 5 11:23:10 2018 +0800 + + * finish task #4810. + +commit c36b5881741a3d07afd802adc04deb4e4dc988f7 +Merge: 1168249a05 10e4df924d +Author: Yagami +Date: Wed Sep 5 11:11:05 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1168249a05781abbc576b2bbce02508533183d35 +Author: Yagami +Date: Wed Sep 5 11:10:43 2018 +0800 + + * Finish task #4783. + +commit 10e4df924d39060c45d481108cfc70856d54485f +Merge: 92b7e10787 20e698b93d +Author: wangyidong +Date: Wed Sep 5 10:40:58 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 92b7e107874e4a7057bce4b3934cad923f6eab92 +Author: wangyidong +Date: Wed Sep 5 10:40:31 2018 +0800 + + * finish task #4812. + +commit 20e698b93dc2ee31c263a7a85e6c4981171590b1 +Author: Yagami +Date: Wed Sep 5 10:31:38 2018 +0800 + + * Finish task #4784. + +commit 6299694b54c0048a32c99917955605b61ce811b9 +Author: Yagami +Date: Wed Sep 5 09:53:35 2018 +0800 + + * Finish task #4830. + +commit 9fe756cf2bde568bac09beaf85c2884832e0167f +Author: Yagami +Date: Wed Sep 5 09:05:13 2018 +0800 + + * Finish task #4837. + +commit 0dba6a098589e409cb01a01966777ed8c7a3d0cd +Merge: a34d3d9fcc cf1db510cc +Author: wangyidong +Date: Tue Sep 4 17:11:08 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a34d3d9fcc9273a25f7c119b84a10730d095c868 +Author: wangyidong +Date: Tue Sep 4 17:10:38 2018 +0800 + + * finish task #4816. + +commit cf1db510cc3134e675db792954934dff4efb20d8 +Merge: a29f81bd2d 726b9ae75a +Author: Yagami +Date: Tue Sep 4 17:09:39 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a29f81bd2d6bccb140a6c48a6ea38797e91bee93 +Author: Yagami +Date: Tue Sep 4 17:09:02 2018 +0800 + + * Finish task #4798,#4797. + +commit 726b9ae75af8b6f013fe4304f0f20164986bd38d +Author: wangyidong +Date: Tue Sep 4 16:29:05 2018 +0800 + + * finish task #4818. + +commit 24c982f0a7aa93cf683a3de4548e8467de7842c4 +Author: wangyidong +Date: Tue Sep 4 16:27:19 2018 +0800 + + * finish task #4821. + +commit c1ed944fd1e47b88704a90e3659ae7bf48d70da0 +Author: wangyidong +Date: Tue Sep 4 16:17:04 2018 +0800 + + * finish task #4822. + +commit c221d3cd7568b0a7553658d8fe626731d9d6cdf4 +Merge: e69e353e99 82b45ba8f2 +Author: wangyidong +Date: Tue Sep 4 16:00:25 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e69e353e992a39b69b6ed3c3c463264cbd03a868 +Author: wangyidong +Date: Tue Sep 4 16:00:04 2018 +0800 + + * finish task #4823. + +commit 82b45ba8f267577f0bce7dba859768005b36ffda +Merge: 1871ebfeed f6beb1d0d1 +Author: Yagami +Date: Tue Sep 4 15:39:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1871ebfeedf44ecc9c0424f0cfbf6d37989402a8 +Author: Yagami +Date: Tue Sep 4 15:39:00 2018 +0800 + + * Finish task #4813. + +commit f6beb1d0d1e50e558cb5133292b82dae88a8b95b +Merge: 934465c5da 7c2485a110 +Author: wangyidong +Date: Tue Sep 4 14:24:47 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 934465c5da497faa3dab99dee63cc979922e4fcf +Author: wangyidong +Date: Tue Sep 4 14:24:25 2018 +0800 + + * finish task #4825. + +commit 7c2485a1103afee03d5aa4d3480bc8987661dea6 +Merge: 7e93504ad0 3fdefc81e9 +Author: Yagami +Date: Tue Sep 4 14:06:04 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7e93504ad0c91d7577e40dd91e4d06baf2df35d2 +Author: Yagami +Date: Tue Sep 4 14:05:47 2018 +0800 + + * Finish task #4820. + +commit 3fdefc81e91c8203dec892b506c57680a6766e94 +Merge: adaed46a79 2154470cd1 +Author: wangyidong +Date: Tue Sep 4 13:23:33 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit adaed46a79e6a74867d063e686a803ff0ee7a834 +Author: wangyidong +Date: Tue Sep 4 13:21:17 2018 +0800 + + * finish task #4827. + +commit 2154470cd143e4bd6926f151647680119376e497 +Author: Yagami +Date: Tue Sep 4 13:15:41 2018 +0800 + + * Finish task #4836. + +commit e6ff80e7b565ccc445ce391bd8a47f1439c17417 +Merge: 7f33483c4c 88951e03bc +Author: Yagami +Date: Tue Sep 4 13:13:39 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7f33483c4c509116511cac02f877685be4dc5c18 +Author: Yagami +Date: Tue Sep 4 13:13:08 2018 +0800 + + * Finish task #4838. + +commit 88951e03bcb4f3979a0fed50513f90a2ee89fe03 +Merge: 478b7ff097 335d73bb78 +Author: wangyidong +Date: Tue Sep 4 11:32:53 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 478b7ff0971e36105fe2771f801a4b4124d6b4ec +Author: wangyidong +Date: Tue Sep 4 11:32:33 2018 +0800 + + * finish task #4829. + +commit 335d73bb7876aa74afb2a3c7e68957dca9da4e3f +Merge: 59415f3441 d4fbf0114e +Author: Yagami +Date: Tue Sep 4 11:22:35 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 59415f3441c2fc2403993a7a05d65ee96552b810 +Author: Yagami +Date: Tue Sep 4 11:22:17 2018 +0800 + + * Finish task #4839. + +commit d4fbf0114ea403b9e37c739fcdc60f1690077746 +Merge: d062805983 78385f6b58 +Author: wangyidong +Date: Tue Sep 4 11:11:19 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d062805983c86b4458de6a6c317424c4aa2ddfea +Author: wangyidong +Date: Tue Sep 4 11:10:51 2018 +0800 + + * finish task #4832. + +commit 78385f6b589956c94041baac5b60783a52567cd9 +Author: 滔哥 +Date: Tue Sep 4 10:54:08 2018 +0800 + + * Finished task#4803. + +commit be23174e21a37d903ef61c0173a6ac5fc1fd854e +Author: 滔哥 +Date: Tue Sep 4 10:37:46 2018 +0800 + + * Finished task#4811. + +commit f980d46fec105f157db810f537a269fdf35ff919 +Author: wangyidong +Date: Sun Sep 2 09:26:23 2018 +0800 + + * fix bug #2135. + +commit fa5f0518bf4b155264fa769f679c17137fe38af1 +Author: wangyidong +Date: Sun Sep 2 09:02:53 2018 +0800 + + * fix for pinyin class in php5.2 + +commit 85e93fa29d2918386fc51e69f23415e27db56027 +Author: wangyidong +Date: Mon Aug 27 15:13:11 2018 +0800 + + * adjust group-mangeview page. + +commit 5645c1f6d614bca00ff75e8fedf0559c7bc0b61e +Author: wangyidong +Date: Mon Aug 27 09:08:47 2018 +0800 + + * Ignore webhook that is timeout. + +commit fbbb1b0d45ffefdba4be6f8aacf25e07189fc00c +Author: wangyidong +Date: Fri Aug 24 11:33:46 2018 +0800 + + * fix bug for ajdust task time. + +commit 74c564090ad794fb9bade6054024e1c36a79b573 +Author: wangyidong +Date: Thu Aug 23 16:18:34 2018 +0800 + + * fix bug. + +commit a5c4e0cb5f521a2537e62da4b33bae9837b0c56a +Author: wangyidong +Date: Thu Aug 23 16:17:12 2018 +0800 + + * fix bug for login and edit. + +commit 2a1cda4ce1db0158fde3369bffca4ecbf4673c85 +Author: wangyidong +Date: Tue Aug 21 15:20:49 2018 +0800 + + * finish task #6972. + +commit 9bd7dad9fb51532f5de829b49474585df67eee71 +Author: wangyidong +Date: Thu Aug 16 13:52:43 2018 +0800 + + * adjust for batch page style. + +commit c71d3d15405f16ecfe7e2b4d3ad609a2a2ccfdda +Author: wangyidong +Date: Wed Aug 15 10:23:31 2018 +0800 + + * fix bug for modal in testcase browse page. + +commit d3ce07acce611d6730b9d0e010f63b0da04e8742 +Author: Catouse +Date: Tue Aug 14 14:22:24 2018 +0800 + + * update zui js file. + +commit 6738e843af4fcc06a6454137e63685fb07172c59 +Author: Catouse +Date: Tue Aug 14 14:20:13 2018 +0800 + + * fix bug #2005, fix UI not show on ie9 and ie10. + +commit 5ad506d926a1440d6b5bde01b813ad283fd1126c +Author: wangyidong +Date: Fri Aug 10 14:25:30 2018 +0800 + + * change for bug #2094. + +commit e6468f51e21b67ce0c21f24403d80352e45297c9 +Author: wangyidong +Date: Fri Aug 10 14:14:31 2018 +0800 + + * fix bug #2094. + +commit 5b6f35062aec5dfcd5cdf0d21d1d3ec913c938b7 +Author: wangyidong +Date: Fri Aug 10 13:20:14 2018 +0800 + + * fix bug #2113. + +commit 3bcd533f480bfc37479f9d5f39c95fff4c3949de +Author: wangyidong +Date: Fri Aug 10 13:13:30 2018 +0800 + + * finish task #2095. + +commit a879819dc73f11a3e0a7e7d1bc480875e71e9698 +Author: wangyidong +Date: Fri Aug 10 11:14:55 2018 +0800 + + * fix bug #2111. + +commit 6cdf85e4515a84c6a98d2028df1160f4c04eea33 +Merge: e3987b76c9 9bf4f30956 +Author: wangyidong +Date: Fri Aug 10 10:21:59 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e3987b76c971f9edcaf18373184a7fa45ca2394f +Author: wangyidong +Date: Fri Aug 10 10:21:08 2018 +0800 + + * fix bug #2112. + +commit 9bf4f3095651f30de4b2742f7f9787865e9b1814 +Merge: f256cc3ed9 d807b3453e +Author: 滔哥 +Date: Thu Aug 9 16:59:07 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f256cc3ed9124f8e279e0d8e50f55e6722fdd7aa +Author: 滔哥 +Date: Thu Aug 9 16:59:01 2018 +0800 + + * Add action for xuanxuan userCheckChange function. + +commit d807b3453e345c23e73b0c4d644b64d3390c777e (tag: zentaopms_10.3_20170809) +Author: Catouse +Date: Thu Aug 9 14:39:28 2018 +0800 + + * update pri icons. + +commit c5584d56ce839e962416091d12a4c1f163a92827 +Author: Catouse +Date: Thu Aug 9 14:39:09 2018 +0800 + + * fix testcase/browse view. + +commit 54b7e51e7c653e22b222a24b1ce69e0cd34d13f6 +Merge: 914b7da422 a20b31ba09 +Author: Catouse +Date: Thu Aug 9 14:30:44 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 914b7da422b46c7beae85b7836a10126f01baa11 +Author: Catouse +Date: Thu Aug 9 14:30:30 2018 +0800 + + * update icons. + +commit a20b31ba09e100d526119229dd2328bad14d141a +Author: wangyidong +Date: Thu Aug 9 14:15:31 2018 +0800 + + add changelog for 10.3. + +commit bb02412aedc847714556fb2412bc77417617533e +Merge: f799b5eb88 9ab90c4e43 +Author: wangyidong +Date: Thu Aug 9 14:11:28 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9ab90c4e43c7161805679c09b71cceb3cc5353b4 +Merge: 281da3fa8e 3861c7077e +Author: Catouse +Date: Thu Aug 9 14:07:22 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 281da3fa8e024a38423d3030bd703cfc6afe93ce +Author: Catouse +Date: Thu Aug 9 14:07:14 2018 +0800 + + * update zui js file. + +commit f799b5eb882e81dd5d1c5c887904610a66af9e54 +Author: wangyidong +Date: Thu Aug 9 14:05:18 2018 +0800 + + * finish task #4654. + +commit 27ad6dae0b88e12dcc24f0ed8135a59c4ffca2df +Author: wangyidong +Date: Thu Aug 9 13:51:45 2018 +0800 + + * add autocomplete='off' for todo block. + +commit eccfad0ec63c9f1225520090c6b881050b14897b +Author: wangyidong +Date: Thu Aug 9 13:49:34 2018 +0800 + + * finish task #4685. + +commit 3861c7077eb0f0a694a8e51efdefa1a17bb9080d +Author: wangyidong +Date: Thu Aug 9 13:23:02 2018 +0800 + + * add new version and upgrade it. + +commit c8d4967a220f5446652d16192dcfeec59b2662e0 +Merge: efd6f81fb8 628db3acfa +Author: wangyidong +Date: Thu Aug 9 12:04:32 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit efd6f81fb8472325100a86852207a1df463c63b5 +Author: wangyidong +Date: Thu Aug 9 11:40:01 2018 +0800 + + * finish task #4649. + +commit 628db3acfad4aa85486b6f8adcc24295d74bbf16 +Merge: 87f9579d77 fc91ec89dd +Author: Catouse +Date: Thu Aug 9 11:34:26 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 87f9579d77b00176c978757f9ae403cdf25550ac +Author: Catouse +Date: Thu Aug 9 11:34:01 2018 +0800 + + * fix bug #2105. + +commit fc91ec89dd2d5b84fa45cc89aee1ea1822d57e8d +Merge: 63f929e329 14c9d661a4 +Author: wangyidong +Date: Thu Aug 9 11:26:21 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 63f929e32917fc991c22c62fdf0f0229327edef6 +Author: wangyidong +Date: Thu Aug 9 11:25:03 2018 +0800 + + * finish task #4661. + +commit 14c9d661a4a35a8661716f19ccf5c5c33a91e85b +Merge: 1a08ec91fa 28f0f30770 +Author: Catouse +Date: Thu Aug 9 10:56:43 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1a08ec91fafe5feb18353f13622a71ade51a422b +Author: Catouse +Date: Thu Aug 9 10:54:01 2018 +0800 + + * finish task #4652 and fix bug #2093. + +commit 28f0f307705f9f2782d813cde378c24910bd5b0f +Author: wangyidong +Date: Thu Aug 9 10:31:05 2018 +0800 + + * finish task #4680. + +commit a5c34a10ed9fb630ab34c610630b655186512d8d +Merge: c8a78acbb9 116ea815b5 +Author: 滔哥 +Date: Wed Aug 8 19:30:41 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c8a78acbb94259326a2035b70d317894ccaf9e76 +Author: 滔哥 +Date: Wed Aug 8 19:29:51 2018 +0800 + + * Fix bug for php7.2. + +commit 116ea815b50df643e06fc5ee3e4d4bab7986224d +Author: wangyidong +Date: Wed Aug 8 17:40:00 2018 +0800 + + * finish task #4685. + +commit 4d5b63086c3fb80f9c4031ada93b741f756db175 +Author: wangyidong +Date: Wed Aug 8 17:15:29 2018 +0800 + + * finish task #4657. + +commit fae8e48325f000b7ea0d0b62e4025194a0f4bda9 +Author: wangyidong +Date: Wed Aug 8 17:14:52 2018 +0800 + + * finish task #4667. + +commit 4f9d50bfdcb1175c061973b17ca76ea563306d8d +Author: wangyidong +Date: Wed Aug 8 15:36:01 2018 +0800 + + * finish task #4648. + +commit c9e196bb6401b401678137b20c2a3f927fbaa75e +Author: wangyidong +Date: Wed Aug 8 15:16:30 2018 +0800 + + * code for task #4679. + +commit 2c2c86bf6216e7bdeac5028db7391767f0115157 +Merge: d71811ab17 2c24472bae +Author: wangyidong +Date: Wed Aug 8 15:08:05 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d71811ab170eabc4ea6fde2d97d8e719ccb1b39f +Author: wangyidong +Date: Wed Aug 8 15:07:31 2018 +0800 + + * finish task #4679. + +commit 2c24472bae3dfcf2e9503c688f7e8e77e96a02e5 +Author: chenfeiCF +Date: Wed Aug 8 14:06:14 2018 +0800 + + * Finish task #4647. + +commit 90ad70d4401930651206d059da9cf6cb63b0c969 +Author: wangyidong +Date: Wed Aug 8 13:51:54 2018 +0800 + + * finish task #4687. + +commit 70653a09a0042aed0d25f90bc08aa1553c2d690a +Author: wangyidong +Date: Wed Aug 8 13:41:25 2018 +0800 + + * finish task #4673. + +commit 321d665abbe7bd9e3fe91388f3438e15a4aef890 +Author: wangyidong +Date: Wed Aug 8 11:30:57 2018 +0800 + + * finish task #4655. + +commit 40c92e76484c03c92c662fbf1b7522858dcef948 +Author: wangyidong +Date: Wed Aug 8 10:21:35 2018 +0800 + + * finish task #4686. + +commit c7dbd805621561fb67383c5fcc2b3b1f4980e853 +Author: wangyidong +Date: Wed Aug 8 09:59:28 2018 +0800 + + * code for task #4652. + +commit 95454cd35b72b7a848a7f372169aa9019e1b0628 +Author: wangyidong +Date: Tue Aug 7 17:27:06 2018 +0800 + + * finish task #4650 and delete useless file. + +commit b66095e78ae40071a61883870280b9db22238031 +Author: wangyidong +Date: Tue Aug 7 17:18:28 2018 +0800 + + * fix bug #2003. + +commit 4875eec38ed2e91678dbf354fb9ef3fd4c629b28 +Author: wangyidong +Date: Tue Aug 7 17:09:11 2018 +0800 + + * finish task #4668. + +commit 3c897623e90f6d4b6005ab762ec0966a8539871c +Merge: 1bcbddf649 6264ffc4ce +Author: wangyidong +Date: Tue Aug 7 16:30:36 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1bcbddf64965ede57bedb0ffe2f8567857994bea +Author: wangyidong +Date: Tue Aug 7 16:30:00 2018 +0800 + + * finish task #4659. + +commit 6264ffc4cefc635e10641713fa81d03bc6391902 +Author: chenfeiCF +Date: Tue Aug 7 16:24:49 2018 +0800 + + * Finish task #4645. + +commit 4a8805f4246d149fccaed84f4235f82cc6a3ff84 +Author: wangyidong +Date: Tue Aug 7 16:11:32 2018 +0800 + + * finish task #4644. + +commit 5c548cf1216ccef2487c2ca066d470486e17ffe1 +Author: wangyidong +Date: Mon Aug 6 17:39:55 2018 +0800 + + * finish task #4664. + +commit c5c850bb02731cc37672be6cd6cadba9698f67f3 +Merge: f04d90faf4 2566eeeda7 +Author: wangyidong +Date: Mon Aug 6 15:36:36 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f04d90faf43b3271c8b24ce53d66b07e7f2f28c7 +Author: wangyidong +Date: Mon Aug 6 15:35:08 2018 +0800 + + * fix bug for export story when search. + +commit 2566eeeda71b4419a69aae57586aaf9194fc3075 +Merge: 6a1f87bd26 90945e3bd7 +Author: Catouse +Date: Thu Aug 2 15:31:15 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6a1f87bd269d5efba272ae0cd730fd6c0052c266 +Author: Catouse +Date: Thu Aug 2 15:31:00 2018 +0800 + + * swap js and css import order to improve frontend perfermance. + +commit e316487734e62152ac7f722488af2007061c2abb +Author: wangyidong +Date: Thu Aug 2 11:46:49 2018 +0800 + + * add xuanxuan when build zentaopms. + +commit 90945e3bd7dd22fe65ec0d63ef5be1ef6ae1726f (tag: zentaopms_10.2_20180802) +Author: wangyidong +Date: Thu Aug 2 10:02:21 2018 +0800 + + * adjust for upgrade. + +commit 4c6c3f461f514a2ec8f53929775ea9a7a668e6f0 +Author: dajiao007 +Date: Wed Aug 1 09:36:58 2018 +0800 + + * modify english words + +commit ca473bc803de593d64fff792435bd34ecb194bc6 +Merge: 5cf6a5be39 df0f7d3c00 +Author: Catouse +Date: Tue Jul 31 13:23:38 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5cf6a5be39e3a5e37fc620b137b9fcaa4690e039 +Author: Catouse +Date: Tue Jul 31 13:23:26 2018 +0800 + + * fix pager language option not work by update zui js. + +commit df0f7d3c00e21995a80db823c232d08f35faf11e +Merge: dcd0f98a73 e295fd0203 +Author: liugang +Date: Mon Jul 30 10:42:34 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dcd0f98a73155e5f3c369c8125be781222d88402 +Author: liugang +Date: Mon Jul 30 10:41:47 2018 +0800 + + * Set buttons in view page as same as in browse page. + +commit e295fd0203241f7f9689c47198a39a7d3aeb1c1f +Author: estellbright <1457749147@qq.com> +Date: Thu Jul 26 09:56:10 2018 +0800 + + Fix Team Bug. + +commit 8b7a79a6e1790c9800ef306ea6be8ccc40d033f4 +Merge: e39a5f0014 375850e6b1 +Author: liugang +Date: Thu Jul 26 09:42:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e39a5f00142b50d9639fe4673ce563be1c63f199 +Author: liugang +Date: Thu Jul 26 09:40:27 2018 +0800 + + * Fix bug #2019 + +commit 375850e6b159eabf25b71bc1a345062c55fcbfeb +Author: estellbright <1457749147@qq.com> +Date: Thu Jul 26 09:38:03 2018 +0800 + + Fix Bug. + +commit 5238216a300d13effc46b44d65027ddc3529aa8a +Merge: 5c63c7f6fd 5ceae019fe +Author: reneteng +Date: Wed Jul 25 17:26:11 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5c63c7f6fda0b2c6b116db6781e1e872812e66ec +Author: reneteng +Date: Wed Jul 25 17:25:15 2018 +0800 + + *stage to phase + +commit 5ceae019fee8fe421d95ab3356d207085bc308ec +Author: estellbright <1457749147@qq.com> +Date: Wed Jul 25 17:17:49 2018 +0800 + + *Finish Task #6833. + +commit 2a85d52eeb3b9da0f2a3a11e4053f4ce9558840a +Author: wangyidong +Date: Wed Jul 25 13:14:36 2018 +0800 + + * fix bug #1433 + +commit 7891bf8591057a794e9b90d3d10bcaf7b52f8074 +Author: wangyidong +Date: Wed Jul 25 11:05:36 2018 +0800 + + * fix bug #1440. + +commit b74da6e41929a9122cb94f61f1f7cc87dff3c2d7 +Merge: fab688d16f c4a752478c +Author: wangyidong +Date: Wed Jul 25 10:39:31 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fab688d16f2fb1f9ca63d2ab24b697ee9e95a47f +Author: wangyidong +Date: Wed Jul 25 10:38:57 2018 +0800 + + * fix bug #1436. + +commit c4a752478c5ab1835458bdf311cfcb5b5b1c73ed +Author: daitingting +Date: Tue Jul 24 15:39:37 2018 +0800 + + * Use ajaxFrom submit it. + +commit afd1728913f30df4163dd8de88a2bc3ad4a05099 +Merge: 362c20a22f b7817b432c +Author: daitingting +Date: Tue Jul 24 15:34:43 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b7817b432cd58e4fc759a05dc88bb375ca266c4e +Merge: 26450f693f 6ab7d1b28c +Author: reneteng +Date: Tue Jul 24 15:01:24 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 26450f693f54d7be6aaaccca34f30ee32efa4de2 +Author: reneteng +Date: Tue Jul 24 15:00:04 2018 +0800 + + *minor change + +commit 362c20a22f23b497ff901d0e301cdb838b9cb665 +Merge: 6840ad7613 6ab7d1b28c +Author: daitingting +Date: Tue Jul 24 14:49:28 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6840ad761377fb5adc41145bbb6b0b0fa9b334e5 +Author: daitingting +Date: Tue Jul 24 14:48:39 2018 +0800 + + * Adjust codes. + +commit 6ab7d1b28cf51f17e573e117bdcc51323f9e5c50 +Merge: 80c9bfab2a 3e935d0e4d +Author: wangyidong +Date: Tue Jul 24 13:47:54 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 80c9bfab2aeaddcc29df8031d442418452d47af7 +Author: wangyidong +Date: Tue Jul 24 13:46:43 2018 +0800 + + * finish task #6894. + +commit 3e935d0e4dcfd54680e7e8e1f9665e52324d807b +Merge: 3ac21017f5 6d9bf4a0bc +Author: Catouse +Date: Tue Jul 24 11:36:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6d9bf4a0bce327364d3767e17b3ead02bf4b5845 +Author: liugang +Date: Tue Jul 24 10:47:55 2018 +0800 + + * Fix bug #2030 + +commit 3ac21017f5e8a9e5f97abc85ecab3bb430ea32d4 +Merge: 0305c59f31 e4a9852f0b +Author: Catouse +Date: Tue Jul 24 10:18:09 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0305c59f31321634b64997ad6fece7cd7894d6e8 +Author: Catouse +Date: Tue Jul 24 10:17:51 2018 +0800 + + * fix datatable not work in hot reload table mode. + +commit e4a9852f0ba98540e6681388763c454684048d6b +Author: Yagami <976204163@qq.com> +Date: Tue Jul 24 10:00:39 2018 +0800 + + *Finish task #6850. + +commit 9a3fddd00e8d94d234730a07b3426d118a969820 +Author: Catouse +Date: Tue Jul 24 09:25:26 2018 +0800 + + * finish task #6798. + +commit f33002c021e5ed64f27a26a1ee0f582e4a982972 +Merge: 3155cb8838 9af39d9e0a +Author: Catouse +Date: Mon Jul 23 17:31:49 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3155cb88380faae97ec369f2d06a8eb307bb51c1 +Author: Catouse +Date: Mon Jul 23 17:31:18 2018 +0800 + + * change import view. + +commit 9af39d9e0a75f98b9eda440b2911641b9a308806 +Author: wangyidong +Date: Mon Jul 23 17:29:51 2018 +0800 + + * fix error. + +commit 9e2df3dde2e7da1b368ca071a5ea05e98dbd62a1 +Author: wangyidong +Date: Mon Jul 23 17:27:54 2018 +0800 + + * change for safe. + +commit 897ad0fdae7638e53f262bdaf2279d802b5e4cc0 +Merge: 38b3d7e6fd ec2b70a222 +Author: wangyidong +Date: Mon Jul 23 15:07:46 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 38b3d7e6fdb40a9f8e5de9140692b39722af9576 +Author: wangyidong +Date: Mon Jul 23 15:06:49 2018 +0800 + + * fix bug #2068,2065,2064,2053. + +commit ec2b70a2228acde72d673531513eaa95266760d5 +Merge: a2baa7ad5a 1eaaf24db6 +Author: liugang +Date: Mon Jul 23 14:15:22 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a2baa7ad5ae1b1377f1069e9250cc2c6340bee3f +Author: liugang +Date: Mon Jul 23 14:15:04 2018 +0800 + + * Display chart datas of testtask. + +commit 1eaaf24db6b6114dab097dd9f7cbb4b1c6decd96 +Author: 滔哥 +Date: Mon Jul 23 13:30:15 2018 +0800 + + * Change for Xuanxuan entry sso. + +commit 087cb53536197a3c43b3d4ea48216eb3014633fa +Author: reneteng +Date: Mon Jul 23 13:20:47 2018 +0800 + + * change funcion to feature + +commit 9727194d11dfbcf6e024f14f2dd2fcf76681ed1c +Merge: 1a0046c7a5 6ac385f583 +Author: reneteng +Date: Mon Jul 23 11:26:30 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + * remove support in common en + +commit 1a0046c7a54cd9819b4b7ee0b2e1229a4db2be51 +Author: reneteng +Date: Mon Jul 23 11:25:53 2018 +0800 + + * remove support + +commit 6ac385f583220a4375ee3cc97a635bd0e13be7d9 +Author: Yagami <976204163@qq.com> +Date: Mon Jul 23 11:25:24 2018 +0800 + + * Finish task #6865. + +commit 44a8a98c34b8552138acd8ee99fcef4f4eed3ae4 +Merge: d6291e05e3 a56ab4ec35 +Author: liugang +Date: Thu Jul 19 15:35:45 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d6291e05e38a82fe08770634b6da7c7c6ed0cbee +Author: liugang +Date: Thu Jul 19 15:34:49 2018 +0800 + + * Set project name as header if export stories of a project. + +commit a56ab4ec35927d04e1debf10f38beeeeaf0dc1dd +Merge: 323e4f80ad 43a295b008 +Author: daitingting +Date: Thu Jul 19 15:30:28 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 323e4f80ad89aa9108b0d036b71984ad3e9c63b1 +Author: daitingting +Date: Thu Jul 19 15:29:34 2018 +0800 + + * Add space. + +commit 43a295b0082feda992606c13b10c03038e706ac4 +Author: liugang +Date: Thu Jul 19 14:11:46 2018 +0800 + + * Fix style. + +commit 38da31c18afcbafc80450a8ab57f3a9c5a81053a +Merge: 21480a368a 95cfa5c880 +Author: liugang +Date: Thu Jul 19 13:57:39 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 21480a368aa29b8e65034fe98d26682c4f7ebd03 +Author: liugang +Date: Thu Jul 19 13:57:04 2018 +0800 + + * Display empty tips if no data. + +commit 95cfa5c880cfd15a1105b7e1e1a7a7cdd66710ea +Merge: db8632234f b8afb7ca57 +Author: daitingting +Date: Wed Jul 18 17:13:59 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit db8632234fa40872890a728acb5c6bce370035bb +Author: daitingting +Date: Wed Jul 18 17:12:43 2018 +0800 + + * Use html for link in mail, fix bug #1235. + +commit b8afb7ca57ee9289f1e478fb931783bf4cbba2fa +Merge: d0f3160fd3 575ed48a0a +Author: wangyidong +Date: Wed Jul 18 15:17:09 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d0f3160fd374fd37c0caf27ac28647b5256fa4e7 +Author: wangyidong +Date: Wed Jul 18 15:16:40 2018 +0800 + + * finish task #6826. + +commit 575ed48a0ad444d6d60068a62654ac18486ccd3a +Merge: afe2fedeb7 d0723ee92b +Author: liugang +Date: Tue Jul 17 15:29:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit afe2fedeb7e4305ee93ce4c106204385feb37f6c +Author: liugang +Date: Tue Jul 17 15:28:36 2018 +0800 + + * The calendar page can only export all records. + +commit d0723ee92be9c33a08b8130091acd15f4dd22ac5 +Author: wangyidong +Date: Tue Jul 17 14:14:25 2018 +0800 + + * adjust for bind ranzhi css. + +commit 96355c532dd6bfa1b7d55684ca60ccc513aa2b07 +Author: wangyidong +Date: Mon Jul 16 17:14:10 2018 +0800 + + * adjust code for subMenu. + +commit c58bcd14cf154756c2d5bb8690da718d88927ef5 (tag: zentaopms_10.1_20180716) +Author: wangyidong +Date: Mon Jul 16 13:39:01 2018 +0800 + + * change for article-content style. + +commit c273b55996d5d605d551854b1db6d100a6a867fc +Author: wangyidong +Date: Mon Jul 16 13:26:40 2018 +0800 + + * adjust changelog and zh-tw lang. + +commit df1862767936f0a61de93d98122636770a9f06d3 +Author: dajiao007 +Date: Sat Jul 14 15:20:53 2018 +0800 + + * modify English Version + +commit b6f022fecc808f2df3fe29272b2dae4041493269 +Merge: 722e82ebee 2414a31290 +Author: dajiao007 +Date: Sat Jul 14 10:41:48 2018 +0800 + + Merge branch 'master' of http://github.com/easysoft/zentaopms + +commit 722e82ebeeb1320db0fe7dfb98ae89ad5184944b +Author: dajiao007 +Date: Sat Jul 14 10:39:37 2018 +0800 + + * modify English Version of Doc + +commit 2414a31290a3b7ffa94681bc473c34e3949e7c9b +Merge: 0a456353e1 cc334e3d8c +Author: wangyidong +Date: Fri Jul 13 18:21:09 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0a456353e111bce478edf9dc117f11e3e2250b70 +Author: wangyidong +Date: Fri Jul 13 18:20:02 2018 +0800 + + * fix bug #4243. + +commit cc334e3d8ceac724a03b2f42bd206e5261b6775d +Author: estellbright <1457749147@qq.com> +Date: Fri Jul 13 15:40:56 2018 +0800 + + Fix bug #2048. + +commit 2b0f70a646a23819343c6347778cae851aa18f3d +Author: estellbright <1457749147@qq.com> +Date: Fri Jul 13 15:38:44 2018 +0800 + + *Fix bug #2044. + +commit cd50d535dedee347d082e8f16d2cf1eaf2aaf6ef +Author: estellbright <1457749147@qq.com> +Date: Fri Jul 13 15:35:54 2018 +0800 + + *Fix bug # 2009. + +commit 3caa486af22bccddf5e03014d9fe31fb16f02ef3 +Author: daitingting +Date: Fri Jul 13 15:05:05 2018 +0800 + + * Add required mark when module is setted required. + +commit 990182a37cdae04bc3a87452b6330fa7d05a500e +Author: liugang +Date: Fri Jul 13 14:34:34 2018 +0800 + + * Submit form by ajax. + +commit c5b4a54b0967baa35f48b5b352b53d1e11407697 +Merge: e8643f6fc6 0b35405187 +Author: liugang +Date: Fri Jul 13 14:29:37 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e8643f6fc6d3ee910ad948435af0cf1e8a9e690d +Author: liugang +Date: Fri Jul 13 14:29:22 2018 +0800 + + * Submit form by ajax. + +commit 0b354051878a5822b9634faa920ebebfad2d8b0d +Merge: cb6495a63a f235f2913a +Author: daitingting +Date: Fri Jul 13 14:06:26 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cb6495a63ab4b0af6e099eb03b31136f9b9b6ea0 +Author: daitingting +Date: Fri Jul 13 14:01:42 2018 +0800 + + * When creating a project with plan, multi-platform product need to display option of all platform if there is no platform. + +commit f235f2913a6f8ecfb970c0d279c06a1892d93a27 +Merge: 498c8a4dfd 08cecec1e3 +Author: chenfeiCF +Date: Fri Jul 13 13:43:50 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 498c8a4dfd155a1bbc92b4bc799ecc4000eca8b8 +Author: chenfeiCF +Date: Fri Jul 13 13:41:39 2018 +0800 + + * Adjust href for refresh link. + +commit 08cecec1e31e51e2fbd5fe2d12b4d18bb1efc80e +Merge: 4089bfb39f 1772018ead +Author: wangyidong +Date: Fri Jul 13 13:37:16 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4089bfb39f10942e470068590d33efb2d7794a8a +Author: wangyidong +Date: Fri Jul 13 13:36:22 2018 +0800 + + * adjust for my-testtask page. + +commit 37cbffb5e7e89e65641a038a8ca5500ec9816eb7 +Merge: bea1e4d4ed 1772018ead +Author: chenfeiCF +Date: Fri Jul 13 13:33:02 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1772018ead5aef6151e03bf24c429c680f8f2cb4 +Author: dajiao007 +Date: Fri Jul 13 13:27:53 2018 +0800 + + * Modify English Version + +commit 6f3ae89b82c0f4a8f17069f2d61b91593dcd3f50 +Author: daitingting +Date: Fri Jul 13 11:23:14 2018 +0800 + + * Add empty file for updated users. + +commit d7a106f0bd5276eec0396ef916d70d7840bdc227 +Author: daitingting +Date: Fri Jul 13 11:18:33 2018 +0800 + + * Disabled autoComplate function. + +commit 440d53a7549c612837538f25fbc2b76c0b68bb55 +Merge: bc4a40282e 526f392155 +Author: Yagami <976204163@qq.com> +Date: Fri Jul 13 10:48:29 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bc4a40282e425b9d40169549e2ebc5bb942515f8 +Author: Yagami <976204163@qq.com> +Date: Fri Jul 13 10:47:17 2018 +0800 + + * Detele todo lang and fix project link to plan bug. + +commit bea1e4d4eddcb6fe9d154c550186fe48ffe96fc1 +Merge: e53ab3e7c6 526f392155 +Author: chenfeiCF +Date: Fri Jul 13 10:40:35 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e53ab3e7c68648fd3afc15ef57abb4ff3da7b579 +Author: chenfeiCF +Date: Fri Jul 13 10:38:44 2018 +0800 + + * Fix bug: can't load it's plan when link another product. + +commit 526f3921550d5e8218765ff59c69eb5d35c0954e +Author: daitingting +Date: Fri Jul 13 10:22:57 2018 +0800 + + * Compute hours for grouptasks like as browse page. + +commit 157aac7269001b9c9d24085ea0245230d6374783 +Merge: f663c7e309 cfa8c0ee0e +Author: daitingting +Date: Fri Jul 13 10:22:12 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cfa8c0ee0e54e5dd91d42cb5ea7a83c513bcf0ce +Author: estellbright <1457749147@qq.com> +Date: Fri Jul 13 10:20:46 2018 +0800 + + *Fix bug #2015. + +commit f663c7e30930356de90a215af155181325ef6258 +Author: daitingting +Date: Fri Jul 13 10:18:05 2018 +0800 + + * Compute the estimated and consumed hours of all status tasks. + * Compute the left hours without canceled tasks. + +commit 0e0fc2ae842b6fa4bc0f26963a30ea98789ca85c +Author: chenfeiCF +Date: Fri Jul 13 10:04:39 2018 +0800 + + * Remove unlink method privilege of story, bug, testcase module. + +commit 413f7d48c38a7c44ea6a0ae3a6ac244f60b7b8ee +Author: estellbright <1457749147@qq.com> +Date: Fri Jul 13 09:36:30 2018 +0800 + + Fix Bug Delete the Last. + +commit 02bd9ce4d95750216b2ef86303f9becb5187403d +Author: dajiao007 +Date: Fri Jul 13 09:05:53 2018 +0800 + + * modify for Egnlish Version + +commit 93bbe3df4cba0a38d8421cf630cb8dc4324d2401 +Merge: 9179d52d84 d9b17a23f4 +Author: Catouse +Date: Thu Jul 12 16:58:38 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9179d52d840a4258a0fe30347debe7d8a8e0133b +Author: Catouse +Date: Thu Jul 12 16:58:21 2018 +0800 + + * fix hash code ‘#todo-id’ not work. + +commit d9b17a23f41ef9c15696ccdf0b65858dc25162cc +Merge: 73c335b3de 48ec560bdb +Author: daitingting +Date: Thu Jul 12 14:38:51 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 73c335b3de887ecaa61bca080f50ca9011891111 +Author: daitingting +Date: Thu Jul 12 14:38:36 2018 +0800 + + * Adjust style. + +commit 48ec560bdbd53648ced13e499b7fba41b1fb7576 +Merge: c699bd74a5 bafb11cc5c +Author: wangyidong +Date: Thu Jul 12 14:36:45 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c699bd74a5782eb311a7a845614562aa1b0a7c22 +Author: wangyidong +Date: Thu Jul 12 14:35:36 2018 +0800 + + * change for batch change stage. + +commit 8083ea07fc9387ebc1817327b599b3a56d01be25 +Author: wangyidong +Date: Thu Jul 12 14:33:40 2018 +0800 + + * fix bug #2036. + +commit bafb11cc5cbf2588afcb14b281d725298680f42c +Merge: 2e39603dae 9e4a9f8eb8 +Author: daitingting +Date: Thu Jul 12 14:15:28 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2e39603dae24a15eaac4f567ed38eba6093918f6 +Author: daitingting +Date: Thu Jul 12 14:15:04 2018 +0800 + + * Adjust codes. + +commit 9e4a9f8eb87818b9671517cb2ba198001e363dc1 +Author: wangyidong +Date: Thu Jul 12 13:34:51 2018 +0800 + + * adjust style when bind ranzhi in biz version. + +commit 0cf45cb10148dc881629faa4e678a3874401dfb8 +Author: wangyidong +Date: Thu Jul 12 13:14:46 2018 +0800 + + * adjust for create task in project for limited user. + +commit 8e6a61a1783ba22ca2c0fa3e8d82eccba16f0848 +Merge: bcef5cbbc5 ac3547b11c +Author: wangyidong +Date: Thu Jul 12 11:56:15 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bcef5cbbc5e7f8c58074e756a3d35fc19d291507 +Author: wangyidong +Date: Thu Jul 12 11:55:32 2018 +0800 + + * fix for project limited. + +commit ac3547b11c44751f89b569aaf184034eb0f0df9b +Merge: c4f2843fac c8ceb6567e +Author: Catouse +Date: Thu Jul 12 11:45:17 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c4f2843facf1c299c8c8cb436db0c91563a156da +Author: Catouse +Date: Thu Jul 12 11:45:06 2018 +0800 + + * update zui js file and fix ajaxform UI. + +commit c8ceb6567e6827da5887f486e8960c4845d885df +Author: Yagami <976204163@qq.com> +Date: Thu Jul 12 11:15:47 2018 +0800 + + *Fix bugs. + +commit f532e7d0604dc9d445c401b036c2a533525e6563 +Merge: 1cd38835e6 51ce3062dd +Author: Yagami <976204163@qq.com> +Date: Thu Jul 12 11:08:38 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1cd38835e65c7e856833f5278c858fb230131970 +Author: Yagami <976204163@qq.com> +Date: Thu Jul 12 11:08:03 2018 +0800 + + *Fix require field. + +commit 51ce3062dd20ccbc428a2f855305be93e5b54ea7 +Author: daitingting +Date: Thu Jul 12 10:57:06 2018 +0800 + + * Delete done status of project. + * Update data. + +commit 4e26d81591e73a2dc463422231bd6cf4d1b767a0 +Merge: b9e042dc56 2c5b1a127d +Author: daitingting +Date: Thu Jul 12 10:43:48 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b9e042dc56c0991d94c322687f0ff6356026e255 +Author: daitingting +Date: Thu Jul 12 10:43:17 2018 +0800 + + * Adjust computeHours4Multiple function. + +commit 187c1bb78fc4ad927bc5fd90926dae62410cf750 +Merge: 27f06f4153 8b21a854e4 +Author: Yagami <976204163@qq.com> +Date: Thu Jul 12 10:25:37 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2c5b1a127d376e5dd1aaf33e8c39cb42a0005778 +Merge: d525b78184 8b21a854e4 +Author: liugang +Date: Thu Jul 12 10:25:33 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 27f06f4153b1358c0a7c3b782a3255b623b6b955 +Author: Yagami <976204163@qq.com> +Date: Thu Jul 12 10:25:19 2018 +0800 + + *Fix bugs. + +commit d525b781849d38722fe18094e8b28c949a03ef8b +Author: liugang +Date: Thu Jul 12 10:24:27 2018 +0800 + + * Change createlib and editlib to upper case and finish task #4628. + +commit 8b21a854e4755c9e713340b68cba7066ceda306c +Merge: 3c58adf701 9918877a5d +Author: wangyidong +Date: Thu Jul 12 10:16:08 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3c58adf701c0837221ae5a323cfc87fa8773eb6d +Author: wangyidong +Date: Thu Jul 12 10:14:27 2018 +0800 + + * adjust for save log with curl in snoopy. + +commit 9918877a5d7cf6f061fac1c0bd515bdeb1d0a10f +Merge: e48c46e84e 6d8d499272 +Author: liugang +Date: Thu Jul 12 10:09:09 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e48c46e84e644c6adc64ec71bbcf0c132a80fb43 +Author: liugang +Date: Thu Jul 12 10:08:40 2018 +0800 + + * Change createLib and editLib to lower case. + +commit 6d8d49927224231aefc18b54b1b4582627ffddcd +Author: Catouse +Date: Thu Jul 12 09:59:51 2018 +0800 + + * finish task #4566. + +commit 406efc28ed657cf138ba6967ce99d47959405c18 +Merge: 4bb44dcb07 70d1aa8c8f +Author: Catouse +Date: Thu Jul 12 09:43:25 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4bb44dcb073adedc77c20f7d117054d93c683ee3 +Author: Catouse +Date: Thu Jul 12 09:43:08 2018 +0800 + + * update zui. + +commit 70d1aa8c8fccdb6d0c9aa5d52b1e210ade196018 +Merge: d7cd324f90 a072dfe807 +Author: liugang +Date: Thu Jul 12 09:18:03 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d7cd324f906f3f50e4ffb83dbaa2a0d0a0c3f858 +Author: liugang +Date: Thu Jul 12 09:17:50 2018 +0800 + + * Remove defaultChosenOptions. + +commit a072dfe8075630df982ae7bda2bf76e93289feed +Merge: 1476846934 2dc1aa7375 +Author: Catouse +Date: Thu Jul 12 09:10:49 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + # Conflicts: + # module/common/view/chosen.html.php + +commit 147684693444dcd0ec3f79868a68cdbd4c0e98d5 +Author: Catouse +Date: Thu Jul 12 08:50:17 2018 +0800 + + * fix chosen usage. + +commit 2dc1aa7375bd5d013f593549397f0bec3e859a7e +Author: Catouse +Date: Thu Jul 12 08:49:35 2018 +0800 + + * fix chosen usage. + +commit d52c878ba5d56777d3fb5bb2cd7bf62895ec9f0e +Author: chenfeiCF +Date: Wed Jul 11 17:40:42 2018 +0800 + + * Add new version. + +commit 1992a70e9cbeb9baeaaefc2841d03f362cb9fce5 +Author: chenfeiCF +Date: Wed Jul 11 14:58:30 2018 +0800 + + * Adjust for task #4496. + +commit 525c467c72599ef103a47713dc22fa8d8cc601de +Merge: 3f4e16fedb 505932a672 +Author: liugang +Date: Wed Jul 11 14:35:53 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3f4e16fedbd58ca96858be70bf28642384ec4348 +Author: liugang +Date: Wed Jul 11 14:35:10 2018 +0800 + + * Add function to create sub menu by settings in lang files. + +commit 505932a672f13381564be293c2733350801b551d +Author: wangyidong +Date: Wed Jul 11 14:30:51 2018 +0800 + + * fix for session error. + +commit 8925112a6c0a6c7296df9a644871b8ea6b20e851 +Merge: 563b7bfd76 35e424ddfa +Author: wangyidong +Date: Wed Jul 11 14:30:35 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 35e424ddfaaa8a155c16f9b8677197aa7bb7adfe +Author: liugang +Date: Wed Jul 11 14:18:15 2018 +0800 + + * Set privileges for sub menu. + +commit 563b7bfd76626572cc580ac73c3a7240d07c223e +Merge: 0470d557d0 e375a18a05 +Author: wangyidong +Date: Wed Jul 11 14:10:47 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0470d557d061eb2641b10635bc7f38c7e3d94f2c +Author: wangyidong +Date: Wed Jul 11 14:10:20 2018 +0800 + + * adjust for kanban. + +commit e375a18a05ad2b215351dd4770433f82280d202e +Merge: f14c21dd62 70c5556aae +Author: liugang +Date: Wed Jul 11 13:55:34 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f14c21dd62ce3629e1585eb6c5514055943904b7 +Author: liugang +Date: Wed Jul 11 13:52:59 2018 +0800 + + * Finish task #4487, 4507 + +commit 70c5556aaeac11260ce646182d88df37302d7680 +Author: estellbright <1457749147@qq.com> +Date: Wed Jul 11 13:48:06 2018 +0800 + + Fix Bug Delete the Last Plan. + +commit c400f14b79dfd2367a38ace86d2e2009422f61a7 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 11 13:42:09 2018 +0800 + + *Fix bug #2038. + +commit deaf51117f0e8aa653935dfbeb7509a3aea6f7ae +Merge: b7326b28ef 203fd21ff2 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 11 13:30:50 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b7326b28ef72181905f4280e7f942663bb6c2680 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 11 13:30:02 2018 +0800 + + *Fix bug edit project loadPlan. + +commit 203fd21ff2da984f05549430b926ba9db40b86b1 +Author: estellbright <1457749147@qq.com> +Date: Wed Jul 11 10:27:04 2018 +0800 + + Fix Bug #1943,1997,1998,2001,2015. + +commit 3d4f7b86d979792e9fd174c33afe36516c486419 +Author: liugang +Date: Wed Jul 11 10:23:13 2018 +0800 + + * finish task #4487. + +commit 39b0115f550aaff5f88df09fa9cd48309bd85203 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 11 10:21:05 2018 +0800 + + *Fix Bug #4516. + +commit 2ff2e04f5441400034b93038889291c960c4f84d +Merge: 510559dd99 1fff6b7db8 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 11 09:36:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 510559dd994cbfff52830861a946c17d0c05a343 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 11 09:35:24 2018 +0800 + + *Fix bug #4516. *Fix bug #4516. *Fix bug #4516. *Fix bug #4516. *Fix bug #4516. *Fix bug #4516. *Fix bug #4516. *Fix bug #4516. + +commit 1fff6b7db8e19036e2b1d6c3910ec0b6961ad663 +Author: wangyidong +Date: Wed Jul 11 09:27:07 2018 +0800 + + * adjust for bind ranzhi css. + +commit b432ee45982e97aa600589a342ab7b53aa129818 +Merge: f505416eb7 db9eebee67 +Author: liugang +Date: Tue Jul 10 18:20:27 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f505416eb777f242e631fa0425cd94f9b0b57fd8 +Author: liugang +Date: Tue Jul 10 18:20:04 2018 +0800 + + * Adjust sub menu settings. + +commit db9eebee6769e6e8a931a9804a0d345489bad282 +Merge: 86f38aa412 a8f1f63101 +Author: wangyidong +Date: Tue Jul 10 17:36:42 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 86f38aa41262f0030e64e84b57f270538e660e22 +Author: wangyidong +Date: Tue Jul 10 17:36:18 2018 +0800 + + * finish task #4633. + +commit a8f1f63101bc8c7968ee2fca07cd11331bc5426b +Merge: 5b09738c95 0891061e34 +Author: daitingting +Date: Tue Jul 10 17:30:07 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5b09738c950ec9845fbf15dc47f2445b43d33733 +Author: daitingting +Date: Tue Jul 10 17:29:19 2018 +0800 + + * Adjust ajaxmenu style for hidden dropdown menu. + +commit 0891061e34eca67fcb844c130631e4902bbe29f4 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 10 16:15:16 2018 +0800 + + *Finish task #4630. + +commit 6eadda51af63b259397a528913edf7aba8b6b21b +Author: Yagami <976204163@qq.com> +Date: Tue Jul 10 15:59:35 2018 +0800 + + *Finish task #4509. + +commit 06a1e1153225544fd8d982ab093f56ae59d00bae +Merge: f0958e21e2 f2c54d74e9 +Author: daitingting +Date: Tue Jul 10 15:43:38 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f0958e21e25f662f19b7b90b92c2d7a857281b33 +Author: daitingting +Date: Tue Jul 10 15:41:56 2018 +0800 + + * Use can not edit and delete file if he has no rights with file's object, fix bug #1521. + +commit f2c54d74e9185b6d9c19cfbdf5f595f2654d855d +Merge: 0655129d4b d048bfbedc +Author: wangyidong +Date: Tue Jul 10 15:21:52 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0655129d4bb2d2dc5e67663b50625ceec5b24701 +Author: wangyidong +Date: Tue Jul 10 15:19:32 2018 +0800 + + * finish task #4522. + +commit d048bfbedc7ebf30467f27bfe38046ce048fcc23 +Author: daitingting +Date: Tue Jul 10 15:04:00 2018 +0800 + + * Add treeTask and treeStory in group. + +commit cac62ee5ccbb039b139b4c53097c61decefe30bd +Merge: 9387fd1a91 9b31294f29 +Author: daitingting +Date: Tue Jul 10 15:00:46 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9387fd1a91d3ddd0c75b646c33a1c358bf16f5a6 +Author: daitingting +Date: Tue Jul 10 15:00:23 2018 +0800 + + * Adjust codes. + +commit 9b31294f294048b0250f7384eb7ce3958928fb90 +Merge: 80a5334c7a fb397502f4 +Author: liugang +Date: Tue Jul 10 13:34:59 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 80a5334c7afa6c1852281a28a53a12994d2a1f08 +Author: liugang +Date: Tue Jul 10 13:34:32 2018 +0800 + + * Finish task #4485 + +commit fb397502f4360f696a4d4fbc211184e08f737ca5 +Merge: 919cb90d37 c4d6d94d61 +Author: wangyidong +Date: Tue Jul 10 13:23:40 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 919cb90d373ce83464ba71856296b350fa691759 +Author: wangyidong +Date: Tue Jul 10 13:21:57 2018 +0800 + + * finish task #4642. + +commit c4d6d94d6151cd9b9cae277f1c0151165b15afb8 +Merge: 4398a6f814 74fbd3b784 +Author: daitingting +Date: Tue Jul 10 11:24:40 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4398a6f814a3e9f9d9e4dd78d0e2eb42f4332544 +Author: daitingting +Date: Tue Jul 10 11:18:33 2018 +0800 + + * Add link for platform products. + +commit 74fbd3b784c334ac6da51c749c9fae05b15862cf +Author: chenfeiCF +Date: Tue Jul 10 11:17:42 2018 +0800 + + * Finish task #4599. + +commit ea7385a3f1fe8f526e031bdd9419fa613cf0d7f7 +Author: chenfeiCF +Date: Tue Jul 10 11:09:31 2018 +0800 + + * Adjust min.js file. + +commit 659d93948490543dec35c3af7660c2b7f1939e95 +Merge: f35a90fc97 e664bb9d1b +Author: wangyidong +Date: Tue Jul 10 10:35:10 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f35a90fc970c0a0b87f738a91b7f176413acc425 +Author: wangyidong +Date: Tue Jul 10 10:34:12 2018 +0800 + + * adjust for multi task. + +commit e664bb9d1bb3cdc7c0e1a95eca6122aa34cdb9c7 +Merge: 07b21f67e2 5c294a5d0b +Author: Yagami <976204163@qq.com> +Date: Tue Jul 10 10:16:25 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 07b21f67e20019cc166ef67fd714be2ca8f20635 +Author: Yagami <976204163@qq.com> +Date: Tue Jul 10 10:11:50 2018 +0800 + + *Finish task #4504. + +commit 5c294a5d0b899d76522262ff5899e612e28aaa85 +Merge: 231e3ab334 b01dc1aa72 +Author: daitingting +Date: Tue Jul 10 10:08:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 231e3ab33476d21e7a7dff26a365b0161af958bf +Author: daitingting +Date: Tue Jul 10 10:07:37 2018 +0800 + + * Hidden project when flow is onlyTest. + +commit b01dc1aa7245855dbe3d58eac48e2fbead9850fc +Author: chenfeiCF +Date: Tue Jul 10 09:07:58 2018 +0800 + + * Finish task #4640. + +commit b8ccab95d71c7088eb127120e907382cf53479ab +Merge: b9003fd791 ba130809f1 +Author: wangyidong +Date: Tue Jul 10 09:01:59 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b9003fd79119483d59b09db4c61676a828aa10b0 +Author: wangyidong +Date: Tue Jul 10 09:00:50 2018 +0800 + + * adjust for task #4529. + +commit ba130809f1527c71d0c69617b7a4822a9c81fc70 +Author: Catouse +Date: Mon Jul 9 18:53:05 2018 +0800 + + * finish task #4510 and fix bug #1971. + +commit 34827d3921f986f0668030db997b83e576259a74 +Merge: 2ea0c5002f 59149a9f35 +Author: Catouse +Date: Mon Jul 9 18:42:01 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2ea0c5002f14e7e837806751c977dbe7d9aad071 +Author: Catouse +Date: Mon Jul 9 18:41:53 2018 +0800 + + * fix chosen usage. + +commit 59149a9f35d5cf9306f3264f81077326f8e97d36 +Merge: 3292637fc9 9a3ce4325f +Author: liugang +Date: Mon Jul 9 17:39:52 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9a3ce4325f6ab4443bf876005f58ee84341fe6f8 +Merge: de5866a8cd 4598117de4 +Author: daitingting +Date: Mon Jul 9 17:32:28 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit de5866a8cdfeb7d6d3b0d055e62242a8742f58e3 +Author: daitingting +Date: Mon Jul 9 17:32:15 2018 +0800 + + * Adjust codes. + +commit 4598117de4f210cae5586fd1d29dd81b1b2bb991 +Merge: eddd9caf61 f3bebb9b84 +Author: Catouse +Date: Mon Jul 9 17:30:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit eddd9caf619fb1d1d263d7ec6ffc6243278fad7c +Author: Catouse +Date: Mon Jul 9 17:30:02 2018 +0800 + + * finish task #4501 and fix bug #1980. + +commit f3bebb9b84a74d323925215ef8b8215050a70181 +Merge: 4ee9e455ea 45b449e475 +Author: chenfeiCF +Date: Mon Jul 9 17:17:14 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4ee9e455ea49fbaaff477ef058d2c8096d0de6cc +Author: chenfeiCF +Date: Mon Jul 9 17:16:51 2018 +0800 + + * Code for task 4640. + +commit 67cc92c81287933d54d1efd0c2f4ea3d3e949e05 +Author: chenfeiCF +Date: Mon Jul 9 17:16:24 2018 +0800 + + * Finish task #4544. + +commit 45b449e47503aaa8f35d32e0894a178a7fbe46cb +Merge: bb0fada456 03f4199ba9 +Author: daitingting +Date: Mon Jul 9 16:54:43 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 03f4199ba941fea60ffbc81732897edb0a35a338 +Merge: b340c649b7 2356ccc125 +Author: Catouse +Date: Mon Jul 9 16:52:29 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b340c649b79233678225809e908b96fa1087c7aa +Author: Catouse +Date: Mon Jul 9 16:52:23 2018 +0800 + + * fix div close tag. + +commit fd01e9076e817398e31efc30caad5cafd693cb37 +Author: Catouse +Date: Mon Jul 9 16:51:51 2018 +0800 + + * remove extra divider in mainActions toolbar. + +commit bb0fada456c3781bc2c22588ebfd48171313fb4b +Merge: c40bfab493 2356ccc125 +Author: daitingting +Date: Mon Jul 9 16:51:20 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c40bfab4936a9507f962273b11132220a4f30ec0 +Author: daitingting +Date: Mon Jul 9 16:48:29 2018 +0800 + + * If the member is not the last, can not finish task, fix bug #1939. + +commit 3292637fc973b15e21ca89bf1bdf37f19dad3822 +Author: liugang +Date: Mon Jul 9 16:31:59 2018 +0800 + + * Finish task #4562 + +commit 2356ccc1257714c134183032f05c6f0e0d862cf9 +Merge: abc7375b2e 5df4cbd69f +Author: wangyidong +Date: Mon Jul 9 16:22:48 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit abc7375b2e4cddd2decfea61fabaf69ddd84bc42 +Author: wangyidong +Date: Mon Jul 9 16:22:09 2018 +0800 + + * finish task #4596. + +commit 5df4cbd69f43624b4e3f88f267591daa4d3d6a9d +Merge: a03c5b953e 0b0146cfb5 +Author: daitingting +Date: Mon Jul 9 16:02:40 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a03c5b953e02ae187921b0fef6e33d841c596780 +Author: daitingting +Date: Mon Jul 9 16:01:07 2018 +0800 + + * Finish task #4621. + +commit 33c87555354511064a115251a2d119679315691d +Merge: 0385ee441d 0b0146cfb5 +Author: Catouse +Date: Mon Jul 9 15:36:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0385ee441d92d5e51dc89182015e9458be4e3fdd +Author: Catouse +Date: Mon Jul 9 15:36:03 2018 +0800 + + * update zui js file. + +commit 07dcbac2fef87272dbf1d9c651393c40001c6b78 +Author: Catouse +Date: Mon Jul 9 15:35:56 2018 +0800 + + * add title attributes. + +commit 0b0146cfb59995f9555cee41c87885ecf7ac1436 +Merge: efa539736c 765942f3c4 +Author: dajiao007 +Date: Mon Jul 9 15:01:16 2018 +0800 + + Merge branch 'master' of http://github.com/easysoft/zentaopms + +commit 765942f3c40e4c42bac75c1105de7f7c384a2a4e +Merge: e9edde159c ffd355d0a3 +Author: daitingting +Date: Mon Jul 9 14:57:15 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e9edde159c144ce3748c3ad8132dc9a921190409 +Author: daitingting +Date: Mon Jul 9 14:56:28 2018 +0800 + + * Fix bug for finish multiple task, fix bug #1872. + +commit efa539736c16696e3ea6a9387b5c75fd61f42d2b +Author: dajiao007 +Date: Mon Jul 9 14:48:38 2018 +0800 + + * modify column width of English version + +commit ffd355d0a360edb92c2796873e86d517e24ca780 +Author: chenfeiCF +Date: Mon Jul 9 14:42:04 2018 +0800 + + * Finish task #4502. + +commit a9d3db45b0029e5a0b6c8809e04d5979f9e811bf +Merge: ca36d3f5ec 1b48715818 +Author: dajiao007 +Date: Mon Jul 9 14:37:37 2018 +0800 + + Merge branch 'master' of http://github.com/easysoft/zentaopms + +commit ca36d3f5ec97f0d3da93033097f26bc95910175a +Author: dajiao007 +Date: Mon Jul 9 14:37:25 2018 +0800 + + * modift English + +commit 1b487158181f49c42a73112197f4e222f8eee571 +Merge: 890dff6dff 8e33b05bb5 +Author: Catouse +Date: Mon Jul 9 14:33:31 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 890dff6dff0ef49c2f872d147367c80d38625bc6 +Author: Catouse +Date: Mon Jul 9 14:33:24 2018 +0800 + + * update zui files. + +commit 8e33b05bb58f462818deb1a4fc76ae2ed1eb4542 +Merge: a53031cfdc 7cacff34b0 +Author: wangyidong +Date: Mon Jul 9 14:26:02 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a53031cfdc18dda36f1d39aad8669b1ead4bd932 +Author: wangyidong +Date: Mon Jul 9 14:25:10 2018 +0800 + + * adjust for cleanINT. + +commit 7cacff34b082ae23697ff78ebf0f99d6fa493f16 +Author: Catouse +Date: Mon Jul 9 14:11:14 2018 +0800 + + * add new line to the end of file. + +commit b430451d0b4ab922f4f287cd0a54ab653cba1256 +Merge: 5fb638f886 cd12e90d46 +Author: Catouse +Date: Mon Jul 9 14:09:06 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5fb638f886f250af6f2fe9ded09c4e022de09f9e +Author: Catouse +Date: Mon Jul 9 14:08:58 2018 +0800 + + * remove responsive wrapper element from todo/batchedit and todo/batchcreate view. + +commit 7d7bb1939de6f6dc6a715613abe124355f090a76 +Author: Catouse +Date: Mon Jul 9 14:08:28 2018 +0800 + + * update zui js file. + +commit 15ed6c64eb8498313a9805e3f8f3d2eec38d896a +Author: Catouse +Date: Mon Jul 9 14:08:20 2018 +0800 + + * fix size of table columns in todo/batchcreate and todo/batchedit view. + +commit cd12e90d46a3ac26eb9a743b9d5f20e2d6721964 +Author: chenfeiCF +Date: Mon Jul 9 14:04:42 2018 +0800 + + * Adjust bug and case module for task #4638. + +commit b6ea3b5c534643e092dc17c12d2f17e61a0a9521 +Merge: 4bd218b9a4 dccf32171b +Author: wangyidong +Date: Mon Jul 9 13:55:51 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4bd218b9a423ef64e73c81690d9cb1f773acf4e6 +Author: wangyidong +Date: Mon Jul 9 13:55:11 2018 +0800 + + * finish task #4589. + +commit 22e7e790c4984ab590397246a29d12c03f2ebd25 +Author: Catouse +Date: Mon Jul 9 13:53:19 2018 +0800 + + * change language text format. + +commit 599cfd718378ad342f48e0997d8656cb361c02c0 +Author: Catouse +Date: Mon Jul 9 13:46:44 2018 +0800 + + * refactor code. modalTrigger usage @see http://zui.sexy/#javascript/modaltrigger. + +commit dccf32171b4b6e423d5ce94655361caf69664e38 +Author: Catouse +Date: Mon Jul 9 13:33:25 2018 +0800 + + * fix $versionName not defined error. + +commit 978549884d6ea9043e934e168801986ee301bc2a +Merge: 97d0357070 8b018e63f6 +Author: Catouse +Date: Mon Jul 9 13:28:51 2018 +0800 + + Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms + +commit 97d0357070242d3b90ecd52b446a3b8ebb7d29ae +Author: Catouse +Date: Mon Jul 9 13:28:44 2018 +0800 + + * finish task #4556. + +commit 7cb180b540c23c1e586a447a26b219463d43722c +Author: Catouse +Date: Mon Jul 9 13:28:29 2018 +0800 + + * make table in group/view sortalbe. + +commit 8b018e63f666fbdf1cdb6d551b053217b849f286 +Merge: 2ec456f319 9aa26a2573 +Author: liugang +Date: Mon Jul 9 11:15:35 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2ec456f319b1157f1b12663b90a5426c57d4658c +Merge: c0e5909247 f6c5cf3689 +Author: liugang +Date: Mon Jul 9 11:15:11 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c0e59092478008b96d361aa9e60de3db0acc7125 +Author: liugang +Date: Mon Jul 9 11:15:03 2018 +0800 + + * Fix bug. + +commit 9aa26a257300a0124eeee7b3c5917e0bc449057e +Merge: 9255162665 f6c5cf3689 +Author: Catouse +Date: Mon Jul 9 11:14:11 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9255162665aa9d7d7054baca304fc1e86e4acc3c +Author: Catouse +Date: Mon Jul 9 11:14:05 2018 +0800 + + * fix table width in story/linkstory view. + +commit e41051e78fb01463fd9c71f16b4dec913e5f6daf +Author: Catouse +Date: Mon Jul 9 11:13:41 2018 +0800 + + * update zui files. + +commit 15335941e7ad63d4bbd41b561db942d12aa0acd7 +Author: Catouse +Date: Mon Jul 9 11:13:28 2018 +0800 + + * update themes. + +commit f6c5cf3689c72e6413ad809b490c9b857336a626 +Author: chenfeiCF +Date: Mon Jul 9 10:44:00 2018 +0800 + + * Finish task #4638. + +commit c8ce5e64c9a80182958be4d627e382a33a52caa3 +Merge: 01e06b7a89 9552cc6fd3 +Author: chenfeiCF +Date: Mon Jul 9 10:43:19 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit abc1c419282711cd6141709df927b78f670ae3ca +Merge: 3190c876d0 9552cc6fd3 +Author: Catouse +Date: Mon Jul 9 10:23:03 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9552cc6fd34240ecfa866eeca76e406cf61b84ea +Merge: 370cdfad9d f0e022127d +Author: liugang +Date: Mon Jul 9 10:08:15 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 370cdfad9dfe9d96d77561da1cb3d676cccce450 +Author: liugang +Date: Mon Jul 9 10:07:52 2018 +0800 + + * Finish task #4634 + +commit f0e022127d48d9235fe8654ff268792d3a03af17 +Merge: 6d2d35bff0 159597411c +Author: daitingting +Date: Mon Jul 9 09:56:55 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6d2d35bff0fe16e3931a668aa02ef54025292ce7 +Author: daitingting +Date: Mon Jul 9 09:56:07 2018 +0800 + + * Adjust status when the old status is done. + +commit 3190c876d09159de2f9e487d1200aa8b0f5b1251 +Merge: 2d2df9c013 83d7855fb9 +Author: Catouse +Date: Mon Jul 9 09:54:54 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2d2df9c0130b13127c782339bcd86cb25d936ac2 +Author: Catouse +Date: Mon Jul 9 09:54:46 2018 +0800 + + * improve UI of block views for placement in small column. + +commit 1cbbb130d8d524e666480aa1939acedc6506dd54 +Author: Catouse +Date: Mon Jul 9 09:54:18 2018 +0800 + + * update zui. + +commit 159597411cc21de61ab054c92e3a38004846b96d +Merge: 45df604068 83d7855fb9 +Author: dajiao007 +Date: Mon Jul 9 09:49:30 2018 +0800 + + Merge branch 'master' of http://github.com/easysoft/zentaopms + +commit 83d7855fb9c392a6b26cb42d719a08633ac31883 +Merge: 8da87c9dcf 29371f8b70 +Author: wangyidong +Date: Mon Jul 9 09:49:10 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8da87c9dcf8aa281efaf53b9f0d713c5cdbf68a0 +Author: wangyidong +Date: Mon Jul 9 09:48:35 2018 +0800 + + * finish task #4641. + +commit 45df604068925eb8294c56a32a89c2969beb4475 +Author: dajiao007 +Date: Mon Jul 9 09:45:33 2018 +0800 + + * modify english labels + +commit cb13c64e9c3dfa83997b5a3109659e30ddfa86a1 +Author: dajiao007 +Date: Mon Jul 9 09:39:49 2018 +0800 + + * modify english labels + +commit 9ed3cdd5f898551530cad5919fd466c75486b900 +Author: Catouse +Date: Mon Jul 9 09:24:34 2018 +0800 + + * improve UI of dashboard. + +commit 01e06b7a89d71579dfa95cb37371c2df0891c46b +Merge: 0fa4796de9 29371f8b70 +Author: chenfeiCF +Date: Mon Jul 9 08:53:39 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 29371f8b7031547585cc29abe8aa3d8b8c86e33c +Merge: 0817ec73cc 5eb55fe399 +Author: daitingting +Date: Thu Jul 5 17:55:49 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0817ec73cce031cadbd84fcda874b6380e233c02 +Author: daitingting +Date: Thu Jul 5 17:55:30 2018 +0800 + + * Optimize text. + +commit 5eb55fe399e5fc82827255c13f41df919151a352 +Merge: c527d0b64b f9592f477d +Author: wangyidong +Date: Thu Jul 5 17:06:48 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c527d0b64b4a3126a8bad9c1c04c8e4089dd2c10 +Merge: 357a0a14de 0ff9dc27d4 +Author: wangyidong +Date: Thu Jul 5 17:06:16 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 357a0a14de77fb0a9f502d55da6aab0950e05884 +Author: wangyidong +Date: Thu Jul 5 17:05:12 2018 +0800 + + * finish task #4603. + +commit f9592f477da3ded263b6ce6b9d3b4effa6762496 +Author: Yagami <976204163@qq.com> +Date: Thu Jul 5 17:04:52 2018 +0800 + + * Finish task #4565. + +commit 0ff9dc27d445138f807b776f0b04b92b4ecd3371 +Merge: 3bd73f1111 c85e1f6fe6 +Author: daitingting +Date: Thu Jul 5 16:23:35 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3bd73f1111696bb8f450642bfcb710ad1cd55893 +Author: daitingting +Date: Thu Jul 5 16:23:20 2018 +0800 + + * Adjust codes. + +commit c85e1f6fe6b8f076bf827bb5207125e89f1796f4 +Merge: 48688a7be8 e612d79e04 +Author: wangyidong +Date: Thu Jul 5 15:45:14 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 48688a7be8564ae74b2ae0461976b84af43e011d +Author: wangyidong +Date: Thu Jul 5 15:44:45 2018 +0800 + + * adjust for sql error. + +commit e612d79e0449be1ded2a8624cae72a30252063c4 +Merge: 5d4b235a62 bac2527f2a +Author: daitingting +Date: Thu Jul 5 15:39:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5d4b235a62005f12483736d0b4abe8626c806ea2 +Author: daitingting +Date: Thu Jul 5 15:37:42 2018 +0800 + + * Compute begin and end for parent task by his children, finish task #4627. + +commit bac2527f2aedcc964b1836325ba717c552281ba9 +Merge: c3c9305775 167c2f196e +Author: wangyidong +Date: Thu Jul 5 15:03:18 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c3c9305775d9863cf194d9ddcf2de14cc7a45553 +Author: wangyidong +Date: Thu Jul 5 14:58:46 2018 +0800 + + * finish task #4556. + +commit 167c2f196e21106b09beec506336e15dfa673dda +Merge: fed443460d 29de85a69a +Author: liugang +Date: Thu Jul 5 14:26:35 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fed443460d1695d0b0412db9818e4074ce288623 +Author: liugang +Date: Thu Jul 5 14:26:18 2018 +0800 + + * Finish task #4628. + +commit 29de85a69ad4f9acb5e37a54e5a42f3333297163 +Merge: 7565708ccd 7c710b4424 +Author: Catouse +Date: Thu Jul 5 14:20:07 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7565708ccd1c067f07e17ab0dd9afa0dbd1f84a8 +Author: Catouse +Date: Thu Jul 5 14:19:56 2018 +0800 + + * adjust style of block views. + +commit a373f375c8babf42d3c6580681d777469fe46b4e +Author: Catouse +Date: Thu Jul 5 14:19:41 2018 +0800 + + * apply zui scrollbar style. + +commit 226c1f1a3a264d6b811c7ad1135be756e63ddbd6 +Author: Catouse +Date: Thu Jul 5 14:12:28 2018 +0800 + + * add fade effection to dashboard element. + +commit 47085c06ebcf0a057e7b3cf23827dc412caf5437 +Author: Catouse +Date: Thu Jul 5 14:11:51 2018 +0800 + + * fix style and .panel-move-handler element not remove when refresh it. + +commit 7c710b4424425120fd81a945ecf57aac8d4dc7e7 +Merge: 330d108f57 c22a2127d7 +Author: liugang +Date: Thu Jul 5 13:56:54 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 330d108f570bed292ca65105af3454d36a95dfbd +Author: liugang +Date: Thu Jul 5 13:56:37 2018 +0800 + + * Finish task #4637. + +commit 0fa4796de98b8eebb9802736632917e9e8be4118 +Author: chenfeiCF +Date: Thu Jul 5 13:54:18 2018 +0800 + + * Finish task #4512. + +commit c22a2127d72e6516da85fbf6af6fcbdb60c1ec5d +Author: Catouse +Date: Thu Jul 5 13:49:50 2018 +0800 + + * change line-height of .article-content. + +commit 1927697271d1dee6a4516563249456973c2d79d2 +Merge: fb093f7f95 634ab84121 +Author: Catouse +Date: Thu Jul 5 13:39:40 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fb093f7f95ec18fbdf97c9df4d06b572d2bba285 +Author: Catouse +Date: Thu Jul 5 13:39:33 2018 +0800 + + * fix modal header style and add title attribute. + +commit 634ab841217b861e4e05c52880a15b1041c0a872 +Merge: 3768276196 a07cd2c312 +Author: Yagami <976204163@qq.com> +Date: Thu Jul 5 13:38:24 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 812c4e98fb7bb8afc390a1fed087ef06c1bea977 +Merge: 6e71477c5c 4f0d8e7409 +Author: daitingting +Date: Thu Jul 5 13:36:23 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6e71477c5c7271b770d75de86b5dc1dcdbf85ee0 +Author: daitingting +Date: Thu Jul 5 13:35:09 2018 +0800 + + * Unset todos those finished by me. + +commit 37682761968e80acdecb6d9052c6b172401c0b5b +Author: Yagami <976204163@qq.com> +Date: Thu Jul 5 13:35:08 2018 +0800 + + * Finish task #4557、#4521、#4531. + +commit a07cd2c312f3f97af4366765bf76386e4b951dc0 +Author: chenfeiCF +Date: Thu Jul 5 13:34:19 2018 +0800 + + * Finish task #4540. + +commit 712d9c87d2d5f07e488c7e5ed871bc0112f6b12b +Merge: 5194dbe0c4 812c4e98fb +Author: wangyidong +Date: Thu Jul 5 13:31:23 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4f0d8e7409d5bd57b66435a37c3dee4fd57460ac +Author: chenfeiCF +Date: Thu Jul 5 13:20:14 2018 +0800 + + * Finish task #4508. + +commit 5194dbe0c44be2f8fd5025b4b89f4a21e37bb56d +Merge: a7fd56792b 6f4cb41c38 +Author: wangyidong +Date: Thu Jul 5 13:19:36 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a7fd56792b2e0fb60238ba7777daaccefd8405d7 +Author: wangyidong +Date: Thu Jul 5 13:19:01 2018 +0800 + + * finish task #4633. + +commit 6f4cb41c38fb0c09953a0476bbff4233842d8f22 +Author: liugang +Date: Thu Jul 5 11:01:42 2018 +0800 + + * Finish task #4629 + +commit 31dc5d608f64dbaa6578edd106755ce40a99614f +Merge: 83c91c5a69 45b8b2c60a +Author: liugang +Date: Thu Jul 5 10:59:40 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 83c91c5a69ec45436f603fcc56de79d56c765505 +Author: liugang +Date: Thu Jul 5 10:57:40 2018 +0800 + + * Finish task #4626 + +commit 45b8b2c60a039aa474631b434f7d055710d7749b +Merge: 8742825b1c f46e7b7be5 +Author: Catouse +Date: Thu Jul 5 10:47:37 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8742825b1c1c66996ea13fc46a0426a52decf516 +Author: Catouse +Date: Thu Jul 5 10:47:31 2018 +0800 + + * update zui and themes. + +commit 8cdb6a884587d3002da7a90657db5a937e610bca +Author: Catouse +Date: Thu Jul 5 10:47:18 2018 +0800 + + * change link color in bug edit form. + +commit f46e7b7be5ec9a17958b27038c4e3039169693aa +Author: chenfeiCF +Date: Thu Jul 5 10:45:41 2018 +0800 + + * Finish task #4513. + +commit 7167e00b83e64c9e054f27d7583265459c03ee7f +Author: chenfeiCF +Date: Thu Jul 5 10:43:21 2018 +0800 + + * Finish task #4499. + +commit b611543c820c2c9274444874bf992182495ba7c1 +Author: Catouse +Date: Thu Jul 5 10:38:38 2018 +0800 + + * adjust style of bug/linkbugs view. + +commit f8ffb3957045e33e6e88b8ad3e4f114ac27636bc +Author: Catouse +Date: Thu Jul 5 10:37:25 2018 +0800 + + * move default style to zui. + +commit c6fbc1fe21ce4af257906b2807efbc795758f498 +Author: Catouse +Date: Thu Jul 5 10:36:43 2018 +0800 + + * adjust style of bug/linkbugs view. + +commit e340357faa80641a5e22e48e00c3ba862687c7a8 +Merge: 9b846f5eae 2e213c6eb5 +Author: liugang +Date: Thu Jul 5 10:26:48 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9b846f5eae1d3f25096cd4949ef3549b18daf43b +Author: liugang +Date: Thu Jul 5 10:25:45 2018 +0800 + + * Finish task #4622,4625 + +commit 2e213c6eb504fb0ff7be6daa5456c8786bb07796 +Author: Catouse +Date: Thu Jul 5 10:25:32 2018 +0800 + + * add commas. + +commit 7f28cc1697fdde8cc96b7f0ef7c5fbf5445a1eac +Merge: f1018cde93 6c377aa988 +Author: Catouse +Date: Thu Jul 5 10:24:44 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f1018cde9336baadd1c7efe82cfbe3d37348916a +Author: Catouse +Date: Thu Jul 5 10:24:38 2018 +0800 + + * improve UI of dashboard. + +commit 5baae8f3ff46a4d7cdf697648e2ffa6e54dbb906 +Author: Catouse +Date: Thu Jul 5 10:24:09 2018 +0800 + + * refactor code. + +commit 6c377aa988dc141b718f5a111020f208e598fdec +Merge: 95149dcda1 1c5844728e +Author: wangyidong +Date: Thu Jul 5 10:18:06 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 95149dcda13bf99d2a7299f60ce8f88c7574d7e2 +Author: wangyidong +Date: Thu Jul 5 10:17:24 2018 +0800 + + * delete useless table. + +commit 1c5844728e8ec147290d81ebf97da176e7cb61b1 +Merge: 946185667f 646d9d60ec +Author: liugang +Date: Thu Jul 5 10:09:01 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 946185667f75b035209a3911b98983358a14046c +Author: liugang +Date: Thu Jul 5 10:08:47 2018 +0800 + + * Finish task #4620 + +commit 646d9d60ecbc8bb23a3aa61bd688589b7b1eed09 +Author: wangyidong +Date: Thu Jul 5 10:02:47 2018 +0800 + + * finish task #4636. + +commit a1607501bc926bec6adee387245df16d9d257e36 +Merge: d0cb047b58 698e51134b +Author: liugang +Date: Thu Jul 5 09:33:41 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d0cb047b5809e6222b2ff0dd975b96e464d52a08 +Author: liugang +Date: Thu Jul 5 09:20:34 2018 +0800 + + * Finish task #4617 + +commit 698e51134b84c1d7a976d62dc1540d32a986fbed +Author: Yagami <976204163@qq.com> +Date: Thu Jul 5 08:54:35 2018 +0800 + + * finish task #4631. + +commit fff69a3471da8ea23ce5a4428ebdb5e5c072b879 +Merge: aac2a7eb46 33895b89e4 +Author: Catouse +Date: Wed Jul 4 20:33:21 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 33895b89e4a1b7042573107fe802812b5c23e599 +Merge: b3aaab4f0c a886e98b26 +Author: liugang +Date: Wed Jul 4 18:07:52 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a886e98b261f49b2b8246c942092521b2a83c9c2 +Author: daitingting +Date: Wed Jul 4 17:23:19 2018 +0800 + + * Set word wrap. + +commit 5a79ac1a3d2a3372336757911d561a0ce193b622 +Author: daitingting +Date: Wed Jul 4 17:15:27 2018 +0800 + + * Get group pairs order by id. + +commit b3aaab4f0c32e59d12e54a143253dfd5536298bb +Author: liugang +Date: Wed Jul 4 17:05:53 2018 +0800 + + * Finish task #4598 + +commit aac2a7eb46a3a5c1d15c343f782c2752d6ced16d +Author: Catouse +Date: Wed Jul 4 16:46:06 2018 +0800 + + * fix sortable not work. + +commit 9510ebf17b70e91295fef102e6f93e2821ff9792 +Merge: 327aeba49d 4a85831bea +Author: liugang +Date: Wed Jul 4 16:18:51 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 327aeba49d44148e3583a3249a8a6d8bca293299 +Author: liugang +Date: Wed Jul 4 15:50:28 2018 +0800 + + * Finish task #4591 + +commit d32830d49e7a00de2238138f37013034c48ac0f7 +Author: liugang +Date: Wed Jul 4 15:39:16 2018 +0800 + + * Finish task #4560 + +commit 4a85831bea2c0e0a343020472b4cbe3b40829bc9 +Merge: ddea3afd97 19fdb9358c +Author: daitingting +Date: Wed Jul 4 15:21:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ddea3afd97f2b6881e54eece42befd25392b6707 +Author: daitingting +Date: Wed Jul 4 15:20:06 2018 +0800 + + * Set build field word-wrap. + +commit 19fdb9358c6cce7ccb0585388f3ac3bf2b8c6a72 +Author: Yagami <976204163@qq.com> +Date: Wed Jul 4 14:34:47 2018 +0800 + + * finish task #4588. + +commit 08ce7bb83a6e98d6509f15181c5129bf8782511d +Merge: b62a8e7193 de8382dfcf +Author: reneteng +Date: Wed Jul 4 14:28:27 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + * change group, company translation + +commit b62a8e7193d1d05316e49c59123a91ade536df6b +Author: reneteng +Date: Wed Jul 4 14:27:30 2018 +0800 + + * change trans + +commit c4f054234fe066df3c6d629f8fa68cb216f73490 +Author: liugang +Date: Wed Jul 4 14:26:40 2018 +0800 + + * Finish task #4554 + +commit de8382dfcf4fd71017c3f65f0b34d427440c5c68 +Merge: babcaa6d7f b308e39f61 +Author: Your Name +Date: Wed Jul 4 14:14:39 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit babcaa6d7f26e2797d31df81970702825d636f30 +Author: Your Name +Date: Wed Jul 4 14:13:14 2018 +0800 + + * finish task #4516. + +commit be092decc56b0ace08556f47f4b897bc911a7a75 +Author: liugang +Date: Wed Jul 4 14:08:51 2018 +0800 + + * Finish task #4553. + +commit b308e39f6177c051aca1305bfc01f9623f8c99bb +Merge: f7bd51a861 d7a6f61ada +Author: liugang +Date: Wed Jul 4 14:07:12 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f7bd51a86177d83334e141812df529db4544e4b9 +Author: liugang +Date: Wed Jul 4 14:05:59 2018 +0800 + + * Finish task #4549, 4550 + +commit b3ff1c09de30539a4e8a6f1729777d1e48990d59 +Merge: 58bf0c3e56 d7a6f61ada +Author: Your Name +Date: Wed Jul 4 13:59:50 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 58bf0c3e5643f32b4ced3844cfca34c4751fba94 +Author: Your Name +Date: Wed Jul 4 13:58:43 2018 +0800 + + * fix bug. + +commit d7a6f61ada80c9d6d113429ac0cf4288bd684a45 +Merge: a703d045e0 ce9cf8a0c7 +Author: wangyidong +Date: Wed Jul 4 13:28:56 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a703d045e05c881d92a9644da475bc5202ee719d +Author: wangyidong +Date: Wed Jul 4 13:28:23 2018 +0800 + + * finish task #4587. + +commit ce9cf8a0c7d787256967fb55d98475a7d4d27b8d +Author: daitingting +Date: Wed Jul 4 13:28:04 2018 +0800 + + * Add 10.0 upgrade sql. + +commit 9889775cc7a7dab4dcf5c393a69f81d8caa4dd4e +Author: daitingting +Date: Wed Jul 4 13:24:09 2018 +0800 + + * Set assignedTo as closed when close todo. + +commit a596142ec59209f93ea3a50f79fdbad0aebed079 +Author: daitingting +Date: Wed Jul 4 11:08:11 2018 +0800 + + * Remove useless file. + +commit 8a63d0de58419127758653df6557894a6f24b12a +Merge: 31a7f1f9a2 e842c24e65 +Author: daitingting +Date: Wed Jul 4 11:05:33 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 31a7f1f9a2482f6beeb496681c1d872802a2763c +Author: daitingting +Date: Wed Jul 4 11:05:01 2018 +0800 + + * Adjust size for ranzhi logo. + +commit e842c24e657279928847ae79600580612a6a5314 +Author: wangyidong +Date: Wed Jul 4 11:01:22 2018 +0800 + + * finish task #4581. + +commit a6e0fce73ebd65d8c70ef795e285203306d0d107 +Author: wangyidong +Date: Wed Jul 4 10:38:12 2018 +0800 + + * finish task #4523. + +commit 19bcb993de9120b13f171b63a6aa829d2f587f19 +Merge: e0529846e3 fbbc51db48 +Author: wangyidong +Date: Wed Jul 4 10:09:13 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e0529846e345aa859363e439d4475cd1741d261c +Author: wangyidong +Date: Wed Jul 4 10:08:49 2018 +0800 + + * finish task #4585. + +commit fbbc51db488b63e1fdffe9a08137dd8e9b03cd23 +Author: chenfeiCF +Date: Wed Jul 4 09:59:54 2018 +0800 + + * Finish task #4543. + +commit ffc34067f89fc93a8174bbe12a79eabe63d59244 +Merge: f055eed1ef cb65bcbc12 +Author: wangyidong +Date: Wed Jul 4 09:48:56 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f055eed1ef8d771364d5f6c5c158af5956df587a +Author: wangyidong +Date: Wed Jul 4 09:48:19 2018 +0800 + + * finish task #4590. + +commit cb65bcbc12f64f4c67528f352ccf84a540b74061 +Author: daitingting +Date: Wed Jul 4 09:22:34 2018 +0800 + + * Set nowrap for modal header. + +commit ee930fb1fc34f6cedaaef2e3ca74ea1770e03dc2 +Merge: bbae037e9f c63664ecaa +Author: wangyidong +Date: Wed Jul 4 09:09:10 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bbae037e9f897fa2ab20ac79328a452502182c30 +Author: wangyidong +Date: Wed Jul 4 09:08:20 2018 +0800 + + * finish task #4529. + +commit c63664ecaa726eebaa055487a362bb24d92394b6 +Merge: d6eb5bedc6 faab8e9937 +Author: Catouse +Date: Tue Jul 3 17:38:20 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d6eb5bedc69b399cd388403adb253dc90b50772d +Author: Catouse +Date: Tue Jul 3 17:38:14 2018 +0800 + + * update zui. + +commit faab8e99373ae5707f92006f2103aeff6f467230 +Merge: 0876825826 12bff7a96d +Author: reneteng +Date: Tue Jul 3 17:14:29 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + *change doc translation + +commit 087682582673bbb2fe34d6fbc57b24cd081a202c +Author: reneteng +Date: Tue Jul 3 17:13:56 2018 +0800 + + *chang doc translation + +commit 12bff7a96dd1e45e4153f6507aad04f5c5ffe5f1 +Merge: 00a69cdbf8 da9f795f05 +Author: liugang +Date: Tue Jul 3 17:03:25 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 00a69cdbf841c54f79d5dc12f81701549b133afa +Author: liugang +Date: Tue Jul 3 17:03:09 2018 +0800 + + * Optimize codes. + +commit da9f795f0532f3dc5842d765628b4b97eae86749 +Merge: 89569635dd 84f2f24059 +Author: Catouse +Date: Tue Jul 3 17:00:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 89569635ddea2d8d788bdc17c9a99ee446107a7b +Author: Catouse +Date: Tue Jul 3 17:00:11 2018 +0800 + + * update zui. + +commit 84f2f240598d5867ae0cc29eb250558bbc94a1f9 +Merge: 491fa4db45 266146bb34 +Author: reneteng +Date: Tue Jul 3 16:54:51 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + * change doc + +commit 491fa4db4514bbf508d3d96247244fe35cb8e4dc +Author: reneteng +Date: Tue Jul 3 16:54:05 2018 +0800 + + *change doc trans + +commit 266146bb343c6a472d0a8e4b0a539c333c1b37cb +Author: wangyidong +Date: Tue Jul 3 16:33:35 2018 +0800 + + * finish task #4583. + +commit cfd582726e3eb82d816061c598d8cebd59b6f30c +Merge: ef8ffca2e8 bf4ccf3bbf +Author: wangyidong +Date: Tue Jul 3 16:30:29 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ef8ffca2e82cf31a4d5e1382e316c1059899be13 +Author: wangyidong +Date: Tue Jul 3 16:29:58 2018 +0800 + + * finish task #4574. + +commit bf4ccf3bbf68238f5d5406586d4d97e0f7507ef3 +Merge: 537699060f 441b8cf589 +Author: daitingting +Date: Tue Jul 3 16:27:07 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 537699060f78a82cb2e0721774dbd780aaa69897 +Author: daitingting +Date: Tue Jul 3 16:26:44 2018 +0800 + + * Adjust codes. + +commit 441b8cf58981986ac0d18bd4445a68b3453e6bcc +Author: wangyidong +Date: Tue Jul 3 16:11:45 2018 +0800 + + * finish task #4580. + +commit 1aa90107c8abd654b6650ebc33335892de775f16 +Author: wangyidong +Date: Tue Jul 3 15:10:53 2018 +0800 + + * finish task #4579. + +commit ad4a9c655f0f0493d2680f342e4127e639539fa2 +Merge: ca78637e29 7712dd4eab +Author: wangyidong +Date: Tue Jul 3 15:03:14 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ca78637e29e9284d6b2229942476a96355bd73e8 +Author: wangyidong +Date: Tue Jul 3 15:02:48 2018 +0800 + + * finish task #4568. + +commit 7712dd4eabb35f060ab6ae98c98759a1a2e2e1d4 +Merge: ac36781aa5 783c05a2a2 +Author: daitingting +Date: Tue Jul 3 14:16:41 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ac36781aa52b808bba77b7d7b64649aad5cdff65 +Author: daitingting +Date: Tue Jul 3 14:13:40 2018 +0800 + + * Set the name nowrap. + +commit 783c05a2a2892d772bab7401eb331ac1af549628 +Author: wangyidong +Date: Tue Jul 3 14:04:36 2018 +0800 + + * finish task #4533. + +commit ec4df0842e6b3d8362c05fc17ca7cb005c6645e3 +Merge: f418bb03a9 634d483f97 +Author: wangyidong +Date: Tue Jul 3 13:54:45 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f418bb03a9cfea466382017deaf468dfb9ed0e12 +Author: wangyidong +Date: Tue Jul 3 13:54:22 2018 +0800 + + * finish task #4522. + +commit 634d483f97c9ce8a77c9e85e38510263030afb21 +Merge: 7c3c36c0d7 a593949e12 +Author: daitingting +Date: Tue Jul 3 13:48:27 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7c3c36c0d7c5e350918a7b5695da7006998a6a75 +Author: daitingting +Date: Tue Jul 3 13:47:04 2018 +0800 + + * Adjust computeHours4Multiple function to fix bug #1921. + +commit a593949e124acb499673438b6df6bfbf547070d6 +Merge: f3c4d8fa0f 3c59b7eb6f +Author: wangyidong +Date: Tue Jul 3 10:56:49 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f3c4d8fa0f66127c017eb1a774a8b0aed0d5f9c6 +Author: wangyidong +Date: Tue Jul 3 10:56:28 2018 +0800 + + * finish task #4520. + +commit 3c59b7eb6f6a1bc3db315e6bca92870fe6e4ec6b +Merge: 1dfefe355b 1e1f271eda +Author: daitingting +Date: Tue Jul 3 10:38:52 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1dfefe355bcf69e192c347f8e7d56d37dfdec523 +Author: daitingting +Date: Tue Jul 3 10:35:33 2018 +0800 + + * Only compute the hours of parent task. + * Do not compute the hours of canceled tasks. + +commit 1e1f271eda12b299a7325fefdb0a3289df7c2f8e +Merge: c885f64d2e c7164b95b0 +Author: wangyidong +Date: Tue Jul 3 10:19:06 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c885f64d2e456c4eadd00ffdd2b6f755d02ba71a +Author: wangyidong +Date: Tue Jul 3 10:18:34 2018 +0800 + + * fix for bind ranzhi. + +commit c7164b95b0f8ca8251814c4f7590a269704fda5b +Merge: fd2754f293 7a37f6eaf4 +Author: daitingting +Date: Tue Jul 3 09:41:46 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fd2754f293e2747f8752984dba73f5ed44e82a8e +Author: daitingting +Date: Tue Jul 3 09:41:10 2018 +0800 + + * Remove fixedTableHead for these reports. + +commit 7a37f6eaf4fbdcd89e8bf1cdcfb25271f44a305b +Merge: 5017751ead 2e71b11723 +Author: wangyidong +Date: Tue Jul 3 09:22:11 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5017751ead4338567d0889d4d51cd1ecbdf5337f +Author: wangyidong +Date: Tue Jul 3 09:21:17 2018 +0800 + + * finish task #4518. + +commit 2e71b1172317c4f9725738a01f3c4b9f6ae47f4a +Merge: 0810c5eea0 4d14558376 +Author: liugang +Date: Tue Jul 3 09:02:14 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0810c5eea01d97ed0f69cb197300d6d504abe8ea +Author: liugang +Date: Tue Jul 3 09:01:46 2018 +0800 + + * Display doc libs by list. + +commit a895d97dae6230b22c935ee7001e406056d3e4f2 +Author: liugang +Date: Tue Jul 3 09:00:26 2018 +0800 + + * Change ojbect to object. + +commit 4d145583763290053658563f04b06b20849ee75f +Merge: 6ada063b15 c136414e39 +Author: reneteng +Date: Mon Jul 2 16:36:35 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + * chanage cap + +commit 6ada063b15bfcfef3068bab6449bca8348e1c4a9 +Author: reneteng +Date: Mon Jul 2 16:35:35 2018 +0800 + + *change capitals + +commit c136414e39f98ab460fc19c01ca9d778b16af9d5 +Merge: 2efaf689f5 ec4bfe7c6f +Author: daitingting +Date: Mon Jul 2 16:23:18 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2efaf689f57e63aa5d70fcd03852f5185623249f +Author: daitingting +Date: Mon Jul 2 16:22:25 2018 +0800 + + * Hidden product or project by different flow. + +commit ec4bfe7c6f899fee466298060af7b362be6a4d87 +Merge: ca62dbdaa6 f0adb5ad13 +Author: wangyidong +Date: Mon Jul 2 15:18:29 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ca62dbdaa6c882dd1bf2a9d95a546c9eda5bfede +Author: wangyidong +Date: Mon Jul 2 15:17:49 2018 +0800 + + * finish task #4514. + +commit f0adb5ad13abc8fc9fd4cdf80398a7f9369f97df +Merge: bd4603ee73 0243e19a03 +Author: daitingting +Date: Mon Jul 2 15:14:14 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0243e19a036d84e0ce4217073975578f78347936 +Author: wangyidong +Date: Mon Jul 2 15:06:11 2018 +0800 + + * adjust for bug-batchcreate page. + +commit bd4603ee73dbbf1bff01cf5dbd7e4191d8c5b3ae +Merge: 2b4a58c118 a582b842e1 +Author: daitingting +Date: Mon Jul 2 15:05:12 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2b4a58c1183a76aab639fbbdec183fa067e48aa7 +Author: daitingting +Date: Mon Jul 2 15:04:53 2018 +0800 + + * Adjust width for product name. + +commit a582b842e1eca05b66c24e9f6868e4d4668e4d4c +Merge: bf99726d14 c9f0751c8a +Author: wangyidong +Date: Mon Jul 2 14:54:10 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bf99726d140ea534833b81896fdbdec322b039b7 +Author: wangyidong +Date: Mon Jul 2 14:53:40 2018 +0800 + + * finish task #4500. + +commit c9f0751c8af0537a60a0305b69987bfd3395d4e1 +Merge: 20943b8585 c2c85790b3 +Author: daitingting +Date: Mon Jul 2 14:46:13 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 20943b8585d55e7c85420094159d16610a64641b +Author: daitingting +Date: Mon Jul 2 14:37:22 2018 +0800 + + * Adjust params for showLink. + +commit c2c85790b3cf23387e1768c383f1c97d5964a282 +Author: chenfeiCF +Date: Mon Jul 2 14:19:26 2018 +0800 + + * Finish task #4608. + +commit 831e54eb3e37bd69ff4f26e468344453ee70d923 +Merge: 4f343e8885 60551c3540 +Author: wangyidong +Date: Mon Jul 2 14:17:00 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4f343e8885a0391e3d3f35ef0233b77f9adec7fa +Author: wangyidong +Date: Mon Jul 2 14:16:38 2018 +0800 + + * finish task #4497. + +commit ef46086f771135f3354519abf3aecd4249ff44c0 +Author: wangyidong +Date: Mon Jul 2 14:16:23 2018 +0800 + + * adjust for bind ranzhi style. + +commit 60551c354047839b8012f93a266459905effd099 +Merge: 7c33439d00 0671483735 +Author: daitingting +Date: Mon Jul 2 14:13:47 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7c33439d001281f6d674c6e6cbdabaee70e13dde +Author: daitingting +Date: Mon Jul 2 14:13:27 2018 +0800 + + * Adjust plan link. + +commit 06714837354ca1b2c33f808b5f3f7591579ff4e7 +Author: chenfeiCF +Date: Mon Jul 2 14:00:07 2018 +0800 + + * Finish task #4615. + +commit ea34c73c9ba4932b55460e64ed6ac4499bc65a0f +Merge: 6892137d99 89002bdd5a +Author: daitingting +Date: Mon Jul 2 13:43:20 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6892137d996b96f248aa245cdbc3e6c3621ae137 +Author: daitingting +Date: Mon Jul 2 13:42:13 2018 +0800 + + * Display menu that can link by bug. + +commit 89002bdd5af9450eecba2612fdc88635f4401cb4 +Merge: a0044b641b 58704d5c48 +Author: reneteng +Date: Mon Jul 2 13:37:27 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + *change for 10.0 + +commit a0044b641bb3bb914898d68915ce3915a0c68c0d +Author: reneteng +Date: Mon Jul 2 13:34:04 2018 +0800 + + *chang for 10.0 + +commit 58704d5c48c8dbcc2fa5c730461934238a8dd672 +Author: chenfeiCF +Date: Mon Jul 2 13:23:57 2018 +0800 + + * Finish task #4616. + +commit c1e7de7815718d6c6a2bb04e0b1c78c7dcd930e2 +Author: 滔哥 +Date: Mon Jul 2 13:13:23 2018 +0800 + + * Fix bug. + +commit 894d50e0ea1b481bb20620be0e004a11d8776684 +Merge: 370cc91228 02b2a38ac2 +Author: liugang +Date: Mon Jul 2 10:51:09 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 370cc9122841463478e9e3390a054431109c19f1 +Author: liugang +Date: Mon Jul 2 10:50:46 2018 +0800 + + * Finish task #4545. + +commit 02b2a38ac2f8745a1ab7fa4a5e6c088a02cd0e7e +Author: wangyidong +Date: Mon Jul 2 10:39:28 2018 +0800 + + * finish task #4492. + +commit 9e085e4b9b7d27b97df5106170d0c4ed89e768c7 +Author: wangyidong +Date: Mon Jul 2 10:08:14 2018 +0800 + + * finish task #4491. + +commit 79c506aed5488c8ff54eefb02d7bf2b1cd6f39f2 +Merge: 1da62a0412 16a61575ce +Author: wangyidong +Date: Mon Jul 2 09:40:06 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 16a61575ce70777d5f5c6806cd1c648412c00dd0 +Author: liugang +Date: Mon Jul 2 09:38:37 2018 +0800 + + * Finish task #4635. + +commit 9fd944be463898c1bb1c804b5fe16a6c09124695 +Author: chenfeiCF +Date: Sun Jul 1 09:33:14 2018 +0800 + + * Adjust log icon of webhook browse page. + +commit a4ab3d9a5161cd095715204f93857fe46237e361 +Author: daitingting +Date: Thu Jun 28 17:56:56 2018 +0800 + + * Set forceSync as true. + +commit 1da62a04123934fceb3f0084f8a6ee80bb64a53a +Author: wangyidong +Date: Thu Jun 28 17:25:35 2018 +0800 + + * fix for misc-ping in login page. + +commit df5f5ddfa38568d4eaf07226d62640d3a7e2ab18 +Author: daitingting +Date: Thu Jun 28 16:54:38 2018 +0800 + + * Remove useless file. + +commit c58e5c134a4185f0ee8a89bb632982a42fbd8590 +Merge: eced83d13a da1fdabb85 +Author: daitingting +Date: Thu Jun 28 16:27:28 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit eced83d13a8e03ecb648c532af74b390b98edf88 +Author: daitingting +Date: Thu Jun 28 16:25:48 2018 +0800 + + * Adjust $config => $this->config. + +commit da1fdabb850b44ff45b8c78f6f36b4b6338dcdf7 +Author: Catouse +Date: Thu Jun 28 09:49:36 2018 +0800 + + * update classic theme. + +commit f868b5c68f250a6aa91665154d2b41934c5df618 +Author: Catouse +Date: Wed Jun 27 15:21:00 2018 +0800 + + * fix c-actions size. + +commit c2eb36ec2746caaed6a12c310713a8ea4db75fb5 +Author: Catouse +Date: Wed Jun 27 15:20:39 2018 +0800 + + * update classic themes. + +commit 5254a3d0dfd6a496bb23c89a4eda588b8ec90dd8 +Merge: c6e9887f8d 9089a57d70 +Author: Catouse +Date: Wed Jun 27 14:45:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c6e9887f8dab1afd9b6b9601c19932075b2e3992 +Author: Catouse +Date: Wed Jun 27 14:44:58 2018 +0800 + + * update zui. + +commit 9089a57d703cb57f95c722f534bcf77b9bf38cf2 +Author: chenfeiCF +Date: Wed Jun 27 13:38:39 2018 +0800 + + * Fix bug #1969. + +commit cdb4b40f13c6d028b89e39157c69f9c8bcab60de +Author: Catouse +Date: Wed Jun 27 10:11:23 2018 +0800 + + * fix error on submit ajaxform. + +commit d483a10408c9dd332e1b86829f266d377a0942f4 (tag: zentaopms_10.0.stable_20180627) +Merge: c23e82b2a0 e8120ff55c +Author: Catouse +Date: Tue Jun 26 17:44:53 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c23e82b2a0d7bdddce2d0b291db38e47efb6cac9 +Author: Catouse +Date: Tue Jun 26 17:44:43 2018 +0800 + + * fix style error. + +commit e8120ff55c0547f23653386ed728e8c3de9fed1b +Author: daitingting +Date: Tue Jun 26 17:42:43 2018 +0800 + + * LoadCustomFromDB when version > 4.3.beta/pro.2.3.beta/biz. + +commit 05156a4e1ddd9c5cad323e6af0d937cbd78044cd +Merge: 44e40eda66 fe278cdf66 +Author: daitingting +Date: Tue Jun 26 15:46:31 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 44e40eda663a6b9608a0dbfff1d6d1af6a9f8ca9 +Author: daitingting +Date: Tue Jun 26 15:46:13 2018 +0800 + + * Adjust version. + +commit fe278cdf6662ac963e4eb7b69ea1273b3b794673 +Merge: b745f2dd7b eeb9e29fe7 +Author: Catouse +Date: Tue Jun 26 15:30:30 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b745f2dd7b6e492f79ea2db1fe1affffb03b8d9c +Author: Catouse +Date: Tue Jun 26 15:30:18 2018 +0800 + + * change style of roadmap. + +commit eeb9e29fe742bf3727c36648e4e2b50fd5eb6b67 +Merge: 73ff01c889 de0f38f3f5 +Author: reneteng +Date: Tue Jun 26 15:19:25 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + *delete a + +commit 73ff01c889dee66438d4e5a9e3248a3f77e01165 +Author: reneteng +Date: Tue Jun 26 15:18:51 2018 +0800 + + *delete a + +commit de0f38f3f53653ff1dab25fadd36f748ed5a1ae9 +Author: daitingting +Date: Tue Jun 26 15:17:50 2018 +0800 + + * Adjust codes. + +commit e70b5026735693c27f0cf920b7824889f6b5b9cc +Merge: 2046bb4fd9 3199f5fe83 +Author: daitingting +Date: Tue Jun 26 15:09:37 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2046bb4fd970265264ca4b598c9a14739e78407f +Author: daitingting +Date: Tue Jun 26 15:08:53 2018 +0800 + + * Locate to index page when there is no projects. + +commit 3199f5fe831e3780be138043ccc16865eb3e2a76 +Author: liugang +Date: Tue Jun 26 14:44:25 2018 +0800 + + * Change Version. + +commit 2a2d7abebab99c64b2cacf000c3aef95cb88649f +Author: Catouse +Date: Tue Jun 26 14:01:38 2018 +0800 + + * disable custom submenu. + +commit 3f25ea36a827ada8ca0a582973c2f310b4cb0700 +Author: Catouse +Date: Tue Jun 26 13:57:51 2018 +0800 + + * change modaltrigger default option 'backdrop' to 'static'. + +commit b751f82fabdd2b2e74a722941f22c1b2a37959ac +Author: Catouse +Date: Tue Jun 26 12:02:21 2018 +0800 + + * fix datatable UI. + +commit 6e74cc0c2acb4b8c166e421738abda4eb46782f1 +Merge: 0cfeb4f960 ff0f06a68a +Author: Catouse +Date: Tue Jun 26 11:00:46 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0cfeb4f9608c13f12eb4a2f0b47bac3d994d290b +Author: Catouse +Date: Tue Jun 26 11:00:30 2018 +0800 + + * fix datatable in macos safari browser. + +commit ff0f06a68a852a77afee7f06323586fc738de4a2 +Merge: 5e5221ebbc 96f510cfb6 +Author: liugang +Date: Tue Jun 26 10:58:42 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5e5221ebbc05f363d47129bb2a34c624ce5830a1 +Author: liugang +Date: Tue Jun 26 10:58:18 2018 +0800 + + * Optimize codes. + +commit 96f510cfb684373415f37e9e8f964f7f9996b766 +Author: wangyidong +Date: Tue Jun 26 10:50:55 2018 +0800 + + * fix for doc-browse + +commit f61a53e9a3e086693f2067d37a4f84d4dbbf4cc2 +Merge: 593b321557 d3d99f2698 +Author: reneteng +Date: Tue Jun 26 10:02:11 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + * change + +commit 593b321557b62a5d21c45884d51e2408e06fb1ac +Author: reneteng +Date: Tue Jun 26 10:01:13 2018 +0800 + + * change (s) + +commit d3d99f26980e198998786b99b76b6d76d4c1340a +Author: Catouse +Date: Tue Jun 26 09:43:39 2018 +0800 + + * improve datatable style. + +commit a6ee2eb8b5d94c3775a099425cce9e9fd855569e +Author: Catouse +Date: Tue Jun 26 09:38:47 2018 +0800 + + * update claasic themes. + +commit 3ed1c6fa3eac82e902be7a9c5615dd2999d70417 +Author: Catouse +Date: Tue Jun 26 09:16:59 2018 +0800 + + * change icons of product and project document lib. + +commit e45cee8e8dc94a3a33ade7c67b7b5d51196e128e +Author: Catouse +Date: Mon Jun 25 17:45:27 2018 +0800 + + * make bug severity sortable. + +commit c7fdbddfc074ddd7ddf539b1d3b5f108ab13ec7b +Author: Catouse +Date: Mon Jun 25 17:34:51 2018 +0800 + + * fix UI for show/hidden submenu item. + +commit b4d7c681b3de9cc05a909e295f4aada8eb22bb35 +Merge: ec659f9499 4ad5f8606d +Author: liugang +Date: Mon Jun 25 17:07:18 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ec659f9499518c297cb472bdaefe46ba30005cc0 +Author: liugang +Date: Mon Jun 25 17:06:53 2018 +0800 + + * Add submenu. + +commit 4ad5f8606d273296bc02d10e2792d12327a9c34d +Author: Catouse +Date: Mon Jun 25 16:06:15 2018 +0800 + + * update icons. + +commit d2c9a228d9b85cf0d9f37129ca6257652a93447a +Author: Catouse +Date: Mon Jun 25 15:31:38 2018 +0800 + + * hide empty dropdown-menu. + +commit 0feedd4e28a8d02c22a10a2df09211350101d855 +Merge: d54177e634 3b505042a8 +Author: Catouse +Date: Mon Jun 25 14:58:06 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d54177e63401d1608bfaacf35c019fe8eec584b3 +Author: Catouse +Date: Mon Jun 25 14:57:56 2018 +0800 + + * support hide/show item in dropdown menu, task #4487. + +commit 3b505042a83fc4a08dd5ace277eee84172d5b7d9 +Author: liugang +Date: Mon Jun 25 14:38:05 2018 +0800 + + * Change version to 10.0.stable. + +commit fc5e771628b34de868be298f43ce22e18556f852 +Author: liugang +Date: Mon Jun 25 14:18:48 2018 +0800 + + * Fix bugs. + +commit f9dadb53080d7a44b66d76c10d4d1ba2faf05f25 +Merge: 53b86db1ce a4d0bb2d60 +Author: liugang +Date: Mon Jun 25 13:44:13 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 53b86db1ce9db67165bd71511b10653dce58b180 +Author: liugang +Date: Mon Jun 25 13:42:41 2018 +0800 + + * Remove class mw-1400px. + +commit a4d0bb2d60b52a83a524fa8a16e605c23bbd8318 +Author: Catouse +Date: Mon Jun 25 13:25:47 2018 +0800 + + * add tip content to block without content. + +commit 1a0cd36e0d83909f36ff05601ea411e7cf58da82 +Merge: 0e0374c414 4eb7fa395a +Author: Catouse +Date: Mon Jun 25 11:38:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0e0374c414de31764199abe3b75163b6d05f78ae +Author: Catouse +Date: Mon Jun 25 11:38:12 2018 +0800 + + * refactor datatable style. + +commit 4eb7fa395a6487573ea473c04287da36b5decafc +Author: liugang +Date: Mon Jun 25 11:25:32 2018 +0800 + + * Finish task #4475 + +commit e14b3753e3f4231fa4a693016f8e5ea436323d4d +Author: Catouse +Date: Mon Jun 25 10:52:29 2018 +0800 + + * improve UI of assigntome block. + +commit d55ad46c6a47c005059d87328f61ec2c50af08b2 +Author: Catouse +Date: Mon Jun 25 10:51:35 2018 +0800 + + * change color of datetimepikcer panel. + +commit 56abed5252990488b0bae06f39dd1f84c6aae195 +Author: Catouse +Date: Mon Jun 25 10:33:21 2018 +0800 + + * fix table header in assigntome block. + +commit de5854c184c7799b7d1b19717509df320d5e3920 +Author: 滔哥 +Date: Mon Jun 25 10:31:19 2018 +0800 + + * Fix bug#1928. + +commit acab920f414ba7b0d3628d8ae5778fc7f2b3e46d +Author: daitingting +Date: Mon Jun 25 10:27:43 2018 +0800 + + * Add all params for dept managers. + +commit ee3c030f802ea30785fc5a6dbc72f2a9ac3fa92a +Merge: 1b669c7d7e 33d3b9ef32 +Author: daitingting +Date: Mon Jun 25 09:58:21 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1b669c7d7e3382dc900f945a89b091706e85abe8 +Author: daitingting +Date: Mon Jun 25 09:57:25 2018 +0800 + + * If feedbackView is true, hide side-col. + +commit 33d3b9ef32c12d44096e421e55a601b850003b29 +Author: Catouse +Date: Mon Jun 25 09:55:39 2018 +0800 + + * fix table style in block. + +commit a843aac2bd0a885ada15d10e627d6b7163bac2c8 +Merge: 127d3acb49 33214ebde8 +Author: Catouse +Date: Mon Jun 25 09:17:32 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 127d3acb49802612a1b47da81fbeeeba4aaa9bb1 +Author: Catouse +Date: Mon Jun 25 09:17:07 2018 +0800 + + * update zui and fix bug #1928. + +commit 33214ebde8239b1af69c6b0985fe1c31e3440f6a +Author: 滔哥 +Date: Sun Jun 24 21:13:08 2018 +0800 + + * Fix bug#1928. + +commit 9995fdec6ca4b530dc85824eee924c6156189f80 +Author: Catouse +Date: Sat Jun 23 20:02:57 2018 +0800 + + * support show some data view with datatable. + +commit a06498fd5274ed5be983df7226165de60abde389 +Author: Catouse +Date: Sat Jun 23 16:58:49 2018 +0800 + + * improve dashboard UI. + +commit 5d1472e187f997fdf4d5806b1dfc522ddd150364 +Author: Catouse +Date: Sat Jun 23 16:56:12 2018 +0800 + + * update classic theme. + +commit 47d6799e810f29d3dcc99fdc5be8d4da80a48f8f +Author: Catouse +Date: Sat Jun 23 16:23:16 2018 +0800 + + * remove support ie8. + +commit 8faed8221c5b40ee118a1f581523e3cda2a0c334 +Author: Catouse +Date: Sat Jun 23 16:23:05 2018 +0800 + + * remove duplicate chart code, the code is in zui. + +commit 31fb97cb7495e174595177e2872284c759ca0893 +Author: Catouse +Date: Sat Jun 23 16:19:03 2018 +0800 + + + add datatable files. + +commit ba1c784510fd6c7f655767cff95308080f304938 +Author: Catouse +Date: Sat Jun 23 16:04:06 2018 +0800 + + * refactor codes. + +commit 15698c1fb809dbd74026a3773ddbd80b9addc334 +Author: Catouse +Date: Sat Jun 23 15:16:36 2018 +0800 + + * refactor codes. + +commit f6d2818177b00e5b34e666040dda39de253c8e0e +Author: Catouse +Date: Sat Jun 23 15:11:50 2018 +0800 + + * finish backyard bug #1358,https://backyard.cnezsoft.com/pms/bug-view-1358.html + +commit 562a754b2413c77d8cc1eebaee0a80a8f3d6c99a +Author: Catouse +Date: Sat Jun 23 14:32:06 2018 +0800 + + * fix select style for firefox in mac. + +commit c4316f104e23081b7535ba49c88197fbd84e5ac1 +Author: Catouse +Date: Sat Jun 23 14:27:25 2018 +0800 + + * fix burn interval selectbox size. + +commit c4e8472de951072865f40c0dcc01b2d9131b6a37 +Author: Catouse +Date: Sat Jun 23 14:17:58 2018 +0800 + + * fix style of search list and chosen and finish task #4484. + +commit 4d1fda964d79c64988370a25fe2c37bf9b8f904a +Merge: 9236fe025e d64f5ffc36 +Author: liugang +Date: Fri Jun 22 18:00:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9236fe025e41c413fe9a6d68c080ff9db1ed38b6 +Author: liugang +Date: Fri Jun 22 17:59:53 2018 +0800 + + * Fix bug of qa statistic block. + +commit d64f5ffc36aba5092757367c44d0f3defa40533b +Merge: 6c32a3b893 58cc58f95c +Author: 滔哥 +Date: Fri Jun 22 16:31:28 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6c32a3b893ce37804fad805e7cb668dccd402c35 +Author: 滔哥 +Date: Fri Jun 22 16:31:22 2018 +0800 + + * Fix bug. + +commit 58cc58f95c5dfed2a9d544777ea536372840f26b +Merge: 02a5b86697 e8c36a2e4f +Author: wangyidong +Date: Fri Jun 22 16:21:09 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 02a5b8669792df96e471c6f6d88d23a5c125a87c +Author: wangyidong +Date: Fri Jun 22 16:20:37 2018 +0800 + + * adjust for ux. + +commit e8c36a2e4f71e173981c04b271a76662c877ed3f +Merge: 6ecf228be4 310d3db0dc +Author: Catouse +Date: Fri Jun 22 16:01:35 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6ecf228be4f424148432d3c42d33e3c238d465f1 +Author: Catouse +Date: Fri Jun 22 16:01:27 2018 +0800 + + * update zui file. + +commit 310d3db0dccc4cbf65b39b06006bcf6fe02cfb3e +Merge: 9c45581e05 37b2364a9c +Author: 滔哥 +Date: Fri Jun 22 15:49:38 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 37b2364a9cc7b4dcc176f8b6dbda54854f6365e8 +Author: liugang +Date: Fri Jun 22 15:46:50 2018 +0800 + + * Adjust codes. + +commit 6c1fd5634e0cd23833d777a877ac1dddc6f310ca +Author: liugang +Date: Fri Jun 22 15:39:09 2018 +0800 + + * Fix bug. + +commit 9c45581e054dc429040777e54bd7c0315e20fccf +Author: 滔哥 +Date: Fri Jun 22 15:38:12 2018 +0800 + + * Finish bug#1933. + +commit ac4c646d8404b24790326cb3bcc8a7e1d1e19a39 +Author: 滔哥 +Date: Fri Jun 22 15:22:08 2018 +0800 + + * Finish bug#1937. + +commit 7c9b45ca0cff904abef0e001ce25f30970e487c9 +Author: 滔哥 +Date: Fri Jun 22 15:18:23 2018 +0800 + + * Finish bug#1946,1945. + +commit 93015be6e248ee7db80d5ba69fdec6cc01fd48e7 +Author: 滔哥 +Date: Fri Jun 22 15:13:51 2018 +0800 + + * Finish bug#1946. + +commit 2ffa3ff230af61ea1552fd8ba7ddd0b9f77f8161 +Author: 滔哥 +Date: Fri Jun 22 15:05:10 2018 +0800 + + * Finish bug#1949. + +commit 334f6548ae97b8c031062b743a9e304dcc15191f +Author: liugang +Date: Fri Jun 22 14:35:48 2018 +0800 + + * Finish task #4489 + +commit 3e1a2b565eb3620e19af92e1cdcc994cd825b8fd +Author: liugang +Date: Fri Jun 22 13:15:56 2018 +0800 + + * Finish task #4482 + +commit 01683e7ec4d762c7d270b33f7f34d8a38b19a781 +Author: liugang +Date: Fri Jun 22 11:15:08 2018 +0800 + + * Finish task #4477 + +commit bace586795ab6562a4780bf33d04cc842079dc52 +Merge: 7c5208c61a 1c72b78bf1 +Author: liugang +Date: Fri Jun 22 10:49:53 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7c5208c61a4e42ee6bc52cce66ca89d9fd60a217 +Author: liugang +Date: Fri Jun 22 10:48:22 2018 +0800 + + * Hide tutorial menu if the global flow is not full. + +commit 1c72b78bf1cbde5bd88ed9c7e23a8d008ee75bec +Author: Catouse +Date: Fri Jun 22 09:42:12 2018 +0800 + + * remove css .table td {overflow:hidden;} and fix bug. + +commit cb0fa7c451fe16a7eab86f63142a0e413830f1d4 +Merge: a054614d58 e0986c8883 +Author: liugang +Date: Thu Jun 21 17:39:53 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a054614d586690d77ae8a7c29f53d5eaa9f6b704 +Author: liugang +Date: Thu Jun 21 17:39:31 2018 +0800 + + * Finish task #4488 + +commit e0986c8883edf1cc7b8362660c3b08b26472b6de +Merge: dc7073ac3a 817dcdf23b +Author: daitingting +Date: Thu Jun 21 15:15:26 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dc7073ac3a5b48165456add00daa7cf8472ba1dc +Author: daitingting +Date: Thu Jun 21 15:15:09 2018 +0800 + + * Adjust form to left. + +commit 817dcdf23b50b196cf4a47ac74c6e854e167ed89 +Merge: 21d3d935b8 62862bc6cf +Author: reneteng +Date: Thu Jun 21 15:03:31 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 21d3d935b87759b7f3da5cbf48ddb10f0591a8ee +Merge: aa13ebf9c4 0d6a3975e5 +Author: reneteng +Date: Thu Jun 21 15:02:14 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 62862bc6cf133a7c7402568c164044e32fb7b59d +Author: daitingting +Date: Thu Jun 21 15:01:31 2018 +0800 + + * Adjust form to left. + +commit aa13ebf9c49750cfa9accff26a136f165e323db7 +Author: reneteng +Date: Thu Jun 21 15:01:01 2018 +0800 + + * change translation + +commit 0d6a3975e5cb863e492fad8e8f5450924554eb17 +Author: daitingting +Date: Thu Jun 21 14:52:02 2018 +0800 + + * Adjust form to left. + +commit 78e898258a9ce36a1aa43b073402d8eca1be8470 +Author: daitingting +Date: Thu Jun 21 14:37:28 2018 +0800 + + * Format codes. + +commit b9fb4fae18750e3b005fe4ddc6a61da264729cba +Author: liugang +Date: Thu Jun 21 13:55:27 2018 +0800 + + * Finish task #4479 + +commit baf5dffd7916423e00fbad91cf54682b6c9a07ea +Author: liugang +Date: Thu Jun 21 13:43:20 2018 +0800 + + * Finish task #4480,4490 + +commit 2341927a791ae0ecbdd1b811776bce652bdd5866 +Author: daitingting +Date: Wed Jun 20 14:49:26 2018 +0800 + + * Adjust conflict. + +commit e8aff5c01d23ca8d6c89348ed10e83c5a750d3a3 +Merge: eedf30e0c6 f8cd274e20 +Author: Catouse +Date: Wed Jun 20 14:41:22 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f8cd274e200fe09a88a3da43a1604f92ce51ef91 +Merge: 1b9f99f127 2594c5691c +Author: wangyidong +Date: Wed Jun 20 14:39:19 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit eedf30e0c6821a38be0f0e5bcc55262ccbc9b196 +Merge: b24eb3c2ac 2594c5691c +Author: Catouse +Date: Wed Jun 20 14:36:52 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b24eb3c2acb9625434b2e374166e324a50b2ddbf +Author: Catouse +Date: Wed Jun 20 14:36:00 2018 +0800 + + * update zui file. + +commit 1b9f99f1274b79e0e86d27d55320715308806c30 +Merge: 146c148586 6e25725965 +Author: wangyidong +Date: Wed Jun 20 14:27:16 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2594c5691c09998336d42565a602464676ec3133 +Merge: e0fed55401 6e25725965 +Author: daitingting +Date: Wed Jun 20 14:26:46 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + Conflicts: + module/bug/model.php + module/product/model.php + module/testcase/model.php + module/testsuite/model.php + module/testtask/model.php + +commit 146c14858699eb26f6b87eff3ac41a85b9007d76 +Author: wangyidong +Date: Wed Jun 20 14:26:19 2018 +0800 + + * adjust for setMenu method. + +commit e0fed55401548c78db1973ea5e6aaf43e7e2fcb7 +Author: daitingting +Date: Wed Jun 20 14:24:22 2018 +0800 + + * Adjust modulePageNav for mobile page. + +commit 6e25725965ce1935d9b2ee004157599f82dcfd15 +Merge: 1eb7ed4198 2544b973ca +Author: liugang +Date: Wed Jun 20 14:12:34 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1eb7ed4198daf0cafb21050acbf69ece2588f937 +Author: liugang +Date: Wed Jun 20 14:11:52 2018 +0800 + + * Finish task #4461. + +commit 2544b973ca6819cb0ab227d9a80542f2bffecdf9 +Author: Catouse +Date: Wed Jun 20 13:37:38 2018 +0800 + + * fix paste text lines in batch create form not work. + +commit 59804604f14bc8b1b9a3b9327cf6cdfc30b7a7c0 +Author: Catouse +Date: Wed Jun 20 13:36:34 2018 +0800 + + * fix user login panel width. + +commit 4e1a2513885d8c87cc5af111eb56b29228122687 +Author: Catouse +Date: Wed Jun 20 10:32:26 2018 +0800 + + * change style of custom/ajaxmenu view. + +commit 0f94ffe7c2ed3bbba95312dae770d860f2c64c18 +Author: Catouse +Date: Wed Jun 20 10:24:59 2018 +0800 + + * update zui. + +commit af3e2469d1405b09229b63a5f340524402545913 +Merge: c6952e9a1a 8846edc16b +Author: Catouse +Date: Wed Jun 20 09:22:54 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c6952e9a1a4f02e0d2da95b4e780a75b6265c17c +Author: Catouse +Date: Wed Jun 20 09:22:44 2018 +0800 + + * change style of dashboard block panels. + +commit f9d74dec94a406e4c06c5a12bbbc9644bb331fb1 +Author: Catouse +Date: Wed Jun 20 09:15:42 2018 +0800 + + * change style of custom/ajaxmenu view. + +commit 8846edc16b206428c1d64c77d8e230d8c1839064 +Merge: 08fb94f161 eb29ee0b6f +Author: liugang +Date: Tue Jun 19 18:14:35 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 08fb94f161f9601d052691f120b98af1ca169569 +Author: liugang +Date: Tue Jun 19 18:14:21 2018 +0800 + + * Format codes. + +commit eb29ee0b6ff5cdfaefd43c0e141da8eeb0cc9c17 +Author: Catouse +Date: Tue Jun 19 17:25:10 2018 +0800 + + * make page responsive for small screen. + +commit e89a58a9b773af5e85a91323f18415ef4ebb2c49 +Author: Catouse +Date: Tue Jun 19 17:20:56 2018 +0800 + + * fix UI of block panel drag and drop. + +commit 83c6f5a99a0a5e43d7ff5e502c22dc8b6c1b30a7 +Merge: df3e713276 9cfc03d122 +Author: Catouse +Date: Tue Jun 19 17:04:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit df3e713276ff812c41d99ccd92dcc18d6a109032 +Author: Catouse +Date: Tue Jun 19 17:04:27 2018 +0800 + + * remove fixed container size. + +commit 9cfc03d122d8f7a2bbeb193cdc2c1f57bfa76f34 +Merge: 5b0459d968 e9920819c0 +Author: liugang +Date: Tue Jun 19 16:56:14 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5b0459d96899a19f3a9de0b4ddb67b5ae96b54c2 +Author: liugang +Date: Tue Jun 19 16:55:43 2018 +0800 + + * Custom define menu. + +commit e9920819c0b6ccefec04862910960c3bb4ab5f1c +Author: Catouse +Date: Tue Jun 19 16:44:36 2018 +0800 + + * fix container size in modal. + +commit 85ab286d4baf0234a0670ddc6d82be7318b8b2bb +Author: Catouse +Date: Tue Jun 19 14:31:54 2018 +0800 + + * improve UI for large screens. + +commit e5140604c1dc93552805e5461c97c0f9b8f08958 +Author: Catouse +Date: Tue Jun 19 14:06:55 2018 +0800 + + * improve UI of dashboard. + +commit e8c822f670386cea3e1a54aa4ebdf2caa48a45cc +Merge: d4edf035ae 6506886dc3 +Author: Catouse +Date: Tue Jun 19 13:56:32 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d4edf035aeb92e661481f108bcb00629d514c793 +Author: Catouse +Date: Tue Jun 19 13:56:24 2018 +0800 + + * support custom navbar menu items. + +commit 6506886dc35d370e54a4f8fa6d6e94e728c15f54 +Author: wangyidong +Date: Tue Jun 19 10:59:20 2018 +0800 + + * adjust for ux. + +commit 013bfdcf07625c58ebd6e2b3ee79aea53d831a70 +Author: Catouse +Date: Tue Jun 19 10:54:32 2018 +0800 + + * change UI of user/reset view. + +commit 370fdea0714441d973a16538cf22ad0adc2614c1 +Author: Catouse +Date: Tue Jun 19 10:54:19 2018 +0800 + + * update zui files. + +commit bdf0f98617847ee18e99a9a56291047f11f1c2c7 +Author: Catouse +Date: Tue Jun 19 10:53:59 2018 +0800 + + * change style of blocks. + +commit 069e1cbf4d9e283cdc3deac261b04a28111383b6 +Author: Catouse +Date: Tue Jun 19 10:16:50 2018 +0800 + + * fix fixed table head in dashboard not work after drag and drop panel. + +commit 59456e61f0de916a6bf9e616e92efd0a9dcfe327 +Author: Catouse +Date: Fri Jun 15 18:01:51 2018 +0800 + + * improve UI of dashboard. + +commit 53fc742e646b2b87df8a1ed80a7e5c6339cde228 +Author: Catouse +Date: Fri Jun 15 17:40:55 2018 +0800 + + * improve UI of dashboard. + +commit 99a4facb5b032508e5f26deb69340ef5c4e5f980 +Author: Catouse +Date: Fri Jun 15 14:34:30 2018 +0800 + + * change navbar style. + +commit eae27fa1bac40ba2525676fc2c5768dde748e968 +Merge: ebc3ecbe0f 684a51aede +Author: Catouse +Date: Fri Jun 15 14:16:26 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ebc3ecbe0f44a9b7a54ae6ed3a646322f9f4ab7c +Author: Catouse +Date: Fri Jun 15 14:16:17 2018 +0800 + + * change submit button position of comment modal in todo view. + +commit 684a51aedea0602d769db4f4c2f1443dc5c32123 +Merge: 32f90f5778 5af1da0382 +Author: liugang +Date: Fri Jun 15 14:11:38 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5af1da03829de0f7dac749adf0d8d7b86277ec1f +Author: Catouse +Date: Fri Jun 15 14:11:11 2018 +0800 + + * improve UI for tutorial mode. + +commit 32f90f57787fd8f7b01b49a916392f7576ead3b0 +Author: liugang +Date: Fri Jun 15 14:10:36 2018 +0800 + + * Finish task #4467. + +commit 622d81b3a26ecda6fb78d9b6f9fdead3cff19162 +Author: Catouse +Date: Fri Jun 15 13:54:01 2018 +0800 + + * improve search form UI for small screen. + +commit 1b594402c822a0b835440e484dfe8c80821e2bba +Author: Catouse +Date: Fri Jun 15 13:53:41 2018 +0800 + + * improve UI of project/story view. + +commit 7e770b814987f8edaf3b5b9cc6cd3765437e9897 +Author: Catouse +Date: Fri Jun 15 13:32:44 2018 +0800 + + * update zui. + +commit cd7aca8d5360293faef9cbc35f937d1dfd2974a8 +Author: Catouse +Date: Fri Jun 15 13:32:34 2018 +0800 + + * fix branch property not defined error. + +commit 15d1cd199f45206a4c7faa447292a22a117a1fce +Author: Catouse +Date: Fri Jun 15 13:32:11 2018 +0800 + + * improve UI of tutorial views. + +commit b5ff0d309053c83aee2ab3fbd94e09218969169f +Author: Catouse +Date: Fri Jun 15 11:58:01 2018 +0800 + + * improve kanban UI. + +commit e08f63acd7461b6a96b977e4fa9f5ec13ee88729 +Merge: 842fe76c29 20ff5b5491 +Author: Catouse +Date: Fri Jun 15 10:09:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 842fe76c29c08f2db77f6d53c48f7907073ef17b +Author: Catouse +Date: Fri Jun 15 10:09:11 2018 +0800 + + * add title attribute for table head cell. + +commit 20ff5b5491803eed9e0c34d80d8933861f05ea04 +Merge: 1a4427c0db f94d555ce2 +Author: estellbright <1457749147@qq.com> +Date: Fri Jun 15 09:42:31 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f94d555ce2b964cfe5e00972507cc85f37edd54e +Author: Catouse +Date: Fri Jun 15 09:27:42 2018 +0800 + + * update classic theme. + +commit 9805a21e28b19bf00da8a7eadc3a1a133a175c8b +Author: Catouse +Date: Fri Jun 15 09:21:18 2018 +0800 + + * fix kanban UI. + +commit 1a4427c0db60adfca377e02aa87ec03b75803bbf +Author: estellbright <1457749147@qq.com> +Date: Fri Jun 15 09:03:41 2018 +0800 + + Fix #Task #4464. + +commit 47ea0dd617ba3473b54c60819a4afb17743476d7 +Merge: ea2bcf0df9 bbdc292f8a +Author: Catouse +Date: Fri Jun 15 08:56:22 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ea2bcf0df9fb8f838adf4eb98206ec37d6399fde +Author: Catouse +Date: Fri Jun 15 08:56:14 2018 +0800 + + * finisha task #4445. + +commit 2b90bac67e59c0f31547d81d3a6b45dd10c96c8b +Author: Catouse +Date: Fri Jun 15 08:55:55 2018 +0800 + + * finish task #4453. + +commit bbdc292f8ae0e65a9863141398ac3f8f7403cd63 +Author: liugang +Date: Thu Jun 14 17:36:01 2018 +0800 + + * Finish task #4462. + +commit 6ae6137e600a1de7708bcbf24660834b67e6b515 +Merge: ee64289ade 251d4844cc +Author: Catouse +Date: Thu Jun 14 17:27:47 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ee64289ade181f86b9ad38576e30459f907c3c69 +Author: Catouse +Date: Thu Jun 14 17:27:38 2018 +0800 + + * update zui files. + +commit 251d4844cc07205f2b017ccf6610d132b0dc37e8 +Author: liugang +Date: Thu Jun 14 15:54:14 2018 +0800 + + * Finish task #4473. + +commit 4988ee098583a7108cda909b494b0d0778033f06 +Author: liugang +Date: Thu Jun 14 15:22:15 2018 +0800 + + * Hide useless dynamics and search objetcs in different working type. + +commit 2573f7804607f6966dabb1d6a781dfeb104cb83f +Author: liugang +Date: Thu Jun 14 14:46:25 2018 +0800 + + * Hide product index link if the global flow is not full. + +commit 35bcf01ff5bedbdb761e5222afcbcca6d0ab5713 +Author: liugang +Date: Thu Jun 14 14:34:41 2018 +0800 + + * Replace $this->config with $config in view files. + +commit 3a833a0f7a79dd795b9b5faf2a314cb0630af0a9 +Merge: 90656f49ba d84f6c6250 +Author: liugang +Date: Thu Jun 14 14:32:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 90656f49ba92d3785a0ac0be1fc68482e75a4eca +Author: liugang +Date: Thu Jun 14 14:31:19 2018 +0800 + + * Finish task #4434, 4461, 4468, 4471, 4474 + +commit d84f6c6250f89b88812877c786850f3f02273e48 +Merge: 554dcce37a 67263e82a7 +Author: Catouse +Date: Thu Jun 14 10:05:35 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 554dcce37a73f62c2045b88b55f625a02a60ec73 +Author: Catouse +Date: Thu Jun 14 10:05:27 2018 +0800 + + * update zui files. + +commit 67263e82a70d7e555005a86c0142df0e821a63de +Author: estellbright <1457749147@qq.com> +Date: Thu Jun 14 09:44:05 2018 +0800 + + Fix #Task 4443. + +commit c177080a22961f328245c8c399311c9ce25fe7a0 +Author: estellbright <1457749147@qq.com> +Date: Thu Jun 14 09:40:27 2018 +0800 + + Fix #Task 4454. + +commit 1ded7ce4b2d0c636e56433256fdc3a99eec46911 +Author: estellbright <1457749147@qq.com> +Date: Thu Jun 14 09:36:02 2018 +0800 + + Fix #Task #4464. + +commit 00d703d2836984dcba26256639c324155c322cf3 +Author: estellbright <1457749147@qq.com> +Date: Thu Jun 14 09:31:32 2018 +0800 + + Fix #Task 4453. + +commit 109ffec313abf2e1a162af5f28ee682659a73755 +Author: estellbright <1457749147@qq.com> +Date: Thu Jun 14 09:26:41 2018 +0800 + + Fix #Task 4451. + +commit 0c71a115739be833490047b0402cd6695fe46490 +Author: liugang +Date: Wed Jun 13 16:11:34 2018 +0800 + + * Fix spell error. + +commit abf5ce608cef34bd1b3fe0376c9985d663b7a4bf +Merge: a7852b7fd1 4227ff9e74 +Author: liugang +Date: Tue Jun 12 17:41:39 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a7852b7fd13dd77b69968815814e5a54debaf159 +Author: liugang +Date: Tue Jun 12 17:41:30 2018 +0800 + + * Optimize codes. + +commit 4227ff9e74e70e36fddbcd565b0011e3adb65e96 +Author: estellbright <1457749147@qq.com> +Date: Tue Jun 12 16:49:14 2018 +0800 + + Fix #Task 4446. + +commit ba993c66eadf654baebbd28bc4c2d0d432a53c05 +Merge: 0b3c1b9597 5170b6c173 +Author: estellbright <1457749147@qq.com> +Date: Tue Jun 12 16:46:17 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0b3c1b9597ebdf8a6a2cd60f830919153ba119fd +Author: estellbright <1457749147@qq.com> +Date: Tue Jun 12 16:27:06 2018 +0800 + + Finish #Task4444. + +commit 5170b6c1738c457075ad90ed29da31dbb769b47e +Author: liugang +Date: Tue Jun 12 15:48:29 2018 +0800 + + * Finish task #4456 + +commit 9151a9aea4ed2925cefbf37e020009782f8baa08 +Author: liugang +Date: Tue Jun 12 15:00:13 2018 +0800 + + * Finish task #4457 + +commit 71e7bc6b0b22620c8ca3f3175567b00185774081 +Author: liugang +Date: Tue Jun 12 14:32:49 2018 +0800 + + * Fix bug. + +commit 8469e2c2775e165a96d440721f571d65efb87259 +Merge: 87d3a9d0c6 30803ce8a0 +Author: liugang +Date: Tue Jun 12 14:10:56 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 87d3a9d0c63b3b32a685c10a2d3ea7be7821780d +Author: liugang +Date: Tue Jun 12 14:10:39 2018 +0800 + + * Optimize codes. + +commit 30803ce8a02c1c3733bc67563cf0d81eec81fb54 +Author: chenfeiCF +Date: Tue Jun 12 14:04:48 2018 +0800 + + * Fix bugs in bugcreate report. + +commit 9c292e522ad5c97313ce25bf0676d3839ce15c3d +Author: liugang +Date: Tue Jun 12 13:38:55 2018 +0800 + + * Format codes. + +commit 99e0933ab38c133f25085a992ca34cb3be349e31 +Author: liugang +Date: Tue Jun 12 13:37:39 2018 +0800 + + * Finish task #4458 + +commit 1195f7266c7170c55070274a5b83130fea683e79 +Author: liugang +Date: Tue Jun 12 10:46:48 2018 +0800 + + * Finish task #4428 + +commit c25f4260ef236da03460701334b54b4c7f06fc64 +Author: liugang +Date: Tue Jun 12 10:38:15 2018 +0800 + + * Finish task #4447 + +commit 76b20cccf3664b0953609033d50098dd97c9bfa1 +Merge: ff5c40d7f0 cedffa142a +Author: liugang +Date: Tue Jun 12 10:26:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ff5c40d7f013c3597c816a8be1ec470086d06b3a +Author: liugang +Date: Tue Jun 12 10:25:43 2018 +0800 + + * Finish task #4429 + +commit 85ed55501cfe7066b1ccc77e7556e482c928a9ac +Author: liugang +Date: Tue Jun 12 10:24:56 2018 +0800 + + * Finish task #4452. + +commit cedffa142a50953ec461d25176e77744df4e7ad9 +Author: Catouse +Date: Mon Jun 11 18:21:32 2018 +0800 + + * update classic theme. + +commit 7a79b0405240c8dbd2844ecc6127efc377b89289 +Author: Catouse +Date: Mon Jun 11 18:18:35 2018 +0800 + + * update classic theme. + +commit 13431cbb89485c18f8fe459aa7606469cd10e2f7 +Author: Catouse +Date: Mon Jun 11 17:52:14 2018 +0800 + + * update classic theme. + +commit 88b6eb82dc5f6421d20f482e3d9ce8f562198226 +Author: Catouse +Date: Mon Jun 11 17:39:06 2018 +0800 + + * update classic theme. + +commit b783826067a4b0439b0a18238b5dd3014c69857d +Author: Catouse +Date: Mon Jun 11 17:38:49 2018 +0800 + + * fix zentao logo not show in about dialog. + +commit 3b2e4ff0a44d1cd18b2a4d744f528bf126e1c900 +Author: Catouse +Date: Mon Jun 11 17:07:40 2018 +0800 + + * fix comment modal position in project/tree view. + +commit 4c256db0440305e1d57c3bb8f5a981ff2c75fc17 +Author: Catouse +Date: Mon Jun 11 17:05:22 2018 +0800 + + * update zui files. + +commit 655e5c6e98718f77a5bb79fb48a50aa924d47826 +Merge: 27dd71f684 2da62c290f +Author: Catouse +Date: Mon Jun 11 16:36:25 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 27dd71f684866fd583760474260e86e5e2d32628 +Author: Catouse +Date: Mon Jun 11 16:36:18 2018 +0800 + + * add .icon-angle-double-right. + +commit 2da62c290f9375dfd01ad6f463bac6abc322e0de +Author: liugang +Date: Mon Jun 11 16:21:32 2018 +0800 + + * Finish task #4433 + +commit 2585696e8fd2b00ed1f6a37332abb00921c1ea7f +Author: liugang +Date: Mon Jun 11 16:00:55 2018 +0800 + + * Finish task #4430 + +commit 311b4ad0ab25cfe0da2bb1ae0b9404cdbe571da5 +Author: liugang +Date: Mon Jun 11 16:00:28 2018 +0800 + + * Finish task #4437 + +commit 05eb4613b756ee210625da2185921dfff7f11ecb +Author: liugang +Date: Mon Jun 11 15:46:42 2018 +0800 + + * Finish task #4427. + +commit a7841dc8ed93b0f82bdc614a1992c35ce83b3f26 +Merge: 0aac52c8a5 971aacab1a +Author: wangyidong +Date: Mon Jun 11 15:20:12 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0aac52c8a5f5f6bbed2e4fe1b8102280d93f5162 +Author: wangyidong +Date: Mon Jun 11 15:19:46 2018 +0800 + + * adjust for api url. + +commit 971aacab1a496046feefe630ed8ab368248fdc0c +Merge: 9ad2a8365c 2ec7f5f28e +Author: estellbright <1457749147@qq.com> +Date: Mon Jun 11 15:08:24 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9ad2a8365c7fbbd2d0119d461dd2df3bce4ff840 +Author: estellbright <1457749147@qq.com> +Date: Mon Jun 11 14:49:10 2018 +0800 + + Finish #Task 4459. + +commit 2ec7f5f28e7db7a2ac6ade4face843a5c6eb9adb +Author: Catouse +Date: Mon Jun 11 14:10:48 2018 +0800 + + * update cliassic theme. + +commit 9cb0b571f47964e77c712292d657b51b59ad6231 +Merge: 2007b95cc8 7890f8f385 +Author: Catouse +Date: Mon Jun 11 14:09:20 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2007b95cc8e1a9169ca343dbd470ad2ab2b79d67 +Author: Catouse +Date: Mon Jun 11 14:09:05 2018 +0800 + + * update zentao themes. + +commit 7890f8f385bf58027b4548587b3a7edf255d2498 +Author: estellbright <1457749147@qq.com> +Date: Mon Jun 11 13:22:56 2018 +0800 + + Fix bug #4439. + +commit 65a0bf2ee11796c525339413de44379e1186ac89 +Author: estellbright <1457749147@qq.com> +Date: Mon Jun 11 13:15:38 2018 +0800 + + Finish #Task 4438,4439,4440. + +commit 03f38a45f1fbde92fc0a8e615ddf04d7eac97303 +Author: Catouse +Date: Fri Jun 8 16:08:20 2018 +0800 + + * improve UI of tutorial views. + +commit 900e46d19e4a202b03ca02e16b313e21a550681e +Author: Catouse +Date: Fri Jun 8 16:08:02 2018 +0800 + + * update themes. + +commit b3872b2f837329885ba3116b04ca047357e7e319 +Author: Catouse +Date: Fri Jun 8 16:07:44 2018 +0800 + + * change style of todo block. + +commit 5c46f7eb02f9a0cfeb50937596436f275463da47 +Author: Catouse +Date: Fri Jun 8 12:13:10 2018 +0800 + + * change sparkline align in project block. + +commit 5d3a019de7ac1ac0499950b03fb5f896f5a359bf +Author: Catouse +Date: Fri Jun 8 10:57:16 2018 +0800 + + * fix #searchGo style. + +commit 1f3baa1c4a9f33ae577924f70352de35bfa59672 +Merge: 98fdb94d1f 56256fb190 +Author: Catouse +Date: Fri Jun 8 10:35:16 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 98fdb94d1ffc8f16ae2a3ae1e521c24817e0685a +Author: Catouse +Date: Fri Jun 8 10:35:05 2018 +0800 + + * update themes. + +commit 56256fb190bd5be314032fdeb2bd197c3588a883 +Author: wangyidong +Date: Fri Jun 8 09:54:32 2018 +0800 + + * fix bug. + +commit 98f5270353a27d7641b723b023c4f93889639bef +Author: Catouse +Date: Fri Jun 8 09:30:35 2018 +0800 + + * update themes. + +commit d17e9cd12239c1610ad85770ccf96b7d1d630093 +Author: Catouse +Date: Fri Jun 8 09:30:27 2018 +0800 + + * change style todo block. + +commit a0fc1a2bc3014c1d9ea568309df3523de2a0456f +Author: Catouse +Date: Thu Jun 7 18:51:57 2018 +0800 + + * support open zentao help. + +commit 10c5528dc10c3492e6853577d463181bac09d11c +Author: Catouse +Date: Thu Jun 7 17:33:58 2018 +0800 + + * refactor codes. + +commit 99a3674952396b13d98e5c6e35af0eaa0c50dee4 +Author: Catouse +Date: Thu Jun 7 17:15:47 2018 +0800 + + * fix error when change theme or language. + +commit c79b6082926ecda664fcf8aa744dae332a87db31 +Author: Catouse +Date: Thu Jun 7 17:10:38 2018 +0800 + + * improve UI for big screens. + +commit 849fefb8b4de5a548aaa6300df4a869965f356ae +Author: Catouse +Date: Thu Jun 7 16:31:57 2018 +0800 + + * update blackberry theme. + +commit 758f11d98dca8412bc08560dcca898f35c1fb82e +Author: Catouse +Date: Thu Jun 7 12:05:13 2018 +0800 + + * update themes. + +commit bbaca1522cc8083f8946fd4380d79c98ed41469b +Author: Catouse +Date: Thu Jun 7 11:24:18 2018 +0800 + + * update themes. + +commit cf55f0c291a8f2f1931518642dc5c97cef14ec9f +Author: Catouse +Date: Thu Jun 7 11:19:15 2018 +0800 + + * refactor codes. + +commit 3fa58063b3ebb7603aee30652ef96355897067ec (tag: zentaopms_10.0.beta_20180607) +Author: Catouse +Date: Thu Jun 7 10:52:01 2018 +0800 + + * improve style of search box. + +commit 104706dda84fb48c98378849f4d79ac7ef3a638a +Author: Catouse +Date: Thu Jun 7 10:46:46 2018 +0800 + + * improve style of progress bars and sparklines. + +commit b8f6277c9b2196f50316d6cd279b4ed22a736ac0 +Author: Catouse +Date: Thu Jun 7 10:35:21 2018 +0800 + + * update burn UI. + +commit b6785dc9569fb383851025872c7110a65d249b70 +Author: Catouse +Date: Thu Jun 7 10:30:09 2018 +0800 + + * update themes. + +commit 1ae50c4b1fc4822a92c3d2dacf098ed2017b791e +Author: Catouse +Date: Thu Jun 7 09:37:36 2018 +0800 + + * refactor themes. + +commit 6c260365f60d1f63b3856353e1b663d43fb5e1b1 +Author: Catouse +Date: Wed Jun 6 21:07:48 2018 +0800 + + + add zentao new themes. + +commit 821ae6957467b06b488c07a7cfd1fbc8fcc0e7d0 +Merge: 42225e08e6 d11edad46b +Author: Catouse +Date: Wed Jun 6 15:02:17 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 42225e08e60ac33e0b64bfc410aee5813879abd2 +Author: Catouse +Date: Wed Jun 6 15:02:10 2018 +0800 + + * refactor tutorial module views. + +commit d11edad46bfe7734a67bb7b6ba525df3bb4ce283 +Author: liugang +Date: Tue Jun 5 13:44:28 2018 +0800 + + * Fix bug if the product type is not normal can delete the plan of story. + +commit a104f067f35dd8c4a7577c4a7ca39ca41f57485d +Author: 滔哥 +Date: Fri Jun 1 16:14:37 2018 +0800 + + * Finish task#4369. + +commit ea693ad8355379b8982f8388808b1d4bede2ecd4 +Merge: d38a9ea3a3 78226d52a4 +Author: 滔哥 +Date: Fri Jun 1 15:59:34 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 78226d52a4a32559b55068058d92b7e5622744fd +Author: Catouse +Date: Fri Jun 1 15:43:26 2018 +0800 + + * change style of about dialog. + +commit 43665d678ad0a13d63d89d6db6c7e67870ffd23c +Author: Catouse +Date: Fri Jun 1 15:42:14 2018 +0800 + + * change style of block views. + +commit bb0c64178f919b87389184ccdfe1dc26507813e1 +Author: Catouse +Date: Fri Jun 1 15:27:26 2018 +0800 + + * focus search input when change search type. + +commit 06b4229f6ed0ed20aec45ca139a2fe50b95dbf8d +Merge: 92f71d1fbf 97d82a4d76 +Author: Catouse +Date: Fri Jun 1 15:20:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 92f71d1fbf232b18efd7f19ab88badc8a9e0cf7b +Author: Catouse +Date: Fri Jun 1 15:20:26 2018 +0800 + + * improve UI of file/uploadImages view. + +commit 97d82a4d7694812208072c2d84818ac26f7d1ed8 +Author: daitingting +Date: Fri Jun 1 15:11:42 2018 +0800 + + * Adjust version. + +commit d38a9ea3a3bd0e75ce9c7440010de6ec2ce4cbe7 +Author: 滔哥 +Date: Fri Jun 1 15:10:28 2018 +0800 + + * Fix bug. + +commit 1bec81e2c33fb1e16c72f05aace9a998bab15b19 +Author: daitingting +Date: Fri Jun 1 15:09:24 2018 +0800 + + * Add 10.0.beta sql. + +commit 884eda8221124378d7da91500a051a29e6985d5e +Merge: f0c0b51f4c 5e917baf44 +Author: daitingting +Date: Fri Jun 1 15:04:30 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f0c0b51f4c23342c242d905cbeaa756547f132fe +Author: daitingting +Date: Fri Jun 1 15:04:06 2018 +0800 + + * Adjust version. + * Add tw lang. + +commit 5e917baf44d30939fee90eda3355d9b455fae772 +Merge: ffd93b51df 91b11b3a98 +Author: Catouse +Date: Fri Jun 1 14:57:46 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ffd93b51dfbc360778765093b4b143e673c1fb23 +Author: Catouse +Date: Fri Jun 1 14:57:36 2018 +0800 + + * set filters options for uploader. + +commit 91b11b3a98ef028d8584f0bfeedcbec5ec7edc80 +Merge: 2d1a67516c 815bd9bc51 +Author: 滔哥 +Date: Fri Jun 1 14:48:11 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2d1a67516c4a28def5e2b6ab08b3bd217cb59aee +Author: 滔哥 +Date: Fri Jun 1 14:41:00 2018 +0800 + + * Finish task#4356. + +commit 815bd9bc51dfc2c32fa60974dfcdd3efa8a0f003 +Author: Catouse +Date: Fri Jun 1 14:23:11 2018 +0800 + + * adjust style. + +commit bc75ae126deb1a94822efa77928bc2bbf538a79d +Merge: 368f5a7794 af1b568009 +Author: Catouse +Date: Fri Jun 1 14:19:16 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 368f5a7794fb8805f4afdac41669c9444475eb3c +Author: Catouse +Date: Fri Jun 1 14:19:07 2018 +0800 + + * hide empty action toolbar. + +commit af1b5680091682e84f9ee30cae074ab0596eb760 +Merge: c284d78905 90680a4066 +Author: daitingting +Date: Fri Jun 1 13:30:00 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c284d789055c0a682de8a02c6e319a6fce2c779d +Author: daitingting +Date: Fri Jun 1 13:29:29 2018 +0800 + + * Set nowrap for them. + +commit 90680a4066f56b29fb151a2de966b93dc71e57d0 +Merge: 2a2e933f2b 58945d0a59 +Author: 滔哥 +Date: Fri Jun 1 13:23:38 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2a2e933f2b5fdabf3fe12f05ba15f0e6bfc35553 +Author: 滔哥 +Date: Fri Jun 1 13:23:30 2018 +0800 + + * Finish task#4355. + +commit 58945d0a595bf3c8b7b6195841d9b1fb82be3019 +Merge: 3ec13c930b d581f97ec4 +Author: Catouse +Date: Fri Jun 1 11:20:21 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3ec13c930b82a5647054f0a349ab55736f254152 +Author: Catouse +Date: Fri Jun 1 11:20:10 2018 +0800 + + * fix uploadImages not work sometimes. + +commit d581f97ec492e87884bd67cf185d51c7c6f358eb +Author: daitingting +Date: Fri Jun 1 10:42:47 2018 +0800 + + * Set nowrap for objectName. + +commit 8a0ffc37bbe6c442caf442bcbfb70a675a3649a4 +Merge: bbda1c4e8d a97c4a6560 +Author: 滔哥 +Date: Fri Jun 1 09:34:23 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c327146ab10eb8a5733b1af84f8b00d4d145926a +Merge: 6abc28119a a97c4a6560 +Author: daitingting +Date: Fri Jun 1 09:17:48 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a97c4a65605007d1fbbbb2403dfb9a7179aa8147 +Author: Catouse +Date: Fri Jun 1 09:04:06 2018 +0800 + + * fix style of sparkline in table. + +commit bbda1c4e8dde01b97ab2a529c343dd8fb11193e7 +Merge: 90375b277e 929a145382 +Author: 滔哥 +Date: Thu May 31 22:24:48 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 929a1453829d31ebdcb58262cf73f72ce2f47f21 +Author: Catouse +Date: Thu May 31 17:57:17 2018 +0800 + + * improve UI of product/roadmap view. + +commit 6abc28119a56e5335c66df80aa0409484b4d64d2 +Author: daitingting +Date: Thu May 31 17:43:48 2018 +0800 + + * Adjust codes. + +commit bb89e2eddc0542dff2d95b471d64937847a821e2 +Merge: 4c9c8694d6 a43e64c5c1 +Author: Catouse +Date: Thu May 31 17:17:06 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4c9c8694d6dcee24c0c2bf7be747820700dcb91f +Author: Catouse +Date: Thu May 31 17:16:57 2018 +0800 + + * fix table UI for safari. + +commit a43e64c5c102ac8dc6d7e78f1878b0b12d6c1b27 +Author: chenfeiCF +Date: Thu May 31 17:10:46 2018 +0800 + + Finish task #4426. + +commit f22a9ee6c47015cd4c3464368e9d169d2c75d40c +Merge: 916bcda0ab 4643931d3c +Author: Catouse +Date: Thu May 31 16:52:43 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 916bcda0ab25da6f711a390f4380c6b61a393812 +Author: Catouse +Date: Thu May 31 16:52:33 2018 +0800 + + * change style of user/login view. + +commit 77a784204d470113d5a89de840c51d3e788350b6 +Author: Catouse +Date: Thu May 31 16:47:48 2018 +0800 + + * change logo image in about dialog. + +commit 4643931d3c034629588b5b16c4bef23d20b6dcb5 +Author: daitingting +Date: Thu May 31 16:22:40 2018 +0800 + + * Adjust codes. + +commit 485ad8d170610c894903b3f938bd17ce632ec6be +Merge: 568402d9bc 819e74699d +Author: daitingting +Date: Thu May 31 16:21:47 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 568402d9bc3fc4e4f3d20e0432758b135d7b7da5 +Author: daitingting +Date: Thu May 31 16:21:01 2018 +0800 + + * Do not display divider if the menu is the last. + +commit 819e74699d789ed16cd3261eef0c5fa367bd9462 +Author: Catouse +Date: Thu May 31 16:20:53 2018 +0800 + + * hide title setting of welcome block. + +commit f8f5a57e872d4d1cf78ed1a242b2fa3b965541d8 +Author: Catouse +Date: Thu May 31 16:05:33 2018 +0800 + + * improve UI of table component by update zui. + +commit 1825743e276e05369611e5746620477cee03e657 +Merge: ffa3beeb38 abdadd7f83 +Author: Catouse +Date: Thu May 31 16:02:28 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ffa3beeb38f2d6ed9afcd7f32bc9c40c5910b659 +Author: Catouse +Date: Thu May 31 16:02:21 2018 +0800 + + * change work break rule of tree items. + +commit 8d9655f555cc9f533f8b700102a851ac2e5078a9 +Author: Catouse +Date: Thu May 31 16:02:01 2018 +0800 + + * change login panel width. + +commit 0157ea352316f4bef2d4d189405dcb8568b37a6d +Author: Catouse +Date: Thu May 31 15:56:23 2018 +0800 + + * remove table responsive container element for create form view. + +commit 90375b277ef9bd984e99efdeb20c1b00402f9012 +Author: 滔哥 +Date: Thu May 31 15:26:43 2018 +0800 + + * Fix bug. + +commit abdadd7f8347dc09e0cbdcb407eda258ffa705cd +Author: 滔哥 +Date: Thu May 31 15:22:40 2018 +0800 + + * Finish task#4371. + +commit 276e020efd5a23fac4c905fb7bf266e668182a8a +Merge: 484dda26a0 7777c806fd +Author: 滔哥 +Date: Thu May 31 15:04:24 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 484dda26a02c4dbb6acd14de717d7c274c2c5462 +Author: 滔哥 +Date: Thu May 31 15:04:10 2018 +0800 + + * Finish task#4376. + +commit 7777c806fdb9e787d64b7e4d25cc5e1d20b8f2ec +Author: daitingting +Date: Thu May 31 14:59:54 2018 +0800 + + * Add link for company name. + +commit 8d2814b017ee1b3885fc67eff7a65cb633d6000c +Author: daitingting +Date: Thu May 31 14:35:17 2018 +0800 + + * Remove viewLink for webhook. + +commit deff59e7077929c8e91b9bfef1d69a36a324e7e8 +Author: daitingting +Date: Thu May 31 14:34:33 2018 +0800 + + * Adjust codes. + +commit a10b598a2aa0acd2f1ae44c9a9e064cc65b5d0a9 +Merge: 2b984e6630 b412f58900 +Author: daitingting +Date: Thu May 31 14:27:50 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2b984e6630f2f9292a6b31d7f630d9937596ed65 +Author: daitingting +Date: Thu May 31 14:27:24 2018 +0800 + + * Adjust acls of user. + +commit b412f589006899aec3429060597548c42fb43b62 +Author: chenfeiCF +Date: Thu May 31 14:06:28 2018 +0800 + + * Finish task #4222, #4223. + +commit 6ec03cae6f96fbeb72cbb0afbcfd91924f476168 +Author: daitingting +Date: Thu May 31 13:34:52 2018 +0800 + + * Adjust align for some fields. + +commit 8ca09a065c51fba190afb057c8933b5d1dcdfc1a +Merge: b1de85895c a8bdea386e +Author: daitingting +Date: Thu May 31 13:10:07 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b1de85895c4e7da26e287ec392ecbabd8fd6471a +Author: daitingting +Date: Thu May 31 13:09:40 2018 +0800 + + * Adjust codes. + +commit a8bdea386e5e8b8e31703dba2ff54502ea6ff932 +Author: Catouse +Date: Thu May 31 11:37:39 2018 +0800 + + * update zui js file. + +commit 4e78323819c318293be9f41ad2c23af7bc6c174f +Author: Catouse +Date: Thu May 31 11:37:28 2018 +0800 + + * improve assign modal UI in grouptask view. + +commit ced0860dfd81e3a09207b12829d8593fb0974a60 +Merge: e35249510a 31f9ee5201 +Author: Catouse +Date: Thu May 31 11:09:59 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e35249510a4dad52feb9729736f4c8e08525618b +Author: Catouse +Date: Thu May 31 11:09:51 2018 +0800 + + * fix upload images not work in story/batchcreate view. + +commit 31f9ee5201b6302d55e4acc57a8b1389a5713f20 +Merge: 560a272c4d 62950122b3 +Author: daitingting +Date: Thu May 31 10:47:33 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 560a272c4d11694f032f075870d584e755fa4d89 +Author: daitingting +Date: Thu May 31 10:47:00 2018 +0800 + + * Display actions button when report is not deleted. + +commit 62950122b3420cbba233d851e2b130ab7bcd6f2d +Merge: 3b6892eb4a 99bb895557 +Author: Catouse +Date: Thu May 31 09:53:35 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3b6892eb4abd2b2ef047bebec342d90a32ce30fc +Author: Catouse +Date: Thu May 31 09:53:28 2018 +0800 + + * adjust style of kanban views. + +commit 99bb8955575847f02586918d6d8bf20bdf003d7e +Author: daitingting +Date: Thu May 31 09:47:15 2018 +0800 + + * Adjust codes. + +commit 101f8e372ba476c30dcaa88d08f0edc16d677f9a +Author: 滔哥 +Date: Wed May 30 22:34:40 2018 +0800 + + * Finish task#4363. + +commit a03cb5cf9b0389090d315ca588e88e94d99296b4 +Author: 滔哥 +Date: Wed May 30 21:33:32 2018 +0800 + + * Finish task#4364. + +commit 2aeb32ea39ac99016d0614d40c26f3dc50b43059 +Author: daitingting +Date: Wed May 30 17:17:21 2018 +0800 + + * Adjust codes. + +commit e9f1f3b18488bfdd64f01f94f5309bbfd8bb31a5 +Author: daitingting +Date: Wed May 30 17:08:14 2018 +0800 + + * Fix bug #1819. + +commit 90fd88fb7eda2683d72238dc24a3374b54215b7c +Author: chenfeiCF +Date: Wed May 30 15:29:05 2018 +0800 + + * Finish task #4415, #4418, #4419. + +commit 9ae007b5509732f1c35ec0f8e9a7ae0dee33addf +Author: Catouse +Date: Wed May 30 15:22:19 2018 +0800 + + * remove debug alert messages. + +commit b12720cb807ffdea9b34a3fbc9540b1465911fd1 +Author: Catouse +Date: Wed May 30 15:20:03 2018 +0800 + + * fix error of resetForm not defined. + +commit 34143147c834c082de7de5664ef9d5d1c7355cba +Author: Catouse +Date: Wed May 30 15:10:59 2018 +0800 + + * improve UI of project/task view. + +commit 292219fc171781c42e8e0f58e5a11ab92bd07027 +Author: Catouse +Date: Wed May 30 15:07:36 2018 +0800 + + * improve UI of table views. + +commit c8bf43c62b93fd8dbcef228462dcd93b18ae9c90 +Author: Catouse +Date: Wed May 30 14:38:11 2018 +0800 + + * improve sidebar toggle UI. + +commit 78e3497a9c121700dac295257d5873b01d4babb0 +Merge: 7d0cc0abc1 18bcca3f93 +Author: Catouse +Date: Wed May 30 13:40:44 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7d0cc0abc1775efa2ab3b358b43dedf8d3a418d8 +Author: Catouse +Date: Wed May 30 13:40:36 2018 +0800 + + * fix table UI to support responsive mode. + +commit 18bcca3f93bdf664d5948f8496eebb6b0684fb02 +Author: chenfeiCF +Date: Wed May 30 13:05:06 2018 +0800 + + * Finish task #4409, #4410, #4411, #4413. + +commit 33aa0834d50bf2c98e2aea7576ce770d1f5c43f1 +Author: Catouse +Date: Wed May 30 11:43:02 2018 +0800 + + * make table responsive. + +commit e3d2ccfed46e084c38843ab2c2da5712208ae6f1 +Author: Catouse +Date: Wed May 30 11:24:54 2018 +0800 + + * make batchcreate form table responsive. + +commit 50c93eeb41bd146e7fc80206049d81bf1c56987a +Merge: 656b24a501 bd67b5fb58 +Author: Catouse +Date: Wed May 30 11:22:41 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 656b24a501f3623ed8aaf67a1203ad9908a55f1c +Author: Catouse +Date: Wed May 30 11:22:13 2018 +0800 + + * improve table list UI by use table-responsive. + +commit bd67b5fb58d3273be659dd6b7b23ed640fb1f0a6 +Merge: 7ee8e2b634 88106a85c6 +Author: 滔哥 +Date: Wed May 30 11:17:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 88106a85c64938917bc1eda3be303bcb6748e0ed +Author: Catouse +Date: Wed May 30 11:15:53 2018 +0800 + + * refactor script tags. + +commit 07a203312b4641afa2a2f374c37b3ff85bf85a1a +Author: Catouse +Date: Wed May 30 11:14:58 2018 +0800 + + * change pager UI in dynamic views. + +commit 7ee8e2b634b32baba6361bcbe47b88fcf860e802 +Author: 滔哥 +Date: Wed May 30 11:13:04 2018 +0800 + + * Finish task#4370. + +commit d90e95256b4576a1d0c1c7c1933a81d9fad50915 +Author: 滔哥 +Date: Wed May 30 11:08:06 2018 +0800 + + * Finish task#4374. + +commit 18aaf1656b26352b32f5bd9593d826dbe02357cd +Author: 滔哥 +Date: Wed May 30 11:02:19 2018 +0800 + + * Finish task#4375. + +commit a5013928c89f757657c9f95efda0150e6b0298fc +Author: 滔哥 +Date: Wed May 30 10:54:36 2018 +0800 + + * Finish task#4378. + +commit e223a3c73ac53837ef3a835de313c1fcd31045b2 +Author: Catouse +Date: Wed May 30 10:53:45 2018 +0800 + + * improve UI of label selector componet. + +commit cc4946959a531249b1f3a61cfc06fb9565782d30 +Author: Catouse +Date: Wed May 30 08:57:35 2018 +0800 + + * fix style of project/groupTask view. + +commit 5236f5729d4161971f42943366415f52b9dfceae +Author: Catouse +Date: Wed May 30 08:46:10 2018 +0800 + + * refactor views. + +commit 30554aafe3d95049aae1d7d2834a2e4f064144e2 +Author: Catouse +Date: Tue May 29 19:03:33 2018 +0800 + + * improve UI of task views. + +commit 6d3b51c826c70901088d4a8eb04b60eba5ab6c8a +Author: Catouse +Date: Tue May 29 18:28:44 2018 +0800 + + * fix UI of views with querybox. + +commit bd406387b5b6f7a586a4596eed9b6ebdd4fc123d +Author: Catouse +Date: Tue May 29 17:59:00 2018 +0800 + + * improve style of linkcase views. + +commit e225a64d8cb50c05f7fa410b1398715f087cebb1 +Author: Catouse +Date: Tue May 29 17:47:50 2018 +0800 + + * change style of dynamic block. + +commit b8b4d833249d81aa7644c0391ba14b40e7de8d27 +Author: Catouse +Date: Tue May 29 17:44:16 2018 +0800 + + * change icons in document module views. + +commit 4ae830fd5aa78b5faae80c0cdd2bf5e38003ca42 +Author: Catouse +Date: Tue May 29 17:32:21 2018 +0800 + + * fix tables style in firefox. + +commit c7aa5ec3de99a3365ab4cb493230e9c92286e565 +Author: Catouse +Date: Tue May 29 17:19:33 2018 +0800 + + * change style of statistic blocks. + +commit 0e2a4e16eb7116651f44f078ae99f79740950603 +Author: Catouse +Date: Tue May 29 17:12:43 2018 +0800 + + * fix tables style by update zui. + +commit c0d86bc46ad5587e6537141fd0fb9afd391e357c +Merge: 94247505f2 800ae9129d +Author: Catouse +Date: Tue May 29 16:50:54 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 94247505f23dab1cffc2473ba8d0ba13b02cef32 +Author: Catouse +Date: Tue May 29 16:50:47 2018 +0800 + + * refactor views. + +commit 800ae9129da429adf23395308a127437b4b54e81 +Merge: e699db14d4 f108052b89 +Author: daitingting +Date: Tue May 29 16:38:06 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e699db14d41a7e16dc1823f62b7a9b5089ab9bc1 +Author: daitingting +Date: Tue May 29 16:35:43 2018 +0800 + + * Adjust codes. + +commit f108052b897fc067f4936874a8b6be49c16ebcf3 +Author: Catouse +Date: Tue May 29 16:07:34 2018 +0800 + + * refactor views. + +commit 9c5739bd86fc6878d90517c318adcd4df06d3adc +Author: Catouse +Date: Tue May 29 15:41:12 2018 +0800 + + * improve UI of productplan/view. + +commit 564f445984d1983a7c9ba3b52fe7c4aa39a19e22 +Merge: 4fe06dfde8 731ca973cd +Author: Catouse +Date: Tue May 29 15:26:52 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4fe06dfde85e59414b27a09120e2fb2cc4fcbc25 +Author: Catouse +Date: Tue May 29 15:26:41 2018 +0800 + + * improve UI of build/view. + +commit 731ca973cdf9dd8d8df60ce149a23c91a147f73d +Author: chenfeiCF +Date: Tue May 29 15:09:34 2018 +0800 + + * Finish task #4300. + +commit 21bc0120e1aa14aaa3cc70aeb9286478f32271fb +Merge: e56a1ae82a 311bff018a +Author: chenfeiCF +Date: Tue May 29 15:02:30 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 311bff018a0ec5fc3652c42ac06c460dc5618047 +Author: Catouse +Date: Tue May 29 14:10:08 2018 +0800 + + * refactor codes. + +commit 1f6cd9f66afb3ad78793027bc45f2d2f3388b7ee +Author: Catouse +Date: Tue May 29 14:04:22 2018 +0800 + + * fix border style of grouped table. + +commit 2bb0b815aa93d3ec6856911bc04f32bc91daa098 +Merge: b71bf23f30 2e10a89e49 +Author: Catouse +Date: Tue May 29 10:49:11 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b71bf23f30925a355f5f9657c909a9c7a31e0da2 +Author: Catouse +Date: Tue May 29 10:49:02 2018 +0800 + + * improve UI of project module views. + +commit 2e10a89e49bd31ab721c495ac446970c8092f0d8 +Merge: ff3af11733 c83e6bde6f +Author: 滔哥 +Date: Tue May 29 10:38:35 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ff3af11733793a560393b49cb05cf6fd4b9b91b9 +Author: 滔哥 +Date: Tue May 29 10:38:05 2018 +0800 + + * Finish task#4241. + +commit c83e6bde6f254e81c415efbd24f223aab38de47c +Merge: cf3893633c dfecfa9d5c +Author: Catouse +Date: Tue May 29 10:20:33 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cf3893633c602896fe5c5722a53f60b5a47eaf5d +Author: Catouse +Date: Tue May 29 10:20:24 2018 +0800 + + * change style of customfield dropdown menu. + +commit 9cddb589f84f6a24762281ab37d25da8134efbf9 +Author: Catouse +Date: Tue May 29 10:20:03 2018 +0800 + + * fix setTreeBox not defined. + +commit dfecfa9d5cdedb738d956c17620708729c39db20 +Author: 滔哥 +Date: Tue May 29 09:57:17 2018 +0800 + + * Finish task#4240. + +commit a4f24ab1982786c65cdf0eed7ea571751829a255 +Merge: 1e398d5bbc a63516c312 +Author: 滔哥 +Date: Tue May 29 09:56:05 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1e398d5bbcc8c46f28a673b8eec2283f5595af94 +Author: 滔哥 +Date: Tue May 29 09:55:37 2018 +0800 + + * Finish task#4240. + +commit a63516c31283d690c47a415c3f9e292f7f031f84 +Author: Catouse +Date: Tue May 29 09:55:08 2018 +0800 + + * change style of my/managecontacts modal view. + +commit 05b4206adc6bcbb91077a4df2c2f2585ea35ec27 +Merge: 9c70f7489e d6d30af418 +Author: Catouse +Date: Tue May 29 09:54:12 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9c70f7489ed35da330cdb98362120d98607ee9bb +Author: Catouse +Date: Tue May 29 09:48:52 2018 +0800 + + * change style of testcase views. + +commit 60d056034c42d6ee8d85844ac0f9557d83ec360a +Author: Catouse +Date: Tue May 29 09:48:39 2018 +0800 + + * remove obsolete code. + +commit d6d30af418359e54628ac8d41cd3489a8542e280 +Author: daitingting +Date: Tue May 29 09:47:34 2018 +0800 + + * Adjust direction for chosen. + +commit 65c761bd2e5964c9d48df51e3219611b3ab7c10b +Author: Catouse +Date: Tue May 29 09:44:16 2018 +0800 + + * refactor codes. + +commit c16e2c2bd2f0df2d40ddd74c46009eb1179fc02f +Author: daitingting +Date: Tue May 29 09:21:51 2018 +0800 + + * Check is the super admin or not by admins of company when user's admin field is empty. + +commit a0d160896c77054cc8b14b8430d5ab3efd378673 +Merge: dddb0b1e43 eb9738124d +Author: wangyidong +Date: Mon May 28 17:41:04 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit dddb0b1e43327cb6a6414a3580b5590d406c1e6d +Author: wangyidong +Date: Mon May 28 17:40:40 2018 +0800 + + * finish task #4190. + +commit eb9738124dcc907533fc66c0a676c54b56a8c579 +Merge: fe1c9ee94c 47d3681b4d +Author: 滔哥 +Date: Mon May 28 16:46:45 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fe1c9ee94c87558a40fa389ff27da227d733cbc5 +Author: 滔哥 +Date: Mon May 28 16:46:39 2018 +0800 + + * Finish task#4269. + +commit 47d3681b4d090d23b4d788ae67ec6166a3121423 +Author: daitingting +Date: Mon May 28 16:34:29 2018 +0800 + + * Display the actions directly. + +commit 8d3458ce62170460e27e2796a7d1cdd45912023a +Author: daitingting +Date: Mon May 28 16:08:22 2018 +0800 + + * Adjust height for modal. + +commit 1649d8cfc6abf1e054ac2bd7e88d860eef2f2557 +Merge: 0864c1093e 6ab26917a5 +Author: daitingting +Date: Mon May 28 15:59:09 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0864c1093ecdf72ebae7274011c0b274b6b68a64 +Author: daitingting +Date: Mon May 28 15:58:39 2018 +0800 + + * Adjust style when mode is create. + +commit 6ab26917a569149edfaf61faca902c08c8905859 +Author: Catouse +Date: Mon May 28 15:56:12 2018 +0800 + + * change style of todo view. + +commit f99116d4adc0f0c8049cba9a859c306396891be4 +Author: Catouse +Date: Mon May 28 15:48:15 2018 +0800 + + * update zui file. + +commit f4d7184a88d911b7dcbe1151dd0348a08e0c0ed7 +Author: Catouse +Date: Mon May 28 15:46:21 2018 +0800 + + * change button style. + +commit ccb6c25222a958dbecc959b4f0e87c226b585818 +Merge: 0fe8f10c7b 68d3d9a11e +Author: Catouse +Date: Mon May 28 15:43:22 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0fe8f10c7bbf31081ebdaf8bf2e277b4d93d0678 +Author: Catouse +Date: Mon May 28 15:43:07 2018 +0800 + + * change UI of modal trigger. + +commit 68d3d9a11edc20f9e0b49985fcd370c11aef0beb +Merge: 0b36b54ab5 f4a8590d62 +Author: wangyidong +Date: Mon May 28 15:34:44 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0b36b54ab52667610da321837d254803b8a08409 +Author: wangyidong +Date: Mon May 28 15:34:15 2018 +0800 + + * finish task #4146. + +commit f4a8590d62644185ad7c390d738ddc96b12d1930 +Author: Catouse +Date: Mon May 28 14:56:53 2018 +0800 + + * change style of flowchart block. + +commit 6009212f60de60a6c24fdc05ca4b53cb2d46dd2a +Merge: 214a4efaaa d84374c618 +Author: Catouse +Date: Mon May 28 14:53:59 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 214a4efaaa38f1a79198a349a4a8ff4a2fc1f7fe +Author: Catouse +Date: Mon May 28 14:53:51 2018 +0800 + + * change style of close icon. + +commit d84374c618c0d82b2cbbdaa77c2a21d02ed72c70 +Author: daitingting +Date: Mon May 28 14:38:47 2018 +0800 + + * Adjust space between btn. + +commit 6aab48e3049bc7feaa5892bd182dd840e9c7107e +Merge: e03ecf66f7 57e3dae49c +Author: daitingting +Date: Mon May 28 14:21:11 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e03ecf66f7e1a478046958784ec9469635d0fcfe +Author: daitingting +Date: Mon May 28 14:20:52 2018 +0800 + + * Adjust major action. + +commit 57e3dae49c61be758aa5c21842d4ee69d1975793 +Merge: d919c483f1 8af26cd7ef +Author: Catouse +Date: Mon May 28 14:01:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d919c483f1c893ee3510de75ced029c6377fb4d9 +Author: Catouse +Date: Mon May 28 14:01:12 2018 +0800 + + * fix js error. + +commit 8af26cd7efb17fc0c2a3d57c107ff7e7472f1399 +Merge: 78dda99381 cfe4c79a95 +Author: wangyidong +Date: Mon May 28 13:51:31 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 78dda993817aef4cce7aa9960beba50efad33626 +Author: wangyidong +Date: Mon May 28 13:50:08 2018 +0800 + + * finish task #4210. + +commit cfe4c79a955fd9ef16c8d1b993107ca7bc38fc70 +Merge: a9e3f1dfae 56579a66ce +Author: daitingting +Date: Mon May 28 13:21:34 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a9e3f1dfae43cfa988adcea9565d48fc4a34a181 +Author: daitingting +Date: Mon May 28 13:21:14 2018 +0800 + + * Adjust logo image. + +commit 56579a66cea0147214216ea49b18bac4f54207a7 +Author: Catouse +Date: Mon May 28 12:03:16 2018 +0800 + + * refactor codes. + +commit e344879fa4a999b1fa8db0a0a366fd56511910c2 +Author: Catouse +Date: Mon May 28 11:13:39 2018 +0800 + + * change .main-form style. + +commit c2e3d93ddd6ce253fe6a26210aacb7e595cc8fa3 +Author: Catouse +Date: Mon May 28 11:11:51 2018 +0800 + + * improve UI of user/edit view. + +commit 7bcbcb98883de2b958ebb39552432882f6afb1da +Author: Catouse +Date: Mon May 28 10:51:35 2018 +0800 + + * change label style of testsuite/browse view. + +commit dbe8ef5a873dd67eaf8a02208ab4ec38c7628523 +Author: Catouse +Date: Mon May 28 10:51:16 2018 +0800 + + * remove useless code. + +commit e5759654ec1836827fe8eec3e3c2f591e917097c +Merge: 3ccb780298 a1c30c420d +Author: Catouse +Date: Mon May 28 10:30:48 2018 +0800 + + Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms + +commit 3ccb780298df6506fb27ad55155d5a7614e25e2b +Author: Catouse +Date: Mon May 28 10:30:41 2018 +0800 + + * fix issue of not set pager cookie on pagePerRec changed. + +commit a1c30c420dc679cc68ac7d73b0edabee6b46f399 +Merge: 4c18f9fbc6 c2130344fb +Author: daitingting +Date: Mon May 28 10:16:20 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c2130344fbd018b0cb36d0b1be8d606d54c8c341 +Merge: 1a1fd3344d 648f4da467 +Author: Catouse +Date: Mon May 28 10:13:13 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1a1fd3344dace8b73ff111b42e6dbf62d4ea6be3 +Author: Catouse +Date: Mon May 28 10:13:05 2018 +0800 + + * change gray color more darker. + +commit 871dfa48e2776d5bcb9bb4a96e5904b32764e517 +Author: Catouse +Date: Mon May 28 10:12:50 2018 +0800 + + * change status label style of todo list view. + +commit 648f4da467591a714cc64bb81dd525f92aefe52d +Merge: 1e76a357a2 b1c2675439 +Author: 滔哥 +Date: Mon May 28 10:09:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4c18f9fbc6f8651f2478b8cf1d29301ead727711 +Merge: 6ecf999f86 b1c2675439 +Author: daitingting +Date: Mon May 28 10:08:25 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1e76a357a24d537d8376fbd2524d6b2eee5a9789 +Author: 滔哥 +Date: Mon May 28 10:08:03 2018 +0800 + + * Finish task#4237. + +commit 6ecf999f864b6bb9d1bba40df9e80e12a0b7e13e +Author: daitingting +Date: Mon May 28 10:08:02 2018 +0800 + + * Adjust style when it is not onlybody. + +commit e56a1ae82a29dd4d9e0d94d3f2e0a857c118b8e4 +Author: chenfeiCF +Date: Mon May 28 10:07:21 2018 +0800 + + * Finish task #4294. + +commit b1c2675439401075e5bc2aaf5d732979c6ed35e8 +Merge: f60f188bbd b038d71873 +Author: Catouse +Date: Mon May 28 10:06:39 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f60f188bbd02014a3a5179a8335683a3384872c6 +Author: Catouse +Date: Mon May 28 10:06:11 2018 +0800 + + * change style of timeline component. + +commit 223e203aa59bdcb632490302be660475607cf8ab +Author: Catouse +Date: Mon May 28 10:05:59 2018 +0800 + + * adjust style of story/create view. + +commit b038d7187389343d893187e32fda6cbc5409763d +Merge: 77fe2659d7 20953cf027 +Author: daitingting +Date: Mon May 28 10:02:21 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 77fe2659d75e0ac59c589565b4a860f83f1d1b49 +Author: daitingting +Date: Mon May 28 10:00:46 2018 +0800 + + * Adjust style when it is not onlybody. + +commit 20953cf027a175bc2cbdcb5230a88395ee0b5092 +Merge: a981ac8438 fc39b0702f +Author: Catouse +Date: Mon May 28 09:53:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a981ac8438171e305eed6bbb1e2a84e3d2c1b8f6 +Author: Catouse +Date: Mon May 28 09:53:12 2018 +0800 + + * fix contactlist control in form not work. + +commit d4fe13681eb2ab6bf06d9bf700aaa7e1e5fc13fe +Author: 滔哥 +Date: Mon May 28 09:41:15 2018 +0800 + + * Fix bug. + +commit fc39b0702fac07598329c13ffda2c30473f1fbf8 +Author: 滔哥 +Date: Mon May 28 09:24:13 2018 +0800 + + * Finish task#4250 + +commit 330d8d1e991c8f971cfcfa01e54e31f644289580 +Author: 滔哥 +Date: Mon May 28 09:20:06 2018 +0800 + + * Finish task#4254 + +commit f7825494094f07f228895d7ce5b58fbc891b33f3 +Author: 滔哥 +Date: Mon May 28 09:07:21 2018 +0800 + + * Finish task#4267 + +commit 32a07c24509c505656c15329c4be309058539003 +Author: 滔哥 +Date: Mon May 28 08:55:26 2018 +0800 + + * Finish task#4271 + +commit 09e8081b2688f7149ced224b7ee6b5a6e64a2930 +Merge: 18cf9473da 6548de69b1 +Author: 滔哥 +Date: Mon May 28 08:41:53 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 18cf9473da6d759c16ae41817b8f82f393d86ed8 +Author: 滔哥 +Date: Mon May 28 08:41:45 2018 +0800 + + * Finish task#4258 + +commit 6548de69b14e745639d4dedf12ee8fa8b9f31e3e +Author: Catouse +Date: Fri May 25 18:37:33 2018 +0800 + + * add more labels styles. + +commit 84ece31c0dafc906fe85fc2d5e14c398a3f8f498 +Merge: 2f970e721a 474649aae8 +Author: Catouse +Date: Fri May 25 17:56:51 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2f970e721abe7204864b3a3f46b2e3e36fa39d49 +Author: Catouse +Date: Fri May 25 17:56:43 2018 +0800 + + * change style of project/story view. + +commit 474649aae884cf0af0f501021f5d2e25d434799b +Merge: fc3bf027dc 9dde09ad05 +Author: 滔哥 +Date: Fri May 25 17:30:01 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fc3bf027dc83e0d7ff5d5024268ff739b2675664 +Author: 滔哥 +Date: Fri May 25 17:29:54 2018 +0800 + + * Format code. + +commit 8f7d0ca97045396fa12cd842288045263d46926a +Author: Catouse +Date: Fri May 25 17:24:33 2018 +0800 + + * change style of project/linkstory view. + +commit 9dde09ad05165c3664672e2acf8307ac68b6d2cb +Author: chenfeiCF +Date: Fri May 25 17:23:20 2018 +0800 + + * Finish task #4306. + +commit 394632d8fa3de8bc6320c02e0ad8bd1997096861 +Merge: 6d460fac3c a220646406 +Author: Catouse +Date: Fri May 25 17:07:18 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + # Conflicts: + # module/bug/js/browse.js + +commit 6d460fac3c9d5901329b49eeb62f35cc2ac900b8 +Author: Catouse +Date: Fri May 25 17:05:57 2018 +0800 + + * remove last divider item in navbar. + +commit 2b14bf65fe42e1977629d6d5a2ca0c83c214bb37 +Author: Catouse +Date: Fri May 25 17:05:40 2018 +0800 + + * refactor bug/browse view. + +commit 5e787cddc641c2f8cd1abeda1b720ddfb0e4b774 +Author: Catouse +Date: Fri May 25 17:05:11 2018 +0800 + + * add timestramp to js css url to prevent browser cache for debug mode. + +commit a220646406c6058561c2e7a9427e431ec6ab81e7 +Author: daitingting +Date: Fri May 25 16:47:48 2018 +0800 + + * Adjust link for view story. + +commit 1498e2441a79f11d4877c864d2e4f20975b899c8 +Merge: 996c25cd4b 3e31e43c04 +Author: daitingting +Date: Fri May 25 16:21:45 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 996c25cd4bccc05cf921167ff3167a3f98828a7d +Author: daitingting +Date: Fri May 25 16:20:33 2018 +0800 + + * Load custom from db when upgradeVersion > 4.3.beta. + +commit 3e31e43c049d7dc367f20e961c858265b9828375 +Author: 滔哥 +Date: Fri May 25 16:08:56 2018 +0800 + + * Finish task#4262. + +commit 7659a88f15a66a7ac88082183576d9f6069f76e3 +Merge: c748ede499 aea82f1c87 +Author: wangyidong +Date: Fri May 25 15:30:20 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c748ede499d466e1ab29d0f9424732adca96e9e4 +Author: wangyidong +Date: Fri May 25 15:29:43 2018 +0800 + + * fix for shortcut query. + +commit aea82f1c87dc550ff91913b72d79798445ec6106 +Merge: 761c65bf72 d240986143 +Author: 滔哥 +Date: Fri May 25 15:11:09 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 761c65bf72c7d3d83cde3372c0a97628a33c1d35 +Author: 滔哥 +Date: Fri May 25 15:11:02 2018 +0800 + + * Finish task#4277. + +commit d2409861432e27c5a217e3bbf1f4b60cfa2fddee +Merge: 167b26c2d5 aa31d9637d +Author: daitingting +Date: Fri May 25 15:01:20 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 167b26c2d5a105472f7cc8e837cbec6015db8c90 +Author: daitingting +Date: Fri May 25 15:00:12 2018 +0800 + + * Adjust style for promotion. + +commit aa31d9637d528c5b8dcce8c1b80aac93b71f7a3a +Merge: 613231b9f5 df69baf1b7 +Author: tengfei +Date: Fri May 25 14:55:44 2018 +0800 + + * Test. + +commit 613231b9f56d400dcc1b7216f19fe9eab6ce14c9 +Author: tengfei +Date: Fri May 25 14:44:24 2018 +0800 + + *changed story translation + +commit df69baf1b726598ab52dea342cde2dc5fc94c897 +Merge: 23973cbdb6 66560e81e3 +Author: wangyidong +Date: Fri May 25 14:43:59 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 66560e81e36f508c4ebdff25905d77aed6af8964 +Author: Catouse +Date: Fri May 25 14:43:18 2018 +0800 + + * fix columns size of product block view. + +commit ee3cb35d390062518f12cdadffd259f8ceacc497 +Author: Catouse +Date: Fri May 25 14:42:27 2018 +0800 + + * fix fixed head table style. + +commit 23973cbdb68d56f5a997e6a6bef13903adcc1cca +Author: wangyidong +Date: Fri May 25 14:40:49 2018 +0800 + + * finish task #4164. + +commit 9b0f31cccf130bc48341f6275d3e9f0802990b60 +Merge: dd20d480d3 50cef96291 +Author: Catouse +Date: Fri May 25 14:40:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dd20d480d3879d2e779335853f9fff2015a8d992 +Author: Catouse +Date: Fri May 25 14:40:11 2018 +0800 + + * fix UI of testcase/showimport modal view. + +commit 75a4a63a37bb2de7615bd55bae657efbad6ecb1a +Author: 滔哥 +Date: Fri May 25 14:31:23 2018 +0800 + + * Finish task#4278. + +commit 50cef962912eec053ed28d368d52eb6c6fa061dc +Merge: 61185f2467 fd75fbfe0d +Author: daitingting +Date: Fri May 25 14:24:15 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 61185f24673c79a50c1947a1a1630a3b265524d6 +Author: daitingting +Date: Fri May 25 14:23:34 2018 +0800 + + * Give a tip when there is no product or project. + +commit fd75fbfe0d79da502136ba2f8c0fec6847a960f4 +Author: 滔哥 +Date: Fri May 25 14:11:52 2018 +0800 + + * Test task#4278 + +commit 857642662b7c2ecf1105933f68a769cbbc726b80 +Merge: 52bcaad547 30e345a010 +Author: 滔哥 +Date: Fri May 25 14:08:05 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 52bcaad54715faac787d0d52e2deccf26f00a8ba +Author: 滔哥 +Date: Fri May 25 14:07:59 2018 +0800 + + * Test task#4278 + +commit 30e345a010dd8bd45132acd63fe3064d05b6cc4d +Merge: 52b93dc694 69321876bc +Author: daitingting +Date: Fri May 25 13:45:58 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 52b93dc694eddf071ccbc89b4271a6137caa3008 +Author: daitingting +Date: Fri May 25 13:45:37 2018 +0800 + + * Adjust type for statistic block of project. + +commit 69321876bc0ab1135ce7133bb3549b1cbab2a93d +Merge: 41973195df e27dbca164 +Author: Catouse +Date: Fri May 25 13:13:46 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 41973195dfdc206c6804ce2da79bea14f8462dd2 +Author: Catouse +Date: Fri May 25 13:13:38 2018 +0800 + + * change buttons style in datatable/ajaxcustom modal view. + +commit e27dbca164081c45a2a41462bdd336469e59f5d8 +Merge: fdb74ef7ec cd932cf4ff +Author: 滔哥 +Date: Fri May 25 11:33:51 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fdb74ef7ec021b3f9337007d57785af41194b448 +Author: 滔哥 +Date: Fri May 25 11:33:46 2018 +0800 + + * Finish task#4252 + +commit cd932cf4ff949085f3749d129a549affb7c253f8 +Author: Catouse +Date: Fri May 25 11:23:05 2018 +0800 + + * change style of project/kanban views. + +commit 5663a6baa0503ae46d152e502589c9d6c802afce +Merge: 8d78fa409a e851690722 +Author: Catouse +Date: Fri May 25 11:09:20 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8d78fa409a2e1cc63ac658056756a1d3c862d3c7 +Author: Catouse +Date: Fri May 25 11:09:12 2018 +0800 + + * change style of dynamic views. + +commit e851690722a13726829bcc00d5b39f8bbd15bf49 +Author: daitingting +Date: Fri May 25 10:59:29 2018 +0800 + + * Adjust space between btn. + +commit fbdf2b54a9c564eff3e9790ee502528a00b6c506 +Author: daitingting +Date: Fri May 25 10:31:09 2018 +0800 + + * Adjust space between btn. + +commit f5932df92cef8d155844529ff9343f6179cf5ac8 +Author: daitingting +Date: Fri May 25 10:26:20 2018 +0800 + + * Adjust space between btn. + +commit 651a75ac71523791bf743d1f2d20a296a859b6ec +Author: daitingting +Date: Fri May 25 10:18:13 2018 +0800 + + * Adjust space between btn. + +commit 7fbb8566cc763fe76eb74a0f285b0b5141e3d1f6 +Merge: f43b357836 9065c7885b +Author: daitingting +Date: Fri May 25 10:13:51 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f43b35783637789fac09b012b8e1e5067ad448c7 +Author: daitingting +Date: Fri May 25 10:13:33 2018 +0800 + + * Adjust space between btn. + +commit 9065c7885bf162dae47e7d67ab60c9677c01cc42 +Merge: 37e5c9188a c21a6689ac +Author: wangyidong +Date: Fri May 25 10:06:16 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 37e5c9188a2e3a6bf6419bec81520fce26106cfe +Author: wangyidong +Date: Fri May 25 10:05:48 2018 +0800 + + * code for task #4229. + +commit c21a6689ac39b58b18f5d9ac87247eab2bd97931 +Merge: 3ece122648 4205a87992 +Author: daitingting +Date: Fri May 25 10:04:14 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3ece122648e2f2c9de5db596d76e8af1e7ee40c9 +Author: daitingting +Date: Fri May 25 10:03:58 2018 +0800 + + * Adjust space between btn. + +commit 4205a87992b0600c625b25c7dde793da27f002bf +Merge: f8bd140942 a101010468 +Author: wangyidong +Date: Fri May 25 10:02:45 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f8bd140942800684a691db5dd945436781c57f6f +Author: wangyidong +Date: Fri May 25 10:02:12 2018 +0800 + + * finish task #4155. + +commit a101010468374adb1ee78132a1bdcb893bb302b6 +Merge: b727812b38 92e63812b1 +Author: Catouse +Date: Fri May 25 09:54:37 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b727812b38a55fbf36d0420bfdf37f129a943f61 +Author: Catouse +Date: Fri May 25 09:54:27 2018 +0800 + + * improve UI of story/change form view. + +commit 92e63812b141dfa9b1674b5446e04728909026eb +Author: daitingting +Date: Fri May 25 09:52:56 2018 +0800 + + * Adjust space between btn. + +commit b102f46568cf7a8a04d40e56ead1373fcce26bea +Author: daitingting +Date: Fri May 25 09:47:53 2018 +0800 + + * Adjust space between btn. + +commit 3a4aa88169d45afdbf7acef3a7cc1a2443b7c122 +Author: daitingting +Date: Fri May 25 09:35:47 2018 +0800 + + * Adjust space between btn. + +commit 4a12f37828c799a885fbc39d2308eb56308a7a40 +Author: daitingting +Date: Fri May 25 09:16:19 2018 +0800 + + * Adjust lang. + +commit ad44994c82d5d80c190505451dda1bd4b50bf20d +Merge: 27228fda90 99f302541e +Author: daitingting +Date: Fri May 25 09:15:27 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 27228fda908e3d37151c58c3d48eba470753849e +Author: daitingting +Date: Fri May 25 09:12:59 2018 +0800 + + * Adjust space between button. + +commit 99f302541ee96ee82b367e2fc53d2b7040d3b1b9 +Author: Catouse +Date: Fri May 25 08:49:17 2018 +0800 + + * change style of qastatistic block. + +commit 44e343764a8da91239d9f16fa25312d7bbf8064f +Author: Catouse +Date: Fri May 25 08:45:48 2018 +0800 + + * remove autocomplete attribute from datetimepicker input control. + +commit 409eaa2abac6329e95bcdc76cac405f1cbb24490 +Author: Catouse +Date: Fri May 25 08:42:22 2018 +0800 + + * remove dotted border arround buttons and link in firefox. + +commit 00e3ba2911841244201b388b0b99e0560fbce7db +Author: Catouse +Date: Fri May 25 08:41:49 2018 +0800 + + * change tablesorter style. + +commit cf906f6e619f0ae49dc6e96796adab2bc2d2c9e8 +Author: Catouse +Date: Thu May 24 17:49:29 2018 +0800 + + * remove chosen-simple class. + +commit 4291dd0ee3f345dc752bcc33450f11c57c69f849 +Author: Catouse +Date: Thu May 24 17:46:48 2018 +0800 + + * improve UI for mac by update zui css file. + +commit 55b5b0ed3514e651cb14085309d46f12d7ccbacd +Author: Catouse +Date: Thu May 24 17:46:34 2018 +0800 + + * change style of productplan/edit view. + +commit 8d3db7963d1be75b559a508a1445d1acfbecf5aa +Author: Catouse +Date: Thu May 24 17:22:40 2018 +0800 + + * change style of language change btn in login view. + +commit 380cb6ac4a16902e4bd0ecccb39c17ef8234bb6b +Merge: bfc735fb22 2e797e3ff7 +Author: Catouse +Date: Thu May 24 17:19:20 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bfc735fb2206555abb1ab279210c72c657fda97b +Author: Catouse +Date: Thu May 24 17:19:13 2018 +0800 + + * refactor codes. + +commit 2e797e3ff76e5338d42e04fab1e342c39809f179 +Merge: c908111095 a40d9e5b13 +Author: wangyidong +Date: Thu May 24 17:08:30 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c908111095ce9b5428db767152d3659116aa673d +Author: wangyidong +Date: Thu May 24 17:08:16 2018 +0800 + + * adjust for style. + +commit a40d9e5b13aee4d4c8785855c9905fb9a2923ba6 +Merge: 4c38efb845 7dc82af32f +Author: Catouse +Date: Thu May 24 17:06:07 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4c38efb845f85dc8f96877e585fc98b384c6776d +Author: Catouse +Date: Thu May 24 17:05:57 2018 +0800 + + * improve UI of links on footer. + +commit 7dc82af32f02513d9b25b0116f47246bebb15eae +Merge: e9f36319b7 9f10cc9733 +Author: wangyidong +Date: Thu May 24 16:54:31 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e9f36319b7ba2b85bbd7d29c6b0a507ab73b3333 +Author: wangyidong +Date: Thu May 24 16:54:11 2018 +0800 + + * finish task #4198. + +commit 3ece82b0e9ece6da134382379cabfde876a90791 +Author: Catouse +Date: Thu May 24 16:54:01 2018 +0800 + + * remove line numbers in import lines modal. + +commit ca065c7685cda3e13f64d2f343b9fbca5da32b4f +Author: Catouse +Date: Thu May 24 16:51:27 2018 +0800 + + * refactor testcase/import view. + +commit 9f10cc973384919f8f0bcbab2aef07de711befff +Merge: 94fbe8fa9a 652c32f680 +Author: Catouse +Date: Thu May 24 16:18:34 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 94fbe8fa9a13ba2b21d96dc38a565ce5d4d9d8ab +Author: Catouse +Date: Thu May 24 16:18:26 2018 +0800 + + * improve UI of task/batchcreate view. + +commit 652c32f6804d3b6f17ee9ed364a858ffd848c860 +Merge: f80a55c778 7af210ef82 +Author: wangyidong +Date: Thu May 24 15:58:33 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f80a55c7783ca75a05d6c5b9e97eb29164738058 +Author: wangyidong +Date: Thu May 24 15:56:01 2018 +0800 + + * code for task #4144. + +commit 7af210ef82f33a215fb1ecec5dbd521d72a743e9 +Author: 滔哥 +Date: Thu May 24 15:55:33 2018 +0800 + + * Finish task#4248 + +commit 2dbc8f4e38ff9b7e7047d5ec844a39fa46f85f6d +Merge: df26471865 c108997503 +Author: Catouse +Date: Thu May 24 15:48:54 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit df264718656ded6ac0e7bf86dce92a27f15b96ab +Author: Catouse +Date: Thu May 24 15:48:47 2018 +0800 + + * improve UI of modules and depts tree view. + +commit c108997503365c2f9895d3a43683c54ccf2e94f7 +Author: 滔哥 +Date: Thu May 24 15:29:32 2018 +0800 + + * Fix bug. + +commit 4479572d29e769c5eedb527f1a7c5cefcfc99946 +Merge: 824d50abe3 10b0c24c1c +Author: 滔哥 +Date: Thu May 24 15:17:32 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 824d50abe36174573124c7e823ada374277ca3c9 +Author: 滔哥 +Date: Thu May 24 15:17:27 2018 +0800 + + * Fix task#4270. + +commit 10b0c24c1c6e23e94420667daac6747915924ae9 +Author: wangyidong +Date: Thu May 24 15:01:15 2018 +0800 + + * finish task #4214. + +commit 199b394876b83a495d508301272ccf7341d4fc77 +Merge: 836c897e2c 0b694e3211 +Author: wangyidong +Date: Thu May 24 14:52:13 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 836c897e2cf28d8a25dfd0e06c22c1dc901b7cd5 +Author: wangyidong +Date: Thu May 24 14:51:48 2018 +0800 + + * finish task #4144. + +commit 0b694e321118b0acb2bb5164b66c1ab1014ed03c +Merge: d5c423ada8 dc574c8ac2 +Author: 滔哥 +Date: Thu May 24 14:49:09 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d5c423ada84408bd7520b7f2ac4aa3ceefaa0eb6 +Author: 滔哥 +Date: Thu May 24 14:48:56 2018 +0800 + + * Fix task#4276. + +commit dc574c8ac23fb8d37e09eec29410cf99783e3f2b +Author: Catouse +Date: Thu May 24 14:44:49 2018 +0800 + + * adjust style of todo block. + +commit 9ae25e6922774546efe179e97202b5140952d634 +Merge: 4cb3f674b5 93133f1b08 +Author: Catouse +Date: Thu May 24 14:41:57 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 93133f1b082740aa2ca96e414c8c7326303fe4cd +Author: wangyidong +Date: Thu May 24 14:40:50 2018 +0800 + + * finish task #4203. + +commit 4cb3f674b571a14a3e8a537ecc5f1ceed2e6b6b6 +Merge: 38c5df9d53 08b5bcc3f3 +Author: Catouse +Date: Thu May 24 14:40:41 2018 +0800 + + Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms + +commit 38c5df9d53e6dec044660ae84cae0aced48f7c57 +Author: Catouse +Date: Thu May 24 14:40:14 2018 +0800 + + * make sidebar toggle to click more easy. + +commit 08b5bcc3f34bbf88e490d48e70d933e5ce5ef673 +Merge: 684c709691 bacd1f2625 +Author: wangyidong +Date: Thu May 24 14:39:21 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 684c70969170772abe0c026b65b1722711b279c6 +Author: wangyidong +Date: Thu May 24 14:38:40 2018 +0800 + + * fix bug for batch edit testcase. + +commit bacd1f2625d914386b0ba925965fcf9d8cf261e9 +Author: Catouse +Date: Thu May 24 14:33:28 2018 +0800 + + * change pageSetting dropdown menu UI. + +commit af6d054acc1bb25e1b488c9a571f104007bf526c +Author: Catouse +Date: Thu May 24 14:29:36 2018 +0800 + + * improve UI of doc module views. + +commit 8499d04368e592f0b1d33cccaf74a4ad5d262de3 +Author: Catouse +Date: Thu May 24 14:16:34 2018 +0800 + + * improve UI of doc and file module views. + +commit 7f698a49b96d976f86841be51f027d5535a074ed +Author: Catouse +Date: Thu May 24 11:27:08 2018 +0800 + + * improve UI of testsuite module views. + +commit 52cbee494c4a92dd54cfe964422c3c6d7e053190 +Author: Catouse +Date: Thu May 24 11:23:32 2018 +0800 + + * finish task #4251. + +commit 0a891a0b81b2d9bc3d57093ca7c7ac2a8898e5f0 +Merge: b6b41ae2da c9ff66d9f7 +Author: Catouse +Date: Thu May 24 11:10:12 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b6b41ae2da1a6006dadddf1712f7b53d9fc84c62 +Author: Catouse +Date: Thu May 24 11:10:05 2018 +0800 + + * refactor codes. + +commit c9ff66d9f71bc22f6674d41b1e4dcf76f4099d4c +Merge: dbd536dba5 b885520b46 +Author: wangyidong +Date: Thu May 24 11:03:43 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit dbd536dba5e912334055330895c37275e379afab +Author: wangyidong +Date: Thu May 24 11:03:08 2018 +0800 + + * finish task #4197. + +commit b885520b468cbebb7e1fef9d90826d91db5f916a +Author: chenfeiCF +Date: Thu May 24 10:48:14 2018 +0800 + + * Finish task #4312, #4308. + +commit 930d8b6c8bf531f21f2008f73976054ecd33db13 +Merge: 32e89f4eea 1c89503442 +Author: 滔哥 +Date: Thu May 24 10:18:06 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 32e89f4eead981ff7cf131b352267faf28844eba +Author: 滔哥 +Date: Thu May 24 10:18:02 2018 +0800 + + * Finish task#4242 + +commit 1c895034425381670eceb465f48a46ba613040b6 +Author: chenfeiCF +Date: Thu May 24 09:56:44 2018 +0800 + + * Finish task #4313. + +commit bb083468aeb2d8b284cc282d115a1be128d65193 +Merge: 6290a8bd5b 6aab932c26 +Author: wangyidong +Date: Thu May 24 09:35:01 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6290a8bd5b58608c488e84521b10a983c371254a +Author: wangyidong +Date: Thu May 24 09:34:33 2018 +0800 + + * finish task #4207. + +commit d5c6aa1831759ba57dfae6e5655d9abfae29aa45 +Merge: c2c60714df 6aab932c26 +Author: 滔哥 +Date: Thu May 24 09:21:37 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c2c60714df674e97124bc606f4542ca0ed1e2d15 +Author: 滔哥 +Date: Thu May 24 09:21:29 2018 +0800 + + * Finish task#4245 + +commit 6aab932c265da43905766847954667de0d23c91a +Author: chenfeiCF +Date: Thu May 24 09:19:48 2018 +0800 + + * Finish task #4314, #4315, #4316. + +commit 9a6abfb9c8ae272723ae63b3fd6f82e1da726f1c +Author: 滔哥 +Date: Thu May 24 09:14:20 2018 +0800 + + * Finish task#4259 + +commit 5bf8aa791e071e6f72b79c030ae115cf191e96ac +Merge: 059b28ef26 d311af3c76 +Author: Catouse +Date: Wed May 23 18:21:28 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 059b28ef2680e8e47518861846d1abe123ff06bf +Author: Catouse +Date: Wed May 23 18:21:04 2018 +0800 + + * refactor dashboard blocks UI. + +commit d311af3c7693b279d70ceb1ac249fb59d8413521 +Merge: ca13dc8c93 ef4f1e99e6 +Author: 滔哥 +Date: Wed May 23 17:30:58 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ca13dc8c9369e1a731b93ffc627e2e23f8ee1798 +Author: 滔哥 +Date: Wed May 23 17:30:52 2018 +0800 + + * Fix bug. + +commit ef4f1e99e648a22f59953b426b39a4cdbc941938 +Author: wangyidong +Date: Wed May 23 17:08:54 2018 +0800 + + * finish task #4209. + +commit e67173bced8f64d0c33bc00742396d2f5729cfb7 +Author: Catouse +Date: Wed May 23 16:50:38 2018 +0800 + + * change style of todo block. + +commit 2b0742f2d776cba561b8762986c877a3f6c34f41 +Author: wangyidong +Date: Wed May 23 16:49:27 2018 +0800 + + * finish task #4211. + +commit f360738910503d8469fd255d3f568e5fda0d5c73 +Merge: 311e4dda78 3b6d54fced +Author: wangyidong +Date: Wed May 23 16:46:23 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 311e4dda780aa1b11bff7eb98edbd4a25f7b12bc +Author: wangyidong +Date: Wed May 23 16:46:02 2018 +0800 + + * finish task #4213. + +commit 3b6d54fced7173982e3a848e4ed2aee6a68d3d71 +Merge: 8ec5037fa8 ae4c8f518b +Author: Catouse +Date: Wed May 23 16:45:32 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ae4c8f518b45751624fbeb811ee674ddbe3b9d0b +Author: wangyidong +Date: Wed May 23 16:40:00 2018 +0800 + + * finish task #4215. + +commit 5a903de6fdc44af5c26b42e375aaf78ea044902e +Author: wangyidong +Date: Wed May 23 16:36:11 2018 +0800 + + * finish task #4216. + +commit 8ec5037fa82f87849538b2d3737ba52c16a49910 +Merge: 69c91ce6a4 057f94defa +Author: Catouse +Date: Wed May 23 16:26:23 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 69c91ce6a4af2f4c34cc8d658df53dda06651757 +Author: Catouse +Date: Wed May 23 16:26:15 2018 +0800 + + * change page side gap size to 20. + +commit 244a261be4d03b6b00a3915dd4a1bc400dd9ee78 +Author: wangyidong +Date: Wed May 23 16:25:50 2018 +0800 + + * finish task #4217. + +commit 09aa64dceba0be3a8d46ef0d4a0e0e1bd80ceb59 +Merge: 05cd17ed09 057f94defa +Author: daitingting +Date: Wed May 23 16:22:55 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 057f94defaad88984c14520c4744b99b63f5a8f1 +Author: wangyidong +Date: Wed May 23 16:20:46 2018 +0800 + + * finish task #4219. + +commit 3eb7f3107cad5ebb1fbf8936f70ea4c61dd6874b +Merge: ee0ac234b2 ccc102717f +Author: wangyidong +Date: Wed May 23 16:19:41 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ee0ac234b256c1f9d02093d1d1c8c14d412f1c36 +Author: wangyidong +Date: Wed May 23 16:19:11 2018 +0800 + + * finish task #4220. + +commit 05cd17ed09a86531bbec46f1d1323724925e24b8 +Merge: b7de0d5e8f 0cd84a4639 +Author: daitingting +Date: Wed May 23 16:14:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b7de0d5e8f5aac915fe58378dd2592f1b4917d95 +Author: daitingting +Date: Wed May 23 16:13:49 2018 +0800 + + * Adjust width for actions. + +commit ccc102717f3fe41b98372ec34772cb42c984dd70 +Merge: 02ec99fee6 0cd84a4639 +Author: Catouse +Date: Wed May 23 16:13:41 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 02ec99fee6b120754b74c14aeb51e6ad7feb0823 +Author: Catouse +Date: Wed May 23 16:13:15 2018 +0800 + + * adjust style of report views. + +commit 0cd84a46397fd91d45aab2d286480ce3ec9a9a58 +Merge: f1532b204d c746cc2d6b +Author: 滔哥 +Date: Wed May 23 16:09:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f1532b204d9059d1a63ebf982920cc93c84e08cd +Author: 滔哥 +Date: Wed May 23 16:09:30 2018 +0800 + + * Fix bug. + +commit 4f7052c4fc9f0f9489548c781efc3cd91615a511 +Author: Catouse +Date: Wed May 23 16:03:52 2018 +0800 + + * adjust style of report/bugcreate view. + +commit c746cc2d6b6789ac1723cb3bbab5a838da9c3ced +Merge: 628179d1ba 59229caa10 +Author: Catouse +Date: Wed May 23 15:58:07 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 628179d1ba386b9cd292e11f7162379848914448 +Author: Catouse +Date: Wed May 23 15:57:57 2018 +0800 + + * improve UI of bug views. + +commit 59229caa1094c101f2abeb62bceabf90539aa452 +Merge: ad8b144d5c f5b1e98a39 +Author: chenfeiCF +Date: Wed May 23 15:49:25 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ad8b144d5cffd8a68fd7c73f193eb300423857e6 +Author: chenfeiCF +Date: Wed May 23 15:47:53 2018 +0800 + + * Finish task #4309, #4310. + +commit f5b1e98a39fb109568e577f89bde6a4f4008802f +Merge: a516365977 6827a6b0e8 +Author: daitingting +Date: Wed May 23 15:43:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a516365977aea355ce81a1ea171860073aac4f35 +Author: daitingting +Date: Wed May 23 15:42:53 2018 +0800 + + * Adjust language. + +commit 6827a6b0e8aab5c8174f0a763a4c1215edff5f2a +Merge: e54b7946fc d4ae0184ed +Author: wangyidong +Date: Wed May 23 15:35:12 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e54b7946fc784140e3dbdde673bb644bfb7461f8 +Author: wangyidong +Date: Wed May 23 15:34:46 2018 +0800 + + * finish task #4222. + +commit d4ae0184edc4614f8420e2dddc7b5467ac0a6562 +Merge: 34891f0049 483df2da30 +Author: Catouse +Date: Wed May 23 15:33:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 34891f004965160ba221f54dfbd4066aaca24f42 +Author: Catouse +Date: Wed May 23 15:33:10 2018 +0800 + + * adjust style of copy project modal in project/create view. + +commit 483df2da308752636f5108a2fd13db06df1975b8 +Author: chenfeiCF +Date: Wed May 23 15:21:52 2018 +0800 + + * Finish task #4307. + +commit 4ef0cd64320e28a8a5fa2b7bf3e04736a9feba13 +Merge: 7388d561c3 8a9aa521e2 +Author: chenfeiCF +Date: Wed May 23 15:14:40 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8a9aa521e25b1ddf660e462619cb694608983483 +Merge: 67aec16baa 25df6f2233 +Author: wangyidong +Date: Wed May 23 15:12:11 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 67aec16baafd70c17413b0d01c4eac3eee97fe89 +Author: wangyidong +Date: Wed May 23 15:11:48 2018 +0800 + + * finish task #4224. + +commit 25df6f22339eb838885fd6ce0ad354110282d27e +Merge: da248b64bc b17beb30c8 +Author: daitingting +Date: Wed May 23 15:00:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit da248b64bc52f808d254284ddca5783821f415e0 +Author: daitingting +Date: Wed May 23 14:59:48 2018 +0800 + + * Adjust width. + +commit b17beb30c8c9c90c32edea1023211654895b06ef +Merge: b1bbcb7c22 1d325061fd +Author: wangyidong +Date: Wed May 23 14:56:03 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b1bbcb7c2287f62a372af43955a84f7a76c53620 +Author: wangyidong +Date: Wed May 23 14:55:33 2018 +0800 + + * finish task #4225. + +commit 1d325061fdacde33fb8962422af550110a1683f2 +Merge: 6c48a85460 74c933526a +Author: daitingting +Date: Wed May 23 14:51:42 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 74c933526a7d144968a79fb08a751766042fa5f6 +Author: Catouse +Date: Wed May 23 14:51:15 2018 +0800 + + * change style of misc/changelog view. + +commit 7388d561c3602cf97691e03e1c990bcbf41ac413 +Author: chenfeiCF +Date: Wed May 23 14:51:09 2018 +0800 + + * Adjust contact list box. + +commit 6c48a85460e9ec79acb36b0a4a0c4e9331388da1 +Author: daitingting +Date: Wed May 23 14:49:37 2018 +0800 + + * Adjust position for productModal, projectModal. + * Adjust position for required note. + +commit b9d7e79e55a15fb0a9199beba3135a3c69f1efff +Author: wangyidong +Date: Wed May 23 14:31:40 2018 +0800 + + * finish task #4226. + +commit 165d70340405fc9a5d5590baa19762d8b7a3f508 +Merge: 3b2acc23ad d157270639 +Author: Catouse +Date: Wed May 23 14:30:18 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3b2acc23ad801be211173f82dfad03f18c118f12 +Author: Catouse +Date: Wed May 23 14:30:07 2018 +0800 + + * refactor form views. + +commit d157270639c51abdbeabfcc942efa0d2d308c715 +Merge: f45e4e0369 cf39b6844f +Author: 滔哥 +Date: Wed May 23 14:26:43 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f45e4e03696456186dc1260a33ba0fead96d0cc0 +Author: 滔哥 +Date: Wed May 23 14:26:36 2018 +0800 + + * Fix task#4261 + +commit cf39b6844fd47a880649f901f556a42841f44e2d +Author: wangyidong +Date: Wed May 23 14:23:07 2018 +0800 + + * finish task #4227. + +commit 378f5d400173cc740f1b97ab42f27463ce291651 +Merge: 2c57a1cbe7 e2a77d6b3b +Author: wangyidong +Date: Wed May 23 14:21:04 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e2a77d6b3bde036da0f3eb1a0732a774eb9a8b59 +Merge: f4d2556759 004d879698 +Author: 滔哥 +Date: Wed May 23 14:20:51 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2c57a1cbe772a3af66333dea7521b1cee22b24f0 +Author: wangyidong +Date: Wed May 23 14:20:44 2018 +0800 + + * finish task #4228. + +commit f4d25567593cc2bff7946095615d131898b746a6 +Author: 滔哥 +Date: Wed May 23 14:20:43 2018 +0800 + + * Finish task#4235 + +commit e1edf82e5373ef156c36304aba378230d561bcb9 +Author: 滔哥 +Date: Wed May 23 14:17:10 2018 +0800 + + * Finish task#4232 + +commit 004d879698f33def8bf8fb87490d0352970509ad +Author: wangyidong +Date: Wed May 23 14:13:40 2018 +0800 + + * finish task #4229. + +commit eb8da77db56040433d79d94b2b58cf2420c20a6c +Author: Catouse +Date: Wed May 23 14:09:01 2018 +0800 + + * change main form style and finish task #4193. + +commit 78a6b623905de9d77c6c449c8cafc7af23dd520a +Merge: e5f1368924 2751dfc81f +Author: Catouse +Date: Wed May 23 14:06:41 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e5f1368924c6a3bdcfdbe360b98c9d17d98ccb12 +Author: Catouse +Date: Wed May 23 14:06:33 2018 +0800 + + * change btn style in table of bug/browse view. + +commit dbabcd9c92214b9896645a61700ea83b87653099 +Author: wangyidong +Date: Wed May 23 14:05:56 2018 +0800 + + * finish task #4230. + +commit 2751dfc81ff100980594997d211aa67285406e37 +Merge: b6a703667d f04993b2c9 +Author: wangyidong +Date: Wed May 23 13:59:57 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b6a703667d56e110e44abd69c3f6b57f19c1723c +Author: wangyidong +Date: Wed May 23 13:59:31 2018 +0800 + + * finish task #4231. + +commit f04993b2c98e59a977fcd1b2d4a1228fa0406efb +Merge: 34fa242fc1 527e7c9529 +Author: 滔哥 +Date: Wed May 23 13:45:32 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 34fa242fc15da3852ad37508c47e30abaa6febc8 +Author: 滔哥 +Date: Wed May 23 13:45:26 2018 +0800 + + * Finish task#4261 + +commit 527e7c9529d301140fa5261ec6e9edec7ff3c3b9 +Merge: 03d5875a19 91d242b1c3 +Author: daitingting +Date: Wed May 23 13:05:13 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 03d5875a1978946f300b7682deb477a1a056a554 +Author: daitingting +Date: Wed May 23 13:04:56 2018 +0800 + + * Adjust space between btn. + +commit 91d242b1c35a0d5dba718657fe36fea8aba908bc +Author: 滔哥 +Date: Wed May 23 11:52:46 2018 +0800 + + * Finish task#4263 + +commit e0eced298369276ee828d8720a8efbc393f1771a +Merge: 4188bcabf5 75b73f9a0f +Author: Catouse +Date: Wed May 23 11:43:20 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4188bcabf5fe4e0f2c284e63aa636c5b2903a6a6 +Author: Catouse +Date: Wed May 23 11:43:13 2018 +0800 + + * improve UI of projet/tree view. + +commit 75b73f9a0ff6d0ea0b031088d9620bd9d7356b45 +Merge: e677941b5f 9058191fcc +Author: 滔哥 +Date: Wed May 23 11:24:48 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e677941b5f6a7e3257366b16beb668f7318f6ce9 +Author: 滔哥 +Date: Wed May 23 11:24:36 2018 +0800 + + * Finish task#4264 + +commit 9058191fcc93bbcc26966377923a6fcf01fec95d +Merge: 9017f1df06 91278a361f +Author: Catouse +Date: Wed May 23 11:09:29 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9017f1df066410950675d100bc1aba815aeef651 +Author: Catouse +Date: Wed May 23 11:08:56 2018 +0800 + + * refactor kindeditor usage. + +commit 26d116631b50ee8c734927eee5737b725cf480de +Author: Catouse +Date: Wed May 23 11:08:42 2018 +0800 + + * update zui files. + +commit 91278a361fb62f559ca1d1fcee7f34deaea322ba +Author: chenfeiCF +Date: Wed May 23 10:52:35 2018 +0800 + + * Finish task #4301. + +commit 080fafdcdd438a3f351c5765863ceb9c33b1c261 +Merge: 111d0998da f918a52876 +Author: 滔哥 +Date: Wed May 23 10:46:06 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 111d0998da90d1b5933e9e20b2127497edb713e1 +Author: 滔哥 +Date: Wed May 23 10:45:58 2018 +0800 + + * Finish task#4270. + +commit f918a5287604fd105a7c06c688e4c25949f778fd +Merge: 42589ff9a7 68e3f766e7 +Author: daitingting +Date: Wed May 23 10:43:23 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 42589ff9a7a183eeb01c930d9dd9e7d9a7bd0bb2 +Author: daitingting +Date: Wed May 23 10:43:06 2018 +0800 + + * Adjust language. + +commit 68e3f766e7bb516e4ea13f220bf0b161b749a1ae +Merge: 1035026243 e40d43c01c +Author: wangyidong +Date: Wed May 23 10:36:15 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d0ba096c2e3cb3b53441223debfd1dc9c8b7a82b +Merge: 77c3c7210e e40d43c01c +Author: tengfei +Date: Wed May 23 10:36:13 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 103502624393e8efa31718d83b8361803ae41fdb +Author: wangyidong +Date: Wed May 23 10:35:30 2018 +0800 + + * fix bug for high light and make int package. + +commit 77c3c7210e243e9b14e8bffe7a6ae3e9a9472078 +Author: tengfei +Date: Wed May 23 10:35:10 2018 +0800 + + *todo trans change + +commit e40d43c01c760fdfac5629e1f9c462b6ed8d5dc9 +Author: daitingting +Date: Wed May 23 10:35:07 2018 +0800 + + * Adjust format for build id. + +commit de490110fc224095fdd06ab7a11b3fe8c31137f5 +Merge: 92bafeedcd 950315d46e +Author: Catouse +Date: Wed May 23 10:27:52 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 92bafeedcd6fa729e79df4d21494d072d9239b33 +Author: Catouse +Date: Wed May 23 10:27:45 2018 +0800 + + * fix icon class name. + +commit 950315d46e347b01dd85cc59f7c3b1154073c75f +Author: 滔哥 +Date: Wed May 23 10:22:53 2018 +0800 + + * Finish task#4275 + +commit f6b02b7071d4c359425f9b19df32eb5345a6eb50 +Author: Catouse +Date: Wed May 23 10:15:45 2018 +0800 + + * fix style of assignto button in main table. + +commit 3d686f09d1f5c696168d1628a988a9ec15f884e4 +Merge: 4f35262fae ac539b735d +Author: 滔哥 +Date: Wed May 23 10:14:32 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4f35262fae8f0168cd6e2ed422e98cfc9ef28d64 +Author: 滔哥 +Date: Wed May 23 10:14:26 2018 +0800 + + * Format code. + +commit ac539b735d5957e3cf298824bff223e71ff92050 +Author: Catouse +Date: Wed May 23 10:03:08 2018 +0800 + + * fix sidebar toggle position in dom. + +commit 5d2fd7cb8d2b8f1cbf4e5bbaf87e831844859d95 +Merge: 04ef838897 c7f590821b +Author: Catouse +Date: Wed May 23 10:02:54 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 04ef8388972a9584da535afbd39b11a115b63f19 +Author: Catouse +Date: Wed May 23 10:02:42 2018 +0800 + + * refactor export modal trigger. + +commit c7f590821ba75796fed7b343cdea03cad2a141a6 +Author: chenfeiCF +Date: Wed May 23 09:47:40 2018 +0800 + + * Finish task #4296. + +commit f6136872275ed328c26eb5ac5a08882738dbe5ec +Author: daitingting +Date: Wed May 23 09:34:48 2018 +0800 + + * Todo name is required. + +commit 3af004c58b1d9e52464d320e0ce09725e3a6991a +Author: 滔哥 +Date: Wed May 23 08:59:56 2018 +0800 + + Task #4284 + +commit ee6c619cf73f8fe4b466712982a8606ca546069f +Merge: 938ed08b73 b352241f2f +Author: Catouse +Date: Tue May 22 18:19:20 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 938ed08b7303d8474fb81a902038379c415e9d62 +Author: Catouse +Date: Tue May 22 18:19:12 2018 +0800 + + * improve UI of file/export view. + +commit b352241f2f2e945ce2391ab9540672904bae9650 +Author: daitingting +Date: Tue May 22 17:33:56 2018 +0800 + + * Adjust style for batchedit page of todo. + +commit e1ea7eb4b398376a4fb173027f9ca0e47707b8d0 +Merge: 47add48bc5 e78e406a22 +Author: daitingting +Date: Tue May 22 17:29:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 47add48bc5f304e684eefc286e868ee1879e4c81 +Author: daitingting +Date: Tue May 22 17:28:54 2018 +0800 + + * Adjust batchedit page for todo. + +commit e78e406a227d9efee3584f50e6c124fb58491e7e +Author: chenfeiCF +Date: Tue May 22 16:16:48 2018 +0800 + + * Finish task #4293, #4303, #4311. + +commit c48b79965a9298444cb7157251733bb0f8c9caad +Author: Catouse +Date: Tue May 22 16:14:40 2018 +0800 + + * change style of project/team view. + +commit f3f5105ef95fced1818ec17d6442833e1eecbbf0 +Merge: 19f77b435f 932bb4b7b1 +Author: Catouse +Date: Tue May 22 16:05:41 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 19f77b435fd989f73b854de0de43389dff752411 +Author: Catouse +Date: Tue May 22 16:05:33 2018 +0800 + + * change UI of sidebar. + +commit 932bb4b7b1743a7aff73764f275612121460cac6 +Merge: 5d27c53fd2 f5f0e79ecb +Author: daitingting +Date: Tue May 22 15:12:03 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5d27c53fd2f2b968dcd8106132cdd8d6d4a869c1 +Author: daitingting +Date: Tue May 22 15:11:11 2018 +0800 + + * Adjust details about tree page of project. + +commit f5f0e79ecb109df98e7f801189b4ed47b8eb3b71 +Author: chenfeiCF +Date: Tue May 22 15:05:16 2018 +0800 + + * Finish task #4286, #4287, #4288, #4289, #4290. + +commit a2d1575f26ea556d308c0f7f6a5543e2aabe4c52 +Author: Catouse +Date: Tue May 22 15:02:13 2018 +0800 + + * change style of testcase/browse view. + +commit a13522f616c94734e5331eea194a31c5c4ceffe4 +Author: Catouse +Date: Tue May 22 14:34:55 2018 +0800 + + * change tables style. + +commit 5e65a861bb88af165463eaae026c835b170dc31a +Merge: 2924e223ff 83d7c1430c +Author: Catouse +Date: Tue May 22 14:19:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2924e223ff4046dbcc822691459a266399d91006 +Author: Catouse +Date: Tue May 22 14:19:03 2018 +0800 + + * update zui js file. + +commit b7ff73e9d5ca6374d2fb57fbc6cb010c36185302 +Author: Catouse +Date: Tue May 22 14:18:54 2018 +0800 + + * change style of search form. + +commit 83d7c1430c3e6ea6b8f2dada42aeaeca434e830e +Merge: c4a8f46313 a39675dc22 +Author: tengfei +Date: Tue May 22 13:48:01 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c4a8f46313d64513cf8fbeb5da1c6972316f6d2e +Author: tengfei +Date: Tue May 22 13:47:03 2018 +0800 + + *fixed undone translation:wq + +commit a39675dc22014af43b985ed035997ab3ad29b386 +Merge: 996a87bb7c 2f0a3158de +Author: daitingting +Date: Tue May 22 13:18:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 996a87bb7c8dc7c158cad39f5dc20c30958c7e5c +Author: daitingting +Date: Tue May 22 13:15:04 2018 +0800 + + * Add title for task name. + * Adjust style for dropmenu. + +commit 2f0a3158deb58173e3b934e4455e5e9fa800907c +Merge: 4b6fbc7b9c de4b1b81c5 +Author: Catouse +Date: Tue May 22 12:03:37 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4b6fbc7b9c49997bfcc14bc9c3ed16817c9a7498 +Author: Catouse +Date: Tue May 22 12:03:30 2018 +0800 + + * fix double iframe modal issue. + +commit 51d591615ff5792745fbec8d3d86fb13ea9987f3 +Author: Catouse +Date: Tue May 22 11:19:10 2018 +0800 + + * adjust kanban style. + +commit de4b1b81c5882d090feeb99ed61865e3fcf436c5 +Merge: a11b0f9a9f 9f74b34f01 +Author: 滔哥 +Date: Tue May 22 11:17:47 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9f74b34f013a79301fc1fdba68e724bf47d6adc0 +Author: Catouse +Date: Tue May 22 11:15:03 2018 +0800 + + * improve UI of project/task view. + +commit a11b0f9a9f82920d45125ece68526783dc00221f +Author: 滔哥 +Date: Tue May 22 10:50:14 2018 +0800 + + * Task#4180. + +commit df043be4916d871f8587b05f49ddcad7ae5e0534 +Author: Catouse +Date: Tue May 22 10:46:43 2018 +0800 + + * change style of task/create view. + +commit f9247090e88f9a57f33c6d69e4222c1d3b3389b5 +Author: Catouse +Date: Tue May 22 10:46:22 2018 +0800 + + * update zui files. + +commit 7b19e791613844fadfe5474c1cc7e257c311c59c +Merge: 44ee45537b faf2ef0a34 +Author: Catouse +Date: Mon May 21 17:54:51 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 44ee45537b78f1d78f524ec312d3665e3d10f6db +Author: Catouse +Date: Mon May 21 17:54:43 2018 +0800 + + * change product/browse UI. + +commit faf2ef0a340b7906ffbd5d2998edc326cc2ba0cf +Merge: dc60a11e93 e7c3b4c99c +Author: daitingting +Date: Mon May 21 17:07:21 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dc60a11e9317b3b81669a81f2c7af69212939b4a +Author: daitingting +Date: Mon May 21 17:07:01 2018 +0800 + + * Add title for team member. + +commit e7c3b4c99c93db67a1815fbe7f74046337efd825 +Merge: 7fea6a86c6 91b213a105 +Author: Catouse +Date: Mon May 21 16:54:58 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7fea6a86c6c974bd81c4af4774dfdf0193f9a3f1 +Author: Catouse +Date: Mon May 21 16:54:51 2018 +0800 + + * refactor codes. + +commit 91b213a105ac0c8e13a8ff168fcc079886ec331d +Author: daitingting +Date: Mon May 21 16:34:01 2018 +0800 + + * Add title for severity. + +commit 0affd76e54668ebeeea070069f57eebfbd087860 +Merge: 06704f1825 4a90c9fc54 +Author: daitingting +Date: Mon May 21 16:27:46 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 06704f1825cfb9afa67da32d08690bdc2ba1f267 +Author: daitingting +Date: Mon May 21 16:27:32 2018 +0800 + + * Add title for pri. + +commit 4a90c9fc54b6f6cf976702f4c0109bb9ef897125 +Merge: dd21f477a5 169867f280 +Author: Catouse +Date: Mon May 21 15:52:41 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dd21f477a55b74ab9b629d8aaa9b40291112ac75 +Author: Catouse +Date: Mon May 21 15:52:31 2018 +0800 + + * change style of roadmap view. + +commit b1b257da1fbfafe02c6e61122f077901163bd541 +Author: Catouse +Date: Mon May 21 15:20:29 2018 +0800 + + * support display long title in header. + +commit 169867f2809be769abdc953c6c2506e65e89c8fd +Merge: 291ebde04a f0b3ab7b15 +Author: daitingting +Date: Mon May 21 15:18:13 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 291ebde04a7616e7a8cf21075122d2d597fefdcf +Author: daitingting +Date: Mon May 21 15:17:48 2018 +0800 + + * Use kindeditor for comment in view file. + +commit f0b3ab7b1531a8a187c7affddfd0518fb490b7ef +Merge: 98bdda1043 249f1c1ddf +Author: Catouse +Date: Mon May 21 14:38:29 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 98bdda10435b307e50cb225c3a35230ebf1096c4 +Author: Catouse +Date: Mon May 21 14:38:22 2018 +0800 + + * change buttons style in table. + +commit 249f1c1ddfd9719cf22c63a0157c872c4b07c1e6 +Merge: 77e493c029 0e242e12fd +Author: daitingting +Date: Mon May 21 14:28:44 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 77e493c029fa4ea3d45a558749d3dada1265eae8 +Author: daitingting +Date: Mon May 21 14:28:28 2018 +0800 + + * Adjust width for search form. + +commit 0e242e12fdd55624b9579c9e314a69ac79b80f71 +Merge: de9e83147d 9d8c138615 +Author: Catouse +Date: Mon May 21 14:21:09 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9d8c138615e3b10902a540aaa24fa688112281a1 +Merge: 8ac45e17db f2bc9bbbdf +Author: daitingting +Date: Mon May 21 14:15:54 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8ac45e17db0fb9620306d6d8e58dda2af57b1c3e +Author: daitingting +Date: Mon May 21 14:15:21 2018 +0800 + + * Adjust margin between estimate and button. + +commit f2bc9bbbdf44d692c42cc98bfa8f101bb52e0636 +Merge: fe90f84c52 6619560c82 +Author: tengfei +Date: Mon May 21 14:04:58 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fe90f84c5240023d1d3a7f218881217dfe90d21f +Author: tengfei +Date: Mon May 21 14:04:25 2018 +0800 + + *minior trans change + +commit de9e83147de18776bffe4813703bcadd13508ff0 +Author: Catouse +Date: Mon May 21 14:04:14 2018 +0800 + + * change pro vesion icon style. + +commit 6619560c82f36452656f90485dc420ef39024bf5 +Merge: 258f2cad9c 56baff9845 +Author: Catouse +Date: Mon May 21 11:29:13 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 258f2cad9c49b79763a9fa557856e4df7cd1e2c9 +Author: Catouse +Date: Mon May 21 11:29:00 2018 +0800 + + * refactor codes. + +commit 56baff9845deaffdd3bbeef83b51629a2e103534 +Merge: 34c2d4887d 9d851842e2 +Author: tengfei +Date: Mon May 21 11:27:45 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 34c2d4887d82e171458aa5835cefe3e21ad44974 +Author: tengfei +Date: Mon May 21 11:27:11 2018 +0800 + + * minor trans change + +commit 9d851842e2c72aba69ad4724bebee4dec12a58db +Merge: 43f4d8b93a 451fe7b029 +Author: daitingting +Date: Mon May 21 10:45:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 43f4d8b93a1e44bcad1a26b31d4b5283b2a148a0 +Author: daitingting +Date: Mon May 21 10:44:27 2018 +0800 + + * Mark the call is from zentao when the http_referer is empty. + +commit 451fe7b02955fe6d5933f4c034e97b3bc5a98897 +Merge: 6aad78208d 2268f3e582 +Author: tengfei +Date: Mon May 21 10:27:03 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6aad78208db8e1ee9cb994595418b2bc8b984199 +Author: tengfei +Date: Mon May 21 10:26:00 2018 +0800 + + * minor translation change + +commit 2268f3e5825dae78b77aad597c8ba20132977020 +Author: Catouse +Date: Mon May 21 10:07:25 2018 +0800 + + * fix severity label style. + +commit 9e45e82ad35eb282620121be59b8e1cc2a719076 +Author: Catouse +Date: Mon May 21 09:47:36 2018 +0800 + + * fix iframe modal dialog border style. + +commit d27fb779c3f89bca6a044997172ea6bb7b44ca93 +Author: Catouse +Date: Mon May 21 09:08:08 2018 +0800 + + * refactor codes. + +commit 1fc9c5dc7c2746a6e5cd11d2cb629e8b3d0a5d50 +Merge: 10a9c5d602 3fee807a8f +Author: Catouse +Date: Mon May 21 08:45:46 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 10a9c5d602636b83ac753ca5b19c6d7711871105 +Author: Catouse +Date: Mon May 21 08:45:24 2018 +0800 + + * adjust style of testsuite/libview view. + +commit 829efb90f46be8cb366b1e2221ad2036e1f79355 +Author: Catouse +Date: Mon May 21 08:45:02 2018 +0800 + + * update zui files and fix testtask/view style. + +commit 3fee807a8f1b12cb551ff82b85ce567055229514 +Author: liugang +Date: Fri May 18 18:16:57 2018 +0800 + + * Remove useless files. + +commit 6eb3ce8219a92fed3a9ca5cbd91543c36056070e (tag: zentaopms_10.0.alpha_20180518) +Merge: f414eb0bc9 0cba188d2d +Author: Catouse +Date: Fri May 18 16:48:40 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f414eb0bc9d8636496c253d6e6f2c011af6e3bbc +Author: Catouse +Date: Fri May 18 16:48:30 2018 +0800 + + * change createLib view UI. + +commit 5e10f645629ba3691b023945d2e5d1c16ca4f1d2 +Author: Catouse +Date: Fri May 18 16:36:51 2018 +0800 + + * fix panel style in doc/index view. + +commit 0cba188d2d1bb01137280a97ee602f1f8765653b +Merge: 0203b33fea aa5444cf92 +Author: wangyidong +Date: Fri May 18 16:30:00 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit aa5444cf929df54e9c1708118436f9971539f30a +Merge: c0050579c6 e6d66d905d +Author: Catouse +Date: Fri May 18 16:28:02 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c0050579c6f80866e38516cc6ee7576f32782969 +Author: Catouse +Date: Fri May 18 16:27:54 2018 +0800 + + * change progress pie chart when value is 100%. + +commit 0203b33fea50c1ab10713430cae01dfc60cae5fe +Author: wangyidong +Date: Fri May 18 16:26:43 2018 +0800 + + * adjust for testtask-browse page. + +commit e6d66d905ddee9d6bac945327483fba3da63af50 +Author: chenfeiCF +Date: Fri May 18 16:20:23 2018 +0800 + + * Fix bugs. + +commit c1ccabcd0a6a2dd310895f9bc4935a55fe67b930 +Author: Catouse +Date: Fri May 18 16:16:30 2018 +0800 + + * fix required mark missing in todo create view. + +commit eec9dbd8f7d213179f84376971b85b830765a70c +Author: wangyidong +Date: Fri May 18 15:58:56 2018 +0800 + + * fix bug. + +commit 28fb042313e2c15b97c3ec0912550053f1c437af +Author: wangyidong +Date: Fri May 18 15:38:07 2018 +0800 + + * fix bug. + +commit 66f879b11ca4b94b3b1006f0c67d59110cf13240 +Author: daitingting +Date: Fri May 18 15:27:20 2018 +0800 + + * Adjust style for card temporarily. + +commit 22c21390d5a25709ba7ab5bb48c8ead24f1ee6bb +Merge: 25a3cffcdb f74d58ee72 +Author: daitingting +Date: Fri May 18 15:26:24 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 25a3cffcdbd4cf2f61d14345bb0698ec7dcd4254 +Author: daitingting +Date: Fri May 18 15:25:48 2018 +0800 + + * Add text-ellipsis for desc of release. + +commit f74d58ee726f5824b03ae191cb02f7afba525a99 +Author: Catouse +Date: Fri May 18 15:23:41 2018 +0800 + + * adjust roadmap style. + +commit 1040bc89924b474d428435ebf00b91370e9383fd +Author: Catouse +Date: Fri May 18 15:17:05 2018 +0800 + + * update zentao logo in login view. + +commit 542faad6dbe2c8ba0c70599c99aa5620b791bfbf +Author: Catouse +Date: Fri May 18 15:14:30 2018 +0800 + + * remove btn-wide of login button. + +commit 2e0e50c36b69c5e3b6b74e37fc66d403f99bd4bf +Merge: 32c1465a8e 41f262aceb +Author: Catouse +Date: Fri May 18 15:06:54 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 32c1465a8eac8ba8c44eebe0347fd264fa557026 +Author: Catouse +Date: Fri May 18 15:06:22 2018 +0800 + + * fix todo block overflow setting. + +commit 41f262aceb579e3de69254dcfd2a5cdf212e8fc3 +Merge: 2b0c7c4ef3 c04b173b1e +Author: wangyidong +Date: Fri May 18 15:05:21 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2b0c7c4ef33f6230c6837b2e841a864e1ba5c551 +Author: wangyidong +Date: Fri May 18 15:04:53 2018 +0800 + + * adjust for style. + +commit c04b173b1eeb84a4b261c001680dc2212f3b53b7 +Author: Catouse +Date: Fri May 18 15:02:10 2018 +0800 + + * add empty char and fix roadmap style. + +commit 1757add93cfcdacda37c6a2c9d05750a577b4abb +Author: Catouse +Date: Fri May 18 14:47:13 2018 +0800 + + * strip tags of title text. + +commit a5fef486596ca29cd7c4475b66d3d7178a6793ef +Merge: f0fcec6363 6ce2e2fef4 +Author: Catouse +Date: Fri May 18 14:45:41 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f0fcec6363a41975ab0139b1a729269816aefc79 +Author: Catouse +Date: Fri May 18 14:45:32 2018 +0800 + + * limit roadmap description text length. + +commit 6ce2e2fef4b2f0876f17f68a53068a155b292814 +Merge: d256a684c0 100447df61 +Author: wangyidong +Date: Fri May 18 14:40:05 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d256a684c02d5db3b0e628b5b78a4d3180998093 +Author: wangyidong +Date: Fri May 18 14:39:29 2018 +0800 + + * adjust for doc. + +commit 100447df61b9467a4555ff19f53017f1a809ca78 +Merge: 28a4814d89 f2fce388b7 +Author: daitingting +Date: Fri May 18 14:32:02 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 28a4814d89bc02fb707e7a2a564b10d143b439fc +Author: daitingting +Date: Fri May 18 14:31:49 2018 +0800 + + * Adjust codes. + +commit f2fce388b7f398b3d01e5509a355ead85aecb846 +Merge: a51a4c48f1 afe24439ea +Author: liugang +Date: Fri May 18 14:27:35 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a51a4c48f149cb82a5aa0ff455966c853f9ae682 +Author: liugang +Date: Fri May 18 14:27:01 2018 +0800 + + * Remove $mode == 'table'. + +commit afe24439ea269059deaceb49401018014798f839 +Merge: f5a0cb33ef 7ab90f9ee7 +Author: daitingting +Date: Fri May 18 14:26:03 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f5a0cb33efac267cc0469a02c492fdd468b98b53 +Author: daitingting +Date: Fri May 18 14:25:45 2018 +0800 + + * Remove unused field. + +commit 7ab90f9ee7fa2e8819bf67be9a69cfcbe20dd287 +Author: wangyidong +Date: Fri May 18 14:20:04 2018 +0800 + + * fix for page show. + +commit a88c09646b0af17dc11b2bcc4ae7828bafc5c375 +Merge: ac523f8883 22f4122e4b +Author: wangyidong +Date: Fri May 18 14:16:21 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ac523f8883d40164c66f458dd1a86bcb05ccd593 +Author: wangyidong +Date: Fri May 18 14:16:00 2018 +0800 + + * adjust for testtask-cases page. + +commit 22f4122e4b69a6da3fe8b644689ece10da3027cd +Merge: 71d60671f8 bd41421b35 +Author: daitingting +Date: Fri May 18 14:12:50 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 71d60671f89eeab14dbb74a3de537a4feb6bd656 +Author: daitingting +Date: Fri May 18 14:12:19 2018 +0800 + + * Remove contactListMenu when submit form. + +commit bd41421b35f178a209e32838b1b765800667a445 +Merge: 661ea69237 c3ac4b39d6 +Author: wangyidong +Date: Fri May 18 14:05:53 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 661ea692376064bd9b1c4d50978db59576145b16 +Author: wangyidong +Date: Fri May 18 14:05:36 2018 +0800 + + * adjust for zh-tw lang. + +commit f68f9ed78f8ab08049e93f1d90c5e5fa82016cb5 +Author: wangyidong +Date: Fri May 18 14:04:50 2018 +0800 + + * adjust for batch edit cycle. + +commit c3ac4b39d6b3623b3d080dec4b64a0eb3624f62a +Merge: 070acee067 502daf647e +Author: Catouse +Date: Fri May 18 14:01:30 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 070acee067beae06b33a575fa493a654ad2eaeb7 +Author: Catouse +Date: Fri May 18 14:01:20 2018 +0800 + + * change buttons style. + +commit a76da604728229b6b6fe69544536b5463b786966 +Author: Catouse +Date: Fri May 18 14:01:06 2018 +0800 + + * remove debug notifications. + +commit 502daf647e0bbfc3990aac737a7deb9b04cbd017 +Merge: 40d76d974f 476073baf6 +Author: liugang +Date: Fri May 18 14:01:05 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 40d76d974fa2b3c4ee6b3fe5fba81be862253576 +Author: liugang +Date: Fri May 18 14:00:57 2018 +0800 + + * Fix bug. + +commit 476073baf645f3906862acb2baeec56783092909 +Author: wangyidong +Date: Fri May 18 13:59:18 2018 +0800 + + * adjust for upgrade. + +commit e618d63514aad454847850d52c364f6f2df0ddad +Merge: c22e9f2875 e9a3fdee0c +Author: wangyidong +Date: Fri May 18 13:58:52 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c22e9f2875f30f4cd8fa7fb3963307bd9f07ecd8 +Author: wangyidong +Date: Fri May 18 13:58:02 2018 +0800 + + * adjust for todo create. + +commit e9a3fdee0c33fd514983c763bcc3ad709e879d9b +Merge: 78d978fd5f 18db97acfe +Author: liugang +Date: Fri May 18 13:53:43 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 78d978fd5f939b466eb4981629e8b65f13f1882c +Author: liugang +Date: Fri May 18 13:52:54 2018 +0800 + + * Hide product name if the build block is a short block. + +commit 18db97acfe012359f861637e5c76d46bbeddb37b +Author: daitingting +Date: Fri May 18 13:48:42 2018 +0800 + + * Adjust position for color. + +commit 9eda304837e48653ea7103f140fd9f22a61ed3a1 +Author: daitingting +Date: Fri May 18 13:46:36 2018 +0800 + + * Adjust linkButton. + +commit 2fafe58dbe44110b9122409ec60a867d8548ed0e +Merge: 1c78423a24 10ba857796 +Author: daitingting +Date: Fri May 18 13:33:49 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1c78423a24889a93beb06d438e969c67244f520a +Author: daitingting +Date: Fri May 18 13:33:25 2018 +0800 + + * Adjust backButton. + +commit 10ba8577966702f7a85fe6bfe1f81903d1dbbe77 +Merge: 70fceeb815 679d42132f +Author: Catouse +Date: Fri May 18 13:32:35 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 70fceeb815218e065fc974760a9a25dce2304bf5 +Author: Catouse +Date: Fri May 18 13:32:28 2018 +0800 + + * refactor codes. + +commit 2f46170191c848f27d4c1d3aeb425ac7eabfb278 +Author: Catouse +Date: Fri May 18 13:32:18 2018 +0800 + + * change style of task/batchcreate form. + +commit 679d42132f57321a108624e433267ea9d2c9e73e +Merge: cb99d6e0e0 7cf41ee696 +Author: wangyidong +Date: Fri May 18 13:30:14 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cb99d6e0e0bf926b712913696ab70198faeb7c40 +Author: wangyidong +Date: Fri May 18 13:29:47 2018 +0800 + + * adjust for high light. + +commit 7cf41ee696f93454efa44a6ca0b6541a56267955 +Merge: cbb127c726 522bb7a74b +Author: daitingting +Date: Fri May 18 13:23:56 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cbb127c72645f94941a853c3439189754d3d2c63 +Author: daitingting +Date: Fri May 18 13:23:29 2018 +0800 + + * Adjust collect style and title. + +commit 522bb7a74b0774fa7cb2e61402dafecab809d7fb +Merge: dc4de1a658 5d09115645 +Author: wangyidong +Date: Fri May 18 13:19:16 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit dc4de1a658eec8f07f1d1d8faaff24e6fda3365a +Author: wangyidong +Date: Fri May 18 13:18:40 2018 +0800 + + * finish task #4166. + +commit 5d091156454777bee59a88980c1baa978919633e +Author: Catouse +Date: Fri May 18 13:09:01 2018 +0800 + + * update zui css file. + +commit 60b5cb78166e25bc3a8df2adf616c23c39289935 +Author: Catouse +Date: Fri May 18 12:50:42 2018 +0800 + + * refactor codes. + +commit 18971092a7d79fe968656b7205e8363ae010b1b0 +Author: Catouse +Date: Fri May 18 12:40:14 2018 +0800 + + * change required mark style. + +commit b0ce69029944e57b00cfde988e62366d8d9e70c5 +Author: Catouse +Date: Fri May 18 12:31:28 2018 +0800 + + * change style of buildcontactlists view. + +commit ae0b1ebbb6931498a6ac1ac432a3c0a2573a1b09 +Author: Catouse +Date: Fri May 18 12:07:34 2018 +0800 + + * improve markdown editor UI. + +commit 1295a05eb3633ae03c61a24fd075b8da45449cb7 +Author: Catouse +Date: Fri May 18 12:07:17 2018 +0800 + + * update zui fonts. + +commit 5295dbef0755a694d7225afb07966716e858bcd5 +Merge: 69ebbbc0f6 7ede06b0dd +Author: Catouse +Date: Fri May 18 11:33:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 69ebbbc0f607b015c5ad86fb2e075c3dde7349f7 +Author: Catouse +Date: Fri May 18 11:33:02 2018 +0800 + + * change doc/createLib modal style. + +commit d4bd3ca5a799e13440ac242518453309d79f435d +Author: Catouse +Date: Fri May 18 11:32:45 2018 +0800 + + * fix chosen drop position. + +commit 7ede06b0dda17a23dbcb0656fb3109cfba044578 +Merge: 82ce0b3d84 9e04d4714a +Author: daitingting +Date: Fri May 18 11:27:27 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 82ce0b3d84d7a43b12d096514a335a094ac0b812 +Author: daitingting +Date: Fri May 18 11:27:12 2018 +0800 + + * Add th for actions. + +commit 9e04d4714ae56f0dd765622717233fcf48e68118 +Merge: 770db7df13 5704ec43a0 +Author: liugang +Date: Fri May 18 11:19:12 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 770db7df1313f4f2bcf2d3d178dc4fae652a405e +Author: liugang +Date: Fri May 18 11:19:01 2018 +0800 + + * Hide theme menu. + +commit 5704ec43a05cb3f74e0f52607050baaad8eb1041 +Merge: 36a1bec648 3ca7269f8b +Author: wangyidong +Date: Fri May 18 11:07:39 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 36a1bec64888d043b76ffd124adf9f85ac160c3d +Author: wangyidong +Date: Fri May 18 11:07:19 2018 +0800 + + * adjust for style. + +commit 3ca7269f8b369b4a981afbad1b45e2449224bb7a +Author: daitingting +Date: Fri May 18 11:06:21 2018 +0800 + + * Adjust btn. + +commit 10433564c2561f19654a246cbd9d14ec8a34d8f3 +Author: daitingting +Date: Fri May 18 11:03:45 2018 +0800 + + * Adjust style. + +commit 61bfafbc5bb536cb2dca26175776a083253cbee4 +Merge: f6450d8c37 eb889b72bb +Author: daitingting +Date: Fri May 18 10:56:47 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f6450d8c37f55f3ef3d66eb22cd4e6b6db771f14 +Author: daitingting +Date: Fri May 18 10:56:23 2018 +0800 + + * Adjust button. + +commit eb889b72bb2758dcabcaf313c7dd1e3866aaad98 +Author: Catouse +Date: Fri May 18 10:52:26 2018 +0800 + + * add cancel icon. + +commit 1374160b5e16ce11f4908f5aa843508a81332886 +Author: Catouse +Date: Fri May 18 10:46:41 2018 +0800 + + * change required icon position. + +commit efed50f58008c2950733282cc24906b497644fd1 +Author: Catouse +Date: Fri May 18 10:44:04 2018 +0800 + + * iframe modal support resize modal height on modal body changed. + +commit 6db418d6d04274b9d9589266438928e253ee33fa +Author: Catouse +Date: Fri May 18 10:36:17 2018 +0800 + + * update zui files. + +commit da161f111be88d560e6b32b6f6df3efc644e1475 +Merge: 61c2e0c6e7 44de16b021 +Author: Catouse +Date: Fri May 18 10:33:49 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 61c2e0c6e7bd566b9af26b1f60b72d95105b3ee5 +Author: Catouse +Date: Fri May 18 10:33:42 2018 +0800 + + * improve modal UI. + +commit 44de16b021787623b2e68a642b13d9c61400376e +Merge: 50e6f8e15f eb937c9e59 +Author: daitingting +Date: Fri May 18 10:29:48 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 50e6f8e15f83d8bd2592f7142a78e6b8edccd2f9 +Author: daitingting +Date: Fri May 18 10:29:20 2018 +0800 + + * Add english language. + +commit eb937c9e59d3e26b50c2b4b8f5b8e3bc1233ea75 +Merge: bb7b76e803 0f26c55cab +Author: wangyidong +Date: Fri May 18 10:27:44 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bb7b76e80323d97301349ecee4d211c24cea193e +Author: wangyidong +Date: Fri May 18 10:27:06 2018 +0800 + + * adjust for only test. + +commit 0f26c55cab580478d769455cbf29dc8add9b58e1 +Merge: ddb33c2a34 a5c48d625e +Author: liugang +Date: Fri May 18 10:05:23 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ddb33c2a34b222973cab76dd8efd267d2e442f8a +Author: liugang +Date: Fri May 18 10:05:13 2018 +0800 + + * Fix button style. + +commit a5c48d625ec9a6edfddbd02abef73de874bd2308 +Merge: 8f4fbd18ab e87d6eb9cb +Author: 滔哥 +Date: Fri May 18 09:49:33 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8f4fbd18ab62572f2b681d1a27e9f5bc7b4a88e2 +Author: 滔哥 +Date: Fri May 18 09:48:23 2018 +0800 + + * Format code for testcase. + +commit 61a74747448e2264e5e8763f6145fb6cbbb8f440 +Author: 滔哥 +Date: Fri May 18 09:47:34 2018 +0800 + + * Format code. + +commit e87d6eb9cbac88f7b0e0c954ca97c51de1a3d811 +Merge: 01e8f79b55 6b487c7cfd +Author: daitingting +Date: Fri May 18 09:39:39 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 01e8f79b550475957be9d44dfdd242f8e5d7f65f +Author: daitingting +Date: Fri May 18 09:39:21 2018 +0800 + + * Merge it. + +commit 6b487c7cfd31a1b0d252d3da892ba4faf022fff7 +Merge: 7d1dc5a5e9 2bc846055c +Author: 滔哥 +Date: Fri May 18 09:38:42 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7d1dc5a5e9cf4d9ab33e180fefcc2069622d51f6 +Author: 滔哥 +Date: Fri May 18 09:38:35 2018 +0800 + + * Format code. + +commit 2bc846055c83ad13ed75cdd156b8a45a5a68c243 +Merge: 6c6601ae46 9ebca72c86 +Author: daitingting +Date: Fri May 18 09:37:56 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + Conflicts: + module/task/css/create.css + +commit 6c6601ae468bda4e2d351d81162cac65eb25e209 +Author: daitingting +Date: Fri May 18 09:37:19 2018 +0800 + + * Adjust button positon in name. + +commit 9ebca72c8626aefa35f2f966d11a3989fb2d6503 +Author: chenfeiCF +Date: Fri May 18 09:31:17 2018 +0800 + + * Finish task #4151. + +commit e52e1a937328e7ae3302bdbd9b1f777afc317fda +Merge: eafa14bdca 66cf0a2572 +Author: 滔哥 +Date: Fri May 18 09:28:26 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit eafa14bdcab1e9e4108bacdede007a15fd07e479 +Author: 滔哥 +Date: Fri May 18 09:28:19 2018 +0800 + + * Task#4159. + +commit 66cf0a2572f5e7a8e182914c292424bfab971dd3 +Merge: 6b548f637f f5c5deb75d +Author: wangyidong +Date: Fri May 18 09:26:16 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6b548f637f5d5a6180cd1f3dbc6fb0d31ee1e537 +Author: wangyidong +Date: Fri May 18 09:25:53 2018 +0800 + + * adjust for team. + +commit f5c5deb75d262564bc24522acfd0f5ca1bbf0af6 +Merge: 45a3c59682 2488ca9c86 +Author: liugang +Date: Fri May 18 09:19:33 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 45a3c596825327b3b5f1a14e675246ba495cd57c +Author: liugang +Date: Fri May 18 09:19:14 2018 +0800 + + * Change version to 10.0.alpha. + +commit 2488ca9c8669c1b25ee94315b1f563c469ac3c0e +Merge: 02363e7488 59229b0c52 +Author: Catouse +Date: Fri May 18 09:18:34 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 02363e748811b567691a6e778a2f2b441f1ff8b6 +Author: Catouse +Date: Fri May 18 09:18:26 2018 +0800 + + * fix table style in panel body. + +commit 59229b0c522a77f13f6914306a7e86a0445508a3 +Merge: 1ec3ae0f8d 22f8b657e8 +Author: liugang +Date: Fri May 18 09:06:11 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1ec3ae0f8d1f0713ca9ba145fd7173d35c917678 +Author: liugang +Date: Fri May 18 09:05:39 2018 +0800 + + * Fix status and severity style. + +commit 22f8b657e89c5990b0523e901b3e2e06fc52e522 +Merge: e2c46ea2a9 600bfd300b +Author: Catouse +Date: Fri May 18 09:01:03 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e2c46ea2a93fbb246eb516eccdfbebe77fb7ed67 +Author: Catouse +Date: Fri May 18 09:00:55 2018 +0800 + + * update zui js file. + +commit 2518ac259eb5b2fbc789420657f79b35223030ac +Author: Catouse +Date: Fri May 18 09:00:47 2018 +0800 + + * change savequery dialog style. + +commit 81fe923a60d1b25a8e808d601f5df0a83a20f387 +Author: Catouse +Date: Fri May 18 09:00:27 2018 +0800 + + * fix query label style. + +commit 600bfd300b492a8fc645e2345683effdb2ce515b +Merge: 3f41de395d 16762b2bef +Author: wangyidong +Date: Fri May 18 08:58:18 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3f41de395d8e7afcca2c71175c9f47b4be8af8df +Author: wangyidong +Date: Fri May 18 08:57:51 2018 +0800 + + * finish task #4149. + +commit 16762b2bef762bd985948c2c52e55580870353b1 +Author: 滔哥 +Date: Fri May 18 08:46:53 2018 +0800 + + * Task#4154. + +commit ae39caedad188ddf9a0a736612a878bb9e5748ed +Author: 滔哥 +Date: Thu May 17 20:02:39 2018 +0800 + + * Task#4141. + +commit 82dd51d2afca695cf3ff9f39ffa47a12f9bb3098 +Author: 滔哥 +Date: Thu May 17 19:54:06 2018 +0800 + + * Task#4158. + +commit 5d7d3ceb48478411653a5977c02d369760de7271 +Author: 滔哥 +Date: Thu May 17 19:47:23 2018 +0800 + + * Task#4161. + +commit 719471db9acdecb104fe000f71d113be2e0439e9 +Author: Catouse +Date: Thu May 17 18:34:08 2018 +0800 + + * fix button style in input-group. + +commit 4d1e624c3beaa80441693d2a16fe913cd0e0e056 +Author: Catouse +Date: Thu May 17 18:33:48 2018 +0800 + + * fix icon style in bug/browse view. + +commit 07852489c92189e99ec5fea5e77873675dee2a09 +Author: Catouse +Date: Thu May 17 18:33:24 2018 +0800 + + * fix savequery modal style. + +commit 661bcb7ed7408ba3601593c5c1f94d3aacc04a6a +Author: Catouse +Date: Thu May 17 18:22:53 2018 +0800 + + * fix .table-grouped style. + +commit 10ca7db0ce3692d75c55681e27438cd30caf718c +Author: Catouse +Date: Thu May 17 18:16:43 2018 +0800 + + * remove debug codes. + +commit bb5a2975d2ce9956143595cc96471fdaaf27ca61 +Merge: 582d1b1a2c 98a51a8c2d +Author: Catouse +Date: Thu May 17 18:14:53 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 582d1b1a2ce6a63baad998f58323799ab6ed6df2 +Author: Catouse +Date: Thu May 17 18:14:46 2018 +0800 + + * refactor codes. + +commit 98a51a8c2d5fdcc7d1f8117f6b552a3ebe07c3d6 +Merge: 3591e5732e 430c205805 +Author: wangyidong +Date: Thu May 17 17:28:42 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 430c2058053d3791701432cbe1284b4533bdf4fd +Author: daitingting +Date: Thu May 17 17:05:28 2018 +0800 + + * Remove split-row when from is not doc. + * Adjust language. + +commit 3ac0602e102444dd384c52b39101397bdcf5f5c3 +Author: daitingting +Date: Thu May 17 17:00:24 2018 +0800 + + * Adjust codes. + +commit 3591e5732e9647a9bb870dd7da9409b3bd419e3e +Merge: 8b78775556 f88d50c01a +Author: wangyidong +Date: Thu May 17 16:38:06 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8b78775556b4843be3dd732b125bfc0384a4c857 +Author: wangyidong +Date: Thu May 17 16:37:40 2018 +0800 + + * adjust for report page. + +commit f88d50c01a32cd2ea24217a63f8e8b4ad43e09b4 +Merge: 5b97fbdc0b 7e3f890623 +Author: daitingting +Date: Thu May 17 16:12:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5b97fbdc0b91855635a62112a2ee3c81c1189502 +Author: daitingting +Date: Thu May 17 16:12:12 2018 +0800 + + * Adjust modulesTree. + +commit 7e3f8906235f48de49e6c705312be02e4a30825e +Merge: 7b890d9a03 ba2a44a659 +Author: Catouse +Date: Thu May 17 15:40:20 2018 +0800 + + Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms + +commit 7b890d9a036262de5828cc9a3b87c2dcd0d45011 +Author: Catouse +Date: Thu May 17 15:40:11 2018 +0800 + + * refactor codes. + +commit ba2a44a659a1b3574bb92238dbd6929cc414c80b +Merge: 44d87c1368 dd94a715b8 +Author: tengfei +Date: Thu May 17 15:09:59 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 44d87c1368b9b0fb073032f00547074aa5ca0afa +Author: tengfei +Date: Thu May 17 15:07:58 2018 +0800 + + * translation changed + +commit dd94a715b8e72dc54d0afa01cc3297aa03fce7d5 +Author: chenfeiCF +Date: Thu May 17 14:54:56 2018 +0800 + + * Adjust style for team of task. + +commit c5fec18481b8bd37ce768c5775c3cd0c7cc8363b +Merge: 6e6c82be2b 3ef65f2d83 +Author: wangyidong +Date: Thu May 17 14:43:54 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6e6c82be2b552a26c845c05565644794b3dd3940 +Author: wangyidong +Date: Thu May 17 14:43:35 2018 +0800 + + * adjust for page. + +commit 3ef65f2d83659d8720337bac40206517e5341751 +Author: chenfeiCF +Date: Thu May 17 14:38:30 2018 +0800 + + * Show no assigned if the task assigned to none. + +commit e80f2cce73e7d7a506858b358b4c633ff0e4948f +Author: daitingting +Date: Thu May 17 14:33:04 2018 +0800 + + * Adjust codes. + +commit bd12a2c8fbe1405d7e3bf923bee4d9ca8276d1ce +Author: Catouse +Date: Thu May 17 14:18:37 2018 +0800 + + * fix more actions position in firefox. + +commit e4a06c3fb2ebafcc181657810041d7cf085874a7 +Merge: 27a4f7d55a e9cf09ccd8 +Author: Catouse +Date: Thu May 17 14:03:59 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 27a4f7d55a0f6292a82cd488789186fdc909fa00 +Author: Catouse +Date: Thu May 17 14:03:51 2018 +0800 + + * refactor codes. + +commit e9cf09ccd875b8ed85992b73b70e911e9ffad217 +Author: liugang +Date: Thu May 17 13:55:33 2018 +0800 + + * Rename btn-default to btn. + +commit 67debd69856f622b0e182b74ecd4b1c305739948 +Merge: 7b0ce5666d b8c3e70dfa +Author: liugang +Date: Thu May 17 13:54:26 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7b0ce5666da8260f3b26c1560b76d4e095af4a3b +Merge: 1266a30bbc d81eb365b1 +Author: liugang +Date: Thu May 17 13:54:14 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b8c3e70dfad25cdf6a572876d750b8cca30fbc50 +Author: Catouse +Date: Thu May 17 13:49:07 2018 +0800 + + * refactor codes. + +commit 7465556299deb448ee9ae75b0b1ef8c125aa90bb +Merge: 1e0708ad67 d81eb365b1 +Author: Catouse +Date: Thu May 17 13:45:17 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1e0708ad67e50bd86eb5fb504edc062ba7446d8a +Author: Catouse +Date: Thu May 17 13:36:32 2018 +0800 + + * fix icon style. + +commit 1266a30bbc9fbba1058a5a33d1a29748ef5ecf92 +Author: liugang +Date: Thu May 17 13:35:56 2018 +0800 + + * Remove class btn-default. + * Merge conflicts. + +commit d81eb365b11069633c3ea863ba10a3a961724d26 +Merge: 07f8ccb1d5 fe09d37f38 +Author: daitingting +Date: Thu May 17 13:33:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 07f8ccb1d5ca77ae1f2b46c8833a1634e09d482b +Author: daitingting +Date: Thu May 17 13:32:54 2018 +0800 + + * Adjust width. + +commit fe09d37f3841a1c206f4f82c7cbf663674ce320a +Merge: b9aa9568c5 27915acec1 +Author: Catouse +Date: Thu May 17 13:26:38 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b9aa9568c5b3c9d60c2aba72f3495684214cb6df +Author: Catouse +Date: Thu May 17 13:26:27 2018 +0800 + + * improve UI of forms elements. + +commit 27915acec1941075adf80d4718a98fc73b09ae1f +Author: daitingting +Date: Thu May 17 13:25:55 2018 +0800 + + * Adjust style for whitelistbox. + +commit 8c713ac2b3cdb5cf9c8850800a5f4bf586206165 +Merge: 39a330601e acc3341e84 +Author: daitingting +Date: Thu May 17 11:32:14 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 39a330601ea9c916ee6b738d2a467dc0847ff4f1 +Author: daitingting +Date: Thu May 17 11:31:55 2018 +0800 + + * Adjust batch page. + +commit acc3341e84d033da6dce77e95e7b4c6d9f4b2d34 +Merge: 5818b4cbef 4432a36f1a +Author: tengfei +Date: Thu May 17 11:21:41 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5818b4cbef6d890fdc619c9865359c9dfc6533d5 +Author: tengfei +Date: Thu May 17 11:20:09 2018 +0800 + + * minor translation change + +commit 4432a36f1ae38998eba2d251d0758f40a8e957f3 +Author: Catouse +Date: Thu May 17 11:18:19 2018 +0800 + + * change buttons style. + +commit 5d22f7daa71b1740b32bee268bfe26c17cf020d5 +Author: Catouse +Date: Thu May 17 11:13:16 2018 +0800 + + * change subtask label style. + +commit b3b8583b93377d994cd5d3b7ef4d8c5f93b943cb +Author: Catouse +Date: Thu May 17 11:11:11 2018 +0800 + + * update zui css file. + +commit 4607381f64c51ae6e6c5f5e351beed787a5469f1 +Merge: eecaeee8c4 5c3e27a6b0 +Author: Catouse +Date: Thu May 17 11:04:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit eecaeee8c4f6a35c6a5b909830303d502af69001 +Author: Catouse +Date: Thu May 17 11:04:08 2018 +0800 + + * adjust elements in dashboard style by update zui css file. + +commit 5c3e27a6b0534bfefde9bcd508723b5844aa1cf4 +Author: daitingting +Date: Thu May 17 11:02:52 2018 +0800 + + * Set requiredFields. + * Adjust style for title color. + +commit b3f882f7dd20892c7d079abd3a209eaf2a31b82b +Author: Catouse +Date: Thu May 17 11:01:20 2018 +0800 + + * change searchbox style. + +commit 51350fbeb74d4632dadda751516bc1d264ec1d47 +Merge: 362e6f25d5 6c109c04af +Author: tengfei +Date: Thu May 17 10:59:04 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6c109c04af92b2d84a84bee991778651d2b99213 +Author: daitingting +Date: Thu May 17 10:54:19 2018 +0800 + + * Set requiredFields. + +commit 6986b5721fec26de5c1be6bae13b939446a7d0b4 +Author: Catouse +Date: Thu May 17 10:53:40 2018 +0800 + + * add fade effection to user/login view. + +commit e1b933e3f090a9f2be865857480611cb28eecd80 +Merge: d47879c736 17f9f2550c +Author: daitingting +Date: Thu May 17 10:43:54 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 17f9f2550ca4611d88ff42f2552f675c95615fd3 +Merge: f84adc3086 e81c3c5bb5 +Author: Catouse +Date: Thu May 17 10:43:28 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f84adc30860a81db22a5d88360bb6f8a1e5dc9f2 +Author: Catouse +Date: Thu May 17 10:43:18 2018 +0800 + + * refactor codes. + +commit d47879c736415508215f4ccaef759abfc966a467 +Author: daitingting +Date: Thu May 17 10:43:07 2018 +0800 + + * Set required fields. + * Adjust style of title color. + +commit e81c3c5bb53e65a3402389c8a5339b056feecf60 +Author: daitingting +Date: Thu May 17 10:29:12 2018 +0800 + + * Adjust submitButton. + +commit 7e7bc2b356b7a9f62cb1de865b6c19af6d5c5e9a +Author: daitingting +Date: Thu May 17 10:27:18 2018 +0800 + + * Adjust codes. + +commit 6a95b2a5a9e6b29f292a73a58c2ca7e7c60ec1de +Author: daitingting +Date: Thu May 17 10:12:54 2018 +0800 + + * Set submit button in center. + +commit 92aaca1f0c03cd919be4f6aa9366608a53e8328b +Merge: 435eac9450 cf333e3b36 +Author: daitingting +Date: Thu May 17 10:09:00 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 435eac94509d7d961404903a8c4f6ab339146482 +Author: daitingting +Date: Thu May 17 10:08:40 2018 +0800 + + * Adjust required fields. + +commit cf333e3b361b2f55eb93504ae2ffdc4321df7000 +Author: Catouse +Date: Thu May 17 10:02:23 2018 +0800 + + * fix icon missing. + +commit 27d88fe9983edcefc8a0c96fdcf4dec17ca68f7b +Author: Catouse +Date: Thu May 17 09:56:22 2018 +0800 + + * merge code. + +commit e9d51b9360c417f87f37780838db723ab88af011 +Author: Catouse +Date: Thu May 17 09:56:07 2018 +0800 + + * fix project statistic block style. + +commit 3cb9e07bd7b59ac80dbb3f0005b558d5d811d222 +Merge: 6d99041b8b 897346d6f9 +Author: Catouse +Date: Thu May 17 09:49:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6d99041b8b99916e3f223f59a8c0e44e8bc68ff5 +Author: Catouse +Date: Thu May 17 09:48:59 2018 +0800 + + * fix modal style. + +commit 77b78b57ebc5908fa1ccff24de291a6799a9f51f +Author: Catouse +Date: Thu May 17 09:48:51 2018 +0800 + + * fix block styles. + +commit 897346d6f9c39cf00c594bc731784ddfd7dda280 +Author: wangyidong +Date: Thu May 17 09:45:10 2018 +0800 + + * adjust for testcase bugs page. + +commit 54d73617e0a92420ce0cf5c33e344136c4e25c39 +Merge: a4048ea3a2 cb334ba0ab +Author: wangyidong +Date: Thu May 17 09:35:24 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a4048ea3a2bddf12b79cffc4820226f06ae30cec +Author: wangyidong +Date: Thu May 17 09:34:16 2018 +0800 + + * finish task #4136,4134. + +commit cb334ba0abceab3c60c22b336e7f7ca7295ef36f +Merge: a95ca70cea 47eac5821d +Author: 滔哥 +Date: Thu May 17 09:32:06 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a95ca70cea1e88b8f425b631043644ad519ba76f +Author: 滔哥 +Date: Thu May 17 09:32:00 2018 +0800 + + * Task#4137. + +commit 47eac5821dd938b6dc658d6504d9d436727b2139 +Author: Catouse +Date: Thu May 17 09:29:30 2018 +0800 + + * fix modal style. + +commit 6e3df90c27e5cea844f9b3f666aa5a0795f3e00a +Merge: 590fb904e1 646079892c +Author: Catouse +Date: Thu May 17 09:27:16 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 590fb904e1d394e9eb5e4067ec2453ade154c29a +Author: Catouse +Date: Thu May 17 09:27:08 2018 +0800 + + * fix chosen style. + +commit 646079892cf25fcf0b249610dee7d17e649e3f4a +Merge: 304653cd65 b5d0e60258 +Author: wangyidong +Date: Thu May 17 09:05:15 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 304653cd655adfb3a1a00fc7643367a4a9f3f919 +Author: wangyidong +Date: Thu May 17 09:04:44 2018 +0800 + + * fix bug. + +commit b5d0e602582ad484e0c29d4ba48736319bedfa38 +Merge: b78a175040 e2bd9a8e0b +Author: Catouse +Date: Thu May 17 08:52:30 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b78a175040ada4ad0285e0c7f16a457eb8f06a60 +Author: Catouse +Date: Thu May 17 08:52:23 2018 +0800 + + * fix $.closeModal not work. + +commit e2bd9a8e0b157913c71cb679e3ea667047495bc7 +Merge: 880d85d7d7 a02d415176 +Author: daitingting +Date: Wed May 16 17:46:46 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 880d85d7d7e65257c58c232b60e925890c3b3114 +Merge: fad7ac2701 c269296739 +Author: daitingting +Date: Wed May 16 17:46:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a02d415176fc3fe7ae5a028d2a5cc52e05c36b9d +Author: Catouse +Date: Wed May 16 17:46:11 2018 +0800 + + * remove html required attribute. + +commit fad7ac27013e95eda5d4ee1b1078a0609fbcb748 +Merge: 0056609d9c d31cb467ee +Author: daitingting +Date: Wed May 16 17:46:01 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + Conflicts: + module/build/view/linkbug.html.php + module/build/view/linkstory.html.php + module/project/view/create.html.php + module/release/view/linkbug.html.php + module/release/view/linkstory.html.php + +commit c2692967399ff8a1cf39dd2a6bdc02f29c17e3af +Merge: 9c97348013 d31cb467ee +Author: Catouse +Date: Wed May 16 17:44:55 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9c97348013623ce09f850dbd518c3c742dafbe7e +Author: Catouse +Date: Wed May 16 17:44:49 2018 +0800 + + * refactor codes. + +commit 0056609d9c788d51e113f48226ba650a244ce0be +Author: daitingting +Date: Wed May 16 17:44:42 2018 +0800 + + * Adjust button style. + +commit d31cb467eea5b5badeb0fe21a7c21ac7e1b3b15e +Merge: 316ba36b94 bd0a029ec5 +Author: wangyidong +Date: Wed May 16 16:02:48 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 316ba36b9444953e4a7cfe0905c295012a860f43 +Author: wangyidong +Date: Wed May 16 16:01:56 2018 +0800 + + * adjust for bug-linkbugs page. + +commit bd0a029ec5a3b09143a6e8050a64f710d407c0be +Merge: db8155f6ae a3deb382e2 +Author: Catouse +Date: Wed May 16 15:31:20 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit db8155f6aeec994d1a623b768bbbd1058c0e8bfc +Author: Catouse +Date: Wed May 16 15:31:13 2018 +0800 + + * improve UI for sortable table. + +commit a3deb382e2c5aa9b876a6734d2feebedc4b18d15 +Merge: a4e39f0acf 984117329e +Author: 滔哥 +Date: Wed May 16 15:21:38 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a4e39f0acf98a81a02a03159e63a8f5b7d8e7a6a +Author: 滔哥 +Date: Wed May 16 15:21:23 2018 +0800 + + * Format code. + +commit 984117329ee9c936eb83829a6902f542446c79ad +Author: Catouse +Date: Wed May 16 15:13:20 2018 +0800 + + * change details style. + +commit 78c9a0353947230ce23d7f81325a0a2c6c14f211 +Author: Catouse +Date: Wed May 16 15:11:05 2018 +0800 + + * fix user profile dialog width. + +commit 980b218c8f709e914fe8cec614986a2be56acd99 +Merge: 9a7263b427 6bd19bff24 +Author: Catouse +Date: Wed May 16 15:08:52 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9a7263b4274946b606e8625eb3e6cb938f3e61d5 +Author: Catouse +Date: Wed May 16 15:08:45 2018 +0800 + + * update zui files. + +commit 6bd19bff24b92021b85b9848abee6836b8037fd3 +Merge: c0a9d8eb61 d120507aef +Author: liugang +Date: Wed May 16 15:06:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c0a9d8eb613df7b4c1a01a03349b217e1273db48 +Author: liugang +Date: Wed May 16 15:06:01 2018 +0800 + + * Adjust style. + +commit d120507aef5932dd529363bcc1e1d234d545eecc +Merge: 4be5a4c3ec 600f4cab37 +Author: Catouse +Date: Wed May 16 15:05:35 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4be5a4c3ec04693b2b6b79a7d2cafef79173193f +Author: Catouse +Date: Wed May 16 15:05:29 2018 +0800 + + * refactor codes. + +commit 600f4cab37fee780fe12b544684e44711b121f06 +Merge: 82b9d32295 a1e57b2044 +Author: liugang +Date: Wed May 16 14:49:59 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 82b9d32295ee4edc8f4d39424776b572e9696ccb +Author: liugang +Date: Wed May 16 14:49:46 2018 +0800 + + * Optimize codes. + +commit 683386d7aaa8c1329545f6d52bf59b3e1da6e65f +Author: Catouse +Date: Wed May 16 14:32:01 2018 +0800 + + * disabled block color setting. + +commit a1e57b20446b7db542ec73de4020dfe30f9d567d +Merge: 7986465387 743488862e +Author: Catouse +Date: Wed May 16 14:11:14 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7986465387b495295f13f82f5d7193ba15f5204a +Author: Catouse +Date: Wed May 16 14:11:08 2018 +0800 + + * update buttons style. + +commit 743488862e79ce107e141c8257ef50b811502e87 +Author: chenfeiCF +Date: Wed May 16 14:00:00 2018 +0800 + + * Finish task #4063, #4064, #4065. + +commit ba9be5b48636bae462123d212acc7b9e8a608383 +Merge: d7c643853b 7f0eddc801 +Author: Catouse +Date: Wed May 16 13:50:14 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d7c643853b65d096379fc1e2fa2a827907f83b70 +Author: Catouse +Date: Wed May 16 13:50:04 2018 +0800 + + * improve UI of about dialog and admin/index links view. + +commit 7f0eddc8016134cf4aece035b8f6395e5407dcd8 +Author: daitingting +Date: Wed May 16 13:35:15 2018 +0800 + + * Add note when there is no test task. + +commit 02e41e1fc1766e3665fb584041f8c9817e0e4ee3 +Author: wangyidong +Date: Wed May 16 13:06:35 2018 +0800 + + * finish task #3975. + +commit 74ebec4baceba5f86757623adc0c0d1878fb39bc +Merge: 98fad5db13 43a0f7bd7d +Author: daitingting +Date: Wed May 16 11:19:44 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 98fad5db13391ba1c3906772bbb87627583e5e1f +Merge: 4b87c33388 43fd7a509d +Author: daitingting +Date: Wed May 16 11:18:16 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4b87c33388dcbacd2712cee996bd04e778cc8b49 +Author: daitingting +Date: Wed May 16 11:17:56 2018 +0800 + + * Rewrite batchEdit page of bug. + +commit 43a0f7bd7d410206b5e3c212e075e99562b235d0 +Merge: 1c71e9623b 43fd7a509d +Author: Catouse +Date: Wed May 16 11:17:55 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1c71e9623bd1f88ce41b61d5ef32e0eadb856205 +Author: Catouse +Date: Wed May 16 11:17:49 2018 +0800 + + * change pri column width. + +commit 43fd7a509d4dc4c073da0e917ef202753ae3762a +Merge: 586b523fe9 38fb85246a +Author: wangyidong +Date: Wed May 16 11:10:59 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 586b523fe96392b2155e534f2c9c857ac23e7479 +Author: wangyidong +Date: Wed May 16 11:10:34 2018 +0800 + + * adjust for task #4033. + +commit 38fb85246a5c8ec4eb51dc52ae444ee653b530ce +Author: chenfeiCF +Date: Wed May 16 11:06:39 2018 +0800 + + * Adjust style for bug action method. + +commit 5629e2db0da47afe6510fd4d1c473e4c998b2ae2 +Merge: ed3529f546 6fceb7fee0 +Author: wangyidong +Date: Wed May 16 11:05:24 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ed3529f5467366261a88ee7079b3d8ebb7d5e827 +Author: wangyidong +Date: Wed May 16 11:04:14 2018 +0800 + + * adjust for task #3983. + +commit 6fceb7fee04d1f425eca4f4f9a1f7aa298a90b96 +Merge: 18223853aa dc41b2ff2b +Author: Catouse +Date: Wed May 16 11:01:37 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 18223853aaa7f8d4fb99af0c2227316af341de29 +Author: Catouse +Date: Wed May 16 11:01:29 2018 +0800 + + * improve UI of tree/browse view. + +commit af0750f920da803f6e596c98215ef51fe3babf6d +Author: Catouse +Date: Wed May 16 11:01:15 2018 +0800 + + * change default modal dialog width. + +commit dc41b2ff2b1af9b55364b0bbd9b9661736dc0cf8 +Author: 滔哥 +Date: Wed May 16 10:56:43 2018 +0800 + + * Format code. + +commit a3ac5db59b8cc6e6d58579c15c8bb869e154ace9 +Merge: e9ecb1fd9e 0559c728ec +Author: liugang +Date: Wed May 16 10:42:57 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e9ecb1fd9e732057fe7f9327b0048bfbf890208e +Author: liugang +Date: Wed May 16 10:42:42 2018 +0800 + + * Optimize codes. + +commit 0559c728ec8da1beecd4165326059b61e85f378f +Merge: f9b9567424 cccac5dc93 +Author: daitingting +Date: Wed May 16 10:39:41 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f9b95674248444a72bbedd25e8d8eea269826c7a +Author: daitingting +Date: Wed May 16 10:39:14 2018 +0800 + + * Rewrite batchCreate page of bug. + +commit cccac5dc931957b42e9a566502982ed5573e834e +Merge: 13eecc18eb ab1f2c3e25 +Author: Catouse +Date: Wed May 16 10:09:38 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 13eecc18ebb9fa0c2976d3b2bf40761741c72f9a +Author: Catouse +Date: Wed May 16 10:09:12 2018 +0800 + + * change productplan/browse view. + +commit d3ce73d4d82b26e33d15caf7459720907f3e3089 +Author: Catouse +Date: Wed May 16 10:08:47 2018 +0800 + + * update zui fonts. + +commit ab1f2c3e258dc7bc55fc97838bc80d286cddb580 +Author: 滔哥 +Date: Wed May 16 10:01:29 2018 +0800 + + * Task#410. + +commit 1273cc071529bb8d1c38857eae640596b08e965e +Author: 滔哥 +Date: Wed May 16 09:51:29 2018 +0800 + + * Task#4125. + +commit da32e7d4de5885d2b71d689db8ee57aacdad9d19 +Author: 滔哥 +Date: Wed May 16 09:36:26 2018 +0800 + + * Task#4125. + +commit 0092582e562013171ee9c2c5dc916734104e3c52 +Merge: f1d8d22691 eedea7b49c +Author: 滔哥 +Date: Wed May 16 09:17:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f1d8d22691f8d08a43bf642acf99d004bde2609d +Author: 滔哥 +Date: Wed May 16 09:13:05 2018 +0800 + + * Task#4125. + +commit f2058e9b9f94964e5411f8416fd3ee39e1aa977e +Author: 滔哥 +Date: Wed May 16 09:08:57 2018 +0800 + + * Task#4118. + +commit eedea7b49c1c1d5c2ad9fc026aa690d8e373c443 +Author: liugang +Date: Tue May 15 19:22:34 2018 +0800 + + * Adjust style. + +commit c3f59dc024d3eac22a80e600ebe3c10d860cc7b7 +Merge: fdae598943 5f91f480cc +Author: Catouse +Date: Tue May 15 17:38:29 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fdae5989433b86eef249129a3c01c474d517c592 +Author: Catouse +Date: Tue May 15 17:38:21 2018 +0800 + + * fix file-list style in firefox. + +commit 5f91f480cc8aa8d382b8bb2fed7d0dd0569d0c84 +Merge: 81d06711b1 517aa12411 +Author: daitingting +Date: Tue May 15 17:32:22 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 81d06711b13894616e806c2dc831b92219966b44 +Author: daitingting +Date: Tue May 15 17:32:02 2018 +0800 + + * Rewrite edit page of bug. + +commit 517aa1241191583636f0a7d36208ed1ca93c5f38 +Merge: a6315cfd2f b95a4f625b +Author: wangyidong +Date: Tue May 15 17:24:56 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a6315cfd2f5e6c9ba643aa5126f6a3dc5a770149 +Author: wangyidong +Date: Tue May 15 17:24:21 2018 +0800 + + * finish task #4105. + +commit b95a4f625ba70c3806ed68f8ab7eea4b04b04df8 +Merge: 485debed48 c84e1e7ed4 +Author: Catouse +Date: Tue May 15 17:06:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 485debed485b8639574f9f84d65be1767f7700df +Author: Catouse +Date: Tue May 15 17:06:28 2018 +0800 + + * improve UI of datatable/ajaxcustom modal view. + +commit c84e1e7ed4273c12f9ff099f1355365b603af153 +Merge: 06b11132ac 8f61e1ed73 +Author: liugang +Date: Tue May 15 16:59:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 06b11132acc62f284872684b1ffbf2bdfdccf6ab +Author: liugang +Date: Tue May 15 16:57:28 2018 +0800 + + * Adjust style. + +commit 8f61e1ed7378634bc468af84e191c76ae6876eec +Merge: 8aa2c21204 e11cf18d4d +Author: Catouse +Date: Tue May 15 16:48:09 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8aa2c212043872249829624684b19a215278a7c9 +Author: Catouse +Date: Tue May 15 16:48:00 2018 +0800 + + * add padding to dashboard container element. + +commit 06fcb5b7a4d8486002d6985791d5051925fe404f +Author: Catouse +Date: Tue May 15 16:47:48 2018 +0800 + + * refactor company/browse view. + +commit 6c579733568a27efe3e6d0b054275057852587a1 +Author: Catouse +Date: Tue May 15 16:47:21 2018 +0800 + + * update font icons. + +commit e11cf18d4dba9e336a0960256c0fe096dc6da04a +Merge: 73b1a29da4 aff04f3ddc +Author: daitingting +Date: Tue May 15 16:21:29 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 73b1a29da4763bb6120cf358405b6888eca9d615 +Author: daitingting +Date: Tue May 15 16:21:13 2018 +0800 + + * Rewrite create page of bug. + +commit aff04f3ddc8991ada1605282ffc60280f174c276 +Author: chenfeiCF +Date: Tue May 15 16:14:47 2018 +0800 + + * Finish task #4066, #4067. + +commit ec4117c6b946411d8f7a76c57893fee8e79bbbfc +Merge: 05b7ecb71e 572a80e9e9 +Author: liugang +Date: Tue May 15 16:02:44 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 05b7ecb71e4c53835db792bf697dbe8f5de39e81 +Author: liugang +Date: Tue May 15 16:02:31 2018 +0800 + + * Optimize pages. + +commit 572a80e9e90fec51267e038cad85db250bf19f16 +Author: chenfeiCF +Date: Tue May 15 15:52:01 2018 +0800 + + * Finish task #4072, #4073. + +commit dbc4f92af2eff927fdb801ec8ec192dee2afbbc3 +Merge: cc4c828a1e e522af53b4 +Author: wangyidong +Date: Tue May 15 15:46:36 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cc4c828a1ed1ec0277cebd002da9eea1291e557e +Author: wangyidong +Date: Tue May 15 15:46:06 2018 +0800 + + * finish task #4108. + +commit e522af53b408086922258562f6c04d3e840edc10 +Author: Catouse +Date: Tue May 15 15:33:33 2018 +0800 + + * remove btn-gray. + +commit 9a5e6404c2229ffe662574a26c5fbea142b479d5 +Merge: 698be84084 78de695a00 +Author: Catouse +Date: Tue May 15 15:32:03 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 698be84084b9d59f8126824787a18535a8a34697 +Author: Catouse +Date: Tue May 15 15:31:56 2018 +0800 + + * add more status style. + +commit 63a5801a4360a8ce3ed3647a657374d923630b78 +Author: Catouse +Date: Tue May 15 15:28:30 2018 +0800 + + * improve UI of story/batchedit view. + +commit a5647d69aa6374ccd21732b36217ae32efdd490e +Author: wangyidong +Date: Tue May 15 15:25:42 2018 +0800 + + * adjust for testcase-review page. + +commit 78de695a007df23186fd064a362cad8aac2355c2 +Merge: 7613bee09f e0b68dbaec +Author: wangyidong +Date: Tue May 15 15:21:21 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7613bee09f3d138481614de2a72c1dc4d9ff0e29 +Author: wangyidong +Date: Tue May 15 15:20:55 2018 +0800 + + * adjust for testcase-edit page. + +commit 35fb655e861631375214ec0e8db695d13d4c8de2 +Author: Catouse +Date: Tue May 15 14:56:42 2018 +0800 + + * refactor codes. + +commit e0b68dbaecc962c685da35047fea9ed2d3c4f113 +Author: daitingting +Date: Tue May 15 14:39:51 2018 +0800 + + * Adjust width. + +commit d5aee5976802f0b660b3737de43d28d1e934e3b9 +Merge: fcc4a98329 f82d7d69a2 +Author: daitingting +Date: Tue May 15 14:36:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + Conflicts: + module/testcase/config.php + +commit 5394b9948731fd85db5429ef3ce4432a1e296d68 +Author: Catouse +Date: Tue May 15 14:32:28 2018 +0800 + + * fix fixed table footer in bottom not work. + +commit fcc4a9832937166ebe491b17bf0b31c6cac2e47f +Author: daitingting +Date: Tue May 15 14:27:41 2018 +0800 + + * Adjust width. + +commit f82d7d69a288aeea8f5b5f006068472f615843bd +Merge: 32d70e3b63 bc95bb9801 +Author: liugang +Date: Tue May 15 14:27:15 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 32d70e3b6325c44e89e581a1d69697a62590c81d +Author: liugang +Date: Tue May 15 14:26:52 2018 +0800 + + * Add qa statistic block. + * Refact build page of product. + +commit fb2ecd613b949a1b4345b2b3886a963e2919817f +Author: daitingting +Date: Tue May 15 14:25:33 2018 +0800 + + * Rewrite view file of testtask. + +commit bc95bb98018cb03c8bd2ac247aa339e4914cc1d6 +Merge: 9e8eb90896 f8d523d5d7 +Author: Catouse +Date: Tue May 15 14:22:38 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9e8eb9089629fc3cbf76c98ed85a4856752bb393 +Author: Catouse +Date: Tue May 15 14:22:32 2018 +0800 + + * refactor codes. + +commit f8d523d5d7cffe78c1ade7d34fb1397671248444 +Merge: 41d8cfe611 d5cf1f21f5 +Author: wangyidong +Date: Tue May 15 14:09:49 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 41d8cfe6118d831990ad4f9425778eca9797aa93 +Author: wangyidong +Date: Tue May 15 14:09:07 2018 +0800 + + * adjust for testtask-runcase and testtask-results page. + +commit b4d9442e9439773bda73fb61b6e0d4fcd3f2d9be +Author: Catouse +Date: Tue May 15 13:17:41 2018 +0800 + + * update zui files. + +commit 9219b3d30562987fe25f065d41e80c404eb0f7f2 +Author: Catouse +Date: Tue May 15 13:17:30 2018 +0800 + + * improve UI of story/create view. + +commit 27e6af0a7985011bd223d4d774d0d4af9f3a9f01 +Author: Catouse +Date: Tue May 15 13:17:09 2018 +0800 + + * fix dashboard margin. + +commit d5cf1f21f5fa16757babd6f78f2f6b4db303cf3e +Author: Catouse +Date: Tue May 15 11:23:20 2018 +0800 + + * update zui style. + +commit fe87258268132391897eea1d189d4e62e854a793 +Author: Catouse +Date: Tue May 15 11:22:40 2018 +0800 + + * change productplan/edit view. + +commit 165aa001a0b83378e1f1f4dcfe49c2193a7e228f +Merge: 112461336c 6a0d40a695 +Author: Catouse +Date: Tue May 15 11:16:43 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 112461336cd67716ee41ce2b3c19d5d30d163b9a +Author: Catouse +Date: Tue May 15 11:16:35 2018 +0800 + + * update global font size. + +commit e38b0f312a3ba050e41094ee6e09440b1a84c7b9 +Author: Catouse +Date: Tue May 15 11:16:12 2018 +0800 + + * change icon button style. + +commit 431dd77d8c1ae844a88ecc81fb401aa2f14473ad +Author: Catouse +Date: Tue May 15 11:15:55 2018 +0800 + + * change kanban style. + +commit 6a0d40a695893683731850fb7afd66e8abb7429e +Author: daitingting +Date: Tue May 15 11:12:20 2018 +0800 + + * Adjust mainMenu for linkCase page. + +commit 3c83ba61de75908971734595ae401813de3a2262 +Author: daitingting +Date: Tue May 15 11:11:21 2018 +0800 + + * Format codes. + +commit de5d5ce0c9a8ca3afe3cd74f3522346e59121532 +Merge: a28ae568fa 80b5a03121 +Author: wangyidong +Date: Tue May 15 11:01:53 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a28ae568fa2f45a27999ba93fd871474e06184ef +Author: wangyidong +Date: Tue May 15 11:00:52 2018 +0800 + + * adjust for testcase-browse and testcase-view page. + +commit 80b5a03121e74f9d5d609383e51189844c6b4692 +Author: daitingting +Date: Tue May 15 10:24:30 2018 +0800 + + * Add testtaskID for setMenu. + +commit 129137e649a6d7e70636432ac9a909a395af76f2 +Merge: c32021ba59 01e3a22c70 +Author: daitingting +Date: Tue May 15 10:05:27 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c32021ba590b02a607ed977eeca669d807424c38 +Author: daitingting +Date: Tue May 15 10:05:12 2018 +0800 + + * Adjust actions style. + +commit 01e3a22c7070110feb3c54b471830bef8ed72daa +Merge: e7665d12d1 7ebb2919e3 +Author: Catouse +Date: Tue May 15 09:16:18 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e7665d12d1e9ee2bf23e7e42021ee154c119c8a0 +Author: Catouse +Date: Tue May 15 09:15:53 2018 +0800 + + * update pri label style. + +commit 7ebb2919e3a9842c8acd36562d586f2f1882759a +Merge: 0e13578107 933f66ca44 +Author: daitingting +Date: Mon May 14 19:10:42 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 933f66ca44f165781119db9e91c5e6c3d7f6873d +Merge: 75de66ef0d a2cc1222c4 +Author: Catouse +Date: Mon May 14 18:41:59 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 75de66ef0d1cd2950cbd598e4bf0e792ec60d7be +Author: Catouse +Date: Mon May 14 18:41:50 2018 +0800 + + * refactor codes. + +commit 0fb591c691e5d99b484369fc946a1468058fe5b7 +Author: Catouse +Date: Mon May 14 18:28:14 2018 +0800 + + * improve UI of project/create form. + +commit 0e13578107522d7e718f039f1fee2546f3439818 +Merge: a4137aff82 a2cc1222c4 +Author: daitingting +Date: Mon May 14 18:13:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a4137aff8290dca84443fe0fd0914b47245b9cd3 +Author: daitingting +Date: Mon May 14 18:12:56 2018 +0800 + + * Add taskList in submenu. + * Adjust actions for task cases. + +commit a2cc1222c4f689368ed111f62e4959cd1ecea986 +Merge: 75c9ebecc4 00aa64c979 +Author: liugang +Date: Mon May 14 18:09:57 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 75c9ebecc48f1d65d87fe4b5aba5ca3a412d0cbc +Author: liugang +Date: Mon May 14 18:09:45 2018 +0800 + + * Add qd overview page. + +commit 85004331040b5ec7567696666f1818944cbeeeea +Author: Catouse +Date: Mon May 14 17:39:43 2018 +0800 + + * improve UI of login view. + +commit b6eb107c173e0485c5c82eb6d853c64f50f8a0f0 +Author: Catouse +Date: Mon May 14 17:39:33 2018 +0800 + + * output debug in config object. + +commit 00aa64c979546ba3b159abbff06f1baed3034caa +Author: wangyidong +Date: Mon May 14 17:25:01 2018 +0800 + + * adjust for testtask create and edit page. + +commit b37ba6bd816d73f88e3529d1fd34c5acdab4912f +Merge: bda005ea0d d14b518163 +Author: wangyidong +Date: Mon May 14 17:11:12 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bda005ea0d067b2588d468785e9cbff6e04791f9 +Author: wangyidong +Date: Mon May 14 17:10:47 2018 +0800 + + * adjust for todo create page. + +commit d14b5181633e530ebe4c2237a53f4fe9b175c0f8 +Author: Catouse +Date: Mon May 14 16:55:06 2018 +0800 + + * refactor codes. + +commit 1d72c00643a8af45ecf35ef54c0731e4801d6a09 +Merge: 53e6c095d5 8d28f9361e +Author: Catouse +Date: Mon May 14 16:54:08 2018 +0800 + + Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms + +commit 8d28f9361ee855f3ec6932819019e0b3efda3cd1 +Merge: 760d4205e3 7e612039cd +Author: liugang +Date: Mon May 14 16:49:24 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 760d4205e3b5501696274a1fe4a670b5eb2313fb +Author: liugang +Date: Mon May 14 16:49:11 2018 +0800 + + * Refact browse page of testtask. + +commit 7e612039cdfcaca420190fbc1de65aa632a6fa33 +Merge: 065e720ed3 7430deca8c +Author: chenfeiCF +Date: Mon May 14 16:16:48 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 065e720ed3e55e31f4d6f0c2bb1a68f3fa93ad47 +Author: chenfeiCF +Date: Mon May 14 16:15:44 2018 +0800 + + * Finish task #4081, #4082, #4083, #4084, #4085. + +commit 7430deca8c41480365e3373808ac707a58808841 +Author: daitingting +Date: Mon May 14 16:15:34 2018 +0800 + + * Rewrite block page of testtask. + +commit 18bf8b6ff4e271b3653d1bf335e53d95378ee820 +Merge: 6473e52976 4c3df122a0 +Author: daitingting +Date: Mon May 14 16:03:57 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6473e52976d551ec0d0b8e7cc7b398146c63ff41 +Author: daitingting +Date: Mon May 14 16:03:43 2018 +0800 + + * Rewrite activate page. + +commit 53e6c095d5e6a318691c7c87395b9c5f2ce8c8c2 +Author: Catouse +Date: Mon May 14 15:48:37 2018 +0800 + + * fix inputFocusJump not defined error. + +commit dba27baadff23b159f59c85d6d2e1f79923ac27e +Author: Catouse +Date: Mon May 14 15:48:17 2018 +0800 + + * fix bug severity not show in block. + +commit 4c3df122a0325e7969cf1b8767f0cfaaa25523c4 +Merge: 6e08c62f81 ca74933fdc +Author: liugang +Date: Mon May 14 15:36:49 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6e08c62f815d843c29ec65913d0d29bdedce7f10 +Author: liugang +Date: Mon May 14 15:35:57 2018 +0800 + + * Refact cases page and link case page of testtask. + +commit ca74933fdc00ec2b5942a5403f910f30183a9d51 +Merge: 68b1ec1dcd 0e34f1a8a7 +Author: daitingting +Date: Mon May 14 15:35:13 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 68b1ec1dcdad1dacf5193de430d195c03fcfc6e4 +Author: daitingting +Date: Mon May 14 15:34:56 2018 +0800 + + * Rewrite start and close page. + +commit 0e34f1a8a73ec0c6988498700967f5797a8d29ea +Merge: 39d5b73286 e4e8cad0d7 +Author: 滔哥 +Date: Mon May 14 15:25:55 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 39d5b73286e1904c08afc9ec0adde89d84f83835 +Author: 滔哥 +Date: Mon May 14 15:25:31 2018 +0800 + + * Task#4115. + +commit e4e8cad0d721d941b8e5e41e2b918cf4d451b70e +Author: Catouse +Date: Mon May 14 15:16:22 2018 +0800 + + * update favico. + +commit ebe0b29ccb47a26a8ea265673192def5fa3fa421 +Merge: 40e796caf6 7cbc29695a +Author: Catouse +Date: Mon May 14 15:10:57 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 40e796caf6c9829c7ea4658196c33dbf97d1109a +Author: Catouse +Date: Mon May 14 15:10:51 2018 +0800 + + * refactor codes. + +commit 7cbc29695a183db9294e4b1e0ddc272dcc05b4cc +Merge: d4af3e2d00 a8c1340f86 +Author: wangyidong +Date: Mon May 14 14:57:41 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d4af3e2d0039bd32e402743a0ac313aca4ed94ca +Author: wangyidong +Date: Mon May 14 14:57:13 2018 +0800 + + * finish task #4091. + +commit a8c1340f86d5dcab6f86d7d1cb01019d4b50c874 +Author: daitingting +Date: Mon May 14 14:16:15 2018 +0800 + + * Give a tip when no products or no bugs. + +commit e46a670ddc2d5d2a8c67ae57406163a556c76b67 +Author: 滔哥 +Date: Mon May 14 13:57:53 2018 +0800 + + * Fix bug. + +commit 54aed2fd850fd004dc501e1d42720c970307ad31 +Author: Catouse +Date: Mon May 14 11:37:51 2018 +0800 + + * update zui files. + +commit 2ba69ebc8eadd6a492f90aaa35504f1d78132850 +Merge: 786d024ef6 78be34984f +Author: Catouse +Date: Mon May 14 11:14:35 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 786d024ef6b955342aa6a06ec5ec7d5b9fb4bb64 +Author: Catouse +Date: Mon May 14 11:14:25 2018 +0800 + + * update zui files. + +commit 78be34984f2805493a86ee7e2c3c2b6740496f37 +Merge: 5f1823691c 14f54e7f37 +Author: liugang +Date: Mon May 14 11:08:30 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5f1823691c26641d2b990c1b12f52896f8ed3823 +Author: liugang +Date: Mon May 14 11:08:10 2018 +0800 + + * Refact library of testsuite. + +commit f37646ba3fe727a2fad8c3cc460bf77586369cb5 +Merge: 46c8565dbd 14f54e7f37 +Author: 滔哥 +Date: Mon May 14 10:21:41 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 46c8565dbdb44ce7df808dc5b647df55552649e0 +Author: 滔哥 +Date: Mon May 14 10:20:41 2018 +0800 + + * Task#4119 + +commit 14f54e7f371703103b56b7e3eafe6487c41271c2 +Author: wangyidong +Date: Mon May 14 10:07:31 2018 +0800 + + * adjust for login page. + +commit d95c372d312756c5bb06e7e02cb73b25a0d502ea +Author: 滔哥 +Date: Mon May 14 09:54:57 2018 +0800 + + * Task#4119 + +commit 31ce8d662798ff99b2fc4c444306620e8cb1b90a +Merge: e365704e10 ae2b82e088 +Author: 滔哥 +Date: Mon May 14 09:01:57 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e365704e10cadebd71d9c7a093df14d75ac2d3f9 +Author: 滔哥 +Date: Mon May 14 08:57:16 2018 +0800 + + * Task#4034,#4035. + +commit ae2b82e088a0d04cf814bb8ff88c6e4ddfc872fb +Merge: cb5e1a205a 6908a2cbd8 +Author: wangyidong +Date: Fri May 11 16:35:45 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cb5e1a205aa40903bbf7d53e67e97c8b05cabbfa +Author: wangyidong +Date: Fri May 11 16:35:19 2018 +0800 + + * finish task #4090. + +commit 6908a2cbd841ef1be3416f3594c8bc485375d402 +Author: chenfeiCF +Date: Fri May 11 16:09:31 2018 +0800 + + Finish task #3986, #3987, #3988. + +commit 9ae6d0f9b87497d24405f7dfd32675f93a48644e +Merge: 0eeaeb1219 266c114dac +Author: liugang +Date: Fri May 11 16:08:28 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0eeaeb12191be57940163874e8b3de1d481df25d +Author: liugang +Date: Fri May 11 16:07:54 2018 +0800 + + * Refact browse page, create page, edit page, view page, linkcase page of testsuite. + +commit ae605d79c2c2408f60323289d267ae47dd305b82 +Author: wangyidong +Date: Fri May 11 16:05:45 2018 +0800 + + * adjust for mail. + +commit 266c114dac2c607af2b81d638e92528ea421f0e1 +Merge: 8e8f2d4456 d9d4d8b69e +Author: wangyidong +Date: Fri May 11 15:39:19 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8e8f2d4456099e7003f0ad19f36f59c6535bcfab +Author: wangyidong +Date: Fri May 11 15:39:00 2018 +0800 + + * adjust for batch create task page. + +commit d9d4d8b69e5eda68cecd83141e9c6d48576e8f21 +Merge: dfa280ae57 ad3eebb5ee +Author: Catouse +Date: Fri May 11 15:12:35 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dfa280ae572c00d4b96d3180334aa6037d28c3c8 +Author: Catouse +Date: Fri May 11 15:12:17 2018 +0800 + + * change checkbox and radio size. + +commit ad3eebb5eec51db803232d0af5b8d7687f55cbda +Merge: 48c3d5a8e5 1f859fc781 +Author: wangyidong +Date: Fri May 11 15:07:50 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 48c3d5a8e5250ed9feabbe91c072aa513e19970c +Author: wangyidong +Date: Fri May 11 15:07:21 2018 +0800 + + * finish task #4080. + +commit 1f859fc781a56f5e010a6a3b1af4ea924510d2bd +Merge: 6aa2295ea6 eff03ed48e +Author: Catouse +Date: Fri May 11 15:00:55 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6aa2295ea6c8178e3e31f592d07e543c97bcfb9a +Author: Catouse +Date: Fri May 11 14:58:57 2018 +0800 + + * improve UI of datatable custom model. + +commit eff03ed48ed082a8f0ec17e117c2410900159c22 +Author: wangyidong +Date: Fri May 11 14:46:30 2018 +0800 + + * finish task #4042. + +commit 362e6f25d5a1809ac9f18a5559592175ae551dfa +Author: tengfei +Date: Fri May 11 14:12:42 2018 +0800 + + * minor translation change + +commit 572ec7aef583dce6e6c3b91e79e4aa14a1b90a21 +Author: wangyidong +Date: Fri May 11 13:25:05 2018 +0800 + + * finish task #4002. + +commit 99c570c5f7340ddb7be7773d7e787d7612515080 +Author: wangyidong +Date: Fri May 11 13:09:01 2018 +0800 + + * finish task #4000. + +commit e7fd338b8498fd4b90a08d8bec6e8e12adea22f8 +Merge: cc0bfeed1d 96b9e26cb5 +Author: wangyidong +Date: Fri May 11 11:30:42 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cc0bfeed1d8490bb874e7efb8b4bee7d2ebc178a +Author: wangyidong +Date: Fri May 11 11:30:20 2018 +0800 + + * finish task #3999. + +commit 96b9e26cb51dcda89649f89e143f0ba5cd39b00c +Author: tengfei +Date: Fri May 11 11:26:56 2018 +0800 + + * minor translation update + +commit 196693330636bc1bc67e9f94846825a76e3ae823 +Author: wangyidong +Date: Fri May 11 11:08:06 2018 +0800 + + * finish task #3998. + +commit 16fd2af25e2939b84627be8afe36d7939c7b12b3 +Merge: 846c997826 61f56263a9 +Author: tengfei +Date: Fri May 11 10:43:33 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 61f56263a9cdb38f52283b49584393be7c6bbcc3 +Merge: 5360683bf3 792e972393 +Author: 滔哥 +Date: Fri May 11 10:40:08 2018 +0800 + + * Merge conflict. + +commit 5360683bf3a6f02fa9a9fbe47026c5d93d2f743b +Author: 滔哥 +Date: Fri May 11 10:35:28 2018 +0800 + + * Task for Custom module. + +commit 792e97239368fb7eba7e6b4b219b52106de03e0c +Merge: 4793ee5dd0 b43d4bbf5f +Author: wangyidong +Date: Fri May 11 09:59:30 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b43d4bbf5f59190d0cf74824606db843ecbd340e +Merge: ac799f59ed b2b0766275 +Author: 滔哥 +Date: Fri May 11 09:57:48 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4793ee5dd0d680772e2376efa4a3de24d5810e44 +Author: wangyidong +Date: Fri May 11 09:55:38 2018 +0800 + + * adjust for custom-score. + +commit ac799f59eda6f35c57433342c35a6d66c81a6d0a +Author: 滔哥 +Date: Fri May 11 09:51:53 2018 +0800 + + * Task#4003 + +commit c356a126186ad6941e394a3456f8ead80eca4eff +Author: 滔哥 +Date: Fri May 11 09:51:15 2018 +0800 + + * Task#4032 + +commit a5867d97645aa22931501a5046e9927e0f98c582 +Author: 滔哥 +Date: Fri May 11 09:50:53 2018 +0800 + + * Task#4004，#4005 + +commit 1b1a03a334f04aba981f01816de1fd7ebbe0df92 +Author: 滔哥 +Date: Fri May 11 09:50:13 2018 +0800 + + * Task#4006 + +commit 725c676d5c30dbfbe0a978f3255719b6a7d34d6a +Author: 滔哥 +Date: Fri May 11 09:48:49 2018 +0800 + + * Task#4022 + +commit b2b076627572f1c6c249ea82aab00154f54ebe56 +Merge: 1ff56a48d9 c91e5da044 +Author: Catouse +Date: Fri May 11 08:40:26 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1ff56a48d935061f53a11f53e4f06cb07609eaff +Author: Catouse +Date: Fri May 11 08:40:20 2018 +0800 + + * update zui. + +commit c91e5da04419d6d4543ab0a214fb66b9f112cd21 +Merge: fa6ed57b81 73acd9ff66 +Author: liugang +Date: Thu May 10 17:44:04 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fa6ed57b81bbe7ec6ca0b0a5010b175a2d255af6 +Merge: 4ad2bdac02 39c95c823d +Author: liugang +Date: Thu May 10 17:43:45 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4ad2bdac028a310842764c7870b0b6b5ed8863be +Author: liugang +Date: Thu May 10 17:43:29 2018 +0800 + + * Refact browse page of bug. + +commit 73acd9ff6607a83e7b60866102cad9b9e1df5eb7 +Author: wangyidong +Date: Thu May 10 17:43:11 2018 +0800 + + * finish task #3997. + +commit 39c95c823d2ee87678425f65d9a504bc257b03c4 +Author: wangyidong +Date: Thu May 10 17:15:06 2018 +0800 + + * finish task #4078. + +commit 39dfb0648a231ab33fb68cb3179843260731cd41 +Author: Catouse +Date: Thu May 10 16:33:16 2018 +0800 + + * refactor codes. + +commit 726556fd042c9f55f636cddef0cffaa70c2d8aac +Author: Catouse +Date: Thu May 10 16:18:00 2018 +0800 + + * refactor codes. + +commit 8206f363327f20957e58a78439d32da7dd8b58a6 +Merge: f2ba54dac9 f214c7ece2 +Author: Catouse +Date: Thu May 10 16:02:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f2ba54dac9c65582f4733c22309868e2445334ed +Author: Catouse +Date: Thu May 10 16:02:02 2018 +0800 + + * improve UI of task/create view. + +commit f214c7ece248b567713e6c2aa41ae78694059756 +Author: wangyidong +Date: Thu May 10 15:52:47 2018 +0800 + + * adjust product-all page. + +commit 32dcdeb74cdab742858266f2ea9d7808d7243959 +Author: wangyidong +Date: Thu May 10 15:52:19 2018 +0800 + + * finish task #4054. + +commit 8e45aed577af1f84dbab073ef236958bd3629202 +Merge: d5972b7a23 c32fa94946 +Author: wangyidong +Date: Thu May 10 15:33:09 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d5972b7a2361bc2055feda07050e3f9b64e7630d +Author: wangyidong +Date: Thu May 10 15:32:08 2018 +0800 + + * finish task #3982. + +commit c32fa949462ab49d094a66c507ed52049db4c8ef +Author: Catouse +Date: Thu May 10 15:15:39 2018 +0800 + + * update zui css. + +commit 266290612994ec8b38d3f1d79a62d39bd49eb0c5 +Author: Catouse +Date: Thu May 10 15:14:19 2018 +0800 + + * refactor code. + +commit 03aed3944281baf664b974ffd780aebc9ce5b069 +Author: Catouse +Date: Thu May 10 15:13:08 2018 +0800 + + * change label-level to label-severity. + +commit 8e5b1a81b4ffd30213bf873a9deab109de5cf94e +Author: Catouse +Date: Thu May 10 14:58:44 2018 +0800 + + * change file language. + +commit ad4a3c3532c06093f4b5a19ccb085ddf5a79f600 +Merge: 3f2e2b96e7 c02d5cf74a +Author: wangyidong +Date: Thu May 10 14:53:26 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3f2e2b96e70f0bf322a15b5039d8e8ebacb55989 +Author: wangyidong +Date: Thu May 10 14:52:04 2018 +0800 + + * finish task #3981. + +commit c02d5cf74ad015e30df497d2cbc866fb61b7c23f +Author: Catouse +Date: Thu May 10 14:51:17 2018 +0800 + + * improve table form style. + +commit 0a375759a7b330a9d61eef98376146b91088bd57 +Merge: 623696b1b0 08da02ba10 +Author: Catouse +Date: Thu May 10 14:50:03 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 623696b1b0c4bf71198d49cfc94736f2f7172b75 +Author: Catouse +Date: Thu May 10 14:49:56 2018 +0800 + + * update mzui. + +commit 2fda0ddde38abeb9948647f90dfcf42122f4683f +Author: Catouse +Date: Thu May 10 14:49:38 2018 +0800 + + * refactor code. + +commit a3bd5c29706bf4340035e6249a614b688e82cdad +Author: wangyidong +Date: Thu May 10 14:44:18 2018 +0800 + + * adjust for table style. + +commit 08da02ba1059f6fa794002e43a2538eed3f661b6 +Author: wangyidong +Date: Thu May 10 14:43:18 2018 +0800 + + * finish task #3980. + +commit bd6668f25b18cbafd704f118ebabe031cc4a3cbb +Merge: 3a62ffb622 0343fbca91 +Author: wangyidong +Date: Thu May 10 14:41:12 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3a62ffb6226726b07a1b9ca2de5f25b2fd3c9ae0 +Author: wangyidong +Date: Thu May 10 14:40:44 2018 +0800 + + * finish task #4044. + +commit 0343fbca916260fff0c4feca29e6898a191da199 +Author: Catouse +Date: Thu May 10 14:11:44 2018 +0800 + + * make dropdown menu in subNavbar auto open when mouse hover. + +commit 3ec32f45699dfc234986d3125321d41ef16e27d6 +Author: Catouse +Date: Thu May 10 13:49:13 2018 +0800 + + * hide datatable btn. + +commit 3b3967b5b44c263289f5db1819dd76f555d33b55 +Author: Catouse +Date: Thu May 10 13:43:39 2018 +0800 + + * change center-block width for form view. + +commit 52799cf5b85b9c62ba63406ee173ad41e4c2304c +Author: wangyidong +Date: Thu May 10 11:18:09 2018 +0800 + + * finish task #3978. + +commit 767a210d026d3e00debf4bc5a8676cd6bee8ea53 +Author: wangyidong +Date: Thu May 10 10:03:17 2018 +0800 + + * finish task #3974. + +commit d20a923105678f725be381996d86e8167e9c1b92 +Merge: aede4506ce e098acb326 +Author: wangyidong +Date: Thu May 10 10:00:33 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit aede4506cebaa7aeafcb911de1325221e3cb0287 +Author: wangyidong +Date: Thu May 10 10:00:05 2018 +0800 + + * finish task #3973. + +commit e098acb3261d945bc4b22d33821900f35526dcf7 +Merge: 81d2309191 c3e3d3e974 +Author: daitingting +Date: Wed May 9 18:07:01 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 81d230919191a0088e172e797780be07abd14132 +Author: daitingting +Date: Wed May 9 18:06:34 2018 +0800 + + * Adjust index file of doc. + +commit c3e3d3e974c86776e18d7f44bfb034ee0fd4800d +Merge: ab4d9a1f2c cad8f8652b +Author: wangyidong +Date: Wed May 9 15:20:15 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ab4d9a1f2c7de6a82679a7a0436e867d14128e6e +Author: wangyidong +Date: Wed May 9 15:18:45 2018 +0800 + + * fix error and adjust for ux. + +commit cad8f8652bffbc490238d5a28e35eb0cf7d6b299 +Author: daitingting +Date: Wed May 9 15:17:34 2018 +0800 + + * Optimize them. + +commit 33a8e0d5353e2ea5a9140babe013df3c03c7b902 +Author: daitingting +Date: Wed May 9 14:59:06 2018 +0800 + + * Merge it. + +commit 7807b3fd12bc4861e5e82d935d57f67b5b9a26e7 +Author: daitingting +Date: Wed May 9 14:55:01 2018 +0800 + + * Adjust codes. + +commit 226074e7b298c8057e39ca725ad7c3b6ddb1b2c1 +Author: daitingting +Date: Wed May 9 14:54:38 2018 +0800 + + * Adjust codes. + +commit bcb5137abea90e5f0e99005eed510ec6c8ffdd12 +Author: daitingting +Date: Wed May 9 14:40:50 2018 +0800 + + * Move update sql to 10.0.beta. + +commit b6f0a806f84b5e1bb2c38780dd44e4cb5cb10770 +Author: daitingting +Date: Wed May 9 14:35:51 2018 +0800 + + * Adjust icon. + +commit 60f224db4a2ebcb76c37a9e943e1e101186c1ac5 +Merge: 911da9d0cb da9f9f6a05 +Author: Catouse +Date: Wed May 9 11:15:15 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 911da9d0cb8ceb562567052c923252d487a84ebe +Author: Catouse +Date: Wed May 9 11:15:09 2018 +0800 + + * update zentao icons. + +commit da9f9f6a0592309a53b5942d5d1d44a228693c19 +Merge: 80478980dd a4e6189f51 +Author: daitingting +Date: Wed May 9 11:01:40 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + Conflicts: + module/doc/view/browse.html.php + +commit 80478980dd49ac2d6c1c6512987fd9867894c7d7 +Author: daitingting +Date: Wed May 9 11:00:55 2018 +0800 + + * Rewrite showfile page of doc. + +commit a4e6189f518dcb49e98ef2c70757ec0ed757aea0 +Merge: 6a5098c40e 5db3cf9041 +Author: Catouse +Date: Wed May 9 10:48:12 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6a5098c40e08fba760b29dd3dbde6f218e112566 +Author: Catouse +Date: Wed May 9 10:48:07 2018 +0800 + + * update zui css. + +commit 5db3cf9041d36b7a690f1a121b1624c4a4a36f7e +Author: 滔哥 +Date: Wed May 9 10:04:14 2018 +0800 + + * Format code. + +commit ed48dbeb8127dd0e50672a98d63e7c0183947891 +Merge: 45f1da3824 97a5c62d95 +Author: 滔哥 +Date: Wed May 9 10:00:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 45f1da3824be40048cc1a266f113dcb5f9c9f7c2 +Author: 滔哥 +Date: Wed May 9 09:58:48 2018 +0800 + + * Task#3944 + +commit 97a5c62d95f233b244c4e315379502ea0323b002 +Merge: f913dcc7f0 86cd21ccd2 +Author: Catouse +Date: Wed May 9 09:26:57 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f913dcc7f0f8f08ab6762b0a0a02bc076c2ef706 +Author: Catouse +Date: Wed May 9 09:26:51 2018 +0800 + + * update zui css. + +commit 325fee5bc74cd6b4c2860b40aa4f07beff65f891 +Author: 滔哥 +Date: Wed May 9 09:18:59 2018 +0800 + + * Task#3944 + +commit 86cd21ccd2957e1d40a41d921060d2a57c1a1ba5 +Author: wangyidong +Date: Wed May 9 09:17:31 2018 +0800 + + * adjust for zentaoux. + +commit 446ee935f97b010cbed8320bc6b54b6d39201bf2 +Author: daitingting +Date: Wed May 9 09:00:23 2018 +0800 + + * Adjust codes. + +commit 9d2ddabcfeec2637e7503194fa80cc76e414448b +Merge: 4985646652 36b6e5863d +Author: wangyidong +Date: Wed May 9 08:59:58 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4985646652b07f35f249e0ffc416b00d9ec76305 +Author: wangyidong +Date: Wed May 9 08:59:25 2018 +0800 + + * adjust for btn-icon class. + +commit 946436452dbe6cb6f5d51d27e48407a53414dc78 +Author: 滔哥 +Date: Wed May 9 00:39:26 2018 +0800 + + * Task#3944 + +commit 36b6e5863d79d3d3962a90cf7076ca98653460bd +Author: 滔哥 +Date: Tue May 8 23:27:12 2018 +0800 + + * Task#3942 + +commit 7939863a05ed34b5a0273e0fe6017c93ffc87581 +Merge: a16a48a323 518f29d616 +Author: 滔哥 +Date: Tue May 8 23:13:16 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a16a48a323d1ba67aa07a795f64f2206c4f3a093 +Author: 滔哥 +Date: Tue May 8 23:12:49 2018 +0800 + + * Task#3942 + +commit 518f29d6166671c4ef6dbbbfd48304f5589ec514 +Author: Catouse +Date: Tue May 8 19:31:47 2018 +0800 + + * update zui. + +commit d67a6ca6b1a7806275500f033a22dc2cbe76f93a +Author: Catouse +Date: Tue May 8 19:25:05 2018 +0800 + + * improve UI of task list views. + +commit 36e68819e90da94f2a80e54feb05de9f225c004b +Merge: 8248b4aecb 495822efd4 +Author: Catouse +Date: Tue May 8 17:11:30 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8248b4aecb99fbaa501c684482383636a567c590 +Author: Catouse +Date: Tue May 8 17:11:24 2018 +0800 + + * change views. + +commit 28300630ea922ceb671e01035fed18493c905ada +Author: Catouse +Date: Tue May 8 17:11:15 2018 +0800 + + * remove debug property from config object. + +commit cd2e8655ee8cb3fd8dd488f1e4a28ec8449a4c7c +Author: Catouse +Date: Tue May 8 17:10:38 2018 +0800 + + * update zui. + +commit 495822efd47c615589745e0bfb396a02daadfe10 +Author: wangyidong +Date: Tue May 8 16:45:07 2018 +0800 + + * adjust for doc. + +commit abec53a54d28c95f59502fa3ea6b621c39076e6b +Merge: c91ca33cb7 1fd774b083 +Author: Catouse +Date: Tue May 8 16:18:28 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c91ca33cb78873f2f04bb5b81065060b2bf11f81 +Author: Catouse +Date: Tue May 8 16:18:20 2018 +0800 + + * change common views. + +commit f3d0efab5791ac3b15ed029e58b5c9bd7b960b36 +Author: Catouse +Date: Tue May 8 16:18:11 2018 +0800 + + * adjust style of products block. + +commit 67f123fb2ecb7ab6c007bf0278b3ced6a2d29188 +Author: Catouse +Date: Tue May 8 16:16:11 2018 +0800 + + * change todo/batchcreate view. + +commit 1f144cf5af43de8df065fbdd28fa280dd92686ee +Author: Catouse +Date: Tue May 8 16:15:37 2018 +0800 + + * update zui files. + +commit 1fd774b083e4d2f9598a69b3f4b26e510b5a42b4 +Author: daitingting +Date: Tue May 8 16:03:34 2018 +0800 + + * Rewrite view page of doc. + +commit 0aa7f60012fb427d059611f19df5b3bbe91e3027 +Merge: bba8b0ed1d de33978595 +Author: daitingting +Date: Tue May 8 14:17:23 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bba8b0ed1da48eb427310544f320bd897afbdb96 +Author: daitingting +Date: Tue May 8 14:16:55 2018 +0800 + + * Add highlight for sidemenu. + +commit de33978595ac09641ce420c3f754159e342447ab +Author: Catouse +Date: Tue May 8 14:00:10 2018 +0800 + + * change front helper class to output better js code. + +commit c6f29e2242432317cb163f5f1c7510dad6cf2eda +Merge: 12f865ad71 9ef57f3cfe +Author: Catouse +Date: Tue May 8 13:44:42 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 12f865ad7118986169cfd39c909977e99c3ac26b +Author: Catouse +Date: Tue May 8 13:44:35 2018 +0800 + + * improve batchcreate form UI. + +commit 9ef57f3cfe2deb1e5a577737ef1108fa2a4776e2 +Merge: b1c8712db3 061f8819c9 +Author: daitingting +Date: Tue May 8 13:24:50 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b1c8712db320865d0d4889f46b753df232cada7e +Author: daitingting +Date: Tue May 8 13:24:26 2018 +0800 + + * Adjust title for search. + +commit 061f8819c969732359b27d933415eb3f67e70a7c +Author: chenfeiCF +Date: Tue May 8 13:22:07 2018 +0800 + + * Adjust fourth menu for some views of user module. + +commit e5f168d1ea3a948b1be8394e6067bb5da1605c96 +Author: Catouse +Date: Tue May 8 11:44:47 2018 +0800 + + * improve UI. + +commit 7405fe8fa484f8bb7f1b3ea477eb44b326928463 +Merge: 0f29586d94 328e622028 +Author: Catouse +Date: Tue May 8 11:31:32 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0f29586d94c5146af69f5b1148635ebcf40d9964 +Author: Catouse +Date: Tue May 8 11:31:21 2018 +0800 + + * update zui css file. + +commit 328e6220289927171fb591133a0588c7ac0d4686 +Author: daitingting +Date: Tue May 8 11:16:53 2018 +0800 + + * Add pager for alllibs page. + +commit 04259632cd91767f935fd98938cc826845e768a6 +Merge: 63246110ac a992b48ee4 +Author: daitingting +Date: Tue May 8 11:06:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 63246110acf0e73189a2ef456b8e75c5fc2ea3c7 +Author: daitingting +Date: Tue May 8 11:05:54 2018 +0800 + + * Adjust codes. + +commit a992b48ee4afe22cfd4def9752f1cccbd58eab14 +Merge: eee114b4d6 3110b8c5fb +Author: Catouse +Date: Tue May 8 10:58:26 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit eee114b4d6ea828a3c58dcd27919268c31ea6ffb +Author: Catouse +Date: Tue May 8 10:58:19 2018 +0800 + + * update zui files. + +commit dda5c7977f0429559714c6116f4c27ff1f4aef19 +Author: Catouse +Date: Tue May 8 10:57:42 2018 +0800 + + * remove unused files. + +commit 3110b8c5fb5dc809dfd0b2a983e9092b14c9bf7d +Author: daitingting +Date: Tue May 8 10:52:13 2018 +0800 + + * Adjust codes. + +commit 30df486fea122873a74b120d98721d849ac58c3d +Author: daitingting +Date: Tue May 8 10:43:19 2018 +0800 + + * Adjust icon. + +commit 29dc19bf162802a329b6f56631ce12fad61117e7 +Author: daitingting +Date: Tue May 8 10:37:05 2018 +0800 + + * Adjust icon. + +commit ff03083f168229024d5896f74030b0e46aac7362 +Merge: 2799d50d7f bfe6c7f85e +Author: daitingting +Date: Tue May 8 10:28:48 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2799d50d7f02d5311f12a27ba71ff13bc931ecae +Author: daitingting +Date: Tue May 8 10:18:38 2018 +0800 + + * Add pager for doc. + +commit bfe6c7f85ed952dc4cf22dc4bf38ba314a9d7c87 +Author: Catouse +Date: Tue May 8 09:55:32 2018 +0800 + + * update zui. + +commit decff416f94fc854eceb1eabafcd2399310d7d09 +Author: chenfeiCF +Date: Mon May 7 19:06:52 2018 +0800 + + * Adjust some view file of user module. + +commit c4eb4ee453ddbe672697d9770691aa504b903289 +Author: daitingting +Date: Mon May 7 17:33:12 2018 +0800 + + * Merge it. + +commit ea560955d957e3a6a3987ce0cb15f6582a5a9e0d +Author: daitingting +Date: Mon May 7 17:30:05 2018 +0800 + + * Merge it. + +commit 511e67f5797222ad813a88574037310975d5dce4 +Merge: 42c6502b0f f6289cc53c +Author: daitingting +Date: Mon May 7 17:28:29 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + Conflicts: + db/update9.8.1.sql + module/doc/css/common.css + module/doc/view/browse.html.php + +commit 42c6502b0f503f52dc628dc16eb6571d0744030a +Author: daitingting +Date: Mon May 7 17:27:12 2018 +0800 + + * Rewrite allLibs, objectLibs and browse pages of doc. + +commit f6289cc53c13786e3242f8792030e7752898794f +Merge: edb2689262 ec493368ee +Author: 滔哥 +Date: Mon May 7 17:08:09 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit edb2689262571bafcc103e5a823734e30ed36175 +Author: 滔哥 +Date: Mon May 7 16:54:52 2018 +0800 + + * Format code. + +commit ec493368ee20c29b7766502b234ea2425fbac2d8 +Merge: 56489075b0 414282d005 +Author: wangyidong +Date: Mon May 7 16:50:15 2018 +0800 + + Merge branch 'master' of git://github.com/easysoft/zentaopms + +commit 56489075b0b105987c2c5cc7289e9ad493913f99 +Merge: 5bf160432b 101832bcfd +Author: wangyidong +Date: Mon May 7 16:48:59 2018 +0800 + + Merge branch 'zentaopms_9.8' + +commit 427afd5674deb4c82a027e786245901139ca14a3 +Author: 滔哥 +Date: Mon May 7 15:07:31 2018 +0800 + + * Task#3921 + +commit 27466d9cd83faea7d8cdfffd033a4c04c87ab07f +Author: 滔哥 +Date: Mon May 7 15:04:28 2018 +0800 + + * Task#3921 + +commit 414282d00541fd2ba89fdf21e4ba1087e712f9bc +Merge: 70dcc23aca 5bf160432b +Author: liugang +Date: Mon May 7 11:55:18 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 70dcc23aca08fba6278eb863eb34dc5e534696bc +Author: liugang +Date: Mon May 7 11:54:54 2018 +0800 + + * Refact testtask page of project. + +commit 5bf160432bd3254a7eef2109f59826fa82211ccb +Merge: 433b28e7c1 b38b38365a +Author: chenfeiCF +Date: Mon May 7 09:24:34 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 433b28e7c11832799d5d318d383fc0f02a85e1f3 +Author: chenfeiCF +Date: Mon May 7 09:23:42 2018 +0800 + + * Adjust user todo and story view file. + +commit b38b38365affe878a12a67ddf439fa5ceed80cc1 +Author: daitingting +Date: Mon May 7 09:23:36 2018 +0800 + + * Update zui. + +commit 83a6c78c3b8c2795728092e07f9b483b5f5f306f +Merge: 55c68b611d 52adf369e9 +Author: wangyidong +Date: Fri May 4 15:14:03 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 55c68b611dc8c95cc9b05663978b386de0c1459f +Author: wangyidong +Date: Fri May 4 15:13:22 2018 +0800 + + * finish task #3936. + +commit 52adf369e94662ec6601ef96e7f9daa65db528ef +Author: daitingting +Date: Fri May 4 09:15:25 2018 +0800 + + * Finish search function. + +commit 706b0ea0e184c8a5480d070b7ba9cd9a3214ae56 +Merge: 1e7406d4a3 5506bcee01 +Author: daitingting +Date: Thu May 3 17:01:35 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1e7406d4a334c5073a98074917c8295d6602d337 +Author: daitingting +Date: Thu May 3 17:01:14 2018 +0800 + + * Rewrite edit page of doc. + +commit 5506bcee01480313be4df942bf264cbf0876d21f +Author: chenfeiCF +Date: Thu May 3 16:50:18 2018 +0800 + + * Finish task #3879, #3880. + +commit 89b4ed727c83f63876eae188b6553c668b615784 +Merge: 8d5ef6e722 86b84dd5a2 +Author: daitingting +Date: Thu May 3 16:45:11 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8d5ef6e722392df173904f311c232207c64a4442 +Author: daitingting +Date: Thu May 3 16:44:50 2018 +0800 + + * Rewrite create page for doc. + +commit 86b84dd5a25ace40cf8161082daa8236b0f4684b +Merge: e6bef8b542 5c7406e5c0 +Author: wangyidong +Date: Thu May 3 16:12:07 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e6bef8b54269e31feac374f78fcb664c739f8292 +Author: wangyidong +Date: Thu May 3 16:05:44 2018 +0800 + + * adjust for task #3947. + +commit 5c7406e5c07fd0fd564c6f653e15a11c9e933dd4 +Merge: a06796c25b 660e499d74 +Author: daitingting +Date: Thu May 3 16:00:14 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a06796c25b73505dceafc6f235ce444a3438bd28 +Author: daitingting +Date: Thu May 3 15:59:30 2018 +0800 + + * Replace effort block to burn block. + * Check priviledge. + +commit 660e499d740329b764368404dba56b35c6ed3923 +Merge: 4a297ee140 fdfa1bbd22 +Author: wangyidong +Date: Thu May 3 15:17:11 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4a297ee1408637e17b2241c9a419ebddec9c3516 +Author: wangyidong +Date: Thu May 3 15:16:27 2018 +0800 + + * finish task #3953. + +commit fdfa1bbd22b23647a01e10f33ec14b294ef8e5d9 +Merge: 46e8569973 9271d69db6 +Author: daitingting +Date: Thu May 3 14:58:34 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 46e85699738587761713fda504b5687e83385004 +Author: daitingting +Date: Thu May 3 14:58:03 2018 +0800 + + * Rewrite view page of project. + +commit 9271d69db671a0999b14ff5479347dee9e4ad747 +Author: dajiao007 +Date: Thu May 3 14:28:06 2018 +0800 + + modify translation of flowchart + +commit 66443f3eeb3856a5fb99e54abbf61a5d320cd148 +Author: chenfeiCF +Date: Thu May 3 14:25:17 2018 +0800 + + * Finish task #3872, #3909. + +commit d950e73715c6ada5d7b7729e80da06899029fc72 +Author: chenfeiCF +Date: Thu May 3 14:24:07 2018 +0800 + + * Modified update9.8.1.sql and zentao.sql file. + +commit c375ed05d0671e1ac49fae4d6f829f8dbe12c4d1 +Merge: 539c1986f9 7b5698f911 +Author: wangyidong +Date: Thu May 3 09:54:01 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 539c1986f9cb37aadbe0dfa3c65d39ad3bcc2d94 +Author: wangyidong +Date: Thu May 3 09:53:30 2018 +0800 + + * adjust for other module page. + +commit 7b5698f911f6da6f30458eb983714fb8e515ff86 +Merge: 43f290fac4 02b8cf01db +Author: liugang +Date: Wed May 2 18:06:31 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 43f290fac46acfb5e8259d18ec7b98fa10334d9c +Author: liugang +Date: Wed May 2 18:06:14 2018 +0800 + + * Refact batch create page of testcase. + +commit 02b8cf01db22bfe36556faac053c3ad0fdb43c1f +Merge: 9748528da5 76c31e952b +Author: daitingting +Date: Wed May 2 16:51:03 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9748528da5aff4b2281ae41ffcbca5cbeaf48a14 +Author: daitingting +Date: Wed May 2 16:50:17 2018 +0800 + + * Rewrite pageNav and pageActions of doc. + +commit 76c31e952b2e2345fa03eb052a47b8b984af872e +Merge: e6c4e06d2f 7f0f102c5d +Author: wangyidong +Date: Wed May 2 16:00:22 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e6c4e06d2fe6d7badaf52d63a910cac1e4c4107a +Author: wangyidong +Date: Wed May 2 15:59:55 2018 +0800 + + * adjust for group module. + +commit 7f0f102c5dd455fb86111fdba0a9124030d588bc +Merge: 20bd8575ac deb70ee4e0 +Author: daitingting +Date: Wed May 2 15:16:13 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 20bd8575acef9c09a5f5dd30f7fb75f744e3c458 +Author: daitingting +Date: Wed May 2 15:15:16 2018 +0800 + + * Add visitedDate and collector fields. + +commit d67fd9d1653f2a05706d8949470b6e30efcbca00 +Author: wangyidong +Date: Wed May 2 13:05:54 2018 +0800 + + * remove custom-ajaxsethomepage page. + +commit deb70ee4e01086a517acc71d1bf0c5e22b200c94 +Author: wangyidong +Date: Wed May 2 10:39:31 2018 +0800 + + * adjust for api-debug page. + +commit 078cfbf4af9a6787c8bc6d035152ba70b9133308 +Merge: c5fd3d0af7 14a2b001ab +Author: wangyidong +Date: Wed May 2 10:13:44 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c5fd3d0af7e422925ff376de1ea1de5af8669a69 +Author: wangyidong +Date: Wed May 2 10:13:20 2018 +0800 + + * adjust for back button in view page. + +commit 14a2b001abae026d366cdfe5e91fcf7e6b771c4b +Author: liugang +Date: Sat Apr 28 18:03:35 2018 +0800 + + * Fix bug. + +commit 7579436d86bf6c021ab690a6da14bb60fc0b07a0 +Merge: 1b645f9055 e36f46ca0a +Author: liugang +Date: Sat Apr 28 17:57:17 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1b645f90550c5d09979f67cf85f593465f0e3d5c +Author: liugang +Date: Sat Apr 28 17:56:36 2018 +0800 + + * Refact batch create task page. + +commit e36f46ca0ab621c999d03d2195111bd8ce92d151 +Author: wangyidong +Date: Sat Apr 28 17:53:20 2018 +0800 + + * adjust for task edit page. + +commit 7327a197abb549db09432fa5e63e28c439b73105 +Merge: c8c5db1bfe dd1d9b67ac +Author: wangyidong +Date: Sat Apr 28 16:49:36 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c8c5db1bfe235aa0cd09275c7a4bb0a4df774847 +Author: wangyidong +Date: Sat Apr 28 16:49:13 2018 +0800 + + * adjust for task module page. + +commit dd1d9b67acdaa56890a28e1c679fb02f6fc5d7d3 +Author: daitingting +Date: Sat Apr 28 16:44:35 2018 +0800 + + * Adjust codes. + +commit 00f74c851ad02bbbcd010d34db40ca9eb22a12ad +Author: daitingting +Date: Sat Apr 28 16:40:23 2018 +0800 + + * Adjust codes. + +commit 7cd8dbe3473ce46eef5c58269f6f52757ca1661a +Merge: 091bbea7aa fddcb3f23c +Author: daitingting +Date: Sat Apr 28 16:37:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 091bbea7aa365a714062c84245cb6075c7d3c17d +Author: daitingting +Date: Sat Apr 28 16:36:56 2018 +0800 + + * Rewrite index page of doc. + +commit fddcb3f23c68deb969c8dfae189ffb95a9ce64bb +Author: wangyidong +Date: Sat Apr 28 15:57:16 2018 +0800 + + * remove fixedTheadOfList and fixedTfootAction. + +commit 8d15930ecf829a71a518bbbd52b306a0239fe782 +Author: wangyidong +Date: Sat Apr 28 14:18:31 2018 +0800 + + * adjust for task pri field width. + +commit 1c7af1e85ff68f3771b5fabf0a03edee11af0629 +Author: wangyidong +Date: Sat Apr 28 14:16:46 2018 +0800 + + * adjust for project task page. + +commit 00f29bee8aff9a5d2955b4a4efa2d7b03bbbf51c +Author: wangyidong +Date: Sat Apr 28 13:52:17 2018 +0800 + + * adjust for file module page. + +commit fb3e2b370fd1ea3f77d0fd5072bd72328900b369 +Author: wangyidong +Date: Sat Apr 28 11:28:53 2018 +0800 + + * adjust for tree browsetask page. + +commit 101832bcfdb016b9c0b721eeaa26d9898bb45ec0 +Author: estellbright <1457749147@qq.com> +Date: Sat Apr 28 10:18:46 2018 +0800 + + * Fix Bug #1518. + +commit f963b360a245a82fcb6710aa2f29bcd3c7d021fd +Merge: 8d65c03247 4cac9a423b +Author: wangyidong +Date: Sat Apr 28 09:43:47 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8d65c03247406cc1b141b66dae610d8fe733804a +Author: wangyidong +Date: Sat Apr 28 09:43:16 2018 +0800 + + * adjust for project batch edit and burn page. + +commit 4cac9a423b7be297051108b756e78d3d89fea839 +Merge: 7d79b7b5db 843f899214 +Author: daitingting +Date: Sat Apr 28 09:16:15 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7d79b7b5db4e15de4a36d2d03e6a849bdb778e9a +Author: daitingting +Date: Sat Apr 28 09:15:37 2018 +0800 + + * Add getDocStructure function. + +commit 7a17a337c489af32a7dc3043afae82047ece7d29 +Author: daitingting +Date: Sat Apr 28 09:12:15 2018 +0800 + + * Update zui. + +commit 843f8992147b16e14751c9ef50cc5b1618fb048b +Author: wangyidong +Date: Sat Apr 28 09:02:34 2018 +0800 + + * adjust project all and import bug page. + +commit df9a873c8e40a554a02437ae7153b5b8b7bd6c4a +Merge: e1846cb067 c28d9b5461 +Author: wangyidong +Date: Fri Apr 27 15:47:07 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e1846cb0673057aa0beb436a26f485e7d7c87348 +Author: wangyidong +Date: Fri Apr 27 15:46:46 2018 +0800 + + * adjust for kanban and import task page. + +commit c28d9b5461905a98f416b1b04aa0b24e5b31948f +Author: liugang +Date: Fri Apr 27 13:52:42 2018 +0800 + + * Adjust lang files. + +commit e2018bb1ea5dfd713085263cf66bdfcf4116d8b4 +Merge: 827b31d89e a3d22705dd +Author: liugang +Date: Fri Apr 27 13:38:51 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 827b31d89ed0abd8c917e10852b8cd4308a9d9be +Author: liugang +Date: Fri Apr 27 13:36:09 2018 +0800 + + * Refact link story page and story page of project. + +commit a3d22705ddde91de4053d425d2dab335df4de527 +Merge: 5c0d4256d5 98c701ea4c +Author: wangyidong +Date: Fri Apr 27 11:30:17 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5c0d4256d5abedfd96ce664dfe235db6ef2c2ddb +Author: wangyidong +Date: Fri Apr 27 11:29:22 2018 +0800 + + * change for task #3936. + +commit 98c701ea4cf8b367034a7dfd2fd5683bbd02aa8a +Author: daitingting +Date: Fri Apr 27 11:22:58 2018 +0800 + + * Adjust codes. + +commit 3dce251b6205bb633233aec29bc4ef5341e0f9e1 +Author: daitingting +Date: Fri Apr 27 11:06:32 2018 +0800 + + * Update zui. + +commit f7f3638ca751ce9888114ce635161c1383ea2657 +Merge: 0188883601 a28f947bb3 +Author: daitingting +Date: Fri Apr 27 11:00:34 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + Conflicts: + module/bug/lang/zh-cn.php + +commit 538b7c65a3cc332d69bb976a5921093ff3ca50bc +Author: estellbright <1457749147@qq.com> +Date: Fri Apr 27 11:00:24 2018 +0800 + + * Fix Bug #1538 #1539. + +commit 018888360186c0611549df3267f4ce62934818e1 +Author: daitingting +Date: Fri Apr 27 10:58:57 2018 +0800 + + * Add project statistic block. + +commit a28f947bb3e680490f5c824fb84904248cc7b10f +Author: wangyidong +Date: Fri Apr 27 10:45:55 2018 +0800 + + * finish task #3961. + +commit a1a04aa45e90827ca02b5e744fee28877b2715c8 +Merge: 960e0af5d2 50336ef762 +Author: wangyidong +Date: Thu Apr 26 17:18:17 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 960e0af5d207273a915851264f2db018e6febe01 +Author: wangyidong +Date: Thu Apr 26 17:17:47 2018 +0800 + + * adjust for show count. + +commit 50336ef7621471c65fd9bfd23dad220ac9d7be47 +Author: liugang +Date: Thu Apr 26 17:09:02 2018 +0800 + + * Refact bug page of project. + +commit dc7f7362a26d993a9803e114a2d19ce2068bfafd +Author: liugang +Date: Thu Apr 26 16:11:17 2018 +0800 + + * Optimize codes. + +commit 2915d16f235905e043f8881010413c2b407ac91d +Merge: 371b6da8bb ee20437535 +Author: liugang +Date: Thu Apr 26 15:59:46 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 371b6da8bb86c7ab17dbcb6ff7da8975fa024288 +Merge: 9450ca5676 0c0500f5d7 +Author: liugang +Date: Thu Apr 26 15:59:34 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ee20437535a9c1b09ef46597458b6ac9d9a7f668 +Author: wangyidong +Date: Thu Apr 26 15:58:21 2018 +0800 + + * adjust for release link bug and story page. + +commit 9450ca5676d76ebbe45bc4abde8ead5c265e6cbb +Author: liugang +Date: Thu Apr 26 15:58:03 2018 +0800 + + * Refact detail page of productplan and build. + +commit eb75fcc2ea7db4d80ecb4da17a992bf14455a9b5 +Author: estellbright <1457749147@qq.com> +Date: Thu Apr 26 14:08:59 2018 +0800 + + * Fix Bug #1525. + +commit 0c0500f5d76422c35da86ecf03208fb8ec525af0 +Merge: b59ac8b1a0 e4b46020b9 +Author: wangyidong +Date: Thu Apr 26 11:28:34 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b59ac8b1a0dc196a4391095a814aa9df3ae4bc6b +Author: wangyidong +Date: Thu Apr 26 11:25:40 2018 +0800 + + * finish task #3915,3917,3955. + +commit e4b46020b941f165b2afed20887036a32ebbb2f2 +Author: daitingting +Date: Thu Apr 26 11:21:05 2018 +0800 + + * Add project overview block. + +commit 8e2573fecedce1abfef1435d221025a9b6189746 +Author: daitingting +Date: Thu Apr 26 10:46:38 2018 +0800 + + * Update zui. + +commit f5111a77112b0b4dd79ed775551e9b8cbfa7b32b +Author: estellbright <1457749147@qq.com> +Date: Thu Apr 26 09:02:09 2018 +0800 + + * Fix Bug #1537. + +commit eed193f3109d45dbb6c189496be4af6b75df4d93 +Merge: aff4e31c97 eafdacf022 +Author: liugang +Date: Wed Apr 25 17:46:24 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit aff4e31c978ad98793732b511b41b6774b17dd32 +Author: liugang +Date: Wed Apr 25 17:45:29 2018 +0800 + + * Refact edit build page and build list page. + * Display dropdown list of builds in detail page of build. + +commit eafdacf0220302b05265f4cc01810d77877461a0 +Author: daitingting +Date: Wed Apr 25 16:23:06 2018 +0800 + + * Rewrite view page of task. + +commit ae1dafbcdf2373cc2592a4365df439cb016de6a0 +Author: daitingting +Date: Wed Apr 25 16:03:22 2018 +0800 + + * Add required for type field. + +commit fd1a63eb5b6a17ec169e8ad76e17242b92ab7930 +Author: daitingting +Date: Wed Apr 25 14:01:53 2018 +0800 + + * Add tip when index page has no project. + +commit 6202123583f5e136c696da7501fb327f73f03114 +Merge: 0d8185d037 1dbb9d4370 +Author: daitingting +Date: Wed Apr 25 13:19:45 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0d8185d0376e3b5d9ef89988e83dd930286717f2 +Author: daitingting +Date: Wed Apr 25 13:19:23 2018 +0800 + + * Rewrite create page of task. + +commit 1dbb9d43705a5cde5a5f0e4975c4499e5ef005d8 +Merge: 5500b19f97 c5371ac7e8 +Author: wangyidong +Date: Wed Apr 25 11:35:21 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5500b19f97915591f49d62d9170c7c103717d3f5 +Author: wangyidong +Date: Wed Apr 25 11:34:26 2018 +0800 + + * finish task #3952. + +commit c5371ac7e88fc0ea9047539d7281b3e224642dd1 +Author: liugang +Date: Wed Apr 25 11:08:57 2018 +0800 + + * Refact testtask page of project. + +commit 3eb0909c4d0757b88df0a63ae8c7d15991df24d7 +Author: wangyidong +Date: Wed Apr 25 09:40:09 2018 +0800 + + * adjust for dev page. + +commit 0571e818d908d70b3ecae5f6fc0818f57a487f95 +Author: wangyidong +Date: Tue Apr 24 16:17:08 2018 +0800 + + * adjust for cron page. + +commit d6b3c5cc6bcd1047e229d3e4f40e34ab845894d6 +Merge: d620047bba b58d0fed16 +Author: wangyidong +Date: Tue Apr 24 16:11:56 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d620047bbaa2c566333f09b7e0b799609f24eb49 +Author: wangyidong +Date: Tue Apr 24 16:11:10 2018 +0800 + + * adjust for admin dev page. + +commit b58d0fed16edb3255a5ad181f7a16581a2fa7c4f +Author: daitingting +Date: Tue Apr 24 15:48:11 2018 +0800 + + * Adjust codes. + +commit 8a652ea638b8ce2a606c9cc11398340c1271f827 +Merge: 6b4a7348de a5ee8fbb23 +Author: daitingting +Date: Tue Apr 24 15:47:12 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6b4a7348dedf8580d98cf8665b79af2ebd6074b8 +Author: daitingting +Date: Tue Apr 24 15:46:45 2018 +0800 + + * Rewrite create and edit page of build. + +commit a5ee8fbb2321b9f070b2df8c66144d5d34a1c0ac +Merge: 6be5af956c 9fc1cfb5a2 +Author: wangyidong +Date: Tue Apr 24 11:13:23 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6be5af956ccf52790059ecda8367ee1af934f0d9 +Author: wangyidong +Date: Tue Apr 24 11:13:01 2018 +0800 + + * adjust for webhook and message page. + +commit 9fc1cfb5a251dba8008551bd26e53059f7711315 +Author: daitingting +Date: Tue Apr 24 10:53:04 2018 +0800 + + * Optimize codes. + +commit c578e38ee8ec47e38d349cf54a75bd44c81f665e +Author: estellbright <1457749147@qq.com> +Date: Tue Apr 24 10:07:00 2018 +0800 + + * Fix Bug #1524. + +commit 6a3b7a11eef32325ff4efaace3f4075027968ac3 +Author: daitingting +Date: Tue Apr 24 09:39:05 2018 +0800 + + * Adjust it. + +commit a9f0a3246673f91ad0f0f682bfa595fc0101c4d2 +Merge: 592f179f34 de78ed5863 +Author: daitingting +Date: Mon Apr 23 18:00:49 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit de78ed5863da999523ac089e8a0546333422df03 +Merge: 8153dae1bd 7719ba82d4 +Author: liugang +Date: Mon Apr 23 17:48:00 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8153dae1bd0c0bb3fac53debc6c2e73c9a8f28b0 +Author: liugang +Date: Mon Apr 23 17:47:23 2018 +0800 + + * Refact manage view page and priv by group page of group. + +commit 7719ba82d477eaaf193b62c8413ee8c4552c8df2 +Author: wangyidong +Date: Mon Apr 23 17:35:36 2018 +0800 + + * adjust for mail pager. + +commit 592f179f34482ea34c29e5787d3addef435d332d +Merge: fa6c4fdfb6 95476f2de4 +Author: daitingting +Date: Mon Apr 23 17:31:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fa6c4fdfb625ee9c21be489ec6fea6e85ad88c03 +Author: daitingting +Date: Mon Apr 23 17:30:50 2018 +0800 + + * Group roadmap. + +commit 2938b41b65523f8a7606356f1b510e3d8116f248 +Author: estellbright <1457749147@qq.com> +Date: Mon Apr 23 16:48:58 2018 +0800 + + * Fix Bug #1523 + +commit 95476f2de4a4e3b9f61f670aaeaa652925766bd1 +Merge: e993f33007 6731bbe3f0 +Author: wangyidong +Date: Mon Apr 23 16:38:50 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e993f33007951f1dda7fcc64c3a5d0f3c72544b8 +Author: wangyidong +Date: Mon Apr 23 16:37:10 2018 +0800 + + * adjust for admin page. + +commit 6731bbe3f0322aefb223a6ec1c1beb2cad10ae5a +Merge: 800dbdbdee 6dbe39bf81 +Author: daitingting +Date: Mon Apr 23 16:13:13 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 800dbdbdeeb2aef5fc6d9c18a974c415907abb56 +Author: daitingting +Date: Mon Apr 23 16:12:56 2018 +0800 + + * Adjust codes. + +commit 6dbe39bf8163d2a9a0cbad1f22828c53d3900456 +Merge: 9159761e62 a62d7a69a7 +Author: liugang +Date: Mon Apr 23 16:00:24 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9159761e621127970ef512bf4f83d75805ccbdf9 +Author: liugang +Date: Mon Apr 23 16:00:04 2018 +0800 + + * Optimize codes. + +commit a62d7a69a70ce5de49b8741554592c59acb1bc2b +Merge: 9022886025 320e879f2f +Author: daitingting +Date: Mon Apr 23 15:55:39 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 90228860254915692252fb8957a358521f26998b +Author: daitingting +Date: Mon Apr 23 15:55:18 2018 +0800 + + * Adjust style for iteration block in view of product. + +commit 320e879f2f95fd8f83ac2818cb7a4c0296809798 +Merge: 2d111e23eb 8f684b12be +Author: liugang +Date: Mon Apr 23 15:51:34 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2d111e23eb6684e2b32825cd3cdfc633042c2578 +Author: liugang +Date: Mon Apr 23 15:48:41 2018 +0800 + + * Finish task #3807, 3831, 3833. + +commit 48ec399d1355eedf7bc9f1fdf8449d3cb7f2e8ea +Author: estellbright <1457749147@qq.com> +Date: Mon Apr 23 15:30:27 2018 +0800 + + * Fix Bug #1517. + +commit 8f684b12be72a1ca9a9663d31ef57d09dc5ceacc +Merge: 41e6cb4670 f276e7083c +Author: daitingting +Date: Mon Apr 23 15:10:06 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 41e6cb4670972e9a33172161c0d63355265928b8 +Author: daitingting +Date: Mon Apr 23 15:09:25 2018 +0800 + + * Rewrite browse page of product without module. + +commit f276e7083ce9a90c70e0748a51938a0d53ba4005 +Merge: 41a1985f4d 4777caa4aa +Author: wangyidong +Date: Mon Apr 23 15:04:41 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 41a1985f4dc825ffad9f1bff42b16f98420fca89 +Author: wangyidong +Date: Mon Apr 23 15:04:13 2018 +0800 + + * adjust for extension page. + +commit 4777caa4aabfda4d66a37b8fd57875fbbe8cf8c4 +Author: daitingting +Date: Mon Apr 23 14:40:03 2018 +0800 + + * Adjust count of release. + +commit d8f448e1bf84142c6658d2d9f83b1bc1181e294b +Author: daitingting +Date: Mon Apr 23 14:11:01 2018 +0800 + + * Rewrite roadmap page of product. + +commit 78243e7443a76687e57531f1159e85262352eab2 +Author: daitingting +Date: Mon Apr 23 14:08:20 2018 +0800 + + * Add marker field for release. + +commit 00ed98a66d0e989b816b5a5093a0683fbe9f00c9 +Author: daitingting +Date: Mon Apr 23 13:33:32 2018 +0800 + + * Update zui. + +commit 0946c6f2a17de5e568f37f1b075693a9d75f0e5a +Author: daitingting +Date: Mon Apr 23 13:24:09 2018 +0800 + + * Adjust codes. + +commit cfad69d6703961e81c39d591df17b83749a98947 +Merge: f50715d3f1 05a8506b2f +Author: wangyidong +Date: Fri Apr 20 17:40:08 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f50715d3f19bd5a9eec4f5034c03a1892e08cb14 +Author: wangyidong +Date: Fri Apr 20 16:42:25 2018 +0800 + + * adjust for project-linkstory page. + +commit 05a8506b2f1cac480b386d772f353b4588dbed89 +Merge: 48d7755bbf bf7cddaa0f +Author: liugang +Date: Fri Apr 20 15:25:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 48d7755bbf13857463f50e1190c6386b9ff432cd +Author: liugang +Date: Fri Apr 20 15:24:55 2018 +0800 + + * Refact browse page of dept. + +commit bf7cddaa0fd8164c8055b69aa70a54893434bb37 +Merge: d639c5c796 ef2c5023d9 +Author: wangyidong +Date: Fri Apr 20 15:17:45 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d639c5c79694b51be5e7ada82b8638be5f260266 +Author: wangyidong +Date: Fri Apr 20 15:17:12 2018 +0800 + + * adjust for project-story page. + +commit ef2c5023d96f15a65ee6db554d3a69c0eb558aba +Merge: 1c3382ed13 70b7113429 +Author: daitingting +Date: Fri Apr 20 14:44:51 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1c3382ed136e967c4dff71c6eb9f813f3cefdb0f +Author: daitingting +Date: Fri Apr 20 14:44:23 2018 +0800 + + * Rewrite browse page of tree. + +commit 70b711342972a4e205d453eb8f5f8438dc46cdb4 +Merge: 52e0a63267 19cfa7b43c +Author: liugang +Date: Fri Apr 20 14:15:43 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 52e0a63267e067caef8d2ccd4fd2e179b466cd9b +Author: liugang +Date: Fri Apr 20 14:15:21 2018 +0800 + + * Refact detail view of todo. + * Optimize codes. + +commit 19cfa7b43c5129b443dbe1d8c11dc787eba60f90 +Merge: 4524f89c21 d8207915f3 +Author: wangyidong +Date: Fri Apr 20 13:01:11 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4524f89c2145d2e4acb5286da70d6f7238672c9b +Author: wangyidong +Date: Fri Apr 20 13:00:35 2018 +0800 + + * finish task #3838. + +commit d8207915f3bb6d6bd212a8b540bfd554416d9395 +Merge: 7cf2f42078 b7b73fea14 +Author: liugang +Date: Fri Apr 20 12:09:38 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7cf2f42078a68d61b114bf337ed90ea1bbe80df9 +Author: liugang +Date: Fri Apr 20 12:09:19 2018 +0800 + + * Refact detail page of todo. + +commit b7b73fea145121e2528a44a77f61d369f0530d48 +Author: daitingting +Date: Fri Apr 20 10:36:41 2018 +0800 + + * Update css and js of zui. + +commit 846c99782671c93b66562cf3d63b3f3d167c54fb +Merge: 182c3bc43e 50171967b4 +Author: tengfei +Date: Fri Apr 20 10:09:41 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 182c3bc43ebd3acff4d49cec0018d7a51d8316f7 +Merge: 92f4c7375d d53267cadf +Author: tengfei +Date: Fri Apr 20 10:08:25 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 50171967b4ec8cac1f158a4708882525a2583d1e +Merge: 5a529bcc54 5de96f44d6 +Author: liugang +Date: Thu Apr 19 18:27:32 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5a529bcc54d829a788567b578125350519cf78c7 +Author: liugang +Date: Thu Apr 19 18:27:16 2018 +0800 + + * Refact view page and edit page of company. + +commit 5de96f44d6b4f90945efffc4871e5f5f250077d5 +Author: daitingting +Date: Thu Apr 19 17:52:47 2018 +0800 + + * Adjust codes. + +commit 9bd46a15b95b18e28de584ae89def91c413be702 +Merge: fa16df8314 209da90793 +Author: liugang +Date: Thu Apr 19 16:46:23 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fa16df83144525bb6831f75ea562042b514120c5 +Author: liugang +Date: Thu Apr 19 16:46:06 2018 +0800 + + * Refact create page and edit page of group. + +commit 209da90793434b0cc747685daf302900c3e2b2e6 +Author: daitingting +Date: Thu Apr 19 16:44:34 2018 +0800 + + * Adjust style. + +commit b46e8a440d5aa227d07cc346c219f3361a04658e +Merge: 4a709543d8 d91b00b919 +Author: daitingting +Date: Thu Apr 19 16:43:29 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4a709543d840cf3085b5f3328e9486559b3748e8 +Author: daitingting +Date: Thu Apr 19 16:42:15 2018 +0800 + + * Set actions of current user as primary. + +commit d91b00b919953ec35fee461780a84745fddff579 +Merge: c33826b727 fd2364eea8 +Author: wangyidong +Date: Thu Apr 19 16:29:44 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c33826b727cdb6b44eba1d243adf91e829a15016 +Author: wangyidong +Date: Thu Apr 19 16:29:19 2018 +0800 + + * finish task #3857. + +commit fd2364eea89e9fa6b3c3fcad20d927ee221b247d +Author: daitingting +Date: Thu Apr 19 16:20:03 2018 +0800 + + * Adjust style for product and branch. + +commit d0388da4838dbb278da47c9232b14dcd926f434b +Author: daitingting +Date: Thu Apr 19 16:01:02 2018 +0800 + + * Rewrite activate file of project. + +commit d12dc914379776d3c47e39e9f9d798dfdd40d0ad +Author: daitingting +Date: Thu Apr 19 15:59:28 2018 +0800 + + * Rewrite close file of project. + +commit 70355bf1d32b0d1b59edefbdae8984fbac9e3780 +Merge: 87c717ff2e e7f4daf29c +Author: daitingting +Date: Thu Apr 19 15:56:37 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 87c717ff2e7ba7012562059de317eed02047c769 +Author: daitingting +Date: Thu Apr 19 15:56:20 2018 +0800 + + * Adjust style. + +commit e7f4daf29cdde834503a8a2b8031562923f6809a +Merge: 6b88e220eb f08fede7d8 +Author: liugang +Date: Thu Apr 19 15:18:49 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6b88e220eb84e3a4af9b8b153eddbdd246d9421f +Author: liugang +Date: Thu Apr 19 15:18:35 2018 +0800 + + * Refact batch create page and batch edit page of user. + +commit f08fede7d8a0537e04f980cee31db74c2a392f7d +Merge: ba972a0d43 437a019d62 +Author: wangyidong +Date: Thu Apr 19 14:57:04 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ba972a0d4317d781565135759265997fe7fc741c +Author: wangyidong +Date: Thu Apr 19 14:56:37 2018 +0800 + + * adjust for task #3852. + +commit 437a019d6206c7ce68680c3c32164184c06d5d19 +Author: daitingting +Date: Thu Apr 19 14:48:43 2018 +0800 + + * Rewrite suspend file of project. + +commit d0dd738cad19fb28389a26be833e768243dd739f +Merge: 02be1c5ce6 138536996f +Author: daitingting +Date: Thu Apr 19 14:47:33 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 02be1c5ce6bb3a85631ddbaf89689cb1456ba142 +Author: daitingting +Date: Thu Apr 19 14:46:59 2018 +0800 + + * Rewrite putoff file of project. + +commit 138536996f56e3a4393ce307e69e48339f85af57 +Merge: 648168287d 9a73f45563 +Author: liugang +Date: Thu Apr 19 14:41:28 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 648168287d6df0b4d1a0c8d1fff90065086a3abd +Author: liugang +Date: Thu Apr 19 14:41:08 2018 +0800 + + * Refact report page of bug. + +commit 9a73f45563ea92709053045c57fb72f062d4dfb2 +Merge: 5d69dce5af d6a74846ff +Author: wangyidong +Date: Thu Apr 19 14:31:11 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5d69dce5afbd4b52519a44b45bc8969c25ab2b06 +Author: wangyidong +Date: Thu Apr 19 14:30:45 2018 +0800 + + * adjust for report page. + +commit d6a74846ffdd90ce1dec82a17d1786da5c4d7b7e +Merge: b0472a7bad 6793fc448a +Author: liugang +Date: Thu Apr 19 14:25:15 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b0472a7badc784fbc35a39d46056dc567b11b943 +Author: liugang +Date: Thu Apr 19 14:24:56 2018 +0800 + + * Refact browse page of company. + +commit 6793fc448a3134c4ac88b001ccb4f08c1a5f5703 +Author: daitingting +Date: Thu Apr 19 14:19:03 2018 +0800 + + * Rewrite start file of project. + +commit 98583c2d4dcd48e4dc7a8d3f3fc5d6c87b3a762e +Author: daitingting +Date: Thu Apr 19 13:59:22 2018 +0800 + + * Adjust style for release block. + +commit 7fc8e259c82bfc527094431d33c7f471d4d3d76a +Author: daitingting +Date: Thu Apr 19 13:57:32 2018 +0800 + + * Add language. + +commit 165524612647760cf226bd5380df90d9b52d2d67 +Merge: c49baf1044 83a01c416f +Author: daitingting +Date: Thu Apr 19 13:37:17 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c49baf10442101f5c5d67178995a6e7f9e5db254 +Author: daitingting +Date: Thu Apr 19 13:36:56 2018 +0800 + + * Rewrite view file of project. + +commit a2dd40fd1fb4af36e4636ae753d8ec16ffd463c5 +Merge: c9f2731f73 83a01c416f +Author: wangyidong +Date: Thu Apr 19 13:35:39 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c9f2731f73f7d4dce1e74102cba3f9dc2d659b8c +Author: wangyidong +Date: Thu Apr 19 13:35:21 2018 +0800 + + * finish task #3822. + +commit 83a01c416f18a7dadb0f1c289963c2bf291dfc15 +Author: liugang +Date: Thu Apr 19 11:58:41 2018 +0800 + + * Refact report view of product stories and project tasks. + +commit 6675f01b0776bdd700352a6751642957fd555819 +Merge: 093898d482 006fe3c90a +Author: liugang +Date: Thu Apr 19 10:12:34 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 093898d482e0c086b47986735769c46253dbcae9 +Author: liugang +Date: Thu Apr 19 10:12:12 2018 +0800 + + * Finish task #3834. + +commit 006fe3c90a16984786e04a95b3852dbf0e9e2d35 +Merge: c2b96011af 151c70cc2a +Author: wangyidong +Date: Thu Apr 19 09:30:32 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c2b96011afb7895d398138405ed06fa61ce47061 +Author: wangyidong +Date: Thu Apr 19 09:30:01 2018 +0800 + + * update zui. + +commit 151c70cc2ab19cb466954ebcd1126068699f090b +Merge: e62575404a 31e2c32e80 +Author: liugang +Date: Wed Apr 18 18:20:25 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e62575404aad13b91cddc696826bfd2f372e4d6e +Author: liugang +Date: Wed Apr 18 18:20:05 2018 +0800 + + * Refact view page of product plan. + +commit 31e2c32e80d1572cd7da8fa4a82024068b6d0408 +Merge: 290c5248e6 9a91659d31 +Author: daitingting +Date: Wed Apr 18 16:27:12 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 290c5248e601cd828e0ca6e6a9c3005426d391cb +Author: daitingting +Date: Wed Apr 18 16:26:52 2018 +0800 + + * Rewrite edit file of project. + +commit 9a91659d31b9bbe4bacabd128dce06837f27c76a +Merge: 14b94d2780 a5250b9ab0 +Author: wangyidong +Date: Wed Apr 18 15:43:58 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 14b94d2780df19cdda2e2a5f360a474e94c434ca +Author: wangyidong +Date: Wed Apr 18 15:43:31 2018 +0800 + + * adjust for project manageproducts page. + +commit a5250b9ab01613c6e22d6707d9a9dacf9180b59f +Merge: 4fa2e55f41 a1ad03261c +Author: daitingting +Date: Wed Apr 18 15:41:27 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4fa2e55f41ba1bab54b52dc83a3242e3c39201f8 +Author: daitingting +Date: Wed Apr 18 15:40:22 2018 +0800 + + * Rewrite create file of project. + +commit a1ad03261c26e5c82410269a3ace588b061ce4c5 +Merge: 20a0166074 8b3b5cdac7 +Author: wangyidong +Date: Wed Apr 18 15:36:53 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 20a01660741133987265661be701d2b0f4549fd6 +Author: wangyidong +Date: Wed Apr 18 15:36:24 2018 +0800 + + * adjust for team page. + +commit 8b3b5cdac7d3c7ee499f3a0bc928f055661600aa +Merge: c82676dfb4 4b1d82949e +Author: liugang +Date: Wed Apr 18 14:43:54 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c82676dfb420f948aff8c7ab59c4ff1bbd517042 +Author: liugang +Date: Wed Apr 18 14:43:38 2018 +0800 + + * Refact pages. + +commit 4b1d82949e3db41842749e08eb9ff438c76d619f +Author: wangyidong +Date: Wed Apr 18 14:17:52 2018 +0800 + + * change for project bug page. + +commit f1db15d15b160e4c1caf48326c9534d6131013f8 +Author: wangyidong +Date: Wed Apr 18 13:14:07 2018 +0800 + + * adjust for branch manage page. + +commit d3e861e212d9a406b7d9a60e140b689e3b40449f +Author: wangyidong +Date: Wed Apr 18 11:54:37 2018 +0800 + + * adjust for release page. + +commit 5f4d3c1746a603363dd6df3c3abbaa43cf28ee6f +Merge: b9ab24ef89 1915c6a352 +Author: wangyidong +Date: Wed Apr 18 11:19:07 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b9ab24ef894750dea04996e5f7fc3a61e32fcfa1 +Author: wangyidong +Date: Wed Apr 18 11:18:41 2018 +0800 + + * adjust for release module. + +commit 1915c6a3527feac380316547a86ccec59411c32c +Merge: 433896a1d0 0a75906f04 +Author: guanxiying +Date: Wed Apr 18 11:09:08 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 433896a1d022c5cc3f623f38e66eec75efec4938 +Author: guanxiying +Date: Wed Apr 18 11:08:37 2018 +0800 + + * Add product report block. + +commit 0a75906f047ad7decffe685ed05377849e10998f +Author: daitingting +Date: Wed Apr 18 09:44:55 2018 +0800 + + * Adjust code position. + +commit 0e6969350204dbc6e99eb85bc5b9c169bee098b9 +Author: daitingting +Date: Wed Apr 18 09:38:32 2018 +0800 + + * Rewrite close file of product. + +commit 79f0599f4ab94cd5853b649a568442e06996835f +Merge: a995a06fec fab342ead9 +Author: wangyidong +Date: Tue Apr 17 17:46:26 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a995a06fec009f777c7475ab94c6efc3795273c2 +Author: wangyidong +Date: Tue Apr 17 17:45:04 2018 +0800 + + * adjust for hide modal header. + +commit fab342ead9188dea4c61c1b0cf227578bc08e571 +Author: daitingting +Date: Tue Apr 17 17:28:33 2018 +0800 + + * Adjust codes. + +commit 4f61b9a69bcefaa8b68790e689610cc0244a6824 +Author: daitingting +Date: Tue Apr 17 16:58:23 2018 +0800 + + * Rewrite edit page of productplan. + +commit c7ebea4b53209d85360d6c600b8f4288b3d25cee +Author: daitingting +Date: Tue Apr 17 16:46:32 2018 +0800 + + * Rewrite edit page of release. + +commit 35e2ca3763f329119a52f0f2797a9f1161859aad +Author: daitingting +Date: Tue Apr 17 16:45:40 2018 +0800 + + * Remove useless codes. + +commit 6640d8118ec04d05864b11ed325271dbdede8183 +Merge: 11eea223ae a35d47a503 +Author: daitingting +Date: Tue Apr 17 16:33:22 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 11eea223ae20f14f6f395188a8c8f83a7cd9b60e +Author: daitingting +Date: Tue Apr 17 16:32:31 2018 +0800 + + * Add required for field. + +commit a35d47a5037420b9feb4562747e06e2521e4e6ed +Author: liugang +Date: Tue Apr 17 16:06:35 2018 +0800 + + * Refact batch edit page of productplan. + +commit eb3ecce61e4779f7ca439654ff415b9e2afaa67d +Merge: e522b82a7e e0d5829bd2 +Author: liugang +Date: Tue Apr 17 15:56:58 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e522b82a7e6f76e813fae0ddadb45ddd4ccd4a6a +Author: liugang +Date: Tue Apr 17 15:53:36 2018 +0800 + + * Add saveSuccess to common lang files. + +commit e0d5829bd2b79a2ef3f9d926359da6aac4a2b6cf +Author: daitingting +Date: Tue Apr 17 15:41:53 2018 +0800 + + * Return json data for ajaxForm. + +commit 3c6d4425c4c81cd0049b456d18e80ba37f27feb5 +Author: daitingting +Date: Tue Apr 17 15:41:20 2018 +0800 + + * Adjust codes. + +commit 3a7fa4266beb2d5aba355dca68b7b9919e891f77 +Author: daitingting +Date: Tue Apr 17 15:37:33 2018 +0800 + + * Rewrite create page of productplan. + +commit 961da7da23e59d61ccce77f3e53290e58ad9d9ca +Merge: f481b228ea b0e3ad7b52 +Author: daitingting +Date: Tue Apr 17 15:36:58 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f481b228ea2717a846e0352b8527d7ff4b988cc4 +Author: daitingting +Date: Tue Apr 17 15:36:34 2018 +0800 + + * Add saveSuccess and fail for send message. + +commit b0e3ad7b52a83048c2451d1e00659b40f98057a6 +Merge: d81e0f3f20 9e033c028a +Author: wangyidong +Date: Tue Apr 17 15:16:28 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d81e0f3f20be9dc142bf46e2ec08474a0595272a +Author: wangyidong +Date: Tue Apr 17 15:15:50 2018 +0800 + + * finish for story action page. + +commit 9e033c028a9376001c12f16ab448b72b671746c9 +Merge: aa1426508e d1dcca0d0e +Author: liugang +Date: Tue Apr 17 14:33:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit aa1426508e85ded3014b219e98325e2fc79a2f6e +Author: liugang +Date: Tue Apr 17 14:33:00 2018 +0800 + + * Refact edit and batch edit page of product. + +commit d1dcca0d0e5052240fbd47a0100fc1f251dd9e3c +Author: daitingting +Date: Tue Apr 17 14:26:30 2018 +0800 + + * Rewrite create page of release. + +commit 7fa26252aec5ea6f8715fba59e7a442a967d6b18 +Author: daitingting +Date: Tue Apr 17 14:21:51 2018 +0800 + + * Adjust codes. + +commit 75c423cd7f5592580fbdfc9b7f1c0c2b2a0a6f9d +Merge: 6a2357f52b fe55156e71 +Author: daitingting +Date: Tue Apr 17 14:20:48 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6a2357f52b8022a9de7f24d48f7a32037c5de6b3 +Author: daitingting +Date: Tue Apr 17 14:19:25 2018 +0800 + + * Adjust button. + +commit fe55156e71dff037bc494ed80003c6c9f0d1281c +Author: liugang +Date: Tue Apr 17 13:53:55 2018 +0800 + + * Refact all page of product. + +commit d8560cefeda39f120854cee7ff336ad33f5dd6ba +Author: liugang +Date: Tue Apr 17 11:25:26 2018 +0800 + + * Refact task page of project. + +commit 21ff8cb1e3258969abd8b458880151b41229c0d5 +Merge: 8c731dc75a f571976624 +Author: liugang +Date: Mon Apr 16 17:47:46 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8c731dc75ab07d31313ce4f109f83c9d69a49f2e +Author: liugang +Date: Mon Apr 16 17:47:24 2018 +0800 + + * Adjust task list page of project. + +commit f57197662458c4d6c936c236cbb59f29ab0c85b9 +Author: daitingting +Date: Mon Apr 16 17:12:31 2018 +0800 + + * Adjust more url for dynamic. + +commit bf326f57ffe72764302cf163ea3f72da9d4ccbd8 +Author: daitingting +Date: Mon Apr 16 16:55:32 2018 +0800 + + * Rewrite view page of product. + +commit 9797921bb2c2666b38c6f5a942c4293a1a17737c +Merge: feceb48f17 4f91a138a9 +Author: daitingting +Date: Mon Apr 16 16:55:11 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit feceb48f17376eea1e007075f83629146f454713 +Author: daitingting +Date: Mon Apr 16 16:54:37 2018 +0800 + + * Adjust codes for inline checkox. + +commit 4f91a138a99cfb23d36dcf3a3b1e35f8a21070f3 +Merge: a4bc9d3287 55fe6144b6 +Author: wangyidong +Date: Mon Apr 16 16:21:02 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 55fe6144b617a768da9f2e9e3ca03b6f404edae6 +Author: liugang +Date: Mon Apr 16 15:49:48 2018 +0800 + + * Extend groupBy function of baseDAO. + +commit 532b35c2b319763afb82e2b8c69f7d4a0bae5af3 +Merge: 4d0e6ba52e 02dd3025c4 +Author: liugang +Date: Mon Apr 16 15:47:29 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4d0e6ba52e9f6fbe4a9731fa220a2bc258b3b567 +Author: liugang +Date: Mon Apr 16 15:46:45 2018 +0800 + + * Check fields in groupBy function and limit function for safety. + +commit a4bc9d32879640a512e2e3ce25064544a713bb10 +Author: wangyidong +Date: Mon Apr 16 15:28:21 2018 +0800 + + * replace featurebar to mainMenu. + +commit 02dd3025c411a8aaf45981c63a9f2bdd74e1da41 +Merge: 4eb3d7e2ac dafec6b33d +Author: wangyidong +Date: Mon Apr 16 15:17:55 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4eb3d7e2ac4b0664f8e80bc4f6e7fb192123e2c2 +Author: wangyidong +Date: Mon Apr 16 15:17:22 2018 +0800 + + * adjust for backup-index page. + +commit ed66606d4d592f9ae02205563bfb8b86a73e53e1 +Author: wangyidong +Date: Mon Apr 16 15:05:38 2018 +0800 + + * adjust for action-trash page. + +commit dafec6b33daa8dcb6772f1cb5828789d83611376 +Author: daitingting +Date: Mon Apr 16 10:20:32 2018 +0800 + + * Rewrite create page of story. + +commit f191c19548a9fd0a55ba3b94bd281fb6ec59b20f +Author: daitingting +Date: Mon Apr 16 09:47:29 2018 +0800 + + * Note useless codes. + +commit a18df2d52130f69064075f5aecc8fc5b949ea435 +Author: daitingting +Date: Mon Apr 16 09:09:30 2018 +0800 + + * Adjust codes for initing chosen. + +commit 0f90a0cf2f83e380ab73b60f423a3ed04f17d9e8 +Author: daitingting +Date: Sat Apr 14 15:08:16 2018 +0800 + + * Update zui. + +commit 1ba938125820729ebde7d42c9a447e29780b5fc7 +Merge: 42779bde4d 1dbf057b44 +Author: daitingting +Date: Sat Apr 14 14:59:07 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 42779bde4df39eb6ef4773adfbd0e032d54c26ac +Author: daitingting +Date: Sat Apr 14 14:58:24 2018 +0800 + + * Add language for customField. + +commit 1dbf057b4480c7a351ebc4e4730415a136921da4 +Merge: 306346820b 8b139725b2 +Author: liugang +Date: Fri Apr 13 15:53:38 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 306346820bf6d20f17876a71452929780656a3ae +Author: liugang +Date: Fri Apr 13 15:53:14 2018 +0800 + + * Add report block and overview block. + +commit 8b139725b2c76f78cfed3a78bf79f842a87ef69e +Author: wangyidong +Date: Fri Apr 13 14:55:44 2018 +0800 + + * adjust menu order. + +commit 491b3554916249b27e214077897908daf22ab8d9 +Author: wangyidong +Date: Fri Apr 13 10:44:10 2018 +0800 + + * adjust for task #3838. + +commit 8830e1095de81a5adc657789608bd093240b245b +Author: wangyidong +Date: Fri Apr 13 10:11:54 2018 +0800 + + * code for task #3810. + +commit d1e76a176f1a89be05285a9f1ba54d4e2a5466cc +Merge: 579cae8b25 bdc6d78993 +Author: wangyidong +Date: Fri Apr 13 09:37:19 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 579cae8b25a27ad83fcecdfa0d3e43898aaeafda +Author: wangyidong +Date: Fri Apr 13 09:36:34 2018 +0800 + + * adjust for batchcreate page. + +commit bdc6d78993c0ef9b2a158ba5ec4ffae97f7136b7 +Merge: de204f6813 de2cedd799 +Author: daitingting +Date: Fri Apr 13 09:09:39 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit de204f6813d5bccc3983516713b406cbabe96245 +Author: daitingting +Date: Fri Apr 13 09:08:57 2018 +0800 + + * Rewrite create view of product. + +commit de2cedd7993c77fd87581b1d92d7ca69eafbdae3 +Author: wangyidong +Date: Thu Apr 12 15:59:04 2018 +0800 + + * adjust for task #3819. + +commit 608bd09e67767c51055f04f24c4e6bb5143b640d +Merge: a3e304ffd7 15f4b53402 +Author: wangyidong +Date: Thu Apr 12 15:20:18 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a3e304ffd7028af1067244d8b2008ba4b8c83bef +Author: wangyidong +Date: Thu Apr 12 15:18:54 2018 +0800 + + * code for task #3819. + +commit 15f4b5340213e7c6ed5355322281edf5b085684f +Author: daitingting +Date: Thu Apr 12 13:44:46 2018 +0800 + + * Update them. + +commit 100502138f1be6046a5871ddfeaac43076f0728e +Merge: 12e7357de3 46cdd38fd4 +Author: daitingting +Date: Thu Apr 12 09:41:24 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 12e7357de38109b75cb23052be74eeb7a3fec2bc +Author: daitingting +Date: Thu Apr 12 09:40:30 2018 +0800 + + * Use TABLE_TEAM instead of zt_team. + +commit 83fa012fbfac11da19b16343b4a307e3afa60b95 +Merge: d7643d5db5 da29b712c5 +Author: liugang +Date: Wed Apr 11 15:46:59 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d7643d5db56dd0d5be99c08e69b72d2b7694d221 +Author: liugang +Date: Wed Apr 11 15:46:47 2018 +0800 + + * Adjust codes. + +commit da29b712c538cb5d3668c63c55a4991e6a3311e9 +Merge: d64b84b2d8 34243df686 +Author: wangyidong +Date: Wed Apr 11 14:20:37 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d64b84b2d876f3d2cfe4d75f219893ce1b54da1c +Author: wangyidong +Date: Wed Apr 11 14:19:38 2018 +0800 + + * fix for new zui. + +commit 34243df686390b59fb2b5e14a40f99ceeaf04ee8 +Author: liugang +Date: Wed Apr 11 11:23:29 2018 +0800 + + * Fix conflicts. + +commit 0c4074280275b16dd5052294a158847cba301791 +Merge: b8605a5f71 eca3405b27 +Author: liugang +Date: Wed Apr 11 10:56:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b8605a5f71a03e0ef5e8dbefc2ffb36490667aca +Author: liugang +Date: Wed Apr 11 10:55:56 2018 +0800 + + * Refact browse page of release. + +commit c5c896538b80c2e8bc66f7e450d164d9f14f469c +Author: liugang +Date: Wed Apr 11 10:34:05 2018 +0800 + + * Display number of plans. + +commit eca3405b27d7599e9ce321227f171f2ad3ede2b9 +Merge: c60070b991 fe3027623e +Author: wangyidong +Date: Wed Apr 11 10:10:41 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c60070b991dcd34b4750e92ecb00ecae7f9564d1 +Author: wangyidong +Date: Wed Apr 11 10:09:33 2018 +0800 + + * code for task #3810. + +commit 46cdd38fd48ff6eb72d01048b32c2a1a2ed9e758 +Merge: 1366eebfae a65ea6aee6 +Author: JackWuLieHao +Date: Wed Apr 11 08:41:24 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 1366eebfae049977355af77f937c193c0e5eb4df +Author: JackWuLieHao +Date: Wed Apr 11 08:40:27 2018 +0800 + + * Finish bug #1516 + +commit fe3027623e080063a7012af4face75af2fa7529a +Author: liugang +Date: Tue Apr 10 16:54:38 2018 +0800 + + * Finish task #3846. + +commit a65ea6aee619941076cda034da4e488df0280ecd +Author: daitingting +Date: Tue Apr 10 16:13:08 2018 +0800 + + * Fix bug #1499. + +commit 76887b37a44f632956602328074cca3587c0ee6e +Author: liugang +Date: Tue Apr 10 15:55:00 2018 +0800 + + * Finish task #3840. + +commit c5d7faf8ace3a9a1d77814ca9575cdca6f7e05cf +Author: daitingting +Date: Tue Apr 10 15:15:34 2018 +0800 + + * Fix bug #1510. + +commit 97c7d8c3e7038b54e93bd51d13174bc23c95249f +Author: daitingting +Date: Tue Apr 10 15:12:59 2018 +0800 + + * Adjust codes. + +commit bb6e8790b55719bdc0e358268c0b181053100c3b +Author: daitingting +Date: Tue Apr 10 13:57:03 2018 +0800 + + * Only assignedTo can start,transfer,recordEstimate,finshed multiple task. + +commit ac29bd4cac02125660b709659612ab5b52183946 +Merge: 40befb5896 abff565609 +Author: liugang +Date: Mon Apr 9 17:52:36 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 40befb5896b028c2df060711f992a04b4e1c01a5 +Author: liugang +Date: Mon Apr 9 17:52:03 2018 +0800 + + * Refact browse view of product plan. + +commit abff565609185349672e5e6184d2b97da811b33c +Author: wangyidong +Date: Mon Apr 9 16:30:18 2018 +0800 + + * finish task #3820. + +commit a7e49faf959e3c0dbfc3719362e8e26a9456540b +Author: wangyidong +Date: Mon Apr 9 16:14:54 2018 +0800 + + * code for task #3838. + +commit 1fd787549d7809d36b6253f943e7ece89d5283cb (tag: zentaopms_9.8.3_20180409) +Merge: d0ffae944b cdc771ef57 +Author: JackWuLieHao +Date: Mon Apr 9 15:28:25 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit d0ffae944b054b699d872c51b443ad14ecdc18d5 +Author: JackWuLieHao +Date: Mon Apr 9 15:26:28 2018 +0800 + + * Finish bug #1503,#1504,1505,1508,1509 + +commit 056853f0e4cf52d92695d56197046915dca595be +Author: wangyidong +Date: Sun Apr 8 16:46:04 2018 +0800 + + * adjust for style. + +commit 2fbf6780a86e2cdaa692dc782eb8e5176bf350e0 +Author: wangyidong +Date: Sun Apr 8 13:08:00 2018 +0800 + + * adjust for dynamic page. + +commit 9f8054382315f1bb9b76347a37c129e6055adda8 +Author: wangyidong +Date: Sun Apr 8 11:29:53 2018 +0800 + + * adjust for ux style. + +commit cdc771ef575f441ad067d806636c912b92017f4c +Merge: 3a00cef5df 0fc0880c09 +Author: wumo +Date: Sun Apr 8 09:17:14 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 3a00cef5df824f40bba8306fb0fac588c3ca44b4 +Author: wumo +Date: Sun Apr 8 09:11:19 2018 +0800 + + * Add the prompt of product management + +commit 2bd092233ab9d1885655ba20b884511688fe0d37 +Author: wangyidong +Date: Wed Apr 4 17:23:26 2018 +0800 + + * adjust for pri style. + +commit 0fc0880c09684e33dc5fae0ec14a556b7f5d19ee +Author: JackWuLieHao +Date: Wed Apr 4 17:19:45 2018 +0800 + + * adjust style + +commit 6c9760c77135d59ccc8561be1383418e24c415f4 +Author: JackWuLieHao +Date: Wed Apr 4 17:02:49 2018 +0800 + + * adjust style + +commit 4548d80a79c5f5d1abf9805fa9ddf6121a5b851b +Author: JackWuLieHao +Date: Wed Apr 4 16:55:39 2018 +0800 + + * adjust style + +commit a24aaee07b6b8955c0e16131b7fe82223bc211d0 +Author: wangyidong +Date: Wed Apr 4 16:48:34 2018 +0800 + + * adjust style. + +commit 70a956dcf52954264bb4e5cd3dc5f02a72b88958 +Merge: d50de9fd8f 7582aeeaf0 +Author: JackWuLieHao +Date: Wed Apr 4 16:47:24 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit d50de9fd8f23cb4145c0415afefd07bb72cb62d7 +Author: JackWuLieHao +Date: Wed Apr 4 16:46:24 2018 +0800 + + * Finish task 3797 + +commit eec949396e3e672885e655318eed6f81e3a389e9 +Author: wangyidong +Date: Wed Apr 4 16:39:21 2018 +0800 + + * adjust for ajaxgetdropmenu. + +commit 7582aeeaf0997223da3fad3970bba3dda25a5611 +Author: daitingting +Date: Wed Apr 4 16:19:05 2018 +0800 + + * Add language. + +commit e9f20b5946fee29b1d3473aa27af9eaa6ef34b59 +Author: daitingting +Date: Wed Apr 4 16:14:21 2018 +0800 + + * Format codes. + +commit ba5727148944e8667d90f8ed49f319db17a208c0 +Author: daitingting +Date: Wed Apr 4 15:38:52 2018 +0800 + + * Adjust order for call computeWorkingHours function. + +commit c43943b73da91256e816a7992474fd0f15d6aa62 +Author: daitingting +Date: Wed Apr 4 15:25:51 2018 +0800 + + * Adjust codes for compute hours for multiple tasks. + +commit 6975faef6802ad9f9ec755a62d829bfef4bdfa9d +Author: wangyidong +Date: Wed Apr 4 15:01:19 2018 +0800 + + * finish task #3759. + +commit 19f7c11b00bac1667d985fac3ea8971763b97479 +Merge: 321005e8ad 5a9bf28a9c +Author: daitingting +Date: Wed Apr 4 14:40:00 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 321005e8ad09b820a0ffbab3a39ba9b3f7509e06 +Author: daitingting +Date: Wed Apr 4 14:38:57 2018 +0800 + + * Compute hours for multiple tasks. + +commit 5a9bf28a9cb701843b37a3df1abb9b3f42e7d084 +Merge: e5b822276d 69e065a803 +Author: JackWuLieHao +Date: Wed Apr 4 14:37:39 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit e5b822276d967d3d9f7b500cee9b0c032fa71674 +Author: JackWuLieHao +Date: Wed Apr 4 14:35:09 2018 +0800 + + * Finish bug #1486 #1502 + +commit 5105af3d8994c00fe81881d82b7d11d3b402e835 +Author: wangyidong +Date: Wed Apr 4 13:51:45 2018 +0800 + + * adjust for show history in view page. + +commit 69e065a8030ae9809ae6cb6c3924fb5cfa7804ed +Author: wumo +Date: Wed Apr 4 13:23:03 2018 +0800 + + * Add the unique key to team table. + +commit 0cdcc4b53bca9f7569f944103a3e061c4b9d4f68 +Merge: 58159b3d42 50e3a3519f +Author: wumo +Date: Wed Apr 4 13:15:17 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 58159b3d42a8dc6a02eb95345e9ef2a025025449 +Author: wumo +Date: Wed Apr 4 13:13:09 2018 +0800 + + * Adjust the style of the prompt in multi-user task + * Add unique key to team table. + +commit 24188f2c4b788fb8222ce4b4764b9f61fec06b54 +Author: wangyidong +Date: Wed Apr 4 10:05:02 2018 +0800 + + * finish task #3768. + +commit 2ecdc58a3d4dedaa251e34170951426c7f89dc59 +Author: wangyidong +Date: Wed Apr 4 09:39:01 2018 +0800 + + * finish task #3769. + +commit 9d16d860c94b5056b5b5d58b979ec0a36107cb0f +Author: wangyidong +Date: Tue Apr 3 17:03:49 2018 +0800 + + * finish task #3761. + +commit 50e3a3519f1950c3de82353554a83e3cf821854a +Merge: fc48a92729 b13eac3b36 +Author: JackWuLieHao +Date: Tue Apr 3 16:03:29 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit fc48a92729addefb16dc1333ab47398e530cdb0d +Author: JackWuLieHao +Date: Tue Apr 3 15:58:30 2018 +0800 + + * If entry-date is default,then hidden + +commit b13eac3b36e8f451f891461a0d2f9a2716398d82 +Merge: d3b4f05f70 6dcfb832f0 +Author: wumo +Date: Tue Apr 3 15:33:43 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit d3b4f05f70f7993aa60bc317852251fe15510d4c +Author: wumo +Date: Tue Apr 3 15:30:02 2018 +0800 + + * Hide the entry to manage product lines when exists product lines + +commit 6dcfb832f028271fb71fabd6964a76eadb931e79 +Author: JackWuLieHao +Date: Tue Apr 3 15:05:20 2018 +0800 + + * my-todo Priority and name plus title; + * user-edit Adjust the location of the entry date + * user-profile If the entry date is empty, do not display. + +commit 88a06cc0e08827fa8337edc5790c5386eaccefbf +Merge: 392cc65ae1 f4b783f0ca +Author: wumo +Date: Tue Apr 3 14:04:55 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 392cc65ae14583dfa03a407e06d4de42a074c1f4 +Author: wumo +Date: Tue Apr 3 14:01:54 2018 +0800 + + * Modify the prompt of start or restart in multi-user task. + +commit f4b783f0ca5cffcb035cc71482530cf175f17e4f +Author: daitingting +Date: Tue Apr 3 13:52:28 2018 +0800 + + * Optimize the order for condition of 'where'. + +commit 81dfc9c5291b68714b372677bc48c88c81084a59 +Merge: fdda7345ce 984060278e +Author: daitingting +Date: Tue Apr 3 13:49:54 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit fdda7345ce66f620ebb01ef2bdc8363df37ce6df +Author: daitingting +Date: Tue Apr 3 13:49:28 2018 +0800 + + * Format codes. + +commit 984060278eea400500bea510f202b63692a7ba52 +Merge: 7be59d3948 33e3711865 +Author: wumo +Date: Tue Apr 3 11:17:08 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 7be59d3948700f15b6e28bcc698f8170d4236824 +Author: wumo +Date: Tue Apr 3 11:15:22 2018 +0800 + + * Change the content of length prompt. + +commit 33e3711865fc2040647b840829619b8f03a4256c +Author: daitingting +Date: Tue Apr 3 09:05:31 2018 +0800 + + * Adjust version to 9.8.3. + +commit 249fb13bb189e7fdf68d2c8f83625f8e438e2ab9 +Merge: 049b2fb3fc 952b7d3bd8 +Author: daitingting +Date: Tue Apr 3 09:04:29 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 049b2fb3fc11f9a498fee93c0b3c4e1dfe62fa80 +Author: daitingting +Date: Tue Apr 3 09:03:57 2018 +0800 + + * Adjust language. + +commit 952b7d3bd8f8aef62400175b1b716275bff36236 +Merge: d455deebab 2eb983b3c2 +Author: wumo +Date: Mon Apr 2 17:36:02 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit d455deebabd170ce673bc1c19d9a091f36974a18 +Author: wumo +Date: Mon Apr 2 17:34:11 2018 +0800 + + * Release the build of 9.8.3 + +commit 2eb983b3c28e825abc07fb480aeddf4ccb44d4e8 +Author: daitingting +Date: Mon Apr 2 16:52:44 2018 +0800 + + * Compute status is delayed or not when project is not closed and done. + +commit 2a595f5077cdca8e965c2d4321505d0b474b7b5a +Author: daitingting +Date: Mon Apr 2 16:10:40 2018 +0800 + + * Distinguish update url of english from chinese. + +commit 45fa54c357cc95cf31b297ba60489ca2ff0fb749 +Author: daitingting +Date: Mon Apr 2 15:00:11 2018 +0800 + + * Use replace instead of insert fot zt_team. + +commit 99026d8de3614b0dfc53a9b7028464b287b411d2 +Merge: a8a75a1556 8bf55fdd63 +Author: daitingting +Date: Mon Apr 2 14:38:27 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit a8a75a155648d402ab8c7af6b8eb780bb904c680 +Author: daitingting +Date: Mon Apr 2 14:36:02 2018 +0800 + + * Fix bug for batchediting descs which has html tags. + +commit 8bf55fdd633a18562fbb02e816b66ccf779b4706 +Author: JackWuLieHao +Date: Mon Apr 2 14:28:15 2018 +0800 + + * Finish task 3786 + +commit 92f4c7375d44d47dd23092aa616394fc1c3a7064 +Author: tengfei +Date: Mon Apr 2 13:10:58 2018 +0800 + + * fix English translation + +commit 204afb448a9ccad613c1105966790727f864eee7 +Merge: d764dc90de 682fdff83d +Author: JackWuLieHao +Date: Mon Apr 2 12:01:09 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit d764dc90deff7b10a84bbcfa12bd94ac791098be +Author: JackWuLieHao +Date: Mon Apr 2 11:59:20 2018 +0800 + + * Finish task #3797 + +commit 682fdff83d1e46457f6576cf8e2b2cfb688cf6d7 +Merge: 65b442dcb1 f004ef4409 +Author: daitingting +Date: Mon Apr 2 11:29:27 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 65b442dcb1346061fe0d7fefa41b434c12c35fef +Author: daitingting +Date: Mon Apr 2 11:25:48 2018 +0800 + + * Fix bug for closed status, bug#1489,#1495,#1497. + +commit d53267cadf32651eb7ccfff3e0b1a5dd744d3d3e +Author: wangyidong +Date: Mon Apr 2 10:56:22 2018 +0800 + + * adjust browse page and update zui. + +commit 2ccd67fbba965f77612f2fa45d791a23e9c8c6df +Author: wangyidong +Date: Mon Apr 2 10:46:16 2018 +0800 + + * adjust for my story page. + +commit f004ef44092f5a39c59bb39617ff2329690536ce +Author: wumo +Date: Mon Apr 2 09:40:14 2018 +0800 + + * Make the rights of task clear. + +commit e6aaf894a62523be872d5b84e87ed32254e2a8cd +Author: daitingting +Date: Fri Mar 30 15:59:24 2018 +0800 + + * Adjust codes. + +commit 2fa7aa63b32b3322d5ed92bf92c56f75d5c7ddfa +Author: daitingting +Date: Fri Mar 30 14:42:11 2018 +0800 + + * Add title for select options. + * Set wrap for options over width. + +commit 1a541d715ba738da345292aeb71322ddf9446c26 +Merge: cac07cddc1 0930835923 +Author: daitingting +Date: Fri Mar 30 14:41:13 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit cac07cddc1fe3116463479f7a07b228fd588d58b +Author: daitingting +Date: Fri Mar 30 14:40:52 2018 +0800 + + * Format codes. + +commit 09308359236275fe2bcc2dee02dd24d3601c3f17 +Merge: 69255bb181 d862e2698d +Author: wumo +Date: Fri Mar 30 14:38:39 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 69255bb181b791411614f4bef39e1f8463cfe1bc +Author: wumo +Date: Fri Mar 30 14:35:20 2018 +0800 + + * Update the status of parent tasks after batch create tasks. + +commit d862e2698de29591a38e6c73b2d139a3690425da +Merge: b76b50e22f 288b985be6 +Author: daitingting +Date: Fri Mar 30 14:19:20 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit b76b50e22f5e70d786870d238caf3dc01a3ca56e +Author: daitingting +Date: Fri Mar 30 14:18:54 2018 +0800 + + * Add ditto when module is ditto. + +commit 288b985be6ca49a60a009540e134e7ab7146735f +Author: JackWuLieHao +Date: Fri Mar 30 13:35:32 2018 +0800 + + * Finish Task #3786 + +commit b51a42c506c9573e423526f8a8d9128080e363fc +Author: wangyidong +Date: Fri Mar 30 11:25:07 2018 +0800 + + * change for my score page. + +commit 959dfe94b813d0594eb2a47beae3c62b42354fae +Author: daitingting +Date: Fri Mar 30 11:20:48 2018 +0800 + + * Optimize codes. + +commit 9c2e3c326b12620780ab28983fa456943fc7649b +Author: daitingting +Date: Fri Mar 30 11:07:26 2018 +0800 + + * Remove useless codes. + +commit 070454933b3ba3b3ba1e0e4909cf0d83ea87c969 +Author: daitingting +Date: Fri Mar 30 10:48:16 2018 +0800 + + * Compatible extension if there is a object to transfer story. + +commit ad7cfe467e32e5da6525dce661e0563acd058d56 +Author: daitingting +Date: Fri Mar 30 10:15:48 2018 +0800 + + * Adjust codes. + +commit 7b614b76209ddbec210de9d489dc4f09a3ba60cb +Author: wangyidong +Date: Thu Mar 29 17:07:50 2018 +0800 + + * finish tast #3766. + +commit a76e66cd81d3fdbecfacf598b92be6d846351163 +Author: wangyidong +Date: Thu Mar 29 17:07:36 2018 +0800 + + * finish task #3765. + +commit 5e37928be588e16a8d5e649d5e7dc28d3ec0d306 +Merge: 0c9e7a58ff 5c6affa5f8 +Author: daitingting +Date: Thu Mar 29 16:58:25 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 0c9e7a58ff56257da51c828efeb7e5a2895242e8 +Author: daitingting +Date: Thu Mar 29 16:56:22 2018 +0800 + + * Compatible extension if there is a object to transfer bug. + +commit 5c6affa5f8a6c069b6b91d56de4c07c05fcfcc8b +Author: JackWuLieHao +Date: Thu Mar 29 16:38:39 2018 +0800 + + * Finish task #3790 + +commit 8e8c69eb853ed7b8f3c38570a5f8240320a0356a +Author: JackWuLieHao +Date: Thu Mar 29 16:18:37 2018 +0800 + + * Finish task #3793 + +commit 55c57079dff6f70bfcfea90f0b35ec729747ea3d +Author: JackWuLieHao +Date: Thu Mar 29 16:17:09 2018 +0800 + + * Finish tash #3797 + +commit 8de30771260724e6eea594479d7c2d2f20574057 +Merge: d7e1b30bd9 cf41ca19ea +Author: JackWuLieHao +Date: Thu Mar 29 15:57:06 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit d7e1b30bd988fec20b0dcdace8f50be0cf82df7a +Author: JackWuLieHao +Date: Thu Mar 29 15:55:46 2018 +0800 + + * Finish task #3793 + +commit cf41ca19ea1474223d56e9893e42ea1c219458e0 +Merge: f94e93a593 8eccd30f45 +Author: wumo +Date: Thu Mar 29 15:53:09 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit f94e93a5930f5d3eae5f06d564d322adcb89611f +Author: wumo +Date: Thu Mar 29 15:52:43 2018 +0800 + + * Add the entry to manage product lines. + +commit 4d59bf7f42f5e0386ac0b26abe091255f341115b +Author: wumo +Date: Thu Mar 29 15:43:30 2018 +0800 + + * Add the entry to manage product lines. + +commit 8eccd30f45b502dcc3e1fd3adde4482161380d7f +Merge: 65d8752b5e 960ec7c84c +Author: wangyidong +Date: Thu Mar 29 15:40:29 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 65d8752b5eba626ec13e673d480081437a9fd156 +Author: wangyidong +Date: Thu Mar 29 15:39:53 2018 +0800 + + * fix for import case in testsuite. + +commit 960ec7c84cdce937cc7b7f7d0d2c49bbf4545e85 +Author: JackWuLieHao +Date: Thu Mar 29 15:39:14 2018 +0800 + + * Finish task #3797 + +commit 9c7712d7da9000f472c620cca1eb8608d7b79e78 +Author: wangyidong +Date: Thu Mar 29 13:56:05 2018 +0800 + + * finish task #3764. + +commit 408152f2f0ca2da65abeb951fd180d81fd458b29 +Merge: 77ed3e4dec a45b147781 +Author: JackWuLieHao +Date: Thu Mar 29 13:44:27 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 77ed3e4dec63cfbe0c46b2e3c57dd4ca33ba8b5a +Author: JackWuLieHao +Date: Thu Mar 29 13:42:12 2018 +0800 + + *Add the user add, edit, and view the details of the page without the + *date of hire display + +commit 34e25dc140b5cf1b424c2751838cc339f8f8a917 +Author: JackWuLieHao +Date: Thu Mar 29 13:37:05 2018 +0800 + + *Repair can not be imported due to a single space in the code + +commit 893fef2eafc7aced0edc4200444bb120f8eb9230 +Author: JackWuLieHao +Date: Thu Mar 29 13:34:44 2018 +0800 + + * international version of the page, column width less + +commit 48c255f2361bce74f299518a405608179557171c +Author: JackWuLieHao +Date: Thu Mar 29 13:31:24 2018 +0800 + + * Modify the installed button style + +commit a45b147781a9f1363142926abc1c78c6dff8d3e5 +Merge: 7719686ae2 f5a09e9558 +Author: daitingting +Date: Thu Mar 29 13:24:45 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 7719686ae28642fb2dfe585fe6932f012ae76893 +Author: daitingting +Date: Thu Mar 29 13:24:26 2018 +0800 + + * Adjust codes. + +commit f5a09e9558b135a9c00455c7d9143624e8dd13ff +Merge: 2d9221beca ea1c4e9f55 +Author: JackWuLieHao +Date: Thu Mar 29 11:25:02 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 2d9221becae2a25cbf3a1c4d827e1c27ea4e1533 +Author: JackWuLieHao +Date: Thu Mar 29 11:18:33 2018 +0800 + + *Add user creation, edit, and view the details of the page without the date of entry display + +commit ea1c4e9f55761389a6b1c3b6a1af17368717beab +Merge: 5f76edbe3b b868c77f83 +Author: wumo +Date: Thu Mar 29 11:11:35 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 5f76edbe3b7ebec1894e356eda4b4823e8d5cfdc +Author: wumo +Date: Thu Mar 29 11:10:54 2018 +0800 + + * Fix the bug of download link not display. + +commit 1e7b8e3d2ac82f802c883893539252d1a6abd706 +Author: wangyidong +Date: Thu Mar 29 11:05:14 2018 +0800 + + * finish task #3763. + +commit b868c77f830efb0924db7c54b6958db28a856cb5 +Merge: 8448dedf53 14217d6ae8 +Author: daitingting +Date: Thu Mar 29 09:44:12 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 8448dedf534cfd7b325d0ddc912accf81cf745da +Author: daitingting +Date: Thu Mar 29 09:43:53 2018 +0800 + + * Add primary key for zt_team. + +commit 14217d6ae85979911f2f151ca971bd3b0a6c6983 +Merge: cb06b23801 c58aa3f02f +Author: wumo +Date: Thu Mar 29 09:15:30 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit cb06b238014245fd1e19c3a900cbd09f8b74aab7 +Author: wumo +Date: Thu Mar 29 09:14:52 2018 +0800 + + * Modify the right of start. + +commit c58aa3f02f4f45f2b8299ec9fe56714cbfac460c +Merge: 44d35beb61 1874f441c4 +Author: JackWuLieHao +Date: Wed Mar 28 20:42:42 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 44d35beb61fbae1e009891e5463541b7b30e3807 +Author: JackWuLieHao +Date: Wed Mar 28 20:41:42 2018 +0800 + + * Modify the name of team. + +commit 1874f441c4c562675e044cdbb6d3c4dee83e701e +Merge: 558bd8fc9f f59975cbc4 +Author: wumo +Date: Wed Mar 28 20:31:57 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 558bd8fc9ff433f771637baf27db0ca0b91e68e2 +Author: wumo +Date: Wed Mar 28 20:30:48 2018 +0800 + + * Modify the rights of restart in multi-user task. + +commit 65036c3cf7ede8b61347a0d559c25371b40e81c3 +Author: wangyidong +Date: Wed Mar 28 17:27:13 2018 +0800 + + * adjust for table width. + +commit 9f43595d79ae342d0c5bda36952735bdde046ca4 +Author: wangyidong +Date: Wed Mar 28 17:18:14 2018 +0800 + + * finish task #3762. + +commit f59975cbc491adfdd9ab9a03ebb8e05025115c45 +Author: daitingting +Date: Wed Mar 28 16:48:11 2018 +0800 + + * Set default plan as empty select. + +commit 315a6f931fba50e5fa1e0a1e65eefb74973f1d8d +Author: wangyidong +Date: Wed Mar 28 16:20:28 2018 +0800 + + * adjust for datatable. + +commit 386add70768621084f5cb31b8551e88715e130b1 +Author: daitingting +Date: Wed Mar 28 16:01:44 2018 +0800 + + * Check exported tasks has children or not. + +commit 97e7d97cb5dbf137f4804c016d0b21bb03ae7a67 +Author: daitingting +Date: Wed Mar 28 15:59:31 2018 +0800 + + * Remove useless codes. + +commit dc061563602943d9110c7a90cf9108ebe060928a +Author: daitingting +Date: Wed Mar 28 15:57:31 2018 +0800 + + * Adjust condition for taskonlyCondition. + +commit 189ad7ca31b724ef9028c47b75e0ad4db06a563e +Author: wangyidong +Date: Wed Mar 28 14:38:39 2018 +0800 + + * code for task #3663. + +commit dcd4da2f9348ac415fd0e0fb9628df36b46ff03f +Merge: f459f4a3da 5f9d7c2fb5 +Author: wangyidong +Date: Wed Mar 28 13:54:27 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f459f4a3dace1772d182ceffbdef2c0c9d7d065d +Author: wangyidong +Date: Wed Mar 28 13:52:26 2018 +0800 + + * code for task #3663. + +commit 3e7af31e9132c750d5ccdd7e27b6572f2e25951c +Author: daitingting +Date: Wed Mar 28 13:44:35 2018 +0800 + + * Adjust style for it. + +commit f05fbc988f8db67f427f4f280a711dd4228e1896 +Merge: 4058c58ca9 14db58abf7 +Author: daitingting +Date: Wed Mar 28 13:21:47 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 4058c58ca99d54ce1d0caba383669a281f99880f +Author: daitingting +Date: Wed Mar 28 13:19:36 2018 +0800 + + * Update time of task when edit team time or record estimate. + +commit 14db58abf745a3af9f608af2f631bce90fa67d89 +Merge: 8145e5d9ee 533c1d4013 +Author: wumo +Date: Wed Mar 28 11:17:58 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 8145e5d9ee90889570ce7411aac0731e6260417c +Author: wumo +Date: Wed Mar 28 11:15:55 2018 +0800 + + * Modify the prompt of pruduct code when create product. + +commit 533c1d401304e0c97c9564fcb1751157625672da +Author: daitingting +Date: Wed Mar 28 09:36:46 2018 +0800 + + * Format codes. + +commit ff510f9c24c1b839b630f0b530763aac984af2cd +Author: daitingting +Date: Wed Mar 28 09:34:44 2018 +0800 + + * Then plan can link with bugs that has been linked with other plans. + +commit 5f9d7c2fb5a3cfa4853bfb303e0daa6f70f35d84 +Author: QingDao Nature Easy Soft Network Technology Co,LTD +Date: Tue Mar 27 14:48:53 2018 +0800 + + Update en.php + + change tutorial prompt + +commit 69a75b1d17b75a8d178099e5047ff2ceaf8842e5 +Merge: 8975712326 bafde6b274 +Author: daitingting +Date: Tue Mar 27 14:46:53 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 89757123266442a883a033e68451e7686fc149ba +Author: daitingting +Date: Tue Mar 27 14:46:37 2018 +0800 + + * Adjust style. + +commit 22e5223158dcb4d461e53d7a5b5b933482219d2e +Merge: 48b97ea292 bafde6b274 +Author: wumo +Date: Tue Mar 27 14:33:16 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit bafde6b274b5129cf253c53332b0f20f2288dfa0 +Merge: 4d8984eeb5 7f520b741d +Author: wangyidong +Date: Tue Mar 27 14:23:40 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 4d8984eeb54baef3dc53d46f4e144af9b5c612d1 +Author: wangyidong +Date: Tue Mar 27 14:23:19 2018 +0800 + + * adjust for upgrade. + +commit 7f520b741d6f6e8a9049791b01910997b25cb671 +Merge: 3b7afb5483 ff19e33fd0 +Author: daitingting +Date: Tue Mar 27 10:25:17 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 3b7afb5483d84b043fcbd82760cda5405fda32a7 +Author: daitingting +Date: Tue Mar 27 10:24:56 2018 +0800 + + * Add condition for set function. + +commit 48b97ea2928b1533373a54aac183c516b3614551 +Author: wumo +Date: Mon Mar 26 15:33:46 2018 +0800 + + * optimize the notes. + +commit ff19e33fd0dff4b9cbd6fc4780a155fc623d8511 +Merge: 24f28c0c1c a4b6765a3b +Author: wumo +Date: Mon Mar 26 09:12:22 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 24f28c0c1cca6d212563726beed25aa15d70e04a +Author: wumo +Date: Mon Mar 26 09:11:16 2018 +0800 + + * Fix the error time of changelog. + +commit a4b6765a3b949f7a6ec1e3879e033e6c27a923a1 (tag: zentaopms_9.8.2_20180326) +Author: wangyidong +Date: Mon Mar 26 09:06:19 2018 +0800 + + * adjust for zh-tw lang. + +commit 4df677f7bd0652946e729eef513663845e81b383 +Merge: 07fa914150 74738607aa +Author: wumo +Date: Mon Mar 26 09:02:12 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 07fa914150df137eabd1938e98bfb3da1b0386f8 +Author: wumo +Date: Mon Mar 26 09:00:31 2018 +0800 + + * Differentiate batch creation tasks and subtasks. + +commit 74738607aa2c60548125bbc2baf65743ae8e7418 +Author: wangyidong +Date: Mon Mar 26 08:38:28 2018 +0800 + + * adjust code for upgrade. + +commit 7e82a431dfcce337b6115f5a84395b25dd1f8d94 +Merge: 3cc37dd724 a8e8c79660 +Author: wangyidong +Date: Fri Mar 23 16:15:00 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 3cc37dd724d709cba9c6d4c074b27ec990a4ea7d +Author: wangyidong +Date: Fri Mar 23 16:14:16 2018 +0800 + + * adjust for delete parent task with child tasks. + +commit 6c7e587b20e7c7e5384d25845115dc955e805a55 +Author: wangyidong +Date: Fri Mar 23 14:10:13 2018 +0800 + + * fix for deleted product. + +commit 55b8bebc83d99d87cf37d6143142c46bd0af2838 +Merge: d02f8b2ee2 ab7ff4024f +Author: wangyidong +Date: Fri Mar 23 13:34:20 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit d02f8b2ee22429efcd0c585738c3570186e86c45 +Author: wangyidong +Date: Fri Mar 23 13:33:54 2018 +0800 + + * fix for update parent task status. + +commit ab7ff4024f24143f7e6d6a1a2e0e060bd004dc51 +Author: daitingting +Date: Fri Mar 23 11:33:35 2018 +0800 + + * Adjust codes. + +commit 627d055dff379b1a7cf4dc3e52cab2f1027acd68 +Merge: 8fad0264bb 5bb0c038f2 +Author: daitingting +Date: Fri Mar 23 11:28:05 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 8fad0264bb914c95b44b945da7043159762d26f2 +Author: daitingting +Date: Fri Mar 23 11:27:52 2018 +0800 + + * Adjust codes. + +commit 5bb0c038f2781fd1db5c8b6511948021e581cb61 +Author: wangyidong +Date: Fri Mar 23 11:13:16 2018 +0800 + + * code for task #3752. + +commit 0954a39e0ac4016ba65f9674ac54de65e18ca719 +Merge: ec374fd2d7 8cfa2878d0 +Author: wangyidong +Date: Fri Mar 23 10:59:31 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit ec374fd2d7d135c71e277c9143078b30fd5dcfb3 +Author: wangyidong +Date: Fri Mar 23 10:59:11 2018 +0800 + + * code for task #3685. + +commit 8cfa2878d02ad418b24d02175e98b220ed2eff1f +Merge: 51d60bac36 5633a1ad1a +Author: daitingting +Date: Fri Mar 23 10:49:13 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 51d60bac36a32e509842da2ce969659ad6d699db +Author: daitingting +Date: Fri Mar 23 10:48:38 2018 +0800 + + * Adjust fixTaskAssignedTo function when update from 9.8.1. + +commit b996e427f04cc9424f7de9d3fb8e04bf94e6d84e +Merge: 96aef84f2c e9d1a804c4 +Author: wangyidong +Date: Fri Mar 23 10:09:11 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 96aef84f2c706bcaa76c40aee5866036a04cb13a +Author: wangyidong +Date: Fri Mar 23 10:08:44 2018 +0800 + + * adjust for update parent task status. + +commit a8e8c79660a519399cc28cfa288433d64aae5768 +Author: wumo +Date: Fri Mar 23 05:48:24 2018 +0800 + + * Adjust the style. + +commit bc9224a9597d13c588df721cb704932bebb929df +Author: wumo +Date: Fri Mar 23 05:34:34 2018 +0800 + + * Limit the width of parent title. + +commit 62ccee6316fcc3a5033c8a2f9d37e7e2b561ad44 +Merge: ef8e72fc0e 6c7e587b20 +Author: wumo +Date: Fri Mar 23 04:12:09 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit ef8e72fc0e79f9b1fefeed4b8489a655685e3877 +Author: wumo +Date: Fri Mar 23 04:10:50 2018 +0800 + + * Set the value of deleted product line to 0. + +commit 061b323440f7143091b9a39fa26671fdcdef6664 +Merge: 1779bdeedc 0954a39e0a +Author: wumo +Date: Fri Mar 23 00:51:26 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 1779bdeedcbe01aec5e23015066b49839c43e57b +Author: wumo +Date: Fri Mar 23 00:48:54 2018 +0800 + + * Change the object of assigned to. + +commit 5633a1ad1ad9bcd8824b9b1249796f7d2ae4e884 +Merge: c59b3290fc b996e427f0 +Author: wumo +Date: Fri Mar 23 00:20:01 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit c59b3290fc0690e629d24c6e7b6116cb6f72e027 +Author: wumo +Date: Fri Mar 23 00:18:42 2018 +0800 + + * Add product line when batch edit products. + +commit e9d1a804c4dbd5d29b0f232b3ef401702ddf146e +Author: wumo +Date: Thu Mar 22 23:18:28 2018 +0800 + + * Add parent title when batch create children task. + +commit 1ea17ed25dcef3220339babe054126af96f8d68d +Author: wumo +Date: Thu Mar 22 23:08:55 2018 +0800 + + * Fix the bug of typeList of todo. + +commit 4a611fd671d542c1274ebfa08c19fcf3fefa6908 +Merge: 402861a88e 3212c1d41e +Author: wumo +Date: Thu Mar 22 16:53:52 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 402861a88ee946e7ba5f14b67f241aa6f3c10b4a +Author: wumo +Date: Thu Mar 22 16:49:51 2018 +0800 + + * Filter the invalid key in custom module. + * Change function called to picture when edit product. + +commit 3212c1d41e5a7877e513a9a1a74c34327cce1f0d +Merge: 3027a4fd3b 5786761b69 +Author: wangyidong +Date: Thu Mar 22 16:28:45 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 5786761b69ebf802119e146a60030a9d94a18bd8 +Author: daitingting +Date: Thu Mar 22 16:22:32 2018 +0800 + + * Adjust codes. + +commit 19bb7f1f1e4b1df7a1c9fad00f3824700cd9b750 +Author: daitingting +Date: Thu Mar 22 15:45:49 2018 +0800 + + * Adjust params for page function. + +commit a474597c66943868142fa9221c9d9b1d6d5ad05a +Merge: 867849c254 4d475eef59 +Author: daitingting +Date: Thu Mar 22 15:43:25 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 867849c2544c00ae69f925a3f45eb995a35354b2 +Author: daitingting +Date: Thu Mar 22 15:42:57 2018 +0800 + + * Optimize future function for productplan. + +commit 3027a4fd3bd977cee54a7aaf10a4fc52e54f4fca +Author: wangyidong +Date: Thu Mar 22 15:28:50 2018 +0800 + + * adjust for team padding in modal. + +commit 4d475eef594c7522d8445e5c0445ef57d7f98196 +Author: wangyidong +Date: Thu Mar 22 15:11:52 2018 +0800 + + * fix error for deleted branch in link story. + +commit bb0cb8efdd96397b1d92d5656e4e58be31dec086 +Merge: ad1a24089d f3098cc12f +Author: wangyidong +Date: Thu Mar 22 15:01:34 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit ad1a24089df2fc50dde598d596dd5ee8990a5cf6 +Author: wangyidong +Date: Thu Mar 22 15:00:55 2018 +0800 + + * code for plan getpairs with unexpired. + +commit f3098cc12f9bb8cf269236dc6ffb617b9c716586 +Merge: a0204a58e9 fb223a3bd7 +Author: daitingting +Date: Thu Mar 22 14:31:05 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit a0204a58e99d2d92d022baad5803eab7fc80943d +Author: daitingting +Date: Thu Mar 22 14:30:28 2018 +0800 + + * Display pri value for short type. + +commit fb223a3bd76f92e71be6f70839cdb13dae23276a +Author: wangyidong +Date: Thu Mar 22 14:29:27 2018 +0800 + + * adjust for check has custom pri. + +commit a72bf602d3a5ad9ff897ab1f710d4388eb0f67aa +Merge: 38219cede9 e24e6c318e +Author: wangyidong +Date: Thu Mar 22 14:17:43 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 38219cede9258542eb13cae04bd2203ce682c633 +Author: wangyidong +Date: Thu Mar 22 14:17:09 2018 +0800 + + * fix for width. + +commit e24e6c318ef90db3ed3d506283ca8864a0e173e3 +Author: daitingting +Date: Thu Mar 22 14:03:05 2018 +0800 + + * Add changelog for 9.8.2. + +commit 3877c7f11169fd3dbf925b10ecaa3ae25fe5a167 +Author: guanxiying +Date: Thu Mar 22 08:11:41 2018 +0800 + + * Fix check Limit code in orderby function. + +commit b2cd6c62f3ec6d22b3dfcc7e36381377c62860a9 +Merge: 7ebfcde7f2 c1dd0e25ec +Author: wumo +Date: Wed Mar 21 16:02:42 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 7ebfcde7f2e77bb4bff8e452d41c246d8893aaaf +Author: wumo +Date: Wed Mar 21 16:01:12 2018 +0800 + + * Fix the bug of comment and setting key. + +commit c1dd0e25ecec87b870768b748d68869a7b17d56f +Merge: 6dd688f3b7 4c9cf4d1f3 +Author: wangyidong +Date: Wed Mar 21 15:02:14 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 6dd688f3b78a8c8ed22bb9d79436da6488a2c8fc +Author: wangyidong +Date: Wed Mar 21 15:01:57 2018 +0800 + + * adjust for batch create. + +commit 4c9cf4d1f324fc107e9808c8215842b620c8fb78 +Author: wumo +Date: Wed Mar 21 14:57:24 2018 +0800 + + * Fix the bug of comment. + +commit 1c9d3674b016b1d0bfc0b71bc235aff61e16b8a1 +Merge: 980c043a25 7ad64ebd80 +Author: wumo +Date: Wed Mar 21 14:22:29 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 980c043a256dfbede540feeb4ea73ef01e9af118 +Author: wumo +Date: Wed Mar 21 14:17:09 2018 +0800 + + * Adjust codes. + +commit 7ad64ebd8013459d1dfd1fe9a61351c3cfaf5004 +Author: daitingting +Date: Wed Mar 21 14:12:41 2018 +0800 + + * Adjust realname field of zt_user. + +commit 0fddc8a6b09c064987dfee7555b4b825bd0998d7 +Author: daitingting +Date: Wed Mar 21 14:10:36 2018 +0800 + + * Adjust codes. + +commit a0aa9f6d6e6992e0ac2103e32f15dab82faca238 +Merge: 3dd4a4e97b 0fb63f3814 +Author: daitingting +Date: Wed Mar 21 13:45:31 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 3dd4a4e97b6d0a1c0cbfff26df0c9d0d068ed067 +Author: daitingting +Date: Wed Mar 21 13:45:07 2018 +0800 + + * Adjust fixClosedInfo of project. + +commit 0fb63f38142257ebf78e8028d8eef459a755c53a +Merge: 99dbec6061 7e77a6d999 +Author: wumo +Date: Wed Mar 21 13:33:43 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 99dbec60618572f74ab132d179bbfa962a2faeae +Author: wumo +Date: Wed Mar 21 13:33:04 2018 +0800 + + * Adjust codes. + +commit 7e77a6d999575452db4ba8e42f02360d19c2f099 +Author: wangyidong +Date: Wed Mar 21 13:23:22 2018 +0800 + + * fix bug. + +commit 0345d0e4fba133770a5d38dabff962ed09988e91 +Author: wangyidong +Date: Wed Mar 21 13:13:52 2018 +0800 + + * merge update sql to zentao.sql. + +commit ee62c220306ba002690adefe8a4a4057bc4322b2 +Author: daitingting +Date: Wed Mar 21 11:23:18 2018 +0800 + + * Adjust version. + +commit fc4c03fce2b692207d3364b765004cb75a34aff4 +Author: daitingting +Date: Wed Mar 21 11:20:18 2018 +0800 + + * Adjust default full blocks. + +commit 714c5803962763f3222fb5e864b1db5959d498dd +Merge: 9e6348b10e b40e2bb9ea +Author: wangyidong +Date: Wed Mar 21 09:49:39 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 9e6348b10eaf4e1661695d8fa686268cd24399f0 +Author: wangyidong +Date: Wed Mar 21 09:49:00 2018 +0800 + + * code for child task. + +commit b40e2bb9ea43d7be0f7ed9b3f5936b8ba4c49bb5 +Author: daitingting +Date: Wed Mar 21 09:30:47 2018 +0800 + + * Add tw language. + +commit cd3971346f04ada2789be933c594658fcfe27d12 +Author: daitingting +Date: Wed Mar 21 09:23:58 2018 +0800 + + * Display future for future plan. + +commit 872821d830ae320970eae55a6b40719e564cdee7 +Merge: 53fa13226b 040137e110 +Author: wumo +Date: Wed Mar 21 09:14:10 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 040137e1101adbb3a6f6771172097c84b392b4b7 +Merge: 7ad7e91147 892103d854 +Author: wangyidong +Date: Wed Mar 21 08:56:58 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 7ad7e91147ce2203d1041512c6606793f689ab79 +Author: wangyidong +Date: Wed Mar 21 08:56:26 2018 +0800 + + * finish task #3747. + +commit 892103d854fc2d06732767250644f44f4f17ae52 +Author: daitingting +Date: Tue Mar 20 18:50:36 2018 +0800 + + * Add height for textarea. + +commit 53fa13226b1c2db651154293417a000e9a859ace +Author: wumo +Date: Tue Mar 20 18:39:03 2018 +0800 + + * Add tips when build is empty. + +commit f25154c98a158a44c1a9bf15c154ad038c7d6e49 +Author: daitingting +Date: Tue Mar 20 18:34:49 2018 +0800 + + * Fix closedBy and closedDate for closed project before. + +commit c8bb6b67263f0a65bae6e04229600f3b06d81178 +Merge: def66979e1 44a6a843e0 +Author: daitingting +Date: Tue Mar 20 18:03:29 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit def66979e104309ce3ecbba6c1448dac6f67c8d3 +Author: daitingting +Date: Tue Mar 20 18:01:58 2018 +0800 + + * Project can not be delayed when it has been closed. + +commit 44a6a843e0ee671f493f5b0ea98fa2fb20842f34 +Merge: 29b3502d03 1e1a2ae026 +Author: Catouse +Date: Tue Mar 20 17:58:59 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 29b3502d0360c92b268c84c675612c0ef2dd7b69 +Author: Catouse +Date: Tue Mar 20 17:58:39 2018 +0800 + + * improve style of elements witch has long text inside. + +commit de741a4c689d977c74c61d0d9c701080f3762c9f +Author: daitingting +Date: Tue Mar 20 17:24:56 2018 +0800 + + * Get last productplan without future. + +commit 1e1a2ae0262384a4bb3ab481420cc9b368ec9370 +Merge: bcf1a89305 3e3d7c30e4 +Author: wangyidong +Date: Tue Mar 20 17:17:55 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit bcf1a89305746ae299123ad338c1d8d82c36f272 +Merge: dfe9ca2e60 c4e167763f +Author: wangyidong +Date: Tue Mar 20 17:15:36 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 3e3d7c30e42670a36d30100c2ad314ba90709c41 +Author: daitingting +Date: Tue Mar 20 17:14:49 2018 +0800 + + * Adjust style for create and edit todo. + +commit dfe9ca2e6052169cfaa62ee10166e01b46397150 +Author: wangyidong +Date: Tue Mar 20 17:07:07 2018 +0800 + + * finish task #3748. + +commit c4e167763ff27934dab0c6c8d40cf49c0e06437c +Author: daitingting +Date: Tue Mar 20 16:51:21 2018 +0800 + + * Adjust codes. + +commit 04b123ac7d1e279d2609ce30e18bf033abdd5263 +Author: daitingting +Date: Tue Mar 20 15:09:33 2018 +0800 + + * @assignedTo when object has assignedTo. + +commit ca63164bc93750532bb7eb2809e1d15ac524dc61 +Merge: 59b5cbcd22 c7823a04c2 +Author: daitingting +Date: Tue Mar 20 15:02:00 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 59b5cbcd22e8a9882dbb74b52fb52590ff675ee8 +Author: daitingting +Date: Tue Mar 20 15:01:06 2018 +0800 + + * Add resolved and bugconfirmed action for @. + +commit c7823a04c2385efe99aaa0b963177c9b807df680 +Author: wumo +Date: Tue Mar 20 14:21:20 2018 +0800 + + * Filter invalid comment. + +commit 74e29a42a30e73689c6ecf2a2d72fea18b00f90c +Merge: 72956d5910 886153a0db +Author: wumo +Date: Tue Mar 20 14:03:30 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 72956d591042bf348a87fde63f3620d3c852ba89 +Author: wumo +Date: Tue Mar 20 13:59:46 2018 +0800 + + * Adjust batch create style. + +commit 886153a0db4b9f336f1287ccf3f7ddfcea267d07 +Author: wangyidong +Date: Tue Mar 20 13:11:53 2018 +0800 + + * adjust for delete branch. + +commit 36b04eb6d5bea3ff7e80897fd343e91c2d9613de +Merge: b5f40d4ad1 5ca4cb2559 +Author: wangyidong +Date: Tue Mar 20 10:45:14 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit b5f40d4ad1597161ccae0d24bb611e9d4440810f +Author: wangyidong +Date: Tue Mar 20 10:44:49 2018 +0800 + + * finish task #3742. + +commit 5ca4cb2559217ac6225be85c9ce6c792600494e3 +Merge: a0ab6272f1 1523479350 +Author: Catouse +Date: Tue Mar 20 10:29:48 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit a0ab6272f1d7b0b0fd31b588d061a5f6bae44f1d +Author: Catouse +Date: Tue Mar 20 10:14:49 2018 +0800 + + * finish task #3725 and fix bug #1406. + +commit 152347935035013cb57767a8b251e976317036fa +Merge: 1c2db4e95b cd918d09fd +Author: wangyidong +Date: Tue Mar 20 10:11:25 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 1c2db4e95b92dd89bb7516f88ca1d308388fdd69 +Author: wangyidong +Date: Tue Mar 20 10:10:23 2018 +0800 + + * finish task #3740. + +commit cd918d09fd33f81eceeb16b925df3e272d2fddf8 +Author: wumo +Date: Tue Mar 20 10:00:30 2018 +0800 + + * Check the key of user when setting. + +commit a87465f4536c1a0b17b9a7f27a569306a432605d +Merge: 498a02e142 3df140466f +Author: wumo +Date: Mon Mar 19 18:39:15 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 498a02e1426d093f48f3d48ed23b98f6a52aca5e +Author: wumo +Date: Mon Mar 19 18:36:19 2018 +0800 + + * Fix the bug of key column empty. + +commit 3df140466f51a398a89eb31a1918a61cb3c868dc +Merge: 6ca2173168 4b938be75f +Author: daitingting +Date: Mon Mar 19 18:34:07 2018 +0800 + + Merge pull request #21 from easysoft/origin/zentaopms_9.8 + + Origin/zentaopms 9.8 + +commit 4b938be75feb4141e306375344abd7a3f305cec6 +Merge: 2f5ac1ad32 6ca2173168 +Author: daitingting +Date: Mon Mar 19 18:33:51 2018 +0800 + + Merge branch 'zentaopms_9.8' into origin/zentaopms_9.8 + +commit 6ca2173168adc8090281985ea33ab27ed1d16da3 +Merge: 37dfcc7a26 90a2fa2f4a +Author: Catouse +Date: Mon Mar 19 17:13:20 2018 +0800 + + Merge branches 'zentaopms_9.8' and 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 2f5ac1ad32900b7bcd265e9637a8e334f6ac7b3f +Author: daitingting +Date: Mon Mar 19 17:13:12 2018 +0800 + + * Adjust length checking. + +commit 37dfcc7a26fb7b40c51642f83c0637bc5ba9ebd7 +Author: Catouse +Date: Mon Mar 19 17:13:01 2018 +0800 + + * finish task #3712 and fix bug #1419. + +commit 90a2fa2f4a2e3e8f6ee52a3273feffc5290c9101 +Author: wumo +Date: Mon Mar 19 16:57:25 2018 +0800 + + * Add the product line in batchedit page. + +commit 7ff7bfd43571d6caa3ea3f02a17703d4c190da77 +Author: daitingting +Date: Mon Mar 19 16:54:29 2018 +0800 + + * Adjust task page for chilrenTask. + +commit 9123dbb30cf4008deda0c7668015686182729a24 +Merge: a28fbfca27 2ff47d30fb +Author: Catouse +Date: Mon Mar 19 16:30:57 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit a28fbfca2749c6afeb65bda60e9b4e446144f376 +Author: Catouse +Date: Mon Mar 19 16:30:23 2018 +0800 + + * finish task #3752 and fix bug #1339. + +commit 2ff47d30fb8f89163bc7aaacbf10f566ee610bee +Author: wumo +Date: Mon Mar 19 16:23:17 2018 +0800 + + * Add the product line in batchedit page. + +commit cab2a753af50a015fe803aac663cb074d3b76c5f +Author: daitingting +Date: Mon Mar 19 15:43:56 2018 +0800 + + * Adjust pri. + +commit f6e84c6dfb30b2a45b664503393023b4790497db +Author: Catouse +Date: Mon Mar 19 15:21:27 2018 +0800 + + * fix bug #1432 and finish task #3689. + +commit 05ad31403deb3d4ed3df6feb67e1ba129a4ce192 +Author: daitingting +Date: Mon Mar 19 14:55:54 2018 +0800 + + * Open build link in current page. + +commit 9c2c0a6926dce7e9c00e308bd9a94310a8a0618a +Author: daitingting +Date: Mon Mar 19 14:51:27 2018 +0800 + + * Adjust style for them. + +commit 36f00235208bb8e33f1f2311dbc4758cd2cc59cd +Author: daitingting +Date: Mon Mar 19 14:12:04 2018 +0800 + + * Unset 'n/a' from resultList of testcase. + +commit 8c9f4876d633f38e7a515f879c0f11a61c35662b +Author: wumo +Date: Mon Mar 19 14:04:09 2018 +0800 + + * Assigned to me in the block to be popout directly + +commit 8c40b14b66bc6f9bd3d649b87b66dac7de563f44 +Merge: 5c406b6df2 e9f39df3b3 +Author: Catouse +Date: Mon Mar 19 13:33:01 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 5c406b6df2afcbb124ef0cad02ffe68f14a13a80 +Author: Catouse +Date: Mon Mar 19 13:31:55 2018 +0800 + + * init modal trigger when refresh block content. + +commit e9f39df3b333b172366ae51e0274de3741748464 +Author: wangyidong +Date: Mon Mar 19 13:22:19 2018 +0800 + + * finish task #3719. + +commit 7d72b791f1ac88a34325c969cb51507189b32f22 +Author: wangyidong +Date: Mon Mar 19 11:24:00 2018 +0800 + + * adjust for kanban. + +commit c9ad9be6399eeffaadba73f539e1bf9214c87861 +Merge: e70b1a5b8d 087fe4f4ca +Author: wangyidong +Date: Mon Mar 19 10:45:15 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit e70b1a5b8d036809f9d6b0f3265f24439d786074 +Author: wangyidong +Date: Mon Mar 19 10:44:46 2018 +0800 + + * finish task #3739. + +commit 4e57098de2c04ad3a56b63ffe88f36118e72a0a3 +Author: daitingting +Date: Mon Mar 19 10:18:18 2018 +0800 + + * Adjust style for ordered list in ueditor. + +commit edc8c3d627d8d87600274850916ced330e5df001 +Author: daitingting +Date: Mon Mar 19 09:58:31 2018 +0800 + + * Adjust zh-cn language in en file. + +commit 087fe4f4ca04231c49e8f875c744432b1f9f107d +Merge: b2c3df0829 9eb0dcc84e +Author: wumo +Date: Mon Mar 19 09:49:28 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit b2c3df08296ae6e271b60946e86f9d106d0677c0 +Author: wumo +Date: Mon Mar 19 09:44:41 2018 +0800 + + * Differentiate batch creation tasks and subtasks. + +commit ab27e19ccb37da57d1361053a1d1050ea29e9c92 +Author: wumo +Date: Sat Mar 17 16:59:04 2018 +0800 + + * Filter the ops when create test. + +commit 9eb0dcc84eeeee491000ca0de0f58c3d828dec0f +Author: wangyidong +Date: Fri Mar 16 17:33:38 2018 +0800 + + * code for task #3728. + +commit ef781fae09349ddeb1e093b6218900acf3a26c2d +Author: wangyidong +Date: Fri Mar 16 16:32:55 2018 +0800 + + * finish task #3728. + +commit 4b1f71460530705fcb38256cd72cb71199bb6b53 +Author: daitingting +Date: Fri Mar 16 16:19:54 2018 +0800 + + * Use latest resolutionList for report. + +commit a3140789daa3d0c2668157f54c5d2f126f223d16 +Merge: 809c8d5eb2 e7eedb4129 +Author: wangyidong +Date: Fri Mar 16 15:51:30 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 809c8d5eb290419ceede43f7a9a3a9d57cd430b6 +Author: wangyidong +Date: Fri Mar 16 15:51:14 2018 +0800 + + * finish task #3727. + +commit e7eedb412937e28421dbbdd4e738df932ce17ab2 +Author: wumo +Date: Fri Mar 16 15:35:13 2018 +0800 + + * Modify the prompt information when the user account is invalid + +commit e20ad46810d31b48fd82fa68073b5ac4ad9e76c1 +Author: daitingting +Date: Fri Mar 16 15:31:22 2018 +0800 + + * Set begin and end is future when click future button. + +commit eb45ec5a3100e2078324b2d82fa571351b151555 +Merge: c817f579f4 87a0679cbf +Author: wumo +Date: Fri Mar 16 14:04:45 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit c817f579f4a0ed68c803e2fbbe07fb919dcebf6d +Author: wumo +Date: Fri Mar 16 14:03:42 2018 +0800 + + * Fix the bug of delete in todo view page. + +commit 87a0679cbf4db24bb1a7bec705b865c8414e862b +Author: wangyidong +Date: Fri Mar 16 13:23:16 2018 +0800 + + * finish task #3720. + +commit 3a2cb307414229a17fa4519521cf8617bab04832 +Author: wangyidong +Date: Fri Mar 16 11:36:11 2018 +0800 + + * finish task #3702. + +commit 35e3a0ea3807f09452aade5466ce4ad356ef735a +Author: daitingting +Date: Fri Mar 16 09:35:20 2018 +0800 + + * Adjust status when close project. + +commit 5f8cd4a5dc9522010431889b0d4b6ce85ff8f9fd +Author: daitingting +Date: Thu Mar 15 17:27:51 2018 +0800 + + * Fix assignedTo for closed children task. + +commit 953b433c09e00f1fd3f4e78c64e580f2a479dc68 +Author: daitingting +Date: Thu Mar 15 16:48:12 2018 +0800 + + * Fix a bug for export case in onlyTest flow. + +commit ecf59d2a97c79f1c702f0fc578250421b178edc8 +Merge: adb6d59087 b4d93a9b7e +Author: wangyidong +Date: Thu Mar 15 16:38:37 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit adb6d590871445911b1d0c36d2eab88564c1e48a +Author: wangyidong +Date: Thu Mar 15 16:38:08 2018 +0800 + + * finish task #3724. + +commit dac814d5e2d7a219ee670a2aa1267f746ff9666d +Author: daitingting +Date: Thu Mar 15 16:18:05 2018 +0800 + + * Get cases that are not deleted. + +commit b4d93a9b7e7258e0d1fad6de5cab03bc1657aa17 +Merge: 22afb60591 4178e93824 +Author: wumo +Date: Thu Mar 15 15:45:42 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 22afb6059118561a46059262fdd60017d0114be6 +Author: wumo +Date: Thu Mar 15 15:44:26 2018 +0800 + + * Show pictures when edit product. + +commit e7189afaafc0fe0c9e74ac009abd2f3249f7ab49 +Author: wangyidong +Date: Thu Mar 15 15:00:23 2018 +0800 + + * finish task #3705. + +commit 4178e93824e7f3901f1ffa408f2ca147b7be49ba +Author: wangyidong +Date: Thu Mar 15 14:52:35 2018 +0800 + + * finish task #3701. + +commit d715b2ab99e27bb841e74efb88d48b34cffb68d6 +Author: wangyidong +Date: Thu Mar 15 13:33:34 2018 +0800 + + * finish task #3669. + +commit 56a4f70e1a31cb6066e50ead6f60e546252942a5 +Author: wangyidong +Date: Thu Mar 15 13:20:43 2018 +0800 + + * finish task #3731. + +commit 9d0261a5780704a12eb3a083f2837df0b28e40a7 +Merge: fb8b43ea4b aad4e06ca6 +Author: wangyidong +Date: Thu Mar 15 11:21:49 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit fb8b43ea4b68770c1a8b5a8a0e1f92374f45b56a +Author: wangyidong +Date: Thu Mar 15 11:19:26 2018 +0800 + + * finish task #3726. + +commit aad4e06ca6953d7590675e983d8bc70cf002ce4c +Author: wumo +Date: Thu Mar 15 11:06:43 2018 +0800 + + * roll back the config file. + * Check the legality of the mailbox when edit profile. + +commit ccc8cbf47c447df0729b6dec2d8e148fffab7ab7 +Author: daitingting +Date: Thu Mar 15 11:02:23 2018 +0800 + + * Update children task when close parent task. + +commit 04678c4c4b4430824560430865adfb0306c4a70f +Author: daitingting +Date: Thu Mar 15 10:10:58 2018 +0800 + + * Fix bug #1423. + +commit 8f9a8248a8e616686842fdd928595ce71ef3b5d7 +Author: daitingting +Date: Thu Mar 15 09:33:47 2018 +0800 + + * Format codes. + * Put the page function in the end. + +commit e76ac1b147625cf2a772384b59bb4b049664e614 +Author: wumo +Date: Thu Mar 15 09:05:43 2018 +0800 + + * Test + +commit eb88de6a3fd7211eaa750669c355d11ff097e1e8 +Author: wumo +Date: Wed Mar 14 20:13:50 2018 +0800 + + * Modify the error date in Changelog + * Adjust the order of product plan table columns. + +commit 287d31735994a904e8fffd0e88d3c5076d3f69eb +Author: daitingting +Date: Wed Mar 14 17:36:22 2018 +0800 + + * Get distinct records, fix bug #1453. + +commit 75c8a6d18a710870dbbbc53da6a9fd35232fc666 +Author: wumo +Date: Wed Mar 14 17:22:32 2018 +0800 + + * Add release time of the Modify log. + +commit d1d033ddd9317f161163c07585e2a6b2ebcd4c1e +Merge: c81e7570b3 6e2614f1e9 +Author: daitingting +Date: Wed Mar 14 16:34:58 2018 +0800 + + Merge branches 'zentaopms_9.8' and 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into origin/zentaopms_9.8 + +commit c81e7570b3a74479189773bc6190ee709dca0b0f +Author: daitingting +Date: Wed Mar 14 16:28:32 2018 +0800 + + * Fix bug #1431. + +commit 4ea0e404e15f43f698830296c76c960acdb03dfe +Author: wumo +Date: Wed Mar 14 16:17:23 2018 +0800 + + * Display empty when delete product line + * Default assigned to the task creator when completed + +commit 6e2614f1e9e5331fcb3dcd8fcb0862c3be63c607 +Merge: 38ca1a2c42 9587e0bffc +Author: wumo +Date: Wed Mar 14 15:24:29 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 9587e0bffc961b7c478583a0083a740e4f1b7bcc +Merge: 5744a32e0f beee7b6850 +Author: wangyidong +Date: Wed Mar 14 15:22:21 2018 +0800 + + Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 + +commit 5744a32e0f7458eca1a6ac1a2e337240d8f2fc16 +Author: wangyidong +Date: Wed Mar 14 15:21:41 2018 +0800 + + * finish task #3713. + +commit 38ca1a2c4239cfcc92d8f36dbda07d38453ef2d5 +Author: wumo +Date: Wed Mar 14 15:17:25 2018 +0800 + + * Show the address link of download + +commit beee7b68503151ede8ecfd5cd6d4aecb053352f5 +Author: wumo +Date: Wed Mar 14 14:02:11 2018 +0800 + + * Show empty when there is no task + +commit cdb834b36a0eb4e11f1ee8a30a32e59fb204a1d4 +Author: wumo +Date: Wed Mar 14 11:26:58 2018 +0800 + + * Display the module level completely + +commit 2bbd10daae8f613243f38442bb53d0ef8dde26eb +Merge: 479cf51461 40318ec8ad +Author: wumo +Date: Wed Mar 14 11:11:19 2018 +0800 + + Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 + +commit 479cf51461e2390ceb615ef85f526418aa50eca2 +Author: wumo +Date: Wed Mar 14 11:11:12 2018 +0800 + + Display the moduel level completely + +commit 40318ec8ada40d91c858c388ae44d86e3b7106fc +Author: wangyidong +Date: Wed Mar 14 10:56:16 2018 +0800 + + * finish task #3683. + +commit 0518e473a3b6cbc8d12d71aa4b5268485ba587fa +Author: wangyidong +Date: Wed Mar 14 10:03:32 2018 +0800 + + * finish task #3678. + +commit e5981e96435658f689da84c6506a0400d927e95d +Author: wangyidong +Date: Wed Mar 14 09:58:24 2018 +0800 + + * finish task #3680. + +commit 5e6d6aefe75fd465b6e2afecbefdf848fc9bbb5d +Author: wangyidong +Date: Tue Mar 13 17:34:20 2018 +0800 + + * finish task #3672. + +commit 17c161dc74575eed42c107791cd8d07e0e9eb256 +Author: wangyidong +Date: Tue Mar 13 17:14:02 2018 +0800 + + * finish task #3665. + +commit c8393b9e088f548b30b1f8137e7c440a5ffacdc7 +Author: wangyidong +Date: Tue Mar 13 16:40:07 2018 +0800 + + * finish task #3664. + +commit d35e51a15a99126aec1555c740a2098909aa3d50 +Author: wangyidong +Date: Tue Mar 13 12:26:20 2018 +0800 + + * merge new change. + +commit dde68dcf1bf63a1039377d382dc5c16716063571 +Author: wangyidong +Date: Tue Mar 13 11:51:38 2018 +0800 + + * change for create ext dir. + +commit 8d64b4c9eb5062303f42d76fa3806e740afb48c8 +Author: wangyidong +Date: Tue Mar 13 11:29:28 2018 +0800 + + * change for 9.8.1 version. + +commit 93a3bfe516da3adcc0603e29cae31bc4e37ef493 +Merge: eaa0265f74 bffd215f7d +Author: wangyidong +Date: Tue Mar 13 10:49:01 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit eaa0265f7498872cdc50957a87614346a58f7b46 +Author: wangyidong +Date: Tue Mar 13 10:48:14 2018 +0800 + + * adjust css for new ui. + +commit bffd215f7ddc500d8c6d59421d066b63989c06a6 +Merge: c31114116d ea04270362 +Author: liugang +Date: Mon Mar 12 18:23:31 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c31114116d57fca59108b81a4182ed345b8c6eab +Author: liugang +Date: Mon Mar 12 18:23:04 2018 +0800 + + * Move error of entry to entry's config. + +commit ea0427036219c0258935732b39c1e913da48cee4 +Author: wangyidong +Date: Wed Mar 7 14:31:26 2018 +0800 + + * adjust for block. + +commit ad797236c43b5bb009dde1d4f33dc254cc14628e +Author: wangyidong +Date: Tue Mar 6 13:59:40 2018 +0800 + + * change for zui css. + +commit 816e5d1ff9c595ab39b465c9b8604592d27b9143 +Author: wangyidong +Date: Mon Mar 5 09:57:32 2018 +0800 + + * adjust for ui. + +commit 1e633ae7ade5527a3f660424f56940ac9b5563a2 +Author: wangyidong +Date: Fri Mar 2 14:16:58 2018 +0800 + + * finish for todo edit page. + +commit 9f61fc5b17b734bdd1fea7e37d6f416ba1726168 +Merge: 003db1f422 83caed8f6a +Author: wangyidong +Date: Fri Mar 2 10:57:50 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 003db1f422f9a71f2c7454ec349295c5b291a6f2 +Author: wangyidong +Date: Fri Mar 2 10:57:26 2018 +0800 + + * change for todo batch create page. + +commit 2441218615ff407a99627bb78d4b328d363080f4 +Author: wangyidong +Date: Fri Mar 2 10:56:08 2018 +0800 + + * fix for get priv product. + +commit 973d0e258fe75f604987cb67bc59aaa9b3e2528c +Author: wangyidong +Date: Fri Mar 2 10:47:36 2018 +0800 + + * change for license. + +commit 83caed8f6a58e0d98b873f12c7c3a4526b8efdd3 +Merge: 79b6c559a8 f228dcf456 +Author: daitingting +Date: Thu Mar 1 17:47:31 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 79b6c559a8fb95e6ca3f3830212b58cb40b39a97 +Author: daitingting +Date: Thu Mar 1 17:47:21 2018 +0800 + + * Format codes. + +commit 2cde802376910e3d20375c5eafe754e793f8adf3 +Author: wangyidong +Date: Wed Feb 28 11:37:55 2018 +0800 + + * change for message header. + +commit f228dcf4565044bac8e11ca2e6abae5a22559881 +Author: wangyidong +Date: Wed Feb 28 10:54:46 2018 +0800 + + * fix bug for check unique module. + +commit e3fae8dffec6a80691701f09a11d91420c353c97 +Author: wangyidong +Date: Tue Feb 27 14:42:41 2018 +0800 + + * fix bug for ajax get story. + +commit 427fdff3240f846410b0d5a5e406ef582cd4063c +Author: wangyidong +Date: Sat Feb 24 17:31:43 2018 +0800 + + * update for new zui + +commit ea74787b8709e0d3e4b66ca4f3a8fd1c49593910 +Author: wangyidong +Date: Fri Feb 9 11:01:02 2018 +0800 + + * change todo to calendar. + +commit a2d2f4b924dcf12d3bd45d1d9c75f558f7767898 +Author: wangyidong +Date: Thu Feb 8 09:32:22 2018 +0800 + + * adjust lang. + +commit e1d2ee80df129540c361ab1c61995811ac6434ad +Author: wangyidong +Date: Thu Feb 8 09:11:03 2018 +0800 + + * change for upgrade 10.0.beta. + +commit 51ce938acc094982025c6ca9417bffb20aab7ca5 +Author: wangyidong +Date: Thu Feb 8 08:25:02 2018 +0800 + + * adjust code and fix bug. + +commit 6f2c3c1b93d43002f0c5c93d5af69cbd388cb2f1 +Author: wangyidong +Date: Wed Feb 7 14:19:57 2018 +0800 + + * change for 9.8.1 version. + +commit 3cde365b5c1b35fea89a80a17331b3b5a99c31fd +Author: wangyidong +Date: Wed Feb 7 13:50:41 2018 +0800 + + * fix bug. + +commit db1224f37a18d8134e387e0a920eb9b8eaf20dc5 +Merge: 1f4b2df38f 74adbfa8aa +Author: wangyidong +Date: Wed Feb 7 13:50:19 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1f4b2df38ff53c969db2a3cb42eae5f1dc4b73ef +Author: wangyidong +Date: Wed Feb 7 13:49:48 2018 +0800 + + * change for create todo in block. + +commit 74adbfa8aa4ad88a3048fdea91e7a1e981b65fb3 +Author: dajiao007 +Date: Wed Feb 7 13:43:17 2018 +0800 + + change demo user from 10->3 + +commit e3f60c4af330a6d50fea3b0a1986c9a5aadc009b +Merge: a623b9016b 57a21b160e +Author: wangyidong +Date: Tue Feb 6 10:43:05 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a623b9016b84c8acbffb8704f533283854dd474b +Author: wangyidong +Date: Tue Feb 6 10:42:51 2018 +0800 + + * change for upgrade. + +commit 57a21b160ec2352c163a291d8b5e2f28f79bc7fe +Author: dajiao007 +Date: Fri Feb 2 13:31:27 2018 +0800 + + Update productsummary.html.php + + change 2 column width of date + +commit 0b281d6ed32d46ec0603cd244f9652b74b230e94 +Author: wangyidong +Date: Thu Feb 1 16:12:16 2018 +0800 + + * adjust lang. + +commit c9ee62c89774a1fcadcf5cdf3c0e04455a9074b3 +Author: wangyidong +Date: Thu Feb 1 15:39:52 2018 +0800 + + * adjust for block view. + +commit 8e2dee9fb610b0da867a60847156f232a899b7a1 +Author: wangyidong +Date: Thu Feb 1 14:23:19 2018 +0800 + + * adjust for case block. + +commit ed2ecf6fd6f75af06527f5274cd22f416a7bd357 +Author: wangyidong +Date: Wed Jan 31 16:31:41 2018 +0800 + + * adjust for todo block. + +commit 30bc8d77095a16e6b15f262631911bb7fdad0017 +Author: wangyidong +Date: Wed Jan 31 15:16:29 2018 +0800 + + * adjust for task #3592. + +commit 120e83a593252a59d62283b721ca0e30f92417c9 +Author: wangyidong +Date: Wed Jan 31 13:08:44 2018 +0800 + + * finish task #3606. + +commit dff29fb2afd32c4bf2b1e6ccb36e1536dca2f52b +Author: wangyidong +Date: Wed Jan 31 09:41:53 2018 +0800 + + * finish task #3600,3598. + +commit 894fd6310f425e1198a30883722f8deb61d71f0a +Author: wangyidong +Date: Wed Jan 31 08:16:20 2018 +0800 + + * fix bug. + +commit 95db27aa7b4807a12f36788b7a2492e06ba40abb +Author: wangyidong +Date: Tue Jan 30 09:57:56 2018 +0800 + + * adjust for check custom pri. + +commit b557f3896deef96e7ee516b5d1dcac8798108c05 +Author: wangyidong +Date: Mon Jan 29 15:07:26 2018 +0800 + + * adjust for action and header. + +commit 4e53c6ef1449f9b6d52452456c23a389382821aa +Author: wangyidong +Date: Mon Jan 29 14:08:42 2018 +0800 + + * adjust for block and change for todo block. + +commit e2dc1c80d9ee9d598d9d7ec34f3e1b5bdea86a6a +Author: wangyidong +Date: Fri Jan 26 15:38:28 2018 +0800 + + * add title for company name. + +commit eb11984ef8e7e45fd2333e97b346d75fc7f74ec8 +Author: wangyidong +Date: Fri Jan 26 15:11:14 2018 +0800 + + * code for new style. + +commit f90925b51e4c48abbe5ccf0d5275c4675ec04ded +Author: wangyidong +Date: Fri Jan 26 13:07:48 2018 +0800 + + * change for add ext for package. + +commit 8bb8e25fb3df5617d156172349c7be60b11e8ea3 +Merge: b4ecfb6c69 b241e07d78 +Author: wangyidong +Date: Fri Jan 26 10:51:58 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b4ecfb6c697f9d13f77214d0e370eb7e6f47abae +Author: wangyidong +Date: Fri Jan 26 10:51:32 2018 +0800 + + * change for welcome block. + +commit b241e07d7853397c4fe4cd29b260c046f38b4a74 +Author: dajiao007 +Date: Fri Jan 26 09:54:45 2018 +0800 + + change translation of adding user + +commit 5d23ea8e88553fe0228504d838f1b328e1f970b2 +Author: wangyidong +Date: Fri Jan 26 09:37:00 2018 +0800 + + * change for task #3602. + +commit baa2e063ea023375d7820895a6e7a30e9a9acc25 +Author: wangyidong +Date: Thu Jan 25 15:12:12 2018 +0800 + + * adjust for edit story. + +commit 6a85480785687bcbd354517e3a7289cadbcf1c36 +Author: wangyidong +Date: Thu Jan 25 14:22:57 2018 +0800 + + * adjust for block. + +commit 03c3226ca4ac69d63ea9e3f556a1b93b080652ea +Author: wangyidong +Date: Thu Jan 25 10:52:03 2018 +0800 + + * finish task #3604. + +commit b668217ba23c6ec88dfd1ea198b00f901bb00c78 +Author: wangyidong +Date: Wed Jan 24 17:05:40 2018 +0800 + + * change for flowchart. + +commit f6be2bb180fdf7f26522936bb42811ffffccabf4 +Author: wangyidong +Date: Wed Jan 24 16:11:11 2018 +0800 + + * finish task #3608. + +commit a2c4e7f594e0eb4a400f9d1d6189ebd848e50925 +Author: wangyidong +Date: Wed Jan 24 15:35:37 2018 +0800 + + * finish task #3613. + +commit 0dd8eb6f0593943f63777e4f8a8b12f4baf28f2c +Author: wangyidong +Date: Wed Jan 24 09:53:47 2018 +0800 + + * adjust for ux. + +commit 11014675d26df6396c36cf1f3886fe06cd23c997 +Author: wangyidong +Date: Mon Jan 22 13:14:08 2018 +0800 + + * fix for doc view page and adjust index.php for check upgrade. + +commit 911e27077509a8ef3ccc3a2ebde9badb928e9ef9 +Merge: c05073c2f9 50aaf9cce0 +Author: wangyidong +Date: Fri Jan 19 18:00:56 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c05073c2f9915bdc3fc9d83485f5df74bc81f311 +Author: wangyidong +Date: Fri Jan 19 18:00:26 2018 +0800 + + * fix bug. + +commit 50aaf9cce0dbbaf3de67de6b4d0382d0619b9bdc +Author: dajiao007 +Date: Thu Jan 18 14:10:19 2018 +0800 + + recover 'hide' into statement + +commit 3a325feef8d290f93a8edacd95aa31d39279272b +Author: dajiao007 +Date: Thu Jan 18 13:50:04 2018 +0800 + + change translation of install pages + +commit 341a9ce7214993dedaf7a0ddf3b10b181251da91 (tag: zentaopms_9.8_20180118) +Author: wwccss +Date: Thu Jan 18 12:17:47 2018 +0800 + + * Remove English part from it. + +commit 474da336c18a6374f1128e31bfbbaa237372631c +Author: wwccss +Date: Thu Jan 18 12:11:59 2018 +0800 + + * adjust Install module. + +commit 74da1e424ffea2d5ef4bda4b367bab2afe126013 +Author: wwccss +Date: Thu Jan 18 12:06:23 2018 +0800 + + * Split into License.EN and LICENSE.CN + +commit 8509e89b2bef868ff0099dbb692fe1ec5881aeeb +Author: dajiao007 +Date: Thu Jan 18 11:34:11 2018 +0800 + + delete comma + +commit 3ef04af11bde9069e39686c790f522e028de20db +Author: wangyidong +Date: Thu Jan 18 11:16:57 2018 +0800 + + * adjust for productplan view. + +commit 95ce4d6f70017673a0f260c95911457a87a1f27c +Author: wangyidong +Date: Thu Jan 18 10:16:46 2018 +0800 + + * change for demo. + +commit 18b6e57e84c55ded2aa0b5f6c34e428e2e2e5728 +Author: dajiao007 +Date: Wed Jan 17 16:09:19 2018 +0800 + + modify translations of 'unconfirmed bug' + +commit 3b5411654463bfd550ea01dd2661cdc0b15d9d1b +Merge: 2a8146f6fb a9dde0e3b4 +Author: dajiao007 +Date: Wed Jan 17 16:02:39 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2a8146f6fb86a36022c497960bb9fdf34d32aa77 +Author: dajiao007 +Date: Wed Jan 17 16:01:59 2018 +0800 + + modify translations of admin module + +commit a9dde0e3b43aab8621b84054e3bc2f4cec51f4e3 +Author: 滔哥 +Date: Wed Jan 17 13:50:06 2018 +0800 + + * Format code. + +commit 577e5fbbbdd3dedb90391a4df2f08b60cc9e31a3 +Author: wangyidong +Date: Wed Jan 17 13:19:19 2018 +0800 + + * fix for group case. + +commit acce6ed11a0c78e6c2fe71731cb1f760909b4fbb +Merge: 1d47fe7379 577ee3b376 +Author: wangyidong +Date: Wed Jan 17 13:03:54 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1d47fe73792b9f77236c4a5d8e8d129c7d1f9381 +Author: wangyidong +Date: Wed Jan 17 13:03:26 2018 +0800 + + * fix for changelog. + +commit 577ee3b376112b02661b412e4804fc405c9d6f6b +Merge: a57e30ced7 2ba5e585dc +Author: 滔哥 +Date: Wed Jan 17 12:24:03 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a57e30ced710347ded01dcad37b6fba8f4086428 +Author: 滔哥 +Date: Wed Jan 17 12:23:58 2018 +0800 + + * Fix bug. + +commit 2ba5e585dcd4cd0b0f7d2b2eed59bf7ee12229b9 +Merge: 4e8b9f23d4 402975b444 +Author: wangyidong +Date: Wed Jan 17 11:11:37 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4e8b9f23d446441ce8e1d864c2a123f332a198bc +Author: wangyidong +Date: Wed Jan 17 11:10:58 2018 +0800 + + * change for misc changelog. + +commit 402975b444d94cb40460fff6d84a5364d87463f3 +Author: 滔哥 +Date: Wed Jan 17 11:07:13 2018 +0800 + + * Fix bug#1368. + +commit 9aa48ff9f3dc4ceb8a4f5b6a8c77728be825403a +Author: wangyidong +Date: Wed Jan 17 10:58:03 2018 +0800 + + * add for changelog. + +commit a4d4683a93223c52ea62f4ac06ad633e856cd47d +Author: wangyidong +Date: Wed Jan 17 10:43:13 2018 +0800 + + * fix bug #1347. + +commit e072f2e95c12c26be902449a5c9f7db4498b5901 +Merge: e3317e2317 8f30956519 +Author: wangyidong +Date: Wed Jan 17 10:10:36 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e3317e23178adaf58b9b7c08f989c3ec70f1a99c +Author: wangyidong +Date: Wed Jan 17 10:10:02 2018 +0800 + + * fix bug #1377. + +commit 8f30956519fe28d07503e8ddf5bb0462a6079b7e +Author: 滔哥 +Date: Wed Jan 17 09:16:25 2018 +0800 + + * Fix bug. + +commit 660ac1f62be27508e6940aae034eab3f554a6cfc +Author: 滔哥 +Date: Tue Jan 16 21:30:31 2018 +0800 + + * Format code. + +commit 08e2522c1aa45cedd2352e6b22820d34b335a4bc +Author: 滔哥 +Date: Tue Jan 16 21:27:42 2018 +0800 + + * Format code. + +commit 4848bf57625fecbff957139245888c675114a451 +Merge: 406d80e7cf fb5796b4c8 +Author: 滔哥 +Date: Tue Jan 16 21:24:25 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 406d80e7cf68a51386f1e34abfcf164ad3da9077 +Author: 滔哥 +Date: Tue Jan 16 21:24:21 2018 +0800 + + * Fix bug. + +commit fb5796b4c8a9fdacfa6d933a98cc612c7871d264 +Author: wangyidong +Date: Tue Jan 16 17:18:54 2018 +0800 + + * adjust for message notice. + +commit 33f16c1eade9d596c8e3c62393e715f5b9210082 +Merge: d0b19ffb50 68f13738ea +Author: 滔哥 +Date: Tue Jan 16 17:03:27 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d0b19ffb50b94f775b30448313f07ed415f4a2f9 +Author: 滔哥 +Date: Tue Jan 16 17:03:24 2018 +0800 + + * Fix bug. + +commit 68f13738ea2549366c411dad77f77e368a5594bf +Author: wangyidong +Date: Tue Jan 16 16:36:18 2018 +0800 + + * fix bug #1385. + +commit 2c545e7ef19be5359d608ec8d385f29ebabeb5d7 +Author: wangyidong +Date: Tue Jan 16 16:28:19 2018 +0800 + + * fix bug #1382. + +commit e92a36c94764c56516defc30386f5cf01047721a +Author: wangyidong +Date: Tue Jan 16 16:01:43 2018 +0800 + + * fix bug #1363. + +commit 1a593e062f9d0ba883098f138734482376c4253d +Author: wangyidong +Date: Tue Jan 16 15:13:32 2018 +0800 + + * adjust for story report page. + +commit 4ca6479a21f0d2f4071f9244ccde4dacc86c4593 +Merge: 9af7afb162 d7a829325c +Author: wangyidong +Date: Tue Jan 16 15:08:42 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9af7afb162897f7a3113fee0bd852d6e3598e633 +Author: wangyidong +Date: Tue Jan 16 15:08:09 2018 +0800 + + * adjust for send notice to self. + +commit d7a829325c909e49c60110f2bf623bb49a4ea561 +Author: 滔哥 +Date: Tue Jan 16 14:59:22 2018 +0800 + + * Fix Bug. + +commit e83360f474c7e20004e1f37c6e3a04a64864f406 +Author: wangyidong +Date: Tue Jan 16 14:52:57 2018 +0800 + + * adjust for print assigntome block. + +commit 037213761d101cd5e697c2a46f45669d46dc42d2 +Author: wangyidong +Date: Tue Jan 16 14:26:38 2018 +0800 + + * adjust for print assigntome block. + +commit 277dc2c2ec7bed922029c7f750ff19c0232b7fe7 +Author: wangyidong +Date: Tue Jan 16 14:06:16 2018 +0800 + + * change for upgrade. + +commit ecf24ad52ac26c607ff115a4b2fa1bad4e51c886 +Author: 滔哥 +Date: Tue Jan 16 11:39:03 2018 +0800 + + * Fix bug#1378. + +commit 9fc6cd34579926295d9e4df70f577b8a34d0ff07 +Author: 滔哥 +Date: Tue Jan 16 11:22:45 2018 +0800 + + * Fix bug#1371. + +commit f07d87e6160d79237b92d93d3f8212cc2ab3bdbd +Merge: 2d13064e7e 80ed7e727f +Author: 滔哥 +Date: Tue Jan 16 11:09:43 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2d13064e7e9c9cc5f8c8d6ad3729414ac7b9ce22 +Author: 滔哥 +Date: Tue Jan 16 11:09:39 2018 +0800 + + * Fix Bug#1388. + +commit 80ed7e727fcc5642b44186bc9203333288f80c4d +Author: wangyidong +Date: Tue Jan 16 10:47:33 2018 +0800 + + * fix bug. + +commit 1a00522c1350114aad18ad904f7302ff3b58ea48 +Author: 滔哥 +Date: Tue Jan 16 10:39:59 2018 +0800 + + * Fix Bug#1388. + +commit 99ca9c0fe765e226d25b2ac43a1c012ab0f60b82 +Merge: 64f7ac5c32 e55e97d7ff +Author: wangyidong +Date: Tue Jan 16 10:29:02 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 64f7ac5c3218899626cb65f84209b53010b5cea7 +Merge: 5dddac711b 691df86cce +Author: wangyidong +Date: Tue Jan 16 10:28:48 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e55e97d7ffb155cf63fd31d1795f1829949d945d +Author: 滔哥 +Date: Tue Jan 16 10:28:39 2018 +0800 + + * Fix Bug#1373,1374. + +commit 5dddac711bfaf72ec62c51fdc34e89bbca75c87d +Author: wangyidong +Date: Tue Jan 16 10:25:51 2018 +0800 + + * adjus for todo to story and bug. + +commit 691df86cce87786237f2e2345af00b85c122d982 +Author: 滔哥 +Date: Mon Jan 15 17:26:26 2018 +0800 + + * Finish Task#3557 + +commit 04247cf054c66471ac17223c3d23fae3a55aa27a +Merge: d33804ab3d 954d89fb0d +Author: 滔哥 +Date: Mon Jan 15 15:47:10 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d33804ab3deae26201dc9ca363bff99a56038e80 +Author: 滔哥 +Date: Mon Jan 15 15:47:06 2018 +0800 + + * Fix bug. + +commit 954d89fb0de2bfe533b6f8c7149bca98943ad55b +Author: dajiao007 +Date: Mon Jan 15 15:20:30 2018 +0800 + + translate version log + +commit 37d89ec2be34221c2df1411374117aaf114b369a +Merge: 53ed09473e d49cc7d23f +Author: 滔哥 +Date: Mon Jan 15 14:58:16 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 53ed09473eea589b5b6f2ed39f5d91ec6ff4b869 +Author: 滔哥 +Date: Mon Jan 15 14:58:11 2018 +0800 + + * Fix Bug#1386 + +commit d49cc7d23ff083a0530022de968642367b6d4fa5 +Author: wangyidong +Date: Mon Jan 15 14:12:00 2018 +0800 + + * finish task #3559. + +commit f8dff350aef50d970e086a7b484fec2977a82e6a +Merge: be5f8e7876 bb156560a9 +Author: wangyidong +Date: Mon Jan 15 11:28:22 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit be5f8e78763ad3c75a4af6d60f3479f4ec77970c +Author: wangyidong +Date: Mon Jan 15 11:28:00 2018 +0800 + + * finish task #3569. + +commit bb156560a9e548cdee9b46bdcbeda5185e77150f +Author: 滔哥 +Date: Mon Jan 15 11:26:52 2018 +0800 + + * Fix Bug#1343. + +commit dc9de38e465ed08cc77041e1d978957212742704 +Merge: b387a55a3d 5b006d142e +Author: wangyidong +Date: Mon Jan 15 09:39:19 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b387a55a3da7d240f9889ce09397102314c8c6c1 +Author: wangyidong +Date: Mon Jan 15 09:38:46 2018 +0800 + + * finish task #3572. + +commit 5b006d142e17c602e9bbb7d8d10242a5efbfb089 +Author: 滔哥 +Date: Sun Jan 14 14:14:57 2018 +0800 + + * Format code. + +commit 9eb56ee5ff08d92d020266213681794efa14af80 +Author: 滔哥 +Date: Sun Jan 14 14:13:40 2018 +0800 + + * Finish Task#3567. + +commit e2c1f72b71896c25f5b7f49dc4c1b73d9a23dc6d +Author: dajiao007 +Date: Fri Jan 12 18:06:57 2018 +0800 + + add space to english + +commit 4f2b90c365aa6057442a0fae0e5d7b03b1afb304 +Merge: 7fed01e467 e50e06350f +Author: 滔哥 +Date: Fri Jan 12 15:36:19 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7fed01e4671c3f2a2b9d41780d2013b86f9d4197 +Author: 滔哥 +Date: Fri Jan 12 15:36:12 2018 +0800 + + * Finish Task#3575. + +commit 4a174dee69822751da2e1898bfbe561f94d059d1 +Author: 滔哥 +Date: Fri Jan 12 11:07:45 2018 +0800 + + * Format code. + +commit e50e06350f0c667135aa08fe75446cd4f3c979b4 +Author: dajiao007 +Date: Fri Jan 12 10:56:25 2018 +0800 + + adjust columns width' + +commit a019781473f4ab56fc6d76b2d811d7dc6045d45b +Merge: dd0d97a437 1a13bff2c0 +Author: 滔哥 +Date: Fri Jan 12 10:38:21 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dd0d97a437b5a16e46f2e58bf92598c894eed5cf +Author: 滔哥 +Date: Fri Jan 12 10:38:11 2018 +0800 + + * Finish Task#3587. + +commit 1a13bff2c0cbf52de98842f3eb8098edee408a3e +Merge: b4446d53fc 1c828004b1 +Author: wangyidong +Date: Fri Jan 12 10:02:36 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b4446d53fc6c1058f076c8025d560ae02326d30c +Author: wangyidong +Date: Fri Jan 12 10:02:00 2018 +0800 + + * finish task #3568. + +commit 1c828004b13277d04131e452179d347f377405cf +Author: 滔哥 +Date: Fri Jan 12 09:30:19 2018 +0800 + + * Format code. + +commit 0a5264547c25b63a995c6aba6a47b9b75c3daeb2 +Author: 滔哥 +Date: Thu Jan 11 23:13:27 2018 +0800 + + * Finish Task#3586. + +commit a63770647a3f3eae453ff08d8398f6e8b8a5d010 +Author: 滔哥 +Date: Thu Jan 11 21:58:37 2018 +0800 + + * Fix sql. + +commit ab94cbca9760a372833783b44637a7792ec46c8f +Merge: 736c265302 e75acb4b95 +Author: 滔哥 +Date: Thu Jan 11 21:56:49 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 736c265302a657ea77ac27f9ab3ce9d1bc3c5917 +Author: 滔哥 +Date: Thu Jan 11 21:53:28 2018 +0800 + + * Task#3586. + +commit e75acb4b95df64375e714ffcc99e7fdb32c78d92 +Merge: 4cc371b757 87807110d5 +Author: wangyidong +Date: Thu Jan 11 16:59:50 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4cc371b7575257b922812a7f699b6c50959a2e9a +Author: wangyidong +Date: Thu Jan 11 16:59:27 2018 +0800 + + * finish task #3583. + +commit 87807110d59184c20611ab464e7ea61930aeaaea +Author: dajiao007 +Date: Thu Jan 11 16:46:08 2018 +0800 + + modify tranlate and adjust column width + +commit 0d77963c0adad7ea6c41fb5250880cb352cdc1d7 +Merge: bd1ea46a9c 9dc01a4ba2 +Author: wangyidong +Date: Thu Jan 11 11:07:37 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bd1ea46a9c631d3a34f18d2e6158b82f4cc23c08 +Author: wangyidong +Date: Thu Jan 11 11:05:50 2018 +0800 + + * finish task #3560. + +commit 9dc01a4ba2122a951f4562038ee5e9aa8008ea98 +Author: 滔哥 +Date: Thu Jan 11 09:41:49 2018 +0800 + + * Format code. + +commit 884d9a85ed7ab3e050937e903bcfc58f03c84982 +Author: 滔哥 +Date: Thu Jan 11 09:35:18 2018 +0800 + + * Format code. + +commit ed33a84ed284350c2d497a377188be521516a640 +Merge: 1177206405 fa00dc9d9c +Author: 滔哥 +Date: Thu Jan 11 09:30:48 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fa00dc9d9cc367b06edf0aad5b16f18bd58e164a +Author: dajiao007 +Date: Wed Jan 10 19:39:51 2018 +0800 + + modify the translate + +commit 1177206405064cb1f52e64e750b1081e5b8d1c55 +Author: 滔哥 +Date: Wed Jan 10 17:29:30 2018 +0800 + + * Finish Task#3551. + +commit 1e12da117ffb82e6a889a1e021aec41eb91ea7e4 +Author: 滔哥 +Date: Wed Jan 10 16:43:17 2018 +0800 + + * Finish Task#3576. + +commit 13458b1b38c2a73c492eac797e54e58a50513d3d +Author: 滔哥 +Date: Wed Jan 10 11:25:08 2018 +0800 + + * Task#3576 + +commit a5e2e4a6e63e26fc58c8153b42a20e84b56da0b8 +Author: 滔哥 +Date: Wed Jan 10 09:51:56 2018 +0800 + + * Fix bug. + +commit 561fd66584404d2ca655fb502cf335c69e854f6e +Merge: 70f18180d2 6301f40a61 +Author: 滔哥 +Date: Wed Jan 10 08:35:02 2018 +0800 + + marage sql. + +commit 70f18180d288ce63455ea3746bdf468081a3d5b6 +Author: 滔哥 +Date: Wed Jan 10 08:33:18 2018 +0800 + + * Task#3576 + +commit 6301f40a613f9eaf4f05ddd5cb69c7a07a5a4825 +Merge: b10b13b4b8 5b2d718c7c +Author: wangyidong +Date: Mon Jan 8 15:51:49 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b10b13b4b86370438741bcea35c939ef748ebe0f +Author: wangyidong +Date: Mon Jan 8 15:50:53 2018 +0800 + + * finish task #3562. + +commit 5b2d718c7c0c7150c1f62659360bec2d03d6d665 +Merge: 1eee375a7f cf8b8902b4 +Author: 滔哥 +Date: Fri Jan 5 11:08:09 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1eee375a7f160055d0c15822453eeb1a6fa07131 +Author: 滔哥 +Date: Fri Jan 5 11:08:00 2018 +0800 + + * Finish task#3551 + +commit cf8b8902b48df007c074f04b3b31386d3fbe181d +Author: wangyidong +Date: Fri Jan 5 09:15:59 2018 +0800 + + * code for task #3579. + +commit 607076205e5d1c8f4373cfda37c2ae0cc4472d81 +Author: wangyidong +Date: Thu Jan 4 17:28:51 2018 +0800 + + * finish task #3579. + +commit e35451994cbe418da53cc909321e22db4050726b +Author: wangyidong +Date: Thu Jan 4 14:18:49 2018 +0800 + + * finish task #3582. + +commit ae2cd0e4a0e35ce3fe19b8e90686baabfccfea15 +Merge: 8a9ad3f23a bfa06024b6 +Author: wangyidong +Date: Thu Jan 4 14:12:26 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8a9ad3f23a276c6a54bf77be06b7f2e6eaaaa7ab +Author: wangyidong +Date: Thu Jan 4 14:12:02 2018 +0800 + + * finish task #3584. + +commit bfa06024b64610d58eaffb403e45f14f947b1192 +Author: Renee +Date: Thu Jan 4 11:18:47 2018 +0800 + + Update README.md + + Sync with manual + +commit b5f462607c5afbd746bff52073b7c569ba6917aa +Merge: 783c5acfa3 a92a0bdb29 +Author: wangyidong +Date: Thu Jan 4 09:47:01 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 783c5acfa39e755d68499bf4bfe637cc8629e5da +Author: wangyidong +Date: Thu Jan 4 09:46:30 2018 +0800 + + * finish task #3570. + +commit a92a0bdb29c9dd3876c43889872b358dd2e7e56d +Author: 滔哥 +Date: Wed Jan 3 22:06:04 2018 +0800 + + * Finish task#3553 + +commit 204639fd2b9c40bf868a07b455983b78004a781f +Merge: 88653f881f 9f7b5146e8 +Author: 滔哥 +Date: Wed Jan 3 21:14:11 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 88653f881fa56c2a1e770d7cbaf6c167e77bff60 +Author: 滔哥 +Date: Wed Jan 3 21:14:05 2018 +0800 + + * Finish task#3574 + +commit 9f7b5146e8bcae894a22b1635afd6c5a218eb996 +Merge: fad9e34e8d 86a3b53329 +Author: wangyidong +Date: Wed Jan 3 16:40:44 2018 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fad9e34e8d188f144c1be1876046cc1b143951b7 +Author: wangyidong +Date: Wed Jan 3 16:40:27 2018 +0800 + + * finish task #3585. + +commit 86a3b53329772f7733789b79595b5b01e70e4f5e +Author: 滔哥 +Date: Tue Jan 2 17:21:42 2018 +0800 + + * Fix bug. + +commit 8c776b66075d465adecd04589a29342637497957 +Author: 滔哥 +Date: Tue Jan 2 17:20:21 2018 +0800 + + * Fix bug. + +commit f96395c6a6629d20e4eb7d1fb0173dfa4345c083 +Author: 滔哥 +Date: Tue Jan 2 10:07:45 2018 +0800 + + * Add db.php for .gitignore + +commit c2d928f58a5e3119156401bce71ad30743b89db0 +Merge: 0d5b43fb5c 0ec4afb68b +Author: 滔哥 +Date: Tue Jan 2 10:04:37 2018 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0ec4afb68b6f7308ef8baa176739f420c9de59e7 +Author: wangyidong +Date: Tue Jan 2 08:55:33 2018 +0800 + + * finish task #3558. + +commit 0d5b43fb5ccb27e112971784785a4952b4db511d +Author: 滔哥 +Date: Fri Dec 29 17:27:58 2017 +0800 + + * Task#3574 + +commit b36436dcf63e956e08ede39ab73287afb4dac164 +Merge: 9abd1d6cf3 345178901a +Author: wangyidong +Date: Fri Dec 29 17:01:57 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9abd1d6cf3ffd23d0793caa3c80f9bc890439f40 +Author: wangyidong +Date: Fri Dec 29 17:01:35 2017 +0800 + + * finish task #3588. + +commit 345178901a7d2f086de515190825b7503d65caf5 +Author: 滔哥 +Date: Fri Dec 29 16:21:56 2017 +0800 + + * Finish Task#3552. + +commit 8f58d409850e152972b68f39fd65b3dc9e461622 +Merge: 71b62c922c 1e547a4bed +Author: 滔哥 +Date: Fri Dec 29 16:09:12 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 71b62c922c8948bda1af22aa80c12474fcbe9cad +Author: 滔哥 +Date: Fri Dec 29 16:09:04 2017 +0800 + + * Finish Task#3554. + +commit ba2439d26502bbd03ba2503487b14980735c74d0 +Author: 滔哥 +Date: Fri Dec 29 15:53:10 2017 +0800 + + * Finish Task#3566. + +commit 1e547a4bed99e32b8420ba4be79e2f3274c60554 +Merge: d71d582f3d 92601443c9 +Author: wangyidong +Date: Fri Dec 29 11:27:19 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d71d582f3d15275a49aca0f791cc972549871dad +Author: wangyidong +Date: Fri Dec 29 11:25:53 2017 +0800 + + * adjust code. + +commit 92601443c97b71e9196c2bb28c5d1b0b99e5570c +Author: 滔哥 +Date: Fri Dec 29 11:04:50 2017 +0800 + + * Finish Task#3565. + +commit d88201be75bf4342357ce0d54dc0e6a164bc3823 +Author: 滔哥 +Date: Fri Dec 29 09:26:05 2017 +0800 + + * Format code. + +commit b4a165b5738e5cc3c77d680a062f33bd50bcf216 +Author: 滔哥 +Date: Fri Dec 29 09:16:58 2017 +0800 + + * Add install sql for Task#3561 + +commit e5b312e326df526a29629a0b0d39119c85d3985f +Author: 滔哥 +Date: Fri Dec 29 09:11:19 2017 +0800 + + * Add upgrade for Task#3561 + +commit 92399590a27d82716d2d7c82ab6a6509ddab8177 +Merge: cbf08b828a a8a1d0c11c +Author: 滔哥 +Date: Thu Dec 28 18:03:53 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cbf08b828a0b37be332f16b280459f4ad4076520 +Author: 滔哥 +Date: Thu Dec 28 18:03:48 2017 +0800 + + * Task#3561 + +commit a8a1d0c11ccdc4ce310c0d5fe8f140909b782d49 +Author: wangyidong +Date: Thu Dec 28 10:16:44 2017 +0800 + + * fix bug for search in link story. + +commit ee5036c6326e5475200f959acb615b3c1bb7acde +Author: wangyidong +Date: Thu Dec 28 09:59:06 2017 +0800 + + * fix error with zget. + +commit f1e5a2c6dd91c91a20d6e5f82939ff44058c4c2a +Author: wangyidong +Date: Wed Dec 27 17:55:48 2017 +0800 + + * fix bug #1362. + +commit 0dad383f6799dc509408ed307e4572d9c0a284ba +Author: wangyidong +Date: Wed Dec 27 17:36:32 2017 +0800 + + * fix bug #1352. + +commit 9cf249835e8fcaed7c56d3db4b01fb307463e112 +Author: wangyidong +Date: Wed Dec 27 17:29:20 2017 +0800 + + * fix bug for custom story review. + +commit 706fc34c5a1a09cba38fc7b6f085babb0e23400e +Merge: 2bea6f457a f71a2edc9d +Author: wangyidong +Date: Wed Dec 27 16:22:28 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2bea6f457a48a78590d9287c40aacc58af1ca526 +Author: wangyidong +Date: Wed Dec 27 16:21:59 2017 +0800 + + * fix bug #1356. + +commit f71a2edc9d071f28e01400c7b795439975272505 +Author: 滔哥 +Date: Wed Dec 27 16:19:24 2017 +0800 + + * Fix bug. + +commit 807cd311a4a6f3590ad1f422d42837776bd9e6f4 +Author: 滔哥 +Date: Wed Dec 27 16:05:56 2017 +0800 + + * Fix bug for devel db. + +commit 89565cfbc61935991d2525eb5a7327d2216e4f18 +Author: 滔哥 +Date: Wed Dec 27 15:42:03 2017 +0800 + + * Format code. + +commit 1a456cada8c0075fde934419594c3d4418704f03 +Author: 滔哥 +Date: Wed Dec 27 15:05:14 2017 +0800 + + * Fix bug for EN. + +commit 3a59ee210ca2adf3c16772eacbc490c8725caadd +Author: 滔哥 +Date: Wed Dec 27 09:07:49 2017 +0800 + + * Fix bug for EN. + +commit 2450f3b4cd86ece0c186cef4b466ad181413ae49 +Author: 滔哥 +Date: Tue Dec 26 17:41:19 2017 +0800 + + * Format code. + +commit f453d2337f2a54faf1a85b2ed6fef58184a59797 +Merge: e585e048b9 d09eabbad8 +Author: 滔哥 +Date: Tue Dec 26 16:47:07 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e585e048b970598378c472c2d096f4500b67aa3a +Author: 滔哥 +Date: Tue Dec 26 16:46:59 2017 +0800 + + * Format code. + +commit d09eabbad812a056b830ead6a80c57a8e3ecfd5d +Author: wangyidong +Date: Tue Dec 26 16:40:18 2017 +0800 + + * fix bug and delete test code. + +commit dc8ee0995ec02161253afc0d4d5de909df46a5be +Author: 滔哥 +Date: Tue Dec 26 16:30:17 2017 +0800 + + * Fix bug. + +commit eee6b9d62fd251768e2a0246b775887590c2a29c +Author: 滔哥 +Date: Tue Dec 26 13:06:48 2017 +0800 + + * Rollback Bug#1344. + +commit 6e86db8ce4719bae89223b28f3e26b283d27d982 +Author: 滔哥 +Date: Mon Dec 25 17:05:43 2017 +0800 + + * Fix bug + +commit cc79cf52c9c7be6d7398dc2794b0898c2a029a09 +Author: 滔哥 +Date: Mon Dec 25 16:57:37 2017 +0800 + + * Fix bug#1326 + +commit 0c39022280555adf7e2b2286c6500942e7f72d42 +Author: 滔哥 +Date: Mon Dec 25 15:06:30 2017 +0800 + + * Fix bug#1126 + +commit 55fa326b889eb311260c3ab167c112fb40db28a2 +Author: 滔哥 +Date: Mon Dec 25 14:16:26 2017 +0800 + + * Format code. + +commit f038c37608584aad28b7c59cc39eebe898df714d +Author: wangyidong +Date: Mon Dec 25 10:12:21 2017 +0800 + + * fix bug for ajax custom in english. + +commit 9e06211e6685e0a7a8638c4b83c443df4c0cc375 +Author: wangyidong +Date: Fri Dec 22 16:21:11 2017 +0800 + + * adjust for install cron lang. + +commit e9419639d6e0fafa833b2032b321a228eebce4ca +Author: 滔哥 +Date: Fri Dec 22 14:23:55 2017 +0800 + + * Fix bug. + +commit 223e0612dcc9c229e023d1ffd22e8a2c5c9fcd12 +Merge: 994e0b56d7 2e83fc72f5 +Author: Catouse +Date: Fri Dec 22 13:29:07 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 994e0b56d71506b8ce199bc10ae28f1826448ef3 +Author: Catouse +Date: Fri Dec 22 13:28:56 2017 +0800 + + * fix js error. + +commit 2e83fc72f57570d526f6f0a695413c1ab1ea0e0d (tag: zentaopms_9.7_20171222) +Author: wangyidong +Date: Fri Dec 22 10:13:23 2017 +0800 + + * change for changelog. + +commit 1eeb0ca399acdf538f26ab655b2a6186b6cd6d7a +Author: wangyidong +Date: Fri Dec 22 10:08:54 2017 +0800 + + * change for zh-tw. + +commit 63635f871631ce2dac984a843951489d8da874a2 +Author: wangyidong +Date: Fri Dec 22 10:05:26 2017 +0800 + + * fix bug. + +commit c0847347bdd5f342a3f90068bd501b39ad5820cf +Author: 滔哥 +Date: Fri Dec 22 09:37:24 2017 +0800 + + * Fix task page bug. + +commit 67a0089814e437226a07d022bd298459c3cec2dc +Merge: 60ebe9fa2e 31fb6383b2 +Author: wangyidong +Date: Fri Dec 22 09:06:02 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 60ebe9fa2ea055ce98f67fd0f015bfdcc3dbcf38 +Author: wangyidong +Date: Fri Dec 22 09:05:34 2017 +0800 + + * fix for upgrade. + +commit 31fb6383b27f9c28673f7cb42cf2cd69aac8fab6 +Author: 滔哥 +Date: Thu Dec 21 16:06:13 2017 +0800 + + * Fix bug. + +commit bb7d362acfe01058bd137ab9ff6417b490a6f117 +Author: 滔哥 +Date: Thu Dec 21 15:41:01 2017 +0800 + + * Format code. + +commit 496e6fdca43aa65f662e057479a69a460f4b6492 +Author: 滔哥 +Date: Thu Dec 21 15:38:17 2017 +0800 + + * Fix bug. + +commit cc8bf62fe512fb345f2f396e92e20b8b2e5cc1d6 +Author: wangyidong +Date: Thu Dec 21 15:27:01 2017 +0800 + + * fix bug #1008. + +commit ee157b0e84114b250fba6adf57608d0d609aa108 +Author: wangyidong +Date: Thu Dec 21 15:18:16 2017 +0800 + + * fix bug #1342. + +commit c81d3a4ee71462afe566a72640e91b69b9638983 +Merge: c7d758b6f0 39765cdd13 +Author: wangyidong +Date: Thu Dec 21 14:51:28 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c7d758b6f0f079e37dae67f7497bc0bd78b71d48 +Author: wangyidong +Date: Thu Dec 21 14:50:49 2017 +0800 + + * fix bug #1337. + +commit 39765cdd131e2b6d83def2fa8f38d3476b53c503 +Author: 滔哥 +Date: Thu Dec 21 14:16:45 2017 +0800 + + * Fix bug. + +commit 7799d1ee427491d3987b43bb4df8d8c4fb568a0c +Author: 滔哥 +Date: Thu Dec 21 13:46:16 2017 +0800 + + * Fix bug. + +commit bc444c347da7ddaf8c8f1f7aafdaf4297457f1a3 +Merge: 04c33a382a 318c120538 +Author: 滔哥 +Date: Thu Dec 21 13:06:26 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 04c33a382aa7935688555aa33155b23551ad6ad5 +Author: 滔哥 +Date: Thu Dec 21 13:06:21 2017 +0800 + + * Fix bug + +commit 897686168d88dd7cbda830e7553e0300f05a649a +Author: 滔哥 +Date: Thu Dec 21 12:41:42 2017 +0800 + + * Fix bug + +commit 318c1205383050e1e2ae940b642feaaf60bf42aa +Merge: 9e628c464b f1467eba02 +Author: wangyidong +Date: Thu Dec 21 11:22:33 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9e628c464b281e3b6b008d9b2c2c6ffaada3226f +Author: wangyidong +Date: Thu Dec 21 11:22:10 2017 +0800 + + * fix bug for export with child. + +commit f1467eba0248005b515a10af77658cd90cc1e91d +Author: 滔哥 +Date: Thu Dec 21 09:27:39 2017 +0800 + + * Fix bug + +commit c6778fdd1711b5293435d82a8592f01444643193 +Author: wangyidong +Date: Wed Dec 20 17:04:55 2017 +0800 + + * adjust for doc showfiles page. + +commit afb023fca9ae91e5652f8a5db5e11969a02cb2a1 +Merge: a42b0008c9 2089850a63 +Author: wangyidong +Date: Wed Dec 20 16:47:01 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a42b0008c9e93592b927e11fc1db59833d7abc54 +Author: wangyidong +Date: Wed Dec 20 16:46:42 2017 +0800 + + * adjust for demo. + +commit 2089850a63c64a7fe3b71f433e6ff3f2aad9ae31 +Merge: 40a653554d 7df4d8febf +Author: Your Name +Date: Wed Dec 20 16:26:50 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 40a653554d0143b70cf110e3afcdc90ab1013a46 +Author: Your Name +Date: Wed Dec 20 16:25:25 2017 +0800 + + * Fix Bug #1245. + +commit 7df4d8febf5446e5eb3da3208dac3c1f90eccdb5 +Merge: 117096919d 6b3ed58d8b +Author: tengfei +Date: Wed Dec 20 16:13:58 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 117096919d10b79ef9624394cc765389e1d238da +Author: tengfei +Date: Wed Dec 20 16:13:43 2017 +0800 + + bug open on change + +commit 6b3ed58d8be5e123aec7e64048cb6fb77607cadd +Merge: b7ce9dc971 a2e3441a46 +Author: wangyidong +Date: Wed Dec 20 16:10:56 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b7ce9dc9718375a418f75be2dfc9ad91ccfefcb7 +Author: wangyidong +Date: Wed Dec 20 16:10:34 2017 +0800 + + * adjust for story field for custom. + +commit f0c123d2a813b502af2176d4bcd9910121821d56 +Author: wangyidong +Date: Wed Dec 20 15:42:48 2017 +0800 + + * change for show demo in login. + +commit 32d218b92ff49d06339596daa5da0aac12abb67a +Author: wangyidong +Date: Wed Dec 20 15:42:04 2017 +0800 + + * change for english demo. + +commit 5a915e733459114aee6e0df2f1603209055c4b00 +Author: wangyidong +Date: Wed Dec 20 15:41:01 2017 +0800 + + * adjust for bug printCell. + +commit a2e3441a4623cab0a0cf9465a99d095a6eb220b5 +Author: 滔哥 +Date: Wed Dec 20 14:42:58 2017 +0800 + + * Fix bug + +commit 515ba0a242e25a289555ea3226b26d0e0512f5c4 +Author: 滔哥 +Date: Wed Dec 20 14:16:25 2017 +0800 + + * Format code. + +commit 44be5a2d9281ed4615ab1bf730293db04ac0095c +Merge: a9c67a1030 94557d5de5 +Author: 滔哥 +Date: Wed Dec 20 14:01:12 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a9c67a103005cb11f38af73cf6c0ea8609d6e904 +Author: 滔哥 +Date: Wed Dec 20 14:01:05 2017 +0800 + + * Fix bug#1341 + +commit 94557d5de58e7d5ffced24639f1a1b0263f2b8c8 +Merge: a775af4846 a168e9a231 +Author: Catouse +Date: Wed Dec 20 11:30:12 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a775af4846641dd70a7dec20ec6c19eb868dafe5 +Author: Catouse +Date: Wed Dec 20 11:30:07 2017 +0800 + + * finish task #3371. + +commit a168e9a23110c85ee59312ff5798f753a4c52b5a +Merge: 674d840161 271b52a889 +Author: 滔哥 +Date: Wed Dec 20 11:21:58 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 674d84016178c9283b8913fe51381a5533ec5cea +Author: 滔哥 +Date: Wed Dec 20 11:21:53 2017 +0800 + + * Fix bug#1344 + +commit 271b52a8899465f9adc5c40f21b1dda5ff31c4f8 +Author: wangyidong +Date: Wed Dec 20 11:17:05 2017 +0800 + + * fix bug #1330. + +commit 5c8e01875b76922f39d1d2ad7eac8e36493d1bc2 +Author: 滔哥 +Date: Wed Dec 20 11:02:54 2017 +0800 + + * Fix bug#1349 + +commit 0c8e120075eefcc75c6a5465b57427a894214a19 +Author: 滔哥 +Date: Wed Dec 20 10:51:22 2017 +0800 + + * Fix bug#1348 + +commit f0bc9b43123434525f02e574570335949f6c132f +Merge: 7928df6cfa 292d447578 +Author: 滔哥 +Date: Wed Dec 20 10:45:30 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 292d447578a718d612942da3a152d336150102ff +Merge: 61d1e0ceec 3a951368ce +Author: wangyidong +Date: Wed Dec 20 10:45:11 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 61d1e0ceecf331f8fd6b60c19f7d460594748f0e +Author: wangyidong +Date: Wed Dec 20 10:44:49 2017 +0800 + + * fix bug for checked. + +commit 7928df6cfae32edc575be0cd0072bb6c5294fcaa +Author: 滔哥 +Date: Wed Dec 20 10:44:18 2017 +0800 + + * Fix bug for task export. + +commit 3a951368ceefab1a2e75c9bbee4c9740aa793e5c +Author: 滔哥 +Date: Wed Dec 20 10:24:33 2017 +0800 + + * Fix bug#1292 + +commit 23c4e386c1dad108262365765c01bad45cec53fe +Merge: 41d4f83c32 1829ecd6e7 +Author: 滔哥 +Date: Wed Dec 20 10:06:10 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1829ecd6e76d5929bbb56610fc9d295eaa2b659e +Merge: 247fc74ec9 f4e2a0db03 +Author: wangyidong +Date: Wed Dec 20 09:15:43 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 247fc74ec99ee82721bcfb0e2ce08aaade752b36 +Author: wangyidong +Date: Wed Dec 20 09:15:20 2017 +0800 + + * fix bug #1340. + +commit 41d4f83c32112947a38db8f9ba521a311b1590b0 +Author: 滔哥 +Date: Tue Dec 19 17:40:43 2017 +0800 + + * Fix bug#1341 + +commit f4e2a0db03cc64a04af2bddf191da4e7da72cfae +Merge: b8fa2165ab 6574cecec4 +Author: 滔哥 +Date: Tue Dec 19 17:37:04 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b8fa2165ab277d0ae5056b134bc7ceacc2eddac6 +Author: 滔哥 +Date: Tue Dec 19 17:36:59 2017 +0800 + + * Fix bug dev API. + +commit 6574cecec40c6ce2af62f8654519069d53628db9 +Merge: 5c7ff9a216 20e63398a3 +Author: wangyidong +Date: Tue Dec 19 17:21:43 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5c7ff9a216070659aae859d593650fe97db9285e +Author: wangyidong +Date: Tue Dec 19 17:21:19 2017 +0800 + + * fix bug #1283. + +commit 20e63398a3104c9dc59e4185c65b0aeac1c26205 +Author: 滔哥 +Date: Tue Dec 19 17:18:47 2017 +0800 + + * Fix bug#1335 + +commit 4830880ebea3fb2a292ddb0792f996ba434b1697 +Author: 滔哥 +Date: Tue Dec 19 17:02:38 2017 +0800 + + * Fix tips. + +commit 8cb3927ca5681c77cba64065d8803c372eb9ed24 +Author: 滔哥 +Date: Tue Dec 19 15:49:27 2017 +0800 + + * Fix Bug#1329 + +commit 0de914da5c4e117d41b0f659880b0b89c8ea2655 +Author: 滔哥 +Date: Tue Dec 19 15:33:48 2017 +0800 + + * Fix bug + +commit 9e2ce144368482dc4b3f3cce48207cdafd166b0c +Merge: 42e4aec31f bd0694658c +Author: 滔哥 +Date: Tue Dec 19 15:28:26 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 42e4aec31f27ff0a869f7e3d8824401c0e63d33e +Author: 滔哥 +Date: Tue Dec 19 15:01:10 2017 +0800 + + * Fix Bug + +commit f7080930b14c2d5e88198f31f60c7e3f9d1468db +Author: 滔哥 +Date: Tue Dec 19 14:19:33 2017 +0800 + + * Fix Bug#1328 + +commit bd0694658c547db41fa339bd6ee784f41561155d +Author: wangyidong +Date: Tue Dec 19 14:18:51 2017 +0800 + + * adjust for project story. + +commit a0b184498427a2d7e831640ca7723cd08f875037 +Merge: ab4f445f19 f157829c16 +Author: wangyidong +Date: Tue Dec 19 14:00:27 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ab4f445f190717ce8a31148bc5e15bb2a74bace6 +Author: wangyidong +Date: Tue Dec 19 14:00:08 2017 +0800 + + * finish task #3475. + +commit f157829c16aa15f9f201e3ccd6a881abe9b439a5 +Author: 滔哥 +Date: Tue Dec 19 13:54:40 2017 +0800 + + * Fix Bug#1326 + +commit 8765fc7f6a203daaaa64e1b2fc0db773362fe736 +Merge: 1e05a84212 ae57a9827f +Author: 滔哥 +Date: Tue Dec 19 10:28:26 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1e05a84212ecaf5b74cbd11a0638194f45bf8abc +Author: 滔哥 +Date: Tue Dec 19 10:28:20 2017 +0800 + + * Task#3467 + +commit ae57a9827fd117cb343cf83a93df651cab9675b4 +Merge: 39d39bc4d8 c4f8508e5a +Author: wangyidong +Date: Tue Dec 19 10:00:07 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 39d39bc4d890c7380bf4577ec4b16a060c8cb930 +Author: wangyidong +Date: Tue Dec 19 09:59:40 2017 +0800 + + * finish task #3444. + +commit c4f8508e5afae65b86e736563560036fe5b9ae67 +Author: 滔哥 +Date: Mon Dec 18 18:44:36 2017 +0800 + + * Task#3467 + +commit aeaaeb67d83c55f19db4bcbb80bfcef7a68b746d +Author: wangyidong +Date: Mon Dec 18 17:30:01 2017 +0800 + + * fix bug for cache. + +commit c5d8eec378bb675322dbb9ebfe25ac41af5d44f6 +Merge: 1060a606c6 9e88268d84 +Author: wangyidong +Date: Mon Dec 18 17:17:01 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1060a606c6659ade720cf0812d20a98ca9b47d79 +Author: wangyidong +Date: Mon Dec 18 17:16:34 2017 +0800 + + * finish task #3455. + +commit 9e88268d84646ea818c78512edb46f65a05d8d58 +Merge: 9c10a2a2f6 ca394008be +Author: 滔哥 +Date: Mon Dec 18 16:50:06 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9c10a2a2f6c8d25769d1abecaaa49bd54f3bd8e0 +Author: 滔哥 +Date: Mon Dec 18 16:49:23 2017 +0800 + + * Fix bug#1327 + +commit ca394008be72ae2d67762d8d57c2b280d47c908e +Merge: 09a94f7752 4e920d9133 +Author: tengfei +Date: Mon Dec 18 16:16:06 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 09a94f77526bfba0ea180169f67608cbc43094ec +Author: tengfei +Date: Mon Dec 18 16:15:49 2017 +0800 + + create change + +commit 2bc327efa06c88d1c78479e11ac4b55ce9e84a33 +Author: 滔哥 +Date: Mon Dec 18 15:05:55 2017 +0800 + + * Fix bug + +commit 4e920d913326469a9fd23c441cf9bcac6cba1fca +Merge: 44bc56562f 507a436704 +Author: wangyidong +Date: Mon Dec 18 14:36:54 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 44bc56562fd65e93b97c7e11fe5c4db4b14fb6a3 +Author: wangyidong +Date: Mon Dec 18 14:36:24 2017 +0800 + + * finish task #3395. + +commit 507a436704b5383cf5461bf164f0b41c6d2792de +Author: 滔哥 +Date: Mon Dec 18 13:57:20 2017 +0800 + + * Fix bug#1275 + +commit e6bcc3101c147d17b86031c0408477770a782c2a +Author: 滔哥 +Date: Mon Dec 18 13:43:52 2017 +0800 + + * Fix bug#1214 + +commit 096693ab2cd60ef61f21dd7dc00025cd353b8277 +Merge: 8a7a437960 5dab74c631 +Author: 滔哥 +Date: Mon Dec 18 11:00:55 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8a7a4379609d3b3a2f56f9d12c1b0273c820c683 +Author: 滔哥 +Date: Mon Dec 18 11:00:29 2017 +0800 + + * Task #3396 and Fix bug + +commit 5dab74c63154486c195add573083945c48fa82df +Author: wangyidong +Date: Mon Dec 18 10:34:34 2017 +0800 + + * finish task #3480. + +commit 020acf5f433928ab23771a2ac3c3c6745b707469 +Merge: a68fe9adcd 1de783bf74 +Author: wangyidong +Date: Mon Dec 18 10:02:39 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a68fe9adcd5178985491b0ae88a9817d345e408d +Author: wangyidong +Date: Mon Dec 18 10:01:08 2017 +0800 + + * finish task 3463. + +commit 1de783bf748989b73de3be91bc11a64d10939a8c +Author: 滔哥 +Date: Fri Dec 15 15:15:08 2017 +0800 + + * Fix bug + +commit 5d656b0a087db2d04989b937f95f3a39db6f4d39 +Author: 滔哥 +Date: Fri Dec 15 13:37:24 2017 +0800 + + * Task#3387 + +commit f840fab1b7a843e54ceeeb7c8e7485ec1cf28ee3 +Author: 滔哥 +Date: Fri Dec 15 11:11:05 2017 +0800 + + * Format code + +commit 9b238d008a805ff2713b5680883776ae27df7627 +Merge: fce5340d36 6cd9793d00 +Author: 滔哥 +Date: Fri Dec 15 11:06:07 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fce5340d368dec629e8f1c16c7d19257d3b401b8 +Author: 滔哥 +Date: Fri Dec 15 11:06:01 2017 +0800 + + * Task #3465 + +commit 6cd9793d0054623bd84efcfc7f6ba927e753a271 +Merge: 3ab22b4ac0 9cbb4909a4 +Author: wangyidong +Date: Fri Dec 15 10:36:29 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3ab22b4ac0163b354d445dbbac4a326cedd6094e +Author: wangyidong +Date: Fri Dec 15 10:35:49 2017 +0800 + + * finish task #3449. + +commit f35ef39f896dbe5de8341735c6c8d9242f80c25f +Author: wangyidong +Date: Fri Dec 15 10:09:42 2017 +0800 + + * finish task #3449. + +commit 9cbb4909a464a6369fc412b18072e0dff83ed71e +Merge: 073ff8fdb4 73fd2f0575 +Author: 滔哥 +Date: Thu Dec 14 18:28:11 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 073ff8fdb4c893a2279de58f5e05a713f8f6b3fd +Author: 滔哥 +Date: Thu Dec 14 18:27:26 2017 +0800 + + * Format code + +commit 73fd2f057504f19b56506df69e49dccb10a93de5 +Author: wangyidong +Date: Thu Dec 14 17:11:13 2017 +0800 + + * finish task #3457. + +commit 04c5c50ccea41d5ac3e0a84f6f4e329219ad0aeb +Author: wangyidong +Date: Thu Dec 14 17:00:28 2017 +0800 + + * fix bug. + +commit 5b6d0accd21d97ee9f1523e2d69765fa9c676fd9 +Merge: 5145126ad0 583d24be0e +Author: 滔哥 +Date: Thu Dec 14 16:54:09 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5145126ad0d7d34edcdbfd0ed17b771d87885f86 +Merge: 831183be84 e821b758c0 +Author: 滔哥 +Date: Thu Dec 14 16:53:59 2017 +0800 + + * Fix bug + +commit 583d24be0eacadb1f40f0cd6ebeb6cfd76e7ae21 +Author: wangyidong +Date: Thu Dec 14 16:36:16 2017 +0800 + + * finish for task #3443. + +commit 831183be84dfd5184038d271526b7e2a2ebc78e3 +Author: 滔哥 +Date: Thu Dec 14 15:32:37 2017 +0800 + + * Task#3456 + +commit e821b758c03696aa268dfa56d0cd63973b3a30ae +Merge: 11d80a5d93 4dc6fcb16d +Author: wangyidong +Date: Thu Dec 14 15:30:33 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 11d80a5d93d299ba21cd287d5f8f9862bb70ed8e +Author: wangyidong +Date: Thu Dec 14 15:29:09 2017 +0800 + + * finish task #3442. + +commit 24366d4e549296a99746a86c0ff21314d1a69df6 +Author: 滔哥 +Date: Thu Dec 14 15:12:05 2017 +0800 + + * Fix Bug + +commit 4dc6fcb16d69fe45914d7d3d60a0258894f03817 +Merge: fc70d4ffdb 7770bab6af +Author: wyd621 +Date: Thu Dec 14 14:56:27 2017 +0800 + + Merge pull request #17 from dajiao007/master + + * finish the task of 3423 + +commit 7770bab6afaa4788d76dd249e9ed2e41fa7191e5 +Author: dajiao007 +Date: Thu Dec 14 14:24:30 2017 +0800 + + * fix the story of 3423 + +commit fc70d4ffdb17e3016c898dd557ef1e347dc22b66 +Author: wangyidong +Date: Thu Dec 14 14:06:47 2017 +0800 + + * finish task #3491. + +commit a069ceb65496df52e0ed8797912128076a61b850 +Author: wangyidong +Date: Thu Dec 14 13:49:43 2017 +0800 + + * change for task #3435. + +commit 0f13899945a343741f2e4ded36454ed8737503f4 +Author: wangyidong +Date: Thu Dec 14 11:37:48 2017 +0800 + + * code for task #3427. + +commit 592413c431b438a1197688ded8d1570d7e879c3a +Merge: 5057abf5d8 b4517c9945 +Author: wangyidong +Date: Thu Dec 14 11:21:44 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b4517c994539cd275e168abed8248dbf97bce9e8 +Author: 滔哥 +Date: Thu Dec 14 11:17:15 2017 +0800 + + * Fix bug + +commit 5057abf5d8f020274ebc49ab9620c85996c99f83 +Author: wangyidong +Date: Thu Dec 14 11:16:03 2017 +0800 + + * finish task #3427. + +commit 4efc830f3175e1762aefa538b8602260a07f1fbb +Author: 滔哥 +Date: Thu Dec 14 10:34:28 2017 +0800 + + * Change tips. + +commit 9c7df9ce2e6286b09f8dadaab6479b38cd99daa7 +Merge: a259a31891 12a898ef96 +Author: 滔哥 +Date: Thu Dec 14 10:32:39 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a259a3189143be1011e0fc9684ecf487560ccd65 +Author: 滔哥 +Date: Thu Dec 14 10:32:29 2017 +0800 + + * Add tips for create user. + +commit 12a898ef9630d11b7082979ee371ddcad3f28d0c +Merge: b3515831b8 f21bfab1eb +Author: wangyidong +Date: Thu Dec 14 09:39:32 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b3515831b824a0a1073909c6fdc87af71b8ed3c9 +Author: wangyidong +Date: Thu Dec 14 09:38:39 2017 +0800 + + * finish task #3468. + +commit 2c896fbe8f6027d101e8120730aa14bfdac45d6a +Author: 滔哥 +Date: Thu Dec 14 09:36:39 2017 +0800 + + * Task #3456 Add SQL + +commit f21bfab1ebfa83a0da65bcce9fc04c6126300a16 +Author: 滔哥 +Date: Wed Dec 13 21:38:15 2017 +0800 + + * Task #3465 + +commit 3697775a1abfef81e7fd45ae6465968fae9a6fe9 +Author: 滔哥 +Date: Wed Dec 13 21:31:35 2017 +0800 + + * Format code + +commit 2f966a1d9db5b52e61c42a93020aa2e70b6fcb36 +Author: 滔哥 +Date: Wed Dec 13 21:29:58 2017 +0800 + + * Task #3465 + +commit f34e4c7ee3af6d1d7bb204778e293d0ddd6283aa +Author: 滔哥 +Date: Wed Dec 13 19:30:29 2017 +0800 + + * Task #3465 + +commit 7449b93402a7d743e06f17ae587a5cec835d13db +Author: 滔哥 +Date: Wed Dec 13 19:17:29 2017 +0800 + + * Task #3465 + +commit f289c99c984ff6fea76f287ec45c953c117ec597 +Author: 滔哥 +Date: Wed Dec 13 16:48:18 2017 +0800 + + * Task #3465 + +commit 3a15a8ed693ffcc0d767ffb8550a4652f17e2e2b +Merge: 0e5b6e52ce 5fc4f0dadb +Author: 滔哥 +Date: Wed Dec 13 16:41:43 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0e5b6e52ce5ac2366a4ae2ccafda97c85576bcc1 +Author: 滔哥 +Date: Wed Dec 13 16:41:38 2017 +0800 + + * Task #3448 + +commit 5fc4f0dadb26c058299098dcdf2cce88490deac0 +Author: wangyidong +Date: Wed Dec 13 16:06:00 2017 +0800 + + * finish task #3433. + +commit 221291c0f3142663653dac749eaafb898474e246 +Author: wangyidong +Date: Wed Dec 13 15:52:36 2017 +0800 + + * finish task #3429. + +commit 6006f3e93a5fe76f6ced9a20059fa390971f9ba3 +Author: wangyidong +Date: Wed Dec 13 14:22:09 2017 +0800 + + * finish task #3397. + +commit 526dad43d3a478df6212c7511e465af87a6e5f12 +Author: wangyidong +Date: Wed Dec 13 14:07:25 2017 +0800 + + * finish task #3394. + +commit 22f4518437df60985ce26d35fc49cba9208f52e5 +Author: wangyidong +Date: Wed Dec 13 13:38:46 2017 +0800 + + * finish task #3383. + +commit 391ac047d93a45a6f1111a957ff223476815b66b +Merge: 452ab148f0 b5b0bb53ce +Author: wangyidong +Date: Wed Dec 13 13:13:30 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 452ab148f00e7722f88c5d7edfab751ec54c07d2 +Author: wangyidong +Date: Wed Dec 13 13:11:20 2017 +0800 + + * remove test code. + +commit b5b0bb53ceb6284fc551091d3e0868eb887a9e80 +Merge: 3571212ee3 cfce20ea3b +Author: 滔哥 +Date: Wed Dec 13 12:06:59 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3571212ee34997828e2d61126bb08447b263fbeb +Author: 滔哥 +Date: Wed Dec 13 12:06:52 2017 +0800 + + * Format code + +commit cfce20ea3bc312729eeec3e83ebe13ac41d86f8b +Author: wangyidong +Date: Wed Dec 13 11:35:20 2017 +0800 + + * finish task #3375. + +commit 3eba5feb136d7aa2bd3b9bc8e5e6dcbc8f9f0182 +Author: wangyidong +Date: Wed Dec 13 11:33:55 2017 +0800 + + * code for task #3476. + +commit db3b3deafb675f4839ed37bbe7223d718e7e3ad1 +Author: wangyidong +Date: Wed Dec 13 11:12:21 2017 +0800 + + * code for task #3476. + +commit 0205849cc272df6809740635135ade9dfae7330a +Merge: c404eff816 8d3a733612 +Author: wangyidong +Date: Wed Dec 13 10:57:30 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c404eff816119cc70bf3619698a2e2f40f80eccb +Author: wangyidong +Date: Wed Dec 13 10:56:56 2017 +0800 + + * finish task #3476. + +commit dc817f3e541a26110fa0e881fbee856ec81d8309 +Merge: a2672a6c44 8d3a733612 +Author: 滔哥 +Date: Wed Dec 13 10:09:32 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8d3a7336120163ab09e9c4b8db898474b61a73a8 +Merge: 7dacfb2f78 9a904d2501 +Author: tengfei +Date: Wed Dec 13 09:54:23 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7dacfb2f78d8018753215ed4d06b4c87e02b0bde +Author: tengfei +Date: Wed Dec 13 09:54:06 2017 +0800 + + action-common + +commit a2672a6c446a02c8b295e144199c5ead47af04ef +Author: 滔哥 +Date: Tue Dec 12 17:42:42 2017 +0800 + + * Task #3446 + +commit 926340dcd4d101e7f4752ab16d672b770ab4056e +Merge: d7cec4597f 9a904d2501 +Author: 滔哥 +Date: Tue Dec 12 17:41:58 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d7cec4597fef793fe3288877b65f083780780c3d +Author: 滔哥 +Date: Tue Dec 12 16:52:20 2017 +0800 + + * Task #3456 add lang + +commit f877273082c7d6f602bfaa7f283987fcbbb510ec +Author: 滔哥 +Date: Tue Dec 12 16:51:57 2017 +0800 + + * Format code + +commit 9a904d2501c100289b43b0c4f74b6fe7e4163c16 +Merge: 4049379042 e923b6ab92 +Author: wangyidong +Date: Tue Dec 12 16:51:10 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4049379042e6e22b5ff4f6f63344bb46ccfe2030 +Author: wangyidong +Date: Tue Dec 12 16:50:38 2017 +0800 + + * fix for auto delete. + +commit e923b6ab928a9531bfd1f425fed79e8efa9208dd +Merge: df84a91b74 b8f5165d57 +Author: 滔哥 +Date: Tue Dec 12 15:30:59 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit df84a91b743327b950b2c697c97fb19b282efede +Author: 滔哥 +Date: Tue Dec 12 15:30:52 2017 +0800 + + * Task#3407 + +commit c09dbfa88b2b0b485be8caf7ed3099aceb76b2d7 +Author: 滔哥 +Date: Tue Dec 12 14:46:01 2017 +0800 + + * Task #3470 + +commit b8f5165d5786dc5a6db7948353943350f8249e5d +Author: tengfei +Date: Tue Dec 12 14:42:36 2017 +0800 + + report translation change + +commit d51a71ec88a7f92793324293c55db8480880448e +Author: 滔哥 +Date: Tue Dec 12 13:15:48 2017 +0800 + + * Format code + +commit fc235d0381a0fef3b8550acc0aaa5f60a4e01fd4 +Author: 滔哥 +Date: Tue Dec 12 10:52:11 2017 +0800 + + * Task #3440 + +commit 9efbce145c72377b3e6299170a354cb44e71cf80 +Author: 滔哥 +Date: Tue Dec 12 10:30:34 2017 +0800 + + * Task #3432 + +commit c31cd78f91c406e820598a086f8de99f2e564b9d +Author: 滔哥 +Date: Tue Dec 12 09:21:45 2017 +0800 + + * Fix style + +commit bf0e2e4bd5bb80a97838811fcdc3da3e55deb5e3 +Author: 滔哥 +Date: Mon Dec 11 18:44:08 2017 +0800 + + * Task#3459 + +commit f48be85a23408d9c4f72a5dd731e70d56e28930c +Author: 滔哥 +Date: Mon Dec 11 17:16:42 2017 +0800 + + * Task #3459 + +commit 100c8906c61114f487cb1f683834560e206eda5a +Author: 滔哥 +Date: Mon Dec 11 17:07:53 2017 +0800 + + * Fix batchedit ui + +commit daa6aedf77e282e551b83968d1711cc567da1d70 +Author: 滔哥 +Date: Mon Dec 11 17:04:15 2017 +0800 + + * Child task order + +commit 27c6eabab9e59b421a7065826637763de9827b7c +Author: 滔哥 +Date: Mon Dec 11 16:58:31 2017 +0800 + + * Format code + +commit 428613805359be4eae7372038e930d74eedbc93c +Author: 滔哥 +Date: Mon Dec 11 16:42:24 2017 +0800 + + * Format code + +commit a3968b556324febe043788937423c7adffedb450 +Author: 滔哥 +Date: Mon Dec 11 15:31:47 2017 +0800 + + * Fix EN logo + +commit 942e108139a28fad3807fadc1a399387c466ec3e +Merge: 6f6d4e3504 be9ac6b798 +Author: 滔哥 +Date: Mon Dec 11 15:06:20 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6f6d4e35040d723393a76be9d0ecf9eddc22b0f0 +Author: 滔哥 +Date: Mon Dec 11 15:04:44 2017 +0800 + + * Fix EN install logo + +commit be9ac6b7982e787b64a477e7d078831e300943e3 +Merge: 54afa9bce1 a411a04aad +Author: wangyidong +Date: Mon Dec 11 14:42:19 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 54afa9bce1d18e5ce72e4f77f580d1e486fd9931 +Author: wangyidong +Date: Mon Dec 11 14:37:00 2017 +0800 + + * fix bug. + +commit a411a04aad247f4914518856e4d39d8e25066e1f +Author: 滔哥 +Date: Mon Dec 11 14:10:03 2017 +0800 + + * Fix bug + +commit 7e6ac2c34a39e8348f3110667a15cf60157dc56c +Author: 滔哥 +Date: Mon Dec 11 14:03:55 2017 +0800 + + * Fix bug + +commit 71e60a0d5ec8fe25051bb60511c3fb4f29dbb71e +Author: 滔哥 +Date: Mon Dec 11 11:43:47 2017 +0800 + + * Task #3477 + +commit 56274294f3895cad4b98513fa6ebb6bcfc7ac1c6 +Author: 滔哥 +Date: Mon Dec 11 09:13:28 2017 +0800 + + * Fix lang + +commit 2c47eb12db6d50ac381b6a6f95712021c78bd23f +Author: 滔哥 +Date: Fri Dec 8 18:09:39 2017 +0800 + + * add Zsite logo + +commit e79145be1f6ab0cf21d0b8d2f047d4739c06e456 +Author: 滔哥 +Date: Fri Dec 8 18:06:13 2017 +0800 + + * Task #3545 + +commit 0f70d62399cec3b9cff9517c37bd00f46aa86631 +Author: 滔哥 +Date: Fri Dec 8 16:18:43 2017 +0800 + + * Task #3485 + +commit 8bc6e888e8ec430a0e9897a9433ac1c4f8f01184 +Author: 滔哥 +Date: Fri Dec 8 13:50:20 2017 +0800 + + * Task #3504 + +commit be669c524bf178fdd98230253f4914825d12c318 +Merge: 81ba2b914a c9bc66b4f9 +Author: tengfei +Date: Thu Dec 7 17:04:46 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 81ba2b914a3c87ced3e35679e89705768f33306e +Author: tengfei +Date: Thu Dec 7 17:04:31 2017 +0800 + + product info + +commit c9bc66b4f91eff97a1f8a2076d5c9b751462cc33 +Author: 滔哥 +Date: Thu Dec 7 16:43:02 2017 +0800 + + * Task#3494 + +commit 88bd2a9e9111b7c65dac76c3d23870d2540334a7 +Author: 滔哥 +Date: Thu Dec 7 16:37:45 2017 +0800 + + * Task#3437 + +commit 5ee2c261f6f178fac6a19b80277e4d586c2f02ff +Author: 滔哥 +Date: Thu Dec 7 16:16:35 2017 +0800 + + * Task#3436 + +commit 95c957e4bd90fa9a0e238873de335dba0d3e5d46 +Author: 滔哥 +Date: Thu Dec 7 15:27:37 2017 +0800 + + * Task#3483 + +commit 9953d5437ae9700dbbcbba92a3029f3715d21622 +Merge: cb7bde31c8 daf9075508 +Author: 滔哥 +Date: Thu Dec 7 14:38:50 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cb7bde31c8e1a819b02962361acf99ad1cd11b66 +Author: 滔哥 +Date: Thu Dec 7 14:38:41 2017 +0800 + + * Task#3496 + +commit e45eb3ab2aea1cf9147775a652f17603b3135a61 +Author: 滔哥 +Date: Thu Dec 7 14:26:57 2017 +0800 + + * Task#3500 + +commit e9bea327fff0af68cc069aa0648a659b92f817e4 +Author: 滔哥 +Date: Thu Dec 7 14:23:36 2017 +0800 + + * Task#3441 + +commit daf907550854d7d14339640099bc746828b40541 +Merge: fb48b45f0a 3eb02d09cb +Author: wangyidong +Date: Thu Dec 7 14:20:08 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fb48b45f0ad05e51c44a6503a999d9f960b451ad +Author: wangyidong +Date: Thu Dec 7 14:19:35 2017 +0800 + + * fix bug and code for batch edit user. + +commit a4e4761c8a46a28e2de86e2a4bb3ad9449fa2946 +Author: 滔哥 +Date: Thu Dec 7 14:13:24 2017 +0800 + + * Task#3450 + +commit 3eb02d09cb3ed8a8a2b8436ce1021031d77f498f +Author: 滔哥 +Date: Thu Dec 7 14:03:51 2017 +0800 + + * Task#3413 + +commit 35af295955d1c73ac9bb0f2a9aa4e16c2c8fa93d +Author: 滔哥 +Date: Thu Dec 7 13:59:00 2017 +0800 + + * Task#3409 + +commit da38db6ef5d00da31d9401ef76352c0987fda0a2 +Author: 滔哥 +Date: Thu Dec 7 13:55:01 2017 +0800 + + * Task#3503 + +commit f13e402bb060e4d60e80c6fdada2234a29601e02 +Author: 滔哥 +Date: Thu Dec 7 10:44:54 2017 +0800 + + * Add batch change stage for project story. + +commit 522f28dd39a6c6d8425974e8bf86de9414da6c6e +Merge: 8314d813cb 82188fd188 +Author: tengfei +Date: Wed Dec 6 17:47:50 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8314d813cbe4f77d55c780771efe873e1260b7b5 +Author: tengfei +Date: Wed Dec 6 17:47:31 2017 +0800 + + 12/6 trans error done + +commit 82188fd188a6b623e73a989754e665cda237ce70 +Merge: 4f22090677 5b1e544dff +Author: liugang +Date: Wed Dec 6 17:36:01 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4f2209067704523698997df0d5f1de32fee964c8 +Author: liugang +Date: Wed Dec 6 17:34:36 2017 +0800 + + * Load my.php at last. + +commit 5b1e544dff2f51418c9aed0637c55eecfe4e4624 +Author: 滔哥 +Date: Wed Dec 6 17:05:58 2017 +0800 + + * Chang testtask block link. + +commit acf1410e595f9c3a8f9e75d7ccc7f8d2f5a27116 +Author: 滔哥 +Date: Wed Dec 6 16:32:11 2017 +0800 + + * Change style + +commit 6f43344754b11605fb1a8359f06c9f5b7f585818 +Author: 滔哥 +Date: Wed Dec 6 16:11:18 2017 +0800 + + * Format Code + +commit e081bad9f18a318f1f88a82af79071b4869876eb +Author: 滔哥 +Date: Wed Dec 6 15:47:42 2017 +0800 + + * Task#3438 + +commit cb9bba12a9d9bc55394b59fd24f849cd48bc0c4d +Author: 滔哥 +Date: Wed Dec 6 14:53:56 2017 +0800 + + * Fix end date bug + +commit 75fdcaa780fc1b11dd36c0e918afe3963769471d +Author: 滔哥 +Date: Wed Dec 6 14:34:10 2017 +0800 + + * Task #3386 && Bug #1264 + +commit 734cfcd9bcb764d83b123e12389093a12407efe0 +Author: 滔哥 +Date: Wed Dec 6 14:14:39 2017 +0800 + + * Format code. + +commit fcb87dc1a141c3591e67e4936c4e26fec35118ff +Author: 滔哥 +Date: Wed Dec 6 13:21:16 2017 +0800 + + * Task #3434 + +commit 1132bf8c7e65b5a965da68e804cc7c3d67c33c8d +Author: 滔哥 +Date: Wed Dec 6 10:45:38 2017 +0800 + + * Task #3430 + +commit ea28589fd9e069366ad207ccf3cdce1679c0ef76 +Author: 滔哥 +Date: Wed Dec 6 09:42:54 2017 +0800 + + * Task #3430 + +commit 6652b9221c4a4d1d5046e18823bf4c22fba8ce24 +Author: 滔哥 +Date: Tue Dec 5 23:23:10 2017 +0800 + + * Task #3462 + +commit ef31488fa0c826566ef2c00dfc72fa8cde751954 +Author: 滔哥 +Date: Tue Dec 5 22:52:18 2017 +0800 + + * Task #3458 + +commit 7358ada1f6d437469fae33dce35dab5417de6790 +Author: 滔哥 +Date: Tue Dec 5 22:45:15 2017 +0800 + + * Task #3464 + +commit 797260dffeffb58220848bda54b488e32f505de2 +Author: 滔哥 +Date: Tue Dec 5 22:27:10 2017 +0800 + + * Add back parent task btn for child task. + +commit 95040eb64fa5a06b36d388454a72d10189a93b76 +Author: 滔哥 +Date: Tue Dec 5 22:00:47 2017 +0800 + + * Fix task bug + +commit 8663227af1d5beaaaab5667ba496ecaccf699e24 +Author: 滔哥 +Date: Tue Dec 5 21:53:18 2017 +0800 + + * Fix task bug + +commit e09fe8c01ae64bbddc751175dd5668ca833c2261 +Merge: 5c8b72ddf0 e3ba0b0216 +Author: tengfei +Date: Tue Dec 5 17:35:01 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5c8b72ddf05e8e6188d8887a3b1abf29df340f7a +Author: tengfei +Date: Tue Dec 5 17:34:48 2017 +0800 + + translation error 12/5 + +commit e3ba0b021651d770db44778d4074826018b25d83 +Author: 滔哥 +Date: Tue Dec 5 16:17:09 2017 +0800 + + * Change Url for En Notice + +commit 6376a64a93fe5aebe7d39059180f67d91739d97e +Merge: f8b0050c38 ee44254608 +Author: 滔哥 +Date: Tue Dec 5 14:21:49 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f8b0050c38bb006b73ffd79b4c7040c94183f4c8 +Author: 滔哥 +Date: Tue Dec 5 14:21:03 2017 +0800 + + * Change Url for En Notice + +commit ee442546084b73fc0fcb02c1be28d24e3da9b5a6 +Merge: 232d00dbcd 2d65d4a222 +Author: tengfei +Date: Tue Dec 5 11:26:51 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 232d00dbcd68c48c6e392d4c54553b7d02b5dda2 +Author: tengfei +Date: Tue Dec 5 11:24:06 2017 +0800 + + translation minor error + +commit e1075f32df25a1906973fd5820a91de87a7c59ff +Author: 滔哥 +Date: Tue Dec 5 11:08:24 2017 +0800 + + * Task 3481 + +commit ee85a1accdeb866404c8c8bd83a82ec7d5b7e65b +Author: 滔哥 +Date: Mon Dec 4 17:45:43 2017 +0800 + + * Task 3451 + +commit 2d65d4a222bd0ff578986c861a614836baf6707d (tag: zentaopms_9.6.3_20171204) +Author: wangyidong +Date: Mon Dec 4 16:45:16 2017 +0800 + + * change for zh-tw and upgrade. + +commit e8e24b91096ce88f9aabae6d470d2536361ebc8c +Author: wangyidong +Date: Mon Dec 4 16:37:35 2017 +0800 + + * fix for datatable check. + +commit 1a1321e57c98eee906d9ec99d93c3129f893e97d +Author: 滔哥 +Date: Mon Dec 4 15:57:37 2017 +0800 + + * Fix bug + +commit 619608946d7fd774b665621c41eedc2275670b8e +Merge: e1f20d5ef1 b0feda7029 +Author: 滔哥 +Date: Mon Dec 4 15:57:09 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b0feda702932c15bb39863681a0d084ea0c5a192 +Merge: 1bd227029a da6a23e7bc +Author: Catouse +Date: Mon Dec 4 15:53:45 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit da6a23e7bcfe52b027224c0f4203c665c744eb32 +Author: wangyidong +Date: Mon Dec 4 15:24:27 2017 +0800 + + * fix bug #1132. + +commit 1bd227029a977b96158266c7b9f075f17e8c6ad0 +Merge: 5a76b904b3 e082c20f90 +Author: Catouse +Date: Mon Dec 4 15:14:52 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5a76b904b39d90b3662c068a92a609ef2f674b95 +Author: Catouse +Date: Mon Dec 4 15:14:45 2017 +0800 + + * fix bug #1294. + +commit e082c20f90c374ef369c3e99033b41f833db79fc +Author: wangyidong +Date: Mon Dec 4 14:51:35 2017 +0800 + + * fix bug #1252. + +commit e1f20d5ef148b192f5d75fcb975ae5ffe0d32e2b +Author: 滔哥 +Date: Mon Dec 4 14:50:09 2017 +0800 + + * Fix bug 1278 + +commit aa391ba138cbdb70ba35450ed6448f15ce00c7b6 +Author: 滔哥 +Date: Mon Dec 4 14:49:54 2017 +0800 + + * Fix bug 1278 + +commit 91cc9135f1300d841124533a4f2839d891660f4f +Author: wangyidong +Date: Mon Dec 4 14:21:12 2017 +0800 + + * fix bug #1262. + +commit d7ed9c0bbb4b6a6fbf10b81fab9444719f38c21a +Author: wangyidong +Date: Mon Dec 4 14:09:51 2017 +0800 + + * adjust code for showimport. + +commit e2333b70a24b544f711278fe6b2d95bfd8dbd91f +Merge: e2070d56b1 8165e6c31e +Author: wangyidong +Date: Mon Dec 4 13:38:53 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e2070d56b1d8c8b34e9f3674fc7d847bde7ee7e4 +Author: wangyidong +Date: Mon Dec 4 13:37:43 2017 +0800 + + * fix bug #1279. + +commit 8165e6c31e3ea38701f53d22f33db65584931d15 +Merge: 11ad8f1d95 37aeaa887f +Author: 滔哥 +Date: Mon Dec 4 13:33:03 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 11ad8f1d957bedfe151518ccbfcddfa32495b2c1 +Author: 滔哥 +Date: Mon Dec 4 13:32:17 2017 +0800 + + * Fix bug 1315 + +commit 37aeaa887f8763d58adc58edaf05ef4387456d4d +Author: wangyidong +Date: Mon Dec 4 13:16:38 2017 +0800 + + * fix bug #1291. + +commit bf7126e3af44c7bd0a770f5b23cabbf4dd0f949b +Author: wangyidong +Date: Mon Dec 4 11:36:18 2017 +0800 + + * fix bug #1297. + +commit aaada03ccf74692f3eb93d25cbfdedaa407fb085 +Merge: 67c4ed6cc4 ede35673b6 +Author: 滔哥 +Date: Fri Dec 1 16:25:02 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 67c4ed6cc4b58ea7ebd5227d1049aeea73e0b65d +Author: 滔哥 +Date: Fri Dec 1 16:24:56 2017 +0800 + + * Fix 1317 + +commit ede35673b6ed96f9d5e47b9fb57131dfd7421bb0 +Author: wangyidong +Date: Fri Dec 1 15:15:38 2017 +0800 + + * fix bug #1292. + +commit 6df5ea26453b0f624ec7499780d0fe051f6ca31b +Author: wangyidong +Date: Fri Dec 1 14:45:51 2017 +0800 + + * fix bug #1293. + +commit c2fe7af6f0bd4b660b8875bd22bfec894035e3c1 +Author: wangyidong +Date: Fri Dec 1 14:44:04 2017 +0800 + + * fix bug #1284. + +commit 0a45abd11e7a2f91cc2c6eb4cf217b2cacbb0af1 +Merge: a6aeaf2cb5 ba7422ca22 +Author: wangyidong +Date: Fri Dec 1 14:28:13 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a6aeaf2cb5b747c038ff2846b3804700cace9d1c +Author: wangyidong +Date: Fri Dec 1 14:27:51 2017 +0800 + + * fix bug #1285. + +commit ba7422ca22c5a927ce611c91a73864d374727aea +Merge: 7b9b7d4a40 62cc162358 +Author: 滔哥 +Date: Fri Dec 1 14:24:03 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7b9b7d4a40c2a358d32cb2d5f6ae8f78ec165532 +Author: 滔哥 +Date: Fri Dec 1 14:23:57 2017 +0800 + + * Fix bug + +commit 62cc1623583afc85040f5bb06f19349e4401e66e +Author: wangyidong +Date: Fri Dec 1 14:10:19 2017 +0800 + + * fix bug #1286. + +commit 29f7e91a9f6d0c7025327397706726f8e35080b3 +Author: wangyidong +Date: Fri Dec 1 14:00:21 2017 +0800 + + * fix bug #1290. + +commit be4b83290944a348dee42f792bd1d059b5fe74b3 +Author: wangyidong +Date: Fri Dec 1 13:55:14 2017 +0800 + + * fix bug #1296. + +commit 18cb10cfa358a0464aa13449f42235cc8ec44bf0 +Author: wangyidong +Date: Fri Dec 1 13:48:33 2017 +0800 + + * fix bug #1306. + +commit 8be716b8a5d2888a11b05570c6209b44255f55f2 +Author: wangyidong +Date: Fri Dec 1 13:17:16 2017 +0800 + + * fix bug #1309. + +commit eac28529d6d34709a06c81bd6261bb6b551c2807 +Merge: 74adf6ae8f c49a2c8fca +Author: wangyidong +Date: Fri Dec 1 11:26:27 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 74adf6ae8fa5290da62cff2ca76aa7c7c2b1a222 +Author: wangyidong +Date: Fri Dec 1 11:25:51 2017 +0800 + + * fix bug #1316. + +commit c49a2c8fca71b693a987c71482ce755835551168 +Author: 滔哥 +Date: Fri Dec 1 11:24:53 2017 +0800 + + * Fix bug + +commit 3664bd09c8bbac1c459b9b53a9fa5e2edab49aa0 +Author: wangyidong +Date: Fri Dec 1 10:44:21 2017 +0800 + + * fix bug #1314. + +commit 6f8543277edf32d0f3c7a6fe51b63a1df2b8b7e1 +Author: wangyidong +Date: Fri Dec 1 10:22:25 2017 +0800 + + * fix bug #1307. + +commit ef4e8a2cbd477644bb987527bd055338c9527070 +Author: wangyidong +Date: Fri Dec 1 09:43:56 2017 +0800 + + * fix bug #1310. + +commit 66e5d7f47ab4e7ded5769996ed101b076027eddf +Author: wangyidong +Date: Fri Dec 1 09:36:22 2017 +0800 + + * fix bug #1313. + +commit fca246824ad255af7ade7c9a8704184e4876f61d +Author: wangyidong +Date: Fri Dec 1 09:17:04 2017 +0800 + + * fix bug #1298. + +commit 057f8978b1363830aa539d0952458101aabd7ae2 +Author: wangyidong +Date: Fri Dec 1 09:09:15 2017 +0800 + + * fix bug #1300. + +commit 08bbbeabfb33ac62ac30c74c6e39d69c100c407e +Author: wangyidong +Date: Fri Dec 1 09:06:00 2017 +0800 + + * fix bug #1303. + +commit 97725f46b19a930a570172a1b4ffa01f6ece708f +Author: wangyidong +Date: Thu Nov 30 17:30:42 2017 +0800 + + * adjust code for pro. + +commit 5aae8732dd660680bbd8fb81c52375b7c0ae3b6d +Author: wangyidong +Date: Thu Nov 30 14:13:25 2017 +0800 + + * fix bug #843. + +commit 76ea4b62e54495169d2278ea8d747a315492de68 +Author: wangyidong +Date: Thu Nov 30 09:25:22 2017 +0800 + + * fix bug #993. + +commit 33415b566b1c5968de24d95add0936a313534765 +Merge: 759b3950cb 35d244ac4c +Author: wangyidong +Date: Thu Nov 30 09:04:23 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 759b3950cbe6e775559530666c4781a901b04e0d +Author: wangyidong +Date: Thu Nov 30 09:03:40 2017 +0800 + + * fix bug #1081. + +commit 35d244ac4c86fb3f08a70823334027aae5fa8c5f +Merge: 7b0571d18f 9d5485ec6a +Author: 滔哥 +Date: Wed Nov 29 15:52:24 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7b0571d18fad39dd192751e2eef46b0d02a279bd +Author: 滔哥 +Date: Wed Nov 29 15:52:14 2017 +0800 + + * User list add title + +commit 9d5485ec6a8546caab30c4d83c862503d0cc6182 +Merge: a8fb159310 36fa1e01ae +Author: wangyidong +Date: Wed Nov 29 14:48:53 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a8fb159310c730e22b9eda8df1913e861ffe684d +Author: wangyidong +Date: Wed Nov 29 14:47:40 2017 +0800 + + * fix error. + +commit 36fa1e01aecd61fcc64851d21641c4c57b8213d6 +Merge: 5a4f5057d6 eb533e8f67 +Author: tengfei +Date: Mon Nov 27 17:08:55 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5a4f5057d6bb70c2c30062c24f0cd1e9e784349d +Author: tengfei +Date: Mon Nov 27 17:08:29 2017 +0800 + + “minor change + +commit eb533e8f67ae5229cb5f286fa8b80fc0916f61bc +Author: Renee +Date: Mon Nov 27 17:04:34 2017 +0800 + + Update README.md + +commit 232cdee07669fcf64d78f6314793b3bf4da5f104 +Merge: d16dc28d93 03aa706057 +Author: 滔哥 +Date: Fri Nov 24 15:59:18 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d16dc28d93b0ff773277496f96500ee137284e64 +Author: 滔哥 +Date: Fri Nov 24 15:59:02 2017 +0800 + + * Fix bug + +commit 03aa706057a4f1e18cc4441eb74f2ac6d8975246 +Merge: edc8c80cec ec8fcb6521 +Author: tengfei +Date: Fri Nov 24 11:10:13 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit edc8c80cece6db8de735c771f9e98e337bb3aa5d +Author: tengfei +Date: Fri Nov 24 11:10:02 2017 +0800 + + effort & man-hour + +commit ec8fcb6521187a50f0b34508646d08ecd0057ee4 +Author: wangyidong +Date: Thu Nov 23 16:53:06 2017 +0800 + + * change for export bug. + +commit 5d633807227b83d54aba0f1f9aeccc99e283eea1 +Author: wangyidong +Date: Thu Nov 23 16:52:34 2017 +0800 + + * add commonModel::http method. + +commit a0fd8d6e9fd2cc14a4320bf87d022bf665be7934 +Merge: c7b03419ae cf097da3b8 +Author: 滔哥 +Date: Thu Nov 23 16:10:59 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c7b03419ae31b730a208bc10a63b97bb3c1f27bc +Author: 滔哥 +Date: Thu Nov 23 16:10:51 2017 +0800 + + * Fix report style + +commit cf097da3b8d8c74a81bd52d3e762ebfe06695156 +Merge: e5daf6f56f bfcb578533 +Author: wangyidong +Date: Tue Nov 21 17:10:38 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e5daf6f56f73e0a62b56ce541751d246c70b6599 +Author: wangyidong +Date: Tue Nov 21 17:10:07 2017 +0800 + + * finish task #6308. + +commit bfcb5785330b8eb427e16b2bc3f5a37b39377053 +Author: 滔哥 +Date: Tue Nov 21 17:00:22 2017 +0800 + + * Fix bug + +commit e0bb4f27f1d5b69d5322626deec9d15e00ed9400 +Merge: 8d3f234bf4 feaa6d4782 +Author: 滔哥 +Date: Tue Nov 21 16:58:34 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8d3f234bf4feabdd4e5c6e651e167824d12f0ba5 +Author: 滔哥 +Date: Tue Nov 21 16:55:01 2017 +0800 + + * Fix bug + +commit feaa6d47823104e22004e1d1deac830b4bfd3cf0 +Author: wangyidong +Date: Tue Nov 21 14:23:59 2017 +0800 + + * adjust for children task. + +commit db681c2b206b53021af099ca05d9440723832bc5 +Merge: deb1e2f4d5 d0cb562048 +Author: wangyidong +Date: Tue Nov 21 13:47:12 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit deb1e2f4d508b32ecb51019d0ed9d9d2ab3470fb +Author: wangyidong +Date: Tue Nov 21 13:46:34 2017 +0800 + + * adjust background for active list-group-item. + +commit d0cb562048b93e16d6aec0ab69a93d38f164a431 +Author: tengfei +Date: Mon Nov 20 19:08:56 2017 +0800 + + ok.txt->file + +commit f6b3158c483c1732fd79bc3234289a954e0594d7 +Author: 滔哥 +Date: Mon Nov 20 15:19:12 2017 +0800 + + * Fix bug + +commit 7cd852a712404243ca4cd2bf2fd5a8d327edf443 +Merge: c53dabe4b1 bb03a47b45 +Author: wangyidong +Date: Fri Nov 17 16:15:59 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c53dabe4b1163f2b84748e26e6a04f9853a47ac0 +Author: wangyidong +Date: Fri Nov 17 16:14:55 2017 +0800 + + * add project deviation chart. + +commit bb03a47b45367b5446ac817af22b04c4afc643be +Author: tengfei +Date: Fri Nov 17 15:16:31 2017 +0800 + + story desc + +commit a12fefb2a6a947bfde3f490aba9d63dd0b1db622 +Merge: bda8f7434f cc173a41f6 +Author: 滔哥 +Date: Fri Nov 17 15:02:35 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bda8f7434fb407a7acc5cb2c39bfee281938d787 +Author: 滔哥 +Date: Fri Nov 17 15:02:26 2017 +0800 + + * Fix bug in php7.1 + +commit cc173a41f637f8c0b7d6df83485c3edb8c0e9878 +Author: wangyidong +Date: Fri Nov 17 15:00:22 2017 +0800 + + * fix error. + +commit b94d4e2dcb8030934eddd341e66528c5ae5f0d13 +Author: wangyidong +Date: Fri Nov 17 14:18:26 2017 +0800 + + * fix bug #1289. + +commit ec88c8c85adba209c6a0531ba42ce68d62d6ae30 +Author: wangyidong +Date: Fri Nov 17 13:18:11 2017 +0800 + + * fix bug #1287,1288. + +commit daa396bbcb61beacf529f2599a0bee7344d01afa +Author: wangyidong +Date: Fri Nov 17 12:29:12 2017 +0800 + + * fix db sql. + +commit 3da2a97b489a8122ca75ffdb55a2b66e0b8751db +Author: wangyidong +Date: Fri Nov 17 11:54:19 2017 +0800 + + * change for 9.6.2 version. + +commit 6a87a80a4d0e49ba015dafebda482e14ae4f833d +Author: 滔哥 +Date: Fri Nov 17 11:38:45 2017 +0800 + + * Fix bug + +commit 9d54e787fc0d2763fb7923d4137539532e8dc6f4 +Author: 滔哥 +Date: Fri Nov 17 11:23:21 2017 +0800 + + * Fix Bug + +commit a74ea03424fabd0c629f3ebb5fc1f087106271d0 +Merge: 63eaccc04b bc9cf41beb +Author: 滔哥 +Date: Fri Nov 17 09:17:14 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 63eaccc04b3cfbc39f91ffc1864788e3dee2e4f1 +Author: 滔哥 +Date: Fri Nov 17 09:17:07 2017 +0800 + + * Fix bug + +commit bc9cf41beb3deb10d40f57a6f64ffb59da79a447 +Merge: ad3ce6bab6 67a0263646 +Author: wangyidong +Date: Thu Nov 16 15:26:49 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ad3ce6bab638ffb2acddb2115ce95ec9928dea78 +Author: wangyidong +Date: Thu Nov 16 15:26:20 2017 +0800 + + * change for pro. + +commit dcec446d69cafb8afb65b0451923d455d1d5821c +Author: wangyidong +Date: Thu Nov 16 15:25:59 2017 +0800 + + * fix bug for send mail with ztcloud. + +commit 67a026364685bc54b677a4d4b453d7a189bb033e +Author: 滔哥 +Date: Wed Nov 15 19:04:42 2017 +0800 + + * Add story tips lang for todo + +commit 20d15486c5e9999e657f6c41de4f0bec997a4a56 +Author: 滔哥 +Date: Wed Nov 15 18:44:24 2017 +0800 + + * Add story for todo + +commit c417c2fd70dffd6e83fae216716fbc2d7bdc437c +Author: 滔哥 +Date: Wed Nov 15 18:37:15 2017 +0800 + + * Add story for todo + +commit 5e47b860d8a77e24cd8f42dfab7f68ff4b2029d7 +Author: 滔哥 +Date: Wed Nov 15 18:25:22 2017 +0800 + + * Add story for todo + +commit 400c4838f537fc4525bff7ff0a09d01139dba940 +Author: 滔哥 +Date: Wed Nov 15 17:10:33 2017 +0800 + + * Add story for todo + +commit 602a95cfd27ee7a5941a9fb790f72b46faf0f7af +Author: 滔哥 +Date: Wed Nov 15 16:52:27 2017 +0800 + + * Add story for todo + +commit f425743a8d0b8f473bbeafa154bbfcc23721e67a +Author: 滔哥 +Date: Wed Nov 15 15:28:00 2017 +0800 + + * Fix bug + +commit 3a9b7dd1030139a35fe400e6eeb37cd4f37465a2 +Author: 滔哥 +Date: Wed Nov 15 14:52:16 2017 +0800 + + * Format code and Add story for todo module + +commit dd5047a5dae01f4b0136e79345d909cb95d8a191 +Merge: ed078b58c3 2087e26166 +Author: wangyidong +Date: Tue Nov 14 16:34:52 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ed078b58c3e1a34f7870ab1d216c6e15117f368d +Author: wangyidong +Date: Tue Nov 14 16:33:59 2017 +0800 + + * change datatable for pro. + +commit 440946f087f7c5f2561101ed65c6fb8af7717edc +Author: wangyidong +Date: Tue Nov 14 16:24:35 2017 +0800 + + * finish task #6289 for pro. + +commit 2087e2616648490571252ebbe081b994eb699214 +Author: 滔哥 +Date: Mon Nov 13 14:52:52 2017 +0800 + + * Fix score bug + +commit de1824bf42740bfdb701cb9d4063c9872874fc74 (tag: zentaopms_9.6.1_20171113) +Author: wangyidong +Date: Mon Nov 13 09:18:47 2017 +0800 + + * adjust after exec page. + +commit 19005ae8532733816bcd0cc5cc29e526dff3b270 +Author: wangyidong +Date: Mon Nov 13 09:05:30 2017 +0800 + + * change for new version. + +commit ce5750f65434991d0c3e6c646c0282f59697a328 +Merge: 16e6097773 78b4295e65 +Author: liugang +Date: Mon Nov 13 08:55:26 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 16e6097773822ff967411caefeb4002fab41b7b6 +Author: liugang +Date: Mon Nov 13 08:35:59 2017 +0800 + + * Adjust codes. + +commit 78b4295e6502c243cf07b796ce876cd7c01220fd +Author: Catouse +Date: Fri Nov 10 17:04:44 2017 +0800 + + * finish task #3342. + +commit 55cefacc576dbf57ae06f5e3146000b00bbe1a34 +Author: wangyidong +Date: Fri Nov 10 16:25:59 2017 +0800 + + * adjust for project task page. + +commit 97d490f008a05d2fcc7ba471f8ecd23cd08f731d +Author: wangyidong +Date: Fri Nov 10 15:49:48 2017 +0800 + + * change for zh-tw lang. + +commit 9c8f506fbe42b689395fa1d72de0c3f95e82b087 +Author: wangyidong +Date: Fri Nov 10 14:08:00 2017 +0800 + + * fix bug #1125. + +commit 9b820f143de6305d0b1e72ea6aeb050065797fb1 +Author: wangyidong +Date: Fri Nov 10 13:57:41 2017 +0800 + + * fix bug #1246. + +commit 53765e00daf5e51242b1319435ec63b69f3f908a +Merge: c21128595e a5464f2c18 +Author: 滔哥 +Date: Fri Nov 10 11:37:48 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c21128595e2ec3f7cbcc3a2fd87d78b312e2de90 +Author: 滔哥 +Date: Fri Nov 10 11:37:42 2017 +0800 + + * Fix task bug + +commit a5464f2c188bdb37a7d29bb5f5ad0d8b4b847cbe +Merge: 5d6609181d b90c3ac9eb +Author: wangyidong +Date: Fri Nov 10 11:23:46 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5d6609181de5337cfbff3c9f77f38bb09097f45f +Author: wangyidong +Date: Fri Nov 10 11:23:22 2017 +0800 + + * fix bug #1265. + +commit b90c3ac9ebc8fdcf79dbab785e0eac2c4589475b +Author: 滔哥 +Date: Fri Nov 10 10:58:24 2017 +0800 + + * Fix bug + +commit a82ce075b03b0a046ed62eb83895408763b67818 +Author: liugang +Date: Fri Nov 10 10:51:29 2017 +0800 + + * Finish task #3325. + +commit 23711177c53c9ddf5c5ad59fce0d88f62c674fc1 +Author: wangyidong +Date: Fri Nov 10 10:41:26 2017 +0800 + + * fix bug #1269. + +commit d6df4deeae7f0ada6777f3181d0093963ce69008 +Merge: 6957ae1681 533cc18eb3 +Author: wangyidong +Date: Fri Nov 10 10:34:36 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6957ae1681b145988c6e6c648e3f43aec4d7cc55 +Author: wangyidong +Date: Fri Nov 10 10:34:13 2017 +0800 + + * fix bug #1271. + +commit 533cc18eb38263dcf16540199a9036dbabf65ee2 +Author: 滔哥 +Date: Fri Nov 10 10:26:30 2017 +0800 + + * Fix bug + +commit 69f0bbd70f731a58fb07d7d2adb3f360517859a3 +Author: 滔哥 +Date: Fri Nov 10 10:08:54 2017 +0800 + + * Fix bug + +commit 2179def2114116fafd5cefc31d63b36fe505cff9 +Merge: 868ed79c9b c03e82edb2 +Author: wangyidong +Date: Fri Nov 10 09:40:51 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 868ed79c9ba1a255c172d398f332cddb50d77f09 +Author: wangyidong +Date: Fri Nov 10 09:39:27 2017 +0800 + + * finish bug #1259. + +commit c03e82edb23fbd2a2b5f43e4f28651ec2da65ca7 +Author: 滔哥 +Date: Fri Nov 10 09:17:32 2017 +0800 + + * Fix bug + +commit c9f44030d4b346d139436c593c2113790d83172d +Author: 滔哥 +Date: Thu Nov 9 18:32:30 2017 +0800 + + * Format codes + +commit da7a66d4aae607526a9df37a94cd8a0bd79e6a0e +Merge: 2679a472b8 f1db4bbff8 +Author: 滔哥 +Date: Thu Nov 9 18:24:11 2017 +0800 + + * Fix bug + +commit 2679a472b8535251bd6227266065194fb4498767 +Author: 滔哥 +Date: Thu Nov 9 18:21:58 2017 +0800 + + * Fix bug + +commit f1db4bbff8d7390f1e198ab46891bc57f406f50b +Author: wangyidong +Date: Thu Nov 9 17:09:07 2017 +0800 + + * adjust table th width in story kanban. + +commit 87e4abfcb81e42067de8370d9670789e056f0fb0 +Merge: fef1d8fa15 34f4a904fb +Author: wangyidong +Date: Thu Nov 9 16:46:51 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fef1d8fa152031fe68c41c002f2155b6dcd085fc +Author: wangyidong +Date: Thu Nov 9 16:46:27 2017 +0800 + + * finish task #3369. + +commit 34f4a904fb4b664d24729d47668a58c137b80459 +Merge: 90211f67fa 5c18a95a4a +Author: liugang +Date: Thu Nov 9 15:17:39 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 90211f67fae5f3b65f5d83a6c1cb90cbab2c99f7 +Author: liugang +Date: Thu Nov 9 15:16:22 2017 +0800 + + * Finish task #3337,3338,3357,3358,3365,3366,3367. + +commit 5c18a95a4a098eede0acc8d6dbc3ba99a2c73bf6 +Merge: 40995c4dc3 42593e686a +Author: 滔哥 +Date: Thu Nov 9 15:12:08 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 40995c4dc338dc7f6bbea15a8ba21d92d4fa0d21 +Author: 滔哥 +Date: Thu Nov 9 15:12:02 2017 +0800 + + * Fix bug + +commit c2e05057f585fbc6058abf520ab7269442b6fbd1 +Author: wangyidong +Date: Thu Nov 9 15:11:08 2017 +0800 + + * finish task #3341. + +commit ced6585aecee65de440af2b40282fbfd67d3af04 +Author: wangyidong +Date: Thu Nov 9 14:08:57 2017 +0800 + + * finish task #3339. + +commit 42593e686ab906f6f8071b4291aa5ff8658d8c14 +Author: wangyidong +Date: Thu Nov 9 13:56:06 2017 +0800 + + * finish task #3349. + +commit 76d140b197fa9e6c3c3fa4fc41209668c407641f +Author: wangyidong +Date: Thu Nov 9 13:50:53 2017 +0800 + + * finish task #3354. + +commit 528c6934eec26dee521cd5850f4c5f3c2824da08 +Merge: 7dd879c8d6 e627415f6c +Author: wangyidong +Date: Thu Nov 9 13:46:49 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7dd879c8d6c988a1f6e808792859a92f489667d3 +Author: wangyidong +Date: Thu Nov 9 13:46:10 2017 +0800 + + * finish task #3334,3323. + +commit e627415f6ceef4179e2c989bab889c8d0a2f4f46 +Author: 滔哥 +Date: Thu Nov 9 13:39:41 2017 +0800 + + * Fix bug + +commit 9c2abdb523e4a13a850857986c64b979df56b065 +Merge: 26b3e2c39f 2f2c99f346 +Author: wangyidong +Date: Thu Nov 9 13:39:30 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 26b3e2c39fd3f86c902782cbcd96857a30050f1b +Author: wangyidong +Date: Thu Nov 9 13:20:38 2017 +0800 + + * finish task #3327. + +commit 2f2c99f346f4034d7650e882dc5c1ccff3e610bb +Author: 滔哥 +Date: Thu Nov 9 10:51:03 2017 +0800 + + * Fix bug + +commit 2799322a63be567c35f7917ddd64ba74e12fc2cf +Author: 滔哥 +Date: Thu Nov 9 10:01:50 2017 +0800 + + * Fix bug + +commit 3cc063d5b313ced7c05cc853bac8fda889dbf0c6 +Author: 滔哥 +Date: Wed Nov 8 16:33:10 2017 +0800 + + * Fix delete MySQL affair for socre module + +commit c64f94b337406cc8b534f33065a832bf63f6b84a +Author: 滔哥 +Date: Wed Nov 8 16:08:44 2017 +0800 + + * Fix task start bug + +commit 9d2861678fee46a23af76abfdcc34e959b5a81d9 +Author: guanxiying +Date: Wed Nov 8 16:00:24 2017 +0800 + + Format codes. + +commit f1ba417162864d7d84d175e846b146a9facd9d54 +Author: Xiying Guan +Date: Wed Nov 8 13:28:26 2017 +0800 + + * Format codes. + +commit eb8d31ca6bc0c8297d2097d58d8feb846e3ca7a2 +Author: wangyidong +Date: Tue Nov 7 13:09:48 2017 +0800 + + * unique mail cc list. + +commit 4ba312f1eb7fa023ddbe43b568c7b9a0ca0c2eef +Author: 滔哥 +Date: Tue Nov 7 12:59:31 2017 +0800 + + * Fix tutorial score bug + +commit e7e5d2501c9973cf03669bf52f1247beb0ec4623 +Author: liugang +Date: Tue Nov 7 10:52:22 2017 +0800 + + * Adjust sql. + +commit 6aea4c13a2e666df7b13527ac06dbea70763e73e (tag: zentaopms_9.6_20171106) +Merge: 1711bb65b6 0eeeaee760 +Author: wangyidong +Date: Mon Nov 6 17:51:58 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1711bb65b66880ec70793495c8e26cfe1e5ebba2 +Author: wangyidong +Date: Mon Nov 6 17:51:43 2017 +0800 + + * change for zh-tw lang. + +commit bb734582634998e9db803e087f243628e45b250f +Author: wangyidong +Date: Mon Nov 6 17:50:53 2017 +0800 + + * adjust for test report require members. + +commit 0eeeaee76051e4bbc2376c1596a6f602dea1845f +Merge: e294367e46 f406d38aed +Author: 滔哥 +Date: Mon Nov 6 17:49:20 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e294367e46ea3cd23e7b5154919d28e9b27cabe9 +Author: 滔哥 +Date: Mon Nov 6 17:49:12 2017 +0800 + + * Fix tutorial bug + +commit 49909d01c1c6833ee742d534f4103f35440fdab9 +Author: wangyidong +Date: Mon Nov 6 17:46:57 2017 +0800 + + * adjust for required. + +commit f406d38aeddd4d81bc8e7f0ec93a33995e5b68a1 +Merge: 55725dbcf9 35a179f00f +Author: wangyidong +Date: Mon Nov 6 17:27:09 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 55725dbcf9d46ba03bc86e8bb6471d394e3f658d +Author: wangyidong +Date: Mon Nov 6 17:26:51 2017 +0800 + + * fix for get testtask. + +commit 35a179f00f5788d6500916a2f80bfd928225a4b1 +Merge: e2f04471ce 7293086b45 +Author: 滔哥 +Date: Mon Nov 6 17:23:46 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e2f04471ce70a83c6f03c0f5a2f84f48cbca38fe +Author: 滔哥 +Date: Mon Nov 6 17:23:39 2017 +0800 + + * Fix tutorial bug + +commit 7293086b455607f0902b21539db23135a10f4816 +Author: wangyidong +Date: Mon Nov 6 16:57:13 2017 +0800 + + * fix for required. + +commit 93f853980325e5624abb67009a73b3432b95834d +Author: wangyidong +Date: Mon Nov 6 10:56:41 2017 +0800 + + * fix search width. + +commit 7eb0f9d077ac381f3ccdbe4c03524e5afad4c461 +Author: wangyidong +Date: Mon Nov 6 10:45:48 2017 +0800 + + * add changelog. + +commit f44dba62b181e6fca01e5e63ab49556fe8b66369 +Merge: dc046c4ff5 db2a8b4a84 +Author: wangyidong +Date: Mon Nov 6 10:40:12 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit dc046c4ff5f883d75232414021c129ca5ee1c641 +Author: wangyidong +Date: Mon Nov 6 10:39:28 2017 +0800 + + * adjust for doc priv. + +commit db2a8b4a847f2c1003e6831877232258b7bad28a +Merge: d2dcabfbc0 6dc6d6126f +Author: 滔哥 +Date: Mon Nov 6 10:26:54 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d2dcabfbc00716cbd59551701ac0b50ec41cfcea +Author: 滔哥 +Date: Mon Nov 6 10:26:45 2017 +0800 + + * Fix score date + +commit 6dc6d6126f51676d5144e3cd9fb1782ba5e54a34 +Merge: 130f1f1b33 0f1f1df14b +Author: liugang +Date: Mon Nov 6 10:18:17 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 130f1f1b332db66f9c2aafe42ce697e63e0a2ad0 +Author: liugang +Date: Mon Nov 6 10:17:26 2017 +0800 + + * Make tmp dir when execute makefile. + +commit 0f1f1df14b05fbad1b4ab4ceee049a702fa8cdef +Merge: fbc5b38585 7792da815f +Author: wangyidong +Date: Mon Nov 6 10:13:38 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fbc5b385850252ed6f19c842e4b88b0e594b1d86 +Author: wangyidong +Date: Mon Nov 6 10:13:16 2017 +0800 + + * change for zh-tw lang. + +commit 7792da815f7b9d8c79ba87a65994b0df1b2bd063 +Author: 滔哥 +Date: Mon Nov 6 10:07:38 2017 +0800 + + * fix score title + +commit 57dbab5a1434df390aec309245ccd04ae38e3ccb +Author: 滔哥 +Date: Mon Nov 6 10:05:45 2017 +0800 + + * fix score bug + +commit c495dac642b5495819741dc0f47d947a722c5d5f +Merge: 298e2b6616 27f93a8e7f +Author: 滔哥 +Date: Mon Nov 6 10:03:24 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 298e2b66163d2e82a5cd7f2997dc9105615b1d89 +Author: 滔哥 +Date: Mon Nov 6 10:03:17 2017 +0800 + + * fix score rule title + +commit 27f93a8e7f6025098e5ac67c4556915e02551425 +Author: wangyidong +Date: Mon Nov 6 09:52:35 2017 +0800 + + * fix upgrade. + +commit 80c5e7fddb8b3629e001692b0c16581dd35a5289 +Merge: cb85e011a6 3279c1ab71 +Author: 滔哥 +Date: Mon Nov 6 09:31:57 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cb85e011a600bc5061ab819293eae61b66eea6dc +Author: 滔哥 +Date: Mon Nov 6 09:31:45 2017 +0800 + + * add tools + +commit 3279c1ab71451b2c02ca3e29e70cb25932319395 +Author: liugang +Date: Mon Nov 6 09:18:55 2017 +0800 + + * Merge sql.Change version to 9.6 + +commit 22eb945187dcecd0dcf9f7a65d85e5cbd889f1e6 +Merge: 58ad5f6374 0a56094b1c +Author: liugang +Date: Fri Nov 3 17:42:11 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 58ad5f6374cb318288d427da4eb05bf60a2cf7b6 +Author: liugang +Date: Fri Nov 3 17:41:48 2017 +0800 + + * Fix bug. + +commit 0a56094b1c8376c7b29e19c020f7a189e117b73f +Merge: 8dc523cdf3 a260408929 +Author: 滔哥 +Date: Fri Nov 3 16:28:24 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8dc523cdf38467d43379efab83145568b8074c4e +Author: 滔哥 +Date: Fri Nov 3 16:28:15 2017 +0800 + + * fix task bug + +commit a260408929a51279bf004be366cdc3509f4e17f5 +Merge: 07d043a0a1 1e94998fb5 +Author: wangyidong +Date: Fri Nov 3 16:16:34 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 07d043a0a1c9c96bd71928fe06e02a8a20f5fffa +Author: wangyidong +Date: Fri Nov 3 16:14:44 2017 +0800 + + Finish task#3286 看板更多操作在火狐下的边框去掉,cost:0.5 left:0 + +commit a10e725ba50aa114956d6e684dc57ba3a169e142 +Author: wangyidong +Date: Fri Nov 3 16:02:15 2017 +0800 + + Finish task#3311 普通表格太宽时不要滚动整个页面,cost:2 left:0 + +commit 1e94998fb50fd6ed1221568943625f75545460e3 +Merge: 2feb6fc2a9 03279991cb +Author: 滔哥 +Date: Fri Nov 3 16:00:24 2017 +0800 + + * score rule add btn + +commit 2feb6fc2a9d64c0fef3e7eae68a236811c2d6c7b +Author: 滔哥 +Date: Fri Nov 3 15:59:51 2017 +0800 + + * score rule add btn + +commit 03279991cb534b92fbc07939ff3a8ee21bc9bf04 +Merge: 930738c4a5 3f30bfacf8 +Author: liugang +Date: Fri Nov 3 15:45:30 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 930738c4a5b0c8ca7758b7dcd28317e616def099 +Author: liugang +Date: Fri Nov 3 15:45:17 2017 +0800 + + * Fix bug of dao::$cache. + +commit 3f30bfacf8f0925703f8f7c5c973f9d47aa377bc +Merge: 37538538fa 0a1b0abe87 +Author: wangyidong +Date: Fri Nov 3 15:26:09 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 37538538faa2f1cfbdb409058ced585b8d79ba5c +Author: wangyidong +Date: Fri Nov 3 15:25:45 2017 +0800 + + * fix bug for browse testtask. + +commit 0a1b0abe87575c75e9fb8d038782bf505d7386b1 +Merge: 58be8d10a8 1ad2a03511 +Author: 滔哥 +Date: Fri Nov 3 14:59:25 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 58be8d10a8022f064904a4b696f8738bb7b1ed56 +Author: 滔哥 +Date: Fri Nov 3 14:59:16 2017 +0800 + + * fix score rule title + +commit 52d9ff63e35ec1d2b39cbfb60aaf767c1e3aa02e +Merge: 7a2487d656 1ad2a03511 +Author: liugang +Date: Fri Nov 3 14:44:16 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7a2487d6563e2caeab3a76a6ec882bf987879d5b +Author: liugang +Date: Fri Nov 3 14:43:46 2017 +0800 + + * Upgrade from version 9.5.1. + +commit 1ad2a035115ec5ac75884ba35720ffaaf3ecbb9b +Merge: ef1291a06c 1460031cbb +Author: wangyidong +Date: Fri Nov 3 14:18:21 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ef1291a06cecc201ebc2eb9595241984be188736 +Author: wangyidong +Date: Fri Nov 3 14:17:58 2017 +0800 + + * fix error. + +commit 1460031cbb627373ce5640a6a73b26443f58216c +Author: 滔哥 +Date: Fri Nov 3 14:09:51 2017 +0800 + + * fix tutorial score + +commit 946c799bbc208850799b658373d9c3c0b81a61ed +Merge: b5a3b6d415 5a851c7830 +Author: 滔哥 +Date: Fri Nov 3 13:36:10 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b5a3b6d41519ead7662727340341708be57f34f8 +Author: 滔哥 +Date: Fri Nov 3 13:35:55 2017 +0800 + + * fix score lang + +commit 5a851c7830fbae0549efbd9f24031002ed185c91 +Merge: 38073d2ad7 ad8a305f0d +Author: wangyidong +Date: Fri Nov 3 13:22:52 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 38073d2ad7b79dc06ca591543ed40b3dbbf07aaa +Author: wangyidong +Date: Fri Nov 3 13:22:27 2017 +0800 + + * finish task #3310. + +commit ad8a305f0dbcb759b22c742672830623d95b12eb +Author: 滔哥 +Date: Fri Nov 3 13:07:29 2017 +0800 + + * fix score lang + +commit b21aff7bc1a829e7270185bc1568e51f300f66f3 +Author: 滔哥 +Date: Fri Nov 3 13:03:05 2017 +0800 + + * fix task + +commit 254cc9a5ef616caf44630c3e003d8ab1b1d47b22 +Author: 滔哥 +Date: Fri Nov 3 00:30:58 2017 +0800 + + * fix remove score chinese + +commit 0f3189d9e8fc102e45219559c3d775bb3e8e8169 +Merge: 0dc610f36b c5c3f585c4 +Author: 滔哥 +Date: Fri Nov 3 00:28:03 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0dc610f36b920b8dabd466e64fbfadf8c6aea546 +Author: 滔哥 +Date: Fri Nov 3 00:27:58 2017 +0800 + + * fix score and child task bug + +commit c5c3f585c48a461c69f9cac82ef9d7ea04fbef2d +Author: liugang +Date: Thu Nov 2 17:38:11 2017 +0800 + + * Finish task #3303. + +commit 4045697d0af647ab8d51e4cf52196594bcc6fea0 +Merge: 1485cad751 ea349fa5aa +Author: liugang +Date: Thu Nov 2 17:27:55 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1485cad7514f2a577d43f3ea73e8e28a1599e7a0 +Author: liugang +Date: Thu Nov 2 17:27:05 2017 +0800 + + * Don't display parent when edit a product line. + * Don't display child page when browse a product line. + +commit ea349fa5aad4397984014a7ea35ff52b215594e5 +Merge: e6b8226f53 e37e9235ef +Author: wangyidong +Date: Thu Nov 2 16:56:11 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e6b8226f535cd0e06d80c2683ed2366460eb5606 +Author: wangyidong +Date: Thu Nov 2 16:55:50 2017 +0800 + + * finish task #3295. + +commit e37e9235efcc9a479a3ee9e513c4bf8bbf2ae33f +Merge: 0f377e4750 04cab43447 +Author: liugang +Date: Thu Nov 2 16:30:16 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0f377e47505de0402d6c511717d40540d018432d +Author: liugang +Date: Thu Nov 2 16:29:48 2017 +0800 + + * Add line when export products. + +commit 04cab43447f17721fd8d9683180990d83fb9072b +Author: wangyidong +Date: Thu Nov 2 16:14:36 2017 +0800 + + Finish task#3304 测试报告三角图标改一下使用info图标,cost:0.2 left:0 + +commit 500139efde90c633c62141b5fc101281b0373f13 +Author: wangyidong +Date: Thu Nov 2 16:11:59 2017 +0800 + + * fix error for projectblock. + +commit 19114bbf63ace22f726e194272dc5576ed88ad5e +Author: wangyidong +Date: Thu Nov 2 16:07:08 2017 +0800 + + * fix bug #3296. + +commit cddabe418855202b44b6fcde7cc3fa22fa0343fc +Author: wangyidong +Date: Thu Nov 2 15:50:52 2017 +0800 + + Finish task#3300 已验收的项目需求所处阶段只能改到发布,cost:0.2 left:0 + +commit a5a18ad2e4d78fd5beb1ca3fcc5e301b999753b2 +Author: wangyidong +Date: Thu Nov 2 15:25:55 2017 +0800 + + Finish task#3315 任务列表的相关需求字段去掉,cost:0.1 left:0 + +commit 80b14f7c0459ca424ed2c07150bbac630e1934a8 +Author: wangyidong +Date: Thu Nov 2 15:20:29 2017 +0800 + + Finish task#3287 看板分组按钮合并到左侧排序菜单里面，需求ID排序去掉，增加需求默认排序,cost:1 left:0 + +commit 8f2b8be0e1320a3f43f3a1e80ed265fcfe854e0e +Merge: 99bd7ed909 5805beb7ca +Author: wangyidong +Date: Thu Nov 2 14:28:26 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 99bd7ed90961e1cb5ced3873360308e4159cdbec +Author: wangyidong +Date: Thu Nov 2 14:28:02 2017 +0800 + + * finish task #3289. + +commit 5a5a10256d2e7f36facfc0f6e79805f5ed7645c0 +Author: liugang +Date: Thu Nov 2 14:06:06 2017 +0800 + + * Fix bug #1261. + +commit 5805beb7ca4d0628e096c0feae2d7640f3d499e1 +Merge: e8cdfe2bff 06861184a2 +Author: liugang +Date: Thu Nov 2 11:37:02 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e8cdfe2bff922e86ba40ef29a1f5c92543e9f7d4 +Author: liugang +Date: Thu Nov 2 11:35:52 2017 +0800 + + + Add en lang files. + * Finish task 3292,3293,3294,3305,3306,3307,3308,3309. + +commit 5c1ef6e4f2c73b27a00009a3f341afe804fc371d +Author: wangyidong +Date: Thu Nov 2 10:42:48 2017 +0800 + + Finish task#3299 需求看板页面不能拖放的列颜色上给出提示，往右拖的时候所有经过的列颜色都变了，历史记录文案改成：由XXX验收,cost:0.5 left:0 + +commit 06861184a207a8ea4640b30c24f48ea161a33385 +Author: 滔哥 +Date: Thu Nov 2 08:27:08 2017 +0800 + + * fix score config + +commit 32887bfd590c1da35a4704b8590984416b5387df +Author: 滔哥 +Date: Wed Nov 1 19:55:16 2017 +0800 + + * + parent task name + +commit 52f4d0f67b06be06e4c1b5a66f9dbb9ff15ffc80 +Author: 滔哥 +Date: Wed Nov 1 19:38:27 2017 +0800 + + * fix score annotate + +commit 4446a7160b7041926b6cb0fe282da2d9c000c090 +Merge: 7aa86734db 1a3a404677 +Author: 滔哥 +Date: Wed Nov 1 19:32:12 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7aa86734db64d124dd0c499f29de0526e774db94 +Author: 滔哥 +Date: Wed Nov 1 19:31:59 2017 +0800 + + * fix score module + +commit 1a3a404677e168e5c4078ee466f017d7a5e21d22 +Author: wangyidong +Date: Wed Nov 1 14:14:40 2017 +0800 + + * fix for custom required. + +commit d4dd502c31e6e404f4fc1ff593496d480c83121c +Merge: 8000d57e9d 0b90bae736 +Author: wangyidong +Date: Wed Nov 1 13:28:14 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8000d57e9d6cc05474d7a7ac116fc61c97084408 +Author: wangyidong +Date: Wed Nov 1 13:26:03 2017 +0800 + + * adjust for save custom with global. + +commit 0b90bae736e55e7cc87d80ec5b4a9dd439aff7c6 +Merge: a3a4a4bac0 3d17d07926 +Author: liugang +Date: Wed Nov 1 13:10:26 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a3a4a4bac0fbe1a35e69d1d99fa6ecd385490aef +Author: liugang +Date: Wed Nov 1 13:06:24 2017 +0800 + + * Fix bug #1216. + +commit 3d17d07926a46b1515dd26208a2df5a338e76b2b +Author: 滔哥 +Date: Wed Nov 1 11:32:57 2017 +0800 + + * fix format score config.php + +commit c5d9187bafc87350a77b098697770a7c3c8ec583 +Author: 滔哥 +Date: Wed Nov 1 11:29:07 2017 +0800 + + * fix score module + +commit 13c0df7fffbbc915bbcddb71742ef3d0fc1924e3 +Author: wangyidong +Date: Wed Nov 1 09:39:16 2017 +0800 + + Finish task#3238 项目挂起再激活的时候给用户选择是否顺延任务起止时间,cost:3 left:0 + +commit 4c9248f1dd0acc6916fae31afe29c164aeb5112c +Author: wangyidong +Date: Wed Nov 1 09:24:23 2017 +0800 + + Finish task#3281 批量编辑bug时，批量编辑页面会显示两条相同选择的数据,cost:1 left:0 + Finish task#3280 谷歌浏览器批量编辑需求、任务、用例时，显示数据重复。,cost:1 left:0 + +commit 3b246f43f14d08f3cbc059365aa3318b433d18be +Merge: c6b07c7bac 34b3df57e2 +Author: 滔哥 +Date: Tue Oct 31 21:15:18 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 34b3df57e21f361e44a5f08c9e6ab0ecc023fb92 +Author: liugang +Date: Tue Oct 31 16:33:58 2017 +0800 + + * Remove category from module menu. + +commit 6fc4e4850a5446fb726521868aa70912917e8aff +Merge: fc8e08698f f0914224f8 +Author: liugang +Date: Tue Oct 31 14:08:22 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit fc8e08698f57076f3991743aa8394379f49b8939 +Author: liugang +Date: Tue Oct 31 14:08:02 2017 +0800 + + * Browse products by category. + +commit f0914224f8cfa60c44400d4fc876484b85e600d2 +Author: wangyidong +Date: Tue Oct 31 13:15:10 2017 +0800 + + * adjust for task #3239. + +commit e9ac65b7dccb9bd4b9022ca2a90e6cafa7e59153 +Author: wangyidong +Date: Tue Oct 31 11:13:40 2017 +0800 + + * fix for task #3239. + +commit c6b07c7bac790ba37acfbfb4d16b326bd459410c +Merge: e3ea70b43a 9c7e311c8c +Author: 滔哥 +Date: Tue Oct 31 11:13:14 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e3ea70b43ac85436bf35f1a4b2965447ae7c7e06 +Author: 滔哥 +Date: Tue Oct 31 11:13:09 2017 +0800 + + * change score module + +commit 9c7e311c8cbf5815fa29dc956978992656498760 +Author: wangyidong +Date: Tue Oct 31 10:47:28 2017 +0800 + + Fix bug#1231 产品-计划中计划描述插入图片，在计划列表不显示，6.5之前版本描述插入图片会显示在计划列表中。 + +commit 09395f45e8ddac81364ad34a851e1e5431533c60 +Author: 滔哥 +Date: Tue Oct 31 10:14:12 2017 +0800 + + * add score for my model + +commit 44bc56d7e04357a6efdcd85e67f8be39aa15cd7c +Merge: 3d0dff1420 b56bacb0e1 +Author: 滔哥 +Date: Tue Oct 31 10:04:00 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3d0dff1420ba66a141f3569f586c7f9d2a2383cb +Author: 滔哥 +Date: Tue Oct 31 10:03:54 2017 +0800 + + * add score auth + +commit b56bacb0e11c1e45c9e44ba7077aef26668c4550 +Merge: aacff2955f 6dd2154233 +Author: wangyidong +Date: Tue Oct 31 09:00:39 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit aacff2955f0d04382579c74c7e23f0d26eaee947 +Author: wangyidong +Date: Tue Oct 31 09:00:21 2017 +0800 + + Finish task#3239 项目需求可以拖动排序,cost:4 left:0 + +commit 2dc822ca731f3346b302ac034ea585d7ea3d5460 +Merge: d42cf9b277 6dd2154233 +Author: 滔哥 +Date: Tue Oct 31 07:31:32 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d42cf9b277729feac0ad6e83d8d503c8f7c10f61 +Author: 滔哥 +Date: Tue Oct 31 07:31:28 2017 +0800 + + * add score init + +commit 6dd215423325166bf22538fdd0dc1daa3f847670 +Author: liugang +Date: Mon Oct 30 17:55:55 2017 +0800 + + * Add category to product. + +commit fd3553901440ca395a528a08a12af47f2301c43b +Author: liugang +Date: Mon Oct 30 16:01:03 2017 +0800 + + * @someone in message of dingding when assign an object. + +commit 09b7b0c0d2e5e363daf3abebaff308fe12ed1133 +Author: liugang +Date: Mon Oct 30 14:37:29 2017 +0800 + + * Adjust style. + +commit 3dd4a313657f7dd6228951691c184ca408fc2f5b +Merge: 3076736e9e 1b82933c0d +Author: liugang +Date: Mon Oct 30 14:27:33 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3076736e9eee5b5a3f80a5cbc321b571977fb1f0 +Author: liugang +Date: Mon Oct 30 14:26:51 2017 +0800 + + * Set default msgtype as markdown for dingding. + +commit 1b82933c0db4c77654f7edb2f242bcb2f1c4a6ad +Author: wangyidong +Date: Mon Oct 30 11:32:53 2017 +0800 + + Finish task#3237 所有项目 /所有产品页面增加导出功能,cost:2 left:0 + +commit a1d0b808521567e2f3f2f94f2c068fd65637fc0b +Merge: 0f2eb04f6a a0e8b24f25 +Author: wangyidong +Date: Mon Oct 30 08:18:36 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a0e8b24f25c2d2b53f39d3285def2c2b293029c7 +Author: 滔哥 +Date: Fri Oct 27 23:46:50 2017 +0800 + + * + score model + +commit 3833a7f861c14f94857423a366ac82a7e9712d42 +Merge: 0feb29c9e2 4b141a137f +Author: 滔哥 +Date: Fri Oct 27 23:46:15 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4b141a137fe3e13b443799be3de5d1a9234c699a +Merge: 99ffc7407b cba3dff61f +Author: liugang +Date: Fri Oct 27 17:40:55 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 99ffc7407b76ccc71c10a3bf216d651dffbea161 +Author: liugang +Date: Fri Oct 27 17:40:16 2017 +0800 + + * Add document link for entry. + +commit 0feb29c9e27ed9b7b0108bc52cff6fd4aecda10c +Merge: cd16f35a54 cba3dff61f +Author: 滔哥 +Date: Fri Oct 27 15:36:45 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0f2eb04f6aa0fbe36e5f746e52ff52cc311d3b0a +Author: wangyidong +Date: Fri Oct 27 14:21:12 2017 +0800 + + Fix bug#1258 每日提醒有错误记录 + +commit cba3dff61f34b3faccaf4884757ec32c81772be4 +Author: wangyidong +Date: Fri Oct 27 13:30:18 2017 +0800 + + Finish task#3243 看板增加自定义设置显示颜色的功能,cost:4 left:0 + +commit cd16f35a54ebd8dd4caaf99eb9e54c2df85dafc9 +Merge: d9290cbf9b 8f90f7b8e6 +Author: 滔哥 +Date: Fri Oct 27 11:15:33 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d9290cbf9bdf86fd92d06b5dbd374223de280f4e +Merge: fc52d683c7 d41c411bfd +Author: 滔哥 +Date: Fri Oct 27 11:15:28 2017 +0800 + + * + score in all model + +commit 8f90f7b8e6fdafa90d05576863c0f3419b7dd8fc +Author: wangyidong +Date: Fri Oct 27 11:14:13 2017 +0800 + + * adjust for dao cache. + +commit a8cbbd2aefd313bb89dfb349f6cbc332bf12f86a +Merge: 5bd85abc7c 7116d5b454 +Author: wangyidong +Date: Fri Oct 27 10:58:17 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5bd85abc7c0172f14e788fec1025b8b38c7cb4b0 +Author: wangyidong +Date: Fri Oct 27 10:57:15 2017 +0800 + + * fix for dao cache. + +commit 7116d5b45421135970d36cb6694310b65f718a28 +Author: liugang +Date: Fri Oct 27 10:26:11 2017 +0800 + + * Add function to avoid error when user cron to async send message. + +commit 3acbf6bd0a4c5a33779c804b2e6b9470bb76d8d7 +Author: liugang +Date: Fri Oct 27 09:10:05 2017 +0800 + + * Add @xxx function when post message to dingding. + +commit d41c411bfd7f8d76f129fb91a8f90615b8d8d843 +Author: liugang +Date: Thu Oct 26 18:36:41 2017 +0800 + + + Finish task #3244. + +commit 6ba9bc8b88349374cfe6476dafbe2aba9c3ef85b +Author: liugang +Date: Thu Oct 26 18:12:31 2017 +0800 + + * Finish task #3245. + +commit c4f435237e66fdb944b959f8e5180e0c490cff0d +Merge: 8f6026ca78 ee25589b77 +Author: liugang +Date: Thu Oct 26 17:55:18 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8f6026ca785b3979c48e232b01d7981fe815acc8 +Author: liugang +Date: Thu Oct 26 17:54:34 2017 +0800 + + + Add api.php as entrance. + +commit fc52d683c7c475b6dfab56a15d9cbc875554cd58 +Merge: 001057edb0 ee25589b77 +Author: 滔哥 +Date: Thu Oct 26 17:26:12 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 001057edb00240f7361c3c68207d4ed0167f4ddb +Author: 滔哥 +Date: Thu Oct 26 17:26:09 2017 +0800 + + * + my score log + +commit 7c066756bdd0e1a648115c12dff842b0697642bf +Author: wangyidong +Date: Thu Oct 26 14:16:07 2017 +0800 + + Finish task#3256 看板可以按照其他的字段进行分组,cost:7 left:0 + +commit ee25589b77d75e1e4d0f2230e172df6b1e5041b1 +Merge: 4626e4f0d1 14ab071b46 +Author: wangyidong +Date: Thu Oct 26 08:56:48 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4626e4f0d14b6649ea9f6120a6d8fbedae9a17b9 +Author: wangyidong +Date: Thu Oct 26 08:56:01 2017 +0800 + + * fix for error. + +commit b4379937b58ebbdbe3b1d3ebccb290f6aa8a9cc7 +Author: wangyidong +Date: Thu Oct 26 08:55:43 2017 +0800 + + Finish task#3278 增加项目->需求看板模式。,cost:4 left:0 + +commit 87ce0c4f00d75d89126d01c508c6867ef3a61893 +Author: wangyidong +Date: Wed Oct 25 22:20:03 2017 +0800 + + * adjust for check limited in all checked. + +commit 14ab071b4630ad3e330bdea17bcaa04eb4c637d4 +Author: liugang +Date: Wed Oct 25 17:20:27 2017 +0800 + + * Fix bugs. + + Save log when an entry visit zentao. + +commit a192a263484abeac4cccdc7744deb74cc45651ae +Author: liugang +Date: Wed Oct 25 15:23:06 2017 +0800 + + * Compare webhook products and action product. + +commit 9375676a666e8ca3be038515db327125e2747bb9 +Author: liugang +Date: Wed Oct 25 15:06:47 2017 +0800 + + * Fix bugs. + +commit 51db6a81b90e54111f80274a8106ab07826e107a +Author: liugang +Date: Wed Oct 25 14:01:34 2017 +0800 + + * Add api to send message to dingding. + +commit 9f355a2d3d75eb264f326705758a65c55b082d54 +Merge: 7212c1a4ac 66ff400d7a +Author: liugang +Date: Wed Oct 25 12:01:12 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7212c1a4accbfd7f0067d20717342447b0ac12c7 +Author: liugang +Date: Wed Oct 25 11:25:11 2017 +0800 + + * Adjust sql. + +commit 66ff400d7acb66d4d09e63a60b526a136d6ed045 +Author: 滔哥 +Date: Wed Oct 25 11:09:54 2017 +0800 + + * add score admin authority + +commit 39b46a01cf2835bf4354e1def1c40dc8ea1b2042 +Author: 滔哥 +Date: Wed Oct 25 10:49:05 2017 +0800 + + + add score switch of custom + +commit 48024e6cf8a8822495b64daba636bfa31a9b8be9 +Author: wangyidong +Date: Wed Oct 25 10:48:31 2017 +0800 + + Finish task#3273 操作受限用户无法创建待办和日志,cost:1 left:0 + +commit deb8adaec619865aee91994c75edece72b2c8c85 +Merge: 04528419bd 729f39daeb +Author: wangyidong +Date: Wed Oct 25 10:26:39 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 04528419bd3c35a2a21d121a93c8f6487805904c +Author: wangyidong +Date: Wed Oct 25 10:26:25 2017 +0800 + + Finish task#3272 后台-二次开发-编辑器 存在安全漏洞,cost:1 left:0 + +commit 7280a01aa31803fd4d9c08e37fd25a8b45a5cb66 +Merge: f560cb7091 7a9edad861 +Author: wangyidong +Date: Wed Oct 25 10:10:44 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f560cb7091e00171be956a2c95bf8d06b69b3e0e +Author: wangyidong +Date: Wed Oct 25 10:10:31 2017 +0800 + + Finish task#3277 调整测试报告,cost:4 left:0 + +commit 729f39daeb1e458ebaa1da223997f7e9be718d9a +Author: sgm0422 <976204163@qq.com> +Date: Wed Oct 25 10:10:24 2017 +0800 + + * Fix Bug #1234. + +commit 7a9edad86116c3eb56c0ad001370d819e3016bbb +Author: 滔哥 +Date: Wed Oct 25 09:59:35 2017 +0800 + + * + grouptask style add childTask + +commit 029150bb5b81f4f66daa2828f723521cbcd58971 +Merge: 2d0dbe98e0 9db67eb25b +Author: 滔哥 +Date: Wed Oct 25 09:49:32 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2d0dbe98e047f0d5f8cdd72178d48f6875d9b63c +Author: 滔哥 +Date: Wed Oct 25 09:49:28 2017 +0800 + + * + score sql + +commit 9db67eb25bb4f5d9cdf628c1d1ab6f52c0786462 +Merge: 785c49ca54 e066c51c8e +Author: liugang +Date: Wed Oct 25 09:47:11 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e066c51c8e6697e66beaeae26b5346fd98d54f9f +Author: 滔哥 +Date: Wed Oct 25 09:36:37 2017 +0800 + + * fix common style + +commit 6e2f0aa9bd82b18c6f22bff70e24562b045c941a +Author: 滔哥 +Date: Wed Oct 25 09:36:25 2017 +0800 + + * fix common style + +commit 0cd0caa4511b94014507e3dcaed8eebc677f50d3 +Author: 滔哥 +Date: Wed Oct 25 09:36:01 2017 +0800 + + * fix bug + +commit 83ff859016d232d79f2b553edeaf5ead4cbdc621 +Author: 滔哥 +Date: Wed Oct 25 09:35:49 2017 +0800 + + * fix bug + +commit 12cfe294fcde193036046ffc1c0f90e19788c70b +Author: 滔哥 +Date: Wed Oct 25 09:34:48 2017 +0800 + + * + child task export + +commit 785c49ca549aaa6709cda570429a05d999a2fbe4 +Author: liugang +Date: Tue Oct 24 18:10:07 2017 +0800 + + * Fix bug. + +commit 37bb58a23ed48e05718e33a4c5d40bf439da396f +Merge: a259217bdf 5e3cc44e86 +Author: liugang +Date: Tue Oct 24 18:02:30 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a259217bdfa0466d7513ada390bc8abbfe6443f5 +Author: liugang +Date: Tue Oct 24 18:01:56 2017 +0800 + + + Post data when hook is triggered. + + Add log. + +commit 5e3cc44e86027da24ac3fcf583f4249182d9ab34 +Merge: 87d230dd2a 9b2bb638dd +Author: wangyidong +Date: Tue Oct 24 17:22:15 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 87d230dd2a3faa98567f5b788e7c506b2ad62044 +Author: wangyidong +Date: Tue Oct 24 17:21:39 2017 +0800 + + * fix bug for report. + +commit 9b2bb638dd53148c923c7eff68f1b64f8e8ff5e0 +Author: sgm0422 <976204163@qq.com> +Date: Tue Oct 24 16:15:03 2017 +0800 + + * Fix Bug #1235. + +commit a9bc7fbd27e7dcaaea675e94d6090c7376702b6d +Author: 滔哥 +Date: Tue Oct 24 16:07:41 2017 +0800 + + * fix childTask + +commit a85c0ceaef0fa131ce756722bbe4662b78361818 +Author: 滔哥 +Date: Tue Oct 24 16:00:50 2017 +0800 + + * fix dataTable style + +commit 014e9585303b4b2d3d457156da9ee59b96c48636 +Author: 滔哥 +Date: Tue Oct 24 16:00:32 2017 +0800 + + * fix dataTable style + +commit 0c04dcbaa390f109a9b0ca4fb2293bdaa5bf644c +Author: 滔哥 +Date: Tue Oct 24 15:38:55 2017 +0800 + + * fix task + +commit fddfe83cb35c4dd83102941f258b00637046a0dd +Merge: 9b5f00ea0d 7eefad2430 +Author: 滔哥 +Date: Tue Oct 24 15:37:22 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9b5f00ea0d26580117954216ae6b327ae1b93bb7 +Author: 滔哥 +Date: Tue Oct 24 15:36:46 2017 +0800 + + * fix batchCreate + +commit 9b077f12c66c0490e4a82053c1f8b78b64a9623c +Author: 滔哥 +Date: Tue Oct 24 15:36:28 2017 +0800 + + * fix batchCreate + +commit 6c6c6183376b3f951bbe0f527798d30028657bb3 +Author: wangyidong +Date: Tue Oct 24 14:54:34 2017 +0800 + + Finish task#3262 各个表单的必填项字段可以自定义,cost:16 left:0 + +commit 7eefad2430248f8d53f1f090b080a09a0535111c +Author: sgm0422 <976204163@qq.com> +Date: Tue Oct 24 09:19:44 2017 +0800 + + * Fix bug #1237. + +commit 11a4dc28f0b513c0ebda91bc17c952421ef84b72 +Merge: b267870db4 a8e3dd25b9 +Author: sgm0422 <976204163@qq.com> +Date: Tue Oct 24 09:06:13 2017 +0800 + + Merge remote-tracking branch 'refs/remotes/origin/master' + +commit b267870db4d88e941dbb716680d1571c9af11a07 +Author: sgm0422 <976204163@qq.com> +Date: Tue Oct 24 09:03:43 2017 +0800 + + * Fix bug #1245. + +commit a8e3dd25b97012534e23676a620f5827e3f2395c +Author: 滔哥 +Date: Tue Oct 24 08:46:41 2017 +0800 + + * childTask status change + +commit 91eb91ecb1b9a41a3823e1cb0679cd2e39c59881 +Author: 滔哥 +Date: Mon Oct 23 21:16:23 2017 +0800 + + * format task model + +commit 4a7c7c74027d73e2b413293ec52fbe176b1ca465 +Author: 滔哥 +Date: Mon Oct 23 21:13:35 2017 +0800 + + * Task Status change + +commit c0ccf6ff4bc060dc055e5e00c21e80aea4c42f41 +Author: 滔哥 +Date: Mon Oct 23 17:48:26 2017 +0800 + + * Task style + +commit d3358d463787ec652789d8266db8476f25ad0661 +Author: 滔哥 +Date: Mon Oct 23 17:32:20 2017 +0800 + + * change children style + +commit b252c629d94ed7d5e589dd265180aa06b62e76a2 +Merge: 1508828fc1 c9805574df +Author: wangyidong +Date: Mon Oct 23 17:21:30 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1508828fc15866ee8903d6c76952654afc488b38 +Author: wangyidong +Date: Mon Oct 23 17:21:04 2017 +0800 + + * fix bug select all. + +commit c9805574df39ca0cd7a12254c0afa737d45ba908 +Author: 滔哥 +Date: Mon Oct 23 17:15:45 2017 +0800 + + * task children style + +commit 4f14940ecea471beb05f0eaa66ef844b340e3380 +Merge: 492bf6e956 2b5d8d1640 +Author: 滔哥 +Date: Mon Oct 23 16:51:01 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 492bf6e956542f888ca176ee114903f2a6fba6a3 +Author: 滔哥 +Date: Mon Oct 23 16:50:48 2017 +0800 + + * Task Bug + +commit 2b5d8d16407cee21e82d59202bb6883c89bb7571 +Merge: 5801f9c07d 540e02f895 +Author: wangyidong +Date: Mon Oct 23 16:36:46 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5801f9c07de9d0e9cf47a72306b598b72466e71f +Author: wangyidong +Date: Mon Oct 23 16:36:02 2017 +0800 + + * fix bug for browse list page. + +commit cd23a2dd23d2dec7f0680bdf29927fa1ac3f43e6 +Author: 滔哥 +Date: Mon Oct 23 14:09:58 2017 +0800 + + * multiTask assignedDate empty value bug + +commit 540e02f895c499eb45f572d162ef31ea74667df9 +Author: 滔哥 +Date: Mon Oct 23 13:59:34 2017 +0800 + + * add task lang + +commit cf94b99b5b264f5493e7bd9069794c9a46ce6cb6 +Author: 滔哥 +Date: Mon Oct 23 13:37:34 2017 +0800 + + es->ea + +commit a8c27a1513eb030956df7c8eae236f03b2a6f2fc +Author: 滔哥 +Date: Mon Oct 23 13:19:06 2017 +0800 + + * fix task model empty + +commit b19c1ce1eb74798cd095b2600db4f66050446b9c +Author: 滔哥 +Date: Mon Oct 23 10:28:27 2017 +0800 + + .DS_Store + +commit e99bdc37858f64b9e589e3c066f101d0a53fd24b +Author: wangyidong +Date: Mon Oct 23 09:13:53 2017 +0800 + + * revert .gitignore. + +commit 0970f411a6c3282756f2184b919d304e7abe4be3 +Merge: 0a79bdc4bb 53d0b2b8fa +Author: wangyidong +Date: Mon Oct 23 09:11:20 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 53d0b2b8fa4ce8fca1dfbc2ba60d4ae3257fcda1 +Author: 滔哥 +Date: Fri Oct 20 16:40:21 2017 +0800 + + view add btn for childTask + +commit 0a79bdc4bb7f667cb4a64e9ede2daf6e8df00a25 +Merge: c312b64220 08a528f85b +Author: wangyidong +Date: Fri Oct 20 16:28:40 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c312b64220222a56eb7c67cbdb4ac270cbbbfaf7 +Author: wangyidong +Date: Fri Oct 20 16:27:17 2017 +0800 + + Finish task#3253 优化看板卡片弹出菜单的位置,cost:1 left:0 + Finish task#3243 看板增加自定义设置显示颜色的功能,cost:3 left:0 + Finish task#3242 看板增加默认展开/折叠任务选项卡的功能,cost:1 left:0 + Finish task#3241 看板增加显示/隐藏已关闭已取消任务的功能,cost:2 left:0 + +commit 08a528f85beb9f3e1b8d10ae44c55d15e4937ff7 +Author: 滔哥 +Date: Fri Oct 20 16:24:50 2017 +0800 + + "fix debug level 2" + +commit 371b945d32baadd23a1d46844e1b6cd942d6336a +Author: 滔哥 +Date: Fri Oct 20 15:49:07 2017 +0800 + + framework + +commit 421e046c930cb8b41990af585da9994d2759c50b +Author: 滔哥 +Date: Fri Oct 20 15:17:24 2017 +0800 + + "style change" + +commit 1f102d851de8264d3e4a05d44c06faf3d78c21ef +Author: 滔哥 +Date: Fri Oct 20 15:11:27 2017 +0800 + + "Task list add btn" + +commit 984f3940c9b8a966633351a9b7e491c46242a822 +Author: 滔哥 +Date: Fri Oct 20 14:31:55 2017 +0800 + + change .gitignore + +commit 303ad1cb7da34d7c4d3615f804c7069177e95deb +Author: lvtao320 +Date: Fri Oct 20 14:26:43 2017 +0800 + + Update helper.class.php + +commit 2cf44d57e6354f0f32ce5ef97e75703d4ad2f9cb +Author: 滔哥 +Date: Fri Oct 20 14:18:41 2017 +0800 + + (gitignore commit and remove .idea) + +commit 9ba2bbdb9e4e3154324982ec83ec3866806c0581 +Author: 滔哥 +Date: Fri Oct 20 14:12:39 2017 +0800 + + add database change + +commit 9043edd8ca2daf06eae854e475d191c6a0b8f09e +Merge: 129834b30f 4b52f18cbf +Author: 滔哥 +Date: Fri Oct 20 14:08:01 2017 +0800 + + add childTask and multiTask + +commit 129834b30fae3ceb2b8fb87a118e018d15eb2321 +Author: 滔哥 +Date: Fri Oct 20 13:50:48 2017 +0800 + + * childTask and multiTask + +commit 4b52f18cbfc0266e2c82e849f482e79c8c4937bf +Author: wangyidong +Date: Thu Oct 19 16:12:13 2017 +0800 + + Finish task#3240 看板增加任务的暂停状态栏显示,cost:1 left:0 + +commit b965b706a86a26814b45239a6bd9c23255bd2355 +Author: wangyidong +Date: Thu Oct 19 14:31:03 2017 +0800 + + Finish task#3252 管理员可以将自己的菜单配置作为公共的配置,cost:3 left:0 + +commit 608a43c263795fb12522359f55b81d9297496a4c +Merge: 19dc3cdae5 29cd0d4b4e +Author: wangyidong +Date: Thu Oct 19 13:47:44 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 19dc3cdae5cc31f91786c32ec0d3c430d82153c5 +Author: wangyidong +Date: Thu Oct 19 11:17:25 2017 +0800 + + Finish task#3255 禅道中所有列表页面都增加自定义显示字段的功能,cost:12 left:0 + +commit 29cd0d4b4e55961ae79880413ed099028c2f4ea6 +Author: liugang +Date: Thu Oct 19 10:41:29 2017 +0800 + + * Add entry and webhook module. + +commit fe16db7484650052a23528227915ce321bac24ab +Author: wangyidong +Date: Wed Oct 18 16:53:33 2017 +0800 + + Finish task#3247 管理员可以自定义所有人用的列表的默认布局。,cost:5 left:0 + +commit 5f0c90a9231938d646b6d3be91660ac199538a6f +Author: wangyidong +Date: Tue Oct 17 14:54:56 2017 +0800 + + * fix for link story in plan for branch. + +commit f21a790b271f99c13eb4eaae26ab8e7fb3e0a162 +Merge: 735f0ad1d1 912548e494 +Author: wangyidong +Date: Tue Oct 17 14:16:19 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 735f0ad1d18e63ee586b31ab79b4a4146bad7310 +Author: wangyidong +Date: Tue Oct 17 14:04:11 2017 +0800 + + * fix task #3254. + +commit 912548e494c3fa87683466914c41534c06c68b9e +Author: liugang +Date: Mon Oct 16 16:52:10 2017 +0800 + + * Add update sql. + +commit f289ed31b1c244cf29e1cdd8a739f21b43bee88b +Author: wangyidong +Date: Mon Oct 16 13:43:20 2017 +0800 + + * finish task #3246. + +commit eaedc6d2c0cd638e79c986fe210cf4f346c67fe8 +Author: wangyidong +Date: Mon Oct 16 09:00:32 2017 +0800 + + * adjust for batchedit.html.php + +commit c09caf8a77a1c915626077111eb5a2beb4ef418f +Author: wangyidong +Date: Fri Oct 13 10:53:15 2017 +0800 + + * fix bug for delete useless file. + +commit 0ac8704898fcb7b88efd05a40e5a0484ae3c89f9 +Merge: aa54f5bb0c 82843f6476 +Author: wangyidong +Date: Fri Oct 13 09:20:55 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit aa54f5bb0c314c748347bf22e45e7bf06dee5082 +Author: wangyidong +Date: Fri Oct 13 09:17:24 2017 +0800 + + * remove test code and fix bug. + +commit fe7eea2227e372c7f734f6b41e77baa67169fbab +Author: wangyidong +Date: Fri Oct 13 09:16:31 2017 +0800 + + * fix for batch assign in safari. + +commit 09e803a091bbac77398dfe1cfc810b0bd6d9e760 +Author: wangyidong +Date: Fri Oct 13 09:15:57 2017 +0800 + + * adjust for dao cache. + +commit 82843f6476ee8ebb62f43cd51ec692cb268d1851 +Author: Catouse +Date: Wed Oct 11 10:23:46 2017 +0800 + + * fix setFormAction error in mac safari. + +commit 554db50b248491e18828d8942efb8f17cdabb9f1 (tag: zentaopms_9.5.1_20170927) +Author: wangyidong +Date: Thu Sep 28 08:51:44 2017 +0800 + + * fix bug for upgrade. + +commit acac70d6cec147392a74b8f5810d1ab45abaa5cd +Author: wangyidong +Date: Wed Sep 27 16:49:10 2017 +0800 + + * fix bug for create bug. + +commit d6f43d83dc06dded90dec8f35eb9c33365183a8f +Author: wangyidong +Date: Wed Sep 27 10:11:25 2017 +0800 + + * change for CHANGELOG + +commit 99b05decfc6d614da78da544d8cb153fe3bf9d46 +Author: wangyidong +Date: Wed Sep 27 10:04:17 2017 +0800 + + * fix error for actions. + +commit f4828cf504d80737caf3bc49e2c145f491f56d89 +Author: wangyidong +Date: Tue Sep 26 16:44:45 2017 +0800 + + * adjust for db. + +commit 06752d4cb3f528633b9333bfc24575e19a6673ce +Author: wangyidong +Date: Tue Sep 26 13:45:32 2017 +0800 + + * add new version and upgrade. + +commit 50460830e201bdccd87903fb35683605b3150741 +Author: wangyidong +Date: Tue Sep 26 11:08:11 2017 +0800 + + * adjust for limited user. + +commit 87b37b3a677c7c7e152d119cde250c423ced5aca +Author: pengjiangxiu +Date: Fri Sep 22 14:24:41 2017 +0800 + + * Delect instal step2 check gd. + +commit 3f92a560a1c269b2e944f3c049c32d45a85e6318 +Author: pengjiangxiu +Date: Thu Sep 21 14:23:40 2017 +0800 + + * Install page replace zdoo to xuanxuan. + +commit 39186201c41fac1e647f77508ab6d095930e8eed +Author: pengjiangxiu +Date: Thu Sep 21 11:25:37 2017 +0800 + + * Adjust code. + +commit a0779473fc65bd352f817681ea8efa39165b0bbe +Author: pengjiangxiu +Date: Thu Sep 21 09:10:22 2017 +0800 + + * Finish task #3220. + +commit 221a7e1db9244475378554d03955135df6d95f79 +Merge: 6a8f072e42 cd35bd4c4e +Author: pengjiangxiu +Date: Wed Sep 20 15:37:54 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6a8f072e423db3ff123e388220c09b9e3d8a835d +Author: pengjiangxiu +Date: Wed Sep 20 15:37:26 2017 +0800 + + * Finish task #3224. + +commit cd35bd4c4e7032da3ae9e57bb5981684dca659d9 +Merge: d8c7507020 5d3014cc72 +Author: wangyidong +Date: Wed Sep 20 15:24:55 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d8c7507020bb4ccbce59a7dfc7aa43ebb36e9e07 +Author: wangyidong +Date: Wed Sep 20 15:24:27 2017 +0800 + + * adjust for save novice config. + +commit f6647bd9b85d4c6da2d614d6753b9151e99c586b +Author: wangyidong +Date: Wed Sep 20 15:23:50 2017 +0800 + + * change for allowed. + +commit 5d3014cc72616ff85f4e8eece2dd029a60d5c7b4 +Merge: cb35c2a358 da796c772c +Author: Catouse +Date: Wed Sep 20 11:16:31 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cb35c2a35899c6167f640606bad29bf3d60eb9b7 +Author: Catouse +Date: Wed Sep 20 11:16:24 2017 +0800 + + * update chosen. + +commit da796c772c64dd318aa52cbdc420a25707afade1 +Author: pengjiangxiu +Date: Tue Sep 19 15:01:39 2017 +0800 + + * Finish task #3209. + +commit 41a2fc9a8f2a66a245195a9eb5444c4adc957db7 +Author: pengjiangxiu +Date: Tue Sep 19 13:56:39 2017 +0800 + + * Finish task #3210. + +commit d343eebc93b633fd7efb5b0a02dd0f90428d9416 +Author: pengjiangxiu +Date: Fri Sep 15 09:35:40 2017 +0800 + + * Finish task #3222. + +commit 2dfce57503d8f749b557e7142f064c357f36450d +Author: pengjiangxiu +Date: Thu Sep 14 15:21:51 2017 +0800 + + * Finish task #3214. + +commit 26010c31672eed8c164a1eddf6bdb4a52c8778af +Author: pengjiangxiu +Date: Thu Sep 14 14:37:32 2017 +0800 + + * Finish task #3202. + +commit 844ee7452f1aa1045ab5fa812bd58675e5f50cdd +Author: pengjiangxiu +Date: Thu Sep 14 11:07:28 2017 +0800 + + * Finish task #3224. + +commit 33d1d0b2d0ba350c3b6bcd24ef4dd491f9ca46a3 +Author: pengjiangxiu +Date: Wed Sep 13 17:22:36 2017 +0800 + + * Finish task #3221. + +commit 239f0130fd79b519ff8a12ebaacef0ca4e37d83b +Author: pengjiangxiu +Date: Wed Sep 13 17:06:00 2017 +0800 + + * Finish task #3220. + +commit f1efc0e51e8dc8fcfc37a8ac706e1b7a17887f29 +Author: pengjiangxiu +Date: Wed Sep 13 16:28:56 2017 +0800 + + * Finish task #3219. + +commit 479a1b1ea86a662c032dad979888238e8aee79e0 +Author: pengjiangxiu +Date: Wed Sep 13 09:39:11 2017 +0800 + + * Finish task #3218. + +commit c10a3cb7b514aaa815e7014ee73dc1818359ebff +Author: pengjiangxiu +Date: Tue Sep 12 16:08:41 2017 +0800 + + * Finish task #3226. + +commit 384208467f8282a204629137c28a31e8f1a56ca5 +Author: pengjiangxiu +Date: Tue Sep 12 15:26:39 2017 +0800 + + * Finish task #3217. + +commit e6c4b189f89b21fba990fb6a8116bceccc77cbca +Author: pengjiangxiu +Date: Tue Sep 12 14:52:25 2017 +0800 + + * Finish task #3215. + +commit 2cf53afcebfe071fb72afc45238b4f3748253f3f +Author: pengjiangxiu +Date: Tue Sep 12 14:14:36 2017 +0800 + + * Finish task #3216. + +commit 16f87e721da55916d79c4146d84b7688f6907584 +Author: pengjiangxiu +Date: Tue Sep 12 14:02:07 2017 +0800 + + * Finish task #3213. + +commit 74c5559c7b932adf61e771d55a9882842f0ff22a +Author: pengjiangxiu +Date: Tue Sep 12 10:42:56 2017 +0800 + + * Finish task #3207. + +commit 60f3998e0946cd955196907ac022b5a7b25c64e0 +Author: pengjiangxiu +Date: Tue Sep 12 10:17:43 2017 +0800 + + * Finish task #3203. + +commit 9eda515927f8dcf074a35642ff962390b10559fd +Author: pengjiangxiu +Date: Tue Sep 12 09:49:59 2017 +0800 + + * Finish task #3211. + +commit 40a3419f056cda12c0a015fc80ab0de674ed6f69 +Author: pengjiangxiu +Date: Mon Sep 11 16:10:50 2017 +0800 + + * Finish task #3223. + +commit acd00ec17c0d2292f2b1609e9eba425a807a7914 +Merge: c8049d270a b3369097a9 +Author: pengjiangxiu +Date: Mon Sep 11 15:21:04 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c8049d270ac2d412049c146c3d8a2d2358e61fbb +Author: pengjiangxiu +Date: Mon Sep 11 15:14:30 2017 +0800 + + * Finish task #3209. + +commit dd146a6bfcc3ccc14288dd8d0be556238d60fc19 +Author: wangyidong +Date: Mon Sep 11 13:03:37 2017 +0800 + + * add pptx in allowed file config and fix svn cat in action. + +commit b3369097a9ede5fa8e1710bc315e0ed994b32910 +Author: wangyidong +Date: Mon Sep 11 10:06:41 2017 +0800 + + * fix for zentaobiz. + +commit 4a0912d655c11ad54cdbbf8b33cdffabc315cea8 +Merge: 08c473b8ca 5a138ea592 +Author: wangyidong +Date: Fri Sep 8 16:19:54 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 08c473b8caac3cae8f0651b4c0241b51f43be72b +Author: wangyidong +Date: Fri Sep 8 16:19:32 2017 +0800 + + * fix bug for zentaobiz. + +commit 5a138ea5925da15f13e730963660a75834e04738 +Author: pengjiangxiu +Date: Fri Sep 8 15:44:44 2017 +0800 + + * Finish task #3206. + +commit a1570d6b75daee05aca68c477cac7e3a2928d4e2 +Author: pengjiangxiu +Date: Fri Sep 8 14:21:12 2017 +0800 + + * Finish task #3204. + +commit fec29072d97093943d97be4d524ae6391be02d22 +Author: wyd621 +Date: Fri Sep 8 10:21:42 2017 +0800 + + * change style + +commit 96369ad840d49201bef4f9213d8679edea07887a +Author: wyd621 +Date: Fri Sep 8 10:17:42 2017 +0800 + + + add Readme_zh.md file + +commit de855054fcd75c1bb646b2af0391f98dd56c089f +Author: wangyidong +Date: Thu Sep 7 16:59:25 2017 +0800 + + * login with json. + +commit fa1c8e9d0ef22707c058f2ba8255369de44e79f5 +Author: wangyidong +Date: Thu Sep 7 16:28:09 2017 +0800 + + * fix bug. + +commit e7ece74a591b9278203e5478ccef63843a4f02cd +Author: wangyidong +Date: Thu Sep 7 14:34:38 2017 +0800 + + * adjust for upgrade. + +commit 41a360d076538bc93a18b1cb305a49b475393293 +Author: wangyidong +Date: Thu Sep 7 13:14:35 2017 +0800 + + * fix for check priv action link. + +commit 23c7f8a94e4cd9bc63e181ab0f76e16a27945c79 +Author: wangyidong +Date: Thu Sep 7 12:19:51 2017 +0800 + + * fix for search in testtask cases page. + +commit 3400e5a1433354569703a6f9d2e46e76b32c903a +Author: wangyidong +Date: Wed Sep 6 14:36:48 2017 +0800 + + * adjust for edit in modal. + +commit fc5ceafb4b8d9e930128b1029413601b43f96fe1 +Merge: f60a4c664b 81b0d5d770 +Author: wangyidong +Date: Mon Sep 4 14:46:41 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f60a4c664b7f027daf845a3ecdf35664860bdce3 +Author: wangyidong +Date: Mon Sep 4 14:46:17 2017 +0800 + + * custom show deleted user. + +commit ded7a07ad7ccecc5b539e73dd5b5d0f9716a311a +Author: wangyidong +Date: Mon Sep 4 14:46:02 2017 +0800 + + * adjust for oa. + +commit 81b0d5d770bf178fdf5bfa02ac6324277217f9ca +Author: sgm0422 <976204163@qq.com> +Date: Mon Sep 4 14:16:03 2017 +0800 + + * Fix Bug #1211. + +commit 5c5a3eecbee5c8a024d418a2bab3ec10fa96a89c +Author: sgm0422 <976204163@qq.com> +Date: Mon Sep 4 08:55:41 2017 +0800 + + * Fix Bug #1210. + +commit 3ecf54ee7aed1671d558c7cc0c6535dffe302aae +Author: sgm0422 <976204163@qq.com> +Date: Tue Aug 29 13:07:24 2017 +0800 + + *Fix Bug #1208. + +commit 4220fa5ce47d07479ae53f78e79986a3e6c00ff6 +Author: Renee +Date: Tue Aug 29 09:47:41 2017 +0800 + + Update README.md + +commit c81685eaec295d14c1ecda379a788c4eaef9135f +Merge: cdc0fb9707 57e31b1daf +Author: sgm0422 <976204163@qq.com> +Date: Mon Aug 28 17:06:13 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cdc0fb97070c8c9752108e9e8b9676360049ef24 +Author: sgm0422 <976204163@qq.com> +Date: Mon Aug 28 16:53:33 2017 +0800 + + *Fix Bug #1207. + +commit 57e31b1daf183e3f961d9ea02ff3542e36388273 +Author: wangyidong +Date: Mon Aug 28 11:29:18 2017 +0800 + + * fix bug for testreport. + +commit 49f8f606f62e62012c431488c212ebd8eec91e8b +Author: wangyidong +Date: Fri Aug 25 16:31:23 2017 +0800 + + * fix bug for ajax form. + +commit 58529a4e798e2c2b719a9cd37573a5250839bc29 +Merge: 3eb18b024f 0965b0520b +Author: wangyidong +Date: Thu Aug 24 17:27:56 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3eb18b024f44a0926329644ec0a92e2219b176c6 +Author: wangyidong +Date: Thu Aug 24 17:27:11 2017 +0800 + + * remove space in php file. + +commit 0965b0520b7bdf9949c4bb9f8b201adff531a3b3 (tag: zentaopms_9.5.stable_20170824) +Author: pengjiangxiu +Date: Thu Aug 24 14:21:23 2017 +0800 + + * add version stable. + +commit ea306d3f3ba0c2480b586352b691cfb05c89011c +Author: pengjiangxiu +Date: Thu Aug 24 14:03:58 2017 +0800 + + * change lang file. + +commit 15ebe3b532610cb7772a8a1a32702526751d7182 +Merge: 66eabe8717 37b6e7eb5f +Author: wangyidong +Date: Thu Aug 24 13:55:27 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 66eabe87170ee3098b29ec702de33dca4388129e +Author: wangyidong +Date: Thu Aug 24 13:54:58 2017 +0800 + + * fix for mail no subject. + +commit 37b6e7eb5f649fe822757f77e911bd75cf3290d7 +Author: pengjiangxiu +Date: Thu Aug 24 10:46:37 2017 +0800 + + 添加了v9.5 upgrade信息. + +commit a96bb1775277f36ed54113ba5ace200a54e558f0 +Author: pengjiangxiu +Date: Thu Aug 24 09:40:53 2017 +0800 + + * * Adjust for bug batch activate. + +commit affcf9b642f58b86a0daae08d4117849f7dd430c +Author: wangyidong +Date: Thu Aug 24 09:20:45 2017 +0800 + + * adjust for block safe. + +commit 153006237e37199f01e5a712eca8e819e34baacf +Author: wangyidong +Date: Wed Aug 23 15:59:08 2017 +0800 + + * not save session in json. + +commit 51d786989cf577ed6a7084c1864e8c5129b2af5d +Author: wangyidong +Date: Wed Aug 23 15:48:05 2017 +0800 + + * adjust for action. + +commit 9dce33c3dff958f905cd56883341595ad01c1362 +Merge: 094c960bf4 202d76db45 +Author: wangyidong +Date: Wed Aug 23 14:56:32 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 094c960bf41d8276096138e1ef853db4a67364be +Author: wangyidong +Date: Wed Aug 23 14:55:49 2017 +0800 + + * finish task #3088. + +commit 202d76db45d22a730ec6e89505cb486ae9a20416 +Author: pengjiangxiu +Date: Wed Aug 23 13:08:06 2017 +0800 + + * Adjust code. + +commit 0ee04f80d1a40a44e5d7f230e2373ae58e884aec +Author: wangyidong +Date: Wed Aug 23 09:53:09 2017 +0800 + + * adjust for browse type style in show files page. + +commit 386f68277df99140b876c9a3ea4091ac06f94546 +Merge: 64880a3071 22ed90761e +Author: wangyidong +Date: Wed Aug 23 09:53:05 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 64880a3071cba916f4df82bc647be989e3d7cdb7 +Author: wangyidong +Date: Wed Aug 23 08:21:53 2017 +0800 + + * fix for search in import case from lib. + +commit 22ed90761e3dd777d7e76cef9d7cf191afa50630 +Merge: 7a318c92ab b09ad76835 +Author: Catouse +Date: Tue Aug 22 15:33:51 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7a318c92ab43b05da9bf48f819a2923e4ef9502e +Author: Catouse +Date: Tue Aug 22 15:33:45 2017 +0800 + + * support open todo view modal on load page with hash prefix 'todo-'. + +commit caf304be98edff43faa02c134dd759b2e23f56d7 +Author: Catouse +Date: Tue Aug 22 14:36:33 2017 +0800 + + * finish task #3155 and fix bug #1093. + +commit c0237c0648d17f168e7373574b93a36d7bcc1074 +Author: Catouse +Date: Tue Aug 22 14:35:54 2017 +0800 + + * remove console.log. + +commit 4ae7325f5b893c3178ab22478cac6850cf76562e +Author: Catouse +Date: Tue Aug 22 14:35:40 2017 +0800 + + * update zui. + +commit b09ad768353139fc82572b937b823a8d51279f2a +Author: wangyidong +Date: Tue Aug 22 14:18:56 2017 +0800 + + * adjust for safe. + +commit b0c67d90bb774ff312f97676f0cc9019a4f414ea +Merge: 34b794e39a e1005f67c5 +Author: wangyidong +Date: Tue Aug 22 13:44:49 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 34b794e39a59be63685092ca9f8f818c994e422d +Author: wangyidong +Date: Tue Aug 22 13:44:34 2017 +0800 + + * fix error. + +commit e1005f67c542e9fc7666fff0694ff512de4f9352 +Merge: 61b5f77f91 1ccf610088 +Author: pengjiangxiu +Date: Tue Aug 22 13:05:43 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 61b5f77f910489e7d337f412db1535a82a44306d +Author: pengjiangxiu +Date: Tue Aug 22 13:05:13 2017 +0800 + + * Finish task #3201. + +commit 1ccf610088cfa5744d3fe21e0990afadaae4bd11 +Merge: 8ea15d424f f33cca51e5 +Author: wangyidong +Date: Tue Aug 22 10:21:11 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8ea15d424fa90aeb128649ecb2ca9e60d5cdf914 +Author: wangyidong +Date: Tue Aug 22 10:20:24 2017 +0800 + + * finish task #3198. + +commit f33cca51e551c4e5a257c8b63eea948db294be1c +Author: pengjiangxiu +Date: Tue Aug 22 10:06:25 2017 +0800 + + * Fix bug for dev api. + +commit 1ee4465a04c60db662fdabe37e2e87c32cac124f +Author: pengjiangxiu +Date: Tue Aug 22 09:52:16 2017 +0800 + + * Fix dev bug. + +commit 27c423399d5ade3629385bc9e3ba240b7ab4a73d +Author: Catouse +Date: Mon Aug 21 19:15:19 2017 +0800 + + * finish task #3721. + +commit 9194c158b8508c892d3ab3fe5c36ee578ad7decb +Author: Catouse +Date: Mon Aug 21 18:53:33 2017 +0800 + + * finish task #3194. + +commit 624950cfc9bc094d7038a8f0decd02546f7998ab +Author: pengjiangxiu +Date: Mon Aug 21 16:04:00 2017 +0800 + + * Finish task #3187. + +commit fa707a14649d5c21fde35fb5eba56992432b328d +Author: wangyidong +Date: Mon Aug 21 16:00:42 2017 +0800 + + * code for task #3100. + +commit 2e798743cfe0e9efdd8fb25483f68ae93b54d72f +Merge: bfa5ff7352 ee2ec3bb84 +Author: wangyidong +Date: Mon Aug 21 14:48:02 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bfa5ff7352d7aa78d87ca2328630805bdb9f0b50 +Author: wangyidong +Date: Mon Aug 21 14:47:41 2017 +0800 + + * finish task #3190. + +commit 975a6ba2b93f87ebf73472a5cb00d350a99b81e5 +Author: wangyidong +Date: Mon Aug 21 14:46:05 2017 +0800 + + * fix for ajaxupdatefile. + +commit def8ddc63455543cdab82c6495e3f6b58ecaa7f7 +Author: wangyidong +Date: Mon Aug 21 14:44:48 2017 +0800 + + * finish task #3197. + +commit ee2ec3bb8478550cbe3e335485db5063978b90ec +Merge: 26ac9ca6b6 547355168d +Author: sgm0422 <976204163@qq.com> +Date: Mon Aug 21 14:27:41 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 26ac9ca6b6a678852599bb5c02144e47270660f0 +Author: sgm0422 <976204163@qq.com> +Date: Mon Aug 21 14:17:18 2017 +0800 + + *Fix Bug #1206 + +commit 547355168de439bb30e9002e81fc79da7885bda2 +Author: pengjiangxiu +Date: Mon Aug 21 13:29:51 2017 +0800 + + * Finish task #3195. + +commit 0479f33e151a98e27a9714d310f4aff23338c135 +Merge: 3f431a2110 f294f9b181 +Author: wangyidong +Date: Mon Aug 21 09:09:44 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3f431a2110e1064df76a47a18ac25c55f6a71a72 +Author: wangyidong +Date: Mon Aug 21 09:08:38 2017 +0800 + + * finish task #3128. + +commit f294f9b18188e971b415c2355d4a3c9c5a04fc7d +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 18 16:26:28 2017 +0800 + + * Fix Bug #1195. + +commit 4db02b2d4e1005d65a31491454bf307e2776ef84 +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 18 16:20:24 2017 +0800 + + * Fix Bug # 1200 + +commit 772b339664f7647f46562a9cebc87a0e47f25e8c +Merge: ef7000ff45 653648b3eb +Author: pengjiangxiu +Date: Fri Aug 18 15:21:14 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ef7000ff45f28c8949d8b75084026c55288648b9 +Author: pengjiangxiu +Date: Fri Aug 18 15:20:13 2017 +0800 + + * Adjust code. + +commit 653648b3eb18d33513be7045e1f3a9adb04b22b4 +Merge: 5e267814d0 7f6274c07d +Author: wangyidong +Date: Fri Aug 18 15:16:14 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5e267814d0db6eb2dc1c5a21830d48959708d04d +Author: wangyidong +Date: Fri Aug 18 15:15:55 2017 +0800 + + * finish task #3129. + +commit 7f6274c07d8855c7f0d8797dcb3f01c7f40e5f85 +Author: pengjiangxiu +Date: Fri Aug 18 15:10:07 2017 +0800 + + * Finish task #1201. + +commit 594310a61ad3801dd086350d41d3ed4549eafc63 +Author: pengjiangxiu +Date: Fri Aug 18 13:57:11 2017 +0800 + + * Finish task #1197. + +commit 4732bfaebcd4d8b9ced773c1b6ec04530fd90e22 +Author: pengjiangxiu +Date: Fri Aug 18 13:51:29 2017 +0800 + + * Finish task #3184. + +commit 223910e142fcd029fef187dd176a16a08162c354 +Author: wangyidong +Date: Fri Aug 18 13:28:46 2017 +0800 + + * finish task #3192. + +commit c06e7bfb03010f333209172deb342e08162104d0 +Merge: 432d852092 a8c478c4f2 +Author: wangyidong +Date: Fri Aug 18 13:05:06 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 432d852092df10e17ce786e3be5b628dd99a99fb +Author: wangyidong +Date: Fri Aug 18 13:04:45 2017 +0800 + + * finish task #3156. + +commit a8c478c4f27226cfbf147d1a64e121c5654a6383 +Author: pengjiangxiu +Date: Fri Aug 18 11:32:25 2017 +0800 + + * Finish task #3183. + +commit f090318a7abd73a3ab9a0f168bc546aa02236a82 +Author: wangyidong +Date: Fri Aug 18 11:05:27 2017 +0800 + + * finish task #3135. + +commit 1359fddbf1de4863ebcbbe675c9ae8a705e1c1a7 +Merge: d2485c8e82 1998bb4215 +Author: wangyidong +Date: Fri Aug 18 11:00:55 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d2485c8e8262574f9962ffb8339ff0fc43b5c93b +Author: wangyidong +Date: Fri Aug 18 11:00:38 2017 +0800 + + * finish task #3106. + +commit 1998bb421526cdc0eee0137abab5d3018b4eb682 +Author: pengjiangxiu +Date: Fri Aug 18 11:00:29 2017 +0800 + + * Finish task #3137. + +commit abc1180a2add7cb5b1a25a8f9700b328ae274346 +Merge: 70a30eb727 d4c5c73cf2 +Author: wangyidong +Date: Fri Aug 18 11:00:15 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 70a30eb72700a343909d3bd69acfa2d3fa87ea0e +Author: wangyidong +Date: Fri Aug 18 10:59:46 2017 +0800 + + * adjust page for editor edit. + +commit 257a478940a7b3b22ee50546390cd5cc4d4587a4 +Author: wangyidong +Date: Fri Aug 18 10:58:55 2017 +0800 + + * fix for show image in file download page. + +commit d4c5c73cf20ac945846eee7325949bd6c16de457 +Author: pengjiangxiu +Date: Fri Aug 18 09:34:33 2017 +0800 + + * Finish task #3150. + +commit 16af1cd29014709458eeef223c3323155a097afa +Author: wangyidong +Date: Thu Aug 17 16:29:15 2017 +0800 + + * finish task #3099. + +commit e28ceee2d921afc3e955618cfe7d625a7eb99f22 +Author: pengjiangxiu +Date: Thu Aug 17 11:26:42 2017 +0800 + + * Adjust code for tab to space. + +commit 9e34e50947a71b548455f99491529ea03b086824 +Author: pengjiangxiu +Date: Thu Aug 17 10:31:21 2017 +0800 + + * Finish task #3111. + +commit 6c19289354fc658914912c876ff932790e89ca48 +Author: pengjiangxiu +Date: Wed Aug 16 17:18:45 2017 +0800 + + * Finish task #3126. + +commit 8d909478e2bf45569dfbe688436556de470d02b8 +Author: wangyidong +Date: Wed Aug 16 16:52:45 2017 +0800 + + * finish task #3136. + +commit 865146cc4c8c59470992f76260c7a644292718af +Merge: 9a974c6c93 22d2a45563 +Author: wangyidong +Date: Wed Aug 16 16:44:43 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9a974c6c931941148ebe104e086e3f4a34c09561 +Author: wangyidong +Date: Wed Aug 16 16:44:19 2017 +0800 + + * finish task #3142. + +commit 22d2a455635d18e1bab1fb7b28f9bdbd5e3bf4a3 +Merge: 282d166ac5 0508eefd70 +Author: pengjiangxiu +Date: Wed Aug 16 16:27:29 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 282d166ac5dfd063bffdd5023a78587657664ce2 +Author: pengjiangxiu +Date: Wed Aug 16 16:26:46 2017 +0800 + + * Finish task #3131. + +commit 0508eefd70b0380d9412431a3bcf5326fcd5010e +Merge: e3d3d6f573 c6165b16d5 +Author: wangyidong +Date: Wed Aug 16 16:13:05 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e3d3d6f57326dd63acde21e98d5ace50f075cbde +Author: wangyidong +Date: Wed Aug 16 16:12:50 2017 +0800 + + * finish task #3109. + +commit c6165b16d5c2cdc2144f7fa8285da22fab5dd8e4 +Author: pengjiangxiu +Date: Wed Aug 16 15:47:57 2017 +0800 + + * Finish task #1202. + +commit 79b4d4d97c4c7092c90c5a326bc203b8cbf94062 +Author: wangyidong +Date: Wed Aug 16 15:15:05 2017 +0800 + + * finish task #3104. + +commit 9c0875d9616e671f8265a37db49c342110257e06 +Author: wangyidong +Date: Wed Aug 16 15:00:41 2017 +0800 + + * finish task #3143. + +commit 84e91fc75ad26e76ff8eb4967a4fc885af36e6f3 +Author: wangyidong +Date: Wed Aug 16 14:24:58 2017 +0800 + + * finish task #3102. + +commit ef4cbfd1e3dee8a679897cbe781b18116514ddce +Merge: a25a10d542 0480e28e67 +Author: wangyidong +Date: Wed Aug 16 13:33:11 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a25a10d542c4bfe0d12a625530d542eef3fd1e37 +Author: wangyidong +Date: Wed Aug 16 13:32:34 2017 +0800 + + * finish task #3147 and update HTMLPurifier. + +commit 0480e28e6794c146eb38b0be08fdc625a61d7174 +Author: pengjiangxiu +Date: Wed Aug 16 10:03:20 2017 +0800 + + * Finish task #3116. + +commit d805329387ee1fb8adfb0ec6a9539ed12d8c681b +Author: wangyidong +Date: Wed Aug 16 09:51:47 2017 +0800 + + * finish task #3087. + +commit bd622e3d2341a40b79e4205dcecbd706d015d91d +Author: wangyidong +Date: Wed Aug 16 09:36:51 2017 +0800 + + * finish task #3086. + +commit 25530314a76b76450acc12c65e4834680cbd7238 +Author: wangyidong +Date: Tue Aug 15 17:17:15 2017 +0800 + + * finish task #3154. + +commit 27a57e6ee3e26444706aefdc7d6b0ca4b7f70b6e +Author: wangyidong +Date: Tue Aug 15 17:04:15 2017 +0800 + + * finish task #3158. + +commit fc3f537836bc3180175cfda05a81ba710da72d49 +Author: wangyidong +Date: Tue Aug 15 16:25:25 2017 +0800 + + * finish task #3159. + +commit bbe6de3e621c1dc0ad6187414b25ea317f246afd +Merge: 68ac8081c6 4d72b7752e +Author: wangyidong +Date: Tue Aug 15 15:54:27 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 68ac8081c67a326433384443e5836fbecbc4df4c +Author: wangyidong +Date: Tue Aug 15 15:53:54 2017 +0800 + + * finish task #3163. + +commit 4d72b7752e50e5c63c2037564248019b01c07217 +Author: pengjiangxiu +Date: Tue Aug 15 13:55:14 2017 +0800 + + * Finish task #3138. + +commit 1c5907366358297af3ce27f7105143a888ae19d4 +Author: pengjiangxiu +Date: Tue Aug 15 13:10:43 2017 +0800 + + * Finish task #3146. + +commit 6ebfac505a121002e2eda5ec91163941e917a12f +Author: pengjiangxiu +Date: Tue Aug 15 11:13:40 2017 +0800 + + * Finish task #1081. + +commit 848f5b46646c3490c6d091d5f4a1270fc8914c54 +Author: pengjiangxiu +Date: Tue Aug 15 10:19:31 2017 +0800 + + * Finish task #3121. + +commit ce6ac2eb3e2c1e0749e315ad654bd6a5c2f259ff +Merge: 6bd68359da 69c16a2028 +Author: wangyidong +Date: Mon Aug 14 16:47:17 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6bd68359dae2d37f035bf5ae61bc9c403f4e264c +Author: wangyidong +Date: Mon Aug 14 16:46:59 2017 +0800 + + * finish task #3167. + +commit 69c16a20285eb0a54083791f21f7c0645131890a +Merge: ff0ff006b3 d0f3eb3906 +Author: pengjiangxiu +Date: Mon Aug 14 16:45:29 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ff0ff006b316f8d205d02af33a797e9205b30881 +Author: pengjiangxiu +Date: Mon Aug 14 16:45:22 2017 +0800 + + * Finish task #3123. + +commit d0f3eb3906291dc3e18a5644a27832b9ef271a9d +Merge: 07af0d08b4 2573fe9562 +Author: wangyidong +Date: Mon Aug 14 16:32:53 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 07af0d08b4adcfd265f7b6588dc00a88fc85e1d3 +Author: wangyidong +Date: Mon Aug 14 16:32:30 2017 +0800 + + * finish task #3168. + +commit 2573fe9562a414aa7e871edffd377ab03d8fe50a +Merge: 184fbce147 5954b34fd8 +Author: pengjiangxiu +Date: Mon Aug 14 14:34:53 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 184fbce14712694890037a51de30b28711fc30e0 +Author: pengjiangxiu +Date: Mon Aug 14 14:32:20 2017 +0800 + + + Add update9.4.sql + +commit 5954b34fd8ecf68f6dff4c049b90b919c20afd77 +Merge: 4636f763a2 3e86953b4a +Author: wangyidong +Date: Mon Aug 14 14:31:40 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4636f763a2c0c8718e343f489179274742cb0e6a +Author: wangyidong +Date: Mon Aug 14 14:31:10 2017 +0800 + + * finish task #3170. + +commit 3e86953b4a6a1363711d2361df62b3cafe330972 +Author: pengjiangxiu +Date: Mon Aug 14 11:34:42 2017 +0800 + + * Finish task #3124. + +commit 6a9d81161450bcbb946945b6bfb46a12a60b12a5 +Author: wangyidong +Date: Mon Aug 14 11:05:51 2017 +0800 + + * finish task #3173. + +commit 4f43386af8989edebebb2f36741d97bbda2e2ec8 +Merge: b91e47c2e7 dccebc7b9a +Author: wangyidong +Date: Mon Aug 14 10:05:57 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b91e47c2e706ae5e32d5e5cf405ae14fc91acaae +Author: wangyidong +Date: Mon Aug 14 10:05:30 2017 +0800 + + * finish task #3117. + +commit dccebc7b9a955cca607692764a826208fbd78397 +Author: pengjiangxiu +Date: Mon Aug 14 09:56:39 2017 +0800 + + * Finish task #3119. + +commit fdd13c22975a3b9c32d29dd2914b3bd4f8856237 +Author: pengjiangxiu +Date: Fri Aug 11 15:40:54 2017 +0800 + + * Finish task #3122. + +commit 3953a542fc941a84fa5f89134bbfe151a17f4708 +Author: pengjiangxiu +Date: Fri Aug 11 15:19:10 2017 +0800 + + * Finish task #3164. + +commit fdfe48a9044854f72c0dfda24c7dfc4dd4f6e0e6 +Author: pengjiangxiu +Date: Fri Aug 11 15:03:38 2017 +0800 + + * Finish task #3165. + +commit de0acf67eed2d86f8fbce0d9ca693985f777e0f9 +Merge: 6db420de76 2d17fc78ec +Author: wangyidong +Date: Fri Aug 11 15:02:29 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6db420de767c06b6dba4b9f4ca520e5f6289f17e +Author: wangyidong +Date: Fri Aug 11 15:02:01 2017 +0800 + + * adjust for framework page class. + +commit 359949f582116242421d94f8fe16d84d88029d59 +Author: wangyidong +Date: Fri Aug 11 15:00:52 2017 +0800 + + * finish task #3118. + +commit 2d17fc78ece5280d2f068407d0269b909e371793 +Author: pengjiangxiu +Date: Fri Aug 11 14:36:47 2017 +0800 + + * Finish task #3169. + +commit 24a0ed150ef3e9b9186585eac07d21281cd25748 +Author: sgm0422 <976204163@qq.com> +Date: Fri Aug 11 11:03:11 2017 +0800 + + * Fix bug #1189. + +commit 34cd31b93ba957ca2d08f01d562947fbe5bd7444 +Author: zhubaoxin <472455206@qq.com> +Date: Tue Aug 8 18:03:36 2017 +0800 + + * Fix Bug #1162. + +commit f0d3eb33291e88eb250460c456eda6643b01443d +Author: zhubaoxin <472455206@qq.com> +Date: Tue Aug 8 18:02:03 2017 +0800 + + * Fix Bug #1171. + +commit 5d2796ef23679c149429d85976369bf6f888f8c4 +Author: zhubaoxin <472455206@qq.com> +Date: Tue Aug 8 17:58:46 2017 +0800 + + * Fix Bug #1176 and #1175. + +commit 78898d425e955405c49d7b6f96220c52c0ad953d +Author: zhubaoxin <472455206@qq.com> +Date: Tue Aug 8 17:55:52 2017 +0800 + + * Fix Bug #1178. + +commit 0112ba79f9909557a88c5c18f37560d28f4bd761 +Author: zhubaoxin <472455206@qq.com> +Date: Tue Aug 8 17:45:25 2017 +0800 + + * Fix Bug #1179. + +commit ff56a58b7d7df290acc67fe972770db189d4f513 +Author: wangyidong +Date: Tue Aug 8 10:12:01 2017 +0800 + + * fix bug for search on menu. + +commit da39880a1c4c551c2d7cba8f98331622ae65aa07 +Author: wangyidong +Date: Tue Aug 8 08:21:58 2017 +0800 + + * adjust code for zentaobiz and fix bug. + +commit 619188a569ab192874a3a761332528f896eb85ec +Author: sgm0422 <976204163@qq.com> +Date: Thu Aug 3 17:31:43 2017 +0800 + + *Fix Bug #1148 + +commit c0a3efe8595706ea80bc0c1d24d732004b0c2898 +Author: sgm0422 <976204163@qq.com> +Date: Thu Aug 3 15:09:52 2017 +0800 + + * Fix bug: change 'limit' to 'LIMIT'. + +commit 4e414fe69d259fa183587b599b07a913524c97c3 +Author: zhubaoxin <472455206@qq.com> +Date: Thu Aug 3 09:52:20 2017 +0800 + + * Fix bug #1143. + +commit a1c10d3a94c702e9ecf940292126208d3a82f2cb +Author: zhubaoxin <472455206@qq.com> +Date: Thu Aug 3 09:38:38 2017 +0800 + + * Fix bug #1184. + +commit 9015fe0c34196a5bf4543af5939758bb1cb5d9e2 +Merge: c257df4e18 3f882d43f3 +Author: zhubaoxin +Date: Thu Aug 3 09:04:57 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c257df4e184aec0e6d1b01fe2e6f80065c4041cf +Author: zhubaoxin +Date: Thu Aug 3 09:02:30 2017 +0800 + + * Fix bug #1185. + +commit 3f882d43f3d8ae814207daa21fa2a1b6994f9f41 +Author: sgm0422 <976204163@qq.com> +Date: Wed Aug 2 17:32:54 2017 +0800 + + * Fix Bug #1149. + +commit bd76d2bca25f6e64fc34413d42d38abb1305857d +Author: sgm0422 <976204163@qq.com> +Date: Wed Aug 2 17:16:48 2017 +0800 + + * Fix bug #1181. + +commit f77214be222ed355e24a75b604234a3cfe027b3d +Author: wangyidong +Date: Fri Jul 28 13:37:05 2017 +0800 + + * adjust for merge ext model. + +commit 361521adee419b24a69f6c9d6276aac943f8da00 (tag: zentaopms_9.4_20170726) +Author: pengjiangxiu +Date: Tue Jul 25 13:35:16 2017 +0800 + + * Adjust code. + +commit bc5f724eaa690efb04ab7702732cdb42872e776f +Author: pengjiangxiu +Date: Mon Jul 24 17:02:57 2017 +0800 + + * Fix bug #1127. + +commit c555c79de7b7666aefcb4a2cd86ee17d0934106d +Author: pengjiangxiu +Date: Mon Jul 24 14:05:18 2017 +0800 + + * Adjust code. + +commit e6ab3c3fa077fa1feabb97c843151228f7f1c24c +Author: pengjiangxiu +Date: Mon Jul 24 14:04:36 2017 +0800 + + * Change upgrade to V9.4 + +commit 93e374ddf6d277654362390e788d343404cf09d1 +Author: pengjiangxiu +Date: Mon Jul 24 09:12:25 2017 +0800 + + * Fix bug #1140. + +commit 594cea2f8cd68d5dfd9154b1352a79f839b07f6c +Author: pengjiangxiu +Date: Fri Jul 21 11:27:26 2017 +0800 + + * Fix bug #1112. + +commit 8b6b41b19a7714ca4221cbd55573998722959425 +Author: pengjiangxiu +Date: Fri Jul 21 10:54:17 2017 +0800 + + * Fix bug #1116. + +commit 3d218bc5f429f5e9c9caefa86381fd12e757d8b7 +Author: pengjiangxiu +Date: Fri Jul 21 10:33:11 2017 +0800 + + * Fix bug #1122. + +commit 9b2e1ab809029423c2510ad39dad15975db7a5d4 +Author: pengjiangxiu +Date: Thu Jul 20 16:51:46 2017 +0800 + + * Fix bug #1154. + +commit ede8c60761cedf23260a681e6bd5362d58ef127d +Merge: 472c167bbd 39d9f1ace5 +Author: pengjiangxiu +Date: Thu Jul 20 16:07:18 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 472c167bbde631e46a082d8f9cc4ffee3e2a4e7c +Author: pengjiangxiu +Date: Thu Jul 20 16:03:10 2017 +0800 + + * Adjust code. + +commit 39d9f1ace555c48b6b926303719bbdb36af481ce +Merge: 5cf6bd34b8 1b1d30c782 +Author: wangyidong +Date: Thu Jul 20 14:30:58 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5cf6bd34b892827f6cd25b295b80cb8267f74848 +Author: wangyidong +Date: Thu Jul 20 14:30:43 2017 +0800 + + * adjust for doc view. + +commit 1b1d30c7826389f35a4106f233161840d2e5de09 +Author: pengjiangxiu +Date: Thu Jul 20 14:04:14 2017 +0800 + + * Fix bug #1167. + +commit d909f2d8261e63c7b125ef788aae7593ae945743 +Author: wangyidong +Date: Thu Jul 20 13:04:53 2017 +0800 + + * remove diff method. + +commit a4522a9e0527b4738383431c881223dbf94923fa +Author: wangyidong +Date: Thu Jul 20 13:04:21 2017 +0800 + + * change for merge hook. + +commit 54ea128fdea7b6d84f855897d856af4b87dcdac9 +Author: pengjiangxiu +Date: Thu Jul 20 11:19:32 2017 +0800 + + * Fix bug #1097. + +commit f2c220e6b813b28b02352e9baaf83ca5e57c2127 +Author: pengjiangxiu +Date: Wed Jul 19 17:02:43 2017 +0800 + + * Fix bug #1129. + +commit a0f2e4b2d66c4c59c82bc9a2da50d055ea60e6f8 +Author: pengjiangxiu +Date: Wed Jul 19 16:43:33 2017 +0800 + + * Fix bug #1172. + +commit 8e55b830e9b7bd0e5e89af036b78d165449d8a4a +Author: pengjiangxiu +Date: Wed Jul 19 15:00:11 2017 +0800 + + * Fix bug #1174. + +commit 77e4345aeff79d31c83f6dfbddc47ee4bcf7c920 +Author: pengjiangxiu +Date: Wed Jul 19 11:16:57 2017 +0800 + + * Fix bug #1155. + +commit fcd9281b122339f49b1af9b58a274b4573ef08d0 +Author: pengjiangxiu +Date: Wed Jul 19 11:16:26 2017 +0800 + + * Adjust code. + +commit 2e03077539db876b82f5db828e6b5766d66b9c96 +Author: pengjiangxiu +Date: Wed Jul 19 10:26:59 2017 +0800 + + * Fix bug #1153. + +commit 2012550daff5d3d6c8f7932197fa3942135e17ea +Author: pengjiangxiu +Date: Wed Jul 19 09:39:03 2017 +0800 + + * Fix bug #1156. + +commit 1deb334e5be1053182e40fc4f5d66ea062959983 +Author: pengjiangxiu +Date: Tue Jul 18 17:23:58 2017 +0800 + + * Fix bug #1161. + +commit 14560f007d5271e702fb017f9ca10b15ba6185ca +Author: pengjiangxiu +Date: Tue Jul 18 14:22:31 2017 +0800 + + * Finish task #3070. + +commit 6542d36b7bc412ca8b7f2b1ed0e6d63ac0412dea +Author: pengjiangxiu +Date: Tue Jul 18 14:02:07 2017 +0800 + + * Adjust code for release view. + +commit 74f68f5d1f57247cd3d2f9eddca24398a114abd9 +Author: pengjiangxiu +Date: Tue Jul 18 13:29:29 2017 +0800 + + * Finish task #3067. + +commit 76f6ea9c859f9393681f3ef0ddfe56ce5528b253 +Merge: a22d622db0 a0d2117066 +Author: wangyidong +Date: Mon Jul 17 17:12:15 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a22d622db0878a073068f2252e221b4ca6cb1c52 +Author: wangyidong +Date: Mon Jul 17 17:11:13 2017 +0800 + + * fix for show tag in modal with onlybody. + +commit a0d211706602827cffa00de7340bc550e56fe756 +Merge: 80df7a693e 1d884af8f7 +Author: pengjiangxiu +Date: Mon Jul 17 16:55:45 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 80df7a693e892996a370da2edb396ac29ffd03dc +Author: pengjiangxiu +Date: Mon Jul 17 16:53:53 2017 +0800 + + * Finish task #3074. + +commit 1d884af8f79798eb9662354db98a8a1b063ce022 +Merge: 9b863fe982 48fc034fa1 +Author: wangyidong +Date: Mon Jul 17 16:50:26 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9b863fe98201d5f45c4e5398e19fd1b6bedc5c1a +Author: wangyidong +Date: Mon Jul 17 16:49:59 2017 +0800 + + * fix bugs. + +commit 48fc034fa1f91b7ecb6a69c6ab8ccdec5cdf0651 +Author: pengjiangxiu +Date: Mon Jul 17 15:33:40 2017 +0800 + + * Finish task #3065. + +commit 1b5465b57b787cc79161129890a0d1b29cfd546b +Author: pengjiangxiu +Date: Mon Jul 17 10:54:17 2017 +0800 + + * Finish task #3078. + +commit c00018831ea9840d827aa49a8c65beec5a7823e2 +Author: pengjiangxiu +Date: Sat Jul 15 17:11:40 2017 +0800 + + * finish task #3073. + +commit 26e3e0d2066874d3a1290b73cc5a472d9acbc304 +Author: pengjiangxiu +Date: Sat Jul 15 16:16:02 2017 +0800 + + * finish task #3069. + +commit 0062ecfb5658fd6c37cca52c475b9c3823a0a16a +Author: pengjiangxiu +Date: Sat Jul 15 15:41:59 2017 +0800 + + * finish task #3066. + +commit 279a96fca5dfc9090296178ae23011c3a64396c3 +Author: pengjiangxiu +Date: Sat Jul 15 10:16:33 2017 +0800 + + * finish task #3075. + +commit ca2a3528de6e4e2cd3bca364f51478d7382ed46d +Author: pengjiangxiu +Date: Sat Jul 15 10:13:41 2017 +0800 + + * finish task #3076. + +commit cf457c7a7e2d85c94803e3854f15d30a34888155 +Author: pengjiangxiu +Date: Fri Jul 14 15:03:26 2017 +0800 + + * Finish task #3077. + +commit 152daa4c395c6199f1ff96ac394f473df42b22f0 +Author: wangyidong +Date: Mon Jul 10 14:12:12 2017 +0800 + + * adjust framework. + +commit 5924091515195ddd8bd25931acaef4b2ac3ca6b7 +Author: wangyidong +Date: Wed Jul 5 13:17:45 2017 +0800 + + * adjust for framework and fix bug for search use today. + +commit 1b92dc4ad0e1d1d504fd5e8e01ea85331470f891 +Author: wangyidong +Date: Tue Jul 4 17:33:01 2017 +0800 + + * fix for testreport create. + +commit 834bcdaedac762b1a5961cb5b57aef94c92d7528 +Author: wangyidong +Date: Mon Jul 3 09:39:12 2017 +0800 + + * adjust for framework. + +commit c444e6fd2e6fb6ae427d19de313933c714756315 +Author: wangyidong +Date: Thu Jun 29 10:16:18 2017 +0800 + + * adjust for process image url. + +commit 6179da02b847320eed779c65cae574978fdfae79 +Author: wangyidong +Date: Thu Jun 29 09:51:09 2017 +0800 + + * fix bug for process image url in windows. + +commit 9dbd80045ccedcf97f2b658a72ec0de4280f427d (tag: zentaopms_9.3.beta_20170627) +Author: wangyidong +Date: Mon Jun 26 17:01:30 2017 +0800 + + * set file-read to openmethod. + +commit 8c7930ffff22705057d34284a82609d169628d0b +Author: wangyidong +Date: Mon Jun 26 15:42:10 2017 +0800 + + * adjust for save file no extension. + +commit 794fb575db1c360a8ee13352b4d4787da3b3ef6c +Author: wangyidong +Date: Mon Jun 26 14:47:58 2017 +0800 + + * adjust for save file not with extension. + +commit c8f4f4fc0f0adfe42991e93f62a2fac1aff4a3b2 +Author: pengjiangxiu +Date: Thu Jun 22 15:26:49 2017 +0800 + + fix bug for router-setParamsByPathInfo + +commit 1920d57d3afc446b2548bb58e2b26dacf9c9e1d3 +Author: pengjiangxiu +Date: Thu Jun 22 13:35:16 2017 +0800 + + * Adjust filter and framework + +commit d71f095975f12869d8734fdbdb91e2ee5fd4c9a1 +Author: pengjiangxiu +Date: Wed Jun 21 11:20:46 2017 +0800 + + * Update version info + +commit 5e46cb6fc5475a092cca1e4e067cda9ae9e0bded +Author: wangyidong +Date: Tue Jun 20 16:12:10 2017 +0800 + + * adjust code. + +commit f4608f5a6bc3601242d97c901a9bafc32663843b +Merge: 3777f18b8f e929d7a6a9 +Author: wangyidong +Date: Tue Jun 20 15:58:09 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3777f18b8f887e278e88c708b78f56109ae74d77 +Author: wangyidong +Date: Tue Jun 20 15:57:42 2017 +0800 + + * create file read link with extension. + +commit e929d7a6a904918069e6a9078d2ce2d18699ad6b +Author: pengjiangxiu +Date: Tue Jun 20 15:55:10 2017 +0800 + + * Adjust config + +commit 0d73f34c52e53383f5ef36074679759d7d93fa11 +Author: pengjiangxiu +Date: Tue Jun 20 08:26:58 2017 +0800 + + * fix filter params bug + +commit d18cc65d9081fe172b87a98047dc2562795c06c7 +Author: wangyidong +Date: Fri Jun 16 16:52:45 2017 +0800 + + * merge new framework. + +commit db4eca22ae3c07aed42141cf494b8f064441f0b6 +Author: wangyidong +Date: Thu Jun 15 11:37:04 2017 +0800 + + * merge framework. + +commit 06e714223fa50225ea92d543671fbd87587302b0 +Author: pengjiangxiu +Date: Thu Jun 15 10:46:06 2017 +0800 + + * update file dangers type + +commit 757b9ecf718f453d2ecde836bb7c19e2fed09527 +Author: pengjiangxiu +Date: Thu Jun 15 09:48:51 2017 +0800 + + * Adjust for framework. + +commit 97bbc1bef0cc7013f95740eea1dd50719d8ee3f4 +Author: pengjiangxiu +Date: Thu Jun 15 09:46:13 2017 +0800 + + * Merge file upload allowed + +commit a29c6f214316088c09c6af9ad41bc570cdcae076 +Author: wangyidong +Date: Wed Jun 14 16:11:08 2017 +0800 + + * adjust code. + +commit de5c536659113e24d4a0915f39f2d82f94eeac95 +Author: wangyidong +Date: Wed Jun 14 15:23:38 2017 +0800 + + * adjust for framework. + +commit 19def0f2fd40b9e7b6c1dd399c83a8ec0f7e3cae +Author: wangyidong +Date: Mon Jun 12 10:47:15 2017 +0800 + + * adjust for filter cookie. + +commit a37df65bc8e323901bcee576d2b44b6cfb746f86 +Author: wangyidong +Date: Fri Jun 9 17:06:18 2017 +0800 + + * mereg zentaophp framework to zentao. + +commit c27f1f7d34884fef5a805908fe958a48da50d5c9 +Author: wangyidong +Date: Fri Jun 9 17:05:37 2017 +0800 + + * merge zentaophp to zentao. + +commit e3d6b9d7096ba2eb4313da9570fb6a411ed42ef3 +Author: wangyidong +Date: Fri Jun 2 16:19:10 2017 +0800 + + * fix workload days. + +commit 90d12565de191281d763a44c91046dc896123eed +Author: wangyidong +Date: Thu Jun 1 10:23:54 2017 +0800 + + * fix bug. + +commit 67b29ccb880b3bbe4908940923321bc0c03b46b6 +Author: wangyidong +Date: Tue May 23 11:03:54 2017 +0800 + + * fix bug edit build. + +commit 02bd73a67be46ff980a20d3c86ad856b78ea0f4f (tag: zentaopms_9.2.1_20170522) +Author: wangyidong +Date: Mon May 22 09:53:16 2017 +0800 + + * change for upgrade. + +commit 93063f15df212b0f2c1016fd9561ed4eb95833ba +Merge: 11ea0f3e93 ee2370eb56 +Author: wangyidong +Date: Fri May 19 16:57:23 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 11ea0f3e9379d992d7980a841e31d63dc96b62d4 +Author: wangyidong +Date: Fri May 19 16:56:27 2017 +0800 + + * fix for create story in prject story when force review. + +commit 117bec6bfba6cf5942caa339d48459351190371a +Author: wangyidong +Date: Fri May 19 16:48:19 2017 +0800 + + * fix bug for #1098. + +commit 6a308ba5caee1d0fce0f11d211e12d83b808b426 +Author: wangyidong +Date: Fri May 19 16:33:20 2017 +0800 + + * adjust for page style. + +commit ee2370eb56f9116a3647d39c82b2dbbcef2772dc +Author: Catouse +Date: Fri May 19 16:27:20 2017 +0800 + + * prevent login page show in a iframe modal. + +commit ac7958d7360f58d5f68024d2dc85b61e17477760 +Merge: dd5e5e7767 3e5d56f665 +Author: Catouse +Date: Fri May 19 15:08:27 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dd5e5e7767cd61200a67eea8b00e913754fd3160 +Author: Catouse +Date: Fri May 19 15:08:21 2017 +0800 + + * fix required error. + +commit 3e5d56f6655d3fdd387a49c81bdbc2ebaca1a524 +Merge: ef8be94f83 089a70ef11 +Author: daitingting +Date: Fri May 19 10:08:11 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ef8be94f83e1317cb17a833607ef39ccdcae6a0c +Author: daitingting +Date: Fri May 19 10:07:48 2017 +0800 + + * Hidden product when working is task. + +commit 089a70ef117e3c89b8d15c97a0bef65925c131f5 +Author: Catouse +Date: Thu May 18 16:35:26 2017 +0800 + + * adjust code format. + +commit d133157f7c0af36f067fd9bbde8de5a14e5ea031 +Author: Catouse +Date: Thu May 18 16:26:36 2017 +0800 + + * fix tooltip behavior in tutorial page. + +commit 07865fdb4269ef0eefc6386a426ad12e3dde1ace +Author: Catouse +Date: Thu May 18 16:17:16 2017 +0800 + + * fix setRequiredFields method. + +commit 5f66e75da9ba82f4746018022b06747a62ca2a49 +Author: daitingting +Date: Thu May 18 11:14:19 2017 +0800 + + * Adjust codes. + +commit 4065570e95a000434df8959f441525f62b106fb1 (tag: zentaopms_9.2.stable_20170516) +Merge: e8b8b67471 4804c795b6 +Author: daitingting +Date: Tue May 16 16:06:11 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e8b8b67471176d2552a3882a28ed0713eebed91f +Author: daitingting +Date: Tue May 16 16:06:02 2017 +0800 + + * Adjust codes. + +commit 4804c795b6ba6e2cb42b68dd5b068ccffba338dc +Author: wangyidong +Date: Tue May 16 15:51:54 2017 +0800 + + * fix bug for install. + +commit 68b274e3d35cd7fb45f1f1b062c3aeb106a3e679 +Author: wangyidong +Date: Tue May 16 15:16:03 2017 +0800 + + * adjust css. + +commit fc5c2a964cd64a0baac1f408674c967b7222e66e +Author: daitingting +Date: Tue May 16 14:55:06 2017 +0800 + + * Adjust conflict. + +commit 58b0e33efc555bda5b3fe0ed7151e599c12cef54 +Merge: 7d46c76ea2 12c288a4e7 +Author: daitingting +Date: Tue May 16 14:51:26 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + Conflicts: + module/common/lang/en.php + module/common/lang/zh-cn.php + +commit 7d46c76ea29424199b24ca95c3ed682d1f0c4596 +Author: daitingting +Date: Tue May 16 14:51:03 2017 +0800 + + * Adjust rights. + +commit d49867fc208889d85de6a8173ed4379f6393c2b5 +Author: daitingting +Date: Tue May 16 14:43:45 2017 +0800 + + * Add english language. + +commit 12c288a4e7a20122e9feaae8a11662d295ab2e6c +Author: wangyidong +Date: Tue May 16 14:27:53 2017 +0800 + + * change for upgrade. + +commit f0e76ff576481d5ebbb1e3b75eab02da4e7fa3e0 +Author: daitingting +Date: Tue May 16 13:53:17 2017 +0800 + + * Set flow for custom doc menu. + +commit 07cebfea4a3710df8c7db105b45d49f7abc8d364 +Author: daitingting +Date: Tue May 16 13:03:04 2017 +0800 + + * Adjust fixed menu. + +commit 1a23280c7553e66df8d2ca18f670f3c0b2635055 +Author: daitingting +Date: Tue May 16 11:29:21 2017 +0800 + + * Adjust codes. + +commit 06d26ecce9392d44a377ad40e3b046c2a7b48611 +Author: daitingting +Date: Tue May 16 11:26:05 2017 +0800 + + * Adjust style for create btn group. + +commit 2274c3ec6f7bc177e2c9e2a5028e1e7cb55e6f9f +Author: daitingting +Date: Tue May 16 11:20:53 2017 +0800 + + * Adjust menu when width is more. + +commit 917fc190113b32f1cb81722859dcb95053c681e1 +Author: daitingting +Date: Tue May 16 09:53:51 2017 +0800 + + * Adjust high light. + +commit 33932cad94bc01f38562d691814e9ebc55049b16 +Author: daitingting +Date: Mon May 15 16:58:15 2017 +0800 + + * Remove useless codes. + +commit 69255005d83c939d556cad4c1e7c49de7f0fbf60 +Author: daitingting +Date: Mon May 15 16:56:21 2017 +0800 + + * Adjust custom field. + +commit 16b1c329af61c8bb1810ccd3f2a30605e0a511e4 +Merge: 5cc2e1be9a 2f28a6ee36 +Author: daitingting +Date: Mon May 15 16:35:45 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5cc2e1be9ab3484a5b05ae6849182d5776a98712 +Author: daitingting +Date: Mon May 15 16:34:38 2017 +0800 + + * Adjust high light for menu. + +commit 2f28a6ee36e26a4cf449315a9bd8f6e60e051f95 +Author: wangyidong +Date: Mon May 15 16:30:37 2017 +0800 + + * fix bug for release link story. + +commit 869e73db82c870080d20fbec8afeea9c473bbb87 +Merge: d9f73fe9aa 98fff8d7ec +Author: wangyidong +Date: Mon May 15 16:26:19 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d9f73fe9aacb0ce93c186e60d630965bb1c6f264 +Author: wangyidong +Date: Mon May 15 16:25:23 2017 +0800 + + * adjust for precondition width. + +commit aa02e6a8c335a09f619c1d4b5db6c04485098fc7 +Author: wangyidong +Date: Mon May 15 16:25:08 2017 +0800 + + * fix bug. + +commit 98fff8d7ec5f33f7d72bdf17c8a7baa14c81256c +Author: daitingting +Date: Mon May 15 16:23:50 2017 +0800 + + * Hidden project. + +commit de9b2e6af475f95db0ec53a18e61c4678656a4db +Author: wangyidong +Date: Mon May 15 16:23:44 2017 +0800 + + * adjust for init block. + +commit 6cdf8fd119754841f89bf41081e351574297aa29 +Author: wangyidong +Date: Mon May 15 16:23:17 2017 +0800 + + * adjust for restoreTip. + +commit 954539c4c83f2c2a83ba12f82b16afe310e67764 +Author: wangyidong +Date: Mon May 15 16:22:43 2017 +0800 + + * adjust for safe. + +commit 954a16cd15bbec9e1e697313d0473c4a826b014a +Author: daitingting +Date: Mon May 15 11:30:24 2017 +0800 + + * Revert loadConfigFromDB function. + +commit eebb7e4cdb6bdb2b5ffadf22d76b7404b1f0a598 +Author: daitingting +Date: Mon May 15 11:15:22 2017 +0800 + + * Adjust style. + +commit b2f7b4d2ce12d9db4c88466dbec0bf4e4a5b4f1d +Merge: e5b388d585 fcbc6b2d23 +Author: daitingting +Date: Fri May 12 16:22:31 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e5b388d5852d7b12470942fd8b2022bcc14882f7 +Author: daitingting +Date: Fri May 12 16:22:22 2017 +0800 + + * Adjust codes. + +commit fcbc6b2d23cd2c0825e17a20cd103f9d3a0e566f +Merge: 5b558cb825 4e691243c6 +Author: wangyidong +Date: Fri May 12 16:15:32 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5b558cb825c3cedd2d3c8640b7b0bd021bfb870a +Author: wangyidong +Date: Fri May 12 16:14:33 2017 +0800 + + * adjust for show module tree in branch browse. + +commit 4e691243c61c2699ee545a1648a723410ed3a5bb +Author: daitingting +Date: Fri May 12 15:33:41 2017 +0800 + + * Adjust style for create btn. + +commit e5bc4d44b51ce20ae3f35d41726505759c967b5d +Author: daitingting +Date: Fri May 12 15:04:25 2017 +0800 + + * Adjust codes. + +commit 4ee07be5d6475f45049b1e5ee746397187e54df6 +Merge: b378b53307 255d7b457d +Author: daitingting +Date: Fri May 12 14:46:15 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b378b533070ec9728ed93e36db8fb7d7d00c4017 +Author: daitingting +Date: Fri May 12 14:45:57 2017 +0800 + + * Adjust menu for onlyTest. + +commit 255d7b457d03b883299c79b24ae0de8b4735e8f4 +Author: wangyidong +Date: Fri May 12 14:24:19 2017 +0800 + + * Readjust precondition width by cases precondition. + +commit df7d08d24a7a91c2c2cf89dab044ed4923623f04 +Author: wangyidong +Date: Fri May 12 14:22:36 2017 +0800 + + * fix bug for report bugConfirmedRate. + +commit f1eb150a2b5fef49aed29a92e5ee8c4f41159067 +Author: wangyidong +Date: Fri May 12 11:28:22 2017 +0800 + + * fix for restore. + +commit 89cc81c5494fd1ca4c146fec9cb52f6438752ef7 +Author: wangyidong +Date: Fri May 12 11:12:32 2017 +0800 + + * fix bug. + +commit 4e19cb494f9545bec44f0479816c9e5c42a72ce1 +Author: wangyidong +Date: Fri May 12 11:01:27 2017 +0800 + + * change for import case from file. + +commit 6fd66cc54bb785097abdbb6d1369731dd62bfd41 +Author: wangyidong +Date: Fri May 12 10:58:47 2017 +0800 + + * adjust for safe. + +commit 6714e298bc348e863330a124229a84fc11b259e0 +Merge: 3e1b04d140 59032f8a7c +Author: wangyidong +Date: Fri May 12 08:16:26 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 59032f8a7c2d105e9cc1e551a849392ea0dc036f +Merge: b77e6bb8a0 ff5b0639ed +Author: Catouse +Date: Thu May 11 17:19:31 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b77e6bb8a0bc8954704321a1b556b27118403577 +Author: Catouse +Date: Thu May 11 17:19:09 2017 +0800 + + * update zui. + +commit ff5b0639ede8120d5bf7159da94995575d4c0beb +Author: daitingting +Date: Thu May 11 16:32:35 2017 +0800 + + * Adjust copywriter. + +commit 3e1b04d1404d70b44a90357613ccd596339ca8f6 +Merge: ed0dfa0d3d c5e692714a +Author: wangyidong +Date: Thu May 11 16:31:18 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c5e692714a3f954b1993fc8a38aff58d6173aa0f +Author: daitingting +Date: Thu May 11 16:27:16 2017 +0800 + + * Expand the selection range for sort. + +commit 0d819537d0b454574c05dcf5ec666f54c3507cae +Author: daitingting +Date: Thu May 11 16:19:20 2017 +0800 + + * Adjust codes. + +commit 34cd0e1a4e73ae304160191952e27871a520f25a +Merge: 75dc4abe0f 6879900055 +Author: daitingting +Date: Thu May 11 16:14:50 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 75dc4abe0f5fb208f9646eac79bec445a695d730 +Author: daitingting +Date: Thu May 11 16:14:27 2017 +0800 + + * Add module in setMenu function. + +commit b1325bae3ec199070479e2788509ee0c01b61d7b +Author: daitingting +Date: Thu May 11 16:12:17 2017 +0800 + + * Add branch in batch edit. + +commit ed0dfa0d3d4a23da002525d49036be081fa8547d +Author: wangyidong +Date: Thu May 11 15:36:52 2017 +0800 + + * adjust for testreport. + +commit 6879900055177eb6af529d72338ed5269ac76983 +Author: wangyidong +Date: Thu May 11 14:48:13 2017 +0800 + + * fix bug for changeWeak. + +commit 3dbe1f8f93ad3d5bb7d565e2c6ebcddce890009d +Author: wangyidong +Date: Thu May 11 14:37:46 2017 +0800 + + * adjust style when zentao bind in ranzhi. + +commit c673bc92deef412c8a4d2b83f73284aa4b76cfd9 +Author: wangyidong +Date: Thu May 11 14:30:28 2017 +0800 + + * adjust for fix first day. + +commit 6973cf1f3972edc34425f1253ecc749f07ed8444 +Author: wangyidong +Date: Thu May 11 14:15:53 2017 +0800 + + * adjust style for story list with branch. + +commit a6feb7c7f58da4388a8398b779ffa3f607631b19 +Author: wangyidong +Date: Thu May 11 13:47:28 2017 +0800 + + * Update cron remark by lang. + +commit 8c75db74631d10572ed0c3e2f5a40817359d122c +Author: wangyidong +Date: Thu May 11 13:17:57 2017 +0800 + + * change for modify weak password. + +commit 76306182bd5f2d6cade7bbf8f4d47c024a37e376 +Merge: d47d8cfecf 19e3865963 +Author: wangyidong +Date: Thu May 11 09:09:06 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d47d8cfecfe8731f7c2e4ba1257b4bf51e9d5c9f +Author: wangyidong +Date: Thu May 11 09:06:18 2017 +0800 + + * change max_input_vars to 100000. + +commit 19e38659635f1ba382c6c3ae782bac1c30f0bfd9 +Author: chenfeiCF +Date: Thu May 11 08:59:19 2017 +0800 + + * adjust for task #3000. + +commit d4c77d8769947614bcfd44a266c2bd73bd99efa2 +Author: daitingting +Date: Wed May 10 15:46:21 2017 +0800 + + * Adjust codes. + +commit 9a89d93eaa8b203988f8eca11242d54533c8cb3c +Merge: a642ee379a 9bc3cb7842 +Author: wangyidong +Date: Wed May 10 15:38:24 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9bc3cb7842ba3855b16fb516f80e01d615b067fa +Author: daitingting +Date: Wed May 10 15:01:21 2017 +0800 + + * Hidden project, story and task fields when working is onlyTest. + +commit 99b7d416023e54c1501c109177b0b280e3034faa +Author: daitingting +Date: Wed May 10 14:48:37 2017 +0800 + + * Bug can choose build when create it. + +commit 0cdba9950f945fa12d570892b1c13ccaf710eec7 +Merge: b1fea69e50 1f16b7eff9 +Author: daitingting +Date: Wed May 10 14:48:18 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b1fea69e5038a636b529fbf0cd6cc6d2c0279d8b +Author: daitingting +Date: Wed May 10 14:48:03 2017 +0800 + + * Unset index of product. + +commit 1f16b7eff99aaf5d0f4bccf50292b207ed03858d +Author: Catouse +Date: Wed May 10 13:27:11 2017 +0800 + + * adjust style of star icon for required fields in form. + +commit a642ee379a5335df2078f73cef43c9c2365f2ece +Merge: 65f3a8a5ca 95a46cfa91 +Author: wangyidong +Date: Wed May 10 10:33:39 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 95a46cfa91b43fee28011bdfc9a41abd3d348a50 +Author: Catouse +Date: Wed May 10 10:29:26 2017 +0800 + + * update datatable files and change default option. + +commit 65f3a8a5caa455c2cf8136f4a95c82a2456c7336 +Merge: c898ba1ed8 fee91475f7 +Author: wangyidong +Date: Wed May 10 09:59:33 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fee91475f7ca239c54cf7190f6b3145093f3f263 +Author: Catouse +Date: Wed May 10 09:26:34 2017 +0800 + + * fix datatable cells height. + +commit b2bab58021033b05f787dd02d595b5274a5a82ea +Author: Catouse +Date: Wed May 10 09:26:00 2017 +0800 + + * change task progress pie chart to text. + +commit c898ba1ed8cdd804fb2e0b0b8f4a130e63cb04a6 +Merge: 2ca5f8df02 7131213471 +Author: wangyidong +Date: Wed May 10 09:15:20 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7131213471cffd17ab150053bb4ecb0f7006a6db +Merge: 45ac9c8c01 a9bee2ef79 +Author: Catouse +Date: Tue May 9 17:51:51 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 45ac9c8c01a92cd8040ef0d3ea498f1f30000fe8 +Author: Catouse +Date: Tue May 9 17:32:11 2017 +0800 + + * update datatable. + +commit a9bee2ef7935632c9f57aed97521f84a5607b762 +Merge: 2b759f5528 1070b1ebc3 +Author: daitingting +Date: Tue May 9 17:28:14 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2b759f552823bf8a15d2e8d9a8276d0d2ec0a39e +Author: daitingting +Date: Tue May 9 17:27:57 2017 +0800 + + * Display todo block. + +commit 1070b1ebc3bbad9598d018f7f7fcdbea926311a5 +Author: Catouse +Date: Tue May 9 17:27:18 2017 +0800 + + * improve pie chart perfermance. + +commit 2b42fa8a3c8ad37878ed607609a420f6f71ea110 +Merge: 7187e8a221 35ca3e4479 +Author: Catouse +Date: Tue May 9 17:25:51 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7187e8a221c275956e54ac1cb00195c0dc8166b4 +Author: Catouse +Date: Tue May 9 17:25:45 2017 +0800 + + * update datatable and improve perfermance. + +commit 35ca3e4479c7223f28766a8467a25439fc8ea92b +Author: daitingting +Date: Tue May 9 17:11:45 2017 +0800 + + * Add english lang. + +commit a30d771223858783855687842deee00c3ed1b468 +Merge: 28ce46a835 082b08ee7b +Author: daitingting +Date: Tue May 9 16:42:15 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 28ce46a835af2d2b2acfb291c70ff58331872341 +Author: daitingting +Date: Tue May 9 16:41:53 2017 +0800 + + * Display todo module all the time. + +commit 082b08ee7b6b2e81f8789deece3b68133ccc5afe +Author: Catouse +Date: Tue May 9 16:20:43 2017 +0800 + + * fix noProject undefined error. + +commit d9bb5678bbd0474cbd4b0556c0b6f7f1e3fddddf +Author: Catouse +Date: Tue May 9 15:43:03 2017 +0800 + + * adjust style of page in dialog, fix bug #987 and finish task #3028 + +commit 2aea5825e7ebc018dd6a693bb19efd4e24a557f6 +Author: daitingting +Date: Tue May 9 15:40:23 2017 +0800 + + * Adjust menus. + +commit 21a2c8bd8b6d988a48af564d8702c7ae5278684f +Author: daitingting +Date: Tue May 9 15:39:48 2017 +0800 + + * Adjust codes. + +commit ea576aec26c94587dd7b20ca1d5bfa9179629839 +Author: daitingting +Date: Tue May 9 14:30:29 2017 +0800 + + * Disabled novice when working is not full. + +commit 2ca5f8df02e03c68afd2f2e719743e82d722c661 +Merge: ed0ed35cbe 0f28e3cd52 +Author: wangyidong +Date: Tue May 9 14:28:49 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0f28e3cd525144c47e5cd02142018c526d6541c3 +Author: daitingting +Date: Tue May 9 14:09:52 2017 +0800 + + * Adjust codes. + +commit d78dcc6e452d7e150efc4a9b35fe71ab683c440a +Author: daitingting +Date: Tue May 9 14:03:17 2017 +0800 + + * Adjust codes. + +commit ed0ed35cbed2e98c539542762b0302e9394348fa +Author: wangyidong +Date: Tue May 9 13:50:21 2017 +0800 + + * fix for doc lib priv. + +commit 488a26fbcff6d90b9f337b675a92b26136fa04b5 +Author: daitingting +Date: Tue May 9 13:43:49 2017 +0800 + + * Adjust codes. + +commit 04845b6209475133c9d4faccb3bea5078a7d9dc1 +Author: daitingting +Date: Tue May 9 13:26:44 2017 +0800 + + * Open the related story and bugs by modal. + +commit 089f0de93df04d5f99ad00fac41ea511ac532743 +Author: daitingting +Date: Tue May 9 10:17:18 2017 +0800 + + * Project lib of product is unsortable. + +commit 49662b5eb603dede429eff7ba8006347727661b2 +Author: daitingting +Date: Tue May 9 10:05:41 2017 +0800 + + * Process custom menus when upgrade from 9.1.2. + +commit 9f77785b5347cc00a24c1bc274449d966019c37b +Author: daitingting +Date: Mon May 8 17:12:53 2017 +0800 + + * Remove story when working is only task. + +commit 3a80707c1160a64e6dd3e367c5542e786bd387a3 +Author: daitingting +Date: Mon May 8 16:34:53 2017 +0800 + + * Adjust codes. + +commit 12928583e7b83f72a0f6bcb4468d6541cafeb39e +Merge: 8624ceb224 52011a079c +Author: daitingting +Date: Mon May 8 15:09:03 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8624ceb224c5f696729204c0cd7f492c0b552dc5 +Author: daitingting +Date: Mon May 8 15:08:42 2017 +0800 + + * Adjust codes for test working. + +commit fb4e757e6a1cd006ecff7b01b9e0421899a58dec +Author: wangyidong +Date: Mon May 8 14:51:17 2017 +0800 + + * code for task #2987. + +commit 083cb51904c2a29d0add6c9bfe999a2bec28ab12 +Author: wangyidong +Date: Mon May 8 14:50:46 2017 +0800 + + * code for task 2994. + +commit 73bf63b4a4d6ba323e3701656ff3163db7a16f83 +Author: wangyidong +Date: Mon May 8 10:48:51 2017 +0800 + + * code for task #2993. + +commit 8e78fa7abf4e75a2c613b02c9ef9969ef179d815 +Author: wangyidong +Date: Mon May 8 10:31:41 2017 +0800 + + * code for task #2992. + +commit 52011a079c76fcd1f0db98749b6ee7f569306212 +Author: wangyidong +Date: Mon May 8 09:51:36 2017 +0800 + + * adjust for doc access priv. + +commit 49ac975d049f1c8b7dea7d6ffc21f4c55d9d7c73 +Author: daitingting +Date: Mon May 8 09:11:21 2017 +0800 + + * Add build page for product. + +commit b69ea19c7386d71ef9510119f147d1d0dc698908 +Merge: ce174f973c d47bfddaf9 +Author: daitingting +Date: Fri May 5 12:09:43 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ce174f973c089027a9d2be734bf47c3709bdb4c6 +Author: daitingting +Date: Fri May 5 12:09:19 2017 +0800 + + * Set as working as only test. + +commit d47bfddaf91db19b1d17e1d0232ceee4f37bf1ec +Author: wangyidong +Date: Thu May 4 16:40:44 2017 +0800 + + * fix bug #1082. + +commit 4de3df7b0370c05d3880b0384c6f927ca9a8d8b0 +Author: wangyidong +Date: Thu May 4 16:37:42 2017 +0800 + + * adjust for down file with session id. + +commit 6c98c6cb82e7fb9b91d3f0a62d782d09ec415c00 +Author: wangyidong +Date: Thu May 4 15:38:43 2017 +0800 + + * finish task #3009. + +commit eb059f46fa208717169aea5acf2eb2a1d56d9c6a +Merge: 785087f88c 3f640d9f59 +Author: wangyidong +Date: Thu May 4 15:19:07 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 785087f88c20d1e0261982a6990845184d7cb849 +Author: wangyidong +Date: Thu May 4 15:18:49 2017 +0800 + + * fix bug #1071. + +commit 9e5a8b46f3e41914e4c0a7d9ad3ef5b7b432aa86 +Author: wangyidong +Date: Thu May 4 14:52:17 2017 +0800 + + * fix bug #1066. + +commit 3e72482114530de52e02ec92bf5afd6e4ed760b3 +Author: wangyidong +Date: Thu May 4 14:42:55 2017 +0800 + + Finish task#3027 后台-计划任务在服务重启后可能无法读取正常的配置也有可能无法运行,cost:2 left:0 + +commit 3f640d9f59f8b5cfaf417b63cad3ace51d5d3bf4 +Author: chenfeiCF +Date: Thu May 4 14:06:45 2017 +0800 + + * finish task #3000. + +commit 3012a24b5f123030a02363b0c9ca68acd82fca80 +Merge: 5b6240a693 868227856f +Author: wangyidong +Date: Thu May 4 13:17:48 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5b6240a693a34099a8b3761755495cb8a7e82601 +Author: wangyidong +Date: Thu May 4 09:58:46 2017 +0800 + + Finish task#3037 项目关联需求页面，列表中各列的宽带调整一下,cost:1 left:0 + +commit 868227856fa6e97af4b611366aa0f1f06ad3113b +Author: daitingting +Date: Thu May 4 09:55:25 2017 +0800 + + * Hidden doc and module related with product when working is onlyTask. + +commit fa4671b8246166bd56678dbd2caf218226ba24a8 +Merge: 2e5e8ec5a4 1883eafb21 +Author: daitingting +Date: Wed May 3 17:36:20 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2e5e8ec5a4a4190c63511454bbb345ee015a4ce3 +Author: daitingting +Date: Wed May 3 17:35:37 2017 +0800 + + * Set working. + * Set as only task. + * Set as only story. + +commit 1883eafb2181e18ecbd08b3fb1d3023eab50dbc3 +Author: wangyidong +Date: Wed May 3 16:52:20 2017 +0800 + + * fix bug #1085. + +commit 842c811c757c65059c2bcf1353a7538f73eba997 +Author: wangyidong +Date: Wed May 3 16:45:34 2017 +0800 + + * code for task #2982. + +commit 47f1b5dfa85e634ec85665575b0946b6b2b5f6da +Author: wangyidong +Date: Wed May 3 16:45:25 2017 +0800 + + Finish task#3012 用例编辑修改步骤后列表页面用例步骤数不会发生改变,cost:0.5 left:0 + +commit 2edc510b7743b44e16c2003ff9896073d81ba1ba +Author: wangyidong +Date: Wed May 3 16:18:49 2017 +0800 + + * can not add custom item for reviewResult. + +commit 4eaff3759f6ac107a6647b590910e1753d1a1e57 +Author: wangyidong +Date: Wed May 3 15:59:13 2017 +0800 + + * code for task #2994. + +commit 2c0696ba21ed5955993074eabd2a6bbdcf2b8232 +Author: wangyidong +Date: Wed May 3 15:53:21 2017 +0800 + + * code for task #2994. + +commit 099bd94ebbe922c7b580190ebae7aba68bd2bf02 +Author: wangyidong +Date: Wed May 3 14:39:38 2017 +0800 + + Finish task#2994 禅道如果和然之集成后，样式做调整,cost:3 left:0 + +commit 4463151d96126e120dfa43d49cde2cb6f9cc6c42 +Author: wangyidong +Date: Wed May 3 11:21:11 2017 +0800 + + Finish task#2992 燃尽图修改首天工时时将那一天的剩余工时也修改了,cost:1 left:0 + +commit 93ab2fce42ca579870ce9853e22085958618148a +Author: wangyidong +Date: Wed May 3 10:50:13 2017 +0800 + + Finish task#3016 测试视图版本选择里面的全部产品应当根据流程设置进行修改,cost:1 left:0 + +commit 5b82cd0accf4f1c3443ddb529905fce8b8ff9e14 +Merge: 9aad8360a3 abaee1eda6 +Author: wangyidong +Date: Wed May 3 10:47:31 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9aad8360a388fa7bbbfe65880a053137733b8886 +Author: wangyidong +Date: Wed May 3 10:46:59 2017 +0800 + + * adjust code for show import case. + +commit b4f0a9c031cb159fbe90772e89c283f1b0176e28 +Author: wangyidong +Date: Wed May 3 10:46:23 2017 +0800 + + * fix bug for batch update story. + +commit 6b6883c2c95f6dcb1a71fc7d5d2c042cacfa889b +Author: wangyidong +Date: Wed May 3 10:45:49 2017 +0800 + + * fix for browse task by product. + +commit 457ffb3f61f98671596307bee9719eecc109253b +Author: wangyidong +Date: Wed May 3 10:34:49 2017 +0800 + + Finish task#3015 重复修改模块所属的产品时，列出的模块列表有重复,cost:1 left:0 + +commit 22fb4f59fc925b854782e26cf001c4e879717c33 +Author: wangyidong +Date: Wed May 3 10:33:50 2017 +0800 + + Finish task#2982 公共用例库增加导入和批量添加的功能,cost:5 left:0 + +commit abaee1eda6b1760e7bddeb204b6fcdf408660b64 +Merge: f0cbb00254 00126f3d97 +Author: Catouse +Date: Tue May 2 17:15:27 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f0cbb00254e5014475ff6f40a3e4d40805aa9160 +Author: Catouse +Date: Tue May 2 17:15:20 2017 +0800 + + * finish task #3023, and fix bug #1000. + +commit 078520ee2ef71efcb65e113d5ec9aa3b6f0f4fa4 +Author: Catouse +Date: Tue May 2 17:14:48 2017 +0800 + + * finish task #2989. + +commit 00126f3d97582c5637ebc57f3e0fda1c3cb560be +Author: daitingting +Date: Tue May 2 17:07:18 2017 +0800 + + * Set working way when install it. + +commit 4b2202d3f62ff2b3e0541f0e4627c2b470f9d102 +Merge: 9498716f33 3f281a6bed +Author: daitingting +Date: Tue May 2 17:05:56 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9498716f338fe220d4a44a8cb4dbeb7e4ab8142c +Author: daitingting +Date: Tue May 2 17:05:37 2017 +0800 + + * Adjust working way name. + +commit 3f281a6bedca8283b976b564a2af36570dcf7cf4 +Merge: 1f5f225683 99fbbbe92a +Author: Catouse +Date: Tue May 2 15:25:01 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1f5f2256837e4de90731cc39792f98c628d92a50 +Author: Catouse +Date: Tue May 2 15:24:54 2017 +0800 + + * change steps form UI, finish task #2989. + +commit 99fbbbe92a1ce6df8fa92ff3bbacd80a57d79301 +Merge: 53653b0572 c4b150c4be +Author: wangyidong +Date: Tue May 2 11:17:27 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c4b150c4beeb5e2e65873bee51d856825a084b04 +Author: chenfeiCF +Date: Tue May 2 11:00:22 2017 +0800 + + * finish task #3011. + +commit a453c5fdef7f286cea037845d4aa254e98fe1ea9 +Author: chenfeiCF +Date: Tue May 2 10:50:28 2017 +0800 + + * finish task #3017. + +commit e119fd21d5f1dcef3c357a484518759464c0f3e5 +Merge: ddb772a947 c1129597d5 +Author: daitingting +Date: Tue May 2 10:37:19 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ddb772a947e060651ec9dbf7356893a333f389d0 +Author: daitingting +Date: Tue May 2 10:36:51 2017 +0800 + + * Set working in admin. + +commit c1129597d57e591314a35eff3a6896f51f2e2d0d +Author: Catouse +Date: Tue May 2 10:22:03 2017 +0800 + + * fix getPreventDefault is deprecated warning. fix #bug 999, finish task #3024. + +commit 53653b057287aa17ef7fd392ce21bf6e91cd8ba5 +Author: wangyidong +Date: Tue May 2 10:05:49 2017 +0800 + + Finish task#3002 禅道迁移目录之后，model临时文件能够自动重新生成。,cost:1 left:0 + +commit 1bbe740ba4ff220c9fa198284486c62ea9f7d323 +Author: Catouse +Date: Tue May 2 10:05:24 2017 +0800 + + * finish task #2995; + +commit 2f91b01a490000ec90b1db7b0befc107ac165c70 +Author: wangyidong +Date: Tue May 2 09:24:49 2017 +0800 + + Finish task#2986 调整测试用例的评审功能,cost:1 left:0 + +commit ab422efab69187291e5b21827d987c1c0bddeb70 +Merge: 25fe7ac322 c6bc903bcb +Author: wangyidong +Date: Tue May 2 08:23:49 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c6bc903bcb8efa4ef3f1cb26056e9665cead58f1 +Author: daitingting +Date: Fri Apr 28 17:31:26 2017 +0800 + + * Adjust codes. + +commit 25fe7ac3227c4d2798e156867ad3a104eb7fc8aa +Author: wangyidong +Date: Fri Apr 28 16:01:27 2017 +0800 + + Finish task#2984 优化下数据库检查修复页面的排版,cost:1 left:0 + +commit 34411d974cf35730e0e8dd5fc395d47d5fc84068 +Author: wangyidong +Date: Fri Apr 28 16:00:37 2017 +0800 + + * adjust for ajax save log. + +commit 45da6a8984bc473056279842bb72fb339365c206 +Author: wangyidong +Date: Fri Apr 28 16:00:07 2017 +0800 + + * fix for page style. + +commit b4218c71fcf28b7ef494b75a49765e3f62709a78 +Author: daitingting +Date: Fri Apr 28 15:47:15 2017 +0800 + + * Add restore tip. + * Optimize confirm tip. + +commit 3650af33e488fcf8ec0a01a39dc75b04181ed390 +Author: daitingting +Date: Fri Apr 28 13:59:34 2017 +0800 + + * Backup code. + +commit 3ee1318ca418c557cd345df88d899dcb40df7335 +Merge: f27818dc0c ba39e66cc3 +Author: wangyidong +Date: Fri Apr 28 11:08:30 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ba39e66cc30e7d1592167c4664f6994105b7a67a +Author: daitingting +Date: Fri Apr 28 10:47:14 2017 +0800 + + * Adjust style for tablesorter. + +commit 17ee8168e75c2e997357bdaddac1c56f0f42d214 +Author: daitingting +Date: Fri Apr 28 10:06:32 2017 +0800 + + * Display public module for multi branch. + +commit d85aae7c1fb4b72756403b7b3f093a934e32048c +Author: daitingting +Date: Thu Apr 27 17:43:25 2017 +0800 + + * Adjust codes. + +commit 1f6257ed8dbe74aa0d7f400ceb2a00223761085e +Author: daitingting +Date: Thu Apr 27 16:54:30 2017 +0800 + + * Adjust language. + +commit b5039eb2d4ba5f633ed54e68db14de186843b37a +Merge: 78d55271f3 9a0490e30d +Author: daitingting +Date: Thu Apr 27 16:30:02 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 78d55271f3d3a5cd208d433455b84e017506d8b4 +Author: daitingting +Date: Thu Apr 27 16:29:46 2017 +0800 + + * Display precondition. + +commit 9a0490e30d3340641a4b987a9fa2cdf1b17e210c +Author: chenfeiCF +Date: Thu Apr 27 16:04:19 2017 +0800 + + * finish task #3008. + +commit bd6e02b35ceb245528c67192354565b3866c50b6 +Author: chenfeiCF +Date: Thu Apr 27 15:45:33 2017 +0800 + + * finish task #2996. + +commit c1ffb57424668ee53c0f067735b9061b1ea22e1d +Author: tengfei +Date: Thu Apr 27 15:20:24 2017 +0800 + + *sync bug en + +commit 0f6943068337b070d41da7917ba30a0c50eb90ee +Author: daitingting +Date: Thu Apr 27 14:08:11 2017 +0800 + + * Adjust time of the daily remind. + +commit 118c52349e65349f49e3802d2eea03b06f644f21 +Author: daitingting +Date: Thu Apr 27 13:49:53 2017 +0800 + + * Copy title to spec. + +commit cfae0a2eff9740b2e3bfda10e4d115342aeb6630 +Author: daitingting +Date: Thu Apr 27 13:25:29 2017 +0800 + + * Batch edit branch of bug. + +commit ae7dee40d659e7c7b5c0c1df46fb4a928d10c68e +Author: daitingting +Date: Thu Apr 27 13:25:20 2017 +0800 + + * Adjust codes. + +commit 230c8fcd689b38839b652e181714081e70febd09 +Merge: 492a8983a6 c04f3dc4d8 +Author: daitingting +Date: Thu Apr 27 11:06:18 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 492a8983a6fc76340fe91543c22f6753b2935be1 +Author: daitingting +Date: Thu Apr 27 11:05:30 2017 +0800 + + * Batch edit branch for test case. + +commit c04f3dc4d82824c793f24bcfbf1388b3037e47a9 +Author: chenfeiCF +Date: Thu Apr 27 10:00:27 2017 +0800 + + * finish task #2277. + +commit 91ad391de82012de29d585189f51875b6cffce95 +Merge: 02e2d720d7 65a9ba9ef3 +Author: daitingting +Date: Thu Apr 27 09:38:31 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 02e2d720d7a26e021b882d7fad1474fa191d10e4 +Author: daitingting +Date: Thu Apr 27 09:37:23 2017 +0800 + + * Fix edit testcase which type is lib. + +commit 65a9ba9ef3379873492627e5866538ddaa630ba1 +Author: chenfeiCF +Date: Thu Apr 27 09:12:52 2017 +0800 + + * finish task #2991. + +commit b0a9cb9803e8d33066d90d6e1101381a4efa1006 +Merge: 6ac47102e8 36ed4695f9 +Author: daitingting +Date: Wed Apr 26 18:04:05 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6ac47102e85cdc2ddc6aad1ee716b049c61bfcdf +Author: daitingting +Date: Wed Apr 26 18:03:35 2017 +0800 + + * Edit branch for story when batch edit them. + +commit 36ed4695f91a6475a031fccda65c71c182ed860b +Author: chenfeiCF +Date: Wed Apr 26 15:16:29 2017 +0800 + + * finish task #2987. + +commit cd31f1eda223f10c2efe3e3121ab00014b69c4a8 +Merge: ca1f858562 f1a71c2ce6 +Author: daitingting +Date: Wed Apr 26 13:52:10 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ca1f858562f78f1eff1ab8797c5c06193aed0613 +Author: daitingting +Date: Wed Apr 26 13:48:08 2017 +0800 + + * Set the same privilege as product or project for doclib. + +commit f1a71c2ce67210b0a3c8d3d6f0d4ff40076bf69d +Author: chenfeiCF +Date: Wed Apr 26 13:10:07 2017 +0800 + + * fix bug for testtask batchRun method. + +commit c480a3e4d3e7f16d5466f5a40b1502da21066e6a +Author: chenfeiCF +Date: Wed Apr 26 11:11:00 2017 +0800 + + * finish task #2985. + +commit 1fb8d4849e6017c48893ec7939164adda3773d33 +Merge: 9de09fa830 5cda35c926 +Author: daitingting +Date: Wed Apr 26 10:56:28 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9de09fa830eb0ba12af79111141e7d395e37e2dd +Author: daitingting +Date: Wed Apr 26 10:56:04 2017 +0800 + + * Add search function for files of doclib. + +commit 5cda35c9266dc07e8ef449c1cefb711b75efef5d +Author: chenfeiCF +Date: Wed Apr 26 09:55:46 2017 +0800 + + * finish task #2983. + +commit 04c93ad7ef9180107e62b46ebd7c8d1f31e036f1 +Author: daitingting +Date: Tue Apr 25 16:54:58 2017 +0800 + + * Display stage of story for link story. + +commit c5f2b983d2db7e95bcd22271913f4947ac881e19 +Merge: 418f685299 f36f82f86e +Author: daitingting +Date: Tue Apr 25 16:54:28 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 418f6852993bc1eadd0fa3fa5c31960de3f078b0 +Author: daitingting +Date: Tue Apr 25 16:54:12 2017 +0800 + + * Adjust codes. + +commit f36f82f86ec568e1f51880338428857af1da4004 +Author: chenfeiCF +Date: Tue Apr 25 16:38:26 2017 +0800 + + * finish task #3020. + +commit c0b0f1f7491426e9e775ae14be2174f54a4f8cc6 +Merge: 3171903ca2 4b9d6a26d9 +Author: daitingting +Date: Tue Apr 25 16:37:24 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3171903ca28daaa3674a45517b404680991f20c4 +Author: daitingting +Date: Tue Apr 25 16:36:22 2017 +0800 + + * Add tip for branch and platform. + +commit 4b9d6a26d9219cff6a34ad920275f8eeb9c50d61 +Author: chenfeiCF +Date: Tue Apr 25 16:23:10 2017 +0800 + + * finish task #2988. + +commit 26944c946e3007e22d48cbfa8e2e5ac5bdbe2a48 +Author: chenfeiCF +Date: Tue Apr 25 16:18:05 2017 +0800 + + * finish task #2997. + +commit 6b623dd233defc628e41c838766562ec19c34b8b +Author: chenfeiCF +Date: Tue Apr 25 15:59:21 2017 +0800 + + * finish task #2999. + +commit ec2356ed6b95406dcd7569785542212c0623f966 +Author: chenfeiCF +Date: Tue Apr 25 15:41:38 2017 +0800 + + * finish task #3003. + +commit 5956c3665ee6042829d228398a4642c3368678fe +Author: daitingting +Date: Tue Apr 25 15:40:19 2017 +0800 + + * Fix a bug for date. + +commit 10bb432212aac6ff1391fed86aa95f05b26d238b +Author: daitingting +Date: Tue Apr 25 14:10:08 2017 +0800 + + * Add sort function for doclib. + +commit f27818dc0cc16ff929788439535f9310357b33db +Author: wangyidong +Date: Mon Apr 24 13:33:12 2017 +0800 + + Fix bug#1054 我的地盘添加产品区块无法选择类型 + +commit 442d7e3d74e71e4640fbf4405ac8cccaf98d43c3 +Author: wangyidong +Date: Mon Apr 24 10:27:47 2017 +0800 + + Fix bug#1027 英文状态下导出bug只能选择utf-8 + +commit d3607062b3f66288a819659adfb54006da594a7c +Author: wangyidong +Date: Mon Apr 24 09:34:53 2017 +0800 + + Fix bug#1043 每日提醒功能会提示暂停项目中的任务 + +commit 24fdb413bee55d9ccb5fb1698b2cf16d889e659c +Author: wangyidong +Date: Fri Apr 21 15:52:38 2017 +0800 + + Fix bug#1047 需求关闭之后重新激活状态要重新设置下 + +commit 01163fe166c8c269689868b803c5292f90609ced +Author: wangyidong +Date: Fri Apr 21 15:40:26 2017 +0800 + + Fix bug#1045 kindeditor.html.php 单词拼写错误 + +commit c9643c81fa705f37bbedba13e58df07c8b54efcd +Author: wangyidong +Date: Fri Apr 21 15:27:43 2017 +0800 + + Fix bug#1010 提交bug页面向右拖动重现步骤的文本框调整大小浏览器字段下拉列表可能无法显示 + +commit 05a8b7f17080249aeea9b25846632d9e61ff2224 +Author: wangyidong +Date: Fri Apr 21 15:11:08 2017 +0800 + + Fix bug#1042 用例库添加用例优先级显示不友好 + +commit 6e9166a8599836576cdb2506893023e1fd067b29 +Author: wangyidong +Date: Fri Apr 21 14:17:42 2017 +0800 + + * remove test code. + +commit a7adfdc10ca21166f5c0510ea53baa46be3879e9 +Author: wangyidong +Date: Fri Apr 21 14:13:18 2017 +0800 + + Fix bug#1014 markdown编辑器中的表格显示不正确 + +commit 01755510462e0a641506bc522835e7c22fb5b01e +Author: wangyidong +Date: Thu Apr 20 14:58:01 2017 +0800 + + * fix bug for chenge account login to company-browse bysearch page. + +commit 07b2ff39ed63d6d48c965d54fa737924dea94585 +Author: wangyidong +Date: Thu Apr 20 14:28:28 2017 +0800 + + * change for chinese name. + +commit 94842924b4a92dfde13ba211b4299bbde062a5c7 (tag: zentaopms_9.1.2_20170419) +Author: wangyidong +Date: Wed Apr 19 13:23:00 2017 +0800 + + * change whitelist field to text. + +commit 4c12bcb111ce277febddffb19a2dbf8152f6b681 +Author: wangyidong +Date: Wed Apr 19 11:23:00 2017 +0800 + + * change for upgrade. + +commit 7a788b150ea61251359f59cc73cc233569613da8 +Author: wangyidong +Date: Wed Apr 19 10:58:04 2017 +0800 + + * fix bug #1051. + +commit 3d6bca84efa22901ea41ff752019314446e906e9 +Author: wangyidong +Date: Wed Apr 19 10:03:33 2017 +0800 + + * adjust for check and repair table. + +commit 975a7b53c7991f7d361b9a8a7610dd49751af4cf +Author: wangyidong +Date: Tue Apr 18 17:06:33 2017 +0800 + + * adjust for check table. + +commit 0832e0e2315c11769207638387b0e8df7ad9fa68 +Author: wangyidong +Date: Tue Apr 18 15:17:30 2017 +0800 + + * fix bug #1053. + +commit 83cde8fefcc96c133d05754c84b5a47cd3d9369b +Author: wangyidong +Date: Tue Apr 18 14:12:02 2017 +0800 + + * fix bug #1058. + +commit 3b5426fc4d9e4039e8a6b1beca894af355a876a1 +Author: wangyidong +Date: Tue Apr 18 13:48:47 2017 +0800 + + * code for bug #1061. + +commit 19ee6977ec9f3eb518a6a094d76555fa749e6ed1 +Author: wangyidong +Date: Tue Apr 18 13:45:05 2017 +0800 + + * fix bug #1061. + +commit f97c288560a2f909227faa047d960246942e2b58 +Author: wangyidong +Date: Tue Apr 18 13:31:10 2017 +0800 + + * code for bug #1062. + +commit 62425cb148be09896f80c17c04f1cfeeb40b8e4c +Author: wangyidong +Date: Tue Apr 18 13:30:01 2017 +0800 + + * fix bug #1062. + +commit 5b39baaade21dee5f6212f7c943b422f3808a392 +Author: wangyidong +Date: Tue Apr 18 10:13:03 2017 +0800 + + * adjust for print mobile order link. + +commit 794a09bc04d0b8e5cfc2a2ecd394f85db5271acb +Author: wangyidong +Date: Fri Apr 14 16:35:22 2017 +0800 + + * adjust for pro. + +commit d82b31871c6f4a61788290ad01873345014c2d6b +Author: wangyidong +Date: Fri Apr 14 16:35:01 2017 +0800 + + * fix bug for create report. + +commit e2eb26423427226668146ca47381cb92807c0bb5 +Author: chenfeiCF +Date: Tue Apr 11 13:48:50 2017 +0800 + + * adjust code for mobile web. + +commit 391894d37df5d5454253e77ec15c90eb53b33851 +Author: wangyidong +Date: Tue Apr 11 10:49:55 2017 +0800 + + * add new sql. + +commit 2d18b2945c7c00d40f5528c75be8604ce46946f0 (tag: zentaopms_9.1.1_20170410) +Author: wangyidong +Date: Mon Apr 10 09:30:24 2017 +0800 + + * change for add new version and upgrade it. + +commit 019c527b894ed4536af39354f10aa8c3e35bd1ad +Merge: e51ae47824 d2967f0e16 +Author: wangyidong +Date: Mon Apr 10 09:06:08 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e51ae47824b856307239d1be580518c9156c1075 +Author: wangyidong +Date: Mon Apr 10 09:05:40 2017 +0800 + + * adjust for report. + +commit d2967f0e162e7f76581f9f356f5b9c72057e2f95 +Author: chenfeiCF +Date: Fri Apr 7 16:52:20 2017 +0800 + + * adjust for mobile web. + +commit ed5e5a368bfb2f8371c4f8cb19927d9b942b1353 +Author: wangyidong +Date: Fri Apr 7 15:36:24 2017 +0800 + + * fix bug for testreport and other error and adjust after upgrade. + +commit ae6ca01c8cab7e94e021d5ba2e12d0f53fb24bdd +Author: wangyidong +Date: Fri Apr 7 13:44:52 2017 +0800 + + * fix bug #1013. + +commit cabb08e89b3f129d54b8733f9ddc6ba8cf37ae2c +Author: wangyidong +Date: Fri Apr 7 13:24:43 2017 +0800 + + bug#1041 测试-报告页面无法切换产品 + +commit a8110589a41574bd6fbc90bd74ecb3b274c7636c +Author: wangyidong +Date: Fri Apr 7 10:10:24 2017 +0800 + + * adjust for web and fix bugs. + +commit d12b51d827ec058f32cb3f567aa47b643ca212f6 +Author: chenfeiCF +Date: Thu Apr 6 15:04:56 2017 +0800 + + * adjust code for mobile web. + +commit 79b06de3e657ce032cac7d3d41b06da10cc1b754 +Merge: 0847decc37 cba53880f4 +Author: Catouse +Date: Thu Apr 6 14:36:26 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0847decc375087d3ca970ce2711ea36db0d497ce +Author: Catouse +Date: Thu Apr 6 14:33:43 2017 +0800 + + * fix tree menu style for company/browse. + +commit cba53880f41c07fe3645fe60c9f64d5e9ab4917e +Author: chenfeiCF +Date: Wed Apr 5 17:43:59 2017 +0800 + + * fix bug: if object is doc lib, just show object name. + +commit 377231ed49a09b978b7147be45173b9ff4c6bf09 +Author: chenfeiCF +Date: Wed Apr 5 17:17:18 2017 +0800 + + * fix bug: url in trash or action module is wrong. + +commit bf22fc1a7c4883da5b11f0bf55b6ce788769a9da +Author: chenfeiCF +Date: Wed Apr 5 15:00:57 2017 +0800 + + * adjust for mobile web: display block title in table head. + +commit df32a9cc9477051b20e999d4a96a453e51e0ad92 +Merge: cc9884cb1b 0bb5f024e4 +Author: wangyidong +Date: Wed Apr 5 10:02:54 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cc9884cb1b53e6ac6cc2e92775e9059c3d43d6ff +Author: wangyidong +Date: Wed Apr 5 10:01:12 2017 +0800 + + * fix for create affair task. + +commit 0f1d1dd275372ab606586cef1867098a4c2204df +Author: wangyidong +Date: Wed Apr 5 09:51:33 2017 +0800 + + * change for web. + +commit 0bb5f024e4381d0bf5542b68853e4239c4e7b828 +Merge: ac3fbbfe27 f3a62a9e30 +Author: daitingting +Date: Fri Mar 31 10:28:23 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ac3fbbfe27345b2c7fa84e159af9c9ceb39dcb13 +Author: daitingting +Date: Fri Mar 31 10:27:24 2017 +0800 + + * Fix a bug for ranzhi getting block form zentao. + +commit f3a62a9e30d66e783bdc4c42fba1f46fdcdb4dfe +Author: chenfeiCF +Date: Thu Mar 30 13:07:01 2017 +0800 + + * add lang item for 'required'. + +commit a0aac0368e5bd312ae06ab179568380b51118467 +Merge: f3f94e51a2 1fdea7c0c6 +Author: wangyidong +Date: Thu Mar 30 10:39:12 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f3f94e51a2bd2bce3f5c8658840e00ec8d51f87c +Author: wangyidong +Date: Thu Mar 30 10:36:43 2017 +0800 + + * fix bug for delete user. + +commit 1fdea7c0c6d5c6077e046141878079b59734bda1 +Author: chenfeiCF +Date: Wed Mar 29 15:17:48 2017 +0800 + + * add lang item for sort. + +commit 0b544fad55c8a356c19371966bec1714cdaf0dbe +Author: chenfeiCF +Date: Wed Mar 29 14:27:03 2017 +0800 + + * add lang item for pager object. + +commit e7bad1c238021ec7ff42dade25b4763a81e31e03 +Author: chenfeiCF +Date: Tue Mar 28 16:19:35 2017 +0800 + + * adjust code for code refactoring of mobile web. + +commit 3d4a2fb7bd748bd7ac98058000904e3e90d87653 +Author: chenfeiCF +Date: Tue Mar 28 10:08:08 2017 +0800 + + * delete mobile directory of images dir. + +commit 3b6ab707ff57160785e53dc9bfdd484c23e4290a +Author: chenfeiCF +Date: Tue Mar 28 09:43:12 2017 +0800 + + * delete useless mobile web file. + +commit 03ffb5b51d5b2deb1c14bf8bfabdbdbb6d199269 +Merge: 2bed9e03e9 4e15469935 +Author: chenfeiCF +Date: Tue Mar 28 09:35:42 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2bed9e03e9dedbff3c8bd38c3097d9e3840045d9 +Author: chenfeiCF +Date: Tue Mar 28 09:35:04 2017 +0800 + + * If client device is mobile and version is pro, set the default view as mthml. + +commit 4e15469935c3498e29ff4da0d7a9728b57fc4ec8 +Author: wangyidong +Date: Mon Mar 27 15:53:07 2017 +0800 + + * fix bug for sendmail that no action. + +commit dce2c6a5e83b3fdb5ec814d29477e60889369d96 +Author: wangyidong +Date: Mon Mar 27 15:25:54 2017 +0800 + + * fix bug #994. + +commit 65cffaf22b2b3202a29adfe529a263687acaa270 +Author: wangyidong +Date: Fri Mar 24 16:58:46 2017 +0800 + + * fix bug #1024. + +commit 081b841d1879e00bf9797a8fba5a2154f1db0a16 +Author: wangyidong +Date: Fri Mar 24 16:19:10 2017 +0800 + + * fix bug #1026. + +commit 8c40d3a2a192a000736ce7bb7c2e90a029d3c03b +Author: wangyidong +Date: Fri Mar 24 16:13:11 2017 +0800 + + * fix bug #1028. + +commit 3817a3f8c3f09be246475c3a786affb760294c2c +Author: wangyidong +Date: Fri Mar 24 15:29:45 2017 +0800 + + * remove insert video in ueditor. + +commit 7992e7b389968e412814bb7d879edb7372140cd9 +Author: wangyidong +Date: Fri Mar 24 14:11:24 2017 +0800 + + * fix for add admin item for user by sso login. + +commit b28978b34fe88c34cf9f654f2f59453bc54a993c +Author: wangyidong +Date: Fri Mar 24 10:17:23 2017 +0800 + + * adjust for testsuite and testreport priv. + +commit 06746e365969e4a1bff28c39ad2153deae203321 +Author: wangyidong +Date: Thu Mar 23 16:19:39 2017 +0800 + + * fix for lang. + +commit 0ee005e96569a9149dbdf393456bcf66b0700b5b (tag: zentaopms_9.1.stable_20170323) +Author: wangyidong +Date: Thu Mar 23 13:17:22 2017 +0800 + + * adjust for zh-tw lang. + +commit c79153bc2aee00d4b17a512ff415163ccb762d97 +Merge: 05fc92c45c 6a440ba147 +Author: wangyidong +Date: Thu Mar 23 11:55:13 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 05fc92c45cf978a7675d35b45c77215009377434 +Author: wangyidong +Date: Thu Mar 23 11:54:55 2017 +0800 + + * adjust for upgrade. + +commit 6a440ba147a0f41539a2c7c5d7382a1bf0b481a0 +Author: pengjiangxiu +Date: Wed Mar 22 16:29:50 2017 +0800 + + * adjust code + +commit c9bda5f577fd8bb8d38709b19a9569cdbcac9a3b +Author: wangyidong +Date: Wed Mar 22 15:21:19 2017 +0800 + + * fix bug #1025. + +commit bfa8cc76f41748c53adf80fe9eecf0ede07f3c41 +Author: wangyidong +Date: Wed Mar 22 15:06:40 2017 +0800 + + * fix bug #1031. + +commit 15ab56b7856bce7e5cbc24dccb4815ad789e686d +Author: wangyidong +Date: Wed Mar 22 15:04:10 2017 +0800 + + * fix bug #1035. + +commit ca08397cc64d6dfeb04b2322968e1cb7b105fd25 +Author: wangyidong +Date: Wed Mar 22 14:34:50 2017 +0800 + + * fix bug #1037. + +commit 5eaa1d1b83ffbbf2a1f3618146e40391ffeaf963 +Merge: 2eb5ee260a 7ad0ecc388 +Author: wangyidong +Date: Wed Mar 22 14:12:51 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2eb5ee260a4cab486a1676d800a609b68dcdc5b7 +Author: wangyidong +Date: Wed Mar 22 14:12:26 2017 +0800 + + * adjust judgeSuhosinSetting method to static. + +commit 7ad0ecc388fb05f6a967868220fc610f35d89d98 +Author: pengjiangxiu +Date: Wed Mar 22 14:11:33 2017 +0800 + + * adjust testcass for batchCaseTypeChange. + +commit cec824e54065a98be75ec7220268f480e914796a +Author: wangyidong +Date: Wed Mar 22 13:34:46 2017 +0800 + + * ajdust build view page in modal. + +commit aabf230dd674ded3be59a153d28d5b17fdf11340 +Author: chenfeiCF +Date: Wed Mar 22 13:04:26 2017 +0800 + + * if products's type are normal, unset branch field when export stories and bugs. + +commit a7ff963039e57ec74f3bc9a4a36f4c02270b1111 +Merge: 5b2c5c80ba 6b2aa9a7cb +Author: wangyidong +Date: Wed Mar 22 11:31:42 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5b2c5c80bad4cb69bd9037c8d2a1de8c16578637 +Author: wangyidong +Date: Wed Mar 22 11:31:14 2017 +0800 + + * add testtask repot for bug report. + +commit 6b2aa9a7cbf80f265e8e3bb10683a1eccdfcebce +Author: pengjiangxiu +Date: Wed Mar 22 10:47:15 2017 +0800 + + * adjust linkCase. + +commit 224923e8221594471d3f734a1bd8d25051685ecb +Author: chenfeiCF +Date: Wed Mar 22 10:15:41 2017 +0800 + + * adjust checkDelayBugs method. + +commit 6e5dbf8d84e99823d03b0dd8a4a3336d5fc79ace +Author: wangyidong +Date: Wed Mar 22 09:50:41 2017 +0800 + + * fix for set block closed. + +commit a0a60c11e065e1d6d036aee117da37dde3de20aa +Author: pengjiangxiu +Date: Wed Mar 22 09:29:04 2017 +0800 + + * adjust for test task. + +commit 5c95565f44c121d305053e1468d18bc04bb8597c +Merge: 7de75f5fc1 fcb75ab53d +Author: wangyidong +Date: Tue Mar 21 16:54:15 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7de75f5fc13c6f27dd48891add0c46efca7bf18a +Author: wangyidong +Date: Tue Mar 21 16:53:55 2017 +0800 + + * adjust for create bug from case. + +commit fcb75ab53d904dc6a88b36262856c8033210049b +Author: Catouse +Date: Tue Mar 21 16:17:21 2017 +0800 + + * fix drop menu not hide on click document. + +commit 323308d1056db78b1c6dd330cd4b89e7fd8b7316 +Author: chenfeiCF +Date: Tue Mar 21 15:12:19 2017 +0800 + + * adjust colspan for view file of importfromlib method. + +commit 48432b3e4110e88049038a7a06481f21dc0ca037 +Merge: dc812fd161 0d0764dc5a +Author: wangyidong +Date: Tue Mar 21 15:08:51 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit dc812fd161a197fc8cac2b3ede40c436b0750a44 +Author: wangyidong +Date: Tue Mar 21 15:06:38 2017 +0800 + + * adjust code. + +commit 0d0764dc5a517a697c99659947a5e90321dac370 +Author: chenfeiCF +Date: Tue Mar 21 14:32:50 2017 +0800 + + * fix bug when create bug from case. + +commit 7c78f4ca516f9eb5f407777d406e8774dd216c9a +Author: Catouse +Date: Tue Mar 21 14:26:26 2017 +0800 + + * remove unused code. + +commit 5667e909b12d24e3a749cba77a3648f0c1078e1b +Author: Catouse +Date: Tue Mar 21 14:26:09 2017 +0800 + + * refactor testsuit lib search dropmenu. + +commit a6c7eed490540bebe95450b1d8ea56f3ebd3d73d +Merge: 940d9b7b42 741a5ac94b +Author: Catouse +Date: Tue Mar 21 13:24:43 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 940d9b7b42af2634b3b1a5087b9c9081f04a3841 +Author: Catouse +Date: Tue Mar 21 13:24:36 2017 +0800 + + * refactor drop menu UI. + +commit 741a5ac94bf2c4a1fcd378bac0473a94a3c6636b +Author: chenfeiCF +Date: Tue Mar 21 10:09:04 2017 +0800 + + * adjust for task #2925. + +commit 462b0405050a16d36406c18c18778bc758c422ad +Merge: aeac7bd566 06a4993ab3 +Author: chenfeiCF +Date: Mon Mar 20 17:15:26 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit aeac7bd5663233cab9bf480592218656795a0a9a +Author: chenfeiCF +Date: Mon Mar 20 17:13:43 2017 +0800 + + * adjust colorbox width when create bug from failed cases. + +commit 06a4993ab3a58a33b4fef083e6494fe003d3e904 +Author: wangyidong +Date: Mon Mar 20 16:51:37 2017 +0800 + + * fix bug. + +commit 4bfaac292d76a450f0165b136e35a11c4d38c1d3 +Author: wangyidong +Date: Mon Mar 20 16:34:17 2017 +0800 + + * adjust for get case step count. + +commit 2116e473da392398e4d13159a260149d0ee9677b +Merge: c8d822e454 d5ae973e2c +Author: wangyidong +Date: Mon Mar 20 16:32:52 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c8d822e45421b29c94059be7fcc53ad019a69e3b +Author: wangyidong +Date: Mon Mar 20 16:32:02 2017 +0800 + + * rewrite convert pinyin. + +commit d5ae973e2c3e6445731b1fa05dace9ef5b86906c +Author: chenfeiCF +Date: Mon Mar 20 16:16:46 2017 +0800 + + * adjust db file. + +commit 4998a71370a5e7103742aae3e67d9e4ba0caf405 +Merge: b047d57063 f334c1897a +Author: chenfeiCF +Date: Mon Mar 20 15:56:12 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b047d570634b795c35dc3119a6fa477f34df668f +Author: chenfeiCF +Date: Mon Mar 20 15:54:36 2017 +0800 + + * adjust view file of batchRun method: merge td for step group. + +commit f334c1897a937ef5c7508e43d9549a020866b290 +Author: pengjiangxiu +Date: Mon Mar 20 15:54:12 2017 +0800 + + * adjust code. + +commit 5d00d81b88f42efb8f6d5b05c887f0686dc17b17 +Merge: 93e769f51d 2248fc8b6e +Author: wangyidong +Date: Mon Mar 20 15:14:46 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 93e769f51d966a2daf17892b7b2a0f4ab0ae8287 +Author: wangyidong +Date: Mon Mar 20 15:13:08 2017 +0800 + + * adjust for testreport. + +commit 2248fc8b6ee895465296d3c6e2e01d5783e5ba6e +Author: pengjiangxiu +Date: Mon Mar 20 14:44:04 2017 +0800 + + * adjust code for task #2917. + +commit c63229709191ca424326a516e0461c414eb65318 +Merge: 3778413d90 8951abc134 +Author: pengjiangxiu +Date: Mon Mar 20 13:41:56 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3778413d90053532f5315387a154bd810bf14b34 +Author: pengjiangxiu +Date: Mon Mar 20 13:41:36 2017 +0800 + + * adjust code. + +commit 8951abc13454de05b0d6c2ca384b9b7817b4c3d1 +Merge: 4ccf0ebc1f 1de940c5aa +Author: chenfeiCF +Date: Mon Mar 20 13:34:54 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4ccf0ebc1f218350b51c49dcd1cbcca28b253cad +Author: chenfeiCF +Date: Mon Mar 20 13:30:58 2017 +0800 + + * save step type and display according to step type. + +commit 1de940c5aa76177917ce0f3d89fb71c79d52e91b +Author: pengjiangxiu +Date: Mon Mar 20 13:24:07 2017 +0800 + + * adjust style. + +commit f43682fec8d2c0a11673da3ed73df937976570f7 +Author: Catouse +Date: Mon Mar 20 11:16:11 2017 +0800 + + * adjust style. + +commit 6914123274f4305905154ed154c77cf07fa34bcd +Author: Catouse +Date: Sat Mar 18 14:14:51 2017 +0800 + + * adjust code. + +commit d21721df96f330b006b228518bfe63884a680cd0 +Merge: 87b7971ee4 3c980a02fb +Author: Catouse +Date: Sat Mar 18 14:14:36 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 87b7971ee4287696222f8aea519e43ae443335ec +Author: Catouse +Date: Sat Mar 18 13:37:18 2017 +0800 + + * refactor testcase steps editor. + +commit 3c980a02fb490ef4026413c8b0a354e28295e552 +Merge: 6d1474a541 7f5b9a3834 +Author: wangyidong +Date: Fri Mar 17 17:19:20 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6d1474a54182751fed94acd55c3c01e5c7c34ad9 +Author: wangyidong +Date: Fri Mar 17 17:18:24 2017 +0800 + + * adjust code. + +commit 7f5b9a3834f491b67a80490ef2bb6e0f2f216ade +Author: chenfeiCF +Date: Fri Mar 17 15:01:26 2017 +0800 + + * merge owner and pri, begin and end as one row in edit view file of testtask module. + +commit c73649a0176c06585b25b88b1270bc60eb243ac2 +Author: wangyidong +Date: Fri Mar 17 14:45:33 2017 +0800 + + * fix bug for project burn in block. + +commit dc652650b54fb474cfad475ba016514c46180223 +Merge: e050079a3d 018a63f7e9 +Author: chenfeiCF +Date: Fri Mar 17 13:30:21 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e050079a3df8f1a534654ca1f5fde1d06b9711b4 +Author: chenfeiCF +Date: Fri Mar 17 13:29:08 2017 +0800 + + * adjust action for testtask. + +commit 018a63f7e919bcc23866d3d12eadf0fab0fe64e4 +Merge: 7648bfd46e d00a71eec2 +Author: wangyidong +Date: Fri Mar 17 13:25:16 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7648bfd46eac4a8c4eecf71be2f780900197c65d +Author: wangyidong +Date: Fri Mar 17 13:24:43 2017 +0800 + + * change field name fromLib to fromCaseID. + +commit 5e73bbc6ee8105129ceddbc08304ebe244c11c46 +Merge: cc5386b162 05569ed945 +Author: wangyidong +Date: Fri Mar 17 13:16:10 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d00a71eec2871dbdac3d13f68db3ecf9c12616ef +Author: chenfeiCF +Date: Fri Mar 17 13:16:09 2017 +0800 + + * remove toggle icon. + +commit cc5386b1626cdf1898980fb763dd975e16cd629d +Author: wangyidong +Date: Fri Mar 17 13:15:47 2017 +0800 + + * rename importlib to importfromlib. + +commit 05569ed945175faea963de63864317fe3a8a9a96 +Author: chenfeiCF +Date: Fri Mar 17 13:04:13 2017 +0800 + + * adjust code for task #2932.. + +commit 9851ec8a118c3dbdbfd066c1f8ad80889f4ffaa8 +Merge: 41965a24b4 bf66b705d4 +Author: wangyidong +Date: Fri Mar 17 10:46:40 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 41965a24b40e4c27e698db334cd5736e57f94f5c +Author: wangyidong +Date: Fri Mar 17 10:46:12 2017 +0800 + + * adjust code. + +commit bf66b705d4468ac39e76b4ff5c70d545189bb9d1 +Author: chenfeiCF +Date: Fri Mar 17 10:19:00 2017 +0800 + + * remove duplicate deadline in view file of bug's edit method. + +commit d88e6d3669b964ebf23ba8122d9ba20a860d640d +Author: chenfeiCF +Date: Fri Mar 17 10:17:05 2017 +0800 + + * add bug's deadline field to user custom fields in DB. + +commit e61a36a9e0ab070086b64f9cb365f5fc97da997c +Author: wangyidong +Date: Fri Mar 17 09:34:32 2017 +0800 + + * change lang. + +commit f53dba8aff7460c95d92a0473a17993c871900b9 +Merge: 38e9126691 6f0fc2948b +Author: wangyidong +Date: Fri Mar 17 09:12:33 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 38e9126691ca239ce24206a6dda659b2f749d9c7 +Author: wangyidong +Date: Fri Mar 17 09:12:06 2017 +0800 + + * change for group priv. + +commit 6f0fc2948b277697881fba3b39eabbe0267fa234 +Merge: e5e05bf0f0 91ebea1734 +Author: tengfei +Date: Thu Mar 16 11:35:03 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + *pull for push added lang + +commit e5e05bf0f094613757ae02b0e022d21288c991fd +Author: tengfei +Date: Thu Mar 16 11:34:09 2017 +0800 + + *edited newly added lang + +commit 91ebea17345bcec56bade2c1e3357dbe138e8348 +Author: pengjiangxiu +Date: Thu Mar 16 10:29:17 2017 +0800 + + * adjust for link case build + +commit 70dae03a8276059f8eaa4f4e3b1d99448890fb48 +Author: chenfeiCF +Date: Thu Mar 16 10:18:19 2017 +0800 + + * adjust chosen container max width. + +commit c0240bb96bfc2d1464076458ecf5f476ed6e67f2 +Author: pengjiangxiu +Date: Thu Mar 16 09:55:11 2017 +0800 + + * adjust for block and activaate + +commit 9b3bf11a215606087ed9a1b776d8ac4cef99a3e8 +Merge: 90c70d3373 a769f83c22 +Author: wangyidong +Date: Thu Mar 16 09:49:38 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 90c70d3373ac660e640409f22d62ee683f718f45 +Author: wangyidong +Date: Thu Mar 16 09:44:55 2017 +0800 + + * adjust for link case in testtask. + +commit 5c5bada3a1aeb18a2006b3532f457bee63814d4b +Merge: f755c21fa3 a769f83c22 +Author: tengfei +Date: Thu Mar 16 09:26:33 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + *deleted feedback and repo + +commit a769f83c22e55aa5e0c5bd8f376be6f352a33601 +Author: pengjiangxiu +Date: Thu Mar 16 09:22:30 2017 +0800 + + * adjust style for testtask + +commit bc386309db3aa1bd9beb8dba06140f76219af7ae +Author: wangyidong +Date: Thu Mar 16 08:24:20 2017 +0800 + + * fix code. + +commit b25f05717eca77668d5d8689df49264faa18be12 +Author: wangyidong +Date: Wed Mar 15 17:38:06 2017 +0800 + + * adjust for setTreeBox. + +commit a4abc014041f1bed67dc8e67aaaca31b916a8905 +Author: wangyidong +Date: Wed Mar 15 17:33:17 2017 +0800 + + * change for hide side. + +commit e187f98374226faef68c7d33579949e43836fe1e +Merge: 64c998e30b a5c19fd479 +Author: wangyidong +Date: Wed Mar 15 17:19:41 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 64c998e30b1b57bc81b06d7d8066d064f54a6c47 +Author: wangyidong +Date: Wed Mar 15 17:18:39 2017 +0800 + + * code for batch edit testcase in my module. + +commit a5c19fd47921ddcc855cd36827d44fe1aa455e05 +Author: chenfeiCF +Date: Wed Mar 15 17:01:42 2017 +0800 + + * just use case step item as bug step when creating bug from case steps. + +commit 0416eed2897079c66b37dda5df012a0204b8225e +Author: wangyidong +Date: Wed Mar 15 16:43:58 2017 +0800 + + * set admin in login. + +commit 339f9fa19847ecb6fc05f7f7a5b04c78d3a55dbe +Author: Catouse +Date: Wed Mar 15 15:41:10 2017 +0800 + + * adjust code format. + +commit f3e07b735e9f9d676b365909a99af4f30a096ac2 +Author: pengjiangxiu +Date: Wed Mar 15 15:04:33 2017 +0800 + + + adjust style for testtask and other + +commit 4b2f35c6c6a9452516bfcbe8ea2f2f20fb4beb4c +Author: chenfeiCF +Date: Wed Mar 15 14:44:01 2017 +0800 + + * fix bug: overdue bug label can not highlight. + +commit a9b12e488724c744cbcbe738c2d498c4c14bbce4 +Author: chenfeiCF +Date: Wed Mar 15 14:31:46 2017 +0800 + + * add deadline field in creaet, edit and batchEdit method of bug module. + +commit b8c310e31c8d161619ff4f8be102e62441ae760e +Author: wangyidong +Date: Wed Mar 15 13:57:20 2017 +0800 + + * change testlib to caselib. + +commit 751fad9fe2d2383b501348104fac52a6bb146cbf +Author: wangyidong +Date: Tue Mar 14 16:12:13 2017 +0800 + + + adjust style for testcase report. + +commit 9c9dac31c8a8bcca4b0a51722b6cdd0020a08d90 +Merge: 89f3ea8f47 24ce584f95 +Author: wangyidong +Date: Tue Mar 14 15:04:22 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 89f3ea8f4702840ccfd2bf926932006068a9c7ae +Author: wangyidong +Date: Tue Mar 14 15:03:47 2017 +0800 + + * adjust style for testreport. + +commit 24ce584f95b5671abb782919e720b69519b26da4 +Author: pengjiangxiu +Date: Tue Mar 14 15:00:10 2017 +0800 + + * code for bug #1030. + +commit 9757471300cb87aeb8800f9240dd5ecb4d7e7d03 +Author: pengjiangxiu +Date: Tue Mar 14 14:13:32 2017 +0800 + + change for #task 2900. + +commit 4421cf85d64a345673f2563562a63ea095d4fc42 +Author: wangyidong +Date: Tue Mar 14 13:32:44 2017 +0800 + + * fix bug #1029. + +commit f0d0ba097ebbf0132748760506c1e59e41b14482 +Merge: d9ec2be130 60e919420e +Author: wangyidong +Date: Tue Mar 14 11:33:36 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d9ec2be130c7658484bcd698932b346012cb1b26 +Author: wangyidong +Date: Tue Mar 14 11:33:18 2017 +0800 + + * ajdust style. + +commit f755c21fa384aba9e43998f1c15edfb63cae1d73 +Author: tengfei +Date: Tue Mar 14 09:53:19 2017 +0800 + + * ADJUST pending versions + +commit 60e919420e0c16d99879297bf0089871f448c0ce +Author: pengjiangxiu +Date: Tue Mar 14 09:25:28 2017 +0800 + + * finish task #2908 #2928. + +commit f53fa19bbedfaefc214f94bef387c2fa513f666b +Author: wangyidong +Date: Mon Mar 13 09:20:29 2017 +0800 + + * code for task #2901. + +commit 2e283cda225bfd8bbe0ab922b0e585f0a4acbe83 +Author: wangyidong +Date: Mon Mar 13 09:14:02 2017 +0800 + + * finish task #2920. + +commit 3af3685d29d9b9f8c5ed73d18d9d05a795c676ad +Author: wangyidong +Date: Fri Mar 10 16:04:04 2017 +0800 + + * add new english lang. + +commit 93d5a18f57c809bf84f296da47b832977dd7b3e4 +Author: wangyidong +Date: Fri Mar 10 15:34:10 2017 +0800 + + * change for en lang. + +commit af8ad0420f214ef712e4ab2d3e44baa9c01a18e1 +Author: wangyidong +Date: Fri Mar 10 15:00:33 2017 +0800 + + * finish task #2937. + +commit eaeab89f534028b43133ee33962e219b271635eb +Author: wangyidong +Date: Fri Mar 10 11:59:01 2017 +0800 + + * finish task #2927. + +commit c74726b52ad7327d50d1f7741c2a90e372fb53bb +Author: wangyidong +Date: Fri Mar 10 10:34:39 2017 +0800 + + * code for task #2941. + +commit 429ab3b49469aa2e764cb795ae066eecf294db7f +Author: wangyidong +Date: Fri Mar 10 10:24:31 2017 +0800 + + * finish task #2941. + +commit 107039b87bf20cdf57ade051afe9d2fb3751eb9a +Author: wangyidong +Date: Fri Mar 10 09:58:49 2017 +0800 + + * code for 2899. + +commit cb90082ae388539ac982999926fc201c1ede1124 +Merge: 752a96a5eb c64dd977ae +Author: wangyidong +Date: Thu Mar 9 17:21:43 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 752a96a5eb3187fc1cc635434a129646229fbe1e +Author: wangyidong +Date: Thu Mar 9 17:21:09 2017 +0800 + + * finish for task #2899. + +commit c64dd977ae0d8a59ea2bf483599b606e5de13931 +Author: pengjiangxiu +Date: Thu Mar 9 17:01:31 2017 +0800 + + * finish task #2917. + +commit 5e4bae3022a3e06097b394a1e0511b282f09ba5b +Merge: e306f0d364 829628db1b +Author: wangyidong +Date: Thu Mar 9 09:08:56 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e306f0d364f0db146db688ef0cc11a3c528bb435 +Author: wangyidong +Date: Thu Mar 9 09:08:09 2017 +0800 + + * update db. + +commit 829628db1ba6f60a32de974dbfa1fc194a711de1 +Author: pengjiangxiu +Date: Wed Mar 8 16:46:36 2017 +0800 + + * finish task #2919. + +commit d5f1671bc705394493cd76c0ea0d2aed3fb67aef +Author: pengjiangxiu +Date: Tue Mar 7 14:37:47 2017 +0800 + + * finish task #2900. + +commit e46a533aee322a30107e674784d8cac4d3123a07 +Author: pengjiangxiu +Date: Tue Mar 7 10:21:39 2017 +0800 + + * finish task #2930 #2925. + +commit e4001d23d5d9e6f8c0ed16df08bf286fadb326cb +Author: pengjiangxiu +Date: Tue Mar 7 10:15:26 2017 +0800 + + ./config/my.php.back + +commit f1515951b042ad4f0e6fb35ca35d22afd3febf68 +Author: wangyidong +Date: Mon Mar 6 13:14:38 2017 +0800 + + * finish task #2907,2910. + +commit 54f267e438a0fa8d62cf21a8d8115b638a78e9ee +Author: Catouse +Date: Fri Mar 3 17:54:09 2017 +0800 + + * adjust style. + +commit 262363a3ba80e0eea50f90cf0b921c7628a31af2 +Author: Catouse +Date: Fri Mar 3 17:48:08 2017 +0800 + + * change testcase steps form UI. + +commit 4bdc57c2bb4efb3bbb03502101cfb314b86e9550 +Author: Catouse +Date: Fri Mar 3 17:19:52 2017 +0800 + + * fix testcase steps sortable not work in firefox. + +commit c162d18eb1156c3acff1a429105dcf59b5ad2b0f +Author: wangyidong +Date: Fri Mar 3 09:08:13 2017 +0800 + + * code for task #2896. + +commit 22115ecfbd9f6e55098ec1443da2dfc09ada8b06 +Author: wangyidong +Date: Fri Mar 3 09:00:45 2017 +0800 + + * finish task #2896. + +commit 20078c869540dda27a78fc47b24f05be0216f3e2 +Merge: 06d30aa8c6 375b811447 +Author: Catouse +Date: Thu Mar 2 16:53:44 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 06d30aa8c65bd330af6f1e59c28c7f39fc06f817 +Author: Catouse +Date: Thu Mar 2 16:52:36 2017 +0800 + + * code for task #2939, now support to resize block height in dashboard. + +commit 375b811447073c08324d37c276284e187fddb6e3 +Author: wangyidong +Date: Thu Mar 2 10:47:06 2017 +0800 + + * code for task #2898. + +commit b3ee0204b529a0374132d4aca4a21ca0c402f1ba +Author: wangyidong +Date: Thu Mar 2 10:37:13 2017 +0800 + + * finish task #2898. + +commit 97739b476ca1f2190ffe9bd627b8db44a78260a8 +Merge: 47405cf9dc 9042d65433 +Author: Catouse +Date: Thu Mar 2 10:32:14 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 47405cf9dcdb6b2381cf4c2b318d5136fb946cd1 +Author: Catouse +Date: Thu Mar 2 10:31:38 2017 +0800 + + * change testcase/view UI. + +commit 5179018d24291ca25fc8b0fa2504a30dbff03754 +Author: Catouse +Date: Thu Mar 2 10:31:23 2017 +0800 + + * code for task #2906, change edit testcase UI. + +commit 9042d65433292bfc852d82818a7269bec1678228 +Author: pengjiangxiu +Date: Thu Mar 2 10:19:39 2017 +0800 + + * finish task #2931. + +commit fdd12316aefeeb50da374568f046d08177d41ba1 +Author: Catouse +Date: Wed Mar 1 17:20:22 2017 +0800 + + * code for task #2939. + +commit 3e32f88360532f0fb0822a640eac325bae6a542b +Merge: c1aa7413e0 d2b82bc30d +Author: Catouse +Date: Wed Mar 1 15:36:11 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c1aa7413e091ccc19444d79add18f6712942f96a +Author: Catouse +Date: Wed Mar 1 15:35:59 2017 +0800 + + * finish task #2906. + +commit d2b82bc30d2d9cf62f440055b92107337a448ef9 +Author: pengjiangxiu +Date: Wed Mar 1 15:19:04 2017 +0800 + + * finish task #2940. + +commit 586ac5c826f36cc0de674a7098160dbacffe89c8 +Author: pengjiangxiu +Date: Wed Mar 1 11:05:25 2017 +0800 + + * finish task #2938. + +commit 175f0b416050aab882bedb6a5860698a801ac954 +Merge: a9d7f8d8c7 8aac6c576b +Author: wangyidong +Date: Tue Feb 28 17:36:58 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a9d7f8d8c72fd91e0d881030b619880eeb1244dc +Author: wangyidong +Date: Tue Feb 28 17:36:34 2017 +0800 + + * code for task #2897. + +commit 8aac6c576ba44ed36e8cda8ef4ac7f725db05387 +Author: pengjiangxiu +Date: Tue Feb 28 11:24:17 2017 +0800 + + * finish task #2902,2903,2904. + +commit de360cb4d0ebb0b185728ce7827c20e32f5af7a0 +Author: pengjiangxiu +Date: Mon Feb 27 14:01:52 2017 +0800 + + * finish task #2916. + +commit e832b8e002a86a471a6da9b304eb349adaf3b3c1 +Merge: c6b1ad5a8f 420da7e951 +Author: wangyidong +Date: Mon Feb 27 13:50:27 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c6b1ad5a8fa3c1a886d1db5d9f2b6d7436236af0 +Author: wangyidong +Date: Mon Feb 27 13:49:47 2017 +0800 + + * finish task #2895. + +commit 93a17061b46c8bcd1cc6ebdcc954bb80c2327811 +Author: wangyidong +Date: Mon Feb 27 13:18:44 2017 +0800 + + * add doc for compatible. + +commit 420da7e9512e193f2ac14ed800ccc5a5007da6a8 +Author: pengjiangxiu +Date: Mon Feb 27 10:27:43 2017 +0800 + + * finish task #2909. + +commit 4eea9a33b418571dd37f6b650c7444246105420e +Merge: 4e84b9cdde da1e08c9bb +Author: wangyidong +Date: Fri Feb 24 16:29:41 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4e84b9cddef02434b14b095405ca26b76fdc3070 +Author: wangyidong +Date: Fri Feb 24 16:28:29 2017 +0800 + + * finish task #2893,2894. + +commit da1e08c9bbca8cc04dc90b2f9855698636e835d0 +Author: pengjiangxiu +Date: Fri Feb 24 15:29:39 2017 +0800 + + * finish task #2912. + +commit 1d893447ebf4253f20da1ab51b1d4a1eeadba0e1 +Author: pengjiangxiu +Date: Fri Feb 24 14:52:48 2017 +0800 + + * finish task #2929. + +commit 0a00ab84a8dcb69878ca4dbb5259b3a536846b3f +Merge: c1427b373e 96979544d9 +Author: wangyidong +Date: Fri Feb 24 10:23:33 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c1427b373e015ceff216923d99ae8d87efcafb28 +Author: wangyidong +Date: Fri Feb 24 10:23:04 2017 +0800 + + * ignore empty order. + +commit 53f0953951a2d3c4d466c398f91f14b779101681 +Author: wangyidong +Date: Fri Feb 24 10:15:01 2017 +0800 + + * adjust for get last extension version. + +commit 96979544d928f2b5071904771837cef790d172fd +Author: pengjiangxiu +Date: Fri Feb 24 10:04:06 2017 +0800 + + * finish task #2934. + +commit 14f1158bde48a3473a097a95e675005c3ed44fa9 +Author: pengjiangxiu +Date: Thu Feb 23 13:55:12 2017 +0800 + + * finish task #2935. + +commit 6520403138be5d40aa886e7d498c629ebe09bbca +Merge: 8133b79b48 0e5c648c54 +Author: wangyidong +Date: Thu Feb 23 13:23:14 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8133b79b482698242b8f3fe1a951516209906ed0 +Author: wangyidong +Date: Thu Feb 23 13:22:22 2017 +0800 + + * finish task #2926. + +commit 0e5c648c540e08991fd3d79122ab70867360e7b9 +Author: pengjiangxiu +Date: Thu Feb 23 13:04:35 2017 +0800 + + * finish task #2932 + +commit 82c7d41f082e59a8a4cbd0ae7511591fe0f3fb9a +Author: pengjiangxiu +Date: Thu Feb 23 09:52:57 2017 +0800 + + * finish task #2922 + +commit 73b27f4e6a5571de8a544e650b52b077b1e78519 +Author: pengjiangxiu +Date: Thu Feb 23 09:37:39 2017 +0800 + + * finish task #2911 + +commit 5a658521d764e5cde7be0c23fbdd8027ed5dd604 +Author: wangyidong +Date: Thu Feb 23 09:24:46 2017 +0800 + + * fix bug #1016. + +commit aef586576be4610a5562851f19e1beb368150762 +Author: pengjiangxiu +Date: Thu Feb 23 09:08:51 2017 +0800 + + * finish task #2936 + +commit 16d2f2a9b97d8cf2148d61739a968ebd517e292a +Author: wangyidong +Date: Wed Feb 22 17:11:33 2017 +0800 + + * finish task #2921. + +commit 08cdbfdd27f358ed0f79db4c5862bb630da95863 +Merge: 625948aad3 75ec1671cf +Author: wangyidong +Date: Wed Feb 22 16:31:10 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 625948aad3b4751db9af47388a65995fa8cf216f +Author: wangyidong +Date: Wed Feb 22 16:30:53 2017 +0800 + + * finish task #2933. + +commit 7fd78bbb8c74c5939231fcf0800731bbea58f48e +Author: wangyidong +Date: Wed Feb 22 16:19:27 2017 +0800 + + * fix for order by plan. + +commit 75ec1671cf51d0e050fa1968c4c3829c01883a2f +Merge: 522022360d 11718672c6 +Author: QingDao Nature Easy Soft Network Technology Co,LTD +Date: Thu Feb 16 09:48:35 2017 +0800 + + Merge pull request #7 from PeterDaveHelloKitchen/image-optimize + + optimize png images using zopflipng + +commit 522022360d4f7d28886a1ba36629cc11c1e42d69 (tag: zentaopms_9.0.1_20170215) +Author: wangyidong +Date: Wed Feb 15 10:17:41 2017 +0800 + + * changeLog. + +commit 5a72fcb503e521254d1c80317d7904bf39a889f8 +Author: wangyidong +Date: Wed Feb 15 10:05:43 2017 +0800 + + * adjust for safe. + +commit 8d309ad7cf6f736da9b23dfadb03769a58f22c29 +Author: wangyidong +Date: Wed Feb 15 10:04:07 2017 +0800 + + * adjust for project tree. + +commit 5619ac5f4c729051a12b4dbbc73e4f1ff32567d0 +Author: wangyidong +Date: Tue Feb 14 16:33:06 2017 +0800 + + * change for upgrade and en,zh-tw lang. + +commit ce087026a7ecc5d36ee11952b91dc8ed523628ab +Author: wangyidong +Date: Tue Feb 14 16:04:02 2017 +0800 + + * adjust for safe. + +commit b5e9d08b8ceb220ef2381daf1bb4ab75985b1215 +Author: wangyidong +Date: Tue Feb 14 15:11:45 2017 +0800 + + * adjust for resolve page. + +commit d17a138f05681286477920fd07db9fefe8a563b4 +Author: wangyidong +Date: Tue Feb 14 14:01:39 2017 +0800 + + * adjust for dao class. + +commit a32496e9114d015910e9663c0808873460f5a034 +Author: wangyidong +Date: Tue Feb 14 13:39:43 2017 +0800 + + * remove urlencode. + +commit ef2cc89e5ac31a8f973121b654867d58f4f90dd9 +Author: wangyidong +Date: Tue Feb 14 13:38:24 2017 +0800 + + * fix bug #1002. + +commit 4610fdad327d76b2c5f775e8a72dad3ca569a13f +Author: wangyidong +Date: Tue Feb 14 13:36:13 2017 +0800 + + * check sql for safe in order and limit function. + +commit 05cb13e0126e11648c7e64602d553d3a64238a40 +Author: wangyidong +Date: Tue Feb 14 10:34:46 2017 +0800 + + * fix bug #1007. + +commit 4a398b0e42ebe0be3416c1da2df1249d0d418c3a +Author: wangyidong +Date: Tue Feb 14 10:30:54 2017 +0800 + + * fix for add doc image delete. + +commit 29b4f4f5316ca3caba1a31f500224500ba1ae829 +Author: wangyidong +Date: Tue Feb 14 10:09:09 2017 +0800 + + * adjust for burn in index. + +commit 3537469229414c92ac122efe42372029c63652e0 +Author: wangyidong +Date: Mon Feb 13 17:25:38 2017 +0800 + + * fix bug #1006. + +commit c8630c8d325ba6664df998ecb18b65655e2bc2e4 +Author: wangyidong +Date: Mon Feb 13 15:32:09 2017 +0800 + + * fix bug #996. + +commit 3eb8385a63ba9598ac69e9c2f1f84906f541642a +Author: wangyidong +Date: Mon Feb 13 15:19:02 2017 +0800 + + * fix projectproduct data. + +commit 1a004fc60cde1668d1c524271347de99584ed814 +Author: wangyidong +Date: Mon Feb 13 14:50:44 2017 +0800 + + * finish task #2890. + +commit 7986d739a674c6db57e23ee364014e212b1376f3 +Author: wangyidong +Date: Fri Feb 10 09:37:39 2017 +0800 + + * code for task #2892. + +commit c3fd6d6f918a660e7594f672cc5fce1edc8679c3 +Author: wangyidong +Date: Thu Feb 9 15:14:27 2017 +0800 + + * finish task #2891. + +commit 9ce0e008cb56c89259670be13e01acbe06f826d8 +Author: wangyidong +Date: Thu Feb 9 14:55:37 2017 +0800 + + * finish task #2889. + +commit 313032128dfbc6fcf4f491391b69d6a411c5ef73 +Author: wangyidong +Date: Thu Feb 9 14:34:50 2017 +0800 + + * change for task #2887. + +commit f6aea7992e44582a4200ebacf8c53f237a32ecbc +Author: tengfei +Date: Thu Feb 9 13:52:03 2017 +0800 + + *update + +commit 2b3fbcd4975f26b86c5623f0cf10883d73a85692 +Author: tengfei +Date: Thu Feb 9 13:50:22 2017 +0800 + + *update + +commit 2de2af1d5cae0a3c24e33c2ce68e1b432c4405b6 +Author: tengfei +Date: Thu Feb 9 13:47:00 2017 +0800 + + *adjust password + +commit 357f0216d7971dd88e1eeefe1869781cc7115205 +Author: wangyidong +Date: Thu Feb 9 10:39:43 2017 +0800 + + * finish task #2888. + +commit 33f8c7dbd104b10b48c3a5f5ba585cf101923b21 +Author: wangyidong +Date: Thu Feb 9 10:11:01 2017 +0800 + + * finish task #2887. + +commit eab8af2e8cb93d1930c5d362c2a170b1aff03ebd +Author: wangyidong +Date: Wed Feb 8 10:57:27 2017 +0800 + + * finish task #2886. + +commit 217c6c4795c3d133d7d724fe5ed4cdef6dcbf695 +Author: wangyidong +Date: Wed Feb 8 10:23:33 2017 +0800 + + * finish task #2885. + +commit 3d380fa3a323f9a58aacd3612ed12d98d31622e2 +Author: wangyidong +Date: Wed Feb 8 09:34:39 2017 +0800 + + * adjust for bug. + +commit ca2f2db54a33d0264f5100821c29304e84c96403 +Merge: 4a2ff90ddc 5b0f01462a +Author: wangyidong +Date: Mon Feb 6 15:19:25 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4a2ff90ddc2971755d4d1f5a6622752b90597a15 +Author: wangyidong +Date: Mon Feb 6 15:18:54 2017 +0800 + + * adjust for comment story. + +commit 5b0f01462aeb6409c1e8535e66b4d6b62be35fdc +Author: wangyidong +Date: Sat Feb 4 16:25:19 2017 +0800 + + * fix bug for comment story. + +commit e37578024e58cacb6f8b9ab4a622ce487bbb53e1 +Merge: 99952acab0 7e7a334e39 +Author: wangyidong +Date: Sat Feb 4 16:23:34 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 99952acab03e461f00d8e47df00d87a759ce8b3a +Author: wangyidong +Date: Sat Feb 4 16:23:10 2017 +0800 + + * change for close lang. + +commit 7e7a334e39b829d94497dab9a34eddfdf5a32904 +Merge: cb0d85b65c ff018ec831 +Author: Catouse +Date: Fri Feb 3 15:45:42 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + Conflicts: + module/project/css/tree.css + module/project/lang/en.php + module/project/view/tree.html.php + +commit ff018ec831e7212f37429d33f2d9c85544aeb962 +Author: tengfei +Date: Fri Feb 3 14:53:18 2017 +0800 + + *adjust relate to link:wq + +commit d1c5293d0466945cd4347d7836bd79959f564e01 +Author: tengfei +Date: Fri Feb 3 14:39:57 2017 +0800 + + *adjust relate to link + +commit 86a26f6b1c03c9fe9d531640b1b566b483b1d4cb +Merge: 18df8b6d88 d63e337672 +Author: wangyidong +Date: Fri Feb 3 09:56:43 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 18df8b6d886e5b9467209d659b0b879485f22b11 +Author: wangyidong +Date: Fri Feb 3 09:56:23 2017 +0800 + + * fix for upgrade. + +commit 37a82dd9529deadad48c42947695ca230830ebaf +Author: wangyidong +Date: Sun Jan 22 15:38:45 2017 +0800 + + * fix bug. + +commit d63e337672bbdf3f4da030ced2f245d8090ac9df +Author: tengfei +Date: Wed Jan 18 14:51:27 2017 +0800 + + *adjust ext note + +commit 34a5414b3560aa80f8a5223096319d69a97291bf +Author: wangyidong +Date: Wed Jan 18 10:19:28 2017 +0800 + + * change doc lang. + +commit 6212cd4155fa8ba4e4b82cf41155f1f7859bf918 +Author: wangyidong +Date: Tue Jan 17 16:26:33 2017 +0800 + + * fix for burn. + +commit daed4773de5c7adcf05a190835ce273b37c39928 (tag: zentaopms_9.0.stable_20170117) +Author: wangyidong +Date: Tue Jan 17 14:08:17 2017 +0800 + + * revert version. + +commit 7905394d885e678127316cc27da299ad4623fd7c +Author: wangyidong +Date: Tue Jan 17 13:51:06 2017 +0800 + + * change for upgrade. + +commit bfefa7b88be19be22536c2c198b01d65c337ca2f +Author: wangyidong +Date: Tue Jan 17 13:15:49 2017 +0800 + + * adjust for check url. + +commit 475eaf90f759df0609eb0ceb83bd9e84ecc71673 +Author: wangyidong +Date: Tue Jan 17 11:20:13 2017 +0800 + + * fix select all user when no story. + +commit 4c48ab249153f5be25e207173024256379310f6a +Merge: 96968faad8 b1d42dbc78 +Author: wangyidong +Date: Tue Jan 17 10:53:48 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 96968faad8f22f2d747f9281d2383a7f0471a549 +Author: wangyidong +Date: Tue Jan 17 10:53:21 2017 +0800 + + * finish task #2862. + +commit b1d42dbc787ef89e23c6cb7545b491bb88440689 +Merge: f09d337df3 54962074fc +Author: chenfeiCF +Date: Tue Jan 17 09:40:05 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f09d337df39c79fdd88bb49c21b74f4490f5d743 +Author: chenfeiCF +Date: Tue Jan 17 09:39:14 2017 +0800 + + * adjust code for task #2883. + +commit 54962074fc69cac3da6212cd1209a5ee41c88808 +Author: wangyidong +Date: Tue Jan 17 09:19:52 2017 +0800 + + * finish task #2884,2872. + +commit 630b7d283d17c43e4e79b0d69f6b5509ed483b68 +Merge: 31502d0d48 319389a496 +Author: wangyidong +Date: Tue Jan 17 09:16:21 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 319389a4961308ff83d87bae8a7a9f7fefaf05c2 +Author: chenfeiCF +Date: Tue Jan 17 09:04:56 2017 +0800 + + * adjust code for task #2881. + +commit 3b177feb10e91e0b5206f72e5dd3d84922468a59 +Author: chenfeiCF +Date: Tue Jan 17 09:02:32 2017 +0800 + + * adjust code for task #2873. + +commit 15b83b3536ad71ebfffcf9c455248907b925fb04 +Author: chenfeiCF +Date: Tue Jan 17 08:40:28 2017 +0800 + + * adjust code for task #2869. + +commit 31502d0d489a7fcf81dde7366385e0f78dfec6aa +Author: wangyidong +Date: Mon Jan 16 17:09:58 2017 +0800 + + * adjust list-alt icon. + +commit 4362d10e8a981108aa3a57d40ae24ed8d9061bf0 +Merge: efae75ae7f 117fe64412 +Author: tengfei +Date: Mon Jan 16 17:03:19 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit efae75ae7f8a5e2108866ea5068452b9c87533aa +Author: tengfei +Date: Mon Jan 16 17:01:45 2017 +0800 + + * added newly translated content + +commit 117fe644120811c119dc59f46c7191f2b8638ab6 +Author: chenfeiCF +Date: Mon Jan 16 16:52:44 2017 +0800 + + * adjust for task #2868. + +commit c6e6d9e1a5fd1d67fd810f1d555f911de67da35c +Author: wangyidong +Date: Mon Jan 16 15:13:44 2017 +0800 + + * adjust for project tree. + +commit 8af5e74ad4a54d5ddadfba2c2ad933f204d95717 +Author: wangyidong +Date: Mon Jan 16 14:47:43 2017 +0800 + + * copy zh-cn lang to en. + +commit f23b840d7f45d2f990ea2ee86114039cfce542e5 +Merge: 2692fc2983 3216ab447d +Author: wangyidong +Date: Mon Jan 16 14:41:59 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2692fc2983bc88f24715f0192a1984565ef0e777 +Author: wangyidong +Date: Mon Jan 16 14:41:34 2017 +0800 + + * change case icon. + +commit 3216ab447d3c514a3dcb9ec3231bc702b8a9fae0 +Author: chenfeiCF +Date: Mon Jan 16 14:28:45 2017 +0800 + + * adjust the distance between operate icons in cases page. + +commit 453074044c408c48b265bb8e2e6ba28f9af83235 +Author: wangyidong +Date: Mon Jan 16 14:15:41 2017 +0800 + + * adjust for priv. + +commit 392e2d6aa13a9a34e063d4cd9f829282067e5382 +Author: wangyidong +Date: Mon Jan 16 13:36:57 2017 +0800 + + * adjust qq for zentao user. + +commit 79b9c8bf5887fd8e5e650f875ea045ca260fa9ef +Merge: 42ded183b5 5e44401a10 +Author: wangyidong +Date: Mon Jan 16 11:38:20 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 42ded183b54ad29957d57cac136753d12650890e +Author: wangyidong +Date: Mon Jan 16 11:37:38 2017 +0800 + + * finish task #2878. + +commit 5678a2937c04788ec0ea044fbc9fd1039558c003 +Author: wangyidong +Date: Mon Jan 16 10:46:45 2017 +0800 + + * adjust icon. + +commit 7d429274063a0da911c60aab5763d0539f033983 +Author: wangyidong +Date: Mon Jan 16 10:45:57 2017 +0800 + + * adjust for convertEncoding. + +commit cf3677bfa93a93f1ba99221171d65d9653a6b826 +Author: wangyidong +Date: Mon Jan 16 10:44:57 2017 +0800 + + * add copy lang for task. + +commit 5e44401a10ad878172c94b2478a7a255ca06fe0f +Author: chenfeiCF +Date: Mon Jan 16 08:57:53 2017 +0800 + + * fix bug #992. + +commit c36ac5856e4e632e2536cfbc1199e53ebe5a48f9 +Merge: 87393fbca2 456e36e57f +Author: wangyidong +Date: Fri Jan 13 17:41:04 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 87393fbca2ae260d488539e9b37468d3bdf34626 +Author: wangyidong +Date: Fri Jan 13 17:40:30 2017 +0800 + + * fix bug. + +commit 456e36e57feb9fb2a9a976b28d962f57a290cbdc +Author: chenfeiCF +Date: Fri Jan 13 16:34:19 2017 +0800 + + * fix bug #993. + +commit 8525150295845ac7ead63aeae602db0ba40c3bc9 +Author: chenfeiCF +Date: Fri Jan 13 13:53:31 2017 +0800 + + * adjust code for task #2883. + +commit 8510ac3fea673f10df2a374a0355d620e48b971f +Author: chenfeiCF +Date: Fri Jan 13 13:44:17 2017 +0800 + + * adjust code for task #2881. + +commit fb1902200eef7172477c8ab6bdad62fe79be95f6 +Merge: c9cf671c8e 2d60b14e21 +Author: wangyidong +Date: Fri Jan 13 13:32:02 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c9cf671c8ef221ef857cef96d9ada5f7fa51789c +Author: wangyidong +Date: Fri Jan 13 13:29:04 2017 +0800 + + * finish task #2854. + +commit 2d60b14e2128bbd1920217e6634a5227edea5bef +Author: chenfeiCF +Date: Fri Jan 13 13:22:28 2017 +0800 + + * finish task #2877. + +commit eb24478bd063aab90cef38fad8f67967826f18a0 +Merge: 9855a93bf3 90e2789f7c +Author: wangyidong +Date: Fri Jan 13 11:12:52 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9855a93bf3de979cdc825501b39c457a21d9e453 +Author: wangyidong +Date: Fri Jan 13 11:12:25 2017 +0800 + + * finish task #2850. + +commit 90e2789f7cd977a73f1b5bc667a4b35c4956d5e8 +Author: chenfeiCF +Date: Fri Jan 13 11:11:31 2017 +0800 + + * finish task #2883. + +commit ad25d007d9b17ab4bf075e4c7ee477e16d82d7d4 +Merge: 80cf4d8c2e 3698443bc5 +Author: wangyidong +Date: Fri Jan 13 10:19:59 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 80cf4d8c2e4c0589df416e92e70988e718511f64 +Author: wangyidong +Date: Fri Jan 13 10:19:17 2017 +0800 + + * finish task #2851. + +commit 3698443bc5ce91fc2ab94de0b389b07e335ce990 +Author: chenfeiCF +Date: Thu Jan 12 22:08:20 2017 +0800 + + * finish task #2853. + +commit 184d40cc782bc67e960c59334b2ec64ec31a66d5 +Author: chenfeiCF +Date: Thu Jan 12 13:23:26 2017 +0800 + + * fix bug #990. + +commit a301cd10a1d57fd35af5d65041b6fd19c59a9eff +Merge: 15042bbeb5 3286faf10b +Author: tengfei +Date: Wed Jan 11 16:45:10 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 15042bbeb5ae325da9f5eb148499efad8fba033f +Author: tengfei +Date: Wed Jan 11 16:44:26 2017 +0800 + + *adjust relate story note + +commit 3286faf10b46240bd10d6fd5c0f13b8cc7420c26 +Merge: 3c85e54038 3686f4e4e5 +Author: wangyidong +Date: Wed Jan 11 16:42:42 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3c85e540384bd8c6960a5a82943c41a081d00233 +Author: wangyidong +Date: Wed Jan 11 16:42:13 2017 +0800 + + * finish task #2872. + +commit 3686f4e4e5f418d5e3d2ed165b4b5bd89dc1ea66 +Author: chenfeiCF +Date: Wed Jan 11 16:40:57 2017 +0800 + + * finish task #2881. + +commit 9167409f9966963d783e4e16a48729b844ae5b42 +Author: chenfeiCF +Date: Wed Jan 11 16:16:39 2017 +0800 + + * finish task #2873. + +commit addcdc83328ac967852ab4ec3fc33ab955d562b0 +Merge: cfb79eb257 15a02bab8b +Author: tengfei +Date: Wed Jan 11 15:54:06 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cfb79eb2573e6b8d95c4915892a255b0c5362a19 +Author: tengfei +Date: Wed Jan 11 15:53:17 2017 +0800 + + *adjust for interface + +commit 15a02bab8b4390d6543de5dbbf770f066fe7a0fe +Merge: 4f4dfe068c 8bd7160dfc +Author: wangyidong +Date: Wed Jan 11 14:55:55 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4f4dfe068cac7a1c4478fb27560d35ec6e8fc6a3 +Author: wangyidong +Date: Wed Jan 11 14:55:27 2017 +0800 + + * finish task #2871. + +commit 8bd7160dfca8eb4d0885856b874e817204735d2f +Author: chenfeiCF +Date: Wed Jan 11 14:25:19 2017 +0800 + + * finish task #2875. + +commit 311bb335c4c11bc4920db0591409bc9c3c757495 +Merge: 2926039122 86997cd179 +Author: wangyidong +Date: Wed Jan 11 14:13:38 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 29260391221d2e4fe146e3796dd631a8375d0726 +Author: wangyidong +Date: Wed Jan 11 14:12:00 2017 +0800 + + * finish task #2862. + +commit 86997cd179eabf31ea3e221bacf957b793ef3c2c +Author: chenfeiCF +Date: Wed Jan 11 13:38:49 2017 +0800 + + * finish task #2870. + +commit cc28d65b94dcd6cec527e8041c329531897e83e4 +Author: tengfei +Date: Wed Jan 11 08:14:41 2017 +0800 + + * change parse to paste + +commit a079adecc718e9ee326927b63e665ca15a7c924d +Merge: 9d3d6d278a ccc1c7d30d +Author: wangyidong +Date: Tue Jan 10 16:18:54 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9d3d6d278a9596d663457f79c698c876b878f5fd +Author: wangyidong +Date: Tue Jan 10 16:15:18 2017 +0800 + + * adjust for export with branch. + +commit ccc1c7d30d4a713a0409df2e5c8311e70764b8f8 +Merge: 61db347702 5129350df0 +Author: chenfeiCF +Date: Tue Jan 10 14:14:06 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 61db3477020e722d624d6f941f68c74e48fa3250 +Author: chenfeiCF +Date: Tue Jan 10 14:13:31 2017 +0800 + + * finish task #2880. + +commit 5129350df032f85b3a87502c5602e92b84c46e18 +Author: wangyidong +Date: Tue Jan 10 11:51:44 2017 +0800 + + * finish task #2865. + +commit f8460d4027ef5a857e850614228485675239bae0 +Author: chenfeiCF +Date: Tue Jan 10 10:56:58 2017 +0800 + + * finish task #2869. + +commit 0ecaa6306fa0758b160e6315274da3f5b7aecfac +Author: chenfeiCF +Date: Mon Jan 9 15:35:46 2017 +0800 + + * finish task 2879. + +commit ae2199270f36a8832ccf3178efffd2c25d129d43 +Author: Catouse +Date: Mon Jan 9 15:29:35 2017 +0800 + + * fix search form style for task #2858. + +commit 232e155578e716e154aa4a50ce0c48f93acc20d3 +Merge: 45c30e6417 f5c4cdbfe5 +Author: Catouse +Date: Mon Jan 9 14:39:35 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 45c30e64170e82624cade375f76934d7242bb7c6 +Author: Catouse +Date: Mon Jan 9 14:39:20 2017 +0800 + + * refactor ueditor UI. + +commit f809da99319ba0ec019021cdb394c65b8e79c56a +Author: Catouse +Date: Mon Jan 9 14:39:08 2017 +0800 + + * update zui files. + +commit 9997c81559f9eeffe366c4abe873a6edb2648453 +Author: Catouse +Date: Mon Jan 9 14:38:55 2017 +0800 + + * refactor UI of markdown editor. + +commit f5c4cdbfe55050736ad57ea1077158f0e8cac092 +Author: chenfeiCF +Date: Mon Jan 9 14:36:37 2017 +0800 + + * finish task #2868. + +commit 087e5aed22af5cf65310425e7f0289379e987208 +Author: chenfeiCF +Date: Mon Jan 9 13:47:12 2017 +0800 + + * finish task #2867. + +commit 5b93bc16e4f35660bf9a1ed49c9405a7101beeb6 +Merge: 645a6b0ede 7261dc6c54 +Author: wangyidong +Date: Mon Jan 9 13:31:11 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 645a6b0edee70919a8e3beacd1b878082e78d77f +Author: wangyidong +Date: Mon Jan 9 13:30:08 2017 +0800 + + * finish task # 2849. + +commit 108bd040ccde75cecf39feb30bf34b2d991250aa +Author: Catouse +Date: Mon Jan 9 13:10:18 2017 +0800 + + * update zui. + +commit 7261dc6c5434341cf70f593971bfe2522263d7d5 +Author: chenfeiCF +Date: Mon Jan 9 13:07:11 2017 +0800 + + * finish task #2864. + +commit 2664c32f284d7c9aa6b95b991ed6c5945db32403 +Merge: 2afae21446 f6b10a3088 +Author: Catouse +Date: Mon Jan 9 10:29:53 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2afae2144667eb952ff04ae40de5c3c50392ac8e +Author: Catouse +Date: Mon Jan 9 10:29:43 2017 +0800 + + * finish task #2858 and fix bug #860. + +commit f6b10a30881d39b8cd0eee345f9622a166987dd4 +Merge: f00a45e9dd bcde9454d5 +Author: wangyidong +Date: Mon Jan 9 10:22:25 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f00a45e9ddbc07ad1777b2e5195d5018e48a76d3 +Author: wangyidong +Date: Mon Jan 9 10:21:57 2017 +0800 + + * finish task #2846. + +commit 77b8cb76f8efcd48f006cb055cc9564382a89599 +Author: wangyidong +Date: Mon Jan 9 09:47:06 2017 +0800 + + * finish task #2840. + +commit bcde9454d57fe1adeb8649b613e86920ca055ad6 +Author: Catouse +Date: Mon Jan 9 09:39:43 2017 +0800 + + * finish task #2857 and fix bug #870. + +commit cd25a4216e994c310bdbbd1199676be4b806f87e +Author: wangyidong +Date: Mon Jan 9 09:29:09 2017 +0800 + + * fix for save mail queue. + +commit eff0ac2d99928a7abcc498cfd4864f14daf7f064 +Author: wangyidong +Date: Mon Jan 9 09:25:51 2017 +0800 + + * adjust for get tree menu in testtask cases page. + +commit 1235530eeeabc1f4a5a83fad7a19dd1876860bb6 +Merge: 599fa16c64 2a26a2fc95 +Author: wangyidong +Date: Fri Jan 6 15:19:59 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 599fa16c64bd13045861a322ec52cf3655a5d15f +Author: wangyidong +Date: Fri Jan 6 15:19:32 2017 +0800 + + * finish task #2845. + +commit 2a26a2fc9547180ec0adacd695ce9d427d539d92 +Author: chenfeiCF +Date: Fri Jan 6 14:50:54 2017 +0800 + + * finish task #2874. + +commit f26b724ec2ed20dd6d7d7c4d8611446b29d12fb2 +Author: chenfeiCF +Date: Fri Jan 6 14:39:02 2017 +0800 + + * finish task #2861. + +commit 0fc5d7a778e669902dbfb6a6c6051e995b743e20 +Merge: 2df587ccf5 e8103e089b +Author: wangyidong +Date: Fri Jan 6 14:05:33 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2df587ccf58dab1bfe03ae8cf5d255f3b549a4fb +Author: wangyidong +Date: Fri Jan 6 14:04:48 2017 +0800 + + * finish task #2841. + +commit e8103e089ba9a3531a00a48eeda7f75c34ae603b +Author: chenfeiCF +Date: Fri Jan 6 13:29:23 2017 +0800 + + * finish task #2843. + +commit d607a34324d28c51b8691960deba3149266c50e9 +Author: chenfeiCF +Date: Fri Jan 6 13:10:39 2017 +0800 + + * finish task #2839. + +commit 4cc2b5a493e9d0d60ebace52bc7270af5ac71a4c +Author: wangyidong +Date: Fri Jan 6 11:34:31 2017 +0800 + + * finish task #2837. + +commit 9f5591d2ead797456ee82ab0e9c6ab19e9f0abda +Author: wangyidong +Date: Thu Jan 5 14:39:03 2017 +0800 + + * adjust for members when edit. + +commit 9d643ac3f1c4337aac4f0e783d4074d37ffd38dc +Author: wangyidong +Date: Thu Jan 5 14:12:10 2017 +0800 + + * fix bug for update file. + +commit 1d6d3e8cb189ee0692698355b99fd15d90c9e092 +Author: wangyidong +Date: Thu Jan 5 11:12:43 2017 +0800 + + * set company field required. + +commit 5600702eb320fe5aa22df8c0b9364ddaad12ba82 +Merge: a940b4a11f 2f0fa8df85 +Author: wyd621 +Date: Thu Jan 5 10:20:31 2017 +0800 + + Merge pull request #9 from zhangsean/master + + Fix bug: An error occurred when adding comment to bug with a picture. + +commit 2f0fa8df859533dc3a5b09ace98e568e5ab12fce +Author: Zhangxf +Date: Thu Jan 5 10:03:21 2017 +0800 + + Fix bug: An error occurred when adding comment to bug with a picture. + +commit a940b4a11fe5ec4e703bcd4584f0fb83c8fa8f7a +Merge: c707519caa 880427a2f0 +Author: Catouse +Date: Wed Jan 4 13:40:00 2017 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c707519caa71da7b51a442d7dfac19f08b406b38 +Author: Catouse +Date: Wed Jan 4 13:39:52 2017 +0800 + + * refactor code. + +commit 880427a2f0c0b25a6630bc936015199b770ba544 (tag: zentaopms_9.0.beta_20170103) +Author: wangyidong +Date: Tue Jan 3 11:33:36 2017 +0800 + + * change for changelog. + +commit 05c4cc79db5e48618635d4716da438e76b8976c1 +Merge: a34e4cc7fa 666ef225d0 +Author: tengfei +Date: Tue Jan 3 11:15:11 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a34e4cc7faffb324ead13d27c536d3f60feb7e73 +Author: tengfei +Date: Tue Jan 3 11:13:43 2017 +0800 + + *translation new items in Admin, Mail + +commit 666ef225d07d35ef097df7339e74bfd8d8b861e5 +Author: Catouse +Date: Tue Jan 3 11:08:18 2017 +0800 + + * update zui files. + +commit afbe60c77fe9725fd0d91b2b673b70c497114d56 +Author: wangyidong +Date: Tue Jan 3 10:41:37 2017 +0800 + + * readonly when key is null. + +commit 141b5c4df00b847a84a329e244dc25b44b0f99cb +Author: wangyidong +Date: Tue Jan 3 10:18:33 2017 +0800 + + * change for en lang and zh-tw lang. + +commit 147167bee6d957d348aecf9f58bcf2e866c0610e +Merge: 8ba21afa1c e3ed7817a7 +Author: wangyidong +Date: Tue Jan 3 09:46:40 2017 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8ba21afa1cd7c8e3778ce72621dbf60e81482131 +Author: wangyidong +Date: Tue Jan 3 09:45:47 2017 +0800 + + * change for upgrade. + +commit e8df6cf433cddb7eadf8df7b6b6f20fde58097c6 +Author: wangyidong +Date: Tue Jan 3 09:35:10 2017 +0800 + + * adjust for upgrade. + +commit e3ed7817a711e57f73b1916e73906a667aad9127 +Author: Catouse +Date: Sat Dec 31 16:00:23 2016 +0800 + + * fixed bug #931. + +commit a34edcfd4a75d004d201029eb334eb999b0dcdb3 +Author: wangyidong +Date: Fri Dec 30 11:47:02 2016 +0800 + + * fix bug #913. + +commit b2d18e626e72110cceb1b8821bd31b07a858b272 +Author: wangyidong +Date: Fri Dec 30 10:55:29 2016 +0800 + + * fix bug #975. + +commit 782ccae3a8b662144beee44d32646a58df6dedd2 +Author: wangyidong +Date: Fri Dec 30 10:48:42 2016 +0800 + + * fix bug #976. + +commit 6e374fbd13cb3908fc84047cda006ae8e616f739 +Author: wangyidong +Date: Fri Dec 30 10:32:10 2016 +0800 + + * fix bug #966. + +commit 17ccbaa54381b38a091137e2282829cdecc57a85 +Author: wangyidong +Date: Fri Dec 30 09:54:47 2016 +0800 + + * update for NewZentaoIcon font. + +commit 099aecdda6bffb70eef9530dde8de6f12c05824c +Author: wangyidong +Date: Thu Dec 29 17:35:02 2016 +0800 + + * adjust for select with pinyin. + +commit 6ece360ab70e6181a7fdcfdab0472f18730ce38e +Author: wangyidong +Date: Thu Dec 29 17:30:13 2016 +0800 + + * adjust pinyin. + +commit 0866c204259c1dbe022608e78a77cdb112de2d3e +Author: wangyidong +Date: Thu Dec 29 16:20:18 2016 +0800 + + * adjust for send by ztcloud. + +commit 1b81e0133225dc9869c6f488b7e068f3938467bf +Merge: 15c7bf8288 d77aae1feb +Author: wangyidong +Date: Thu Dec 29 16:07:14 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 15c7bf8288a8cbf7334a0a6db8e6d64c02728686 +Author: wangyidong +Date: Thu Dec 29 14:47:13 2016 +0800 + + * change font-size 16px to 13px for ueditor. + +commit 2ab3441386a66771388d7dd93031691e2dfa19c9 +Author: wangyidong +Date: Wed Dec 28 18:31:53 2016 +0800 + + * fix bug for send mail. + +commit d77aae1feb609f9387439f91e189543de79e397a +Author: chenfeiCF +Date: Wed Dec 28 14:49:42 2016 +0800 + + * merge two mails subject as the subject. + +commit 830d4091215450d9262fae24d08e2ee55beaf760 +Author: chenfeiCF +Date: Wed Dec 28 14:31:28 2016 +0800 + + * adjust code for task #2808. + +commit 149cc28282bc45cd0d8c7bf42583166814628450 +Author: chenfeiCF +Date: Wed Dec 28 13:56:45 2016 +0800 + + * adjust code for task #2810. + +commit 0873ca1864ccf25f716bced0dfe210f853eae7c6 +Author: wangyidong +Date: Wed Dec 28 09:27:04 2016 +0800 + + * fix bug #973. + +commit 672e9df3ccbf7908601c98cbefb2597e44869dc6 +Author: wangyidong +Date: Tue Dec 27 15:41:22 2016 +0800 + + * adjust style for register page. + +commit cdbf4c6dcf0e38038886d74a0adb86bfad21ea54 +Author: wangyidong +Date: Tue Dec 27 15:33:26 2016 +0800 + + * adjust for certify. + +commit 0ce192ff38a884fb9ea365dc0ce9771af3b9ec72 +Author: wangyidong +Date: Tue Dec 27 15:26:54 2016 +0800 + + * fix bug #936. + +commit 7b98c378839ba708001709d66a48d7c9f27e95ae +Author: wangyidong +Date: Tue Dec 27 08:59:51 2016 +0800 + + * delete useless css. + +commit 49c8928ea0948560b9d127a8dec85ae58c5557ab +Author: wangyidong +Date: Mon Dec 26 17:01:28 2016 +0800 + + * fix bug #931. + +commit a3896363d2a1393fb217e93b20d75e75d61f29b6 +Merge: 80a11b9089 14e762ad1b +Author: wangyidong +Date: Mon Dec 26 15:40:26 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 80a11b908978d4987e2cc3770eadb598fa1173a6 +Author: wangyidong +Date: Mon Dec 26 15:40:02 2016 +0800 + + * fix bug #952. + +commit 14e762ad1b59017d1a83149785e369faad474939 +Author: chenfeiCF +Date: Mon Dec 26 15:21:46 2016 +0800 + + * fix bug #963. + +commit 0a061c6f06db1ca3b7bb449cc30c95b1b217ca44 +Author: wangyidong +Date: Mon Dec 26 14:54:04 2016 +0800 + + * fix bug #965. + +commit a2d7b37ea0319f0e9587703dd6b9307a7af50fa7 +Author: chenfeiCF +Date: Mon Dec 26 13:44:43 2016 +0800 + + * fix table border bottom in report view. + +commit f01a1a2320eb18d208eb4182babf239b1dc74030 +Author: wangyidong +Date: Mon Dec 26 13:11:27 2016 +0800 + + * adjust for style. + +commit 83726f81d79ab02626c96b886eea50f9e1de2e40 +Merge: ea95bd65b0 0e6510a84f +Author: wangyidong +Date: Mon Dec 26 09:21:35 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ea95bd65b0a3e5bfad39546f9c17bf7f01a4a3b6 +Author: wangyidong +Date: Mon Dec 26 09:20:59 2016 +0800 + + * fix bug #963. + +commit 0e6510a84f85fda52bfdc2ee0d4bcf21d12c17fc +Author: chenfeiCF +Date: Fri Dec 23 17:27:06 2016 +0800 + + * fix border in create page of bug module. + +commit 98cd4d7ba0a249cd00abe3defbb9378e7c51e8d7 +Merge: 1c6d9f4197 84cf016837 +Author: wangyidong +Date: Fri Dec 23 17:19:53 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1c6d9f41979d7b7736629ea474d5e5d392238c71 +Author: wangyidong +Date: Fri Dec 23 17:19:06 2016 +0800 + + * adjust for ueditor and markdown. + +commit 84cf016837d183d6bbfeb620216c95c6739a3897 +Author: chenfeiCF +Date: Fri Dec 23 16:23:20 2016 +0800 + + * fix bug #878. + +commit 4d998d8badff92e97077431d0e591a4bf1aaacae +Author: wangyidong +Date: Fri Dec 23 15:58:36 2016 +0800 + + * fix bug for report product summary. + +commit 0c83443ba2bce2772b2890149b988707b5e4677e +Author: chenfeiCF +Date: Fri Dec 23 15:30:42 2016 +0800 + + * fix bug #895. + +commit 59332be052453cf237d3062a483e7fe8518b21e6 +Author: chenfeiCF +Date: Fri Dec 23 15:14:57 2016 +0800 + + * fix bug #868. + +commit 168e2131399f6afa79529fc86840121add3f3b77 +Author: chenfeiCF +Date: Fri Dec 23 13:35:15 2016 +0800 + + * fix bug #934. + +commit ef92422e71064a2d093482c15bbf73247c752f07 +Author: chenfeiCF +Date: Fri Dec 23 11:17:43 2016 +0800 + + * fix bug #939. + +commit fc2ea2d14e48e51c5c9cd8c7bc7b09246f34e4ef +Author: chenfeiCF +Date: Fri Dec 23 11:05:34 2016 +0800 + + * fix bug #940. + +commit 403e75c9748bc7c93c40ed13343ec5b687739074 +Author: chenfeiCF +Date: Fri Dec 23 10:30:06 2016 +0800 + + * fix bug #942. + +commit aa7b6e4cbcc5e9fbc32b74ef73b17d17d204deb3 +Merge: 53f75eb866 72c915d619 +Author: wangyidong +Date: Fri Dec 23 09:45:10 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 53f75eb866463f61076c1544e09862d5631dbe2c +Author: wangyidong +Date: Fri Dec 23 09:44:22 2016 +0800 + + * add site for bind zentao. + +commit 72c915d619c3eca60c263b50f8a54f630bc867d7 +Merge: 7252ed181d 4c2166b1c1 +Author: tengfei +Date: Fri Dec 23 08:56:55 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + + * merger + +commit 7252ed181dba5a8807d581e38e564b422762eb06 +Author: tengfei +Date: Thu Dec 22 17:06:23 2016 +0800 + + *adjust for screenshot + +commit 4c2166b1c184465456714bb4066834c19257a186 +Author: chenfeiCF +Date: Thu Dec 22 14:54:42 2016 +0800 + + * fix bug #951. + +commit 4a85b8810d283407e2d9efca9ba85b4071fb4c49 +Author: chenfeiCF +Date: Thu Dec 22 13:58:30 2016 +0800 + + * fix bug #960. + +commit 9ed2669dc6353a1d6bdd32220a83076a99a2f997 +Author: chenfeiCF +Date: Thu Dec 22 11:18:51 2016 +0800 + + * change address information of company in LICENSE. + +commit aa4ff18fc4ff78c3d4c3cb3d5b28689b53a9e599 +Merge: 5c47dc0301 aabbc9b17c +Author: tengfei +Date: Thu Dec 22 10:44:27 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + *edit + +commit 5c47dc0301ff95d7a39a9b17016793c165212cf3 +Author: tengfei +Date: Thu Dec 22 10:43:49 2016 +0800 + + * adjust for screenshots + +commit aabbc9b17c154e5903d049e2e2ec7515dfff6725 +Author: chenfeiCF +Date: Thu Dec 22 10:34:16 2016 +0800 + + * fix bug #957. + +commit 25cff19166809c0b89840efff32fa972ad1de628 +Author: chenfeiCF +Date: Thu Dec 22 09:52:19 2016 +0800 + + * fix bug #959. + +commit fca65ddfec8887442132b4519d34a47ea228f550 +Author: chenfeiCF +Date: Thu Dec 22 09:11:57 2016 +0800 + + * fix bug #948. + +commit a94a63998b66358fc3b1f9ecc99cbf30b0ee1968 +Author: chenfeiCF +Date: Wed Dec 21 14:46:28 2016 +0800 + + * not merge mails if method is browse of mail module. + +commit 5e81dbdb5633c6bc56b1b1e6848d2f80808eef17 +Author: chenfeiCF +Date: Wed Dec 21 14:14:16 2016 +0800 + + * finish task #2810. + +commit ffc19f45ef615862cd4888c0711126ab95c74fa0 +Merge: 5c25329222 cac3e5cc76 +Author: Catouse +Date: Wed Dec 21 11:11:37 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5c25329222f87f2e0674a7cffc37a569dbd76c24 +Author: Catouse +Date: Wed Dec 21 11:11:19 2016 +0800 + + * support to fixed table header and footer for datatable views. + +commit cac3e5cc76d93052e4e56d8afa97a1308a8265d4 +Author: chenfeiCF +Date: Wed Dec 21 10:31:32 2016 +0800 + + * finish task #2811. + +commit 778b70e8149e912edfbbe9310c62fbe115d073e5 +Author: chenfeiCF +Date: Wed Dec 21 09:21:21 2016 +0800 + + * code for task #2808: adjust style if select rows. + +commit 22b9aeae2b3b8a94de5b50487bd6619580a14763 +Author: chenfeiCF +Date: Wed Dec 21 09:03:55 2016 +0800 + + * code for task #2808. + +commit e0b2e258d5a6c29d534a305bf28f55f2be034578 +Author: chenfeiCF +Date: Tue Dec 20 19:40:08 2016 +0800 + + * finish task #2809. + +commit 399ad7fcac665e91d87417a597b2a93aed6c5b43 +Author: chenfeiCF +Date: Tue Dec 20 19:27:48 2016 +0800 + + * fix colspan for product browse method. + +commit e4dcd541519bc0b4094bf73706f5c7ee4ca871c4 +Author: Catouse +Date: Tue Dec 20 17:33:49 2016 +0800 + + * change style of crumbs menu. + +commit 58a2e40b605846de0de6cf3ed8909d51a287d11c +Merge: f349fc98ea 3ef4ce2a11 +Author: Catouse +Date: Tue Dec 20 16:33:59 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f349fc98ea1e6c53fac23cb5ff765765b8279ae4 +Author: Catouse +Date: Tue Dec 20 16:33:50 2016 +0800 + + * change style of crumbs menu. + +commit 3ef4ce2a11081764af0a765ef1191c9eae25ac6c +Author: chenfeiCF +Date: Tue Dec 20 16:17:14 2016 +0800 + + * finish task #2812. + +commit 36cbc6b076a511e56bcfdf841edf4f9b2f6302b4 +Merge: 41de567793 a87d63949a +Author: tengfei +Date: Tue Dec 20 15:35:12 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 41de567793fce3dde6aa9011454d3382eca71f70 +Author: tengfei +Date: Tue Dec 20 15:34:33 2016 +0800 + + * adjust for report + +commit 6895b03d219ee727ec5a7e1f5a55e1da15353462 +Author: wangyidong +Date: Tue Dec 20 11:29:17 2016 +0800 + + * fix bug for sort. + +commit a87d63949a7e6422178550a8faa57e64c6591512 +Author: Catouse +Date: Tue Dec 20 09:27:55 2016 +0800 + + * replace QR code image source with a empty image, see http://www.zentao.net/thread/86777.html. + +commit 33408e3b65be59b0afa07d618eb787a96a202494 +Merge: 507d9a2d8e 22eb0f10cd +Author: chenfeiCF +Date: Tue Dec 20 09:01:45 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 507d9a2d8e45af936572ab291fb25e3a70ebe1e8 +Author: chenfeiCF +Date: Tue Dec 20 08:58:36 2016 +0800 + + * merge mails when async send mails. + +commit 22eb0f10cd833a84c92dab4d63648d3996ccc40f +Author: wangyidong +Date: Mon Dec 19 16:34:33 2016 +0800 + + * adjust for sendcloud. + +commit 9447a00b75737f88d96f9c7718c97ab736fb2f3b +Author: wangyidong +Date: Mon Dec 19 16:34:08 2016 +0800 + + * fix bug. + +commit 9579586ccf7e7c6b3d4d808ab114a7e072fd6071 +Merge: eead64da2f cc522b2a03 +Author: wangyidong +Date: Mon Dec 19 09:33:14 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit eead64da2f0590a402ae08a9f3cecc2f1868dde5 +Author: wangyidong +Date: Mon Dec 19 09:32:33 2016 +0800 + + * adjust for index.php. + +commit 86b0a414f5ef4d28d98ceb71e7aa8c53f7f7acb7 +Author: wangyidong +Date: Mon Dec 19 09:32:08 2016 +0800 + + * change for bind sendcloud. + +commit cc522b2a0335afda068ba0314ac11d6c913c915c +Author: tengfei +Date: Fri Dec 16 13:18:33 2016 +0800 + + *Adjust user + +commit ef292e44bf607ce5eab405211ab5b5e94f77c4c9 +Author: tengfei +Date: Thu Dec 15 14:56:28 2016 +0800 + + *Adjust subdivide + +commit 87cc92998a2ede3bd27cf0c59683da9c9c8a727a +Author: tengfei +Date: Thu Dec 15 14:48:38 2016 +0800 + + *Adjust for screenshot + +commit 934efeaa00c19691a9c2a6c66295e07cc0639164 +Author: tengfei +Date: Thu Dec 15 11:32:01 2016 +0800 + + *ADJUST LINK->RELATE + +commit 865184fc0435285def19e61527edc1895b199b24 +Author: wangyidong +Date: Thu Dec 15 08:26:28 2016 +0800 + + * fix bug for error table. + +commit 01e94f8261711a659299a7446f953a82532411fb +Author: wangyidong +Date: Thu Dec 15 08:25:36 2016 +0800 + + * fix bug for custom longlife. + +commit ee7d8155790c101dcfa3707720a0a4bfbfa378a9 +Author: tengfei +Date: Wed Dec 14 15:16:02 2016 +0800 + + *Adjust report bugs + +commit 298a68d805340a05cddbe59ebfc00f9a3a906f1a +Author: tengfei +Date: Wed Dec 14 15:08:35 2016 +0800 + + *Adjust minor change + +commit d8ea232ee70c63de8180c59a06e05ee0e6800db0 +Author: tengfei +Date: Wed Dec 14 11:32:57 2016 +0800 + + *Adjust for screenshot + +commit 18e631d92824286a79664b6d4b766fcc36f23d3e +Author: tengfei +Date: Tue Dec 13 14:28:36 2016 +0800 + + * adjust for screenshot + +commit dd40d6ec7d8ebe8b07c8debaea839f7f24df47d8 +Author: tengfei +Date: Tue Dec 13 11:34:58 2016 +0800 + + *adjust admin + +commit 25251417d5e2a5155451f579c8e6e75f5a10c7bd +Author: tengfei +Date: Tue Dec 13 11:22:58 2016 +0800 + + *Adjust r&d->Dev + +commit c7d4e506de18ae40fc5667d20aed42f6442da20a +Author: tengfei +Date: Tue Dec 13 10:54:32 2016 +0800 + + *adjust gender + +commit d47bed5fdc9107fca0361d494966e31872623f03 +Author: wangyidong +Date: Mon Dec 12 16:46:13 2016 +0800 + + * fix bug for parse csv. + +commit 4f5debd7cc4660014366a1e290f8f0dfd8e965df +Author: wangyidong +Date: Mon Dec 12 13:41:41 2016 +0800 + + * fix bug for group task. + +commit 4c153973fb62b83dd8e09788c7a63f9e1c5cc1e1 (tag: zentaopms_8.4.1_20161212) +Author: wangyidong +Date: Mon Dec 12 10:08:23 2016 +0800 + + * change for upgrade. + +commit d134a89f02d561bd34a8750bfbcffb9602ca5266 +Author: wangyidong +Date: Mon Dec 12 08:15:45 2016 +0800 + + * fix bug for get default project. + +commit f6491e73b80c66f854a8e60849e46199307db71a +Merge: 1d9943c3f6 dd71a7dc12 +Author: Catouse +Date: Fri Dec 9 12:08:02 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1d9943c3f69f24ba192c46c7371ced6904293a5d +Author: Catouse +Date: Fri Dec 9 12:07:53 2016 +0800 + + * improve table UI on scrolling. + +commit dd71a7dc1230a963a8d0329871689fc473cf2c0b +Merge: 4b929ab7ae 4bbdd23f4d +Author: wangyidong +Date: Fri Dec 9 11:54:53 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4b929ab7aef172e4434c4828db7d19075ba66419 +Author: wangyidong +Date: Fri Dec 9 11:54:16 2016 +0800 + + * adjust for convert encoding. + +commit e5f8b6321ca53e1d95e25b2196cf741d88ebacfd +Author: Catouse +Date: Fri Dec 9 11:11:07 2016 +0800 + + * change default doughnut size of mini pie chart. + +commit 4bbdd23f4d34df5e24984d54ae543516691277fa +Author: tengfei +Date: Fri Dec 9 10:43:02 2016 +0800 + + *chunge error + +commit 6150ee7b76616cbb2e5b6eb2822eec7d4599d14d +Author: wangyidong +Date: Fri Dec 9 09:38:13 2016 +0800 + + * adjust for pinyin. + +commit 0fe35cb5d2672ccac7e6685e21b1ed1386d71975 +Author: wangyidong +Date: Fri Dec 9 09:01:46 2016 +0800 + + * fix bug for kindeditor placeholder. + +commit b8be575cb22ae1b892909bd4b9047dd040989d93 +Merge: a2db678341 6471624de8 +Author: wangyidong +Date: Thu Dec 8 14:11:56 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6471624de8d96f515fdf9bacd7213a1d44bcc369 +Author: wyd621 +Date: Thu Dec 8 14:10:51 2016 +0800 + + Delete my.min.js + +commit a2db67834122a7261f05c2065f21d5486dec6244 +Author: wangyidong +Date: Thu Dec 8 14:00:06 2016 +0800 + + - delete my.min.js. + +commit fbce8df9488dbd2a8511ea930b57d8775fb48034 +Author: wangyidong +Date: Thu Dec 8 13:27:37 2016 +0800 + + * adjust page. + +commit 2f71effc52e34920bc4d8458aa7bd7a030dcd9c5 +Author: wangyidong +Date: Thu Dec 8 13:27:15 2016 +0800 + + * adjust for upgrade. + +commit f7d35cef9e8dc9fbbbdf80136440fe53b4fba0dc +Author: tengfei +Date: Thu Dec 8 13:24:17 2016 +0800 + + *planning->plan + +commit 18280dc2e923e2f89649361a78db1225a6d79f80 +Merge: 41341bb9f5 b7bb3cbf11 +Author: wangyidong +Date: Wed Dec 7 17:24:53 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 41341bb9f5b6e4bc3acd565c1138ae2d47ef35f4 +Author: wangyidong +Date: Wed Dec 7 17:22:28 2016 +0800 + + * adjust for safe. + +commit b7bb3cbf1199e704c7827e950b13251a90c0392d +Merge: bd2b7162ab ede1a0b798 +Author: tengfei +Date: Wed Dec 7 09:32:22 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + *man-hour + +commit ede1a0b7982585230d575562f0502e7716629152 +Author: wangyidong +Date: Wed Dec 7 09:07:48 2016 +0800 + + * adjust priv. + +commit bd2b7162ab605b71818a92a9f7cfbfed92853c2d +Author: tengfei +Date: Wed Dec 7 08:26:11 2016 +0800 + + *man-hour edit + +commit 51e662fcb9c1b83361a480c5b853fa60db87f985 (tag: zentaopms_8.4.stable_20161206) +Author: wangyidong +Date: Tue Dec 6 17:02:24 2016 +0800 + + * add changelog. + +commit f66345f83e2fb0c6c9166661aa5fc64850e9d272 +Author: wangyidong +Date: Tue Dec 6 16:30:11 2016 +0800 + + * change my.min.js to my.full.js when debug. + +commit 5766579932676f6129e84b50f16fdbe9dc225f97 +Author: wangyidong +Date: Tue Dec 6 16:20:07 2016 +0800 + + * change for upgrade. + +commit 05be061ce0349aae4a7e546ad04b56b15bfb9c26 +Merge: dd19be807f 0531694dab +Author: wangyidong +Date: Tue Dec 6 16:06:58 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit dd19be807fe9ae5e64f0b9b01e309ca11ae2bac8 +Author: wangyidong +Date: Tue Dec 6 16:06:18 2016 +0800 + + * replace iconv by mb_convert_encoding. + +commit e2c7e649a4f1ffde8ddb02bcb3fee64eee0f29fe +Author: wangyidong +Date: Tue Dec 6 14:54:19 2016 +0800 + + * fix bug for git. + +commit 0531694dab3eccbb32e89ed6780b22100f49c68e +Author: tengfei +Date: Tue Dec 6 14:29:35 2016 +0800 + + *edit new added items + +commit 21eba69df90d36dcec5ebf2c5f2d31aae97b49c9 +Author: wangyidong +Date: Tue Dec 6 14:22:18 2016 +0800 + + * adjust for select with pinyin. + +commit 21e8457d5eda484ced101275b9b41ed0a9bf3a50 +Author: wangyidong +Date: Tue Dec 6 13:25:25 2016 +0800 + + * change for resource and en zh-tw lang. + +commit 185f540348c82a746c4e28f8f0d776ef5219dfb7 +Author: wangyidong +Date: Tue Dec 6 11:30:59 2016 +0800 + + * adjust for skip task when batch close. + +commit 7451929e65aef0e06d50636b0df489c072ea43ad +Merge: e10309b1d0 384c5feedc +Author: wangyidong +Date: Tue Dec 6 10:41:17 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e10309b1d0e6c2504e8caf448698ebdb4adf8f7a +Author: wangyidong +Date: Tue Dec 6 10:39:19 2016 +0800 + + * change for ajax save log for svn and git. + +commit 2f679cee93371986b272e135654282dda39079ef +Author: wangyidong +Date: Tue Dec 6 10:33:09 2016 +0800 + + * adjust for pinyin. + +commit 384c5feedc4038537536b19b1d7b3493d46b4bd2 +Author: chenfeiCF +Date: Mon Dec 5 16:53:20 2016 +0800 + + * display user list in assignedTo box when fix tfoot. + +commit 08d5d096132d96fa50abc828047b06bb817573ea +Merge: ebe9fbe2cb dee9734c94 +Author: Catouse +Date: Mon Dec 5 11:06:10 2016 +0800 + + Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms + +commit ebe9fbe2cb1602618d6bc4d502380758bfd77f33 +Author: Catouse +Date: Mon Dec 5 11:05:19 2016 +0800 + + * adjust style of task/create view. + +commit dee9734c940958b6958f3cdd3ae28b50b2c4e91a +Author: chenfeiCF +Date: Mon Dec 5 10:30:32 2016 +0800 + + * add english lang item for zdoo. + +commit 2c902cce89380841a315fab68df83dd2d8941bcc +Author: chenfeiCF +Date: Mon Dec 5 10:23:20 2016 +0800 + + * adjust help info color in report page. + +commit 79ebafe91dc65c0ff884772ead65e7be0dc8ab3b +Author: Catouse +Date: Mon Dec 5 09:28:18 2016 +0800 + + * fix style for project/managemembers view. + +commit 4c5f7679ce2a4ea0493d71eb77184c073a07810f +Author: chenfeiCF +Date: Sun Dec 4 20:21:39 2016 +0800 + + * fix error in bug batch create. + +commit a539be0c32e526e941817d219b52bf66588607d2 +Author: chenfeiCF +Date: Sun Dec 4 13:35:40 2016 +0800 + + * adjust task #2731. + +commit cb30979d576a1a13e20c3a0ebc222c12b6e5fe0e +Author: chenfeiCF +Date: Fri Dec 2 17:21:56 2016 +0800 + + * adjust task #2694. + +commit 7671623442155d839c0a21becb58a67fe623667c +Merge: feb128a192 915c55e001 +Author: tengfei +Date: Fri Dec 2 12:51:11 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + * edit + +commit feb128a192ef21374ced3911a7a42dc34401ab2d +Author: tengfei +Date: Fri Dec 2 12:50:14 2016 +0800 + + *edit + +commit 915c55e001313cf21a9dd42bd48b8a24b6aa6dfc +Author: chenfeiCF +Date: Fri Dec 2 12:28:38 2016 +0800 + + * adjust task #2790. + +commit 673f23381b0ac582ce1713002b63934dd4455046 +Author: wangyidong +Date: Fri Dec 2 10:32:41 2016 +0800 + + * change en lang. + +commit 65940b16b86278f714887a0e8a20ced4d6bdb5f7 +Author: wangyidong +Date: Fri Dec 2 10:30:46 2016 +0800 + + * finish task #2703. + +commit 25b76b8d8043cc247880aa65a30b892522244cf5 +Author: tengfei +Date: Fri Dec 2 10:12:43 2016 +0800 + + *flowchart->workflow + +commit bbd2052dc722d5faa089ec8fc060b82aadc87e6c +Author: wangyidong +Date: Fri Dec 2 09:47:55 2016 +0800 + + * finish task #2752. + +commit fffb7943136e101109a8796ea9917cc13b68d98d +Merge: 95780d863e d9d00b393f +Author: wangyidong +Date: Fri Dec 2 09:21:02 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 95780d863e1d6ad175bfd8e7f85e9c1cc737ebe2 +Author: wangyidong +Date: Fri Dec 2 09:12:59 2016 +0800 + + + add upgrade and install tmp file. + +commit aa6864612cbf016dcb46ae36917f710428460720 +Author: wangyidong +Date: Fri Dec 2 09:06:58 2016 +0800 + + * adjust for construct. + +commit 921ff77303195e4737d1e85fc5b6ba857f6bc715 +Author: wangyidong +Date: Fri Dec 2 09:06:28 2016 +0800 + + * adjust isOpenMethod. + +commit d7a914e328389204190a5113c90348c4c66a13e6 +Author: wangyidong +Date: Fri Dec 2 09:02:38 2016 +0800 + + * fix error. + +commit de810eba6108ee722989f6f1d847e0a0948d1870 +Author: wangyidong +Date: Fri Dec 2 09:02:11 2016 +0800 + + * finish task #2799. + +commit d9d00b393fe9ab22068f001a75cf1778efd9cf8c +Merge: cb39cc9f08 ea0e116b46 +Author: chenfeiCF +Date: Thu Dec 1 17:35:54 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cb39cc9f08f61f3b1eb3428a3dccde2d8053e547 +Author: chenfeiCF +Date: Thu Dec 1 17:33:45 2016 +0800 + + * adjust task #2784. + +commit ea0e116b46b7b939c5238c3367c6ae1efb9bedec +Author: Catouse +Date: Thu Dec 1 17:31:36 2016 +0800 + + * adjust task/create view style. + +commit fd208b2f39ea271e3543392f5763e3806c9b2ba9 +Merge: dc8d9d4002 ffa9b017f0 +Author: Catouse +Date: Thu Dec 1 17:28:02 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dc8d9d40024a5f89b0e6c9f9669f626b6b80038a +Author: Catouse +Date: Thu Dec 1 17:27:48 2016 +0800 + + * code for task #2745. + +commit ffa9b017f005d7d99c62d9ca2f7d161e800e2810 +Author: chenfeiCF +Date: Thu Dec 1 17:14:04 2016 +0800 + + * adjust task #2780. + +commit 2af603bac7ebfe6ef147b554e99b027fb90e74b8 +Author: chenfeiCF +Date: Thu Dec 1 17:07:13 2016 +0800 + + * adjust task #2681. + +commit 82b61dc1dab28b369f259d1133a7786006581853 +Author: chenfeiCF +Date: Thu Dec 1 16:59:45 2016 +0800 + + * adjust the style of create button group. + +commit 75589d210df2cad6a63f104d4b4da71b6b390560 +Author: chenfeiCF +Date: Thu Dec 1 16:43:15 2016 +0800 + + * adjust task #2777. + +commit e9e77687069dd1eef49467564c33c39a3a40096f +Author: chenfeiCF +Date: Thu Dec 1 16:18:59 2016 +0800 + + * adjust task #2727. + +commit f8c8f1874660b2a3726fe29b850a504f87ad7c13 +Author: wangyidong +Date: Thu Dec 1 15:38:55 2016 +0800 + + * finish task #2798. + +commit 75c4c563f5b1e6f5c7a9c8f66e2928ef785f6988 +Author: wangyidong +Date: Thu Dec 1 15:36:25 2016 +0800 + + * finish task #2783. + +commit dd29125b5846da2e7bf82f553058a313f5356e63 +Author: chenfeiCF +Date: Thu Dec 1 15:24:11 2016 +0800 + + * adjust task #2725. + +commit 11f494ae0723ed48917ae56adb5f76b59b42f280 +Author: chenfeiCF +Date: Thu Dec 1 15:00:53 2016 +0800 + + * adjuct task #2722. + +commit e472df69deb8c1249607898743aabdf7e5126bb7 +Author: wangyidong +Date: Thu Dec 1 14:58:26 2016 +0800 + + * finish task #2776. + +commit 74aaed0949a95749f941f0249940c27f7745257b +Author: chenfeiCF +Date: Thu Dec 1 14:49:35 2016 +0800 + + * adjust task #2713. + +commit c059628b076bc2f33110e6d2bd5eb92b6bd8a521 +Author: wangyidong +Date: Thu Dec 1 14:46:26 2016 +0800 + + * finish task #2773. + +commit aaf8e6477719ddc22dadabb9787783c7a7bc5896 +Author: wangyidong +Date: Thu Dec 1 14:37:47 2016 +0800 + + * finish task #2750. + +commit e4946b529ec625e19a22e65bedeb56b37de1eeaa +Author: wangyidong +Date: Thu Dec 1 13:44:52 2016 +0800 + + * finish task #2736. + +commit a78ff866cb5464266c3ecff2c69e5ab4e4117ccf +Merge: 0f232e6d8f fc7cbe828b +Author: wangyidong +Date: Thu Dec 1 13:39:50 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0f232e6d8f111b2c05a0943e6f530554b9e78732 +Author: wangyidong +Date: Thu Dec 1 13:39:29 2016 +0800 + + * finish task #2735. + +commit fc7cbe828be6222b4c97e53dd879bb1509cce538 +Author: chenfeiCF +Date: Thu Dec 1 13:06:10 2016 +0800 + + * adjust task #2704. + +commit 5062e5af5c77d8d4ad3dff49d63a7aea22bb49ad +Merge: 88167e8151 20443bd8ec +Author: wangyidong +Date: Thu Dec 1 11:33:39 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 88167e8151423ea56d483e0bc3f3c2023f45b34a +Merge: c153cece0c 18cd65f939 +Author: wangyidong +Date: Thu Dec 1 11:33:03 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 20443bd8ecca606c0226744c04cb8f659e8b5e4a +Author: chenfeiCF +Date: Thu Dec 1 11:31:04 2016 +0800 + + * adjust task #2701. + +commit c153cece0ce643cc68345576b4124f3fef142382 +Author: wangyidong +Date: Thu Dec 1 11:25:28 2016 +0800 + + * finish task #2732. + +commit 18cd65f9395c80ff02c7a83a9e79dd0ce6df1b9d +Merge: 8720e886e8 8462d65a36 +Author: chenfeiCF +Date: Thu Dec 1 11:23:34 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8720e886e8d6984fa83d0110dbe24461779836b4 +Author: chenfeiCF +Date: Thu Dec 1 11:23:04 2016 +0800 + + * adjust task #2696. + +commit 45d37f489e2eb0c156797d70db76cc6884504034 +Author: wangyidong +Date: Thu Dec 1 11:22:35 2016 +0800 + + * revert for task #2730. + +commit 8462d65a364d762997a6214e56ad80900762cb24 +Author: wangyidong +Date: Thu Dec 1 11:11:37 2016 +0800 + + * finish task #2717. + +commit 777dee7f6b0f394552d8d6a0ed9a890b36a02952 +Author: wangyidong +Date: Thu Dec 1 10:44:10 2016 +0800 + + * finish task #2712. + +commit 531f63e5622362353322bc1c2fa8e73c90568950 +Merge: 9fac0a464c 901c40a6fb +Author: wangyidong +Date: Thu Dec 1 10:32:59 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9fac0a464cc6be64e68f053cb79cc94ad51c9119 +Author: wangyidong +Date: Thu Dec 1 10:31:47 2016 +0800 + + * finish task #2710. + +commit 80ad4ce7581c7c58e7dcad77f64a00c00c2cd7b1 +Author: wangyidong +Date: Thu Dec 1 10:15:24 2016 +0800 + + * finish task #2699. + +commit 901c40a6fbd3cc8d69239bb05217991c801652b3 +Author: chenfeiCF +Date: Thu Dec 1 09:38:51 2016 +0800 + + * make name or title nowrap in table. + +commit 34cd16c329832fd6df27cb88c2392a5ced311b64 +Merge: 2029f1ce34 ef7e7fda15 +Author: chenfeiCF +Date: Wed Nov 30 17:35:14 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2029f1ce34365277b800bb31bfe758b3cd092eb4 +Author: chenfeiCF +Date: Wed Nov 30 17:33:08 2016 +0800 + + * adjust task #2695. + +commit feb0e706084c93c31a5bd7a309c115f3f812e1d7 +Author: wangyidong +Date: Wed Nov 30 17:13:40 2016 +0800 + + * finish task #2689. + +commit ef7e7fda157c065bfaad656577a10d75e37d9e91 +Merge: c1c7966674 a4b337fe8a +Author: tengfei +Date: Wed Nov 30 17:02:28 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c1c796667432d9bd2f4d4a879cd82063b281bff4 +Author: tengfei +Date: Wed Nov 30 17:00:58 2016 +0800 + + *minor editing + +commit a4b337fe8ab1d3cbaaa1765adc3bdd5068903079 +Author: chenfeiCF +Date: Wed Nov 30 15:51:57 2016 +0800 + + * adjust task #2683. + +commit bbed2e599c9dfd5d0c94703541b16d404ddbabc9 +Author: chenfeiCF +Date: Wed Nov 30 15:32:08 2016 +0800 + + * adjust task #2681. + +commit 274d1a0c49f5c85355354f33d3e49f9fc5feef29 +Author: Catouse +Date: Wed Nov 30 15:04:32 2016 +0800 + + * finish task #2723, user can press esc key to close modal. + +commit 05356fab8b71a5c7bc5b56ce25a87e8c5495ec43 +Author: Catouse +Date: Wed Nov 30 14:59:46 2016 +0800 + + * fix canvas chart for ie8. + +commit ef3d5cabdf5851453834d076260766faa6e9d34c +Author: Catouse +Date: Wed Nov 30 14:26:04 2016 +0800 + + * change pie chart radius size to 20. + +commit 147c76d99f6d7d432c66cb7311780749e2425f5c +Merge: 462abed288 ae1b3f9080 +Author: Catouse +Date: Wed Nov 30 14:23:03 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 462abed288746cb4630d2ead8200a0f0aa628f17 +Author: Catouse +Date: Wed Nov 30 14:22:51 2016 +0800 + + * show task progress in project task list with pie chart. + +commit 413e80a3d558708394798e5e91fd6bfc15f028b3 +Author: Catouse +Date: Wed Nov 30 14:22:01 2016 +0800 + + * adjust code format. + +commit 964ebebc546e6780b1eafbb92e560fd308dce0c0 +Merge: 95f028cbbb ae1b3f9080 +Author: wangyidong +Date: Wed Nov 30 11:05:17 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ae1b3f9080cd3776a61c4e6a6783c1ab439c80a4 +Author: tengfei +Date: Wed Nov 30 10:35:14 2016 +0800 + + * Delete useless files. + +commit 6b8f460ede19ceef87de10f53565efee826b4bf3 +Author: tengfei +Date: Wed Nov 30 10:28:54 2016 +0800 + + * bak. + +commit b7c509aa09dfcd2b3356844918610ceebaf29e37 +Author: tengfei +Date: Wed Nov 30 09:22:47 2016 +0800 + + * verification->acceptance + +commit 95f028cbbbc460ac6ac214151850e5334c63cb88 +Merge: f0548adfd3 81800e7cec +Author: wangyidong +Date: Wed Nov 30 09:01:57 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f0548adfd3d586ad4f4e6738ba39b6420dc921d2 +Author: wangyidong +Date: Wed Nov 30 09:01:30 2016 +0800 + + * adjus for bind zentao. + +commit 2e4b6d22b6261ac34b38c4012fcb09702e78e479 +Author: tengfei +Date: Tue Nov 29 15:37:28 2016 +0800 + + language review on 11/29. + +commit 81800e7cece0c183c547790dbe29405569eeff11 +Author: tengfei +Date: Tue Nov 29 14:58:38 2016 +0800 + + * language review. + +commit 04f779edd13f71de3b0c77dbebac0a4d3f163ee7 +Merge: b8207c3588 9e92401815 +Author: Catouse +Date: Tue Nov 29 13:29:59 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b8207c3588ee4733883892e66ce6375fd4343c1f +Author: Catouse +Date: Tue Nov 29 13:29:46 2016 +0800 + + * fix blockquote style in actionbox. + +commit 9e92401815567d3ec22019105e11368c52f8ec92 +Author: chenfeiCF +Date: Tue Nov 29 13:18:57 2016 +0800 + + * if isonlybody do not display subdivide and create testcase button. + +commit 8e4c3803972e120f68e540287dc63e0bb1bc0df9 +Author: wangyidong +Date: Tue Nov 29 13:05:14 2016 +0800 + + * code for task #2773. + +commit c340e6a9332803a7fab955ad85cef4ec168f75db +Author: wangyidong +Date: Tue Nov 29 09:07:34 2016 +0800 + + * finish task #2773. + +commit c833cfd20311c313bc55214b3f637ab20bbe8857 +Author: wangyidong +Date: Tue Nov 29 09:03:26 2016 +0800 + + * adjust for task #2712. + +commit ee7204c10cf5b5379f64ff47299483bb6153f220 +Author: wangyidong +Date: Mon Nov 28 16:55:02 2016 +0800 + + * finish task #2712. + +commit 3baf0ab280cfcfd93aa75d79154589e02aaf0d2e +Author: wangyidong +Date: Mon Nov 28 16:27:39 2016 +0800 + + * finish task #2703. + +commit a3b75f5df3dd07d784eb6f619bf22af148c7040e +Author: wangyidong +Date: Mon Nov 28 14:21:23 2016 +0800 + + * code for task #2773. + +commit c5d68e53056020dcd694bec92366dd288bf24334 +Merge: 92711b1a2e 8975592ed2 +Author: wangyidong +Date: Mon Nov 28 13:56:17 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 92711b1a2e3f7178b390eb53c6a73f338d38a3e8 +Author: wangyidong +Date: Mon Nov 28 13:53:15 2016 +0800 + + * finish task #2689,2746. + +commit 8975592ed27cfe75c3795da84aad2d354587e3c1 +Author: chenfeiCF +Date: Mon Nov 28 10:05:01 2016 +0800 + + * finish task #2715. + +commit 79445db85b84fce09000ac0399db1b6f49e793be +Author: chenfeiCF +Date: Mon Nov 28 09:37:51 2016 +0800 + + * finish task #2720. + +commit 6c0d60dd4921f8c93183c9522a77482a0088f51d +Author: chenfeiCF +Date: Mon Nov 28 09:37:17 2016 +0800 + + * finish task #2711. + +commit f3aef78223b1b4d9e5cbcba0dd30e630ff29039c +Merge: be29473333 ec4804aff9 +Author: chenfeiCF +Date: Mon Nov 28 09:11:57 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + + Conflicts: + module/project/css/task.css + +commit be29473333621ec03754ef5125b128b0f2476c09 +Author: chenfeiCF +Date: Mon Nov 28 09:01:45 2016 +0800 + + * finish task #2770, #2771, #2767. + +commit ec4804aff9c0b09b9631c86da3b529b11d6a8005 +Author: Catouse +Date: Sat Nov 26 18:20:53 2016 +0800 + + * finish task #2763. + +commit 92a398bb1d35fe55374db601a8b917e9793032b8 +Author: Catouse +Date: Sat Nov 26 17:25:24 2016 +0800 + + * improve UI of project/manageproducts view. + +commit 9d0e59a9fdbf88ad78dde060302eb3e071b7c768 +Author: wangyidong +Date: Fri Nov 25 17:36:05 2016 +0800 + + * revert install.php and upgrade.php + +commit 7ef7b4506095fda28417869dad216a1d23a42104 +Merge: 7ac6afe616 6cbe1cfb44 +Author: wangyidong +Date: Fri Nov 25 15:42:42 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7ac6afe616b44bec58c4e37fc6bd272f4e4c350a +Author: wangyidong +Date: Fri Nov 25 15:32:28 2016 +0800 + + * finish task #2719,2729. + +commit 6cbe1cfb44b469d64e03c8dd75509effc270dadb +Author: chenfeiCF +Date: Fri Nov 25 14:18:29 2016 +0800 + + * adjust colspan in project task page. + +commit 2abca48f870396f4e5f35cfd4cf56cf221a6b3ae +Author: chenfeiCF +Date: Fri Nov 25 14:15:04 2016 +0800 + + * finish task #2741. + +commit acbcd7e7e70206820bbc7752601adfad8daa58ff +Author: chenfeiCF +Date: Fri Nov 25 13:57:14 2016 +0800 + + * finish task #2708. + +commit 45028b5f9d4fb3bcfaa2d69970e914244f2e04e0 +Author: chenfeiCF +Date: Fri Nov 25 13:44:18 2016 +0800 + + * finish task #2722. + +commit cab2bbe620cefd8ecdbcf199db4bd309d73fc6cf +Author: chenfeiCF +Date: Fri Nov 25 13:29:12 2016 +0800 + + * finish task #2725. + +commit 637c00dbde798843e825e8954d31cd124dfdf417 +Author: chenfeiCF +Date: Fri Nov 25 13:14:07 2016 +0800 + + * finish task #2764 and fix border for bugcreate and workload report page. + +commit c6a495b0834088ad4c0f2cd0fadbdb7dd4d3db97 +Author: Catouse +Date: Fri Nov 25 11:34:45 2016 +0800 + + * improve UI of views with side handler. + +commit a3c2640ef7f4737b909b48cf0c05b84adb143318 +Author: Catouse +Date: Fri Nov 25 10:43:09 2016 +0800 + + * code for task #2775 and fix table foot columns count error. + +commit cd7e76d1df8b1ca66fc2c10ecb8225656c18263c +Author: chenfeiCF +Date: Fri Nov 25 10:29:47 2016 +0800 + + * add module to objectTables. + +commit a22346e04b53cdc58d750cd7285e7601a9149fb4 +Merge: 6a672f4194 f52c5ab5e3 +Author: Catouse +Date: Thu Nov 24 17:42:44 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6a672f4194276de2fa9e0fe85924df74c3c6cb5a +Author: Catouse +Date: Thu Nov 24 17:42:22 2016 +0800 + + * code for task #2717. + +commit f52c5ab5e3ffbb92ecc39c712658c11bf0b13ab1 +Author: chenfeiCF +Date: Thu Nov 24 17:28:53 2016 +0800 + + * finish task #2785. + +commit ceb8bccb041ea6b87ae072ba86b081e164f67151 +Merge: d6802d7f16 fcb0f2d969 +Author: Catouse +Date: Thu Nov 24 17:19:47 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d6802d7f16a7bc51da51297eccffca6c14c46504 +Author: Catouse +Date: Thu Nov 24 17:19:39 2016 +0800 + + * finish task #2685. + +commit 23c72bab8d390bb19975bd9ec73afcc9e2365b4c +Author: Catouse +Date: Thu Nov 24 17:19:17 2016 +0800 + + * finish task #2742. + +commit cc1e0f2cf0ae0759fc5b74b04dd6fe5f39d3654c +Author: wangyidong +Date: Thu Nov 24 16:55:39 2016 +0800 + + * finish task #2730. + +commit fcb0f2d9691b08836cc6dcb9650bd8e995f10487 +Author: chenfeiCF +Date: Thu Nov 24 15:59:25 2016 +0800 + + * finish task #2793. + +commit 6066dee241e3b63fa3fafd5ce42f039fa70a098c +Author: Catouse +Date: Thu Nov 24 15:56:09 2016 +0800 + + * fix assign dropdown menu UI. + +commit d64e6700e3f195fc732089713305cfe91f39072f +Author: Catouse +Date: Thu Nov 24 15:50:10 2016 +0800 + + * add tree view lang setting for project module. + +commit 8951f8d0af640811c3099ccd212d1da39ff30a4f +Author: Catouse +Date: Thu Nov 24 15:47:47 2016 +0800 + + * improve UI of views with table, finish task #2687，task #2749 and task #2762. + +commit bdac0837e5e0dd214313f15b469e4684ce504b0e +Author: chenfeiCF +Date: Thu Nov 24 15:35:40 2016 +0800 + + * finish task #2714. + +commit cefe16af3509f327e50965dbce261bf1b5824653 +Author: chenfeiCF +Date: Thu Nov 24 14:18:15 2016 +0800 + + * finish task #2782. + +commit a70a30f8373283f746e34b0e101b795b2d37f543 +Author: wangyidong +Date: Thu Nov 24 13:48:28 2016 +0800 + + * finish task #2733. + +commit 23d37c17b79c4def16ef8aec92fcaec395740557 +Merge: cb64163ea0 266727b2fb +Author: wangyidong +Date: Thu Nov 24 11:16:38 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cb64163ea03548fdc13664be428abc8ee9f5f5ae +Author: wangyidong +Date: Thu Nov 24 10:29:54 2016 +0800 + + * finish task #2735. + +commit 80fac82927924a9120c16161909f5e854f4baf0e +Author: wangyidong +Date: Thu Nov 24 10:05:54 2016 +0800 + + * finish task #2736. + +commit 266727b2fb8004b8dba621c83d0f0e76b337fc17 +Author: chenfeiCF +Date: Thu Nov 24 09:06:29 2016 +0800 + + * add deleted field to zt_module table. + +commit 842f2c8c200ffee494ab02d7f4672b04a367af0f +Author: chenfeiCF +Date: Wed Nov 23 17:06:28 2016 +0800 + + * finish task #2724. + +commit c2a4699d5cc06c2a607ea7bec60ba615d16dab69 +Author: Catouse +Date: Wed Nov 23 17:03:28 2016 +0800 + + * improve project task tree UI. + +commit e490628ecac7b0346ede6102ff3d46bd6ea08e20 +Merge: a30a1b7b35 213b79c896 +Author: Catouse +Date: Wed Nov 23 16:51:27 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a30a1b7b3559ec8a92f31093adc029c5d8df3762 +Author: Catouse +Date: Wed Nov 23 16:49:43 2016 +0800 + + * code for task #2751. + +commit 213b79c896b6fb368b22feba2566bc037d39c59f +Merge: 0da4982f3d c4ba4b015a +Author: chenfeiCF +Date: Wed Nov 23 16:48:31 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0da4982f3da4cc98dc743857572aa069dea3013a +Author: chenfeiCF +Date: Wed Nov 23 16:47:47 2016 +0800 + + * finish task #2755. + +commit 2d48ca7caf4abcfb14fb339f9ee09915cec4ecce +Merge: 7a28c7ef3c c4ba4b015a +Author: wangyidong +Date: Wed Nov 23 16:01:59 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c4ba4b015aa2cf37019433f2dbba2e217849c45a +Author: Catouse +Date: Wed Nov 23 15:11:04 2016 +0800 + + * finish task #2766. + +commit d88dcb92f72e6d2a584d39bd76d5e178c5052b5d +Merge: d7b75936e0 fd3b1e0890 +Author: Catouse +Date: Wed Nov 23 14:58:32 2016 +0800 + + Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms + +commit d7b75936e02888d75f4787f88f28234810143dda +Author: Catouse +Date: Wed Nov 23 14:58:15 2016 +0800 + + * finish task #2769 and task #2768. + +commit 7a28c7ef3cc4e38dbcc390a71acf28287b557592 +Author: wangyidong +Date: Wed Nov 23 14:49:32 2016 +0800 + + * finish task #2737. + +commit fd3b1e08904a170381de32400c404994216ccbad +Author: chenfeiCF +Date: Wed Nov 23 14:47:34 2016 +0800 + + * finish task #2731. + +commit 3f5434f83ba64eaa3209bdcc88d30c619a4d3b74 +Merge: a93e57260e 3cf812b1af +Author: Catouse +Date: Wed Nov 23 14:46:44 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a93e57260e2511655723bfbd92e985e9046e60b4 +Author: Catouse +Date: Wed Nov 23 14:46:03 2016 +0800 + + * update zui. + +commit 3cf812b1afed12581b513684c73fdb8ef3cb2a56 +Author: wangyidong +Date: Wed Nov 23 14:38:56 2016 +0800 + + * code for task #2752. + +commit be0590ac6f5d4b6bc6a6f980707595ac1d51f723 +Merge: af68f3c193 5c613b10e4 +Author: wangyidong +Date: Wed Nov 23 14:38:21 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit af68f3c193428c7a8448ec20af2f738af8b7cc02 +Author: wangyidong +Date: Wed Nov 23 14:36:41 2016 +0800 + + * finish task #2738. + +commit 66f4ab8ea6c3fff46af2aec021216dcf7955956d +Author: wangyidong +Date: Wed Nov 23 14:28:53 2016 +0800 + + * fix bug for save query condition. + +commit 5c613b10e4e3a1336a46067a3c46f84f869d5b29 +Merge: 4a98f9b3fd dc75ee0124 +Author: Catouse +Date: Wed Nov 23 14:03:54 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + Conflicts: + module/productplan/css/view.css + module/project/view/grouptask.html.php + +commit dc75ee01248d5eca03de9abc1a6203a9c15564a4 +Author: chenfeiCF +Date: Wed Nov 23 13:32:31 2016 +0800 + + * code for task #2731: could custom branch when batch create story. + +commit 26aadd03f9b0dba8dc9b9ac5f9bab7a1a72d6f88 +Author: wangyidong +Date: Wed Nov 23 11:55:37 2016 +0800 + + * finish task #2740. + +commit 5aeebbba9534dcf6ea9e4c45cdf367d04f19d08c +Author: wangyidong +Date: Wed Nov 23 11:06:51 2016 +0800 + + * finish task #2748. + +commit 74071c46e58fe33e109ee5a3105581c8e15b1436 +Merge: decf0f8b67 7a9b077972 +Author: wangyidong +Date: Wed Nov 23 10:59:24 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit decf0f8b67cb0c0ec2279eb9ad57be02a7d0452e +Author: wangyidong +Date: Wed Nov 23 10:59:00 2016 +0800 + + * finish task #2750. + +commit ceb1fd45fba7e9966b8b343cea27b4540e7d6bd7 +Author: wangyidong +Date: Wed Nov 23 10:40:15 2016 +0800 + + * add api for integrate svn/git. + +commit 7a9b077972f78d9c42fcfd34e438a1d1527cc25a +Author: chenfeiCF +Date: Wed Nov 23 09:24:38 2016 +0800 + + * finish task #2745. + +commit 0f26f8f7d7e4c03f25639403c4f9305155b275d1 +Author: chenfeiCF +Date: Tue Nov 22 17:19:08 2016 +0800 + + * finish task #2777. + +commit 8809a36e64840479e44ee9b3ec6444b2e9175414 +Author: wangyidong +Date: Tue Nov 22 16:43:53 2016 +0800 + + * finish task #2752. + +commit 4a98f9b3fdf1c5f3a51411f3af8bce5e15b8f5cc +Merge: 65b2930060 0c4205589b +Author: Catouse +Date: Tue Nov 22 16:20:41 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 65b293006045807614b85dd1f7b48b4df05cd8c4 +Author: Catouse +Date: Tue Nov 22 16:19:01 2016 +0800 + + * fix style of bordered table. + +commit 22e81d3d9329721d546da4b1642f5df8bc0459e2 +Author: Catouse +Date: Tue Nov 22 16:18:35 2016 +0800 + + * fix table fixed header style in block. + +commit 979459abab3c3575bbc77031c36712f9ae68ccbc +Author: Catouse +Date: Tue Nov 22 16:18:07 2016 +0800 + + * adjust code format. + +commit 0c4205589b1318314694fa27291bf3490ed39d5b +Merge: 5cc0de9ec4 176eb15d75 +Author: wangyidong +Date: Tue Nov 22 16:18:03 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 79a24ec8fd376aa03b5061f753967df51a28c151 +Author: Catouse +Date: Tue Nov 22 16:17:58 2016 +0800 + + * fix fixed table header style. + +commit 2a3e32696260b2d78e3b361cbbf5ff6fca14a01b +Author: Catouse +Date: Tue Nov 22 16:17:40 2016 +0800 + + * fix task pri text with zero value. + +commit 176eb15d75aeb2e39f4f63925327c8e327b4bcf7 +Author: chenfeiCF +Date: Tue Nov 22 16:06:44 2016 +0800 + + * close modal when create a testcase from story view. + +commit 5cc0de9ec4134fe73ddf237764475fc056602eed +Merge: c6d79ccd4b 9e4a7f5316 +Author: wangyidong +Date: Tue Nov 22 15:57:51 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c6d79ccd4b5ebaacdbb1dcdac312091549942549 +Author: wangyidong +Date: Tue Nov 22 15:56:30 2016 +0800 + + * finish task #2753 and code task #2719. + +commit 9e4a7f53168567afea14ba6af8c9b8d45c6bb856 +Author: chenfeiCF +Date: Tue Nov 22 15:28:05 2016 +0800 + + * finish task #2716. + +commit 0f25690c861bce99fd43184c51b021d0fef334a8 +Merge: 815e104606 d3fb97b921 +Author: Catouse +Date: Tue Nov 22 14:40:28 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 815e1046061c2f091a31de6392c5691cf5e2690b +Author: Catouse +Date: Tue Nov 22 14:40:18 2016 +0800 + + * fix hotkey error. + +commit d3fb97b92104af715260a25fe439fd5c1fb9f0d3 +Merge: e549d7f015 6fe63dcc59 +Author: wangyidong +Date: Tue Nov 22 14:22:20 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e549d7f015580d8278a9e19353b9260fa5708c20 +Author: wangyidong +Date: Tue Nov 22 14:21:05 2016 +0800 + + * finish task #2757. + +commit 40818f0779035f39cd3a6b93bd318f606538955c +Author: wangyidong +Date: Tue Nov 22 14:12:49 2016 +0800 + + * revert bug lang. + +commit 6fe63dcc592ec4ec8f858cfe1e6aa7473c19f9c9 +Author: Catouse +Date: Tue Nov 22 13:42:41 2016 +0800 + + * finish task #2781. + +commit 97ea6de6b2b20030c88d24d06264c46b92e6bf86 +Merge: 6fe397cf6d 9410cab78f +Author: Catouse +Date: Tue Nov 22 11:35:28 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6fe397cf6d7803cfc282f142378d41372e37436e +Author: Catouse +Date: Tue Nov 22 11:33:55 2016 +0800 + + * improve tree UI. + +commit 57b5a526cd63b6eb8e38a2cd776fa8a40b0d99fd +Author: Catouse +Date: Tue Nov 22 11:33:39 2016 +0800 + + * adjust dropdown style. + +commit 24db1cd1fc6d4647b205b25f905d860833f86ef2 +Author: Catouse +Date: Tue Nov 22 11:33:23 2016 +0800 + + * update chosen and code for task #2684. + +commit 9410cab78f1d29c326a534cbddb8a8649f70d865 +Merge: 45c6658826 995d4653cc +Author: wangyidong +Date: Tue Nov 22 11:28:13 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 45c6658826b395fe59420b3a4f23f9c8652b4338 +Author: wangyidong +Date: Tue Nov 22 11:27:51 2016 +0800 + + * finish task #2710. + +commit 995d4653cc4d4a8921aabc0d1dbca4caf9fbb199 +Author: chenfeiCF +Date: Tue Nov 22 11:24:25 2016 +0800 + + * add task, bug, case counts of story to datatable. + +commit 54419ad74b41dcd2c441bf3a25fec12391de1ca0 +Author: chenfeiCF +Date: Tue Nov 22 10:38:33 2016 +0800 + + * add task progress to datatable and adjust task view page of create method. + +commit 26a9b56aa8452964209c8d9380098fa367e5eb6e +Author: wangyidong +Date: Tue Nov 22 10:08:15 2016 +0800 + + * finish task #2705. + +commit 1fdd5206cbf9d852e0e254ce25d9eaadd141b6be +Author: wangyidong +Date: Tue Nov 22 09:54:02 2016 +0800 + + * finish task #2728. + +commit 5765831546a441695a8a2073120968cc0d57137f +Author: wangyidong +Date: Tue Nov 22 09:43:46 2016 +0800 + + + add new file for syntaxhighlighter. + +commit 6707744696bde07579be9d8eae69e4a5eab9cfe4 +Author: wangyidong +Date: Mon Nov 21 17:08:10 2016 +0800 + + * finish task #2754. + +commit ba7957bbce55e88c91bf8d9b941e7bbea4d4b7e5 +Merge: f3f18a3401 a37904c148 +Author: wangyidong +Date: Mon Nov 21 17:03:52 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f3f18a3401d284236bf808cb4a332741315e3168 +Author: wangyidong +Date: Mon Nov 21 17:02:44 2016 +0800 + + * finish task #2761,2732. + +commit a37904c148498dadeaf44133ad54261f88de3067 +Author: chenfeiCF +Date: Mon Nov 21 16:26:06 2016 +0800 + + * finish task #2747. + +commit c8897865bc9ab4904905486b1a344b3776d9b051 +Author: chenfeiCF +Date: Mon Nov 21 14:51:47 2016 +0800 + + * finish task #2743. + +commit 8f27a6f471293a828874e2c8874bc41290b54aac +Author: chenfeiCF +Date: Mon Nov 21 14:24:53 2016 +0800 + + * finish task #2756. + +commit a4a8120bebbdcdfa8ec8dbaa679fe099b129ea72 +Author: chenfeiCF +Date: Mon Nov 21 13:13:30 2016 +0800 + + * finish task #2774. + +commit 30eafa9b80b28ad5313cef8b85de0e5051ddaad4 +Merge: c4e8cef7f8 332f262b54 +Author: wangyidong +Date: Mon Nov 21 12:04:13 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c4e8cef7f8aac4e8d5b947e4d8101395cf24ff05 +Author: wangyidong +Date: Mon Nov 21 12:03:44 2016 +0800 + + * finish task #2776. + +commit 332f262b543f9f9d00200c18f2826a21afeb2ee9 +Author: chenfeiCF +Date: Mon Nov 21 10:48:51 2016 +0800 + + * finish task #2739. + +commit b32c4eb6de784d12ec2dd6f64f0e3461adfc1249 +Author: chenfeiCF +Date: Mon Nov 21 10:26:29 2016 +0800 + + * fix bug when get story tasks. + +commit 1cf66e4b78fdc6af7612bc4249bd82efdc73da87 +Author: chenfeiCF +Date: Mon Nov 21 10:03:59 2016 +0800 + + * finish task #2758. + +commit 21c11b9edb373da7cfb978cad11369dfd8af915f +Author: wangyidong +Date: Mon Nov 21 09:57:06 2016 +0800 + + * finish task #2783. + +commit a886430fd0afe1e4039e342e3fcba1f59554cf92 +Author: wangyidong +Date: Mon Nov 21 09:19:01 2016 +0800 + + * finish task #2779. + +commit b3432912e56f38d222dba8038a551ef6c0ae750b +Author: wangyidong +Date: Fri Nov 18 17:33:49 2016 +0800 + + * finish task #2779. + +commit 882442734027c3c9a53592ca52e883eacdc201dc +Merge: 3aa41586a7 db7859a808 +Author: wangyidong +Date: Fri Nov 18 17:18:30 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3aa41586a77761e7301a308a7d85228cfea86f13 +Author: wangyidong +Date: Fri Nov 18 17:17:55 2016 +0800 + + * finish task #2692. + +commit 582e3924297e97f08b00280403f61c79f3f6fd64 +Author: wangyidong +Date: Fri Nov 18 17:12:09 2016 +0800 + + * code for task #2699,2791. + +commit db7859a808c8c69a72cb9b9affff36e48765be48 +Author: chenfeiCF +Date: Fri Nov 18 16:51:55 2016 +0800 + + * finish task #2707. + +commit cb0d85b65cff8c3defee1d87c2b9c92c03a4585e +Merge: 1614938788 08ce64e737 +Author: Catouse +Date: Fri Nov 18 15:52:24 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1614938788f947faeb1055f18809d5fe3f07ec59 +Author: Catouse +Date: Fri Nov 18 15:52:07 2016 +0800 + + * fnish task #2762. + +commit edfa25e8cfd8e78a77adb901920cdd0bf261e8b6 +Author: Catouse +Date: Fri Nov 18 15:46:46 2016 +0800 + + * finish task #2751, task #2792. + +commit 08ce64e7375ccc3965966c8c4a3368bd734d06a6 +Author: chenfeiCF +Date: Fri Nov 18 15:26:31 2016 +0800 + + * finish task #2701. + +commit 3041a5312440a8dc3beb235c4298a25bbc31bbe3 +Author: chenfeiCF +Date: Fri Nov 18 13:13:13 2016 +0800 + + * finish task #2709. + +commit f1d1663d4f0eab98b9c10b6a9519e59364154f01 +Merge: f3dbc6f52a d633f6b157 +Author: wangyidong +Date: Fri Nov 18 13:12:23 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d633f6b157e11e21351346058fb236878353231f +Author: Catouse +Date: Fri Nov 18 11:50:13 2016 +0800 + + * fix dropdown size in #topNav. + +commit 846804cbcba63fc89db9ff5a2ede8143c775624e +Merge: a6210b9eb7 4ae5f6e018 +Author: Catouse +Date: Fri Nov 18 11:12:31 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4ae5f6e01899ffce1490a0811913eabf22ed2bb0 +Author: chenfeiCF +Date: Fri Nov 18 09:46:52 2016 +0800 + + * finish task #2697. + +commit a6210b9eb74756e0191dd3abde84d82b3dc1895c +Merge: 88b0595290 0bcb1b5cc8 +Author: Catouse +Date: Thu Nov 17 17:32:54 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 88b05952904c74fb85d410138e13236852b4be23 +Author: Catouse +Date: Thu Nov 17 17:32:10 2016 +0800 + + * finish task #2734. + +commit 0e5ee436a757060138872155a0494cd484e3d106 +Author: Catouse +Date: Thu Nov 17 17:31:50 2016 +0800 + + * update zui: fix tree UI. + +commit 0bcb1b5cc83270748b3942ab29e14f002e883de9 +Author: chenfeiCF +Date: Thu Nov 17 17:25:16 2016 +0800 + + * finish task #2713. + +commit f3dbc6f52a8f4c9e1148cac2cc7badf926360877 +Author: wangyidong +Date: Thu Nov 17 15:24:55 2016 +0800 + + * adjust for notice when view deny doc. + +commit 58693b20c362c8b5ab002198b5fc5edd58c72302 +Author: chenfeiCF +Date: Thu Nov 17 15:04:16 2016 +0800 + + * finish task #2706. + +commit 6dfdf69b6f7f289ac5aac22d781e40df6e13b761 +Merge: befa5a2a80 fd7742ce14 +Author: chenfeiCF +Date: Thu Nov 17 14:43:59 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit befa5a2a8047c2edbe536751e1211de64937d38a +Author: chenfeiCF +Date: Thu Nov 17 14:42:06 2016 +0800 + + * finish task #2704. + +commit fd7742ce14301db8a37aa61e974e629e0b435ccf +Merge: e9b329df4c 9fba07add1 +Author: Catouse +Date: Thu Nov 17 14:37:22 2016 +0800 + + Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms + +commit e9b329df4c4db5f7cd1b6787937b5cd659d53885 +Author: Catouse +Date: Thu Nov 17 14:36:28 2016 +0800 + + * finish task #2723. + +commit 9fba07add15e5bfd5cf93975af032702ed0baadf +Author: chenfeiCF +Date: Thu Nov 17 14:10:52 2016 +0800 + + * finish task #2702. + +commit 37d97288a75cae5188e9917ef1a9136776d535ec +Merge: 8b5f5d2c25 ea6244405f +Author: Catouse +Date: Thu Nov 17 14:07:08 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8b5f5d2c25027d84d423474baaa28ffafc6f7786 +Author: Catouse +Date: Thu Nov 17 14:06:59 2016 +0800 + + * finish task #2688. + +commit ea6244405fb3c9309b39f94db4e95bb85ada202e +Merge: fb5bb21f97 9be3d4b00e +Author: wangyidong +Date: Thu Nov 17 13:34:55 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fb5bb21f97f6cd5741868d6c356502e33a57a5f2 +Author: wangyidong +Date: Thu Nov 17 13:34:25 2016 +0800 + + * change for afterexec css. + +commit 9be3d4b00e468ab62549a1253921d60b55029c82 +Author: chenfeiCF +Date: Thu Nov 17 13:32:21 2016 +0800 + + * finish task #2700. + +commit 120ac37bdc7ed3c9518598386f34be1c9be0170a +Author: wangyidong +Date: Thu Nov 17 13:13:57 2016 +0800 + + * change for upgrade 8.3.1. + +commit 67a54b2c429754cb75502bd5983bf6bd7a137bc5 +Merge: 35594d8d50 86439a699e +Author: wangyidong +Date: Thu Nov 17 11:37:19 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 35594d8d500bd7b4539edb3814aa6fdfe21f9608 +Author: wangyidong +Date: Thu Nov 17 11:36:53 2016 +0800 + + * change for doc priv. + +commit c49352eca55763de8c29120fc0fff174df9a61d9 +Author: wangyidong +Date: Thu Nov 17 11:36:29 2016 +0800 + + * fix bug for doc view link. + +commit 0a2bb5b52c573cd59d5e9393c6d25edf80a0e423 +Author: wangyidong +Date: Thu Nov 17 11:36:04 2016 +0800 + + * change for upgrade. + +commit b4fd8e184fb827215b760d29d079f8ccfe3fe209 +Author: wangyidong +Date: Thu Nov 17 11:35:24 2016 +0800 + + * change for sendcloud async. + +commit 001ff6705e496c30eeaa704994a5e9db404a14b5 +Author: wangyidong +Date: Thu Nov 17 11:34:53 2016 +0800 + + * adjust for devicePrefix config. + +commit 86439a699ec3ed726053582f1d11fac38b363c99 +Author: chenfeiCF +Date: Thu Nov 17 11:22:14 2016 +0800 + + * finish task #2695. + +commit 45ff3731970c3193b2cd7cbbb69b01415e8c96e9 +Author: chenfeiCF +Date: Thu Nov 17 09:02:25 2016 +0800 + + * finish task #2694. + +commit 71a3f0109642bb855e24e45ea4d0a33fb7afc5ca +Author: chenfeiCF +Date: Wed Nov 16 13:33:59 2016 +0800 + + * finish task #2698. + +commit e8bcd89181588c0e53d2d443d5c7a77889af68d7 +Author: chenfeiCF +Date: Wed Nov 16 13:19:57 2016 +0800 + + * finish task #2683. + +commit 721e5749deaea9a7b9f4bd4625a147076698502b +Merge: 5a68ad0d7b dd4e5d63f3 +Author: Catouse +Date: Wed Nov 16 10:46:57 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5a68ad0d7b4cf7a63323efb2f222c4eedf6902df +Author: Catouse +Date: Wed Nov 16 10:44:06 2016 +0800 + + * adjust js code. + +commit c4da9fa838c7171b6fa19d67a99b47b4dbc9fd08 +Author: Catouse +Date: Wed Nov 16 10:43:48 2016 +0800 + + * update zui. + +commit dd4e5d63f3148dfaa04c24899a52caca7d86eb76 +Author: chenfeiCF +Date: Wed Nov 16 10:17:32 2016 +0800 + + * finish task #2690. + +commit f605f772c988a2eb9ca9d367ed1c4d4fdb0ef952 +Merge: 3559b3c03e e2d06a1858 +Author: wangyidong +Date: Tue Nov 15 18:04:19 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3559b3c03eb890e59e25297c3b616775df02ec39 +Author: wangyidong +Date: Tue Nov 15 18:03:29 2016 +0800 + + * finish task #2786. + +commit e2d06a1858bbd3bc71980e40b7d6765f16e3293e +Author: chenfeiCF +Date: Tue Nov 15 17:35:29 2016 +0800 + + * finish task #2778. + +commit c4878d452222283f49e860c261bd6f91f3ac0db1 +Author: chenfeiCF +Date: Tue Nov 15 16:59:44 2016 +0800 + + * finish task #2784. + +commit ce574424d3656224c002eca0038af7792527f6e9 +Author: wangyidong +Date: Tue Nov 15 16:29:23 2016 +0800 + + * finish task #2794. + +commit 8bea7509c3fed9ebf28d9cc5b4e4515290a1fbbf +Merge: 314190a3de 90312c8124 +Author: wangyidong +Date: Tue Nov 15 15:53:00 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 314190a3dedae55da7fcc36e23a2d5cb345ec480 +Author: wangyidong +Date: Tue Nov 15 15:52:29 2016 +0800 + + * finish task #2796. + +commit e7991f415bea2e4025ed9ffa18a609555dcc69e9 +Author: wangyidong +Date: Tue Nov 15 14:59:42 2016 +0800 + + * finish task #2798. + +commit 90312c8124857f795b769e5d16720308d4d1224b +Author: Renee +Date: Tue Nov 15 14:46:58 2016 +0800 + + Update en.php + +commit 49c5f6346bb303e91e8558a7a45b12ecc284b3c1 +Author: chenfeiCF +Date: Tue Nov 15 14:45:57 2016 +0800 + + * finish task #2693. + +commit 49b2e7b9aeb63373cbb6b97ca63dd76d29ee78ea +Author: wangyidong +Date: Tue Nov 15 14:02:14 2016 +0800 + + * finish task #2797. + +commit 8a3e3c3b0e1552baaa204bfe62a270ba9c6e4337 +Author: Renee +Date: Tue Nov 15 14:01:23 2016 +0800 + + Update en.php + +commit 6dc42d23e26e36fa137bd76e1625b209883857bf +Author: chenfeiCF +Date: Tue Nov 15 13:56:08 2016 +0800 + + * finish task #2686. + +commit c72a51076fd2a817dbde5159229cb4d8ec5ab3b1 +Author: chenfeiCF +Date: Tue Nov 15 13:10:39 2016 +0800 + + * finish task #2696. + +commit ff435621c33380249bef1439e150faeb5d6a9f2d +Author: wangyidong +Date: Tue Nov 15 11:19:16 2016 +0800 + + * finish task #2800,2799. + +commit 95dff5fb684eb0376e8adebb448b466f1e7b35a9 +Merge: 5854894af3 5e25d0396b +Author: wangyidong +Date: Tue Nov 15 10:28:52 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5854894af347b8651a6a5d5eb1b31e114c95145f +Author: wangyidong +Date: Tue Nov 15 10:22:48 2016 +0800 + + * fix bug for 8.3. + +commit 5e25d0396b95e7057fe4b7bb9866adfabf5501cb +Author: chenfeiCF +Date: Tue Nov 15 09:50:38 2016 +0800 + + * finish task #2681. + +commit c380ee7f8118023c4c9ec712346ffa8b323e1fa8 +Author: chenfeiCF +Date: Mon Nov 14 17:21:50 2016 +0800 + + * finish task #2789. + +commit 3b87eda7440cb1a2d3b88fc3fed019cb90df59d7 +Author: chenfeiCF +Date: Mon Nov 14 17:05:40 2016 +0800 + + * finish task #2780. + +commit 8c32145ab83cd47ca99d00cd46c3fd2ef9b35a31 +Author: wangyidong +Date: Mon Nov 14 16:07:13 2016 +0800 + + * finish task #2802. + +commit 7cd10ef371326faeb42c54794c5c1c97c23f158d +Author: wangyidong +Date: Mon Nov 14 16:03:16 2016 +0800 + + * code for 2803. + +commit 2d6f8ac439bb5fc290f00014edb5d1f31a065274 +Author: wangyidong +Date: Mon Nov 14 15:52:38 2016 +0800 + + * finish task #2803. + +commit f8acec2392e5f69b7bd5b7657bbe25c889cc2b8b +Merge: 5d4d431544 cbd90fdd22 +Author: wangyidong +Date: Mon Nov 14 15:51:45 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cbd90fdd221278c3b1eb73b152731b9cae302d2c +Author: chenfeiCF +Date: Mon Nov 14 15:38:28 2016 +0800 + + * finish task #2787. + +commit 5d4d431544f598367a79f1ff48d20dd35d36a9aa +Merge: df531594e8 2035c1881b +Author: wangyidong +Date: Mon Nov 14 14:12:13 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit df531594e8966648854f1f291204405a2ebdb323 +Author: wangyidong +Date: Mon Nov 14 14:11:20 2016 +0800 + + * finish task #2804. + +commit 2035c1881b0a35bd9689fb3a370c3087efecd4ff +Author: chenfeiCF +Date: Mon Nov 14 14:05:10 2016 +0800 + + * finish task #2788. + +commit 68ebaf540e59971a7e2118e6f597d6fd16207530 +Author: chenfeiCF +Date: Mon Nov 14 13:27:49 2016 +0800 + + * finish task #2790. + +commit 4c2d4ac9bf96dc4942b62422491ebabce0491ba7 +Merge: 2d91db196f 863bc490d9 +Author: wangyidong +Date: Mon Nov 14 11:27:05 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2d91db196f04bfce65e87dd7768c8df285fed7d2 +Author: wangyidong +Date: Mon Nov 14 11:25:58 2016 +0800 + + * finish task #2805. + +commit 863bc490d9b0ffb33164380123882715bb590d41 +Author: chenfeiCF +Date: Mon Nov 14 10:47:10 2016 +0800 + + * finish task #2795. + +commit bb1f2a7cdfebda8d4269d0e27cccdefaf62dc965 +Merge: d73ba00f0b 9bc9ced1b0 +Author: wangyidong +Date: Fri Nov 11 14:43:53 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d73ba00f0bb16048fc6cbd14954d08c83e6345be +Author: wangyidong +Date: Fri Nov 11 13:07:45 2016 +0800 + + * fix bug for en lang. + +commit 9bc9ced1b0bbd2ab2fb6c08ac1bc163ee1f2cae3 +Author: Renee +Date: Fri Nov 11 10:56:07 2016 +0800 + + Update README.md + +commit 60ee7806e641f2385dc7e66deef30d612180c337 +Author: wangyidong +Date: Thu Nov 10 15:13:23 2016 +0800 + + * change for demo sql. + +commit 37cbef380c66ed39266c1564967ccd3b18e1b906 +Author: wangyidong +Date: Thu Nov 10 15:13:09 2016 +0800 + + * add changelog. + +commit 29bf12312cbda82a5347a89d4c7cea4e0b1c7335 +Author: wangyidong +Date: Thu Nov 10 15:12:38 2016 +0800 + + * fix bug and adjust doc search. + +commit f0b8d17c630e7125e2f3e49726e1b16d18783be5 (tag: zentaopms_8.3.stable_20161109) +Author: wangyidong +Date: Wed Nov 9 16:27:48 2016 +0800 + + * change for get libs by order. + +commit f4b14dd644576376379a47f277cb9536592160cf +Author: wangyidong +Date: Wed Nov 9 16:15:07 2016 +0800 + + * change for zh-tw lang. + +commit 1beee1808f423d88f616f50316ddbb4f176e8f51 +Author: wangyidong +Date: Wed Nov 9 16:06:53 2016 +0800 + + * adjust for doc. + +commit 5e4340489f1c65a0e1a0dffb577fd69dae3bcee6 +Author: wangyidong +Date: Wed Nov 9 14:13:51 2016 +0800 + + * adjust for doc drop menu. + +commit 199e5bd3bf19e8e6067391e3d3f0528172398451 +Merge: 80a2e16111 d8af5e4e2a +Author: wangyidong +Date: Wed Nov 9 13:50:47 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 80a2e16111796df8fad593b182d7e50200ef0948 +Author: wangyidong +Date: Wed Nov 9 11:00:37 2016 +0800 + + * adjust for doc menu. + +commit d8af5e4e2aede365a315e3f87563f728b3f3b5fb +Author: Catouse +Date: Wed Nov 9 10:44:07 2016 +0800 + + * focus search box on drop menu show. + +commit ebc7232f46e415ff09e7b4415f74c686bc6a7bc6 +Author: Catouse +Date: Wed Nov 9 10:32:22 2016 +0800 + + * change padding of lib-menu-item. + +commit 1bdfeac6ca06f689b0defb8ae7a4c8065350734a +Merge: 25b155df0b 4e29668b7a +Author: Catouse +Date: Wed Nov 9 10:26:49 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 25b155df0bc36cb570305eedb2416478eead67b6 +Author: Catouse +Date: Wed Nov 9 10:26:34 2016 +0800 + + * make drop menu in doc views responsive for wide screens. + +commit 4e29668b7a09054a9d4078536c456b8653522771 +Author: Renee +Date: Wed Nov 9 09:53:43 2016 +0800 + + Update README.md + +commit 4983a57ee95647166a98b8b673bf10573495abfd +Author: wangyidong +Date: Wed Nov 9 09:33:37 2016 +0800 + + * fix bug for delete. + +commit df765447e5b5f2a9c0a4d5be172124b038c1f202 +Author: wangyidong +Date: Wed Nov 9 09:33:06 2016 +0800 + + * adjust for doc. + +commit 547bfa71800a0424cb0e1b8c00f3529d9bdee5ad +Author: Catouse +Date: Wed Nov 9 08:41:50 2016 +0800 + + * delete test code. + +commit 61b6e9d52062cb63fe2647d7426b4ff4f4e19617 +Author: Catouse +Date: Wed Nov 9 08:40:27 2016 +0800 + + * add new drop menu UI for doc views. + +commit 75e12fbb1383869caae0db4f2eab413e7b6679fd +Author: wangyidong +Date: Tue Nov 8 17:11:42 2016 +0800 + + * fix bug for get all libs. + +commit 7ee3f82963624a237fc9ac7f2f603f26619a0b36 +Author: wangyidong +Date: Tue Nov 8 15:11:22 2016 +0800 + + * adjust for doc page. + +commit 78db39b7dc75a009d05800ddb3cba99dfa480c14 +Author: wangyidong +Date: Mon Nov 7 11:14:35 2016 +0800 + + * change for en lang. + +commit f4701f69700827807b460bd6dc87e593e92c7313 +Author: wangyidong +Date: Mon Nov 7 09:37:43 2016 +0800 + + * adjust for lib priv. + +commit e71dc4bd001623d3f2ab0187db8e47092b8f60f1 +Author: wangyidong +Date: Mon Nov 7 08:18:28 2016 +0800 + + * add changelog. + +commit 2f3694c4d62bdf354feb81d0ee35a68d1bcb68bc +Author: wangyidong +Date: Sun Nov 6 19:10:32 2016 +0800 + + * fix for doclib priv. + +commit 250be506421d5b714b998de6d069ac062633c81e +Author: wangyidong +Date: Sun Nov 6 19:02:42 2016 +0800 + + * fix bug for project link doclib. + +commit 0b869cdf45a5bd2349fc9ae3a76fa472f708f6a2 +Author: wangyidong +Date: Sun Nov 6 18:19:46 2016 +0800 + + * adjust for doc. + +commit ea93d2c3a9a42624a768b7d8e671db0c5c3bdc7c +Author: wangyidong +Date: Fri Nov 4 10:46:11 2016 +0800 + + * add objectLibs priv. + +commit cb56126f68a88121f1c2f25982d23692da097aef +Author: wangyidong +Date: Fri Nov 4 10:29:12 2016 +0800 + + * add show libs for product or project. + +commit 27f7d0c392ef2a470921eadc8d3fa14a1114e966 +Author: wangyidong +Date: Thu Nov 3 21:38:29 2016 +0800 + + * add new tab when browse by menu. + +commit d44feed3440a94c60100c10acfc5eb081110fee7 +Author: wangyidong +Date: Thu Nov 3 21:24:52 2016 +0800 + + * adjust doc module. + +commit 0a90286dcc6c3a8caed015f18f77cb5c342088a7 +Author: wangyidong +Date: Thu Nov 3 21:21:40 2016 +0800 + + * adjust for create doclib when create project or product. + +commit 2673f0cad8ba5b5a56d5c810445b6839b65eefc7 +Author: wangyidong +Date: Thu Nov 3 21:21:07 2016 +0800 + + * adjust for upgrade. + +commit ef096bfa82aa2641249491cba05a6e25d4888b29 +Author: wangyidong +Date: Thu Nov 3 21:20:41 2016 +0800 + + * adjust for ueditor and markdown. + +commit ab4bf80092778d070aa76812ab869d2d07df570d +Merge: 4b109007f9 23d9ea565a +Author: wangyidong +Date: Thu Nov 3 21:13:38 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4b109007f99f5f75210adb2363be686a641482c4 +Author: wangyidong +Date: Thu Nov 3 21:09:11 2016 +0800 + + * change for sql. + +commit 23d9ea565a14780ff72577a4b2589eb3984e138c +Author: Catouse +Date: Thu Nov 3 15:26:14 2016 +0800 + + * fix doc tree view. + +commit e37a0aac7ce4b8875a8a96a13a9e6913ab5569a2 +Author: wangyidong +Date: Wed Nov 2 16:13:11 2016 +0800 + + * adjust for index and alllibs page. + +commit 599c8985e1315ee5596ff88132cae8573037610e +Author: Catouse +Date: Tue Nov 1 16:02:00 2016 +0800 + + * fix bug #893. + +commit 1fa8edbe4a662324dbaf62fca8790b2a8cce3ab2 +Author: Catouse +Date: Tue Nov 1 13:41:53 2016 +0800 + + * fix bug #927. + +commit 2f04c65633c97c4f55db087c85ee5748f2bc8c2d +Author: Catouse +Date: Tue Nov 1 13:13:00 2016 +0800 + + * adjust code format. + +commit a2004e3515186e1bea3d76eb10bed78e7c1cb9d4 +Merge: b03c589cf7 f7a8588de6 +Author: Catouse +Date: Tue Nov 1 09:00:24 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b03c589cf74f59f49d0e92afb002609b9dc6c495 +Author: Catouse +Date: Mon Oct 31 18:05:03 2016 +0800 + + * fix bug #925. + +commit f7a8588de623a97d0bad7153366dfbe9dfa09b30 +Author: wangyidong +Date: Mon Oct 31 16:11:28 2016 +0800 + + * fix bug #876. + +commit 32a7b76bd2ca815e439f76269ebf9c9dcadbe1dd +Author: wangyidong +Date: Mon Oct 31 15:56:03 2016 +0800 + + * fix bug #880. + +commit d6e2222c5d9fa3d7ccf7611f709a578be30d20f9 +Author: wangyidong +Date: Mon Oct 31 15:23:12 2016 +0800 + + * fix bug #882. + +commit 779881168061c206d7acf8b12116a9ac623ebbcc +Author: wangyidong +Date: Mon Oct 31 14:34:28 2016 +0800 + + * fix bug #883. + +commit 48dcbd963fd1dc0e662eda365b968bbc8add8688 +Author: wangyidong +Date: Mon Oct 31 14:22:15 2016 +0800 + + * fix bug #891. + +commit a3704e5c5c12eeee1a52b259347527cbaacfcccf +Author: wangyidong +Date: Mon Oct 31 14:12:03 2016 +0800 + + * fix for upgrade. + +commit c554482c3c4164e540000272734d20042df8bbd1 +Merge: a5d31cb98d 293087d952 +Author: wangyidong +Date: Mon Oct 31 14:08:08 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a5d31cb98d68e4d4376777ca4ed6fc9d64441340 +Author: wangyidong +Date: Mon Oct 31 14:06:25 2016 +0800 + + * adjust error. + +commit 293087d95214067ddeec1f067d603a937d1d9cf1 +Merge: d1dcd9904b b4a1fb4811 +Author: Catouse +Date: Mon Oct 31 13:59:38 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d1dcd9904b5b7ee980537907fb7d358bf1154fd9 +Author: Catouse +Date: Mon Oct 31 13:58:56 2016 +0800 + + * change selectable option. + +commit 389b428027dfbe367ed9b5e147c00068d3f5cea5 +Author: Catouse +Date: Mon Oct 31 13:56:52 2016 +0800 + + * update zui to version 1.5. + +commit b4a1fb4811eb9a0634e3981cdc816a3625e0f6c6 +Author: wangyidong +Date: Mon Oct 31 13:52:56 2016 +0800 + + * fix bug #873. + +commit a7307a1726002bce06e93b1b514746e24e5d54a3 +Author: wangyidong +Date: Mon Oct 31 11:54:54 2016 +0800 + + * change for db and add priv. + +commit b03c4628969e210ec6db48c3c1e38c487b3a6328 +Author: wangyidong +Date: Mon Oct 31 11:12:36 2016 +0800 + + * change for upgrade. + +commit 526896d2e66efe584348ae036618d3b0ef591884 +Author: wangyidong +Date: Mon Oct 31 11:12:07 2016 +0800 + + * fix error for pclzip. + +commit a42672984d887e1b1ad32faf39df86837b6d0c04 +Author: wangyidong +Date: Mon Oct 31 11:09:39 2016 +0800 + + * fix error. + +commit dcac5a2a99211dde43aca76a98a2c636a4618602 +Author: wangyidong +Date: Mon Oct 31 10:53:43 2016 +0800 + + * fix bug #922. + +commit 74bdbd443c372a1354ae76b8b3a06987f82c0477 +Merge: 15571aa079 006d86beba +Author: wangyidong +Date: Mon Oct 31 10:32:16 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 15571aa0796506ffcc273af60b9e5485c417ef73 +Author: wangyidong +Date: Mon Oct 31 10:27:23 2016 +0800 + + * fix bug for test. + +commit 006d86bebac60aaeebda5efda3d9d293c2c2d13d +Author: Catouse +Date: Mon Oct 31 09:57:10 2016 +0800 + + * change UI of doc/browsetree view. + +commit 1d5d0db10a2e2811b0727bc7fb9de84df250fe38 +Author: Catouse +Date: Mon Oct 31 08:52:20 2016 +0800 + + * change UI of doc/browsemenu view. + +commit 53e7179a5857ed7b88ca22d1e6b67358f7201914 +Merge: bffe521e65 9d4733dc2a +Author: Catouse +Date: Fri Oct 28 16:42:05 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bffe521e6569225e07fc5460fd7e8c34b8f69657 +Author: Catouse +Date: Fri Oct 28 16:41:55 2016 +0800 + + * improve UI of doc views. + +commit 9d4733dc2acbf7ef518a6b2138611e0bf8dc1f28 +Author: wangyidong +Date: Fri Oct 28 14:40:53 2016 +0800 + + * fix bug #872. + +commit 78a97aeb82deb713425c01f7b6b3f850f2b1b943 +Author: wangyidong +Date: Fri Oct 28 13:22:52 2016 +0800 + + * fix bug #916. + +commit 625a21684bf989255ab55d50e613538c39ed3052 +Author: wangyidong +Date: Fri Oct 28 11:16:32 2016 +0800 + + * fix bug #915. + +commit fb302d163f2f56b06903a3eb7cf8a0111d3591b7 +Author: wangyidong +Date: Fri Oct 28 10:54:20 2016 +0800 + + * fix bug #918. + +commit 5c567c48fcbedb933dc8ee0c749cc7319415d0d5 +Author: wangyidong +Date: Fri Oct 28 10:40:28 2016 +0800 + + * finish task #920. + +commit 7b53f324360eb06fffda6048f9ec4a3668853486 +Author: wangyidong +Date: Fri Oct 28 10:07:30 2016 +0800 + + * fix bug #921. + +commit f392985317b4265d76a20d5d665292c18a335967 +Author: wangyidong +Date: Fri Oct 28 09:29:44 2016 +0800 + + * code for task #2663. + +commit 94bdc950381bc1b43632d007f3ab4378d3b70b43 +Author: wangyidong +Date: Fri Oct 28 09:28:04 2016 +0800 + + * finish task #2663. + +commit 9a83ebe44a7d3bb3bec27ee52a239ac8b9b832f3 +Author: wangyidong +Date: Wed Oct 26 15:03:11 2016 +0800 + + * adjust for custom. + +commit 89bff6c91e30fb5aee93500797a38f898d7d8b60 +Merge: 0b4e00d77d 9cadd8f9d0 +Author: wangyidong +Date: Wed Oct 26 14:30:36 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0b4e00d77d1b028292e3880fbf1c2599a2b85c36 +Author: wangyidong +Date: Wed Oct 26 14:28:55 2016 +0800 + + * code for task #2672. + +commit 9cadd8f9d0fc712a5272369c7f74f68f5aa9fd21 +Author: chenfeiCF +Date: Wed Oct 26 13:55:48 2016 +0800 + + * hide open process button if cron is closed and adjust lang item for cron notice. + +commit 000addf3922b9365bb04cc7589f0bb809113a5d3 +Author: wangyidong +Date: Tue Oct 25 15:52:23 2016 +0800 + + * finish task #2671. + +commit 101ec01ae832cb00bba51abf6e7b98a812299816 +Author: wangyidong +Date: Tue Oct 25 11:52:00 2016 +0800 + + * finish task #2679. + +commit 96ccd38fd6cc86b47fc387c83b2472a2e67d1d8d +Author: wangyidong +Date: Tue Oct 25 10:16:05 2016 +0800 + + * finish task #2678. + +commit 67e27080a65f9db4256ca15084c621bedd05c8cb +Author: wangyidong +Date: Fri Oct 21 16:41:54 2016 +0800 + + * finish task #2666. + +commit 148822be3d030282879b0ec927297c724f756217 +Author: wangyidong +Date: Fri Oct 21 10:33:24 2016 +0800 + + * remove save last revision. + +commit 5a95dcb1db3058e716e4c5a11772c41050e475f6 +Author: wangyidong +Date: Fri Oct 21 10:29:12 2016 +0800 + + * change for ajax save log. + +commit 7d57150231bb8aa3c60002f9de504911180d55fb +Author: wangyidong +Date: Thu Oct 20 11:12:29 2016 +0800 + + * adjust for index page. + +commit 3bc98cb9d97e288db9138853835b496aeb09eaac +Author: wangyidong +Date: Wed Oct 19 11:20:01 2016 +0800 + + * finish task #2670. + +commit cac3f55ada17b8e1982349f71230efbf6b531ac8 +Author: wangyidong +Date: Wed Oct 19 10:26:11 2016 +0800 + + * add version in doc and add priv. + +commit 37933349d84945b09079ea0ac2220b4d0d3e6232 +Author: wangyidong +Date: Mon Oct 17 17:14:23 2016 +0800 + + * finish task #2674. + +commit 511d07099cce533194d31c556345e0cc1205df8b +Author: wangyidong +Date: Mon Oct 17 14:38:00 2016 +0800 + + * finish task #2673. + +commit f246fbeba76b89989c49967d1738815591d3581e +Author: wangyidong +Date: Fri Oct 14 15:22:41 2016 +0800 + + * finish task #2664. + +commit ab2e6d83cbeab298c89192d057ba7d7c4af2f319 +Author: wangyidong +Date: Fri Oct 14 14:31:50 2016 +0800 + + * finish task #2668. + +commit 8feda80cd9ae2bd85257aec979680f8bee0aa5a1 +Author: wangyidong +Date: Thu Oct 13 17:35:02 2016 +0800 + + * finish task #2667,2669. + +commit 4bcc1a7980f93e374e79f7c2dcda186aeac7c73f +Author: wangyidong +Date: Tue Oct 11 13:34:48 2016 +0800 + + * adjust for doc menu. + +commit bbe0412fcd9d3289c088c0f9a2128b31a61248c6 +Author: wangyidong +Date: Tue Oct 11 13:32:21 2016 +0800 + + * adjust doc module when upgrade. + +commit 85e635b0286e0fa33e53bb69ef526e28e522282d +Merge: 3dd56d8fce 8a604e4ebd +Author: wangyidong +Date: Tue Oct 11 10:02:12 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3dd56d8fce7bb5deb31532a3a4c29cb4173df250 +Author: wangyidong +Date: Tue Oct 11 10:01:24 2016 +0800 + + * fix bug and adjust dao. + +commit 8a604e4ebd098645b7215a4077b0e6e1f80f08e8 +Author: Catouse +Date: Fri Sep 30 14:50:32 2016 +0800 + + * change getDataInJSON method. + +commit 0ee05de100a152781f03c0d513d60f85435b5e79 +Author: chenfeiCF +Date: Thu Sep 29 11:41:56 2016 +0800 + + * delete useless directory. + +commit 012aace4bea8434db97e3f2257c3bceab8cfba7a +Author: Renee +Date: Thu Sep 29 11:20:33 2016 +0800 + + Create en_tf + +commit 8e30e63a1d52f0c3a07dcc47d8fbdbab842c620c +Author: wangyidong +Date: Mon Sep 19 09:19:29 2016 +0800 + + * adjust for update user for usergroup. + +commit 2e6862256f45211b64e959e05517489b150b135d +Author: wangyidong +Date: Sun Sep 18 16:12:10 2016 +0800 + + * fix bug #910. + +commit bbee66558185c5575ecdac5fa6df6974f103d0f2 (tag: zentaopms_8.2.6_20160913) +Author: wangyidong +Date: Tue Sep 13 10:26:53 2016 +0800 + + * change for upgrade. + +commit f916a2d8c1763c8ff931b6fdcb6fa97fe2b3bd0e +Merge: c4ec0828f6 b33141ff02 +Author: wangyidong +Date: Mon Sep 12 17:15:56 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c4ec0828f6541036a2cf417ed73adb2dcdd7aa38 +Author: wangyidong +Date: Mon Sep 12 17:15:19 2016 +0800 + + * fix bug #879. + +commit b33141ff022fa9deaa70927905e36d6f9ff0e8f6 +Author: chenfeiCF +Date: Mon Sep 12 16:09:20 2016 +0800 + + * fix bug #881. + +commit dc912902bd088339a993265d5b0c67cbee263840 +Author: chenfeiCF +Date: Mon Sep 12 15:41:46 2016 +0800 + + * fix bug #871. + +commit a712b2b3e4391c1f2f0ea90e6c9d93dc516b6066 +Merge: 8ca67c79d9 dfb9429eb3 +Author: wangyidong +Date: Mon Sep 12 15:13:15 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8ca67c79d971d6c5e39bb124674f31ba8bc808d6 +Author: wangyidong +Date: Mon Sep 12 15:12:39 2016 +0800 + + * fix bug #888. + +commit dfb9429eb3a4a935135eb9bb8b43d820ed2e1380 +Author: chenfeiCF +Date: Mon Sep 12 14:42:02 2016 +0800 + + * adjust notice when upload image explain. + +commit 34b76cb35817d2f096b48602ac5462c7aff7d6cd +Merge: 6a3545ee95 f9bef4922c +Author: chenfeiCF +Date: Mon Sep 12 14:29:03 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6a3545ee951cd6b12ec79f367ff4f9914c496414 +Author: chenfeiCF +Date: Mon Sep 12 14:28:27 2016 +0800 + + * fix bug #903. + +commit f9bef4922cae9e3f5395e439f2f5163a8ab8a7ab +Merge: 9a5c00cf72 6ad33fa6a8 +Author: wangyidong +Date: Mon Sep 12 14:15:32 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9a5c00cf7231e70054b459c2e97be47443d9491d +Author: wangyidong +Date: Mon Sep 12 14:14:59 2016 +0800 + + * fix bug #908. + +commit 6ad33fa6a8afef42e44f95f47cd0ae1493192856 +Author: chenfeiCF +Date: Mon Sep 12 14:08:42 2016 +0800 + + * fix bug #869. + +commit 0851f9b2743ca427f001b2ba46a5db7b540e1722 +Author: chenfeiCF +Date: Mon Sep 12 13:31:54 2016 +0800 + + * fix bug #886. + +commit 6526ecbd33e81ed67641503225babac41167b394 +Author: chenfeiCF +Date: Mon Sep 12 11:09:36 2016 +0800 + + * fix bug #887. + +commit eb3c445728fa359a629596c29713b58a095d37e8 +Author: chenfeiCF +Date: Mon Sep 12 09:57:37 2016 +0800 + + * fix bug #901. + +commit 463605f225ef1d74f10170589e08bc719a0a811e +Author: chenfeiCF +Date: Mon Sep 12 09:40:27 2016 +0800 + + * fix bug #906. + +commit e08432aaf298aaca8453865a171028f8bbc93d2c +Author: wangyidong +Date: Thu Sep 8 17:30:38 2016 +0800 + + * fix bugs. + +commit 1c0a787a1686167003cef13f4e4d43cb316a2e1f +Author: reneeteng +Date: Wed Aug 31 16:23:32 2016 +0800 + + Update README.md + +commit 82b7b354543293c53ff6b2b7620dae6818d3b0b6 +Merge: afe4d3311b fff6cd51e8 +Author: wangyidong +Date: Mon Aug 29 08:18:44 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit afe4d3311bc1ff18d3a72ca22fec6c6eacb56f7e +Author: wangyidong +Date: Mon Aug 29 08:18:05 2016 +0800 + + * revert dao.class.php. + +commit 11718672c6c5e8db816744d3f35aaf72019db00d +Author: Peter Dave Hello +Date: Tue Aug 23 02:44:05 2016 +0800 + + optimize png images using zopflipng + +commit fff6cd51e83b174b0f4feb5feea1276266e4c24d +Author: reneeteng +Date: Tue Aug 16 16:20:59 2016 +0800 + + Update README.md + +commit 3a4626f924f5865e6c467bd7f7519b284a6ca6f8 +Author: reneeteng +Date: Tue Aug 16 16:20:05 2016 +0800 + + Update README.md + +commit 9070eb40f275982bdb605d8ee5748f000d89dc01 +Author: Catouse +Date: Tue Aug 16 09:54:58 2016 +0800 + + * update chanzhi logo image. + +commit 8d075e9adf7ffe9f4f8543eafa7ad0c675e98390 +Merge: 8e78e51891 5537580d45 +Author: Catouse +Date: Mon Aug 15 15:26:52 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8e78e518917ef3bf35af88a2a3f57d8f00125f33 +Author: Catouse +Date: Mon Aug 15 15:26:44 2016 +0800 + + * change ranzhi logo image. + +commit 5537580d45ca00d7b57b745c789b47646c374246 +Author: wangyidong +Date: Fri Aug 5 15:14:49 2016 +0800 + + * adjust for product and project priv. + +commit 68e3e64a14d6590ce883764725e4daec0cde1847 (tag: zentaopms_8.2.5_20160805) +Author: wangyidong +Date: Fri Aug 5 10:55:55 2016 +0800 + + * change for new version and upgrade. + +commit 2b4b2cb10eda898dfa1f7868099b7dbbca12cfc8 (tag: zentaopms_8.2.4_20160628) +Author: wangyidong +Date: Fri Aug 5 09:47:34 2016 +0800 + + * adjust for cache dao. + +commit e622618140fad6a2c51b1527b5138105ae6ed4ca +Merge: b01a39d2cd 24651e05ed +Author: wangyidong +Date: Thu Aug 4 11:11:43 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b01a39d2cd2b95b792b3e7aa3e5b1e5819e8f1ad +Author: wangyidong +Date: Fri Jul 29 11:07:34 2016 +0800 + + * fix bug for reort story when sql with left join. + +commit 6f4bd06495fa8df7c44038399a9dc7d25308c506 +Author: wangyidong +Date: Fri Jul 29 10:59:08 2016 +0800 + + * adjust word. + +commit 97d050e78a5c80df26d690d269e011d88362fb2a +Author: wangyidong +Date: Fri Jul 29 10:58:41 2016 +0800 + + * fix bug for view task. + +commit 24651e05ed13cd2a8bcefff80cdac99556aad619 +Author: Catouse +Date: Tue Jul 19 08:54:58 2016 +0800 + + * ajax* methods support json view type. + +commit 985e18282fbdc9881d1035519327d37384858ec7 +Author: wangyidong +Date: Mon Jul 11 09:39:18 2016 +0800 + + * fix for jsonEncode4Parse in php5.3. + +commit 90f6005bc437f00c0560d2af3a9da18fa3c838b1 +Author: wangyidong +Date: Mon Jul 11 09:21:04 2016 +0800 + + * adjust for php5.2 json_encode. + +commit e0bde1d3fde209177aa6672c4277bd969acadb4a +Author: wangyidong +Date: Fri Jul 8 15:01:13 2016 +0800 + + * fix bug for import case. + +commit a2044a1f710ac040b8ec4f2863db0a357d516597 +Author: wangyidong +Date: Wed Jul 6 17:32:09 2016 +0800 + + * change error word. + +commit 5b3ee0c791e271bb413bd872b11e943030d2b266 +Author: wangyidong +Date: Wed Jul 6 16:40:05 2016 +0800 + + * adjust for story stage. + +commit dc4a90a440aad6792b12288785d9025722e9e24b +Author: wangyidong +Date: Wed Jul 6 15:55:19 2016 +0800 + + * adjust for get build. + +commit c696a41d55c9da7425ca946aaa6fb80e2d63e78c +Author: wangyidong +Date: Tue Jul 5 10:00:17 2016 +0800 + + * fix bug #866. + +commit 4a99e1748113fc2b07c693ae035d140727d1de4b +Author: chenfeiCF +Date: Wed Jun 29 13:10:27 2016 +0800 + + * fix bug for dept tree when browse dept. + +commit 6027b5ecac8d2d05c6216652050c9a7c460a9481 +Author: chenfeiCF +Date: Wed Jun 29 10:12:47 2016 +0800 + + * fix bug #863. + +commit 2aa92e808aa1b3da6d76f12b34cee7e9afb21fb5 +Author: chenfeiCF +Date: Wed Jun 29 09:22:52 2016 +0800 + + * fix bug #865. + +commit 85e422c7ac99be0e228979f112702ed8ad407f33 (tag: zentaopms_8.3.4_20160628) +Merge: 52aad5f6eb ebe6a57fff +Author: chenfeiCF +Date: Tue Jun 28 15:20:50 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 52aad5f6ebe23b0ea81ad3e69da170369073b359 +Author: chenfeiCF +Date: Tue Jun 28 15:19:49 2016 +0800 + + * keep project status if project has been suspended. + +commit ebe6a57fffae5dc8b681bb6b63793511ef1d4f90 +Author: wangyidong +Date: Tue Jun 28 15:01:49 2016 +0800 + + * add new version and upgrade. + +commit 3e402d5459cb56defca7cbc26b57a4d7205e03d0 +Author: chenfeiCF +Date: Tue Jun 28 14:17:44 2016 +0800 + + * adjust code for json_encode method to be compatible with php 5.2 and which below 5.2. + +commit 6a280b79e2239990b7160e3d648a2a5a44a70ce9 +Author: wangyidong +Date: Tue Jun 28 14:15:54 2016 +0800 + + * json encode for parseJSON. + +commit 234a3466a29eb37d043fb84dc9d2b94d01c6fb68 +Author: wangyidong +Date: Tue Jun 28 13:36:00 2016 +0800 + + * fix bug for WooYun-2016-218351. + +commit d3915c1dd027d7a3ea3c757d0183dc88c8c10150 +Author: wangyidong +Date: Tue Jun 28 13:35:29 2016 +0800 + + * fix bug for check empty object. + +commit ca7df0332e95aad0a82a9fa24b1a7ea7ddcd1273 +Author: Catouse +Date: Tue Jun 28 10:14:22 2016 +0800 + + * change flowchart UI and improve browser compatibility. + +commit bfba4d244f16f14582cf47ed38df3f922e1b793b +Author: chenfeiCF +Date: Mon Jun 27 16:19:48 2016 +0800 + + * fix bug: Can not get correct data by 'byModule' or 'byProduct' browse type when browse tasks and stories in project module. + +commit dd1d6d165605282839d3f4fe4e123dbda1823e69 +Merge: 3c245322d6 94ca57233d +Author: wangyidong +Date: Mon Jun 27 13:25:39 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3c245322d6ce5ed3eafd7c2860bade8874b0b0ab +Author: wangyidong +Date: Mon Jun 27 13:25:08 2016 +0800 + + * trim module name. + +commit 94ca57233db2fa3c3b7d9e15cab22ee0288b7169 +Author: chenfeiCF +Date: Mon Jun 27 13:10:30 2016 +0800 + + * fix a bug: Can not report bugs which have more than one openedBuild. + +commit 50561070feb5481e73c6bf5a97992a319d08386b +Author: wangyidong +Date: Mon Jun 27 11:17:40 2016 +0800 + + * adjust for json_encode. + +commit 88785d485a1c48578793a4c96b21179eff1b4b1c (tag: zentaopms_8.2.3_20160624) +Author: wangyidong +Date: Fri Jun 24 10:05:05 2016 +0800 + + * change for upgrade and zh-tw lang. + +commit 24494221719966c2e2e42f2acaed588f72c6c84e +Author: wangyidong +Date: Fri Jun 24 09:50:08 2016 +0800 + + * fix for checkOnlybodyPage. + +commit 3fff2a85046e61b9e9f64ed97185e643b08788e6 +Author: wangyidong +Date: Fri Jun 24 09:38:40 2016 +0800 + + * fix bug #862. + +commit 0654c0f34a6a3a259fcffa743694f7eaa3347c8b +Author: wangyidong +Date: Fri Jun 24 09:20:21 2016 +0800 + + * fix bug #856. + +commit 84d5e277d294ac4ddb92e749e0cd49da9d036c79 +Author: wangyidong +Date: Thu Jun 23 15:34:36 2016 +0800 + + * fix bug #861. + +commit 386650045f9ccc0073b1b28c53a4cbbcb89f0fe1 +Author: wangyidong +Date: Thu Jun 23 15:22:10 2016 +0800 + + * finish task #859. + +commit 8da5379cdaa54d696028e373ac80fd2e8c5b9358 +Author: wangyidong +Date: Thu Jun 23 14:58:24 2016 +0800 + + * fix bug #855. + +commit 6a48785d136391b60f97cd325a1fb2cc93f12ab8 +Author: wangyidong +Date: Thu Jun 23 14:34:41 2016 +0800 + + * fix bug #851. + +commit 8a2b60168f0198979d1248bdf855db02ab8fec41 +Merge: b39dfa6fcd b5eec2edbc +Author: wangyidong +Date: Thu Jun 23 14:31:25 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b39dfa6fcd7c7bb3cf52db79b8d5ecfd209e94b4 +Author: wangyidong +Date: Thu Jun 23 14:30:46 2016 +0800 + + * revert module cookie. + +commit c82bde7457b5b9287038aa5f22e06a31a9099cd3 +Author: wangyidong +Date: Thu Jun 23 14:01:00 2016 +0800 + + * fix bug #850. + +commit b5eec2edbc648c99679547cce90bbe98a2e4db7f +Merge: c2dc58d64d 3523c70c61 +Author: Catouse +Date: Thu Jun 23 13:37:33 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c2dc58d64ddfe5d3d8c1084137156b6b0a12a8dc +Author: Catouse +Date: Thu Jun 23 13:37:25 2016 +0800 + + * change story items color in kanban. + +commit 3523c70c61ef475a1aa85d5320e620bb1667b60e +Author: chenfeiCF +Date: Thu Jun 23 13:31:05 2016 +0800 + + * adjust width of todo's beginAndEnd and name. + +commit df1eaff942f6c083d2907ad0e4e0db363d94962f +Merge: f4d916adad 3c40e2d17e +Author: chenfeiCF +Date: Thu Jun 23 13:15:45 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f4d916adadd7e54d9e8d9dfc0d4e9dd438b46d89 +Author: chenfeiCF +Date: Thu Jun 23 13:11:46 2016 +0800 + + * alert users to save work record which has not been saved when they want to edit or delete the record. + +commit 3c40e2d17edf416f95bff6c29818186dec59cd2c +Merge: a4f4d19051 836b70cd86 +Author: wangyidong +Date: Wed Jun 22 17:20:17 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a4f4d190510b8b1a3b846abd81cb5afd46dcdfcc +Author: wangyidong +Date: Wed Jun 22 17:19:38 2016 +0800 + + * change onlybody to config.onlybody. + +commit 2d58ccd3c4a3480babcc64974f7325ca0d1f1542 +Author: wangyidong +Date: Wed Jun 22 17:19:17 2016 +0800 + + * adjust for export2html style. + +commit 46350a0c9657cef1f828b0e006e61683c01547af +Author: wangyidong +Date: Wed Jun 22 17:18:51 2016 +0800 + + * adjust en lang for extensio module. + +commit fb8b78303d3997c881cbe85c86695710b9c6fa04 +Author: wangyidong +Date: Wed Jun 22 17:18:20 2016 +0800 + + * fix bug #858. + +commit 836b70cd8606f9b75d1d91211720dff1b1960f9f +Author: chenfeiCF +Date: Mon Jun 20 15:14:18 2016 +0800 + + * Remind users to save the estimate record if it has not been saved before they edit or delete an estimate record. + +commit 458a055d14577729dba6e17fdb0e8034c26923ac +Author: wangyidong +Date: Wed Jun 15 13:13:11 2016 +0800 + + * adjust for kanban. + +commit 75f38e2ce947658e5d6b0d591fcc66656d853ccf +Author: wangyidong +Date: Wed Jun 15 11:08:22 2016 +0800 + + * finish task #4036 for backyard. + +commit 7f6d3b60ff17c037efec8d27a648edd02d076b01 +Author: wangyidong +Date: Mon Jun 13 16:42:48 2016 +0800 + + * fix bug #857. + +commit 3c8f0a4abf37846bc2f0a73632fd3b3367c15db6 +Author: wangyidong +Date: Mon Jun 13 14:11:03 2016 +0800 + + * adjust code for zentaopro. + +commit 88bb6e8df893a6500c58638776cf8da5782fbd2b +Author: wangyidong +Date: Sun Jun 12 15:40:53 2016 +0800 + + * code task #4053 for backyard. + +commit 9bc735b504c8da2569ec69e8e8ea9d5ed70ea216 +Author: wangyidong +Date: Sun Jun 12 13:24:31 2016 +0800 + + * set fixScroll to public. + +commit 64d95aa406e6d8847c3d817495f3a7f9a2d03588 +Merge: ac930e6a46 76b16db409 +Author: wangyidong +Date: Sun Jun 12 11:23:17 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ac930e6a4670939bb887c4946ba82703a1023caa +Author: wangyidong +Date: Sun Jun 12 11:22:27 2016 +0800 + + * finish task #4033 for backyard. + +commit 76b16db40945ea8b1a1ef59f55a2d07454596ae9 +Author: wwccss +Date: Sun Jun 12 09:21:12 2016 +0800 + + * fix the comment error. + +commit 316c6c7150bef74fe95d5671a0feb463bd90ada2 +Author: wangyidong +Date: Wed Jun 8 17:24:55 2016 +0800 + + * adjust a error word. + +commit c33166261dfb27910204d0fd91c692cc94790d6c +Author: wangyidong +Date: Wed Jun 8 11:36:52 2016 +0800 + + * fix bug 841. + +commit 932f6f9778b7d052b281c0d1b1f341a0153443b0 +Author: wangyidong +Date: Wed Jun 8 11:36:00 2016 +0800 + + * fix bug #831. + +commit 1c39368eb2ceb5ad2a99e8ea14d5a397e46946fc +Author: wangyidong +Date: Wed Jun 8 11:34:04 2016 +0800 + + * fix for sync sendcloud user with '-'. + +commit 358725a035c68f2644efec9b3a22bbc94694575e (tag: zentaopms_8.2.2_20160608) +Author: wangyidong +Date: Wed Jun 8 09:03:38 2016 +0800 + + * change for upgrade. + +commit a1268700f09c50e5861b253b646c829661211b1a +Author: wangyidong +Date: Wed Jun 8 09:00:17 2016 +0800 + + * display select button. + +commit 80aee299b906236537fbee1e5a586c8e63c9cf97 +Author: Catouse +Date: Tue Jun 7 18:07:17 2016 +0800 + + * finish task #2597. + +commit 15bb4129ac84ed2b3b6ff9557100563cba99e246 +Author: wangyidong +Date: Tue Jun 7 15:58:33 2016 +0800 + + * adjust for mergeFeatureBar. + +commit c1c114ebff91271212d6c6a79d11156bcf99afc4 +Author: wangyidong +Date: Tue Jun 7 15:57:39 2016 +0800 + + * code for task #2614. + +commit ac5624891b3f24ae7a100c3904aa933d1a45016a +Author: wangyidong +Date: Tue Jun 7 15:56:46 2016 +0800 + + * finish task #2614. + +commit 21d6f08818b892ca71066c772a63dd9817cc8f6d +Author: wangyidong +Date: Tue Jun 7 15:15:10 2016 +0800 + + * finish task #2618. + +commit 78ce4d3aeb65e672b6d5669715f5ea04ac7dbeda +Author: wangyidong +Date: Tue Jun 7 13:59:03 2016 +0800 + + * code for task #2616. + +commit b986c959e2d5a7a33ee5c9b3d2ac08557cb64fb4 +Author: wangyidong +Date: Tue Jun 7 13:47:04 2016 +0800 + + * finish task #2616. + +commit be4f6ceddaeba1fd036bf5efa19fde467486d126 +Author: wangyidong +Date: Tue Jun 7 13:21:17 2016 +0800 + + * finish task #2593. + +commit a0a9c3864fb0d6ebee12954da061c9e3f7538273 +Author: wangyidong +Date: Tue Jun 7 11:45:12 2016 +0800 + + * finish task #2613. + +commit 569d83480bea87479e688d66b4f9aa37b31b313d +Author: wangyidong +Date: Mon Jun 6 16:50:16 2016 +0800 + + * finish task 2611. + +commit 5f59630f58b4fb864676a7ec19761d558f420f6b +Merge: fd8c64e97f 1a91a58cf4 +Author: wangyidong +Date: Mon Jun 6 16:12:42 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fd8c64e97f565ff9697bc923ff0d8ee6407e8a68 +Author: wangyidong +Date: Mon Jun 6 16:12:20 2016 +0800 + + * code for task #2607. + +commit 1a91a58cf4f435c39fac5c50233811d35b74a673 +Merge: 1b5e924bb0 e5170b2a87 +Author: chenfeiCF +Date: Mon Jun 6 16:05:26 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1b5e924bb09e2b6c6ffe17185b67014ca09c7a35 +Author: chenfeiCF +Date: Mon Jun 6 16:04:00 2016 +0800 + + * merge source and source note into one line. + +commit e5170b2a87e4a46dfc4ba610c9af3a248b06df17 +Author: wangyidong +Date: Mon Jun 6 16:03:42 2016 +0800 + + * finish task #2620. + +commit 6dc2e626b7adbdce91f041eb31cc0e2cb54f7e89 +Author: wangyidong +Date: Mon Jun 6 15:55:29 2016 +0800 + + * finish task #2621. + +commit 2ca5b2b3a917f08937adaa05b44fdab5ace1014f +Merge: 978257a418 eed834ee3c +Author: wangyidong +Date: Mon Jun 6 14:25:25 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 978257a4187099a23692e9c9e5179d02ded25607 +Author: wangyidong +Date: Mon Jun 6 14:24:57 2016 +0800 + + * finish task #2617. + +commit b8c90ca68a06cad8824d446bdb671121486af34a +Author: wangyidong +Date: Mon Jun 6 14:05:48 2016 +0800 + + * finish task #2598. + +commit 94b013cdb2852e4dd7579cbe5dd2230ea5747bc5 +Author: wangyidong +Date: Mon Jun 6 14:05:06 2016 +0800 + + * finish task #2594. + +commit 8602a0584683af94315448cd1bf42044b274542c +Author: wangyidong +Date: Mon Jun 6 14:04:01 2016 +0800 + + * finish task #2595. + +commit eed834ee3c3561b6c32c7a13cd17eccf4b0a33ce +Author: chenfeiCF +Date: Mon Jun 6 11:40:47 2016 +0800 + + * add source note when create a story. + +commit f1bd329aa8f7c579e48d588e0e56d973a8e1a619 +Author: wangyidong +Date: Mon Jun 6 09:32:09 2016 +0800 + + * adjust for add task estimate when start task. + +commit 52882750dcd475e45fe9ab1f448435dca95d393d +Author: wangyidong +Date: Fri Jun 3 16:43:42 2016 +0800 + + * fix and adjust code. + +commit 1a68eb42496fafc87ef158494002da340429845a +Author: wangyidong +Date: Wed Jun 1 16:12:07 2016 +0800 + + * fix bug for merge rights. + +commit 841bf08e6e4864acee51101da6792fa8aabafbe2 +Merge: d0aa1b5157 a0a6ca9951 +Author: wangyidong +Date: Tue May 31 16:54:54 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a0a6ca9951e3e92feb8079e5903250532913829a +Author: Catouse +Date: Tue May 31 16:27:44 2016 +0800 + + * change method 'setOuterBox' in my.js. + +commit d0aa1b515753b022a63c5cef98b10cbbb7f05d4b +Author: wangyidong +Date: Tue May 31 14:26:51 2016 +0800 + + * adjust for link story. + +commit 81ba709acf7b15d0cc4268ec8efd2a5b91bad1fa +Author: wangyidong +Date: Tue May 31 14:25:59 2016 +0800 + + * fix bug for dump database. + +commit 697ed27e66efe8c09182a8d2f75353289afac1df +Merge: 7552ca07e3 05b9b0b9b4 +Author: wangyidong +Date: Tue May 31 14:09:55 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7552ca07e3b177a571eebb1afc22b10245f7ee52 +Author: wangyidong +Date: Tue May 31 14:09:06 2016 +0800 + + * adjust for show onMenuBar checkbox when search save query. + +commit cbda3adaee40e03c9498378c9657882ca58d91a6 +Author: wangyidong +Date: Tue May 31 13:52:44 2016 +0800 + + * adjust for process search sql. + +commit 05b5a5fba14272aa524987b72b52f87be38ef936 +Author: wangyidong +Date: Tue May 31 13:51:18 2016 +0800 + + * fix for custom menu. + +commit 197a4eb62fa3453b56907adcb40c15df6a69a651 +Author: wangyidong +Date: Tue May 31 13:50:28 2016 +0800 + + * set session for dashboard. + +commit 892a5920f78598f926c004cee5f182001b15cc9e +Author: wangyidong +Date: Tue May 31 13:46:50 2016 +0800 + + * fix for get sendcloud member. + +commit 05b9b0b9b4a985a71aa98ec3792cb8ce5023c91a +Author: chenfeiCF +Date: Fri May 27 09:38:45 2016 +0800 + + * update select chosen when batch creating users. + +commit 267e8f3105551106e023ad72aa59432dd3c23e80 +Author: chenfeiCF +Date: Thu May 26 15:21:39 2016 +0800 + + * update select chosen for group when creating a user. + +commit 4fecea04ce39cfaa2fda251040fb94083e997f0a +Author: chenfeiCF +Date: Thu May 26 08:55:09 2016 +0800 + + * fix bug #838. + +commit 760743962d19ac2077d97bfaf6d0db7508d861d3 +Author: wangyidong +Date: Wed May 25 08:28:47 2016 +0800 + + * revert for login. + +commit ce5106ae5aef0b4a7af7332da72f3a5ebdb395c3 (tag: zentaopms_8.2.1_20160524) +Author: wangyidong +Date: Tue May 24 15:07:28 2016 +0800 + + * change for upgrade. + +commit 74f4d67357e822db4e6349ee6a47e7d458006abc +Merge: bc3c227626 af847155bd +Author: chenfeiCF +Date: Tue May 24 14:58:26 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bc3c2276263c5a0c25eaa2de3b3a305350b4db52 +Author: chenfeiCF +Date: Tue May 24 14:57:51 2016 +0800 + + * finish task #2591. + +commit af847155bd67aa90ecfbc03eb9eaa0f748423a94 +Merge: 30903e10a7 626fc549a2 +Author: wangyidong +Date: Tue May 24 14:24:10 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + + Conflicts: + module/block/view/projectblock.html.php + +commit 30903e10a76b1e003cdb6533143b751b842a012e +Author: wangyidong +Date: Tue May 24 14:13:42 2016 +0800 + + * adjust for dao when tutorialMode. + +commit 2082aee081186d003b8bb5c1c7bace2981b29523 +Author: wangyidong +Date: Tue May 24 13:47:55 2016 +0800 + + * adjust for the width of project progess. + +commit 626fc549a2e725d0aa3b395e541f31e5084eadfe +Author: Catouse +Date: Tue May 24 13:19:22 2016 +0800 + + * remove unneed code. + +commit de490bb1c739a1b563602402099a957f16021a01 +Author: Catouse +Date: Tue May 24 13:18:55 2016 +0800 + + * ajust progress bar style in project block. + +commit a3a8209488623996d0a1d18296129d809251eeb0 +Merge: 69acd19391 2a6ec86f01 +Author: wangyidong +Date: Tue May 24 11:57:51 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 69acd193919bf3ad31e771e14f9d769847a256b5 +Author: wangyidong +Date: Tue May 24 11:56:34 2016 +0800 + + * fix bug for border when no data. + +commit 2a6ec86f01ff91078f8fd0d21b777c2f0ebe62e7 +Author: daitingting +Date: Tue May 24 10:21:01 2016 +0800 + + * Check key when integrate with ranzhi. + +commit 3b829cbc2e27510dfbdc89f176cc9976e99d29f3 +Author: wangyidong +Date: Tue May 24 09:55:06 2016 +0800 + + * finish task #2584. + +commit 40d63415ebcd9c077d2fa716a9b7493f3d189562 +Author: wangyidong +Date: Tue May 24 09:30:05 2016 +0800 + + * finish task #2585. + +commit 02794d696c1ee842e59517d9d05d969ae6baca3d +Author: wangyidong +Date: Mon May 23 16:39:54 2016 +0800 + + * adjust for dashboard when guest. + +commit 30ba80d0e08413d8583e2523518fc736213322d4 +Author: wangyidong +Date: Mon May 23 16:35:32 2016 +0800 + + * adjust for all product or project when by search. + +commit 926e6b7a323568f60b34c5d58ea921abe66b88a5 +Author: wangyidong +Date: Mon May 23 16:34:40 2016 +0800 + + * set homepage for guest. + +commit b472790d2baf85e3c1d6da4056ed0ee933c9104b +Author: wangyidong +Date: Mon May 23 16:33:53 2016 +0800 + + * fix bug for create cron. + +commit dde75c9a0e813237228aa60288d35d1554f21488 +Merge: 97c2c1b7db c4a8809761 +Author: wangyidong +Date: Mon May 23 16:31:21 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 97c2c1b7db2dbed7de9a7aa48ff1d995a25e11eb +Author: wangyidong +Date: Mon May 23 16:27:50 2016 +0800 + + * adjust for manage branch. + +commit c4a880976177aaf3ff87a96b1d29e3506d30dc3a +Author: chenfeiCF +Date: Mon May 23 16:07:01 2016 +0800 + + * adjust code format for testcase view. + +commit 0ba05bff9c9f35b1c45ca75fb6e92cb6f979f604 +Author: chenfeiCF +Date: Mon May 23 15:26:09 2016 +0800 + + * adjust code format. + +commit 58e6d9d8a341cad75e1177eabf03dbff4df04d0f +Merge: 90239c681e cd8cd0b43c +Author: daitingting +Date: Mon May 23 09:59:09 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 90239c681ee7ba3132ea6636173a0c4608d5133b +Author: daitingting +Date: Mon May 23 09:58:36 2016 +0800 + + * Get tasks and bugs together. + +commit cd8cd0b43c5931af6c42e78c897b1470e8b29cd5 +Author: wangyidong +Date: Mon May 23 09:22:03 2016 +0800 + + * fix for get cookie branch. + +commit d17beaf08ca0ebbdeb9b723d1def45b17dd0575b +Author: wangyidong +Date: Mon May 23 09:21:26 2016 +0800 + + * fix for check module unique. + +commit 16f8c282020a7e3bcd98caf8adc6f4dab8e78155 +Author: wangyidong +Date: Mon May 23 09:20:59 2016 +0800 + + * adjust power for block. + +commit aae2f9006932f39d65480a4c813451914c3527ce +Author: wangyidong +Date: Fri May 20 09:07:48 2016 +0800 + + * convert branch to int when import case. + +commit f3b764c07921ba24201f8827d516b5089088161a +Author: wangyidong +Date: Thu May 19 11:41:52 2016 +0800 + + * adjust for check custom pri and severity when create. + +commit 927d2df1f7793e31d2b34d0f659f934f4a712ef0 +Merge: 8856efb813 46f9dd07d3 +Author: wangyidong +Date: Wed May 18 16:41:34 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8856efb813b4787bafb0ed4d2f9f420f6ab04b25 +Author: wangyidong +Date: Wed May 18 16:39:57 2016 +0800 + + * fix bug for all page for project and product. + * fix bug for manage tree and dept. + +commit 46f9dd07d3c6c53731d94341a30b34d8e671a33a +Merge: 30f9e11692 29e2d4a789 +Author: daitingting +Date: Wed May 18 14:35:35 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 30f9e11692cadb762a5ae5015e4f61a38ffac854 +Author: daitingting +Date: Wed May 18 14:35:11 2016 +0800 + + * Get todo list for ranzhi. + +commit 29e2d4a78918dee7012cd9b26da057b015823e0f +Author: wangyidong +Date: Wed May 18 14:27:53 2016 +0800 + + * adjust code for task header. + +commit 610837bb80b008b2fbb72d285b5b6ebc6b01cc8a +Author: wangyidong +Date: Wed May 18 14:25:01 2016 +0800 + + * fix bug for print burn link in ops project. + +commit 02f387b8a7a8f7e05e7fdffee086437d7004d7c8 +Author: wangyidong +Date: Wed May 18 08:59:42 2016 +0800 + + * fix for mobile view. + +commit 77bbc814ce454134a4d55fb2eb7f68e7169986a0 +Author: wangyidong +Date: Tue May 17 13:47:36 2016 +0800 + + * adjust style for sendclouduser page. + +commit a64b16ca6ac823ea827a7f506734106a88c411a1 (tag: zentaopms_8.2.stable_20160517) +Author: wangyidong +Date: Tue May 17 09:41:14 2016 +0800 + + * adjust lang and add zh-tw lang. + +commit 89edd46c6c3166b55e872a156cdcfbcd17e8c3fc +Author: wangyidong +Date: Tue May 17 09:30:25 2016 +0800 + + * adjust for style. + +commit 83b5b140acbdbc3f09a2ce8d19d28caf84981bf0 +Author: wangyidong +Date: Tue May 17 08:56:53 2016 +0800 + + * fix error. + +commit 86f644cd6f2a4fc6a1f769193c88bcc55fe17a14 +Author: wangyidong +Date: Mon May 16 17:35:40 2016 +0800 + + * change for showerrornone function. + +commit ee83dfc97ad4b6690259a3b9202421eb0df18395 +Author: wangyidong +Date: Mon May 16 17:29:18 2016 +0800 + + * set homepage for index when no product or project. + +commit 0c368a460ac0237b6af0974c3de30bfbb2a7c991 +Author: wangyidong +Date: Mon May 16 17:06:39 2016 +0800 + + * remove datatable. + +commit 27c312f7b4f3d7eba5207f313431193a84dac028 +Author: wangyidong +Date: Mon May 16 15:57:48 2016 +0800 + + * fix bug for ajax delete in teatcase-browse page. + +commit cf2db607d2eab8adaaca8359cad69da7f8c5cd07 +Author: chenfeiCF +Date: Mon May 16 13:27:41 2016 +0800 + + * add story for cases datatable of testtask. + +commit 0f78e9e68cf909b7da3614718977b4edb0935c6e +Author: chenfeiCF +Date: Mon May 16 13:04:08 2016 +0800 + + * trigger modal when create or edit doc lib. + +commit 92aa5b8f7e9bb61feb10b618f9d02bd1494b2daf +Author: chenfeiCF +Date: Mon May 16 10:41:36 2016 +0800 + + * add case result and step result object for action lang item. + +commit 3b11ebfcfe1bcaa4545a903c68ae9524d85553ca +Author: chenfeiCF +Date: Mon May 16 10:02:21 2016 +0800 + + * Unset table zt_searchdict when convert. + +commit 60f16e44a61a09482ea10a060a6e509b742f42e8 +Author: chenfeiCF +Date: Mon May 16 09:05:57 2016 +0800 + + * fix bug: set homepage button disappeared. + +commit d7fdb1b2c6f1ef7ddf1bf339934a2be5794f8bb3 +Author: Catouse +Date: Fri May 13 17:29:23 2016 +0800 + + * fix table header color on fixed in dashboard panels. + +commit 9a6aa2d4d4ddf56ebfa7d653d87ef1eb06ff197d +Author: Catouse +Date: Fri May 13 17:24:34 2016 +0800 + + * update zui: fix error in colorPicker on update color to other elements. + +commit 0841c2933668d8e59b9a157ca3a58fe7c2416262 +Author: wangyidong +Date: Fri May 13 16:16:01 2016 +0800 + + * adjust for import task. + +commit 5331afa0baa1e8cefc57689cad933dabe5275a0b +Author: chenfeiCF +Date: Fri May 13 10:31:38 2016 +0800 + + * user module does not have featurebar so it is no use showing search tag on bar menu. + +commit dcd0285cf1fd68774be15d481ebe49b1c1d024ec +Author: chenfeiCF +Date: Fri May 13 09:55:01 2016 +0800 + + * hide the create block icon use another one if there is no block. + +commit a193e356ee6d94191390be6e02664910930c4cb0 +Author: chenfeiCF +Date: Thu May 12 14:46:00 2016 +0800 + + * fix bug: input account into mail box automatically when edit user. + +commit 2a86cdcf289982795c31037e5add791830f88be6 +Author: chenfeiCF +Date: Thu May 12 14:24:15 2016 +0800 + + * fix bug: Can't save user groups if change user account when edit user. + +commit 13265518d6bc1b57bfefcf44f7b4df9b78bedb59 +Author: wangyidong +Date: Wed May 11 13:39:15 2016 +0800 + + * change for upgrade and zh-tw lang. + +commit 0cabcabd54f2f6bdc4d7057d094e6ca89faf5987 +Author: wangyidong +Date: Wed May 11 13:18:32 2016 +0800 + + * fix bug #834. + +commit 4d78e3c1ddd7c6fc4105ca0703ace51952e48596 +Merge: 830068486a 58d0dea320 +Author: wangyidong +Date: Wed May 11 11:06:32 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 830068486a1a9a8a0baea563431b9417da70b661 +Author: wangyidong +Date: Wed May 11 11:06:11 2016 +0800 + + * adjust for set homepage. + +commit 58d0dea32057b68a20cf27ac1bb3f937b53f007e +Merge: 023435d67e 634b7bbae7 +Author: Catouse +Date: Wed May 11 10:02:33 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 023435d67e110627739660926bcf40265d0d7a1f +Author: Catouse +Date: Wed May 11 10:02:20 2016 +0800 + + * improve UI of dashboard. + +commit 634b7bbae73d33dd84dec7736f4abf1fe22eacbe +Author: chenfeiCF +Date: Wed May 11 09:43:34 2016 +0800 + + * fix bug: Can not change build branch into all branch when edit build. + +commit 9d2921c79bc2d3a0d6818058065716631eb16595 +Author: chenfeiCF +Date: Wed May 11 09:38:30 2016 +0800 + + * fix style for actions of table thead. + +commit dc10ecdc6d35cd4fb33453575f455d00e4291bdb +Merge: df55e68c97 af025409aa +Author: wangyidong +Date: Wed May 11 09:26:39 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit df55e68c97e88058e5cc281d07f461c415eb7c5a +Author: wangyidong +Date: Wed May 11 09:26:03 2016 +0800 + + * default block name when add block. + +commit af025409aa618c531de582fde3f1a85700072e66 +Author: chenfeiCF +Date: Tue May 10 16:28:25 2016 +0800 + + * filter project children modules in product tree when manage project modules. + +commit ae532c0134e92889cad977fddd6a8214e6096856 +Author: wangyidong +Date: Tue May 10 16:03:11 2016 +0800 + + * adjust for save branch cookie. + +commit ae29d8e1a253e5c07bb777f9969590d480867d37 +Merge: a319e31401 824f7cb2ce +Author: wangyidong +Date: Tue May 10 11:18:37 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a319e31401edb08690adbf6a824722a3d9ec4e67 +Author: wangyidong +Date: Tue May 10 11:17:25 2016 +0800 + + * add notice in tutorial. + +commit 824f7cb2ce1ba349ff3c942363f9b096bcc08127 +Author: chenfeiCF +Date: Tue May 10 11:15:53 2016 +0800 + + * add color tag when batch create bug, task and testcase. + +commit a72f1f8fd45554805a0fe18e5dfa43abf5b985ed +Author: wangyidong +Date: Tue May 10 10:34:50 2016 +0800 + + * fix bug for custom menu. + +commit 9a9796a02733032258265a17eb70c299b7b47497 +Merge: 37d80b6d9f d884dc22a7 +Author: Catouse +Date: Tue May 10 10:04:19 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 37d80b6d9fd997e0c6a28273b751b10a535e7587 +Author: Catouse +Date: Tue May 10 10:04:12 2016 +0800 + + * fix UI of tree/browse. + +commit d884dc22a7a54c811008aba07160ec94912a9f9f +Author: chenfeiCF +Date: Mon May 9 23:03:46 2016 +0800 + + * add color tag when batch create stories. + +commit 83e1ebbb0dea3be65f40366357a62efaef9b5f2a +Author: chenfeiCF +Date: Mon May 9 16:53:54 2016 +0800 + + * add branch label class. + +commit b4d17d4d8dc643c8c56a9c635ccc6edc4ba86b13 +Author: Catouse +Date: Mon May 9 16:44:54 2016 +0800 + + * fix tree admin UI. + +commit 3019f1dfa0c2b6af0b17417f8d7d755144bb1a00 +Author: chenfeiCF +Date: Mon May 9 15:00:35 2016 +0800 + + * can edit color tag when batch edit stories, bugs, tasks or cases. + +commit 0b9b928ea203c7775ea9dbfd893b913207879306 +Author: chenfeiCF +Date: Mon May 9 13:03:40 2016 +0800 + + * change branch label class to distinguish branch from module. + * add title for branch and module label. + +commit d10578b1754f3548671636274d2612234ecb273c +Author: chenfeiCF +Date: Mon May 9 10:04:23 2016 +0800 + + * fix bug: Remind to update bug's stauts when task from bug is finished, bug it still reminds to update task's staus when updating bug's status even through task has finished. + +commit a49f04c976dbc743f22b7d7b72e7d4a81eae9236 +Merge: 3e7412ec75 e5951dc1e7 +Author: wangyidong +Date: Fri May 6 14:00:09 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3e7412ec75636d3208c4bb78b77126806a514d98 +Author: wangyidong +Date: Fri May 6 13:59:37 2016 +0800 + + * adjust for block and fix bug. + +commit e5951dc1e7e3ee63b198f0aa87b4f26df12f6e6c +Merge: ed89cac0df 342b1b02c8 +Author: Catouse +Date: Fri May 6 11:20:47 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ed89cac0df69dad62d92f63bc68f89793e2004d4 +Author: Catouse +Date: Fri May 6 11:20:31 2016 +0800 + + * fix table cell colos. + +commit 342b1b02c84b49aeefddc8be01e8babd325083b1 +Author: chenfeiCF +Date: Fri May 6 10:23:12 2016 +0800 + + * fix date format when creating test task. + +commit 3749945b864b2f67d14d870c7280854884119b80 +Merge: bc23fac50a 359f9fb786 +Author: Catouse +Date: Fri May 6 10:20:55 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bc23fac50a62d4c4d528cc206fe0593f35a15552 +Author: Catouse +Date: Fri May 6 10:20:45 2016 +0800 + + * refactor checkTable method, make table selectable after update with ajax. + +commit 8f2bb27c587ba07ea86a8dc53780d56c22238ef2 +Author: Catouse +Date: Fri May 6 10:20:09 2016 +0800 + + * remove console.log. + +commit a2b78158286cc447d8e36c5b104adcaf9f0946b1 +Author: Catouse +Date: Fri May 6 10:19:17 2016 +0800 + + * ajust style of dashboard. + +commit 359f9fb786b6d21a46b76f4753ac3a1f263b87e3 +Author: chenfeiCF +Date: Thu May 5 17:08:58 2016 +0800 + + * revert lang item which has been deleted in bug module. + +commit 6b923a1ca7ffc8f9990d3cb19fd3f58d0c65e6f6 +Author: chenfeiCF +Date: Thu May 5 16:45:41 2016 +0800 + + * set story stage when creating story. + +commit f6b67867893c9a6dcab5254be81ee805626fee85 +Merge: c4347f536b 6a7703df03 +Author: wangyidong +Date: Thu May 5 16:31:44 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c4347f536bc79f84d48f0abb41f4c2528dd8adae +Author: wangyidong +Date: Thu May 5 16:30:32 2016 +0800 + + * fix bug for sort in branch. + +commit 6a7703df034bd17b244e0c3966503c8d743d353b +Merge: b18f2f1f36 8f945abc41 +Author: Catouse +Date: Thu May 5 16:07:45 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b18f2f1f36f35b1de4536ca99840414f96e3ff33 +Author: Catouse +Date: Thu May 5 16:07:28 2016 +0800 + + * fix table border missing in firefox. + +commit 8f945abc411e288c1443b71bd99c5aef1468c9bb +Author: wangyidong +Date: Thu May 5 15:38:10 2016 +0800 + + * fix bug for datatable custom field. + +commit 6363622f2781930c0c230ebc028dfd8de68ed9a5 +Author: wangyidong +Date: Thu May 5 13:42:58 2016 +0800 + + * mark search query when custom menu. + +commit ee5b49167992b6f12d21555bcef03bc78f5e8730 (tag: zentaopms_8.2.beta_20160504) +Author: wangyidong +Date: Wed May 4 17:28:11 2016 +0800 + + * fix bug in install and change VERSION. + +commit f65262b09483dfb9f83242e17959ad8b37ff7f91 +Author: wangyidong +Date: Wed May 4 17:19:59 2016 +0800 + + * change for zh-tw and en lang. + +commit 81189415190aab159b68e9bcd5b4136770c5c02d +Merge: 48aa11d4e5 ec94618e15 +Author: wangyidong +Date: Wed May 4 17:13:31 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 48aa11d4e515d773c598f030544bc87302f99231 +Author: wangyidong +Date: Wed May 4 17:13:09 2016 +0800 + + * change for upgrade. + +commit ec94618e151d0aa923649afea5a212fe52b7e450 +Merge: bdf751f490 b2651517b9 +Author: chenfeiCF +Date: Wed May 4 16:57:20 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bdf751f490beedad8988adc23ad8d9f6c2b52adf +Author: chenfeiCF +Date: Wed May 4 16:55:57 2016 +0800 + + * fix bug #830: Long life bugs here are unclosed bugs. + +commit b2651517b928b688542e6e564e7e3b69101e46ca +Merge: 76830e1176 1c77e77627 +Author: Catouse +Date: Wed May 4 16:51:00 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 76830e11761c840f0f8fc33896c88411edc497af +Author: Catouse +Date: Wed May 4 16:48:57 2016 +0800 + + * change style of project/managemembers. + +commit 3bee3c79b31945bf200b43a395b7b56239cb2c7f +Merge: 1fd086dad9 bd145bfe4e +Author: Catouse +Date: Wed May 4 16:46:24 2016 +0800 + + Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms + +commit 1fd086dad9a6bcfe71d8c3bd7b6316a3c2089e2f +Author: Catouse +Date: Wed May 4 16:46:14 2016 +0800 + + * fix style of project/managemembers for ie. + +commit 76132616025de2a50cef538e453597bb7b64bc9d +Author: Catouse +Date: Wed May 4 16:45:57 2016 +0800 + + * change lang setting. + +commit 1c77e776271e8ac9b6d71258f178eab3416e503f +Author: chenfeiCF +Date: Wed May 4 16:45:43 2016 +0800 + + * fix bug #830. + +commit bd145bfe4e767411744b6a05830e7d1594b9d01a +Author: chenfeiCF +Date: Wed May 4 16:24:09 2016 +0800 + + * adjust code for uploading file when run case. + +commit c7408769917527b3f9d30b855df619abc778f5f7 +Merge: 265b6adf9d 3c615c4116 +Author: Catouse +Date: Wed May 4 15:40:34 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 265b6adf9daf0b3c663e246e289361965d988d44 +Author: Catouse +Date: Wed May 4 15:40:26 2016 +0800 + + * add new task 'manage team members' to the tutorial. + +commit 3c615c41163f2722bb37fc0a1780f1653a9b4189 +Merge: 5d70ec7e35 747bc3b06a +Author: wangyidong +Date: Wed May 4 15:00:31 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5d70ec7e35d81234ddd11d6cd2eca7643a82fece +Author: wangyidong +Date: Wed May 4 14:59:39 2016 +0800 + + adjust code. + +commit 747bc3b06ae25888343f2cfd74be5967b90ff19d +Author: chenfeiCF +Date: Wed May 4 14:43:59 2016 +0800 + + * fix style for tutorial module. + +commit ce1a9b27324309930f3fc2e9ac4d5a3eaaed24d4 +Author: Catouse +Date: Wed May 4 14:28:56 2016 +0800 + + * ajust style of module labels. + +commit a9e4e1d8a11ed02ff4cb8fa45156cc990310e313 +Author: Catouse +Date: Wed May 4 13:53:52 2016 +0800 + + * remove console.log. + +commit d27aa31723a6e5534f84250a66aea042721aca61 +Author: Catouse +Date: Wed May 4 11:54:38 2016 +0800 + + * change UI of project/tree. + +commit 4c5c25ee282785c942dea260c437db206b171366 +Merge: c42ca921b2 9880310b62 +Author: Catouse +Date: Wed May 4 11:30:05 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c42ca921b24bf86bbef3d3bb8530d787c632bee0 +Author: Catouse +Date: Wed May 4 11:29:56 2016 +0800 + + * change style of module labels. + +commit 9880310b62843b20dc41d07d74fac11c348a9574 +Author: chenfeiCF +Date: Wed May 4 11:13:22 2016 +0800 + + * change the width of input box of contact list name. + +commit 3154ef97f2a70d28f4c8e37bbb6e99510b25c0d8 +Author: Catouse +Date: Wed May 4 10:34:51 2016 +0800 + + * improve dashboard UI. + +commit 6ba5b60e09e8800ee273c5a56ce2912282cfea24 +Author: Catouse +Date: Wed May 4 10:25:37 2016 +0800 + + * refactor code. + +commit 9abc3ed6bef45718477f2b06e31011984638e05b +Merge: 482826a818 9e9c71a054 +Author: Catouse +Date: Wed May 4 10:00:33 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 482826a8184f44763de85066a731a25aa66e98a6 +Author: Catouse +Date: Wed May 4 10:00:26 2016 +0800 + + * fix UI of tutorial mode for IE browsers. + +commit 8eea428911a53e413b840f03193094bf80ded9c9 +Author: Catouse +Date: Wed May 4 10:00:02 2016 +0800 + + * update zui. + +commit afdb3886f24ce09d35564b5970b702e6f40baed8 +Author: Catouse +Date: Wed May 4 09:59:54 2016 +0800 + + * wrap js code as jquery ready callback. + +commit 9e9c71a0549f9694fde3a6733b8311fd299ca653 +Author: chenfeiCF +Date: Wed May 4 08:39:38 2016 +0800 + + * adjust code for manageContacts method. + +commit 4604a3c36833b9d7ccf5b4425d189c498f460de6 +Merge: b1246cb458 0a749292bc +Author: wangyidong +Date: Tue May 3 17:34:24 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b1246cb458d15eeb4bbbde42a2d26d4830fba431 +Author: wangyidong +Date: Tue May 3 17:33:32 2016 +0800 + + * adjust for combinatorial search. + +commit 0a749292bcd43a7f438c9e63a71ad5be1cb94180 +Merge: 43bbeab578 a512350363 +Author: Catouse +Date: Tue May 3 17:22:40 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 43bbeab578bdab5a1c3c7bb9c1d6c16f5fa2c9e0 +Author: Catouse +Date: Tue May 3 17:21:26 2016 +0800 + + * update zui. + +commit a512350363b3a3857da5f2564e746193df6a5a89 +Author: wangyidong +Date: Tue May 3 17:13:11 2016 +0800 + + * adjust code. + +commit 5ffc37fefeb2cbdb321acf5c253eab230319ac9f +Merge: 553963a627 6d2e09397a +Author: wangyidong +Date: Tue May 3 11:19:56 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 553963a627e000d31df0de6e6f31b74c8912d6e7 +Author: wangyidong +Date: Tue May 3 11:18:49 2016 +0800 + + * remove useless file and adjust export template. + +commit 6d2e09397a508a18b8fd7f7e47a6f3b01e26382f +Author: Catouse +Date: Tue May 3 11:10:07 2016 +0800 + + * closeModel after submit 'my/managecontacts' form. + +commit e7776d39559a2b62c7c9d26686305d9375d9132a +Merge: 1289702d41 9dd48a815e +Author: Catouse +Date: Tue May 3 10:33:22 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1289702d4166c68b4b8164a855d9dd0ae2adcfa7 +Author: Catouse +Date: Tue May 3 10:28:04 2016 +0800 + + * change UI of 'project/manageMembers'. + +commit 9dd48a815e1ea488754c4000d061b7a04f58d036 +Author: wangyidong +Date: Tue May 3 10:10:51 2016 +0800 + + * adjust code. + +commit 2ea55f54f50145983dce71d8d7118e12840e37f6 +Author: chenfeiCF +Date: Mon May 2 21:04:51 2016 +0800 + + * adjust code for task #2543. + +commit 17de99d55eae92ff71efc1d4a02a3b7132dd3e69 +Author: chenfeiCF +Date: Mon May 2 12:14:04 2016 +0800 + + * add custom for batch edit todo. + +commit efd4c1c14cd66ae994a9731d384adf1b53a1bdbf +Author: chenfeiCF +Date: Mon May 2 11:51:21 2016 +0800 + + * adjust code for batch create and edit mothod. + +commit ae1bea822c1d21f7c5be8ac8c097fd478b39e963 +Author: chenfeiCF +Date: Fri Apr 29 17:02:17 2016 +0800 + + * add comments for common.js + +commit 1f25dce2cdeefb60dde50829f89b708057384e59 +Author: chenfeiCF +Date: Fri Apr 29 16:54:35 2016 +0800 + + * adjust lang item position for bug, task, testcase module. + +commit c70145b4ccecdc023be66057917fd39b66ccd236 +Author: chenfeiCF +Date: Fri Apr 29 16:20:28 2016 +0800 + + * fix bug: hide closedReason if it is customed to hide. + +commit f9386dbfde47c84e9da2eeaa699fa58728a5f4a3 +Author: chenfeiCF +Date: Fri Apr 29 16:08:33 2016 +0800 + + * change hasFields into visibleFields. + +commit cc5e08bf566a9cd6c853489fad5b5bf4ad317ca8 +Author: wangyidong +Date: Fri Apr 29 16:06:43 2016 +0800 + + - remove useless lang. + +commit 150de50d7f6faf7e2bd33fb3fdae0cd114e7f577 +Merge: b0db3d1128 12e7c14a71 +Author: wangyidong +Date: Fri Apr 29 16:05:54 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b0db3d112834590914f1cdde204c2f8bcb2f1921 +Author: wangyidong +Date: Fri Apr 29 16:04:36 2016 +0800 + + * adjust for overflow auto when fields too more. + +commit 12e7c14a71327bb0b274e0d1ac41e84f294b8e4a +Merge: cc2a7e60c0 ef94ddb284 +Author: chenfeiCF +Date: Fri Apr 29 15:45:42 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cc2a7e60c0cb1eb91ceb0fe45f220092d7785e98 +Author: chenfeiCF +Date: Fri Apr 29 15:45:01 2016 +0800 + + * change moduleIds into moduleIdList. + +commit ef94ddb2844acbf64e81c4c2fc0cdec3e871425a +Merge: 5c6f2c0b43 fa2cadf195 +Author: wangyidong +Date: Fri Apr 29 15:44:25 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5c6f2c0b4346f952bb3b3573315b61d3ae06d91b +Author: wangyidong +Date: Fri Apr 29 15:44:06 2016 +0800 + + * adjust for custom field. + +commit fa2cadf1958d1e823f1c1340d133d2f2768e517f +Merge: 38dbf6e28a 746774ee72 +Author: chenfeiCF +Date: Fri Apr 29 15:30:57 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 38dbf6e28a22cc2bbbef006da951054c1262b7ad +Author: chenfeiCF +Date: Fri Apr 29 15:23:15 2016 +0800 + + * change name and adjust code format for custom fields. + +commit 746774ee7214be51231c6507cec5b04826446c53 +Author: wangyidong +Date: Fri Apr 29 15:08:32 2016 +0800 + + * adjust code. + +commit d05b006311820ac8b7863783ca7a07210c9f4758 +Author: wangyidong +Date: Fri Apr 29 14:58:39 2016 +0800 + + * adjust for delete template. + +commit c87a695eadc24eec73e6060f58be97f5bf761463 +Merge: c53e78728d 6f1d2def6f +Author: wangyidong +Date: Fri Apr 29 14:46:34 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c53e78728d8699311109d64fc5c6095f43c3f3e1 +Author: wangyidong +Date: Fri Apr 29 14:46:03 2016 +0800 + + * revert project-task and adjust grouptask page. + +commit 6f1d2def6f4864382b4c1c50067a23a9d7fed997 +Author: Catouse +Date: Fri Apr 29 14:39:41 2016 +0800 + + * change 'my/managecontacts' UI. + +commit b556ffe47d63d0239e46195c887aae796607a181 +Author: wangyidong +Date: Fri Apr 29 14:37:58 2016 +0800 + + * adjust for dept and tree browse. + +commit c0fab02d5dea80271287d595e75bbe107d114ac0 +Merge: 26050b1215 0fc6a0da81 +Author: Catouse +Date: Fri Apr 29 14:15:47 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 26050b1215e0407b8846d57f5f7da4fe2452b13c +Author: Catouse +Date: Fri Apr 29 14:15:39 2016 +0800 + + * change tree browse UI. + +commit 0fc6a0da81cc6a73898443f70f281d0976211958 +Author: chenfeiCF +Date: Fri Apr 29 13:48:05 2016 +0800 + + * rm suitEndDate method and adjust code format. + +commit 152b81d3e9642cc52581ec1868bf2b6b84cc4e9f +Merge: 2b5a458350 8f5a147d81 +Author: wangyidong +Date: Fri Apr 29 13:46:29 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2b5a4583504e3d9d585be32816fa1e495fe34440 +Author: wangyidong +Date: Fri Apr 29 13:45:28 2016 +0800 + + * adjust showmodule link position and fix error. + +commit 8f5a147d81602c874949b92844c8775079cecc85 +Author: chenfeiCF +Date: Fri Apr 29 13:38:04 2016 +0800 + + * adjust code format. + +commit 66d2f40056ca2e30b26e41be9c17e854650a964b +Author: chenfeiCF +Date: Fri Apr 29 13:22:37 2016 +0800 + + * adjust code for managecontacts method. + * add buildcontactlists method which is fetched in story, bug, task and testtask create method. + +commit dd039abb6ff038fea928250ba02d40d87bba5315 +Author: wangyidong +Date: Fri Apr 29 11:05:15 2016 +0800 + + * adjust for set homepage. + +commit 8ba883511f1c8be301c7f06477e9a3eecd55acea +Merge: 10c0c19c8f e79539c5de +Author: wangyidong +Date: Fri Apr 29 10:30:22 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 10c0c19c8f14d06a5bccce8075b6d454d0c91594 +Author: wangyidong +Date: Fri Apr 29 10:29:20 2016 +0800 + + * change for block. + +commit e79539c5deed44497bf69dd746cff834696d8d13 +Merge: 40831717f1 9184d4757e +Author: Catouse +Date: Fri Apr 29 10:13:54 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 40831717f18327673a1f84db7430cb1de7ad30d1 +Author: Catouse +Date: Fri Apr 29 10:13:46 2016 +0800 + + * refactor code for tutorial mode. + +commit 9184d4757e15ac872131d195895649c93f6cde95 +Author: chenfeiCF +Date: Fri Apr 29 09:57:58 2016 +0800 + + * change array param into 2 string params for file module and adjust related code in testtask module. + +commit 5e8d1e160f2b536cf15a5dc8595f0fd8a91fd316 +Merge: 80f3d591c0 5ea4367ac6 +Author: Catouse +Date: Fri Apr 29 09:40:45 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 80f3d591c0e8e45257e19682b6fa602b1b574875 +Author: Catouse +Date: Fri Apr 29 09:40:38 2016 +0800 + + * refactor code. + +commit 5ea4367ac60c07a5d5c1e6d047a90a8f789c7578 +Author: chenfeiCF +Date: Fri Apr 29 08:43:42 2016 +0800 + + * change showOs into showOS for bug create view. + +commit 263023fe3c8ab7884e5069f099c1eb804220f530 +Author: chenfeiCF +Date: Fri Apr 29 08:40:59 2016 +0800 + + * adjust lang item for 'index' of product, project and qa module. + +commit ac19e849159d0262349948ba17435a9cf51bfc8c +Author: chenfeiCF +Date: Thu Apr 28 17:42:18 2016 +0800 + + * rm createPrjManageMemberLink method and adjust getDeptUserPairs method. + +commit 2816e2fa5136067bf3db4214273be7a4cddd6512 +Author: wangyidong +Date: Thu Apr 28 17:35:33 2016 +0800 + + * adjust for module menu. + +commit 6d8d2c6565295c44305ac32963784a6c00e0f3f6 +Author: wangyidong +Date: Thu Apr 28 17:34:02 2016 +0800 + + * remove useless function. + +commit 55ca035860d400e906f396f81c8b70b2e81fa44b +Author: wangyidong +Date: Thu Apr 28 17:29:44 2016 +0800 + + * add more block for ranzhi. + +commit 2080da90ee0c24e6433f0d4b3a4b01d8351b83ac +Author: Catouse +Date: Thu Apr 28 16:30:46 2016 +0800 + + * change feature model UI. + +commit fc6b25df8f408334d54f684d0dc3190c0d2636d3 +Author: Catouse +Date: Thu Apr 28 15:50:42 2016 +0800 + + * fix code for tutorial mode. + +commit b7c1125b30008a008cdaec51d50043ac2436b97c +Author: Catouse +Date: Thu Apr 28 15:17:30 2016 +0800 + + * ajust code. + +commit 9a0bf1da6ac4c826167c7398960ef4f4cffa0611 +Author: Catouse +Date: Thu Apr 28 15:17:20 2016 +0800 + + * change grouptask UI. + +commit 9c707c4b89b3c0f3d5c3904b076a43b93fc79e59 +Author: Catouse +Date: Thu Apr 28 15:17:00 2016 +0800 + + * fix project/tree view UI. + +commit bc9bf450926268ed5f9f43bc3de265b3d873d2f2 +Author: Catouse +Date: Thu Apr 28 15:16:45 2016 +0800 + + * fix status style definitions in default theme. + +commit b6e1e16cd86cae3be4fd9a63c6825ce7ef7176b1 +Author: Catouse +Date: Thu Apr 28 14:08:50 2016 +0800 + + * change feature menu UI of project/task. + +commit f4525e9554eea08768f05881275ca2738291555b +Author: Catouse +Date: Thu Apr 28 14:06:29 2016 +0800 + + * change feature menu UI of project/task. + +commit fb0a1d49b6f29042df8725f5aaaa5df8986fb587 +Author: Catouse +Date: Thu Apr 28 13:46:32 2016 +0800 + + * fix model title missing. + +commit b1d66bcf3e873501c4ad33dbd254aa1fcf222edd +Author: Catouse +Date: Thu Apr 28 13:36:47 2016 +0800 + + * change style of module admin view. + +commit 5bdf5fb13783db46abdd263f44879f8dace6e81d +Author: Catouse +Date: Thu Apr 28 13:31:24 2016 +0800 + + * update zui. + +commit 4b23bfabeeec9276aa8b2a97ffafb1d34d04baa1 +Author: Catouse +Date: Thu Apr 28 13:31:16 2016 +0800 + + * change project tree view UI. + +commit 26c54d376e91f7bdf1273e121720bf5846d4f282 +Author: Catouse +Date: Thu Apr 28 12:05:05 2016 +0800 + + * change project tree view UI. + +commit c38da5160f18773f777e48334cfb9c0dfdfae7ab +Author: Catouse +Date: Thu Apr 28 10:33:14 2016 +0800 + + * fix dropdown menu not work in data table pager. + +commit 367fab7ed051ff7881bbb4abdc3497f6878f72e2 +Author: Catouse +Date: Thu Apr 28 10:29:31 2016 +0800 + + * fix style conflict in my/todo. + +commit 37014d90857e0dd27930a757f33b14007a503cec +Author: Catouse +Date: Thu Apr 28 10:22:12 2016 +0800 + + * revert default theme. + +commit f211bc0abb7705520dd7f15fc0f3c7a4699fb238 +Merge: fc72b8e4c7 badd47cb6a +Author: Catouse +Date: Thu Apr 28 10:11:31 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit badd47cb6aca0fd05fe3e054dd437869d986aca7 +Merge: 4dba7d5de0 dcead9593f +Author: wangyidong +Date: Thu Apr 28 10:11:08 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fc72b8e4c794d592ce0ae8d0e9c45b2556df8283 +Merge: 2f535bf4cf dcead9593f +Author: Catouse +Date: Thu Apr 28 10:11:05 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2f535bf4cf5b57cb265dfd804211d7a8e64f33a4 +Author: Catouse +Date: Thu Apr 28 10:10:58 2016 +0800 + + * change dashboard UI. + +commit a3076feab0a9bfebdd3af78dfe82fb892bd4f3ed +Author: Catouse +Date: Thu Apr 28 10:10:43 2016 +0800 + + * change default theme. + +commit 4dba7d5de044f6634366416b5b6746e5b820c291 +Author: wangyidong +Date: Thu Apr 28 10:10:42 2016 +0800 + + * fix bug. + +commit dcead9593f1fa928eca2e770272d83e0dec1619e +Author: chenfeiCF +Date: Thu Apr 28 09:13:28 2016 +0800 + + * adjust code for task #2577. + +commit a95d623dec0b1d52f8799704753755fdf4089421 +Author: wangyidong +Date: Thu Apr 28 08:38:45 2016 +0800 + + * fix bug for show dashboard first. + +commit d01ba354a2efd64de1132035651b8da2eed2f2d2 +Merge: 64ba2bc34f 65a591a8f4 +Author: wangyidong +Date: Wed Apr 27 17:32:44 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 64ba2bc34fb295f7c5307776d80037c33b8b352e +Author: wangyidong +Date: Wed Apr 27 17:32:00 2016 +0800 + + * adjust for block. + +commit 65a591a8f4797ff4a6e553fb600731c5b4b64f38 +Merge: 8a847af41d 2f794905bf +Author: Catouse +Date: Wed Apr 27 17:13:49 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8a847af41da575d89b024dae28551009aad9c89f +Author: Catouse +Date: Wed Apr 27 17:13:41 2016 +0800 + + * add new style for tooltip to theme. + +commit 6b2375b028418ee771d3c2fbaed41fe5c0d84c14 +Author: Catouse +Date: Wed Apr 27 17:13:19 2016 +0800 + + * change menu UI. + +commit 5707226b82b1aed98d4356a2a896f33eb3618656 +Author: Catouse +Date: Wed Apr 27 17:13:03 2016 +0800 + + * change tutorial UI. + +commit 2f794905bf22654d5a1e62e5aee63afe7c2a16a8 +Merge: ef016ae98a 281173aefe +Author: wangyidong +Date: Wed Apr 27 16:56:06 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ef016ae98adb2de1477250305adff96f6f689fc2 +Author: wangyidong +Date: Wed Apr 27 16:55:33 2016 +0800 + + * change for md5 password. + +commit 281173aefef872881a86e0a8d0f2e242bc9bf022 +Author: Catouse +Date: Wed Apr 27 16:32:03 2016 +0800 + + * fix UI of tree edit view. + +commit c281641e651097c138da1f4b600bb7aeb608fb06 +Author: Catouse +Date: Wed Apr 27 16:13:42 2016 +0800 + + * fix tree does not preserve state by update zui. + +commit cda90d1adbed67f9561d73d01b292fab55c774d1 +Author: Catouse +Date: Wed Apr 27 15:45:16 2016 +0800 + + * update zui: remove carousel from zui. + +commit 24250ce32252992ff4f2bae5a3728b40ad128700 +Author: Catouse +Date: Wed Apr 27 15:43:57 2016 +0800 + + * fix bug #761. + +commit 7c95170c7d5687a73f138cd36644c5daa4c37733 +Author: Catouse +Date: Wed Apr 27 15:07:30 2016 +0800 + + * fix style of table in report charts. + +commit 2e186dae37c2989d320adc78aa7727e3350ea963 +Author: Catouse +Date: Wed Apr 27 15:03:01 2016 +0800 + + * improve selectable UI and fix bug #715. + +commit 763aeda1cd7b385355c82b0b43fab1769af167ce +Author: Catouse +Date: Wed Apr 27 14:51:19 2016 +0800 + + * fix style of datatable menu. + +commit b880e32ddbd5ba3722ae3f5df5c870d05808d6ce +Author: Catouse +Date: Wed Apr 27 14:50:53 2016 +0800 + + * change color of dashboard action links. + +commit 6870ce368472ed33ac11a5e41c08501cff02d081 +Author: Catouse +Date: Wed Apr 27 13:49:13 2016 +0800 + + * fix bug #824. + +commit 5ba877d7107ce2b7f2fb32cd3b74e3f58a56af15 +Author: Catouse +Date: Wed Apr 27 13:48:37 2016 +0800 + + * fix bug #826. + +commit 8ca15e50b97019bce6008fa798156669a85c0b2a +Author: Catouse +Date: Wed Apr 27 13:43:41 2016 +0800 + + * change list group style in my/managecontacts. + +commit 5a2364454a6e687e09d07bc4bb09601a7ff8e379 +Author: Catouse +Date: Wed Apr 27 11:55:40 2016 +0800 + + * change dashboard UI. + +commit 1b4639d5f9c7e2d435caa0b6266bc04fb1953ae5 +Author: Catouse +Date: Wed Apr 27 11:39:13 2016 +0800 + + * change tree UI. + +commit dfe818bd11a89c1ef6116b8124a88c482ae53588 +Merge: 3f16cc786b a974ec32d0 +Author: chenfeiCF +Date: Wed Apr 27 10:13:09 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3f16cc786b4214f9cd5eecfbf19aa267bc35d427 +Author: chenfeiCF +Date: Wed Apr 27 10:12:29 2016 +0800 + + * change code for addPriv8_2 method. + +commit a974ec32d01e2a65bfa52a74a016d82944507572 +Merge: 93001c037c 4967d2d5e5 +Author: wangyidong +Date: Wed Apr 27 09:59:52 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 93001c037c631d0d871f89107cae958506d01d31 +Author: wangyidong +Date: Wed Apr 27 09:59:23 2016 +0800 + + * add zh-tw lang and check en lang. + +commit 4967d2d5e54ad35b9d25733f8fd5183cdc37bf09 +Author: chenfeiCF +Date: Wed Apr 27 09:52:39 2016 +0800 + + * adjust code for buildexporttpl view. + +commit 54cba0a9e543f2d3123483616037062fce91e2b8 +Merge: e019ddbba3 f7063f570f +Author: wangyidong +Date: Wed Apr 27 09:27:38 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e019ddbba3f74b258fa529189844b886aac9ca63 +Author: wangyidong +Date: Wed Apr 27 09:26:58 2016 +0800 + + * add fullchart block in index page. + +commit f7063f570ff7bd02bd1dd6512b69f21a73247212 +Author: chenfeiCF +Date: Wed Apr 27 09:25:56 2016 +0800 + + * fix bug #828. + +commit 50cc2cdbf5a308a3f06007dc9064fb2cdf3e4503 +Author: wangyidong +Date: Wed Apr 27 09:11:28 2016 +0800 + + * adjust tutorial power. + +commit 4126db324d24a4ea787747e77db3071822a57091 +Author: chenfeiCF +Date: Wed Apr 27 09:03:23 2016 +0800 + + * fix bug: can not get child dept users. + +commit b66ce7411abb69f7a15a315dbc35e5444302b7e6 +Merge: b07caeefae 240b81f508 +Author: Catouse +Date: Wed Apr 27 08:59:54 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b07caeefae6a4a24661765a7109860c8aa98925c +Author: Catouse +Date: Wed Apr 27 08:59:20 2016 +0800 + + * finish task #2526, task #2525. + +commit 240b81f508dcfac9c8dd738ba44e9b8cede4a1c9 +Author: wangyidong +Date: Wed Apr 27 08:30:32 2016 +0800 + + * adjust for tutorial. + +commit 20520456b891d55447b349658497c5085947b8df +Author: Catouse +Date: Tue Apr 26 17:52:27 2016 +0800 + + * add confirm dialog to tutorial mode. + +commit df065e18edef859dff5fac024dca5125269f6214 +Merge: 12f5593d66 b13972d91c +Author: Catouse +Date: Tue Apr 26 17:12:37 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 12f5593d669756050ea08589d7def0d466351938 +Author: Catouse +Date: Tue Apr 26 17:12:28 2016 +0800 + + * improve tutorial UI. + +commit b13972d91c0f2a007b5f4b8f2ea216b29ef1cc90 +Merge: b8825a18a2 6d0d9bd80e +Author: chenfeiCF +Date: Tue Apr 26 17:10:47 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6d0d9bd80e2cf13a7a880fe280f54a5acf017393 +Author: wangyidong +Date: Tue Apr 26 17:07:39 2016 +0800 + + * fix bug for feature bar custom menu. + +commit b8825a18a29c363bec7d705b32450864bcac3343 +Author: chenfeiCF +Date: Tue Apr 26 17:06:14 2016 +0800 + + * Create new contact list if no contact list when manage contacts. + +commit ba10199096fee2ed6f9e8bfdc08059e163580644 +Author: wangyidong +Date: Tue Apr 26 16:47:38 2016 +0800 + + * fix bug for build menu. + +commit 5107805a0f23c21c890cb4297d6826eb45a012be +Merge: 0e5971967b 652dbbed75 +Author: wangyidong +Date: Tue Apr 26 16:24:02 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0e5971967b9d7014e27fdf479b85829a1c49fcb1 +Author: wangyidong +Date: Tue Apr 26 16:23:24 2016 +0800 + + * remove check domain in getSiteCode. + +commit b2a03b7595e4f7c072f03e483167a6df92d306a7 +Author: wangyidong +Date: Tue Apr 26 16:22:36 2016 +0800 + + * adjust for init block. + +commit 652dbbed75903d024d348084e350a3fa0a940217 +Author: Catouse +Date: Tue Apr 26 15:59:47 2016 +0800 + + * ajust code. + +commit cbbdbb63b89b0685953d21036962d6c1af3c6bfc +Merge: fb160e115d 676a46f4be +Author: Catouse +Date: Tue Apr 26 15:56:54 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + Conflicts: + module/common/model.php + module/custom/model.php + +commit fb160e115dee9d701dc8ac4da85c6fce351351b9 +Author: Catouse +Date: Tue Apr 26 15:54:12 2016 +0800 + + * improve tutorial UI. + +commit 676a46f4be7f44a0744adc24f35021c31753b477 +Merge: b69889c388 ee047197cc +Author: wangyidong +Date: Tue Apr 26 15:52:45 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b69889c38887477b4a643dd3bb88a5961cbd690c +Author: wangyidong +Date: Tue Apr 26 15:52:08 2016 +0800 + + * adjust for user-create by tutorial-wizard. + +commit ee047197ccc05abda6ebf08bf728770f469a5022 +Author: chenfeiCF +Date: Tue Apr 26 15:46:34 2016 +0800 + + * adjust english lang item for tutorial module. + +commit f91aad9e464067a284fc8f491ac78b3f9328b919 +Author: chenfeiCF +Date: Tue Apr 26 15:26:55 2016 +0800 + + * fix error for english lang item of tutorial module. + +commit a20671196ade21dcb0e77158e98afb3c7c800216 +Author: wangyidong +Date: Tue Apr 26 15:03:50 2016 +0800 + + * remove novice mode config. + +commit 71280187149b80edb2f3fb5b75e8e73e96f8da76 +Author: wangyidong +Date: Tue Apr 26 15:00:55 2016 +0800 + + * change for encrypt password. + +commit 947ee783ff58a57140071bd6ad9604a75030f96c +Author: wangyidong +Date: Tue Apr 26 14:59:17 2016 +0800 + + * switch for encrypt password. + +commit 19d44f1ebacdf5e6bfbb031926f0f057ff9b4c73 +Author: chenfeiCF +Date: Tue Apr 26 14:17:55 2016 +0800 + + * fix colspan for product and project batch edit view. + +commit f0f665cc01a53a9128bda8895c87678d23782fd2 +Author: chenfeiCF +Date: Tue Apr 26 14:12:47 2016 +0800 + + * set chosen-drop min width for plan field when batch edit bugs. + +commit 4fb6f580c5efdc2572561cd1016e3c15824af282 +Author: chenfeiCF +Date: Tue Apr 26 14:04:10 2016 +0800 + + * fix textarea height in chrome. + +commit 796121e47613755ac04b94949a351f004dcded29 +Author: chenfeiCF +Date: Tue Apr 26 13:34:06 2016 +0800 + + * Set default join date if join field is empty when batch create users. + +commit 6409895aa24e61c2c455f0b176ad5ee048b8a239 +Author: chenfeiCF +Date: Tue Apr 26 10:42:37 2016 +0800 + + * fix tfoot style for todo method of my module: import button should not wrap. + +commit ff8c4bb5e97bb3ed3e778dbaa9d65274681713b4 +Merge: cb5f7162c8 23de8db1cd +Author: Catouse +Date: Tue Apr 26 10:37:13 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cb5f7162c8320a02a8e1f7854d8a704773435fcd +Author: Catouse +Date: Tue Apr 26 10:36:58 2016 +0800 + + * change zentao help page link. + +commit 956e2259ee77e59f63dd0e32ef225bd1ab3d4526 +Author: Catouse +Date: Tue Apr 26 10:36:45 2016 +0800 + + * change style of 'misc/feature' view. + +commit 23de8db1cdb048fa1ac877e248a9a07f52addbf9 +Merge: 8362b154c7 23773b99c8 +Author: wangyidong +Date: Tue Apr 26 10:26:17 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8362b154c7fd08930bc304fb508e54493e6eed23 +Author: wangyidong +Date: Tue Apr 26 10:25:45 2016 +0800 + + * change for get viewType. + +commit 23773b99c8bce649ba340f16c1e919e4acdf699e +Author: chenfeiCF +Date: Tue Apr 26 10:18:26 2016 +0800 + + * fix style for buildexporttpl view if template name is too long. + +commit bf2a617c908cc30548f197826446084640a6f763 +Author: chenfeiCF +Date: Tue Apr 26 09:59:15 2016 +0800 + + * fix style for block view. + +commit af195c974dfa5b99881cdca774982e2fe993ee8a +Author: chenfeiCF +Date: Tue Apr 26 09:37:09 2016 +0800 + + * remove console.log. + +commit 734da9eb375849695325273f9fef7698ce93495b +Author: chenfeiCF +Date: Tue Apr 26 09:26:13 2016 +0800 + + * remove 'arrow' for fixing product index page style. + * add english lang item for search module. + +commit 6f2024abac1c99d7126960f8c5c941214c5d5a95 +Merge: 03a8e3a2d6 1f84eac3e3 +Author: wangyidong +Date: Tue Apr 26 09:23:24 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 03a8e3a2d63d13e27db8f7296d22acc0dd45d8cf +Author: wangyidong +Date: Tue Apr 26 09:22:46 2016 +0800 + + * build tutorial data and add wizard function. + +commit 1f84eac3e3da8ec653c485fea0cf1f2e3db9f0ea +Author: chenfeiCF +Date: Tue Apr 26 09:03:03 2016 +0800 + + * fix colspan for results method of testtask module. + +commit 5200d26e7b3422789cc9916fd527b9b1b5609608 +Merge: 40d5b4190c 81eea5e27d +Author: Catouse +Date: Mon Apr 25 18:31:35 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 40d5b4190c18a1c58a03696ccc5b2b12effeb797 +Author: Catouse +Date: Mon Apr 25 18:31:25 2016 +0800 + + * finish task #2544. + +commit 131e996a59fb28aa040cabf1d1124dc357846752 +Author: Catouse +Date: Mon Apr 25 18:26:47 2016 +0800 + + * update zui. + +commit 9ce9183d8b58269e2bd69449dd7eef800ae5bfea +Author: Catouse +Date: Mon Apr 25 17:45:15 2016 +0800 + + * remove console.log. + +commit 81eea5e27def0a954bb234681d1c53c752ddfd75 +Author: chenfeiCF +Date: Mon Apr 25 17:04:12 2016 +0800 + + * add english lang item. + +commit 044f7de265af0d2003ddb0b9a4e4588126bc21ba +Merge: 09059f6b7d 6a48745fcb +Author: chenfeiCF +Date: Mon Apr 25 16:34:37 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 09059f6b7db05674fbd90f897820cd1ecaa0fdb1 +Author: chenfeiCF +Date: Mon Apr 25 16:33:03 2016 +0800 + + * add english lang item and change for zh-cn. + +commit 6a48745fcbbf7f732a1aa7795a516e56ad6d2b2f +Author: Catouse +Date: Mon Apr 25 16:28:28 2016 +0800 + + * fix percent calculate method. + +commit 1fda3a14986754494b77701094ad5b2134821239 +Author: Catouse +Date: Mon Apr 25 16:16:34 2016 +0800 + + * finish task #2581. + +commit 72bab02bef7d6e4f987c8b054d46e217e5c4d8fc +Author: Catouse +Date: Mon Apr 25 16:16:02 2016 +0800 + + * ajust code. + +commit dfa4471e26d633800ce46b41110e273d85f547a5 +Author: Catouse +Date: Mon Apr 25 12:06:10 2016 +0800 + + * improve tutorial UI. + +commit 3a11f1972c705b7a7b85178eb92dda609c7a139f +Author: Catouse +Date: Mon Apr 25 11:46:18 2016 +0800 + + * fix code error. + +commit dcf2d475f7aba12c910a3ad69380cd1a1d9e8d8c +Merge: 2f5e3e3d6d 473e4ab805 +Author: Catouse +Date: Mon Apr 25 11:44:41 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + Conflicts: + module/tutorial/control.php + module/tutorial/view/index.html.php + +commit 2f5e3e3d6d7f415f91efea513d6e714f2a0bebce +Author: Catouse +Date: Mon Apr 25 11:41:40 2016 +0800 + + * finish task #2563. + +commit 473e4ab805addcb6bcabd58eb7c6bb3b882347f2 +Author: chenfeiCF +Date: Mon Apr 25 11:12:20 2016 +0800 + + * fix style for uploading and checking attached files. + +commit fbccbf45b746a46243ec7796ccc2614e80eda565 +Author: wangyidong +Date: Mon Apr 25 10:55:47 2016 +0800 + + * adjust code for error. + +commit 1e49a490c4af1cb047293b70635d8e9bf627541d +Author: wangyidong +Date: Mon Apr 25 10:04:09 2016 +0800 + + * adjust for branch and add restore function. + +commit 47de6173f9794de891d4aa87fe41e24774a6c63d +Merge: 64811aa633 1defa3dacd +Author: Catouse +Date: Mon Apr 25 08:42:27 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 64811aa633d7f2fc640e05d80ca14a2475eb3f9d +Author: Catouse +Date: Mon Apr 25 08:42:17 2016 +0800 + + * code for task #2563. + +commit 1defa3dacd799c79ff388adc39911cdd8f7d9ed8 +Author: chenfeiCF +Date: Sun Apr 24 18:39:59 2016 +0800 + + * fix table head for product all, project all, productplan browse and testtask cases method. + +commit 7a601b1172b5a82c3ccc36bc31f07f1583df03fc +Author: chenfeiCF +Date: Sun Apr 24 18:02:46 2016 +0800 + + * fix error for fixedTheadOfList and fixedTfootAction method after ajax loading. + +commit c39b58eaa69b6f225d77a3627827914d10b82814 +Merge: 37ffcf59d8 2872ae3f8f +Author: Catouse +Date: Fri Apr 22 20:38:26 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 37ffcf59d8ecd65e1a0cb4475fb276cc7b7517fe +Author: Catouse +Date: Fri Apr 22 18:04:15 2016 +0800 + + * code for task #2562. + +commit 2872ae3f8f6bee1644e362fab04115acef78de6a +Author: wangyidong +Date: Fri Apr 22 14:19:37 2016 +0800 + + * code for browse filter. + +commit ed4ad97ac3804eea3879be826134e4561b911b35 +Author: wangyidong +Date: Fri Apr 22 14:16:22 2016 +0800 + + * adjust for custom menu. + +commit 4f6744ec477474addbdf63dad39d308e36a4ad31 +Author: chenfeiCF +Date: Fri Apr 22 13:25:16 2016 +0800 + + * code for task #2576: add color tag for story, task, bug, case in block and my module. + +commit b820895a551abab1a7cdac0905a5ec518bf97f02 +Author: Catouse +Date: Fri Apr 22 11:30:46 2016 +0800 + + * code for task #2562. + +commit 7b15a503af2519520d53ec13ce8948941438e67b +Author: Catouse +Date: Fri Apr 22 10:35:06 2016 +0800 + + * add footer to misc/about view. + +commit 525a6497494cae58820679a5e67db764f66437f1 +Author: Catouse +Date: Fri Apr 22 10:21:56 2016 +0800 + + * change tree method. + +commit 063b1c97e261776b7e0ea30f08bc0ae9c325fa3a +Author: Catouse +Date: Fri Apr 22 09:58:31 2016 +0800 + + * make close modal button work. + +commit ad91d7b16c3a1d633144b8ceba023249a6e31c41 +Author: Catouse +Date: Fri Apr 22 09:35:26 2016 +0800 + + * improve UI of project tree view. + +commit 44b225bbdee0923cdb1594b8f509373858147b14 +Author: Catouse +Date: Fri Apr 22 09:35:02 2016 +0800 + + * update zui. + +commit cd5b5e8a38b57d236947fc524d7767561889867d +Author: chenfeiCF +Date: Thu Apr 21 21:24:45 2016 +0800 + + * fix bug: can not set custom lang when lang is en. + +commit 4b92f379ec9c2d2069ff6aba0da2858850628020 +Merge: e2702036cf 0927768631 +Author: Catouse +Date: Thu Apr 21 18:04:07 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e2702036cfef3ca3c0d192319af3eba18b653e2a +Author: Catouse +Date: Thu Apr 21 18:03:57 2016 +0800 + + * tree support update after actions with ajax. + +commit 2894c8b046ac273e060cb10be690667a0804d89b +Author: Catouse +Date: Thu Apr 21 17:28:37 2016 +0800 + + * fix menu custom UI. + +commit 0927768631936f7ad96d3d4ab9052d94b791aaed +Author: chenfeiCF +Date: Thu Apr 21 17:13:21 2016 +0800 + + * add english lang item for 'list'. + +commit 9fba47c58425800bf712d5f597310677cc6ba330 +Merge: ae05ed236d 077f52214a +Author: chenfeiCF +Date: Thu Apr 21 16:36:20 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ae05ed236d89b7c2f0fae0cfefee0f836702a011 +Author: chenfeiCF +Date: Thu Apr 21 16:35:00 2016 +0800 + + * fix bug #827. + +commit 077f52214ac160cdd066ea8c77c881dca99cc1a1 +Merge: a64adf09c8 c64b48ebad +Author: Catouse +Date: Thu Apr 21 16:27:21 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a64adf09c8b23823c27ea96aaa4eccf55995baf9 +Author: Catouse +Date: Thu Apr 21 16:22:47 2016 +0800 + + * ajust code. + +commit c64b48ebad3006378cac54b296b6cb29ee4553bd +Merge: 30464151ce dd3b0bbb5e +Author: wangyidong +Date: Thu Apr 21 16:11:20 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 30464151ce113b24be3b4532611a59102ae05872 +Author: wangyidong +Date: Thu Apr 21 16:10:38 2016 +0800 + + * fix bug and adjust code for product-tree. + +commit dd3b0bbb5ea8efdba94f926ba24fddb9ddc0a058 +Author: Catouse +Date: Thu Apr 21 16:03:36 2016 +0800 + + * fix an error on display user account information. + +commit 05c5c2e50a89f94c5a9a462273a78a1558995425 +Merge: 3663f341e9 6cfe70895b +Author: Catouse +Date: Thu Apr 21 15:45:08 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + Conflicts: + module/project/model.php + +commit 3663f341e9a8549f7c73c4a8e37bb3b48561af4f +Author: Catouse +Date: Thu Apr 21 15:43:36 2016 +0800 + + * refactor code. + +commit 6cfe70895b884fba5f4030638309accedf1c8acf +Author: wangyidong +Date: Thu Apr 21 15:39:20 2016 +0800 + + * change it again. + +commit 9f2e4e99ea4353fe0094e4b40a223e41dfaa59ba +Author: Catouse +Date: Thu Apr 21 15:12:54 2016 +0800 + + * fix product tasks tree view. + +commit 0524386afb8d02b09379736fa4974d21fcf8eb39 +Author: Catouse +Date: Thu Apr 21 13:49:11 2016 +0800 + + *disabled main menu sortable. + +commit 70abc0efab4bad0a32cc244ff2fb9f4891e7943a +Author: Catouse +Date: Thu Apr 21 13:48:40 2016 +0800 + + * fix error for build menu config. + +commit 825350f42139498db247b9ccc2da8f54dab912e8 +Author: Catouse +Date: Thu Apr 21 12:07:15 2016 +0800 + + * improve custom menu UI. + +commit ceb8e4fe67780636ce8cb6368357b4dae356028f +Author: Catouse +Date: Thu Apr 21 12:06:52 2016 +0800 + + * ajust code. + +commit 597300de4645f74ba5fb8c11f5e94899856c8926 +Merge: 27676eeb4b 5d449563ca +Author: Catouse +Date: Thu Apr 21 08:45:55 2016 +0800 + + Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms + +commit 27676eeb4b4f414b029ce4bfcee7a737bccfc50e +Author: Catouse +Date: Thu Apr 21 08:45:43 2016 +0800 + + * add menu custom UI. + +commit 5d449563ca3f3654b74a364ac02241e497c7f7c2 +Author: chenfeiCF +Date: Wed Apr 20 16:27:53 2016 +0800 + + * fix bug: should not get moduleOptionMenu of product whose id equal project when project links no product. + +commit 0d727fc3d86afe660dfa4adf7912b35955adc9a8 +Author: Catouse +Date: Wed Apr 20 15:39:47 2016 +0800 + + * change menu method. + +commit 06f3fe23b106b380daac9e8a70ed277ea42ff714 +Author: Catouse +Date: Wed Apr 20 15:35:44 2016 +0800 + + * change menu method. + +commit 42a26d17deac8dae9ce9cdc54f7b504c945742bb +Author: Catouse +Date: Wed Apr 20 15:29:12 2016 +0800 + + * fix feature menu. + +commit 149e26071ffc156af200ccfa1d681035c2239249 +Merge: 9f6b172442 d89d674cdd +Author: Catouse +Date: Wed Apr 20 15:14:39 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + Conflicts: + module/bug/view/browse.html.php + module/product/view/browse.html.php + module/project/lang/zh-cn.php + module/project/view/taskheader.html.php + module/testcase/view/caseheader.html.php + module/testtask/view/caseheader.html.php + +commit d89d674cddfa277ffd8104749dfed9dc04659622 +Author: wangyidong +Date: Wed Apr 20 14:51:05 2016 +0800 + + * code for task #2522,2579. + +commit 9f6b17244231fc1e9be7ac939211c494f9365560 +Merge: 0733b9f177 164f7630d3 +Author: Catouse +Date: Wed Apr 20 14:12:48 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0733b9f177f249d0260a69a9a863cbd08b6b0f1a +Author: Catouse +Date: Wed Apr 20 14:06:23 2016 +0800 + + * fix UI for feature menu. + +commit 164f7630d393b954e11c9aa400a5cc8e000da51b +Author: chenfeiCF +Date: Wed Apr 20 11:21:17 2016 +0800 + + * fix error for task #2559: not merge product module pairs when type is 'task'; + +commit c4c5f942e87956d435840748b9f403d3a29b4f18 +Author: Catouse +Date: Wed Apr 20 08:41:42 2016 +0800 + + * change model motheds for menus. + +commit 4e0d51bba54a6cf1044852c6cbb3c5e5c17b1479 +Author: Catouse +Date: Wed Apr 20 08:41:03 2016 +0800 + + * ajust code. + +commit b52947ed2743df6c5d44dc7bc7684c098928309f +Author: Catouse +Date: Tue Apr 19 17:50:02 2016 +0800 + + * code for task #2518. + +commit a184f23c81af3621e5b4af4a6fc3b82a0cb2671a +Merge: 3a6d5cf29c 156c55cb70 +Author: Catouse +Date: Tue Apr 19 17:49:36 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3a6d5cf29cda7bdb985d83fef00ac2ba29baf738 +Author: Catouse +Date: Tue Apr 19 17:49:19 2016 +0800 + + * add method to refresh all panels in dashboard. + +commit 156c55cb703a7341c32a357f5ea7fa8b1bcbbd7b +Author: chenfeiCF +Date: Tue Apr 19 17:30:08 2016 +0800 + + * add lang itme for files of story and task module. + +commit d9f12f65628ed64f8a416bcf4dab2ee8d9ab5020 +Author: chenfeiCF +Date: Tue Apr 19 17:05:53 2016 +0800 + + fix bug: fill 'admin' in last input tags automatically when batch edit users. + +commit ff5dac78873315bd15092dc94432c94d02dbae79 +Author: chenfeiCF +Date: Tue Apr 19 17:00:34 2016 +0800 + + * fix bug: can not get builds belong to all branch when activating a bug in one branch. + +commit fc385aa25d7e96f2381ff23d30d58eab8f73a927 +Merge: 3bd8e72a9d afef5eedbd +Author: chenfeiCF +Date: Tue Apr 19 14:19:43 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit afef5eedbd08192d1a184b18440f91116ca04578 +Merge: 58678c00fd d1bcb26a7a +Author: wangyidong +Date: Tue Apr 19 14:16:11 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 58678c00fdbe5be1d65c0f00d70b9482788620f0 +Author: wangyidong +Date: Tue Apr 19 14:15:45 2016 +0800 + + * adjust for manage tree. + +commit 3bd8e72a9dbed62df2b854a728440b5fcdd26e84 +Author: chenfeiCF +Date: Tue Apr 19 14:15:00 2016 +0800 + + * fix error for export method of bug module: not set os and browser list. + +commit d1bcb26a7a1371f9be2eae4036837aa889ac325b +Author: chenfeiCF +Date: Tue Apr 19 13:31:14 2016 +0800 + + * fix error for task #2554 when browseType is 'byproduct'. + +commit 25ada3e7e336bc88da4777cb2c61917ac6274a14 +Merge: a20f6c9ce0 3322a58d91 +Author: wangyidong +Date: Tue Apr 19 11:13:49 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a20f6c9ce0e39790adf60ea9feb0d66033623add +Author: wangyidong +Date: Tue Apr 19 11:12:56 2016 +0800 + + * fix bug and adjust code for get story version when batch create case. + +commit 3322a58d912c4f95cfaf7e5089b04476a68016ef +Merge: 95c09a8425 0d832ade74 +Author: Catouse +Date: Tue Apr 19 10:48:12 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 95c09a842562a0413765510828a3bc116e149800 +Author: Catouse +Date: Tue Apr 19 10:48:05 2016 +0800 + + * improve project tree UI. + +commit 0d832ade745072ca4399f335dbec4e8a050752f6 +Author: chenfeiCF +Date: Tue Apr 19 09:41:26 2016 +0800 + + * fix error for featurebar of bug module browse menu. + +commit 0f986db03184e497197c24b876f222fb5763998c +Merge: b356e65732 755013b151 +Author: Catouse +Date: Mon Apr 18 18:46:23 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b356e65732e2d9b03060b0f99cbe2ada16bd6180 +Author: Catouse +Date: Mon Apr 18 18:45:58 2016 +0800 + + * finish task #2552. + +commit 755013b151e331cbc6c148f3a560307f281b56fe +Author: wangyidong +Date: Mon Apr 18 16:59:55 2016 +0800 + + * fix var error. + +commit f75c032c4d517f9e89eae939479b01894d8425d8 +Author: chenfeiCF +Date: Mon Apr 18 16:47:27 2016 +0800 + + * add lang item for setPublic. + +commit 62f35f1a18c17d7a7bfb2e633dc4f57503fe9984 +Merge: ba2eff3f57 8ea70725cd +Author: Catouse +Date: Mon Apr 18 16:38:37 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + Conflicts: + module/project/view/taskheader.html.php + +commit ba2eff3f5717de7c13e3eb6489e43a0128ce7a90 +Author: Catouse +Date: Mon Apr 18 16:35:50 2016 +0800 + + * code for task #2552. + +commit 53a390dd0a06bef799755e4a17f8c93bab3c4ca9 +Author: Catouse +Date: Mon Apr 18 16:31:38 2016 +0800 + + * update zui. + +commit 8ea70725cd5695f12a342b1d5e2c06867aee84a4 +Merge: d22230a546 5762df7678 +Author: wangyidong +Date: Mon Apr 18 16:29:49 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d22230a546f914bdfb69ab1b8febb16bf30d48b3 +Author: wangyidong +Date: Mon Apr 18 16:27:15 2016 +0800 + + * change for custom menu. + +commit 5762df7678569032736a7c069b7726e08780602f +Author: chenfeiCF +Date: Mon Apr 18 16:26:25 2016 +0800 + + * fix button style for bug method of my module. + +commit 8345963cb4bb603d2e08e84b6fda8c3b28d57659 +Author: chenfeiCF +Date: Mon Apr 18 16:11:02 2016 +0800 + + * fix error if bugs do not belong to same product when batch edit bugs. + +commit 3e7ff8731da5a03f3618a7111709fd8ef29d2ec2 +Author: chenfeiCF +Date: Mon Apr 18 15:12:37 2016 +0800 + + * remove manageContacts and deleteContacts method of user module. + +commit 88fe7ee93f4625acf2b0f85bf9ca9b5df6e43d74 +Author: Catouse +Date: Mon Apr 18 13:41:25 2016 +0800 + + * ajust code. + +commit 35c45afc19562f01b7db9fa8019d7033f05886e6 +Author: Catouse +Date: Mon Apr 18 13:08:20 2016 +0800 + + * task modules tree support product. + +commit 9c3e35e4b1f4b60267c8fc30f7e67504ed706624 +Author: chenfeiCF +Date: Mon Apr 18 11:24:00 2016 +0800 + + * add change log for 8.1.3 version of new privilege. + +commit dc33dbb5d6196fe262bace856fd30cdfbfcbcb9d +Merge: 619e9220ca 6f8224ba0c +Author: wangyidong +Date: Mon Apr 18 10:07:25 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit eb14a9389558d615473d42d11be853aaa6f56b09 +Author: Catouse +Date: Mon Apr 18 09:59:20 2016 +0800 + + * remove console.log. + +commit 69766cca3a700b8d1cce3242ef39f4b3131c7061 +Merge: a42a26761f 6f8224ba0c +Author: Catouse +Date: Mon Apr 18 09:57:25 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a42a26761fc72446f48f8dda3933427cf7d8c4f3 +Author: Catouse +Date: Mon Apr 18 09:57:17 2016 +0800 + + * fix UI for dashboard views. + +commit 6f8224ba0c76b12a478fa2bea1105bc3e3eb1f54 +Author: chenfeiCF +Date: Mon Apr 18 09:27:06 2016 +0800 + + * add priv for manageContacts, deleteContacts and batchChangeModule method. + +commit dd3b5667696a38fb3a3e9f74bcbef0b201ac80f9 +Merge: 80650fb91c 974d615787 +Author: Catouse +Date: Fri Apr 15 19:51:51 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 80650fb91cc315b05a7c0f8a62a72b874867a528 +Author: Catouse +Date: Fri Apr 15 19:51:35 2016 +0800 + + * table in block support to fix header. + +commit 8c013e9c26bedf96d3dead95ff7159f05c8e9fbb +Author: Catouse +Date: Fri Apr 15 16:43:27 2016 +0800 + + * fix button style in datatable. + +commit 974d6157879f991a79f89627a3ed691f9eb3d3ba +Author: chenfeiCF +Date: Fri Apr 15 16:26:25 2016 +0800 + + * fix error for SQL when printing build block. + +commit 9a636b34c4f3ffa2d83493a700945420ad65e1bc +Author: chenfeiCF +Date: Fri Apr 15 16:23:58 2016 +0800 + + * fix bug #825. + +commit 7ce39f06584930bac84fb82409dd3a3e65eb4880 +Author: Catouse +Date: Fri Apr 15 15:45:16 2016 +0800 + + * dashboard file include common sparkline file. + +commit 2c8ee202838be31d0d64faf4c5371921bb410b39 +Merge: 4a4ecc4dac 91f4ecf2d8 +Author: Catouse +Date: Fri Apr 15 15:37:14 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4a4ecc4dac2e0c106493cd8c8e1c503909d62f28 +Author: Catouse +Date: Fri Apr 15 15:37:02 2016 +0800 + + * fix style of fixed table header. + +commit 91f4ecf2d86823656a70c0ccecfbda99411aed03 +Author: chenfeiCF +Date: Fri Apr 15 15:33:35 2016 +0800 + + * adjust the value of z-index for css class fixedTheadOfList. + +commit 71638983691bdd4cabebf29a989d3d192a13697f +Author: chenfeiCF +Date: Fri Apr 15 15:31:25 2016 +0800 + + * finish task #2577. + +commit c32b283c7c56b1d2f420813dce37be452438b2d3 +Author: Catouse +Date: Fri Apr 15 15:18:24 2016 +0800 + + * update zui. + +commit 619e9220caf6339d2ad6e026b6f1c060341b4203 +Author: wangyidong +Date: Fri Apr 15 15:03:35 2016 +0800 + + * adjust and fix block. + +commit 250caa590b10978cc90699cf92a2cdde939217a6 +Author: Catouse +Date: Fri Apr 15 14:40:44 2016 +0800 + + * remove border radius of cards in about page. + +commit bb35bbd4a9af85253ce8de555507bc76d08dec6e +Author: Catouse +Date: Fri Apr 15 14:19:49 2016 +0800 + + * finish task #2517. + +commit 54a3ededff6a8c7da45ed2433ec3ebe06bd93e24 +Merge: 687b30412d 8fd1ffd129 +Author: Catouse +Date: Fri Apr 15 11:43:26 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 687b30412d601ec2022534ec09801edaccea2fba +Author: Catouse +Date: Fri Apr 15 11:43:16 2016 +0800 + + - delete datatable resource files: datatable is include in zui. + +commit 7412681d2c67d19298891230cebef8d96817a6df +Author: Catouse +Date: Fri Apr 15 11:42:47 2016 +0800 + + * update zui. + +commit 8fd1ffd1292afaea753e04a8140a9e9c99aa39c1 +Author: wangyidong +Date: Fri Apr 15 11:37:08 2016 +0800 + + * change for english. + +commit c5dcca79bf1dd6bd688b8ba97c37f46182eb27ce +Author: wangyidong +Date: Fri Apr 15 11:32:46 2016 +0800 + + * set homepage for product/project/qa. + +commit 7e7e14b9db658f1d6b74ae6f98f6411b6b4b41d1 +Merge: b5fc78970d b3df46f4e5 +Author: Catouse +Date: Fri Apr 15 10:18:12 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b3df46f4e5dfabb2e021ce3361ee9eb35025ae03 +Author: chenfeiCF +Date: Thu Apr 14 16:51:24 2016 +0800 + + * fix error for task #2535: Set the second param correct for judgeSuhosinSetting function. + +commit d45ecec122082e3b91cafaabff43d6406ff114c7 +Author: chenfeiCF +Date: Thu Apr 14 16:38:30 2016 +0800 + + * code for task #2536: Set custom for batch edit product. + +commit f116895750fff59c1ff633787f62608de5b3e9ac +Merge: 37a64ea759 ceee26974e +Author: wangyidong +Date: Thu Apr 14 16:33:20 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 37a64ea759aa194c5be3bf76a22804ca383874f4 +Author: wangyidong +Date: Thu Apr 14 16:32:45 2016 +0800 + + * custom for user batchcreate. + +commit ceee26974e0d7c880e3adf6dcff3e09bf45926d4 +Author: chenfeiCF +Date: Thu Apr 14 15:42:28 2016 +0800 + + * code for task #2536: Set custom for batch edit project. + +commit b5fc78970ddc2a451e62b99c546c54c58e701f5f +Merge: f7926fd3a4 6c7549b472 +Author: Catouse +Date: Thu Apr 14 15:31:54 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f7926fd3a437a1884b28f9d3098932c6350faa9b +Author: Catouse +Date: Thu Apr 14 15:31:42 2016 +0800 + + * dashboard support resize by drag edge. + +commit 74e370408443342bc0395e1c6d34bf3465913cbb +Author: Catouse +Date: Thu Apr 14 15:31:22 2016 +0800 + + * update zui: dashboard support drag and resize. + +commit 281d075cbf45df30f20eb4d76ba5718e62bc4346 +Author: wangyidong +Date: Thu Apr 14 14:48:03 2016 +0800 + + * custom for todo batchcreate. + +commit 6c7549b472301359e63f5cbbdf6e5037f179e966 +Author: chenfeiCF +Date: Thu Apr 14 14:13:45 2016 +0800 + + * adjust custom fields for batch create and edit method of testcase module. + +commit 56fac4501d47b61056469fd0b23154d06cb8ce8f +Author: chenfeiCF +Date: Thu Apr 14 14:02:35 2016 +0800 + + * revert ditto function in batchedit.js of bug module. + +commit 2529a6ba5ccf99b12b8e8f00f3664a6b71570b4b +Author: chenfeiCF +Date: Thu Apr 14 13:58:44 2016 +0800 + + * code for task #2536: Set custom for batch edit method of user module. + +commit 23e76dfc28ca58a273d216503e72089b4d917ca2 +Author: Catouse +Date: Thu Apr 14 13:37:19 2016 +0800 + + * main menu support sort by drag and drop. + +commit c81ef5564d21da3c00c69409d2fa4b852524077c +Author: Catouse +Date: Thu Apr 14 11:50:13 2016 +0800 + + * change blocks UI. + +commit 3462afd85649d2925d3978d13ce3b259caf6f6fe +Author: Catouse +Date: Thu Apr 14 11:49:30 2016 +0800 + + * table support clickable row. + +commit da4289df7b8104714d08cfaa81c7e0a59bf932c9 +Merge: a536675548 1d42f477f8 +Author: wangyidong +Date: Thu Apr 14 10:43:18 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a536675548d3faeba1676a39d27855354383eac9 +Author: wangyidong +Date: Thu Apr 14 10:42:57 2016 +0800 + + * finish task #2534. + +commit 1d42f477f89cac77ff8dbe0d87126e5ea86407e3 +Author: chenfeiCF +Date: Thu Apr 14 10:21:27 2016 +0800 + + * finish task #2535. + +commit ea4c94bcc2d2455a66a3c417fa73ef10cc4330a6 +Merge: d80aa64136 847c24f571 +Author: chenfeiCF +Date: Thu Apr 14 09:15:27 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d80aa64136c7959bac10b25e13df40f23810a350 +Author: chenfeiCF +Date: Thu Apr 14 09:14:31 2016 +0800 + + * finish task #2539. + +commit 847c24f5710abc858c0420727ca9b52e0f5e65b9 +Merge: 3edba12cc7 650ec21b00 +Author: Catouse +Date: Thu Apr 14 09:08:47 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3edba12cc7e99aa0f8724bbec62f763aa3e4590e +Author: Catouse +Date: Thu Apr 14 09:08:32 2016 +0800 + + * improve dashboard UI. + +commit 650ec21b00d9df129edbe72c18341dd5da890a25 +Author: chenfeiCF +Date: Thu Apr 14 08:41:08 2016 +0800 + + * code fot task #2540: add pri to custom field. + +commit 32eb12d2ccd43238cfc0655f0a62fd7a7b43c164 +Author: Catouse +Date: Wed Apr 13 17:43:14 2016 +0800 + + * update zui: dashboard support more options. + +commit 1b31f92251de75649796ef68b4855e15da4360d8 +Author: Catouse +Date: Wed Apr 13 17:42:48 2016 +0800 + + * fix error in set ajax modal. + +commit 27ed67331ed2b8aec56e08299e18a6a4f1adc6ea +Author: Catouse +Date: Wed Apr 13 17:42:21 2016 +0800 + + * improve dashboard UI. + +commit 5a837ca15c936d57c320b3b9a7d6ad7b20b1f209 +Author: chenfeiCF +Date: Wed Apr 13 17:31:54 2016 +0800 + + * code for task #2548: add pri to custom field list. + +commit 0daddb0d6e686b2941f09afccf4b26951075885d +Author: chenfeiCF +Date: Wed Apr 13 17:03:09 2016 +0800 + + * code for task #2540: adjust the position of the custom button. + +commit 6ccfbaebef093e605581d2512716c793eb4fe94b +Author: chenfeiCF +Date: Wed Apr 13 16:54:51 2016 +0800 + + * code for task #2546. + +commit 143c0255be25d54f0db4dd077e7c6a7095837d83 +Author: wangyidong +Date: Wed Apr 13 16:15:17 2016 +0800 + + * fix bug for import csv. + +commit 27d611a2c451fb6a9cc65d3b6163fb4f57a61f70 +Merge: 75fead9168 3fec649bf1 +Author: wangyidong +Date: Wed Apr 13 13:52:29 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 75fead91689e5d708f57f2428c8f55921e4cee89 +Author: wangyidong +Date: Wed Apr 13 13:51:42 2016 +0800 + + * change for task #2533. + +commit 3fec649bf16ab79cfa1ba8dea7fc286d68155fe4 +Author: chenfeiCF +Date: Wed Apr 13 11:35:04 2016 +0800 + + * finish task #2540. + +commit f8ff73708673af544d94ce8b4355fe87340a7cc1 +Author: wangyidong +Date: Wed Apr 13 10:42:19 2016 +0800 + + * finish task #2532. + +commit ceeeb8943511bef0a51dd9dd40562e65077c0dfb +Merge: 23ee51e7ea e87801ebd1 +Author: wangyidong +Date: Tue Apr 12 17:35:08 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 23ee51e7ea5df1334890f8b07b6ed20413c26105 +Author: wangyidong +Date: Tue Apr 12 17:34:23 2016 +0800 + + * finsh task #2538. + +commit e87801ebd138f6b800271bff2178bf2091140623 +Merge: e7a72856a0 9acf763a61 +Author: Catouse +Date: Tue Apr 12 16:59:55 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e7a72856a0e30472c2520e804812dfe7b08e7483 +Author: Catouse +Date: Tue Apr 12 16:59:30 2016 +0800 + + * improve UI for manage modules, code for task #2549. + +commit 9acf763a61c6fb3b01a644ca41541a1767a3dc07 +Merge: 9e840b7367 9a07d9ef4f +Author: wangyidong +Date: Tue Apr 12 16:53:05 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9e840b7367850be8eeda037944e59f2163e934cb +Author: wangyidong +Date: Tue Apr 12 16:52:35 2016 +0800 + + * finish task #2537. + +commit 9a07d9ef4fc2c34c67a4984eb45217999fc59bc9 +Author: chenfeiCF +Date: Tue Apr 12 16:15:12 2016 +0800 + + * fix bug #786. + +commit 663fb0a558e88bff3f249a8683f5cf2aa7dc4257 +Author: Catouse +Date: Tue Apr 12 15:37:39 2016 +0800 + + * update tree in zui. + +commit 93c00ba10b7b6c2060aa763e37d1e9a601758893 +Author: chenfeiCF +Date: Tue Apr 12 14:18:29 2016 +0800 + + * fix table head and foot if module tree is hidden or displayed. + +commit d7b5cd085c08e7c16b1b0bf60bbfe039c69e1e4c +Merge: 9c2f9dfa32 47628c8d3a +Author: wangyidong +Date: Tue Apr 12 13:54:03 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + + Conflicts: + module/bug/model.php + +commit 9c2f9dfa32c192ce27c84f6312d3991ef4fda960 +Author: wangyidong +Date: Tue Apr 12 13:51:09 2016 +0800 + + * fix error and adjust code. + +commit 47628c8d3a986cffa562999fc0d848e8c0f25f92 +Merge: 8a8f7715ac 7a40bbeaec +Author: Catouse +Date: Tue Apr 12 13:40:39 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 8a8f7715ac60951f5ef7f6cc507472276cae8cdf +Author: Catouse +Date: Tue Apr 12 13:40:30 2016 +0800 + + * fix error on add department to root. + +commit 430c9359fed40e9fe225038dcca83b7ebf34813e +Author: Catouse +Date: Tue Apr 12 13:33:13 2016 +0800 + + * update zui. + +commit 6b5f1228c85da578a25afeb556c1a9536cd4f9f3 +Author: Catouse +Date: Tue Apr 12 13:32:54 2016 +0800 + + * finish task #2576. + +commit 7a40bbeaecc7323e0e8a8e4c739fd27edaeb23b7 +Merge: cb5d368c48 52370d1855 +Author: wangyidong +Date: Tue Apr 12 11:23:49 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cb5d368c4828aba27d6e9b8e9e6c13452504bc2b +Author: wangyidong +Date: Tue Apr 12 11:23:05 2016 +0800 + + * finish task #2524. + +commit 52370d18551efb54e497e47ba30ee6d200a720e0 +Author: chenfeiCF +Date: Tue Apr 12 09:44:02 2016 +0800 + + * fix bug #817. + +commit b1e147fec318f6229f2d1dee2e7881424571f603 +Author: chenfeiCF +Date: Tue Apr 12 08:28:42 2016 +0800 + + * code for task #2528. + +commit 12925bc1cd195ca5445864e480a9ddc7e547b2dc +Author: Catouse +Date: Mon Apr 11 19:22:51 2016 +0800 + + * change UI of department manage view. + +commit e6712a3a4b3d99d1b70a393b307205b3267a69f8 +Author: Catouse +Date: Mon Apr 11 19:22:25 2016 +0800 + + * update zui and fix tree style. + +commit 4b08db0b40efe475b1faf5ca6eb92c414c29488b +Author: Catouse +Date: Mon Apr 11 19:22:03 2016 +0800 + + * fix error in modal trigger extension. + +commit 21da156bd103b0eef065cc4fab18236a11099762 +Author: Catouse +Date: Mon Apr 11 19:21:45 2016 +0800 + + * change front helpers. + +commit 64f837231a0941c9addedf3e788097cf8a354729 +Merge: ca4710fa99 ac2bfc94dd +Author: chenfeiCF +Date: Mon Apr 11 17:38:23 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ca4710fa99ab27127bbe9865b134a4b8134ed16c +Author: chenfeiCF +Date: Mon Apr 11 17:36:30 2016 +0800 + + * fix bug #820. + +commit ac2bfc94dd38f460159c1c81f615fe475757ffeb +Author: wangyidong +Date: Mon Apr 11 17:30:27 2016 +0800 + + * adjust for integrate ranzhi. + +commit 7fea820831d4da13d5fced244e9c3c65fe2c469e +Author: wangyidong +Date: Mon Apr 11 17:05:05 2016 +0800 + + * code for fix error and adjust default block. + +commit 25648f4067589caa4688d1b0d67f4c224eeed58c +Author: chenfeiCF +Date: Mon Apr 11 16:58:37 2016 +0800 + + * fix bug 822. + +commit 322b895c9657ffa473c2c8d2c0100fb80f25f395 +Merge: 3630f79874 ddbf65ab50 +Author: wangyidong +Date: Mon Apr 11 16:57:51 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3630f798742ca45bb12ec24a08a50ca8d441e4cf +Author: wangyidong +Date: Mon Apr 11 16:57:26 2016 +0800 + + * change for check priv. + +commit ddbf65ab50ce073119c8162a804962cd194fb47f +Author: chenfeiCF +Date: Mon Apr 11 16:54:15 2016 +0800 + + * fix bug #823. + +commit 37bc93aa530a62af288e858e6c7c9ba3fedf5063 +Merge: 13f1fd6bf7 3cda13683f +Author: wangyidong +Date: Mon Apr 11 15:49:34 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 13f1fd6bf7c759abd509e4eab17e51bb3453da2e +Author: wangyidong +Date: Mon Apr 11 15:48:58 2016 +0800 + + * change for print blok. + +commit 3cda13683f176c8662346a79f6390c4df5146c06 +Author: Catouse +Date: Mon Apr 11 15:10:14 2016 +0800 + + * update zui. + +commit 13f7011a05e10ec0ab847ce9624589f79978f5a8 +Author: wangyidong +Date: Mon Apr 11 10:58:08 2016 +0800 + + * add color field for task/story/bug/case. + +commit bfeaca5fa3e0093fb9266bdfd28112b7a2603833 +Author: wangyidong +Date: Mon Apr 11 10:14:46 2016 +0800 + + * change for browse in mobile. + +commit 6006efd721f33f390fc8d27fd952a0ccebdc529c +Author: wangyidong +Date: Mon Apr 11 09:29:33 2016 +0800 + + * code for task #2529. + +commit b6ef7dd9616da41f5bda4d32550c60d6f656ca7a +Author: chenfeiCF +Date: Sat Apr 9 13:37:25 2016 +0800 + + * adjust for task #2531:Process the post data in model when value is 'ditto'. + +commit 2cb3981b3828b3bbe746447cbc10b3d6a903db85 +Author: Catouse +Date: Fri Apr 8 17:53:18 2016 +0800 + + * update zui. + +commit 1aec16628e8ee6298afc414acd092413d8d70f97 +Author: Catouse +Date: Fri Apr 8 17:53:10 2016 +0800 + + * code for task #2576. + +commit 18363ef7d4e38b81636d066de8ea2074c9ef4ee7 +Merge: ce53e54709 ceb50edff9 +Author: Catouse +Date: Fri Apr 8 16:12:17 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ce53e547096567f96c3782855641b8b121641032 +Author: Catouse +Date: Fri Apr 8 16:11:31 2016 +0800 + + * update zui: add color picker module. + +commit ceb50edff946d1678436d619615505f76bb6443d +Author: wangyidong +Date: Fri Apr 8 13:28:33 2016 +0800 + + * code for task #2527. + +commit 4d38fbdad132bf2aeaa4ef6d8e5ee3988c72b985 +Author: wangyidong +Date: Fri Apr 8 11:40:37 2016 +0800 + + * add index page. + +commit ea7aabdd3e9b45f6f202d7dd170ef0ad92f3f11d +Author: wangyidong +Date: Fri Apr 8 11:01:24 2016 +0800 + + * add function sort and delete block. + +commit c50c181700d752bfa9b27c1ad685119ad5064b0d +Author: wangyidong +Date: Fri Apr 8 10:41:20 2016 +0800 + + * code for task #2529. + +commit 1c851a0f59f361042c44f4b4448869174312ef2e +Author: wangyidong +Date: Fri Apr 8 10:40:36 2016 +0800 + + * adjust style for file export.html.php. + +commit f3b933a3d4d3d359962f7774b74d3fbf96052516 +Merge: 85d5058ff3 4ae9e43e41 +Author: wangyidong +Date: Fri Apr 8 10:39:15 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 85d5058ff39d17cc0adecda66a8a019dd13d1354 +Author: wangyidong +Date: Fri Apr 8 10:38:15 2016 +0800 + + * code for block. + +commit 36999dc90786ec06ce1c690f2506ac73c9faaf1f +Author: wangyidong +Date: Fri Apr 8 10:34:17 2016 +0800 + + * fix for removeDuplicate when batchCreate. + +commit 72dff1e177b021ca9158b89f6e3b87ecf7b30a72 +Author: wangyidong +Date: Fri Apr 8 10:33:18 2016 +0800 + + * fix for ignore 360 browser. + +commit 88843220e9c9134a9e61dd0401a60194b5b6858e +Author: wangyidong +Date: Fri Apr 8 10:32:39 2016 +0800 + + * change for md5 password when login. + +commit 968627b5f33d1381f8545d2148c409d6ddf61925 +Author: wangyidong +Date: Fri Apr 8 10:31:25 2016 +0800 + + * fix bug for no function imagecreatefromjpeg. + +commit 98747e9d3cf6eab71b3848bc4e0e10f040dbdd1c +Author: wangyidong +Date: Fri Apr 8 10:29:03 2016 +0800 + + * fix bug for bug-batchCreate. + +commit 4ae9e43e41e4e8300050b089263d6158e5637c80 +Author: chenfeiCF +Date: Fri Apr 8 00:00:24 2016 +0800 + + * finish task #2531. + +commit 10d9fe498278c13b8684632a20d33273fc02b2e5 +Author: Catouse +Date: Thu Apr 7 18:18:17 2016 +0800 + + * add dashboard example and update zui. + +commit 9b6328ec35c871ae6c49bdeea574b50b711d2e08 +Author: Catouse +Date: Thu Apr 7 15:40:02 2016 +0800 + + -delete zui.sortable.js: the code is already include in zui. + +commit 974ebd225bd9d0f8f5888ccadf49d2367b66aa01 +Author: Catouse +Date: Thu Apr 7 15:39:21 2016 +0800 + + * add dashboard resouce by update zui. + +commit b441b18b5733ae9eb41f5b3463795a21cbc38576 +Author: Catouse +Date: Thu Apr 7 15:21:41 2016 +0800 + + * code for task #2564. + +commit 149e058816b365665f230efa422d2ee93a9c6d68 +Merge: 221d3264b1 2a881fbe12 +Author: wangyidong +Date: Thu Apr 7 09:45:13 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 221d3264b1551f1d145a1bebac65da28f948c409 +Author: wangyidong +Date: Thu Apr 7 09:44:06 2016 +0800 + + * fix bug #821. + +commit 2a881fbe12244eb149bbd5f42881f48095e8bcae +Author: chenfeiCF +Date: Wed Apr 6 21:29:42 2016 +0800 + + * code for task #2531: add ditto option for task batch edit. + +commit 5bea716cb7dd19d975ae3db3dcac1ebc343e2f70 +Author: chenfeiCF +Date: Wed Apr 6 15:55:14 2016 +0800 + + * fix end date format when creating product plan. + +commit 494ca5ac9d4bf9695c6286f549db97022bfc7a22 +Author: chenfeiCF +Date: Tue Apr 5 22:30:46 2016 +0800 + + * finish task #2546. + +commit ee0ace3c750dafed07765060e447fcbcd7c8ff41 +Author: wangyidong +Date: Tue Apr 5 14:29:21 2016 +0800 + + * finish task #2559. + +commit a242c0e39dfd192b7313bf79fca8547ca99c6cb1 +Merge: 2e72d5724b a42521dadb +Author: wangyidong +Date: Fri Apr 1 16:25:17 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2e72d5724ba35bdbcf8e1cd1253bf30a50a576fa +Author: wangyidong +Date: Fri Apr 1 16:24:38 2016 +0800 + + * finish task #2551. + +commit a42521dadb285ef39988d866660499e5efc98a55 +Author: chenfeiCF +Date: Fri Apr 1 11:01:06 2016 +0800 + + * finish task #2548. + +commit a4c6bfb114928603e4a90245829c046c3993fb57 +Author: wangyidong +Date: Fri Apr 1 09:37:29 2016 +0800 + + * finish task #2530. + +commit a160d631e25ba7cd0a43428b2dbce43a373359bd +Author: chenfeiCF +Date: Thu Mar 31 13:53:18 2016 +0800 + + * finish task #2574. + +commit 8da31932bd0f346446736c210cd30f7bbb16bec4 +Author: chenfeiCF +Date: Thu Mar 31 13:43:01 2016 +0800 + + * finish task #2556. + +commit 040f86ddcc3adacc6d31142001f4fc12c32b36a0 +Merge: 511978cd0c f8070cc489 +Author: wangyidong +Date: Thu Mar 31 11:29:44 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 511978cd0c6c813bf40a1bfc50950deae364e66b +Author: wangyidong +Date: Thu Mar 31 11:28:36 2016 +0800 + + * adjust for task #2545,2547. + +commit f8070cc48948f53797c07fa052727fdaafb45ecf +Author: chenfeiCF +Date: Thu Mar 31 11:17:46 2016 +0800 + + * modify spelling errors. + +commit ba7d3a6a1d7fee5ad38652bc36d626912ba19606 +Merge: e08ddd12b8 dff1bfb1ae +Author: chenfeiCF +Date: Thu Mar 31 11:04:59 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e08ddd12b85bc9aa8e8da45c736684c7d7c43fcc +Author: chenfeiCF +Date: Thu Mar 31 11:04:17 2016 +0800 + + * finish task #2555. + +commit dff1bfb1ae6976f0ee1e3efb666c7b7d87f211e0 +Author: wangyidong +Date: Thu Mar 31 10:06:54 2016 +0800 + + * finish task #2542. + +commit c9658bc638bf5dfd6fe38715f2036ac3c50b4a92 +Author: chenfeiCF +Date: Thu Mar 31 09:39:28 2016 +0800 + + * finish task #2554. + * code model.php of product module for task #2553. + +commit 6cbd5c878223139bfec8ab8a13407494bc7a662c +Merge: b549b7d862 9c4a37c800 +Author: wangyidong +Date: Wed Mar 30 13:08:33 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b549b7d8627b379b15af672f086d9179085d0e62 +Author: wangyidong +Date: Wed Mar 30 13:07:16 2016 +0800 + + * code for task #2547. + +commit b053ec972fc6b37f849701c5357d799e133bbf3f +Author: wangyidong +Date: Wed Mar 30 10:55:00 2016 +0800 + + * finish task #2545. + +commit 9c4a37c80099d19ddfe66a640e6aef46e687becc +Author: chenfeiCF +Date: Wed Mar 30 10:37:52 2016 +0800 + + * finish task #2570. + +commit 2be4df631937c645975fb8967fc1e59a9a9c23a8 +Author: chenfeiCF +Date: Wed Mar 30 10:04:47 2016 +0800 + + * finish task #2571. + +commit ddf15aa13b6f97f39b3f6e6f6b5f48b96f923638 +Author: wangyidong +Date: Tue Mar 29 16:12:00 2016 +0800 + + * fix bug for getOptionMenu when project link two products or more. + +commit 92d8ffe16a96a32a6b027111800edffb9df28cf5 +Author: wangyidong +Date: Tue Mar 29 15:12:22 2016 +0800 + + * finish task #2580. + +commit 2cbcebc17f477ddf0bd152ba3a0379f2549fd73c +Merge: 647e9bee18 590afbf92e +Author: wangyidong +Date: Tue Mar 29 15:10:38 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 647e9bee18fdb41bb405d18cba1cd39e463b2745 +Author: wangyidong +Date: Tue Mar 29 15:08:46 2016 +0800 + + * finish task #2580. + +commit 590afbf92edd66ceed58c35a6c80ab12396c8384 +Author: chenfeiCF +Date: Tue Mar 29 14:27:57 2016 +0800 + + * finish task #2569. + +commit e1c08416f11c4e884a24d4d88f6898b868e3bb74 +Author: chenfeiCF +Date: Tue Mar 29 13:14:29 2016 +0800 + + * finish task #2568. + +commit 486b9396c0c616b6f59604aec8567b9274307c64 +Merge: a6a61d7e1f 8cd6978375 +Author: wangyidong +Date: Tue Mar 29 10:51:10 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a6a61d7e1fcc1269c8119ba6270bb4af919617d8 +Author: wangyidong +Date: Tue Mar 29 10:50:33 2016 +0800 + + * finish task #2573. + +commit 8cd6978375024801a41c6bae17c51b281eaaaccb +Author: chenfeiCF +Date: Tue Mar 29 10:34:34 2016 +0800 + + * finish task #2567. + +commit 79096a6fdd96224cde72309589133649a6c3951a +Author: chenfeiCF +Date: Mon Mar 28 16:49:37 2016 +0800 + + * adjust the format of end date for product plan. + +commit 92f2cb6c5dcfe4db18e56c2c5f710ba318c39bca +Author: chenfeiCF +Date: Mon Mar 28 16:42:41 2016 +0800 + + * finish task #2572. + +commit 2306be7eaf83caa174353d0a5dcf18ce499d34e7 +Author: chenfeiCF +Date: Mon Mar 28 16:05:03 2016 +0800 + + * finish task #2558. + * add manage contacts and refresh button for task and testtask module. + +commit 7767e14eb59dbff641cb1f5c049f3c1104396a9a +Merge: a3828e0b21 a0d62eea86 +Author: wangyidong +Date: Mon Mar 28 15:52:24 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a3828e0b210873a4fe73ed8ffc3e9ab68ac120c3 +Author: wangyidong +Date: Mon Mar 28 15:34:55 2016 +0800 + + * finish task #2553. + +commit a0d62eea861e0a925a071fc591ec13b7266bc641 +Author: chenfeiCF +Date: Mon Mar 28 13:51:43 2016 +0800 + + * finish task #2557. + +commit 228b0aa59aa95ca0232fed608e13e546ec1f736c +Author: wangyidong +Date: Mon Mar 28 13:28:55 2016 +0800 + + * adjust js for task #1560. + +commit 213e92ee4144f5dd8adebefabaf0f8a65f2627a9 +Author: wangyidong +Date: Mon Mar 28 11:19:39 2016 +0800 + + * change for task #2560. + +commit b474222ed787b57773ea10244187cb00f92f9cb6 +Author: wangyidong +Date: Mon Mar 28 10:15:44 2016 +0800 + + * code for task #2560. + +commit 4c06f689c4437671fe98faf458594b0e8fbc3c27 +Merge: 578f27a8dc 8d843914d4 +Author: wangyidong +Date: Mon Mar 28 09:28:43 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 578f27a8dcd5b9383587fd7ccc1e1e3f0429df99 +Author: wangyidong +Date: Mon Mar 28 09:27:59 2016 +0800 + + + add for task 2561. + +commit be07c40bf79e17184b924119bdfae2378b214a38 +Author: wangyidong +Date: Mon Mar 28 09:27:09 2016 +0800 + + * code for task #2561. + +commit 8d843914d4defc0213bcdd104bbc0de7471fc22f +Author: chenfeiCF +Date: Fri Mar 25 17:27:08 2016 +0800 + + * finish task #2543. + * adjust method name createGroupLink to createGroupManageMemberLink. + +commit 902963c8f6f024575629f4c4dbe1f686410a230f +Author: wangyidong +Date: Fri Mar 25 14:25:14 2016 +0800 + + * fix bug for doc tree menu. + +commit 420ff1ab87539dd781d155e7a3b4278723322855 +Merge: d4dd709c33 53175bca26 +Author: wangyidong +Date: Fri Mar 25 13:34:14 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d4dd709c333fdf745105e08dd38d1d72906d8f18 +Author: wangyidong +Date: Fri Mar 25 13:33:37 2016 +0800 + + * adjust for build search sql. + +commit 256383e5e318cb42d3bc33a6f97b5d22c06a1a46 +Author: wangyidong +Date: Fri Mar 25 13:32:45 2016 +0800 + + * finish task #2575. + +commit 53175bca26780df7ef90aad3e4ba79c88cc8c699 +Author: chenfeiCF +Date: Fri Mar 25 10:26:49 2016 +0800 + + * finish task #2565. + +commit c338e0277ac6a58fb4a8f4a06dc79a4e025a11fc +Author: chenfeiCF +Date: Thu Mar 24 13:35:45 2016 +0800 + + * remove console.log for search module. + +commit 3430178900e5c009ded0727dce14a08212b1fcec (tag: zentaopms_8.1.3_20160323) +Author: wangyidong +Date: Wed Mar 23 13:49:29 2016 +0800 + + * change for zh-tw. + +commit f3e552f275c1b40c8dc54b5bc68a8d8e8cd294a4 +Author: wangyidong +Date: Wed Mar 23 13:45:08 2016 +0800 + + * fix sprintf with %branch%. + +commit e7a1c9e2178a6e8a40a618505610d1eed149cc78 +Merge: 7bda21cac4 bee42a5340 +Author: wangyidong +Date: Wed Mar 23 13:13:13 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7bda21cac46924da904b51ba1c0259057694184c +Author: wangyidong +Date: Wed Mar 23 13:12:46 2016 +0800 + + * fix bug for pro. + +commit bee42a5340d3402cb4eedc8f2157470d575b3da3 +Merge: 4913b98ae0 1b11c85a5d +Author: chenfeiCF +Date: Wed Mar 23 12:13:38 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4913b98ae065677b12f560555f956a4ee051f012 +Author: chenfeiCF +Date: Wed Mar 23 12:06:48 2016 +0800 + + * add activatedCountAB lang item for bug datatable. + +commit 1b11c85a5dfbd509f95a6c086254767449620798 +Merge: 313e0c82e7 63010c7886 +Author: Catouse +Date: Wed Mar 23 11:58:00 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 313e0c82e7569019d810cb7905a05c66db7e943d +Author: Catouse +Date: Wed Mar 23 11:39:26 2016 +0800 + + * fix caption border in table of testtask result. + +commit 807d6af6567b02d25c70eaafca416d24eefd9328 +Author: wangyidong +Date: Wed Mar 23 10:59:40 2016 +0800 + + * change for upgrade. + +commit 63010c78863b14b45469ccf59058a75897c9926b +Author: wangyidong +Date: Wed Mar 23 10:44:22 2016 +0800 + + * fix for load siteCode config. + +commit 366347b29ef73d2890222a7285a31e650aff0d93 +Merge: a015353dea c2174d62dd +Author: wangyidong +Date: Wed Mar 23 10:36:09 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a015353dea0cbfe85b53d0fa73c30da82ad8af63 +Author: wangyidong +Date: Wed Mar 23 10:35:39 2016 +0800 + + * fix for http://www.zentao.net/thread/86375.html. + +commit c2174d62dd8bed4bdc76532bf7bf0ae5ea1a96e2 +Author: chenfeiCF +Date: Wed Mar 23 09:53:35 2016 +0800 + + * fix bug: the estimate can not display if pri title is long when creating a task. + +commit 0339c69ec6cd2a5ca5ebdea7575616d6e64da03b +Author: chenfeiCF +Date: Wed Mar 23 09:52:11 2016 +0800 + + * adjust code for bug #806. + +commit a93628962ee95856845cfb46f4c26c7fd15abc29 +Merge: 50bdd38e19 565ad7ae1c +Author: chenfeiCF +Date: Tue Mar 22 20:52:46 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 50bdd38e19fdce739ac87eb694ac89ae56b844ce +Author: chenfeiCF +Date: Tue Mar 22 20:47:02 2016 +0800 + + * fix bug #806. + +commit 565ad7ae1c36723c34f348da7f92317a093eabfa +Author: wangyidong +Date: Tue Mar 22 17:32:00 2016 +0800 + + * fix bug #812. + +commit c88146591719f881f21c5f954b7378326050fee1 +Author: chenfeiCF +Date: Tue Mar 22 16:26:04 2016 +0800 + + * fix bug #811. + +commit 0f99d48d58ae005c83b61622ab4496cb61977c5e +Author: chenfeiCF +Date: Tue Mar 22 15:19:13 2016 +0800 + + * fix bug #810. + +commit 5733a4d348884480de63f90a1bc4aea2d4b3aa01 +Author: Catouse +Date: Tue Mar 22 11:11:42 2016 +0800 + + * fix usage of tree menu. + +commit d907cda1afe343e5b4f3ce80a1addb1246990895 +Author: Catouse +Date: Tue Mar 22 10:41:15 2016 +0800 + + * enable option 'initialState' in tree to preserve tree state. + +commit 54553e7edbbebd847af6c6cd0f68fe4a4d73154b +Author: chenfeiCF +Date: Tue Mar 22 10:12:14 2016 +0800 + + * fix bug #809. + +commit 06385b32ebd96d976036e77a37660ecf2cbdeec2 +Author: chenfeiCF +Date: Tue Mar 22 09:47:44 2016 +0800 + + * fix bug #808. + +commit c3d4188f6d167292de3c1a470dfcc7e7b2bb8c83 +Author: chenfeiCF +Date: Tue Mar 22 09:26:50 2016 +0800 + + * fix style for tree branch when it is selected. + +commit a3a0d3551a2cc4931cf22e866ba728e8c83bcd48 +Author: Catouse +Date: Mon Mar 21 15:58:35 2016 +0800 + + * fix table border in form for firefox. + +commit 65734d8439954f276d2683e76ec0eaccaea0f21f +Author: wangyidong +Date: Mon Mar 21 11:21:05 2016 +0800 + + * change width when pri has customized. + +commit 28cd5db04a2b053ba4f29d3950abbd29f1c32b67 +Author: wangyidong +Date: Mon Mar 21 11:17:09 2016 +0800 + + * fix a bug for check browser. + +commit 589d4988a44c831ca581a8eeed07a2e02a2b766d +Author: wangyidong +Date: Fri Mar 18 08:23:34 2016 +0800 + + * fix add comment for story/task/bug/case. + +commit 9687085189d5925dad2a43caebab82c1db33f1a4 +Author: wangyidong +Date: Thu Mar 17 11:40:17 2016 +0800 + + * fix a bug from create task module. + +commit cb601c8e911bf1f85bcec2b3668aad5fcf5f2315 +Author: wangyidong +Date: Wed Mar 16 14:42:15 2016 +0800 + + * fix bug for model merge hook and setClientTheme. + +commit 05f7a04679e3eee211f7f19372906b54086970b5 +Author: wangyidong +Date: Wed Mar 16 11:13:34 2016 +0800 + + * adjust find danger upload file. + +commit b7ba4d4a388b369a457e416c95dbd19baa9eea4d (tag: zentaopms_8.1.stable_20160315) +Author: chenfeiCF +Date: Tue Mar 15 11:55:15 2016 +0800 + + * fix bug: can not get queryID when browseType is 'bySearch'. + +commit cf4e151f10b6b31ca1a4a720db44508aac2d3df7 +Author: wangyidong +Date: Tue Mar 15 11:21:43 2016 +0800 + + * add changelog. + +commit bfee27a9123b83642f928fd5efaade10b91bfa9f +Author: wangyidong +Date: Tue Mar 15 11:21:12 2016 +0800 + + * fix bug #804. + +commit b57e0ba64fd4774ac1f74609f2daf7736ffdb59c +Author: wangyidong +Date: Tue Mar 15 11:06:21 2016 +0800 + + * change for zh-tw lang. + +commit 17ac3a89964395a149e928dc8a796503a2f2a3f8 +Merge: dcb944f0ac 9de63a3b15 +Author: wangyidong +Date: Tue Mar 15 11:00:34 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit dcb944f0ac96cfdf939dd4c32b17c91c806b63c5 +Author: wangyidong +Date: Tue Mar 15 11:00:07 2016 +0800 + + * change for priv. + +commit 9de63a3b15ce630eb620fb701d358bb930017c38 +Author: chenfeiCF +Date: Tue Mar 15 10:58:04 2016 +0800 + + * adjust view style for view method of task module. + +commit 9b339ac01f6573886dfe982776d57706ff3b69ca +Author: wangyidong +Date: Tue Mar 15 10:39:16 2016 +0800 + + * fix bug get args for batchCheckIF. + +commit 0b3ef6fba1e79a93af0e9c8e6ea8f8932d169759 +Merge: 0e7c551027 c6d21eec38 +Author: wangyidong +Date: Tue Mar 15 09:57:51 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0e7c5510276a0a5b26e01fe36e6c157da2754257 +Author: wangyidong +Date: Tue Mar 15 09:57:03 2016 +0800 + + * fix zget function and fix error. + +commit 7f2c61c891272b996771f1117f5f887b91fbf863 +Author: wangyidong +Date: Tue Mar 15 09:56:33 2016 +0800 + + * change for browse notice. + +commit 7a0c7932702667acd2dadbe09b97128bd0386d03 +Author: wangyidong +Date: Tue Mar 15 09:53:16 2016 +0800 + + * adjust framework and check mobile. + +commit c6d21eec38091a3f8a725b2d2535ca27464ddba2 +Author: chenfeiCF +Date: Tue Mar 15 09:51:05 2016 +0800 + + * add confirmBug action icon for zentao mobile web. + +commit 8c32fc916a3319571533b4beec13b0530b48d24d +Merge: b5a42dedda e549511cbb +Author: wangyidong +Date: Mon Mar 14 16:00:26 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e549511cbb199ff7332e7b8e2a341436c6e2cbb2 +Merge: c374a6e482 e843e0004d +Author: Catouse +Date: Mon Mar 14 15:59:13 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b5a42deddaaccb8654057c8e487ebe21db83e178 +Author: wangyidong +Date: Mon Mar 14 15:59:12 2016 +0800 + + * fix beginIF for dao.class.php and saveQueryCondition for doc. + +commit c374a6e4821bc15b2196ce106380d915e7b8d15c +Author: Catouse +Date: Mon Mar 14 15:58:59 2016 +0800 + + * fix table border in iframe modal in firefox. + +commit e843e0004d5e5c1a7d28b05ecef2d6f8992a0257 +Author: wangyidong +Date: Mon Mar 14 14:56:20 2016 +0800 + + * adjust code for ajaxGetSonModules. + +commit d0a31b775e5d0cda57086ac2768977b98502e006 +Author: wangyidong +Date: Mon Mar 14 14:51:11 2016 +0800 + + * change testcase getByAssigento => getByAssignedTo, getByOpened => getByOpenedBy. + +commit fa11f088a6ce073da2eaf7a2cee972941e548fb3 +Author: wangyidong +Date: Mon Mar 14 14:44:28 2016 +0800 + + * change getWillClose to get2BeClosed and adjust width for create story. + +commit 0bd5173f01172712734fb380ccd4acc477a33393 +Merge: 14f376e399 cc24cd982c +Author: wangyidong +Date: Mon Mar 14 14:40:26 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 14f376e3993fb4c648db15417fa51ea0cc70bc30 +Author: wangyidong +Date: Mon Mar 14 14:39:35 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 01fec363c4c6d17e3ffbe92260cfc8cea8a88711 +Author: wangyidong +Date: Mon Mar 14 14:38:15 2016 +0800 + + * remove a css style. + +commit 9cfcab7dff4cd2d81dd78ccb4cf8768f2c7764c0 +Merge: 96a8ff86f7 0d7558d206 +Author: wangyidong +Date: Mon Mar 14 14:29:49 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 96a8ff86f712c7511e1496d15543644e90d33884 +Author: wangyidong +Date: Mon Mar 14 14:29:27 2016 +0800 + + * adjust for check session. + +commit 82a46bd19643d42d96e484575eb2fc94e30284d5 +Author: wangyidong +Date: Mon Mar 14 14:17:41 2016 +0800 + + * fix bug for check icovn or mb_convert_encoding and check Directory separator. + +commit ff43f65926f73f43ec6d99c47456b27d69a69444 +Author: wangyidong +Date: Mon Mar 14 14:03:27 2016 +0800 + + * adjust var name and adjust compressImage function. + +commit 5dfd9e57e9113114ef85b8658ebcbcf5b388875b +Author: wangyidong +Date: Mon Mar 14 13:25:45 2016 +0800 + + * adjust var name and add notes for custom. + +commit b5059fa0a5102346a0d8cdf85f95f273eabf01d4 +Author: wangyidong +Date: Mon Mar 14 12:59:42 2016 +0800 + + * adjust code for var name. + +commit 81c74520084440a967dea262211b3bcbb253204a +Merge: f3bb4d7e3e 4f4ddb3e5f +Author: wangyidong +Date: Mon Mar 14 12:55:31 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f3bb4d7e3e99d439e5d09a432b47537b5918aa6c +Author: wangyidong +Date: Mon Mar 14 12:55:04 2016 +0800 + + * fix for parseJSON. + +commit b9b6821d36d05ba17ed30df3231044b9c36c4192 +Merge: 8bbad78ec1 d9ea62d417 +Author: chenfeiCF +Date: Mon Mar 14 12:00:32 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d9ea62d417a417c7f0af9bb8349b6f72e3bc9ce9 +Merge: d0030e82d3 b2d49204b8 +Author: Catouse +Date: Mon Mar 14 17:15:50 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d0030e82d340dcfbf0b90a24c91fc90b597b5eeb +Author: Catouse +Date: Mon Mar 14 17:15:42 2016 +0800 + + * fix table border in firefox. + +commit 8bbad78ec1ad2aa4ffc7cb490e21d90beacf8232 +Author: chenfeiCF +Date: Mon Mar 14 11:59:34 2016 +0800 + + * 1.added story verify in task view. + * 2.put story spec, verify and file together. + +commit b2d49204b8c7e46040a3d9ef3b247e3010c68d0f +Author: chenfeiCF +Date: Mon Mar 14 11:31:02 2016 +0800 + + * move checkIP method to common model from user model. + +commit 0f6e89bd702ff9e662c39b4ce209873fd5491269 +Author: wangyidong +Date: Mon Mar 14 11:28:01 2016 +0800 + + - rm treeview.html.php. + +commit 516b1f003407ef5ffd074d83ed03b7ccae09c9ee +Author: wangyidong +Date: Mon Mar 14 10:48:42 2016 +0800 + + * change hasEdited to editedByOther in common lang. + +commit ae46e92be5f2ae005985a0a966d36b9561c25e79 +Author: wangyidong +Date: Mon Mar 14 10:43:04 2016 +0800 + + * change selectAll to selectButton in list. + +commit 3d349b45d8f94dbb23056d4ad700f5f694a4fa88 +Author: wangyidong +Date: Mon Mar 14 09:32:30 2016 +0800 + + * remove unset lastEditedDate. + +commit cc24cd982cd19c7832bc8923d4da1e8f1d030080 +Merge: 70776effd6 9cfcab7dff +Author: chenfeiCF +Date: Mon Mar 14 09:11:15 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9b050fea1629950c143ceaea4e7add368033ea51 +Author: wangyidong +Date: Mon Mar 14 09:08:06 2016 +0800 + + * change mailtitle to mailTitle. + +commit 800a0efd9ec6fed9d55d266d04c1352246778296 +Author: wangyidong +Date: Mon Mar 14 09:05:58 2016 +0800 + + * check unique add branch condition when create build and release. + +commit 70776effd69e3f559a65e2f2fe3e9edf8d22021c +Author: chenfeiCF +Date: Mon Mar 14 09:00:57 2016 +0800 + + * 1.change ajaxUnlink method to unlink in order to adding privilege. + * 2.add method lang item for managePriv in group module. + +commit 0d7558d2062356dcb2bdf986f452f87b780b1288 +Merge: 6c26ebb27f 82a46bd196 +Author: chenfeiCF +Date: Mon Mar 14 09:00:12 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6c26ebb27f8bd35d497e7927f8b833ea40ff1f02 +Author: chenfeiCF +Date: Mon Mar 14 08:55:38 2016 +0800 + + * add method privilege for link or unlink story, bug, case. + +commit c604bf2ba21c4e68b3b080c1446e6c3bae532e85 +Author: wangyidong +Date: Mon Mar 14 08:39:16 2016 +0800 + + * adjust for control send fail. + +commit 5188f6aa0beaeab5542cbce6cf44db9a727fda9d +Merge: 1a8a8a0be4 0bebfe176a +Author: wangyidong +Date: Mon Mar 14 08:10:15 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4f4ddb3e5f114229ad9a3adbef8c75bc627c927e +Author: chenfeiCF +Date: Mon Mar 14 06:09:14 2016 +0800 + + * if task is from bug, setImgSize for bug steps. + +commit 0bebfe176a2fa85c0c7b5b83c0c222286c18d1de +Author: chenfeiCF +Date: Mon Mar 14 02:44:40 2016 +0800 + + * delete lang items which have not been used. + +commit eb20cc47413c17f228b2d89a4d56e2829abf08ac +Author: chenfeiCF +Date: Sun Mar 13 11:54:47 2016 +0800 + + * fix the bug: not load search model when calling setSearchParams method. + +commit 0190934f07b8c0757788ede4dd50b0e052dbf30a +Author: chenfeiCF +Date: Sun Mar 13 10:56:16 2016 +0800 + + * add empty mode for getPairs method of project model. + +commit 6b055c87fec29bbdc63fabdc3b72b980d157b6b5 +Author: chenfeiCF +Date: Sun Mar 13 08:02:35 2016 +0800 + + * put getDeptUserPairs method from group model to dept model. + +commit bf33b5f10804902a3d70113ddede2770db52847d +Author: chenfeiCF +Date: Sun Mar 13 07:49:46 2016 +0800 + + * adjust code for getUsers method of company module. + +commit ab8f86396fb31ba6d7dd2bc0d21b667d3b1d3304 +Author: chenfeiCF +Date: Sun Mar 13 07:43:03 2016 +0800 + + * adjust buildSearchForm method: put setSearchParams method in model. + +commit 931a13641b94e6bb1a666e9c9bbebb0a201cb3a6 +Author: chenfeiCF +Date: Sun Mar 13 05:19:13 2016 +0800 + + * 1.added action labels for link or unlink action. + * 2.added desc of actions for link or unlink related case. + +commit 80a39594155060525e483e2bbf094610aaf950b5 +Author: chenfeiCF +Date: Sun Mar 13 05:11:59 2016 +0800 + + * 1.change deleteLinkedCase method name to unlinkCase. + * 2.adjust style for linkCases.html.php and delete lang item for link and unlink action. + +commit 4dcaa49d5b514391080f46c88f46ee536ba19ad5 +Author: chenfeiCF +Date: Sun Mar 13 04:42:47 2016 +0800 + + * 1.change deleteLinkedBug method name to unlinkBug. + * 2.adjust code for bug module. + +commit a3c5e42a7c194f7ef45195dc7c0ee83210eee92f +Author: chenfeiCF +Date: Sun Mar 13 04:26:13 2016 +0800 + + * 1.change deleteLinkedStory method name to unlinkStory. + * 2.adjust the code for story module. + +commit eff03084c3a64b30845412cee5657f900c6f5de8 +Author: chenfeiCF +Date: Sat Mar 12 22:09:06 2016 +0800 + + * if save search query successfully, display the query title in query select box. + +commit 4763dc65f73046077e17f59725f0c729a939bed0 +Author: chenfeiCF +Date: Sat Mar 12 21:40:24 2016 +0800 + + * change the code style for browse method of release module. + +commit 55c2f7e63ae0fb521df6827f1af5e2d459938b95 +Author: chenfeiCF +Date: Sat Mar 12 21:36:26 2016 +0800 + + * change the code style for story.js of project module. + +commit 91194fccccf597f966c2846e04b34731fba23455 +Author: chenfeiCF +Date: Sat Mar 12 21:32:03 2016 +0800 + + * change getStoryStages method name to batchGetStoryStage. + +commit bbbd0891ffac5bb66b7ba23acb7831e985f63bea +Author: chenfeiCF +Date: Sat Mar 12 21:16:34 2016 +0800 + + * put the hint of preAndNext shortcut key on the back of title. + +commit 1a8a8a0be4a02af168699b1f54a1e7236ca822b7 +Author: wangyidong +Date: Fri Mar 11 17:31:39 2016 +0800 + + * adjust mail style. + +commit aea3e80a3f2d4abd7179b3ad2a167d85046967d0 +Author: wangyidong +Date: Fri Mar 11 15:19:00 2016 +0800 + + * adjust style for bug create. + +commit 563541db13c6539377e7ce108e58ba8142f60568 +Author: wangyidong +Date: Fri Mar 11 15:01:09 2016 +0800 + + * adjust code. + +commit 2a748ac35ff51f7591bcab6301cce4ff9a44b745 +Author: wangyidong +Date: Fri Mar 11 14:56:58 2016 +0800 + + * adjust required style. + +commit 470eb3a2816c5fb7a9f16fe2457ec0468c08466c +Author: wangyidong +Date: Fri Mar 11 14:56:36 2016 +0800 + + * adjust code for common. + +commit 2a8d4e92ebbf22c5267290eac55deee4f448a3dc +Merge: ba4efcfa7f a4ca492969 +Author: wangyidong +Date: Fri Mar 11 14:51:54 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a4ca492969c1c07a558b0314ba7fb434838f6992 +Author: Catouse +Date: Fri Mar 11 13:06:54 2016 +0800 + + * set min height for form in iframe modal. + +commit 7e626c0b6bf40b2d70472c460dae5ddc9df05a70 +Author: Catouse +Date: Fri Mar 11 13:04:02 2016 +0800 + + * fix UI for modal trigger and ajax replace. + +commit cd760834afb7ba2e614cae4f669a218f44d1b280 +Author: Catouse +Date: Fri Mar 11 12:24:57 2016 +0800 + + * ajust code. + +commit 51b555c101938a296e1aeb7395858c503a18b115 +Author: Catouse +Date: Fri Mar 11 12:24:48 2016 +0800 + + * change modal trigger markup. + +commit 81c9b4d0205118b74feaf8f6d5c8ace5a9d5c46b +Author: Catouse +Date: Fri Mar 11 11:42:57 2016 +0800 + + * prevent default behavior for modal trigger. + +commit 41df2d107be1b09f8ba7109c172a8fe0a1fca36e +Author: Catouse +Date: Fri Mar 11 11:42:32 2016 +0800 + + * change shadow effect for main UI. + +commit 80957347adb7e173a93bb3d001d0b94c7ee71580 +Author: Catouse +Date: Fri Mar 11 10:07:34 2016 +0800 + + * change order of buttons in bootbox by update zui. + +commit ba4efcfa7f79d4e491c4e4fc0a390017cb5e2e52 +Merge: b0e0241676 7c349639df +Author: wangyidong +Date: Fri Mar 11 09:32:02 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b0e024167653b156e5a89822be37bacac43a22d9 +Author: wangyidong +Date: Fri Mar 11 09:02:31 2016 +0800 + + * change for framework. + +commit 7c349639df20c49ad0b7a2e8cbe57b3e655710b9 +Author: chenfeiCF +Date: Fri Mar 11 07:30:36 2016 +0800 + + * 1.add linkCases method for testcase module. + * 2.hide fromBug or toBugs if not exist for testcase. + +commit 026dbe2f25632ce00bd5952cb08e2b28f0578f38 +Author: chenfeiCF +Date: Fri Mar 11 07:25:58 2016 +0800 + + * add view file for linkBugs method. + +commit 6f9b3d3e614cc405bd4f990840e504228a3d648d +Author: chenfeiCF +Date: Fri Mar 11 07:13:47 2016 +0800 + + * 1.add link bug method for bug module. + * 2.hide toStory, toTask or toCase when not exit for bug. + +commit 1e22ef4ea7674e4f2c99d7827f7da319e37b35df +Author: chenfeiCF +Date: Fri Mar 11 06:55:17 2016 +0800 + + * adjust code for linkStory method and change the style for edit method. + +commit 5f975e60ba9db56405e3acabff99561da882a091 +Author: Catouse +Date: Thu Mar 10 18:23:00 2016 +0800 + + * change style for table fixed in scrolling. + +commit 4fc1f5286b51f38c0a45b75b8cce03895d236003 +Author: Catouse +Date: Thu Mar 10 17:46:39 2016 +0800 + + * update zui. + +commit 142915aa3053d71cd9e9ff174c3b98040b585f31 +Merge: c96be8964a 7ba54fb85b +Author: wangyidong +Date: Thu Mar 10 11:16:00 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c96be8964abbb559a03b7b5b887cb25203ec1266 +Author: wangyidong +Date: Thu Mar 10 11:15:24 2016 +0800 + + * change for framework. + +commit 2417ceeea2be3f52f97c209e57aac512b85934ea +Author: wangyidong +Date: Thu Mar 10 10:26:29 2016 +0800 + + * fix style. + +commit 019969ab90217505cfda0ec8f2cd2ed085926872 +Author: wangyidong +Date: Thu Mar 10 10:25:59 2016 +0800 + + * fix for fixed tfoot. + +commit 7ba54fb85b9bcf7f17b17384e4641e6b52f0f492 +Author: chenfeiCF +Date: Thu Mar 10 10:20:35 2016 +0800 + + * add getBySearch method for testcase model.php. + +commit 0b99aaea7e726aa4ebd534ba7231b324548980e1 +Author: wangyidong +Date: Thu Mar 10 10:08:12 2016 +0800 + + * adjust for fix tfoot action. + +commit b899f67e5cbee1300e69d70c89269d5388b5898b +Merge: dffd808378 6d6d0a85dd +Author: wangyidong +Date: Thu Mar 10 09:32:11 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit dffd8083787c96ea403171f276c1c1c4c0a3ecba +Author: wangyidong +Date: Thu Mar 10 09:30:15 2016 +0800 + + * change for lib can extend with base. + +commit e617014b6514cbe4481ef1ef5c1442f2460693da +Author: wangyidong +Date: Thu Mar 10 09:29:42 2016 +0800 + + * adjust for fixed tfoot action. + +commit 6d6d0a85dd59aaf193add40f85222cce6dfe0318 +Author: chenfeiCF +Date: Thu Mar 10 07:41:53 2016 +0800 + + * change the return type for ajaxGetLinkedStories, ajaxDeleteLinkedStory, linkStories, deleteLinkedStory, getLinkedStories method. + +commit c30be46e52354506407d6f85e9369f6912a4e478 +Author: chenfeiCF +Date: Wed Mar 9 22:30:41 2016 +0800 + + * 1.use ajax when delete search query. + * 2.adjust for task #2467. + +commit e996a9d4ed1058b6c2adf16084767f8baad28a3b +Author: chenfeiCF +Date: Wed Mar 9 21:30:53 2016 +0800 + + * 1.change 'Set view' to 'Assign' for company and product module. + * 2.adjust code and fix error for linkstory method of story module. + +commit 61fb9e38babf41ff3821d10a2438160a4c7521e5 +Merge: 2e7698db31 140a15b0be +Author: wangyidong +Date: Wed Mar 9 17:36:40 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2e7698db31cf5a0d8f2756435685a7367d46e994 +Author: wangyidong +Date: Wed Mar 9 17:36:02 2016 +0800 + + * change for framework. + +commit 4569039d98d8772e9605c0b977165fd0d7ff856f +Author: wangyidong +Date: Wed Mar 9 17:35:26 2016 +0800 + + * fix style for selectButton. + +commit 7da16e22ca47d3ab2747f8d69d77f8f4399df589 +Author: wangyidong +Date: Wed Mar 9 17:35:11 2016 +0800 + + * change index name for db. + +commit 140a15b0be2a0fcc77e87cdb6f224ebbca5216d4 +Author: chenfeiCF +Date: Wed Mar 9 16:50:36 2016 +0800 + + * change the dao property name for task #2458. + +commit 7a1eb61efdaa941bcdc94167e0ce1a3a546561d2 +Merge: 40a300031e 12bdd87463 +Author: chenfeiCF +Date: Wed Mar 9 13:15:25 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 40a300031e3afe482652f6d3c15e267f6989b30e +Author: chenfeiCF +Date: Wed Mar 9 13:14:36 2016 +0800 + + * adjust code for story module. + +commit 12bdd874634b7c0f577ce54c4c58c8940368d17d +Author: wangyidong +Date: Wed Mar 9 13:13:50 2016 +0800 + + * fix bug. + +commit 6f673a06ed83bd4c07f12572a81804d545193289 +Merge: 81375e9147 80b9d18d73 +Author: wangyidong +Date: Wed Mar 9 13:13:13 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 80b9d18d73d3223fb3948de159f24a5bfdaef92b +Author: chenfeiCF +Date: Wed Mar 9 13:03:06 2016 +0800 + + * add link story method when edit a story. + +commit 81375e91470738dc880d4ab7df00821bbc490808 +Author: wangyidong +Date: Wed Mar 9 09:32:19 2016 +0800 + + * adjust code for fixed table. + +commit a04db8bc49ab89d6e17dfc82d38aad67a6d46abd +Author: wangyidong +Date: Tue Mar 8 16:27:47 2016 +0800 + + * change for upgrade. + +commit 4f7b7266f43e77d7ae0f38f61d2da241dc353edc +Author: wangyidong +Date: Tue Mar 8 15:37:13 2016 +0800 + + * adjust code for custom lang. + +commit 3525fe15bc6e1420fcc70641a07e951154546110 +Author: wangyidong +Date: Tue Mar 8 13:50:09 2016 +0800 + + * fix error. + +commit 152ad148e67a6ae68c6006f9a0f1dcc141c40cdb +Merge: df85f2625e 454d7d4942 +Author: wangyidong +Date: Tue Mar 8 11:34:12 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit df85f2625e42c9dbb3bcb0a1a6d1bbc49d100b00 +Author: wangyidong +Date: Tue Mar 8 11:32:48 2016 +0800 + + * finish task #2474 and fix bug. + +commit 454d7d49423a6c44173fe35b6a086468b38cc210 +Author: Catouse +Date: Tue Mar 8 09:15:43 2016 +0800 + + * change style in default theme for datatable. + +commit 26d831d0b6d0b2f1a5665a1995a27c02055e2d7c +Merge: 5722d28e77 8c05dd59f4 +Author: wangyidong +Date: Tue Mar 8 09:10:18 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8c05dd59f464470e7a3f4cc64b3c4e29b58edc5d +Author: Catouse +Date: Mon Mar 7 14:07:49 2016 +0800 + + * improve UI of forms for create action. + +commit 18f97e6478fbd5edaf8419838da0f0f83d841963 +Author: Catouse +Date: Mon Mar 7 13:35:13 2016 +0800 + + * change UI of buttons in table footer. + +commit d97d22c0db6bd92e69a48a0bde6cbf59b24a8fe2 +Author: chenfeiCF +Date: Mon Mar 7 13:16:51 2016 +0800 + + * add story files and comments for task view. + +commit 5722d28e7786128f08f6a9042f24707452d6daaf +Author: wangyidong +Date: Mon Mar 7 11:15:58 2016 +0800 + + * fix bug #785. + +commit fb65e3660bb975dcd9a3478ce2eb55b3836c3ed7 +Author: wangyidong +Date: Mon Mar 7 10:06:20 2016 +0800 + + * finish task #2494. + +commit b3583677dec8e604d7c4be4e216194ed7254f797 +Author: Catouse +Date: Fri Mar 4 17:30:45 2016 +0800 + + * change style of priority icon. + +commit 8c911f45daf3dcda3a7e9952667f5d359e254b5f +Merge: dad0b0395d 4017b1ae75 +Author: Catouse +Date: Fri Mar 4 17:17:55 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dad0b0395d098b869a020e950425a87ededd3bbc +Author: Catouse +Date: Fri Mar 4 17:17:42 2016 +0800 + + * change UI for create forms. + +commit 4017b1ae752479d15462ef3279193daaaff795df +Author: wangyidong +Date: Fri Mar 4 15:21:18 2016 +0800 + + * set time limit to 7200. + +commit 7603866e92dd9b4fc2d5364d968cd21b14590dcb +Author: wangyidong +Date: Fri Mar 4 14:50:48 2016 +0800 + + * merge in db and adjust code. + +commit 0d47f23a1913aa243953464de1e8590c63ec0f38 +Merge: f6186e949c 3e19bde847 +Author: wangyidong +Date: Fri Mar 4 14:43:21 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3e19bde84759eec34322dc67994c1e2e2aa39b1a +Author: chenfeiCF +Date: Fri Mar 4 14:40:51 2016 +0800 + + * merge the update8.0.1.sql. + +commit f6186e949cac151cf083e3463e9ea0f13044a8d9 +Author: wangyidong +Date: Fri Mar 4 14:15:01 2016 +0800 + + * adjust code for dao check. + +commit f36272ed99894b059309fc93be7a9017ba017ffa +Author: wangyidong +Date: Fri Mar 4 14:14:15 2016 +0800 + + * fix bug #772. + +commit 401e2c0ac1581eaca0abba4d92f4509a010628b6 +Author: wangyidong +Date: Fri Mar 4 13:50:01 2016 +0800 + + * fix bug #789. + +commit 9cc1a9e055e62aa716d0d57eafdd480823b93ddc +Author: wangyidong +Date: Fri Mar 4 13:36:33 2016 +0800 + + * adjust code. + +commit 051e6530d8ae7289f5f5ff75e135c78dbf2b1da8 +Author: wangyidong +Date: Fri Mar 4 13:36:09 2016 +0800 + + * fix bug #795. + +commit 833d40aba6466b7013f590c0ed19aacebd8bbd91 +Merge: 8bb0290077 51d75e71a2 +Author: wangyidong +Date: Fri Mar 4 13:08:31 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8bb029007756dd7355be68e3e5ae168fd97c82bb +Author: wangyidong +Date: Fri Mar 4 13:07:20 2016 +0800 + + * fix bug #801. + +commit 51d75e71a2a0299e01bf3ceb6d0f7258a7737272 +Author: Catouse +Date: Fri Mar 4 13:01:28 2016 +0800 + + * add method to init priority selectors. + +commit 0dafbb66dd2443fbc4ecfafa4e85c4559cf2d380 +Merge: f1454d2d99 59c99c29f3 +Author: Catouse +Date: Fri Mar 4 12:20:20 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + + Conflicts: + www/js/my.full.js + +commit f1454d2d991fa1e8f722ae0c79a0468728279b5b +Author: Catouse +Date: Fri Mar 4 12:18:42 2016 +0800 + + * create new UI for priority selectors. + +commit f4980f8377df114619d20d1979cbd55710ed64da +Author: Catouse +Date: Fri Mar 4 12:17:53 2016 +0800 + + * add css helpers. + +commit 2fc659447f919d5ef5f3501eb13f5f62a1dcd1bf +Author: Catouse +Date: Fri Mar 4 12:17:23 2016 +0800 + + * add white space to button and link in login form. + +commit 4f9fd70b9e4f3cdbd620ce9130e06b4c50b4d09a +Author: Catouse +Date: Fri Mar 4 12:17:03 2016 +0800 + + * improve UI of story/create view. + +commit 59c99c29f3ce5b84e619626604b0e5742a4c9558 +Author: wangyidong +Date: Fri Mar 4 11:36:21 2016 +0800 + + * adjust code for bug #792. + +commit d9e1606b2e2b0c5dfa0cb99387cfea2488a4aca1 +Author: wangyidong +Date: Fri Mar 4 11:33:54 2016 +0800 + + * fix bug #792. + +commit bc18f5d692672785ebbb7c4eabe5126e906af0f0 +Author: wangyidong +Date: Fri Mar 4 10:36:18 2016 +0800 + + * fix bug #796. + +commit a8089272bca340821ccde277e7ed27fc55bd19a0 +Merge: 59917d3a0a 2dbfa69498 +Author: wangyidong +Date: Thu Mar 3 15:42:19 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 59917d3a0aeb3e55b0843c1b1de83238479fac83 +Author: wangyidong +Date: Thu Mar 3 15:41:00 2016 +0800 + + * finish task #2424. + +commit 2dbfa6949833e7d455d5c646c38477c7e3691f9c +Author: chenfeiCF +Date: Thu Mar 3 13:58:22 2016 +0800 + + * finish task #2471. + +commit 2f9ac5d436cab84f7e8585c4d8f48d33b481ba0d +Author: chenfeiCF +Date: Wed Mar 2 17:35:05 2016 +0800 + + * refactor task method for project module. + +commit 46eeec68aa6044dcfdead1f135ae88b5970df952 +Merge: 274639baa5 af9f3f8d37 +Author: wangyidong +Date: Wed Mar 2 15:25:40 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 274639baa5423696c97253798c065bf0c7f689dd +Author: wangyidong +Date: Wed Mar 2 15:25:27 2016 +0800 + + * fix bug. + +commit af9f3f8d372e19f5efb2d82b1cc801ca31605913 +Author: chenfeiCF +Date: Wed Mar 2 14:24:49 2016 +0800 + + * refactor browse method for doc module. + +commit 09c8fa8aa8dd606b57312c51f40d31bb79f480f2 +Merge: 20aa49dea9 abfb3f5fa5 +Author: wangyidong +Date: Wed Mar 2 13:28:44 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 20aa49dea99cfde10d5f0269f18f4f1860051b11 +Author: wangyidong +Date: Wed Mar 2 13:28:04 2016 +0800 + + * fix bug #797 and adjust frawework. + +commit abfb3f5fa59a620ef38adaaca024218b3ebe6750 +Author: chenfeiCF +Date: Wed Mar 2 11:11:57 2016 +0800 + + * adjust code for browse method of release module. + +commit a4fbf1ddef4268eb881ed45ea689921cfb24fa9a +Author: chenfeiCF +Date: Wed Mar 2 10:46:28 2016 +0800 + + * refactor browse method for testcase module. + +commit 12ec619856fcc0b5e4e144a680a0a1fdb218c77e +Author: chenfeiCF +Date: Tue Mar 1 08:28:35 2016 +0800 + + * refactor browse method for product module. + +commit c7168f7db778dd3fc9d5992f47f41566bd919874 +Author: chenfeiCF +Date: Tue Mar 1 06:52:21 2016 +0800 + + * refactor browse method for company module. + +commit cb7663e691d04986a0eea68c4c2aa1e0101d14ad +Author: chenfeiCF +Date: Tue Mar 1 06:21:48 2016 +0800 + + * adjust code for bug module. + +commit c1a45df1cd836550299daa99fb455442d8e457ac +Merge: ffd58aebb7 127d2e6a40 +Author: wangyidong +Date: Tue Mar 1 14:48:20 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ffd58aebb71c1b963d1378afd5ff4d221cbc25be +Author: wangyidong +Date: Tue Mar 1 14:48:02 2016 +0800 + + + add myrouter class. + +commit da0b5e611dd8f50e7f13751a4e9e9182af25a9fc +Merge: e23311969d 7f66f2018e +Author: wangyidong +Date: Tue Mar 1 10:58:35 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e23311969d521af6f1fdde20115639cba3a7cdb2 +Author: wangyidong +Date: Tue Mar 1 10:57:53 2016 +0800 + + * change for new framework. + +commit 127d2e6a407e1ecd29014ef282d4ac99a60db4ad +Author: chenfeiCF +Date: Tue Mar 1 06:00:25 2016 +0800 + + * refactor browse method for bug module. + +commit 7f66f2018e6913934a1addd7aadbc0fb2a857250 +Author: chenfeiCF +Date: Tue Mar 1 02:09:18 2016 +0800 + + * finish task #2501. + +commit 8a604925eed82f93a962295dfff8315b933d37a9 +Author: chenfeiCF +Date: Mon Feb 29 10:16:34 2016 +0800 + + * finish task #2492. + +commit 288bfe5758b48a6aeea682334b3c7e86d798b626 +Author: chenfeiCF +Date: Thu Feb 25 15:21:04 2016 +0800 + + * finish task *2467. + +commit 3abf28e9ed5f0319099ca3eb9d5c1f5cc7d12dce +Author: chenfeiCF +Date: Thu Feb 25 15:12:11 2016 +0800 + + * adjust style of file/buildform. + +commit 69f7a3341e424fba8a72ba90813c9ef631be7ddb +Merge: 7bb16d8f92 f3edc332fd +Author: QingDao Nature Easy Soft Network Technology Co,LTD +Date: Wed Feb 24 17:05:54 2016 +0800 + + Merge pull request #3 from syncxplus/master + + * Update chmod command in Makefile, working on Mac OSX + +commit 7bb16d8f922a0ef47c44e9315e8b6783b18c614d +Author: wangyidong +Date: Wed Feb 24 16:00:21 2016 +0800 + + * finish task #2510. + +commit f3edc332fd9892b186c832db0007e1ceb28b4162 +Author: jibo +Date: Wed Feb 24 15:40:43 2016 +0800 + + Update chmod command in Makefile, working on Mac OSX + +commit b321098c26dc74d22c2da997559d79fbd067f554 +Author: wangyidong +Date: Wed Feb 24 14:52:54 2016 +0800 + + * finish task #2508. + +commit 8c3028d3c0fbe296701ad10b61fb20a0d3863b08 +Merge: 997f691665 8a5df03463 +Author: wangyidong +Date: Wed Feb 24 13:58:30 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 997f691665ac340ea0f29c3de7ad1d030f6170cd +Author: wangyidong +Date: Wed Feb 24 13:06:59 2016 +0800 + + * code for task #2470. + +commit 8a5df0346334c96bc4e6473fc6f1ede8f3a5d7d2 +Author: Catouse +Date: Wed Feb 24 10:34:58 2016 +0800 + + * fix style of group/managemember. + +commit a26186746871d8c869b60df959cbeb65cd343f63 +Merge: b8474bddf5 7683db7228 +Author: wangyidong +Date: Wed Feb 24 08:41:08 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b8474bddf5ef75019af103112d7c21771241abf2 +Author: wangyidong +Date: Wed Feb 24 08:38:49 2016 +0800 + + * fix bug. + +commit 7683db7228fcd476ac722cdfeb6d2dd325540b2d +Author: chenfeiCF +Date: Tue Feb 23 21:46:26 2016 +0800 + + * finish task #2459. + +commit 0269715534248451473c1b8edad1bbc2fef89077 +Author: chenfeiCF +Date: Tue Feb 23 21:03:20 2016 +0800 + + * adjust code for task #2015. + +commit 8499ea4819c05ebddbe5153e948f0d4e8267e4ed +Author: chenfeiCF +Date: Tue Feb 23 20:56:35 2016 +0800 + + * finish task #2015. + +commit 8373cc09cf4aea3b3b06f3294f390208d8878ebd +Author: Catouse +Date: Tue Feb 23 16:56:02 2016 +0800 + + + add zentao logo. + +commit 334a0b1009f39d14b333623c26fd3ef4e802b259 +Author: Catouse +Date: Tue Feb 23 16:55:50 2016 +0800 + + * change UI of mail content for user. + +commit ae4fd31b3d79c92b764b01059280c233d020490f +Merge: ea56bf4d25 98e7f59798 +Author: Catouse +Date: Tue Feb 23 15:43:37 2016 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ea56bf4d254582352becce75dc9cdcf820eb9cd0 +Author: Catouse +Date: Tue Feb 23 14:36:02 2016 +0800 + + * ajust action history list style. + +commit 98e7f59798ff24537437ddea09d965ae65c0f5be +Author: chenfeiCF +Date: Tue Feb 23 13:41:52 2016 +0800 + + * finish task #2482. + +commit baa2b472c232aa1aa7d95bb4cb08e2d809bee902 +Author: chenfeiCF +Date: Mon Feb 22 21:49:51 2016 +0800 + + * finish task #2493. + +commit 8c284f445963d8aa33ca37138c7e837a86eec863 +Author: Catouse +Date: Mon Feb 22 17:21:17 2016 +0800 + + * change alert style in mail/save UI. + +commit 2bde4bcba28c40782fa93c9cf15d7889afa15ae5 +Author: Catouse +Date: Mon Feb 22 17:21:04 2016 +0800 + + * disable autocomplete of date input. + +commit 2f8121190db1f5dfe8cc7f3485ecb5d6463685e9 +Author: Catouse +Date: Mon Feb 22 17:08:45 2016 +0800 + + * finish task #2509. + +commit 338cfa239b8eaba189585807fedd3c22e02890f9 +Author: Catouse +Date: Mon Feb 22 15:32:50 2016 +0800 + + * remove right border of button in search form. + +commit d06f0ecb5fd6c588e6372fd5297010dab7fd557a +Author: Catouse +Date: Mon Feb 22 15:29:39 2016 +0800 + + * change margin of titlebar. + +commit 80b50cb041719965bd815f81424fa6f190522bd1 +Author: Catouse +Date: Mon Feb 22 15:14:31 2016 +0800 + + * ajust style of project/manageproducts UI. + +commit 9141bb13d790fa22e25be5bdc5025ccbfbca2603 +Author: Catouse +Date: Mon Feb 22 15:03:44 2016 +0800 + + * fix style of tree menu. + +commit 0f2f5eaf1acd3a4754d11bbfe9bb2437df58c1f4 +Author: Catouse +Date: Mon Feb 22 13:46:54 2016 +0800 + + * change admin/sso UI. + +commit f3ab28ebdd7178950a74a904a8d5c81e186151cb +Author: Catouse +Date: Mon Feb 22 13:46:18 2016 +0800 + + * update zui. + +commit 173fa51902b2330e478dbed12234208e8bdafa51 +Author: Catouse +Date: Mon Feb 22 13:39:53 2016 +0800 + + * fix chosen style. + +commit e35b0f273e212454c6d3ba5174cde766106c08a2 +Author: Catouse +Date: Mon Feb 22 13:39:43 2016 +0800 + + * fix style of inline radios. + +commit 44d380dd344e1f265be5dbd8abc220120456dbaf +Author: Catouse +Date: Mon Feb 22 13:39:17 2016 +0800 + + * update zui to 1.4. + +commit 4b76d36e9e8844de3827b28d3d536ed8d41918ea +Author: Catouse +Date: Mon Feb 22 10:29:28 2016 +0800 + + * finish task #2469. + +commit 1fce9b6d686593bca8366f1889595a0de608bf8b +Merge: bbf3d672af d9ddbd0450 +Author: wangyidong +Date: Fri Feb 19 14:35:30 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bbf3d672af05423b28b790b554cd30c4ab884194 +Author: wangyidong +Date: Fri Feb 19 14:35:03 2016 +0800 + + * code for task #2464. + +commit d9ddbd045019e11a42d2e3bfe7f3bdcdfa6ce6df +Author: chenfeiCF +Date: Fri Feb 19 13:49:25 2016 +0800 + + * finish task #2458. + +commit aa6f3bc46dd31d00c8076be0bdd9f33c350e3107 +Merge: 33d94add3b 46136fbf70 +Author: wangyidong +Date: Fri Feb 19 11:06:16 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 33d94add3bd37694b0ace8ad5c2ab2abe7eea69e +Author: wangyidong +Date: Fri Feb 19 11:04:53 2016 +0800 + + * code for task #2460. + +commit 46136fbf706a48e9dbe87ec2ad702ed2a9f4ee44 +Author: chenfeiCF +Date: Fri Feb 19 09:46:53 2016 +0800 + + * adjust for task #2478. + +commit 95de1da36573e5d7e0dd7cd7264fa02ac92ecda8 +Merge: 77b0403e53 72c1f7dc8a +Author: wangyidong +Date: Fri Feb 19 08:59:57 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 72c1f7dc8ab5cd50c43c0a7718597091b86fbb18 +Merge: 9f99387a7e 19044c3115 +Author: chenfeiCF +Date: Thu Feb 18 22:27:01 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9f99387a7e32bc12c30227e3dd39e14929854711 +Author: chenfeiCF +Date: Thu Feb 18 21:38:54 2016 +0800 + + * finish task #2457. + +commit 77b0403e530727051869f441e4a261a9989cc461 +Author: wangyidong +Date: Thu Feb 18 17:26:44 2016 +0800 + + * adjust code for getProjectBugs. + +commit 19044c3115e90d4a15116fdf89471d8cc9c7bf8d +Merge: a24f6cbeba 8517690be4 +Author: wangyidong +Date: Thu Feb 18 17:19:08 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a24f6cbeba4463dc2b84a063497b39a11bdfc375 +Author: wangyidong +Date: Thu Feb 18 17:18:20 2016 +0800 + + * finish task #2466. + +commit 8517690be4c91fa76d0344b16607485b6c88cc9e +Author: chenfeiCF +Date: Thu Feb 18 12:16:43 2016 +0800 + + * finish task #2478. + +commit ae81e0f85ecdd007fdcfaa234c144e84fa8d7cf2 +Author: wangyidong +Date: Thu Feb 18 11:00:05 2016 +0800 + + * adjust code for upload image. + +commit 83d41f0345296195436a67f56f449b1ada0add5c +Author: wangyidong +Date: Thu Feb 18 10:59:37 2016 +0800 + + * finish task #2502. + +commit 39928a235fda64bc9383146fbef5ffaf877690cd +Author: wangyidong +Date: Thu Feb 18 09:14:37 2016 +0800 + + * adjust code for testtask. + +commit 454ed3acb27d68a2bd11645e68271858d79c9e21 +Author: wangyidong +Date: Wed Feb 17 16:31:30 2016 +0800 + + * adjust code for task #2465. + +commit ff800c613314b4fb9974e264ef57fd4ca8fa6359 +Merge: 8230ffd6d0 ae9b46a05f +Author: wangyidong +Date: Wed Feb 17 16:22:49 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8230ffd6d0692311f4a9b47e24c92596440dccbb +Author: wangyidong +Date: Wed Feb 17 16:22:24 2016 +0800 + + * finish task #2465. + +commit ae9b46a05f5ae26cab36df9bce9f3c320e20ecec +Author: chenfeiCF +Date: Wed Feb 17 15:20:51 2016 +0800 + + * finish task #2495. + +commit d01b8eb8df3fc36f9505d7c1f5532f10ffc5bc4e +Author: wangyidong +Date: Wed Feb 17 14:18:54 2016 +0800 + + * finish task #2489. + +commit 8b1c8fb46fdc87f5f94cdb581a31f35f5c5c82cd +Author: wangyidong +Date: Wed Feb 17 10:40:17 2016 +0800 + + * code for task #1799. + +commit 26e611bee537d74176c8b335011d07303661da0e +Author: wangyidong +Date: Wed Feb 17 10:16:18 2016 +0800 + + * finish task #1799. + +commit 46a7ceaad780b4d17c216c914b0817ae924537e5 +Merge: 30b9c0d99b 63b4164434 +Author: wangyidong +Date: Wed Feb 17 09:09:00 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 30b9c0d99b1ab71fa90a467197f119f1af78404a +Author: wangyidong +Date: Wed Feb 17 09:07:46 2016 +0800 + + * finish task #2498. + +commit 63b41644348884c92ead07257bd6b03b6c79ca4e +Author: chenfeiCF +Date: Tue Feb 16 17:27:23 2016 +0800 + + * finish task *2505. + +commit 2f9807ab143608af62dc836e057dc7315196dea5 +Merge: 50b3d69bc9 fcc798f4d4 +Author: wangyidong +Date: Tue Feb 16 14:56:57 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 50b3d69bc9e05c4410849dd4b2a5ae5ba9df9113 +Author: wangyidong +Date: Tue Feb 16 14:56:08 2016 +0800 + + * finish task #2462. + +commit fcc798f4d46a02e86b4f34c48d2ef2aa3c1b5211 +Author: chenfeiCF +Date: Tue Feb 16 14:05:45 2016 +0800 + + * finish task #2507. + +commit d324bb72e65f3b684ec31d61001f2e16fafbf7af +Merge: e8bb9aa1ee 5266c8c064 +Author: wangyidong +Date: Mon Feb 15 17:29:46 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e8bb9aa1ee6171f761e672e3426ae4e1514ce52e +Author: wangyidong +Date: Mon Feb 15 17:29:23 2016 +0800 + + * finish task #1295. + +commit 5266c8c064e7129be76d60c69a55e074956a9793 +Author: chenfeiCF +Date: Mon Feb 15 15:42:21 2016 +0800 + + * finish task #2499. + +commit 86ee7a20550593187252cf03caf2d85870841a89 +Author: chenfeiCF +Date: Mon Feb 15 15:21:29 2016 +0800 + + * finish task #2503. + +commit ef9f7ca2fb32baf50e080d349d7e033bb87bf27e +Author: chenfeiCF +Date: Mon Feb 15 14:39:31 2016 +0800 + + * finish task #2506. + +commit 1f9055b610a7ea3259c885fcd4120f710219a6d7 +Author: wangyidong +Date: Mon Jan 25 13:50:58 2016 +0800 + + * fix bugs and adjust code. + +commit 2b7df545f2e0ccf70d2762fd7793dbb3b8987441 +Merge: ba3ed90986 6acdab6742 +Author: wangyidong +Date: Mon Jan 11 11:33:13 2016 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ba3ed9098663fedea3ad3f507d1db36f5c14685e +Author: wangyidong +Date: Mon Jan 11 11:32:51 2016 +0800 + + * fix bug for report getUserTesttasks. + +commit 6acdab67426bf7196560390982f99702f4a2ff8a +Author: Catouse +Date: Fri Jan 8 09:25:17 2016 +0800 + + * fix kindeditor crash in ie8. + +commit a0d475720b159f63da593af0462f11a36a564910 +Author: wangyidong +Date: Tue Jan 5 15:22:04 2016 +0800 + + * fix error. + +commit 052a1d7a7c9489247e19d8bc379c7b183d8192a2 +Author: wangyidong +Date: Tue Jan 5 15:21:25 2016 +0800 + + * fix bug #783. + +commit a2e1a381e22fb7817a99ac32e97b605c9ede0f83 +Author: wangyidong +Date: Mon Jan 4 09:43:24 2016 +0800 + + * fix bug for backup db. + +commit e3c51a6200565d12d539bb86b78583346ba7c609 +Author: wangyidong +Date: Thu Dec 31 15:54:27 2015 +0800 + + * adjust for merge model file. + +commit ce148bb582d464dfb32ea0d4eee013e6e9b2b998 +Merge: dfa64599e2 ca7e1ab6f7 +Author: chenfeiCF +Date: Wed Dec 30 16:08:04 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit dfa64599e2c4169da590fbd6f26c982e851ecb71 +Author: chenfeiCF +Date: Wed Dec 30 15:55:33 2015 +0800 + + * fix a bug for action module. + +commit ca7e1ab6f7a95add37e701a41883110d063e130d +Author: wangyidong +Date: Wed Dec 30 14:41:11 2015 +0800 + + * fix bug #750. + +commit 0f4856495a0935d839e553db64a46cb00a0b5948 +Author: wangyidong +Date: Thu Dec 24 15:07:20 2015 +0800 + + * fix bug #781. + +commit 888c89fbe5121e9bd1d68b83dbee5d5e55d4772c (tag: zentaopms_8.0.1_20151224) +Author: wangyidong +Date: Thu Dec 24 09:59:08 2015 +0800 + + * change for upgrade. + +commit 731bc2e5a81158c0d6a4a571414bf57184d27898 +Author: wangyidong +Date: Thu Dec 24 09:48:03 2015 +0800 + + * fix bug #776. + +commit fb2357ef32d43de1039adb6b35d8d0f236d7f243 +Author: wangyidong +Date: Wed Dec 23 17:23:30 2015 +0800 + + * fix bug for create bug in branch. + +commit 82f04a6a229ef9d39100949ee6a748c992bbfa56 +Author: wangyidong +Date: Wed Dec 23 16:33:47 2015 +0800 + + * fix bug #774. + +commit 4ebfcc3ac87d5f3c5a5ad8803c21ab176cc56d7f +Author: wangyidong +Date: Wed Dec 23 13:45:19 2015 +0800 + + * fix bug #775. + +commit e45a196b7bbc0aebb0333eab58dcffeadfe970d9 +Author: wangyidong +Date: Wed Dec 23 09:29:38 2015 +0800 + + * fix bugs. + +commit 957111c6f01652481014efcae698df7e60e57305 +Author: wangyidong +Date: Tue Dec 22 16:56:55 2015 +0800 + + * code for bug #777. + +commit 1e3c913063ab68c71ad93e2feb0a1ff39fb3fcd4 +Author: wangyidong +Date: Tue Dec 22 16:55:25 2015 +0800 + + * fix bug #777. + +commit b6e4fc2e41567976cca82d936c8ecdd67d6ab2d3 +Author: wangyidong +Date: Tue Dec 22 15:10:55 2015 +0800 + + * fix bug #778. + +commit b49fae3d745a85f63435d71b7490846de8eb8fcb +Author: wangyidong +Date: Tue Dec 22 15:01:21 2015 +0800 + + * fix bug #779. + +commit 7007f4b888ccd31df60dcc7c23a8aa31979950b6 +Author: wangyidong +Date: Tue Dec 22 13:27:26 2015 +0800 + + * finish task #2425. + +commit aab0b66e1550ac10f0e1beb7a36c827840a8d522 +Author: wangyidong +Date: Mon Dec 21 17:27:57 2015 +0800 + + * finish task #2426. + +commit 9c6d301c9cc6b702aa7fed2ce25b94d6805f5370 +Author: wangyidong +Date: Mon Dec 21 16:02:41 2015 +0800 + + * finish task #2428. + +commit 62c590a94b6d10f48f7612a789574ad2537c1a33 +Author: wangyidong +Date: Mon Dec 21 14:20:13 2015 +0800 + + * finish task #2431. + +commit b5d020c652ba032695a112c7414c08566a64eda1 +Author: chenfeiCF +Date: Wed Dec 16 13:49:09 2015 +0800 + + * fix a bug. + +commit 72eca957bfe905e0e8b33aa3e8c1827f22c51de9 +Author: wangyidong +Date: Thu Dec 10 13:50:05 2015 +0800 + + * fix bug for project link story when branch is empty. + +commit 92208eae36bc1ebc6ff15b1c53ac004ccb89ce1c +Author: wangyidong +Date: Fri Dec 4 13:07:50 2015 +0800 + + * fix error for HTMLPurifier. + +commit b3f919b697c1de3bc812e3f8b056d397e267cc6b +Author: wangyidong +Date: Thu Dec 3 15:49:31 2015 +0800 + + * fix bug for update user. + +commit 6ae74c1430a6c374070e71bf157ebf7a7cbffb71 +Author: wangyidong +Date: Wed Dec 2 17:32:51 2015 +0800 + + * fix for zdb class. + +commit 33dff400924e3ea10d6f503d123584895ffd5847 +Author: wangyidong +Date: Wed Dec 2 16:21:31 2015 +0800 + + * fix bug for get build pairs. + +commit 8fccef5df357d3a4f9549a3f66d867baac3c2e32 +Author: wangyidong +Date: Tue Dec 1 15:31:24 2015 +0800 + + * fix bug #773. + +commit 5933daa169e50add1ae68ed4bc826f31b673b14c +Author: wangyidong +Date: Tue Dec 1 11:03:29 2015 +0800 + + * change js parents to closest. + +commit a2b2454760fe7caea1beb6f5375c75b2a6f5db0a +Author: wangyidong +Date: Tue Dec 1 11:03:08 2015 +0800 + + * fix a bug for branch. + +commit b808b0c8c397bf279af7addea02d1c7d5d5531ab +Author: wangyidong +Date: Mon Nov 30 14:23:36 2015 +0800 + + * change for build and release view page. + +commit 0160e9905495fc7bb5f982eccc8ff853a6e762ca +Author: wangyidong +Date: Mon Nov 30 14:19:25 2015 +0800 + + * adjust style. + +commit 036cebc87e0136885d38570af421551b7af6cd8d (tag: zentaopms_8.0.stable_20151127) +Author: wangyidong +Date: Fri Nov 27 15:46:22 2015 +0800 + + * fix js error. + +commit 290d1a76bc34191844d2defe08ef819f836da651 +Author: daitingting +Date: Fri Nov 27 15:40:23 2015 +0800 + + * Adjust codes. + +commit 61ecdb6000fc2f8599acdf173ee805331c857dae +Author: daitingting +Date: Fri Nov 27 15:26:19 2015 +0800 + + * Add more link for blocks. + +commit 5913f76f35915b79fe98c720b667d8178f774872 +Merge: d04a6a0ba8 7acbf8c7bd +Author: chujilu +Date: Fri Nov 27 14:49:31 2015 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit d04a6a0ba86a49879f25c64fc36c35c02c85de18 +Author: chujilu +Date: Fri Nov 27 14:48:58 2015 +0800 + + * fix block user account + +commit 7acbf8c7bde6226925a9c701e637d75f3beadbda +Author: wangyidong +Date: Fri Nov 27 14:06:59 2015 +0800 + + * disabled for ie8/9 placeholder. + +commit 9fe3b5ca0522fd4c9251930d097bb9148c863c6c +Merge: 998f465811 119f3bfb20 +Author: wangyidong +Date: Fri Nov 27 13:33:23 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 119f3bfb20ce72c7b91b6d6df7ac6aaa5eefdcb2 +Author: Catouse +Date: Fri Nov 27 13:30:02 2015 +0800 + + * fix placeholder for ie. + +commit 998f4658112784d8ecc756cb70f40e0b7d9c4c5b +Author: wangyidong +Date: Fri Nov 27 13:18:45 2015 +0800 + + * adjust story needReview. + +commit 4bf02d062f75d48578c00fe704352b38a2d00d84 +Author: Catouse +Date: Fri Nov 27 12:05:02 2015 +0800 + + * change admin/index style. + +commit 62fc4ac385be9acd6a3652b1c3077a8d7f73a7d3 +Author: wangyidong +Date: Fri Nov 27 09:21:17 2015 +0800 + + * change for zh-tw lang. + +commit f020e482c6d60210ae27502358862d5900b53e7a +Author: wangyidong +Date: Thu Nov 26 17:33:03 2015 +0800 + + * change for upgrade. + +commit 6d2f5f4c8e6f9a73ec205b2b1b4867be0b8bcde5 +Author: wangyidong +Date: Thu Nov 26 17:26:40 2015 +0800 + + * delete sended mail. + +commit 4040b541ddd3feec1021c9128663bf589e822abf +Author: wangyidong +Date: Thu Nov 26 16:18:03 2015 +0800 + + * adjust for misc-about. + +commit 13c881ccda643cb41da382b184d8ca7260205a41 +Author: wangyidong +Date: Thu Nov 26 16:17:42 2015 +0800 + + * fix bug #770. + +commit a9f3fe527066fd4d68a8a0a6f6f6359f621cddb1 +Author: wangyidong +Date: Thu Nov 26 14:01:32 2015 +0800 + + * fix bug #769. + +commit 02ce779b654fbb25689212e009d37c2f979aaf17 +Author: wangyidong +Date: Thu Nov 26 13:29:29 2015 +0800 + + * adjust code. + +commit 48ada5974b667401b0670eb72c034b17370cf535 +Author: wangyidong +Date: Thu Nov 26 13:11:01 2015 +0800 + + * finish task #2416. + +commit 6670b94cafe0d5ba5685483e14b7bed103bd3309 +Author: wangyidong +Date: Thu Nov 26 09:20:53 2015 +0800 + + * adjust for user getById. + +commit a94cd23f697ef7315baed8ddac8943e7a0a3c133 +Author: wangyidong +Date: Wed Nov 25 16:23:47 2015 +0800 + + * finish task #2411. + +commit 514376c3078eb069cb7e2d5bb1179fffeb33433e +Author: wangyidong +Date: Wed Nov 25 15:31:54 2015 +0800 + + * finish task #2414. + +commit aa8c0363f3881e181c8a780c540189fc058e53c4 +Author: wangyidong +Date: Wed Nov 25 14:22:24 2015 +0800 + + * finish task #2415. + +commit 849ec917538d04409237784494b9fa086ee4372d +Author: wangyidong +Date: Wed Nov 25 13:15:54 2015 +0800 + + * code for task #2417. + +commit 9012728c5a1eb9f1acce4bfa62f4c6552658526a +Author: wangyidong +Date: Wed Nov 25 12:13:49 2015 +0800 + + * change for dept. + +commit 3c4c0e137ef39815d0e92572c22546f1ce4cb533 +Author: wangyidong +Date: Wed Nov 25 10:11:02 2015 +0800 + + * finish task #2417. + +commit 2aba28b253029af18f22b13d309dc33f6a542f30 +Author: wangyidong +Date: Tue Nov 24 12:07:39 2015 +0800 + + * finish task #2418. + +commit 715050df57a386b21bd08f7068fd93e07b30247b +Author: wangyidong +Date: Tue Nov 24 11:25:10 2015 +0800 + + * adjust for user. + +commit 8ff1e21c95fc697184895aa73fd4f0b9b7026c89 +Author: wangyidong +Date: Tue Nov 24 11:15:00 2015 +0800 + + * change for ranzhi. + +commit a01925a0f2763cc896137ac59612cf819c1ae118 +Author: wangyidong +Date: Tue Nov 24 10:18:48 2015 +0800 + + * finish task #2419. + +commit 6f67d9af0fe8c6444bde055a097d73a7e91aef2f +Author: wangyidong +Date: Tue Nov 24 09:31:35 2015 +0800 + + * fix bug. + +commit c3a9804a56cde8285449cee64356514cd757215d +Author: wangyidong +Date: Tue Nov 24 09:12:27 2015 +0800 + + * finish task #2420. + +commit 5923c8e637fc9d685a72973904ff28d67654e3c1 +Author: wangyidong +Date: Tue Nov 24 08:44:17 2015 +0800 + + * finish task #2421. + +commit eebc5834aef41b15d781433230e2beffae61311f +Author: wangyidong +Date: Mon Nov 23 17:15:32 2015 +0800 + + * fix for testcase show import. + +commit 75bd02ec483bb9a988e07cc69210d46274f2cfed +Author: wangyidong +Date: Mon Nov 23 16:22:51 2015 +0800 + + * adjust width for english. + +commit 103919866f835e12f2de67b2a3df2fc0be83a8ae +Author: wangyidong +Date: Mon Nov 23 15:18:42 2015 +0800 + + * fix bug #755. + +commit 57ef7bad741e50d356689c8e3c2044105b0ac7f9 +Author: wangyidong +Date: Mon Nov 23 14:25:58 2015 +0800 + + * fix bug #768. + +commit 3d46d2e1ed1fd24e54bbc83e3318181b81b636d4 +Author: wangyidong +Date: Fri Nov 20 11:36:46 2015 +0800 + + * fix bug #663 in backyard pms. + +commit c657433fa203e56f5de669dde602ce4e16a992ea +Author: wangyidong +Date: Fri Nov 20 10:45:18 2015 +0800 + + * adjust code and fix bug. + +commit 7374c819496c621f891b33827ca8b5d00967ac7e +Author: wangyidong +Date: Fri Nov 20 10:06:59 2015 +0800 + + * fix bug #669 in backyard pms. + +commit d06306de006500474d997031b90f0bc16c76a865 +Author: wangyidong +Date: Fri Nov 20 10:05:42 2015 +0800 + + * fix bug #666 in backyard pms. + +commit ba0f4306c62ccab1c2b8fa8bb9a3ce1677499d63 +Author: wangyidong +Date: Fri Nov 20 10:05:17 2015 +0800 + + * fix filter params. + +commit 35cd899cd5122e271a7efa9deeeb6f4edbc39fa0 +Author: wangyidong +Date: Thu Nov 19 11:05:24 2015 +0800 + + * fix bug for get noterminate build. + +commit a05357d9649c5b886ef56715ffa8bd7ca7df1b02 +Author: wangyidong +Date: Thu Nov 19 09:27:53 2015 +0800 + + * fix bug #656 in backyard pms. + +commit 7955810546af493c7d30c076fe87af3898dfc826 +Merge: 6fe166a8f5 c1da3f39c2 +Author: wangyidong +Date: Tue Nov 17 10:54:16 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6fe166a8f5cc8ff253cd83307a26517c24e9719e +Author: wangyidong +Date: Tue Nov 17 10:53:58 2015 +0800 + + * fix bug for sql. + +commit c1da3f39c2f9f9a9a9edc36374709790df7ffc02 +Author: chenfeiCF +Date: Mon Nov 16 13:39:05 2015 +0800 + + * fix bug #766. + +commit e17126e526cc7b8b21c02439924556dd7b574ef2 +Author: wangyidong +Date: Fri Nov 13 15:34:23 2015 +0800 + + * add changelog. + +commit 7c5358ed0d5aaa32bfdd3eb94f58e5eaac6b9529 +Merge: 7184cb3a90 8823b0e03c +Author: daitingting +Date: Fri Nov 13 15:17:23 2015 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 7184cb3a90f36ad637afef659e44002b47ddf14b +Author: daitingting +Date: Fri Nov 13 15:14:42 2015 +0800 + + * Adjust codes. + +commit 8823b0e03cebdc2310d680a0e7a4445409b3e47c (tag: zentaopms_7.4.beta_20151113) +Author: wangyidong +Date: Fri Nov 13 13:35:20 2015 +0800 + + * change 7.4 to 7.4.beta. + +commit 2feed8a2cd15766681a53fb0f5bc992ab12b6ecc +Merge: 786b78a025 aa0b77bf28 +Author: wangyidong +Date: Fri Nov 13 13:27:57 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 786b78a025e2fe337372896c9c48a1ee52fec608 +Author: wangyidong +Date: Fri Nov 13 13:27:29 2015 +0800 + + * add 7.4 version. + +commit aa0b77bf2844282e2467bc39ef8700cb73f893d0 +Author: chenfeiCF +Date: Fri Nov 13 13:25:19 2015 +0800 + + * fix bug for task #2403. + +commit dca7ad86fa14c706563246788d0b08d3edc50647 +Merge: 530388712a ce7be4ebc6 +Author: wangyidong +Date: Fri Nov 13 11:58:04 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 530388712a64f19a14cb5fe8c04e7460fbf13892 +Author: wangyidong +Date: Fri Nov 13 11:57:36 2015 +0800 + + * change for branch session. + +commit ce7be4ebc6fe3e3d19f83aa3fdc29a82f047f124 +Merge: af948a8805 d12d84f950 +Author: chenfeiCF +Date: Fri Nov 13 11:20:36 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit af948a8805afafab64711eafb9d3781a019149e0 +Author: chenfeiCF +Date: Fri Nov 13 11:17:53 2015 +0800 + + * adjust code for task #2382, 2383. + +commit e7037700751d0c200d461cc7800bce99de543240 +Author: wangyidong +Date: Fri Nov 13 11:12:41 2015 +0800 + + * fix error and adjust build code. + +commit d12d84f9501fc93ce55bb7d1f3d8d9959d16cf86 +Merge: 2d61ca8d34 2f28d73c47 +Author: wangyidong +Date: Fri Nov 13 10:56:47 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2d61ca8d34ea58b1a0a0f500f011ae26891d7bf8 +Author: wangyidong +Date: Fri Nov 13 10:55:50 2015 +0800 + + * change zh-tw. + +commit 2f28d73c47b733e34e3061abf56b6caaaf7326c2 +Author: chenfeiCF +Date: Fri Nov 13 10:54:14 2015 +0800 + + * finish task #2400. + +commit 5c361fdac7571119b987ac07085b109e5ec8f5ef +Author: wangyidong +Date: Fri Nov 13 10:29:52 2015 +0800 + + * merge database. + +commit 1af9dbe0c5ddefb9780eca858dfffd8818d7584f +Author: wangyidong +Date: Fri Nov 13 10:02:28 2015 +0800 + + * adjust for filter super var. + +commit 603f64a61894200032a4087e4b4092fdef6bd239 +Author: wangyidong +Date: Fri Nov 13 09:25:36 2015 +0800 + + * fix bug for tree. + +commit 886eefeca379ce317ace38635b574abc0b9fc64c +Merge: 7891848534 f4ea06eddf +Author: wangyidong +Date: Fri Nov 13 09:02:41 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f4ea06eddfeeec198cefc94752fe96d46f7d96de +Author: chenfeiCF +Date: Fri Nov 13 08:02:54 2015 +0800 + + * finish task #2392. + +commit cb4e84a9da1910b4e720517a5a327af4588c4f49 +Author: chenfeiCF +Date: Fri Nov 13 00:19:43 2015 +0800 + + * finish task #2403. + +commit ba1f44853b74bf695c3ebb753bc8180fcc8b8572 +Author: chenfeiCF +Date: Thu Nov 12 22:44:02 2015 +0800 + + * finish task #2385. + +commit 222927bf88121112ce9791e96c160d0292554c89 +Author: chenfeiCF +Date: Thu Nov 12 21:58:11 2015 +0800 + + * adjust code for testtask.html.php of my module. + +commit 7891848534c69799ce66e8099041999fbf104d33 +Author: wangyidong +Date: Thu Nov 12 16:25:41 2015 +0800 + + * finish task #2393. + +commit d70f35fa664b8f48c830170fa2497343f910db20 +Author: wangyidong +Date: Thu Nov 12 15:39:12 2015 +0800 + + * add label for batch create. + +commit 3866f3526d7f8f9321f6ac7b0f5c220a180f9e24 +Merge: 6abfe59501 be5f2c680a +Author: wangyidong +Date: Thu Nov 12 15:00:14 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6abfe59501e574e9c6a5fdb9c1246256b6aac94c +Author: wangyidong +Date: Thu Nov 12 14:59:49 2015 +0800 + + * finish task #2410. + +commit be5f2c680a7eac3526d01c3a08f159d64fe03609 +Author: Catouse +Date: Thu Nov 12 14:12:53 2015 +0800 + + * finish task #2407. + +commit 6e95c09e6c181031ef8b2281e97b05e308b8d74d +Author: wangyidong +Date: Thu Nov 12 13:48:42 2015 +0800 + + * finish task #2409. + +commit b7578aaca28d691db242cab85606fa553f51f430 +Author: wangyidong +Date: Thu Nov 12 11:37:20 2015 +0800 + + * finish task #2405. + +commit 086848c53ec080ee0fcd3d795f6728d39e707640 +Author: wangyidong +Date: Thu Nov 12 10:40:02 2015 +0800 + + * code task #2404. + +commit 19a2e963caeba92f59efcf7915c2db76a64ac2b1 +Author: wangyidong +Date: Thu Nov 12 10:24:29 2015 +0800 + + * finish task #2399. + +commit 275c833e02587393425ef1f072787b1e476629d2 +Author: wangyidong +Date: Thu Nov 12 10:14:43 2015 +0800 + + * finish task #2394. + +commit 6f12e34d25262dced5d25d5a25cf330839a3d219 +Author: wangyidong +Date: Thu Nov 12 09:54:00 2015 +0800 + + * finish task #2398. + +commit d5916dac13c1d94d3921b4969fd620d6a0a431c2 +Merge: 97f38e1177 00f23416df +Author: wangyidong +Date: Thu Nov 12 09:18:29 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 00f23416df0274be7c62b4c1297f14b19de59de8 +Author: chenfeiCF +Date: Wed Nov 11 20:04:29 2015 +0800 + + * adjust code for build and release module. + +commit 97f38e11771ea7fdb88eacd35bdf7b4f03abdf08 +Author: wangyidong +Date: Wed Nov 11 16:54:23 2015 +0800 + + * finish task #2408. + +commit fd312662ccac556e41acfcba9b4bc8a78946f381 +Author: wangyidong +Date: Wed Nov 11 16:15:41 2015 +0800 + + * finish task #2395. + +commit 4f48349475f779ca7dcbadde7915e9feae068ada +Merge: dec039edfb d953088cfb +Author: wangyidong +Date: Wed Nov 11 14:56:57 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit dec039edfb2dd8f5dee65da0a4ab5066c5de1ed8 +Author: wangyidong +Date: Wed Nov 11 14:56:37 2015 +0800 + + * finish task #2391. + +commit d953088cfb99bb9ca667d7112929452d3b289dc2 +Author: chenfeiCF +Date: Wed Nov 11 14:44:07 2015 +0800 + + * change for en and zh-tw lang of release module. + +commit 94158ab9043d83651bcbf3e34dde8d01e0c3f686 +Author: chenfeiCF +Date: Wed Nov 11 14:20:26 2015 +0800 + + * finish task #2401. + +commit dc07d9f3cf9947d53267abc8cfcb19cfb0538d55 +Merge: 12f37c1798 68f9066039 +Author: chenfeiCF +Date: Wed Nov 11 13:44:21 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 12f37c1798b21f416d3484ca25b1e03a9fa0acf3 +Author: chenfeiCF +Date: Wed Nov 11 13:43:18 2015 +0800 + + * finish task #2404. + +commit 68f9066039d5bbd322ce09f97dbfcda33f6f91d0 +Merge: a9d90a73c9 a178e19241 +Author: wangyidong +Date: Wed Nov 11 13:30:37 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a9d90a73c98116a25a4f79260cc49bec90299aa5 +Author: wangyidong +Date: Wed Nov 11 13:29:55 2015 +0800 + + * finish task #2386,2402. + +commit a178e1924142ecc528451cc072d6302e08de6bd0 +Author: chenfeiCF +Date: Wed Nov 11 13:26:23 2015 +0800 + + * finish task #2406. + +commit 9c7cff9c16dfd767b480515cfba8d1982a15a902 +Author: chenfeiCF +Date: Wed Nov 11 13:10:07 2015 +0800 + + * finish task #2383. + +commit fcadcec130f7d0ecd387c2d63bb67c96aa25402f +Merge: 45fb1f0c92 89c17e26e9 +Author: wangyidong +Date: Wed Nov 11 11:08:38 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 45fb1f0c925a79e0dc0fcf04452f59fcb1695835 +Author: wangyidong +Date: Wed Nov 11 11:07:59 2015 +0800 + + * finish task #2380,2389,2390. + +commit 89c17e26e9f6f8dd177da04bcb0d6c674250555c +Author: daitingting +Date: Wed Nov 11 10:41:08 2015 +0800 + + * Add bindUser and createUser function for ranzhi. + +commit 84af2e4700a7ebe5a4188f23ab6390fdbb492051 +Merge: d1129ebf9f 8746d7bc64 +Author: chenfeiCF +Date: Tue Nov 10 17:30:37 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d1129ebf9f993a48a737fc5cd5465e168041dded +Author: chenfeiCF +Date: Tue Nov 10 17:29:21 2015 +0800 + + * finish task #2382. + +commit 8746d7bc64e71a90e6836e5a33c425185a3891c3 +Merge: 273bf0a237 160eb29d76 +Author: wangyidong +Date: Tue Nov 10 17:14:05 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 273bf0a23747180edc02e1ce6c31fc153004279f +Author: wangyidong +Date: Tue Nov 10 17:12:33 2015 +0800 + + * finish task #2378,2379,2381. + +commit 160eb29d76af0bcaed7fca8315d96f9997d34f23 +Author: chenfeiCF +Date: Tue Nov 10 16:45:39 2015 +0800 + + * finish task #2397. + +commit 86b96a9640dcabfb05241924d5c41b5613496ba4 +Author: chenfeiCF +Date: Tue Nov 10 15:29:41 2015 +0800 + + * finish task #2388. + +commit 1f72c22642f5c61144f2a5aed1e6133bcd982a11 +Author: chenfeiCF +Date: Tue Nov 10 13:34:06 2015 +0800 + + * finish task #2387. + +commit 74d50c2bcdbca333d19e96f33f7421fdb3c58df5 +Author: chenfeiCF +Date: Tue Nov 10 11:21:54 2015 +0800 + + * finish task #2384. + +commit ff210f304d6acdcdbc233d16be53e753d9febe2a +Author: wangyidong +Date: Tue Nov 10 11:11:48 2015 +0800 + + * finish task #2377. + +commit 4cf14c3e438d75467add8ad7a47d8a0804450db2 +Merge: a0c97d7e01 fe99321c45 +Author: wangyidong +Date: Tue Nov 10 10:56:35 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a0c97d7e0152f7d6c09d9510fbc2670ae7949b97 +Author: wangyidong +Date: Tue Nov 10 10:55:34 2015 +0800 + + * adjust for branch name by product name. + +commit 1df211fdaa4383193f7db76a7ef74fcd120f1dc5 +Author: wangyidong +Date: Tue Nov 10 10:55:14 2015 +0800 + + * adjust for parseImage. + +commit 7464680eae837b718803680431da74ee696aabe4 +Author: wangyidong +Date: Tue Nov 10 10:50:32 2015 +0800 + + * upgrade license. + +commit 61eb0a6fc34cb3e2f85a794368311aa3ba14282b +Author: wangyidong +Date: Tue Nov 10 10:50:01 2015 +0800 + + * change for upgrade. + +commit fe99321c4533a3b3a69f63c8b0a370b270efa14d +Author: chenfeiCF +Date: Tue Nov 10 10:43:23 2015 +0800 + + * finish task #2396. + +commit b82964c3892156060258ef034d1fd9a96fe3cbce +Author: wangyidong +Date: Tue Nov 10 10:37:43 2015 +0800 + + * finish task #2376. + +commit 99eb66aaf0a32e6af30355f507c9acc0213b32c1 +Merge: 225270d39b 6b92b40e4c +Author: daitingting +Date: Mon Nov 9 16:02:40 2015 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 225270d39bf53cedc5aab25b2d6bdcfcb9d16762 +Author: daitingting +Date: Mon Nov 9 16:02:07 2015 +0800 + + * Check privilage. + +commit 6b92b40e4ce7d0595889630971dc98048668982e +Author: chenfeiCF +Date: Mon Nov 9 15:10:48 2015 +0800 + + * remove back button for manage method of branch. + +commit e98ceb95c70d16ece6f46d18126c7d6a79f415e6 +Author: wangyidong +Date: Mon Nov 9 13:14:12 2015 +0800 + + * finish task #2333. + +commit 3478a9010fdd1fa0d011489051daad885b95923d +Author: wangyidong +Date: Mon Nov 9 10:19:50 2015 +0800 + + * adjust for story export. + +commit c3f3cfbed4c00f9cebf012a45e180a1f22ef1d74 +Merge: 653b1c3cd1 23430345e9 +Author: wangyidong +Date: Mon Nov 9 09:49:41 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 653b1c3cd1e716a9f5e36047ad19efd928c08633 +Author: wangyidong +Date: Mon Nov 9 09:32:15 2015 +0800 + + * fix bug #749. + +commit 23430345e90f01174890153ba08e7fb16be04e40 +Author: chenfeiCF +Date: Mon Nov 9 09:24:32 2015 +0800 + + * adjust the code for common.js of bug module. + +commit fd44c39d50514f9bb0e3f38fd94a8e66d3bb0745 +Author: wangyidong +Date: Mon Nov 9 09:15:08 2015 +0800 + + * fix bug #748. + +commit 951f8436155b0aeb8d470922f6f93772935936bd +Author: wangyidong +Date: Fri Nov 6 15:35:18 2015 +0800 + + * change for en and zh-tw lang. + +commit 7065b7aa68e9f162d8d181d2104832be3a632994 +Merge: e2c77e381c 64e490d650 +Author: wangyidong +Date: Fri Nov 6 14:31:26 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e2c77e381cb0485a434e1ba3e230fee3e112cbc9 +Author: wangyidong +Date: Fri Nov 6 14:30:55 2015 +0800 + + * change for compute password strength. + +commit 64e490d6506e40fabfda02ef67cfc7ee00cc93f8 +Author: chenfeiCF +Date: Fri Nov 6 10:38:01 2015 +0800 + + * add notice when editing story, bug and case. + +commit 5f70edfbfdf679ad5999e069d4a9bb5201a12742 +Author: wangyidong +Date: Fri Nov 6 09:26:00 2015 +0800 + + * fix bug and adjust sso-bind page. + +commit e003ed01f0df12e90b2b5806fa08278b5f335ec2 +Author: wangyidong +Date: Thu Nov 5 17:27:59 2015 +0800 + + * finish task #2363,2364. + +commit 015401d1e0b753245fb08b64736e06c1279287bf +Author: wangyidong +Date: Thu Nov 5 14:09:52 2015 +0800 + + * change zpl 1.1 to 1.2. + +commit d521893d0abb10d877fe0fd0430f41b5d1b62c29 +Author: wangyidong +Date: Thu Nov 5 11:36:40 2015 +0800 + + * code for task #2333. + +commit 5d0adaee3dd65f34df5af7624d322d2a73ee8bf1 +Merge: c5feed8a07 0bdb398791 +Author: wangyidong +Date: Thu Nov 5 11:33:31 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c5feed8a0790bb5285274438aed2517ea777f08d +Author: wangyidong +Date: Thu Nov 5 11:32:51 2015 +0800 + + * add purifier lib and filter by purifier. + +commit da84d5164ca7fc31c7d1cb71a84cba838ab12655 +Author: wangyidong +Date: Thu Nov 5 11:32:04 2015 +0800 + + * adjust code. + +commit 0bdb398791a487547e8ce1c98adb6dfcd3ab031e +Author: wwccss +Date: Thu Nov 5 11:16:04 2015 +0800 + + * Remove duplicate title. + +commit 388df75ec10b1d5459184df87e7069927155875e +Author: wangyidong +Date: Thu Nov 5 11:10:53 2015 +0800 + + * change license. + +commit c945a0a8c320067e55973dc2ed30ee6654d68d31 +Author: wangyidong +Date: Thu Nov 5 10:24:19 2015 +0800 + + * adjust for workload. + +commit 3e77dd314560f219053c6b66922994c9cd62ee83 +Author: wangyidong +Date: Thu Nov 5 09:51:42 2015 +0800 + + * code for safe in framework. + +commit 35c18012050302f91d29c2997051c357204fbf81 +Author: wangyidong +Date: Wed Nov 4 14:17:58 2015 +0800 + + * add notice. + +commit 513c49f8550c9268164a4dd570607b2b47ca66cb +Author: wangyidong +Date: Wed Nov 4 14:17:20 2015 +0800 + + * change for filter super vars. + +commit 394a407ec04bf401f97a68b225a5932431f8415e +Author: wangyidong +Date: Wed Nov 4 13:33:58 2015 +0800 + + * fix a bug for sendcloud. + +commit f4751b5fae226a3984e7d2c8fe123ef0fd07a9a9 +Author: wangyidong +Date: Wed Nov 4 13:19:07 2015 +0800 + + * fix bug for create task from story-view page. + +commit b9ff9b465dda2f7540cd4aef809cfe62c677a243 +Author: wangyidong +Date: Wed Nov 4 13:14:43 2015 +0800 + + * fix bug #758. + +commit 2a39736fd7acc0a1b75910eeca3589d1ea9afc57 +Author: wangyidong +Date: Wed Nov 4 12:16:40 2015 +0800 + + * adjust code. + +commit 35771f7f369c903021b50ab70e02c60fb81fdd50 +Merge: 4470b3db97 85cbdbb6b7 +Author: wangyidong +Date: Wed Nov 4 11:26:32 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4470b3db97c72f40292569419b0d275845f64549 +Author: wangyidong +Date: Wed Nov 4 11:24:09 2015 +0800 + + * fix bug for WooYun-2015-151486. + +commit 85cbdbb6b718a488af39a4b1a9a3a4ffd2a54985 +Author: chenfeiCF +Date: Wed Nov 4 10:59:19 2015 +0800 + + * adjust the code. + +commit 09866e78b5f062bda6c4acd43b18d8d60daa90a9 +Merge: a46563dade 8b082953d0 +Author: chenfeiCF +Date: Wed Nov 4 10:26:08 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a46563dadeec0d6181e6c45cb21cbf3845e79e67 +Author: chenfeiCF +Date: Wed Nov 4 10:23:20 2015 +0800 + + * adjust the code for task #2357 2358. + +commit 8b082953d02e716afa5778822e1fef3e99a0c2ec +Author: chujilu +Date: Wed Nov 4 09:35:30 2015 +0800 + + * Fix bug of sso login 302 url. + +commit 834aee0f273626babbbe5c27cc61f22d5dcbca8f +Author: chenfeiCF +Date: Tue Nov 3 16:58:32 2015 +0800 + + * adjust the code. + +commit b65a72e141a321a77b465455a6dd31a97c5c2fdb +Author: wangyidong +Date: Tue Nov 3 16:05:40 2015 +0800 + + * change code and add notice. + +commit e0a24a8a09ed6188f17c8ec776addabf22f26463 +Merge: fa09186c68 e93cb9e75d +Author: wangyidong +Date: Tue Nov 3 08:26:24 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fa09186c686d6c9ec407f82850000be9fc3e7cc1 +Author: wangyidong +Date: Tue Nov 3 08:25:03 2015 +0800 + + * fix bug for WooYun-2015-137380. + +commit e93cb9e75dff22eab8b40e5d08992063534a7508 +Merge: a6b66e916e 9bfcc069ab +Author: chenfeiCF +Date: Mon Nov 2 16:02:29 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + + Conflicts: + module/build/model.php + module/release/model.php + +commit a6b66e916e11b97d9f5af47133ddc83a67b7b844 +Author: chenfeiCF +Date: Mon Nov 2 15:50:47 2015 +0800 + + * adjust code for bug #757. + +commit 9bfcc069abb719cbfa4ea3d944bd97866181ecb0 +Merge: 5d7126f5ca f82bd56ce2 +Author: wangyidong +Date: Mon Nov 2 15:33:17 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + + Conflicts: + module/release/model.php + +commit 5d7126f5ca1bf2369e9e7fe42dccca9f8e759136 +Author: wangyidong +Date: Mon Nov 2 15:30:43 2015 +0800 + + * finish task #2335. + +commit f82bd56ce25c027d07005ee60c762a0c2f22954b +Author: chenfeiCF +Date: Mon Nov 2 14:35:35 2015 +0800 + + * fix bug #757. + +commit 1807788f9d1f4536475e2c898b4bc44255691105 +Merge: eee2990ea7 4b9459b3e3 +Author: wangyidong +Date: Mon Nov 2 10:52:25 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit eee2990ea7c939a66387e5d1ccfa381d377282a8 +Author: wangyidong +Date: Mon Nov 2 10:52:04 2015 +0800 + + * adjust lang for branch. + +commit 4b9459b3e3135f1b02fa11dc762afa406d9f9f44 +Merge: c8c87f6a3f 3214cb08ce +Author: chenfeiCF +Date: Mon Nov 2 10:48:39 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c8c87f6a3f88edc53148d9a44df7c03275ea9bb0 +Author: chenfeiCF +Date: Mon Nov 2 10:48:03 2015 +0800 + + * fix bug #759. + +commit 3214cb08ce65d855768b0fdc3ed77c060b9c75ce +Author: wangyidong +Date: Mon Nov 2 09:47:37 2015 +0800 + + * change for roadmap. + +commit 713b190e090dd06b78891875822235ef839829af +Merge: 38ec1e74ee 5b5f982fd6 +Author: wangyidong +Date: Mon Nov 2 08:39:11 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 38ec1e74ee3596738f7b54954958f7941dc33431 +Author: wangyidong +Date: Mon Nov 2 08:38:58 2015 +0800 + + * fix a bug. + +commit 1633dfb3aac0b3eafecdf03a71928718e5d144d2 +Author: wangyidong +Date: Mon Nov 2 08:38:17 2015 +0800 + + * adjust for productplan link story. + +commit 5b5f982fd65e91ee0ec170bc44a7fac095cea878 +Author: chenfeiCF +Date: Mon Nov 2 08:04:17 2015 +0800 + + * fix bug #760. + +commit 7c7117d233d8ba546a3dfaf33d6f6b412889ef23 +Author: wangyidong +Date: Fri Oct 30 16:05:19 2015 +0800 + + * adjust productplan for branch. + +commit 785c21f04a10f7657a7fcd278bacf7d84def3891 +Author: chenfeiCF +Date: Fri Oct 30 13:51:19 2015 +0800 + + * fix bug #753 and adjust the code format. + +commit 4b77b0faa07de8defa0612dd4b1b18fd2c1b87ea +Merge: 125f4244bd e58fe08c46 +Author: chenfeiCF +Date: Fri Oct 30 10:59:09 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 125f4244bd5b0c3fe2c53420fe1a810137e99a3e +Author: chenfeiCF +Date: Fri Oct 30 10:57:48 2015 +0800 + + * adjust code for bug and build module. + +commit e58fe08c46bb8561c9da4035860435daa26027c5 +Author: wangyidong +Date: Fri Oct 30 09:13:43 2015 +0800 + + * adjust search config for branch. + +commit 2fd60f85c307968704e00da757e4d7b02fa90825 +Author: easysoft +Date: Fri Oct 30 08:15:15 2015 +0800 + + * fix the error of markdown + +commit 4823890b2d2f3ab9f22d04e15ed625210d3cc8ab +Author: chenfeiCF +Date: Thu Oct 29 21:53:59 2015 +0800 + + * adjust for task #2359. + +commit d135d85ba4501727fcf56f27e0e637aabb9345b5 +Merge: de80cb0470 8593f3ce07 +Author: chenfeiCF +Date: Thu Oct 29 16:17:26 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit de80cb047093795b4c503c7833ca2aef4671f58f +Author: chenfeiCF +Date: Thu Oct 29 16:15:01 2015 +0800 + + * fix bug #752. + +commit 8593f3ce07ea21d95a9b19cb54a6f95a24e47af3 +Author: wangyidong +Date: Thu Oct 29 15:28:08 2015 +0800 + + * adjust code for branch. + +commit 8381753633da59fee6a238bbe1d83b09b9cec2ae +Author: chenfeiCF +Date: Thu Oct 29 15:15:10 2015 +0800 + + * fix bug #754. + +commit 9910e1bd1f395995ff89d11eb4647cb091fe69c2 +Merge: 6a5f590ce9 1202c8db38 +Author: chenfeiCF +Date: Thu Oct 29 12:21:51 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6a5f590ce97298a17040cfabb435f8fd76a16b3b +Author: chenfeiCF +Date: Thu Oct 29 12:18:53 2015 +0800 + + * adjust for task #2357 2358 + +commit 1202c8db387b3cb75c8ccdb7a3a42d9cee9049e5 +Author: wangyidong +Date: Thu Oct 29 10:05:01 2015 +0800 + + * finish for testtask branch. + +commit d52bb5da5ca59c57f40f5d33fd4674484cb7a2d9 +Author: wangyidong +Date: Wed Oct 28 14:54:48 2015 +0800 + + * finish task #2349. + +commit e1d907628c5db40975195e340361eef0e34efe88 +Author: wangyidong +Date: Wed Oct 28 14:33:06 2015 +0800 + + * finish task #2346 2347 2348. + +commit 7960c73e1b86c433791a52bbb7b49173953cce4c +Merge: 546e61c36a 11b33e1e7f +Author: chenfeiCF +Date: Tue Oct 27 20:21:01 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + + Conflicts: + module/build/model.php + +commit 546e61c36a1fcaa941d8aec248830ff014ceecd7 +Author: chenfeiCF +Date: Tue Oct 27 18:55:59 2015 +0800 + + * finish task #2350. + +commit 11b33e1e7f6e09b732ba85ecb85039fd34c4c996 +Author: wwccss +Date: Tue Oct 27 16:52:50 2015 +0800 + + * add link of zentao.pm. + +commit 76c9841dc9a88544191c247bf196c1c1fa4ebb0f +Author: wwccss +Date: Tue Oct 27 16:42:18 2015 +0800 + + * change the readme. + +commit a8429345bc1b6b216f80cf4c73af53af0dc8a535 +Author: wwccss +Date: Tue Oct 27 16:39:42 2015 +0800 + + * change readme. + +commit 1046a25f09c0cc9520779902ecb24ac4cec427c6 +Author: wwccss +Date: Tue Oct 27 16:36:16 2015 +0800 + + * fix the comment error. + +commit 36732015096a75d0e7bf009adf0a3c7b9d91bcd2 +Author: wangyidong +Date: Tue Oct 27 15:03:20 2015 +0800 + + * adjust for task #2336. + +commit 71240b18a799c0e489d113f75ebb124ae45b691c +Author: wangyidong +Date: Tue Oct 27 14:15:05 2015 +0800 + + * finish task #2351. + +commit b979a5da3898395fb71b127b870c70be0038209f +Author: wangyidong +Date: Tue Oct 27 09:34:05 2015 +0800 + + * finish task #2352. + +commit 695815c2d6da0dc543d9d82629494d021cb13016 +Author: wangyidong +Date: Tue Oct 27 08:27:25 2015 +0800 + + * fix bug #751. + +commit 9c04bd1fd19fbf82f2bdd157d6218304a6395f54 +Author: wangyidong +Date: Tue Oct 27 08:27:06 2015 +0800 + + * change for db. + +commit c4bd3be15dff16400a4b6a36d0cc1ec2b1c648d8 +Author: wangyidong +Date: Mon Oct 26 14:40:49 2015 +0800 + + * code for task #2353. + +commit 9bd03f59761c80451d04de30c7dbef62bfc67b1c +Author: wangyidong +Date: Mon Oct 26 14:15:25 2015 +0800 + + * finish task #2353. + +commit 5029ba6b235e61413d9ff28af8a2695b6e3fc8a7 +Author: wangyidong +Date: Mon Oct 26 13:12:00 2015 +0800 + + * finish task #2344. + +commit 621684debf27e237299c4cca5c7f434b7131ac8a +Merge: 66af5e5183 b8fd607508 +Author: wangyidong +Date: Mon Oct 26 09:35:58 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 66af5e51830f62dc610a15a3607e0dbdcc348271 +Author: wangyidong +Date: Mon Oct 26 09:35:22 2015 +0800 + + * finish task #2344. + +commit b8fd6075088f7ad2c94eb414b2ab804ed02055bc +Merge: 87686ad3f1 a1625710cb +Author: chenfeiCF +Date: Fri Oct 23 14:01:46 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 87686ad3f174a05a006f785325945ade41089b35 +Author: chenfeiCF +Date: Fri Oct 23 13:59:59 2015 +0800 + + * finish task #2354. + +commit a1625710cbf84942ac8cb632fb0a7b0c7f59af2a +Merge: 578d47a409 7aebf9efbd +Author: wangyidong +Date: Thu Oct 22 17:22:21 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + *finish task #2342. + + Conflicts: + module/bug/control.php + +commit 578d47a4090cc6b9977c3369cc10ebb2ec388e7a +Author: wangyidong +Date: Thu Oct 22 17:18:34 2015 +0800 + + * finish task #2342. + +commit 7aebf9efbd84d988b107d01e19376be7cb297ce0 +Author: chenfeiCF +Date: Thu Oct 22 17:12:56 2015 +0800 + + * finish task #2358. + +commit df23f3b43e151ab81909f55dc6e45fd4b4b1f79c +Author: wangyidong +Date: Thu Oct 22 16:38:39 2015 +0800 + + * finish task #2341. + +commit 333b0be157ac15717e7a7b39b53ccef49ec4a707 +Author: wangyidong +Date: Thu Oct 22 09:03:37 2015 +0800 + + * finish task #2323,2340. + +commit 2026c89d90bc7eff9cd7226047a2b57015d679a5 +Author: chenfeiCF +Date: Thu Oct 22 08:28:54 2015 +0800 + + * finish task #2357. + +commit 1e2eb99b642e3ebea00536e60dd5269f0d14a1fa +Author: chenfeiCF +Date: Wed Oct 21 14:39:37 2015 +0800 + + * adjust the style for create.html.php of bug module. + +commit c45326cca4badce63de5af934b992437b3b51cd4 +Author: chenfeiCF +Date: Wed Oct 21 10:32:07 2015 +0800 + + * finish task #2359. + +commit a56a0bde160ed3a9377b25cde5205e87139538a2 +Author: daitingting +Date: Tue Oct 20 13:14:58 2015 +0800 + + * finish task #2360. + +commit 9ad38472fc36ee805741c569fa28de4e8cde7886 +Author: wangyidong +Date: Tue Oct 20 10:11:46 2015 +0800 + + * finish task #2336,2337,2338,2339. + +commit 78218b47d01a44462f586ff7dd7814356964bd99 +Author: wangyidong +Date: Tue Oct 20 10:10:17 2015 +0800 + + * fix a bug for safe. + +commit c20745f87d41b2bdc60373d319f7a8626d9f6072 +Author: wangyidong +Date: Fri Oct 16 15:46:03 2015 +0800 + + * finish task #2356. + +commit 86deb93acd5df9ce2732af9a1e0493469f7b0f1e +Author: wangyidong +Date: Fri Oct 16 14:26:03 2015 +0800 + + * finish task #2355. + +commit 15b703fde3d413ed275d694e86eb790842ce16ad +Author: wangyidong +Date: Fri Oct 16 13:50:19 2015 +0800 + + * finish task #2334. + +commit e097fdcb8efc94c34cecff25ba07bfc22a0f0cfa +Author: wangyidong +Date: Fri Oct 16 10:53:10 2015 +0800 + + * finish task #2329. + +commit c571a8a4400e60436f707e88b3b9a6f16cb71cfe +Author: wangyidong +Date: Thu Oct 15 17:28:40 2015 +0800 + + * finish task #2361. + +commit ea93e3cc5b1fe1c0ccdaf6cf595393c95ea54c3c +Author: wangyidong +Date: Thu Oct 15 11:33:52 2015 +0800 + + * finish task #2332. + +commit 81a305e6b6febc4ff869cdf44c89e72444dc8ddf +Author: wangyidong +Date: Thu Oct 15 11:21:22 2015 +0800 + + * finish task #2328. + +commit c03bce590ca49e25585dea7b2491957598f01c93 +Author: wangyidong +Date: Thu Oct 15 10:08:22 2015 +0800 + + * finish task #2327. + +commit 2b09f778dde71a39fbb97cfed8dd5f813e8eb33e +Author: wangyidong +Date: Wed Oct 14 17:06:23 2015 +0800 + + * finish task #2325. + +commit a99d4b866fabbb23a3c30c07a36b397536db597e +Author: wangyidong +Date: Wed Oct 14 16:59:02 2015 +0800 + + * finish task #2362. + +commit d449255cda0cc2b1690d0a960ddcbb69ee78b06e +Author: wangyidong +Date: Wed Oct 14 16:46:47 2015 +0800 + + * finish task #2366. + +commit e4c40098c2549b752dce0a884b8eb03b55aeee42 +Author: wangyidong +Date: Wed Oct 14 16:06:30 2015 +0800 + + * finish task #2367. + +commit 2d209e4bb682de9c10fc5fd120501c71e71788f5 +Author: wangyidong +Date: Wed Oct 14 14:23:46 2015 +0800 + + * finish task #2368. + +commit 34a48fe06c99a7b6c99b65420c4caa2cd9a0d819 +Author: wangyidong +Date: Wed Oct 14 13:58:55 2015 +0800 + + * adjust code for task #2370. + +commit 6e0f8ff5fcf70db9c5724ceab58524d41a9a479c +Author: wangyidong +Date: Wed Oct 14 13:55:06 2015 +0800 + + * finish task #2370. + +commit 9ec0520b34cb2bd7b6aed720c63b455635bbbacf +Author: wangyidong +Date: Wed Oct 14 11:11:52 2015 +0800 + + * finish task #2371. + +commit c5546d215ec0209ba8211f1c92900a43e9addf2a +Author: wangyidong +Date: Tue Oct 13 02:11:36 2015 +0800 + + * finish task #2372. + +commit 1fb482222a456071d57412e7eaaef0a15be72435 +Author: wangyidong +Date: Tue Oct 13 00:43:45 2015 +0800 + + * finish task #2373. + +commit d741661d4337ce813840e8537fa60c92fd390aae +Author: wangyidong +Date: Mon Oct 12 23:58:50 2015 +0800 + + * finish task #2374. + +commit 2495cae34082b264d20b8a691a647b2fc296e18d +Author: wangyidong +Date: Thu Oct 8 15:52:49 2015 +0800 + + * fix bugs #746,747. + +commit 0138d6f7f978fb7d721a1e2090a3a6c43365f4a7 +Author: wangyidong +Date: Wed Sep 23 11:01:00 2015 +0800 + + * fix a bug. + +commit cff0aff1be414dc8d6c32cb63661cc85ed2656a6 +Author: wangyidong +Date: Mon Sep 21 10:07:46 2015 +0800 + + * fix for group lang. + +commit 94b2a70e689635ba9d1836a0a41a4125381753c3 (tag: zentaopms_7.3.stable_20150918) +Author: wangyidong +Date: Fri Sep 18 15:52:20 2015 +0800 + + * fix a bug and add changelog. + +commit abf8b9790427f6fbd7eaf339235819cad4898390 +Author: wangyidong +Date: Fri Sep 18 09:59:43 2015 +0800 + + * change for zh-tw. + +commit dcc9d80a7047af57504e542a36ead2c53e265de5 +Author: wangyidong +Date: Fri Sep 18 09:38:15 2015 +0800 + + * adjust for password safe. + +commit 6278f570f31af2d906d408266c83783cf69df7e4 +Author: wangyidong +Date: Thu Sep 17 16:59:08 2015 +0800 + + * adjust task #2304. + +commit 8110f8fcb224e60b597884cd8797b7ff8c7e5da5 +Author: wangyidong +Date: Thu Sep 17 16:23:51 2015 +0800 + + * Sync to sendcloud when create,edit and delete user. + +commit 9665abb8ed0480d5a6b94d0e2dd1ff9cc6e096cd +Author: wangyidong +Date: Thu Sep 17 15:34:25 2015 +0800 + + * adjust for mail. + +commit adf49b7dd53ae242f39578f004021cff920a27f8 +Author: wangyidong +Date: Thu Sep 17 14:53:15 2015 +0800 + + * adjust for cron. + +commit 35b25360e318e670c073ecc1f8a076252fa3bd92 +Author: wangyidong +Date: Thu Sep 17 14:48:20 2015 +0800 + + * adjust lang for build and release. + +commit df8478386a44e79d64e667e8697e6e472ba8c682 +Author: wangyidong +Date: Thu Sep 17 14:45:08 2015 +0800 + + * adjust for import bug. + +commit 1747c0e0d220ceb93bda20290c15fd9c8ee4864f +Author: wangyidong +Date: Thu Sep 17 14:36:42 2015 +0800 + + * adjust task #2293. + +commit 9ab9c376f73dc683b6856d8e9f290a76a0466754 +Author: wangyidong +Date: Thu Sep 17 14:31:35 2015 +0800 + + * adjust for task #2295. + +commit eb0e1c2f47ff5d0499bc0d36105a349f9db5cd62 +Author: wangyidong +Date: Thu Sep 17 14:08:15 2015 +0800 + + * adjust task #2300. + +commit 9cf05383dff600e08f2d73c731c0934f3dcf0f2d +Merge: 06a577884d 59fca8a35c +Author: wangyidong +Date: Thu Sep 17 13:57:26 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 06a577884debada3ab2fff8b63d888c571c322b5 +Author: wangyidong +Date: Thu Sep 17 13:55:44 2015 +0800 + + * adjust for task 2301. + +commit b54316ef321298b801941adfcc05e13de6e9a903 +Author: wangyidong +Date: Thu Sep 17 13:30:14 2015 +0800 + + * adjust for import. + +commit db94d8252c190376c150337bd5a68239721172b4 +Author: wangyidong +Date: Thu Sep 17 11:11:40 2015 +0800 + + * adjust for create page of bug,story,task,testcase. + +commit 90b4011e568c188cccfadc3099ae4a32405ef3d9 +Author: wangyidong +Date: Thu Sep 17 09:44:02 2015 +0800 + + * adjust manageview page. + +commit d2843052d9cfcb96d0cb70d21335e0fdac8ea858 +Author: wangyidong +Date: Thu Sep 17 09:30:10 2015 +0800 + + * change for export template and adjust create,edit page. + +commit 59fca8a35c2a061c07cd866cab02a1eefd381979 +Author: Catouse +Date: Wed Sep 16 18:28:38 2015 +0800 + + * update chartjs. + +commit 7d45f50cc21b8e76a3dfe8edcd3dce8a9a14a2a7 +Author: wangyidong +Date: Wed Sep 16 16:41:45 2015 +0800 + + * adjust for task #2320. + +commit 44fae82506e1370dab3cfc736b774813bd1ce98a +Author: wangyidong +Date: Wed Sep 16 16:36:59 2015 +0800 + + + add for task #2285. + +commit 43ff689c19e9c9e785cabd61a74e2b242ce40afd +Author: wangyidong +Date: Wed Sep 16 16:25:33 2015 +0800 + + + add for task 2283. + +commit f008c122347ed9d0c9e529d5399877e2468bb8d4 +Author: wangyidong +Date: Wed Sep 16 10:19:31 2015 +0800 + + * adjust code for utf8 bom in file. + +commit da2fa149f6439c83bd4611e305d9f63b25bfc3e4 +Author: wangyidong +Date: Wed Sep 16 08:39:56 2015 +0800 + + * finish task #2324. + +commit 4c0ae94b0ad69365afc9ff4e9e90319cd61c2599 +Author: wangyidong +Date: Tue Sep 15 15:04:36 2015 +0800 + + * fix bug #743. + +commit 3371dbd74ec280ed920468ade5fd806546904942 +Author: wangyidong +Date: Tue Sep 15 14:59:05 2015 +0800 + + * add pri for create bug. + +commit 91890ff23bfd03fef91f400968995ed2af394ee8 +Author: wangyidong +Date: Tue Sep 15 14:40:20 2015 +0800 + + * finish task #2273. + +commit 90897e53ca6f0d2f9509b4824f54fb1b7835c5d5 +Author: wangyidong +Date: Mon Sep 14 15:23:24 2015 +0800 + + * fix bug #734. + +commit 911cd1d50a81c26c3489a84031ab02d197787ecc +Author: wangyidong +Date: Fri Sep 11 14:53:14 2015 +0800 + + * fix bug #720. + +commit a6d77d7389205b0e6f4bff01efe07f985a088330 +Author: wangyidong +Date: Fri Sep 11 14:14:18 2015 +0800 + + * adjust for sso. + +commit 0ae2909ebc6254d318dc3ddad47bc558774223f7 +Merge: bbf14efe38 7fdc8e13e4 +Author: wangyidong +Date: Fri Sep 11 14:07:57 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bbf14efe388841f2c4e3ed4f04be7aebbf016950 +Author: wangyidong +Date: Fri Sep 11 14:06:50 2015 +0800 + + * adjust code. + +commit 7fdc8e13e4acdfdfa8c1da79ff1dba65336e185d +Author: chujilu +Date: Fri Sep 11 13:25:48 2015 +0800 + + * Fix a bug. + +commit 453965f87ca7deba6116310e5232188cda61e99f +Author: wangyidong +Date: Fri Sep 11 13:05:09 2015 +0800 + + * adjust style. + +commit feae0d759808c9e737bb2b5335babf295dd4385b +Author: wangyidong +Date: Fri Sep 11 10:28:41 2015 +0800 + + * add 7.3 version and change for upgrade. + +commit a9184b79e33c05922bab7747b8853b0b79a35655 +Author: wangyidong +Date: Fri Sep 11 10:27:53 2015 +0800 + + * adjust for check.php. + +commit 9ee012cb22a54501c655d5f2b4b40281428bb717 +Author: wangyidong +Date: Fri Sep 11 09:51:44 2015 +0800 + + * adjust z-index for querybox. + +commit 29e88c91f4bb40adadd7c5d6c8b2375e89090a61 +Author: wangyidong +Date: Fri Sep 11 09:40:43 2015 +0800 + + * fix bug #729. + +commit a626216df38611f6ff711b4389ebac038b4fabe3 +Author: wangyidong +Date: Fri Sep 11 09:24:54 2015 +0800 + + * adjust block project for index. + +commit 8c0cd5821fd6fb6f945f07ec900bce12a9583f33 +Author: wangyidong +Date: Fri Sep 11 08:55:52 2015 +0800 + + * merge task create for kanban. + +commit ace8ade51f7ad9441a399849a160a2db04ac3c3b +Author: wangyidong +Date: Thu Sep 10 17:03:19 2015 +0800 + + * adjust lang for sendcloud. + +commit e084f9c2fdccbb91df48ad966a83bb262ed22f94 +Author: wangyidong +Date: Thu Sep 10 16:47:34 2015 +0800 + + * fix bug #732. + +commit 5c1355973753527fa51ef1184b1faff07cd0d2b3 +Author: wangyidong +Date: Thu Sep 10 16:08:45 2015 +0800 + + * fix bug #735. + +commit 202e3e96b416c89b8cee7f03e59824420d0d5855 +Author: wangyidong +Date: Thu Sep 10 15:42:20 2015 +0800 + + * code bug #736. + +commit 3628e43f27802d070dbd0bf0dbbb7d06f14adb1c +Author: wangyidong +Date: Thu Sep 10 15:39:38 2015 +0800 + + * fix a bug #736. + +commit 8cf7c265c2340a4a60fb616b1e1be16fdb6ec821 +Author: wangyidong +Date: Thu Sep 10 14:27:10 2015 +0800 + + * fix bug #740. + +commit 1db6ebc5b1b6b1d07ff9ca6d6fade71bee6d0f48 +Author: wangyidong +Date: Thu Sep 10 14:12:17 2015 +0800 + + * fix bug #741. + +commit ce6e889f1d53983fd8b7a1b24f9a52800b13a1cc +Author: wangyidong +Date: Thu Sep 10 13:19:42 2015 +0800 + + * fix bug #742. + +commit 8e2a676514ada7a60d81b0837fe714c87baedb56 +Author: wangyidong +Date: Thu Sep 10 13:13:45 2015 +0800 + + * finish task #2307. + +commit 64ecfecc647886171ab31b9a7a14f4df82d5a0de +Author: wangyidong +Date: Wed Sep 9 17:10:58 2015 +0800 + + * finish task #2308. + +commit 76d9e3a14d4d78e721f0d99fa576c67f023fb330 +Merge: 841aed3e99 c67b0746e0 +Author: wangyidong +Date: Wed Sep 9 16:19:43 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 841aed3e9946deff30b1e5cef783b6b3682eac5b +Author: wangyidong +Date: Wed Sep 9 16:19:28 2015 +0800 + + * finish task #2309. + +commit c13891ffd1bfdb0b59e907a52f58ed2f7ce87480 +Author: wangyidong +Date: Wed Sep 9 15:51:47 2015 +0800 + + * finish task #2310. + +commit c67b0746e04431639015e12c346257b11723a2b1 +Author: Catouse +Date: Wed Sep 9 14:25:34 2015 +0800 + + * change burn chart config. + +commit a1c27a2dd278d0337ab6a39bca82183fa71485bc +Merge: 0bf04601f0 d5f3479c1f +Author: wangyidong +Date: Wed Sep 9 14:20:57 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d5f3479c1fd5ded40cbd7d20738bca9ddfad9194 +Author: Catouse +Date: Wed Sep 9 14:08:50 2015 +0800 + + * finish task #2282: display value label in bar chart by update zui. + +commit 296f0ac78d1101d16b31f56667b6edfaaa5ca6e0 +Author: Catouse +Date: Wed Sep 9 12:03:59 2015 +0800 + + * finish task #2274. + +commit 0bf04601f0e7f31496c84f755c395c189371cae7 +Author: wangyidong +Date: Wed Sep 9 10:03:23 2015 +0800 + + * adjust lang for sso and mail. + +commit a1c129710cecb11373e3a28b419cd2702fea1309 +Author: wangyidong +Date: Tue Sep 8 17:17:34 2015 +0800 + + * finish task #2288. + +commit 530a68da22783bdcbb9cebf039d00bf257fe2651 +Author: wangyidong +Date: Tue Sep 8 15:30:11 2015 +0800 + + * finish task #2272,2271,2270. + +commit 26a13919a28c5fb9970bc050dcf579487001c503 +Author: wangyidong +Date: Tue Sep 8 08:21:45 2015 +0800 + + * finish task #2289. + +commit 0571ffe6a3e4853d4371baeb77ea0c966ef9c815 +Author: wangyidong +Date: Mon Sep 7 16:56:44 2015 +0800 + + * finish task #2276. + +commit 84d7e4921141980f1df14a71782b8054854f828d +Author: wangyidong +Date: Mon Sep 7 14:10:37 2015 +0800 + + * finish task #2278. + +commit b80a050ae35ebb4641d36defc10d06fd32236020 +Author: wangyidong +Date: Mon Sep 7 13:20:03 2015 +0800 + + * finish task #2275. + +commit 474e1fe5bd91a28e0be0858e5da782cf622754ba +Author: wangyidong +Date: Mon Sep 7 09:23:21 2015 +0800 + + + finish task #2279. + +commit 84987d90191626601dfdf71d6d5c955546216476 +Author: wangyidong +Date: Sun Sep 6 16:26:01 2015 +0800 + + * finish task #2280. + +commit 5fc3330334eeba42ea1dabab1c05dacd61fc6bfb +Author: wangyidong +Date: Sun Sep 6 16:01:48 2015 +0800 + + * finish task #2297. + +commit 7871037e38f20ac01dd251f0b7e91c5120600cc8 +Author: wangyidong +Date: Sun Sep 6 14:49:35 2015 +0800 + + * finish task #2292. + +commit 08f665a20f2e62cade5f55ffe9016aaabb1fed69 +Author: wangyidong +Date: Sun Sep 6 13:32:35 2015 +0800 + + * finish task #2281. + +commit e21f1727bd2ace7f7fb17ad055f56205a7af5639 +Author: wangyidong +Date: Wed Sep 2 17:25:46 2015 +0800 + + * finish task #2283. + +commit fd11ead66a2fd92524c58e03414479ad9412b0ff +Author: wangyidong +Date: Wed Sep 2 13:33:03 2015 +0800 + + * finish task #2284. + +commit bf2183811864e3b366a1d67e1da267937bf9ec38 +Author: wangyidong +Date: Wed Sep 2 13:13:58 2015 +0800 + + * finish task #2285. + +commit 34cbd724fdc64cd34a38467e428b32ecb54e2eef +Author: wangyidong +Date: Wed Sep 2 10:41:44 2015 +0800 + + * finish task #2287. + +commit 79fea4c0b1a6705305f21ffd6f1af772f7bb663d +Author: wangyidong +Date: Wed Sep 2 10:13:15 2015 +0800 + + * code for task #2288. + +commit 645fe34e18b7b96c35decb35912bd29b3d1e1a94 +Author: wangyidong +Date: Tue Sep 1 17:17:44 2015 +0800 + + * code for task 2290. + +commit 6ca4dc0197ab64276c6a4a97dbd9d6ef26ac2e97 +Author: wangyidong +Date: Tue Sep 1 17:04:56 2015 +0800 + + * finish task #2290. + +commit 8274afc8daedf7015110bd4bc354f8aaf0dc4a33 +Author: wangyidong +Date: Tue Sep 1 16:06:47 2015 +0800 + + * finish task #2291. + +commit 68891fa0cf33f209cf579b58c043d349d60062fa +Author: wangyidong +Date: Tue Sep 1 15:09:37 2015 +0800 + + * finish task #2293. + +commit 8576ea525aab8621d94478ec42ede854f6698acd +Author: wangyidong +Date: Tue Sep 1 14:28:59 2015 +0800 + + * finish task #2294. + +commit 33fc3798a018eec5e03ee63a7d68eeb28a31bef1 +Author: wangyidong +Date: Tue Sep 1 13:36:54 2015 +0800 + + * finish task #2300. + +commit dfdde5d748888647c00309187e2b5de432b5cbd3 +Author: wangyidong +Date: Tue Sep 1 10:52:23 2015 +0800 + + * code for task #2301. + +commit ad7ff8ef2c28bfe3a1bbd4e969424bfb222812f5 +Author: wangyidong +Date: Mon Aug 31 14:43:00 2015 +0800 + + * code for task #2299. + +commit 95c377a3969f890b6dc2a89198d62580f809b933 +Author: wangyidong +Date: Mon Aug 31 14:19:07 2015 +0800 + + * finish task #2299. + +commit a322707b69503314f179ce0bb9ac440b8bfc84d7 +Author: wangyidong +Date: Mon Aug 31 10:57:42 2015 +0800 + + * finish task #2305. + +commit 2c1543c4a0aa38b4dcd7d2cb43c0bd96af4dbce5 +Author: wangyidong +Date: Fri Aug 28 16:02:12 2015 +0800 + + * finish task #2295. + +commit 0df81600aea0d25cdcd2659b4819034c16bbb03b +Author: wangyidong +Date: Fri Aug 28 15:55:31 2015 +0800 + + * finish task #2296. + +commit 0aa0730fd8b7e2fce7adac3ebd94a3c72c7304c4 +Author: wangyidong +Date: Fri Aug 28 14:58:50 2015 +0800 + + * finish task #2298. + +commit e4baed44a839b6263227baec99ddef3bf694d20e +Author: wangyidong +Date: Fri Aug 28 14:46:26 2015 +0800 + + * code for task #2304. + +commit 57b494614d31ea46c7d809d47ad5aa3b426b0496 +Author: wangyidong +Date: Fri Aug 28 14:21:02 2015 +0800 + + * code for task #2304. + +commit 83071d38893b5ff3a73af56258bf132f9142a237 +Author: wangyidong +Date: Fri Aug 28 14:17:40 2015 +0800 + + * finish task #2304. + +commit e53bbdf5028ecb7f768d42ef82efe39c47f00b59 +Author: wangyidong +Date: Fri Aug 28 13:14:02 2015 +0800 + + * finish task #2306. + +commit 615ef46841904a13ec8133278fbdeac0db457aa6 +Author: wangyidong +Date: Fri Aug 28 11:07:36 2015 +0800 + + * finish task #2311. + +commit 91b76c85d832086f07171e9d90ae9dfedd344e0d +Author: wangyidong +Date: Fri Aug 28 10:54:37 2015 +0800 + + * finish task #2313. + +commit cc660238a2984ab7fb83c1415492310821d83571 +Author: wangyidong +Date: Fri Aug 28 09:56:29 2015 +0800 + + * finish task #2316. + +commit 09ecfa30ddc8d38b47606cf0f7b4e27c2bb39466 +Author: wangyidong +Date: Thu Aug 27 14:49:33 2015 +0800 + + * finish task #2317. + +commit 7bb9a3f92317c921ff661184cf8bf8dc2c4530b7 +Author: wangyidong +Date: Wed Aug 26 17:29:01 2015 +0800 + + * finish task #2318. + +commit d83b92be9ae6a219eacac47ea452954156f2ce35 +Author: wangyidong +Date: Wed Aug 26 17:01:27 2015 +0800 + + * finish task #2319. + +commit 4bf8f317dfe0d460aa4e764418ca2b0d4a3d75e6 +Merge: 425975b874 615fb2ff1f +Author: wangyidong +Date: Wed Aug 26 16:40:19 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 425975b874f08a3fd4dea29658f5e0aaea46f962 +Author: wangyidong +Date: Wed Aug 26 16:40:02 2015 +0800 + + * fix a bug. + +commit 615fb2ff1f08cb9aca287499dd5145ada694c787 +Author: Catouse +Date: Wed Aug 26 15:23:34 2015 +0800 + + * finish task #2312. + +commit 9f9d367606e003a950d90e3de98f461b26956bf7 +Merge: b34c1f5c6c 783e6e90d8 +Author: wangyidong +Date: Wed Aug 26 14:55:36 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b34c1f5c6cc53c41b20298ac04d4c16e571fb12f +Author: wangyidong +Date: Wed Aug 26 14:54:54 2015 +0800 + + * finish task #2320. + +commit 783e6e90d85744aac96adb335e7f6f9689c31a80 +Author: Catouse +Date: Wed Aug 26 14:38:16 2015 +0800 + + * finish task #2314. + +commit 0f79a4f998b271c7ec69a1fda4220b968bc3226e +Author: wangyidong +Date: Wed Aug 26 14:37:01 2015 +0800 + + * finish task #2315. + +commit aac7b2ef5da5c47e53d25520b50d872856f45499 +Author: wangyidong +Date: Wed Aug 26 14:13:58 2015 +0800 + + * code for task 2322. + +commit e1c7f9ddff34c085cfcbcc33aebd8eb670d5d9c7 +Author: wangyidong +Date: Wed Aug 26 10:48:11 2015 +0800 + + * revert for task #2322. + +commit 4524b6bbd693dd8dc1bd933c7c0632ca3634bf07 +Author: wangyidong +Date: Wed Aug 26 10:11:43 2015 +0800 + + * finish task 2322. + +commit dddd25f18abfbedcbfb90ad9b5194422581dde2a +Author: wangyidong +Date: Tue Aug 25 15:14:22 2015 +0800 + + * finish task #2312. + +commit 5396c4bc3f3914a59a73374eb1d59a90b8fbabe1 +Author: wangyidong +Date: Fri Aug 14 09:02:48 2015 +0800 + + * fix a bug. + +commit 12c4635f54e356dba8efa4852843473b54aedb96 +Author: wangyidong +Date: Thu Aug 13 16:15:33 2015 +0800 + + * fix a bug for admin-safe. + +commit 27cfb7d38be64f8e92d6c694dbb840bbca012653 +Author: wangyidong +Date: Wed Aug 12 14:51:04 2015 +0800 + + * fix a bug. + +commit f5833692358f941fe69b8eb801f9c1914412bcd4 (tag: zentaopms_7.2.5_20150807) +Author: wangyidong +Date: Fri Aug 7 09:09:19 2015 +0800 + + * fix bug for install when ztv_ and undelete. + +commit 5d799fba8334560b51ba264393a1b2657a282b19 +Author: wangyidong +Date: Thu Aug 6 14:33:15 2015 +0800 + + * adjust code for group view. + +commit d1d56b2a6a83a3a7ad3318dfc4ae70c1e2581887 +Author: wangyidong +Date: Thu Aug 6 10:46:30 2015 +0800 + + * change for zh-tw. + +commit 9d2d722192affe611c19337477fa856b7466c3b5 +Author: wangyidong +Date: Thu Aug 6 10:44:43 2015 +0800 + + * change for upgrade. + +commit 1625f0394e60c51fe8ea42ee15cddef8a03a6d81 +Author: wangyidong +Date: Wed Aug 5 16:09:12 2015 +0800 + + * fix a bug for svn and adjust burn. + +commit 4d0ff8f8c8527ccf24be302be5f89aba2dcdbf59 +Author: wangyidong +Date: Tue Aug 4 14:44:13 2015 +0800 + + * adjust for workload. + +commit 60d6d5a63c76b5c89333eaad6988c01d9477702a +Author: wangyidong +Date: Tue Aug 4 14:23:43 2015 +0800 + + * adjust for bug create. + +commit d328ee21c235838571044e09c0dd1a4da7078efa +Author: wangyidong +Date: Mon Aug 3 15:17:45 2015 +0800 + + * adjust project deviation report. + +commit 47926abd17db8460e560c715ac81aff03666c176 +Author: wangyidong +Date: Thu Jul 30 15:37:33 2015 +0800 + + * change tools. + +commit e0a643cd0bbb07177b4864f3b40d90105b0aac94 +Author: wangyidong +Date: Thu Jul 30 15:35:55 2015 +0800 + + * change projectcommon to projectCommon,productcommon to productCommon. + +commit 1cb30fe76da8afd7bcb9ff9d9ee5fd7df9ebe854 +Author: chujilu +Date: Thu Jul 30 14:52:00 2015 +0800 + + * Fix a kindEditor bug. + +commit bc45adf37c2879bccf7f218dcdf94c4a57252a8b +Author: wangyidong +Date: Thu Jul 30 09:03:58 2015 +0800 + + * change for git and report. + +commit 09aa6eb818bd0ff4e9cdd3aac46a10a69fb3f170 +Author: wangyidong +Date: Wed Jul 29 17:24:43 2015 +0800 + + * fix a bug #711. + +commit 02d1a087c7aad4646ca01330624267a10db26c64 +Author: wangyidong +Date: Wed Jul 29 15:58:11 2015 +0800 + + * fix a bug #721. + +commit 5ab2b007ba64b7588d0b93d15d803353e4bdb013 +Author: wangyidong +Date: Wed Jul 29 14:04:21 2015 +0800 + + * fix bug #724. + +commit de63b68c0d90687898c0760387a382ff48ff334e +Author: wangyidong +Date: Wed Jul 29 14:00:48 2015 +0800 + + * fix bug #714. + +commit e6c4f6a953e3a3ce03139b471e157b2a937a18b2 +Author: wangyidong +Date: Wed Jul 29 13:55:23 2015 +0800 + + * fix bug #719. + +commit c4c6b1bc2d8c6924cace3ba94c4ac598f56bdd94 +Author: wangyidong +Date: Wed Jul 29 13:44:20 2015 +0800 + + * fix bug #723. + +commit e190b182baf6ab737700790cf5ad7714f473564f +Author: wangyidong +Date: Wed Jul 29 13:25:22 2015 +0800 + + * adjust for git. + +commit e637c7c09ceb98a1fd7b2e036b6a3db4368dd9a6 +Author: wangyidong +Date: Wed Jul 29 11:24:49 2015 +0800 + + * fix a bug for kindeditor in ie11. + +commit 71bb2181abeeba38a616c720b73f288d2b57fe1d +Author: wangyidong +Date: Wed Jul 29 10:26:04 2015 +0800 + + * fix bug #728. + +commit 45f0e31e298925d1361f3dd5be9971d082f0ac5e +Author: wangyidong +Date: Tue Jul 28 16:25:51 2015 +0800 + + * fix for pro4.7 + +commit 24c838edf99ef5d2d1fc16ccfd352b4db41d1a2b +Author: wangyidong +Date: Tue Jul 28 16:25:09 2015 +0800 + + * finish task #642. + +commit 95edbb391404829f6bb92ebaa7f6d498477e3734 +Author: wangyidong +Date: Tue Jul 28 13:28:36 2015 +0800 + + * fix bug #649. + +commit df78a73a788d0adcef514ba7df2104212918add0 +Author: wangyidong +Date: Mon Jul 27 13:07:38 2015 +0800 + + * finish task #3375. + +commit 1bf12ec314984e43c581bf1eaa7ef4a8b646daf2 +Merge: a790ea2247 8a69184a4d +Author: wangyidong +Date: Fri Jul 24 12:07:51 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a790ea22479b70f51a85bbfaf8ad170123c39a44 +Author: wangyidong +Date: Fri Jul 24 12:07:34 2015 +0800 + + * finish task #3369. + +commit 8a69184a4d6aa0715292500cf3d0cdd1d5474b70 +Merge: 9d4d6b5ee2 7437704c4e +Author: wwccss +Date: Fri Jul 24 10:13:34 2015 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 9d4d6b5ee2e5c1cf60fa83c92ecacb3cc529a231 +Author: wwccss +Date: Fri Jul 24 10:08:52 2015 +0800 + + * adjust the alert info for install.php and upgrade.php. + +commit 9e357c4c51e1a152d461502d08d293a1cd8fd107 +Author: wwccss +Date: Fri Jul 24 10:08:35 2015 +0800 + + * adjust weibo link. + +commit 7437704c4ee10a5816d33619eb25951799c1fc13 +Merge: 2551853591 517bda424c +Author: wangyidong +Date: Thu Jul 23 15:22:36 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 255185359140064b1e76359cff51224430cf0782 +Author: wangyidong +Date: Thu Jul 23 15:21:51 2015 +0800 + + * finish task #3352. + +commit 517bda424c48ffecfbc7eecc9b5c7a7197b7f753 +Author: wwccss +Date: Thu Jul 23 13:32:10 2015 +0800 + + * should use batchCheck instead of autocheck. + +commit 04197c1ec9582cfaf9f02bbb44af58f13536e392 +Author: wangyidong +Date: Thu Jul 23 10:44:16 2015 +0800 + + * fix git in windows. + +commit 031c0370d151fdeef2f12cb993dba642e34e46d8 +Author: wangyidong +Date: Fri Jul 17 16:08:26 2015 +0800 + + * fix bug. + +commit 551649dd2eb8a586f6e9c16bdd9fcc147ad43373 +Merge: 9390e960ee 0dfc668a35 +Author: wangyidong +Date: Fri Jul 17 13:25:16 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9390e960ee6bced1098b6faabbdc621e906f3e8f +Author: wangyidong +Date: Fri Jul 17 13:24:48 2015 +0800 + + * finish task #3344. + +commit 0dfc668a35ca8b3dd91ea12c47ab876fa0054936 +Author: Catouse +Date: Tue Jul 14 16:30:53 2015 +0800 + + * add server time information to config. + +commit 700292f5648fa22e9484dd552cdf1ceb07b38aab +Author: wangyidong +Date: Wed Jul 8 19:31:19 2015 +0800 + + * adjust code. + +commit 5378faf74dd072ca56434e023bd34481c11519fa +Author: wangyidong +Date: Tue Jul 7 16:18:39 2015 +0800 + + * fix a bug #640. + +commit 7c6747e7d2af429b5c5d085cd178d8a576a620ce +Author: wangyidong +Date: Tue Jul 7 15:04:53 2015 +0800 + + * fix a bug #718. + +commit ff2e24d3b3e0b4cba32111d4d9cbe484fe5be0c4 +Author: wangyidong +Date: Tue Jul 7 14:53:14 2015 +0800 + + * fix bug #717. + +commit 1b1ea5062f43897b417ee692e7d943981ac0eb36 +Author: wangyidong +Date: Tue Jul 7 14:44:10 2015 +0800 + + * adjust code. + +commit 365b8b1e56d497405b8b64ddded05bbf1afbb71c +Author: wangyidong +Date: Tue Jul 7 14:37:18 2015 +0800 + + * fix bug #643. + +commit 69845ccd53233c41227502f1578b3ff70f9fb0bd (tag: zentaopms_7.2.4_20150703) +Author: wangyidong +Date: Fri Jul 3 14:54:02 2015 +0800 + + * change version. + +commit bd579e8919f94d2810d117c446ba42c31d1d60e7 +Author: wangyidong +Date: Fri Jul 3 14:08:59 2015 +0800 + + * change for zh-tw. + +commit fc67542419514128e8da1da470e39f70345ee179 +Author: wangyidong +Date: Fri Jul 3 11:39:11 2015 +0800 + + * fix a bug #712. + +commit dc381b40b5868d78aa7d14ca736d6cfee4e7f400 +Author: wangyidong +Date: Fri Jul 3 11:33:21 2015 +0800 + + * fix bugs. + +commit d11cc426f294ce20f9e461176a6057eca11714db +Author: wangyidong +Date: Thu Jul 2 15:19:22 2015 +0800 + + * adjust for upgrade. + +commit d7d3c518d6017e1f0fbc0596475b360848837089 +Author: wangyidong +Date: Wed Jul 1 12:09:11 2015 +0800 + + * change for new version. + +commit 2bd8675b6165153804c124b0edfcb44beeaf8356 +Author: wangyidong +Date: Wed Jul 1 10:29:40 2015 +0800 + + * fix bug for database. + +commit ecf44af91dab7a15c38a47ae2340e9591aea96dc +Author: wangyidong +Date: Wed Jul 1 10:29:06 2015 +0800 + + * fix bugs. + +commit b70dbadc037e6769d26febdc21717542a6b1ee7d +Author: wangyidong +Date: Wed Jul 1 10:27:45 2015 +0800 + + * add function for check ajax request. + +commit 9538c89267e57484e0cf8b7c3baf2e5d2a1e986a +Author: wangyidong +Date: Wed Jul 1 10:27:11 2015 +0800 + + * fix for pro. + +commit e86d427062e72470a61679ec21cce33bd6a54b86 +Author: Catouse +Date: Tue Jun 30 10:26:20 2015 +0800 + + * ajax modal trigger support more options. + +commit 0022e3f8e8c3b0a712739a2baf82a8ce1264de1a +Author: wangyidong +Date: Tue Jun 16 13:21:52 2015 +0800 + + * fix a bug. + +commit 598ec01ccc717564c62ebf4d1781b05abdd34e4f +Author: wangyidong +Date: Fri Jun 12 11:18:44 2015 +0800 + + * adjust code. + +commit 353bb5160fb692de4430e6bb127138228f159c23 +Author: wangyidong +Date: Fri Jun 12 11:18:22 2015 +0800 + + * fix a bug. + +commit 1e0555c378d8e3bc01ead90d764beb9deb9b7177 +Author: wangyidong +Date: Tue Jun 9 11:35:07 2015 +0800 + + * fix a bug. + +commit 04c534936ebb2d83df8ba7d9d7216a41970c9965 +Author: wangyidong +Date: Fri Jun 5 14:49:58 2015 +0800 + + * fix a bug. + +commit 17dc7e986b1725f588612d0d22558f9b3eb195cb +Author: wangyidong +Date: Thu May 28 17:04:20 2015 +0800 + + * fix a bug. + +commit 49f121382fbdcd3dc038db2d9139d8c3309f24b2 +Author: wangyidong +Date: Thu May 28 17:03:58 2015 +0800 + + * fix a bug. + +commit 7fed4605b1d9c1a21c01115f840ba8578bd7ebec +Author: wangyidong +Date: Wed May 27 10:17:41 2015 +0800 + + * fix a bug for link. + +commit c57df9104c3254cb6c8b2ca119c7762d7036700b (tag: zentaopms_7.2.stable_20150525) +Author: wangyidong +Date: Mon May 25 13:55:07 2015 +0800 + + * delete useless code. + +commit ae4cd7ef861f410977068fd60eb7d31124e8ef34 +Author: wangyidong +Date: Mon May 25 13:43:37 2015 +0800 + + * fix for link bug. + +commit ef9a2e941a6c6b5a0d1f89b02f5453048b343f8b +Author: wangyidong +Date: Fri May 22 09:45:19 2015 +0800 + + * add for CHANGELOG + +commit 6738a4bfd7513d316b3080f57a406a288d7b5c49 +Author: wangyidong +Date: Fri May 22 09:44:09 2015 +0800 + + * fix bug #710. + +commit f9691b32b6f5e40cc50f34797b535d30ae23468e +Author: wangyidong +Date: Fri May 22 09:22:01 2015 +0800 + + * change for promotion. + +commit 52b61c8d4fb962081eef742b03f59dbb4d7d88df +Author: wangyidong +Date: Fri May 22 09:20:32 2015 +0800 + + * change for product name. + +commit be8b0848d5d8ba10cb8ac798551c1901f6315336 +Author: wangyidong +Date: Thu May 21 17:07:21 2015 +0800 + + * remove set stage when edit story. + +commit c4f4bc5381db2656bf0efd64180cc14e729d67a6 +Author: wangyidong +Date: Sun May 31 14:36:43 2015 +0800 + + * fix bug #700. + +commit 1f32ddbce91be2672d93da6958a13d3a9dd5cfdb +Author: wangyidong +Date: Thu May 21 13:57:41 2015 +0800 + + * fix a bug #706. + +commit 0345e1a38088d3554f7e8de2baff2d3b59597db6 +Author: wangyidong +Date: Thu May 21 13:36:25 2015 +0800 + + * adjust for task #2266. + +commit 927851d74f1ccd49920e53406a0ef28d4186cb2b +Author: wangyidong +Date: Wed May 20 16:13:24 2015 +0800 + + * adjust for link story and bug for release build and productplan. + +commit dc0f5ec51a03ab3dea9001d6f4d1b1ab1fac1c0f +Author: wangyidong +Date: Wed May 20 14:45:48 2015 +0800 + + * change for notice. + +commit d27612e031a9ceb1bc40d6a044e7593192a0cb69 +Author: wangyidong +Date: Wed May 20 14:30:41 2015 +0800 + + * change for verify password. + +commit f1243b5621ac52e43105936517f4554117a30912 +Author: wangyidong +Date: Wed May 20 13:58:10 2015 +0800 + + * adjust for ok file note. + +commit 061815355ae2f1cc62a9a2d9b6ae2dd015ca7820 +Author: wangyidong +Date: Wed May 20 13:45:54 2015 +0800 + + * adjust for check password. + +commit 0cfdc19e15c084090cdb42355cccfabdfafad273 +Author: wangyidong +Date: Wed May 20 13:13:42 2015 +0800 + + * adjust for check password. + +commit 55c7228a354b07fca042e2d7ca38f6d820c37f98 +Author: wangyidong +Date: Wed May 20 11:06:16 2015 +0800 + + * adjust for project story module. + +commit 729b2a2e0fb80d05ff228f61df9809f82e9b10ab +Author: wangyidong +Date: Wed May 20 10:16:10 2015 +0800 + + * adjust for manage view. + +commit 3acc6c09be966175fa0010d285a13ed23ba431a3 +Author: wangyidong +Date: Wed May 20 10:00:26 2015 +0800 + + * adjust for lang. + +commit 1c89035b86977afaaebf78a6ed678bd13352be81 +Author: wangyidong +Date: Wed May 20 09:47:21 2015 +0800 + + * change for update order. + +commit 391cbf8b6469fdb6382219b41ed7f899f0f896c3 +Author: Catouse +Date: Tue May 19 17:28:41 2015 +0800 + + * disable animation effect for ie8. + +commit 0df23bc4ec0ef4dfe27fdc2ccf72eb613bb4d373 +Merge: a097785af8 56e91ed36c +Author: Catouse +Date: Tue May 19 17:23:48 2015 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit a097785af8d0fc2ebcd2473540d6f68260c1440f +Author: Catouse +Date: Tue May 19 17:23:07 2015 +0800 + + * fix pie chart for ie8. + +commit 56e91ed36c632a6a28986d5546821a0e1fcaa435 +Merge: d00db8682c f707f38e9f +Author: wangyidong +Date: Tue May 19 17:11:40 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d00db8682c366434deabf79d809265e16ba7e6a5 +Author: wangyidong +Date: Tue May 19 17:11:18 2015 +0800 + + * adjust for change root. + +commit f707f38e9f8a1e69f08c789cd62cefb2dcb18d1f +Author: Catouse +Date: Tue May 19 16:58:57 2015 +0800 + + * update excanvas and chart.js. + +commit 191172df1e522312620e253135c18ee0a62c7cd5 +Author: Catouse +Date: Tue May 19 15:16:50 2015 +0800 + + * fix bar spacing of bar chart. + +commit 54c6e7791342648224318dd6319dcc096dd82622 +Author: Catouse +Date: Tue May 19 14:28:03 2015 +0800 + + * change table sortable UI. + +commit e68b2579003585e0fccb07db7686ec7487188c21 +Author: Catouse +Date: Tue May 19 14:27:36 2015 +0800 + + * update zui.sortable.js. + +commit 1ba3da9ce2933bb811e7e0aedfd7862743a28ac8 +Author: wangyidong +Date: Mon May 18 17:06:34 2015 +0800 + + * fix a bug. + +commit cd5c9ed06e48847359a1697c58d1f3cc332aa809 +Author: wangyidong +Date: Mon May 18 15:13:09 2015 +0800 + + * change group priv and fix bug. + +commit 34b6eddb1326e9260cafa2810354d76d6f9f631d +Merge: bddb8c7791 6a04e0ce04 +Author: wangyidong +Date: Mon May 18 14:28:01 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bddb8c77919f574fdb9a1d59dfa50d7773026267 +Author: wangyidong +Date: Mon May 18 14:27:26 2015 +0800 + + * fix bug #696. + +commit 6a04e0ce04d5c544bcd0d910c218e453824e5c49 +Merge: ae0a931e46 0ca09de3d7 +Author: Catouse +Date: Mon May 18 14:21:13 2015 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ae0a931e4629f5141cda631ac11f95bfe31015b7 +Author: Catouse +Date: Mon May 18 14:19:47 2015 +0800 + + * update zui. + +commit 6a2a9be1e570fea73da43f9ed9b3aaafd6db7985 +Author: wangyidong +Date: Mon May 18 14:09:10 2015 +0800 + + * fix bug #699. + +commit 0ca09de3d784d0abf6ca082383e2c8b271daaebf +Author: wangyidong +Date: Mon May 18 13:55:40 2015 +0800 + + * change for zh-tw lang. + +commit e83440e3a8c74c2cc009d5a914fd13bbbc56a3ef +Author: wangyidong +Date: Mon May 18 13:19:13 2015 +0800 + + * change for upgrade. + +commit 2b7e60cd89c5501003be26c55135cd1542df7a30 +Author: wangyidong +Date: Mon May 18 11:11:06 2015 +0800 + + * fix bug #704. + +commit f425f9589c9ce8e3704944e57e9537c32d16d1f8 +Author: wangyidong +Date: Mon May 18 11:07:33 2015 +0800 + + * fix bug #707. + +commit 3fd7840423c6416bdfffee7d7045fc2b875d31c9 +Author: wangyidong +Date: Mon May 18 09:15:32 2015 +0800 + + * fix bug #708. + +commit da281de857d8ea9512d8997d8d8ad9009fb4151b +Author: wangyidong +Date: Fri May 15 16:08:41 2015 +0800 + + * finish task #2261. + +commit ed1d7ba4b6914bc78211aa35a2083ce7f4b4cc24 +Author: wangyidong +Date: Fri May 15 13:26:15 2015 +0800 + + * finish task #2266. + +commit 8c06ec0f0c049a9db29634891d607abaf5017f4b +Author: wangyidong +Date: Thu May 14 13:40:41 2015 +0800 + + * adjust for cron. + +commit b693b89d4c71559f5daa058293480953a3edb520 +Author: wangyidong +Date: Thu May 14 09:58:16 2015 +0800 + + * finish task #2262. + +commit d569700b40c5e2d0a2962c6f60c5dc2b4774c67b +Merge: b1c52d11de a080308b3e +Author: wangyidong +Date: Wed May 13 17:17:55 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b1c52d11de6af83721d069114225620f2cc8fd07 +Author: wangyidong +Date: Wed May 13 17:17:24 2015 +0800 + + * fix a bug #702. + +commit a080308b3e4a977cd5b1f01d638248bb28370746 +Author: Catouse +Date: Wed May 13 16:59:21 2015 +0800 + + * add createSingleJSON method. + +commit ef6e9bd15a9574cf3760e09c20a95794d69867bd +Author: Catouse +Date: Wed May 13 16:55:58 2015 +0800 + + * display pie chart UI. + +commit 8d298d95ab409273351204f2f8d6a8824976242c +Author: Catouse +Date: Wed May 13 16:55:26 2015 +0800 + + * update zui.chart.js. + +commit ded3e99d370a2f0527baa73ee9e21d01591d4ee6 +Author: wangyidong +Date: Wed May 13 16:44:44 2015 +0800 + + * finish task #2267. + +commit 0fccaca5c0418617ab6c03665dc53ba652f33f2b +Author: wangyidong +Date: Wed May 13 14:47:20 2015 +0800 + + * finish task #2259. + +commit a9df6f4f2731421e8570a5f0cc34476237e549f1 +Author: wangyidong +Date: Wed May 13 14:16:35 2015 +0800 + + * finish task #2256. + +commit 6f3931a15bef9d93f4d688dc61bffd7288a72328 +Author: wangyidong +Date: Wed May 13 14:13:32 2015 +0800 + + * finish task #2255. + +commit ca1a37436e22fb1b0d484da3dd864588ecf4012a +Author: Catouse +Date: Tue May 12 15:44:58 2015 +0800 + + * delete unused code. + +commit 003ffaae907d69c876e7f4e2206a2d4786e585a8 +Author: Catouse +Date: Tue May 12 15:42:11 2015 +0800 + + * change report UI. + +commit 95dddf03363ea3aeee921a3177e5b3f82b77706e +Author: Catouse +Date: Tue May 12 15:22:35 2015 +0800 + + * change story report UI. + +commit 9c2bd0310ee9a67452406c539a3e9fc531155a21 +Author: Catouse +Date: Tue May 12 14:58:24 2015 +0800 + + * change report UI. + +commit 43eaa052780b40be0104604d7b9d8101c19c5505 +Author: Catouse +Date: Tue May 12 14:58:15 2015 +0800 + + * chart support bar type. + +commit b4d9b43717483f73d17d201bc11df1ce0232eee0 +Author: Catouse +Date: Tue May 12 13:59:55 2015 +0800 + + * change project burn chart UI. + +commit 280ca2a0dba85c1ad0c0abe2c4e6ac1d236ca7d5 +Author: Catouse +Date: Tue May 12 13:56:12 2015 +0800 + + * update chart component in zui. + +commit d0ad83da1aaf45b9f7fc4a54d701b0aae79d640f +Merge: d00f899b21 a9963ac8f4 +Author: wangyidong +Date: Tue May 12 11:15:57 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d00f899b211f6bf4471d8f533141255d42877dfa +Author: wangyidong +Date: Tue May 12 11:15:33 2015 +0800 + + * finish task #2252. + +commit ff8ac1f30f9b7e552f5e17c37907ea3e8733171a +Author: wangyidong +Date: Tue May 12 11:14:46 2015 +0800 + + * finish task #2246. + * code task #2252. + +commit a9963ac8f4804c32cb543104a3953fb7a224dafc +Author: Catouse +Date: Mon May 11 17:36:58 2015 +0800 + + * change task report UI. + +commit 4b4a8f8b1bd03ceb4024834df81feb0019c47f50 +Author: Catouse +Date: Mon May 11 17:36:35 2015 +0800 + + * add jquery extension to create chart with data in table. + +commit 550bfde56d24cd493a9ce5cf6fb4625db8a17501 +Author: Catouse +Date: Mon May 11 17:35:43 2015 +0800 + + * update zui. + +commit 53270a04aa073e2516e57b9bafa7d0a761928ccb +Author: Catouse +Date: Mon May 11 17:06:29 2015 +0800 + + * delete unused code. + +commit 634f8f4925af6dc9080105701a21ad51821217a7 +Author: Catouse +Date: Mon May 11 17:05:24 2015 +0800 + + * update chart.js. + +commit 70e100410265fc72b8dfc9a7b57a86d17e8652ad +Author: Catouse +Date: Mon May 11 17:05:14 2015 +0800 + + * change burn report UI. + +commit bd44b3479c3c96edd66d457347038aa2513dee26 +Author: Catouse +Date: Mon May 11 17:03:29 2015 +0800 + + + add chart common code. + +commit 234fd4bc88d9db3887227481cf52ecd786951c19 +Author: Catouse +Date: Mon May 11 13:27:07 2015 +0800 + + + add chart.js. + +commit 1e753119c0bfab4f79fd2fb2086a308c45479705 +Author: Catouse +Date: Mon May 11 13:26:55 2015 +0800 + + * update zui.js. + +commit 9a0dda6d0746c30dcbdfc120df4062eb9756614f +Author: wangyidong +Date: Fri May 8 17:01:22 2015 +0800 + + * finish task #2257. + +commit aecefc24191d976f33e1792c25e1b9127c454ae8 +Author: wangyidong +Date: Fri May 8 16:36:27 2015 +0800 + + * fix a bug. + +commit 6816445f0f9773279b5bd2f200443c8f3c7e7d58 +Merge: 0aaefcaada c453cb940f +Author: wangyidong +Date: Fri May 8 16:24:26 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0aaefcaadac436612bf53e987d523b8703891063 +Author: wangyidong +Date: Fri May 8 16:24:04 2015 +0800 + + * finish task #2253. + +commit e2260064d84b90de725ff202079871ad663f6a5a +Author: wangyidong +Date: Fri May 8 15:44:14 2015 +0800 + + * change for order. + +commit c453cb940f5443706dc0bbfcc4842aaf144847b7 +Author: Catouse +Date: Fri May 8 15:24:19 2015 +0800 + + * update zui.sortable.js. + +commit b095d6e8cf4d061c1d0435df330fa26d357d29be +Merge: 0ed8b0b52e 06c4e51de2 +Author: Catouse +Date: Fri May 8 14:48:30 2015 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 06c4e51de2b084b84671773f976cd6db2a53ad74 +Merge: 76e8841a51 091ad90cd3 +Author: wangyidong +Date: Fri May 8 14:46:41 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 76e8841a51b14d5f7e285c5a14f124260dabb85c +Author: wangyidong +Date: Fri May 8 14:46:11 2015 +0800 + + * finish task #2247. + +commit 0ed8b0b52e9e604fcd3d0f72b8509665fafb7b50 +Author: Catouse +Date: Fri May 8 14:43:58 2015 +0800 + + * update zui.sortable.js. + +commit 091ad90cd31b2b14e7ad877d262e29e5ea82cc69 +Author: Catouse +Date: Fri May 8 14:37:15 2015 +0800 + + Revert " * update zui.sortable.js." + + This reverts commit 875533c100398c8224703fbed198aa55a5331d3d. + +commit 875533c100398c8224703fbed198aa55a5331d3d +Author: Catouse +Date: Fri May 8 14:36:25 2015 +0800 + + * update zui.sortable.js. + +commit 163fb178f13469d2be04465b46b87bb0c6e54b9c +Author: wangyidong +Date: Fri May 8 13:12:15 2015 +0800 + + * finish task #2237. + +commit e8ced4499c8fed0c91ff7c83d49fc82fd2587213 +Author: wangyidong +Date: Fri May 8 10:10:43 2015 +0800 + + * finish task #2244. + +commit cd1a74d5605c61e88bb125d7d38998101b0b748e +Merge: 36a4c32720 77f96464e5 +Author: wangyidong +Date: Fri May 8 09:50:06 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 36a4c32720ec18cbd6ee5a9cd728076e43f272f9 +Author: wangyidong +Date: Fri May 8 09:47:39 2015 +0800 + + * finish task #2241,2245. + +commit 77f96464e5860cbef7874a7d02996d6c224d2786 +Author: Catouse +Date: Thu May 7 18:19:00 2015 +0800 + + * make product and project table sortable. + +commit aca7d9d693b040421e1a5c58fd686b7c5f2feba0 +Author: Catouse +Date: Thu May 7 16:41:07 2015 +0800 + + * change table style. + +commit 9a6b20e1cdcefd4b6a0f2d83e4d6a1c6b58cea19 +Author: Catouse +Date: Thu May 7 16:16:20 2015 +0800 + + * insert sort icon to tag 'a' and make it clickale. + +commit 430a09f33da9ea69f4eb8e8bf0d80e8118f7266f +Author: Catouse +Date: Thu May 7 16:02:06 2015 +0800 + + * finish task #2260: update chosen.js. + +commit 369f8755266f4d407942c13e77238ed1dfc1397e +Author: Catouse +Date: Thu May 7 15:27:39 2015 +0800 + + * rename window.browser to $.zui.browser. + +commit cd464d2a0f95ed84de8773258bd91675a858acbf +Author: Catouse +Date: Thu May 7 15:27:21 2015 +0800 + + * finish task #2243:change search drop menu UI. + +commit 4f8eb1d30eed16338eedead5b6a27bad6307a913 +Author: Catouse +Date: Thu May 7 11:30:02 2015 +0800 + + * change product set icon. + +commit a6e680eeafae04e51a1c24d420c8e4c437e463f3 +Author: Catouse +Date: Thu May 7 11:24:44 2015 +0800 + + * update zenicon.ttf. + +commit e4d1a204c8afd9663d1559a7d7264e81e809963a +Author: Catouse +Date: Thu May 7 11:23:33 2015 +0800 + + * update zui to version 1.3. + +commit fc827119cd10b82de55b369ae74c0ed1363c2d40 +Author: Catouse +Date: Thu May 7 10:28:10 2015 +0800 + + * finish task #2239. + +commit 99c04a9a46a33afd08b00b423f01a5c914af77b0 +Author: Catouse +Date: Thu May 7 10:27:48 2015 +0800 + + * change remove button style for chosen. + +commit ba83f43b15e2675832e7fee5b69c6534175b6463 +Author: wangyidong +Date: Wed May 6 15:42:23 2015 +0800 + + * finish task #2242. + +commit dca976c86ad785f723099fcfb87899b39a48bf04 +Author: wangyidong +Date: Wed May 6 11:16:28 2015 +0800 + + * code for task #2236. + +commit 7006837d1f2ef052c0a111ffd066e91dffa72d2a +Author: wangyidong +Date: Tue May 5 17:11:31 2015 +0800 + + * fix a bug. + +commit 06f1199112a7e6441ea80886fb7e9c825323a3a8 +Author: wangyidong +Date: Tue May 5 15:50:34 2015 +0800 + + * finish task #2236. + +commit e0b03126721c4eec82dc80e05be8801e282895ba +Author: wangyidong +Date: Mon May 4 17:16:37 2015 +0800 + + * finish task #2251. + +commit 6c5089fe93ed085ab000c7954a18ad48627f93ef +Author: wangyidong +Date: Mon May 4 16:47:30 2015 +0800 + + * fix a bug for create bug from case. + +commit c97f38b2a389da0bcb1534fb0475e199c72c27bf +Author: wangyidong +Date: Mon May 4 16:38:22 2015 +0800 + + * fix a bug for js. + +commit 7e396468720529043b5898eb24147835847b418e +Author: wangyidong +Date: Mon May 4 16:28:35 2015 +0800 + + * finish task #2250. + +commit 4ace25561523bfd211683a9a5eddebad7c7a91d9 +Author: wangyidong +Date: Mon May 4 16:01:16 2015 +0800 + + * finish task #2248. + +commit dee023ecdd6bb670a123a5e0ca7f94342e97ebe9 +Author: wangyidong +Date: Mon May 4 15:03:33 2015 +0800 + + * finish task #2268. + +commit e6737067117a397decfd42f3b98a94fe299294cc +Author: wangyidong +Date: Mon May 4 14:12:55 2015 +0800 + + * finish task #2265. + +commit 5f4a2ffd9d378a28b2233c304581c83db0fe6559 +Author: wangyidong +Date: Mon May 4 13:25:58 2015 +0800 + + * finish task #2240. + +commit d38fc5073735f1ae885fb7294edb80701c91fd78 +Author: wangyidong +Date: Wed Apr 29 18:11:44 2015 +0800 + + * fix a bug. + +commit efb44f20e490ebd602e4ca92390345deaa6bedbf +Author: wangyidong +Date: Wed Apr 29 11:29:35 2015 +0800 + + * fix a bug. + +commit 23d76509ae45af52abfc64e369855e8951bb9742 +Author: wangyidong +Date: Tue Apr 28 15:34:31 2015 +0800 + + * adjust for account rule. + +commit 54c34ab69185b70cbedb5c76a7f5897202ed9293 +Author: wangyidong +Date: Tue Apr 28 15:08:11 2015 +0800 + + * fix a bug. + +commit e5bb896f5a8b14d5715434f416351a0e34a9ab25 +Author: wangyidong +Date: Mon Apr 27 09:36:40 2015 +0800 + + * fix a bug. + +commit 68e85fce0615ce6c5ec25e050b3a8afc1a6c05f0 +Merge: d31bc920b6 75428645fe +Author: wangyidong +Date: Thu Apr 23 09:04:56 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d31bc920b6c9dcc152929704851b3430d1c07154 +Author: wangyidong +Date: Thu Apr 23 09:04:38 2015 +0800 + + * fix a bug. + +commit 75428645fe9f329607e47b2104ce0236a5571d18 +Author: Catouse +Date: Mon Apr 20 11:53:46 2015 +0800 + + * fix progressbar style. + +commit b7e5119415f286ecf1ca91b7475c34eac42af4c5 +Author: wangyidong +Date: Wed Apr 15 15:05:03 2015 +0800 + + * fix a bug #665. + +commit 2eb38cfeba35af169e2e489f146f216bccbbcb13 +Author: wangyidong +Date: Wed Apr 15 13:53:33 2015 +0800 + + * fix a bug for search bug in link bug. + +commit ce534d9f928b669cbb0083f7fb7aa036c6b03b05 +Author: wangyidong +Date: Tue Apr 14 14:23:23 2015 +0800 + + * fix a bug #685. + +commit 18d8f179feb247d1e68e5c4afe71d7eafb35473f +Author: wangyidong +Date: Tue Apr 14 13:08:16 2015 +0800 + + * fix a bug #683. + +commit 91d2f6be1fad6685e98f9bd76ebdca6103e73307 +Author: wangyidong +Date: Tue Apr 14 11:17:58 2015 +0800 + + * fix a bug #687. + +commit ab3c3a6fbf2719cbf1181e699b8b0ec7971b2aa8 +Author: wangyidong +Date: Tue Apr 14 11:07:48 2015 +0800 + + * fix a bug #689. + +commit 614580a02612d939fb253aedd5c781702360a47a +Author: wangyidong +Date: Tue Apr 14 10:36:00 2015 +0800 + + * fix a bug for #690. + +commit d096a5dde3d9ea4e5104f23c106aead18252d564 +Author: wangyidong +Date: Tue Apr 14 09:52:41 2015 +0800 + + * fix a bug #692. + +commit 0c78e0bc62fc927ef8ae2de2b9f51ba47a202390 +Author: wangyidong +Date: Tue Apr 14 09:39:31 2015 +0800 + + * fix bug #693. + +commit dd3b718016a0cb140dada703dc99727262beb976 +Author: wangyidong +Date: Tue Apr 14 09:26:32 2015 +0800 + + * fix bug #695. + +commit 9f6fb466861d6b5700b7bcb22c705852427a09e6 +Author: wangyidong +Date: Mon Apr 13 16:08:31 2015 +0800 + + * fix a bug #640. + +commit d8cc94b83ee1491e8cd8cb847bd1da9ed6d4ebb0 +Author: wangyidong +Date: Tue Apr 7 15:16:44 2015 +0800 + + * fix a bug for batch create story from image. + +commit ded9efab9c3fb814c3e1d8a6a60a7de2a1969290 +Author: wangyidong +Date: Thu Apr 2 16:21:35 2015 +0800 + + * add Requires php for rpm. + +commit 4046ab3cdda29d9aaa7de0f4cd61ba1ed44847eb +Author: wangyidong +Date: Wed Apr 1 16:25:36 2015 +0800 + + * fix bug #691. + +commit 44161c02c052a6a23f5c28a2048fdf55a151a73e +Author: wangyidong +Date: Wed Apr 1 16:05:28 2015 +0800 + + * fix for doc tree. + +commit c60edb8f5c18e4a1d106392e4f0e6af4d8116612 +Author: wangyidong +Date: Wed Apr 1 13:57:55 2015 +0800 + + * fix a bug for upgrade from 6.4 + +commit 3c506769f6ad1f769c8666c0b5b3129adac78e2b +Author: wangyidong +Date: Tue Mar 31 09:23:44 2015 +0800 + + * change for gitignore. + +commit 77d4ee573e5794574c405a9c2e0a197399104f2c +Author: wangyidong +Date: Tue Mar 31 09:20:30 2015 +0800 + + * adjust for install and upgrade. + +commit b1aab631c73edf1b17512439b50c645dbf131d13 +Author: wangyidong +Date: Mon Mar 30 16:36:06 2015 +0800 + + * fix bug. + +commit 429b8f30a3e05ff208961738738d861dd93b1aff +Author: wangyidong +Date: Mon Mar 30 16:31:12 2015 +0800 + + * fix bug for upgrade.php security code. + +commit 922348465d2e4851b5724a4f1bf1e34747f1a3cc +Author: wangyidong +Date: Thu Mar 26 16:00:21 2015 +0800 + + * fix bugs. + +commit 406a6841c5538d65ea5eea2717fb44e19c5c50b7 +Author: wangyidong +Date: Fri Mar 20 16:26:13 2015 +0800 + + * adjust code. + +commit de74637aab4dd19523cd4ebf1446ebe3cf6cd685 (tag: zentaopms_7.1.stable_20150317) +Author: wangyidong +Date: Tue Mar 17 10:43:29 2015 +0800 + + * change for build rpm. + +commit 615cbda384d95e97c89db4e2f7ea61b581a52d09 +Author: wangyidong +Date: Tue Mar 17 10:21:45 2015 +0800 + + * adjust for build rpm and deb. + +commit 464b388d0be28e4131ed28259fb448c9bd405de6 +Author: wangyidong +Date: Mon Mar 16 17:11:52 2015 +0800 + + * add zh-tw lang for cron. + +commit ae37ee4d54bc54951156530110c844f6f4103080 +Author: wangyidong +Date: Mon Mar 16 14:28:36 2015 +0800 + + * add for build deb and rpm. + +commit 31924d9945739463dcb5ba5f7906f34920c31fa4 +Author: wangyidong +Date: Mon Mar 16 10:57:55 2015 +0800 + + * adjust code for cron. + +commit 359ce0bbf6d6b1d793eb71e94a906fd9e512270d +Author: wangyidong +Date: Fri Mar 13 15:58:57 2015 +0800 + + * adjust code. + +commit de2f33c84a78d3c0f75b91a6f6327c5cc2d6fc4c +Author: wangyidong +Date: Fri Mar 13 15:21:53 2015 +0800 + + * remove test code. + +commit 0d8da8c89ec18c128c68680f550f682f62f65166 +Author: wangyidong +Date: Fri Mar 13 15:10:18 2015 +0800 + + * adjust code for cron. + +commit 2fce1a136b96ebbe33d31855e396a1dc16ecc2ac +Author: wangyidong +Date: Fri Mar 13 13:55:06 2015 +0800 + + * fix a bug and notice. + +commit c4ade54fc3e91e40327d8b9d09a39683f82a1722 +Author: wangyidong +Date: Fri Mar 13 13:33:30 2015 +0800 + + fix a bug for async mail. + +commit be5b8187874125da7e621aa373ad76b82ee1bd45 +Author: wangyidong +Date: Fri Mar 13 09:26:27 2015 +0800 + + * fix bug #633. + +commit 07fbcf23b006972e072610061267160c2624f377 +Author: wangyidong +Date: Thu Mar 12 15:37:58 2015 +0800 + + * update Mobile-Detect class. + +commit 02a5d0bf2b483fe41694a442ebd909866693702a +Author: wangyidong +Date: Thu Mar 12 14:56:29 2015 +0800 + + * fix bug #679. + +commit ce242a7dce8f8918bc0cfe1645574751932dc7ba +Author: wangyidong +Date: Thu Mar 12 14:20:52 2015 +0800 + + * fix bug #682. + +commit cc6fcc68c1f65ea754fac01390d085613c733192 +Author: wangyidong +Date: Thu Mar 12 14:20:23 2015 +0800 + + * adjust for cron. + +commit 447476ad17a85a9df30eece53799f25454a15aae +Author: wangyidong +Date: Mon Mar 9 16:16:21 2015 +0800 + + * code for dev. + +commit b80b3620efbe5a974596c14ca2d9f95f3ed9fc8d +Author: wangyidong +Date: Mon Mar 9 12:02:54 2015 +0800 + + * change for zh-tw. + +commit e7f90d0f6b7b51f335f0433382b30b61bb9f062d +Author: wangyidong +Date: Mon Mar 9 12:02:40 2015 +0800 + + * adjust for cron. + +commit 9106252a29bea88b8fbff7b5515198a3d4c308d2 +Author: wangyidong +Date: Mon Mar 9 12:01:59 2015 +0800 + + * change for show dev module. + +commit 83a1f6e303c7179a38b8bc38bd226544595d42ed +Author: wangyidong +Date: Mon Mar 9 11:57:54 2015 +0800 + + * fix a bug. + +commit f2491441e2e522908fffac68266d335ed1407631 +Author: wangyidong +Date: Mon Mar 9 11:38:53 2015 +0800 + + * adjust cron. + +commit 21c77685bb10c769510d316156ef2e5eae1f109e +Author: wangyidong +Date: Mon Mar 9 11:35:42 2015 +0800 + + * change for upgrade. + +commit 8c26498edf9276a57f1fa18588085fe04acba0ab +Author: wangyidong +Date: Fri Mar 6 16:39:57 2015 +0800 + + * adjust for show upgrade error. + +commit 22a4be06388c9d353dd1b2cf191b1c6a4632359c +Author: wangyidong +Date: Fri Mar 6 15:12:54 2015 +0800 + + * fix a bug for upload extension. + +commit e06779bdadfacf2438b8b741cf9cb208a2ac2a90 +Merge: d4def96048 a94f44416c +Author: wangyidong +Date: Fri Mar 6 14:02:23 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d4def96048670160d2d968d9e36c0c5cb62a1156 +Author: wangyidong +Date: Fri Mar 6 14:01:58 2015 +0800 + + * fix bug. + +commit a94f44416c40e5df52c52112ca28bdc144d6299b +Author: xia0ta0 +Date: Thu Mar 5 09:38:03 2015 +0800 + + * adjust language of dev. + +commit ab274a4ff8bdfc82742da7b18bd03e8f892b3e63 +Merge: 22f0a7fb22 fdc283afd7 +Author: xia0ta0 +Date: Thu Mar 5 09:20:44 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + + Conflicts: + module/dev/lang/en.php + +commit 22f0a7fb226cbde24624a7b3d2850e14c9acd86a +Author: xia0ta0 +Date: Thu Mar 5 09:11:11 2015 +0800 + + + add api css. + +commit 37cfad323c92caf3a0c17356c6a937175b0714a2 +Author: xia0ta0 +Date: Thu Mar 5 09:03:13 2015 +0800 + + + add english. + * adjust style. + +commit fdc283afd74c3cf379fd24153ece79fe519c0b20 +Author: wangyidong +Date: Wed Mar 4 14:42:27 2015 +0800 + + * adjust for upload extension file. + +commit a9e6dcc529840cd357e19dc726a05ae874c9c38a +Author: wangyidong +Date: Mon Mar 2 14:24:44 2015 +0800 + + * change for group priv. + +commit c4a72a6b754d2bad6e92c01dadc6693068e06b3e +Merge: e3276297c5 8e2899f62b +Author: wangyidong +Date: Sat Feb 28 17:29:16 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + + Conflicts: + module/common/lang/en.php + module/common/lang/menuOrder.php + module/common/lang/zh-cn.php + +commit e3276297c551011455c6d6c044e666c701ec71a7 +Author: wangyidong +Date: Sat Feb 28 17:26:27 2015 +0800 + + * finish task #2208. + +commit c56d8e69c617749a32510d26c7332b43eadb359e +Author: wangyidong +Date: Sat Feb 28 14:56:35 2015 +0800 + + * finish task #2206, 2207. + +commit 8e2899f62bc3565cd9b1fdd7b84a827aa29c847b +Author: xia0ta0 +Date: Fri Feb 27 08:40:37 2015 +0800 + + - remove editor from extension. + +commit 5b7075f444c0829736383923a2dda6a9f6decac9 +Author: xia0ta0 +Date: Fri Feb 27 08:38:28 2015 +0800 + + * adjust menuOrder of admin. + +commit b34318a0289ce1b64179c00c04dfc7c075172e5f +Author: xia0ta0 +Date: Thu Feb 26 16:19:57 2015 +0800 + + + add dev module. + +commit 6efa9f676860ef8b7bafcd1b7fc02a8e45bf98b7 +Author: xia0ta0 +Date: Thu Feb 26 16:16:46 2015 +0800 + + * move editor from extension to dev. + +commit fc495455bf33e12978c1ba40292217f612c6074d +Author: xia0ta0 +Date: Thu Feb 26 16:11:35 2015 +0800 + + * adjust submenu of admin. + +commit 4b0d42c23029295543f9ca494c857d3ec3da4147 +Author: Catouse +Date: Thu Feb 26 14:05:53 2015 +0800 + + * change method "getDataInJSON" of user model for new API. + +commit ff4eca94c23771f06abb47d94e7484857d4b20e8 +Author: wangyidong +Date: Thu Feb 26 09:35:34 2015 +0800 + + * fix a bug. + +commit 13e6b3d91bde31b547580ed343cd3179f3d2edbe +Author: wangyidong +Date: Tue Feb 10 16:09:32 2015 +0800 + + * fix glob error. + +commit 33f5ca6e738410f5449b0577cf26fb4504d9d37b (tag: zentaopms_7.0.stable_20150206) +Author: wangyidong +Date: Fri Feb 6 09:05:18 2015 +0800 + + * change for changelog. + +commit 30c1ab399a78819d191650d59ca0dec25a8ae3c0 +Author: wangyidong +Date: Wed Feb 4 17:35:09 2015 +0800 + + * adjust for paste image. + +commit 6d9aa57ec7fab166cd9a2a77f49781783e1510a9 +Merge: c9f0b9f861 cf330a9264 +Author: wangyidong +Date: Wed Feb 4 15:43:45 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c9f0b9f8611380f748574597fcd38d22dabe756d +Author: wangyidong +Date: Wed Feb 4 15:43:19 2015 +0800 + + * change for zh-tw. + +commit c3e0d714f05aaca68b9a0e30afd6b5b1d3997b9d +Author: wangyidong +Date: Wed Feb 4 10:14:53 2015 +0800 + + * adjust code. + +commit cf330a92643983c2ca93ea7034196d6925af75bc +Author: Catouse +Date: Mon Feb 2 16:04:33 2015 +0800 + + * chosen suppot change dropmenu direction. + +commit 24f81f356ebe161e5693c0427e3f09ddc1fb9454 +Author: wangyidong +Date: Mon Feb 2 09:55:33 2015 +0800 + + * change version and upgrade. + +commit 8b07b81ed8d5b9396929662934dd16d1fdeb354d +Author: wangyidong +Date: Mon Feb 2 08:45:10 2015 +0800 + + * fix error. + +commit 3b78433deea33156f469f5cb6d4e8e362a84e3bf +Author: wangyidong +Date: Fri Jan 30 16:00:17 2015 +0800 + + * fix bug #677. + +commit 4d7feceb69b2e5cf9513e701c39f864eb3213d39 +Author: wangyidong +Date: Fri Jan 30 15:27:51 2015 +0800 + + * fix bugs. + +commit 03dae63dd0ca7a362c43321202b1b92cb73ec7af +Author: wangyidong +Date: Thu Jan 29 17:16:46 2015 +0800 + + * code for bug #2202. + +commit 5c1c020f253ab65a717331958fef270368ef4058 +Merge: 054a9dad0c adde00fd9e +Author: wangyidong +Date: Thu Jan 29 16:56:54 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 054a9dad0c97fa0ec7530ed4500e439ee7ec0c66 +Author: wangyidong +Date: Thu Jan 29 16:09:38 2015 +0800 + + * finish tsak #2199. + +commit 3c8a5cc6fd73fd19019aeb7f0804c918464c6e7d +Author: wangyidong +Date: Thu Jan 29 16:03:32 2015 +0800 + + * finish task #2202. + +commit adde00fd9e2c6003cd6123ba26e68ba7e350b832 +Author: xia0ta0 +Date: Thu Jan 29 14:00:35 2015 +0800 + + * move notice() to callback. + +commit 1d5557f5457ab84863ccb9c054152013d090a37b +Author: xia0ta0 +Date: Thu Jan 29 13:02:13 2015 +0800 + + * use notice() for scan builds. + +commit 7f38bf0dfa70006391b3642ee4b4e6e9eee64beb +Author: xia0ta0 +Date: Thu Jan 29 13:00:27 2015 +0800 + + - remove create and refresh link. + +commit 895fb2831569e4b4db36f762eb6de08bed162b58 +Author: wwccss +Date: Thu Jan 29 13:28:15 2015 +0800 + + * change the error of comment. + +commit 7412321aba81d8dd7e2d0345f038d2700110387f +Author: wangyidong +Date: Thu Jan 29 11:59:39 2015 +0800 + + * fix bug #666. + +commit bb80d4b4aec014d903a23b78bb80b25f355f6fc2 +Author: wangyidong +Date: Thu Jan 29 11:23:50 2015 +0800 + + * fix bug #667. + +commit f2383ba306f904536a86c73b31d6e4f06cd2ee42 +Author: wangyidong +Date: Thu Jan 29 10:28:43 2015 +0800 + + * fix bug #669. + +commit c5dddc90085218703e4cc5a0e60155987c3083d1 +Author: wangyidong +Date: Thu Jan 29 10:24:22 2015 +0800 + + * fix bug #671. + +commit 93ed6c90f83cbf60b622fa5f082b25884401ada4 +Author: wangyidong +Date: Thu Jan 29 10:12:22 2015 +0800 + + * fix bug #672. + +commit c886721b9bc82c3b1abe103f2dbcea750b66aba4 +Author: wangyidong +Date: Thu Jan 29 09:56:38 2015 +0800 + + * fix a bug. + +commit cfc96b690e975ec19c1c7718c0c363af952d4791 +Author: wangyidong +Date: Thu Jan 29 09:53:40 2015 +0800 + + * fix bug #673. + +commit 3dd4e0b94d1d5d7f39531bbc6c8612806b32550e +Merge: 2e520d15f1 fb4eed1c39 +Author: Catouse +Date: Thu Jan 29 09:43:34 2015 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 2e520d15f1ec3215d2a3a62443382b7f2fdc47cd +Author: Catouse +Date: Thu Jan 29 09:43:22 2015 +0800 + + * ajust columns size of 'bug/report' layout. + +commit 1863fc59873affd3220bc4bf373b42a16b65060d +Author: Catouse +Date: Thu Jan 29 09:36:27 2015 +0800 + + * fix datetimepick textbox with value "0000-00-00". + +commit f8e22d72a016e0a3faf09e20d3eec601a47f9395 +Author: wangyidong +Date: Thu Jan 29 09:24:38 2015 +0800 + + * fix bug #674. + +commit fb4eed1c39cc98fc7602158164fbbd2d783af0f0 +Author: wangyidong +Date: Wed Jan 28 16:31:03 2015 +0800 + + * finish task #2190. + +commit 0dd2d53f406a8ef0d0e8b9d62e23deb9ca87fdf5 +Author: wangyidong +Date: Wed Jan 28 15:14:02 2015 +0800 + + * change for task #2190. + +commit 661928131df9e5181f89291d6c35cd2617b330d6 +Author: wangyidong +Date: Wed Jan 28 14:46:44 2015 +0800 + + + replace LGPL to ZPL. + +commit 13d5d12c78f25afe030965c75f92ab01b23ec577 +Author: wangyidong +Date: Wed Jan 28 14:33:04 2015 +0800 + + * finish task #2183. + +commit b0dd0d75b872ddcac9903b0137544d230f004b39 +Author: wangyidong +Date: Wed Jan 28 13:46:37 2015 +0800 + + * adjust for comment in mail. + +commit 3391130cf46486140f05a3c308da5095a17cd631 +Author: wangyidong +Date: Wed Jan 28 11:56:47 2015 +0800 + + * finish task #2186. + +commit 4a9dad22b387e83bc883eed05daa3f381ce5ae20 +Author: wangyidong +Date: Wed Jan 28 11:16:51 2015 +0800 + + * finish task #2185. + +commit e67ab008d4bb9a872d9c25941f145191b73fa604 +Author: wangyidong +Date: Wed Jan 28 10:22:00 2015 +0800 + + * finish task #2187. + +commit a175b9bae8048526d9c6651574305020354e445e +Author: wangyidong +Date: Wed Jan 28 10:09:56 2015 +0800 + + * finish task #2188. + +commit 8ea6cd4e82d69892fb60db4189e70bbc70c4762f +Author: wangyidong +Date: Wed Jan 28 09:47:05 2015 +0800 + + * finish task #2192. + +commit 2d83179de00d07244e2b4033293cb34519635c9e +Author: wangyidong +Date: Tue Jan 27 17:16:43 2015 +0800 + + * finish task #2193. + +commit 202fb4be65bf63d3bd6d45f5514cbbdcac0e7885 +Author: wangyidong +Date: Tue Jan 27 16:57:13 2015 +0800 + + * finish task #2194. + +commit f76f54330acbabea70de5511dbc4a2d052db854f +Merge: df9ac0573b 1bbf014696 +Author: wangyidong +Date: Tue Jan 27 16:32:34 2015 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit df9ac0573b65257a9ae2b1f8812c5373953629c2 +Author: wangyidong +Date: Tue Jan 27 16:31:53 2015 +0800 + + * finish task #2195. + +commit b99331df5677a4c460ecabf7f66038aa3518c0cb +Author: wangyidong +Date: Tue Jan 27 15:06:32 2015 +0800 + + * finish task #2196. + +commit 3f86de68ac38e27006a15a102a95273aff42f013 +Author: wangyidong +Date: Tue Jan 27 14:24:04 2015 +0800 + + * finish task #2197. + +commit dd860363cdada323c7aa586deec3a8f3e86d6200 +Author: wangyidong +Date: Tue Jan 27 11:09:23 2015 +0800 + + * finish task #2198. + +commit 03e21e86886dc9a74711fe107c64a5df09fb95da +Author: wangyidong +Date: Thu Jan 22 10:59:49 2015 +0800 + + * fix for check tls when test mail. + +commit 1bbf014696653d99681738b58cf6d37cf2ca0f4a +Author: wwccss +Date: Wed Jan 21 10:42:24 2015 +0800 + + * fix the bug of pageID, show be pageid. + +commit a6078c90544f1f6b08de5469735966ffb3b5e6f1 +Author: wangyidong +Date: Mon Jan 19 16:52:01 2015 +0800 + + * finish task #2178. + +commit 82fe4637648042220f16cdb8419f489280b854c5 +Author: wangyidong +Date: Mon Jan 19 16:44:25 2015 +0800 + + * finish task #2177. + +commit 6eb622d45a72c0131e0391a1c0d27fca116a8318 +Author: wangyidong +Date: Tue Jan 13 08:40:56 2015 +0800 + + * fix bugs. + +commit 1111206f8dfa666d10789f7eeb4551a17e741d8a +Author: wangyidong +Date: Fri Dec 26 05:47:06 2014 +0000 + + * ajdust for bug #654. + +commit 98bb42a3391f50b04d54a9cee6873368f3905a97 (tag: zentaopms_6.4.stable_20141223) +Author: wangyidong +Date: Wed Dec 24 09:07:49 2014 +0000 + + * fix a bug. + +commit 9092d53ba4a7c5b19526f9df16c81f42653c445b +Author: wangyidong +Date: Wed Dec 24 08:53:37 2014 +0000 + + * adjust code. + +commit 4824b3a63de55b6baf2d3f7796265eba98e532d3 +Author: wangyidong +Date: Wed Dec 24 08:28:27 2014 +0000 + + * fix a bug. + +commit 88003b33af621477f7df98d828a7725b1642a5fe +Author: wangyidong +Date: Wed Dec 24 02:48:26 2014 +0000 + + * fix a bug. + +commit 0db5dc606550ed2b11dd574f26419fbe45ed9d6d +Author: wangyidong +Date: Wed Dec 24 01:20:25 2014 +0000 + + * fix a bug. + +commit b2885fa53e4db3c2a563a1a5afa6373e4f8e74a8 +Author: wangyidong +Date: Mon Dec 22 08:53:57 2014 +0000 + + * adjust style. + +commit 6b092dbde9ad616c040e9d67ebddcdebc8336b94 +Author: wangyidong +Date: Sun Dec 22 07:51:50 2013 +0000 + + * add file header in backup file. + +commit a1a587a2afeb2057c9a4c366822359437b79fcc6 +Author: wangyidong +Date: Fri Dec 19 06:51:59 2014 +0000 + + * adjust code. + +commit 0c0f8d85a9fcb0192a7633f98cbc199a9950e960 +Author: wangyidong +Date: Fri Dec 19 01:05:41 2014 +0000 + + * adjust code. + +commit 532d22eb5e72c9ae3141a7bcfe5150767c826086 +Author: wangyidong +Date: Thu Dec 18 05:36:57 2014 +0000 + + * fix a bug. + +commit 0099f3e33779b82352fe912457a3b0707f009ae4 +Author: wangyidong +Date: Thu Dec 18 03:54:33 2014 +0000 + + * fix a bug. + +commit 236103cded28c70a1362fb5f6f8e63a05f2107db +Author: wangyidong +Date: Thu Dec 18 01:05:50 2014 +0000 + + * adjust for ajax get story when create case. + +commit bbaf9039d07b63ee73e58a0c79fe6484343098cf +Author: Catouse +Date: Wed Dec 17 18:10:13 2014 +0800 + + * enhance ui of story search modal with chosen. + +commit a6bfa6e64c620111b01353a8dd08366705c5e7d7 +Author: wangyidong +Date: Wed Dec 17 09:24:14 2014 +0000 + + * fix bugs. + +commit 8f33a4c031eabe262e381ace04c7abad37932033 +Author: wangyidong +Date: Wed Dec 17 08:12:49 2014 +0000 + + * adjust code for edit dept. + +commit 7a44cc96ce57eaf54c6d67d2ab04ee2834ef4ff1 +Author: wangyidong +Date: Wed Dec 17 06:06:09 2014 +0000 + + * adjust code for batch assignto. + +commit a5d4fff722af644e9425d5c2b1cd23cf18413dd0 +Author: wangyidong +Date: Wed Dec 17 01:39:39 2014 +0000 + + * adjust auto check. + +commit dea2622ff51d95871df2ef79c848345275a39a4b +Author: wangyidong +Date: Tue Dec 16 09:15:47 2014 +0000 + + * add 6.4 changelog. + +commit d75f50e6910dd6012d896ff9eca908ac3c99da71 +Author: wangyidong +Date: Tue Dec 16 09:03:36 2014 +0000 + + * change for zh-tw lang. + +commit 0a4c567c8e35f4a449bebc8c3ae6d10175d75022 +Author: wangyidong +Date: Tue Dec 16 09:01:53 2014 +0000 + + * change for group resource. + +commit 644fc7df6a4e3af23eb8288e1304a6ac743355e9 +Author: wangyidong +Date: Tue Dec 16 08:15:30 2014 +0000 + + * change for 6.4 version. + +commit d7c0a03f8bf64a3cfdf049f63cfa8e9765611df2 +Author: wangyidong +Date: Tue Dec 16 07:20:30 2014 +0000 + + * fix a bug. + +commit 9528bba9096cd8ee52e642a7fea88e99b47d00dd +Author: wangyidong +Date: Tue Dec 16 06:41:15 2014 +0000 + + * adjust code for task #2151. + +commit a69236a90049866b0c6cde83ae68dff6aa29e708 +Merge: a792d8c0a7 294aaeefc5 +Author: wangyidong +Date: Tue Dec 16 06:12:56 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a792d8c0a71143c7edf9cc574a1343197b183b70 +Author: wangyidong +Date: Tue Dec 16 06:12:20 2014 +0000 + + * adjust code. + +commit 294aaeefc56108dc59761b7fb3dbc0656c2689f7 +Merge: 6e5148963e f3c6e0c601 +Author: Catouse +Date: Tue Dec 16 11:26:10 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6e5148963e9a4114ba77d45037d5b6ae3e19e6d8 +Author: Catouse +Date: Tue Dec 16 10:55:22 2014 +0800 + + * fix select buttons. + +commit f3c6e0c601b1016d8d6c27f62f1222b4bd4cc27b +Author: wangyidong +Date: Tue Dec 16 01:43:38 2014 +0000 + + * fix a bug #661. + +commit ac7312bf8191985da5a5ae2ef2a38c329bfb296b +Merge: 8ce86eddbe e5f9fa752d +Author: wangyidong +Date: Tue Dec 16 01:19:16 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8ce86eddbeeb91b2872e79be5ee38cd8a22aea12 +Author: wangyidong +Date: Tue Dec 16 01:18:39 2014 +0000 + + * finish task #660. + +commit e5f9fa752d68a60a5c64c7bdc3e43f7ad90deb26 +Author: Catouse +Date: Tue Dec 16 09:11:21 2014 +0800 + + * updated zui to version 1.2.1. + +commit c5e93987e03f2ea40d479df450c9c17abca7d8ee +Author: wangyidong +Date: Mon Dec 15 09:14:00 2014 +0000 + + * finish task #2167. + +commit c1095d61575867635f8422d1bf34e764aa752b9c +Merge: d111c160c2 46ba732cec +Author: wangyidong +Date: Mon Dec 15 08:50:27 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d111c160c22f68f0471e4bb9e6f768a08fb7e039 +Author: wangyidong +Date: Mon Dec 15 08:49:35 2014 +0000 + + * adjust the view page for build, release and productplan. + +commit 46ba732cec87dc0cdb92a70e5f001ff3e64c6148 +Author: Catouse +Date: Mon Dec 15 15:25:12 2014 +0800 + + * fix style of search item in feature menu. + +commit 6a1be06be611c7bf4763f50e409158a916ee0a0b +Author: wangyidong +Date: Mon Dec 15 02:04:19 2014 +0000 + + * finish task #1996. + +commit 0522f5426c3e227632ecb2b4dfc83f90e5f62f05 +Merge: 88a59254a0 51fa7e0e22 +Author: wangyidong +Date: Fri Dec 12 09:31:56 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 88a59254a01e11217028016bf6fa1bd320fab6a7 +Author: wangyidong +Date: Fri Dec 12 09:31:23 2014 +0000 + + * finish task #2157. + +commit 51fa7e0e220479c2083f7da919426a9411399659 +Author: Catouse +Date: Fri Dec 12 17:29:08 2014 +0800 + + * ajust style of alert on doc/editlib. + +commit 20f1ad149f5f17838ffa8d118deab822f2146e06 +Merge: 74cd2ff6f3 e6dd93fba3 +Author: Catouse +Date: Fri Dec 12 17:25:44 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 74cd2ff6f3710ba33d6383ee328075dee52ed192 +Author: Catouse +Date: Fri Dec 12 17:25:38 2014 +0800 + + * remove icon in buttons. + +commit 5229fe0b5f54a50ba7146368f6c7aa8b0115a968 +Author: Catouse +Date: Fri Dec 12 17:25:22 2014 +0800 + + * fix style for modal. + +commit e6dd93fba384469ff439a3f82ff955135236e2c2 +Author: wangyidong +Date: Fri Dec 12 08:34:20 2014 +0000 + + * finish task #2153. + +commit 1611c929f0d3bd9c3e82701cea76791fc0959400 +Merge: c1fda45ed3 4834ab8ae7 +Author: wangyidong +Date: Fri Dec 12 08:10:39 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c1fda45ed3a5a0293136d2773682053805916520 +Author: wangyidong +Date: Fri Dec 12 08:10:02 2014 +0000 + + * finish task #2009. + +commit 4834ab8ae794d8f3967b5714c78c1d6d0ad05f8b +Author: xia0ta0 +Date: Fri Dec 12 14:52:40 2014 +0800 + + + add style. + +commit 1acfbb2fdb069da4733ab251df0ac81945a80b78 +Author: xia0ta0 +Date: Fri Dec 12 14:51:18 2014 +0800 + + + add title of testtask. + +commit c34d2e4a3b66b6a87db6171594e845ca4e63f800 +Author: xia0ta0 +Date: Fri Dec 12 14:36:07 2014 +0800 + + * code for task#2155. + +commit 65dd7aada9326d72768564e4f95a331c3d723837 +Author: xia0ta0 +Date: Fri Dec 12 12:13:38 2014 +0800 + + * code for task#2162. + +commit c39c589b83d4de9580a7185ddce7ac11c7d607ad +Author: xia0ta0 +Date: Fri Dec 12 12:13:04 2014 +0800 + + * code for task#2162. + +commit da076dc5eb19779df0a32fc2777229c31d63fb04 +Author: xia0ta0 +Date: Fri Dec 12 11:06:39 2014 +0800 + + * code for task#2163. + +commit 1228ad8b1f8b0590aba6fafa52fff64ed3a1ca25 +Author: xia0ta0 +Date: Fri Dec 12 10:27:43 2014 +0800 + + * code for task#2146. + +commit 118d2e9a22ccc745380ebb358b02fbffe29c4a4b +Author: xia0ta0 +Date: Fri Dec 12 09:36:14 2014 +0800 + + * code for task#2172. + +commit b6c6ff304ba9cb7d9fa3b9de658493d6e2d9e560 +Author: xia0ta0 +Date: Fri Dec 12 09:32:06 2014 +0800 + + * code for task#658. + +commit 0d194bfec072587cf2fd35bc01301e25474ed18c +Author: xia0ta0 +Date: Fri Dec 12 09:22:25 2014 +0800 + + * code for task#658. + +commit 54c49e23404b68c8580172453b1f7064ada80a28 +Author: xia0ta0 +Date: Thu Dec 11 17:40:06 2014 +0800 + + * code for task#2154. + +commit f67741ebcf03f7603d3561f1f5057e59a52ad4dd +Author: xia0ta0 +Date: Thu Dec 11 17:34:18 2014 +0800 + + * code for task#2154. + +commit 6fec0feae6ac92acac0db2a653c2f351fec4cdbd +Author: xia0ta0 +Date: Thu Dec 11 16:38:04 2014 +0800 + + * code for task#1302. + +commit c4f4e10717afe89d8aa69c7bb2094a11a1986a00 +Merge: b3e936ba9e 860f99431a +Author: xia0ta0 +Date: Thu Dec 11 15:58:27 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b3e936ba9e2755ff1eef4a6f49f08f583ff34c3b +Author: xia0ta0 +Date: Thu Dec 11 15:57:34 2014 +0800 + + * code for task#1302: adjust link style. + +commit 26b399bf40864571aa00ce99c4789ee8b91d1b0b +Author: xia0ta0 +Date: Thu Dec 11 15:55:46 2014 +0800 + + * code for task#1302. + +commit 860f99431a83a6fd1c1cfab37cb8f50751e7fbb8 +Author: wangyidong +Date: Thu Dec 11 03:30:36 2014 +0000 + + * code for task #1955. + +commit 0c687fcc6dec44ab80c93c8f0453127ba4ffce0f +Merge: 33cb9fb781 1cf0e89af6 +Author: wangyidong +Date: Thu Dec 11 02:46:00 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 33cb9fb7817c2e61f1e67ed7b25785b1f3153f74 +Author: wangyidong +Date: Thu Dec 11 01:45:10 2014 +0000 + + * finish task #2039,2040. + +commit 1cf0e89af62c24061613a4a6ecb1783cee42d961 +Author: xia0ta0 +Date: Thu Dec 11 09:32:11 2014 +0800 + + * code for task#2160. + +commit df54dbdde628671cc504138691b5e28a1ce1d136 +Author: xia0ta0 +Date: Wed Dec 10 17:39:41 2014 +0800 + + * code for task#2171. + +commit 0d0e5e387c0e223f4f9bb334df578e2212ab8c96 +Merge: 571770ea9b 123148ab3e +Author: xia0ta0 +Date: Wed Dec 10 17:37:20 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 571770ea9b3a538eb4ce4a15becf97ab12c8b985 +Author: xia0ta0 +Date: Wed Dec 10 17:36:45 2014 +0800 + + * code for task#2171. + +commit 08359a0bfddb74771e7da59d19b855a1a84ebfd9 +Author: xia0ta0 +Date: Wed Dec 10 16:32:01 2014 +0800 + + * code for task#2171. + +commit 123148ab3e312a6975d7574a969b1c4fa8503c77 +Author: Catouse +Date: Wed Dec 10 15:20:30 2014 +0800 + + * tab key spport jump to next chosen control. + +commit 51812569eab464e9f0417bd6a1afa851430c7e80 +Merge: eff1aed20e e421f17225 +Author: Catouse +Date: Wed Dec 10 15:10:23 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit eff1aed20ea1eb68baf392caec748172f8edb7b4 +Author: Catouse +Date: Wed Dec 10 15:10:12 2014 +0800 + + * finish task #2164. + +commit e421f17225ae111f502fde77b5c954429b374c1c +Author: xia0ta0 +Date: Wed Dec 10 14:03:58 2014 +0800 + + * code for task#2166. + +commit 2677c5086a0108d2fa742bda5542e1532002befa +Author: xia0ta0 +Date: Wed Dec 10 13:37:17 2014 +0800 + + * code for task#2173. + +commit 3477298ca477461e68c6a4bd25bbfd1d06539eb0 +Merge: 0399ee3358 85ba11c7ea +Author: xia0ta0 +Date: Wed Dec 10 11:32:38 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0399ee3358e990f1fa90cb06a98d60afd2db171b +Author: xia0ta0 +Date: Wed Dec 10 11:27:55 2014 +0800 + + * fix bug#647. + +commit 85ba11c7ea6c3f2d53c0e892e0ce520f9ab06d9f +Author: Catouse +Date: Wed Dec 10 09:50:56 2014 +0800 + + * finish task #1959, #1958. + +commit 8753c1f52a74682e5d0782f4eaa29073fe56d9e9 +Merge: 9c9aea31f0 9431e4792e +Author: Catouse +Date: Tue Dec 9 19:14:48 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9c9aea31f0c5fc4aaabb8b56aca211490866520c +Author: Catouse +Date: Tue Dec 9 17:14:44 2014 +0800 + + * change css class name. + +commit c58c386c591d1825f06b72915e41e5f44d3b5a3b +Author: Catouse +Date: Tue Dec 9 17:12:30 2014 +0800 + + * fix duplicate references of chosen. + +commit 64ab8de121e7b1fb442581d78fb69b0998153194 +Author: wangyidong +Date: Tue Dec 9 08:59:46 2014 +0000 + + * finish task #2156. + +commit 9409592b7355a7e2406ca05d414ed0024bc7a439 +Author: wangyidong +Date: Tue Dec 9 08:22:38 2014 +0000 + + * finish task #2168. + +commit 9431e4792e72e30b4e1f92a25f777aa98fad6f04 +Merge: 08995fda1d 64ab8de121 +Author: xia0ta0 +Date: Tue Dec 9 15:23:28 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 08995fda1d166e9d9975dd4347c9b2d84c9078f4 +Author: xia0ta0 +Date: Tue Dec 9 15:23:02 2014 +0800 + + - remove default date. + +commit 7ae6a6838da31ec5f2d0baf9f7afcdd1e6baed4c +Author: wangyidong +Date: Tue Dec 9 07:13:17 2014 +0000 + + * finish task #2161. + +commit 20f7b6285f27fbe83db5c769131b02c7c4b90093 +Author: wangyidong +Date: Tue Dec 9 05:05:30 2014 +0000 + + * ajdust code for task #2151. + +commit 3685523509a9cbaacc7d624b8947ac7c3c86a92e +Merge: 9927d276dc c6d9562fcc +Author: wangyidong +Date: Tue Dec 9 02:56:04 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9927d276dcd4ef53b1f11c39c76f1c86426cb840 +Author: wangyidong +Date: Tue Dec 9 02:55:16 2014 +0000 + + * finish task #2151. + +commit c6d9562fcc7c5912a751eca6f332d193a5f82b52 +Author: Catouse +Date: Mon Dec 8 18:03:56 2014 +0800 + + * enhance ui experience for ie8 users. + +commit 9d349c87ee8a9966da749bc2d47fe0cd79c1af2d +Author: Catouse +Date: Mon Dec 8 18:03:06 2014 +0800 + + * improve js efficiency when operate table rows. + +commit da30077232400550e5d592d7d3e1d5deb01cfaa4 +Author: Catouse +Date: Mon Dec 8 17:40:45 2014 +0800 + + * disabled chart animation for ie8. + +commit d7a615c2c40436c34e44503a4ce6cd8c329bb357 +Merge: 666eea64ad ba385e1477 +Author: Catouse +Date: Mon Dec 8 16:45:22 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 666eea64addad50f7fd3367ac0988a544c323607 +Author: Catouse +Date: Mon Dec 8 16:45:13 2014 +0800 + + * finish task #2169. + +commit ba385e147763b91cc94f847fa3247d13b48f111e +Author: wangyidong +Date: Mon Dec 8 07:20:09 2014 +0000 + + * finish task #2151. + +commit fe9562d816134d225eaff220d9d5805bf023a9c5 +Author: Catouse +Date: Mon Dec 8 15:16:09 2014 +0800 + + * fix function name to detect browser type. + +commit 51a95b38d87fe1729e32b25fc39e8f8b3eebdf07 +Author: Catouse +Date: Mon Dec 8 14:53:24 2014 +0800 + + * finish task #2159. + +commit 8276e02b94fab62b69780b54783866711b470b96 +Author: wangyidong +Date: Fri Dec 5 01:55:54 2014 +0000 + + * finish task #1938. + +commit bf41cdedb3d0f00e68aeeac5795998fb4159d2ca +Author: wangyidong +Date: Fri Dec 5 01:37:42 2014 +0000 + + * fix a bug. + +commit d015ef75e7fafc97711c2879b597115a1d8e7e21 +Author: wangyidong +Date: Thu Dec 4 09:07:18 2014 +0000 + + * finish task #2168. + +commit e5d7669a06f9a60cd9660e9e950e588a4b8b2383 +Author: wangyidong +Date: Thu Dec 4 06:01:14 2014 +0000 + + * finish task #2144. + +commit 1812e64c73f648ba5363632f06af1636db53feae +Author: wangyidong +Date: Thu Dec 4 05:44:58 2014 +0000 + + * fix a bug. + +commit 5595271210496e3054fc18874a253df3c169d06f +Merge: 01e9ebf0b4 28d5a7eca2 +Author: wangyidong +Date: Wed Dec 3 09:01:23 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 01e9ebf0b4c0af30eb6f5053a14693d739f2d550 +Author: wangyidong +Date: Wed Dec 3 09:00:48 2014 +0000 + + * fix a bug. + +commit 28d5a7eca2bbf10f3c9187030367edbfa2efb709 +Author: Catouse +Date: Tue Dec 2 14:25:36 2014 +0800 + + * change input group style on batchcreate view. + +commit 41e63d9e3b09533e2be6bd09c9367959d6182327 +Author: Catouse +Date: Tue Dec 2 11:32:12 2014 +0800 + + * fix style for small screens. + +commit 9695c48baeca15b92c5e49d8796a3c75da316ac4 +Author: Catouse +Date: Tue Dec 2 09:15:26 2014 +0800 + + * fixed style of company/browse. + +commit f8bb6129206627d49ddb38ac743d872a56bdd5da +Author: Catouse +Date: Mon Dec 1 17:32:57 2014 +0800 + + * fixed placeholder in ajax form for ie8. + +commit c0c65ce3b86886fb4bdfdd54ea5751ee6d6e41a4 +Author: Catouse +Date: Mon Dec 1 17:14:16 2014 +0800 + + * disabled chart in ie8 with too many sparkline to draw. + +commit 548985fb2bf210bac98f7041eb944c04947e6e3f +Author: Catouse +Date: Mon Dec 1 17:13:05 2014 +0800 + + * updated zui:added browser.js. + +commit b25a13a2810a8005f5a73c19c2dd7ecb3c788c06 +Author: wangyidong +Date: Mon Dec 1 02:31:09 2014 +0000 + + * fix a bug for ignore deleted project. + +commit cfc27b45bca5da0d003b3c7fb3409db0b351a401 +Author: wwccss +Date: Thu Nov 27 16:53:58 2014 +0800 + + * move it temp. + +commit d1aed6cc98e141d722c6899e3198bf5e745a7b35 +Author: wangyidong +Date: Thu Nov 27 06:46:49 2014 +0000 + + * fix a bug #652. + +commit dca4f88056e6bbe1effbd79ac109d48e4541c15d +Merge: 4da87b6926 e717233a92 +Author: wangyidong +Date: Thu Nov 27 06:09:25 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4da87b69261e07766b11cf7609f081042875b88a +Author: wangyidong +Date: Thu Nov 27 06:07:02 2014 +0000 + + * fix a bug for #648. + +commit e717233a928783e634ca66e7bd03d3d6fcc59ea4 +Author: Catouse +Date: Thu Nov 27 13:58:22 2014 +0800 + + * fixed bug #653. + +commit 35ca45494206b3fd110c6bc2e7ccd674279ff63c +Merge: 77cf7e8040 d330a140c1 +Author: wangyidong +Date: Thu Nov 27 01:03:42 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 77cf7e8040269ba0c86ed429df967b92ec787194 +Author: wangyidong +Date: Thu Nov 27 01:02:42 2014 +0000 + + * fix a bug. + +commit d330a140c11db702bc5bf8a2391a37ad7caef1e9 +Author: Catouse +Date: Wed Nov 26 10:04:41 2014 +0800 + + * apply status colors. + +commit 75468f85c6216110332c876e86e91d6e372571a0 +Author: Catouse +Date: Wed Nov 26 10:04:03 2014 +0800 + + * remove body padding of task/recordestimate. + +commit a28f16a8b3cff9a78deb76d87569bc1cd66914af +Author: Catouse +Date: Tue Nov 25 19:45:24 2014 +0800 + + * change datetime picker position when there is no space to display on the bottom side. + +commit 9fbc96859f6f3d724fd9ce2cac29cc0528d4909f +Author: Catouse +Date: Tue Nov 25 17:22:23 2014 +0800 + + * ajusted font size of chosen on feature bar. + +commit 0560c178705901427a2dad5ed9b2db4b025c027c +Author: Catouse +Date: Tue Nov 25 17:12:40 2014 +0800 + + * ajusted style of chosen on feature bar. + +commit da014675b905000fa348c9929dd94cebab16ea10 +Author: Catouse +Date: Tue Nov 25 17:00:41 2014 +0800 + + * ajusted ui of bug assignto menu on table footer. + +commit 7aa36752a06d5aa9d506d36db86e3ff57fb4bd36 +Author: Catouse +Date: Tue Nov 25 14:47:42 2014 +0800 + + * updated chosen. + +commit 057801ced72c7460beb1439e4a50108300da8261 +Merge: c59e100611 f22b980c23 +Author: wangyidong +Date: Tue Nov 25 05:47:49 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c59e100611081d0bb6a2a5ca61f36b526ae9540c +Author: wangyidong +Date: Tue Nov 25 05:46:57 2014 +0000 + + * code for task #2939. + +commit f22b980c2310043cc72b7743994cb320bd4e8f83 +Author: xia0ta0 +Date: Tue Nov 25 10:40:19 2014 +0800 + + * add ignore for iconv. + +commit a8766c858f62647857c6bded66f134f7305ef73c +Author: wangyidong +Date: Mon Nov 24 08:51:39 2014 +0000 + + * fix a bug. + +commit dea557a4294294884aa066a56081a5464b7e2c11 +Author: ChuJilu +Date: Fri Nov 21 10:21:32 2014 +0800 + + * finish pro task #2957. + +commit f5ed35273805a17acd605a6961c66e56f18e4a0c +Author: wangyidong +Date: Fri Nov 21 00:43:12 2014 +0000 + + * adjust code. + +commit 452c4088b99a19ef729b12ac5543a69d189babdd +Author: Catouse +Date: Tue Nov 18 11:52:07 2014 +0800 + + * fixed a js error in kindeditor.html.php. + +commit dad815c40ce4dde0e907201dd246e946d7526ba8 +Author: Catouse +Date: Tue Nov 18 11:51:46 2014 +0800 + + * updated chosen. + * ajusted style of chosen contro on 'task/batchCreate'. + +commit f4232373a22dacf573ceb26075024a6e8ce9ff32 +Author: wangyidong +Date: Fri Nov 14 03:21:47 2014 +0000 + + * fixed image size of progressbar. + +commit 3c03ef8af02b571157849a5590a011c63ebaa872 +Author: Catouse +Date: Fri Nov 14 10:38:08 2014 +0800 + + * fixed image size of progressbar. + +commit f25db15efda9523303e4d31723ad041073e1ab9a +Author: Catouse +Date: Fri Nov 14 10:22:19 2014 +0800 + + * fixed image path of progressbar. + +commit bacdb3e061fcd2be7e4acd5f9819b98fe3291317 +Merge: 56d235de45 8aae94b51e +Author: Catouse +Date: Fri Nov 14 10:07:58 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 56d235de456c417d3ca6b6001eee8716293de69e +Author: Catouse +Date: Fri Nov 14 10:07:46 2014 +0800 + + * ajusted progressbar with image. + +commit 6a5f8280e00dd6a4449aa4f097af9c5149d2a69b +Author: Catouse +Date: Fri Nov 14 10:07:07 2014 +0800 + + * ajusted ui of table view. + +commit 8aae94b51e966836e0be604d5bc1cea18c9b60a4 +Author: wangyidong +Date: Wed Nov 12 07:35:45 2014 +0000 + + * fix bugs for php notice. + +commit 9b62ce1a57f41d524081845f0788b5e6c266bd47 +Merge: 99892c6036 ab4b55773b +Author: wangyidong +Date: Fri Nov 7 09:07:28 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 99892c6036731f608b7ece482e15733ded85c497 +Author: wangyidong +Date: Fri Nov 7 09:07:08 2014 +0000 + + * fix a bug. + +commit 894e93202620fd41ecba34ecf32bbbf901d5a645 +Author: wangyidong +Date: Fri Nov 7 06:47:56 2014 +0000 + + * fix a bug. + +commit ab4b55773b5a3a442c84c3f66956b95ec9258cc2 +Author: Catouse +Date: Fri Nov 7 14:47:32 2014 +0800 + + * ajusted status color of product/browse. + +commit 627874502b043fb52cb686205df99da3ecbc694d +Author: Catouse +Date: Fri Nov 7 14:41:02 2014 +0800 + + * ignore empty user. + +commit 4ab75aef72920ab77de7158fe33f9043451a786c (tag: zentaopms_6.3.stable_20141107) +Merge: 9650ba0d7d 5d9c0c8c3b +Author: wangyidong +Date: Fri Nov 7 04:26:00 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9650ba0d7da90af47bf4ee192be43fc4342aca56 +Author: wangyidong +Date: Fri Nov 7 04:24:18 2014 +0000 + + * fix bug for 649. + +commit 5d9c0c8c3b1cea1e07d90d30a8835088d1f07da9 +Author: Catouse +Date: Fri Nov 7 11:51:06 2014 +0800 + + * fixed error on submit form with placeholder value for IEs. + +commit 8cacd2aeabed76f88a55064c19643d71e3a79de2 +Author: Catouse +Date: Fri Nov 7 11:28:17 2014 +0800 + + * fixed input group style conflict of searchbox. + +commit e44acb4f65a833b70549407952b34d1601e073d4 +Merge: 3911fb5bd7 268435ebe5 +Author: Catouse +Date: Fri Nov 7 10:38:45 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3911fb5bd75f766d9ce3ecd37607dbd27c40c708 +Author: Catouse +Date: Fri Nov 7 10:38:22 2014 +0800 + + * ajusted style of project menu. + +commit 268435ebe5fd2d01560c6c95c95ceb5d43e1d987 +Author: wangyidong +Date: Fri Nov 7 02:35:49 2014 +0000 + + * adjust for lang. + +commit 81e5998f5f98e6be8e6abec062defd831b8a60b3 +Merge: 92e7e933cc 30183548b1 +Author: wangyidong +Date: Fri Nov 7 02:14:37 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 92e7e933ccb1dce9ac4f66f662d7ef979a82d627 +Author: wangyidong +Date: Fri Nov 7 02:14:17 2014 +0000 + + * adjust code. + +commit 6d5ab1e0e034b36a393818b70c6ae6bca9c1f24e +Author: wangyidong +Date: Fri Nov 7 02:14:03 2014 +0000 + + + add changelog. + +commit 30183548b1cf7a5c7910ae32da5dc0e69abf093f +Merge: c91b4dfd16 5a36e6d25b +Author: Catouse +Date: Fri Nov 7 09:56:51 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c91b4dfd165d9c47ef2269ec2e6b57a56a3a7afb +Author: Catouse +Date: Fri Nov 7 09:56:43 2014 +0800 + + * removed debug code. + +commit 4496cf6df350541e7c8e6ac837237b0f7b9a0b60 +Author: wangyidong +Date: Fri Nov 7 00:55:59 2014 +0000 + + * fix a bug #651. + +commit 5a36e6d25b2bcf8aa73c0ea383af4a80ecac0240 +Author: ChuJilu +Date: Thu Nov 6 18:09:27 2014 +0800 + + * fix task #2102. + +commit 460bc7864f0ab03be9749a5c43bf5714dccad9a6 +Author: ChuJilu +Date: Thu Nov 6 18:06:38 2014 +0800 + + * fix task #2109 + +commit ec222e64773f8236baec7b3144dfda0a4f4ac249 +Merge: 96341b35c3 8d6ed5676f +Author: wangyidong +Date: Thu Nov 6 09:36:22 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 96341b35c3f2ff74e8075244725ee2810ffda72b +Author: wangyidong +Date: Thu Nov 6 09:36:04 2014 +0000 + + * fix file size. + +commit 8d6ed5676fbfe448f82881cc371f43d5e7b7012e +Author: ChuJilu +Date: Thu Nov 6 17:23:13 2014 +0800 + + * fix task #2106. + +commit 22dc72f7397c91e780710a1bb9da64acb8f5eee4 +Author: wangyidong +Date: Thu Nov 6 09:16:27 2014 +0000 + + * sort upload images. + +commit 2a47b1ba25f3fa84ab4b8ba9a00784665ef34317 +Merge: a8be1e9649 6da1b6a4bb +Author: wangyidong +Date: Thu Nov 6 09:09:34 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a8be1e9649e0b1b3e4c039cb717f42dff49311d7 +Author: wangyidong +Date: Thu Nov 6 09:06:34 2014 +0000 + + * fix bug and adjust code. + +commit 6da1b6a4bbb32d2bb20dbdf5ac70e944f41f9576 +Author: Catouse +Date: Thu Nov 6 15:30:35 2014 +0800 + + * updated zui css: fixed article style. + +commit 705a38734023f64ba2abdc8928f57c15314e7ad2 +Author: Catouse +Date: Thu Nov 6 15:23:08 2014 +0800 + + * fixed style of 'project/task'. + +commit fbd944aefde71a9059813a2fb5a772961388864e +Author: Catouse +Date: Thu Nov 6 15:21:08 2014 +0800 + + * ajusted style off assign to menu with search input. + +commit 4e4eb72ae60ae668b07ff304e64b0138876f24e2 +Author: Catouse +Date: Thu Nov 6 15:16:53 2014 +0800 + + * updated zui: added cards and sortable. + +commit cea057d8201535b9cca896c5cd5b7b8faca939c7 +Merge: 1b72bf4723 d76b854042 +Author: Catouse +Date: Thu Nov 6 14:53:53 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1b72bf4723593e0b2da018fce726adde05ea21c6 +Author: Catouse +Date: Thu Nov 6 14:53:01 2014 +0800 + + * ajusted ui of batch assign to dropmenu. + +commit d76b854042cd998e0407c16e5a355042ee7ad8ed +Author: wangyidong +Date: Thu Nov 6 06:01:52 2014 +0000 + + * fix js error for ie. + +commit 6f51bc31f7cb0f7230a2da3bba80d88923e9a825 +Author: wangyidong +Date: Thu Nov 6 05:59:47 2014 +0000 + + * change lang. + +commit 3fe9d38165e7f8de36e44ac80615963cf26df7c3 +Author: wangyidong +Date: Thu Nov 6 05:59:12 2014 +0000 + + * fix client lang ie >= 10. + +commit 31e3daa4c8d1bf5f4684227cbf133df92504d611 +Author: wangyidong +Date: Thu Nov 6 03:07:00 2014 +0000 + + * change lang. + +commit 9f39bc1e2e85e89246b92ae88fce43c741585fba +Author: wangyidong +Date: Thu Nov 6 03:03:14 2014 +0000 + + * adjust mail. + +commit 41452c9d45dbcb87470e58a804bb3752f69e7c25 +Merge: 88ee97e72c 5ed522a94d +Author: wangyidong +Date: Thu Nov 6 01:03:42 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 88ee97e72cab22197f1758ab7ebd797a06178e01 +Author: wangyidong +Date: Thu Nov 6 01:03:23 2014 +0000 + + * change for upgrade. + +commit 5ed522a94d563786657cbc831ea6f284b15e8b7e +Author: Catouse +Date: Thu Nov 6 08:56:31 2014 +0800 + + * ajusted status of objects. + +commit f1f4e8a48d0c290bd8b0bf898e8d2696bdc4cbf0 +Author: ChuJilu +Date: Wed Nov 5 18:32:28 2014 +0800 + + * fix a bug. + +commit c1337e49da2eca38d1d34262ee01e5184f07f513 +Author: ChuJilu +Date: Wed Nov 5 17:23:04 2014 +0800 + + * finish task #2107. + +commit b4d97a5ea94c7e8adbeafe58e013a1ae0dab356e +Author: wangyidong +Date: Wed Nov 5 09:16:31 2014 +0000 + + * adjust code for task #2090. + +commit 144b057d9591bcaf88810d08157780032396899a +Author: wangyidong +Date: Wed Nov 5 08:46:42 2014 +0000 + + * adjust width for files-list. + +commit a796bfbf5406e29f956a069ab3492820e2614c80 +Author: wangyidong +Date: Wed Nov 5 08:37:47 2014 +0000 + + * fix a bug. + +commit 03e017b4308fb5005b7796c51ab8a2418d00a7f6 +Merge: 42d3486642 81f0212df7 +Author: wangyidong +Date: Wed Nov 5 08:24:13 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 42d34866428875b807890415a849f7a4a04e5826 +Author: wangyidong +Date: Wed Nov 5 08:23:20 2014 +0000 + + * finish task #2118. + +commit 81f0212df743c1084b10120859d8d1fdc0e94e45 +Author: ChuJilu +Date: Wed Nov 5 16:22:37 2014 +0800 + + * finish task #2106. + +commit dc0945efd80bd46c8f537f0735e82b70757ac516 +Author: wangyidong +Date: Wed Nov 5 07:44:46 2014 +0000 + + * finish task #2124. + +commit 0fcb3f7bbbb3427b20dd50e2dd3709195bfe005f +Merge: b0d133aa03 a184554259 +Author: wangyidong +Date: Wed Nov 5 07:10:41 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b0d133aa0330f8a8fc1684bda49f6faeca5acc25 +Author: wangyidong +Date: Wed Nov 5 06:58:57 2014 +0000 + + * fix bug #649. + +commit a184554259570ac30679fb1c5589f0ae36e2708c +Author: Catouse +Date: Wed Nov 5 14:38:22 2014 +0800 + + * ajusted status color. + +commit c0e7f91638e4e1fdb6aed05d20f3eb9cb43b26ec +Author: wangyidong +Date: Wed Nov 5 05:46:58 2014 +0000 + + * finish task #2142. + +commit 9c9b1d65cced13a0049d2e69c18c425bc686a25d +Author: wangyidong +Date: Wed Nov 5 05:23:53 2014 +0000 + + * finish task #2143. + +commit 58bfad91a34323e1e6cc3c69373a8cd2db475eda +Merge: 93c65f8476 a3440966bc +Author: wangyidong +Date: Wed Nov 5 05:23:31 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 93c65f847611016089caa74126d8934ef8d04808 +Author: wangyidong +Date: Wed Nov 5 05:22:50 2014 +0000 + + * fix a bug for merge personal config. + +commit a3440966bc5e6f352c86bc03aa2ecfd781709437 +Author: Catouse +Date: Wed Nov 5 11:10:52 2014 +0800 + + * ajusted style of upgrade index. + +commit caf8c74ce4820d92bb4f1996926cd8ade2c371db +Author: Catouse +Date: Wed Nov 5 11:10:01 2014 +0800 + + * updated zui: remove hover effection of alerts. + +commit 95f67aad9ab1733aecf628e1bcb69bb1cfda2e14 +Author: Catouse +Date: Wed Nov 5 09:59:33 2014 +0800 + + * ajusted code. + +commit 32e3858046aa0a21f362dfc02c8a00e1cac85e43 +Author: Catouse +Date: Wed Nov 5 09:59:25 2014 +0800 + + * textarea in batch operation page can ajust height to fit text content. + +commit f4a092f5747bd8774639d624e4cdd36d7040d9f9 +Author: ChuJilu +Date: Tue Nov 4 16:39:26 2014 +0800 + + * finish task #2088 + +commit b5fa7815eafabcba296e1b28ea0444ed8ce40690 +Merge: 64d6b19a4c 7433753e62 +Author: wangyidong +Date: Tue Nov 4 07:50:27 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 64d6b19a4ccbb0698ab468d66e4e84baa997498a +Author: wangyidong +Date: Tue Nov 4 07:49:10 2014 +0000 + + * finish task #2119. + +commit 7433753e629d32d4e46433b38a1b8066f172316c +Author: ChuJilu +Date: Tue Nov 4 14:55:58 2014 +0800 + + * finish task #2102. + +commit 9395eb7517421b76c0202e8e851822b026f4b02d +Author: ChuJilu +Date: Tue Nov 4 11:56:41 2014 +0800 + + * finish task #2108. + +commit b0b92356734bcc3f0b65378145d14706b91488b2 +Merge: bb77d06a1c 91b5c5deb9 +Author: wangyidong +Date: Tue Nov 4 03:16:30 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bb77d06a1ccc483f003896f1a1d94882bb7b34a8 +Author: wangyidong +Date: Tue Nov 4 03:15:56 2014 +0000 + + * fix bug #645. + +commit 91b5c5deb9d56ce2a0581efc4f3ec41813a9ab8f +Author: Catouse +Date: Tue Nov 4 11:00:57 2014 +0800 + + * fixed errors in method ''selectButton". + +commit 6b0b66553732154412f566d167272fc56f4b3615 +Author: ChuJilu +Date: Tue Nov 4 09:48:30 2014 +0800 + + * finish task #2120. + +commit b1af6eac76cda1b9be6b98688b9f751e7a1a9cc8 +Author: wangyidong +Date: Tue Nov 4 01:18:40 2014 +0000 + + * fix a bug #646. + +commit b02fc2cf11e7de4b7afb4f69085e750262323328 +Author: wangyidong +Date: Mon Nov 3 09:26:12 2014 +0000 + + * finish task #2121. + +commit 2a944248fc59757616c79b334ed48de02783b4a6 +Author: wangyidong +Date: Mon Nov 3 09:00:59 2014 +0000 + + * finish task #2123. + +commit bc391577bae51223ceb483434bae8dfff955805c +Author: wangyidong +Date: Mon Nov 3 08:35:17 2014 +0000 + + * fix a bug. + +commit ca30b0775facc1762d5f5a41212b93c0608e945f +Author: wangyidong +Date: Mon Nov 3 07:30:41 2014 +0000 + + * finish task #2138. + +commit 303dbe844da877e5b75c3de79bdb74d1203792f3 +Author: wangyidong +Date: Mon Nov 3 06:12:00 2014 +0000 + + * finish task #2141. + +commit b6128a8c6c9d9e30536c27492784544968b1f99f +Merge: 7c96bd88ee c9905dbef2 +Author: wangyidong +Date: Mon Nov 3 05:52:34 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7c96bd88eee0752b0fd936111777ac3f7dad87b7 +Author: wangyidong +Date: Mon Nov 3 05:51:43 2014 +0000 + + * finish task #2878. + +commit c9905dbef23e3dfa19455b7f36332b67aa2abca2 +Author: ChuJilu +Date: Mon Nov 3 11:36:35 2014 +0800 + + * finish task 2118. + +commit 2db0df11e303b86751991947103d5b05b754c189 +Merge: ebcf2e73f4 d2dd3d510f +Author: wangyidong +Date: Mon Nov 3 03:19:27 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ebcf2e73f4f1162e62ca93ce387bacad109a1d0e +Author: wangyidong +Date: Mon Nov 3 03:19:10 2014 +0000 + + * change for api. + +commit d2dd3d510f45a246c9934beb9c16ec3dcc403ca0 +Merge: c54597908b 449bc717ae +Author: Catouse +Date: Mon Nov 3 10:15:41 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c54597908b1efa3982c5281668aea8827f70012a +Author: Catouse +Date: Mon Nov 3 09:49:12 2014 +0800 + + * removed css class 'datatable' from #taskList. + +commit 449bc717ae7be8f822e784dbd18ae853cdf65ac7 +Author: ChuJilu +Date: Mon Nov 3 09:33:42 2014 +0800 + + * finish task 2109. + +commit 094ddff047a08ed8705bd39c8749d61f3ef85ca6 +Author: Catouse +Date: Fri Oct 31 15:17:41 2014 +0800 + + * function 'setModalList' support datatable. + +commit 7a34b44147b8b78238664e6596a1e1aac0748222 +Author: Catouse +Date: Fri Oct 31 14:19:40 2014 +0800 + + - removed datatable resource. + +commit 08dcd6d2193fdb0b4a7c099495e86888502ad2df +Author: Catouse +Date: Fri Oct 31 14:19:14 2014 +0800 + + - removed excess text. + +commit 32ac6009a0c2a5f1c636f2603bca5f995778e4df +Author: Catouse +Date: Fri Oct 31 13:25:56 2014 +0800 + + * updated zui. + +commit ea4a1195d23aa700cc45172778857de55854cb84 +Author: ChuJilu +Date: Thu Oct 30 17:24:56 2014 +0800 + + * adjust width of project task view. + +commit 23c5fe5d0d028e5d001153faacea665decf289f4 +Author: Catouse +Date: Thu Oct 30 17:06:19 2014 +0800 + + * fixed a js naming conflicts among php syntax. + +commit a62494bd95d4918f90b268de81db3868a491f117 +Author: ChuJilu +Date: Thu Oct 30 16:51:29 2014 +0800 + + * delete the empty check role when batch create. + +commit 97d20d77c77e58fb65594b9a3219f1d0e5683efb +Merge: f5b311cd0f 3deb33dff3 +Author: xia0ta0 +Date: Thu Oct 30 14:51:39 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f5b311cd0f71dec01ca9cc0684bca0d45db1a48c +Author: xia0ta0 +Date: Thu Oct 30 14:50:06 2014 +0800 + + * fix bug: get stories of custom child module error. + +commit 3deb33dff3e9d7f60bac32f5e35ea5d411702823 +Author: Catouse +Date: Thu Oct 30 09:03:28 2014 +0800 + + - removed datatable. + +commit 00de3389474d3d551bb19766236d4da1aea2f8cb +Merge: 61b8f7f9cf 0215c7f66b +Author: Catouse +Date: Wed Oct 29 11:26:28 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0215c7f66b4d17ebad72d5ab6b87aad706e3a224 +Author: wangyidong +Date: Tue Oct 28 09:31:19 2014 +0000 + + * remove UTF8Bom for getconfig. + +commit 830dc8877a2e1e8e548819d9717595a86a9fa991 +Merge: 5fd4791e37 bdb95ca8cb +Author: wangyidong +Date: Tue Oct 28 09:00:17 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5fd4791e3774f8a4754151967d446152e43d0061 +Author: wangyidong +Date: Tue Oct 28 08:59:32 2014 +0000 + + * change for login api. + +commit 61b8f7f9cfedf95af2025883375e64ab42f1efe0 +Author: Catouse +Date: Tue Oct 28 16:57:19 2014 +0800 + + * fixed table row select button for datatable. + +commit bdb95ca8cb4473c6ce317328f0817ae91cca22d6 +Author: Catouse +Date: Tue Oct 28 15:40:55 2014 +0800 + + * set checkbox automatically before init datatable. + +commit 61a43f656b2e21ed225d9c93c2e288a1189518a0 +Author: Catouse +Date: Tue Oct 28 15:31:58 2014 +0800 + + * datatable support check operation. + +commit 5efc73f8265e45206a0bc01bc1b6ae3c6928582a +Author: Catouse +Date: Tue Oct 28 14:32:36 2014 +0800 + + + added datatable.html.php. + +commit 7c5155480a4e95ddfd5ebe6721c072aafe6f5291 +Author: Catouse +Date: Tue Oct 28 14:27:37 2014 +0800 + + + added datatable.html.php. + +commit 08874ffe171bdb81519f532a2a0fe422b7499011 +Author: Catouse +Date: Tue Oct 28 13:38:34 2014 +0800 + + * datatable support checkbox input. + +commit 18de3e20a07241500644b53c1ebe96ce61ba2976 +Author: ChuJilu +Date: Tue Oct 28 13:36:36 2014 +0800 + + * finish task 2130. + +commit c550eb67d207659064ca09c950e1c6beafee683a +Merge: 53f263f844 2b983354a1 +Author: wangyidong +Date: Tue Oct 28 03:36:33 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 53f263f844dd2524431be9f4816ba7d8fce29ca5 +Author: wangyidong +Date: Tue Oct 28 03:35:17 2014 +0000 + + * finish task #2055. + +commit 2b983354a182857ae2a771086efbac57aa593744 +Merge: 0ee2b63cec 7b367455ab +Author: Catouse +Date: Tue Oct 28 10:56:23 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0ee2b63cecbf422de2d02dd79323269365de4042 +Author: Catouse +Date: Tue Oct 28 10:56:17 2014 +0800 + + * moved datatable to common. + +commit 7b367455ab59b91b08c76f4b36bf3147aa2c5947 +Author: ChuJilu +Date: Tue Oct 28 10:45:16 2014 +0800 + + * finish task 2129. + +commit 9c3497e1d98f4e194d924117e1400f3d6e75aa60 +Author: Catouse +Date: Tue Oct 28 10:41:30 2014 +0800 + + * ajusted style of chosen with input group in table foot. + +commit 519b40b4e5c2e721d946a5e5bc197b4b232bc75a +Author: ChuJilu +Date: Tue Oct 28 09:31:49 2014 +0800 + + * finish task 2116. + +commit be94a5a635f82016c090f0097570bc323fc6dc44 +Merge: fba4010d06 3dd15f9ef8 +Author: wangyidong +Date: Mon Oct 27 08:16:39 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fba4010d06cf2ba3b4fb50205cb389a6dbe5fd3a +Author: wangyidong +Date: Mon Oct 27 08:15:53 2014 +0000 + + * finish task #2096,2097. + +commit 3dd15f9ef8a4e7e988f11c696f81b88ca5fffed7 +Author: ChuJilu +Date: Mon Oct 27 16:12:26 2014 +0800 + + * project task view used datatable. + +commit 776f001ccaacc92460a2c56b05eb9a3025b0b438 +Author: Catouse +Date: Mon Oct 27 16:02:38 2014 +0800 + + * datatable support table footer content by updated zui. + +commit cb2dc8d3793abeb3aec5cd9a4c947ea091ce8c94 +Merge: af6f0aa9f3 c353d13ebd +Author: Catouse +Date: Mon Oct 27 16:01:49 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit af6f0aa9f35de40ade806c590837bb4d67fbc996 +Author: Catouse +Date: Mon Oct 27 15:24:46 2014 +0800 + + * fixed border style of table for firefox. + +commit c353d13ebdcb1179ea72f50292067a9aecc53970 +Author: ChuJilu +Date: Mon Oct 27 15:22:52 2014 +0800 + + * add datatable js of project task view. + +commit 38414f177c3c90ac5bb64528ddc093e8f8202161 +Author: Catouse +Date: Mon Oct 27 15:17:05 2014 +0800 + + * fixed header style of titlebar. + +commit 7485ec63d0002d366e2b976f7bb47002204a0036 +Author: Catouse +Date: Mon Oct 27 14:41:31 2014 +0800 + + * swaped pane position. + +commit e0c6cd1f2429d2fc66048261a78042f34dd1ffdb +Author: Catouse +Date: Mon Oct 27 14:29:30 2014 +0800 + + * open link with iframe modal. + +commit e3507c752f82432f0d5a94c7f45d281948cb705b +Author: Catouse +Date: Mon Oct 27 13:56:02 2014 +0800 + + * updated zui. + +commit 61c3c1606d95499e0baa4d61b60c585b0efdf6ab +Author: Catouse +Date: Mon Oct 27 13:55:53 2014 +0800 + + * updated favicon and zentao icon on footer. + +commit 0d29c41d8fde7bd19a1c3b1f384d7d92503a1d88 +Author: Catouse +Date: Mon Oct 27 13:29:17 2014 +0800 + + * updated zui. + +commit 6bc987d4a21d05b9d4799677cfcfcda9b1d85c9b +Author: wangyidong +Date: Mon Oct 27 03:17:30 2014 +0000 + + * change for task #2049. + +commit a6664013108cf63922e860b6ac96281842498840 +Merge: ed8818d5d1 db603bb7cc +Author: wangyidong +Date: Mon Oct 27 02:57:51 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ed8818d5d1c8f54ffbdac4fc72ca43ae9b3e28d0 +Author: wangyidong +Date: Mon Oct 27 02:57:31 2014 +0000 + + * adjust code. + +commit d89b6daa5adceed4565e49ad443da6a051d4a9e9 +Author: wangyidong +Date: Mon Oct 27 02:56:11 2014 +0000 + + * finish task #2043,2094,2098. + +commit a18ee2f055fc126769396ac3fc6fdab581a0fb35 +Author: wangyidong +Date: Mon Oct 27 02:55:30 2014 +0000 + + * change gitignore. + +commit db603bb7cc7908c19feeb15d75d77f5c38a38434 +Author: ChuJilu +Date: Mon Oct 27 09:28:28 2014 +0800 + + * finish task 2113. + +commit 1cae54bcaf98ef7785cef3b5f0ccc3dce1c30512 +Author: ChuJilu +Date: Fri Oct 24 16:17:03 2014 +0800 + + * finish task 2106. + +commit 067d69fc96cf92dcd954318e63d6627a9c268153 +Author: ChuJilu +Date: Fri Oct 24 14:08:27 2014 +0800 + + * finish task 2016. + +commit 71d329e28b93db78f5129e5bc71bd3f3b7a21679 +Author: ChuJilu +Date: Fri Oct 24 10:36:31 2014 +0800 + + * finish task 2093. + +commit e470105e017dff9c4138641e66bb82d1c4b93892 +Author: ChuJilu +Date: Fri Oct 24 10:10:13 2014 +0800 + + * finish task 2092. + +commit bddc5a299195ac5f2fa7244926caf0cf3dd7f362 +Author: ChuJilu +Date: Fri Oct 24 09:14:59 2014 +0800 + + * finish task 2090. + +commit 447af821e7ec08bb7c327dc8e68dd8e4ae8520c0 +Author: ChuJilu +Date: Thu Oct 23 16:42:13 2014 +0800 + + * finish task 2089. + +commit 51f65c74fc7cf31952739aa5b77d897cc3fa5561 +Author: wangyidong +Date: Tue Oct 21 05:20:58 2014 +0000 + + * adjust for get image in mail. + +commit 4c123e834c08128fcc3fdbdc3e52e9b6c4c6de86 +Author: wwccss +Date: Sat Oct 18 11:38:40 2014 +0800 + + * disallow robots. + +commit ffd51c94d202eb271f35b2c4df24155f604c9db3 +Author: ChuJilu +Date: Sat Oct 18 09:37:01 2014 +0800 + + * Change viewPrefix config. + +commit 4fedcd4234453846c9ae9cb1adeb7a994536c5c1 +Author: xia0ta0 +Date: Wed Oct 15 15:20:35 2014 +0800 + + * fix bug of fixModulePath. + +commit 0a493b7eb890399d6b69670ee51d3e233692c466 +Merge: 85505bcd2d bf09d39eb2 +Author: wangyidong +Date: Fri Oct 10 08:47:51 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 85505bcd2de6a8020e4c48ab7a83ab46d4c0fbc7 +Author: wangyidong +Date: Fri Oct 10 08:47:31 2014 +0000 + + + add zdog.sh. + +commit bf09d39eb210dd10a9f43ffba3129532b1a0d4ef +Author: ChuJilu +Date: Fri Oct 10 09:35:33 2014 +0800 + + * Add the config of view prefix. + +commit 0433f34fb6327767e8fa068a105e22d4e3a756da +Author: Catouse +Date: Sat Sep 27 10:22:54 2014 +0800 + + * added 'all' option to get all items by update modal for 'bug','story' and 'task'. + +commit 3f09c6f10aba91b63356761a1b2e5a987c9233f8 +Author: wangyidong +Date: Thu Sep 25 07:07:14 2014 +0000 + + * fix a bug. + +commit f0395931da7364307fdd748d1412bce6775d5087 +Merge: 9508206dd9 83e6d99254 +Author: wangyidong +Date: Tue Sep 23 06:42:09 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 83e6d99254f43eb8603e8dfb78cb069a4167a940 +Author: Catouse +Date: Tue Sep 16 16:41:17 2014 +0800 + + * fixed export button of view 'testask/cases'. + +commit 69f6d00112e2279351f5e684e75ba2fb59aeba39 +Author: Catouse +Date: Tue Sep 16 15:52:17 2014 +0800 + + * fixed style of 'project/create'. + +commit e432ebcdd52ce45c8409a7d1b84fa4934c5c085f +Author: xia0ta0 +Date: Tue Sep 16 14:39:05 2014 +0800 + + * fix warning of convert. + +commit 19238caba09b360c22babda1cbc8c6e84a611c46 +Author: xia0ta0 +Date: Tue Sep 16 14:27:42 2014 +0800 + + * fix warning of convert. + +commit 9508206dd946a077c6ab4e744e2efa94ce234a13 +Author: wangyidong +Date: Tue Sep 9 05:54:09 2014 +0000 + + * fix a bug. + +commit a15bdb9f5280012898031328a1a66f57d96b342a +Author: Catouse +Date: Fri Sep 5 14:25:04 2014 +0800 + + * fixed setModal4List in my.js. + +commit c3f733e8b3ddf665fcf59e62b214d0e8fb631942 +Merge: dbe3c3ec61 225a5eb413 +Author: Catouse +Date: Wed Sep 3 09:23:03 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dbe3c3ec610f5544f77edde66b1e6773000d3a36 +Author: Catouse +Date: Wed Sep 3 09:22:03 2014 +0800 + + * fixed an error of function:'closeModal'. + +commit 225a5eb413316a9fd43d9a8fbb2b86e99043db2d +Author: xia0ta0 +Date: Tue Sep 2 10:08:08 2014 +0800 + + * fix '¶'. + +commit 66a91d13c4632bad3cba187e97c43f1cf8fa232b +Author: xia0ta0 +Date: Mon Sep 1 10:00:35 2014 +0800 + + * fix word error. + +commit fc37dcd3bc80e31f05b5cd575d30c5b8d9700763 (tag: zentaopms_6.2.stable_20140827) +Author: wangyidong +Date: Wed Aug 27 01:10:40 2014 +0000 + + * change for zh-tw. + +commit d8cd85ad5b9ec6f0fd300e95dd87c83371bd14f8 +Author: wangyidong +Date: Tue Aug 26 09:24:55 2014 +0000 + + * change CHANGELOG. + +commit 9c22aa0415537fd0a74ebf0bc992f64b2a62cdb6 +Merge: 79abe30e72 8e96648e2d +Author: wangyidong +Date: Tue Aug 26 09:23:04 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 79abe30e7276172bfda677d99e1684330a2087da +Author: wangyidong +Date: Tue Aug 26 09:21:33 2014 +0000 + + * fix a bug #598. + +commit 2088a01aeeaf9a46cc319478456a7d59a209c799 +Author: wangyidong +Date: Tue Aug 26 07:34:16 2014 +0000 + + * fix bug #610. + +commit 421ceeaa43d2f9328b03720b6741c876b0aaa1de +Author: wangyidong +Date: Tue Aug 26 07:05:06 2014 +0000 + + * fix bug #611. + +commit 2af11bc06719932f531f25d837a50f79d68bbf0a +Author: wangyidong +Date: Tue Aug 26 06:54:09 2014 +0000 + + * fix bug #622. + +commit 3aa0e9cb26f894151d47df6026403ee6b79ee68d +Author: wangyidong +Date: Tue Aug 26 06:53:45 2014 +0000 + + * adjust backgroup for page. + +commit 8e96648e2d210c824e8ca065ae6877e8aab88f88 +Author: wwccss +Date: Tue Aug 26 14:50:57 2014 +0800 + + * init the $jsLang. + +commit 96257d7a39a0468a2d78c177a3738169482c793a +Merge: a59fe005a6 fb9d817546 +Author: wwccss +Date: Tue Aug 26 14:25:22 2014 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit fb9d81754645a67198c0c91cc1a2722c59784b35 +Author: wangyidong +Date: Tue Aug 26 05:34:51 2014 +0000 + + * adjust testtask view. + +commit be13f77d9389671bfd68e9d2d2fab5169c536e5c +Author: wangyidong +Date: Tue Aug 26 03:32:18 2014 +0000 + + * remove bug-customFields priv + +commit 14508064eaed6d8249b0d4bd302723c3eddb44a1 +Author: wangyidong +Date: Tue Aug 26 03:25:44 2014 +0000 + + * remove download notify. + +commit 7038cc4b3e4f57b2a9285b782b9e24f1e542ceb6 +Author: wangyidong +Date: Tue Aug 26 02:49:59 2014 +0000 + + * adjust dao.class.php. + +commit 3e7235e7fddb0441b51be5631b6717b015715eb4 +Author: wangyidong +Date: Tue Aug 26 02:22:58 2014 +0000 + + * fix for removeDuplate. + +commit 2b862ee4f57d9a26ade957a8894db2af9fb0b2f9 +Author: wangyidong +Date: Tue Aug 26 02:02:41 2014 +0000 + + * change width for testtask-edit. + +commit 232e7214f30f283f02f4c0dd56a2f8333693fd26 +Author: wangyidong +Date: Tue Aug 26 01:50:05 2014 +0000 + + * adjust style for testtask-results. + +commit 9a5f14614b54b4d734c5719eb7048cd2f88d185e +Author: wangyidong +Date: Tue Aug 26 01:34:27 2014 +0000 + + * fix bugs. + +commit 02d5200f982d2acdaa05f0ec27dc734f9702ffeb +Author: wangyidong +Date: Tue Aug 26 00:48:31 2014 +0000 + + * change for zh-tw. + +commit 0463c6ab25ae201d6ea434ec0873dcb003105f00 +Author: wangyidong +Date: Mon Aug 25 08:46:03 2014 +0000 + + * remove clearData function. + +commit 379e43bef9c17d2efcfa0d38751abc6a9116dbed +Author: wangyidong +Date: Mon Aug 25 08:06:06 2014 +0000 + + * adjust style of extension. + +commit 4cabf8b6c692fce89f6c33b51466fca5fa02dff8 +Author: wangyidong +Date: Mon Aug 25 07:41:02 2014 +0000 + + * adjust extension header. + +commit 084182698dbc3b2f07caaff0597327ed727bbbad +Author: wangyidong +Date: Mon Aug 25 07:18:20 2014 +0000 + + * adjust for exportConfigVars. + +commit 1d197648db6f8900123994fe97dbfa895354867b +Author: wangyidong +Date: Mon Aug 25 06:43:25 2014 +0000 + + * adjust for needNotReview. + +commit ce1b8874c1f6537a8910be5822923cda19f115ee +Author: wangyidong +Date: Mon Aug 25 06:18:21 2014 +0000 + + * adjust number. + +commit 2cb64ce5c8dfe19ed6cad68be1d0afd7deb176f5 +Author: wangyidong +Date: Mon Aug 25 06:02:04 2014 +0000 + + * fix for safe. + +commit 8edba1680229574a79e832e5014d0156159b7b52 +Author: wangyidong +Date: Mon Aug 25 05:58:46 2014 +0000 + + * adjust page. + +commit fd8ab3880b4246d0171c331bd8781556529d278e +Author: wangyidong +Date: Mon Aug 25 05:38:39 2014 +0000 + + * add notice. + +commit 8a18f5dfb26ff6dab4a1cfdc6cbfe172693c7b0a +Author: wangyidong +Date: Mon Aug 25 05:11:58 2014 +0000 + + * add icon of all project for dropmenu. + +commit 2d07bc1f29120c3d9671352c3db9249dbdf77c85 +Merge: 8c50180759 c11b5a1d27 +Author: wangyidong +Date: Mon Aug 25 03:18:40 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8c50180759e9c2a11b547933a03c4e56d74338bb +Author: wangyidong +Date: Mon Aug 25 03:08:21 2014 +0000 + + * change checkrepeat to removeDuplicate. + +commit c11b5a1d27de0209c124a6bc7d321ce69a0f905b +Author: chujilu +Date: Sun Aug 24 09:49:48 2014 +0800 + + * format code + +commit 68312723dfe3905af05c56c87520a2b805f2db3d +Author: chujilu +Date: Fri Aug 22 18:21:25 2014 +0800 + + * adjust code + +commit 1368a21cc213d87eac6c01487fbfe77be9702c9d +Merge: b29af641af a8d518577e +Author: chujilu +Date: Fri Aug 22 18:02:45 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b29af641af7cff1fd4d167c65e1a19204995049a +Author: chujilu +Date: Fri Aug 22 18:00:53 2014 +0800 + + * finish task #2051 + +commit a8d518577e7d8baf4c3ca7764e4ddc4fbd3beac1 +Author: Catouse +Date: Fri Aug 22 15:35:50 2014 +0800 + + * ajusted title style of modal. + +commit e5ccae20a5a20bf2e95c8be8cea3e886abe4f6f4 +Author: Catouse +Date: Fri Aug 22 15:35:26 2014 +0800 + + * ajusted style of user/edit. + +commit 53a4486703ce01b0856bf3d292f49901fd76d65e +Merge: bf8bbb4608 c70b40a8c4 +Author: Catouse +Date: Fri Aug 22 15:28:18 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bf8bbb4608975ec7a2c660cc3c58b50654bb7c5a +Author: Catouse +Date: Fri Aug 22 15:27:49 2014 +0800 + + * ajusted title style of modal. + +commit c70b40a8c4cd762c5d2b08f5353cea8aac0948cc +Merge: 00627dc835 565fb4c5ef +Author: chujilu +Date: Fri Aug 22 15:25:48 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 00627dc8359e75b2aa5a70c4efab09f9c32348e2 +Author: chujilu +Date: Fri Aug 22 15:24:29 2014 +0800 + + * activate Bug when importbug if bug postponed. + +commit a59fe005a672210d39b551b73f4880dccc5ff4f9 +Author: wwccss +Date: Fri Aug 22 14:06:55 2014 +0800 + + * adjust code format. + +commit c530038d9aae520c6110ea023c73dcd8568f884c +Author: wwccss +Date: Fri Aug 22 14:06:38 2014 +0800 + + * adjust code format. + +commit 565fb4c5ef0128ce712f6c2121920b861912386a +Merge: c5d8317d0a c20972b579 +Author: wangyidong +Date: Fri Aug 22 05:17:32 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c5d8317d0abc2abb963018157cf666ec9ce16632 +Author: wangyidong +Date: Fri Aug 22 05:13:49 2014 +0000 + + * change upgarde lang. + +commit c20972b5796b94af274bcde1f80c3d03f676d106 +Merge: f0a4eebd10 6a1cc1464e +Author: wwccss +Date: Fri Aug 22 10:48:50 2014 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit f0a4eebd109c69bef358c77ba99f9be0918f0ebc +Author: wwccss +Date: Fri Aug 22 10:43:03 2014 +0800 + + * change the zentao lang item. + +commit 6a1cc1464e9544c5f3b76b6602b9fb32beca5b09 +Author: wangyidong +Date: Fri Aug 22 01:30:29 2014 +0000 + + * fix a bug for dao. + +commit 60d7b671216cc93305d8567f5688b21916c31835 +Author: wangyidong +Date: Fri Aug 22 01:22:00 2014 +0000 + + * add restart action. + +commit f0fab789871e8989918e3be235ab12fc30a7d2be +Merge: dffe80c44b f86236e92f +Author: chujilu +Date: Thu Aug 21 20:46:14 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit dffe80c44bb9655708c9017529bc2b7d45a91e55 +Author: chujilu +Date: Thu Aug 21 20:41:42 2014 +0800 + + * rewrite count() method + * change the config of story review + +commit f86236e92f61265cb7938b15fbe78c768050b0e3 +Author: Catouse +Date: Thu Aug 21 17:44:01 2014 +0800 + + * ajusted style of status label in data table. + +commit 4a29cd4d2a0fd2d3ae6282d259288e90ada9b80a +Merge: ffd8af5907 7b61d60845 +Author: wangyidong +Date: Thu Aug 21 09:19:51 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ffd8af59077cbcace41c28749ceeefa6bc64df3f +Author: wangyidong +Date: Thu Aug 21 09:19:02 2014 +0000 + + * add pause task when import task. + +commit b31d4c7cddbf5d065a721aad31a9a3556e033619 +Author: wangyidong +Date: Thu Aug 21 09:10:04 2014 +0000 + + * fix for pause action lang. + +commit 7b61d608459340c7098211ff793faa8265ce1f8f +Author: chujilu +Date: Thu Aug 21 13:53:19 2014 +0800 + + * finish change task #2062 #2063 + +commit e01de20bb18dc29f3b57764db80e41f21b606506 +Author: wangyidong +Date: Thu Aug 21 05:19:31 2014 +0000 + + * change for new version. + +commit 493ccc4915573cba377334b0ef9e04141dc7a7f0 +Merge: 596b131123 a8dacab1e4 +Author: chujilu +Date: Thu Aug 21 10:59:42 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 596b13112370256926d1d58dd623be61ba28be41 +Author: chujilu +Date: Thu Aug 21 10:58:57 2014 +0800 + + * finish change task #2011 + +commit a8dacab1e414c49422677076d5fe72051090160c +Merge: 1f9ad0afd9 068a33b206 +Author: wangyidong +Date: Thu Aug 21 02:58:54 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + + Conflicts: + module/build/control.php + +commit 1f9ad0afd9bac06d2ae71717a32d12d2606c7db9 +Author: wangyidong +Date: Thu Aug 21 02:54:52 2014 +0000 + + * fix a bug. + +commit 068a33b2065f5d976ee213df465aa53032f8ad38 +Merge: e49f102189 b5ed119ab6 +Author: chujilu +Date: Thu Aug 21 10:46:09 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e49f102189a5e1c5494cd62f5f9376fa9a18ec92 +Author: chujilu +Date: Thu Aug 21 10:44:56 2014 +0800 + + * finish change TASK #2051 + +commit 0a6087a146ce4fec833535f884c6c3dfb7c810c2 +Author: wangyidong +Date: Thu Aug 21 02:38:30 2014 +0000 + + * fix a bug. + +commit b0737245d52c7bb1a54434bb334ddb7bc3188119 +Author: wangyidong +Date: Thu Aug 21 02:02:32 2014 +0000 + + * config for common image size. + +commit 1e1e7848551448f2c643a2a4646d69e0ec39eb22 +Author: wangyidong +Date: Thu Aug 21 01:56:20 2014 +0000 + + * change for error notice. + +commit 5d2a6582226977c4cc182d034c336cb18bb03d98 +Author: wangyidong +Date: Thu Aug 21 01:54:42 2014 +0000 + + * fix a bug. + +commit 60595ffa0000b905760192e1b0f7476bf78d08fa +Author: wangyidong +Date: Thu Aug 21 01:43:03 2014 +0000 + + * fix a bug. + +commit b5ed119ab63c50b95d6fe368a3b3fbb816e7395b +Author: Catouse +Date: Wed Aug 20 13:38:31 2014 +0800 + + * ajusted style of status in table. + +commit d30984d42ba15e70ade08ab857cd95be908dba08 +Merge: ebbde07c34 aa2f1f4874 +Author: Catouse +Date: Wed Aug 20 11:13:07 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ebbde07c347f67fe1896abdd444dadd8b10299bd +Author: Catouse +Date: Wed Aug 20 11:12:56 2014 +0800 + + * remove transtion effection when show modal. + +commit aa2f1f4874be503b41d5dad132574f0e72112ff3 +Author: xia0ta0 +Date: Wed Aug 20 10:56:21 2014 +0800 + + * format jsRoot. + +commit 41c3ffae4fb71b5b3155eaea3a3d4666578115b8 +Merge: 86adf69f6e 337a05fa65 +Author: xia0ta0 +Date: Wed Aug 20 10:54:50 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + + Conflicts: + module/search/view/buildform.html.php + +commit 86adf69f6e59a58a52e2934ba40c41b905fc7570 +Author: xia0ta0 +Date: Wed Aug 20 10:48:02 2014 +0800 + + * fix warning: jsRoot is not defined. + +commit 337a05fa6520248c4a4658553645975abb60204d +Author: Catouse +Date: Wed Aug 20 10:47:33 2014 +0800 + + * fixed an error of function 'setModal'. + +commit 730fdfe41531ea8eef3173c1acdeb601ed0e46a7 +Merge: 989b653d11 f9e44c0075 +Author: Catouse +Date: Wed Aug 20 09:24:54 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 989b653d1142799305eaef9fb3b0793c7e6333e6 +Author: Catouse +Date: Wed Aug 20 09:24:08 2014 +0800 + + * ajusted style of forms. + +commit f9e44c00756791184bd25d1ef74258ec822f9064 +Merge: 026e6cc927 57263b444d +Author: chujilu +Date: Wed Aug 20 09:22:34 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 026e6cc927e519e60297f0ed8f9dc1bec683ad3a +Author: chujilu +Date: Wed Aug 20 09:21:19 2014 +0800 + + * add $jsRoot in search/view/buildform.html.php + +commit 57263b444d8255682e4260805dbfd8f3e09f8214 +Author: Catouse +Date: Tue Aug 19 17:35:19 2014 +0800 + + * ajusted style of history. + +commit 7032ad8681bd399ab53111944c6bb82fd624286a +Author: Catouse +Date: Tue Aug 19 17:25:04 2014 +0800 + + * ajusted style of '#titlebar'. + +commit 1de8e06eadd3aa62ecb3f5bdbc89c054bb324cdc +Author: Catouse +Date: Tue Aug 19 17:05:13 2014 +0800 + + * ajusted style of pastetext. + +commit 4ebe545ce47839b16ec3e626ce67a6e9bfa011fb +Merge: 4f85756c37 f0f23f663d +Author: wangyidong +Date: Tue Aug 19 08:43:07 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4f85756c375b9597ca29adf13532e380e0775ee2 +Author: wangyidong +Date: Tue Aug 19 08:42:32 2014 +0000 + + * finish task #2006. + +commit f0f23f663d8b486b04d6926e95d748ba08c5d859 +Merge: 1958e7c078 f49abe5e3a +Author: chujilu +Date: Tue Aug 19 16:24:30 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 1958e7c078f5b6a1488602884a9dff57c4c8f2cf +Author: chujilu +Date: Tue Aug 19 16:23:47 2014 +0800 + + * task 2062 2063 + +commit f49abe5e3a12e4d537a99f211166c18a3f36c285 +Author: Catouse +Date: Tue Aug 19 16:10:29 2014 +0800 + + - removed unused images. + +commit d51dffc3bc952ee8314eaabd95c3a3f8806082b1 +Author: Catouse +Date: Tue Aug 19 16:08:18 2014 +0800 + + - removed unused css files. + * removed missing file references. + +commit d5f73e47cc25158fa773e00cb691f7b07e01e76c +Author: Catouse +Date: Tue Aug 19 15:47:18 2014 +0800 + + - removed unused javascript plugs: alert, autocomplete, colorbox, colorize, dropmenu, jquerytools, bgiframe, incsearch, sorttable, sparkline. + +commit 1e609bbdd3430be1b4edcfbf3aebcc29f9ba176c +Author: Catouse +Date: Tue Aug 19 14:49:52 2014 +0800 + + * ajusted ui of install. + +commit bb4c86268e82804f0445230f281cba224029f8a6 +Author: Catouse +Date: Tue Aug 19 14:32:31 2014 +0800 + + * ajusted style of 'admin/index'. + +commit 360fb7057549229d454656acf8439bbd5f3fb611 +Author: Catouse +Date: Tue Aug 19 14:29:17 2014 +0800 + + * ajusted style of some alerts. + +commit 9fbf1fda82444d0d0ce62d09fabac630e9847247 +Merge: 39a798cedf b4032b5a4c +Author: Catouse +Date: Tue Aug 19 14:27:51 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 39a798cedfd1f6d102e5ad8a56652e3d695b1e82 +Author: Catouse +Date: Tue Aug 19 14:27:44 2014 +0800 + + * removed unused resources. + +commit b4032b5a4c9ee24564b292a3181e7cea5709ea9f +Merge: d75f0eb1eb b26aaa6fad +Author: wangyidong +Date: Tue Aug 19 06:17:26 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d75f0eb1eb1906837b20ae79daf7791ce877ed9e +Author: wangyidong +Date: Tue Aug 19 06:16:41 2014 +0000 + + * adjust code. + +commit 1cb49786a91ec55e110c28860a78cac64f790b64 +Author: wangyidong +Date: Tue Aug 19 06:12:52 2014 +0000 + + * finish task #1964. + +commit b26aaa6fad5763fcba7d0f3c7e70ab017c5a1f5e +Author: Catouse +Date: Tue Aug 19 14:10:56 2014 +0800 + + * ajusted style of 'about' and 'admin/index'. + +commit 2ac1d4bf4b4edf67ea5c4f13f3913335ee9a84f7 +Merge: 212b8fdd02 69f5de9169 +Author: wangyidong +Date: Tue Aug 19 03:30:33 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 212b8fdd02c115cf4bba6050b1ed26f26af3a366 +Author: wangyidong +Date: Tue Aug 19 03:29:46 2014 +0000 + + * finish task #2068. + +commit 69f5de91691c4f726fdfa42c9c633be74af7d552 +Merge: d658a6fa23 5c879bde70 +Author: Catouse +Date: Tue Aug 19 11:14:32 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5c879bde70338578a0bac6178b586716d405c626 +Merge: 22d5d53905 c91334c83c +Author: wangyidong +Date: Tue Aug 19 03:03:46 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 22d5d53905f5333c1e657ec532360f89d9282d17 +Author: wangyidong +Date: Tue Aug 19 02:50:41 2014 +0000 + + * finish task #2034. + +commit d658a6fa2339a91f0be8f4b38e2729dc3e147df9 +Author: Catouse +Date: Tue Aug 19 10:48:50 2014 +0800 + + * ajusted views. + +commit ec3c94d3dff2da35809f83e1416a9500f546973d +Author: wangyidong +Date: Tue Aug 19 02:12:09 2014 +0000 + + * finish task #2049. + +commit 4b25f0c8b1e2f06439f6328b731a225db63ea014 +Author: wangyidong +Date: Tue Aug 19 01:53:19 2014 +0000 + + * finish task #2010. + +commit 42609bd273cb8452dc698e1245635f68f0471d53 +Author: wangyidong +Date: Tue Aug 19 01:33:57 2014 +0000 + + * finish task #2056. + +commit c91334c83ccfd923ae599210cddda19dabae3b9d +Author: Catouse +Date: Mon Aug 18 18:05:27 2014 +0800 + + * ajsuted style of 'searchbox'. + +commit 603975a8ce798b0e1fa2bca03d2a495dc25daf41 +Author: Catouse +Date: Mon Aug 18 18:05:06 2014 +0800 + + * updated zui: added some js compoents. + +commit 365b46a8eaaf2d0412ec949cc666c01fe5fa1cd1 +Merge: ba84bb4abc 32584a0f0d +Author: Catouse +Date: Mon Aug 18 18:04:10 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 32584a0f0dcd8950ded2449a4483c643e39e9234 +Merge: b754f968bb b6864d97f8 +Author: chujilu +Date: Mon Aug 18 17:59:15 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit b754f968bb617326e8c1d187c2dce5d434c43289 +Author: chujilu +Date: Mon Aug 18 17:58:24 2014 +0800 + + * add count() method in dao + +commit b6864d97f81f602cc0476de057e78b9f710c0991 +Merge: de50683bc3 1981642105 +Author: wangyidong +Date: Mon Aug 18 09:03:43 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit de50683bc3e2cfc5d49c41436bb8ee0cccbdb358 +Author: wangyidong +Date: Mon Aug 18 09:02:04 2014 +0000 + + * finish task #2050. + +commit 1981642105b7761cfcd902a8ce1306b8a5dfaff1 +Author: chujilu +Date: Mon Aug 18 16:09:34 2014 +0800 + + * finish task 1993 add config of is story need review + +commit 7681375b687653bad1d0af376e140b5870c0aab5 +Merge: ddc3fd28ea 59470dc564 +Author: wangyidong +Date: Mon Aug 18 07:16:58 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ba84bb4abca70e39593c475349be614605ba7b9f +Author: Catouse +Date: Mon Aug 18 15:15:33 2014 +0800 + + * ajusted style of status label. + +commit ddc3fd28ea08272bebfe3ec309f92e82e4c7f0fe +Author: wangyidong +Date: Mon Aug 18 07:14:09 2014 +0000 + + * finish task #2003. + +commit 4f5dc2ec79abdf921712ffd22d50aef3d8176a8b +Author: Catouse +Date: Mon Aug 18 15:14:08 2014 +0800 + + * change tab behavior of kindeditor. + +commit 59470dc5643770e531c0bbd433be5fcb54d76e65 +Merge: ff8ec7a72c f5c3728f53 +Author: chujilu +Date: Fri Aug 15 17:41:31 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ff8ec7a72cf934c35aebc4912374cefcecca628b +Author: chujilu +Date: Fri Aug 15 17:40:56 2014 +0800 + + * finish task 2019 + +commit f5c3728f530b9d0749e6dcd5c71167783bf98dbe +Author: wangyidong +Date: Fri Aug 15 09:12:39 2014 +0000 + + * finish task #2016. + +commit 5d4410f71388423f32f95ae85488aee2467f7111 +Author: wangyidong +Date: Fri Aug 15 08:59:52 2014 +0000 + + * finish task #2047. + +commit 62aa572dbc508e350f55d6278ef668907c32d86a +Author: wangyidong +Date: Fri Aug 15 08:28:32 2014 +0000 + + * finish task #2206. + +commit 79c33c873cac7e2cd1bc40868e72de3d675ad047 +Merge: f3ae6c1ecc 2e344f2e0d +Author: wangyidong +Date: Fri Aug 15 08:09:48 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f3ae6c1ecc9481313ba648949db49a6a710371c3 +Author: wangyidong +Date: Fri Aug 15 08:09:22 2014 +0000 + + * finish task #1999. + +commit 2e344f2e0dc8fc64fba85ee9b29d46cb77cd2cd1 +Author: chujilu +Date: Fri Aug 15 15:59:35 2014 +0800 + + * finish 2020 + +commit 56737be238114e250f7390d4babbfdfefde967d0 +Author: chujilu +Date: Fri Aug 15 14:14:44 2014 +0800 + + * add position + +commit efc65c2a62045098b6cb0d1fee0969336233f553 +Merge: 2c7596b86b f741787fb7 +Author: wangyidong +Date: Fri Aug 15 05:50:53 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2c7596b86b5675539952aeba13c636cccf5cc4f7 +Author: wangyidong +Date: Fri Aug 15 03:05:03 2014 +0000 + + * finish task #2061. + +commit 32cdbb430a6cac27890761e592a2a4d0f1feeda9 +Author: wangyidong +Date: Fri Aug 15 02:59:50 2014 +0000 + + * finish task #2042. + +commit 7af17a2e4acdee14a2ba96882821948a56348f43 +Author: wangyidong +Date: Fri Aug 15 02:41:42 2014 +0000 + + * finish task #2048. + +commit 22689646978bac23b1e92184e89e847fa22619e9 +Author: wangyidong +Date: Fri Aug 15 01:21:40 2014 +0000 + + * finish task 2058. + +commit 9b1d38849395ddf458426a7069f4a664cd3dffc6 +Author: wangyidong +Date: Fri Aug 15 01:20:37 2014 +0000 + + * code for task #2049. + +commit f741787fb71024a752414d81cf5247ef08208b05 +Merge: 9c435c2cd4 b961d91038 +Author: chujilu +Date: Thu Aug 14 17:35:36 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9c435c2cd4686c328a38ee256c132ce7a93552e3 +Author: chujilu +Date: Thu Aug 14 17:33:07 2014 +0800 + + * task 2053. add chinese of action dynamic + +commit b961d910383dbfcb2002543c94774c4a2935d74f +Author: wangyidong +Date: Thu Aug 14 07:48:04 2014 +0000 + + * finish task #2033. + +commit 163ababa709f983b4683d87d3e96722d425734ae +Merge: 4b48e14895 16d3078300 +Author: wangyidong +Date: Thu Aug 14 06:38:37 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4b48e14895cc5d5358a01a9154a49d08656c6f5d +Author: wangyidong +Date: Thu Aug 14 06:37:51 2014 +0000 + + * finish task #2002. + +commit 16d3078300bcbb38c72b7519a8bbf3ce5c6b0161 +Author: chujilu +Date: Thu Aug 14 14:22:39 2014 +0800 + + * task 2011 + +commit 45be42a13ba5b40e7b6e81238dd08d3b93d9c041 +Author: wangyidong +Date: Thu Aug 14 06:08:48 2014 +0000 + + * finish task #1934. + +commit 0a4698989dd00421c84a41e47811bc988cefd9fd +Author: chujilu +Date: Thu Aug 14 10:47:09 2014 +0800 + + * task 2051 + +commit 6fe88f5ec2ff42aa810df0f47b193a6bb599ed32 +Author: chujilu +Date: Thu Aug 14 10:35:13 2014 +0800 + + * add testtask action in project + +commit ee735923f67511f0050e6023856d0380919ed496 +Author: chujilu +Date: Thu Aug 14 09:13:58 2014 +0800 + + * adjust code + +commit fb1d75aa3e96c590ae44cab6f0025435a02ee65c +Merge: 05081f19ba fd0f8e02f2 +Author: chujilu +Date: Wed Aug 13 21:50:59 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 05081f19baa80dc8e2ee7b70fcc9061c22392b5a +Author: chujilu +Date: Wed Aug 13 21:49:39 2014 +0800 + + * add postponed bug when task import bug + +commit fd0f8e02f28e95e098a6f66bfcfb1dc1598f1e2a +Author: wangyidong +Date: Wed Aug 13 09:03:41 2014 +0000 + + * finish task #1202. + +commit 5e9ac3f2bc09ab303f707865bb8dc523c80fc65b +Author: wangyidong +Date: Wed Aug 13 07:51:24 2014 +0000 + + * finish task #2108. + +commit ee615f13bdbaaeab69e92870504d949b819cf726 +Author: wangyidong +Date: Wed Aug 13 07:22:28 2014 +0000 + + * finish task #1202. + +commit 717476cde18e002f1713d4c36532f4f768891213 +Merge: 8501046c11 9ccf0237c9 +Author: wangyidong +Date: Wed Aug 13 06:49:58 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8501046c1185b6c324c189e24b19a037a8e42aa7 +Author: wangyidong +Date: Wed Aug 13 05:58:51 2014 +0000 + + * finish task #1185. + +commit 9ccf0237c950663905f14a404d4d5538723f1f07 +Author: chujilu +Date: Wed Aug 13 10:53:17 2014 +0800 + + * trim field when email setting save, + * add project when no task at story view. + +commit f532e79b9f8633e09b1f0febb8863574b7f70132 +Author: wangyidong +Date: Wed Aug 13 01:16:27 2014 +0000 + + * htmlspecialchars the field of kindeditor when edit. + +commit f4121083fbf94985c54144f3292c0e7f04a42b25 +Author: wangyidong +Date: Tue Aug 12 09:27:23 2014 +0000 + + * fix bug. + +commit 165f5e86a5901bdf3ecfed0c87340661a4633c38 +Merge: 01023e5fb2 f56e7c0b14 +Author: wangyidong +Date: Tue Aug 12 08:38:48 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f56e7c0b14468d1b31db6b440d72666e0bb64da3 +Author: chujilu +Date: Tue Aug 12 16:16:26 2014 +0800 + + * adjust code + +commit 01023e5fb256028bb39999665b9a60e6f9a3c1c6 +Author: wangyidong +Date: Tue Aug 12 08:14:52 2014 +0000 + + * finish task #1793. + +commit 46f988449570ab893af35cda8bae3353efbc98b2 +Author: chujilu +Date: Tue Aug 12 15:49:32 2014 +0800 + + * adjust code + +commit e4efa79e5729c005449889d6d6a1299b4f9dba64 +Author: chujilu +Date: Tue Aug 12 11:30:43 2014 +0800 + + * show story spec in task view + +commit e596a80929ae48156b758807ff86da6ba7bf5346 +Author: chujilu +Date: Tue Aug 12 10:34:02 2014 +0800 + + * fix bug: can't edit module name + +commit 82dcc713c43ee7bef5fc3641675f888ad3c13b6a +Author: wangyidong +Date: Tue Aug 12 01:18:06 2014 +0000 + + * fix a bug. + +commit 6bfc393dcc85360708144afa987ba4c70ffd8563 +Author: wangyidong +Date: Wed Aug 6 07:51:44 2014 +0000 + + * change style. + +commit d2063542f38bd05d544c1dfb19ba2ee5a21d41dd (tag: zentaopms_6.1.stable_20140806) +Author: wangyidong +Date: Tue Aug 5 09:32:37 2014 +0000 + + + add changeLog. + +commit 8afa5e869ed60bc192990b15312830867c5b73ae +Author: wangyidong +Date: Tue Aug 5 08:42:15 2014 +0000 + + * add user priv. + +commit 85dffb477357a0ddab4bacd14d3eb3950e504676 (tag: zentaopms_6.1.stable_20140805) +Author: wangyidong +Date: Tue Aug 5 08:27:21 2014 +0000 + + * change version and priv. + +commit d3bae677269a33408af761580f7433a46f2a3472 +Merge: ed62b105af a9d3a794cd +Author: wangyidong +Date: Tue Aug 5 05:09:08 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a9d3a794cd4ea3216342b76950daa8d5a7559334 +Author: Catouse +Date: Tue Aug 5 11:34:49 2014 +0800 + + * updated zui. + +commit 4d7025e63a8e419f5dc30ae25418f5fc47da863c +Author: Catouse +Date: Tue Aug 5 11:34:30 2014 +0800 + + * removed fontawesome resources. + +commit ed62b105afacea027a9b53951895f2da5e60b2f5 +Author: wangyidong +Date: Tue Aug 5 03:11:58 2014 +0000 + + * fix page. + +commit 0c7e8a1ba900a0e6bbba5382fabf0bc64ef06ce7 +Author: wangyidong +Date: Tue Aug 5 02:44:05 2014 +0000 + + * fix a bug. + +commit 3230f9fca7e0b3daec7f1978c7e17574f3e7f149 +Author: wangyidong +Date: Tue Aug 5 02:26:12 2014 +0000 + + * fix a bug for parse csv. + +commit 7a0fe98744b90a517365524242245a33a2476207 +Merge: c8a1e58aae 327f29689a +Author: wangyidong +Date: Tue Aug 5 02:14:07 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c8a1e58aaed7234be7f66454f0c8398ba78c8c2e +Author: wangyidong +Date: Tue Aug 5 02:13:41 2014 +0000 + + * adjust lang for no fsocket. + +commit 106b29497d171c40c5df3d8b4a29dfecf6794d10 +Author: wangyidong +Date: Tue Aug 5 01:57:18 2014 +0000 + + * add placeholder for pastetext. + +commit 327f29689aa994f9b5976ee033913833395bef36 +Author: Catouse +Date: Tue Aug 5 09:56:21 2014 +0800 + + * added tablesorter to 'project/index'. + +commit c2e1e06c95d058646b7ae1d19b10719cfd0b36f4 +Author: wangyidong +Date: Tue Aug 5 01:35:35 2014 +0000 + + * adjust result. + +commit 0759a26aaf495fccbef13d73dae447499f970104 +Author: wangyidong +Date: Tue Aug 5 01:22:28 2014 +0000 + + * adjust lang. + +commit 328cb429a85002859982d7049a0de25bfa376af3 +Merge: c1b2fcbca9 fc6d307330 +Author: wangyidong +Date: Tue Aug 5 01:20:56 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c1b2fcbca9c5ba4f51fd0f9d0af57cee6a63ff9b +Author: wangyidong +Date: Tue Aug 5 01:08:52 2014 +0000 + + * change link to tab. + +commit fc6d307330531c310be723994d2f7f11b9d28df2 +Author: Catouse +Date: Mon Aug 4 17:27:31 2014 +0800 + + * fixed function 'setModal' in my.js. + +commit df6fc83c2e45eaa51c98b213eebd73dbd8e8b251 +Author: Catouse +Date: Mon Aug 4 17:12:28 2014 +0800 + + * ajusted style of module extension and upgrade. + +commit 2d8958edb08aefcd5ef17a18220135a96494480e +Author: Catouse +Date: Mon Aug 4 16:22:24 2014 +0800 + + * fixed style of bug/edit for ie8. + +commit 54b2f572a4cb92213691754c8486c18dde981692 +Author: Catouse +Date: Mon Aug 4 15:57:50 2014 +0800 + + * rollback testtask/view. + +commit 495dfc0ba9bbbeb2b858fdbef10f91d05adaa8c6 +Author: Catouse +Date: Mon Aug 4 15:52:27 2014 +0800 + + * fixed errors of function 'setModal' in my.js for ie8. + +commit 5726a0789d9b342bbbe180aaf048fca7191a94af +Author: Catouse +Date: Mon Aug 4 14:50:23 2014 +0800 + + * ajusted style of 'testtask/view'. + +commit 161a56a6f4e14e940f42a192a7ac285c2c77fe22 +Author: wangyidong +Date: Mon Aug 4 06:26:24 2014 +0000 + + * add new version. + +commit 94c6fc423b6520e8e603c5f53c2c5bed8721e607 +Author: wangyidong +Date: Mon Aug 4 05:46:33 2014 +0000 + + * adjust action label. + +commit 07c7280a2d70b7da0c3dcd3e912aacc8d8114fae +Author: wangyidong +Date: Mon Aug 4 05:43:09 2014 +0000 + + * fix a bug. + +commit 43d74e14e9d3a3e03c5823e315139550d0763542 +Author: wangyidong +Date: Mon Aug 4 03:34:26 2014 +0000 + + * finish task #2500. + +commit 6fcdc3bdfcae0b6acb6924d0a2b1bebb9ca5e520 +Merge: 408f5588ab 5ca9b73f12 +Author: wangyidong +Date: Mon Aug 4 01:39:46 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 408f5588ab472e4f0dcf9b22ee7abc4d8d3ddab2 +Author: wangyidong +Date: Mon Aug 4 01:38:14 2014 +0000 + + * adjust code for task #1967. + +commit 5ca9b73f12eb37ee4265159e6517c1b1fc222bd3 +Author: Catouse +Date: Mon Aug 4 08:48:04 2014 +0800 + + * make center of dialog in upgrade views. + +commit 8778ea7089fa7aa829ddbeaba1c0eaee6f139d36 +Author: Catouse +Date: Mon Aug 4 08:44:01 2014 +0800 + + * ajusted views. + * enhance function 'ajustModalPosition' in my.js. + * ajusted style of table caption. + +commit 93be4ffaae03bc7c68202ed055b21e790bcde36b +Author: Catouse +Date: Mon Aug 4 08:42:49 2014 +0800 + + * ajusted views of extention. + +commit afeaa9de37cde240640cbf67c1c6d4cedb56104d +Author: Catouse +Date: Thu Jul 31 14:27:43 2014 +0800 + + * ajusted ui of testtask/view. + +commit bcff1260e13b1a5cbc3acc368315e42a116bdf1a +Author: Catouse +Date: Thu Jul 31 10:37:18 2014 +0800 + + * ajusted style of testtask/results. + +commit 6ea49bf6a409ab4d5f676fcb9aac0130ec5c6c72 +Author: Catouse +Date: Thu Jul 31 08:29:01 2014 +0800 + + * ajusted style. + * updated zui. + +commit 678e0cbae35ebcc325d9754f0b4ade703c84cffb +Author: Catouse +Date: Thu Jul 31 08:27:26 2014 +0800 + + * ajusted ui of testcase/results. + +commit 2762a4a7fb5c44f4b09e2b5a3361ac06b224bc93 +Author: Catouse +Date: Wed Jul 30 15:46:28 2014 +0800 + + * updated tablesorter. now save sort settings with localstorage and cookie fallback. + +commit 0374e5ba53b03893bdb4db5ab2a5b9613eb4cba9 +Author: Catouse +Date: Wed Jul 30 14:09:25 2014 +0800 + + * ajusted style of task/view. + +commit 55ac84d48fce5510f19f2de0ebdaa6c60c6d9c3e +Author: Catouse +Date: Tue Jul 29 17:14:16 2014 +0800 + + * fixed style of build/view. + +commit c2c886b3eaa3d721e962ac9ddfd20abce4488a92 +Author: Catouse +Date: Tue Jul 29 17:13:53 2014 +0800 + + * update themes. + +commit ea972df479778deb43ea91613088658f5bbb67e2 +Author: wangyidong +Date: Tue Jul 29 09:02:11 2014 +0000 + + * finish task #1965. + +commit 2a4ec1f5998f04eb38548199040e8f43ebe27575 +Author: Catouse +Date: Tue Jul 29 16:38:25 2014 +0800 + + * updated zui. + +commit 1f01ff6426f64ca9bf3493ee91f7cb512761f5e0 +Merge: 76a96884d9 debff2f0c8 +Author: Catouse +Date: Tue Jul 29 16:34:16 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 76a96884d940eb47280433febd96e1cda3de00b1 +Author: Catouse +Date: Tue Jul 29 16:33:48 2014 +0800 + + * ajusted code. + +commit 96fd437a8e0c35e8230f094ca46469b14ed1294a +Author: Catouse +Date: Tue Jul 29 16:33:31 2014 +0800 + + * remove animations from action box. + +commit e3c788cb61e214c15559415307032c183f4d66c9 +Author: Catouse +Date: Tue Jul 29 16:33:12 2014 +0800 + + * updated zui, include themes. + +commit debff2f0c8d10dcea4d5ea5104532b1c61f48878 +Author: wangyidong +Date: Tue Jul 29 08:15:34 2014 +0000 + + * fix bug #603. + +commit 535a8783201a2f9d246563d02dab787154e69937 +Author: wangyidong +Date: Tue Jul 29 07:48:55 2014 +0000 + + * fix bug #605. + +commit 274ea6e4ec7ed64c7ddfa7f8c87fd4507217e27d +Author: wangyidong +Date: Tue Jul 29 07:17:16 2014 +0000 + + * fix bug #607 for add table-fixed. + +commit dd5dbea1bdda83599d77e1b6553d3bbc7833d359 +Author: wangyidong +Date: Tue Jul 29 07:10:53 2014 +0000 + + * fix bug #613. + +commit 311776167467c5b55f32ecf84d360b5a935d0995 +Author: wangyidong +Date: Tue Jul 29 06:22:04 2014 +0000 + + * fix bug #612. + +commit 420765690535b2e01b99e33f2b33e404b8abb2d4 +Author: wangyidong +Date: Tue Jul 29 05:54:43 2014 +0000 + + * fix bug #614. + +commit 976343a086712dd8eda65aa9ba0c0bc2e51ec9a5 +Author: wangyidong +Date: Tue Jul 29 02:38:15 2014 +0000 + + * fix bug #615. + +commit b04b23464cd5c80b34758945998341ed4625cfa4 +Author: wangyidong +Date: Tue Jul 29 02:31:38 2014 +0000 + + * fix a bug #616. + +commit bb0787f200650037aa531f8133c312af486e0873 +Author: wangyidong +Date: Tue Jul 29 02:08:17 2014 +0000 + + * fix bug #553. + +commit f249c8674d056d22815a9324599156bc6038f905 +Author: wangyidong +Date: Tue Jul 29 01:47:42 2014 +0000 + + * finish task #1950. + +commit 4ae0876ba3ddf22c082edd251c8dff54daa4df38 +Author: wangyidong +Date: Tue Jul 29 01:09:28 2014 +0000 + + * finish task #1967. + +commit 5696caf06f6f856c89b1df29eb4eaec8fe0bd394 +Author: wangyidong +Date: Mon Jul 28 07:56:52 2014 +0000 + + * finish task #1976. + +commit 5cb4f543a249753914b49ffad0e4184969e528b7 +Author: wangyidong +Date: Mon Jul 28 07:35:11 2014 +0000 + + * finish task #1957. + +commit 95d547bce1bf42fb5db1ba6d3300b2e1d6d21252 +Author: wangyidong +Date: Mon Jul 28 07:14:24 2014 +0000 + + * finish task #1956. + +commit 09ce96d2b05a224ebbdc19ebf25f651f8c02d5ca +Author: wangyidong +Date: Mon Jul 28 03:33:26 2014 +0000 + + * finish task #1954. + +commit 229d23bf0fc76ea73b1114bf99a08c1064f6f35e +Author: wangyidong +Date: Mon Jul 28 02:19:10 2014 +0000 + + * finish task #1962. + +commit 4a27551271193b87bc974061df3b6f89e10c65a5 +Author: wangyidong +Date: Mon Jul 28 02:11:45 2014 +0000 + + * finish task #1373. + +commit 6410641bbbf63cc8977183ca5e6dbf03b32c0251 +Author: wangyidong +Date: Mon Jul 28 02:07:41 2014 +0000 + + * finish task #1970. + +commit 6989db296353926c1a8a0c90278dd9b9b1990d53 +Author: wangyidong +Date: Mon Jul 28 02:05:40 2014 +0000 + + * finish task #1980. + +commit fd05b8d6670372e58400948c4b4cab5da5a3a052 +Author: wangyidong +Date: Mon Jul 28 01:37:34 2014 +0000 + + * finish task #1977. + +commit f92104dd17f255c85649e0d2784dc5154b35fdac +Author: wangyidong +Date: Fri Jul 25 09:05:47 2014 +0000 + + * finish task #1975. + +commit 4a10fcfe9d21991ed5e3e861c082d541f1b6d3e8 +Author: wangyidong +Date: Fri Jul 25 08:37:45 2014 +0000 + + * finish task #1958. + +commit c49bc171fc7a8a39f97781e40f31752ab5806999 +Author: wangyidong +Date: Fri Jul 25 05:53:25 2014 +0000 + + * finish task #1393. + +commit e6797bdddef3b2edbf3d6547295c01a021fb9ebe +Author: wangyidong +Date: Fri Jul 25 02:44:47 2014 +0000 + + * finish task #1945. + +commit 60410b81850e13d11419af1a0b5600e92ee1f7de +Author: Catouse +Date: Fri Jul 25 10:03:52 2014 +0800 + + * fixed errors of function 'setModal' in my.full.js. + +commit f062b3cb61c0b80e9c57e179f826133b70a4e4fb +Author: wangyidong +Date: Fri Jul 25 01:31:50 2014 +0000 + + * adjust ajax modal. + +commit 0418dbe71c2781cdf1f82556e406223d00ff00ae +Author: wangyidong +Date: Thu Jul 24 09:17:13 2014 +0000 + + * finish task #1953. + +commit 0c610eb33f0a3193f394681ea144a2fbf86a2dc2 +Author: wangyidong +Date: Thu Jul 24 01:54:48 2014 +0000 + + * code for task #1971. + +commit e1d1c354fbb306ad62aeb2fa86e731015e490ad0 +Author: wangyidong +Date: Wed Jul 23 09:36:03 2014 +0000 + + * finish task #1971,1961. + +commit c79840dfa989c20640518717d7dda2740e7bcb9e +Author: wangyidong +Date: Wed Jul 23 01:55:32 2014 +0000 + + * code task #1971,1961. + +commit 080ea27752a9bca1899d5490ea2d4782148b93ed +Author: wangyidong +Date: Tue Jul 22 09:10:00 2014 +0000 + + * code for task #1971,1961. + +commit d81b64dafd7b5fd1b73d2bba146c0702b8f8db11 +Author: wangyidong +Date: Tue Jul 22 08:11:04 2014 +0000 + + * code for task #1971 #1961. + +commit a26d198e23072a39cecde91122f1397a318a69fc +Author: wangyidong +Date: Tue Jul 22 05:59:56 2014 +0000 + + * code for task #1971 + * finish task #1947. + *finish task #1946. + +commit 8a789b9fa209f55ff8138dbbe16739779712dc62 +Author: wangyidong +Date: Tue Jul 22 01:05:04 2014 +0000 + + * code for task #1978. + +commit b0dc35223ee0d336347276298f88e0ebfc095bd4 +Author: wangyidong +Date: Mon Jul 21 08:46:02 2014 +0000 + + * finish task #1978. + +commit e408a3bc2d283434c0ad04c4fa7803d6a6c40e25 +Author: wangyidong +Date: Mon Jul 21 06:15:42 2014 +0000 + + * finish task #1939. + +commit 2bd50ee02f486830cca3a4720155d085a58e87a0 +Author: wangyidong +Date: Mon Jul 21 03:21:09 2014 +0000 + + * code for task #1939. + +commit 60925388fd0269b09a6117c9a2378bd6f405c8ef +Author: wangyidong +Date: Fri Jul 18 08:16:56 2014 +0000 + + * finish task #1942. + +commit 9d2914825066d42cd7d8c7e855558df2b38f9766 +Author: wangyidong +Date: Fri Jul 18 06:45:07 2014 +0000 + + * finish task #1941. + +commit edc2ea74d75c264bf29439323d26e0264023d54b +Author: wangyidong +Date: Fri Jul 18 06:15:50 2014 +0000 + + * finish task #1952. + +commit 043ecf66d42d959038bcd7ce3aa098b2408da1a5 +Author: wangyidong +Date: Fri Jul 18 03:21:02 2014 +0000 + + * finish task #1936. + +commit 76d0463623ca7b11c8f27f52d5ec78cd0c5c892f +Author: Catouse +Date: Mon Jul 14 10:41:55 2014 +0800 + + * set startDate of datetimepicker. + +commit b11c6c1db5bb792fdf41794d6e45c5d7efa6b1cc +Author: Catouse +Date: Mon Jul 14 10:23:41 2014 +0800 + + * set empty value when daterpicker meet textbox value '0000-00-00'. + +commit 5dfcdd1661555cdec2388202648e539d956b0750 +Author: xia0ta0 +Date: Thu Jul 10 15:34:58 2014 +0800 + + - remove passwordMD5 of user. + +commit 7f2a4fa67c7212d44c00dae51faebd184faaeecb +Author: wangyidong +Date: Fri Jul 4 00:42:42 2014 +0000 + + * fix a bug for sql. + +commit cdb48c9e5f0e3250fa896873916679da41c91e88 +Merge: 187970bded f2725ee27d +Author: wangyidong +Date: Fri Jul 4 00:17:55 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 187970bdedff71ea855c6c18409ceb62bda23779 +Author: wangyidong +Date: Fri Jul 4 00:17:23 2014 +0000 + + * fix for database. + +commit f2725ee27d9a9bf499ea3f04dcf26eafcca7992d +Author: wwccss +Date: Wed Jul 2 13:59:42 2014 +0800 + + * rename loader-wizard.php to ioncube.php. + +commit af24001dbf1bc0ded8da393b030f912d12acfd6e +Author: wwccss +Date: Wed Jul 2 13:58:08 2014 +0800 + + * add the guest user check logic. + +commit 63004a95e4a2ea61d133cc0007920d93dc564b05 +Author: wwccss +Date: Wed Jul 2 13:57:56 2014 +0800 + + * adjust code. + +commit d1c99218c750540ce7b28fe6ebbd10909222d36b +Author: wangyidong +Date: Mon Jun 30 01:04:31 2014 +0000 + + * add the class of red for set color red. + +commit c3b6839e0b066edce306396c63e17c0771639888 +Author: wangyidong +Date: Fri Jun 27 06:01:30 2014 +0000 + + * fix a bug. + +commit aaeffac03f8f6cb6149f8738dc6f0a8bc3b9b53a +Merge: fb329c9502 4610b92469 +Author: wangyidong +Date: Fri Jun 27 03:40:00 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fb329c950207d3684d5368453fbcf8f761a81df2 +Author: wangyidong +Date: Fri Jun 27 03:37:49 2014 +0000 + + * change for show file notice. + +commit 4610b92469fb91c0831f4250d0d080cd88cdc92a +Author: xia0ta0 +Date: Fri Jun 27 10:49:41 2014 +0800 + + * correct wrong word: build. + +commit 980408edfaaba565da0d8da19b86dd0f25a0b231 (tag: zentaopms_6.0.stable_20140625) +Author: wangyidong +Date: Thu Jun 26 05:13:55 2014 +0000 + + * fix a bug. + +commit 26292c175ad3648e53fe1581be6f6feac4c90c9c +Author: Catouse +Date: Wed Jun 25 13:40:53 2014 +0800 + + * extended jquery object to compatible with older extensions. + +commit c3dac010d7e9030da5a9765eba04b3b701deed0a +Merge: 60bcd3bdef edfafc1047 +Author: xia0ta0 +Date: Wed Jun 25 11:38:38 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 60bcd3bdefa917ffc20a64f05e7f0ec91687ad53 +Author: xia0ta0 +Date: Wed Jun 25 11:37:06 2014 +0800 + + * adjust local image upload to tab1. + +commit edfafc1047e478d3f294568cb628d63c7426d901 +Author: wangyidong +Date: Wed Jun 25 03:25:59 2014 +0000 + + * fix bugs for side cookie. + +commit e7eca025e58eeb60f870fc35cca571ae1dc4ee08 +Merge: 3c04fb1ef6 28e409542e +Author: wangyidong +Date: Wed Jun 25 02:57:25 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3c04fb1ef6b647c699b6964c14ec066865e3e04d +Author: wangyidong +Date: Wed Jun 25 02:56:48 2014 +0000 + + * fix a bug for managecontact. + +commit 28e409542e08b4466d5e0badd5f170b5f221adf2 +Author: Catouse +Date: Wed Jun 25 10:44:02 2014 +0800 + + * added space arround arrow. + +commit c15d972be440797ee5a752b71c8c5b873c839dee +Author: wangyidong +Date: Wed Jun 25 02:18:40 2014 +0000 + + * adjust lang. + +commit 8f21f260c552940f6dfe7e7a8df86cb3c2a63e8b +Author: wangyidong +Date: Wed Jun 25 02:17:06 2014 +0000 + + * add my.min.js. + +commit 802fe2b28f420f3d04363267e313e4840a83f934 +Author: Catouse +Date: Wed Jun 25 09:58:28 2014 +0800 + + * call setTreeBox before document load completely. + +commit 7c50411c6441fbec66ee6ae891cb1879cfdb3090 +Author: Catouse +Date: Wed Jun 25 09:07:32 2014 +0800 + + * changed icon button color. + +commit 2917c23ffc976041777181ec8fda7d94267eade9 +Merge: 6572e1c2d3 428c4be874 +Author: xia0ta0 +Date: Wed Jun 25 09:01:23 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6572e1c2d34784a86fd8bcf8778159f863d924d8 +Author: xia0ta0 +Date: Wed Jun 25 09:00:43 2014 +0800 + + - remove the danger color. + +commit 428c4be874922497042ac4aa92e934efbaf40f12 +Author: wangyidong +Date: Tue Jun 24 09:24:41 2014 +0000 + + * adjust sql. + +commit 6f535764b6185012a65c5f4597909fb580b65b01 +Merge: 506eafdc13 6525e86598 +Author: wangyidong +Date: Tue Jun 24 09:13:24 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 506eafdc13438b17e80da430b34f70b20dcd512b +Author: wangyidong +Date: Tue Jun 24 09:12:59 2014 +0000 + + * change to strtolower. + +commit 6525e86598da3ae1a9b77bc3a169ded770232f16 +Author: xia0ta0 +Date: Tue Jun 24 16:14:33 2014 +0800 + + * fix error of check.php. + +commit 4f15887eb13c4f2e7c7f8cf5e8717e5d9f562ed7 +Author: xia0ta0 +Date: Tue Jun 24 15:33:20 2014 +0800 + + * adjust zh-tw. + +commit f62491ccffbd638a9452d361e478696fb47bb2c9 +Merge: daaaade2d4 e4c632c508 +Author: xia0ta0 +Date: Tue Jun 24 14:44:22 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit daaaade2d40f448c4c9105930c192a0ef9daad53 +Author: xia0ta0 +Date: Tue Jun 24 14:40:56 2014 +0800 + + + add changelog of version6.0.statble. + +commit 6c57a180fb6ee635b0e294468fe2544873e71893 +Author: xia0ta0 +Date: Tue Jun 24 10:50:07 2014 +0800 + + * adjust style. + +commit e4c632c5089e99e74b9f2d6fe5017688d5def2c9 +Author: Catouse +Date: Tue Jun 24 10:39:36 2014 +0800 + + * updated themes. + +commit 920150e53cad5521f8619f20870c0edee55621ca +Author: Catouse +Date: Tue Jun 24 10:33:11 2014 +0800 + + * fixed a syntax error in my.js. + +commit 4b512d72f52ae7279e4bccc5ae7b0eb897c8cf7d +Author: Catouse +Date: Tue Jun 24 10:30:03 2014 +0800 + + * rebind modal trigger event when content changed by ajax. + +commit df38ee6e38f13f6bc50634e5d6dfcd5c7a227acf +Author: Catouse +Date: Tue Jun 24 10:19:40 2014 +0800 + + * updated themes. + * added new theme 'blackberry'. + * ajusted style of user/login. + * added colorbox method in my.js to compatible with older extensions. + +commit e4ce0bfd721f7d734529aaf324f907b4256a2b38 +Author: xia0ta0 +Date: Tue Jun 24 10:16:05 2014 +0800 + + * add fixed style. + +commit fbed456baa6d753a6f80b5a9ec56a8bd43d75be7 +Author: xia0ta0 +Date: Tue Jun 24 10:07:47 2014 +0800 + + * change type of hours from tinyint to float. + +commit 6d9c9061c06c496e59d1be54be19f62508bf3cb5 +Author: xia0ta0 +Date: Tue Jun 24 09:56:41 2014 +0800 + + * format. + +commit d6cb7e64baea508a161ce3d3b774a574660bc5a2 +Author: xia0ta0 +Date: Tue Jun 24 09:53:45 2014 +0800 + + * fix bug#600. + +commit 1df7ace94f6107134e8888fad8178b0c17256658 +Author: xia0ta0 +Date: Tue Jun 24 09:38:04 2014 +0800 + + * change version to 6.0 + +commit d9b1e3183e0ddf6175be52e8fdc61d0ac2aa9c43 +Author: xia0ta0 +Date: Mon Jun 23 15:27:52 2014 +0800 + + + add updateVersion 6.0.beta1. + +commit 23ac86e209790cf12d413d069c2514d1aebfdd54 +Author: xia0ta0 +Date: Mon Jun 23 14:36:25 2014 +0800 + + * code for task#1899. + +commit c5f387b238017280d9f0a71f9e68fce7518f06a9 +Merge: b62a302b84 fb180107b8 +Author: xia0ta0 +Date: Mon Jun 23 14:08:07 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b62a302b84c336460bb4c94e526be19912cdd18b +Author: xia0ta0 +Date: Mon Jun 23 14:07:32 2014 +0800 + + * code for task#1903. + +commit ce20e88eb8f226687c4c0766ed29a7a4f25b4822 +Author: wangyidong +Date: Mon Jun 23 06:01:40 2014 +0000 + + * fix a bug. + +commit fb180107b81635f673ca89bf7cc7abe46681a1a2 +Author: Catouse +Date: Mon Jun 23 11:00:45 2014 +0800 + + * fixed an error in doc/browse.js. + +commit f30cfb9a70a5cb4482a618a78a3a986435a18bc0 +Author: xia0ta0 +Date: Mon Jun 23 10:17:57 2014 +0800 + + * add fixed style to my module. + +commit bd2feb579a42a0a022633d485d95179288c4e182 +Author: xia0ta0 +Date: Mon Jun 23 10:14:11 2014 +0800 + + * code for task#1902. + +commit b55044252f90665e041dbb4f136b9d61a4d3c9ba +Author: xia0ta0 +Date: Mon Jun 23 10:10:49 2014 +0800 + + * code for task#1906, fix QQMail. + +commit 3e5bb891024167de9031e0aa44c45938c76693dd +Merge: fd09d90ee2 def3baca15 +Author: wangyidong +Date: Mon Jun 23 01:21:22 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fd09d90ee229f5076f2122190e2b058d51c0477f +Author: wangyidong +Date: Mon Jun 23 01:20:49 2014 +0000 + + * fix a bug. + +commit def3baca157c4ed4f42fc095b7265de30428d9b3 +Author: xia0ta0 +Date: Fri Jun 20 14:24:32 2014 +0800 + + * code for task#1915. + +commit eee2645fdb55e4e280bf5d3a2dac76f616e849c4 +Author: wangyidong +Date: Fri Jun 20 02:18:08 2014 +0000 + + * finish task #1893. + +commit d358657499be07d1b58cc21ffda7ce59893e9e03 +Merge: 78534a9e00 e28cfa8efc +Author: xia0ta0 +Date: Fri Jun 20 10:04:47 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 78534a9e00bf7a0c55d4b564df75c148a535eae0 +Author: xia0ta0 +Date: Fri Jun 20 10:02:09 2014 +0800 + + * code for task#1892. + +commit a410db00cad5424f50599af53174e97a261583d6 +Author: xia0ta0 +Date: Fri Jun 20 09:18:07 2014 +0800 + + * code for task#1873. + +commit e28cfa8efc24af872597ec2ffc9f095f978103eb +Merge: b1c8b7953a fa9fe66c6e +Author: wangyidong +Date: Thu Jun 19 06:26:59 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b1c8b7953a9ec7939065bc4e3e7ad75ae15fde25 +Author: wangyidong +Date: Thu Jun 19 06:26:31 2014 +0000 + + * finish task #1904. + +commit 3237bbba18c4df953c7636800a0c0ec04deacdca +Author: wangyidong +Date: Thu Jun 19 06:26:06 2014 +0000 + + * finish task #1905. + +commit fa9fe66c6eebd89307fdb6e4bcdccb706a833b1f +Author: Catouse +Date: Thu Jun 19 08:26:50 2014 +0800 + + * fixed style of article content by update zui. + +commit 44ca8ae7084f6aeddbeea398a02e97cdff83f525 +Merge: d4fd617924 193ac6b956 +Author: wangyidong +Date: Thu Jun 19 02:29:25 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d4fd617924c6b4f35479cc30ac3febe5984ac31b +Author: wangyidong +Date: Thu Jun 19 02:28:53 2014 +0000 + + * finish task #1901. + +commit 193ac6b956129d42852d1b33463ef2d26f9ea58c +Author: Catouse +Date: Wed Jun 18 20:08:30 2014 +0800 + + * removed test data. + +commit 02854685b14c219e732d03d9e938a139119066ad +Author: Catouse +Date: Wed Jun 18 19:01:19 2014 +0800 + + * changed sparkline to chartjs. + * ajusted style of progressbar. + +commit 97bd6b4a0adfc88fb74cea02154565a1cc61e369 +Merge: c7f978a69a af1628ebc3 +Author: wangyidong +Date: Wed Jun 18 09:21:15 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c7f978a69a34d63a048eeb16409a71c6803024d1 +Author: wangyidong +Date: Wed Jun 18 09:20:55 2014 +0000 + + * fix a bug. + +commit af1628ebc39329094ef6bedcde60793fc10eb608 +Merge: 4b79bfcd2c 83710606cc +Author: xia0ta0 +Date: Wed Jun 18 16:34:17 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4b79bfcd2cef9c2d4b1dd0b372f5679fde11e49a +Author: xia0ta0 +Date: Wed Jun 18 16:33:45 2014 +0800 + + * code for task#1886. + +commit 83710606cc9040fe769f5c4eeea4472319b6a3c1 +Merge: 7d67d5da39 59027f67bd +Author: wangyidong +Date: Wed Jun 18 08:31:39 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + + Conflicts: + module/task/view/create.html.php + +commit 7d67d5da39ab3ac4f7026e1401e0e03b4fc135e6 +Author: wangyidong +Date: Wed Jun 18 08:13:54 2014 +0000 + + * finish task #1897. + +commit 59027f67bd9c5ac244f8a0c8134f30628617ec81 +Merge: 78ea03f55c d8e24edd3c +Author: xia0ta0 +Date: Wed Jun 18 15:43:42 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 78ea03f55ca07e7d4be5492b5cd96ca8ae479aa4 +Author: xia0ta0 +Date: Wed Jun 18 15:40:15 2014 +0800 + + * code for task #1894. + +commit d8e24edd3c3a729863b87075d7f3fe7c377354ef +Merge: 1a0837a9a0 80d47537f3 +Author: wangyidong +Date: Wed Jun 18 06:54:15 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1a0837a9a0f401d4835882a34287ffc59f1f86ec +Author: wangyidong +Date: Wed Jun 18 06:53:46 2014 +0000 + + * finish task #1881. + +commit 80d47537f3a6feec7e1806e09136e6e213e32cb7 +Author: xia0ta0 +Date: Wed Jun 18 14:09:56 2014 +0800 + + - code for task#1915: remove custom fields of bugs. + +commit f38a2dee54703981c609c22a888734dd7cd34669 +Merge: 2bc26e6bf5 5030a42ad7 +Author: xia0ta0 +Date: Wed Jun 18 13:36:35 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2bc26e6bf5468a66f16cdca859e94df0fbfd5a3c +Author: xia0ta0 +Date: Wed Jun 18 13:36:12 2014 +0800 + + * code for task#1896. + +commit 5030a42ad75fc34e6d15ca295dec6db5f0e67d99 +Merge: d1431b9ddb bb51c37bfe +Author: wangyidong +Date: Wed Jun 18 03:23:52 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d1431b9ddb55045c2f6bcefee6e9dde407cdae93 +Author: wangyidong +Date: Wed Jun 18 03:22:13 2014 +0000 + + * finish task #1876. + +commit bb51c37bfe710fa938f36d1b01c51851cf6579ce +Author: Catouse +Date: Wed Jun 18 11:17:32 2014 +0800 + + * changed icon of create task action. + * fixed style of story for ie8. + * updated zui. + +commit daf87b209f001237bef1e55fe98fdcf1069717a2 +Author: Catouse +Date: Wed Jun 18 11:16:25 2014 +0800 + + * fixed ui of file form. + +commit 697e1b5967744faa2e7c4f5687b70ce85d0824ca +Merge: 578c4620c4 ff1f4191a5 +Author: xia0ta0 +Date: Wed Jun 18 11:13:21 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 578c4620c448cb3504fc8e3abfb2c6ade9bd267f +Author: xia0ta0 +Date: Wed Jun 18 11:12:48 2014 +0800 + + * code for task#1916. + +commit ff1f4191a540fed0cd249e521bdd8484a34d313c +Merge: af5f8653ab fca6253f87 +Author: wangyidong +Date: Wed Jun 18 03:03:47 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit af5f8653abadf9405839be52bc41436ecd2e326b +Author: wangyidong +Date: Wed Jun 18 02:53:33 2014 +0000 + + * finish task #1874. + +commit fca6253f8709c963061b2d2ad6c0fa6e72ed1e44 +Author: xia0ta0 +Date: Wed Jun 18 10:02:16 2014 +0800 + + * fix bug: cannot get mulitiple git logs. + +commit 0337b3337f4e2c4e825b45e609f6024be182ba74 +Author: xia0ta0 +Date: Wed Jun 18 09:37:01 2014 +0800 + + * code for task#1894. + +commit 9b7eb2f9c4bea2b1e759106bc0a4f80e2b7d3d76 +Author: xia0ta0 +Date: Tue Jun 17 17:19:15 2014 +0800 + + * code for task#1889. + +commit 6b2601d870c25f73326f22c977a73f4fad133246 +Merge: 6696901714 1b4c382463 +Author: xia0ta0 +Date: Tue Jun 17 15:27:15 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 66969017142f814cd028f49f345aa9e39c34595d +Author: xia0ta0 +Date: Tue Jun 17 15:26:05 2014 +0800 + + * code for task#1888. + +commit 1b4c382463fd1b7d42ccec96e992e2d4b07edbb2 +Author: wangyidong +Date: Tue Jun 17 07:08:30 2014 +0000 + + * finish task #1913. + +commit db8fc4ba8dae4ed15a29556f31846b47f23dd022 +Author: wangyidong +Date: Tue Jun 17 06:40:02 2014 +0000 + + * finish task #1912. + +commit 0355d9e18e246437958421d4f5af657418165569 +Author: wangyidong +Date: Tue Jun 17 06:35:41 2014 +0000 + + * finish task #1914. + +commit c2f16c22cb5e83ecb28d4c67de33d6ada4bf8f2e +Author: wangyidong +Date: Tue Jun 17 06:03:27 2014 +0000 + + * finish task #1918. + +commit 17838c114abccfe2ddfa7cbddc3c699c38b441e7 +Author: Catouse +Date: Wed Jun 11 17:36:07 2014 +0800 + + * fixed an bug in my.js. + +commit 8830c79df0f9045186632f128eb58d110ee6755d +Author: Catouse +Date: Tue Jun 10 11:52:03 2014 +0800 + + * fixed an error in my.js. + +commit 369d48a45f0e40b05bd53a13d8dbe5df06a95137 +Author: Catouse +Date: Tue Jun 10 11:44:13 2014 +0800 + + * fixed outer height for ie8. + +commit d7b48b0733e806d6464a9803002fd3d3884ec620 +Author: Catouse +Date: Tue Jun 10 11:43:44 2014 +0800 + + * added option(waittime) to limit the loading of iframe modal. + * fixed style for ie 11. + * ajusted code format. + +commit 5fe5b91ba4e88907ea15a43b0c4e658fa1c215de +Author: Catouse +Date: Mon Jun 9 16:49:58 2014 +0800 + + * fixed function 'setModal4List' in my.js. + +commit bade5dfd2c78359a6d5236fa727ef080044d3e08 +Author: Catouse +Date: Mon Jun 9 16:16:39 2014 +0800 + + * fixed a bug: page not reload when close modal on story/view. + +commit 3b854e6224eb4ffee6573515598d445ac713903f +Author: Catouse +Date: Mon Jun 9 15:32:52 2014 +0800 + + * updated zui. + +commit df0cc5322437a963fbfef2b7aa15199c60ae7f24 +Author: Catouse +Date: Mon Jun 9 15:02:53 2014 +0800 + + * optimized style for mobile devices. + * ajsuted style of pager. + +commit 489d815e8a2ade4c6fbb72b5825d6e05e3b5d13c +Author: Catouse +Date: Fri Jun 6 16:15:53 2014 +0800 + + * fixed my.js. + +commit e47aa188ae800c4a6865d210f82fe466e8c5c8f2 +Author: Catouse +Date: Fri Jun 6 11:51:11 2014 +0800 + + * added default options to datepicker. + * ajusted style of todo/bachcreate opened with modal. + * added method to jquery object to open iframe modal. + +commit ef4a98a4e18f619fb392cc57fddf4d05ad1d9176 +Author: Catouse +Date: Thu Jun 5 10:27:27 2014 +0800 + + * updated zui. + * fixed an error in my.js. + +commit 274dee7978526e392ba9d7f8c5fdcdb021a26fb7 +Merge: 787edc0377 8475dccf37 +Author: wyd621 +Date: Thu Jun 5 00:31:05 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 787edc03770857abdc5438d192df2b05fa4027f5 +Author: wyd621 +Date: Thu Jun 5 00:30:35 2014 +0000 + + * fix a bug for export textcase. + +commit 8475dccf37e5a40a54119b40916efb7b4a0e5249 +Author: Catouse +Date: Wed Jun 4 16:51:08 2014 +0800 + + * added an option to prevent addional css class for table in my.js. + +commit c2ea39dcd392e3b2568102a2f0fdbdb2d0d658b5 +Merge: f460c3c94d 24fb051e6d +Author: Catouse +Date: Tue Jun 3 17:22:41 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit f460c3c94d9175bdf7069d8dc3fbab38115406e8 +Author: Catouse +Date: Tue Jun 3 17:22:15 2014 +0800 + + * prevent open modal in an exist modal window. + +commit 24fb051e6d76d0dd9dfc69c0f2cedb3586afe2d3 +Author: xia0ta0 +Date: Tue Jun 3 14:24:24 2014 +0800 + + * fix. + +commit 43402acc05d169cdecddab2790401cd4d5bcc1c3 +Author: xia0ta0 +Date: Tue Jun 3 14:04:10 2014 +0800 + + * fix. + +commit 6583eb6a90901068e5ba7a10fecd47d6a511a438 +Author: xia0ta0 +Date: Tue Jun 3 11:09:04 2014 +0800 + + * delete empty lines. + +commit 97127c5e01f59b00b1d967290015664780cf4f61 +Author: wwccss +Date: Sun Jun 1 23:09:17 2014 +0800 + + * adjust the menu of view page for product and project module. + +commit 9d32265c5a8195300a643fcd4c18c7d0b375f6b5 +Author: wwccss +Date: Sun Jun 1 20:58:00 2014 +0800 + + * rename the clear data feature to reset. + +commit a7f3f9019c81c632e39d4a99e4d26b5945599a8f +Author: xia0ta0 +Date: Thu May 29 16:11:10 2014 +0800 + + * adjust position of import and export. + +commit eb7bb6cf9d843ba2deb82beddb06c16b06435eb4 +Merge: e18e307352 b0fd706749 +Author: xia0ta0 +Date: Thu May 29 16:04:25 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e18e30735219153af256247eca575b18022581ad +Author: xia0ta0 +Date: Thu May 29 16:04:07 2014 +0800 + + * fix. + +commit b0fd706749b1c95582a8b3f5d47a46622a99fe8b +Author: Catouse +Date: Tue May 27 14:50:28 2014 +0800 + + * ajusted position of action buttons in 'testcase/browse'. + +commit cd1284156907387cca29229a713e4393be36adb8 +Merge: 0cfdd58e4b 7ce3733f52 +Author: Catouse +Date: Tue May 27 11:22:38 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0cfdd58e4b89978b70e415639a32a2cb7c200b9b +Author: Catouse +Date: Tue May 27 11:22:19 2014 +0800 + + * kill the scroll bar when modal show by updated zui. + +commit 7ce3733f52604c48228fa1407059cc77f2d24a3d +Author: xia0ta0 +Date: Tue May 27 09:31:21 2014 +0800 + + * fix bug: chosen when select project. + +commit 0fc7c3f0acab31bee1452305e7f85c3984d3f4a3 +Author: Catouse +Date: Tue May 20 09:56:06 2014 +0800 + + * ajusted style of defaultMenu on module menu. + +commit e6c4302e3ff56e7171d046471a2c3c6b8390b579 +Author: Catouse +Date: Mon May 19 15:54:55 2014 +0800 + + * updated zui. + * fixed style of table in panel for firefox. + +commit e05f769a8ad1688f973e6e52a82399a99d1c3872 +Author: Catouse +Date: Tue May 13 10:04:57 2014 +0800 + + * fixed export link then can open with iframe modal. + +commit 5a7e92fbba43f34200f8c0618a1fc1a16d4f6bb8 +Author: Catouse +Date: Mon May 12 14:53:37 2014 +0800 + + * fixed style of table for firefox. + * updated zui. + * updated function 'setOuterBox' in my.js. + +commit d27bf1613d7e3b56521c668a0681ffe227617771 +Author: wyd621 +Date: Fri May 9 08:07:23 2014 +0000 + + * fix a bug. + +commit 2f53b2a951bfdab13d954287f37f2a8026f6a2f3 +Merge: ce89b0b5b0 e083bf99ad +Author: wyd621 +Date: Fri May 9 06:13:20 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ce89b0b5b0cef60a9f5f8120c27286b62d9e994f +Author: wyd621 +Date: Fri May 9 06:11:24 2014 +0000 + + * fix a bug. + +commit e083bf99ad6f3db21bdd4312b90c883d5eb5eb34 +Author: Catouse +Date: Mon May 5 09:39:51 2014 +0800 + + * updated zui. + * ajusted style of 'doc/editlib'. + +commit 12a026a0c94f953f30f43b855992eb060123dffa +Author: Catouse +Date: Sun May 4 13:24:06 2014 +0800 + + * removed heading prefix from view 'task/editestimate'. + +commit 1ab9a28455ee432685fe663a6c1c2843bbc3efe0 +Author: Catouse +Date: Sun May 4 11:12:46 2014 +0800 + + * updated zui. + * removed resize component from jquery/lib.js. + * added type attribute to the button in 'printicon' of 'common/control'. + +commit 117192a4b8ce72c75e797904d297810703779ada +Author: Catouse +Date: Sun May 4 10:51:58 2014 +0800 + + * fixed style of 'user/managecontacts'. + +commit d4c41e76c697e2c5c4b8c230e0a728f473f64c4e +Author: Catouse +Date: Sat May 3 17:55:13 2014 +0800 + + * updated js lib of zui. + +commit ac62124659891af80733e518f4c160d60e361b02 +Author: Catouse +Date: Sat May 3 17:09:12 2014 +0800 + + * updated zui. + * added lang attribute to the html tag. + * bootbox can match client language by read lang attribute of the html tag. + +commit f32c8a6c04aeb05b50d96074213ad5aa8d41188b +Author: wyd621 +Date: Sat May 3 04:53:14 2014 +0000 + + * change lang. + +commit 26e54d703d1f3c1dbfd31f32a3180db7acc693fa (tag: zentaopms_6.0.beta1_20140503) +Author: wyd621 +Date: Sat May 3 03:59:46 2014 +0000 + + * fix a bug. + +commit 682b53831c58818ac08b4ee1e200d65c70fa502a +Merge: a668a12c69 b46b45e77c +Author: wyd621 +Date: Sat May 3 03:46:44 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a668a12c693fc375211d9e176b81b0a77e76157b +Author: wyd621 +Date: Sat May 3 03:45:57 2014 +0000 + + * change hidden to hide. + +commit b46b45e77c62cd14f1aa0944f009ee74c36b676a +Author: Catouse +Date: Sat May 3 11:43:57 2014 +0800 + + * fixed css class confict with zui in 'webapp/create'. + +commit dbfbaa0da4c73c47550963eb1821df6b88cd2845 +Author: Catouse +Date: Sat May 3 10:43:43 2014 +0800 + + * fixed commentbox. + +commit 6ab17b072a2200c815af02e8c878be72f4472807 +Author: wwccss +Date: Sat May 3 10:04:59 2014 +0800 + + * adjust code. + +commit 85a820ea48ffb390937394e4527d94bbb8abdff2 +Merge: 59778bd7de e7718fc708 +Author: wyd621 +Date: Sat May 3 01:57:45 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 59778bd7de903370a6248277031eae7b8d796d50 +Author: wyd621 +Date: Sat May 3 01:57:00 2014 +0000 + + * adjust for install. + +commit e7718fc7086e3c8745b1647aebd5a0babba8f8bb +Author: Catouse +Date: Sat May 3 09:56:05 2014 +0800 + + * fixed js error for ie8. + +commit 1ba4311c466f544ee8ba9990b18bba7289f7ce0d +Author: wyd621 +Date: Sat May 3 01:55:59 2014 +0000 + + * change version to 6.0.beta1. + +commit 606dd365be6158b975c85b6cba1d6bdb752199a5 +Author: wyd621 +Date: Sat May 3 01:55:30 2014 +0000 + + * fix for minifyfront. + +commit 50a3cc4e958651bc1606b349c57cd91fcaa89de2 +Author: Catouse +Date: Sat May 3 09:29:13 2014 +0800 + + * fixed an error in my.js. + +commit 57073673301419df1725c9c8ec830f13be3c9546 +Merge: cf13841da2 9616d8a7a9 +Author: Catouse +Date: Sat May 3 09:24:45 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit cf13841da2c402bfb45b9cc59b0a60503124837f +Author: Catouse +Date: Sat May 3 09:24:34 2014 +0800 + + * removed unused code. + +commit 581dcfc681fd85d8a9a6e29b181ad65d683296da +Author: wyd621 +Date: Sat May 3 01:22:27 2014 +0000 + + * fix a bug. + +commit 9616d8a7a9166544c132a232717cbd4b3dcafc28 +Merge: a0e427d4ce 73510fe9bd +Author: wyd621 +Date: Sat May 3 00:52:41 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a0e427d4ce65fc8bea217c6ba064649e25e10988 +Author: wyd621 +Date: Sat May 3 00:52:12 2014 +0000 + + * change for zh-tw lang. + +commit 383d3b736654d91684381813729523d8fee010cb +Author: wyd621 +Date: Sat May 3 00:46:55 2014 +0000 + + + add new version 6.0.beta. + +commit 73510fe9bdea39f4eb031ed67a4177d7d5b65897 +Author: Catouse +Date: Sat May 3 08:38:33 2014 +0800 + + * fixed error for ie8. + * ajusted style of 'task/recordestimate'. + * fixed style of 'tree/browse' for ie8-11. + +commit 43ff48e930641af49f1d2f8e159b593096fccbaa +Author: wyd621 +Date: Fri May 2 09:53:01 2014 +0000 + + * adjust page. + +commit 84ca2f9bf41d4be004372e033975177fa4ec353a +Merge: d7719a676c f48cf3ba98 +Author: wyd621 +Date: Fri May 2 09:49:16 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d7719a676c665790a61d93bfe9df04ba41f068da +Author: wyd621 +Date: Fri May 2 09:48:22 2014 +0000 + + * fix a js error. + +commit f48cf3ba981ff4925be964be5d1870e6f1d9f9ea +Author: Catouse +Date: Fri May 2 17:30:25 2014 +0800 + + * fixed style of contact menu in form. + +commit 0f0c0cec8042852206052c1d1b8e1643bc08710b +Merge: bd80df4f74 735022a6d8 +Author: Catouse +Date: Fri May 2 17:19:27 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit bd80df4f746356bf5628ce960e315a2cbb8f3719 +Author: Catouse +Date: Fri May 2 17:19:20 2014 +0800 + + * added function 'fixedDate' to the datepicker. + +commit 735022a6d89cd7037405b9e4c6a76eddfdafa36f +Author: wyd621 +Date: Fri May 2 09:04:13 2014 +0000 + + * fix a error. + +commit bfb720beb09db22e4de77d704921453f0bafd357 +Author: Catouse +Date: Fri May 2 16:59:18 2014 +0800 + + * ajusted style of 'user/deny'. + * added 'onlybody' option to the story preview link. + +commit 120ce8bd4fa6a636346f78918426fcb0a6e3ea52 +Author: Catouse +Date: Fri May 2 16:48:03 2014 +0800 + + * fixed function 'setFormAction' in my.js. + +commit ac8bdc84836b4432a1a213d47cbeb665ca332839 +Author: Catouse +Date: Fri May 2 16:37:46 2014 +0800 + + * fixed function 'syncModule' in 'tree/browse.js'. + +commit 43bb0d31486faef7a4aa03d7cd877ee71457bb1c +Author: Catouse +Date: Fri May 2 16:32:53 2014 +0800 + + * fixed style of history list for ie8. + +commit 6472fd9ce428a21571ddd6356f2b10a8b6606b01 +Author: Catouse +Date: Fri May 2 16:06:37 2014 +0800 + + * ajusted style of history for ie8. + +commit 4c32052c8d0732401a3670393f3cfedcb282e57c +Author: Catouse +Date: Fri May 2 16:02:17 2014 +0800 + + * fixed style for ie8. + * ajuste style of 'project/burn'. + +commit a69a464d8d13e2c0651288aa3a27040a5c936d5a +Author: Catouse +Date: Fri May 2 14:38:06 2014 +0800 + + * fixed style for ie8. + +commit 3b40d58d59514f0e6f1037e5fa411e421c5fd6a9 +Merge: 1d57b45f1d bc05675387 +Author: wyd621 +Date: Fri May 2 05:56:59 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1d57b45f1da326f15e98e2e07eb1381a77ad2e18 +Author: wyd621 +Date: Fri May 2 05:56:34 2014 +0000 + + * fix a js error. + +commit bc056753875743712875490f7fac5e53fa6d8ecf +Merge: 6fff62932f f53c16f336 +Author: Catouse +Date: Fri May 2 13:53:04 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6fff62932fef758a32dcb741a7db4426bcde021f +Author: Catouse +Date: Fri May 2 13:52:51 2014 +0800 + + * ajusted ui of language menu on 'topNavbar'. + +commit f53c16f336b99ce7a6755f180f703c677a656a35 +Merge: 13e635c8bf c5a3cf0be7 +Author: wyd621 +Date: Fri May 2 05:49:10 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 13e635c8bfdd547583df4831ae49ff93da8bbafc +Author: wyd621 +Date: Fri May 2 05:48:24 2014 +0000 + + * fix a bug in modal and fix export todo. + +commit c5a3cf0be7e65be3c210633f1a79989eaa9e9e76 +Author: Catouse +Date: Fri May 2 13:39:32 2014 +0800 + + * ajusted form padding of 'file/export'. + * fixed size of textarea for firefox. + * removed unused code from common.css. + +commit f2cf943007b43de1b866c3ee5b0a2f911e87d1d3 +Author: Catouse +Date: Fri May 2 11:40:54 2014 +0800 + + * update zentao icon with image on footer. + +commit 6480d853e48f86034e023d12de96e8f2939476ad +Author: Catouse +Date: Fri May 2 11:21:26 2014 +0800 + + * ajusted style of 'editor/view'. + * changed icon of usecase. + * added border to the table in tab pane. + +commit bac0479268b1f0aac72166d4bf3ce3a74f08f94b +Merge: 00564b28cc 51c38b382d +Author: wyd621 +Date: Fri May 2 03:01:35 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 00564b28cc89ec47c1ce9dd8b18f636e8e197748 +Author: wyd621 +Date: Fri May 2 03:00:34 2014 +0000 + + * adjust page. + +commit a9e60634404c758a18b8a8be35e8dc3a49e98418 +Author: wyd621 +Date: Fri May 2 03:00:07 2014 +0000 + + * remove action in modal. + +commit 1a4762bba2da56aee0d6d36fbf37fbabe0041e7e +Author: wyd621 +Date: Fri May 2 02:48:46 2014 +0000 + + * fix for 129. + +commit 51c38b382df4daf5f18cacc9d217b5d9f5be5e58 +Author: Catouse +Date: Fri May 2 10:48:40 2014 +0800 + + * removed function 'condensedFrom' from my.js. + +commit 2e632c9b74d9e3c5249c49c81bb0560a147a4352 +Author: Catouse +Date: Fri May 2 10:44:37 2014 +0800 + + * fixed display of story id. + * fixed style of columns. + +commit a84ef67f6def781e90fad23f04d8e489d1f6f468 +Author: Catouse +Date: Fri May 2 10:37:15 2014 +0800 + + * ajusted grid layout. + * ajusted style of treeview. + +commit bb4db397d147c1e5aa980e6eff75953635715147 +Author: Catouse +Date: Fri May 2 10:36:26 2014 +0800 + + * removed popover frome productplan list. + +commit b1f408e537b2804786f130df2558b24799897b10 +Author: wyd621 +Date: Fri May 2 02:15:43 2014 +0000 + + * adjust for #121. + +commit f583fe9f20ee015ef97befd1a20c05bccc8ec490 +Author: wyd621 +Date: Fri May 2 01:57:58 2014 +0000 + + * remove title for productplan browse. + +commit a18af772bbd30b5b1762cc7209f551d799ce228a +Author: wyd621 +Date: Fri May 2 01:54:12 2014 +0000 + + * adjust page for stroy view. + +commit 64b41bb092d17d71cf0dab52ab8af7ef524d64f1 +Author: wyd621 +Date: Wed Apr 30 09:28:40 2014 +0000 + + * fix a bug for project burn. + +commit 3343c88fb13861dd2dea926c605b0925db822671 +Author: xia0ta0 +Date: Wed Apr 30 16:08:20 2014 +0800 + + * adjust minifyfront. + +commit 438ab7982c0a606802e91d38ce7a387a7dd9d7df +Merge: 82daeb37b4 ed334dc8f2 +Author: xia0ta0 +Date: Wed Apr 30 15:11:27 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 82daeb37b4f3874884f49ecd0700b2ce840d59f2 +Author: xia0ta0 +Date: Wed Apr 30 15:10:40 2014 +0800 + + * fix: account cannot be empty. + +commit ed334dc8f2998fce31a50d49423c0379bdf4ae9e +Author: wwccss +Date: Wed Apr 30 13:57:47 2014 +0800 + + * adjust the w-resolution style. + +commit 568a3d35c6b07e845f7a447585c2462dc6e235f6 +Author: wwccss +Date: Wed Apr 30 13:19:43 2014 +0800 + + * adjust about page. + +commit ca7ce5b055ad944253ed19b627797afadc195c01 +Merge: e6babde9ce 2c98a3bed8 +Author: wwccss +Date: Wed Apr 30 11:17:28 2014 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 2c98a3bed82387da6f6eafda2c5149acd27f034c +Author: Catouse +Date: Wed Apr 30 10:22:31 2014 +0800 + + * ajusted style of sub featurebar. + * ajusted width of some form. + +commit 78f6ae420668c211f5012f18100811417607acdb +Author: Catouse +Date: Wed Apr 30 09:09:01 2014 +0800 + + * fixed style of featurebar for ie8-11. + * changed side header icon of 'doc/browse'. + * changed icon of datepicker for 'task/start'. + +commit e6babde9ce0c6aabe3db9051eef43a7004dd407a +Merge: 2cd7ff5e16 defd29dc82 +Author: wwccss +Date: Tue Apr 29 17:12:59 2014 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 2cd7ff5e1643082f6a7715e720100cc6f305544e +Author: wwccss +Date: Tue Apr 29 17:12:01 2014 +0800 + + * adjust code format. + +commit 86f64b6e38bca92405635bb3cad0e19d9f71b82a +Author: wwccss +Date: Tue Apr 29 17:11:45 2014 +0800 + + * change EN to English. + +commit defd29dc82b7b97ffde20fb58eb0565633529f13 +Author: Catouse +Date: Tue Apr 29 17:03:01 2014 +0800 + + * updated zui. + +commit 2a14a909b804b615c72fafbc2eb99bd4c6340cd7 +Author: Catouse +Date: Tue Apr 29 16:22:02 2014 +0800 + + * rebuilt zui. + +commit 4a943535cdaf6bed073b8feac1ebedd1d9cceee3 +Author: Catouse +Date: Tue Apr 29 16:11:04 2014 +0800 + + * fixed height of tab navs. + * ajusted sytle of 'testtask/linkcase'. + * updated themes. + +commit 6f83945eecedbd378c66b081f7c72073d6cfba29 +Author: Catouse +Date: Tue Apr 29 15:43:57 2014 +0800 + + * update zui resources. + * ajusted style of 'file/export'. + +commit d52127383bb57761c560ed139ce8278fe26664e6 +Author: Catouse +Date: Tue Apr 29 09:55:33 2014 +0800 + + * fixed style for ie8. + +commit 1ec7ac25e431d043d8361fb87864ee4f43a4bfd6 +Author: Catouse +Date: Tue Apr 29 09:27:13 2014 +0800 + + * ajusted style project/index. + * fixed style for ie8. + +commit 93b4ff5ab222430fd038b270794802ad9c43b880 +Author: Catouse +Date: Mon Apr 28 20:54:31 2014 +0800 + + * fixed style for ie9-11. + +commit 86fbb0201f3d643b618caf100673b06ba2c03a2c +Author: Catouse +Date: Mon Apr 28 20:38:16 2014 +0800 + + * ajusted style of 'task/batchcreate'. + * ajusted style of search form. + +commit 2ce8a8914e6c75e43a9168cadf69f7b5eb226d8c +Merge: 77b28b943c 704e134d51 +Author: Catouse +Date: Mon Apr 28 16:27:20 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 77b28b943c1c44ab3a7f82d523c2b9947977671a +Author: Catouse +Date: Mon Apr 28 16:27:08 2014 +0800 + + * ajusted style of search form. + +commit 704e134d5157606bb72244375c98b8741d2d31c5 +Author: xia0ta0 +Date: Mon Apr 28 16:11:22 2014 +0800 + + * use time() instead of mktime(). + +commit 535e82a70778392d6c64758552a758a937d89fda +Author: Catouse +Date: Mon Apr 28 16:06:02 2014 +0800 + + * ajusted style of 'testcase/showimport'. + +commit e3a14c0aa7ef2d2de9fc78ebf0855d079bc68756 +Merge: a4b32fbc8b 87cf62ca03 +Author: xia0ta0 +Date: Mon Apr 28 15:37:09 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a4b32fbc8bfe3c9df273fb1b04250af22f9c9da7 +Author: xia0ta0 +Date: Mon Apr 28 15:36:39 2014 +0800 + + * adjust en lang. + +commit 87cf62ca032b7a6395a3cf2b02ad43cf2ec31d72 +Author: Catouse +Date: Mon Apr 28 15:27:08 2014 +0800 + + * ajusted layout of 'story/review'. + * added location param to the function 'closeModal' in my.js and front.class.php. + +commit f4e0c5a8cba3712434cd57bd5ae5dd7c286c67c0 +Author: Catouse +Date: Mon Apr 28 14:12:08 2014 +0800 + + * removed jquery sourcemap. + +commit cc4bad62f07f2371a0fc3953e44cbdd689c46ce2 +Author: Catouse +Date: Mon Apr 28 13:49:52 2014 +0800 + + * fixed onlybody option for some links. + * ajusted style of module 'testtask'. + +commit d7cce606ee43b54bec03606ec23ecc21a13b0b1f +Author: xia0ta0 +Date: Mon Apr 28 13:39:57 2014 +0800 + + * fix: add onlybody for manageByModule. + +commit c9c06461c21d3c3f12c7a433933ccc10f27409e3 +Author: xia0ta0 +Date: Mon Apr 28 13:13:41 2014 +0800 + + * fix bug: onlybody 'yes'; + +commit c6ed850dca5905016f811f802560f717346df1bc +Merge: c3d36e0dda 05f516fbb0 +Author: xia0ta0 +Date: Mon Apr 28 12:02:29 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c3d36e0ddacdd69f54e8e5929045b5413ac5261b +Author: xia0ta0 +Date: Mon Apr 28 12:01:53 2014 +0800 + + * display expired plans. + +commit 05f516fbb07eb7a2664693e07673c5de50757494 +Author: Catouse +Date: Mon Apr 28 10:42:49 2014 +0800 + + * removed icon form action button. + * removed debug.html.php. + * ajusted style of 'productplan/linkbug' and 'productplan/linkstory'. + +commit f6b90c37b29d6d0775123ebd6722afb9fc947441 +Merge: 4eb3027b1e 542d992735 +Author: Catouse +Date: Mon Apr 28 10:09:01 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4eb3027b1e70720642c5ad66486458fbdfc43ca1 +Author: Catouse +Date: Mon Apr 28 10:08:54 2014 +0800 + + * ajusted style of footer. + * fixed overflow setting of featurebar. + +commit 542d99273541f04e16ad5c506415c3ba8aad3dee +Merge: 5ec44ff9b4 8d3c33a82f +Author: xia0ta0 +Date: Mon Apr 28 09:51:52 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5ec44ff9b4f820bc06f2099947901faa52954cbb +Author: xia0ta0 +Date: Mon Apr 28 09:51:15 2014 +0800 + + * adjust algin class. + +commit 8d3c33a82fc6386a6290ff65e7d4c6020dea8454 +Merge: e3b6fde5a2 e6f629d0eb +Author: Catouse +Date: Mon Apr 28 09:46:20 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e3b6fde5a2209040195f8e3a70a1faf02bcb80bd +Author: Catouse +Date: Mon Apr 28 09:46:05 2014 +0800 + + * ajusted layout of 'webapp/obtain', 'extension/obtain','custom/set'. + * ajsuted style of 'my/editprofile'. + +commit e6f629d0eb09460bceccd9863f657fb18c9f9c14 +Author: xia0ta0 +Date: Mon Apr 28 09:37:59 2014 +0800 + + - remove company number. + +commit 5b40041c13f67e45cd2ca013a698d0f17b4f4dd9 +Author: xia0ta0 +Date: Mon Apr 28 09:35:09 2014 +0800 + + * fix bug: remove undefined warning. + +commit c10aa876e448e07a016f126bfd4bdd8eb8c1ed4a +Author: Catouse +Date: Sat Apr 26 22:06:18 2014 +0800 + + * fixed style for firefox, oprea 12 and ie 8. + +commit d2decf65fc987f3f33540127a1f1b217ceca71ac +Author: Catouse +Date: Sat Apr 26 19:41:54 2014 +0800 + + * fixed style. + +commit a3985d73d7a1a6e7048394a70ba6e2c06004b9e5 +Author: Catouse +Date: Fri Apr 25 18:10:59 2014 +0800 + + * ajusted style. + +commit fde4ff561012b3e8053ab297725515a24e41d3d1 +Author: Catouse +Date: Fri Apr 25 16:20:36 2014 +0800 + + * remove default text from chosen. + * fixed css class of some tables. + * ajusted style of form. + * ajusted ui of searchbox. + +commit 770825e3701b23fde266ab00582d9678d3457f1a +Merge: 406e8f03ba 977f199c83 +Author: xia0ta0 +Date: Fri Apr 25 14:10:16 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 977f199c839e4c9acaffb4792474d6a8bbb0f60b +Author: Catouse +Date: Fri Apr 25 14:03:22 2014 +0800 + + * ajusted layout. + +commit 406e8f03ba7df5fed63c4d21fb2eae0dfa03b2b6 +Author: xia0ta0 +Date: Fri Apr 25 13:55:15 2014 +0800 + + * fix bug : chosen for assignedTo change. + +commit 07bf8ea95caff0643347a456bc09172680a145ca +Merge: 3485b105f0 8767d31bdb +Author: Catouse +Date: Fri Apr 25 10:36:49 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 3485b105f0e7f18f59acd1b6c6816d3e389f2da6 +Author: Catouse +Date: Fri Apr 25 10:36:40 2014 +0800 + + * ajusted style of 'titlebar' & 'featurebar'. + * updated kindeditor & chosen. + +commit 8767d31bdb0e2b9ecfd82d562be700c5fc7fbfb9 +Author: wwccss +Date: Fri Apr 25 10:30:33 2014 +0800 + + * adjust code format. + +commit 7d221293377c3873837dea37db2898dd88d271b0 +Author: wwccss +Date: Fri Apr 25 09:20:08 2014 +0800 + + * adjust code format. + +commit 40cbbac903943686c464f6d05340a9fa5f0814ae +Author: Catouse +Date: Thu Apr 24 18:02:16 2014 +0800 + + * ajusted style of modal dialog. + +commit 7ca225a37c257483859e7aed6c0226582da7bfe2 +Author: Catouse +Date: Thu Apr 24 17:20:02 2014 +0800 + + * ajusted ui of search form. + * fixed save query function of search form. + +commit 359a37cd6560cadc61dde9099e8f391dfecb9c94 +Author: Catouse +Date: Thu Apr 24 15:58:26 2014 +0800 + + * ajusted style of treeview. + * removed contentedittable instead of orgin textarea. + +commit 70b618f837516a9a0fb9a92b6a6aa9a93c764fd1 +Author: Catouse +Date: Thu Apr 24 15:00:47 2014 +0800 + + * ajusted style of pager. + +commit 516fc17fe3fd3a9030edeaf660902b65d9ab4430 +Author: Catouse +Date: Thu Apr 24 11:36:56 2014 +0800 + + * added option 'center' to make the modal dialog display in the center of screen. + * hide titlebar of 'my/project'. + +commit ac67a5a88eb39ed07e5c3980bd92d275ea87548a +Author: Catouse +Date: Thu Apr 24 10:51:36 2014 +0800 + + * removed outline of links. + * ajusted style of 'project/story'. + * updated zui libs. + +commit c3890aba120eb88798fc1c6f5e8e0bcf6d031271 +Author: Catouse +Date: Thu Apr 24 10:25:50 2014 +0800 + + * ajusted style of dialog showing after create project. + * ajusted style of dropdown menu on 'modulemenu'. + +commit d2c9d41742c67a37ba93feb6912ffd2b8853e412 +Author: Catouse +Date: Thu Apr 24 09:12:22 2014 +0800 + + * fixed z-index of 'side-handle'. + * ajusted style of 'admin/index'. + +commit 61930141308bb2cee7abe25468ea51920a718666 +Author: Catouse +Date: Wed Apr 23 17:56:18 2014 +0800 + + * change 'featurebar' to 'titlebar' and ajust style. + +commit 924f8fbc8ce5efcf0a21c5f8c7defa3ff2d315f7 +Author: Catouse +Date: Wed Apr 23 17:41:39 2014 +0800 + + * ajusted style. + +commit c70e1bcb4edd8437c2702439e6534f3c9fd0d5bd +Author: Catouse +Date: Wed Apr 23 15:48:05 2014 +0800 + + * removed icno in some buttons. + * ajusted margin value of buttons on featurebar. + +commit 52219181586322bea030036cea92432d9d1e0c6e +Author: Catouse +Date: Wed Apr 23 15:13:17 2014 +0800 + + * ajusted style of dropmenu on 'topNavbar'. + * updated zui lib. + +commit 017c6529aeb0cb2c1391de479c6c7ee06358d1c8 +Author: Catouse +Date: Wed Apr 23 13:37:53 2014 +0800 + + * show datetime popup layer when click wrapper. + +commit 7f11a57d23231de92124b614ef2444a96a59c163 +Merge: 7a1a175b04 b399d7d52c +Author: wwccss +Date: Wed Apr 23 13:38:07 2014 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 7a1a175b04e4667bee6be9657acb84d0173a0225 +Author: wwccss +Date: Wed Apr 23 13:37:37 2014 +0800 + + * adjust the license info. + +commit b399d7d52cdb30fc562edb6d93d537b0c24a006d +Author: Catouse +Date: Wed Apr 23 13:17:41 2014 +0800 + + * ajusted button color of feature bar. + * ajusted style of 'my/index'. + * added method 'selectButton' in 'front.class.php'. + +commit a434ad1a4276a0e0181ba3d89664d4be77ca54dd +Author: Catouse +Date: Wed Apr 23 10:45:16 2014 +0800 + + * ajusted style of icon button. + * removed some useless css code. + +commit 07ff7527c5079c1cca74209045d0c8fc6d1094a7 +Author: Catouse +Date: Wed Apr 23 10:44:54 2014 +0800 + + * updated fonts. + +commit 81e05b94a6ca5c4f0f0354bd13bae4fbda2f7369 +Author: Catouse +Date: Wed Apr 23 10:13:26 2014 +0800 + + * fixed css helper conflict by update zui. + +commit ce2a1002a07e97e0d8a8a6875107b1e81929fe64 +Merge: 86696f83dd 875b5f9718 +Author: wwccss +Date: Wed Apr 23 08:49:57 2014 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 875b5f971825a9854c7946704f1435a3fe5df456 +Author: Catouse +Date: Tue Apr 22 20:07:21 2014 +0800 + + * ajusted dropdown style in 'topNavbar'. + * renamed theme 'classic blue' to 'light blue'. + +commit a08b278d9bcd81fc734d062475d146453aac53de +Author: Catouse +Date: Tue Apr 22 18:03:03 2014 +0800 + + * added title attribute to qrcode button on login form. + +commit ed8c08a96bf45136e7422fd97f6ed7685c2ad561 +Author: Catouse +Date: Tue Apr 22 17:50:24 2014 +0800 + + * ajusted width of dropdown menu. + +commit b564d777259df836940f8fcc752ab2b384dcf3a1 +Author: Catouse +Date: Tue Apr 22 17:48:29 2014 +0800 + + * optimized javascript in 'login.js'. + +commit 4ec3e670ab0994b3013e1c541f94099b997b886a +Merge: 9598eec787 27db9d7ebc +Author: Catouse +Date: Tue Apr 22 17:45:50 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 9598eec787cf76c8464018fde2a811affb68ee78 +Author: Catouse +Date: Tue Apr 22 17:45:34 2014 +0800 + + * ajusted style of qrcode btn in footer and login form. + +commit 8188be9ee756cca190a13832f693ee1052cec068 +Author: Catouse +Date: Tue Apr 22 17:26:51 2014 +0800 + + * moved company name actions to the 'topNavbar'. + +commit 1335888f92d90568ef141be6ffa946db27274fca +Author: Catouse +Date: Tue Apr 22 17:25:59 2014 +0800 + + * updated zui libs. + +commit 27db9d7ebc12ac9edac3fd963346436bb00d3d7f +Author: xia0ta0 +Date: Tue Apr 22 16:42:29 2014 +0800 + + * fix bug: can't page after `order`. + +commit 86696f83dd131a06a2275bc4efb661e1d3d6071c +Merge: e596496b2c 4a40da7d61 +Author: wwccss +Date: Tue Apr 22 10:42:59 2014 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 4a40da7d616c68b75d73f5272e19bf22f1af5f2c +Author: Catouse +Date: Mon Apr 21 13:54:34 2014 +0800 + + * ajusted views. + +commit e596496b2c802dda8cba32a3c1053693118c859b +Author: wwccss +Date: Mon Apr 21 13:50:29 2014 +0800 + + * re link it. + +commit f0efa665fdbef672f26858da34c1c80ddf76a98c +Author: wwccss +Date: Mon Apr 21 13:47:05 2014 +0800 + + * adjust the welcome label. + +commit 2eb35ad76e5e0145e23d0718cfbf7530ada7fc89 +Author: wwccss +Date: Mon Apr 21 13:46:27 2014 +0800 + + * adjust the powered by info at footer. + +commit 11a252a8722f84c9e6fbf5d32f042e90432f4028 +Author: wwccss +Date: Mon Apr 21 13:44:05 2014 +0800 + + * adjust the companyname. + +commit f8cf4999c102bc18bff82e129c62eba96ffdce70 +Author: wwccss +Date: Mon Apr 21 13:43:38 2014 +0800 + + * adjust the margin of poweredBy object. + +commit 594b70978a63e3e50b119e5d792a7fd2cd5f5db9 +Author: wwccss +Date: Mon Apr 21 13:42:48 2014 +0800 + + * remove the powerBy and donation info. + +commit 4c7561b7047bf15966d09633a0951b2a9c3c8bf0 +Author: Catouse +Date: Mon Apr 21 13:12:18 2014 +0800 + + * changed options to call chosen. + +commit 56d69759986cdfd433c7f1fea2e9927b8c4b08d4 +Author: Catouse +Date: Mon Apr 21 11:29:58 2014 +0800 + + * fixed style of 'featurebar' for ie11. + +commit 332787a65760576012be802de4a222b5861dd3d5 +Author: Catouse +Date: Mon Apr 21 11:00:42 2014 +0800 + + * ajusted style of 'topNavbar'. + +commit 8e21998053d18c197907166be4991d9c5b171948 +Author: Catouse +Date: Fri Apr 18 17:41:09 2014 +0800 + + * fixed style to compatible with firefox. + +commit f978f9c35cbeeb601411e1949e1fe805ed32116f +Author: Catouse +Date: Fri Apr 18 17:08:27 2014 +0800 + + * fixed width of dropmenu in feature bar for ie8. + +commit 53366a354ca4cfbaa36fdd7c779e912867c9aa39 +Author: Catouse +Date: Fri Apr 18 16:53:52 2014 +0800 + + * ajusted style of burn chart. + +commit f095b6f72f47c99dfbefcc4e11950412d882c6af +Author: Catouse +Date: Fri Apr 18 16:06:33 2014 +0800 + + * fixed message error from js. + +commit dd38f997caa1fcbb4eea99cd4386dad8db01113f +Author: Catouse +Date: Fri Apr 18 15:41:44 2014 +0800 + + * ajusted size of form layout. + +commit be03af7fae4998e03a75a892b6a0b2fdf293fb4f +Author: Catouse +Date: Fri Apr 18 13:58:06 2014 +0800 + + * ajusted style of tree. + +commit d25b4da81d59b4e23db8cfc36201997e73e405aa +Author: Catouse +Date: Fri Apr 18 13:57:25 2014 +0800 + + * ajusted size of container. + +commit 9b63112ba206f403f7e475772f0c3a16596fe01d +Author: Catouse +Date: Fri Apr 18 11:15:05 2014 +0800 + + * removed useless headings from featurebar. + * fixed height of editable div in form for ie8. + +commit 305debac6b334c32a847fe50fe215faec2f8fd35 +Author: Catouse +Date: Fri Apr 18 11:13:56 2014 +0800 + + * updated ui of deny page. + +commit a3d2f7283d2e7cce7ed82b3e2ac7e95e4b3b3360 +Author: Catouse +Date: Fri Apr 18 11:08:04 2014 +0800 + + * ajusted style of search form. + +commit d6916ee14571d95f12d447322cf866dbfa6ebbfa +Author: Catouse +Date: Fri Apr 18 10:31:14 2014 +0800 + + * fixed style. + +commit a0bc37e751873937cd9655d0a7e0358a6df0ea28 +Author: Catouse +Date: Thu Apr 17 20:05:36 2014 +0800 + + * fixed style of input group for opera. + +commit c12ac1c2595706d96897543c417b2db806bfd8e3 +Author: Catouse +Date: Thu Apr 17 17:48:48 2014 +0800 + + * ajusted style of datetime picker. + * fixed style for ie8 & opera. + +commit 3e312408b2e141c686e2c4b109667b1a35d23056 +Author: Catouse +Date: Thu Apr 17 15:48:34 2014 +0800 + + * fixed style for ie8. + * ajusted style of 'about'. + +commit 4f32ba4b31ec0e5a463177cd8ed5accd220ecdab +Author: Catouse +Date: Thu Apr 17 14:11:00 2014 +0800 + + * ajusted ui of topbar. + +commit c42329314b00cef908da165955382322210e87ca +Author: Catouse +Date: Thu Apr 17 11:19:30 2014 +0800 + + * fixed a syntax error in 'product/browse'. + +commit dab3aa8095f8343c6fdfb745d35533f3f1226e7a +Author: Catouse +Date: Thu Apr 17 11:04:26 2014 +0800 + + * fixed side width for ie8. + +commit 254cf0988f9743c649ee46a3cd47dd09a8e845b5 +Author: Catouse +Date: Thu Apr 17 11:04:05 2014 +0800 + + * fixed themes for ie8. + +commit e7ff7d747568685783b110a12a94ebeb1ff8d5b5 +Author: Catouse +Date: Thu Apr 17 10:33:55 2014 +0800 + + * ajusted style of qrcode. + * ajusted css code. + +commit e462375e170019bded989096a945806d5db867c8 +Author: Catouse +Date: Wed Apr 16 17:44:41 2014 +0800 + + * fixed style for ie8. + * ajusted style of buttons in featurebar. + +commit 97a4242498e9aaca60b38bea897fbb3652ef65bb +Author: Catouse +Date: Wed Apr 16 17:43:26 2014 +0800 + + * removed unused css file. + +commit 2bb6dd5793ac6111680ebf07e2b2fb866a9a5f7d +Author: Catouse +Date: Wed Apr 16 14:43:27 2014 +0800 + + * added option for 'setModal' method. + * removed unused code. + +commit 7f6063432ccc78b479a7fb1cd370064f2fdfdf95 +Author: Catouse +Date: Wed Apr 16 14:00:56 2014 +0800 + + * fixed a error of create bug form. + +commit 2f74a7e7e4dfc59f117efd6ec7a11819a101bf6e +Author: Catouse +Date: Wed Apr 16 13:49:26 2014 +0800 + + * ajusted views of 'todo'. + +commit 5d66e815095a1e5de492905b8dce901f4c423760 +Author: Catouse +Date: Wed Apr 16 13:41:27 2014 +0800 + + * ajused style of debug panel. + +commit d7c99b3107d4a515759a1fbbb1e5bdb305989b45 +Author: Catouse +Date: Wed Apr 16 13:29:35 2014 +0800 + + * fixed style of mobile link in foot bar. + * ajusted style of about. + +commit 4aae72eb0f5337c53541a010ba8adc9d93eabcd5 +Author: Catouse +Date: Wed Apr 16 11:46:25 2014 +0800 + + * ajusted style of about. + +commit b8b96ddbaf1928ac7a75c1cdc34581a950c72fac +Author: Catouse +Date: Wed Apr 16 11:16:17 2014 +0800 + + * ajusted style of tree. + +commit 214393e15d66e3a39d194f5eb1b2cc8702081020 +Author: Catouse +Date: Wed Apr 16 11:15:59 2014 +0800 + + * fixed my.min.js. + * listen resize event of modal dialog. + +commit 3f44ffe1808914acd602f8b2148bd4f04b1b53cf +Author: Catouse +Date: Wed Apr 16 10:05:09 2014 +0800 + + * added status style. + * removed some icons style definition. + +commit 014b894a9f3eb60a04274951633aa5c621024e69 +Author: Catouse +Date: Wed Apr 16 10:04:31 2014 +0800 + + * added resize plug to ajust iframe modal height automatically. + * moved bgiframe plug to seperate file. + +commit de27b2822ff89ef3cae9e4cb2b257f9cfdf68802 +Author: Catouse +Date: Wed Apr 16 10:02:41 2014 +0800 + + * removed background from '.side'. + +commit 59e08a2c727ebadbc5ca5ff62da5c2ada98f4dfa +Author: Catouse +Date: Tue Apr 15 17:35:20 2014 +0800 + + * ajusted views. + +commit 23cbb7c9f39f6c586d2b644d54b55d1c7ecaebee +Author: Catouse +Date: Tue Apr 15 16:19:33 2014 +0800 + + * ajusted views. + +commit 61770a9ce136ce7da57fd96332f8e34d934377c1 +Author: Catouse +Date: Tue Apr 15 11:22:34 2014 +0800 + + * ajusted style of stars. + +commit c58fea7d7e45871a09fbf4311ebb78ae37622a6c +Author: Catouse +Date: Tue Apr 15 10:56:16 2014 +0800 + + * ajusted style. + * fixed 'setTemplate' method for kindeditor. + * added some icons deifinitions. + * ajusted style of tips after create project. + +commit 04a2a2ce8d143f030651f4de7cc1057d5c1fb3a6 +Author: Catouse +Date: Mon Apr 14 14:27:25 2014 +0800 + + * ajusted icon of dynamic. + +commit 61238b9af1e5f44d87cdc1674a5308cdccce336f +Author: Catouse +Date: Mon Apr 14 13:37:17 2014 +0800 + + * rebuilt themes resources. + +commit 5595ef2e70594262b5069ddadce22885d725df67 +Author: Catouse +Date: Mon Apr 14 13:29:01 2014 +0800 + + * ajusted views of module 'webapp'. + +commit 91e4aac0669164442fd63d6fe5935b6a52d147dd +Author: Catouse +Date: Fri Apr 11 20:14:21 2014 +0800 + + * ajusted views of module 'webapp'. + +commit 470e9bb9c1821c6f73862f9c44c2870dbe958ab9 +Author: Catouse +Date: Fri Apr 11 17:26:37 2014 +0800 + + * fixed debug iframe name. + +commit 388dcbd8ec55d198c16a3364ca9c26d4f412a334 +Author: Catouse +Date: Fri Apr 11 17:04:27 2014 +0800 + + * ajusted views of module 'install', 'upgrade'. + * fixed css selector when call chosen method. + +commit 43e6844ccf622195e605f21dfad24545b7904b7a +Author: Catouse +Date: Fri Apr 11 13:26:47 2014 +0800 + + * ajust views. + +commit 955e6183ee5c5e9b5af8a787d8550875f6c8a9ec +Author: Catouse +Date: Fri Apr 11 09:44:44 2014 +0800 + + * ajusted views. + +commit d7f4d75c1623c4bd3336875a39c57ba18877e896 +Author: Catouse +Date: Thu Apr 10 20:42:44 2014 +0800 + + * ajusted views of module 'admin', 'bug', 'doc', 'task' & 'testcase'. + +commit decbd7e7cc458e5aecd198c682d63b0958ceb3e2 +Author: Catouse +Date: Thu Apr 10 20:09:49 2014 +0800 + + * removed useless code. + +commit e6706bf6859d44d5fb20342d58e1a9dcc31d381c +Author: Catouse +Date: Thu Apr 10 20:09:32 2014 +0800 + + * ajusted ui of debug in 'footer.lite.html.php'. + +commit 932303986fcf0f13c48db965b44d5157863c8fd7 +Author: Catouse +Date: Thu Apr 10 20:08:55 2014 +0800 + + * added type to method 'checkbox' in 'front.class.php'. + +commit de97699339a82c81d306ca3498a726a6ac2c67d6 +Author: Catouse +Date: Thu Apr 10 17:50:29 2014 +0800 + + * ajusted ui of debug panel. + +commit 8e438291b48b21b9d7f75144fd1b21804b991f15 +Author: Catouse +Date: Thu Apr 10 16:59:22 2014 +0800 + + * added debug view. + +commit fad52a610fe2f5ed2246e2e696672d31af652262 +Author: Catouse +Date: Thu Apr 10 16:19:03 2014 +0800 + + * ajusted option of chosen. + * removed empty option in selection with chosen. + +commit 6531a1bd3b65a5951b5b38acc461054508f53b2c +Author: Catouse +Date: Thu Apr 10 15:28:34 2014 +0800 + + * changed chosen option to allow matches starting from anywhere within a word. + +commit 5f0ac342ed66a32772be99b036a1e11441597fd7 +Author: Catouse +Date: Thu Apr 10 13:30:43 2014 +0800 + + * added date range selection to the date picker control for the query box. + +commit 1db53f91df1d5b1698dcef5d042e7f916608bafd +Author: Catouse +Date: Thu Apr 10 13:12:41 2014 +0800 + + * ajusted style of links. + +commit 1450eebe2d3ded8644c5c96b34594c16da79ed65 +Author: Catouse +Date: Wed Apr 9 18:14:31 2014 +0800 + + * ajusted style of themes. + +commit 57ac806ccde9a38e92438b94701e13f19ed56ab4 +Author: Catouse +Date: Wed Apr 9 16:34:10 2014 +0800 + + * ajusted style of container. + +commit f8a131070eb4c50e9c8bacc99977aa9e36b4bcdc +Author: Catouse +Date: Wed Apr 9 16:27:09 2014 +0800 + + * ajusted views of module 'project'. + +commit acb22c6c3b6bef561a288082a7f6a020681f97f7 +Author: Catouse +Date: Wed Apr 9 15:58:15 2014 +0800 + + * ajusted views of module 'productplan'. + +commit 33a3e06687a9aad24c784a87351ce731f3fb747d +Author: Catouse +Date: Wed Apr 9 15:33:40 2014 +0800 + + * ajusted views of module 'todo'. + +commit d57fc48a06e4112396221d504e1bcbc200505297 +Author: Catouse +Date: Wed Apr 9 10:16:14 2014 +0800 + + * updated zui lib. + +commit 71b69e18e9c9ff60260eebedd45cb4c516098d78 +Author: Catouse +Date: Tue Apr 8 18:10:38 2014 +0800 + + * enhanced effection on modal showing. + +commit 0240b800c33af8c89c4bd5bf4dce705182d6285c +Author: Catouse +Date: Tue Apr 8 17:35:33 2014 +0800 + + * fixed style of search form. + * ajusted style of container. + +commit 8841e750711b89af7f3f621868f01bb4dfc400f1 +Author: Catouse +Date: Tue Apr 8 17:14:40 2014 +0800 + + * ajusted color set by updated zui resouces. + * ajusted style of 'btn-icon'. + +commit 54245c08dd58e1b8e197dfbb33d371c29a3a6687 +Author: Catouse +Date: Tue Apr 8 16:27:51 2014 +0800 + + * enhanced the user experience of tree box sider. + +commit ae41be9f1cf40e37391228a64c8ea27e51c8e546 +Author: Catouse +Date: Tue Apr 8 14:45:02 2014 +0800 + + * fixed common view of 'action'. + +commit d425b767a6457c52bb9a541544569ea683d786ad +Author: Catouse +Date: Tue Apr 8 13:55:05 2014 +0800 + + * replaced 'colorbox' with 'modal' in zui. + +commit 0a4b2c07f1cccbddb7e66bec0d8b180d5c4ae57c +Author: Catouse +Date: Tue Apr 8 10:40:21 2014 +0800 + + * fixed ajaxform. + +commit 4b266ae8e76506bb7fd10a894a6e02c9b623309f +Author: Catouse +Date: Tue Apr 8 09:55:13 2014 +0800 + + * fixed style of chosen in condensed form. + +commit 72578c017388a361b5d5a8fe2b284ddae621ca00 +Author: Catouse +Date: Fri Apr 4 18:31:40 2014 +0800 + + * ajusted views of module 'extension', 'editor' & 'debug'. + +commit d2807228697d2da3f75e3f1435644ad352fc14a3 +Merge: ad94cbec3b ad56722808 +Author: Catouse +Date: Fri Apr 4 16:02:04 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit ad94cbec3b1606d3f03b565451f1d967b84c4b39 +Author: Catouse +Date: Fri Apr 4 16:01:54 2014 +0800 + + * ajusted style of actions. + +commit 1944f1adbad789c2faf7a39e2940ff508eaf9f7b +Author: Catouse +Date: Fri Apr 4 14:02:23 2014 +0800 + + * ajusted views of module 'convert'. + +commit 9d350c1b5188ac9a327f46869c1b31a83822b5c7 +Author: Catouse +Date: Fri Apr 4 14:01:21 2014 +0800 + + * ajusted views of module 'sso'. + +commit ad56722808bb35de5f0739e60acbbdd8450be05a +Author: wyd621 +Date: Fri Apr 4 03:20:37 2014 +0000 + + * fix errors. + +commit 60002b64585327a7f4ff4bbfedc1ae327c1af600 +Author: Catouse +Date: Thu Apr 3 18:04:26 2014 +0800 + + * ajusted views. + +commit 054e2e863b12af9dd88ca711ffc2bbfd8d75511e +Author: Catouse +Date: Thu Apr 3 18:00:55 2014 +0800 + + * fixed method 'linkButton'. + +commit 859b028150f3743dffcb38a79e86843e4954ccd5 +Merge: 5ae05232fb 0f3d95c3fa +Author: Catouse +Date: Thu Apr 3 17:29:30 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 5ae05232fb90af6ac925ef3ec0f4f93e7436590f +Author: Catouse +Date: Thu Apr 3 17:29:19 2014 +0800 + + * updated method 'linkButton'. + +commit 0f3d95c3fa96b88c52ecae410628f121d1305ed9 +Merge: 4744483c11 b9a1d3e723 +Author: wyd621 +Date: Thu Apr 3 08:37:14 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b9a1d3e723d72643b7f3d898d74b870923528bed +Merge: 8f0f8255be d2a30ecfb0 +Author: xia0ta0 +Date: Thu Apr 3 16:17:34 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8f0f8255bed74852e11c622da3b7c68f13b0bd65 +Author: xia0ta0 +Date: Thu Apr 3 16:13:54 2014 +0800 + + * fix bug: chosen had not been refreshed. + +commit d2a30ecfb072664923e03d2458f4f2a2e732a2b4 +Author: Catouse +Date: Thu Apr 3 15:01:15 2014 +0800 + + * ajusted views of moduel 'user'. + +commit 4744483c11c518513b738a4fd40d289df29376d2 +Merge: 4c427d8c60 f1183fed54 +Author: wyd621 +Date: Thu Apr 3 01:09:48 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4c427d8c602a692b58641d48fa6a51b5a9f16fb7 +Author: wyd621 +Date: Thu Apr 3 01:08:51 2014 +0000 + + * fix errors. + +commit f1183fed5400802b92403dc41e7e910fe64c3544 +Author: Catouse +Date: Wed Apr 2 17:38:57 2014 +0800 + + * ajusted views of module 'group' & 'company'. + +commit f27c705c00e8fc60e9c3c0e3659e50cc5745619c +Author: Catouse +Date: Wed Apr 2 15:03:01 2014 +0800 + + * ajusted views of module 'report'. + +commit 59bc3f6e659e5d3e56413ce4aa19adb61c49a5f8 +Author: Catouse +Date: Wed Apr 2 10:37:35 2014 +0800 + + * ajusted views. + +commit e3d60141b9a928b4d3d4fe86313213b3fd0e79e4 +Author: wyd621 +Date: Wed Apr 2 00:47:07 2014 +0000 + + * fix errors. + +commit 37fa3e65bd1e54f0fcb5d99929119670b26c543d +Author: Catouse +Date: Tue Apr 1 16:43:18 2014 +0800 + + * updated method 'setModal' in 'my.full.js'. + * ajusted views of module 'doc'. + +commit b0b422a5e12c10a18e2015f6fc45aa21535a3ccb +Author: Catouse +Date: Tue Apr 1 15:50:47 2014 +0800 + + * ajusted views of module 'doc'. + +commit 0186028fc5338814ab50e53a46d432ccacff8e41 +Merge: e02f41daa4 9a327f7650 +Author: Catouse +Date: Tue Apr 1 15:15:10 2014 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit e02f41daa46d0a1811cc4436ae3aaee2208d58e1 +Author: Catouse +Date: Tue Apr 1 15:14:58 2014 +0800 + + * ajusted views of module 'testtask'. + +commit 9a327f765040d73926b878bfb1516a93595f91dd +Merge: 11873405cc 9e1acb9c15 +Author: wyd621 +Date: Tue Apr 1 06:22:16 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 11873405cc9f69af014801be459a299a3967fc7e +Author: wyd621 +Date: Tue Apr 1 06:21:41 2014 +0000 + + * fix a bug. + +commit 9e1acb9c15e065b8054f904d52b7142f01ff7c69 +Author: Catouse +Date: Tue Apr 1 11:34:36 2014 +0800 + + * ajusted views of module 'testcase' & 'testtask'. + +commit fece501c1c26f131378984bb40e0ca4f1c493ddc +Author: Catouse +Date: Mon Mar 31 18:08:14 2014 +0800 + + * ajusted views of module 'testcase' & 'testtask'. + +commit 48824e268801f43e146b3eb418cc5028ed54de04 +Author: xia0ta0 +Date: Mon Mar 31 16:50:54 2014 +0800 + + * revert old style. + +commit 92bdf3e61ff569fbf94112f626e56944bd70b9cd +Author: xia0ta0 +Date: Mon Mar 31 16:11:43 2014 +0800 + + * fix my.min.js. + +commit 98afc277a36b7c9f9226fd4133e37293ab378bdd +Author: Catouse +Date: Mon Mar 31 11:38:43 2014 +0800 + + * ajusted views of module 'bug'. + +commit 98efc661af18c684a7a124b89e450af03fa2a66d +Author: wyd621 +Date: Fri Mar 28 11:43:24 2014 +0000 + + * fix a bug. + +commit 97ecae2e4f65fb9b89a85bb1f4e8610675ae1e46 +Author: Catouse +Date: Fri Mar 28 17:53:45 2014 +0800 + + * ajusted views of module 'test'. + +commit 561f39afe8b8f7baefde3d08db7d486e6b113579 +Author: Catouse +Date: Fri Mar 28 11:06:06 2014 +0800 + + * ajusted views. + * fixed iframe modal method in 'my.full.js'. + +commit fc322ea3cfb9d8b163205dd45f476abe08a30a8b +Author: Catouse +Date: Thu Mar 27 17:57:35 2014 +0800 + + * ajusted views of module project. + * changed css names. + +commit 285a010037ecc1b67931accb6f5477022a480fd1 +Merge: bdb2a4258c 91497edc0f +Author: xia0ta0 +Date: Thu Mar 27 16:38:54 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + + Conflicts: + module/project/view/build.html.php + +commit bdb2a4258ce6f8a4dcae26499f0e77f0258f36c0 +Author: xia0ta0 +Date: Thu Mar 27 16:34:30 2014 +0800 + + * merge branch zui. + +commit a954e09d5303df1655a062306f8b89835080481f +Merge: 870102ee0f 230ccd34b3 +Author: xia0ta0 +Date: Thu Mar 27 16:27:43 2014 +0800 + + Merge branch 'zui' + + Conflicts: + module/bug/view/activate.html.php + module/bug/view/assignto.html.php + module/bug/view/confirmbug.html.php + module/bug/view/edit.html.php + module/bug/view/resolve.html.php + module/build/view/create.html.php + module/build/view/edit.html.php + module/common/model.php + module/common/view/header.lite.html.php + module/file/view/edit.html.php + module/my/view/bug.html.php + module/product/view/browse.html.php + module/product/view/close.html.php + module/product/view/edit.html.php + module/productplan/view/edit.html.php + module/project/view/activate.html.php + module/project/view/batchedit.html.php + module/project/view/burn.html.php + module/project/view/close.html.php + module/project/view/edit.html.php + module/project/view/putoff.html.php + module/project/view/start.html.php + module/project/view/story.html.php + module/project/view/suspend.html.php + module/project/view/taskheader.html.php + module/release/view/edit.html.php + module/search/view/buildform.html.php + module/story/view/batchclose.html.php + module/story/view/change.html.php + module/task/control.php + module/task/css/batchcreate.css + module/task/view/activate.html.php + module/task/view/assignto.html.php + module/task/view/batchcreate.html.php + module/task/view/cancel.html.php + module/task/view/close.html.php + module/task/view/create.html.php + module/task/view/edit.html.php + module/task/view/finish.html.php + module/task/view/start.html.php + module/testtask/view/close.html.php + module/testtask/view/edit.html.php + module/testtask/view/start.html.php + www/theme/default/style.css + +commit 91497edc0fea2fe75fa8c5186739817409e8487d +Author: wyd621 +Date: Thu Mar 27 06:59:24 2014 +0000 + + * fix a bug for showImport. + +commit 230ccd34b35d69702656bfe19ca17108730e376b +Author: Catouse +Date: Thu Mar 27 14:45:15 2014 +0800 + + * fixed a css error. + +commit ad3a1c29b82dff10cf7e4a1f27f97f286969fa2a +Author: Catouse +Date: Thu Mar 27 14:40:55 2014 +0800 + + * ajusted views. + * changed css names. + +commit 99c8a0554eb14840ad3b685b567cee1cdc0a203a +Author: Catouse +Date: Thu Mar 27 09:12:38 2014 +0800 + + * ajusted views. + +commit aa96761a828b31dcbc9a82daeb05b7f5778c9352 +Author: Catouse +Date: Wed Mar 26 15:44:57 2014 +0800 + + * changed css names. + * added method 'setSyncTrigger' in 'my.full.js'. + +commit 86b129673496a80c64b1d1b8adc39fbf94b41df7 +Author: Catouse +Date: Wed Mar 26 15:43:55 2014 +0800 + + * ajusted views of module .product'. + +commit e94843f4e2dcd59d258ba4d4e2a85abe426471b3 +Author: Catouse +Date: Wed Mar 26 11:01:19 2014 +0800 + + * changed css names to compatible with zui. + +commit 1ff011f6419724c0d5c90bfdca7f268d7c0a7e25 +Author: Catouse +Date: Tue Mar 25 19:57:12 2014 +0800 + + * ajusted views of module 'project'. + +commit 4fb25dbd7750eb163f38b3aaf5191c9da20df53c +Author: Catouse +Date: Tue Mar 25 16:12:49 2014 +0800 + + * added language support to the chosen control. + * added some icons definitions. + +commit dd0f637ee36c3b4a2ea09803006ab1cf206a4a62 (tag: zentaopms_5.3.stable_20140326) +Author: wyd621 +Date: Tue Mar 25 06:39:36 2014 +0000 + + * adjust code. + +commit a1c3b8582ecaf89be5d808251f78e59e343f18c4 +Author: Catouse +Date: Tue Mar 25 14:07:37 2014 +0800 + + * ajusted views of module 'project'. + +commit c1fd2831422b99863faff0fdedb6bf37c5573142 +Author: Catouse +Date: Tue Mar 25 11:25:30 2014 +0800 + + * changed css names. + +commit 6b78cbc325a4e607e9699f1dc506876065f5d4e1 +Author: wyd621 +Date: Tue Mar 25 02:43:14 2014 +0000 + + * change for zh-tw. + +commit f9b210c075ccd5165e03ab3b59dc1d5ed2d23f14 +Author: wyd621 +Date: Tue Mar 25 02:43:02 2014 +0000 + + * change for burn. + +commit 0ceae4a8b23dfc0fed76ccd394a64c9555660e3a +Author: wyd621 +Date: Tue Mar 25 02:42:27 2014 +0000 + + * fix for upgrade. + +commit 870102ee0f93e9bb5b34b17f18feadfd05b08626 +Merge: 12dac1ce57 3c35abc8af +Author: xia0ta0 +Date: Mon Mar 24 16:38:59 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 12dac1ce57a2ccffd63536829635f46d15455a23 +Author: xia0ta0 +Date: Mon Mar 24 16:33:20 2014 +0800 + + * code for task#1835. + +commit 3c35abc8af637a75c0aa0d46f3cbe910d02def7c +Author: wyd621 +Date: Mon Mar 24 08:09:51 2014 +0000 + + * fix a bug. + +commit 515467317b7c3196de41712fc945c59db5ccbaa6 +Merge: 86fd43714e 689c758bdb +Author: wyd621 +Date: Mon Mar 24 07:29:17 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 86fd43714ea4f6772751df7677ba6bb48d97471c +Author: wyd621 +Date: Mon Mar 24 07:28:14 2014 +0000 + + * change 5.3 to 5.3.stable. + +commit 689c758bdb344d80473fdbf215f8d4ad66556461 +Author: xia0ta0 +Date: Mon Mar 24 14:49:36 2014 +0800 + + * merge desc and goal. + +commit 0d3c38489568a94015d8802a0eddef7c2f47d874 +Merge: 4f6181ef3f b22a14b5f9 +Author: xia0ta0 +Date: Mon Mar 24 14:25:40 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4f6181ef3fcee420fbc43928d00c43ede46bbe36 +Author: xia0ta0 +Date: Mon Mar 24 14:24:09 2014 +0800 + + * adjust batchcreate of task. + +commit cffb3cd3c442e02d6ad7f778055588502708b424 +Author: wyd621 +Date: Mon Mar 24 05:59:41 2014 +0000 + + * adjust page that change td => th for commit. + +commit e2c1cf29aa7bcf1ad3e44028bf19cbcafd8a695d +Author: wyd621 +Date: Mon Mar 24 05:30:51 2014 +0000 + + * add assignedTo field for my-bug. + +commit 0c3065d2b222baebc503559d2e0e2818238d48a2 +Author: wyd621 +Date: Mon Mar 24 05:24:32 2014 +0000 + + * adjust burn. + +commit 82c7ada6a0ec086557391e1e318d5d6b150781d1 +Author: wyd621 +Date: Mon Mar 24 03:36:59 2014 +0000 + + * change note. + +commit 7d4c47fa04b928231e426db2ea0df04e98507ec0 +Author: wyd621 +Date: Mon Mar 24 03:34:46 2014 +0000 + + * adjust code. + +commit ff765b0cdc24125aa8e770e2383b6bb75ded9312 +Author: wyd621 +Date: Mon Mar 24 03:33:21 2014 +0000 + + * adjust code. + +commit b22a14b5f9d30bb252e4ba96fa93c553a1850113 +Author: wyd621 +Date: Mon Mar 24 03:20:42 2014 +0000 + + * change lang->date->day => $lang->day for common lang. + +commit 9aa6a9e7e9345296102a7fb5e806a0ff7cae9b47 +Author: xia0ta0 +Date: Mon Mar 24 10:55:53 2014 +0800 + + * change str_replace to nl2br. + +commit d39c50c0821632189640b841b348639f319a39ed +Author: wyd621 +Date: Mon Mar 24 02:49:03 2014 +0000 + + * adjust file-edit in colorbox. + +commit 8086d79e709a3e6d723f85bf0991f3e0a87c1900 +Author: wyd621 +Date: Mon Mar 24 02:24:56 2014 +0000 + + * change getList to getByList + * add getByList in story module. + +commit b66c834b4399ddbd198072c275a73c359385c08b +Author: wyd621 +Date: Mon Mar 24 01:59:50 2014 +0000 + + * adjust for replace full webpath image to mail module. + +commit 37d7253961f903658d1e4ea0cb2fdc0c075b6060 +Author: wyd621 +Date: Mon Mar 24 01:37:51 2014 +0000 + + * adjust page for bug-customfields. + +commit 12374a02bc6c63fbc45f9debeb4db9ffebe76162 +Author: wyd621 +Date: Mon Mar 24 01:25:44 2014 +0000 + + * adjust for output timeout from exportConfigVars. + +commit 01d820accb1f7a709b9ca779c3c9ff74349c6365 +Author: wyd621 +Date: Mon Mar 24 01:15:44 2014 +0000 + + * adjust position for the function of clear. + +commit aa7a270e68a5a1bee9b3242dab6189f2b81457e4 +Author: wyd621 +Date: Mon Mar 24 01:02:26 2014 +0000 + + * remove packageType field for build. + +commit dc6220e34f90b32200c059ea42fb1ad8277cd0dd +Author: wyd621 +Date: Mon Mar 24 00:59:51 2014 +0000 + + * remove export title. + +commit 3c7f80728877588f31534a8603247504c78231b2 +Author: Catouse +Date: Sun Mar 23 14:57:28 2014 +0800 + + * ajusted style of plan view and release view. + +commit d4fae43791be2ede2e91a816b81a73d59d93a010 +Author: Catouse +Date: Sat Mar 22 11:12:59 2014 +0800 + + * ajusted views + +commit 73366a111f53adb55610fbd29ddd2ac7d7bdef6c +Author: wyd621 +Date: Fri Mar 21 09:33:23 2014 +0000 + + * add boarder for build and release. + +commit bd5fd6328912da9ad306029335ac5ff52be2075a +Author: wyd621 +Date: Fri Mar 21 09:26:13 2014 +0000 + + * adjust win2unix.php. + +commit cd349cf78aba90662e7ab9fda913aa84f8ee93a0 +Author: wyd621 +Date: Fri Mar 21 09:10:56 2014 +0000 + + * adjust extension. + +commit bf552c1fa96be8eb7a14e5cd0161746d76a78215 +Author: wyd621 +Date: Fri Mar 21 09:09:02 2014 +0000 + + * adjust zdb. + +commit c5143a6e67aa1bc9fcec7d6e62018190e882f041 +Author: wyd621 +Date: Fri Mar 21 09:08:16 2014 +0000 + + * remove useless plugin. + +commit 63368d9c7d74ea0cb197ff213d9da74c334eec4c +Author: wyd621 +Date: Fri Mar 21 07:21:36 2014 +0000 + + * fix a bug for export stage. + +commit 1e4d3420175a38ce4539260c2e045602c3203596 +Author: Catouse +Date: Fri Mar 21 15:04:23 2014 +0800 + + * ajusted views of module prodcut & doc. + +commit b08e0446bfeda2c731ecf16f68d358ccebf77bb0 +Author: Catouse +Date: Fri Mar 21 11:42:03 2014 +0800 + + * ajusted views of module product. + +commit b1fbc91821ac8c1baec4c17b6064d8feff87caa8 +Author: wyd621 +Date: Fri Mar 21 02:48:50 2014 +0000 + + * adjust code format. + +commit 7b5af08f667204928060eda9a3cf4559eef91635 +Author: wyd621 +Date: Fri Mar 21 02:27:26 2014 +0000 + + * adjust code format. + +commit 1722cbe8b223833fc0e49e6240614a902065b356 +Author: wyd621 +Date: Fri Mar 21 02:27:02 2014 +0000 + + * adjust code format. + +commit 5dac9ab0eb350b537b04819252a6b45ee3bdaff1 +Author: wyd621 +Date: Fri Mar 21 02:26:34 2014 +0000 + + * adjust code format. + +commit 77a534536700080c83255010a849ccdb7da2dbb8 +Author: wyd621 +Date: Fri Mar 21 02:25:53 2014 +0000 + + * remove the colorize plugin. + +commit 9292b7eb0190377c3cf8fe45e23651c24fc73c50 +Author: Catouse +Date: Thu Mar 20 17:12:20 2014 +0800 + + * ajusted views of module 'story'. + +commit 03b66c7152590590cc00e5c9542edbd980cd60e3 +Author: Catouse +Date: Thu Mar 20 17:11:18 2014 +0800 + + * changed method name to 'favicon' form 'icon'. + * added icon method. + +commit 19a43d2b4a2bca8b9e27cff809dd5a379ac9cb0a +Author: Catouse +Date: Thu Mar 20 17:10:10 2014 +0800 + + * ajusted ui of file form. + +commit 845b62e381da18299bab7447a14550c5573ad6c0 +Author: Catouse +Date: Thu Mar 20 11:28:06 2014 +0800 + + * fixed themeroot error of kindeditor. + +commit 49c4ec879e01bcbb970d7b29043fa3cbda23768b +Author: wyd621 +Date: Thu Mar 20 02:45:33 2014 +0000 + + * change version. + +commit 3445055125846016bac9f5b085dc2beab48890b7 +Author: wyd621 +Date: Thu Mar 20 02:43:52 2014 +0000 + + * change for zh-tw. + +commit 050203f0736a25fb47c7f45be7c20ec9af578668 +Author: Catouse +Date: Thu Mar 20 10:14:14 2014 +0800 + + * removed donated link at 'topNavBar'. + +commit 0e6d08a5de32b31979fb36f73e45b438f6413016 +Author: wyd621 +Date: Thu Mar 20 01:53:04 2014 +0000 + + * fix a bug #581. + +commit 537338b7f5cb624cc1ed92c731dd389f3bf0bfbd +Author: wyd621 +Date: Thu Mar 20 01:10:43 2014 +0000 + + * adjust makefile. + +commit bcb765b393a7f0541ffa7e9244676d1f6e8b843f +Author: Catouse +Date: Wed Mar 19 17:39:56 2014 +0800 + + * ajusted style of views in module prodcut. + +commit e27e00b398953bbab196716338449d67faebcb0f +Author: wyd621 +Date: Wed Mar 19 08:02:14 2014 +0000 + + * adjust page. + +commit 7f9bff9190a5d2c26f312f8c902962288baf6943 +Author: wyd621 +Date: Wed Mar 19 06:48:59 2014 +0000 + + * fix a bug. + +commit 70ae28cd3488f545e904d571ac7384030cb5543e +Author: Catouse +Date: Wed Mar 19 14:06:39 2014 +0800 + + * fixed side handle. + +commit c2f50620664140e01e85a0b70f476122bd717933 +Author: wyd621 +Date: Wed Mar 19 05:55:32 2014 +0000 + + * add new version for upgrade. + +commit 11bfcda1905255a928d481a06a5ce09a558b783e +Author: wyd621 +Date: Wed Mar 19 05:52:47 2014 +0000 + + * add priv for bug-batchClose. + +commit 8a2edb2d1f7845c974c12b4639048222553e739a +Author: wyd621 +Date: Wed Mar 19 05:40:20 2014 +0000 + + * adjust sql. + +commit 1a29d43cb0fd3afe057928be6bf98c857232fea9 +Author: wyd621 +Date: Wed Mar 19 02:22:39 2014 +0000 + + * code for task #1812. + +commit 0c9211a2b139c44a064689902986ecee491c0a1c +Author: wyd621 +Date: Wed Mar 19 01:21:25 2014 +0000 + + * fix a bug for batchcreate task. + +commit d4e07814e80a03db3d482e5e8be5f4a8500f684b +Author: Catouse +Date: Tue Mar 18 17:21:15 2014 +0800 + + * changed ui of search form. + +commit 7ce1b3428d869dbd26539b5b2d59d892397bb277 +Author: wyd621 +Date: Tue Mar 18 07:14:27 2014 +0000 + + * fix a bug for http://www.zentao.net/thread-view-83210.html. + +commit 1c6aaba942eb4a3383341c8667d4fded998f5a96 +Author: Catouse +Date: Tue Mar 18 10:24:00 2014 +0800 + + * ajusted style of 'my/profileedit'. + * fixed style of 'user/login'. + +commit 45b10add2b019d41a4c49edad0a17b3f0ef3ea1e +Author: wyd621 +Date: Tue Mar 18 02:19:50 2014 +0000 + + * finish task #1825. + +commit 1b8230f6455a0694adaf47db802468ad02f3ff45 +Author: Catouse +Date: Tue Mar 18 09:19:57 2014 +0800 + + * ajusted ui of module 'my'. + +commit 34f0183944d4790406feb4178c72e405b92f9a6e +Author: wyd621 +Date: Tue Mar 18 01:09:42 2014 +0000 + + * fix a bug. + +commit 4a99133745ad8ce8d34fb7140117a98d92ee3278 +Author: Catouse +Date: Mon Mar 17 17:20:45 2014 +0800 + + * ajusted ui of my/project. + +commit 37d1e31f6acf68bf636c2de49064b9c522f78870 +Author: Catouse +Date: Mon Mar 17 17:20:11 2014 +0800 + + * restored my.min.js. + +commit dfc97f45cad4702009523819cc4d6717d80b620d +Author: Catouse +Date: Mon Mar 17 16:40:17 2014 +0800 + + * fixed icon button behavior of todo list. + +commit 475f420d60c784005d5e0b335b559889fc4167a8 +Author: Catouse +Date: Mon Mar 17 16:21:20 2014 +0800 + + * ajusted style of pager. + +commit a7abde12bd64588d0c136e72c480d6c69e303130 +Author: wyd621 +Date: Mon Mar 17 08:20:43 2014 +0000 + + * remove story and so on when make pms. + * fix a bug. + +commit 4f504f669980df4705a9ffc1c5e7cbf9400b9298 +Author: Catouse +Date: Mon Mar 17 15:48:15 2014 +0800 + + * ajusted code with simplify writting in html5. + +commit cca768f93a022eece069fec92da8e4a35aed143f +Author: Catouse +Date: Mon Mar 17 15:39:40 2014 +0800 + + * ignore table footer active event, fixed 'outer' height. + +commit 9b104801b3259eabba13e1cab669fff2b1c8c639 +Author: Catouse +Date: Mon Mar 17 15:37:05 2014 +0800 + + * updated kindeditor, fixed error when edit with code. + +commit 3ff07701f0dda89a9b6a70d580efde84dbc6e129 +Author: wyd621 +Date: Mon Mar 17 05:59:19 2014 +0000 + + * finish task #1813. + +commit d0f91e79b67e77315ee735207dbd47a560788428 +Author: wyd621 +Date: Mon Mar 17 03:49:45 2014 +0000 + + * change mode. + +commit e90b46f7b26dc8a611c204fb0b7c33c0558e4783 +Author: wyd621 +Date: Mon Mar 17 03:44:46 2014 +0000 + + * finish task #1791. + +commit 24912180810014a01e3d8f042b6a116c57151f3a +Author: Catouse +Date: Sat Mar 15 13:54:58 2014 +0800 + + * changed ui of my/todo. + +commit e88a0a89afba9cb1a7563e7fe7f6b3a3b7b808f4 +Author: Catouse +Date: Sat Mar 15 13:54:26 2014 +0800 + + * fixed outer padding in my/index. + +commit 1ddeae3aef57e643acc581732b2107ca2156c3b7 +Author: Catouse +Date: Sat Mar 15 13:53:50 2014 +0800 + + * removed colorbox. + +commit 3ba4ee5a9f2abadb3bb9cd37272afbd24b47ff40 +Author: Catouse +Date: Fri Mar 14 21:28:53 2014 +0800 + + * changed ui of 'my/todo'. + +commit 2917338e7a28b1bf8fc09d27b512599dae71a28c +Author: Catouse +Date: Fri Mar 14 21:28:21 2014 +0800 + + * updated datetimepicker control. + +commit 74c5b278cc6a0e1fdc122f5dd15d5d1c1023742f +Author: Catouse +Date: Fri Mar 14 21:28:02 2014 +0800 + + * updated zenicon font. + +commit 87622ce8348b2dcfea43079925362d348e5c0919 +Author: Catouse +Date: Fri Mar 14 14:50:42 2014 +0800 + + * ajusted ui of dashboard. + +commit d4df6c22f62fe8db1f6e8fba3de05aa64a74505c +Author: wyd621 +Date: Fri Mar 14 05:10:31 2014 +0000 + + * adjust code. + +commit 7c20ac30ff8fb7ffa7814f80a7ae53c7f5d492bf +Merge: d022e464cb 26ac079e7b +Author: wyd621 +Date: Fri Mar 14 03:29:10 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d022e464cb8393cc14f87ae7b6e1fb2f5c50dced +Author: wyd621 +Date: Fri Mar 14 03:27:53 2014 +0000 + + * finish task #1804. + +commit 375badbeeb2f2bc8d9be3938df2f380491c8ac63 +Author: Catouse +Date: Thu Mar 13 21:11:19 2014 +0800 + + * ajusted code of login view. + +commit cfe5286571385bff8acfc5b9126f2182dce0f3db +Author: Catouse +Date: Thu Mar 13 21:11:00 2014 +0800 + + * ajusted style of head part. + +commit 92e4b4acf88edaf4e98595af062e6f78f89a2eee +Author: Catouse +Date: Thu Mar 13 17:11:06 2014 +0800 + + + added components for old browsers. + +commit 87ddec3a7a5eceda7674b1c0b0e6183d260bea01 +Author: Catouse +Date: Thu Mar 13 17:10:32 2014 +0800 + + * updated fonts of zui. + +commit 26ac079e7b28511f04667d25411e7f78a6cc315e +Author: xia0ta0 +Date: Thu Mar 13 17:01:39 2014 +0800 + + * code for task#1810. + +commit 9eb208fa425971dc09fcc3ace8f2573da3dbcabf +Merge: a529d5f6a8 38e449f8bb +Author: xia0ta0 +Date: Thu Mar 13 15:26:51 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a529d5f6a80073dd36e2af472d278c11260b6630 +Author: xia0ta0 +Date: Thu Mar 13 15:26:08 2014 +0800 + + * code for task#565. + +commit b12ab262167cbcbdd974774e7a69e544af10c501 +Author: Catouse +Date: Thu Mar 13 13:23:33 2014 +0800 + + * ajusted css code. + +commit d3f9657e35c979dae5a5a68eb0a4e5040aa3eda4 +Author: Catouse +Date: Thu Mar 13 11:15:18 2014 +0800 + + * fixed style of login view. + +commit 38e449f8bbc51613ac80df085b3ab9e617425447 +Author: wyd621 +Date: Thu Mar 13 01:58:09 2014 +0000 + + * finish task #1803. + +commit 4c17b7b38d501ecaa52c5a9face298739ecc260e +Merge: 683b1d4dab b5ef3a87f6 +Author: wyd621 +Date: Thu Mar 13 01:16:25 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 683b1d4dabb9d35243d5c6cd648bdd5daef4b478 +Author: wyd621 +Date: Thu Mar 13 01:14:30 2014 +0000 + + * fix a bug #580. + +commit 8dc4966b3005d88a3a5d77c96ed9a240a004a2ba +Author: Catouse +Date: Wed Mar 12 17:53:47 2014 +0800 + + * imported zui resources. + +commit b5ef3a87f68b7247c32d96a3ea24bf3cd1c7af4c +Merge: 38be92fde0 2428605d36 +Author: wwccss +Date: Wed Mar 12 17:06:28 2014 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 38be92fde0f6b7a1f44c1a48dc6270938815d608 +Author: wwccss +Date: Wed Mar 12 17:04:01 2014 +0800 + + * code for task#1829. + +commit 2428605d36a2fd1ba6d960a61ad6526e6b594d44 +Merge: b88842b4c0 1d48510113 +Author: xia0ta0 +Date: Wed Mar 12 16:36:27 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b88842b4c0e1da340f625bc2884e5c7551e4025d +Author: xia0ta0 +Date: Wed Mar 12 16:35:57 2014 +0800 + + * code for task#1830. + +commit 1d4851011371ede70f1bf04ab2df9d614f77c225 +Author: wyd621 +Date: Wed Mar 12 07:43:05 2014 +0000 + + * finish task #1798. + +commit 31b087fc7183be1bf8dc7f84b2c47b8c5461043e +Merge: 9230beaaa8 420f334888 +Author: wyd621 +Date: Wed Mar 12 05:17:59 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9230beaaa8e75008fb3493ae532ffc2dfacfc5aa +Author: wyd621 +Date: Wed Mar 12 05:17:07 2014 +0000 + + * fix bug. + +commit 420f334888b0ef032d8cd9043c3f5f172647ddf3 +Merge: 375e2bdc41 c0433709d9 +Author: xia0ta0 +Date: Wed Mar 12 10:20:56 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 375e2bdc41b8631cb8db6e61f754d5478414e2b6 +Author: xia0ta0 +Date: Wed Mar 12 10:11:56 2014 +0800 + + + add PM. + +commit c0433709d9751aa7570d01bc577a147aec4fa4b2 +Author: wyd621 +Date: Wed Mar 12 01:42:45 2014 +0000 + + * finish task #1805,1819. + +commit a9ec533efd2f724d1e0652ca0d6f9290770470e8 +Author: wyd621 +Date: Tue Mar 11 09:16:50 2014 +0000 + + * finish task #1818. + +commit db48131ce43d3d52c20cd964c14ec99340f85222 +Author: wyd621 +Date: Tue Mar 11 08:34:45 2014 +0000 + + * finish task #1823. + +commit 34ea7869e683ad2717105e5ea7ebe22fc39ed9ae +Merge: 4313915a06 88f995d0fa +Author: xia0ta0 +Date: Tue Mar 11 15:09:11 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4313915a06f7285667b8682e1a586ab985a0fcc7 +Author: xia0ta0 +Date: Tue Mar 11 15:08:12 2014 +0800 + + * code for task#1806. + +commit 88f995d0fae23fa0ac962cdf4a006928ab25b331 +Merge: 8832e3acb1 b69ea0b9df +Author: wyd621 +Date: Tue Mar 11 06:06:36 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8832e3acb1b32d9327a6af19c9f59e2a42a88db1 +Author: wyd621 +Date: Tue Mar 11 06:05:55 2014 +0000 + + * finish task #1831. + +commit b69ea0b9dfe0d6f0c7d6aadbad1cc9fa58acc3c0 +Merge: ec20a3cbff 4e73e16d1a +Author: xia0ta0 +Date: Tue Mar 11 13:23:44 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4e73e16d1a0606c418808b10739ef445aa61697d +Author: wyd621 +Date: Tue Mar 11 03:36:49 2014 +0000 + + * finish task #1826. + +commit 2f06f1b11f37a21f786352f6d0317be7454362c9 +Author: wyd621 +Date: Tue Mar 11 02:25:07 2014 +0000 + + * finish task #1842. + +commit ec20a3cbff4b340615e451b40351f522fa02eb3e +Author: xia0ta0 +Date: Mon Mar 10 11:23:00 2014 +0800 + + * fix accounts_id for chosen. + +commit cfc5282ed75b1d4da55ca6cffdaf2c77cf4ba5de +Merge: 2afdcdd5cc 80da960931 +Author: xia0ta0 +Date: Fri Mar 7 14:33:34 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2afdcdd5ccef26d8625f50904cc8924ffce34072 +Author: xia0ta0 +Date: Fri Mar 7 14:32:44 2014 +0800 + + * code for task#1780. + +commit 80da960931a2f28403a14a52c62c6976092d51a8 +Author: wyd621 +Date: Fri Mar 7 06:20:24 2014 +0000 + + * finish task #1822. + +commit 98d051189d95dcc67bff5947aec7c6008790a224 +Merge: bcd62047c5 de40baa427 +Author: wyd621 +Date: Fri Mar 7 05:44:24 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bcd62047c509cb322c5bf5c7b074116b5081d985 +Author: wyd621 +Date: Fri Mar 7 03:23:48 2014 +0000 + + * finish task #1789. + +commit de40baa42788656eb7f95321eb3be4af7b2e6896 +Author: xia0ta0 +Date: Fri Mar 7 11:06:42 2014 +0800 + + * code for task#1844. + +commit cf54c0f19e1ec2f6f2327852a7ae5f7465d0fe72 +Merge: a573365ce8 561bfadb73 +Author: xia0ta0 +Date: Thu Mar 6 17:33:31 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a573365ce83c357942e9afdc7da9f2267dc510b5 +Author: xia0ta0 +Date: Thu Mar 6 17:23:33 2014 +0800 + + * code for task#1843. + +commit 561bfadb73fd311faa969125037f74dda548666d +Author: wyd621 +Date: Thu Mar 6 09:17:06 2014 +0000 + + * code for task #1802. + +commit 31592da15ecffe4aa5ab77c0ece54354a3043029 +Author: wyd621 +Date: Thu Mar 6 07:48:40 2014 +0000 + + * adjust code for task #1802. + +commit d1e74b782bc9de9995fba4bba4739b2311fb8861 +Author: wyd621 +Date: Thu Mar 6 07:27:50 2014 +0000 + + * finish task #1802. + +commit 505510d35c37c1792d7ad78bcbfff481b6d8e4f3 +Author: wyd621 +Date: Thu Mar 6 07:00:57 2014 +0000 + + * finish task #1252. + +commit 6f17be1a6f48fbc83d109409e2c4bcf583fdcf80 +Author: wyd621 +Date: Thu Mar 6 06:09:14 2014 +0000 + + * adjust code for task #1794. + +commit b159b7abb158c5371a690d52e0804a6d77ad508f +Author: wyd621 +Date: Thu Mar 6 06:01:17 2014 +0000 + + * finish task #1794. + +commit f70190800edb6ae9da36a16fb23e8dccc12c5f11 +Author: wyd621 +Date: Thu Mar 6 05:18:46 2014 +0000 + + * finish task #1814. + +commit f134091b541095ac3793d2e378ba1ef28a817938 +Author: wyd621 +Date: Thu Mar 6 03:35:45 2014 +0000 + + * finish task #1811. + +commit 7b3b80fe5ebaabb5fd5dec76f08cb9fc0d960e6d +Author: wyd621 +Date: Thu Mar 6 03:09:11 2014 +0000 + + * finish task #1809. + +commit 4af7f0e491494aae6f3b2e48ad726ca06c00b341 +Merge: 6579a8d836 dabe455a97 +Author: wyd621 +Date: Thu Mar 6 02:56:21 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6579a8d8369c68faf449d8013f3b5689ca835e56 +Author: wyd621 +Date: Thu Mar 6 02:55:47 2014 +0000 + + * code for task #1807. + +commit dabe455a97d009d418e38346408d0f4e34feb559 +Merge: 84691b1487 ea55339611 +Author: xia0ta0 +Date: Thu Mar 6 10:06:00 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ea5533961129a861447c29843019600475d4e630 +Author: wyd621 +Date: Thu Mar 6 01:47:47 2014 +0000 + + * finish task #1845. + +commit 84691b14873086199c277a561d2162eeb5786d21 +Author: xia0ta0 +Date: Thu Mar 6 09:19:09 2014 +0800 + + * fix linkStory of create task. + +commit dcd20eee4a271d40dab8ca3841585b5ab942aab9 +Author: xia0ta0 +Date: Wed Mar 5 17:17:22 2014 +0800 + + * code for task#1812. + +commit a6ee76e3838dfe5de3e962215401b636a40964f4 +Author: xia0ta0 +Date: Wed Mar 5 14:25:11 2014 +0800 + + * code for task#1801. + +commit 25262593fc56eea0eb2716709cc7c5284aede24a +Author: xia0ta0 +Date: Wed Mar 5 10:05:08 2014 +0800 + + * code for task#1800. + +commit 8d53f48c6810c33317aabe16b87b5dd64d8115fa +Author: xia0ta0 +Date: Wed Mar 5 09:37:14 2014 +0800 + + * code for task#1795. + +commit 72bcbfb72a912ce21fe5344f233468bfcd67e1b8 +Author: xia0ta0 +Date: Wed Mar 5 09:19:28 2014 +0800 + + * code for task#1792. + +commit 021fc841d288fe8c438347123a0e2f140658f676 +Author: xia0ta0 +Date: Wed Mar 5 09:08:13 2014 +0800 + + * code for task#1790. + +commit 75f57adbfbcda112e6225a496eebcba12b30572e +Author: xia0ta0 +Date: Tue Mar 4 14:58:16 2014 +0800 + + * code for task#1786. + +commit 5d4d8239f1e4ddab1791b4bceec77bb54a1f7f15 +Author: xia0ta0 +Date: Tue Mar 4 10:58:40 2014 +0800 + + * select users using chosen. + +commit 427ee4c7f9e9de75e74b98f2e1a4c9c06c477c71 +Author: xia0ta0 +Date: Mon Mar 3 10:24:53 2014 +0800 + + * code for task#1786. + +commit 279537e5258e62d2609da8a134e99845c1eccd7b +Author: xia0ta0 +Date: Mon Mar 3 10:10:04 2014 +0800 + + * code for task#1786. + +commit e426a8131a1237dcee829e5d3a74e939fce9e717 +Author: xia0ta0 +Date: Mon Mar 3 09:29:07 2014 +0800 + + * code for task#1784. + +commit cccc568124e3cb9e6d2e9fd24b93d5348bd2e3eb +Author: xia0ta0 +Date: Fri Feb 28 15:57:29 2014 +0800 + + * code for task#1782. + +commit fad5c1df2504a2588da9a7e0b697d6b887037d7e +Author: xia0ta0 +Date: Fri Feb 28 15:07:56 2014 +0800 + + * code for task#1782. + +commit 4aa7220b7450712fb197be768dae1ba81d528d0b +Author: xia0ta0 +Date: Fri Feb 28 15:01:04 2014 +0800 + + * code for task#1782. + +commit a5a87935b98ae8d7a8b74ab78d78b4485c60ea6b +Author: xia0ta0 +Date: Fri Feb 28 10:46:09 2014 +0800 + + * code for task#1780. + +commit 2fa7e4a25705991ea1dd5dc5e2815eecddb6ed52 +Author: xia0ta0 +Date: Thu Feb 27 16:13:30 2014 +0800 + + * code for task#1779. + +commit 166e9a255e1fedc76e9923b8d28e3c3b18fb76c8 +Merge: 9534e660c2 35d5fcd1ee +Author: xia0ta0 +Date: Thu Feb 27 14:32:13 2014 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9534e660c2f121eb5b5ea4c392c327cbf8017469 +Author: xia0ta0 +Date: Thu Feb 27 14:31:26 2014 +0800 + + * code for task#1778. + +commit 35d5fcd1ee0446aff499778ffa51b6e6f80e17cf +Author: wyd621 +Date: Thu Feb 27 06:26:43 2014 +0000 + + * change for zh-tw lang. + +commit 67a63dabe14148e8b3d61612d9a0de86f71e1674 +Merge: d5e9ec1d0f 90e54718d9 +Author: wyd621 +Date: Wed Jan 15 05:43:37 2014 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d5e9ec1d0fdb3e384d03596b92c205ab5f25bf84 +Author: wyd621 +Date: Wed Jan 15 05:42:44 2014 +0000 + + * fix a bug #529. + +commit 90e54718d9085eee49c7b1eb9d38739143c46548 +Author: wwccss +Date: Sat Jan 11 10:55:12 2014 +0800 + + * adjust code format. + +commit f195cea19c585b036b84dad1f02d8b1acbf90091 +Author: wyd621 +Date: Thu Jan 2 09:43:50 2014 +0000 + + * fix a bug for lib module in search. + +commit 9d3d5921c21edcb1b317322a0ac1aa8645afe25f +Author: wyd621 +Date: Thu Jan 2 07:17:45 2014 +0000 + + * adjust win2unix. + +commit f3c2af5a1ef0f64cebfb4c5c87ec7ba74f4e2c3b +Author: wyd621 +Date: Thu Jan 2 03:22:11 2014 +0000 + + * adjust win2unix. + +commit 07892750be680c1af913864559fd2e6b50a014dd +Author: wyd621 +Date: Mon Dec 30 08:13:59 2013 +0000 + + * add notice for iconv data. + +commit cb57f1d658a8831315aab4cf7b7a150fb759e047 +Author: wyd621 +Date: Mon Dec 30 01:46:50 2013 +0000 + + * fix a bug for import csv. + +commit d9b3fc6c6741d2aeaa2216ef79cd0b0fabb6a635 +Author: wyd621 +Date: Fri Dec 27 07:07:49 2013 +0000 + + * fix a bug #559. + +commit 5a403599f6e682c9874ff1047f0c39b53381b40c +Author: wyd621 +Date: Tue Dec 24 08:15:32 2013 +0000 + + * fix a bug for sendmail no image. + +commit e053106f761b7c169d1dead7a9f37761d45cf11c +Author: wyd621 +Date: Thu Dec 19 01:25:19 2013 +0000 + + * fix a bug for bind the class of colorbox. + +commit 5fb777bcf31011d9ebbb41f73404731dbc91d1cb +Merge: 4c0ce2c38c 4b63899ec7 +Author: xia0ta0 +Date: Thu Dec 19 09:16:52 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4c0ce2c38c2d850780a8cad9b0629b8f3446d9a2 +Author: xia0ta0 +Date: Thu Dec 19 09:15:59 2013 +0800 + + * fix bug#557. + +commit 4b63899ec78070a721c7743844b567f00c0c9402 +Author: wyd621 +Date: Tue Dec 17 02:38:51 2013 +0000 + + * fix a bug for batchCreate. + +commit 7bf527de74cd2f9ec3e4591f38c526c847a7b84c +Author: wyd621 +Date: Mon Dec 16 09:33:53 2013 +0000 + + * fix a bug #556. + +commit 25611cb4066b90ed1bce297abcc286310c870db6 +Merge: 2433ac4c1e 2a77c1d26a +Author: wyd621 +Date: Mon Dec 16 03:02:23 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2433ac4c1e1becc30f2766a2c869da74410d0ca3 +Author: wyd621 +Date: Mon Dec 16 02:57:19 2013 +0000 + + * change CHANGELOG. + +commit 2a77c1d26a4cd076bd67e94756d262037b3b7e73 +Merge: 4c1f259f30 36d653693a +Author: xia0ta0 +Date: Fri Dec 13 13:45:36 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4c1f259f306e1c7eb896a53d5a9edbabd9f47a65 +Author: xia0ta0 +Date: Fri Dec 13 13:44:16 2013 +0800 + + * Only allow users to see loader-wizard.php. + +commit 36d653693a8797dac6abb825cb60725623dbeab2 (tag: zentaopms_5.2.1_20131214) +Author: wyd621 +Date: Fri Dec 13 03:56:53 2013 +0000 + + * change CHANGELOG. + +commit afc2cfda65535e7d7c2a45a7023559606256c9b1 +Author: wyd621 +Date: Fri Dec 13 03:14:13 2013 +0000 + + * add zh-tw lang. + +commit 28aeaa4901fe7a1abee4014c8bd5cb6ac52a91a1 +Merge: 6804dae04b 49d356b221 +Author: wyd621 +Date: Fri Dec 13 02:43:53 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6804dae04b1cbc2adceeea577e3ca0e8f2407fc7 +Author: wyd621 +Date: Fri Dec 13 02:43:13 2013 +0000 + + * add empty css file. + +commit 49d356b22105972258241513a979d3eeed0564c5 +Author: xia0ta0 +Date: Thu Dec 12 17:20:35 2013 +0800 + + * fix a bug#555. + +commit 234858e214fa8c1ab9f4f25e83c193a7c7984c0e +Author: wyd621 +Date: Fri Dec 6 06:54:46 2013 +0000 + + * change changelog. + +commit 3f6ad8dee9ca17c98674ef5349dca3ae48ab5ff8 +Author: wyd621 +Date: Fri Dec 6 02:57:33 2013 +0000 + + * fix a bug. + +commit 68a32dd2d4b27f3a13fe0be7141411511a257c19 +Author: wyd621 +Date: Fri Dec 6 02:50:36 2013 +0000 + + + add new version. + +commit 2b174ea38bdca090d8fe979fca518651e8316117 +Author: wyd621 +Date: Fri Dec 6 02:47:48 2013 +0000 + + * fix a bug for no table in trash. + +commit ecee37a330e4a9b849ef122455ccb0553cdd9a10 +Merge: d30268aac9 7f7f41d336 +Author: wyd621 +Date: Wed Dec 4 07:42:01 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit d30268aac91554c25a524ce2d5652272caa42a8e +Author: wyd621 +Date: Wed Dec 4 07:41:27 2013 +0000 + + * adjust check extension when upgrade. + +commit 7f7f41d336251bbc2423785673121fab15c98e36 +Author: xia0ta0 +Date: Fri Nov 22 02:41:56 2013 +0800 + + * fix bug#551. + +commit f94eafc57c8b8b19216107ba9831a720370ac191 +Author: xia0ta0 +Date: Thu Nov 21 23:36:40 2013 +0800 + + * fix bug#552. + +commit 413b845e06db14915f26e66a79575eb0dfdba42b +Author: xia0ta0 +Date: Wed Nov 20 17:17:20 2013 +0800 + + * fix bug: rich editor will add br. + +commit ab9b2ada6861c23d129a98bb5d4e779585b7528d +Author: xia0ta0 +Date: Wed Nov 20 15:25:24 2013 +0800 + + * fix bug #550. + +commit 659a877b9ff89ee03e3944dfbdd6521120e64eb0 +Author: xia0ta0 +Date: Wed Nov 20 15:14:07 2013 +0800 + + * fix bug #544,545. + +commit 247ba3e4707edf052e09fd4a03fe81936ef2022b +Author: xia0ta0 +Date: Wed Nov 20 15:02:36 2013 +0800 + + * fix bug #546. + +commit d72578e2e1c96ec800628ee3ed6018fac8d1286c +Merge: 409d07ae2b f7d413df3d +Author: xia0ta0 +Date: Wed Nov 20 14:52:38 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 409d07ae2b111d70c1d60159260fa8b345d607fb +Author: xia0ta0 +Date: Wed Nov 20 14:48:52 2013 +0800 + + * fix bug #543. + +commit f7d413df3dfb663151453e4f660b28dbdb834d32 +Merge: 0c5b0aff92 bea380c7e1 +Author: wyd621 +Date: Wed Nov 20 02:37:39 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0c5b0aff92c1ef67561d12113e8b1dd72ee34273 +Author: wyd621 +Date: Wed Nov 20 02:36:19 2013 +0000 + + * adjust code. + +commit bea380c7e1688ccbd4b91ea05c5b47d265278681 +Merge: e855609208 c3d42dbe2e +Author: xia0ta0 +Date: Wed Nov 20 10:24:36 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e855609208bd5849a4ef27d4f30940f89a499132 +Author: xia0ta0 +Date: Wed Nov 20 10:23:54 2013 +0800 + + * change file encoding = utf-8. + +commit c3d42dbe2e06e34f06a3442f1fd60015a72ea7d4 +Author: wyd621 +Date: Wed Nov 20 01:56:43 2013 +0000 + + * adjust var name. + +commit 6078a7bc59d32d4addc2c673e66f46757d421b86 +Merge: 50bf3dff05 590111c9c2 +Author: wyd621 +Date: Tue Nov 19 06:51:55 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 50bf3dff05016053aa210803f04e6c3f2c255a9e +Author: wyd621 +Date: Tue Nov 19 06:51:13 2013 +0000 + + * adjust upgrade for delete company field. + +commit 590111c9c2f6b60a754146d163e38ef5b8b4cac6 +Author: xia0ta0 +Date: Tue Nov 19 14:47:46 2013 +0800 + + * fix: plan is disappear , if resolution is mall. + +commit 190591b89ce58b8092fa4f447acad8703466ac4a +Author: xia0ta0 +Date: Thu Nov 14 16:09:19 2013 +0800 + + * format. + +commit 082d249b69edb476a44621254af41a645704ec89 +Author: xia0ta0 +Date: Thu Nov 14 16:09:02 2013 +0800 + + * format. + +commit 9d7e3b11084e0763a99b75717b8517f10395139b +Merge: 156d24e1ad 1ceb543482 +Author: xia0ta0 +Date: Thu Nov 14 15:33:56 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1ceb5434827cd2c585d89e85c8784851d02c939c +Author: Catouse +Date: Mon Nov 18 11:37:50 2013 +0800 + + * ajust height of header, change button color for some themes. + +commit 156d24e1adc0d17e761f1de89955cb47aefd6ccf +Author: xia0ta0 +Date: Thu Nov 14 15:21:36 2013 +0800 + + * fix a bug : caseresult use runID, not caseID; + +commit e529262e4d3916615f78457eda953531be959d65 +Author: wyd621 +Date: Thu Nov 14 06:42:06 2013 +0000 + + * fix a bug for delete item. + +commit a5d4d3125a18b4851ad7f6ea55cdc7c6df1b8f29 +Author: xia0ta0 +Date: Thu Nov 14 13:28:54 2013 +0800 + + * set confirmed eq 1, when import to task. + +commit 4dd82ea6a21c25a23f8cde8cb4362a79280c7bd1 +Author: xia0ta0 +Date: Thu Nov 14 11:12:59 2013 +0800 + + * add note of last build. + +commit 960add4fe9633f3721adc9c09be5a5a7bf216a8a +Author: xia0ta0 +Date: Thu Nov 14 11:11:50 2013 +0800 + + * add note of last release. + +commit 4f71076eddf150fa4da28511663f4d74c6798092 +Merge: cd9a69deba e529262e4d +Author: xia0ta0 +Date: Thu Nov 14 10:33:32 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cd9a69deba325d0e1f4e6fb658642cf47798b66f +Author: xia0ta0 +Date: Thu Nov 14 10:31:47 2013 +0800 + + * fix a bug: format mailto. + +commit 064931c974646f8f1ae571c2144ad0bf8dd4adf5 +Author: wyd621 +Date: Wed Nov 13 08:34:06 2013 +0000 + + * fix a bug for style. + +commit f50fe12fa4705bc627e916d685e9cc42fe530d99 +Author: Catouse +Date: Fri Nov 8 15:30:39 2013 +0800 + + * fix icon missed in 'product/browse'. + +commit 23baa0ff2fe705ec7ccc1c6c1d44cabe394b9037 +Merge: 6920a9b6b7 069a000a44 +Author: xia0ta0 +Date: Thu Nov 7 17:21:21 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6920a9b6b7f768d1c560d10a85a37b497ebe7a1f +Author: xia0ta0 +Date: Thu Nov 7 17:19:29 2013 +0800 + + * fix a bug : search error. + +commit 069a000a4488b777f50fc1b4f345b4b8f74e063a +Author: wwccss +Date: Thu Nov 7 13:23:50 2013 +0800 + + + add readme.md + +commit c4d412924a8f437b1c8070690094b46854e00317 +Author: wwccss +Date: Thu Nov 7 09:42:39 2013 +0800 + + * add change log for old versions. + +commit d5719b5fffb76bbde2d552a9b007d09029d39901 +Author: wyd621 +Date: Wed Nov 6 06:37:24 2013 +0000 + + * fix a bug for class validater. + +commit 335ff87b88141a4fbc5ffd378610a9b4cf7ec114 +Merge: 850dcb1c65 b8081bd6f1 +Author: wyd621 +Date: Tue Nov 5 00:19:12 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b8081bd6f184a01fb5b15030e6d74f8d43f86b48 (tag: zentaopms_5.2_20131103) +Author: wyd621 +Date: Sat Nov 2 09:25:22 2013 +0000 + + * add zh-tw lang. + +commit 4ff7ecb7710001d39eac1e1684c1e10e8e268551 +Merge: 323777f72e 0d40a9636d +Author: xia0ta0 +Date: Sat Nov 2 17:20:24 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 323777f72ee58c39fe1d488a7ea3a23c04bd2391 +Author: xia0ta0 +Date: Sat Nov 2 17:19:39 2013 +0800 + + * fix a small bug. + +commit 0d40a9636d8ce617f42dcf213706c87b4975499a +Author: Catouse +Date: Sat Nov 2 11:38:34 2013 +0800 + + * replace some image icon with font icon. + +commit 850dcb1c652700d725eb8064134fca362005b044 +Author: wyd621 +Date: Sat Nov 2 02:41:59 2013 +0000 + + * add CHANGELOG. + +commit 7d1bc19d11c27cd2976e752efdf1f0966ff39a05 +Author: wyd621 +Date: Sat Nov 2 02:29:21 2013 +0000 + + * adjust for task-recordEstimate. + +commit 937d1758296771f60f735a847531fa40c744a324 +Author: wyd621 +Date: Sat Nov 2 01:11:40 2013 +0000 + + * adjust the width of mailto. + +commit 3457285efc4eb95a5262fc16c70ce86926624889 +Author: wyd621 +Date: Sat Nov 2 00:46:50 2013 +0000 + + * change for 5.2 version. + +commit 6c0fd8e4ffe31b7fa22c9fec5edfdbca8929070e +Author: wyd621 +Date: Sat Nov 2 00:24:27 2013 +0000 + + * finish task #1728. + +commit 60af664a7d9c63a23ee1bbbfed7e9817409d816c +Author: Catouse +Date: Fri Nov 1 17:13:53 2013 +0800 + + * ajust style of create project form. + +commit 7939a4e69fa3d4b3a423673a1c101168ecf5337e +Author: Catouse +Date: Fri Nov 1 17:13:04 2013 +0800 + + * ajust style. + +commit 078daba5a5d7920b301f88985d4770c4b06ece8b +Merge: 6876570f19 39c525416c +Author: azhi +Date: Fri Nov 1 16:46:26 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 6876570f19805a1e8f36d5d7521bee1e95b1e264 +Author: azhi +Date: Fri Nov 1 16:45:29 2013 +0800 + + * corrent the topOffset of second menu. + +commit 39c525416c62028acc6d035252e1abbfa65c0d1e +Author: wyd621 +Date: Fri Nov 1 08:41:35 2013 +0000 + + * adjust featurebar left a tags width. + +commit dc6af0bbdf628a7e47eb04f6811c896a06dce8fd +Author: wyd621 +Date: Fri Nov 1 08:12:25 2013 +0000 + + * revert ajaxgetdropmenu.html.php. + +commit aec641fa9cebc68c4d805cfdb08441ee2b9f4304 +Merge: 4d8f0fa945 c13a3e5ba0 +Author: wyd621 +Date: Fri Nov 1 07:24:53 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4d8f0fa945e0b015dad521a0ccdc05dbc56f3d38 +Author: wyd621 +Date: Fri Nov 1 07:23:43 2013 +0000 + + * adjust style for webapp + +commit cf42984d2f8faeb7d16dcc3e21c909b778af55dc +Author: wyd621 +Date: Fri Nov 1 07:13:29 2013 +0000 + + * adjust pager style. + +commit c13a3e5ba0461763c4a4e5829fc1c21eff4ca0e8 +Author: Catouse +Date: Fri Nov 1 15:11:51 2013 +0800 + + * ajust style of search form in side. + +commit 870c565403e265869efa2ade5981ebc981653780 +Author: wyd621 +Date: Fri Nov 1 06:28:15 2013 +0000 + + * adjust style for search. + +commit d16a7237901b1f7c8cbaa40009bbe99e364efefc +Author: wyd621 +Date: Fri Nov 1 06:14:47 2013 +0000 + + * adjust code for setImgSize. + +commit bc207117f36710b45db6f7e1d900434b0d685f92 +Merge: dfab00affa f73f6c39b7 +Author: xia0ta0 +Date: Fri Nov 1 13:50:18 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f73f6c39b7f97f949860ce9e0de22d33bd58a064 +Author: wyd621 +Date: Fri Nov 1 03:37:25 2013 +0000 + + * add view file for misc-qrcode. + +commit 2158f025fcccfa5b9fd0ccc20af308f42c8a411d +Author: wyd621 +Date: Fri Nov 1 03:36:55 2013 +0000 + + * adjust the logic of mobile access. + +commit 2c65fffa9d08aa2c64bfbd677bec12b1ffd0dc53 +Author: wyd621 +Date: Fri Nov 1 03:32:14 2013 +0000 + + * adjust code. + +commit c011e9213bd725af4301e849b5e40a341d19393a +Author: wyd621 +Date: Fri Nov 1 03:31:44 2013 +0000 + + - remove the function to create qrCode link. + +commit b80f57a0b8bc75233edc3054e6e1b37cd60fe198 +Merge: 086b20b272 0700883df0 +Author: wyd621 +Date: Fri Nov 1 02:27:44 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 086b20b2727639610a4b843ed88490695bc417b3 +Author: wyd621 +Date: Fri Nov 1 02:27:00 2013 +0000 + + * rewrite the logic of hidden the real path when some error occers. + +commit 0700883df0594d03ab4ca251d1ef8ffa64092183 +Author: Catouse +Date: Fri Nov 1 10:07:53 2013 +0800 + + * ajust style of forms. + +commit 70f5d320477f1d54defbea331a77ed5a6afc8e8d +Merge: 172d2d6223 d8a6b6b394 +Author: wyd621 +Date: Fri Nov 1 01:57:56 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 172d2d62233c8798f99f34df2370de4d7f84d676 +Author: wyd621 +Date: Fri Nov 1 01:54:15 2013 +0000 + + * fix bug #531. + +commit d8a6b6b39483016809e6041bd2fd4cbde9416ab3 +Author: Catouse +Date: Fri Nov 1 09:34:42 2013 +0800 + + * reduce toolbar height. + +commit 0c7c56d2e06844a2d283733bb49d28e86812b068 +Author: Catouse +Date: Fri Nov 1 09:11:34 2013 +0800 + + * ajust style of forms. + +commit 761c5c7e84292244d6f2b241ce26ae47a10d4af8 +Author: Catouse +Date: Fri Nov 1 08:56:59 2013 +0800 + + * ajust style of confirmbug. + +commit e42c8ff138e1999c341703ba910f76fcf1880d1a +Merge: c1df06ee50 268be9fed3 +Author: Catouse +Date: Fri Nov 1 08:43:53 2013 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit c1df06ee5008102afe891db49d84b3260e2db200 +Author: Catouse +Date: Fri Nov 1 08:43:35 2013 +0800 + + * ajust style of customfield. + +commit 268be9fed3eb539ea1cef9308144e8ea083443b4 +Merge: bff10957b0 3ec6e8ebc9 +Author: wyd621 +Date: Fri Nov 1 00:42:29 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bff10957b0f8f86fc6acd09f9605ab1d222d70f9 +Author: wyd621 +Date: Fri Nov 1 00:41:45 2013 +0000 + + * fix bug #523. + +commit 3ec6e8ebc92875b1f46c94c30bdf5684d8efb2ee +Author: Catouse +Date: Fri Nov 1 08:23:49 2013 +0800 + + * change delete file icon to plus sign. + +commit 11c63468f614248401a8e7a069dbf6c9fc7dae75 +Merge: ddf7ba8352 739b9d15fd +Author: wyd621 +Date: Fri Nov 1 00:20:17 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ddf7ba8352f96821ff7fb223a45a918c009a133e +Author: wyd621 +Date: Fri Nov 1 00:19:02 2013 +0000 + + * adjust icon for delete file. + +commit 739b9d15fd477f5c89271d091dd18b800015440f +Author: Catouse +Date: Thu Oct 31 22:34:34 2013 +0800 + + * ajust style. + +commit 1d131406eaa1f94bff3f5ff8363db06f242f3c26 +Author: Catouse +Date: Thu Oct 31 17:13:14 2013 +0800 + + * ajust style of 'choosen'. + +commit bd13b75a2cb4386d1c607bdb122d9164a3459d1d +Merge: 946d3d296d 8e2cffb2ec +Author: wyd621 +Date: Thu Oct 31 09:00:11 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 946d3d296df47d2a7bcb58e559ffe6bcf6ff91c6 +Author: wyd621 +Date: Thu Oct 31 08:59:21 2013 +0000 + + * fix a bug. + +commit a84f66c1b9c324541946f73ce530d21a591597c4 +Author: wyd621 +Date: Thu Oct 31 08:39:46 2013 +0000 + + * fix for the image of comment. + +commit 759bacd4b36cae53c20d46e39a05bfe7bf8087b5 +Author: wyd621 +Date: Thu Oct 31 08:38:26 2013 +0000 + + * fix bug #536. + +commit 8e2cffb2ec70c701e55deb3487c4059644f84e7e +Author: Catouse +Date: Thu Oct 31 15:55:50 2013 +0800 + + * reduce form table cell padding. + +commit f1960f6ad96eb0a3ce2edde48815216902b4410d +Author: Catouse +Date: Thu Oct 31 15:39:15 2013 +0800 + + * lighten link icon color. + +commit 70c5d9b2302f3a88ebdc7380c5560546a38ffe68 +Author: wyd621 +Date: Thu Oct 31 07:38:53 2013 +0000 + + * fix bug #532. + +commit 47a5ae0be42ccecd7120f7005c3b8df7aa11e4e2 +Author: wyd621 +Date: Thu Oct 31 07:34:28 2013 +0000 + + * fix bug #528. + +commit f7ed2103a9e0ab1106758b7cd328c1ffb5fe2e4d +Author: wyd621 +Date: Thu Oct 31 07:22:41 2013 +0000 + + * fix bug #521. + +commit d3c95d36dbd660778ba7398c3c2baa62e1ea10e4 +Author: Catouse +Date: Thu Oct 31 14:50:44 2013 +0800 + + * add icon for priority with value 0. + +commit b9b478fa4201cc31f60bec9f7117536dd9edf986 +Author: Catouse +Date: Thu Oct 31 14:47:41 2013 +0800 + + * increased padding for menus. + +commit 8fccd1a1d219a18466bc97221f17233cba2c4e5f +Author: Catouse +Date: Thu Oct 31 14:40:07 2013 +0800 + + * add icon for undifined priority. + +commit 0d4bab62e1d8c75d139ac84d790f5e0bbd2a1f6f +Author: wyd621 +Date: Thu Oct 31 06:28:52 2013 +0000 + + * fix bug fo #465. + +commit 823fa21d0fd6afa157a4ca278d50b0674ec9f8de +Author: wyd621 +Date: Thu Oct 31 06:27:59 2013 +0000 + + * adjust margin for querybox button of search. + +commit 64f4dfcf2f89e88c4ce95ff78df9874d07f94bb9 +Author: Catouse +Date: Thu Oct 31 13:41:42 2013 +0800 + + * ajsut style of login form. + +commit 531ecbf921af0a15739834b28313bbc630734af3 +Author: Catouse +Date: Thu Oct 31 13:20:00 2013 +0800 + + * ajust style of buttons. + +commit d67982d351cf20c0ada787ef5bf144656e2ed461 +Author: wyd621 +Date: Thu Oct 31 04:09:54 2013 +0000 + + * adjust search buildform. + +commit 682563e41c5571821829835a24f019f94815bf9d +Author: wyd621 +Date: Thu Oct 31 02:01:55 2013 +0000 + + * fix a bug for image size on load. + +commit 15b90a64e73d1c377ee7b55d316679c8845e774c +Author: wyd621 +Date: Thu Oct 31 01:29:47 2013 +0000 + + * adjust code width for my-project. + +commit 395d50e0c1cdfc7a9151ed32596dffe03974a2e1 +Author: wyd621 +Date: Wed Oct 30 07:58:28 2013 +0000 + + * add X-UA-Compatible for ie. + +commit 52a589c72469735bd3d015e1ed8feaf4f9b05e73 +Author: wyd621 +Date: Wed Oct 30 07:40:50 2013 +0000 + + * get last five roadmap. + +commit 2ec200f89935575b64738771e582767a9d5ca4e6 +Author: wyd621 +Date: Wed Oct 30 07:15:09 2013 +0000 + + * adjust pager style. + +commit 520afd8a343d8659443500f30ad908864a7b2405 +Author: wyd621 +Date: Wed Oct 30 06:59:51 2013 +0000 + + * adjust code for user lang. + +commit 651d7966063a61b3eb06f51bc91e5aa64493dbc1 +Author: wyd621 +Date: Wed Oct 30 05:44:22 2013 +0000 + + * adjust the width of colorbox in testcase. + +commit 8aaee0ec2348074b86ae619832ee745385118587 +Author: wyd621 +Date: Wed Oct 30 05:06:46 2013 +0000 + + * adjust data-placeholder for openBuild when batch create bug. + +commit 459e3e64fcc478c84ecb7edff53ca7bf4b8d4e54 +Author: wyd621 +Date: Wed Oct 30 03:11:59 2013 +0000 + + * adjust pager style. + +commit a74239490523219f687286c1a3a67bd6046ae398 +Author: wyd621 +Date: Wed Oct 30 02:43:12 2013 +0000 + + * add index.php for GET of requestType in init.sh(bat) + +commit 16fb99d77d0b2ba8284909776588e884917ef7a0 +Author: wyd621 +Date: Wed Oct 30 02:36:01 2013 +0000 + + * fix a bug for webapp. + +commit 095f18c925ad2b1c551168a15974bb912360d369 +Author: wyd621 +Date: Wed Oct 30 01:37:40 2013 +0000 + + * fix a bug for get webRoot in shell. + +commit 5b7c7e48f96aaec652d80195199e6b254363e39a +Author: wyd621 +Date: Wed Oct 30 00:02:28 2013 +0000 + + * fix bugs. + +commit 1124c73064545ec04420f534a77db930a90c9693 +Author: wyd621 +Date: Wed Oct 30 00:02:15 2013 +0000 + + * adjust for saveError. + +commit 0b4dca130ebb55208151408a2802577d308dadcf +Author: wyd621 +Date: Tue Oct 29 06:28:02 2013 +0000 + + * add ajaxgetdetail to openmethod. + +commit feb00fc1f67c836883c9084e84cf6b5ffff1ea27 +Author: wyd621 +Date: Tue Oct 29 05:37:43 2013 +0000 + + * adjust qrCode. + +commit 1fa079bec577e57b676596ec07f897401984c981 +Author: wyd621 +Date: Tue Oct 29 05:16:32 2013 +0000 + + * fix a bug for create webapp with https. + +commit bba370916d4a864ac033fd73f8fb03ca22a5dc21 +Merge: e207093644 777a9c0719 +Author: wyd621 +Date: Tue Oct 29 03:16:01 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e20709364460b9cf4e9e544a46fd955d29abf75b +Author: wyd621 +Date: Tue Oct 29 03:11:37 2013 +0000 + + * change for show mhtml only in mobile. + +commit 777a9c0719a2cb61cc1ca982a80fea15633f920f +Author: Catouse +Date: Tue Oct 29 09:34:24 2013 +0800 + + * ajust style of query link icon. + +commit 1d34da60e74f2c93f5c383562f98bc1dc57a3e16 +Merge: 1b8eedbf7e eeaad3d332 +Author: wyd621 +Date: Tue Oct 29 01:31:02 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1b8eedbf7e536061db03854e79dc0e132a389a99 +Author: wyd621 +Date: Tue Oct 29 01:29:25 2013 +0000 + + * adjust style for login and check exist object. + +commit eeaad3d332e91c4625d642a64f62d7bc8d6ac2a6 +Author: Catouse +Date: Tue Oct 29 09:19:27 2013 +0800 + + * link icons look smoother. + +commit dfab00affad1452c7378ca8e9d047e99a566941a +Author: xia0ta0 +Date: Sat Oct 26 06:30:35 2013 +0800 + + * change stage of story, if the task is estimated. + +commit d5d9cc8cbd73ee14c018e60f78d1d19ae325c226 +Merge: 7f60249686 1fa079bec5 +Author: xia0ta0 +Date: Sat Oct 26 06:17:53 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 659b9b868ac1c18e58ce0f9895ca510726797197 +Author: Catouse +Date: Fri Oct 25 13:45:53 2013 +0800 + + * ajust style of querybox. + +commit 8b757a66ab8008243fed9a2078b36cca662a61ba +Author: Catouse +Date: Fri Oct 25 13:08:03 2013 +0800 + + * reduce table cell padding. + +commit e5f79e31f17bb4bcdfdcf47ef221bf16752d66db +Author: wyd621 +Date: Thu Oct 24 07:53:40 2013 +0000 + + * fix bug. + +commit da1ea662b7b38576016ea94ba0de31683325eb24 +Author: wyd621 +Date: Thu Oct 24 02:43:58 2013 +0000 + + * fix notice bug. + +commit 7f6024968604fc8f781381660d95a95aa5c5ae64 +Merge: 30e562425f 6c08351d5b +Author: xia0ta0 +Date: Wed Oct 23 16:34:37 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 30e562425f32e4ed54eab785ae428652081dd717 +Author: xia0ta0 +Date: Wed Oct 23 16:33:58 2013 +0800 + + * fix bug#520. + +commit 6c08351d5b6ec085fbbcf8939b6f2bcdb4913f26 +Author: wyd621 +Date: Wed Oct 23 07:56:38 2013 +0000 + + * fix a bug. + +commit 24125993774159de9d708d7890d609f0dc1f73c6 +Author: wyd621 +Date: Wed Oct 23 07:56:14 2013 +0000 + + * fix bug for login. + +commit f338b9a7e86a008220659b8d80f4ca3fd77cd778 +Merge: 33899c1bf5 3ab9fe6c03 +Author: wyd621 +Date: Wed Oct 23 05:10:57 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 33899c1bf54452803daa59188e741ad2895262f3 +Author: wyd621 +Date: Wed Oct 23 05:10:23 2013 +0000 + + * finish task #1709. + +commit cc183e4056a9ae19f0e14d81e368befb8a69dc26 +Author: wyd621 +Date: Wed Oct 23 02:27:03 2013 +0000 + + * adjust var name. + +commit 3ab9fe6c038f210ea479630ad3683aea2a9156e2 +Merge: 0bac6be310 ba3e7d6d62 +Author: xia0ta0 +Date: Tue Oct 22 13:53:01 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0bac6be310b6186406ec4dd86b2ca794bfcb5642 +Author: xia0ta0 +Date: Tue Oct 22 13:52:26 2013 +0800 + + * fix bug#507. + +commit ba3e7d6d6287b4934a8526b2e7401b8942710a2a +Author: azhi +Date: Mon Oct 14 13:28:15 2013 +0800 + + * fix bug: change " to ' in desc'title attr when desc include link. + +commit 2780276c1a14d66173fea79769857cae3f8f7956 +Author: Catouse +Date: Fri Oct 11 16:53:53 2013 +0800 + + * fix user unlock icon missed. + +commit ed165c8120f355a979b3b214cbb17d88fe610ac6 +Merge: fbc8d27bae c9af61fa6d +Author: xia0ta0 +Date: Fri Oct 11 13:13:14 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit fbc8d27baeba46486c83d08dbb89502d0a59dc04 +Author: xia0ta0 +Date: Fri Oct 11 13:08:45 2013 +0800 + + * fix a bug: allow 0 for search value. + +commit c9af61fa6db125c83cd279b7ff25a5ff750ad0f6 +Merge: bf02bcaa83 ac8f7ec0a2 +Author: wyd621 +Date: Thu Oct 10 03:03:29 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bf02bcaa83cb95099b520bee13dc9464cac18fe5 +Author: wyd621 +Date: Thu Oct 10 03:02:49 2013 +0000 + + * fix bug for burn. + +commit ac8f7ec0a24a2e31b867f786ae098f0e6d865046 +Author: Catouse +Date: Wed Oct 9 20:39:11 2013 +0800 + + * ajust control width of querybox for narrow window. + +commit defd4ec5f5f47a37c57aa3ee01977cc04f064277 +Author: xia0ta0 +Date: Wed Oct 9 15:44:25 2013 +0800 + + * fix a bug: count of bugs, not stories. + +commit 2d5e90cf8f2a8f23d9c6af6bd26e486bed228513 +Author: wyd621 +Date: Wed Oct 9 03:26:47 2013 +0000 + + * fix bug #515. + +commit be04f5efacd1dc4a114c1c3c01b28fb6d8b800fc +Author: wyd621 +Date: Wed Oct 9 03:20:14 2013 +0000 + + * fix bug #514. + +commit b6763b42417fde8a64e5be9d5ed4535adbabf546 +Author: Catouse +Date: Tue Oct 8 15:46:28 2013 +0800 + + * new style for primary buttons in default theme. + +commit 7b5c6cdf77dce869e4cd9ab3f76fb6d4554ad7b4 +Author: Catouse +Date: Tue Oct 8 15:36:42 2013 +0800 + + * ajust height of mobile icon for login page. + +commit 4a8e7608c4362ae807441229a67d90e6d76a6b89 +Author: Catouse +Date: Tue Oct 8 15:25:38 2013 +0800 + + * ajust style of groupButton for compatible with IE7. + +commit b103fea0551316fda98c5df00ae9c9096692815a +Author: Catouse +Date: Tue Oct 8 15:20:20 2013 +0800 + + * ajust css code formate. + +commit 4c24ac5e6a8f4ff7d57eb4b11e7decd91aa7093f +Author: Catouse +Date: Tue Oct 8 14:37:45 2013 +0800 + + * change width of button-c for webapp list. + +commit e65cd0384395463590e8c8c33f29764eb6c1f7a8 +Author: Catouse +Date: Tue Oct 8 11:30:38 2013 +0800 + + * fix featurebar icon. + +commit 2262e92519e79d7f52f559d816975d8c30e54e5a +Author: wyd621 +Date: Sun Sep 29 07:55:50 2013 +0000 + + * adjust code for ie7. + +commit 7a64056ada50d282d9a9b4d0d27391b3436685e8 +Author: wyd621 +Date: Sun Sep 29 07:28:14 2013 +0000 + + * fix a bug for font. + +commit b62fb1f8d9a6d075b9cba52d2a70448ef42e0239 +Merge: c7c086d923 fec592347a +Author: wyd621 +Date: Sun Sep 29 07:12:37 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit c7c086d923034f0a940a93ed955a059858353ac6 +Author: wyd621 +Date: Sun Sep 29 07:08:53 2013 +0000 + + * fix a bug for new css. + +commit fec592347a14a6112f13fda4b2bedff2b13496fc +Author: xia0ta0 +Date: Sun Sep 29 14:40:42 2013 +0800 + + * change VERSION to 5.1.stable. + +commit b33f1b46f9f5cefa075630df2c3d1fd9c787eb41 (tag: zentaopms_5.1_20130929) +Merge: 4d2d177881 a79753bbb1 +Author: xia0ta0 +Date: Sun Sep 29 13:36:29 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4d2d177881e0dad63e03e07c56ff5a34e2a6c26f +Author: xia0ta0 +Date: Sun Sep 29 13:35:50 2013 +0800 + + * cn2tw for 5.1. + +commit a79753bbb1286c5317b2a08c0d432e63892bf856 +Merge: 3a8434506b c897d594ee +Author: wyd621 +Date: Sun Sep 29 03:44:29 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 3a8434506bba50fc10a0eacb5b286adee315c047 +Author: wyd621 +Date: Sun Sep 29 03:43:41 2013 +0000 + + * fix a bug for create build. + +commit c897d594ee570dc9b3442846db70da8ac989fbaf +Merge: 4d2dc1b353 ae7bb1c189 +Author: azhi +Date: Sun Sep 29 11:06:44 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 4d2dc1b3532761f5e1da0e7a068df42a51d26c42 +Author: azhi +Date: Sun Sep 29 11:05:38 2013 +0800 + + * adjust the featurebar style. + +commit ae7bb1c18950a8a965903dd04bd2ddd35549682a +Author: wyd621 +Date: Sun Sep 29 02:46:21 2013 +0000 + + * adjust setOuterBox and hidden debugwin. + +commit 755aa3c45602053a23ea379ce3b8287f0604ae04 +Merge: 42435e3e42 3456049400 +Author: wyd621 +Date: Sun Sep 29 02:24:20 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 42435e3e42c2796e2c48863e60ce4a5707656275 +Author: wyd621 +Date: Sun Sep 29 02:23:43 2013 +0000 + + * remove useless css. + +commit 3456049400b8bff512a65894836e9b518c1d076a +Author: Catouse +Date: Sun Sep 29 10:17:56 2013 +0800 + + + icons support ie7. + +commit 582759a56ce955585fc699a97ae3d0e626ec94b0 +Author: wyd621 +Date: Sun Sep 29 02:13:11 2013 +0000 + + * fix a bug for project-burn. + +commit 3c7ee4d9d46c11c6d0cd8b85a858eb2ee70c7155 +Author: wyd621 +Date: Sun Sep 29 01:57:25 2013 +0000 + + * remove debugwin in login page. + +commit 8eee210509948021cc248003a253ceb6bacccaa5 +Merge: 656c46e636 bed9d3e5d6 +Author: wyd621 +Date: Sun Sep 29 01:17:37 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 656c46e636c8bd3941ef686a76d5c71ccd1a1dd8 +Author: wyd621 +Date: Sun Sep 29 01:16:33 2013 +0000 + + * fix bug for assignedTo field when create bug. + +commit bed9d3e5d6babaf3d63e5eb61a4f951075f63d9a +Author: Catouse +Date: Sat Sep 28 15:50:32 2013 +0800 + + * fix sorter icons. + +commit 4eae16c9bf8d3f07d3871ab11e46ee700e8f75b6 +Merge: 8f9e75ffbc 9a65c59e04 +Author: azhi +Date: Sat Sep 28 15:38:06 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 8f9e75ffbc9e2b368d0f920cdd9dd694f5db6fd8 +Author: azhi +Date: Sat Sep 28 15:35:25 2013 +0800 + + * adjust the ui. + +commit 9a65c59e046099d2ab8dcaf3d3b7c9740319c74b +Author: Catouse +Date: Sat Sep 28 15:33:04 2013 +0800 + + * ajust style of icons. + +commit 548b2d9a123a33c756757f18a697858e76db8cbf +Author: wyd621 +Date: Sat Sep 28 07:14:37 2013 +0000 + + * delete debug color. + +commit 24102187748740b41fa5a73eb65c420058f76177 +Author: wyd621 +Date: Sat Sep 28 07:14:14 2013 +0000 + + * change width for updater. + +commit 3cec608741ac8a10f7eaf88479462ee53fe357a1 +Merge: 7980141a0e ae18c90359 +Author: wyd621 +Date: Sat Sep 28 07:04:27 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 7980141a0e7eb19ddfa577ffb071b983435988a5 +Author: wyd621 +Date: Sat Sep 28 07:03:08 2013 +0000 + + * add ping method in openmethod list. + +commit ae18c90359fb3379a021588bbf30a9fe5b29fd82 +Author: Catouse +Date: Sat Sep 28 14:40:22 2013 +0800 + + * remove home icon from footer crumbs. + +commit 2b005bd7da46112a1031d8384b880c2cc6408f83 +Author: xia0ta0 +Date: Sat Sep 28 14:34:05 2013 +0800 + + * fix a bug : fromVersion, not toVersion. + +commit 1ea6101aa95bcdf19b01ed6de7415149638ac62b +Author: xia0ta0 +Date: Sat Sep 28 14:30:14 2013 +0800 + + + add upgrade from 5.0 to 5.1 + +commit 8c5ad1ca573d88a989c9c700f77a7e860920b5d8 +Author: Catouse +Date: Sat Sep 28 13:49:46 2013 +0800 + + * ajust style of featurebar. + +commit d3c3bd0c33bee23ddacca6729358aa39e57f1a4e +Author: wyd621 +Date: Sat Sep 28 05:41:15 2013 +0000 + + * fix a bug for comment is only image. + +commit d39e675ea5646142f2f0214ee15f1663073f5548 +Author: wyd621 +Date: Sat Sep 28 05:34:04 2013 +0000 + + * remove useless css. + +commit 7dd543edb7e535604e70c8a7f484e03edf2e7623 +Author: wyd621 +Date: Sat Sep 28 03:33:46 2013 +0000 + + * fix for tablesorter icon. + +commit 7ad765ef99310be861aa35111142c294e218313a +Merge: 4886f83af2 265349a8e1 +Author: wyd621 +Date: Sat Sep 28 03:10:26 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4886f83af2c98b9aa8a8f194acc9d4f8f70604d1 +Author: wyd621 +Date: Sat Sep 28 03:08:36 2013 +0000 + + * fix bug #497. + +commit 265349a8e1c58539430685e8facef1a8ec27abc9 +Merge: 16092cad71 0c08d63d83 +Author: azhi +Date: Sat Sep 28 10:36:42 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + + Conflicts: + + www/theme/default/style.css + +commit 16092cad71b7008f07bec2142d072f34e5f5fd05 +Author: azhi +Date: Sat Sep 28 10:35:10 2013 +0800 + + * fix bugs: new ui. + +commit 0c08d63d83e2097c0f60d3ce7063fe5b91427405 +Author: wyd621 +Date: Sat Sep 28 01:51:55 2013 +0000 + + * fix icon for effort. + +commit 81a2a18ed4337b41d8640513d96d6d38f4b216ea +Merge: dceaf04b0b 609b182ae0 +Author: wyd621 +Date: Sat Sep 28 00:41:37 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit dceaf04b0bab851945fbd26cb6bfab72bd8b7d8a +Author: wyd621 +Date: Sat Sep 28 00:31:46 2013 +0000 + + * fix a bug #510. + +commit 609b182ae03a479f6689313819f07dab9c250cd9 +Author: Catouse +Date: Fri Sep 27 20:50:18 2013 +0800 + + * ajust style for icon. + +commit 9b65220537a7dd927ece1a3d4ec7db96b64158d2 +Author: Catouse +Date: Fri Sep 27 17:42:48 2013 +0800 + + * ajust margin of box-content. + +commit 1302a0912a5ba35aeb0c02c7d2eab9d07335066d +Author: Catouse +Date: Fri Sep 27 17:39:46 2013 +0800 + + * ajust style of exttable caption. + +commit bf3f1de094c3942436e61fa9e7f0ee668a443391 +Author: Catouse +Date: Fri Sep 27 17:31:35 2013 +0800 + + * ajust bug template icon. + +commit f09ce6ddc60a90824e677466934f7cc04408df08 +Author: Catouse +Date: Fri Sep 27 16:55:01 2013 +0800 + + * fix icons missing. + +commit 891a3d2dd936af8bb395ac8e56db5c75b7428723 +Author: Catouse +Date: Fri Sep 27 16:49:13 2013 +0800 + + * ajust style. + +commit 2e519f9cb067186b15ea9670d2979fda662466e8 +Author: wyd621 +Date: Fri Sep 27 08:26:38 2013 +0000 + + * round consumed. + +commit 9198ec75dac977bda8214c9b5764ea525603cf4e +Author: wyd621 +Date: Fri Sep 27 08:06:20 2013 +0000 + + * fix a bug when order has limit string. + +commit 07e2c8f5718e36ef074abf61e6b1e6fcc7dfa712 +Merge: 8d1843c9bc bac96871d2 +Author: wyd621 +Date: Fri Sep 27 06:48:53 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8d1843c9bcede901c49dd880369c990020a3d293 +Author: wyd621 +Date: Fri Sep 27 06:48:10 2013 +0000 + + * fix a bug for set case field name in action. + +commit bac96871d2986825dd71374d5f8557d9ce0262c9 +Author: Catouse +Date: Fri Sep 27 12:21:08 2013 +0800 + + * ajust style. + +commit dcb3ac81e26c84fd25c1da71c3eefb17dfbcd36e +Merge: 429c5c5a96 ca4f5d636f +Author: Catouse +Date: Fri Sep 27 11:04:44 2013 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 429c5c5a965c65ec933efb16cce6bb277101343e +Author: Catouse +Date: Fri Sep 27 11:04:38 2013 +0800 + + * ajust style. + +commit ca4f5d636f9c866094f2e47664452240e265509f +Author: wyd621 +Date: Fri Sep 27 02:52:49 2013 +0000 + + * fix bug #454. + +commit 32604b81254aea2d6d3de7ad5694562ac190f032 +Author: Catouse +Date: Fri Sep 27 10:22:33 2013 +0800 + + * ajust style of "my/index". + +commit cce52d785e90b2d55f89225d5f8395482db0fbd1 +Author: wyd621 +Date: Fri Sep 27 01:54:27 2013 +0000 + + * fix a bug when field such as t1.id. + +commit 6a78c2502fc240f8d07878c7d4c012711955f25e +Author: wyd621 +Date: Fri Sep 27 01:42:46 2013 +0000 + + * fix a bug for strtolower order. + +commit 4a2680a48a5faf1ac1e36c4afd3e8f9c33344dc1 +Author: Catouse +Date: Thu Sep 26 18:02:18 2013 +0800 + + * fix a error for "style.css". + +commit 90e5499f1da343ffbdec402fedff4b752d68b163 +Author: wyd621 +Date: Thu Sep 26 08:05:25 2013 +0000 + + * fix a bug for order. + +commit ffd3c83dd0362f1089596f00bfc54b7165c8ec7d +Merge: 6dbe327790 a11c799335 +Author: wyd621 +Date: Thu Sep 26 06:24:37 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 6dbe327790ba00de3fee89485acde8317ffbad51 +Author: wyd621 +Date: Thu Sep 26 06:23:59 2013 +0000 + + * fix bug 504. + +commit a11c7993355b160ee3384a27b0c4907b0acc9f4e +Author: Catouse +Date: Thu Sep 26 12:23:52 2013 +0800 + + * ajust style of icons. + +commit 7f3d4bcdca1f3d558adb7ade3ad8a061182f96b7 +Merge: 03dc6303ad 3c3b7d8662 +Author: wyd621 +Date: Thu Sep 26 02:55:19 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 03dc6303ad2ab180d3413eb117d3c4f567ad538f +Author: wyd621 +Date: Thu Sep 26 02:54:40 2013 +0000 + + * fix a bug #498. + +commit 3c3b7d86625b78c79058f9cbe49ba3c2513ec489 +Author: azhi +Date: Thu Sep 26 09:22:06 2013 +0800 + + * adjust the misc-downNotify for new notify. + +commit c9e031e86facd4277a211ed32c23f69274cc0eac +Merge: b5daf6f82b 8549a4757d +Author: azhi +Date: Thu Sep 26 09:21:27 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit b5daf6f82b17bcb3856efc7d406f5ea370dbd820 +Author: azhi +Date: Thu Sep 26 09:20:31 2013 +0800 + + * fix bug#511. + +commit 8549a4757d4b9dc52884d02a2ed37d5c3d593066 +Author: Catouse +Date: Thu Sep 26 09:17:49 2013 +0800 + + * ajust style of icons + +commit b9bf18e3488033e8b9c5f7ba70f0b84be1205d24 +Author: Catouse +Date: Wed Sep 25 10:13:37 2013 +0800 + + * ajust style of daterpicker icon of featurebar. + +commit 1c69f7d847a364c1bbfc0b346b4bd5a77ede5850 +Author: Catouse +Date: Wed Sep 25 09:51:49 2013 +0800 + + * prevent line breaked in querybox. + +commit edaf55c770935544cc2d67d74d3eaa66108dec9c +Author: Catouse +Date: Wed Sep 25 09:41:04 2013 +0800 + + * ajust style of searchbox. + +commit de4d7487a972a8c3a90d8697afeface0b1d79fdb +Merge: 0116d67ad3 ac72358c6d +Author: wyd621 +Date: Tue Sep 24 06:43:37 2013 +0000 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0116d67ad3a0cd0d3de93c160be36dceb6eecd37 +Author: wyd621 +Date: Tue Sep 24 06:42:19 2013 +0000 + + * fix a bug for print icon. + +commit ac72358c6d5201d986100841978fee0e643a1930 +Author: Catouse +Date: Tue Sep 24 10:53:51 2013 +0800 + + * ajust code format. + +commit c9de6b5c4acd992954d843088714298b98127938 +Author: Catouse +Date: Tue Sep 24 10:52:52 2013 +0800 + + - rm useless code. + +commit e7725ef1265e61d0f252739681e96c72380e00be +Author: Catouse +Date: Tue Sep 24 10:51:35 2013 +0800 + + * ajust style of icons. + +commit a3a1a2aa5af62d55102d5ed8d6ca45089c097533 +Author: Catouse +Date: Tue Sep 24 09:20:20 2013 +0800 + + * ajust style of action icons. + +commit b3b0d74d8ce8ada6dc52451566323b9ba419be88 +Author: Catouse +Date: Tue Sep 24 08:45:14 2013 +0800 + + * change icons:.icon-add,.icon-delete. + +commit 23500c93b6b93c835171c9fb0e738f060a4747ef +Author: Catouse +Date: Mon Sep 23 20:21:30 2013 +0800 + + * fix style of extension list. + +commit 6a52f1ef05971d36ba2564a267c38239cb762ca5 +Author: Catouse +Date: Mon Sep 23 20:04:56 2013 +0800 + + * fix style in english of login page. + +commit d3e19f9a2d2ba7011e7b26df6f3c405f123e89ac +Author: Catouse +Date: Mon Sep 23 19:52:52 2013 +0800 + + * add events of login page. + +commit 245e10b6b5f88740b458eb6e7f569c4c8b284136 +Author: Catouse +Date: Mon Sep 23 18:23:06 2013 +0800 + + * new login interface. + +commit 5ed0bcc141ceca674a4ddf4050df27d0fdde7e72 +Author: Catouse +Date: Mon Sep 23 14:41:12 2013 +0800 + + * better classicblue theme. + +commit 0b779f8af5a5777971eb74fddbeb26b9d5676604 +Author: Catouse +Date: Mon Sep 23 14:12:41 2013 +0800 + + * better red theme. + +commit 3d3017586ee67f131bf071520da03680a50fea99 +Author: Catouse +Date: Mon Sep 23 14:02:41 2013 +0800 + + * better green theme. + +commit 2ae51549915a3973c4f23980fbb198014f2ad869 +Author: Catouse +Date: Mon Sep 23 14:02:17 2013 +0800 + + * fix select height. + +commit 0077ab88626614efab1eee199fe5dd4f2ebdc8f0 +Author: wyd621 +Date: Mon Sep 23 13:12:01 2013 +0800 + + * link my.min.js to my.full.js + +commit 60a7c2c377ed2134d2223bd1f9839361ee0970a3 +Author: wyd621 +Date: Mon Sep 23 13:10:05 2013 +0800 + + * finish task #1464. + +commit 4879aa5658faaa8db407ee23500587dd1188ecb9 +Author: wyd621 +Date: Mon Sep 23 13:09:16 2013 +0800 + + * exclude the dir of db hook doc .svn. + +commit f844db4cc6303fc86401ff60a0991c5ab9c068dd +Author: Catouse +Date: Mon Sep 23 09:57:50 2013 +0800 + + * fix multiple select control height. + +commit a1fe248c34839989fe7f63f435ebb599e919cb67 +Merge: 4558677597 d00bfd3280 +Author: Catouse +Date: Mon Sep 23 09:55:50 2013 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 4558677597cbf8eeb164f1a282e7d8aecc2f2a16 +Author: Catouse +Date: Mon Sep 23 09:55:36 2013 +0800 + + * ajust style of chosen. + +commit d00bfd3280f0425c13bef623363c54f68cddb883 +Author: wwccss +Date: Mon Sep 23 09:48:50 2013 +0800 + + * fix the bug. + +commit 226e3895c2d2c99a0f2c47cdf9cbc31a4e053e72 +Author: Catouse +Date: Mon Sep 23 09:35:19 2013 +0800 + + * ajust style of form controls. + +commit ec68dd670a2beff79116ac168c5ec4db5c4f391a +Author: wwccss +Date: Mon Sep 23 09:34:57 2013 +0800 + + + add the syncext.sh. + +commit 5668adbab0f442f50e3c1670bbd54612fd355db7 +Author: Catouse +Date: Mon Sep 23 09:01:39 2013 +0800 + + * ajust style of icons. + +commit c3acb4f8232f4e0479b3532d7dfe40e3cf01c93f +Author: Catouse +Date: Mon Sep 23 08:34:47 2013 +0800 + + * fix ie7/8 compatibility issues. + +commit e8cecbd5eb77a10866ed2452a3b119ab414afeaa +Author: Catouse +Date: Sun Sep 22 17:24:38 2013 +0800 + + * ajust style of webapps list. + +commit 1bf88677ddca56acbfadc649482c1cab88266401 +Author: Catouse +Date: Sun Sep 22 17:17:16 2013 +0800 + + * change style of priority icons. + +commit ed6d2e0eea175d735bb32819403b5b032774359c +Author: Catouse +Date: Sun Sep 22 17:09:27 2013 +0800 + + * change border color of listmenu. + +commit 4cfb449d0bce9989181714752fc4c5d01731213d +Author: Catouse +Date: Sun Sep 22 16:57:23 2013 +0800 + + * change style of bug severity icons. + +commit cf8fd65ba6287a99f8732ca61a83f0e82b3016a1 +Author: Catouse +Date: Sun Sep 22 16:31:30 2013 +0800 + + * fix daterpicker icon undisplay on feature bar. + +commit ae52b87738259ea590c3a22c749f0ec24e49844b +Author: Catouse +Date: Sun Sep 22 16:26:40 2013 +0800 + + * ajust style of dater picker icon. + +commit 8558473667373846c6e1484ff6b445b289d6aaa6 +Author: Catouse +Date: Sun Sep 22 16:10:52 2013 +0800 + + * ajust style of mobile phone icon. + +commit a0458883e7458ba55776c14014945a251b25ee0d +Author: Catouse +Date: Sun Sep 22 16:03:28 2013 +0800 + + * apply feature bar style on ".outer>table>caption". + +commit bb4717a286fe0d4209b34fa294800e5fefc88229 +Author: Catouse +Date: Sun Sep 22 15:57:50 2013 +0800 + + * ajust style of side title. + +commit 6b52fcf810c88865455e5e4a29327be73a4bf26e +Author: Catouse +Date: Sun Sep 22 15:57:31 2013 +0800 + + * change icon in team.html.php. + +commit a34c712c67cef09b7fcc6bb2e3b881d754c39271 +Author: Catouse +Date: Sun Sep 22 15:48:29 2013 +0800 + + * change vertical-align of table cell. + +commit 8950787fc82ce3245dd574d82571c3becce27527 +Author: Catouse +Date: Sun Sep 22 15:47:10 2013 +0800 + + * ajust style of listmenu and groupbutton. + +commit 86de520c2aada4a28838442ba129a20391ff3a88 +Author: Catouse +Date: Sun Sep 22 14:56:26 2013 +0800 + + * ajust vertical-align of #header.navbar. + +commit d49faed0c8318ddf5ea7b16dcdd7834af04283f2 +Author: Catouse +Date: Sun Sep 22 14:53:20 2013 +0800 + + * ajsut style of icons. + +commit f057603eb740953ee8a9bd24cc2ce95cff4db1b9 +Author: Catouse +Date: Sun Sep 22 14:52:45 2013 +0800 + + - rm useless style. + +commit 40a668741a2159f075397a8e34243a9b639c414d +Author: Catouse +Date: Sun Sep 22 14:50:52 2013 +0800 + + * fix setOuterBox in "my.full.js". + +commit 7f57f965d671042e9687107a54413ad9fa65065d +Merge: 9c3a12b11d d2e87c5594 +Author: wyd621 +Date: Sun Sep 22 09:52:05 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 9c3a12b11d9c30ef2d4d6f85ce9e47dfdbfbc90d +Author: wyd621 +Date: Sun Sep 22 09:51:27 2013 +0800 + + * fix a bug for burn. + +commit d2e87c5594e865524fb41699b4675a9c9d0744c6 +Author: Catouse +Date: Wed Sep 18 18:18:57 2013 +0800 + + * ajust style of icons & buttons. + +commit d89536278be6bfc02bdfca45f28c8776a1828084 +Author: Catouse +Date: Wed Sep 18 18:05:54 2013 +0800 + + * ajust style of buttons. + +commit c993ab7a8d59ecf2e597a5050f1d6d79854472fd +Author: Catouse +Date: Wed Sep 18 17:58:05 2013 +0800 + + add style of the buttons. + +commit 2f262580cc16fb55e463c5642bbd2ff368f6aa4b +Author: Catouse +Date: Wed Sep 18 17:19:21 2013 +0800 + + * ajust style of "my/index". + +commit 057a42f834cb05c40b30adcbd2c5d02bf8f1d746 +Author: Catouse +Date: Wed Sep 18 16:55:33 2013 +0800 + + * add style of icons and used correctly. + +commit cfca33f2beacd2dc3c2235b182057f43ef3890f4 +Author: Catouse +Date: Wed Sep 18 16:53:42 2013 +0800 + + * fix setOuterBox in "my.full.js". + +commit 3799e7d264db15b794a4661b0ab34462bc7813ae +Author: Catouse +Date: Wed Sep 18 12:56:27 2013 +0800 + + * update printIcon in "common/control.php". + +commit 8c6d3e42deab62cc8b2f328833b14883f6f36e39 +Author: Catouse +Date: Wed Sep 18 12:50:36 2013 +0800 + + * change wording of the delete icon. + +commit d2fecb7f3a049c10883f8a46d3a3ecae0a130225 +Author: wwccss +Date: Wed Sep 18 10:36:33 2013 +0800 + + + revert it. + +commit a58b320add8a27144d11a591e8be2c4ea74fc5c1 +Author: wwccss +Date: Wed Sep 18 10:29:32 2013 +0800 + + - delete it. + +commit fc2bc9c3d2de3bf84ea55d4a082da7e87e3d6cab +Author: Catouse +Date: Wed Sep 18 08:45:18 2013 +0800 + + * update icon support. + +commit 353d636f3a28217bd82ace8524db6ab8bb7445d4 +Author: Catouse +Date: Wed Sep 18 08:30:27 2013 +0800 + + * change todo icon of 'my/index'. + +commit cb2bb047379f319a4b86bfa376a9de9711fcf420 +Author: Catouse +Date: Wed Sep 18 08:19:59 2013 +0800 + + * ajust style of login. + +commit d069100508bb448a543df901f876889a37937bef +Author: Catouse +Date: Wed Sep 18 07:54:46 2013 +0800 + + * revert change of "common/control.php". + +commit a50c0449f7031d0e7eec6fb386d2793f58fb18f9 +Author: Catouse +Date: Tue Sep 17 17:00:13 2013 +0800 + + + add style of buttons. + +commit 0daa28c4945de867724a6c4893b78a80658ef9fe +Author: Catouse +Date: Tue Sep 17 16:52:52 2013 +0800 + + Revert "* change style." + + This reverts commit 1f830da3efccbf3e6063900a10be9200feaa8959. + +commit 1f830da3efccbf3e6063900a10be9200feaa8959 +Author: Catouse +Date: Tue Sep 17 15:01:00 2013 +0800 + + * change style. + +commit f5826c13156dac5b12ab30d51380e11f8f3f9611 +Author: Catouse +Date: Tue Sep 17 13:59:18 2013 +0800 + + * add 'class' parameter for function 'commonButton'. + +commit d05c0235d2bbecf26ef8d63078436646b928e03f +Author: Catouse +Date: Tue Sep 17 13:22:33 2013 +0800 + + * ajust style of footer and page my/index. + +commit acabc4f81e0a14c258f28d22ef9867f515d5aef4 +Author: Catouse +Date: Tue Sep 17 11:35:28 2013 +0800 + + * ajust style of search form. + +commit cece89e621d1f93bf00870251d40d5498f7c44df +Author: Catouse +Date: Tue Sep 17 10:56:19 2013 +0800 + + * replace style of icons. + +commit c9b01af26c824561a0161790873a55b88aa95c70 +Author: Catouse +Date: Tue Sep 17 09:53:56 2013 +0800 + + * ajust style of module menu and feature bar. + +commit d5ef11b22ffb7cc0a6c350830437a7b8b5fd5ff6 +Author: Catouse +Date: Mon Sep 16 15:36:48 2013 +0800 + + * ajust style of main menu. + +commit 7d9058320cc0f43e7e2da2f923050f0268062627 +Author: Catouse +Date: Mon Sep 16 14:33:49 2013 +0800 + + * ajust style of topBar. + +commit 6704e2c4b599b1150b17b8511101db7c6a3605a5 +Author: Catouse +Date: Mon Sep 16 14:14:50 2013 +0800 + + + add font-awesome support. + +commit e2f40afb04cf06c8304a2a4d3670e6ee8c048b9f +Merge: 31d1346bf7 5eb15407d7 +Author: wyd621 +Date: Thu Sep 12 15:56:52 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 31d1346bf7522bd92ffefb741ee338f2ea5340e2 +Author: wyd621 +Date: Thu Sep 12 15:56:24 2013 +0800 + + * fix a bug for order by left. + +commit 5eb15407d7fdf6272c8e6ff23e160df980da6db7 +Author: xia0ta0 +Date: Wed Sep 11 09:59:09 2013 +0800 + + * fix a warning: treeMenu[0]. + +commit 49d7b65f5470659971d6a3898549b057e760bde9 +Merge: 70436d6e63 3d8e60309f +Author: xia0ta0 +Date: Tue Sep 10 13:43:24 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 70436d6e63c5fc82dc3f78ff8b1f8468a507c89c +Author: xia0ta0 +Date: Tue Sep 10 13:42:28 2013 +0800 + + * fix a bug : testcase, not case. + +commit 36ea5246dbdb7bf540d9218de7e6311158ccae11 +Author: wyd621 +Date: Thu Sep 5 16:59:56 2013 +0800 + + * fix a bug for edit webapp. + +commit 3d8e60309fa9643b3f399503e71ca2f41023e366 +Merge: ca105a77ee e33122c70a +Author: wyd621 +Date: Thu Sep 5 14:14:56 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit ca105a77ee17575b6ec1298556aa62799e341988 +Author: wyd621 +Date: Thu Sep 5 14:14:02 2013 +0800 + + * fix a bug. + +commit e33122c70ad6239a98e78fa4641efad29ed63027 +Merge: 4b485a0560 8a4008b639 +Author: xia0ta0 +Date: Thu Sep 5 14:09:08 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4b485a05604584c25014cf8c3d298e9562622d05 +Author: xia0ta0 +Date: Thu Sep 5 14:03:09 2013 +0800 + + * fix bug#506. + +commit 8a4008b6394900b33c37096986a916a80256990e +Merge: 7b7fdc7ac5 d10b54ac6d +Author: wyd621 +Date: Wed Sep 4 15:20:51 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 7b7fdc7ac5f98f1522ac226fa1140005d4385871 +Author: wyd621 +Date: Wed Sep 4 15:19:18 2013 +0800 + + * fix a bug. + +commit d10b54ac6d4234c638ea8b87469cb4cf21b2dae6 +Author: xia0ta0 +Date: Wed Sep 4 11:24:58 2013 +0800 + + + add git ext. + +commit da1735f3c8762cee01e535ed555e092656bfc57a +Author: xia0ta0 +Date: Tue Sep 3 14:25:20 2013 +0800 + + * reset setCompany. + +commit 831a383726bde53b1278640725543b6923c82b16 +Merge: d24775b120 e07e89ee61 +Author: xia0ta0 +Date: Tue Sep 3 14:18:39 2013 +0800 + + Merge commit 'e07e89ee61311fed45bb9b78d6eafa3cf77d3c6f' + +commit e07e89ee61311fed45bb9b78d6eafa3cf77d3c6f +Author: xia0ta0 +Date: Tue Sep 3 13:58:34 2013 +0800 + + - format. + +commit d24775b120c96d405a41965965215b553d3a0017 +Merge: cf167a5c4f a48a853fca +Author: xia0ta0 +Date: Tue Sep 3 13:59:47 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit cf167a5c4fb11cbf0818d5a05fd264f9c94be666 +Author: xia0ta0 +Date: Tue Sep 3 13:58:34 2013 +0800 + + - remove setCompany. + +commit a48a853fca2af8b6855062edc2b4e8b354ba10e7 (tag: zentaopms_5.0.stable_20130903) +Merge: eed85d018c ca7adf965c +Author: wyd621 +Date: Mon Sep 2 16:51:23 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit eed85d018ce6ed4c3930ed7ecb2ab20a64bd597c +Author: wyd621 +Date: Mon Sep 2 16:48:43 2013 +0800 + + * fix a bug for upgrade. + +commit ca7adf965c2c9d935db53a1de58af3625bbaf39f +Author: azhi +Date: Mon Sep 2 15:29:42 2013 +0800 + + * adjust the code. + +commit 26d9adbe4d339493e875cee45914598a84d29b4b +Merge: db7a862661 563fc90963 +Author: xia0ta0 +Date: Mon Sep 2 14:43:45 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit db7a86266185a0ebaef9479f5405c0dd80202b0f +Author: xia0ta0 +Date: Mon Sep 2 14:42:23 2013 +0800 + + * fix syncgit. + +commit 0bc2dddc4f9ef165bb2803367d928c42ce1b9f16 +Author: xia0ta0 +Date: Mon Sep 2 14:14:56 2013 +0800 + + + add syncgit. + +commit 563fc90963d9cd318ce5e5a1257ced3a4c269d74 +Author: wyd621 +Date: Mon Sep 2 13:43:37 2013 +0800 + + * change for upgrade. + +commit 50e95562215713e5ed48a3311b330c44d1872dc6 +Author: azhi +Date: Fri Aug 30 14:04:41 2013 +0800 + + * fix bug#500. + +commit f32e6ecd85cd977c1bb0f040fa9c51ed78126a09 +Author: azhi +Date: Fri Aug 30 13:56:31 2013 +0800 + + * fix bug#502. + +commit cead3333713fab511e0c86b59ba9ae80b2d4a203 +Author: azhi +Date: Fri Aug 30 13:54:46 2013 +0800 + + * fix bug#503. + +commit f4cef6331e1860835288923c3e50e53ee86bc3ea +Author: azhi +Date: Fri Aug 30 11:22:27 2013 +0800 + + * fix bug#501. + +commit 72e00feda4a7b3da92e542aeb9a4f196beacb648 +Author: azhi +Date: Fri Aug 30 10:57:10 2013 +0800 + + * fix bug: if status == 'closed' then continue; + * adjust batchClose. + +commit 1fc857c907d174ee45625c080e7ee009206a3fe7 +Author: azhi +Date: Fri Aug 30 10:03:43 2013 +0800 + + * fix bug#494. + +commit 4699dcc957ebb30305098aee71fd7bcc1f415625 +Merge: c9762d7319 b55a39ee65 +Author: azhi +Date: Fri Aug 30 09:40:23 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit c9762d7319bd638b61f16e04381b3cebedf69122 +Author: azhi +Date: Fri Aug 30 09:39:38 2013 +0800 + + * code for task#1412. + +commit b55a39ee652910fe3f31c6ae9565924109ec633e +Author: xia0ta0 +Date: Fri Aug 30 09:28:32 2013 +0800 + + * adjust style of build info. + +commit 4061925b09dd358c65f1bf5615f63ee8ca0ca3a1 +Merge: a68ce40162 2933ec26df +Author: xia0ta0 +Date: Fri Aug 30 09:24:36 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit a68ce40162afacde6e80a44ca2749e16433334e6 +Author: xia0ta0 +Date: Fri Aug 30 09:24:06 2013 +0800 + + * fix a bug : edit and delete estimate. + +commit f29376761d8443df2b6fd0d4673743101734e628 +Author: azhi +Date: Fri Aug 30 09:12:36 2013 +0800 + + * code for task#1424. + +commit 2933ec26dfe5a15f10abfacda055a8f2e8f0e726 +Author: azhi +Date: Fri Aug 30 08:59:18 2013 +0800 + + * finish task#1424. + +commit 5315be9f2706c5f2f36c282bf9a3a796181efea7 +Author: iamazhi +Date: Thu Aug 29 16:42:40 2013 +0800 + + * fix bug#492. + +commit c9482ee556f28a98d8ebb0c28bf28cac598e89bb +Author: iamazhi +Date: Thu Aug 29 16:39:25 2013 +0800 + + * fix bug#493. + +commit fa54dff413cbb30567f788931a82bedc7647598e +Author: iamazhi +Date: Thu Aug 29 16:35:31 2013 +0800 + + * finish task#1412. + +commit 04daf5979f596efb7a91ac6c65c15a2caca4ddba +Merge: 3dbe46b51d 6136ac192a +Author: iamazhi +Date: Thu Aug 29 13:12:09 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 6136ac192a3f53514eb0184b87a6302014eadd23 +Author: wwccss +Date: Thu Aug 29 11:59:00 2013 +0800 + + * change .ztaccess for every package. + +commit 3dbe46b51d42b550f6c3e185d14352d73302edc4 +Author: z +Date: Thu Aug 29 11:26:12 2013 +0800 + + * fix bug#488. + +commit 1597c43804f9f47180839474a2d15403e31ae01e +Author: z +Date: Thu Aug 29 11:04:05 2013 +0800 + + * fix bug#489. + +commit bf486628c02425cccd2399480a3a2d85b7eea466 +Author: wwccss +Date: Thu Aug 29 10:44:12 2013 +0800 + + * change the make file. + +commit 25309d9505ffe8ddce4692f828e33005005e4620 (tag: zentaopms_5.0.beta2_20130827) +Author: wwccss +Date: Tue Aug 27 14:08:48 2013 +0800 + + * upgrade the version. + +commit d3a1c7ad3f71be0113d6b92e29eb1f656bea9f9b +Author: xia0ta0 +Date: Tue Aug 27 13:22:40 2013 +0800 + + - remove example path. + +commit d909d60d90966e3c8bf4cd69fbcdea81dbd7c392 +Author: xia0ta0 +Date: Tue Aug 27 11:24:13 2013 +0800 + + * fix zh-tw. + +commit 551dbb1712ad225dba52b5031419c68a763d6529 +Merge: edd307602a b9b3e73ca5 +Author: xia0ta0 +Date: Tue Aug 27 09:31:43 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit edd307602a9bbae8e77c361527b9e4afe6c63cab +Author: xia0ta0 +Date: Tue Aug 27 09:31:03 2013 +0800 + + + add 5.0.beta1 upgrade. + +commit b9b3e73ca573c5a2c52f7096a385b587608525b4 +Author: wwccss +Date: Mon Aug 26 20:47:12 2013 +0800 + + * fix the spelling error of one weeks. + +commit b6e0f43997852d16bb74790643de3e1a86745cc3 +Merge: b3c78948fb 27e54f1202 +Author: wwccss +Date: Mon Aug 26 20:46:10 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 27e54f1202fbb2c5c1a4797c05a4364f2af3e1e4 +Author: xia0ta0 +Date: Mon Aug 26 16:19:03 2013 +0800 + + * code for task#1408. + +commit 588648bb8e60a9e0cc353962f82b19852a93155c +Author: xia0ta0 +Date: Mon Aug 26 15:49:39 2013 +0800 + + * code for task#1405. + +commit 36024ce40a7377fa9fe97b687254c58073ab9d46 +Author: xia0ta0 +Date: Mon Aug 26 15:07:45 2013 +0800 + + * fix bug#457. + +commit 26ce3673b5cc2b104807964cd71853b130f7ced0 +Author: xia0ta0 +Date: Mon Aug 26 14:27:47 2013 +0800 + + * remove draft stories. + +commit 046f075f691eb096060fbb9f4cf803cd325a699e +Merge: 2ddd389a21 abd4f18af8 +Author: xia0ta0 +Date: Mon Aug 26 12:11:06 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 2ddd389a21a04d4cc797e8ec434ec7423979cc1c +Author: xia0ta0 +Date: Mon Aug 26 10:39:09 2013 +0800 + + * code for task#1365. + +commit abd4f18af85a544d1da40b92dda6090fee61bdb1 +Author: azhi +Date: Mon Aug 26 10:16:58 2013 +0800 + + * finish task#1406. + +commit 967f9cd0e5a76a68a702ef9343d7412f8bbd4350 +Author: azhi +Date: Fri Aug 23 11:21:24 2013 +0800 + + + add git module. + +commit 5e52c53dd2521232d4cd3cb924f418b6319482dd +Author: xia0ta0 +Date: Wed Aug 21 15:59:59 2013 +0800 + + * code for task#1403. + +commit faec7a8092b038b52514deab875a5cad10fb205d +Author: azhi +Date: Wed Aug 21 13:45:20 2013 +0800 + + * fix bug#483. + +commit ca93b742cdbec8e8b638fb14fa30485d79a53fb4 +Author: azhi +Date: Wed Aug 21 13:18:38 2013 +0800 + + * fix bug#481. + +commit 5bfb46323910f53f55f875a33e27589109e062a8 +Author: azhi +Date: Wed Aug 21 11:22:45 2013 +0800 + + * fix bug#461. + +commit c51ec3b3794cda1b9fe7f1f47fdd47468d5a4e1c +Author: azhi +Date: Wed Aug 21 10:50:41 2013 +0800 + + * fix bug#467. + +commit b74358ede49181a82d59ba51d307c947850a52c0 +Author: azhi +Date: Wed Aug 21 10:43:22 2013 +0800 + + * fix bug#469. + +commit b18fb04eda85f4ebab7148b97f5b015a504cbd5c +Author: azhi +Date: Wed Aug 21 10:34:28 2013 +0800 + + * adjust the code. + +commit e130f43bb871c1645ac5634c266bbdcce32343a4 +Author: azhi +Date: Wed Aug 21 10:31:13 2013 +0800 + + * fix bug#482. + +commit 70301377c1fefe10ccb7e74da1823b7532a939dd +Author: azhi +Date: Wed Aug 21 10:28:23 2013 +0800 + + * code for task#1395. + +commit 746cbf28995f6eb07ff31529a640fc2197b83de3 +Author: azhi +Date: Wed Aug 21 09:52:20 2013 +0800 + + * finish task#1395. + +commit a1e80ec59ce92ed30ed98dd1337e50e1add4ff37 +Author: azhi +Date: Wed Aug 21 08:52:22 2013 +0800 + + * finish task#1388. + +commit 30dd77cfabf16156dd7fe60ca1c2974267775d7a +Author: wyd621 +Date: Tue Aug 20 16:06:17 2013 +0800 + + * finish task #1392. + +commit 7fd864fcf9e534396053d63f882b5cfb4513e139 +Author: wyd621 +Date: Tue Aug 20 16:05:53 2013 +0800 + + * fix a bug for bug tempate when create bug. + +commit 667110a5ca60cd17130e40f75d26f3890e1d9fbd +Author: wyd621 +Date: Tue Aug 20 11:28:27 2013 +0800 + + * finish task #1400. + +commit 3079ce5fa56362cdfed69d83b50a5d6518d7f773 +Author: wyd621 +Date: Tue Aug 20 08:27:10 2013 +0800 + + * fix js error. + +commit 58ab795bdf697f8917fac66283988b8274ccbc6f +Merge: 67a9c68636 ba58f898b4 +Author: wyd621 +Date: Mon Aug 19 15:44:05 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 67a9c68636f2c24152c767f73802697e6c63a4fc +Author: wyd621 +Date: Mon Aug 19 15:43:35 2013 +0800 + + * finish task #1396. + +commit ba58f898b47ad535cbdb009dcbd327bb1d918ba2 +Author: xia0ta0 +Date: Mon Aug 19 14:50:02 2013 +0800 + + * use ',' between repo accounts. + +commit 70d6a157ae1e8fb961198fcd74f9d3c7a9769232 +Merge: 123bb5d8c6 19e3ce4648 +Author: wyd621 +Date: Mon Aug 19 09:24:34 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 123bb5d8c6a3adda689ff874da7fa26a6d92d6c0 +Author: wyd621 +Date: Mon Aug 19 09:23:58 2013 +0800 + + * fix a bug for dropmenu. + +commit b3c78948fb32dd99bd84fee3d1e69d45379c4071 +Merge: fc67cc127c 19e3ce4648 +Author: wwccss +Date: Fri Aug 16 13:15:18 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 6f5ec321d1f89befdd4c55de13d07afc2932081f +Author: wyd621 +Date: Fri Aug 16 10:50:07 2013 +0800 + + * fix a bug. + +commit 19e3ce4648961722eb89afa2404fcb265102d3c6 +Author: iamazhi +Date: Wed Aug 14 16:00:27 2013 +0800 + + * change for mobile. + +commit a0d38bd40dbebed01aa93800f11c8cb349737822 +Merge: 4cc1e23f30 e5efccef56 +Author: iamazhi +Date: Wed Aug 14 08:53:37 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit e5efccef5606f0fc1a61b8e61eb3324e3c355c9a +Merge: 0304d4ae97 cc2cf3484d +Author: xia0ta0 +Date: Mon Aug 12 14:48:17 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0304d4ae970a17770d7abc73e9f5a97e7db3cc70 +Author: xia0ta0 +Date: Mon Aug 12 14:47:17 2013 +0800 + + * fix a bug : fix getTaskOptionMenu. + +commit cc2cf3484d0c17c9739034db18223b6ca5e5a69c +Merge: f021bebdb1 6b0caf785f +Author: wyd621 +Date: Mon Aug 12 10:12:21 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit f021bebdb1f8478469987227667788e9fc831ff1 +Author: wyd621 +Date: Mon Aug 12 09:51:18 2013 +0800 + + * fix a bug for change TABLE_CUSTOM to TABLE_LANG. + +commit 6b0caf785f75cbeeda855cbc95c5bb51ab396690 +Merge: 9d1a5f3130 ddfa3d8d66 +Author: azhi +Date: Mon Aug 12 09:09:03 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 9d1a5f313051b97707ab0bb40bd611b8e7de2fa2 +Author: azhi +Date: Mon Aug 12 09:08:14 2013 +0800 + + * fix bug: adjust the account is guest when open the authority of + * ajaxGetDropMenu. + +commit ddfa3d8d664d087f51e17e684c7cff13374cebdf +Author: wyd621 +Date: Mon Aug 12 08:56:09 2013 +0800 + + * fix a bug for upgrade. + * change zt_custom to zt_lang. + +commit fc67cc127c17e3becbc938e7c00a43c6a8758efd +Merge: d93b4c7262 b26370d6cb +Author: wwccss +Date: Mon Aug 12 08:30:28 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit b26370d6cb0536567854f0777a9a7c2d6de106c2 +Author: wyd621 +Date: Fri Aug 9 16:45:00 2013 +0800 + + * fix a bug. + +commit a33f27212ec33fafcdcb4430181a65fd08e85020 +Author: wyd621 +Date: Fri Aug 9 16:37:59 2013 +0800 + + * fix a bug. + +commit a8ede1f9f431e5fe10eb60c5a8b070404c73698e +Author: wyd621 +Date: Fri Aug 9 16:25:31 2013 +0800 + + * fix zentao.sql for 5.0.beta1. + +commit 79a8b3602f9f9e6bca0a1c5bce0bd66c1fc36cfc (tag: zentaopms_5.0.beta1_20130809) +Author: wyd621 +Date: Fri Aug 9 14:10:17 2013 +0800 + + * upgrade sql. + +commit f6d5e53cd10efe3c986c5c055444ed94654cc200 +Author: wyd621 +Date: Fri Aug 9 11:24:30 2013 +0800 + + * fix error to triggerError. + +commit 05d96ab74a18b0d08f3f899becb87c231f0bcecf +Author: wyd621 +Date: Fri Aug 9 10:37:44 2013 +0800 + + * change version to 5.0.beta1. + +commit 3caa3e985a119732da0d902b30a0e6e022f16d75 +Author: wyd621 +Date: Fri Aug 9 10:08:02 2013 +0800 + + * add new version. + +commit 2c15082d147a64ab8d4e0a60f873bbe96e43ba30 +Author: xia0ta0 +Date: Fri Aug 9 09:54:19 2013 +0800 + + * resloved bugs first in build. + +commit ee9d70ca873639f09310bb6a75ec463b65be71a1 +Author: xia0ta0 +Date: Fri Aug 9 09:34:53 2013 +0800 + + * fix bug locate. + +commit 121ac9b2ff1d256030d196d3254075d4b51b42df +Merge: bacd9ff4a3 779e3f3ca3 +Author: xia0ta0 +Date: Fri Aug 9 09:03:11 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit bacd9ff4a3f5b663f74fc9ceb68ea10b90095c39 +Author: xia0ta0 +Date: Fri Aug 9 08:59:51 2013 +0800 + + * fix a bug: createBuild is a var. + +commit 779e3f3ca34537c0aad8414b2c2731745b1c9c64 +Merge: 924135c272 1b974ea427 +Author: wyd621 +Date: Fri Aug 9 08:54:18 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 924135c2726499f4858be276080d35a52fdd7e5c +Author: wyd621 +Date: Fri Aug 9 08:53:37 2013 +0800 + + * fix a bug for bug #466. + +commit 1b974ea4278de28a780d12a2d6ef698dcc77fd22 +Author: xia0ta0 +Date: Thu Aug 8 17:45:37 2013 +0800 + + * code for task#1678. + +commit 44d3287bbf2c24d5779d09c11b430ba2577515d0 +Merge: 36bbaf711e 0b4871a98c +Author: xia0ta0 +Date: Thu Aug 8 16:09:05 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 36bbaf711e4eb88180be71d42926b8ef26afe47f +Author: xia0ta0 +Date: Thu Aug 8 16:08:15 2013 +0800 + + * code for task#1678. + +commit 4cc1e23f30d9b0bf28d25724ce8a47b47bde1338 +Merge: d4154063e7 0b4871a98c +Author: iamazhi +Date: Thu Aug 8 15:51:04 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0b4871a98cb8d9ceae62e3b9b939948080668c25 +Merge: 3d17951ba7 f4ed4653b1 +Author: azhi +Date: Thu Aug 8 15:46:37 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 3d17951ba77d87b58f8c39be3c8ba0ab4a5ffc19 +Author: azhi +Date: Thu Aug 8 15:45:54 2013 +0800 + + * finish task#1685. + +commit f4ed4653b1b32bbd03d291548492cee9bbde2694 +Merge: 43ca840982 a14b2c5e7d +Author: wyd621 +Date: Thu Aug 8 15:44:07 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 43ca840982f2df057bfbd4bf8232ea08c78f70b7 +Author: wyd621 +Date: Thu Aug 8 15:43:32 2013 +0800 + + * fix a bug for build link bug. + +commit a14b2c5e7dd2117295a5c555fcab6fad7907d821 +Author: azhi +Date: Thu Aug 8 15:02:27 2013 +0800 + + * finish task#1689. + * add authority for bug-batchResolve. + +commit 39399d6e69f01238acd7d7fc9898a06e7be0c92c +Author: azhi +Date: Thu Aug 8 13:59:19 2013 +0800 + + * set the font-size=12 of summary. + +commit 3c97af8be2cc6bd335b74a09fa42ee85dfdcd71b +Author: azhi +Date: Thu Aug 8 13:51:11 2013 +0800 + + * finish task#1687. + +commit 39994fb21e7b55937b11bd3726dda7cf2f5b6c76 +Author: azhi +Date: Thu Aug 8 13:41:47 2013 +0800 + + * finish task#1684. + +commit 3b74f6ad70bbb10c562eb7466c11d8ac28165b90 +Author: azhi +Date: Thu Aug 8 11:39:58 2013 +0800 + + * finish task#1686. + +commit a087704212dda33ad234bc17733ef9272389d7f9 +Author: azhi +Date: Thu Aug 8 11:13:15 2013 +0800 + + * finish task#1683. + +commit 43c38fc552bc29dd87d94c45e871b63fed2303bc +Author: azhi +Date: Thu Aug 8 10:22:50 2013 +0800 + + * add disabled the has no authority of project-importTask and + * project-importBug. + +commit c8bf1a9d2aeb3db78b0dc6f92ccbe4a22d98b12e +Merge: e4d27b3a67 2b42181852 +Author: azhi +Date: Thu Aug 8 09:57:35 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit e4d27b3a67ece0d5e8953d6aa22dfb12ed632ce9 +Author: azhi +Date: Thu Aug 8 09:56:43 2013 +0800 + + * code for task#1678. + * remove the byModule link. + +commit df52457ceff5bedb9a20adb35c3d07c4f5e9697c +Author: azhi +Date: Thu Aug 8 09:34:52 2013 +0800 + + * code for task#1678. + +commit 7983d567db618190006ee7a205db8c36544e7af1 +Author: azhi +Date: Thu Aug 8 09:24:56 2013 +0800 + + * code for task#1678. + +commit 2b4218185251a95c9b799e4c8aa9934f637a6fd9 +Author: wyd621 +Date: Thu Aug 8 08:51:02 2013 +0800 + + * init object. + +commit d4154063e7932821ce0c736f6357fcf14bbd0ff5 +Author: z +Date: Thu Aug 8 08:44:47 2013 +0800 + + * code for task#1678. + * toggle divider when toggle tree box. + +commit 8b5d33ef6174669e629b4163335ee6071aaf6362 +Author: wyd621 +Date: Thu Aug 8 08:12:25 2013 +0800 + + * fix a bug for get db lang. + +commit 0591161c02626a9c4a74c83019444831694fd0df +Merge: 1caa03cac4 4e97e8e8cb +Author: wyd621 +Date: Thu Aug 8 08:00:50 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 4e97e8e8cb3738d9d4786b61e363d4032be68831 +Author: azhi +Date: Wed Aug 7 16:49:10 2013 +0800 + + * add 'system' column. + +commit 1caa03cac401c7c16e2cbaa13d992127c1f36593 +Merge: ed3371923a 1f3cde2847 +Author: wyd621 +Date: Wed Aug 7 16:45:11 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit ed3371923aab0fdce0d50955d29e5bdfa44a6840 +Author: wyd621 +Date: Wed Aug 7 16:44:41 2013 +0800 + + * fix a bug for webapp pager. + +commit 1f3cde2847149f66c240cc932450906dabb666f3 +Author: azhi +Date: Wed Aug 7 16:37:28 2013 +0800 + + * code for custom set. + +commit bac24e0c81d4b058aa47d8366d321a392afa3591 +Merge: ea739d600b 109d690f05 +Author: azhi +Date: Wed Aug 7 15:51:45 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit ea739d600b07704d3e48cfea87fc36fdb1bf6acd +Author: azhi +Date: Wed Aug 7 15:48:55 2013 +0800 + + * adjust for load lang from db. + +commit 88e92a19aab879f78d63056b350eac06976e2d32 +Author: xia0ta0 +Date: Wed Aug 7 14:17:03 2013 +0800 + + * fix a bug : warning if no tasks. + +commit 109d690f055c9812d802f5cc2daa7133afce303e +Merge: 74b531f810 aebe854ad9 +Author: xia0ta0 +Date: Wed Aug 7 14:03:36 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 74b531f8102267c0874f6a1693c368b681082ab7 +Author: xia0ta0 +Date: Wed Aug 7 14:02:56 2013 +0800 + + * fix strict warning. + +commit aebe854ad96c58d1d41e7920d05b08ab7e33cac5 +Author: azhi +Date: Wed Aug 7 13:40:23 2013 +0800 + + * finish task31673. + * add chosen(multiple) for stageList of testcase-batchedit. + * add authority for custom module. + +commit 145c55b4473af26bceb7e5bc362492cfb6ed4252 +Author: azhi +Date: Wed Aug 7 10:40:10 2013 +0800 + + * finish task#1670. + * finish task#1671. + * finish task#1672. + * finish task#1674. + * finish task#1675. + * finish task#1676. + * finish task#1668. + +commit 4358fd24b37593fe24856835521617a37ca99617 +Merge: af97dcb643 af6e107b50 +Author: xia0ta0 +Date: Wed Aug 7 10:19:18 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit af97dcb643cb54e3a1426a36ea0c09f42c02c940 +Author: xia0ta0 +Date: Wed Aug 7 10:08:07 2013 +0800 + + * isClickable is static function. + +commit 107e4ec2d8e82a5ac2119d6314ed19850b9a2b7f +Author: xia0ta0 +Date: Wed Aug 7 09:24:04 2013 +0800 + + * fix a bug : $index not defined. + +commit af6e107b504e4833f06a1ec9d61dd8a8bff73b1f +Merge: b77e1b16da b36a75eff0 +Author: azhi +Date: Tue Aug 6 17:10:00 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit b77e1b16da0507bcdb721deee540c2d79dc24ec7 +Author: azhi +Date: Tue Aug 6 17:09:23 2013 +0800 + + * code for task#1670. + +commit b36a75eff0ec6517cd31b8c2200d8ed9943a40b3 +Author: wyd621 +Date: Tue Aug 6 16:31:07 2013 +0800 + + * adjust pager. + +commit 1838a4a73b8b0061c4c59698284fe31c3122ea15 +Merge: 500858eb5e 00f604ec3d +Author: wyd621 +Date: Tue Aug 6 16:11:45 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 500858eb5e9597589a0fd8eefaa497cdb8fade59 +Author: wyd621 +Date: Tue Aug 6 16:11:11 2013 +0800 + + * adjust code and fix bugs. + +commit 00f604ec3d534d4d938e749d95f898d23ed2b30c +Author: xia0ta0 +Date: Tue Aug 6 15:15:41 2013 +0800 + + * fix table width. + +commit afa00d0be12bddb694820345a1dc0e43ca1eb2d7 +Author: xia0ta0 +Date: Tue Aug 6 15:13:54 2013 +0800 + + * adjust bug confirm. + +commit d93b4c7262b01240d3b464d29ab49bd5d98882f6 +Author: wwccss +Date: Tue Aug 6 13:09:50 2013 +0800 + + * use date for lasteEditedDate field. + +commit c7eb9e9be70af6df030e8ef960efed3c1965a7c3 +Merge: 3e75b16534 0fdf9dd1ec +Author: wwccss +Date: Tue Aug 6 13:05:09 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 0fdf9dd1ec2d89908000fe44802644ab8f4bc291 +Author: wyd621 +Date: Tue Aug 6 10:50:06 2013 +0800 + + * fix a bug #448. + +commit c787e0200790be054ab448475b9c143b9dc1f2d6 +Merge: 946364b7c5 fb7fb60ac7 +Author: wyd621 +Date: Tue Aug 6 08:52:20 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 946364b7c575187f0a9d58a6a8615d84ffa4e0ae +Merge: 159cae4120 7e891b1056 +Author: wyd621 +Date: Tue Aug 6 08:51:43 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit fb7fb60ac7c8ef1cb6f023a949cc0e6fedfa2466 +Author: azhi +Date: Tue Aug 6 08:51:30 2013 +0800 + + * fix bug: wrong colspan. + +commit 159cae41207bf683d85bb19e2de9e567bbc5d809 +Author: wyd621 +Date: Tue Aug 6 08:51:09 2013 +0800 + + * fix a bug for upgrade. + +commit 7e891b1056ff9dfa8655320fe8957d76de1dc3e6 +Author: azhi +Date: Mon Aug 5 17:04:07 2013 +0800 + + * code for task#1670. + +commit 166d35b5052abf09e26ae56a7a47d5efdb28b171 +Merge: 980902940c e8c1d58782 +Author: azhi +Date: Mon Aug 5 14:38:21 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 980902940c1ae93988c440e80fc3f363764c3bc4 +Author: azhi +Date: Mon Aug 5 14:37:36 2013 +0800 + + * finish task#1667. + +commit e8c1d5878290aae1bb184ba0cec2760f010f3d9f +Merge: b9a380a658 d05f18aa38 +Author: wyd621 +Date: Mon Aug 5 14:14:21 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit b9a380a658f029de9926f69e2db83318c27f2cfa +Author: wyd621 +Date: Mon Aug 5 14:13:42 2013 +0800 + + * change for 4.3.beta. + +commit d05f18aa38f3b8cc3429bde08a8ac0648f887ff5 +Author: azhi +Date: Mon Aug 5 14:10:43 2013 +0800 + + * finish task#1666. + +commit 45f94c0f220b4c3c39214a6208c878c1572ef9b8 +Author: azhi +Date: Mon Aug 5 14:07:51 2013 +0800 + + * code for task#1669. + +commit 09446e2ea8a6c9f00b156084996e6c18a8df54db +Merge: c80ef1e1fd 69106a374d +Author: azhi +Date: Mon Aug 5 12:36:24 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit c80ef1e1fd8ecd38ff39a18f3bcfadfaa4ae3901 +Author: azhi +Date: Mon Aug 5 10:38:30 2013 +0800 + + * adjust align. + +commit 69106a374d84333e057ac59a07f8a7818cb70f2e (tag: zentaopms_4.3.beta_20130805) +Author: wyd621 +Date: Mon Aug 5 10:22:07 2013 +0800 + + * change for new version. + +commit a77407a7fe81a9a4443e07d4b6134c78ce8d2c6b +Merge: 5e26222608 5be7ec6214 +Author: wyd621 +Date: Mon Aug 5 09:43:36 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 5e2622260896496e8f56ef08ebddd9b476a52fb5 +Author: wyd621 +Date: Mon Aug 5 09:43:06 2013 +0800 + + * adjust code and fix bug. + +commit 5be7ec6214aa072d8b9ea746f123def445364c23 +Author: xia0ta0 +Date: Mon Aug 5 09:23:15 2013 +0800 + + * code for task#1581. + +commit 3e75b1653448a7d9045d4b5f6ee7c138f655238e +Author: wwccss +Date: Sat Aug 3 09:53:05 2013 +0800 + + Revert " - delete menuOrder.php." + + This reverts commit d906246c05e6694e0ba826acce27ccbe5744b21b. + +commit d906246c05e6694e0ba826acce27ccbe5744b21b +Author: wwccss +Date: Sat Aug 3 09:48:39 2013 +0800 + + - delete menuOrder.php. + +commit 44b2bf517163c788d44d126f142243d4811ad819 +Author: xia0ta0 +Date: Fri Aug 2 17:20:19 2013 +0800 + + * code for task#1581. + +commit 12c494e162ff15a09f18a662b3f3e77d4e3e1a23 +Merge: 1e563f2f3e fa147203b1 +Author: xia0ta0 +Date: Fri Aug 2 15:55:48 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 1e563f2f3ef443d68bac8be7fdf38948de8654d0 +Author: xia0ta0 +Date: Fri Aug 2 15:55:13 2013 +0800 + + * code for task#1636. + +commit 9aca54f96f1cc617b3d9c7aa80e74a79d16f9adf +Author: xia0ta0 +Date: Fri Aug 2 15:52:26 2013 +0800 + + * code for task#1636. + +commit fa147203b13a227fab21896795f7b780f2105872 +Merge: 1140dbe11f 62fae468b0 +Author: wyd621 +Date: Fri Aug 2 15:45:09 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 1140dbe11fddac62c131e6d94f55eaaf31d0ee6d +Author: wyd621 +Date: Fri Aug 2 15:44:40 2013 +0800 + + * finish task #1662. + +commit 62fae468b0754d784c8cb87398fcd27b4f047ecd +Author: azhi +Date: Fri Aug 2 15:18:32 2013 +0800 + + * code for task#1648. + +commit 902f2a428f86a34998b107f6ba6fecbd614064c0 +Author: xia0ta0 +Date: Fri Aug 2 15:14:00 2013 +0800 + + * code for task#1636. + +commit 65935160752576b43bb57cef8723a4058d1cb6ac +Author: azhi +Date: Fri Aug 2 15:12:41 2013 +0800 + + * code for task#1648. + +commit 96df1dd035c6465a91f56c42996a3fec82767e5c +Merge: df4c2a15c3 f9a6f9a276 +Author: xia0ta0 +Date: Fri Aug 2 14:57:31 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit df4c2a15c366c1ebe33bb2b49a06bb98b682215b +Author: xia0ta0 +Date: Fri Aug 2 14:56:47 2013 +0800 + + * code for task#1620. + +commit f9a6f9a2764153954dba350a85d195dd97796e9f +Merge: 472ad802ad dafd297f6a +Author: azhi +Date: Fri Aug 2 10:42:58 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 472ad802ade3a13cf736d733162ea2c604976887 +Author: azhi +Date: Fri Aug 2 10:42:16 2013 +0800 + + * code for task#1648. + +commit 01dd3ac526c69e760b4b8dc04cbcae7af28485a1 +Author: wyd621 +Date: Fri Aug 2 10:36:34 2013 +0800 + + * fix bug for waring. + +commit 26a8572bde5d48a6053227ced91eb768a14bc9ce +Author: xia0ta0 +Date: Fri Aug 2 10:24:03 2013 +0800 + + * fix bug for set flow. + +commit dafd297f6ac0e9f1203be4c22b1b743cacc7c288 +Merge: 3d0e2ba9c6 16ff3a0c12 +Author: wyd621 +Date: Fri Aug 2 10:17:34 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 3d0e2ba9c6f1678390459002ef257fe9e84de583 +Author: wyd621 +Date: Fri Aug 2 10:17:06 2013 +0800 + + * fix a bug for set flow to full. + +commit 16ff3a0c121e13d5b7a81829f09a3a2ce4d468c1 +Merge: 79dfd7851b 87a7c2b9a5 +Author: azhi +Date: Fri Aug 2 10:15:38 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 767c1353030f3b0d83f15aea8d05593c534ffa5a +Author: wyd621 +Date: Fri Aug 2 10:15:02 2013 +0800 + + * fix bug for waring. + +commit 79dfd7851b23110b3cf178716403dcdb9437d5a7 +Author: azhi +Date: Fri Aug 2 10:13:49 2013 +0800 + + * code for task#1648. + * add dropmenu to common/view jquery/dropmenu. + +commit 87a7c2b9a576794bc25bdf18511b18dce96d0440 +Author: xia0ta0 +Date: Fri Aug 2 10:10:45 2013 +0800 + + * code for task#1622. + +commit a215237c506a4df5d32ebcb5c5df1c9a96a11e50 +Merge: 9d2679c05c 42827590d1 +Author: xia0ta0 +Date: Fri Aug 2 09:57:34 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 9d2679c05c4d80399cae1164d8669f9cf9e8d2b3 +Author: xia0ta0 +Date: Fri Aug 2 09:57:04 2013 +0800 + + * code for task#1654. + +commit 175c5982c6e26622c7a4adce6550367a893a8c21 +Author: xia0ta0 +Date: Fri Aug 2 09:52:58 2013 +0800 + + * code for task#1654. + +commit f91ebb211a79b65ae71c969024adb80b89b48a33 +Author: xia0ta0 +Date: Fri Aug 2 09:33:15 2013 +0800 + + * code for task#1654. + +commit 2e338cd1eba14a4f6024364f4c9a882e97693364 +Author: xia0ta0 +Date: Fri Aug 2 08:58:37 2013 +0800 + + * code for task#1665. + +commit d346820f653149abd17897bf3ace43fe16a7b42c +Author: xia0ta0 +Date: Fri Aug 2 08:58:02 2013 +0800 + + * code for task#1665. + +commit c97dd391ac02ab553d41e38da5ef2b6ad7eaea53 +Author: xia0ta0 +Date: Fri Aug 2 08:57:23 2013 +0800 + + * code for task#1665. + +commit 42827590d1cdc02ef88d7b10a7c179bf887033ea +Merge: ce08eaed8d 0a3be4a998 +Author: azhi +Date: Fri Aug 2 08:51:13 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit ce08eaed8d4b5d3db3bd9ab6612fdfb8cf2a44f8 +Author: azhi +Date: Fri Aug 2 08:50:36 2013 +0800 + + * adjust the placeholder of chosen. + +commit 48ba3c94c6b5a6c38f0bb8ca29e3d8e2edffdb56 +Author: wyd621 +Date: Fri Aug 2 08:45:29 2013 +0800 + + * adjust code for task #1660. + +commit 40f30c489a06a2a2f3c3f0fb3ad5cf6512450e9e +Author: wyd621 +Date: Fri Aug 2 08:42:51 2013 +0800 + + * adjust code for task #1626. + +commit 0a3be4a998862db6f9f89b88635349d7977dff0c +Author: wyd621 +Date: Fri Aug 2 08:26:27 2013 +0800 + + * fix a bug for error encode when import csv. + +commit 7ed9556bdabe3bef20cc7d5c42a0d531b3e1cba1 +Merge: 858d1b3d7f ff28f5e032 +Author: xia0ta0 +Date: Fri Aug 2 08:19:20 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 858d1b3d7f92e785d53aaf399904dba7c92ed70c +Author: xia0ta0 +Date: Fri Aug 2 08:18:14 2013 +0800 + + * code for task#1665. + +commit cb8f96a348ff7315ae1672fdccb3c1f0bbd1ecca +Author: xia0ta0 +Date: Fri Aug 2 08:16:30 2013 +0800 + + * code for task#1665. + +commit ad54b16e64acccd6c0e37475be2679ec0256a412 +Merge: 68682101b5 ec53587f8c +Author: azhi +Date: Thu Aug 1 16:53:10 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 68682101b55ce62bdce2bbcd0ee49d5d1de0e223 +Author: azhi +Date: Thu Aug 1 16:52:24 2013 +0800 + + * finish task#1645. + +commit ec53587f8c873ecde65ef813ded20edbe6e6fd67 +Author: xia0ta0 +Date: Thu Aug 1 16:50:08 2013 +0800 + + * fix bug : ajdust module related. + +commit cb6efc8eb368281cfac5d5d6b7555999ee14ebd1 +Author: xia0ta0 +Date: Thu Aug 1 16:39:48 2013 +0800 + + * fix bug : ajdust module related. + +commit 8ffd00eca60891a547a5a22098a2b75bdfd12eb7 +Author: xia0ta0 +Date: Thu Aug 1 15:15:52 2013 +0800 + + * fix a bug : merge ajaxGetPlans function. + +commit a8de10fa9464e587be494ec4e498395168988c35 +Author: xia0ta0 +Date: Thu Aug 1 15:14:18 2013 +0800 + + * fix a bug : merge ajaxGetPlans function. + +commit 842ba1cf4ac2a0df4741b27cab60712d5cf33ad7 +Author: xia0ta0 +Date: Thu Aug 1 15:08:05 2013 +0800 + + * fix a bug : planID is undefined in create page. + +commit 1de3a97b32ad271fa8ba2c042185f4eb2dabdced +Author: xia0ta0 +Date: Thu Aug 1 14:48:12 2013 +0800 + + * code for task#1621. + +commit 2ad98630b9ab15daf19611dfaddd1244cfe1b768 +Author: xia0ta0 +Date: Thu Aug 1 14:37:25 2013 +0800 + + * code for task#1639. + +commit 1a46c87363a4424c7de29193971cb1203f865e1d +Merge: 73daf4dc85 17ee8cdabd +Author: xia0ta0 +Date: Thu Aug 1 14:34:44 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 73daf4dc85aa20de5c7da897e8813da63bab9b69 +Author: xia0ta0 +Date: Thu Aug 1 14:33:39 2013 +0800 + + * code for task#1639. + +commit 6612defc02b8513f1e393175fc9fe7680928e299 +Author: xia0ta0 +Date: Thu Aug 1 14:14:17 2013 +0800 + + * code for task#1629. + +commit 17ee8cdabd131f8f7de85e83b0cfba9a5447ee28 +Author: azhi +Date: Thu Aug 1 13:53:57 2013 +0800 + + * code for task#1659. + +commit 4b09288597f824c4acf92cd225534245d1975d4b +Merge: 633d26dc8a 8af0c01948 +Author: azhi +Date: Thu Aug 1 13:32:17 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 633d26dc8a4937e4fc3a1534de6136420ed053b3 +Author: azhi +Date: Thu Aug 1 13:31:51 2013 +0800 + + * finish task#1068. + +commit 8af0c01948d52da0591e438e472254c1b9ba9d45 +Author: xia0ta0 +Date: Thu Aug 1 11:33:58 2013 +0800 + + * code for task#1631. + +commit 984e5efadb6bb9907a8848a70583bd31c032686d +Author: xia0ta0 +Date: Thu Aug 1 11:28:25 2013 +0800 + + * code for task#1630. + +commit 75e02e86cfdb0b45d44095bfed41725fcd8dc01b +Author: xia0ta0 +Date: Thu Aug 1 11:14:30 2013 +0800 + + * code for task#1657. + +commit a4964c6e017ffbb4cb06e11d5c6da33bd9c4871d +Author: xia0ta0 +Date: Thu Aug 1 11:12:02 2013 +0800 + + * code for task#1657. + +commit 40ea8cf4c173379c404550779c36a43786293ff0 +Author: xia0ta0 +Date: Thu Aug 1 11:09:58 2013 +0800 + + * code for task#1657. + +commit affd044bb3f37ee9d2f5872815e0114c66c2bc8c +Author: xia0ta0 +Date: Thu Aug 1 11:07:00 2013 +0800 + + * code for task#1657. + +commit 4d19ea6f100b0c273bf5b9580682e50d47a6e818 +Author: xia0ta0 +Date: Thu Aug 1 10:57:12 2013 +0800 + + * code for task#1657. + +commit 2de48dceda5711e413d760f557d7118d7c663efc +Author: xia0ta0 +Date: Thu Aug 1 10:53:33 2013 +0800 + + * code for task#1657. + +commit 49bc364c61207bd1a84a648a8a95f8d3c13e8f64 +Author: xia0ta0 +Date: Thu Aug 1 10:51:35 2013 +0800 + + * code for task#1657. + +commit 01be295d5a6180bc0f1dca4d2ce9d76432bfdeaf +Author: xia0ta0 +Date: Thu Aug 1 10:48:36 2013 +0800 + + * code for task#1657. + +commit 51db05dddf2baf28116f3a07884c025c344c7189 +Author: xia0ta0 +Date: Thu Aug 1 10:45:06 2013 +0800 + + * fix bug in .ignore. + +commit b6b4010892fcc898ba6c78fbe3cdbb49d7b50bb5 +Author: xia0ta0 +Date: Thu Aug 1 10:44:08 2013 +0800 + + * code for task#1657. + +commit d68ffad2513f285c02c3e69bbf8a3b38928aca56 +Author: xia0ta0 +Date: Thu Aug 1 10:17:36 2013 +0800 + + * code for task#1657. + +commit 7a2df7dfcc1c30b827bcfe6f48d723486f2c850f +Author: xia0ta0 +Date: Thu Aug 1 10:16:40 2013 +0800 + + * code for task#1657. + +commit 5f6f9cae7d5e1bef5a73e06cad43970fce88282f +Author: xia0ta0 +Date: Thu Aug 1 10:16:08 2013 +0800 + + * code for task#1657. + +commit 6340c37ef81ddd833728309ffbbfdc68f34b8ca4 +Author: xia0ta0 +Date: Thu Aug 1 10:15:24 2013 +0800 + + * code for task#1657. + +commit 5115b5c7b223194c178c99a89129ff19abab03ef +Author: xia0ta0 +Date: Thu Aug 1 10:14:56 2013 +0800 + + * code for task#1657. + +commit 9dc6bc2894482805f2407a3ca2a68a2fa10f9db1 +Author: xia0ta0 +Date: Thu Aug 1 09:24:13 2013 +0800 + + * code for task#1657. + +commit ff28f5e03201f7af328f81ed1cb76c1a4457e03d +Merge: e259c31486 ad54b16e64 +Author: wyd621 +Date: Thu Aug 1 00:29:30 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + + Conflicts: + + module/productplan/control.php + +commit e259c314863e419d710f6a33cac0d117b57b9c8c +Author: wyd621 +Date: Thu Aug 1 00:27:04 2013 +0800 + + * finish task #1623. + +commit 27d0d2b8ffa936d4e987cef3ae214c77d7028352 +Author: xia0ta0 +Date: Wed Jul 31 17:50:52 2013 +0800 + + * code for task#1657. + +commit ef15e5fdc699167cd429c96203104028cc45ea5b +Author: xia0ta0 +Date: Wed Jul 31 17:48:07 2013 +0800 + + * code for task#1657. + +commit 1326035c57118407d06197a7c9f238fccd47ae98 +Merge: 4e787181d7 d1de6c6ca4 +Author: xia0ta0 +Date: Wed Jul 31 17:42:32 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4e787181d7efdd4451b794ab13618f2920f60faf +Author: xia0ta0 +Date: Wed Jul 31 17:42:11 2013 +0800 + + * code for task#1657. + +commit d4903c510acbc6bbf96ce355b58b2e7e262a15e8 +Author: xia0ta0 +Date: Wed Jul 31 17:35:10 2013 +0800 + + * code for task#1657. + +commit 8fb44b81e326bd4b82160f242f9fc65195b3c874 +Author: xia0ta0 +Date: Wed Jul 31 17:33:04 2013 +0800 + + * code for task#1657. + +commit f37afec4bb304ff888b4716fa3429d4e2f540a61 +Author: xia0ta0 +Date: Wed Jul 31 17:28:03 2013 +0800 + + * code for task#1657. + +commit 3053c2d248cc4453f99d1da1c52ccb546914f69b +Author: xia0ta0 +Date: Wed Jul 31 17:07:51 2013 +0800 + + * code for task#1657. + +commit d1de6c6ca4cb1b91a5921a193da1fa6967088b54 +Author: azhi +Date: Wed Jul 31 16:59:52 2013 +0800 + + * code for task#1559. + +commit 65beb4ef18f21beeeb63530cb61e0e516a1cac23 +Merge: 49731b97ff 15749a6767 +Author: wyd621 +Date: Wed Jul 31 16:58:00 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 15749a6767a3cd1d69feb7970cc24d411bcf365f +Author: azhi +Date: Wed Jul 31 16:56:24 2013 +0800 + + * code for task#1559. + +commit 49731b97ffb8bcde118d258176c6a800cd6ce26a +Merge: 4cc4158bdc b9d2a319cc +Author: wyd621 +Date: Wed Jul 31 16:51:11 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit b9d2a319ccd2d1547b4e9fe5106d27d2b9e52837 +Merge: 4b28ede49a e6c660af1b +Author: azhi +Date: Wed Jul 31 16:50:09 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + + Conflicts: + + module/project/view/task.html.php + module/testcase/view/browse.html.php + +commit d2874f11f567926b3fc53ab6949d95394a49bd1f +Author: xia0ta0 +Date: Wed Jul 31 16:45:25 2013 +0800 + + * code for task#1657. + +commit 4b28ede49a607e31ab253c1984e8642a003fde54 +Author: azhi +Date: Wed Jul 31 16:38:11 2013 +0800 + + * finish task#1659. + * finish task#1661. + +commit 51284d16aa44a5a1a1bb6302c201ab926a4f0ff8 +Author: xia0ta0 +Date: Wed Jul 31 16:37:59 2013 +0800 + + * code for task#1657. + +commit 4cc4158bdc99acfa751354e5218accba6b322e19 +Author: wyd621 +Date: Wed Jul 31 16:35:40 2013 +0800 + + * finish task #1617. + +commit e29bad9f08a760ac85dc9554f655b4ebaeca03f6 +Author: xia0ta0 +Date: Wed Jul 31 15:59:31 2013 +0800 + + * code for task#1657. + +commit 92d6af50e3ebd7f46d2f91dc0690fafba0c4dff3 +Author: wyd621 +Date: Wed Jul 31 15:50:45 2013 +0800 + + * finish task #1618. + +commit e6c660af1b57f9d5a19b685d39afad90d59c0f9b +Author: wyd621 +Date: Wed Jul 31 15:39:15 2013 +0800 + + * finish task #1637. + +commit b970dcc33ab4d915ef68924f277a920e585e3bde +Author: wyd621 +Date: Wed Jul 31 15:37:36 2013 +0800 + + * adjust for git. + +commit 9fa49f4918951c16a1426c6b14b491149a470e7b +Author: wyd621 +Date: Wed Jul 31 15:36:48 2013 +0800 + + * adjust for link product use chosen. + +commit 65b1d1b359ae06e79c78d8046330ec81875d5880 +Author: xia0ta0 +Date: Wed Jul 31 14:37:25 2013 +0800 + + * code for task#1657. + +commit 9eb1223a8a7e2787fc5db4aa01d05e44467aac30 +Author: azhi +Date: Wed Jul 31 14:23:37 2013 +0800 + + * fix bug: correct validRate tips. + +commit ef91b40279d7e4b38e9286b8a671bb79c7300820 +Author: xia0ta0 +Date: Wed Jul 31 14:18:45 2013 +0800 + + * code for task#1657. + +commit a906da46e75265cdd1cfc2bf1e7c91a66aff503c +Author: xia0ta0 +Date: Wed Jul 31 14:17:40 2013 +0800 + + * code for task#1657. + +commit 6ccf1be34b4e53d6b5378253def053b5931dc17c +Author: azhi +Date: Wed Jul 31 14:16:18 2013 +0800 + + * fix bug: validRate must including closed bugs. + +commit 5741bd6276ee4ad7da6215b9bdc8f618226bd088 +Author: xia0ta0 +Date: Wed Jul 31 14:03:01 2013 +0800 + + * code for task#1657. + +commit caaae95b719d00c2b0aacadba8bbb5edfe023d26 +Author: wyd621 +Date: Wed Jul 31 13:35:30 2013 +0800 + + * finish task #1615. + +commit d460fad520a7774f6905137fc75715af26f9286b +Merge: 52df5c7003 8a7f3b5bcd +Author: wyd621 +Date: Wed Jul 31 11:07:27 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + + Conflicts: + + module/my/view/todo.html.php + module/my/view/todolist.html.php + +commit 52df5c700332a1dab6a428ac892663651784a67d +Author: wyd621 +Date: Wed Jul 31 10:49:27 2013 +0800 + + * adjust setModal4List. + +commit 8a7f3b5bcdbdb9f7cd357e6418c7123be12df9cc +Author: xia0ta0 +Date: Wed Jul 31 10:29:00 2013 +0800 + + * code for task#1657. + +commit 44376ef1d1eb60dfc60fcf6ca554149e4b2ff856 +Author: xia0ta0 +Date: Wed Jul 31 10:28:37 2013 +0800 + + * code for task#1657. + +commit 00586a2b395f2cd473a7aecd9d86054b256b024c +Author: xia0ta0 +Date: Wed Jul 31 10:13:35 2013 +0800 + + * code for task#1657. + +commit 60efdc517478c7f28b3c8f9fb347d1880cb5f008 +Author: xia0ta0 +Date: Wed Jul 31 09:40:02 2013 +0800 + + * code for task#1657. + +commit bad90b1df3f5c62369de3db14154ec24d6f8e21c +Author: xia0ta0 +Date: Wed Jul 31 09:00:40 2013 +0800 + + * code for task#1657. + +commit 52549269528ab536fd855c51be5eb17da7bcee2d +Merge: 22de2ae12e 29331ccb93 +Author: wyd621 +Date: Wed Jul 31 08:28:35 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 22de2ae12e381f7c5f1fe5af9a798e793e13ed2a +Author: wyd621 +Date: Tue Jul 30 17:10:45 2013 +0800 + + * finish task #1616. + +commit 29331ccb934de12397d209f45c75f0f2dc728135 +Author: xia0ta0 +Date: Tue Jul 30 17:00:35 2013 +0800 + + * code for task#1657. + +commit 12b6de8187080696357c67cced8e9f6534679d47 +Author: xia0ta0 +Date: Tue Jul 30 16:59:38 2013 +0800 + + * code for task#1657. + +commit bb0dac21919de720f3c9ecfb1df4704110c9f791 +Merge: aad33ebc2a 88913cad8c +Author: xia0ta0 +Date: Tue Jul 30 16:37:40 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit aad33ebc2a75b848d48362323d52b174f71ca76a +Author: xia0ta0 +Date: Tue Jul 30 16:35:27 2013 +0800 + + * code for task#1657. + +commit 32ee5bc3469cbd1a138eb0a941beddd56745d9bc +Author: xia0ta0 +Date: Tue Jul 30 16:34:41 2013 +0800 + + * code for task#1657. + +commit c8e274ce0302f531d101708b1efd3897e878692d +Author: xia0ta0 +Date: Tue Jul 30 16:33:27 2013 +0800 + + * code for task#1657. + +commit 88913cad8cec77764b1631441f4493aa8750c0af +Merge: 6191995428 805927c500 +Author: wyd621 +Date: Tue Jul 30 16:24:34 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 6191995428719eb32e04d758459cf5df10f7b67a +Author: wyd621 +Date: Tue Jul 30 16:23:32 2013 +0800 + + * finish task #1626. + +commit 805927c50074da47ac301699cfb11c4676da053a +Merge: 736f01df7b 60d4a104a0 +Author: azhi +Date: Tue Jul 30 16:22:09 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 736f01df7b8a29889b8936adb9f4319f47ace13f +Author: azhi +Date: Tue Jul 30 16:21:21 2013 +0800 + + * finish task#1644. + +commit 5e00f938e67465289019655483367e9d85564894 +Author: xia0ta0 +Date: Tue Jul 30 16:10:28 2013 +0800 + + * code for task#1657. + +commit 67df14b2f1145fba888b0971cd95510797aa6772 +Author: xia0ta0 +Date: Tue Jul 30 15:26:08 2013 +0800 + + * code for task#1657. + +commit de0a6190a9d7d6f2624313edff5939b6fe38cc64 +Author: wyd621 +Date: Tue Jul 30 15:26:05 2013 +0800 + + * finish task #1638. + +commit 3a4e56ced5c09489fa5b159282ee383e75321128 +Author: wyd621 +Date: Tue Jul 30 15:13:41 2013 +0800 + + * finish task #1641. + +commit fb2200d6b00c2c0c55552a5eed1368c451308610 +Author: xia0ta0 +Date: Tue Jul 30 14:54:02 2013 +0800 + + * code for task#1657. + +commit 8f6c964b1a63eb950271fdd22a220c4418a24be6 +Author: xia0ta0 +Date: Tue Jul 30 14:46:42 2013 +0800 + + * code for task#1657. + +commit 1a7d780ad572073690b3b52c0c79a67778cc60a6 +Author: wyd621 +Date: Tue Jul 30 14:02:51 2013 +0800 + + * finish task #1650. + +commit d47e601cf967a23e6b31685950bb16a8432d11d2 +Author: wyd621 +Date: Tue Jul 30 13:38:26 2013 +0800 + + * fix a bug. + +commit ff72b0462a3e402e2f66f7b9fb145d7f53638a62 +Merge: 5709bd9b74 60d4a104a0 +Author: xia0ta0 +Date: Tue Jul 30 11:09:00 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 5709bd9b7401d4795132a6c2507078502889de29 +Author: xia0ta0 +Date: Tue Jul 30 10:45:06 2013 +0800 + + * code for task#1657. + +commit 60d4a104a002cc284f4e61550ab3a8c8cd44f3c7 +Merge: dd36fdd3a4 c998424270 +Author: wyd621 +Date: Tue Jul 30 10:12:54 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit dd36fdd3a41b3b3285eb72db3574779f4fd37dcf +Author: wyd621 +Date: Tue Jul 30 10:11:41 2013 +0800 + + * finish task #1660. + +commit c99842427074185ea9c5c6ec843e50969803f2ca +Merge: 0d1188f737 6ff5e9aa1b +Author: azhi +Date: Tue Jul 30 09:50:40 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 0d1188f7377fa80e0ded8dd501dc12282c2a2276 +Author: azhi +Date: Tue Jul 30 09:49:58 2013 +0800 + + * finish task#1649. + +commit 6ff5e9aa1b6431f9fa47ff17a7df267699e1898b +Merge: dc260d66f5 d49e026924 +Author: wyd621 +Date: Tue Jul 30 09:29:24 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit d49e026924eace23ecde1949a6b851b01b19cced +Author: azhi +Date: Tue Jul 30 09:24:14 2013 +0800 + + * code for task#1609. + +commit dc260d66f57c64fbae1b5e5a20edd5015b2ca22b +Author: wyd621 +Date: Tue Jul 30 09:21:24 2013 +0800 + + * finish task #1664. + +commit 7e618f3d91fc5079055d46b1524488a712f82ce4 +Author: azhi +Date: Tue Jul 30 09:04:35 2013 +0800 + + * finish task#1625. + * finish task#1627. + +commit 9b13771253630a27f677275344546f9d0624e5a6 +Merge: 3bdb4f6cba 609fb57c65 +Author: azhi +Date: Tue Jul 30 08:40:02 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 3bdb4f6cba608f5621469b8e33b120f35ed61bb5 +Author: azhi +Date: Tue Jul 30 08:39:33 2013 +0800 + + * code for task#1514. + +commit 609fb57c655783510b11c23a1173bc669345b5d6 +Author: wyd621 +Date: Tue Jul 30 08:18:16 2013 +0800 + + * fix a bug for no csv header. + +commit 9ad07920aa17335e634db1441bc57a14ec64c4db +Merge: 2fb8262d78 c56ebbee8e +Author: wyd621 +Date: Tue Jul 30 08:15:29 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 2fb8262d786a6efa9d5c839e44bfba3433be70ea +Author: wyd621 +Date: Tue Jul 30 08:13:58 2013 +0800 + + * change for import csv. + +commit c56ebbee8ea0087e212f7b12f77f0c1b85ba3679 +Merge: 01f57a842d 35cbd8aa6e +Author: xia0ta0 +Date: Mon Jul 29 17:16:59 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 01f57a842d8f739a49e68123b5291d1fc0fc43ad +Author: xia0ta0 +Date: Mon Jul 29 17:16:05 2013 +0800 + + + add ajaxGetPlans function. + +commit 268530c64570312412a1ed764151eb9da0bc5588 +Author: xia0ta0 +Date: Mon Jul 29 17:14:42 2013 +0800 + + * fix plan of bug edit. + +commit b9e7b3a7f68481428a7f840c91f20c71810b078c +Merge: e609beffb6 35cbd8aa6e +Author: azhi +Date: Mon Jul 29 16:41:53 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit e609beffb6f2d1615881d83d17efaf820848c98f +Author: azhi +Date: Mon Jul 29 16:41:12 2013 +0800 + + * finish task#1658. + +commit 4a161ac051e5af1504ae4df7a935a419ba679bdd +Author: xia0ta0 +Date: Mon Jul 29 16:38:25 2013 +0800 + + * add plan field of bug view. + +commit 35cbd8aa6e8f319a4bdf015b4c5a6c5cb00e9f74 +Author: wyd621 +Date: Mon Jul 29 16:31:48 2013 +0800 + + * add resloveBy for build. + +commit cbdff77a27739dcdbe9401bb6521f24ba5991b88 +Author: xia0ta0 +Date: Mon Jul 29 16:23:35 2013 +0800 + + * code for task#1587. + +commit 9853500942d8de88153e7360db7d960c57b28f20 +Author: xia0ta0 +Date: Mon Jul 29 16:22:44 2013 +0800 + + * code for task#1587. + +commit 29673c244a77ed8232fbfb038caf94d726a7110b +Author: xia0ta0 +Date: Mon Jul 29 15:59:37 2013 +0800 + + * code for task#1598. + +commit 09e8e022361fa03d71d44cfec2f98bae6df9e1d8 +Author: xia0ta0 +Date: Mon Jul 29 15:57:15 2013 +0800 + + * code for task#1587. + +commit a31c2efbf1efcad6de0a262b593554e260fe069c +Merge: f9523e7a39 7fc3ecfb54 +Author: azhi +Date: Mon Jul 29 15:42:34 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit f9523e7a391b15347d5aa67b84f388b0e8124e3c +Author: azhi +Date: Mon Jul 29 15:41:34 2013 +0800 + + * add ajaxgetdropmenu of product/project priv for guest account. + +commit 7fc3ecfb545559b4810218681a57ca18af11eaba +Merge: fb95de9777 6258e8e6df +Author: wyd621 +Date: Mon Jul 29 15:12:12 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit fb95de9777ea86b4e73c6421790de6d545953605 +Author: wyd621 +Date: Mon Jul 29 15:11:26 2013 +0800 + + + add view file for exportTemplet. + +commit 6258e8e6dfa7a0fc75206284ca6f90ac5b776e4f +Merge: 8734221200 779b0d9bad +Author: xia0ta0 +Date: Mon Jul 29 15:10:50 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 8734221200383da149b2454643c410d2f0654e2e +Author: xia0ta0 +Date: Mon Jul 29 15:10:06 2013 +0800 + + * code for task#1589. + +commit 779b0d9bad3f9c0e2191fb7e2bd61ae005485e47 +Author: wyd621 +Date: Mon Jul 29 15:08:26 2013 +0800 + + * add lastRunResult lang. + +commit f7119600f5b25041b45730c76469ea7230b9e37b +Merge: fa8937eff4 3e1a529e6d +Author: wyd621 +Date: Mon Jul 29 14:57:52 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit fa8937eff42bc8105eaf3863f57f1715609daa0c +Author: wyd621 +Date: Mon Jul 29 14:56:38 2013 +0800 + + * fix the error of pcre.backtrack_limit for preg_match. + +commit 3e1a529e6d60d61247579b90e16133003920d816 +Author: azhi +Date: Mon Jul 29 14:42:45 2013 +0800 + + * code for task#1599. + +commit b4d7729478bcf80e0b547babe518527c47c2dd64 +Author: xia0ta0 +Date: Mon Jul 29 14:31:18 2013 +0800 + + * code for task#1589. + +commit 252b1d98d731f9153a05b1a9a5c97a8122886b4e +Author: xia0ta0 +Date: Mon Jul 29 14:30:36 2013 +0800 + + * code for task#1598. + +commit cbb533f0b84aac1ffe35bc8aa894df4a6d1e47c8 +Author: xia0ta0 +Date: Mon Jul 29 14:20:59 2013 +0800 + + * code for task#1598. + +commit d1e150b5dd90c4af786775bf049f32c9b88913b3 +Author: azhi +Date: Mon Jul 29 14:15:58 2013 +0800 + + * code for task#1614. + +commit f7c5fdcc41fc072336774961c2d2c89741188653 +Author: azhi +Date: Mon Jul 29 14:07:35 2013 +0800 + + * add server tablesorter for productplan list. + * code for task#1609. + +commit fb1b8520a3992f4c1a264685febe642a9a5e0fb2 +Author: wyd621 +Date: Mon Jul 29 14:05:29 2013 +0800 + + * fix app->error to app->triggerError. + +commit 90966238f5fce5ef90cef7c199d5ac93a48b663d +Author: wyd621 +Date: Mon Jul 29 14:04:09 2013 +0800 + + * remove deleted case. + +commit e372173a70bc9ea53d4c6f0f9d256db2b552d2c8 +Author: wyd621 +Date: Mon Jul 29 14:03:31 2013 +0800 + + * change for upgrade. + +commit 43d88caed4760fd174588295d5c5407bfb5a42c9 +Author: xia0ta0 +Date: Mon Jul 29 13:54:38 2013 +0800 + + * code for task#1589. + +commit be00ccf5d55de5b3e9d410903ed1b16d5c80b754 +Author: azhi +Date: Mon Jul 29 13:41:50 2013 +0800 + + * code for task#1602. + +commit 5f07d2072ddf8ac2219b6d6d0aa3a1c947bd2338 +Merge: 3b9a69ee6c 882a119c7c +Author: azhi +Date: Mon Jul 29 13:24:47 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 3b9a69ee6c51c82b6b136097ed916aa218ab05f4 +Author: azhi +Date: Mon Jul 29 13:23:41 2013 +0800 + + * code for task#1594. + +commit 882a119c7c2f0479cf127ed8fd7df8813b9e7ceb +Author: wyd621 +Date: Fri Jul 26 12:41:10 2013 +0800 + + * code for task #1607. + +commit 945de935d0f234248cb23a64768af389e40e1581 +Merge: e20ef0e1c0 2f05aab04b +Author: wyd621 +Date: Fri Jul 26 09:58:02 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit e20ef0e1c0c9a65bfc5495ff013922a00dcad432 +Author: wyd621 +Date: Fri Jul 26 09:57:19 2013 +0800 + + * code for task #1607. + +commit 2f05aab04b2897796ae7641957908590aab5e76e +Author: wwccss +Date: Fri Jul 26 08:41:29 2013 +0800 + + - remove the entry of linux for Makefile. + +commit caea3c8867ca630b055d2af56c06f5397efd00f5 +Merge: 3aec8f9cb8 fa39edb4bc +Author: wwccss +Date: Fri Jul 26 08:37:47 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit fa39edb4bca4d2da9ba8f38828a4fa359885acc4 +Author: wyd621 +Date: Thu Jul 25 17:05:46 2013 +0800 + + * finish task #1607. + +commit 24723cf1f08945a169bd8f47868d4743b4d009d1 +Merge: f700350e83 638f57cf1d +Author: wyd621 +Date: Thu Jul 25 15:29:04 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit f700350e83e0da7bac04443bbe243e6e29582afe +Author: wyd621 +Date: Thu Jul 25 15:21:04 2013 +0800 + + * code for task #1591. + +commit 3aec8f9cb805648d85570555f280d4ffe233bbd3 +Author: wwccss +Date: Thu Jul 25 15:05:26 2013 +0800 + + - remove the make entry for linux. + +commit 638f57cf1d923706a996defd783dab88393c267a +Merge: f989d8a115 778c835bbc +Author: wwccss +Date: Thu Jul 25 14:56:59 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit f989d8a115b992dcaef873a711328393616d8756 +Author: wwccss +Date: Thu Jul 25 14:56:31 2013 +0800 + + * change the makefile since tools directory changed. + +commit a472e2e43b96aaac98c132149840a93dad50912e +Author: wwccss +Date: Thu Jul 25 14:50:52 2013 +0800 + + + rename build/tools to tools. + +commit 8ae0a2d719e20d3835f4d3acedc85d1a9f235b64 +Author: wwccss +Date: Thu Jul 25 14:50:31 2013 +0800 + + - move them to tools. + +commit 0e247e74ae5107eb87b4f437131d7170586a8650 +Author: wwccss +Date: Thu Jul 25 14:44:40 2013 +0800 + + - delete them because split into seperate repos: zentaowamp, zentaomos + and zentaolamp. + +commit 5f5588c6ff29dda796de99699e0229c4efc94fdc +Author: wwccss +Date: Thu Jul 25 14:34:59 2013 +0800 + + - split it into github/easysoft/zentaomobile. + +commit 778c835bbc27cf8066c9d1847e0e89e38c6f6511 +Merge: 4c3ebc9cc7 507863a09d +Author: wyd621 +Date: Thu Jul 25 13:47:32 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 4c3ebc9cc71b4ae31fe85e674ac6ed03d0fee27a +Author: wyd621 +Date: Thu Jul 25 13:46:02 2013 +0800 + + * finish task #1591 1590. + +commit b8d65903d3347fd403680baae90d4011da879000 +Author: wwccss +Date: Thu Jul 25 12:06:34 2013 +0800 + + * split the code into zentao and xirang. + +commit 507863a09d1fd60aefe30316aefaa3841ef156ae +Author: xia0ta0 +Date: Thu Jul 25 10:31:17 2013 +0800 + + * fix a bug in task#1592. + +commit 91fd95801685d6f5cecf0e24bb1d0e12fd82f988 +Merge: 625831b766 ee40002fba +Author: xia0ta0 +Date: Thu Jul 25 10:04:13 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 625831b76671a5450deb1a5fd90a8e8a6fbb56a3 +Author: xia0ta0 +Date: Thu Jul 25 10:03:27 2013 +0800 + + * code for task#1613. + +commit bf33420c03421b58ea9bb15c9f68d4b5ce787a41 +Author: xia0ta0 +Date: Thu Jul 25 09:09:36 2013 +0800 + + * code for task#1598. + +commit ee40002fba7db1d697b4d08c84230e27d6b0ea02 +Merge: 8230b22949 bcd14731a3 +Author: wwccss +Date: Wed Jul 24 21:57:12 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 8230b229493d4eeb4688997b6d53e5e49e3d3b87 +Author: wwccss +Date: Wed Jul 24 21:56:38 2013 +0800 + + * upgrade to the latest version. + +commit bcd14731a338a02d0ad217cb2bbec49b980513d9 +Merge: c5e604816d 2d4a058478 +Author: azhi +Date: Wed Jul 24 16:04:25 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit c5e604816da75af7572247215b0effe6af6717db +Author: azhi +Date: Wed Jul 24 16:03:15 2013 +0800 + + * finish task#1441. + +commit 2d4a058478fc897fb49a2dccd3cf3cdf71728105 +Author: xia0ta0 +Date: Wed Jul 24 15:37:07 2013 +0800 + + * inLink has been changed to static function. + +commit 44be4dc462ccc2ceb7487aae06af38989a09b6f3 +Author: azhi +Date: Wed Jul 24 15:21:04 2013 +0800 + + * code for task#1604. + +commit a87d5832e227256386e02fc89237ee7ac8dda7c2 +Author: azhi +Date: Wed Jul 24 15:15:44 2013 +0800 + + * finish task#1604. + +commit edbced0619dd572c4c6a110e497378266b51d0fe +Author: xia0ta0 +Date: Wed Jul 24 15:04:49 2013 +0800 + + * fix a bug. + +commit 4206d6b89e93ea7e26084807312340ca0947d186 +Author: xia0ta0 +Date: Wed Jul 24 15:02:02 2013 +0800 + + * code for task#1589. + +commit 85fd31912ab0011e16ce72f3288fd8c8598cb4da +Author: xia0ta0 +Date: Wed Jul 24 14:48:57 2013 +0800 + + * fix a bug: inlink, not $this->inlink. + +commit a249068a5890d9982ff7ef4f7eaa5286b53f3332 +Merge: f543d606f1 a3a214318c +Author: xia0ta0 +Date: Wed Jul 24 14:44:41 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit f543d606f1ae0ee65523e960d0e9aae252e490f2 +Author: xia0ta0 +Date: Wed Jul 24 14:43:35 2013 +0800 + + * fix a bug : printRPN is a static method. + +commit a3a214318c2400bbf0d1d8724dea78d1491d55ef +Author: azhi +Date: Wed Jul 24 14:41:02 2013 +0800 + + * finish task#1602. + +commit 75eafe41d908da010e2d1ecdd958b5eaa3129541 +Merge: 0e16e462b5 3ba16ae13a +Author: xia0ta0 +Date: Wed Jul 24 14:20:53 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 0e16e462b5a28700bd0ad73303b93d48f00bfec8 +Author: xia0ta0 +Date: Wed Jul 24 14:19:24 2013 +0800 + + * code for task#1589. + +commit 0d1a23a5264346d2355b0f62c63ddd7c33577018 +Author: xia0ta0 +Date: Wed Jul 24 14:16:23 2013 +0800 + + * code for task#1589. + +commit 3ba16ae13af9ce0eb30807ae66e837fad29f7d59 +Merge: 901d6f326d d6db1adbbd +Author: azhi +Date: Wed Jul 24 14:06:20 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 901d6f326d954e13e58617cb20fe2b80ba0f3be7 +Author: azhi +Date: Wed Jul 24 14:05:30 2013 +0800 + + * finish task#1614. + +commit d6db1adbbd399f6242e8dc61cf5d4e3c541740d5 +Merge: ac1b8095b2 3b01727bfe +Author: xia0ta0 +Date: Wed Jul 24 10:53:19 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit ac1b8095b2697209d2d43bafd6e64d3aac2fabab +Author: xia0ta0 +Date: Wed Jul 24 10:50:11 2013 +0800 + + * compatible with that of model::delete(). + +commit 922c7edf3f24ccefacfe7e5fea427943d7d5c1fa +Author: xia0ta0 +Date: Wed Jul 24 10:49:34 2013 +0800 + + * compatible with that of model::delete(). + +commit ce358e310c4e4a4645e98ada9cb696c2e479192f +Author: xia0ta0 +Date: Wed Jul 24 10:48:14 2013 +0800 + + * compatible with that of model::delete(). + +commit 140248c0f4a70ff517e4d3f4f8a87a0283589163 +Author: wwccss +Date: Wed Jul 24 10:37:45 2013 +0800 + + * upgrade the ioncube loader. + +commit 8a30f0290d9857e3b89d4c72484fb3deb7630a84 +Author: wwccss +Date: Tue Jul 23 21:02:38 2013 +0800 + + + add opcache.so file. + * rename ioncube loader. + +commit 3b01727bfe579b15e4cce741d26b3c7b70d1fe42 +Merge: abad7c0939 aaec07eeca +Author: wyd621 +Date: Tue Jul 23 17:07:29 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit aaec07eecaa81f3dd8f388900f143b543c98e585 +Author: xia0ta0 +Date: Tue Jul 23 16:48:36 2013 +0800 + + * code for task#1588. + +commit abad7c0939f9f799a32629a54688661aa8db7901 +Author: wyd621 +Date: Tue Jul 23 16:46:36 2013 +0800 + + * finish task #1595. + +commit f96a21038561f075c9ae10a0766eb4090e11a7c4 +Merge: b56e48890f 24d9c60deb +Author: xia0ta0 +Date: Tue Jul 23 16:45:01 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit b56e48890f3f2f5690e2ec80112d31fd6bbdf0e5 +Author: xia0ta0 +Date: Tue Jul 23 16:40:59 2013 +0800 + + * code for task#1592. + +commit 24d9c60deb4444c6134683d8005b8ed84e340cbb +Merge: 2a9ba9fa98 0cf27bc552 +Author: azhi +Date: Tue Jul 23 16:05:00 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 2a9ba9fa98a6d210eb3b188efe2eef7c2ce13dd0 +Author: azhi +Date: Tue Jul 23 16:04:01 2013 +0800 + + * finish task#1599. + +commit fd4a36dc8c9405717650e2a6831e5716a180bf15 +Author: wyd621 +Date: Tue Jul 23 15:49:47 2013 +0800 + + * finish task #1601. + +commit 0cf27bc552833b7391f66ebe6011ab7ed03151f6 +Merge: 4249737b43 3e40581431 +Author: wwccss +Date: Tue Jul 23 15:30:56 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 4249737b43652181f35b13a343d74680433c212b +Author: wwccss +Date: Tue Jul 23 15:29:37 2013 +0800 + + * upgrade wamp to the latest version. + +commit 3e4058143170bd3f365200d33eeadfed88cbdadd +Merge: be31e48b7f cdd474531b +Author: wyd621 +Date: Tue Jul 23 14:52:19 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit be31e48b7fdfff81e4cab15dd7ce01a8bf3d656f +Author: wyd621 +Date: Tue Jul 23 14:50:08 2013 +0800 + + * finish task #1600. + +commit cdd474531b664b7caa99addc36f7c58f96d02406 +Author: wwccss +Date: Tue Jul 23 13:07:15 2013 +0800 + + * upgrade the build program for zentaowamp. + +commit 692fc5f9f4d81dae5cd09f48b0e0ba3da78fbf98 +Author: wyd621 +Date: Tue Jul 23 10:45:18 2013 +0800 + + * fix a bug for import icon. + +commit 169626cc18d30c56e18e53cc212ae7a323f23183 +Author: wyd621 +Date: Tue Jul 23 10:43:17 2013 +0800 + + * finish task #1608. + +commit 9469cb457dd5e1ae91d87aad746dd07a942044bf +Author: wyd621 +Date: Tue Jul 23 08:41:28 2013 +0800 + + * finish task #1593. + +commit 79374d11885d314ccb9df15a55bbcc5cab19be8e +Merge: 7009656f06 0e8c1ffe05 +Author: wwccss +Date: Mon Jul 22 17:11:42 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 7009656f0633fcacf5c42df534b994ba1f015675 +Author: wwccss +Date: Mon Jul 22 17:07:49 2013 +0800 + + * change app->error to app->triggerError(). + +commit 0e8c1ffe05fdde524eb6e9a3b03f7da34f1c7668 +Merge: 01f65195c3 2c3cb25107 +Author: xia0ta0 +Date: Mon Jul 22 16:19:42 2013 +0800 + + Merge branch 'master' of github.com:easysoft/zentaopms + +commit 01f65195c3270c0b411af4fe63e50f629c42c735 +Author: xia0ta0 +Date: Mon Jul 22 16:18:27 2013 +0800 + + * code for task#1552. + +commit 2c3cb251074b12123388d49fb97820192f3d8582 +Merge: 7a2dcb0a31 20db39e034 +Author: wwccss +Date: Mon Jul 22 15:50:22 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 7a2dcb0a31c73df1dc0d159d8d4685817df57460 +Author: wwccss +Date: Mon Jul 22 15:45:17 2013 +0800 + + * use app->triggerError(). + +commit 77ffe65ec6d246a033c5b4850d708a79f5100b5b +Author: wwccss +Date: Mon Jul 22 15:44:56 2013 +0800 + + * adjust ignore. + +commit 20db39e0348226df31c4240d9a7c2e773b850d84 +Author: azhi +Date: Mon Jul 22 15:42:04 2013 +0800 + + * code for task#1612. + +commit ee593816d9abecc410cfbf43526c8a34e0365232 +Author: azhi +Date: Mon Jul 22 15:39:27 2013 +0800 + + * code for task#1609. + +commit 68608781c89b4712fee2b42b6044c64ab1fde156 +Merge: d1c69f8217 f02fec4cc2 +Author: wyd621 +Date: Mon Jul 22 15:32:29 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit f02fec4cc26962fcc2417d3b6c775d9df8f3fd52 +Author: azhi +Date: Mon Jul 22 15:29:34 2013 +0800 + + * finish task#1612. + +commit d1c69f82173c8f5bb1ab15c57b641a8405525653 +Author: wyd621 +Date: Mon Jul 22 15:25:09 2013 +0800 + + * finish task #1586. + +commit 1e06b1b5f59b62748520e14c3829766262b340db +Author: azhi +Date: Mon Jul 22 15:15:50 2013 +0800 + + * finish task#1605. + +commit 6fa5deb13a95516b12ac250a489737c4e9396134 +Author: azhi +Date: Mon Jul 22 14:46:47 2013 +0800 + + * finish task#1609. + +commit f422ad7bb6f4fb5f8fc62b6d914e02650e3f46d6 +Merge: 9f8927de0c 995d7a3088 +Author: azhi +Date: Mon Jul 22 14:25:51 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 9f8927de0ca1bdee663cdb12f70e237a8058d818 +Author: azhi +Date: Mon Jul 22 14:24:56 2013 +0800 + + * finish task#1594. + +commit 995d7a30880910e8b19ef525d20efad905da0efb +Merge: 9d5aae6edc a57116d4d4 +Author: wyd621 +Date: Mon Jul 22 14:17:48 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 9d5aae6edcb1842a56f4cb5f4436d6972072227c +Author: wyd621 +Date: Mon Jul 22 14:16:11 2013 +0800 + + * finish task #1585. + +commit a57116d4d4b39a8c43b1e2d8c81c9447c50dc8bc +Merge: 6a72e95654 78b1ffdfa0 +Author: azhi +Date: Mon Jul 22 09:39:30 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 6a72e9565464c67cd6758b04053f15f07026e903 +Author: azhi +Date: Mon Jul 22 09:36:50 2013 +0800 + + * fix bug: change colspan 8 to 9. + +commit 4063cbad131973c33effd40611a66929d4306dcd +Merge: 042df2c813 78b1ffdfa0 +Author: wyd621 +Date: Mon Jul 22 08:40:41 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 78b1ffdfa0b99ae7d7c6657680ae53ba23f11361 +Author: xia0ta0 +Date: Sun Jul 21 21:00:06 2013 +0800 + + * code for task#1580. + +commit cbe4afe436c3aa338a5409afa0ed0a1bb7acd683 +Author: xia0ta0 +Date: Fri Jul 19 16:35:05 2013 +0800 + + * code for task#1552. + +commit 1067e55ad3028135f6a0247159b0771122469867 +Merge: 6954ee9d89 307eb8832a +Author: xia0ta0 +Date: Fri Jul 19 14:42:25 2013 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 6954ee9d89a75bf154bf7292beb4b72bf9d35b92 +Author: xia0ta0 +Date: Fri Jul 19 14:40:51 2013 +0800 + + * code for task#1580. + +commit 36a90cd70d69cbd3187528523f8319ec6df2d044 +Author: xia0ta0 +Date: Fri Jul 19 14:38:26 2013 +0800 + + * code for task#1580. + +commit d8676d680b4b1c2ca85d8c730dbbda6761989e69 +Author: xia0ta0 +Date: Fri Jul 19 14:16:51 2013 +0800 + + * code for task#1580. + +commit 042df2c8131237da64bd9f9c9d827304503df34b +Author: wyd621 +Date: Fri Jul 19 14:02:48 2013 +0800 + + * finish task #1577. + +commit 307eb8832a9e3807e93b8d532bae3fe550bff4a1 +Author: wyd621 +Date: Fri Jul 19 09:13:37 2013 +0800 + + * finish task #1463. + +commit c0e50a82cd6d152f97068954a788596b12b3f671 +Author: wyd621 +Date: Fri Jul 19 08:22:21 2013 +0800 + + * fix a bug for change pms. + +commit aae95743f949cdc45d49855f08120e65eeed7f6e +Author: wyd621 +Date: Thu Jul 18 16:48:06 2013 +0800 + + * finish task #1571. + +commit 67fd654b2e4d45c1bfe52dd9d2067e8ce26d6c1f +Author: wyd621 +Date: Thu Jul 18 14:52:01 2013 +0800 + + * code for task #1579. + +commit 87b50d246e13dc9ea271e53c1773d705272e54a0 +Merge: e521a8fef3 8961d755a2 +Author: wyd621 +Date: Thu Jul 18 14:19:21 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit e521a8fef3fa6c3c42f6c24c2207004a0204096b +Author: wyd621 +Date: Thu Jul 18 14:17:45 2013 +0800 + + * finish task #1579. + +commit 012b5381ba36d95870f8a00ca252ec3b5574bd72 +Author: wyd621 +Date: Thu Jul 18 14:17:06 2013 +0800 + + * finish task #1578. + +commit 337eadde8e833893b02bd71d6b64cbcbb4516d3b +Author: wyd621 +Date: Thu Jul 18 14:16:37 2013 +0800 + + * adjust code. + +commit 8961d755a2c1dbdcdb2d7d4f8dd29e7c1e749eb3 +Author: wwccss +Date: Thu Jul 18 13:54:15 2013 +0800 + + - remove the debug code. + +commit 1be7953bd027c10d593613692dc65d17909baffb +Merge: bba40c0072 9cb8bad9fb +Author: wwccss +Date: Thu Jul 18 13:16:34 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 9cb8bad9fb8b7b592d8dda101de0d06ab5a8b4d9 +Author: azhi +Date: Thu Jul 18 09:53:58 2013 +0800 + + * code for task#1513. + +commit bba40c007218ee5255928b7284f9e09246b1401f +Merge: c20261cb20 4038b40e74 +Author: wwccss +Date: Thu Jul 18 09:18:06 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit c20261cb20b8982b69613c009e67c62fa0cd9cbb +Author: wwccss +Date: Thu Jul 18 09:17:31 2013 +0800 + + * init ext directory again. + +commit a1f9b389ef5c021162d75a70f2d279f68659d4b0 +Author: wwccss +Date: Thu Jul 18 09:16:29 2013 +0800 + + + add tmp directory. + +commit 718ad2720edbf922473d36be566cae3f6f1e171d +Author: wwccss +Date: Thu Jul 18 09:16:05 2013 +0800 + + * change the initext.php to add .gitkeep files. + +commit 1571e8fcddd797023e20fef2ccba7b127e8298da +Author: wwccss +Date: Thu Jul 18 09:15:50 2013 +0800 + + * change ignore. + +commit 9a6c056ac48ec93795c3f1e7c920e127fa3d185f +Author: wwccss +Date: Thu Jul 18 08:55:02 2013 +0800 + + * change ignore. + +commit 4038b40e7430781437b43cd99d775799a1041a88 +Author: wyd621 +Date: Thu Jul 18 08:30:14 2013 +0800 + + * finish task #1576. + +commit e4405b929edaae1b03dd62fc96d1da544cd2de80 +Author: wwccss +Date: Wed Jul 17 20:13:46 2013 +0800 + + * remove E_STRICT errors. + +commit cbedc2b30e4ff44c912eb551532b844a4545799c +Author: wwccss +Date: Wed Jul 17 20:13:15 2013 +0800 + + * use helper::removeUTF8Bom() instead. + +commit 8a1ace8f3c3838a1c341af469f3b8b94943e9183 +Author: wwccss +Date: Wed Jul 17 20:12:38 2013 +0800 + + * use helper::removeUTFBom() instead. + +commit d5b5deaae52e4aaa136261f966bf580e4b487ded +Author: wwccss +Date: Wed Jul 17 20:11:58 2013 +0800 + + * finish task#1492. + +commit bf8b7ae75bcc4ffcd89731b9ed10877dac3ce87d +Author: wwccss +Date: Wed Jul 17 16:12:00 2013 +0800 + + * finish task#1495. + +commit cdf62fab70331b1756a4ef6c87456ad90bde211b +Author: wwccss +Date: Wed Jul 17 15:25:34 2013 +0800 + + * add release to gitignore. + +commit 1db57d442b12de1b6b33c9abae94a81b86d8a34d +Merge: 0b3d0552ae c920eeb60f +Author: xia0ta0 +Date: Wed Jul 17 14:00:37 2013 +0800 + + Merge branch 'master' of https://github.com/easysoft/zentaopms + +commit 0b3d0552ae0bb07003d156f51688f2e9e8838cfe +Author: xia0ta0 +Date: Wed Jul 17 13:59:41 2013 +0800 + + + add open sso module. + +commit 4b2adf55d8829f56adcff75d68e75b6481685f74 +Author: xia0ta0 +Date: Wed Jul 17 13:54:21 2013 +0800 + + + add sso module. + +commit ebb458107e24fec4d65917c9e7f5ec7ba68034e8 +Author: xia0ta0 +Date: Wed Jul 17 13:44:19 2013 +0800 + + + add .gitignore. + +commit c920eeb60f6c98c623ee50771d1e6577fe59c99d +Author: wyd621 +Date: Wed Jul 17 11:05:28 2013 +0800 + + * finish task #1575. + +commit d31842a4c81a122d3959b448d0776c086d7cfe34 +Author: wyd621 +Date: Wed Jul 17 10:16:04 2013 +0800 + + * revert right config. + +commit ec50ddf69df2b98bf5359ff78c31bd2e05a44d81 +Author: wyd621 +Date: Wed Jul 17 10:05:00 2013 +0800 + + * commit for different. + +commit 1aa58c889579fdfa78ec2185e9321961f05e0a6c +Merge: 890ca7d02f 917209abbb +Author: wyd621 +Date: Wed Jul 17 10:04:22 2013 +0800 + + Merge branch 'master' of git@github.com:easysoft/zentaopms + +commit 890ca7d02fbad74445dfba7336dccdd2be39a2bd +Author: wyd621 +Date: Wed Jul 17 09:44:56 2013 +0800 + + * adjust for pager from api. + +commit 917209abbbeec5ddb40c6d4aa95d8ab577b31d26 +Author: azhi +Date: Wed Jul 17 09:44:27 2013 +0800 + + * code for task#1513. + +commit 09a9872a14af8bf19598edbadc1395c55016c05f +Author: wyd621 +Date: Wed Jul 17 09:41:40 2013 +0800 + + * finish task #1573. + +commit c9d3e386539beb57698d147f139ff1e41652311d +Author: azhi +Date: Wed Jul 17 09:41:11 2013 +0800 + + * adjust the menu of web app. + +commit 648c28140d0548f5c7dd4528cd67331c8fb349ac +Author: wyd621 +Date: Wed Jul 17 09:40:41 2013 +0800 + + * finish task #1568. + +commit 1be844dbea2a4ef5b2f6952f60e09b28b6dfe541 +Author: wyd621 +Date: Wed Jul 17 09:39:29 2013 +0800 + + * finish task #1569. + +commit 6c92b0ec48f18aa2e80401be144bb338a4d2bd04 +Author: azhi +Date: Wed Jul 17 09:12:04 2013 +0800 + + * finish task#1439. + +commit 2a3c6b09c3719ab9a27382567f75c7f1d321781c +Author: xia0ta0 +Date: Wed Jul 17 08:31:29 2013 +0800 + + * fix comment. + +commit 443dabf7edf17465da14dbcc573e38d33cb03078 +Author: wangyidong +Date: Tue Jul 16 04:07:21 2013 +0000 + + * finish task #1567 + +commit b0056f8e82319d8a289013217e9779bba75951d9 +Author: chencongzhi520@gmail.com +Date: Tue Jul 16 02:01:43 2013 +0000 + + * finish task#1574. + +commit 2baf6f43f54c65da983bfa6cedfb72e69c07ad65 +Author: wangyidong +Date: Tue Jul 16 01:47:14 2013 +0000 + + * finish task #1566. + +commit a0dafb6d5a3ef8e2880c54a7ed79987f64b69856 +Author: zhujinyong +Date: Tue Jul 16 01:47:01 2013 +0000 + + * code for task#1582. + +commit 2bd6e5375eeda39cb74984435d8d55664893432b +Author: chencongzhi520@gmail.com +Date: Tue Jul 16 01:31:08 2013 +0000 + + * finish task#1572. + +commit 4c2c15e630d90b34359a2e6ac93ad34eb5221eb9 +Author: chencongzhi520@gmail.com +Date: Tue Jul 16 01:16:35 2013 +0000 + + * remove columns: company , order of product/project. + +commit 5c29ce162a2f9b37b05a7b54e10a7d9f3bc7ee43 +Author: chencongzhi520@gmail.com +Date: Mon Jul 15 08:43:26 2013 +0000 + + * code for task#1534. + +commit 348e0577c817e774a8453cfa649b249ea83c95ac +Author: chencongzhi520@gmail.com +Date: Mon Jul 15 06:47:26 2013 +0000 + + * finish task#1516. + +commit 04b22c74f951ad6e3ffa94c225dd85a2e1d17bfa +Author: chencongzhi520@gmail.com +Date: Mon Jul 15 06:37:03 2013 +0000 + + * finish task#1514. + +commit a6c59896b87e82768b6c3b7a8877b208b2783298 +Author: zhujinyong +Date: Mon Jul 15 06:11:59 2013 +0000 + + * code for task#1541. + +commit 7896522db104414d9c911328e3eed7da932f52f1 +Author: zhujinyong +Date: Mon Jul 15 06:10:50 2013 +0000 + + * code for task#1541. + +commit c6e732626c82af9d9c9a59ba9ef5366b4b7d992e +Author: chencongzhi520@gmail.com +Date: Mon Jul 15 05:57:15 2013 +0000 + + * finish task#1515. + +commit bfd533aa295432df00ce7eb39c0530b50b91ab8d +Author: zhujinyong +Date: Mon Jul 15 03:43:25 2013 +0000 + + * code for task#1541. + +commit 3e9f5d14712b5ce6e7fffa4c5f27bf401f633603 +Author: zhujinyong +Date: Mon Jul 15 03:12:03 2013 +0000 + + * code for task#1549. + +commit bffda6486f479e597484b77e0cac41b1250b1286 +Author: wangyidong +Date: Mon Jul 15 02:09:44 2013 +0000 + + * finish task #1570 + +commit 8c3651b755cbd08b6c504dc326a1f73c9f814ce6 +Author: zhujinyong +Date: Mon Jul 15 02:08:21 2013 +0000 + + * change 'view' to 'debug' of api. + +commit bdf865702f43450f17f1ddfefc0a5769dabfddb6 +Author: chencongzhi520@gmail.com +Date: Mon Jul 15 02:00:24 2013 +0000 + + * delete them. + +commit 811cc9c2fcf165f82977f0c2247692b9554769e2 +Author: chencongzhi520@gmail.com +Date: Mon Jul 15 01:58:11 2013 +0000 + + * delete them. + +commit 4aa07f37a242f81df8b57368f1b1831151a9cb31 +Author: chencongzhi520@gmail.com +Date: Mon Jul 15 01:44:49 2013 +0000 + + * code for task#1513. + +commit 5737520629d3a2558dc5120585f9762089fed4b6 +Author: chencongzhi520@gmail.com +Date: Mon Jul 15 00:43:21 2013 +0000 + + * detele them. + +commit f41270e6ca924b7e075cc364fceab8052e0b78e3 +Author: zhujinyong +Date: Mon Jul 15 00:37:59 2013 +0000 + + * adjust style of api view. + +commit 3ee5fbecd52bb3ad875385e7e36179dd34e610eb +Author: wangchunsheng +Date: Mon Jul 15 00:26:22 2013 +0000 + + + skip-name-resolve param. + +commit b85d84c9f56c72e188a438be8bd5baeed160cbed +Author: zhujinyong +Date: Mon Jul 15 00:23:07 2013 +0000 + + * code for task#1549. + +commit ba9e613f1dda394666d1b4dc868f888dee86fea0 +Author: zhujinyong +Date: Mon Jul 15 00:16:07 2013 +0000 + + * code for task#1541. + +commit 44d6401495aeb2784ed1bd9112fa04085b0edf9a +Author: chencongzhi520@gmail.com +Date: Sat Jul 13 08:59:49 2013 +0000 + + * finish task#1563. + +commit e906abb00f85dfe98124f1980b05293c5eb9e777 +Author: chencongzhi520@gmail.com +Date: Sat Jul 13 08:48:31 2013 +0000 + + * code for task#1513. + +commit 01eb11cb76c57a32d00daa2f2990790b9379bfa0 +Author: zhujinyong +Date: Sat Jul 13 08:43:57 2013 +0000 + + * code for task#1541. + +commit 9fe0ea4e19654c18946631564161c8968320c303 +Author: chencongzhi520@gmail.com +Date: Sat Jul 13 08:42:34 2013 +0000 + + * code for task#1513. + +commit d8c016a22e46464bfc99a0cab9cc7af065a916f6 +Author: chencongzhi520@gmail.com +Date: Sat Jul 13 08:28:14 2013 +0000 + + * finish task#1513. + +commit 4f061e273f1b24d2a3b0556a9a4476cc849326b5 +Author: zhujinyong +Date: Sat Jul 13 01:27:53 2013 +0000 + + * code for task#1541. + +commit c5087451c71cd0765d18361db0547f01f53be77f +Author: zhujinyong +Date: Sat Jul 13 01:11:23 2013 +0000 + + * code for task#1541. + +commit 796cf9bc33f062cc8f40243aba35adb4cfaccd5b +Author: wangchunsheng +Date: Fri Jul 12 15:43:54 2013 +0000 + + * update config files. + +commit d2ae7e7d6b762f3adda8059213a188419bfd2afa +Author: wangchunsheng +Date: Fri Jul 12 14:10:40 2013 +0000 + + + import the setting files for zentaomos. + +commit e2d706e34e9745f069db1a0ce8fcd3675b7e1774 +Author: wangyidong +Date: Fri Jul 12 08:06:42 2013 +0000 + + * finish task #1511. + +commit 1c18615310eb07371c539662a24b4fa2037b4196 +Author: chencongzhi520@gmail.com +Date: Fri Jul 12 07:41:41 2013 +0000 + + * finish task#1555. + +commit 3395c388e9bd79313b6727ba5e3e9636ddda84e9 +Author: chencongzhi520@gmail.com +Date: Fri Jul 12 07:03:14 2013 +0000 + + * finish task#1559. + +commit 40dc579bb67e886e14598d275b617c0b122d9f56 +Author: chencongzhi520@gmail.com +Date: Fri Jul 12 06:37:48 2013 +0000 + + * finish task#1558. + +commit 0c461470ddae882af4c6fafca9e8f334e4d9fcfd +Author: chencongzhi520@gmail.com +Date: Fri Jul 12 06:23:59 2013 +0000 + + * refactory story-batchedit. + * code for task#1562. + +commit 1b782cfe21a41ce7713f3889c69d564689ac39f2 +Author: chencongzhi520@gmail.com +Date: Fri Jul 12 06:02:59 2013 +0000 + + * finish task#1561. + +commit 048b0d7713bc91f948f60df8d151bc655ffa2e57 +Author: wangyidong +Date: Fri Jul 12 05:43:40 2013 +0000 + + * fix a bug for the content of kindeditor is none in post by jquery form. + +commit d4818f9ea125e9af6d799890e5fbabe2a5e679be +Author: chencongzhi520@gmail.com +Date: Fri Jul 12 02:51:33 2013 +0000 + + * finish task#1560. + +commit 67a49f076b866cc71dc210d22a4e25f15042900f +Author: wangyidong +Date: Fri Jul 12 02:45:25 2013 +0000 + + * fix a bug for init object. + +commit 1233dee29eb57518fe84fe7ffe01687ce7ce9167 +Author: wangyidong +Date: Fri Jul 12 02:15:36 2013 +0000 + + * finish task #1519. + +commit 95045da1b30e5df6f26f4d6b64a02a8a83d3fc02 +Author: chencongzhi520@gmail.com +Date: Fri Jul 12 02:03:21 2013 +0000 + + * code for task#1528. + +commit df851dfd3d54367a8c0424275f83410e88d75e01 +Author: chencongzhi520@gmail.com +Date: Fri Jul 12 01:59:04 2013 +0000 + + * code for task#1562. + * refactory the testcase-batchEdit. + +commit 12827cbdde8f7f84770d314dedcda14d75bc32ae +Author: chencongzhi520@gmail.com +Date: Fri Jul 12 01:46:12 2013 +0000 + + * finish task#1557. + +commit d4ce0f265e01998ad1f95f05a40330fc9d710f2b +Author: chencongzhi520@gmail.com +Date: Fri Jul 12 01:28:54 2013 +0000 + + * code for task#1562. + * refactory the batchEdit of task and bug. + +commit e52cecbf855e47f53087beb0d5e389a5fd254e47 +Author: chencongzhi520@gmail.com +Date: Fri Jul 12 01:18:09 2013 +0000 + + * code for task#1562. + +commit 9eb050756e26258e9d9af03dec26b5259e44784a +Author: wangyidong +Date: Fri Jul 12 01:05:42 2013 +0000 + + * finish task #1512. + +commit 7caf1a06aae601b14be35cedd56000c05291702e +Author: wangyidong +Date: Fri Jul 12 01:04:44 2013 +0000 + + + add update sql for 4.3. + +commit f3980b45b573f8f1765c7bb9f1253a7b279f57a3 +Author: chencongzhi520@gmail.com +Date: Fri Jul 12 00:59:54 2013 +0000 + + * refactory the bug-batchEdit. + * code for task#1562. + +commit 82dc204a37c41dbefc35d062e99f5c2aab4b94a4 +Author: chencongzhi520@gmail.com +Date: Fri Jul 12 00:44:27 2013 +0000 + + * finish task#1556. + +commit 5dc8a427ff30d9af24165a1cb651e8e6f6002a49 +Author: zhujinyong +Date: Fri Jul 12 00:25:23 2013 +0000 + + * fix comment. + +commit 17ef78ed6156dd6592577f2f4acd2f0c9588f6c1 +Author: wangyidong +Date: Thu Jul 11 09:02:42 2013 +0000 + + * finish task #1539. + +commit 869f702478debd7de1fb75d8d3f259adcb02aa9a +Author: chencongzhi520@gmail.com +Date: Thu Jul 11 08:09:08 2013 +0000 + + * code for task#1562. + +commit 09228c91459341882d6dc32da41a0b5848144f68 +Author: wangyidong +Date: Thu Jul 11 07:45:53 2013 +0000 + + * finish task #1540. + +commit 4f060ab0fd203e5ce10a7f065c242771f44bb652 +Author: chencongzhi520@gmail.com +Date: Thu Jul 11 07:02:43 2013 +0000 + + * code for task#1528. + +commit 8aca120201bc3573ed521a6306e217d1f551258b +Author: chencongzhi520@gmail.com +Date: Thu Jul 11 06:03:40 2013 +0000 + + * add class='a-left' for my-task and my-project list. + +commit 69083eb0c3ff1ae04661a43aac33f650934a708d +Author: chencongzhi520@gmail.com +Date: Wed Jul 10 08:46:15 2013 +0000 + + * code for task#1534. + +commit 7537b7a40238b6066e4c2aa2cf30c321e65f6775 +Author: chencongzhi520@gmail.com +Date: Wed Jul 10 08:45:33 2013 +0000 + + * code for task#1533. + +commit cf5b49af2f46298f40ddfcee15591da1ecaf68dc +Author: chencongzhi520@gmail.com +Date: Wed Jul 10 06:22:54 2013 +0000 + + * code for task#1533. + +commit 01cebe53aeaa8cb2a6c576bee89892bdddc91457 +Author: chencongzhi520@gmail.com +Date: Wed Jul 10 06:06:46 2013 +0000 + + * finish task#1533. + +commit 3c12c7fda54672a5f5de70b55ec5af18f6676486 +Author: zhujinyong +Date: Wed Jul 10 05:49:24 2013 +0000 + + * fix after location. + +commit 35e221c8b1c322eec86bc8dd66808409cb3e7f7f +Author: zhujinyong +Date: Wed Jul 10 05:29:09 2013 +0000 + + * fix a bug : if no story, don't display copy button. + +commit c67514b98c7e1769b1883e202d721afd80ebc205 +Author: wangyidong +Date: Wed Jul 10 03:30:10 2013 +0000 + + * finish task #1509. + +commit 507d3bd684a6cde58df259c347347c8017cf4324 +Author: wangyidong +Date: Wed Jul 10 02:44:20 2013 +0000 + + * finish task #1526. + +commit c2c80613a9e46b9d043058c497989fe40c34e5a8 +Author: wangyidong +Date: Wed Jul 10 02:25:22 2013 +0000 + + * finish task #1518. + +commit 9929b9fa2192107f03e386d71defc187d090cb9b +Author: chencongzhi520@gmail.com +Date: Wed Jul 10 01:57:06 2013 +0000 + + * finish task#1535. + +commit 24b3f2f2d53a9464caa9c8bb2422d1cbb95168f1 +Author: wangyidong +Date: Wed Jul 10 01:31:38 2013 +0000 + + * finish task #1517. + +commit 737d05bad563e86bc436edace74b092a5d3942c4 +Author: zhujinyong +Date: Wed Jul 10 01:31:06 2013 +0000 + + - remove process left, check it in modlues. + +commit b8cb9a422bcba715a1208c928e9421b6ec2d53d0 +Author: wangyidong +Date: Wed Jul 10 01:14:45 2013 +0000 + + * fix a bug for actionURL when onlybody. + +commit f25dee32443b094970111001ce34f4a47076f28f +Author: chencongzhi520@gmail.com +Date: Wed Jul 10 00:57:36 2013 +0000 + + * finish task#1527. + +commit 2dd095e4e283d8280dd4098072905bfc6739f1c3 +Author: wangyidong +Date: Wed Jul 10 00:46:59 2013 +0000 + + * finish task #1525. + +commit 46d4b2a0b7b8890360e90fb3599177e8d7d6c20b +Author: chencongzhi520@gmail.com +Date: Wed Jul 10 00:44:34 2013 +0000 + + * finish task#1486. + +commit 028aa8e5615278806156ce299b45b31e418445bb +Author: zhujinyong +Date: Tue Jul 9 08:08:03 2013 +0000 + + * if only one page, don't show position. + +commit 12b4344c4fee4df2560f9d76d5180169d14e8c30 +Author: wangyidong +Date: Tue Jul 9 07:43:29 2013 +0000 + + * finish task 1508. + +commit 08b4c0aed0d69ac30b04b90adc934e7dae16ed8c +Author: wangyidong +Date: Tue Jul 9 07:36:21 2013 +0000 + + * change input to password. + +commit 9e1a902ffb7edb6d17776d4bc928611d5597d72f +Author: wangyidong +Date: Mon Jul 8 06:15:54 2013 +0000 + + * revert for search. + +commit b688079505c569aeb021b72255faf5f5b0bcb9b8 +Author: chencongzhi520@gmail.com +Date: Mon Jul 8 05:51:37 2013 +0000 + + * small qrcode image. + +commit 18fe046b866c91d552625df4ad2b319fcc29bafd +Author: zhujinyong +Date: Mon Jul 8 05:22:46 2013 +0000 + + * fix a bug : if version <= 4.1, only get modules of its type. + +commit a92333f7e57621fa5b0f0498567fa891128c04a6 +Author: wangyidong +Date: Mon Jul 8 03:32:32 2013 +0000 + + + changelog for 4.2.beta. + +commit 0953f39e18f60a6d1dc7a2f657c42d9213aed260 +Author: wangyidong +Date: Mon Jul 8 02:41:22 2013 +0000 + + * change version to 4.2.beta. + +commit 919378dc3c82dd07c70e5079af67258919de05fa +Author: zhujinyong +Date: Mon Jul 8 02:09:10 2013 +0000 + + * fix syntax bug. + +commit 88005d150634b3cd7e2015b87e2c80416b9dc7fa +Author: zhujinyong +Date: Mon Jul 8 01:56:11 2013 +0000 + + + add note for getTaskTreeMenu. + +commit 4b9c71fbf31625e61522876bb43d2d0861fd72f0 +Author: wangyidong +Date: Mon Jul 8 01:24:35 2013 +0000 + + * code for task #1441. + +commit 07f9a587823e8b5e8c2758db7ee19f594165836a +Author: chencongzhi520@gmail.com +Date: Mon Jul 8 00:47:04 2013 +0000 + + * adjust the code. + +commit 0dae02fecd3dfdc3340878296ac73df3925038db +Author: chencongzhi520@gmail.com +Date: Mon Jul 8 00:43:17 2013 +0000 + + * change noMatchedProduct|noMatchedProject to noMatched. + * adjust the lang prompt. + +commit 33b345087b0ba556f88fa8c771650325ba08bb10 +Author: chencongzhi520@gmail.com +Date: Mon Jul 8 00:38:56 2013 +0000 + + * move the createProductLink and createProjectLink to model from control. + * code for dropmenu. + +commit fd66566d50eac4a7a85b31a70736cc3a4638eafb +Author: wangyidong +Date: Mon Jul 8 00:27:56 2013 +0000 + + * change for zh-tw lang. + +commit df28b82706267650c33835bc0f7877d79e88a4aa +Author: wangyidong +Date: Sat Jul 6 09:31:17 2013 +0000 + + * chang back button for story and todo. + +commit 1c5c39e04b177cc8f46de4127b0ed698169a160a +Author: chencongzhi520@gmail.com +Date: Sat Jul 6 09:19:55 2013 +0000 + + * adjust the back logic. + +commit fb1a69f8dc4c806ae2ab67f6fa5070bdbe496110 +Author: chencongzhi520@gmail.com +Date: Sat Jul 6 09:15:26 2013 +0000 + + * replace js:locate instead $this->locate. + +commit af02603fd50ffe8534e624fd1959bfc7479103c7 +Author: chencongzhi520@gmail.com +Date: Sat Jul 6 09:13:51 2013 +0000 + + * fix bug: when click backbutton not work. + +commit d4a1af56b49f91d760a803eb8acab1b51d3aea4c +Author: zhujinyong +Date: Sat Jul 6 08:52:01 2013 +0000 + + * note for getEstimateById. + +commit 491671603c8cb37c03574125e47931bd717367e1 +Author: wangyidong +Date: Sat Jul 6 08:31:25 2013 +0000 + + * change responser to response. + +commit e834636be9e42c34325281f6653d9e66c546ce2e +Author: wangyidong +Date: Sat Jul 6 08:29:33 2013 +0000 + + * select all.js and css by debug. + +commit f32fdcf51c2a53970f3538c84e7665da193ea078 +Author: wangyidong +Date: Sat Jul 6 08:17:37 2013 +0000 + + * adjust code for user. + +commit 055ab21947e41eb97d45670b435d5a41b2e84ff0 +Author: wangyidong +Date: Sat Jul 6 08:15:52 2013 +0000 + + * Reduce redundant. + +commit 14adee735b6679efe3d863df813a67387cc4c2f2 +Author: wangyidong +Date: Sat Jul 6 08:13:07 2013 +0000 + + * add note for closeColorbox. + +commit c1f3ef9b444c5d326330a4fd97fe64c97f20fff6 +Author: wangyidong +Date: Sat Jul 6 08:12:10 2013 +0000 + + * change prefix to viewPrefix. + +commit 48c44f932a04eb874f8d5394775272283a8828e2 +Author: wangyidong +Date: Sat Jul 6 08:10:18 2013 +0000 + + - remove useless code. + +commit 34de0eb8af8531e6ebdfd1ad52e7cd66fa632912 +Author: wangyidong +Date: Sat Jul 6 08:09:06 2013 +0000 + + * minify for mobile js and css. + +commit 60250e6b1dacd00087af3a473fcc2f4a38f2b465 +Author: chencongzhi520@gmail.com +Date: Sat Jul 6 07:54:03 2013 +0000 + + * adjust the border-bottom of navBar. + +commit bfb79c5fe1a91b4b410dcb467f4139e49af2b03a +Author: chencongzhi520@gmail.com +Date: Sat Jul 6 07:43:53 2013 +0000 + + * add hr for last object. + * adjust the style of hr in m.action.html.php. + +commit 5d272108f67764c30331d85b3fb408248557d1a4 +Author: zhujinyong +Date: Sat Jul 6 07:04:40 2013 +0000 + + * change 'sons' to 'children'. + +commit e04ad62f1d5e151d2f406a64a94495548eab97ae +Author: chencongzhi520@gmail.com +Date: Sat Jul 6 06:26:05 2013 +0000 + + * change ciqrcode to qrcode. + +commit 7400331f1ee8adbf1c2f8847cfe7dba7ab8faf2f +Author: zhujinyong +Date: Sat Jul 6 06:34:21 2013 +0000 + + - remove '

' tag. + +commit 2aec6962048a63fdeb6ee0abbb7b53cfa8a19609 +Author: zhujinyong +Date: Sat Jul 6 06:33:15 2013 +0000 + + * change 'consumed' to 'consumedNumber'. + +commit 89ae7e4035fc2cf5b374c1a18449d4c70bcb8e9e +Author: zhujinyong +Date: Sat Jul 6 06:25:30 2013 +0000 + + * m.sendmail.html.php include sendmail.html.php. + +commit ef41ff12859f8c597d747739fc3beba5a72a5efc +Author: zhujinyong +Date: Sat Jul 6 06:22:18 2013 +0000 + + * change 'consumed' to 'consumedNumber'. + +commit e8e1726bdcc627ddd0eff50663bbf83aa5229a88 +Author: zhujinyong +Date: Sat Jul 6 06:06:33 2013 +0000 + + * change '0' to 'zero'. + +commit 5d8faf1edcef615832e3ab828b029be89a66ff7a +Author: zhujinyong +Date: Sat Jul 6 06:02:30 2013 +0000 + + * correct en lang of tree browse. + +commit f480b346cb326c5daed228d057ccb3b3fd6b9dc4 +Author: zhujinyong +Date: Sat Jul 6 05:46:32 2013 +0000 + + * format code of task estimate. + +commit 5f25a13cc061e58c0a1d53bc3019eb3c734e8501 +Author: wangyidong +Date: Sat Jul 6 05:26:44 2013 +0000 + + * change the way for check mobile. + +commit 37b5c3d95f3968183c2a47d194ed47797a6d118c +Author: wangyidong +Date: Sat Jul 6 05:21:58 2013 +0000 + + * adjust code. + +commit 364256607fcee7af3169afc582130486da8937d7 +Author: wangyidong +Date: Sat Jul 6 03:41:45 2013 +0000 + + * add note for setMobileMenu + * change array_key_exists to isset. + +commit acfc6f237e238a4fa408a69acd981d54ec647278 +Author: chencongzhi520@gmail.com +Date: Sat Jul 6 03:24:37 2013 +0000 + + * change $users instead $members. + +commit ff235f4cd50a6d016b0bd8e79b7d11b94f923ddc +Author: chencongzhi520@gmail.com +Date: Sat Jul 6 03:21:43 2013 +0000 + + * set the orderBy='code' for product and project. + +commit 2a264ff2c613099e8385306ce8a3f591ade30ff3 +Author: zhujinyong +Date: Sat Jul 6 03:16:59 2013 +0000 + + + add note for getEstimateById. + +commit e7e4387a56d86bed96a0f50e75521ad62a080286 +Author: zhujinyong +Date: Sat Jul 6 03:07:03 2013 +0000 + + * revert error_reporting. + +commit bcf35c4b7b33a89d5520691f144e7fdd3c706110 +Author: chencongzhi520@gmail.com +Date: Sat Jul 6 03:00:01 2013 +0000 + + * adjust the code. + +commit 8386fa93a79563358a678af7335a13b2a7e75892 +Author: wangyidong +Date: Sat Jul 6 02:59:41 2013 +0000 + + * remove useless param. + +commit 3b0fc6c32be807c8a6c991c322ad61acbe65ad56 +Author: wangyidong +Date: Sat Jul 6 02:57:42 2013 +0000 + + * change company index. + +commit ade8be2b66f515f95cefe964c9c88f99bd92640f +Author: chencongzhi520@gmail.com +Date: Fri Jul 5 07:33:42 2013 +0000 + + * change the theme of button for web app. + +commit c767e3fbbc65c500a61f22213452482c58b7c573 +Author: chencongzhi520@gmail.com +Date: Fri Jul 5 07:23:48 2013 +0000 + + * remove the lang: showAll and hideClosed. + +commit d4944de830a8c62770592cbefab78667ea19ddd8 +Author: chencongzhi520@gmail.com +Date: Fri Jul 5 07:13:12 2013 +0000 + + * code for dropMenu. + +commit d77747cd64c6e01dcd0d42ce5f7a4aca5518455b +Author: chencongzhi520@gmail.com +Date: Fri Jul 5 06:51:46 2013 +0000 + + * adjust the lang of mobile login. + +commit 782dfabd8e64f86287a6624509b92fcb00901696 +Author: chencongzhi520@gmail.com +Date: Fri Jul 5 06:50:39 2013 +0000 + + * adjust the prompt. + +commit 8ef5b5df7fe925b1037231eef294abb52dd1173e +Author: chencongzhi520@gmail.com +Date: Fri Jul 5 05:26:14 2013 +0000 + + * adjust the dropmenu. + +commit 2b3888186439bfba8ca1b4ff808993e28720fd67 +Author: wangyidong +Date: Fri Jul 5 02:03:26 2013 +0000 + + * change the number of recPerPage for mobile. + +commit 968f81b49c1f04baf914c6537055eed32ecb27dd +Author: wangyidong +Date: Fri Jul 5 02:02:31 2013 +0000 + + * add return value. + +commit 619e702373c372a45fd8780c4a7fbb9d2181bdee +Author: wangyidong +Date: Fri Jul 5 02:01:46 2013 +0000 + + * adjust for pjax for mobile. + +commit 9bbc388e13ba0337a83b74635fec91c93db7e3ea +Author: wangyidong +Date: Fri Jul 5 02:00:25 2013 +0000 + + * remove company for zt_effort. + +commit 313322f1ada991952e8ef3b3895e4f2e6406fb45 +Author: zhujinyong +Date: Thu Jul 4 07:17:31 2013 +0000 + + * code for task#1481. + +commit a031637a6400c599f7c5b2649d1ef93933c14cd8 +Author: chencongzhi520@gmail.com +Date: Thu Jul 4 07:15:26 2013 +0000 + + * small action buttons. + +commit 0be1be7679d87bb181918be7dddbbba298d96937 +Author: chencongzhi520@gmail.com +Date: Thu Jul 4 07:02:39 2013 +0000 + + * add pager for my bug list. + +commit 2a7ebdbea931ee096c6fa2f3e97f0af86f5bc593 +Author: wangyidong +Date: Thu Jul 4 06:56:02 2013 +0000 + + * fix a bug for browse project and product in mobile. + +commit fa9b8ad2a6865006d7f9aa49d8537c1bf5d2baf1 +Author: wangyidong +Date: Thu Jul 4 06:45:39 2013 +0000 + + * fix a bug for do not locate when no project and product in mobile. + +commit 178c3f2dee769c66bd91d1b10ded5ae93bbc0fb7 +Author: wangyidong +Date: Thu Jul 4 06:44:33 2013 +0000 + + * fix a bug for no project and product. + +commit 9c0c36615381f1702b8a584b967a86bd9df15a0f +Author: zhujinyong +Date: Thu Jul 4 05:50:33 2013 +0000 + + * code for task#1481. + +commit e08129dde59bcd73d5c19e9bee2b6d5d5fc1dc65 +Author: zhujinyong +Date: Thu Jul 4 05:41:56 2013 +0000 + + * adjust pager for mobile. + +commit b5113aaa53736d18486d8579354eab6c3ac2b9f6 +Author: wangyidong +Date: Thu Jul 4 05:40:27 2013 +0000 + + * change zentao.sql to 4.2 + +commit acba807b6c952d3edc046e0552e853bfab7846c3 +Author: wangyidong +Date: Thu Jul 4 01:14:34 2013 +0000 + + * change for upgrade. + +commit 49f3bf69fa7cd6d060bca9d704780dfb65ab31fa +Author: wangyidong +Date: Wed Jul 3 08:52:21 2013 +0000 + + * finish task #1468. + +commit 5d8358246c0842414a93bfa7fe9c4a4fd28e2ea9 +Author: chencongzhi520@gmail.com +Date: Wed Jul 3 08:39:11 2013 +0000 + + * code for task#1487. + +commit 6a7917ffba632f655de4a79205d2ac8b0675f6f9 +Author: wangyidong +Date: Wed Jul 3 08:29:02 2013 +0000 + + * change note. + +commit 2093b5f42123dc4c3e8057606eb26e4c677cad3d +Author: wangyidong +Date: Wed Jul 3 08:27:51 2013 +0000 + + * code for task #1483. + +commit d183a1a25fe47ff3c09d2d651bdb7da200dbe43a +Author: chencongzhi520@gmail.com +Date: Wed Jul 3 08:25:39 2013 +0000 + + * code for task#1487. + +commit 83a516fa9daf509ff8cd06805dc184a32fbdcd97 +Author: chencongzhi520@gmail.com +Date: Wed Jul 3 08:22:13 2013 +0000 + + * code for task#1487. + +commit af0bf604a944a3d76d16fb8e8b1ff4b13faf0317 +Author: chencongzhi520@gmail.com +Date: Wed Jul 3 08:20:57 2013 +0000 + + * code for task#1487. + +commit 204ab284a5e443a242c4801e6ca67798291ca57c +Author: chencongzhi520@gmail.com +Date: Wed Jul 3 08:14:47 2013 +0000 + + * code for task#1487. + +commit c24ba92c5df72f79d147f4b4a57122af542f9776 +Author: wangyidong +Date: Wed Jul 3 08:06:05 2013 +0000 + + * adjust login for mobile. + +commit 331e0f9b0464dbb10b4d518d7ecd58192ff66bff +Author: wangyidong +Date: Wed Jul 3 08:03:58 2013 +0000 + + * finish task #1447. + +commit 957f01c7ed321b80fe6570c0e261965d0caa12f9 +Author: wangyidong +Date: Wed Jul 3 07:54:05 2013 +0000 + + * Do not use colorbox when pager is in colorbox. + +commit edf0f2da82f2222ad4b0730bd3ed6d787aac652f +Author: chencongzhi520@gmail.com +Date: Wed Jul 3 07:40:47 2013 +0000 + + * code for task#1487. + +commit 34e854657706332affb3aea2171eb3f0dc8e8742 +Author: chencongzhi520@gmail.com +Date: Wed Jul 3 07:34:41 2013 +0000 + + * code for task#1487. + +commit ffdcd41f6e0c0b77c00595a771f0415b2b1eac07 +Author: chencongzhi520@gmail.com +Date: Wed Jul 3 07:27:01 2013 +0000 + + * code for task#1487. + +commit 1e9a8043dedaa3625561740a789fe66b2f50da88 +Author: chencongzhi520@gmail.com +Date: Wed Jul 3 07:21:59 2013 +0000 + + * code for task$1487. + +commit 1a9765dc02d9d9653090c756c1cc0c65a34e459c +Author: chencongzhi520@gmail.com +Date: Wed Jul 3 07:18:37 2013 +0000 + + * code for task#1487. + +commit 46f14183f2c966368041120b54a2f4f340528ea4 +Author: wangyidong +Date: Wed Jul 3 07:15:45 2013 +0000 + + + finish task #1496. + +commit e4e04d46bc1a15ee7b985fa96b75585cff3d1017 +Author: zhujinyong +Date: Wed Jul 3 07:05:45 2013 +0000 + + * code for task#1479. + +commit 3be8ff4a9bb1cc293ac2fae3f4c32657de755bf7 +Author: chencongzhi520@gmail.com +Date: Wed Jul 3 06:51:08 2013 +0000 + + * code for task#1487. + * adjust the assign of users. + +commit db9a49eef6b2d8f281b0047aa4784e5e44970900 +Author: zhujinyong +Date: Wed Jul 3 06:15:37 2013 +0000 + + * code for task#1478. + +commit 1abc0b6546a5bd0fdd9601e4769bce0ec2dcb444 +Author: zhujinyong +Date: Wed Jul 3 05:59:04 2013 +0000 + + * code for task#1477. + +commit 8746544e5bd944e1fd17b1b8a4bc6daef715331f +Author: wangyidong +Date: Wed Jul 3 05:10:00 2013 +0000 + + * finish task #1465. + +commit 0ea9b0420c4979116faa40a442c80ea0ccfb138f +Author: wangyidong +Date: Wed Jul 3 03:35:02 2013 +0000 + + * finish task #1463. + +commit 8ea77a02150ac377cca9ff7bd6a2a54fddade912 +Author: zhujinyong +Date: Wed Jul 3 02:34:05 2013 +0000 + + * code for task#1477. + +commit 3360589aded1fa3dc29cc914e74685510675d275 +Author: chencongzhi520@gmail.com +Date: Wed Jul 3 02:22:57 2013 +0000 + + * finish task#1506. + +commit ea6d3274af7462e76af42de1179416f79a2b4a16 +Author: wangyidong +Date: Wed Jul 3 02:15:49 2013 +0000 + + * adjust code. + +commit 8c4809e15a68402dade3dc3b01523543dcd5b4a6 +Author: wangyidong +Date: Wed Jul 3 02:05:50 2013 +0000 + + * finish task #1444. + +commit 56b2d02b9e2b128ef4539e221f6b173ed93d6311 +Author: wangyidong +Date: Wed Jul 3 01:18:37 2013 +0000 + + * code for task #1483. + +commit 684b355af0c4d579a0f2457c44b4619ce253c06c +Author: chencongzhi520@gmail.com +Date: Wed Jul 3 00:27:14 2013 +0000 + + * finish task#1476. + +commit 2d0b26df15504af96b0b49ec417a36df63234472 +Author: chencongzhi520@gmail.com +Date: Tue Jul 2 08:33:44 2013 +0000 + + * finish task#1475. + +commit 5f8bfb7743199fd98f795fd7c4d2946bab6e98ad +Author: wangyidong +Date: Tue Jul 2 08:15:31 2013 +0000 + + * finish task #1483. + +commit b6670b7724885c54d903937f808a310bb1bad67d +Author: zhujinyong +Date: Tue Jul 2 08:10:45 2013 +0000 + + * ignore strict error. + +commit ae8d0bc086043e2b987ba6dfc29f860ee0911b3b +Author: zhujinyong +Date: Tue Jul 2 07:41:37 2013 +0000 + + * fix a bug : webapp menu error. + +commit b9ab6cedb3ebae1d00459e8de426a890f4b80502 +Author: wangyidong +Date: Tue Jul 2 07:03:57 2013 +0000 + + * hide import button when todo is today. + +commit 51f71311c13d4f9908770a6c4ac77de6fd85c8e9 +Author: zhujinyong +Date: Tue Jul 2 06:50:10 2013 +0000 + + * use 127.0.0.1 as default when connect db. + +commit 99e1148a591b198cae4512056913d906a048973c +Author: zhujinyong +Date: Tue Jul 2 06:20:40 2013 +0000 + + * code for task#1455. + +commit 2716c0fad9159eda8b686d6d6852244b45fe1f92 +Author: wangyidong +Date: Tue Jul 2 05:58:11 2013 +0000 + + * finish task #1503. + +commit 6dad6801bd74a5f8b670f04688e590a95b71dccc +Author: wangyidong +Date: Tue Jul 2 05:57:12 2013 +0000 + + * change the footer of todo in mobile. + +commit 10af545c104df0bee7f5b04322038e010c7946cb +Author: chencongzhi520@gmail.com +Date: Tue Jul 2 05:43:11 2013 +0000 + + * finish task#1505. + +commit 9ab8414c3c471ce91be1d16c77c50e0e220227b3 +Author: zhujinyong +Date: Tue Jul 2 03:07:17 2013 +0000 + + * code for task#1448. + +commit d34d49e75ae8ef0ffb0b85920964e15b87208f90 +Author: wangyidong +Date: Tue Jul 2 02:59:25 2013 +0000 + + * finish task #1466. + +commit 0ef541ea9455b87401ff47d017839720ee666246 +Author: wangyidong +Date: Tue Jul 2 02:46:46 2013 +0000 + + * change button for moblie. + * adjust for locate. + +commit 05762e84d8914fb9eb6d00adc8cd61cacafb026c +Author: wangyidong +Date: Tue Jul 2 02:42:33 2013 +0000 + + * change zentao.js for jqueryForm. + +commit c835dd562b97dacedf8830f6fbd5d1cde4e267cc +Author: wangyidong +Date: Tue Jul 2 02:37:21 2013 +0000 + + * finish task #1484. + +commit 5a1cb7ea79d9f6811fd01737602c1a4fad0d4c7c +Author: wangyidong +Date: Tue Jul 2 02:25:52 2013 +0000 + + * finish task #1491. + +commit afa09076139429c9fbe27b467f9db5406e30f54e +Author: chencongzhi520@gmail.com +Date: Tue Jul 2 02:21:55 2013 +0000 + + * finish task#1469. + +commit 88eff285882439e5c690017eb54d1ae106afe250 +Author: zhujinyong +Date: Tue Jul 2 02:16:59 2013 +0000 + + * code for task#1493. + +commit 27ba0096079e140539b58334f659b1f448b61e47 +Author: wangyidong +Date: Tue Jul 2 02:16:37 2013 +0000 + + * finish task #1488. + +commit ac1c910864b1234209de8479ac282cb4dc55aa0b +Author: wangyidong +Date: Tue Jul 2 02:14:02 2013 +0000 + + * finish task #1473. + +commit aad4354fdf53a78ec216a627c0bdfd44285395ab +Author: chencongzhi520@gmail.com +Date: Tue Jul 2 02:11:41 2013 +0000 + + * finish task#1458. + +commit 230553e0b0529b4cb291320eae07ad366d993700 +Author: wangyidong +Date: Tue Jul 2 02:07:54 2013 +0000 + + * finish task #1501. + +commit 00373ffeee97bcf607e327b10946923fa48526a0 +Author: chencongzhi520@gmail.com +Date: Tue Jul 2 01:47:21 2013 +0000 + + * finish task#1504. + +commit b52eb3ea7814a6f80f2d7c3b1dae634f4506146e +Author: zhujinyong +Date: Tue Jul 2 01:39:50 2013 +0000 + + * code for task #1480. + +commit 461eb3e01040a3b6b04481f55ec3e8221c40d3fc +Author: chencongzhi520@gmail.com +Date: Tue Jul 2 01:29:23 2013 +0000 + + * finish task#1456. + +commit baa36ac7d50ec85922a5b0a9a9e8dfac63f60510 +Author: chencongzhi520@gmail.com +Date: Tue Jul 2 01:14:58 2013 +0000 + + * finish task#1451. + +commit 8224033bc119f60dc97cea139ffe17563639271c +Author: chencongzhi520@gmail.com +Date: Tue Jul 2 00:49:12 2013 +0000 + + * finish task#1464. + +commit fbeb8af489cbadba6a278afbc36e28c58816ef5e +Author: chencongzhi520@gmail.com +Date: Mon Jul 1 08:40:25 2013 +0000 + + * finish task#1472. + +commit 293f93dd48cd91740042a5dfa7b377159999dfa9 +Author: zhujinyong +Date: Mon Jul 1 07:51:45 2013 +0000 + + * fix a bug : empty can't use the return of trim. + +commit 7d1aaccedc9cab9c6ce449019ec68127f1512489 +Author: zhujinyong +Date: Mon Jul 1 07:47:58 2013 +0000 + + * if trim condition is empty, condition is '1=1'. + +commit 862865b8f6308984aafe390bc7d18ccd183a5b30 +Author: chencongzhi520@gmail.com +Date: Mon Jul 1 07:45:00 2013 +0000 + + * finish task#1502. + +commit a51164bbc2a7bb0af845c47fb6956ab134e54b1c +Author: chencongzhi520@gmail.com +Date: Mon Jul 1 07:31:28 2013 +0000 + + * finish task#1494. + +commit 50d0ed0d624d66c015c52098fe2c9b74e491b051 +Author: zhujinyong +Date: Mon Jul 1 07:00:32 2013 +0000 + + * if the module is deleted, module of objects will be moved parent. + +commit 2564e600387d56a2284b8389337760f4899e89c8 +Author: zhujinyong +Date: Mon Jul 1 06:46:14 2013 +0000 + + * adjust m.recordestimate.html. + +commit 358138e9f272fd6a848cec532866150ec9d4ffa4 +Author: wangyidong +Date: Fri Jun 28 02:43:27 2013 +0000 + + * ajdust highlight for mobile's mainMenu. + +commit 78a2f85b21415ef113f5e5a88c83f18526f7aeee +Author: wangyidong +Date: Fri Jun 28 02:27:23 2013 +0000 + + * change for my-story use ajax + * add title for project-index and product-index. + +commit 871bc69eff4e9b7526129faceb6858a9683a05ed +Author: zhujinyong +Date: Fri Jun 28 01:57:53 2013 +0000 + + + add backButton for task views. + +commit d3a993565245d546967c2b30d9bfd3f93dbbd2da +Author: zhujinyong +Date: Fri Jun 28 01:45:53 2013 +0000 + + * fix bug in task m.view. + +commit 16224d70a620a9247ae6d77bcd09fafbbe313150 +Author: zhujinyong +Date: Fri Jun 28 01:02:09 2013 +0000 + + * adjust style of mobile task module. + +commit 8c2a2970b8ecad38f5d791a4ac920b530c118923 +Author: wangyidong +Date: Thu Jun 27 09:13:01 2013 +0000 + + * add activate for my-story. + +commit c53b1dfe75e9be3cb7755b28884e35f3f1ea61f7 +Author: wangyidong +Date: Thu Jun 27 09:10:14 2013 +0000 + + * change to table. + +commit 899078c030115c043234cbe0d7f4f59bdad09c22 +Author: chencongzhi520@gmail.com +Date: Thu Jun 27 09:08:13 2013 +0000 + + * code for task#1424. + +commit d0bee531e62bec7fe239e898ec64aeb453138d22 +Author: chencongzhi520@gmail.com +Date: Thu Jun 27 08:57:54 2013 +0000 + + * code for task#1424. + +commit 182059772d448cf148a38f7f977d7a50d3b90ef1 +Author: zhujinyong +Date: Thu Jun 27 08:54:45 2013 +0000 + + * adjust active task. + +commit 0eeedbcc5c662357244f9b7f846c72938d99aa75 +Author: chencongzhi520@gmail.com +Date: Thu Jun 27 08:41:02 2013 +0000 + + * code for task#1424. + +commit ccafa402905d68c59726432c7e89d89b26674a3a +Author: chencongzhi520@gmail.com +Date: Thu Jun 27 08:35:05 2013 +0000 + + * code for task#1424. + +commit 619d22a8a5d3e7630ca14ff2ccadcd620c0da54e +Author: wangyidong +Date: Thu Jun 27 08:01:37 2013 +0000 + + * add style for table. + +commit 758cf28c28cccf6a627a89fd7eacf6819ae2406d +Author: chencongzhi520@gmail.com +Date: Thu Jun 27 07:06:54 2013 +0000 + + * add comment. + +commit ab8dfc3eebbdd23a25966427cf2152ee9b05f7a6 +Author: chencongzhi520@gmail.com +Date: Thu Jun 27 07:03:27 2013 +0000 + + * code for task#1424. + +commit cd902d213af0fcf49a0a1e9ae512d490230d607b +Author: chencongzhi520@gmail.com +Date: Thu Jun 27 06:44:31 2013 +0000 + + * remove the view of todo. + +commit cec3412bbf4586fd80030edd91ef75f250055084 +Author: chencongzhi520@gmail.com +Date: Thu Jun 27 05:28:20 2013 +0000 + + * code for task#1424. + +commit 15b26f4ff242d25dd379ea7f8d82ef73a1f0d63a +Author: wangyidong +Date: Thu Jun 27 03:36:54 2013 +0000 + + * remove the param of onlybody. + +commit 7c2379e8aaec233c26519d1b5c2647381e08cc73 +Author: wangyidong +Date: Thu Jun 27 03:34:32 2013 +0000 + + * adjust code for ajaxForm. + +commit c83fcf55ba836ebd2afc253150dd587ca54453d0 +Author: wangyidong +Date: Thu Jun 27 03:33:25 2013 +0000 + + * change loadColorbox to setModal4List for the function name. + +commit 5e4951250c919b4beaca197f2054083b0cb62f24 +Author: wangyidong +Date: Thu Jun 27 03:31:19 2013 +0000 + + * add null string. + +commit 97a6ddd46ccb9bfae93f051d5e27aa7e3c2b3a63 +Author: chencongzhi520@gmail.com +Date: Thu Jun 27 02:36:58 2013 +0000 + + * ajax get todo detail. + +commit 8bb4649deab1a503ed0c6e530a7bce54543813a3 +Author: chencongzhi520@gmail.com +Date: Thu Jun 27 02:28:28 2013 +0000 + + * code for task#1424. + +commit 5b37b3b0bf2fc5d6a7eb4a3469b2292466f9395b +Author: chencongzhi520@gmail.com +Date: Thu Jun 27 02:23:04 2013 +0000 + + * ajax get the task detail. + +commit 3fe6368478abd788a2dce46b32159b483f2a37d4 +Author: chencongzhi520@gmail.com +Date: Thu Jun 27 02:05:39 2013 +0000 + + * add ajax get the bug detail. + +commit 273c5061b2f6dcd18bd4e077ec176170e89dc847 +Author: chencongzhi520@gmail.com +Date: Thu Jun 27 02:03:48 2013 +0000 + + * adjust my-bug list. + * goto my-bug list from bug-view. + * ajax get the detail of bug. + +commit 5368aaeec1ba456cc47445a0924dbce06d3daa61 +Author: zhujinyong +Date: Thu Jun 27 01:57:59 2013 +0000 + + * go to tasks of project instead of view. + +commit 5fff89dd494a265664a75c3649e95a15bc2636c1 +Author: zhujinyong +Date: Thu Jun 27 01:43:15 2013 +0000 + + * change style of task in mobile. + +commit d2c4e9e4b98b1639e85912aa428e64ff920b64a9 +Author: chencongzhi520@gmail.com +Date: Thu Jun 27 01:37:41 2013 +0000 + + * goto product browse in m.view.html.php. + +commit 77864751cbda91b53aa96897325e6bb284c8431c +Author: chencongzhi520@gmail.com +Date: Thu Jun 27 01:23:22 2013 +0000 + + * add actions for story detail. + +commit 389c4759e5b4551e7c4ddfc9c6f53740a26dba55 +Author: chencongzhi520@gmail.com +Date: Thu Jun 27 01:10:17 2013 +0000 + + * code for task#1424. + * add ajax for story list. + +commit 1dd52b143bfc6ea74e1d9af235bc251cdb8e4e73 +Author: chencongzhi520@gmail.com +Date: Thu Jun 27 00:56:52 2013 +0000 + + * adjust the qrcode. + * remove the code of qrcode.html.php to control.php. + +commit 7823826e2af5f1237fb241a1717e3e5b231bf103 +Author: chencongzhi520@gmail.com +Date: Wed Jun 26 08:28:39 2013 +0000 + + * code for qrcode. + +commit a427e2c62894a50118d4dd72336af08dc5c6709d +Author: chencongzhi520@gmail.com +Date: Wed Jun 26 08:27:24 2013 +0000 + + * code for qrcode. + +commit ac1c3656e5c37b052e303efac79b53f6ae6882f3 +Author: chencongzhi520@gmail.com +Date: Wed Jun 26 07:23:50 2013 +0000 + + * add space. + +commit 860ce33544023a3d92e266dbc51b6e04ebb1a453 +Author: chencongzhi520@gmail.com +Date: Wed Jun 26 07:19:58 2013 +0000 + + * adjust the logic of init currentModule when call setMenu of product. + +commit abea820b22294301b93645a535e13204d7f054c1 +Author: chencongzhi520@gmail.com +Date: Wed Jun 26 07:07:58 2013 +0000 + + * adjust if isset $users. + * batchCreate not assign users. + +commit 3aec8948b12694a30118481064ab6dedde1dba26 +Author: chencongzhi520@gmail.com +Date: Wed Jun 26 06:34:36 2013 +0000 + + * code for task#1427. + +commit c0cb5aaed3ce94028f8ba5c96f3e0b1aa8a32f80 +Author: chencongzhi520@gmail.com +Date: Wed Jun 26 06:27:16 2013 +0000 + + * finish task#1425. + * finish task#1426. + * finish task#1427. + * finish task#1428. + +commit d9a4efdf237dc30cb3974dbd1aaa6c403914621f +Author: wangyidong +Date: Wed Jun 26 05:37:45 2013 +0000 + + * finish task #1438. + +commit eabde4a7fe042d494ff804e8178571619ac05450 +Author: wangyidong +Date: Wed Jun 26 05:32:59 2013 +0000 + + * finish task #1437. + +commit 0538291a19afd70e66ef750e58859ecf9b789a56 +Author: wangyidong +Date: Wed Jun 26 05:25:58 2013 +0000 + + * finish task #1436. + +commit b3104ce424f2b6ceddbf5b4bd5d8d3c4b2d971b8 +Author: wangyidong +Date: Wed Jun 26 03:43:26 2013 +0000 + + * finish task #1435. + +commit a0c3627b8cec0daa2cfc078e239bd9dfdeb45528 +Author: wangyidong +Date: Wed Jun 26 03:42:13 2013 +0000 + + + finish task #1433. + +commit c43eec4a20588e04543233c8dd86b34975ccc21a +Author: wangyidong +Date: Wed Jun 26 03:39:36 2013 +0000 + + * convert int to string in the function js::set(). + +commit 6e558f73ba0971fe23b1207ea0625543f53e8fd0 +Author: chencongzhi520@gmail.com +Date: Wed Jun 26 01:34:33 2013 +0000 + + * remove the goback link. + +commit 485e7bed9f2937327689182a42f4f4ff6b8194a0 +Author: wangyidong +Date: Wed Jun 26 01:13:16 2013 +0000 + + * change to function js::set(). + +commit f96ac18298eaa9c4bdc3734baac851afab6fab8e +Author: wangyidong +Date: Tue Jun 25 01:33:05 2013 +0000 + + * finish task #1432. + +commit 5caeb06c9cb30c3769472b0f91e97eefc7ae9adf +Author: wangyidong +Date: Tue Jun 25 01:31:43 2013 +0000 + + + finish task #1431. + +commit 6518a19c4066388adb3046505f4ff8c26b47f36e +Author: wangyidong +Date: Tue Jun 25 01:28:39 2013 +0000 + + + finish task #1430. + +commit 776dccf2a2cc272ca219afde8be1bf677732e465 +Author: wangyidong +Date: Tue Jun 25 01:25:26 2013 +0000 + + * finish task #1429. + +commit 670ec60f6c54a532bccdf8e32eb1db0052007a16 +Author: wangyidong +Date: Tue Jun 25 00:54:45 2013 +0000 + + + add the function of loadColorbox. + +commit 1d08f9c094da13637dbecde5f250979c434d41d4 +Author: wangyidong +Date: Tue Jun 25 00:51:45 2013 +0000 + + + add function of closeColorbox. + +commit 750d75a0b8845f0134ad10ae6012a7afe37d741f +Author: zhujinyong +Date: Mon Jun 24 06:59:58 2013 +0000 + + * fix a bug: createCaseLink is error. + +commit 4eee8fd53848bda414f9773cae705f28ff84deb2 +Author: wangyidong +Date: Mon Jun 24 01:46:21 2013 +0000 + + * fix a bug. + +commit d21c4187d2db2dd163cfb75f810fc60fbde0b333 +Author: wangyidong +Date: Mon Jun 24 01:39:38 2013 +0000 + + + add m.login.js + +commit a855c053b712607c2d1adff4ef50db77b2182916 +Author: wangyidong +Date: Fri Jun 21 09:03:53 2013 +0000 + + * change style for bug in mobile. + +commit 006c53bfe75d7486ff536c4a04ba6c98b4236857 +Author: zhujinyong +Date: Fri Jun 21 09:02:58 2013 +0000 + + + add js for mobi. + +commit 0669d616e74a20f985429cef6a037712087801d9 +Author: zhujinyong +Date: Fri Jun 21 09:01:58 2013 +0000 + + * code for task#1408. + +commit e711c5c8565bb236126622e0160896966b608a0c +Author: zhujinyong +Date: Fri Jun 21 09:01:26 2013 +0000 + + *code for task#1409. + +commit 8f1aebca6892e0367a1c1608ab16806371a2b0b2 +Author: zhujinyong +Date: Fri Jun 21 09:00:47 2013 +0000 + + * code for task#1411. + +commit 6a1237563ab15d691cd3bae00981dd0b2eccabd8 +Author: zhujinyong +Date: Fri Jun 21 09:00:10 2013 +0000 + + + add send mail for mobile. + +commit 13c28ff95eff7b796d11df5275dc75fa3541874d +Author: wangyidong +Date: Fri Jun 21 08:59:35 2013 +0000 + + * change style for mobile. + +commit 6735e05438f185abb4277ac0a6f1779256a49167 +Author: zhujinyong +Date: Fri Jun 21 08:59:22 2013 +0000 + + * code for task#1408. + +commit fd02974737f353695d9444f273dcb080ce809c36 +Author: zhujinyong +Date: Fri Jun 21 08:55:03 2013 +0000 + + * code for task#1407. + +commit e90cb4e14434dc493f6a39e0b26e5ebaa0ecc388 +Author: zhujinyong +Date: Fri Jun 21 08:52:37 2013 +0000 + + * code for task#1407. + +commit 3c4699fc299466451123a50f3b4713d2ab91851c +Author: wangyidong +Date: Fri Jun 21 08:11:01 2013 +0000 + + * remove script. + +commit fb446e28f31102d5a9ae8444b8f46c2dc35b2d3e +Author: chencongzhi520@gmail.com +Date: Fri Jun 21 08:11:00 2013 +0000 + + * code for task#1395. + +commit c450324c8a78edaee3a575f777746a571f4f964b +Author: wangyidong +Date: Fri Jun 21 07:28:58 2013 +0000 + + * make button to center. + +commit 05fb878d0af8f2065f4733b00dd04158d3f66b67 +Author: chencongzhi520@gmail.com +Date: Fri Jun 21 07:24:48 2013 +0000 + + * code for task#1424. + +commit 7ebcdb3503789b6fe858340865dd2014255b57af +Author: wangyidong +Date: Fri Jun 21 06:32:56 2013 +0000 + + + finish task #1400. + +commit e31e41f47e75dedb5812e4c3b6386173865e9437 +Author: wangyidong +Date: Fri Jun 21 06:31:34 2013 +0000 + + * finish task #1398. + +commit 2d8c05eb11afa56cd895876ddbe607509185ef4d +Author: wangyidong +Date: Fri Jun 21 06:28:47 2013 +0000 + + + finish task #1404. + +commit cdaf02b6c325eb99a3b9002149391d0672895b86 +Author: chencongzhi520@gmail.com +Date: Fri Jun 21 06:23:23 2013 +0000 + + * code for task#1405. + +commit de61bd2795742cc108bcbcf002053ce846dccdcf +Author: chencongzhi520@gmail.com +Date: Fri Jun 21 06:08:33 2013 +0000 + + * code for task#1424. + +commit ece5ec80c9da0897b83ac3546aba102d3c225f5a +Author: chencongzhi520@gmail.com +Date: Fri Jun 21 05:56:00 2013 +0000 + + * code for task#1424. + +commit 1a810adf3b02186aa1ead80ab4329754fed1257e +Author: chencongzhi520@gmail.com +Date: Fri Jun 21 05:48:06 2013 +0000 + + * code for task#1414. + +commit 5bf849379ab6f386d76b672ae39130b884c273e5 +Author: chencongzhi520@gmail.com +Date: Fri Jun 21 05:38:12 2013 +0000 + + * finish task#1413. + +commit f74a78511fc036ae33755cfc02bda2ca3fd06554 +Author: chencongzhi520@gmail.com +Date: Fri Jun 21 05:35:35 2013 +0000 + + * code for task#1412. + +commit b835d6413af17528c91b5b9d8810ee42d415303f +Author: chencongzhi520@gmail.com +Date: Fri Jun 21 05:26:00 2013 +0000 + + * code for task#1416. + +commit 749f293efcb20e7affd7e75680cd098786c2b5bb +Author: chencongzhi520@gmail.com +Date: Fri Jun 21 05:25:29 2013 +0000 + + * code for task#1415. + +commit c6d8069293ca94a6d086bdac875deaa7a5177752 +Author: chencongzhi520@gmail.com +Date: Fri Jun 21 05:23:38 2013 +0000 + + * code for task#1416. + +commit 60a07641e0d16c282e23b4d6dfdf16a118c0626a +Author: chencongzhi520@gmail.com +Date: Fri Jun 21 05:21:31 2013 +0000 + + * finish task#1415. + +commit 2c509e2da56a59a5b105c36f8c0a9e14ef4bc49e +Author: wangyidong +Date: Fri Jun 21 03:44:23 2013 +0000 + + * finish task #1401. + +commit a3d786e5170cbd5145c14f1ad0f0d42848ac987c +Author: chencongzhi520@gmail.com +Date: Fri Jun 21 02:23:42 2013 +0000 + + * add iframe for footer. + +commit 43da58953890ec38265ba9a1b17e5c8fe558a863 +Author: chencongzhi520@gmail.com +Date: Fri Jun 21 02:20:33 2013 +0000 + + * finish task#1416. + +commit 69d622c41fe29ea0a2321d4199066fc222e0ab5d +Author: zhujinyong +Date: Fri Jun 21 01:54:39 2013 +0000 + + * code for task#1402. + +commit 1ea7e50eb52ab0e7fb6eb19b84369cf3f5a67550 +Author: zhujinyong +Date: Fri Jun 21 01:53:20 2013 +0000 + + * code for task#1407. + +commit 2170d63b1f95c3ff2c3f79a6f19c31e87e1f826f +Author: zhujinyong +Date: Fri Jun 21 01:49:58 2013 +0000 + + * code for task#1402. + +commit 5feabd7aba95256acd05fcad2c3e90ed82b8344a +Author: zhujinyong +Date: Fri Jun 21 01:49:29 2013 +0000 + + * code for task#1399. + +commit 440e10b1e67891edc4d64862e4706960c7f12070 +Author: chencongzhi520@gmail.com +Date: Fri Jun 21 01:46:35 2013 +0000 + + * adjust the printIcon function for web app. + +commit 093283d405796d881d471ef1fd8f536bd8eb3050 +Author: wangyidong +Date: Thu Jun 20 09:01:09 2013 +0000 + + * add back button for todo-batchcreate. + +commit efa8eeb3b90a7aaaac4fb662c1e7c1190ba5561c +Author: wangyidong +Date: Thu Jun 20 08:47:51 2013 +0000 + + * finish task #1419. + +commit f2d86d3b41dbe3813399e71ad202afbade8ce552 +Author: wangyidong +Date: Thu Jun 20 08:23:08 2013 +0000 + + * code for view todo. + +commit abb4e55b32d4bcede826eed2bdf483597c5af4f1 +Author: chencongzhi520@gmail.com +Date: Thu Jun 20 08:10:40 2013 +0000 + + * code for task#1392. + +commit dbba8f333b8608667c7fac8f568225ec8c9597ce +Author: chencongzhi520@gmail.com +Date: Thu Jun 20 08:03:26 2013 +0000 + + * code for task#1392. + +commit b9db8d168dd4e6c9cddc4faa59df430ba0baf2b0 +Author: chencongzhi520@gmail.com +Date: Thu Jun 20 06:53:01 2013 +0000 + + * code for task#1392. + +commit 1dcf7de935b20faa4c9310d626dee7c615bfda65 +Author: wangyidong +Date: Thu Jun 20 06:11:05 2013 +0000 + + + finish task #1397. + +commit c1a4deabadbd47391bca49415828569ebc90e17f +Author: zhujinyong +Date: Thu Jun 20 05:47:03 2013 +0000 + + * code for task#1399. + +commit f3a2683d75467459d510bbeb94a70dbe302dca74 +Author: wangchunsheng +Date: Thu Jun 20 05:29:36 2013 +0000 + + * when js::excute, no html head. + +commit ed27f1671e88584df299cdfe6e6ca303b3fd3379 +Author: chencongzhi520@gmail.com +Date: Thu Jun 20 05:27:04 2013 +0000 + + * finish task#1395. + +commit 782520e7b7cbae81400f58b7ed6960cbfc54398b +Author: wangyidong +Date: Thu Jun 20 03:16:07 2013 +0000 + + * finish task #1394. + +commit fdc7eddce16fbc82bd0003cd7382229bb4aa7203 +Author: wangyidong +Date: Thu Jun 20 02:06:58 2013 +0000 + + * supply task #1393. + +commit 97b2ebc892b61a41be9d5c2134c2a05b75efdc0b +Author: wangyidong +Date: Thu Jun 20 02:04:35 2013 +0000 + + * finish task #1393. + +commit a7ad94ae9902453626321d5cd03919b32f09065a +Author: wangyidong +Date: Thu Jun 20 01:51:49 2013 +0000 + + * finish task @1396. + +commit 6238c83e9e5107a6958859caccf4cfe86b6f23aa +Author: wangyidong +Date: Wed Jun 19 07:28:16 2013 +0000 + + * fix a bug for header. + +commit 435557012c5dec97efbdff39018de500c283b4e8 +Author: wangyidong +Date: Wed Jun 19 07:21:15 2013 +0000 + + + finish task #1392. + +commit 359c92751015fcc20b91364bee8e8b0362af87b4 +Author: zhujinyong +Date: Wed Jun 19 05:39:40 2013 +0000 + + * fix a bug : add language of manageWebappChild. + +commit 7c7928cae6e43bcfa9fdefc26bdcffb1ddedb45e +Author: zhujinyong +Date: Wed Jun 19 03:17:02 2013 +0000 + + * code for task#1383. + +commit 5c50476f7512545bd4886476455bf84dcae4ac4f +Author: zhujinyong +Date: Wed Jun 19 03:16:29 2013 +0000 + + * code for task#1382. + +commit dd03e4dd57ae0eb121af2ed78c474446d8879fdd +Author: chencongzhi520@gmail.com +Date: Wed Jun 19 02:48:45 2013 +0000 + + * code for task#1423. + +commit 276f616253b1a7a10cdf1d11725fedc97f792e41 +Author: chencongzhi520@gmail.com +Date: Wed Jun 19 02:11:05 2013 +0000 + + * code for task#1423. + +commit 7d756c24739eeed39b35d19d9913a6d98e9fc63e +Author: zhujinyong +Date: Wed Jun 19 01:38:44 2013 +0000 + + * improve subMenu. + +commit 79eae99f5c7eaedca44e5bf76140cc7b78fcf2f4 +Author: chencongzhi520@gmail.com +Date: Wed Jun 19 01:33:57 2013 +0000 + + * finish task#1366. + +commit 7875620dc875c54d7da56d7b1cb9b6df66f59a94 +Author: chencongzhi520@gmail.com +Date: Wed Jun 19 01:32:21 2013 +0000 + + * code for task#1381. + +commit 3d513621336df8cee6967601c3cb31881b2a1918 +Author: zhujinyong +Date: Wed Jun 19 01:16:48 2013 +0000 + + * code for task#1386. + +commit e66c02dabe422077fb5fc09933e5aebc16e5789f +Author: chencongzhi520@gmail.com +Date: Wed Jun 19 01:13:27 2013 +0000 + + * finish task#1381. + +commit 764151476986dfb73fbfd8a80e0c62dad409e00e +Author: chencongzhi520@gmail.com +Date: Wed Jun 19 01:05:49 2013 +0000 + + * code for task#1377. + +commit 16b97af26fb4617bf10a31afd29ea2bbe6a528ea +Author: chencongzhi520@gmail.com +Date: Wed Jun 19 01:05:11 2013 +0000 + + * code for task#1377. + +commit 73366cc2fdb9a78ffd87dd28a876633849f89789 +Author: wangyidong +Date: Tue Jun 18 08:44:23 2013 +0000 + + + finish task #1391. + +commit b6903c51a56f86fcec2205ae386111819cbe4fc7 +Author: wangyidong +Date: Tue Jun 18 08:42:48 2013 +0000 + + * add pager for login in mobile. + +commit 5438b838bf02a95ad2402c140f136951b5d10118 +Author: chencongzhi520@gmail.com +Date: Tue Jun 18 08:33:43 2013 +0000 + + * code for task#1377. + +commit 17563eae27306109227edcf2ffd8af6e896b5d2b +Author: chencongzhi520@gmail.com +Date: Tue Jun 18 08:26:45 2013 +0000 + + * code for task#1377. + +commit 52eaccd02517d138cab11813afd55d3d56a8aeb5 +Author: chencongzhi520@gmail.com +Date: Tue Jun 18 08:24:26 2013 +0000 + + * code for task#1377. + +commit 739c264ebf2ce22bed5f09b1517c7162da66fe1d +Author: zhujinyong +Date: Tue Jun 18 06:16:43 2013 +0000 + + * update zentao version. + +commit 8eb2a3fc6854632a41bfcafbe054d9a0f5f3e182 +Author: wangyidong +Date: Tue Jun 18 06:03:29 2013 +0000 + + + add images for jquery mobile. + +commit 739819d3b7574a23383a16c3f6356f964f485cb9 +Author: zhujinyong +Date: Tue Jun 18 05:45:59 2013 +0000 + + * code for task#1374. + +commit 802b63a5bd4da9b90086d01f7a28887c2a05e276 +Author: wangyidong +Date: Tue Jun 18 02:48:22 2013 +0000 + + + add jquery mobile. + +commit 7d535a10ccaa451d705d1cf5aa11a22d37977023 +Author: wangyidong +Date: Tue Jun 18 02:44:36 2013 +0000 + + * finish task #1406. + +commit f443892df59e91b31f47397d6c118887657509b8 +Author: wangyidong +Date: Tue Jun 18 01:49:58 2013 +0000 + + + finish task #1390. + +commit 20e39052f8d53cf21740260ab24017294c36a0ce +Author: zhujinyong +Date: Mon Jun 17 09:21:38 2013 +0000 + + * code for task#1374. + +commit d0b136f43e4f3b6cc9d66db4b0f4b4518d888407 +Author: zhujinyong +Date: Mon Jun 17 08:16:44 2013 +0000 + + * fix a bug of task#1374. + +commit 2f12f4a3667fd38d109a1a886e8ae7567e499498 +Author: zhujinyong +Date: Mon Jun 17 08:12:58 2013 +0000 + + * code for task#1374. + +commit 8bdeb310f0f7f7bd3b69450d7bd1fd5ebb410b67 +Author: zhujinyong +Date: Mon Jun 17 07:37:51 2013 +0000 + + * code for task#1374. + +commit e00cffaa1f7ae2757da470979e49f764e4eee2c4 +Author: zhujinyong +Date: Mon Jun 17 06:03:36 2013 +0000 + + * code for task#1374. + +commit 15f720464c0e0d1386f348a1842d1035d8eb0186 +Author: zhujinyong +Date: Mon Jun 17 05:48:13 2013 +0000 + + * code for task#1376. + +commit fbfa9835372e9f5cf0258b709a8afe0d32a844ed +Author: zhujinyong +Date: Fri Jun 14 06:48:54 2013 +0000 + + * code for task#1375. + +commit a7b92bcd60549171f5470c57f04a57e0ed198ea7 +Author: zhujinyong +Date: Fri Jun 14 03:08:45 2013 +0000 + + * code for task#1373. + +commit 5e2be87236f533f6fa3446896e46d79098ac3890 +Author: wangyidong +Date: Fri Jun 14 01:26:52 2013 +0000 + + * fix a bug for plan's order in roadmap. + +commit b8119bde70371336873ede2e89c00afe4049da58 +Author: zhujinyong +Date: Thu Jun 13 11:35:32 2013 +0000 + + + add smaller style. + +commit 1e9d7163f5cc24d26157cec447f8f03e1c2b9bc1 +Author: zhujinyong +Date: Thu Jun 13 11:17:14 2013 +0000 + + * fix option menu of edit. + +commit 5211fb037de625f589624e589e4de3cccff9b254 +Author: wangyidong +Date: Thu Jun 13 07:35:51 2013 +0000 + + * fix a bug for ls in nginx. + +commit 99e9616476fe8a55833db6242eaa86968a5cbacb +Author: zhujinyong +Date: Thu Jun 13 05:11:38 2013 +0000 + + * code for task#1374. + +commit 30fcf64bc5594d533ec682f0f383debc98643f6b +Author: wangyidong +Date: Sat Jun 8 08:09:54 2013 +0000 + + * fix a bug when sql is empty in session. + +commit f2a8a0f8742ac23462fcea2008783fb42dab3ef9 +Author: zhujinyong +Date: Thu Jun 6 06:23:59 2013 +0000 + + * unfold multi-treeView. + +commit c01ddb9b9a9fc4baeee68bf322bc79c38ddb59d7 +Author: zhujinyong +Date: Thu Jun 6 06:18:59 2013 +0000 + + - remove project side. + +commit dc9b725fe64da7d492306f474a58a00644063853 +Author: zhujinyong +Date: Thu Jun 6 06:06:34 2013 +0000 + + * fix bug : root is int. + +commit 76f2c77cf974b22959333442d851be179fd8660a +Author: zhujinyong +Date: Thu Jun 6 02:21:59 2013 +0000 + + * code for task#1368. + +commit c43c3aebcd6aba5a5e3bbd8cbdc12b0fe1b09a2a +Author: zhujinyong +Date: Tue Jun 4 05:59:58 2013 +0000 + + * code for task#1368. + +commit 51257be1b06a081c3e1eaa8fc5f9c22ed48c4383 +Author: zhujinyong +Date: Tue Jun 4 02:57:34 2013 +0000 + + * code for task#1367. + +commit a2733456318bcf074b8618761c776709ce6d782d +Author: zhujinyong +Date: Tue Jun 4 02:56:57 2013 +0000 + + * code for task#1385. + +commit 8aee025076ec62041a65407f6069b30d53466e86 +Author: zhujinyong +Date: Tue Jun 4 02:51:14 2013 +0000 + + * code for task#1368. + +commit b0c61ffca1485592aedc86cc77e0ed46dac209c1 +Author: chencongzhi520@gmail.com +Date: Mon Jun 3 09:15:19 2013 +0000 + + * code for task#1379. + * code for task#1380. + +commit 1e0ff8aa869f99d4171ef07c9e8080ac7baa0aeb +Author: wangchunsheng +Date: Mon Jun 3 05:39:01 2013 +0000 + + * set the margin of p tags in comments. + +commit 74aef4a45c40976af2d70d4bcdd01e7a5321f1df +Author: zhujinyong +Date: Mon Jun 3 02:56:51 2013 +0000 + + + add update4.1.sql. + +commit 455f31aa24ee448db66ed25f3b96bf6ecc627b25 +Author: chencongzhi520@gmail.com +Date: Mon May 20 05:36:11 2013 +0000 + + * fix bug: adjust the code the delete a user's priviledge when edit a user profile. + +commit 69b04a2b9ad8930c7e4aa588c4f47e54a7d854c8 +Author: chencongzhi520@gmail.com +Date: Fri May 10 01:07:59 2013 +0000 + + * fix bug#431. + +commit 590353e4c51d055bf10e2b53480f9cbda96aeb41 +Author: wangyidong +Date: Fri May 10 01:07:48 2013 +0000 + + * fix bug #429. + +commit be06e9f1ff1efdb0543b41c3082a66973c30cb5e +Author: wangchunsheng +Date: Thu May 9 00:57:24 2013 +0000 + + * when confirm, set default assignedTo value. + +commit e5a3bdfa6b0e2a0509920535c5c81e7c7c3ae3dc +Author: wangchunsheng +Date: Sun May 5 10:12:32 2013 +0000 + + * fix the comment error. + +commit 371e89bdfbb5d308404fea36dff966c1ba5dd430 +Author: wangchunsheng +Date: Sun May 5 10:03:06 2013 +0000 + + * rewrite the processFlow() method. + +commit f6e737f81b62cba6da0646e0024aa3759a0f0216 +Author: wangchunsheng +Date: Sun May 5 10:01:46 2013 +0000 + + * when delete items, set autoCompany to false. + +commit 06d27e3cdf6edf54addf0186fa5bdbac665686ef +Author: chencongzhi520@gmail.com +Date: Sun May 5 09:45:25 2013 +0000 + + * add empty index.css for old version. + +commit 53bdeaf44a79757269d3f15d3af232884e2579c9 +Author: wangchunsheng +Date: Sun May 5 09:05:34 2013 +0000 + + * add changelog for version 4.1. + +commit a3c9d2ca78f55d33593872edad086ade1c380d1e +Author: chencongzhi520@gmail.com +Date: Sun May 5 08:35:29 2013 +0000 + + * fix bug for upgrade to zentaopro. + * for version#4700. + +commit e07b48aeb7acd496a11225c168b8e3dd8b89e6bb +Author: chencongzhi520@gmail.com +Date: Sun May 5 08:25:49 2013 +0000 + + * adjust the colspan. + +commit 28633fef9209e75d6e844480183e73fa219d54fc +Author: chencongzhi520@gmail.com +Date: Sun May 5 08:20:15 2013 +0000 + + * revert it. + +commit 875924fee2e7fc26a4be4f99c055b40bc2bac6eb +Author: wangchunsheng +Date: Sun May 5 07:53:23 2013 +0000 + + * fix the error of msn for demo data. + +commit 111754e1789bbf6c2fcfbd9b04d798d1bdbe6ee5 +Author: wangchunsheng +Date: Sun May 5 07:52:50 2013 +0000 + + * adjust the default priv. + +commit d46ff350fd36d85720cee4602ea65b43a3624fa3 +Author: chencongzhi520@gmail.com +Date: Sun May 5 07:41:02 2013 +0000 + + * code for user-story user-task user-bug. + +commit d3b707fb3840b116b046daa5a8cf47ce633b29ef +Author: wangchunsheng +Date: Sun May 5 07:25:50 2013 +0000 + + * check priv when print the register link. + +commit 599afcf1f083384499ab418d02c2a524d0b13dd2 +Author: wangchunsheng +Date: Sun May 5 07:24:21 2013 +0000 + + * judge the priv when print the link button. + +commit 94f552e7c4d36b054bbd3f5da8503ae69234eded +Author: wangchunsheng +Date: Sun May 5 06:13:52 2013 +0000 + + * convert zh-tw lang. + +commit eab52cd33d8a7cd6dff1b6fe16629f519a38e11d +Author: wangchunsheng +Date: Sun May 5 06:10:13 2013 +0000 + + * adjust the lang item of checkDB. + +commit b26226189e4f49508447e0992c122ec3a4b22220 +Author: wangchunsheng +Date: Sun May 5 06:07:25 2013 +0000 + + * adjust the lang item of testtask. + +commit 0e4cda9fccf5256d8187c799509735ec24feabba +Author: wangchunsheng +Date: Sun May 5 06:06:42 2013 +0000 + + * use @ to aviod the warnning message. + +commit 96e3572576ac31d79bcbddc6ae84e1fcbf67baf0 +Author: chencongzhi520@gmail.com +Date: Sun May 5 04:07:04 2013 +0000 + + * change the define. + +commit 17bfd1003cbb174966b170b48466b50d961aed85 +Author: chencongzhi520@gmail.com +Date: Sun May 5 04:06:22 2013 +0000 + + * code for user-test. + +commit 16ca79d7d948b7995754c3590c109cbcbce3b5ec +Author: chencongzhi520@gmail.com +Date: Sun May 5 03:52:53 2013 +0000 + + * code for user-story user-task user-bug. + +commit 6479c562882114d2a234992b74d16912165d3b06 +Author: chencongzhi520@gmail.com +Date: Sun May 5 03:36:13 2013 +0000 + + * code for task#1241. + +commit 024ea87516dbb2222c1912bc1848f3b29c5f6383 +Author: wangchunsheng +Date: Sun May 5 02:51:31 2013 +0000 + + * change msn to skype. + +commit 3f7aaf622059f85d35add3999889e35f978551a1 +Author: chencongzhi520@gmail.com +Date: Sun May 5 02:36:31 2013 +0000 + + * code for upgrade. + +commit 9a205f6de0a6a45dc072e389d9275af9d328d33a +Author: wangchunsheng +Date: Sun May 5 02:34:43 2013 +0000 + + * convert the tw language. + +commit b33b32bb8fa6942f6254c86b0aa5eb637ce25d8d +Author: chencongzhi520@gmail.com +Date: Sun May 5 02:35:02 2013 +0000 + + * code for export charset list. + +commit 71598c875ef44817035acbbc2016b6d9cdf9203b +Author: wangchunsheng +Date: Sun May 5 02:29:51 2013 +0000 + + * adjust the smtp error messages. + +commit 2e3944d315e2841b978da949b9be9a5f056e5df6 +Author: wangchunsheng +Date: Sun May 5 02:28:46 2013 +0000 + + * fix the error of the label for product priviledge. + +commit 44fea92190b8291aa806252ebdf95b997bc7c129 +Author: wangchunsheng +Date: Sun May 5 02:26:17 2013 +0000 + + + add tips. + +commit ab4520283d9751391517861ed723b0c93719ae9a +Author: wangchunsheng +Date: Sun May 5 02:24:36 2013 +0000 + + * display the debug info directly. + * add tips. + * add title and position. + +commit 63ae1adcfa08e9d4a4e0f2660369ac8a244a0c00 +Author: wangchunsheng +Date: Sun May 5 02:20:30 2013 +0000 + + * use $this->post->turnon instead of $this->config->mail->turnon. + +commit 6f71f8618127b4abcaec96e90ee0816141e65a0a +Author: chencongzhi520@gmail.com +Date: Sun May 5 00:29:24 2013 +0000 + + * set the charset of export same as mail configuration. + +commit 52c2beecbe381be231de4e6dd8bc1496f5118212 +Author: chencongzhi520@gmail.com +Date: Sun May 5 00:22:53 2013 +0000 + + * code for task#1259. + +commit 6b78acb6ace629f6beff49f9f35ee0e80e553c0c +Author: chencongzhi520@gmail.com +Date: Sat May 4 08:36:03 2013 +0000 + + * upgrade code. + +commit 3f560e9ae618949e52c1ce6f473589abace5c9c9 +Author: chencongzhi520@gmail.com +Date: Sat May 4 08:25:05 2013 +0000 + + * update it. + +commit a9906a806f6a783f87fbace15c83c235b43bb4a9 +Author: chencongzhi520@gmail.com +Date: Sat May 4 08:09:10 2013 +0000 + + * replace msn instead skype. + +commit 2aaf51fb973a4c528fdb8617ba7dc920be0df0ac +Author: chencongzhi520@gmail.com +Date: Sat May 4 04:23:44 2013 +0000 + + * code for task#1281. + +commit b79fac4039e0cb0b92ed4a8ae392a5307e696e43 +Author: chencongzhi520@gmail.com +Date: Sat May 4 03:23:42 2013 +0000 + + * fix bug#414. + +commit 87639b4c7fd8135a7d0428dd31e08ff22961d0b7 +Author: wangyidong +Date: Sat May 4 02:41:05 2013 +0000 + + * fix a bug for link error. + +commit 6d41bfbe026af46092b29bbd7912035591f8328f +Author: chencongzhi520@gmail.com +Date: Sat May 4 02:39:21 2013 +0000 + + * fix bug#246. + +commit bad1a104e6d8a5eca0a239dcc1c5f67bccfa5c4c +Author: chencongzhi520@gmail.com +Date: Sat May 4 02:30:30 2013 +0000 + + * fix bug#403. + +commit 7b4003465c24ba2e425ab9d53356dd7d943bb705 +Author: wangyidong +Date: Sat May 4 01:54:07 2013 +0000 + + * fix bug#404. + +commit 82a29b1a57b280bef7ea6e2b021e1a60bbc09daa +Author: chencongzhi520@gmail.com +Date: Sat May 4 01:01:42 2013 +0000 + + * fix bug#407. + +commit 23c572cab7fbb1174f3f40ef3dad1325243f6d48 +Author: chencongzhi520@gmail.com +Date: Sat May 4 00:52:40 2013 +0000 + + * fix bug#410. + +commit 9d584c21f6e8c673bc9334fcc8db62633fd65847 +Author: chencongzhi520@gmail.com +Date: Sat May 4 00:37:33 2013 +0000 + + * fix bug#411. + +commit 07149f944dfd58bc522a76321bd13de26bedbc08 +Author: chencongzhi520@gmail.com +Date: Fri May 3 08:35:23 2013 +0000 + + * fix bug#408. + +commit 10789510ae693efb12e405779cf89ddfa9ff9ebd +Author: chencongzhi520@gmail.com +Date: Fri May 3 08:30:57 2013 +0000 + + * remove comment. + +commit 2ccb64fd25ade9c0db9f3643c101fdc057a5d7c1 +Author: chencongzhi520@gmail.com +Date: Fri May 3 08:30:02 2013 +0000 + + * adjust the code style. + +commit 536bc788aae549ce9e888872ed667be203f1d688 +Author: chencongzhi520@gmail.com +Date: Fri May 3 08:20:44 2013 +0000 + + * fix bug#413. + +commit 7ea6a14c3c87102a8d7e5543ba3dd1a58daa1efe +Author: chencongzhi520@gmail.com +Date: Fri May 3 08:20:11 2013 +0000 + + * add fixed. + +commit 731a5a7070372a2298b262c587551a0de85de6a7 +Author: chencongzhi520@gmail.com +Date: Fri May 3 08:08:35 2013 +0000 + + * fix bug#416. + +commit 9f93e6c8385b172d81b09b139abc356fe28218ee +Author: chencongzhi520@gmail.com +Date: Fri May 3 08:03:08 2013 +0000 + + * fix bug#419. + +commit 388c3eb7a9dbffa7f51200482a88d0c85ac9b208 +Author: chencongzhi520@gmail.com +Date: Fri May 3 07:56:28 2013 +0000 + + * fix bug#420. + +commit 8eaae25cf5463b71b6064343a9339dc3e2f84f52 +Author: chencongzhi520@gmail.com +Date: Fri May 3 07:53:55 2013 +0000 + + * fix bug#423. + +commit 0e1c1ff13c0dd3ad8807ac549ee2818ed959ac7a +Author: chencongzhi520@gmail.com +Date: Fri May 3 06:14:34 2013 +0000 + + * code for task#1227. + +commit bd9ae47e248831d3c4b8393ad7275e4667e65d91 +Author: chencongzhi520@gmail.com +Date: Fri May 3 06:11:00 2013 +0000 + + * code for task#1227. + +commit 4f88d135aa25bf9c958a9f3f9a77e82fe33d06bf +Author: chencongzhi520@gmail.com +Date: Fri May 3 05:51:27 2013 +0000 + + * code for task#1363. + +commit d6754d029e948563770fbb074cc78f405df05cea +Author: chencongzhi520@gmail.com +Date: Fri May 3 05:49:55 2013 +0000 + + * fix bug: replace case instead testcase. + +commit 1f2402985365bf0ab2a4233ad2b710b88b897806 +Author: chencongzhi520@gmail.com +Date: Fri May 3 05:20:27 2013 +0000 + + * add fixed. + +commit e93a666c7dfcbd1980ddfcd35caacdd2a2e3baea +Author: chencongzhi520@gmail.com +Date: Fri May 3 05:19:29 2013 +0000 + + * code for task#1215. + +commit f842a0f81a11bb11da9537be4b2712d2ee393a16 +Author: chencongzhi520@gmail.com +Date: Fri May 3 05:14:13 2013 +0000 + + * code for task#1306. + +commit b62c0606f8dfe98414f7d6e83906d8596ca8ba0d +Author: chencongzhi520@gmail.com +Date: Fri May 3 05:08:35 2013 +0000 + + * adjust the code style. + +commit 4f56e0e060107f74ac81eeafa7f2e2b63bc0e4dc +Author: chencongzhi520@gmail.com +Date: Fri May 3 05:07:13 2013 +0000 + + * adjust the code style. + +commit 0f329f8de63ea48297196bcc037dc0efa5872aee +Author: chencongzhi520@gmail.com +Date: Fri May 3 02:20:28 2013 +0000 + + * code for task#1292. + +commit c0a22f2ea1fc7881edd6f382c5151fdaee0f724e +Author: wangyidong +Date: Fri May 3 02:14:51 2013 +0000 + + * change for process flow. + +commit a781fe6e7e2ef2ed4543510db81bca4e1d42dea8 +Author: wangyidong +Date: Fri May 3 00:56:29 2013 +0000 + + * change for new icon picture. + +commit e47bc2fe8d60241b598681a9d164cfdcc96543b5 +Author: chencongzhi520@gmail.com +Date: Thu May 2 09:02:43 2013 +0000 + + * adjust the border of uploaded image. + +commit 7e63678faadefb806b67aeb30d849e2a4182f4fe +Author: wangyidong +Date: Thu May 2 09:00:19 2013 +0000 + + * code for custom size in webapp. + +commit 8a28758a6ac00ce6ff78055ac00ecb8ea14a98cd +Author: chencongzhi520@gmail.com +Date: Thu May 2 08:10:58 2013 +0000 + + * finish task@1212. + +commit 5ee5387d82fda79db3303c733aece546542768b1 +Author: chencongzhi520@gmail.com +Date: Thu May 2 08:04:38 2013 +0000 + + * adjust the colorbox. + +commit ee778e6e7e4d9294e6b1941528735c5a83fa95d5 +Author: wangyidong +Date: Thu May 2 07:55:43 2013 +0000 + + * fix a bug for #517. + +commit 4329f4b0056a44bbc5560ddd5795e320de7a5bb9 +Author: chencongzhi520@gmail.com +Date: Thu May 2 07:55:27 2013 +0000 + + * code for task#1281. + +commit d2546c6e6393ee1beff7232432b2ab19bd5ba68e +Author: chencongzhi520@gmail.com +Date: Thu May 2 07:52:36 2013 +0000 + + * code for task#1281. + +commit 7fc19c37a315ca60698831892f71b63c66a38232 +Author: chencongzhi520@gmail.com +Date: Thu May 2 07:49:49 2013 +0000 + + * remove the icon of action-trash. + +commit 21caabf85bad135284a86b0f9322785db1da9618 +Author: chencongzhi520@gmail.com +Date: Thu May 2 07:01:26 2013 +0000 + + * if user is deleted show the account. + +commit f24894c3b8ef0a80dbf96dfc771caa38db1eb1be +Author: chencongzhi520@gmail.com +Date: Thu May 2 06:57:41 2013 +0000 + + * remove the link of productplan id. + +commit a865ac9442c25e55db2f21e04c784fce9996156d +Author: chencongzhi520@gmail.com +Date: Thu May 2 06:54:16 2013 +0000 + + * code for task#1271. + +commit f4438fedc1d357948c6bc13e595add674d150f02 +Author: chencongzhi520@gmail.com +Date: Thu May 2 06:48:31 2013 +0000 + + * code for task#1195. + +commit 82f3dcb5999d6dd48c213779c0922aef064cb7fd +Author: chencongzhi520@gmail.com +Date: Thu May 2 06:32:54 2013 +0000 + + * remove the css of editGroup. + +commit 98748b2ef134879a476ad4d43857d34958d2d9a4 +Author: chencongzhi520@gmail.com +Date: Thu May 2 06:27:37 2013 +0000 + + * add title for the task. + +commit 62eb53530734826229813ef2737352d05b173844 +Author: chencongzhi520@gmail.com +Date: Thu May 2 06:25:24 2013 +0000 + + * adjust the order of status. + +commit b2a10d0072d7fa9391400353c0c146ec484c349d +Author: chencongzhi520@gmail.com +Date: Thu May 2 06:10:32 2013 +0000 + + * add a-left for closedReason. + +commit f4c2efbf9b5064c022c5bec6690d560a2256aaa7 +Author: wangyidong +Date: Thu May 2 06:04:02 2013 +0000 + + * fix a bug for upgrade to zentaopro. + +commit cc597b4633c708e8b13abbae0e9bbc43ab9e0df2 +Author: wangyidong +Date: Thu May 2 06:01:01 2013 +0000 + + * fix code. + +commit cb8dd5f49794e36d702d595818abe5e4540bff6d +Author: wangyidong +Date: Thu May 2 05:59:02 2013 +0000 + + * change for user-todo menu. + +commit a400bdc058de77cd977d03cc3303cc5ae40e22b3 +Author: chencongzhi520@gmail.com +Date: Thu May 2 05:32:51 2013 +0000 + + * code for task#1323. + +commit 78a58a1f0bbccb56b0ee2dfc95a5a5249df72acd +Author: chencongzhi520@gmail.com +Date: Thu May 2 05:08:46 2013 +0000 + + * code for task#1281. + +commit 4671a93a50ff9fe7dc4b799612cdbf4e15d59a4c +Author: chencongzhi520@gmail.com +Date: Thu May 2 02:49:20 2013 +0000 + + * finish task#1342. + +commit c38a1cea7160cf794381abcfeb6b6c1820e2ccf0 +Author: chencongzhi520@gmail.com +Date: Thu May 2 01:40:54 2013 +0000 + + * code for task#1323. + +commit ac9fb632ae03c58f45cb3b3e76aa652cf20ed904 +Author: wangchunsheng +Date: Mon Apr 29 13:41:57 2013 +0000 + + * upgrade the version. + * adjust code format. + +commit 78e7a70d1061d162573e3b2bea9928e20daffe2b +Author: chencongzhi520@gmail.com +Date: Mon Apr 29 09:06:34 2013 +0000 + + * finish task#1259. + +commit 813a7ae8d75926ab8552d1806750c65e34753cf1 +Author: chencongzhi520@gmail.com +Date: Mon Apr 29 08:15:43 2013 +0000 + + * finish task#1357. + +commit 7e287be2efa7e7eeb16104998790ab0f57db11b3 +Author: chencongzhi520@gmail.com +Date: Mon Apr 29 03:30:48 2013 +0000 + + * finish task#1281. + +commit 76fdadde8e3c2f9ce1d73a14a491c86be5b3ff3f +Author: wangyidong +Date: Sun Apr 28 02:09:46 2013 +0000 + + * finish task #1313. + +commit 3a92b7fa4c9d4595c36d924c14d9423b388905a3 +Author: wangchunsheng +Date: Sun Apr 28 01:59:23 2013 +0000 + + * adjust code format, add comments. + +commit 8132507a48f895963f2a1b2d3083df4a3dd8e0ad +Author: chencongzhi520@gmail.com +Date: Sun Apr 28 01:47:02 2013 +0000 + + * finish task#1197. + +commit 54500438a7a6c36f9545a872c0118b2b2649e54c +Author: chencongzhi520@gmail.com +Date: Sat Apr 27 06:43:11 2013 +0000 + + * add title for testtask-batchRun. + +commit 2607d921ac5770ed02e4b64c70b2801319f2291b +Author: chencongzhi520@gmail.com +Date: Sat Apr 27 06:10:23 2013 +0000 + + * finish task#1215. + +commit 1bf3e2ad35279a149d61fb5b7e498f70b604859b +Author: chencongzhi520@gmail.com +Date: Sat Apr 27 05:49:28 2013 +0000 + + * code for task#1200. + +commit 2dabae4f6cfbb155e2f747644806248cb5728a31 +Author: chencongzhi520@gmail.com +Date: Sat Apr 27 05:08:48 2013 +0000 + + * finish task#1229. + +commit 943642f97f1f0d97a3083eec86a784c485a987d1 +Author: chencongzhi520@gmail.com +Date: Sat Apr 27 05:07:28 2013 +0000 + + * finish task#1312. + +commit d0bb42f98bf4c81a7d848fc756ac51d93b81133e +Author: chencongzhi520@gmail.com +Date: Fri Apr 26 08:02:28 2013 +0000 + + * finish task#1305. + +commit cf739ac72bfb4291ef9cfe911726ba660f31bc31 +Author: chencongzhi520@gmail.com +Date: Fri Apr 26 08:01:10 2013 +0000 + + * fix bug#426. + +commit a94335af2f99cfa7ee316ab40c2b791eb4ccd2e8 +Author: chencongzhi520@gmail.com +Date: Fri Apr 26 06:36:10 2013 +0000 + + * finish task#1300. + +commit 42578da1df5b5d4df5a6bdabce2f4a67a9fce62e +Author: chencongzhi520@gmail.com +Date: Fri Apr 26 06:31:05 2013 +0000 + + * finish task#1280. + +commit 0368fe70560c566cf92719670ae99014a5256c67 +Author: chencongzhi520@gmail.com +Date: Fri Apr 26 06:23:58 2013 +0000 + + * finish task#1273. + +commit c614ed81bef5552b93ad72484bda1e65af382612 +Author: chencongzhi520@gmail.com +Date: Fri Apr 26 06:08:23 2013 +0000 + + * finish task#1209. + +commit 73571ead2bade3d268008102bc080af1edf36f7b +Author: chencongzhi520@gmail.com +Date: Tue Apr 23 08:51:02 2013 +0000 + + * code for task#1241. + +commit 40464d01af0d4b98f5fd69832d4583ace9e00332 +Author: chencongzhi520@gmail.com +Date: Tue Apr 23 08:42:35 2013 +0000 + + * finish task#1292. + +commit ac76f3fb30693cd73380237ea07d7d1f6016a5e3 +Author: chencongzhi520@gmail.com +Date: Tue Apr 23 07:33:37 2013 +0000 + + * finish task#1306. + +commit 2837b10fe4de54041a1936a1a9acdf3bf1786584 +Author: chencongzhi520@gmail.com +Date: Tue Apr 23 07:10:33 2013 +0000 + + * finish task#1245. + +commit 0163a5f18e2f2c1f543c01d52a037647fd48c40c +Author: chencongzhi520@gmail.com +Date: Tue Apr 23 07:04:22 2013 +0000 + + * finish task#1262. + +commit 96cf9949e5bbc7fc510639b7a7c8694291c9e11f +Author: chencongzhi520@gmail.com +Date: Tue Apr 23 07:01:24 2013 +0000 + + * finish task#1214. + +commit 4c5ecf5101b012eda656d016f61cc7c5a5aa6114 +Author: chencongzhi520@gmail.com +Date: Tue Apr 23 02:28:08 2013 +0000 + + * finish task#1309. + +commit 64f1743484291b86bb6f1afe3b301a5df0922fb7 +Author: chencongzhi520@gmail.com +Date: Tue Apr 23 02:15:49 2013 +0000 + + * finish task#1251. + +commit 5c8a581250416f7947bdf1aedf9f83589d23d43f +Author: chencongzhi520@gmail.com +Date: Thu Apr 18 08:34:36 2013 +0000 + + * finish task#1264. + +commit 3d4045481a6c447b5d3a9c5970854d2d8f6287ec +Author: chencongzhi520@gmail.com +Date: Thu Apr 18 08:28:03 2013 +0000 + + * finish task#1252. + +commit 7d3355b9118dfc124efcd1f15dae63e84eb44269 +Author: chencongzhi520@gmail.com +Date: Thu Apr 18 08:26:36 2013 +0000 + + * code for task#1279. + +commit 52fc5004a9437740601b2723a35e3e6302b3f959 +Author: chencongzhi520@gmail.com +Date: Thu Apr 18 08:05:12 2013 +0000 + + i * finish task#1241. + +commit 9a77b9b6a220a417f54faa2bbe9c98fd8051c3aa +Author: chencongzhi520@gmail.com +Date: Thu Apr 18 02:36:27 2013 +0000 + + * finish task#1221. + +commit 3f5ac11c3346da4ebe2992187cb78579b82b9a5e +Author: chencongzhi520@gmail.com +Date: Thu Apr 18 02:34:33 2013 +0000 + + * fix bug: don't show the deleted member. + +commit 31dcfb2325418a0578ee9ba2a3e75583c86da9a6 +Author: chencongzhi520@gmail.com +Date: Thu Apr 18 02:01:39 2013 +0000 + + * finish task#1189. + +commit 243aa368cf97299360c91a7b3ed11d65b7f064a3 +Author: chencongzhi520@gmail.com +Date: Wed Apr 17 08:22:02 2013 +0000 + + * finish task#1196. + * finish task#1279. + +commit c31a78e23ba119f4bc16083db7daaa2aeb331db2 +Author: chencongzhi520@gmail.com +Date: Wed Apr 17 06:45:08 2013 +0000 + + * finish task#1251. + +commit fe82eb02f1019d04d3130c2b0dba006c24e6f398 +Author: chencongzhi520@gmail.com +Date: Wed Apr 17 04:27:16 2013 +0000 + + * fix bug. + +commit 0f315457f48868e8cdc6672430df5fa66874ef3c +Author: chencongzhi520@gmail.com +Date: Wed Apr 17 02:01:26 2013 +0000 + + * finish task#1326. + +commit 08a6ef16f4485fe95a2f3e019a399c753969f7ad +Author: chencongzhi520@gmail.com +Date: Tue Apr 16 07:35:07 2013 +0000 + + * finish task#1363. + +commit b33f99f6e1157ad8521c02efe02464a438e0a673 +Author: chencongzhi520@gmail.com +Date: Mon Apr 15 09:08:31 2013 +0000 + + * code for task#1362. + +commit 09edd94b49270878781a1f3c81860cea881c32ab +Author: chencongzhi520@gmail.com +Date: Mon Apr 15 09:07:27 2013 +0000 + + * finish task#1211. + +commit 6bf0f5edbbb9518c583c884f407ad0c813381ba5 +Author: chencongzhi520@gmail.com +Date: Mon Apr 15 07:28:23 2013 +0000 + + * finish task#1298. + +commit 8a616cfd0b6f7cedced7a32f3684988cc58cabd2 +Author: chencongzhi520@gmail.com +Date: Mon Apr 15 06:59:38 2013 +0000 + + * finish task#1303. + +commit 95d7c894665450a7434da2abb2fa0210a7b3987e +Author: chencongzhi520@gmail.com +Date: Mon Apr 15 06:17:19 2013 +0000 + + * finish task#1321. + +commit 88fbed76834bed9d06983edb6a613d733554efde +Author: chencongzhi520@gmail.com +Date: Mon Apr 15 05:30:50 2013 +0000 + + * finish task#1362. + +commit 48afd4c726e8ae07380215589c98142517fe89d4 +Author: chencongzhi520@gmail.com +Date: Mon Apr 15 03:00:10 2013 +0000 + + * finish task#1318. + +commit dd383e1a65a912ff2767da6bdd4d5be77710cf2f +Author: chencongzhi520@gmail.com +Date: Mon Apr 15 02:45:49 2013 +0000 + + * finish task#1271. + * code for task@1323. + +commit 862c73cf1e8970537114d9970db06dbae19b71ea +Author: chencongzhi520@gmail.com +Date: Mon Apr 15 02:13:22 2013 +0000 + + * finish task#1203. + * code for task#1323. + +commit 63ef3df46bccb2695349c22f6d16b8770b82942e +Author: chencongzhi520@gmail.com +Date: Mon Apr 15 01:32:52 2013 +0000 + + * finish task#1323. + +commit 921a09eef0cebf916eec9fdb87de0e06d01d655f +Author: chencongzhi520@gmail.com +Date: Thu Apr 11 08:32:09 2013 +0000 + + * finish task#1190. + +commit f5867097f4ae7f5811abc96e5dc879576d497b32 +Author: chencongzhi520@gmail.com +Date: Thu Apr 11 07:15:43 2013 +0000 + + * finish task#1323. + +commit 1a0473ef845435cc5d458ed1802b0039200a3024 +Author: chencongzhi520@gmail.com +Date: Thu Apr 11 06:16:31 2013 +0000 + + * finish task#1227. + +commit ee8dcf9d6434e97100771c50d3cf7988ebdf37fc +Author: chencongzhi520@gmail.com +Date: Thu Apr 11 05:38:37 2013 +0000 + + * finish task#1261. + +commit be0e494a0d6313154fc5d9715d5800c3f2d3b5a2 +Author: wangyidong +Date: Thu Apr 11 03:44:52 2013 +0000 + + * finish task #1139. + +commit a14b01dcd92338a688d971be31b29da1ec19172a +Author: chencongzhi520@gmail.com +Date: Thu Apr 11 02:12:32 2013 +0000 + + * finish task#1238. + +commit 156416921642a9d3e92c9714d6f653ea4843f65d +Author: chencongzhi520@gmail.com +Date: Thu Apr 11 02:06:35 2013 +0000 + + * finish task#1220. + +commit 514d77f0b6f5d4bc2efbea0342b24f861af07bbd +Author: chencongzhi520@gmail.com +Date: Thu Apr 11 02:04:10 2013 +0000 + + * finish task#1212. + +commit 80600809b34141e38320e0cc8e27b200384854b8 +Author: chencongzhi520@gmail.com +Date: Thu Apr 11 02:03:16 2013 +0000 + + * code for task#1194. + +commit 05fe520c8493265a0e568a3cbb357ed838594cfe +Author: chencongzhi520@gmail.com +Date: Thu Apr 11 01:15:31 2013 +0000 + + * finish task#1200. + +commit 16ed492bda38bd8b6cc62179446b2a729b6676e2 +Author: chencongzhi520@gmail.com +Date: Wed Apr 10 08:07:28 2013 +0000 + + * finish task#1204. + +commit 7e8354c6cae3cc3aac83da5f556d87094f7ba214 +Author: chencongzhi520@gmail.com +Date: Wed Apr 10 08:03:14 2013 +0000 + + * finish task#1194. + +commit 7a275dbeae1cda18c905cf4065b26dde4ff5b778 +Author: chencongzhi520@gmail.com +Date: Wed Apr 10 07:07:58 2013 +0000 + + * finish task#1263. + +commit a4ec9958f0ed83aa576ec1275edd80f7eb59d7fc +Author: chencongzhi520@gmail.com +Date: Wed Apr 10 07:01:41 2013 +0000 + + * code for task#1328. + +commit 3aa889862c0c7eed32cdb89b3ad77e370fa74d5d +Author: chencongzhi520@gmail.com +Date: Wed Apr 10 06:52:24 2013 +0000 + + * finish task#1328. + +commit b8a6dd275fc98f8af279de75ee08a406f4e0d304 +Author: chencongzhi520@gmail.com +Date: Wed Apr 10 05:54:08 2013 +0000 + + * finish task#1324. + * set transition=none for colorbox of file-edit. + +commit c166bd333225431227ea2321c88f42080155710a +Author: chencongzhi520@gmail.com +Date: Wed Apr 10 05:47:56 2013 +0000 + + * finish task#1329. + +commit 656c1b6fcf3de64525221069db8c6f6020a8641d +Author: chencongzhi520@gmail.com +Date: Wed Apr 10 05:46:39 2013 +0000 + + * finish task#1337. + +commit 06e1b6f87f7eebfc20fb0380ba68f91d6caceddf +Author: chencongzhi520@gmail.com +Date: Wed Apr 10 05:42:20 2013 +0000 + + * finish task#1246. + +commit 70f144d242da96f06a6385b191dc805cbb4dfc20 +Author: chencongzhi520@gmail.com +Date: Wed Apr 10 05:34:36 2013 +0000 + + * finish task#1218. + +commit 4708c33b39ea3ae615e01ba81a6d8b8b473e1c75 +Author: chencongzhi520@gmail.com +Date: Wed Apr 10 03:09:32 2013 +0000 + + * finish task#1217. + +commit 965109b6acba747097013530bb7fbb0d9e23d812 +Author: chencongzhi520@gmail.com +Date: Thu Mar 28 01:53:04 2013 +0000 + + * update these. + +commit 1f0ad18adf73833384f47066969a9f05ed924cf3 +Author: chencongzhi520@gmail.com +Date: Thu Mar 28 01:09:02 2013 +0000 + + * adjust the code. + +commit 35767f1c6f3d24df50e2b09d09ab8bba049fa0d7 +Author: wangyidong +Date: Wed Mar 27 02:26:38 2013 +0000 + + * change for show max upload filesize. + +commit 6bc70c96667ec4b4a62be22570b8f56b0b141f83 +Author: wangyidong +Date: Wed Mar 20 09:34:07 2013 +0000 + + * fix for refresh pager when close colorbox. + +commit 04f23e377277bf80045ca2db7f72378893fb2c1f +Author: wangyidong +Date: Wed Mar 20 09:18:35 2013 +0000 + + * add title for extension-obtain. + +commit 959b43bec43fd494d98aa372f10741045efbbb40 +Author: wangyidong +Date: Wed Mar 20 09:15:09 2013 +0000 + + * fix for check account in batchCreate and batchEdit. + +commit 4997abffb3a32a0a4fd7fe579f0f14ce9eb099d4 +Author: wangyidong +Date: Mon Mar 18 08:24:21 2013 +0000 + + * change for lang of upgrade. + +commit d62915837b0c5623a20b914e379e153d465077df +Author: wangchunsheng +Date: Mon Mar 18 08:02:26 2013 +0000 + + * task#1180. + +commit 8751897e8193185fe23f30c8027e28639315305e +Author: wangyidong +Date: Mon Mar 18 07:58:13 2013 +0000 + + * adjust get notice in Makefile. + +commit 3af46269c910136c1f8b02f7cf741e4956c21bf7 +Author: wangchunsheng +Date: Mon Mar 18 07:46:16 2013 +0000 + + + task#1179. + +commit a9f928b4e69ad8d413bd43c9591ffd6206616bfe +Author: wangyidong +Date: Mon Mar 18 05:48:28 2013 +0000 + + * adjust save query logic. + +commit b27c1ec855ad2657a8785247f685aabfa119ec8b +Author: wangyidong +Date: Mon Mar 18 01:34:39 2013 +0000 + + * change for zh-tw lang. + +commit cba1a144523c97bb68f58f237009a04ff5177840 +Author: wangyidong +Date: Mon Mar 18 01:29:18 2013 +0000 + + * change for 4.0.1 version upgrade. + +commit 66e68034787a855a085adbdaab77286393fc0e9f +Author: wangyidong +Date: Fri Mar 15 02:46:52 2013 +0000 + + * adjust for order module. + +commit 8987de71b7dd178862d1398db44863d36e281203 +Author: wangyidong +Date: Fri Mar 15 02:09:41 2013 +0000 + + + add sql for 4.0.1. + +commit 3925f5b4773900ba871cafaf7da15293c73ad807 +Author: wangyidong +Date: Fri Mar 15 02:04:36 2013 +0000 + + * adjust for project search. + +commit 3d035e461096d161d011e700180ac533e89f9d36 +Author: wangyidong +Date: Fri Mar 15 02:02:20 2013 +0000 + + * change checkbox for label. + +commit 27e1603f68946bca5873aae2cd9c1df20230b757 +Author: wangyidong +Date: Thu Mar 14 09:29:21 2013 +0000 + + * fix a bug for search with product. + +commit 93e4430596ab187f647d353d31d8c8aeecf35a45 +Author: wangyidong +Date: Thu Mar 14 08:29:30 2013 +0000 + + * finish task #1182. + +commit ddb12a7413d7483a9a214843a4745921556e8a9f +Author: wangyidong +Date: Thu Mar 14 03:20:04 2013 +0000 + + * finisht task #1181. + +commit 1185ede020ce79ac57f60beb01cf9690e52fbfb7 +Author: wangyidong +Date: Thu Mar 14 03:06:41 2013 +0000 + + * adjust checkAll postition. + +commit faadff0e5f5af5d7aebfe5bc481db951399a3b21 +Author: wangyidong +Date: Thu Mar 14 03:01:34 2013 +0000 + + * finish task #1177. + +commit dc456c676511e24bee7e73c04d45f9c8e805236a +Author: wangyidong +Date: Thu Mar 14 01:14:13 2013 +0000 + + * finish task #1176. + +commit e9b68c0d51ce25cd9d1b43a4d607623f7e764e07 +Author: wangyidong +Date: Wed Mar 13 13:46:01 2013 +0000 + + * fix for no database selected. + +commit f070ec2cbaa08e78368ce0015eac3376f341ec45 +Author: wangyidong +Date: Wed Mar 13 11:18:59 2013 +0000 + + * revert robots.txt. + +commit 071979143196a1f4f764027f8d0fa35d1ca0bbf3 +Author: wangyidong +Date: Wed Mar 13 11:14:47 2013 +0000 + + * add return value. + +commit 7dd83ab97860d3fa3dc5a5e58d68bf34ca59f455 +Author: wangyidong +Date: Wed Mar 13 06:28:28 2013 +0000 + + * finish task #1174. + +commit edf9a3490a3f6a7be2abb10f4211983f38d5622f +Author: wangyidong +Date: Wed Mar 13 06:16:02 2013 +0000 + + * finish task #1175. + +commit e174135198364e19b1201c606b1b360212d47ba5 +Author: wangyidong +Date: Wed Mar 13 06:12:10 2013 +0000 + + * finish task #1173. + +commit faf7b82c5987781c6ea2f045f14cfda3536341e4 +Author: wangyidong +Date: Wed Mar 13 05:55:21 2013 +0000 + + * finish task #1171. + +commit abbe7d1e4ba4fcff7fa11f6f61bb1b5d52ec781c +Author: wangyidong +Date: Wed Mar 13 04:18:27 2013 +0000 + + * finish task #1166. + +commit 149e3b11a1972d5a835770b99054308e00838ad3 +Author: wangyidong +Date: Wed Mar 13 02:55:33 2013 +0000 + + * finish task #1165. + +commit d442df5df20e068fb672a58260d8eddc898444d6 +Author: wangyidong +Date: Wed Mar 13 02:35:15 2013 +0000 + + * finish task #1164. + +commit c24164b3a5cb0f8ca1cd638b4d099abffe1e2c2f +Author: wangyidong +Date: Wed Mar 13 02:06:45 2013 +0000 + + * fix some bugs. + +commit 49628437830d76ddef7d0f406c3ac733e2f2c90e +Author: wangyidong +Date: Wed Mar 13 02:05:08 2013 +0000 + + * finish task #1163. + +commit a2616f7ca3de1d2569ce6c68961609ea679eac42 +Author: chencongzhi520@gmail.com +Date: Fri Mar 8 05:23:50 2013 +0000 + + * add is_string judge for js::set method. + +commit 990e5fdedd40dc6f8f100b3ea05de5d45a3013a1 +Author: zhujinyong +Date: Thu Mar 7 03:09:52 2013 +0000 + + + add js and css ext of common methods. + +commit e4720ad90b7ad936ad9001a48be5956030990f38 +Author: wangyidong +Date: Tue Mar 5 08:54:07 2013 +0000 + + * fix a bug for set flow in sql. + +commit 626e151a23fceb01cebe68e7dd550ef34a2ddd08 +Author: wangyidong +Date: Tue Mar 5 07:00:33 2013 +0000 + + * revert update4.0.beta2.sql. + +commit 3e6f1f350ac91723da89f4dfc18795b481219867 +Author: wangyidong +Date: Tue Mar 5 06:56:35 2013 +0000 + + * fix bug for edit story. + +commit 701201ae2e1733e121094acd4bc77d08b749f1f3 +Author: wangyidong +Date: Tue Mar 5 01:41:55 2013 +0000 + + * fix bug for colorbox error in view.html.php. + +commit f4cf1b14fc4c5a6507a069d16f4436465e5991cb +Author: wangyidong +Date: Tue Mar 5 01:41:16 2013 +0000 + + * fix bug for no data when batchEdit user. + --This line, and th se below, will be ignored-- + + M control.php + +commit 75a7383ff2559c86030b3cd12f7c455fb23d41ad +Author: zhujinyong +Date: Sun Mar 3 05:39:49 2013 +0000 + + * fix bug : record.js should be renamed. + +commit 22eb655f00d87dc2827b864ca59927d44a3bf0dc +Author: wangyidong +Date: Sun Mar 3 04:12:29 2013 +0000 + + * add for insert group data. + +commit 82dc069ea6bde76b2531a39fc0a8515d771e8459 +Author: chencongzhi520@gmail.com +Date: Sun Mar 3 02:56:10 2013 +0000 + + * revert the change. + +commit 1884b6f56a1b1c3af9518e4541c3f30b974619b9 +Author: wangchunsheng +Date: Sun Mar 3 02:37:52 2013 +0000 + + * change the group priviledges. + +commit cbdfc4b0761d8645258dc373fb7884aa325ee8e9 +Author: wangchunsheng +Date: Sun Mar 3 02:32:02 2013 +0000 + + * when no working hours, show the table header to avoid empty page. + +commit 3f7b9d6b9023635f3ad0be9907be96cf0c5a037e +Author: zhujinyong +Date: Sun Mar 3 02:24:34 2013 +0000 + + * fix bug : consumed is error. + +commit 0d51012ff42cd3a0dd8c0b5ed7ca939580ef1bbf +Author: zhujinyong +Date: Sun Mar 3 02:10:12 2013 +0000 + + * fix bug : change 'record' to 'recordEstimate'. + +commit d6ffd38a9ff948a4077d3819d8718c228b567d3b +Author: wangchunsheng +Date: Sun Mar 3 02:01:15 2013 +0000 + + * convert zh-tw lang. + +commit 3c37b7424e15e637aa6993b6bebbb40262ffb6c3 +Author: wangchunsheng +Date: Sun Mar 3 01:55:19 2013 +0000 + + * adjust ui. + +commit 28112fb8e4a613564063d5a45c5c03b29beef12e +Author: zhujinyong +Date: Sun Mar 3 01:45:28 2013 +0000 + + * if left is 0, change status of task to done. + +commit c22b9ed320ec1372ea5714aed9cccbcb3e0928f1 +Author: wangchunsheng +Date: Sun Mar 3 01:24:04 2013 +0000 + + * adjust lang items for estimate feature. + +commit 305d36d2985c8c3998d3ec0b84b613818146a986 +Author: wangchunsheng +Date: Sun Mar 3 01:19:50 2013 +0000 + + * adjust the layout of recore estimate page. + +commit 0160c9b1ba21228ef0068149b912efacec3e226e +Author: wangchunsheng +Date: Sun Mar 3 01:16:44 2013 +0000 + + * include footer.lite.html.php instead. + +commit 9f024fbdc430b49a62026eed66edf0c1d25056d9 +Author: zhujinyong +Date: Sun Mar 3 01:06:48 2013 +0000 + + * if status of task is not wait and doing, can't record estimate. + +commit c7ead516a6ca166f06fdeb5f5c04d92d67825e04 +Author: zhujinyong +Date: Sun Mar 3 01:03:54 2013 +0000 + + * if status of task is wait, recording estimate will change status. + +commit 67b4e1d74f645f69900c98caea64a4ca13144e58 +Author: wangyidong +Date: Sun Mar 3 00:52:39 2013 +0000 + + * fix a hug for init object in remind. + +commit c6ad20487b0abfac8280139275e4d81fc8c7da0b +Author: zhujinyong +Date: Sun Mar 3 00:49:56 2013 +0000 + + + add work field. + +commit c34e90d9e9dd677759ea858f91c4848e6b1805ab +Author: zhujinyong +Date: Sun Mar 3 00:39:40 2013 +0000 + + * change label of edit estimate. + +commit 7581d12cb729dafeec17fcdb77ec5ec2ed25d8fe +Author: zhujinyong +Date: Sun Mar 3 00:36:25 2013 +0000 + + + add changes of edit and delete estimate. + +commit ac39ce3dca586d5b48d8e0404f975ecd3d320b56 +Author: wangchunsheng +Date: Sun Mar 3 00:33:34 2013 +0000 + + * adjust the notice for daily report. + +commit 11d72d123c82a6b6c9617b262478fdfb86354970 +Author: wangyidong +Date: Sun Mar 3 00:25:07 2013 +0000 + + * adjust webapp colorbox height. + +commit cb6baded870770ba97d324d8685da944a737e9c0 +Author: zhujinyong +Date: Sat Mar 2 15:16:17 2013 +0000 + + * if finish task and consumed is not changed, don't record. + +commit 4f94ab2485cac57b471c934e63207bc793873694 +Author: zhujinyong +Date: Sat Mar 2 15:03:21 2013 +0000 + + * fix a bug : oldEstimate is not defined. + +commit e3510512390c9bbe56673ca9b7e7f8374ae0e0a1 +Author: zhujinyong +Date: Sat Mar 2 14:57:24 2013 +0000 + + * change 'record' to 'recordestimate'. + +commit 3f60ff46651fbe0e13ab3830ff15c576dd0d3a8c +Author: zhujinyong +Date: Sat Mar 2 14:55:28 2013 +0000 + + * short 'record estimate' to 'record'. + +commit 4f425f43408b0708bf5d9986d87df070b91f857c +Author: zhujinyong +Date: Sat Mar 2 14:49:10 2013 +0000 + + * change style. + +commit ea9aff842534f4e0106745a396199a40ad3c44f5 +Author: zhujinyong +Date: Sat Mar 2 14:44:53 2013 +0000 + + * change record to recordEstimate. + +commit ae197d30da8d541fd88e97266ce9df4e8ab784ae +Author: zhujinyong +Date: Sat Mar 2 14:43:15 2013 +0000 + + * change record to recordEstimate. + +commit 1a9ded8ff13edc0f2af092bdc2c78a7c4e5b4745 +Author: zhujinyong +Date: Sat Mar 2 14:32:44 2013 +0000 + + * change 'record' to 'recordEstimate'. + +commit 24e534655d30e4aabde781307eeec916d29ae4ca +Author: zhujinyong +Date: Sat Mar 2 14:29:07 2013 +0000 + + * compute consumed and left when delete estimate. + +commit eb89b01f2b151a8d838d5d65fc6b5b4c42d3473a +Author: zhujinyong +Date: Sat Mar 2 14:24:16 2013 +0000 + + * add priv of edit estimate. + +commit 7cf689bc82bc756f226b8ae2d47299e17feb1eac +Author: zhujinyong +Date: Sat Mar 2 14:19:44 2013 +0000 + + * if users have priv of edit task, they can edit estimate. + +commit 7b5a6aea39e640c371c8d101374f32761df35748 +Author: wangchunsheng +Date: Sat Mar 2 14:05:21 2013 +0000 + + * adjust the lang item for bug->convertCase. + +commit 85987eee805d2422059128e811c1caa65d24b274 +Author: zhujinyong +Date: Sat Mar 2 14:04:28 2013 +0000 + + * change 'record' to 'recordEstimate'. + +commit abe4779cf09fb6ea91be86e06fd44ccbdf3cc1b4 +Author: zhujinyong +Date: Sat Mar 2 13:58:47 2013 +0000 + + + add record, edit and delete estimate. + +commit 3c9654de23b6065656249f1c64d4d32d01b0142c +Author: wangchunsheng +Date: Sat Mar 2 13:39:37 2013 +0000 + + * adjust the lang item when convert bug to testcase. + +commit 1e24cb4a12f39a2a964889c12e0b202db8b936ca +Author: zhujinyong +Date: Sat Mar 2 13:21:27 2013 +0000 + + * if task is wati or doing, display edit and delete link. + +commit 2f12e3b0f61eeb8afbd5806bfd6fbe83b0ebf498 +Author: wangchunsheng +Date: Sat Mar 2 13:17:37 2013 +0000 + + * convert the zh-tw lang. + +commit 7e928b89b7b2f9609afeced211dea607ea3432a3 +Author: wangchunsheng +Date: Sat Mar 2 13:16:54 2013 +0000 + + - remove the totalConsumed item. + +commit 56c89ce4887b1eb71545fe58269ebcd8bc777c7d +Author: wangchunsheng +Date: Sat Mar 2 13:14:11 2013 +0000 + + * adjust the lang items. + +commit 4903c2273a5822e4f337b83b317134ef0118d24a +Author: wangchunsheng +Date: Sat Mar 2 13:12:52 2013 +0000 + + * when batchedit, show consumed field. + +commit b82f9243768d43c49018f6a6eca200e47f9c728f +Author: zhujinyong +Date: Sat Mar 2 13:03:43 2013 +0000 + + * change 'deleteEstimate' to 'delEstimate'. + * change priv of task record. + +commit 74206ad32a81f68083760c0312ec6701acc4724d +Author: zhujinyong +Date: Sat Mar 2 12:37:27 2013 +0000 + + + add work field. + +commit 2501750773ec7766dfa26b4143863ec630fe20f4 +Author: zhujinyong +Date: Sat Mar 2 12:35:07 2013 +0000 + + * change 'consumed' to 'totalConsumed' when finish task. + * use work field instead of comment. + +commit b6fba0c421377b759000c34101755eb819e5ad6f +Author: zhujinyong +Date: Sat Mar 2 11:20:15 2013 +0000 + + * fix a bug : browse tasks by module is error. + +commit 0f2f3d50a32652a2796e1d929104460d6b506a78 +Author: wangchunsheng +Date: Sat Mar 2 10:37:39 2013 +0000 + + * check modules exists or not when assign module in task->batchEdit page. + +commit bfde41b4faa7465b4fb2617d19a84b755de788ec +Author: chencongzhi520@gmail.com +Date: Sat Mar 2 09:10:16 2013 +0000 + + * add menuOrder for story-batchEdit. + +commit 792d8091574e4999fb561f96762e35ed7245dd2f +Author: wangyidong +Date: Sat Mar 2 09:08:25 2013 +0000 + + * delete search link for groupTask pager. + +commit 2610f97fc0ccbec7537bbcfe2c7f908579a229bf +Author: chencongzhi520@gmail.com +Date: Sat Mar 2 08:56:47 2013 +0000 + + * adjust the zh-cn lang of consumedThisTime. + +commit ee052401f827541242ded44c57cb87b1e66cc4d8 +Author: zhujinyong +Date: Sat Mar 2 08:28:53 2013 +0000 + + + add estimate class. + +commit 6462a0f32682dc06b6fc03054cb1bd04a7585445 +Author: chencongzhi520@gmail.com +Date: Sat Mar 2 08:25:24 2013 +0000 + + * adjust the code style. + +commit 3e18a9a101d70ce6e89491c0c6591cfed15354cd +Author: wangyidong +Date: Sat Mar 2 08:18:12 2013 +0000 + + * fix a bug for batchrun when case's step is empty. + +commit 476f9fcc7b58e5951eca07fa11f74968500508f4 +Author: wangchunsheng +Date: Sat Mar 2 08:05:31 2013 +0000 + + + add the feature of change port for my.php and phpmyadmin. + +commit 7362960476b0bfc49b8bb262d9a31f67dd69f58a +Author: chencongzhi520@gmail.com +Date: Sat Mar 2 07:42:01 2013 +0000 + + * finish task#1137. + +commit 3ae092a5d0a169b287d7e3fec9cbcde5fefc4a97 +Author: wangchunsheng +Date: Sat Mar 2 07:13:22 2013 +0000 + + * change ports for phpmyadmin in linux one package. + +commit 118ffd6ad43274c4a03dae1fdd98d6d421409fff +Author: wangyidong +Date: Sat Mar 2 07:00:43 2013 +0000 + + * delete icon in view pager. + +commit 20adae2a3080f73688f92a831ad2394cd3161477 +Author: wangchunsheng +Date: Sat Mar 2 06:46:34 2013 +0000 + + * fix the title error when create a case. + +commit 0f68785a736d5669a9e4b3be49543393fb6659e8 +Author: wangyidong +Date: Sat Mar 2 06:45:29 2013 +0000 + + * adjust webapp style. + +commit 28966eb38c293c63ee1c66c9052fd9248e4d885d +Author: zhujinyong +Date: Sat Mar 2 06:42:59 2013 +0000 + + * adjust code. + +commit 240677671d2cbde196ad80521a7d54dec96dfae4 +Author: zhujinyong +Date: Sat Mar 2 06:27:12 2013 +0000 + + * fix bug : batchcreate location. + +commit a50933ae1a09de34697559d1978cd73e81578275 +Author: chencongzhi520@gmail.com +Date: Sat Mar 2 06:25:39 2013 +0000 + + * add port config. + +commit 540c9d66180e66ecfc19012d29212b39701f56ee +Author: wangyidong +Date: Sat Mar 2 05:28:19 2013 +0000 + + * fix a bug when module root is 0. + +commit 43c897c6c8ebf4e6f17d7f963f515c30af3e84cb +Author: chencongzhi520@gmail.com +Date: Fri Mar 1 11:17:41 2013 +0000 + + * add port for serverName config for controlPanel. + +commit 3117402e7b1b00a299a25f94ad2b994928d4380f +Author: wangyidong +Date: Fri Mar 1 09:53:27 2013 +0000 + + * fix notice for class. + +commit 9e93f14550caf86c2c71cdac93ebf423518f454f +Author: wangyidong +Date: Fri Mar 1 07:27:54 2013 +0000 + + * fix a bug for load lang. + +commit 6e5468b8c01d8be93ef5bd29d8448a47707d554d +Author: wangyidong +Date: Fri Mar 1 03:23:52 2013 +0000 + + * remove deleted task by search. + +commit f2ecbaf38fc4bab1fd2ac2eccecad098c3714e2e +Author: wangyidong +Date: Fri Mar 1 01:57:08 2013 +0000 + + * fix a bug for batch create user. + +commit 259b898b366f05e1bb996eea4a5326898735772f +Author: wangyidong +Date: Fri Mar 1 01:56:26 2013 +0000 + + * fix bug for createLInk error. + +commit 4f8b2c7e8bb1cd676bf0521ad2e222aef5cf80b0 +Author: wangyidong +Date: Thu Feb 28 02:28:45 2013 +0000 + + * adjust webapp. + +commit 34b7462bca57f2f2cb08b1dcfa6d081988d8a159 +Author: zhujinyong +Date: Thu Feb 28 02:26:37 2013 +0000 + + - remove consumed info. + +commit 5e5d9042f850d9fdadbc48f497e6adbc2071d3e6 +Author: wangchunsheng +Date: Thu Feb 28 01:56:52 2013 +0000 + + * add changelog for 4.0.stable. + +commit 73c5234b8c07fc4e7f88ec732bcf6047850cac21 +Author: wangyidong +Date: Thu Feb 28 00:56:31 2013 +0000 + + + 4.0.beta2 version for upgrade. + +commit 16056e12ef4f0c28c7cea71c6265209fecf236d7 +Author: wangyidong +Date: Thu Feb 28 00:52:05 2013 +0000 + + * zh-cn to zh-tw for lang. + +commit b09e6a8ee07e40f97bd6810358cea407459d7687 +Author: zhujinyong +Date: Thu Feb 28 00:43:03 2013 +0000 + + * fix bug : if no record, left is 0. + +commit df225e41f72f51d62ff61c9eb23a3075449ef96d +Author: wangyidong +Date: Wed Feb 27 08:30:09 2013 +0000 + + * change sql for zt_group. + +commit 66bad0952841549b1e12845854011c92e7b8f032 +Author: wangyidong +Date: Wed Feb 27 08:25:45 2013 +0000 + + * add new priv for new version. + +commit 8e065ebad7bbb5ea9c77da0ff8adbc7b433c8be5 +Author: zhujinyong +Date: Wed Feb 27 07:42:17 2013 +0000 + + - remove transition. + +commit ad0d88ec1dd84774cadc6666524982bf6a75107c +Author: zhujinyong +Date: Wed Feb 27 06:43:54 2013 +0000 + + * adjust datepicker. + +commit 6490992b00c31b5d9a07fd886f8316783d803c3a +Author: zhujinyong +Date: Wed Feb 27 06:05:03 2013 +0000 + + - remove transition. + +commit 0a1a44ecd544ad47560311c62cca03c95c1d424b +Author: zhujinyong +Date: Wed Feb 27 03:35:41 2013 +0000 + + * code for task#1142. + +commit aac3545320772a1c9624cc0136b0d02919b07dc8 +Author: wangyidong +Date: Wed Feb 27 03:27:05 2013 +0000 + + * finish task #1140. + +commit 04fc7a14196f5df68b7805a6e3b86fb572871f84 +Author: zhujinyong +Date: Wed Feb 27 03:01:03 2013 +0000 + + * adjust lang. + +commit f6b4c30fd31040b4d55df20ca838ad2838983f46 +Author: chencongzhi520@gmail.com +Date: Wed Feb 27 02:54:49 2013 +0000 + + * finish task#1127. + +commit 614e3312d9c072e7f748d2be3369fbd58059f417 +Author: wangyidong +Date: Wed Feb 27 02:53:25 2013 +0000 + + * finish task # 1139. + +commit 059e3e8a291157329e621bf90d47e7c9298f720b +Author: zhujinyong +Date: Wed Feb 27 02:47:26 2013 +0000 + + + add record link in edit.html.php. + +commit 32aad3b8628a48e0b973006b0a53fc2a4b738256 +Author: wangyidong +Date: Wed Feb 27 02:47:01 2013 +0000 + + * finish task #1144. + +commit 705697a305d122ea5a7efc2904470f6289c4d791 +Author: chencongzhi520@gmail.com +Date: Wed Feb 27 02:24:43 2013 +0000 + + * finish task#1120. + * refactory the task-batchCreate. + +commit 4252f0ef8de1a95bba0b97769a8643358209ae39 +Author: zhujinyong +Date: Wed Feb 27 02:21:35 2013 +0000 + + * check if ':' exists. + +commit 274298ccd7ab74970aa725bed94552086d79e34e +Author: wangyidong +Date: Wed Feb 27 02:21:18 2013 +0000 + + * finish task #1135. + +commit 6d9b310cb9de6d33471edb1a61d2fb1585988d46 +Author: wangyidong +Date: Wed Feb 27 02:20:43 2013 +0000 + + * finish task #1138. + +commit a4f2484333ad1c086a53e75acd3a524892d96438 +Author: wangyidong +Date: Wed Feb 27 01:57:22 2013 +0000 + + * code for task#1072. + * undelete the marked lang define. + +commit 8560d8d39ef9917f0f6370163022370d0755453f +Author: zhujinyong +Date: Wed Feb 27 01:53:42 2013 +0000 + + + upgrade estimate priv. + +commit 7c7ec70572cc4183053472ed3c0e7e47eb4eb95e +Author: wangyidong +Date: Wed Feb 27 01:51:51 2013 +0000 + + * finish task #1130. + +commit 50106ccfaf488e3c56a9aa2a63ee8ccd8e9aef05 +Author: chencongzhi520@gmail.com +Date: Wed Feb 27 01:23:40 2013 +0000 + + * finish task#1128. + +commit b79c18360972e5a184a4c2c124d44285ba516e78 +Author: zhujinyong +Date: Wed Feb 27 01:13:16 2013 +0000 + + * add priv of edit and delete estimate. + +commit 754d636b202b778ea7a2dbf0ebd41459a852e440 +Author: wangyidong +Date: Wed Feb 27 01:12:11 2013 +0000 + + * finish task #1113. + +commit b9e6a848b97d05a9b1d6a23f3f16b809e32df427 +Author: chencongzhi520@gmail.com +Date: Wed Feb 27 01:09:39 2013 +0000 + + * finish task#1122. + +commit 266c12421e25dcb0ea934ad1413be4f202eafd4c +Author: chencongzhi520@gmail.com +Date: Wed Feb 27 01:00:52 2013 +0000 + + * finish task#1145. + +commit 8cb3cd79654a0db7025afee2360b0d2a48b23156 +Author: zhujinyong +Date: Wed Feb 27 00:58:19 2013 +0000 + + * compute consumed and left when delete estimate. + +commit 7e41cf58884f8373daba11a7b7867a8a9a26cf76 +Author: chencongzhi520@gmail.com +Date: Wed Feb 27 00:58:19 2013 +0000 + + * finish task#1141. + +commit 86932b940184d1a757444b89d25df397b7d5d9e9 +Author: chencongzhi520@gmail.com +Date: Wed Feb 27 00:54:49 2013 +0000 + + * finish task#1129. + +commit 3e70268958dee7c6eebbab2362f5a6f5fe8240f5 +Author: wangyidong +Date: Wed Feb 27 00:46:41 2013 +0000 + + * change sql for webapp. + +commit 70b0e9bbd5ef333eebae66db1839fb278f3eef16 +Author: chencongzhi520@gmail.com +Date: Wed Feb 27 00:41:02 2013 +0000 + + * finish task#1134. + +commit ceda2557d406ab0ee6a0b537e5db1e166b9db8f6 +Author: wangchunsheng +Date: Wed Feb 27 00:28:50 2013 +0000 + + * fix the error of warning. + +commit c3826287c3f40c4e26f6095e6e547688c36e0096 +Author: wangchunsheng +Date: Wed Feb 27 00:28:16 2013 +0000 + + * change the log of default webapp. + +commit f4104bd565f9bfef12e9837db9124a6f9a61fc60 +Author: wangchunsheng +Date: Tue Feb 26 07:38:36 2013 +0000 + + * fix the error of zt_webApp, should be zt_webapp. + +commit 991aabac6f7ef756775db915326ca7bb0ea95242 +Author: wangchunsheng +Date: Tue Feb 26 07:37:04 2013 +0000 + + * change the lang item of noModule of webapp. + +commit ac758ace639d505cdae7d6e94dcb27a08b28a887 +Author: wangchunsheng +Date: Tue Feb 26 07:36:11 2013 +0000 + + * fix the error of webapp's default icon. + +commit cc678aec811d27fa68c227387f8c6c1329142ab7 +Author: wangchunsheng +Date: Tue Feb 26 06:10:59 2013 +0000 + + * adjust code format. + +commit 3b308030cb4ab8c5592977f48fc7822f46cde462 +Author: chencongzhi520@gmail.com +Date: Tue Feb 26 02:28:02 2013 +0000 + + * adjust ->clearDataSucceed lang defined instead ->clearDataSuccessfully. + +commit 46a34634b11210a06eaf76a25f82ce202f1889e2 +Author: chencongzhi520@gmail.com +Date: Tue Feb 26 02:22:49 2013 +0000 + + * adjust the project's tree: remove the the product branch that without project. + +commit 7f8670d2446c92894220a6e6c7e949bf28bf2beb +Author: chencongzhi520@gmail.com +Date: Tue Feb 26 02:12:02 2013 +0000 + + * adjust the task-batchCreate. + +commit 757b9c220a4d0c1bfc1c0c98aea6bbb459719ae1 +Author: wangyidong +Date: Tue Feb 26 01:59:23 2013 +0000 + + * add priv changelog for new version. + +commit 8eb0e35ddc832c3a57128254beb40e2745e0026d +Author: zhujinyong +Date: Tue Feb 26 01:42:29 2013 +0000 + + + add note. + +commit 248a8d33add3da51f959f608a62c0d4d407bf83e +Author: zhujinyong +Date: Tue Feb 26 01:37:26 2013 +0000 + + * fix for colorbox. + +commit a0148bdc736cdbf9c954003a51a4ac2fd736a922 +Author: zhujinyong +Date: Tue Feb 26 01:23:27 2013 +0000 + + * refresh when close colorbox. + +commit ff6239757997267c06b2d04ae7c063dc830fb027 +Author: zhujinyong +Date: Tue Feb 26 01:00:42 2013 +0000 + + * adjust task record style. + +commit 756d436eeccff10bde30cdc381b358906ce8eb51 +Author: chencongzhi520@gmail.com +Date: Tue Feb 26 00:54:28 2013 +0000 + + * add red for type of task-batchedit. + +commit 85b89300ab7e0faa10a7f6937600cd3a51ed4b22 +Author: wangchunsheng +Date: Mon Feb 25 08:47:21 2013 +0000 + + * change bugassign to bugAssign. + +commit c1b2c2143180c680438c9ff13e830b2f247033f6 +Author: wangchunsheng +Date: Mon Feb 25 08:41:19 2013 +0000 + + - remove the setHelpLink() method. + +commit 4081020178b9d01db0c1d5215c15323c5204c03a +Author: wangyidong +Date: Mon Feb 25 06:13:42 2013 +0000 + + * adjust pre pager for get webapp by api. + +commit 60175e661e8d30515901a628008baa66dec4d545 +Author: wangyidong +Date: Mon Feb 25 06:06:27 2013 +0000 + + * fix a bug for view app by api. + +commit 34d024ed0dab2f9313dc40a7b40ddd694c43e522 +Author: zhujinyong +Date: Mon Feb 25 06:01:54 2013 +0000 + + * fix a bug : task consumed error. + +commit 8a7ba33735d2a4b3587aa421dd2465f97395a9fb +Author: zhujinyong +Date: Mon Feb 25 05:59:38 2013 +0000 + + * compute task estimate. + +commit b46581f4c193841c80ee42c6e7855900be4c9d25 +Author: wangyidong +Date: Mon Feb 25 05:59:11 2013 +0000 + + * adjust webapp. + +commit 9df65ddda086c27d892dcac99d2b2458e99572d5 +Author: wangchunsheng +Date: Mon Feb 25 01:49:35 2013 +0000 + + * adjust batchCreate item to 10 for todo. + +commit 589d3f0db56a9dfe2a9b4dba0a355ca8deaa8672 +Author: wangchunsheng +Date: Mon Feb 25 01:45:03 2013 +0000 + + * adjust the file export page. + +commit 39afa7138694a1cdb409d825938cd8dc1954a8e8 +Author: wangchunsheng +Date: Sat Feb 23 02:23:20 2013 +0000 + + * adjust the lang->bug->common for zh-cn. + +commit d129d82629a17de423321585e464d7d501267c91 +Author: wangchunsheng +Date: Sat Feb 23 02:21:52 2013 +0000 + + * adjust the dynamic, when login, logout, remove the objectLabel. + +commit e5e9668e36c2fdd7ed34bfc64313736754f083f1 +Author: wangchunsheng +Date: Sat Feb 23 02:12:51 2013 +0000 + + * fix the error of debugwin. + +commit a9d6569bb5aafd13d6864f116fd4bae269988f73 +Author: wangchunsheng +Date: Sat Feb 23 02:03:17 2013 +0000 + + * adjust the fields of product info in index page. + +commit dfa8415ca0b1fcda3913706fcf0b14971c846b10 +Author: wangchunsheng +Date: Sat Feb 23 02:02:11 2013 +0000 + + * adjust the fields of company table for English. + +commit 57011125839a2a4d740edbd885ee9c67643c6ac3 +Author: wangchunsheng +Date: Sat Feb 23 01:41:45 2013 +0000 + + * adjust the defination for task's type field. + +commit 01e10ad51535db08ec8c9c2f049186fb94940829 +Author: wangchunsheng +Date: Sat Feb 23 01:40:51 2013 +0000 + + * adjust the notes for type field. + * adjust the width for projectTree and moduleTree. + * adjust the width of actions. + +commit 23fac5c207cac845cbcc9d370a9ac5bb5be2f20d +Author: wangchunsheng +Date: Sat Feb 23 01:21:20 2013 +0000 + + * adjust the showAll and hideClosed label. + +commit 5e4d5ef318fabd91c33dc00d0b0df1557d220c6c +Author: wangchunsheng +Date: Sat Feb 23 00:55:40 2013 +0000 + + * adjust the UI for Egnlish. + +commit cef1f7c10a371d0477ad8c63ca5f39c521111d97 +Author: wangyidong +Date: Fri Feb 22 08:08:26 2013 +0000 + + * adjust webapp style. + +commit 16586d1f2985bf03d714b30eeb0b6b21f31ed44e +Author: wangyidong +Date: Fri Feb 22 08:06:31 2013 +0000 + + * fix a bug for tree order. + +commit f20fd74b6895d5241e5abdae6af2f0530cc19c72 +Author: wangyidong +Date: Fri Feb 22 07:26:35 2013 +0000 + + * change for webapp module. + +commit e21c460bf15ba27291c08bf3ba4636cf091bac67 +Author: zhujinyong +Date: Fri Feb 22 06:51:40 2013 +0000 + + * move display from js to html. + +commit 1b36b4dc3a9466235e8c0cd1608e46cf1b15a440 +Author: wangchunsheng +Date: Fri Feb 22 06:43:07 2013 +0000 + + * adjust englisth lang for web app. + +commit 5ad693574679af561b0b3041603a7215c166d5b7 +Author: wangchunsheng +Date: Fri Feb 22 06:14:14 2013 +0000 + + * change the readme.txt for windows one package. + +commit 1eaf070881c37e1aa3cb2b9ef280522332029780 +Author: wangchunsheng +Date: Fri Feb 22 06:09:41 2013 +0000 + + * add the port checking and setting feature for windows xampp package. + +commit 88aae7b06b8eff43a3508ff9e48683efce92fe1b +Author: wangyidong +Date: Fri Feb 22 03:37:57 2013 +0000 + + * change data for group priv. + +commit 8154437a3c6c79a3e0b0720949e94314c2812d31 +Author: wangyidong +Date: Fri Feb 22 03:25:33 2013 +0000 + + * add priv in resource. + +commit 1b2ff051d002206ab269691bbb4e4a1137311d33 +Author: wangyidong +Date: Fri Feb 22 03:19:24 2013 +0000 + + * finish task #1111,1112. + +commit 621e7b7c7094b6317907065c18b99e059397ebb1 +Author: wangyidong +Date: Fri Feb 22 03:17:10 2013 +0000 + + * add report-remind to writeList. + +commit 44284531d75d5714138c026699d81db13ffd6a29 +Author: zhujinyong +Date: Fri Feb 22 02:57:42 2013 +0000 + + * code for task#1110. + +commit f1d81b1fd1cca39f1d150c83ebc8d84bb7195e29 +Author: wangyidong +Date: Fri Feb 22 02:55:31 2013 +0000 + + * change group priv. + +commit a6c666485bf58910aadaffb1bed71690189f6b7e +Author: zhujinyong +Date: Fri Feb 22 02:54:23 2013 +0000 + + * code for task#1102. + +commit df0774f931db64175a331a4a115ba25b2a680bf2 +Author: zhujinyong +Date: Fri Feb 22 02:48:46 2013 +0000 + + + add title. + +commit 0458e4aa82f4106c90adb7d975d2eda16af972b2 +Author: zhujinyong +Date: Fri Feb 22 02:35:58 2013 +0000 + + + add title. + +commit a2a018e42dd71c667c4f1bc60672b1dfff70b776 +Author: wangchunsheng +Date: Fri Feb 22 02:24:43 2013 +0000 + + * pass pmsRoot to init.sh auto. + +commit ba7d0cd9fc2ce1ac3d6bc1408b1a4665636fe716 +Author: zhujinyong +Date: Fri Feb 22 01:45:01 2013 +0000 + + * if type of project is sprint, remove module. + +commit 460ad95f4f975a49689f456327b5e7069ca6e4b9 +Author: zhujinyong +Date: Fri Feb 22 01:33:12 2013 +0000 + + * change 'baseUrl' to 'pmsRoot'. + +commit 75c082e475c0d4a9cbbb7942461406d2db80d30b +Author: zhujinyong +Date: Fri Feb 22 01:29:57 2013 +0000 + + * change 'baseUrl' to 'pmsRoot'. + * adjust param check. + +commit 4c7ed2a6bf732abfcb9a7308cb35a18a45be0706 +Author: wangyidong +Date: Fri Feb 22 01:19:42 2013 +0000 + + * finish task #1097. + +commit c5b0382c252389c9771e0df8ddfe7d312acba104 +Author: chencongzhi520@gmail.com +Date: Fri Feb 22 01:18:19 2013 +0000 + + * adjust the colorbox of project-tips. + +commit b9cd90323ee649339f5c0c09c76ac126eca95f70 +Author: chencongzhi520@gmail.com +Date: Fri Feb 22 00:56:04 2013 +0000 + + * fix bug: linkCase instead linCase. + +commit 846c174d7beba7dab4541d5d43dbbe7a47463396 +Author: wangyidong +Date: Thu Feb 21 09:44:35 2013 +0000 + + * fix a bug for no init object. + +commit eeb7ab47367f5409165fb6239da28c7f0015f398 +Author: zhujinyong +Date: Thu Feb 21 08:50:44 2013 +0000 + + * adjust position of project button. + +commit ca428419c25a448de152cec313775bd01ca708a2 +Author: zhujinyong +Date: Thu Feb 21 07:47:28 2013 +0000 + + * clean baseUrl. + +commit 43d1bb2f167c3799f2ef51bce3e8e7e3145f746c +Author: zhujinyong +Date: Thu Feb 21 03:05:19 2013 +0000 + + * clean baseurl. + +commit a5e6e37fb394fc8f94f0671b9d8bab32856d71b1 +Author: wangyidong +Date: Thu Feb 21 02:48:40 2013 +0000 + + * change new database sql for zentao 4.0. + +commit b6f3f93ff821da84266e223aba4715e454c91f9b +Author: wangyidong +Date: Thu Feb 21 01:22:52 2013 +0000 + + + add tests about getwebroot method. + +commit b8d97728b06eff47fd16fe17dfb31d147b44d18e +Author: wangyidong +Date: Thu Feb 21 01:21:26 2013 +0000 + + * fix a bug for get webroot in shell. + +commit 9a448451bcebf65499da6d80118ac007d54be5e1 +Author: chencongzhi520@gmail.com +Date: Wed Feb 20 09:04:00 2013 +0000 + + * finish task#1093. + +commit 4586f3cb2ce43c765b43b59255797e785df8aa0b +Author: chencongzhi520@gmail.com +Date: Wed Feb 20 09:03:12 2013 +0000 + + * code for task#1089. + +commit 92114527a8928166f9f6d387d771779698ac3221 +Author: wangyidong +Date: Wed Feb 20 07:14:56 2013 +0000 + + * fix for sql notice. + +commit d9045c47d39d8023f3ed599ea83b9845183ea5eb +Author: zhujinyong +Date: Wed Feb 20 06:51:06 2013 +0000 + + + add zentao url. + +commit fef2eb33e52da3027d945189553a629260726fdc +Author: wangyidong +Date: Wed Feb 20 06:39:48 2013 +0000 + + * change flow sql. + +commit 3e997ec833c41194ec8fd98bad03fefdffd23d33 +Author: zhujinyong +Date: Wed Feb 20 06:04:00 2013 +0000 + + + add zentao url. + +commit dbb10ba028cc6688b907387f285d778a2f2fc5ef +Author: wangyidong +Date: Wed Feb 20 05:35:55 2013 +0000 + + * change version to 4.0 + +commit 7cd8dabd228a00dc34ef72f08918e4ea50d58049 +Author: chencongzhi520@gmail.com +Date: Wed Feb 20 03:16:06 2013 +0000 + + * code for task#1096. + +commit a99bc96a49ce499ad102792224ab95edae8cf3f5 +Author: chencongzhi520@gmail.com +Date: Wed Feb 20 02:42:10 2013 +0000 + + * finish task#1089. + +commit 8d5db001b3d5eea999f5f2d674473148b095fdd2 +Author: zhujinyong +Date: Wed Feb 20 02:34:00 2013 +0000 + + * adjust project sidebar. + +commit 58132a7e2a7c7c2dc61ba32babc794605ef99d7c +Author: wangyidong +Date: Wed Feb 20 01:39:44 2013 +0000 + + + add dailyreminder to zentao. + +commit 634d78b3bbff67c40311d22b3964e07c0570e434 +Author: zhujinyong +Date: Wed Feb 20 01:31:08 2013 +0000 + + + add upgrade 4.0.beta2. + +commit 40065bfc2d4637772870db196751895ed8e1b2a6 +Author: chencongzhi520@gmail.com +Date: Wed Feb 20 00:36:56 2013 +0000 + + * finish task#1095. + +commit e600b135fcbc9385b7df0bc6782b439434df8688 +Author: wangchunsheng +Date: Tue Feb 19 12:18:24 2013 +0000 + + * rewrite the readme.txt for windows one package. + +commit 2d5bb923ae39e9d8e7a17fbccfd465681deb3e23 +Author: wangyidong +Date: Tue Feb 19 08:23:45 2013 +0000 + + * fix a bug for action hide priv. + +commit 560267bc52badad3045bf3b10965be3989e162f2 +Author: chencongzhi520@gmail.com +Date: Tue Feb 19 08:19:42 2013 +0000 + + * update delete icon. + +commit 6de9e8a3b1e9e381b957d71360c96e7395d1c90b +Author: wangchunsheng +Date: Tue Feb 19 07:51:04 2013 +0000 + + * adjust the items for flow chosen. + +commit 10818ccdff640a3564f62fceaee562858e972672 +Author: chencongzhi520@gmail.com +Date: Tue Feb 19 07:37:45 2013 +0000 + + * set onlybody=true in colorbox. + +commit 7427704392ca302c8b612aa04a1081b835f19657 +Author: chencongzhi520@gmail.com +Date: Tue Feb 19 07:23:06 2013 +0000 + + * finish task#1078. + +commit 3315c3ce9eb973662c38e59bc69459a33bb18327 +Author: wangyidong +Date: Tue Feb 19 07:17:11 2013 +0000 + + * add onlybody param for createLink. + +commit 4df2a31d02794fa034515ced15fd6673d811912d +Author: wangyidong +Date: Tue Feb 19 07:03:34 2013 +0000 + + * change for add dailyminder extension. + +commit 0744d1c9c6255a0f2d9ee787b7852299d135d218 +Author: zhujinyong +Date: Tue Feb 19 06:29:09 2013 +0000 + + * fix a bug in batchedit tasks. + +commit 8b4018f4bd6a30a26c11b5caf10da70c324b81be +Author: wangyidong +Date: Tue Feb 19 06:23:57 2013 +0000 + + * fix a bug for colorbox size. + +commit 81c4e313851203c857b2936ff331dae1f9ed9eb6 +Author: chencongzhi520@gmail.com +Date: Tue Feb 19 05:53:05 2013 +0000 + + * finish task#1079. + +commit d1b98918125a2931e4981d7bbdcdd50e4e609c86 +Author: zhujinyong +Date: Tue Feb 19 05:45:59 2013 +0000 + + + add dailyreminder to cron. + +commit 8fa8a5462e5298658972cbd5145648b794b29271 +Author: wangyidong +Date: Tue Feb 19 05:41:32 2013 +0000 + + * finish task #1088. + +commit 6d0550772b00baa44c97275fc5882bc883c46716 +Author: chencongzhi520@gmail.com +Date: Tue Feb 19 03:38:28 2013 +0000 + + * code for task#1087. + * remove the useless image:search.gif. + * remove the useless css. + +commit 9e4b3cce4d77e556e472af45a6082969e1f65968 +Author: chencongzhi520@gmail.com +Date: Tue Feb 19 03:19:21 2013 +0000 + + * remove the useless images. + +commit e3422824974ff01a14a2c55892c0d9ba76e508ef +Author: chencongzhi520@gmail.com +Date: Tue Feb 19 03:14:01 2013 +0000 + + * code for task#1087. + * update zt-icons.png. + * remove the useless images. + +commit a909bf6858a2129e71aee3448de705ac034b89fb +Author: zhujinyong +Date: Tue Feb 19 02:32:40 2013 +0000 + + * code for task#1076. + +commit 37676cb51d4d7ea9e4145afd853835dbd8e123bb +Author: zhujinyong +Date: Tue Feb 19 02:31:01 2013 +0000 + + * save session when browse users. + +commit c5986128841200b80ce47e5bc2e663b3a3980c9d +Author: wangyidong +Date: Tue Feb 19 02:28:46 2013 +0000 + + * fix bug for task #1090. + +commit 8bdb5ecd018408a2f76cb26b5f35b6b4add80e70 +Author: zhujinyong +Date: Tue Feb 19 02:20:41 2013 +0000 + + * save session when browse users. + +commit 9c85150e93c1efcf37925d90a8b4f1acbcd2ebc6 +Author: wangyidong +Date: Tue Feb 19 02:16:41 2013 +0000 + + * finish task #1094. + +commit f152d320026cb26cde6bc82f448bd18a37b3a01e +Author: wangyidong +Date: Tue Feb 19 01:49:01 2013 +0000 + + * finish task #1080. + +commit af6c4a4ee8a5ec4fa5448cca359e37cfb37e0867 +Author: wangyidong +Date: Tue Feb 19 01:47:57 2013 +0000 + + * finish task #1074. + +commit 044c8fd6a8cdff7dcd72670eb8924b4e14df8a3a +Author: chencongzhi520@gmail.com +Date: Tue Feb 19 01:47:10 2013 +0000 + + * code for task#1087. + * remove the www/theme/index.css to module/my/css/index.css. + * replace the noProjectTips instead createProject. + * replace the noProductTips instead createProduct. + +commit 0f4b864f905519ba74f8736c3b52fa944a8a216f +Author: zhujinyong +Date: Tue Feb 19 01:44:52 2013 +0000 + + + add unplanned story. + +commit ef486899e3aa9977398107094d0bfae6b2720c63 +Author: chencongzhi520@gmail.com +Date: Tue Feb 19 01:10:30 2013 +0000 + + * remove the useless css. + +commit f595d7b95d818267a11d4521676c4861694c6907 +Author: wangyidong +Date: Tue Feb 19 00:36:09 2013 +0000 + + * finish task #1073. + +commit 510c001b30e3f57be8ab6d657c52af91410d3d5f +Author: wangchunsheng +Date: Mon Feb 18 23:51:51 2013 +0000 + + * adjust the init script for testing. + +commit 16760ca94c4cdcbb349528ecde5cfe6ab8a3895c +Author: wangchunsheng +Date: Mon Feb 18 23:47:47 2013 +0000 + + - remove it. + +commit d8b594b3c2ed7f7c32ce8dd412e53adba55242bf +Author: wangchunsheng +Date: Mon Feb 18 23:47:03 2013 +0000 + + + add the first test case for zentaopms. + +commit 498b5a95d0f70fdc6b425e18b0ab5d0978ae205f +Author: wangchunsheng +Date: Mon Feb 18 23:41:34 2013 +0000 + + * when edit company, add http to it's backyard and website fields. + +commit 222d7f2fcbb0d0408df28ccb04247c1548598023 +Author: wangchunsheng +Date: Mon Feb 18 23:40:50 2013 +0000 + + * when edit company, reload the page again. + +commit 5d808c7eeb3a32e8069bce8a70fb3d26d00f6e06 +Author: wangchunsheng +Date: Mon Feb 18 23:39:41 2013 +0000 + + * adjust the style for type field. + +commit 1732bf6389ca0e21bf88631c13cf0ba1f828849f +Author: wangchunsheng +Date: Mon Feb 18 23:38:40 2013 +0000 + + * fix the error of warning. + +commit 97da61f5260b9f9ac5b069e1b758db8676ae3487 +Author: wangchunsheng +Date: Mon Feb 18 23:33:31 2013 +0000 + + + add a threelevel case. + +commit 423b0d3f9578658e0fc5e01ad13116f32414b158 +Author: wangyidong +Date: Mon Feb 18 10:00:06 2013 +0000 + + * fix a bug for iframe when no clicked. + +commit f0149dbf199b90a5407fea8b7052a2d6e6f62c80 +Author: wangyidong +Date: Mon Feb 18 09:18:08 2013 +0000 + + * fix a bug for action.html.php. + +commit 2780dc200b40435394c2dd1f4a871cbef3861465 +Author: wangyidong +Date: Mon Feb 18 09:16:31 2013 +0000 + + * adjust task estimate for start and finish. + +commit a11b5e7da7f4ce6691fb0083db2291d4ddc1f72e +Author: wangchunsheng +Date: Mon Feb 18 03:06:23 2013 +0000 + + * adjust the classblug style. + +commit a3b4584623aba2babfa6a3bd064a150c2aabf088 +Author: wangchunsheng +Date: Mon Feb 18 03:05:21 2013 +0000 + + * remove the chdir logic. + * init $app->user. + +commit 59356e22df247c382ea6f4645dc6912eda9c3ad0 +Author: wangchunsheng +Date: Mon Feb 18 03:02:55 2013 +0000 + + * when comine the css of other style, change the path of the background images. + +commit da6816b494932389fb10272b04439c31c895aed2 +Author: zhujinyong +Date: Mon Feb 18 02:44:32 2013 +0000 + + * fix workhour record. + +commit 2df192332a5f036a9ebcf598c28040c1edca66f9 +Author: wangchunsheng +Date: Mon Feb 18 02:34:20 2013 +0000 + + - remove the css file for ko and ja. + +commit 7a0466f16b792acb337d28efab5733955ec1e530 +Author: wangchunsheng +Date: Mon Feb 18 02:13:01 2013 +0000 + + * change max file upload size to 50M. + +commit 0161901df160c89e9d955bab05ab7904721b15af +Author: wangchunsheng +Date: Mon Feb 18 01:25:33 2013 +0000 + + + add the testing scripts for helper::setMember() method. + +commit 1ea570ad51078b7a3c0b0478a2b81fe325a9aa7b +Author: wangchunsheng +Date: Wed Feb 6 07:32:18 2013 +0000 + + * readjust the linux package. + +commit e5d7f02956ff2a1bb9dfaaf2e03cce131e4b7db1 +Author: wangchunsheng +Date: Wed Feb 6 04:10:55 2013 +0000 + + * fix the error of warning. + +commit 846e679ea0329c749c052ddd7eff5fed4ba2962f +Author: wangchunsheng +Date: Wed Feb 6 03:20:58 2013 +0000 + + * remove the myisamchk.exe from the windows package. + +commit 71920088d090e3eb77f2d5633c7b616fd65c4c29 +Author: zhujinyong +Date: Tue Feb 5 02:46:10 2013 +0000 + + * fix a bug. + +commit 513d5049e2dbc4bd4e8452b671402a62f871cd82 +Author: wangyidong +Date: Mon Feb 4 08:07:10 2013 +0000 + + * close html tag for testtask. + +commit ed2cedb0f382c15a284c15a0525d620905b923ee +Author: wangyidong +Date: Mon Feb 4 08:05:16 2013 +0000 + + * adjust consumed of batch edit. + +commit ecc0ff7ee1bc6cae5b295153784fa2bb1ccb91c4 +Author: zhujinyong +Date: Mon Feb 4 07:55:12 2013 +0000 + + * fix a bug : fix setAfter. + +commit 10e7e90ca325f64ceada7fae5dc61154c3b4e99a +Author: wangchunsheng +Date: Sat Feb 2 05:33:27 2013 +0000 + + * when detect mysqldump, trim the result. + +commit d49503f2d689d990eb5e41b851f29b7eac18f626 +Author: wangchunsheng +Date: Sat Feb 2 05:20:53 2013 +0000 + + + add the syncsvn.sh. + +commit 2b97b00e8af6dfdff235307afa3c296ebf3b14ae +Author: wangchunsheng +Date: Sat Feb 2 03:02:50 2013 +0000 + + * adjust the log format for cli mode. + +commit 3a3c1ac687489b9c8adf3d7918b10c19fdd2d14b +Author: wangchunsheng +Date: Sat Feb 2 02:42:47 2013 +0000 + + + create syncsvn.bat and put it in cron. + +commit a8ef102906dc99e1f89baa4ada03a3fdc34cb6f2 +Author: wangchunsheng +Date: Sat Feb 2 02:37:39 2013 +0000 + + * adjust getMySQLDump() method, auto detect for other environment. + +commit 609060e02cfaccfc5b2fb69001a5fe1c67ec6e2c +Author: wangchunsheng +Date: Sat Feb 2 01:03:54 2013 +0000 + + * fix the error of warning. + +commit 1488762c4530eea5d3492e0c66916a05552f4886 +Author: chencongzhi520@gmail.com +Date: Wed Jan 30 08:32:37 2013 +0000 + + * adjust the code. + +commit a9f9abff91ac53aff4a4a5796bca834ea585e50c +Author: wangchunsheng +Date: Wed Jan 30 07:33:40 2013 +0000 + + * fix the error of zentaoRoot when download notify package. + +commit 4fd49494a295274141581f63cf8090317363c313 +Author: wangchunsheng +Date: Wed Jan 30 07:01:35 2013 +0000 + + * fix the error of warnning when install. + +commit 2d6b9df67c5b67cf3ca8211716e93b4f930db2fd +Author: wangchunsheng +Date: Wed Jan 30 06:18:29 2013 +0000 + + * adjust the build scripts for linux. + +commit b4b94c6227dfc7703d5df0514ee3ea119559ddd6 +Author: wangchunsheng +Date: Wed Jan 30 06:08:35 2013 +0000 + + * adjust the include path. + * set time zone. + +commit e57a66b18af86fc6dcf5208b7742d49659a87c78 +Author: wangchunsheng +Date: Wed Jan 30 05:32:46 2013 +0000 + + * adjust code, add comments. + +commit d875876e33f7a019af444571995e0ff83f751545 +Author: wangchunsheng +Date: Wed Jan 30 05:28:51 2013 +0000 + + * when parsed crons, print them. + + add feature of re parse. + * adjust the log format and save path. + +commit 884dfdaafac18dbbc43439e360d25d2f48483c72 +Author: wangchunsheng +Date: Wed Jan 30 05:21:13 2013 +0000 + + * adjust code. + * fix the error of sys.cron. + * use absolute path when create sys.cron. + +commit 4bdfa9701e6094973873e5d349bb06c9bddb1efe +Author: wangchunsheng +Date: Wed Jan 30 05:20:04 2013 +0000 + + * change the link of zentao.net. + +commit 4fd482a276b689f10a60787a055029c997c2934d +Author: wangchunsheng +Date: Wed Jan 30 05:13:20 2013 +0000 + + * set the file upload size as 50M. + +commit 9844fbabd43d1d72fac9cf86efd7244eadf3554e +Author: chencongzhi520@gmail.com +Date: Wed Jan 30 02:35:30 2013 +0000 + + * add icons for testastk-start and testtask-close. + +commit 38493f1486055cefd42277067f8cd4e07de40b36 +Author: chencongzhi520@gmail.com +Date: Wed Jan 30 02:34:23 2013 +0000 + + * add close-icon for product. + +commit 0e5713deed2b5acf26ea2ab499950cc66599fcad +Author: chencongzhi520@gmail.com +Date: Wed Jan 30 02:25:38 2013 +0000 + + * add icon for bug-activate. + +commit 92c64e2a3f5b785560b353ee0b4f4de172334c2f +Author: wangchunsheng +Date: Wed Jan 30 02:19:38 2013 +0000 + + * change the copyright info. + +commit d98e595b7b3e5f744d7c5e77b2d151ccc05cc05f +Author: wangchunsheng +Date: Wed Jan 30 01:33:22 2013 +0000 + + * use " instead of ' to quote the url. + +commit c31b33654d6fe896f70d015d09215bba02233206 +Author: wangchunsheng +Date: Wed Jan 30 01:32:03 2013 +0000 + + * turn off the E_STRICT error. + +commit 0437d2bc668442c2669dbfbbca8518d65f5cef04 +Author: wangchunsheng +Date: Tue Jan 29 06:45:21 2013 +0000 + + * rewrite the build.php. + +commit f64c9e703147ada165e630be76f64902bfc638bb +Author: chencongzhi520@gmail.com +Date: Tue Jan 29 06:33:18 2013 +0000 + + * change show project as default setting. + * update show project and hide project icon. + +commit 6f1d979a7daae0fb2b31c23ec3eaacd34f00563a +Author: wangchunsheng +Date: Tue Jan 29 06:20:59 2013 +0000 + + * fix the warnning error. + +commit eaccf44cc341d1c6dd2c086099542ed69757f95e +Author: wangchunsheng +Date: Tue Jan 29 06:18:05 2013 +0000 + + * change the log file for apache. + * set the access priviledge for virtual host. + +commit c283a5076ac4b13e9e542437d4ee357700c80a6d +Author: wangchunsheng +Date: Tue Jan 29 05:43:35 2013 +0000 + + * change the svn.php config. + - remove the syncsvn.bat. + +commit 3d779b02ed7693d3a20548699c663ae3b8117236 +Author: chencongzhi520@gmail.com +Date: Tue Jan 29 05:22:30 2013 +0000 + + * add icons for show projects and hide projects. + +commit 2cd99c51ccaee15aa5dd3b5e90276f2805235bd3 +Author: wangchunsheng +Date: Tue Jan 29 03:39:05 2013 +0000 + + * when turn on virtualhost, set the access priviledge。 + +commit 96a923e0caa52863032632fca7d29562354f76de +Author: wangchunsheng +Date: Tue Jan 29 03:31:44 2013 +0000 + + * when install service, set the path for php and mysql. + +commit d20d04352322c660947d4bf8ea98381da7cfdaa5 +Author: wangchunsheng +Date: Tue Jan 29 03:31:14 2013 +0000 + + * move the phpmyadmin.php to windows directory. + +commit 3384846bd7c7564608249cc1ac13b62dde5e60ac +Author: zhujinyong +Date: Tue Jan 29 03:03:32 2013 +0000 + + * change style of productplan view. + +commit 4396b5e7c421bb417b6fa630a609b67ecc0a1290 +Author: wangchunsheng +Date: Mon Jan 28 13:18:46 2013 +0000 + + * change to dos format. + +commit 8d55854ca7dac342d79ab07a37c23f7dfa637893 +Author: wangchunsheng +Date: Mon Jan 28 13:01:46 2013 +0000 + + * rewrite the build tools for windows package. + +commit bccde8019ccb0cb022bfb770d2b38ce8b25df1c2 +Author: zhujinyong +Date: Mon Jan 28 09:03:56 2013 +0000 + + * adjust code. + +commit 2bb9e4ec3bb0d6b18e4e4fae7db023280e0388a6 +Author: zhujinyong +Date: Mon Jan 28 08:56:56 2013 +0000 + + * change en lang. + +commit cc84bba6b5d2f5b7e9472fe5295bc429a023310e +Author: zhujinyong +Date: Mon Jan 28 05:14:34 2013 +0000 + + + add cron.bat. + +commit 07c0e40ad20be2c3980647e30a30f508d5da303d +Author: zhujinyong +Date: Mon Jan 28 02:56:52 2013 +0000 + + * fix a bug : check priv of no productProjects. + +commit 49d2eb1642aa2096efa5b84fafbf2095a8968e4b +Author: zhujinyong +Date: Mon Jan 28 01:49:33 2013 +0000 + + * adjust date function. + +commit e370b0287e4d10ae18e9214e162d506cb38736d7 +Author: wangchunsheng +Date: Mon Jan 28 00:58:08 2013 +0000 + + - remove this bin directory, using the init.bat instead. + +commit 5a9f21c9f6ac6ffe4144222d3584d1d141be94a8 +Author: wangchunsheng +Date: Sun Jan 27 08:42:11 2013 +0000 + + + add support for windows in getMySQLDump() method. + +commit 0d290291e50a3a5a8ed9255921b59ff33c190a34 +Author: wangchunsheng +Date: Sun Jan 27 07:51:45 2013 +0000 + + * when install, try to detech the mysqldump auto. + +commit 6b9a4418d9842e69b749efdc3081899591222113 +Author: wangchunsheng +Date: Sun Jan 27 07:50:53 2013 +0000 + + * fix the error of index.php of xampp package. + +commit 7ce066ea1d19685823c458dae6f0c4b5290c4057 +Author: wangchunsheng +Date: Sun Jan 27 06:18:50 2013 +0000 + + * revert the update4.0.beta2.sql. + +commit 21b03191a9a575468ac2a04cd4daa5b22617ca9a +Author: wangchunsheng +Date: Sun Jan 27 06:14:35 2013 +0000 + + * turn on the scripts for linux building. + +commit c414cf91aa2d2f1d8d20d41f5ea0df8af731ee4b +Author: wangchunsheng +Date: Sun Jan 27 06:09:31 2013 +0000 + + * adjust the buildxampp.sh. + +commit 16a1437eec118e34936165aab79de74c5a95dbef +Author: wangchunsheng +Date: Sun Jan 27 06:08:29 2013 +0000 + + * rewrite the start scripts, add the judge of /opt/lampp directory and init scripts. + +commit d554cdec437cdf518cd3122183dfe35d4ecfd212 +Author: zhujinyong +Date: Sun Jan 27 05:32:43 2013 +0000 + + * adjust init.sh. + +commit f502948597c9b330d35f4ccc3314990ba678072f +Author: wangyidong +Date: Sun Jan 27 01:17:52 2013 +0000 + + * adjust js::reload. + +commit 572cd0700b9ebbb3d0f6bbeeb74bf9a2115d4516 +Author: wangyidong +Date: Fri Jan 25 08:43:21 2013 +0000 + + * add check for bizext. + +commit 6ad37ee631b932dea71bfb9c27f20a85a4ffbbac +Author: zhujinyong +Date: Fri Jan 25 08:40:21 2013 +0000 + + * echo log. + +commit 3358df71a46c148e601ec602a54e54fe23279a50 +Author: wangyidong +Date: Fri Jan 25 08:11:04 2013 +0000 + + * don't set sn in install. + +commit 6cdab986bf80eb115cc38c56a9caf02a48b913b5 +Author: wangchunsheng +Date: Fri Jan 25 08:04:17 2013 +0000 + + * set title when install success. + +commit db6020c7ace91ebaf737f86f3ae0b782b1b60608 +Author: wangchunsheng +Date: Fri Jan 25 07:49:46 2013 +0000 + + * fix the error when build zip package. + +commit 1191c76d21cbc8a5c0153c8d5028847ff1260d22 +Author: wangchunsheng +Date: Fri Jan 25 07:47:52 2013 +0000 + + * rewrite the linux build shell. + +commit d47aac3dd90879cade6e54422d07d61c7025e600 +Author: wangchunsheng +Date: Fri Jan 25 07:23:46 2013 +0000 + + * set the propset execute. + +commit dba3a629ff8f93c34129dcf81b4281cdbd538863 +Author: zhujinyong +Date: Fri Jan 25 07:20:51 2013 +0000 + + + add cron. + +commit 750610f3a7ce6c908ebbd20aed063d33f6785dc1 +Author: zhujinyong +Date: Fri Jan 25 07:08:54 2013 +0000 + + - remove cron. + +commit 6851c53ec4ee200f6f840f351796fbaf78a569bc +Author: zhujinyong +Date: Fri Jan 25 07:02:04 2013 +0000 + + * loop to check phpcli exists or not. + +commit cefa766413db86b3d312e5abde233985d0f9a24f +Author: zhujinyong +Date: Fri Jan 25 06:44:52 2013 +0000 + + * adjust init.bat. + +commit 3eb72e27f9b73e13f7618c6e3425d06c9c89807b +Author: zhujinyong +Date: Fri Jan 25 06:14:28 2013 +0000 + + + add init.bat. + +commit 0c8c1bb68dd38e13ffdca9af45bfede8b6dfca4d +Author: zhujinyong +Date: Fri Jan 25 06:07:13 2013 +0000 + + - remvoe ztcli.bat. + +commit f74e25efd99c590e618601027a04a65f16cb0a4b +Author: zhujinyong +Date: Fri Jan 25 05:57:28 2013 +0000 + + - rm bat. + - rm shell. + +commit 72d4504007c13934d9e6e01450a9ea35d5a4349f +Author: zhujinyong +Date: Fri Jan 25 05:48:22 2013 +0000 + + - remove computeburn. + - remove checkdb. + +commit f521748dd745610b31e138455e801b0e8d28111b +Author: zhujinyong +Date: Fri Jan 25 05:45:31 2013 +0000 + + * change computeburn. + +commit e04a801b6c097f60bacb97cf840e62de5d639552 +Author: zhujinyong +Date: Fri Jan 25 05:43:42 2013 +0000 + + - remove ztcli.sh. + +commit d7c1abd5f74fa0650345ca671fbf8c65823408f5 +Author: wangyidong +Date: Fri Jan 25 05:31:11 2013 +0000 + + * change for webapp. + +commit cb85992f14d3aac83a0578711893f3269a6aafeb +Author: chencongzhi520@gmail.com +Date: Fri Jan 25 02:08:11 2013 +0000 + + * add icons for webapp. + +commit 84c7fd2c49cd15c885f32c4e1bd35af9a8d653f1 +Author: chencongzhi520@gmail.com +Date: Fri Jan 25 01:28:28 2013 +0000 + + * remove the ui-green ui-gray ui-blue instead zt-icons. + +commit 835b3757ec91d87c554f0324d8f84fa19cdd1cfd +Author: wangyidong +Date: Thu Jan 24 09:30:50 2013 +0000 + + * fix for header title. + +commit 6d3706edbd5ed97c0e3887d5eb8441043c0512c8 +Author: wangchunsheng +Date: Thu Jan 24 09:26:20 2013 +0000 + + * adjust the code for notify.zip. + * remove the code of .htaccess for linux one package. + +commit 8ad302037bb2c8a4e3e815387f8ee4fcc187a8ad +Author: zhujinyong +Date: Thu Jan 24 09:20:59 2013 +0000 + + * adjust init.sh. + +commit f7d578bcaf5bff3106ed31c299833b67df51bd7d +Author: chencongzhi520@gmail.com +Date: Thu Jan 24 09:14:56 2013 +0000 + + * remove the .outer's border of colorbox. + +commit 14db5f51e819a123083b7f3940be37c436864786 +Author: zhujinyong +Date: Thu Jan 24 09:11:48 2013 +0000 + + + add init.sh. + +commit ea2bcb1eae825e39f1dc8425a7fb27334a179dcd +Author: zhujinyong +Date: Thu Jan 24 08:51:37 2013 +0000 + + * remove transition of task. + +commit c8ab1820452eeb7173d5f5c6fcdd9090464d589b +Author: zhujinyong +Date: Thu Jan 24 08:50:46 2013 +0000 + + * fix a bug : add task consumed. + +commit 3915ac5c4da3d24f795f03cdcf7ca0d67d57ce81 +Author: chencongzhi520@gmail.com +Date: Thu Jan 24 08:48:56 2013 +0000 + + * add padding-bottom for caption. + +commit 54e99a39d3360da4fde89d7cf85dd44108ec2852 +Author: wangyidong +Date: Thu Jan 24 07:33:22 2013 +0000 + + * adjust colorbox padding-bottom. + +commit ec98a9dec03bc2bf189998d1d933a08e750a80dc +Author: chencongzhi520@gmail.com +Date: Thu Jan 24 07:05:52 2013 +0000 + + * hide clear data link. + +commit fe0817a681a99a0abf3c6af689b6e42ff4e2b618 +Author: wangyidong +Date: Thu Jan 24 05:49:40 2013 +0000 + + * change for js:set. + +commit 00ef79be413bf0a9d5c9077a05c156e73b98225a +Author: wangyidong +Date: Thu Jan 24 05:48:05 2013 +0000 + + * adjust js logic. + +commit 7edea52a4e513fa0738c77fa2769a4cc5f29d6ec +Author: wangyidong +Date: Thu Jan 24 05:31:47 2013 +0000 + + * adjust function js::set. + +commit 00f8d9392b3cd4368c4ca9ee5500937bce582f73 +Author: wangchunsheng +Date: Thu Jan 24 05:27:01 2013 +0000 + + * fix the error of doxygen. + +commit 99881763e2c64b92f5222fd5828e311af4564a70 +Author: chencongzhi520@gmail.com +Date: Thu Jan 24 02:48:31 2013 +0000 + + * adjust the lang of clearData. + +commit 5ef1e5645869b495acbe478d1624bb2e88b2f6bd +Author: zhujinyong +Date: Thu Jan 24 02:44:32 2013 +0000 + + * fix a bug : if there is no project, display error. + +commit 76b00987e5043aab0ba3b05c5e423f31105d37ed +Author: wangchunsheng +Date: Thu Jan 24 01:13:05 2013 +0000 + + * fix the bug of member management. + +commit b604ac93b7d7612d18914fa53d82f2cd07037a7a +Author: wangchunsheng +Date: Wed Jan 23 09:53:17 2013 +0000 + + - remove it. + +commit a13a34cc7a1006a076e497b1689ada168bbcb641 +Author: wangchunsheng +Date: Wed Jan 23 09:52:17 2013 +0000 + + * rename mobile app. + +commit ccf464f9af9b1369dcdcbd16b34c15e7e857f041 +Author: wangchunsheng +Date: Wed Jan 23 09:50:52 2013 +0000 + + * rewrite the Makefile. + +commit 4444e501be9aece34835ad985316241bc7df66d8 +Author: zhujinyong +Date: Wed Jan 23 09:07:09 2013 +0000 + + - remove init.php. + +commit 1a2da635d26f9772755d2281d87ca6513d13a41b +Author: zhujinyong +Date: Wed Jan 23 08:49:26 2013 +0000 + + + add init.php. + +commit 9578331adb0342254bf4f0def2df53de879817e8 +Author: wangyidong +Date: Wed Jan 23 08:33:54 2013 +0000 + + * adjust flow style. + +commit c87180211a6656d89a8aa41f957eed0c2eefbeea +Author: chencongzhi520@gmail.com +Date: Wed Jan 23 08:31:54 2013 +0000 + + * code for task#808. + +commit 166560f243b7eca41ae4ed6c88172a72c80ef41c +Author: wangyidong +Date: Wed Jan 23 08:22:46 2013 +0000 + + * adjust for choose flow. + +commit dfb35fbde26e785aeacd387a92e09725f60ee996 +Author: wangchunsheng +Date: Wed Jan 23 08:22:43 2013 +0000 + + * add the define of config class and getWebRoot() function. + +commit 0c5150921fc6516fd486b6b717b622541186fafe +Author: zhujinyong +Date: Wed Jan 23 08:16:10 2013 +0000 + + * change 'default' to 'sys'. + +commit a4258cde557ddb569c4ed6189a72bd6a54a75ab5 +Author: zhujinyong +Date: Wed Jan 23 07:55:28 2013 +0000 + + * rebuild crond.php. + +commit fa2a901f90bc4a4a038006da00178438ba3026e2 +Author: wangchunsheng +Date: Wed Jan 23 07:02:42 2013 +0000 + + * add role field for zt_group table. + +commit 807c0104c4c47b941cbc8089c2aac3af234e06f2 +Author: wangchunsheng +Date: Wed Jan 23 06:45:43 2013 +0000 + + * move them to doc directory. + +commit fd7f8160dfcb530ddee8c62dc5d2697ad38bcd66 +Author: wangchunsheng +Date: Wed Jan 23 06:25:15 2013 +0000 + + - rename it to windows. + +commit 6844e8d6c05e4d35fea3ae46823248f30f776acb +Author: wangchunsheng +Date: Wed Jan 23 06:24:30 2013 +0000 + + - delete it. + +commit 5f47dbc2b4895116f9655c94d83702ff940d76c9 +Author: wangchunsheng +Date: Wed Jan 23 06:23:01 2013 +0000 + + - move it to up directory. + +commit 39224c7c0a3653365915277e2b58f75aa006e077 +Author: wangchunsheng +Date: Wed Jan 23 06:21:52 2013 +0000 + + - remove sae. + +commit 74a71d5c2fcfc058671872ec7ae638bffe3f4bf6 +Author: wangchunsheng +Date: Wed Jan 23 05:44:48 2013 +0000 + + * move bin/build to build/tools. + +commit f839e2b487d8ba52eef18677957b7d1eb7a1080e +Author: wangchunsheng +Date: Wed Jan 23 05:40:25 2013 +0000 + + * adjust the cron directory. + +commit b9bc314662ee7298a1abb48222bc1ea66963405b +Author: wangchunsheng +Date: Wed Jan 23 05:22:55 2013 +0000 + + - remove it. + +commit db6eda867032bd80e634dd1438443e85b83485b0 +Author: wangchunsheng +Date: Wed Jan 23 02:50:40 2013 +0000 + + * adjust the ztcli. + +commit 068f5cba9c6be4d9c08e1dae6997d93ab27ffc1b +Author: wangchunsheng +Date: Wed Jan 23 02:49:28 2013 +0000 + + * change ZenTaoPMS to zentaoPMS. + +commit 3fde66bb888adcd31b22841cc31b5689fa472071 +Author: wangchunsheng +Date: Wed Jan 23 02:47:53 2013 +0000 + + * fix the error of doc table border setting. + +commit 43ab996a8a0c77843e6a1154fa95ea20ade76b03 +Author: zhujinyong +Date: Wed Jan 23 00:49:12 2013 +0000 + + - remove back button. + +commit 04fe67bc6f7e9d63cb71f525ba699c6e4063e367 +Author: zhujinyong +Date: Tue Jan 22 09:18:50 2013 +0000 + + * record time when start or finish. + +commit 357565fc5aab1c7bdc839a4b4a103405b47522d9 +Author: zhujinyong +Date: Tue Jan 22 09:17:03 2013 +0000 + + * check left is 0. + +commit d4fb426dc1851513caa1b15d1346846b23253ffc +Author: zhujinyong +Date: Tue Jan 22 09:15:05 2013 +0000 + + - remove estimate filed. + +commit ff8880fc5cb8d29b192631af197e374e9fdb2e0e +Author: zhujinyong +Date: Tue Jan 22 09:13:18 2013 +0000 + + * open in colorbox. + +commit 77194dad77cac28746ebb550d9797bb476a10a2e +Author: zhujinyong +Date: Tue Jan 22 09:12:10 2013 +0000 + + * move checkLeft to common.js. + +commit acb911e1fa68aa202742620568bdf6707f6da6a5 +Author: zhujinyong +Date: Tue Jan 22 09:11:13 2013 +0000 + + * return to parent. + +commit 9c608f7e56bbadd2d5873560e84d8fbbaf8110ed +Author: zhujinyong +Date: Tue Jan 22 09:08:35 2013 +0000 + + * consumed of task can not be edited. + +commit b30722c4898d2e8fc2f4765540f92b5482276918 +Author: wangchunsheng +Date: Tue Jan 22 07:55:28 2013 +0000 + + * adjust the todo menu in user-todo page. + * sort the data on server side. + +commit b29c436fae1724f170e721f2afcca55fd9922177 +Author: wangchunsheng +Date: Tue Jan 22 07:26:33 2013 +0000 + + * rewrite the todo guider menu in my-todo page. + +commit b9e5cf4861a5c22a25438f4da548b3b8e71eed2a +Author: zhujinyong +Date: Tue Jan 22 06:18:58 2013 +0000 + + * change lang of projectTasks. + +commit ea5881ffef01cc67265b787961f9b51da1021f78 +Author: zhujinyong +Date: Tue Jan 22 06:16:11 2013 +0000 + + * move noProduct projects to bottom. + +commit d006a8f88bb170ebc97ad035f2d01d485a76dcf7 +Author: chencongzhi520@gmail.com +Date: Tue Jan 22 05:57:28 2013 +0000 + + * adjust the export icon for opera browser. + +commit 9823289d2c6ce6afc4303895d3036a73fbd8d071 +Author: zhujinyong +Date: Tue Jan 22 05:48:34 2013 +0000 + + * move 'byProjects' to left bar. + +commit 01f3d287fb5dd1386741783076ed600abe378ad6 +Author: chencongzhi520@gmail.com +Date: Tue Jan 22 05:46:57 2013 +0000 + + * remove it. + +commit 4aaa033b0b7652ba56ad7a2ca5555d99a3da2f3e +Author: chencongzhi520@gmail.com +Date: Tue Jan 22 05:27:42 2013 +0000 + + * adjust the icons. + +commit a29ddf1ec5e91fbd4708cd2aee849e92636e131b +Author: chencongzhi520@gmail.com +Date: Tue Jan 22 05:25:12 2013 +0000 + + * replace icon-doing instead icon-task. + +commit 87c845014464b692141a06b0468a1ca082038e9d +Author: chencongzhi520@gmail.com +Date: Tue Jan 22 05:17:58 2013 +0000 + + * add icons for wbs and batch wbs of project-story. + +commit ddbf5f862ca594d5e978e80ac067ffa291734a94 +Author: zhujinyong +Date: Tue Jan 22 01:09:42 2013 +0000 + + * change tree id to class. + +commit c5f1477d392d8d17380237abc23925baca169382 +Author: zhujinyong +Date: Tue Jan 22 01:06:12 2013 +0000 + + * change tree id to class. + +commit a553410b8eb97780e7a2941de4c847abdd941301 +Author: zhujinyong +Date: Mon Jan 21 09:01:33 2013 +0000 + + * change 'noPrdProjects' to 'noProducts'. + +commit 76d45d54675a3930cb07bb67e68fc3d80ee88b66 +Author: zhujinyong +Date: Mon Jan 21 08:55:46 2013 +0000 + + * move no product projects to bottom. + +commit 890e80a8a0cd702ab4a058a5cfcb116074c4e4db +Author: zhujinyong +Date: Mon Jan 21 08:11:03 2013 +0000 + + * adjust project task. + +commit d6ecb98406fb8a16d0f042067896e657f1a9f7f0 +Author: chencongzhi520@gmail.com +Date: Mon Jan 21 07:19:04 2013 +0000 + + * change the height of task and story chosen. + +commit bce17e95138c408b7a48b142ac7160e3af2b1dee +Author: chencongzhi520@gmail.com +Date: Mon Jan 21 07:18:18 2013 +0000 + + * add class:select-1 for task-edit's module select html. + +commit e1c03dfb23c6ad21540d8868a655fe83ff7e6d9b +Author: chencongzhi520@gmail.com +Date: Mon Jan 21 05:50:07 2013 +0000 + + * replace the /theme instead theme. + +commit 9dfd005b29cc62417500bb020a606cd0e5429c01 +Author: chencongzhi520@gmail.com +Date: Mon Jan 21 05:43:35 2013 +0000 + + * code for task#1072. + +commit 7e72c9e8ee2696cda2b3f3a6f3922a5da5aaeb79 +Author: wangyidong +Date: Mon Jan 21 05:32:40 2013 +0000 + + * fix a bug for record. + +commit 844dc2ae101a016ccbaecdcdf6ff0a367218da6f +Author: wangyidong +Date: Mon Jan 21 05:26:47 2013 +0000 + + * adjust check onlybody. + * adjust task-record. + +commit 89951d540073cbc30e3a6efe540f404d831e0125 +Author: chencongzhi520@gmail.com +Date: Mon Jan 21 02:43:08 2013 +0000 + + * finish task#1072. + +commit d654b08e6697db4e5e58b633a003b3e968219195 +Author: zhujinyong +Date: Mon Jan 21 02:06:26 2013 +0000 + + + add type of project. + +commit fe729868bde4f7fb11e664cef761c868e085fa23 +Author: chencongzhi520@gmail.com +Date: Mon Jan 21 01:59:37 2013 +0000 + + * adjust the task-create icon of project-story. + +commit d60d17e5cfcb1005558aca3335712252767cb822 +Author: chencongzhi520@gmail.com +Date: Mon Jan 21 01:58:41 2013 +0000 + + * adjust my-index. + +commit c83221c5c9e9819e8c1428f098289bd0b344d77c +Author: zhujinyong +Date: Mon Jan 21 01:44:15 2013 +0000 + + * change type of project. + +commit 499273f6d1bc14f22af24b84e2c40c933ab0253e +Author: chencongzhi520@gmail.com +Date: Mon Jan 21 01:22:28 2013 +0000 + + * adjust the icons of my-index. + +commit e70b52feb4489e6664b5b7040a140a987c89df64 +Author: chencongzhi520@gmail.com +Date: Mon Jan 21 01:18:50 2013 +0000 + + * remove the icons: icon-help icon-title icon-notice. + +commit 9ce05a71fc2fa5b3b2ce0b67c10a8738e3f3b7d0 +Author: chencongzhi520@gmail.com +Date: Sun Jan 20 10:09:59 2013 +0000 + + * adjust the size of actions td. + +commit d8aa1c1ea39c98d77d3b667c495222c60fae1a44 +Author: wangchunsheng +Date: Sun Jan 20 10:06:16 2013 +0000 + + * change the warnning error. + +commit 770c1e235b24edd68ab0cfffcac309c6fee1836b +Author: wangchunsheng +Date: Sun Jan 20 09:59:47 2013 +0000 + + * change the title assign method. + +commit fce2b8b9ffd7e140bdab2f4e7681ffe189c47c10 +Author: chencongzhi520@gmail.com +Date: Sun Jan 20 09:59:31 2013 +0000 + + * adjust the popup way of colorbox. + +commit f933c7b13af64f3735b0d45456ec6b7734176f6e +Author: wangchunsheng +Date: Sun Jan 20 09:54:37 2013 +0000 + + * change the title assign method. + +commit 18e0c28ac9fafec277896e1b50cc3b712bd9e0fe +Author: wangchunsheng +Date: Sun Jan 20 09:53:01 2013 +0000 + + * change the title assign method. + +commit 5005685c02edd8eccbce3f03c925df41c041fe33 +Author: wangchunsheng +Date: Sun Jan 20 09:50:41 2013 +0000 + + * change the title assign method. + +commit 73af12ee7756d48b55b7241117863be322878ae2 +Author: wangchunsheng +Date: Sun Jan 20 09:47:51 2013 +0000 + + * change the title assign method. + +commit 7a412bd469af35310928f0176502859066006e87 +Author: chencongzhi520@gmail.com +Date: Sun Jan 20 09:46:09 2013 +0000 + + * adjust the width of actions td. + +commit 18b5cc2f3b134d3faf79682abdcec7cb3168293a +Author: chencongzhi520@gmail.com +Date: Sun Jan 20 09:45:34 2013 +0000 + + * adjust the size of colorbox. + +commit f0a9cad84b92068ce6ab02cb4e85c2bcb00a5916 +Author: wangchunsheng +Date: Sun Jan 20 09:45:26 2013 +0000 + + * change the title assign method. + +commit a7545b786cd5bcfc870be45d98224682b77dc4e4 +Author: chencongzhi520@gmail.com +Date: Sun Jan 20 09:44:32 2013 +0000 + + * fix bug: runCase and results and popup colorbox. + +commit e5db5f813ded42b330f78f8f9b0a1144665a25d0 +Author: wangchunsheng +Date: Sun Jan 20 09:41:11 2013 +0000 + + * change the title assign method. + +commit 7385b064d4324b3ecf0f773c38df22b9f50d6025 +Author: wangchunsheng +Date: Sun Jan 20 09:37:14 2013 +0000 + + * adjust the title assign method. + +commit 82f3efc52610c072866bd8efd990eb9259c9e233 +Author: wangchunsheng +Date: Sun Jan 20 09:34:04 2013 +0000 + + * change the title assign method. + +commit 278eb7aebd18cf56d2e7cc49b70f073c669d96a9 +Author: wangchunsheng +Date: Sun Jan 20 09:32:11 2013 +0000 + + * change the title assign method. + +commit 2605fa9bdccf09569263d2d43fb44db7b2bdd818 +Author: wangchunsheng +Date: Sun Jan 20 09:28:46 2013 +0000 + + * change the title assign method. + +commit 4ce17746895675f5832c531d93a0045392b60dc0 +Author: chencongzhi520@gmail.com +Date: Sun Jan 20 09:27:58 2013 +0000 + + * finish task#823. + +commit c13dd13ce80ff6e5de80b82298f67f64de4bab1b +Author: chencongzhi520@gmail.com +Date: Sun Jan 20 09:25:20 2013 +0000 + + * adjust the icons. + +commit f3bafc949b3ec1e5cc62f9310264dcd381169c30 +Author: chencongzhi520@gmail.com +Date: Sun Jan 20 09:23:06 2013 +0000 + + * adjust icons. + +commit 9a3363fda5da7d5c04440bac2fcf962a780c6c1a +Author: chencongzhi520@gmail.com +Date: Sun Jan 20 09:22:34 2013 +0000 + + * adjust the size of colorbox of customfiled. + +commit 8135f0b5b3f7ab6fdd60bbb5b519ec2e1bfa8052 +Author: wangchunsheng +Date: Sun Jan 20 09:15:24 2013 +0000 + + * change the title assign method. + +commit 0d3b5afe40100defda4b3947e1eb5c42b64d64c9 +Author: wangchunsheng +Date: Sun Jan 20 09:11:48 2013 +0000 + + * change the title assign method. + +commit 61850c11c90cfb880a4f6bea04c522b16d2b9003 +Author: wangchunsheng +Date: Sun Jan 20 09:10:57 2013 +0000 + + * change the title assign method. + +commit ac9db9e5a2ba1b575030574b29c56975c3177c52 +Author: wangchunsheng +Date: Sun Jan 20 09:08:08 2013 +0000 + + * adjust the title assign method. + +commit 9fdf227d5cdcbf98254c3afeeb2c8bb3edd69538 +Author: chencongzhi520@gmail.com +Date: Sun Jan 20 09:00:25 2013 +0000 + + * adjust the icon of project-unlinkmember. + +commit f2fc95a0376ebaefb51b7b67ddb05e411e0e6290 +Author: chencongzhi520@gmail.com +Date: Sun Jan 20 08:57:20 2013 +0000 + + * adjust the icons of project. + +commit 16131676035e1ad3327d651d218988e8113ae95f +Author: wangchunsheng +Date: Sun Jan 20 08:31:51 2013 +0000 + + * change the title assign method. + +commit fb8d55ec279be994ca90c951b1f2509625371d68 +Author: wangchunsheng +Date: Sun Jan 20 08:29:19 2013 +0000 + + - remove the help module. + +commit 4aa7bcab3aab48c3eba90bf95fdcecddbe8f20a9 +Author: wangchunsheng +Date: Sun Jan 20 08:27:55 2013 +0000 + + - remove the help module. + +commit a0d15a199ce6bc6dfb7ea9fd96b56d2ade82fb7f +Author: wangchunsheng +Date: Sun Jan 20 08:11:33 2013 +0000 + + * adjust the title assign method. + +commit bf0ddec7d14a3100c090024baeb9a687d1c65bea +Author: chencongzhi520@gmail.com +Date: Sun Jan 20 07:49:16 2013 +0000 + + * replace table of bug's steps instead div. + * add icon for bug-buildtemplate. + +commit 43b935966c48c91804a167ca351ab98d5dc7fd92 +Author: chencongzhi520@gmail.com +Date: Sun Jan 20 07:47:13 2013 +0000 + + * adjust the border color of file input. + * fix bug: icon-del instead icon-delete. + +commit 0e94f33b30633b6f03edf11e039ca87462650aea +Author: wangchunsheng +Date: Sun Jan 20 07:42:49 2013 +0000 + + * change the title assign method. + +commit 6e7e298359e964e5aab898d16d49db830a95121f +Author: wangchunsheng +Date: Sun Jan 20 07:36:13 2013 +0000 + + * adjust the title assign method. + +commit 4992525323091bde15a5ea032b36471ca29cf54f +Author: wangchunsheng +Date: Sun Jan 20 07:11:36 2013 +0000 + + * adjust the title assign method. + +commit 5d1ad311b5525e94a80a7f816766a29a0fe3e7e4 +Author: wangchunsheng +Date: Sun Jan 20 07:09:42 2013 +0000 + + * adjust the title assign method. + * adjust the dept-browse page. + +commit 8df31557a147582a6fca1608e1561fb9aca89fd0 +Author: wangchunsheng +Date: Sun Jan 20 06:56:13 2013 +0000 + + * change the title assign method. + +commit 2ce3941615b4287f8920e29cbbefe843f7ae5221 +Author: wangchunsheng +Date: Sun Jan 20 06:53:35 2013 +0000 + + * change the title assign method. + +commit 36ba1f2a1de9fd20d1c5ddf9fa5d31ed10d0a71e +Author: wangchunsheng +Date: Sun Jan 20 06:49:06 2013 +0000 + + * adjust the titlte assign method. + +commit 8ed6c922d1802736af7ed2298fb437ce14603e68 +Author: wangchunsheng +Date: Sun Jan 20 06:46:41 2013 +0000 + + * adjust the title assign method. + +commit 0e0887fb5a2db8db4681168fdc08821549b0c3b0 +Author: wangchunsheng +Date: Sun Jan 20 06:38:12 2013 +0000 + + - remove the file icon and title. + +commit a1ed0dee837515099491d8bd264bba675b90634e +Author: wangchunsheng +Date: Sun Jan 20 05:48:34 2013 +0000 + + * fix the error of html::titlte(). + +commit 1fa949ffec0ea1b1da8a63c6fb848d3715acf99e +Author: wangchunsheng +Date: Sun Jan 20 05:46:47 2013 +0000 + + * add the feature of hideAll(). + +commit 0168fb63bf53704f3d9c9ba77ab3343dd5174745 +Author: wangchunsheng +Date: Sun Jan 20 01:36:20 2013 +0000 + + * remove the undelete method to action module. + +commit 0648fe3560365811bce2feabc79ec7de0d7a8609 +Author: zhujinyong +Date: Fri Jan 18 08:50:15 2013 +0000 + + + add close lang. + +commit 240394264fcc4e0d13d8f03a77c5a75104a97cf8 +Author: zhujinyong +Date: Fri Jan 18 08:47:50 2013 +0000 + + * change 'delay' to 'putoff'. + +commit 7ea61a8c294e0ebc7db3c75771899fc60fd75b2d +Author: zhujinyong +Date: Fri Jan 18 08:41:32 2013 +0000 + + * change 'delay' to 'put off'. + +commit e04296deedab65564836be965cde61b2c8682581 +Author: wangchunsheng +Date: Fri Jan 18 08:28:03 2013 +0000 + + * add target param to linkButton() method. + +commit 730f64f4db4f4b539a3b075e470ebab006ec6b0d +Author: zhujinyong +Date: Fri Jan 18 07:52:52 2013 +0000 + + + add new methods. + +commit 6e0513ad624f10fdf7728b29e1f43c7b11f86400 +Author: wangyidong +Date: Fri Jan 18 07:01:06 2013 +0000 + + * refactory the logic: hasPriv then html::a instead common::printLink. + +commit 7d375914e2f0643d5ab14bb9fa9b5da9d6ecb6a5 +Author: zhujinyong +Date: Fri Jan 18 06:16:00 2013 +0000 + + + add report of testtask. + +commit c28c7386c57ccff9507a57083d8f5de4265f2d7c +Author: zhujinyong +Date: Fri Jan 18 06:15:13 2013 +0000 + + * add report of testtask. + +commit ee231c529c845cb052d4e51d42de31bad1fad505 +Author: zhujinyong +Date: Fri Jan 18 05:48:12 2013 +0000 + + * add alias of testtask. + +commit 7323683405896cba3e70850a3c7fa5eae9b1fe6b +Author: zhujinyong +Date: Fri Jan 18 05:43:47 2013 +0000 + + * add actions of testtask. + +commit 5d0b629775222c2d179d660a0ddac92ac37ea553 +Author: wangyidong +Date: Fri Jan 18 05:22:45 2013 +0000 + + * add icons for bug custom page. + +commit 826b549da89bf55545b23d6cc33c02d307f22eb3 +Author: wangchunsheng +Date: Fri Jan 18 05:13:14 2013 +0000 + + * change ZenTaoPMS to zentaoPMS. + +commit 8aa9a4cfb698bada662c87eb48785861a118ecd5 +Author: wangchunsheng +Date: Fri Jan 18 03:31:52 2013 +0000 + + * add report field to create diff. + +commit be062d7850fdf780642b0f5f8be88719d27b6981 +Author: wangyidong +Date: Fri Jan 18 02:59:45 2013 +0000 + + * add icon. + +commit 1661213e2d506321c1fb233f70b26e72ffa610cc +Author: wangchunsheng +Date: Fri Jan 18 02:38:59 2013 +0000 + + * adjust the title assign. + +commit 740e82af5cfc12b0ba53211e7e69dff17e243ec9 +Author: wangyidong +Date: Fri Jan 18 02:31:42 2013 +0000 + + * fix bug: show the max upload size of php setting. + +commit c6066a60e1ceed740f008bfeb2e4f77769e63363 +Author: wangchunsheng +Date: Fri Jan 18 02:30:05 2013 +0000 + + * convert to unix format. + +commit 048dd586ba207a19240e5c91a00f5b0cd906df81 +Author: wangchunsheng +Date: Fri Jan 18 02:24:44 2013 +0000 + + * convert to unix format. + +commit a47628eba53784db811e32ea072b59728f7f7cda +Author: wangchunsheng +Date: Fri Jan 18 02:20:10 2013 +0000 + + - remove uniserver. + +commit 8f0d651d9c1ba63e6995b64898ec522eef30bf5e +Author: wangchunsheng +Date: Fri Jan 18 01:58:14 2013 +0000 + + * convert to unix format. + +commit acf877aeb8c02bd4528ac991f20afd1f5c258482 +Author: wangchunsheng +Date: Fri Jan 18 01:47:42 2013 +0000 + + * adjust the assign view methods. + +commit b54b942703cc4b92031cc7ea6586e2ff35f7fefa +Author: wangyidong +Date: Fri Jan 18 01:45:10 2013 +0000 + + * add icons for doc-create and group-create. + +commit 96177a314c5bb066601d896719d514c675efa6f3 +Author: wangchunsheng +Date: Fri Jan 18 01:42:14 2013 +0000 + + * change $lang->ZenTaoPMS to $lang->zentaopms. + +commit 48d43cb5e1d34f4a16c71e59c765a19fb4f6546b +Author: wangchunsheng +Date: Fri Jan 18 01:18:58 2013 +0000 + + * change copyright time. + +commit 2f3e8f2c70f7169b0028d79ec647bae64993921d +Author: wangyidong +Date: Fri Jan 18 01:07:31 2013 +0000 + + * fix bug: the wrong link of icon. + * adjust the style of page. + * change the url of reload. + +commit 641876898a13e08a5180ca7552fcf70f7da398b7 +Author: wangyidong +Date: Fri Jan 18 00:51:29 2013 +0000 + + * adjust the logic of including footer.html.php. + +commit 0f755938b4167849095bd40e96dad874d08fdea3 +Author: wangyidong +Date: Thu Jan 17 09:50:38 2013 +0000 + + * adjust icon of qa. + +commit 436c2e7bbc4ca29710948869cede771ac01c954c +Author: zhujinyong +Date: Thu Jan 17 08:29:37 2013 +0000 + + * red font if necessary. + +commit 8ed7a0bf957a8f76bccae8c7166e65da704efdfc +Author: wangyidong +Date: Thu Jan 17 08:03:28 2013 +0000 + + * save session condition for browse by needconfirm. + +commit 55fed43318276c25008397c3aee32aa4ebc489bc +Author: wangchunsheng +Date: Thu Jan 17 07:10:46 2013 +0000 + + * move the notify link to common model. + +commit 9e468efa699c6e8adff7ae7a6f8b6274898ec40f +Author: zhujinyong +Date: Thu Jan 17 07:05:53 2013 +0000 + + - remove some links. + +commit 655edbee2008ff358097d327fabc39b79c52e152 +Author: wangyidong +Date: Thu Jan 17 06:52:43 2013 +0000 + + * adjust the icons for my-blockprojects my-blockproducts. + +commit 056f99d27d8f02f9533448b6ac64cf036ca448b0 +Author: wangyidong +Date: Thu Jan 17 06:44:33 2013 +0000 + + * adjust the icons of project views. + * add onlybody params for helper::createLink. + +commit 77fa35b9b802c6e91fc3e1b222806f45959f65f0 +Author: zhujinyong +Date: Thu Jan 17 06:33:15 2013 +0000 + + * adjust style of caption. + +commit b846a00b4eb7c0abb1993364df6359a9bc1e503b +Author: chencongzhi520@gmail.com +Date: Thu Jan 17 06:27:56 2013 +0000 + + * update icons. + +commit cf7f63904eea61c1de371fe52d62e8d3dcb1c26c +Author: wangchunsheng +Date: Thu Jan 17 06:00:36 2013 +0000 + + * rname zset to zget. + +commit c1b0ca3146302be3fe32101590b1e17431605fc4 +Author: zhujinyong +Date: Thu Jan 17 05:48:07 2013 +0000 + + - remove status. + +commit 7e355c1250268f77cac3a8243a1d6f774e646f93 +Author: zhujinyong +Date: Thu Jan 17 05:47:21 2013 +0000 + + * change lang. + +commit 05fbfd3ebaaf82d46cd395f73f4638425938464f +Author: wangyidong +Date: Thu Jan 17 05:38:48 2013 +0000 + + * code for task icons. + +commit 0a521082a54594c7f7e6f90c32512a98cae2ad9b +Author: wangchunsheng +Date: Thu Jan 17 05:38:48 2013 +0000 + + * fix the error of warnning. + +commit 30312e3ba15cd7545581f54828e9376e2c624a01 +Author: wangchunsheng +Date: Thu Jan 17 05:17:54 2013 +0000 + + * fix the error of warnning. + +commit 76d82831a19b9d48c13d237f08b1de08ce717053 +Author: wangyidong +Date: Thu Jan 17 05:17:39 2013 +0000 + + * update webapp image. + +commit 7c8b6fbbd86d7a77a5af53ea102ae33709a796e9 +Author: wangyidong +Date: Thu Jan 17 05:17:02 2013 +0000 + + * replace button instead span. + +commit 36bff9359d65e7866abc6e10db0e6cd8e131cbd6 +Author: wangyidong +Date: Thu Jan 17 05:14:37 2013 +0000 + + * fix bug: wrong chinese lang. + +commit c7b4a27fea5ad2c76709643a42921f8201695964 +Author: zhujinyong +Date: Thu Jan 17 02:54:22 2013 +0000 + + - remove some code. + +commit e22e3a3b7ff2badc22bc33887d02bfb6d92f8764 +Author: zhujinyong +Date: Thu Jan 17 02:51:47 2013 +0000 + + * add actions of product. + +commit bd9b503eba8f541a627898b0a9936d4c8f4b8434 +Author: zhujinyong +Date: Thu Jan 17 02:01:36 2013 +0000 + + * change 'allProject' to 'all'. + +commit 68bdefd3a4856d959d95c8dce4c9da4053086ae2 +Author: zhujinyong +Date: Thu Jan 17 01:57:53 2013 +0000 + + * display all projects default. + +commit afa222432072bba9c6e0d8289daf3015f24945bf +Author: zhujinyong +Date: Thu Jan 17 01:48:41 2013 +0000 + + * display all defaultly. + +commit be1ccca5e5fc757a4ac985f734bf4a89a943ee3b +Author: wangyidong +Date: Thu Jan 17 01:31:59 2013 +0000 + + * adjust the code logic of view page for isClickable function. + +commit c3e3ba6f1321df881b04e958228e2f02360611fb +Author: zhujinyong +Date: Thu Jan 17 01:31:17 2013 +0000 + + + add default status of project. + +commit 984f2987bfb11d138426d06b5b05fd570b8d99a5 +Author: zhujinyong +Date: Thu Jan 17 01:25:46 2013 +0000 + + fix locked time error. + +commit d681e56cacf7cc4d794c2ecbe5df44688f7d36fd +Author: zhujinyong +Date: Thu Jan 17 01:24:01 2013 +0000 + + * adjust status of project. + +commit 98537901a4d1b42370b7411941df82e4025ea65d +Author: zhujinyong +Date: Thu Jan 17 00:54:39 2013 +0000 + + * add alias of edit submenu. + +commit 2d840a6cea9bdff35e532b6be3102949566d831d +Author: zhujinyong +Date: Thu Jan 17 00:48:49 2013 +0000 + + * edit doc library in colorbox. + +commit 731b1a2a30aac782889e470ccee1612ae19abc41 +Author: zhujinyong +Date: Thu Jan 17 00:42:57 2013 +0000 + + * add delayed and suspended actions. + +commit 89008a2442d48d6fdbd8e77cb1c6ef7e956f5e0b +Author: zhujinyong +Date: Thu Jan 17 00:41:43 2013 +0000 + + * exclude suspended project. + +commit d26d99d41330026a5880c913bb53b5184849521e +Author: wangyidong +Date: Wed Jan 16 08:57:04 2013 +0000 + + * adjust the icons of product view. + +commit 033530394407aca47f36afded66ec31c5e0224cf +Author: zhujinyong +Date: Wed Jan 16 08:22:31 2013 +0000 + + * add suspend status. + +commit ecefc7c8e1332657da9c7bc6c3e3249e6ff92c19 +Author: wangyidong +Date: Wed Jan 16 08:11:50 2013 +0000 + + * add link for qq. + +commit 2e343803540efc2fb5f6e4c34533370cbeafd74f +Author: zhujinyong +Date: Wed Jan 16 07:06:53 2013 +0000 + + * add actions of project. + +commit d05c63b9b6e0b6be0e0b20e4711403c64c4ed400 +Author: chencongzhi520@gmail.com +Date: Wed Jan 16 06:18:56 2013 +0000 + + * adjust the icons. + +commit 68e0c85aaaea3e7112961160aab4de44158ac296 +Author: zhujinyong +Date: Wed Jan 16 02:35:13 2013 +0000 + + * add actions of project. + +commit c93ddd5336868578eca6b12c755532ab12e39526 +Author: wangyidong +Date: Wed Jan 16 01:49:31 2013 +0000 + + * adjust for colorbox size. + * fix a bug for click export. + +commit 853e56a2ab5b65ae32a37ec211183baa6ecee12e +Author: zhujinyong +Date: Wed Jan 16 00:21:46 2013 +0000 + + * view todo in colorbox. + +commit bd7b2082f2f53b096cfe195cc730fc6c6693bb10 +Author: zhujinyong +Date: Tue Jan 15 09:11:01 2013 +0000 + + * view todo in colorbox. + +commit d0b404b494aa4ef1e375453e59ff65a382255ccc +Author: zhujinyong +Date: Tue Jan 15 07:11:29 2013 +0000 + + * fix a bug : remove undefined value. + +commit 466af5a135a934c56f2cc02de063ca72a925ac96 +Author: zhujinyong +Date: Tue Jan 15 02:00:29 2013 +0000 + + * fix a bug : change date error in my todo. + +commit 8bacd4094bc4c30de5558842b1eec1d5aee00d98 +Author: zhujinyong +Date: Mon Jan 14 07:42:22 2013 +0000 + + * fix a bug : empty value error. + +commit 2cf0508c409466036b36252fd768ce65933655f7 +Author: zhujinyong +Date: Mon Jan 14 06:38:32 2013 +0000 + + * adjust location of cron log. + +commit b0dca27b2a36330fd4777ed031977770001b8899 +Author: zhujinyong +Date: Mon Jan 14 06:07:29 2013 +0000 + + * code for cron. + +commit e815e1a311330035745a7e1760556ecc12183a2c +Author: zhujinyong +Date: Mon Jan 14 05:50:43 2013 +0000 + + * code for cron. + +commit beda81c1b0fac2743a1ab3b2c9069b5cbff5f9f1 +Author: zhujinyong +Date: Mon Jan 14 03:18:51 2013 +0000 + + * code for cron. + +commit 88c08b455cbc9bd9f6da707b79acf4c355570b65 +Author: zhujinyong +Date: Mon Jan 14 03:15:50 2013 +0000 + + * code for cron. + +commit 6b1194307d79684b9e0152eae0ecb91bcfb118a1 +Author: wangchunsheng +Date: Fri Jan 11 08:21:56 2013 +0000 + + * when manage team, set roles auto. + +commit 8fff23ba16823e1cb28e433eb75d1fbcd496da0c +Author: wangchunsheng +Date: Fri Jan 11 08:17:23 2013 +0000 + + + add lua env. + +commit 7b1b02456246d72a371b6d0740d5ec9e3bf0d526 +Author: wangchunsheng +Date: Fri Jan 11 08:08:15 2013 +0000 + + + add execute attribute. + +commit fa08af85764f844671436c2bf4bcb2c4d59e3832 +Author: zhujinyong +Date: Fri Jan 11 07:53:33 2013 +0000 + + - remove inof.php. + +commit 9a9def578ede23be135c23db655cb666f8fe3394 +Author: zhujinyong +Date: Fri Jan 11 07:49:35 2013 +0000 + + * avoid init class error. + +commit f512689c9dd524bad656b2174a5b4e6814091d9a +Author: zhujinyong +Date: Fri Jan 11 07:16:26 2013 +0000 + + * include config.php instead of my.php. + * init object use stdClass. + +commit 6caa66da382451301408f5541046016ba73ccf93 +Author: wangyidong +Date: Fri Jan 11 06:45:59 2013 +0000 + + * adjust for get config from db. + +commit 4476d1d7acf9ec059606bb70882fc404375cdd60 +Author: zhujinyong +Date: Fri Jan 11 06:26:54 2013 +0000 + + * fix zentao root. + +commit 34c001b00ccbf8722ba4328f5eaa5ece00cba3c4 +Author: zhujinyong +Date: Fri Jan 11 06:25:36 2013 +0000 + + * code for task#1025. + +commit dc200ec395e48ecc9058a2f61e67b40112f9ea1f +Author: zhujinyong +Date: Fri Jan 11 06:15:12 2013 +0000 + + + add crontab class. + +commit 3f612c2af56bf5e6c4d10d8b60e2b58a5cb5e16b +Author: zhujinyong +Date: Fri Jan 11 06:12:13 2013 +0000 + + - remove '/'. + +commit 4565fd0980a2dbac5bf759314f882469dd6f9384 +Author: zhujinyong +Date: Fri Jan 11 05:36:52 2013 +0000 + + + add linux shells. + +commit 71bfcceb8d87289ac824caf5e10e7109cdde54bf +Author: zhujinyong +Date: Fri Jan 11 05:32:54 2013 +0000 + + + add mailExist function. + +commit 05ff202810dc0d9bd290afdae40350f4f9216bf1 +Author: wangyidong +Date: Fri Jan 11 04:08:32 2013 +0000 + + * fix a bug for power. + +commit 92cb1c6b70df0f740af266686976a334c7c93f74 +Author: wangchunsheng +Date: Fri Jan 11 03:12:52 2013 +0000 + + * rewrite the mail setting logic, save config to database. + +commit 1e3adbf41a4736c2d53e244c2c692d08d9831cb1 +Author: wangchunsheng +Date: Fri Jan 11 03:11:44 2013 +0000 + + * fix the error of setItems(). + +commit e7022090153da55b85e64c47501cf72e706a723d +Author: zhujinyong +Date: Fri Jan 11 03:10:30 2013 +0000 + + * fix a bug: webRoot is error. + +commit af83f26ba38577259c6c595a7c8eefa39ebc9814 +Author: zhujinyong +Date: Fri Jan 11 03:08:19 2013 +0000 + + + add getWebRoot function. + +commit 7b63bcbf61e94d178e4d0df686f95478fc5b4f9a +Author: wangyidong +Date: Fri Jan 11 02:04:51 2013 +0000 + + * adjust webapp style. + +commit d52e498017be5df2305f8668e2deeaf4d286a0c4 +Author: wangyidong +Date: Fri Jan 11 01:55:15 2013 +0000 + + * adjust for new set item. + +commit 0a874903e8a41b4cb72195fb15125661e39f7234 +Author: wangchunsheng +Date: Fri Jan 11 01:38:25 2013 +0000 + + * adjust the getItems logic, use in() for all fields. + +commit fc83f4c96300ef422704ca48a0f55e1ebc221e0a +Author: wangchunsheng +Date: Thu Jan 10 15:16:34 2013 +0000 + + + add the function of zset(). + +commit d902ffe6411af8baf47093227340fb2f7156544e +Author: wangchunsheng +Date: Thu Jan 10 15:15:59 2013 +0000 + + * rewrite the code since setting module rewrite. + +commit fd6fddc16a8ab725cd9e0b2a31c018fc7021c35f +Author: wangchunsheng +Date: Thu Jan 10 15:15:10 2013 +0000 + + * fix the error of setItem(). + +commit 2b773f2013420f6f83fe1b97ecaf647ced5e0a09 +Author: wangchunsheng +Date: Thu Jan 10 14:48:46 2013 +0000 + + * rewrite the setting module. + +commit 6dfb0bb5ed6486961e9d69d7414bdbcc4ae70c0d +Author: wangchunsheng +Date: Thu Jan 10 14:43:14 2013 +0000 + + * adjust the menu items. + +commit ce8e4840cd5f316f63087be998d8bc8082475e56 +Author: wangchunsheng +Date: Thu Jan 10 14:41:50 2013 +0000 + + * adjust the var name, the var after foreach should be $key, not order. + +commit ec635056fa93c0dbf151b544fcadd11ebb30724b +Author: wangyidong +Date: Thu Jan 10 08:30:24 2013 +0000 + + * hide toBug link for view case when case is not fail. + +commit 4e9082f59050da40f51713294b86ef034286f7b5 +Author: wangyidong +Date: Thu Jan 10 08:29:14 2013 +0000 + + * fix for link of go back. + +commit 208f6df85783c7121cd86cd59c28bdaf923e9c7f +Author: chencongzhi520@gmail.com +Date: Thu Jan 10 07:19:27 2013 +0000 + + * code for icons. + * remove icon-add1 instead icon-add. + +commit 246203b2812d5f249d4c329cd95e66de914e014d +Author: wangchunsheng +Date: Thu Jan 10 07:16:46 2013 +0000 + + * allways loadConfigFromDB(), even not login. + +commit 51c7dac0faa8c71dd1e4adb327208355e1fb9bbb +Author: chencongzhi520@gmail.com +Date: Thu Jan 10 07:14:21 2013 +0000 + + * code for icons. + * adjust the add-icon. + * change the icon-addProduct instead icon-add. + * change the icon-addProject instead icon-project. + * change the icon-allProduct. + * change the icon-allProject. + +commit a3860ca3673da543e481c44ee88223c809c02da5 +Author: wangyidong +Date: Thu Jan 10 07:13:51 2013 +0000 + + * adjust flow. + +commit 0578c49150da549fd6c258e7dd3f8bcc7361ac4e +Author: wangchunsheng +Date: Thu Jan 10 07:12:20 2013 +0000 + + * adjust code format. + +commit c5f3a5fe3f645ccad3ece62a2479cf4585e250a5 +Author: wangchunsheng +Date: Thu Jan 10 07:10:22 2013 +0000 + + - remove the sn when comapny equal 1. + +commit 6023852e7fae6aa85d1039de0a2fcc89c470bef2 +Author: chencongzhi520@gmail.com +Date: Thu Jan 10 06:49:30 2013 +0000 + + * revert the button-search css. + +commit 7f7d11d2c8704083d77992d398bc67cfab0edcd9 +Author: chencongzhi520@gmail.com +Date: Thu Jan 10 06:42:39 2013 +0000 + + * code for icons. + * adjust the icons of my-index. + +commit 3eff65eeb00f4582a7ffe41d37be393755d41b15 +Author: chencongzhi520@gmail.com +Date: Thu Jan 10 06:26:41 2013 +0000 + + * code for icons. + * add icon for unlock a user. + +commit 461e311fd6043ac8bdd384147f05207dabd66e9f +Author: wangyidong +Date: Thu Jan 10 06:18:45 2013 +0000 + + * adjust for highlight. + +commit 3e30398b9cf08d26480d0b89d197539ac181517a +Author: wangyidong +Date: Thu Jan 10 06:03:32 2013 +0000 + + * fix a bug for can not copy module in bug and case. + +commit b7e07963102e0967dc742448bb4d81ea53075e52 +Author: wangchunsheng +Date: Thu Jan 10 05:37:10 2013 +0000 + + * adjust the records of zt_config table. + +commit c8498e86d0d16f0e055625d152e33c35682d7c66 +Author: wangchunsheng +Date: Thu Jan 10 05:09:59 2013 +0000 + + * adjust the logic of sn and demoUser. + +commit fed918ab7972cafa6b005e163ffb07a619c21426 +Author: wangyidong +Date: Thu Jan 10 03:28:05 2013 +0000 + + * adjust hide selectAll button when no cases. + +commit 247cdf8616ff987005be5219bed21168ac69d5c4 +Author: wangyidong +Date: Thu Jan 10 03:05:51 2013 +0000 + + * adjust the page of bug. + +commit 80743e0d62caa5d03c6456d53aef11ac22410d88 +Author: chencongzhi520@gmail.com +Date: Thu Jan 10 02:53:59 2013 +0000 + + * adjust the rule that get the css sprite. + +commit abc51784ce5f55754b9410af694694b0177443ff +Author: wangyidong +Date: Thu Jan 10 02:27:35 2013 +0000 + + * adjust include ext config. + +commit b45de1cd468be52464ac726c2064aab0beb6b007 +Author: wangyidong +Date: Thu Jan 10 02:24:38 2013 +0000 + + * fix a bug for create config object. + +commit 06e8e9b2f961976c60f6b1588f9619fc3962f01f +Author: zhujinyong +Date: Thu Jan 10 02:08:22 2013 +0000 + + * format. + +commit ec17e09341fc7d371e091bc41b290d426f95d8a0 +Author: wangchunsheng +Date: Thu Jan 10 01:11:49 2013 +0000 + + * fix the error of warning under 5.4. + +commit 8b8b3eddb9579fcc5b449c2f50f61b39ed3ebc68 +Author: zhujinyong +Date: Thu Jan 10 01:07:19 2013 +0000 + + * code for task#1091. + +commit 6bb73aa24fb3a2be3d54645662b2199310bcc10d +Author: zhujinyong +Date: Wed Jan 9 08:20:32 2013 +0000 + + * fix a bug : datepicker error when edit project. + +commit 7f884f56e5d77abc40346b3d13dc6b51a8d04265 +Author: wangyidong +Date: Wed Jan 9 08:15:00 2013 +0000 + + * add $config->objectTables['testcase'] = TABLE_CASE; + +commit 8a043173fbe7a81e0d4626e2af801e67fc2f48c3 +Author: zhujinyong +Date: Wed Jan 9 08:14:31 2013 +0000 + + * code for task#1024. + +commit 21a9c67de7074c3af1e448a653f7bd3035bafc8f +Author: wangyidong +Date: Wed Jan 9 07:53:02 2013 +0000 + + * code for task#1046. + +commit 67ca479090d4496d4d19d4b1b1d0dd4f6a39afca +Author: wangyidong +Date: Wed Jan 9 07:50:38 2013 +0000 + + * adjust the page link of click save button. + * goto productplan-view instead productplan-browse. + +commit 1a806aaa58f4360e3ed518e7f058ad66b4ae9f11 +Author: wangyidong +Date: Wed Jan 9 07:11:18 2013 +0000 + + * remove the post value: delta. + +commit 95920353626c2113d4b0257bc885c3332e9ffe6e +Author: wangyidong +Date: Wed Jan 9 06:46:21 2013 +0000 + + * adjust the setComment method for firefox. + +commit 5b45e00639e457745a20fab8ecc628856f56ac83 +Author: zhujinyong +Date: Wed Jan 9 06:39:56 2013 +0000 + + * adjust license. + +commit ae9da000b1cdbecd71599cd47a1c1ed2c20c7681 +Author: zhujinyong +Date: Wed Jan 9 06:35:02 2013 +0000 + + * code for task#1030. + +commit 0951df0cbd23228bdcd74c32b9ebd012f87d1a8a +Author: zhujinyong +Date: Wed Jan 9 06:33:44 2013 +0000 + + * code for task#1030. + +commit cc02b2ef8d171dcc2b916240a48c06e3e540b266 +Author: wangyidong +Date: Wed Jan 9 06:14:10 2013 +0000 + + * adjust the lang define of max size of upload. + +commit 323a00b4f01a8a589f69e67569f9ecac24a4719e +Author: wangyidong +Date: Wed Jan 9 05:59:42 2013 +0000 + + * fix a bug for no init value. + +commit ebf524c7e53e252705622a3eff02f4b39f0d7162 +Author: zhujinyong +Date: Wed Jan 9 05:56:57 2013 +0000 + + * change left and consumed field. + +commit 04266928b2df9c94c507f933bf6e523cf504f540 +Author: wangyidong +Date: Wed Jan 9 05:30:57 2013 +0000 + + * adjust trush to reload. + +commit ddae04422bc9c98a0bae9ae5fb282b1bdf3e3aef +Author: wangchunsheng +Date: Wed Jan 9 05:28:47 2013 +0000 + + * adjust the footer.html.php. + +commit 0cb29714fddeaf9d64e4a573d8278295582c9f91 +Author: wangyidong +Date: Wed Jan 9 05:26:08 2013 +0000 + + * fix a bug for select talbe by module. + +commit 6842cbc41f336d890f3aa3035844d064a7575584 +Author: wangyidong +Date: Wed Jan 9 04:22:56 2013 +0000 + + * change colorbox flow to my module. + * adjust export checked item. + +commit dd765793c2870aaaf5fbfc97b49513328c64ae7e +Author: zhujinyong +Date: Wed Jan 9 03:21:29 2013 +0000 + + * code for task#1030. + +commit 4ca79b465e4e5f2b6117fbde321a71febc8ae312 +Author: wangchunsheng +Date: Wed Jan 9 03:16:48 2013 +0000 + + * adjust footer.html.php. + +commit 5d44a35bfc5084f459f161361584b6fade5bb67f +Author: wangyidong +Date: Wed Jan 9 03:09:42 2013 +0000 + + * change setpath.sh for set ztcli.sh. + +commit 647a422fdc7b5034e3274eca6463b257f31d62e6 +Author: wangchunsheng +Date: Wed Jan 9 03:08:27 2013 +0000 + + * adjust the code. + +commit 2ebd814ed2517148dbdd4f7079c1c32f1bc2d5b3 +Author: wangyidong +Date: Wed Jan 9 03:06:52 2013 +0000 + + * change setpath for bat and shell. + +commit bfd459d4e913247bff7c12c88a3621856081259f +Author: wangchunsheng +Date: Wed Jan 9 03:03:27 2013 +0000 + + * fix the error of varname. + +commit 33a6cf0aac2b782373068991cbcf6f890096d2f6 +Author: zhujinyong +Date: Wed Jan 9 02:55:06 2013 +0000 + + * fix a bug in createChanges. + +commit ef2c4cb87b26ab3c75549c751aabd1222c55c5d6 +Author: wangchunsheng +Date: Wed Jan 9 02:35:07 2013 +0000 + + * change the js::set for placeholders. + +commit 7e10192cbf1d6b307125eb0b408f08ee8c9e5bb0 +Author: wangchunsheng +Date: Wed Jan 9 02:33:04 2013 +0000 + + * change the taskestimate instead taskEstimate. + +commit 206285ba70068974b3a19bd219f218b818b9f856 +Author: wangchunsheng +Date: Wed Jan 9 02:17:42 2013 +0000 + + * use js::set() to rewrite the js var setting. + * adjust the privew code. + +commit 66960dc27351534c084e926af649576d0c6aff31 +Author: wangchunsheng +Date: Wed Jan 9 02:15:03 2013 +0000 + + * add type param to js::set() method. + +commit 2eb5ef9b74a57480833e6e27ef3ad4c42193e183 +Author: wangchunsheng +Date: Wed Jan 9 01:08:30 2013 +0000 + + * fix the error of warning under php5.4. + +commit 4cef8e0281ade9be98a64b8b7b4b2689393b6094 +Author: wangchunsheng +Date: Wed Jan 9 01:06:49 2013 +0000 + + * merge checkDemoData.php to check.php. + +commit 5355b7715fa44d4a1560fab665369122b5a1009c +Author: wangchunsheng +Date: Wed Jan 9 00:47:38 2013 +0000 + + * rename it to setpath. + +commit 2acce5a4861e3a26136c8bf07764ab444737bd02 +Author: zhujinyong +Date: Tue Jan 8 09:02:32 2013 +0000 + + * change date. + +commit 24fb9a6236ab955098efa2773c2357eca42c36ed +Author: zhujinyong +Date: Tue Jan 8 08:37:17 2013 +0000 + + * change estimate to left. + +commit 8ea3c3b1db703fa6ee9e278729f1fb7968285d1e +Author: wangyidong +Date: Tue Jan 8 08:03:02 2013 +0000 + + * refactory. + * mv objectTables to config/config.php from action/config.php. + +commit 848f20cd1fac2192d9979a056c29846982eda0c1 +Author: wangyidong +Date: Tue Jan 8 08:00:36 2013 +0000 + + * refactory action-trash. + +commit 9d9de72cf646baaa69c7ef0efcab73ebc3bedfa5 +Author: zhujinyong +Date: Tue Jan 8 07:13:54 2013 +0000 + + * change table task_estimate. + +commit a70e90d4586a032d6c5349d6a77e34178953e37d +Author: zhujinyong +Date: Tue Jan 8 07:06:19 2013 +0000 + + * code for task#1037. + +commit 3f41b340a01233d8750eeec8be5e1bf7af1351a4 +Author: wangyidong +Date: Tue Jan 8 05:39:51 2013 +0000 + + * refactory action-trash. + +commit f5b2bec05a38c1455a57471fb679481bfe45619e +Author: wangyidong +Date: Tue Jan 8 05:38:35 2013 +0000 + + * fix for guest login. + +commit 64ca57031f8c64898a4ca1e62642a570ad4682ba +Author: wangchunsheng +Date: Tue Jan 8 05:36:29 2013 +0000 + + - delete getbugs.bat and todo.bat. + * move changepath.bat to setpath.bat. + +commit 7bdec4db76bed8063cad7c98cff4f050442d4fa7 +Author: wangchunsheng +Date: Tue Jan 8 05:33:48 2013 +0000 + + + add execute propset. + +commit 53ae669b53cd6e408facfa32fb3a50786fec80f5 +Author: wangchunsheng +Date: Tue Jan 8 05:26:04 2013 +0000 + + * move ztcli to bin directory. + +commit a2ae7a0d938008d16b481e57d1cc0204960c2689 +Author: zhujinyong +Date: Tue Jan 8 03:23:54 2013 +0000 + + + add role content. + +commit fe76401e29fcfadb03d278ea4527cc68a4471311 +Author: wangchunsheng +Date: Tue Jan 8 03:04:29 2013 +0000 + + * move ztcli* to bin/ + +commit 474c4f6bd7bbeeab1b9dc747f1d662d48428bacf +Author: wangchunsheng +Date: Tue Jan 8 02:59:39 2013 +0000 + + * change the errror porting level. + +commit 996ba7889a2aacfb6bdee603cb6b8410d3bb05ae +Author: zhujinyong +Date: Tue Jan 8 02:30:59 2013 +0000 + + - remove group and role. + +commit 6da59d199a399ee64a0bb08fada4f996ab8c58e7 +Author: wangchunsheng +Date: Tue Jan 8 01:46:27 2013 +0000 + + * adjust the backup.php. + +commit 6ab362aa75b3ea6b666aea09c26d8d92b46e5647 +Author: wangchunsheng +Date: Tue Jan 8 01:08:13 2013 +0000 + + * move these build tools to build directory. + +commit ba02584ae15e64dd75ce6eb11b0c3dc3bc61ddc8 +Author: wangchunsheng +Date: Tue Jan 8 01:00:44 2013 +0000 + + - remove them. + +commit 210e7a2216d51088fd4e1d90f8524031d3749a28 +Author: wangchunsheng +Date: Tue Jan 8 00:53:17 2013 +0000 + + - remove build.php + * move getbugs and todo to api. + +commit 2dd1aa2f2d5e29acfaa6eecb1a7d375b70d70ec3 +Author: wangyidong +Date: Mon Jan 7 08:39:27 2013 +0000 + + * finish task #1059. + +commit 34cc9568780da37db0b91484237b8186da26686f +Author: zhujinyong +Date: Mon Jan 7 07:00:20 2013 +0000 + + * remove first letter of account. + +commit 8c7ae82f2ee60208c38b6af35992c22bbb3b97f2 +Author: zhujinyong +Date: Mon Jan 7 06:55:03 2013 +0000 + + * fix a bug : display user link. + +commit 5176f5d77f6b541776dcaa11f06e11fc19d70d89 +Author: zhujinyong +Date: Mon Jan 7 05:50:18 2013 +0000 + + + add date class. + +commit 11a6ba063bebd1ede011ad990603818718e6554a +Author: zhujinyong +Date: Mon Jan 7 05:34:34 2013 +0000 + + * code for task#1066. + +commit e0fef0c0a6668a07af166ceb6f696629eb81f310 +Author: zhujinyong +Date: Mon Jan 7 03:34:48 2013 +0000 + + * need not dates. + +commit 833f89610d64ac2afb7808a5c90f76fbc3391beb +Author: wangyidong +Date: Mon Jan 7 03:16:43 2013 +0000 + + * fix a bug for group byModule. + +commit ed79e818629c17e582edd7e5cecde892664cfcb5 +Author: zhujinyong +Date: Mon Jan 7 03:14:14 2013 +0000 + + - rm date module. + +commit d9807f865c99ec23706ab127d940fb084ab54e81 +Author: wangyidong +Date: Mon Jan 7 02:18:35 2013 +0000 + + * finish task #1042. + +commit 3d28cac4ad2e4d70d8204529a00ad4af2084e039 +Author: zhujinyong +Date: Mon Jan 7 01:41:50 2013 +0000 + + * code for task#1056. + +commit d282e93c252e692afb44605fcb4ce2ff6660aa56 +Author: zhujinyong +Date: Mon Jan 7 01:31:25 2013 +0000 + + * code for task#1056. + +commit c6c37a65e0e566fb05fb2cdced234b8ef8269b7f +Author: zhujinyong +Date: Mon Jan 7 01:28:48 2013 +0000 + + * code for task#1056. + +commit dda32ab8717fde6634aa703564aca7ba97a4b29e +Author: zhujinyong +Date: Mon Jan 7 01:23:28 2013 +0000 + + * code for task#1056. + +commit 7d925e3693365bde863e2a97569647d281a749c9 +Author: zhujinyong +Date: Mon Jan 7 01:21:37 2013 +0000 + + * code for task#1056. + +commit 6e67f0cf8b9af0214d229c1a385a0d6d0797bd86 +Author: zhujinyong +Date: Mon Jan 7 01:15:24 2013 +0000 + + * code for task#1056. + +commit c475af16a277f12249fbb63df64faa78d8a42a54 +Author: zhujinyong +Date: Mon Jan 7 01:08:54 2013 +0000 + + * code for task #1056. + +commit 3094d440470db2b6253ab04d883bc7d6ff3015cb +Author: zhujinyong +Date: Mon Jan 7 01:07:14 2013 +0000 + + * code for task#1056. + +commit eff243f6299ea488b8d6e973d8699d4415adbadc +Author: zhujinyong +Date: Mon Jan 7 01:02:35 2013 +0000 + + * code for task#1056. + +commit fd08ff4a4d085c44b2064a5d60d3e4c0d00548c9 +Author: zhujinyong +Date: Mon Jan 7 00:59:53 2013 +0000 + + * code for task#1056. + +commit 8630b224c069975b9451ca7d0cc9b7409d742bb7 +Author: zhujinyong +Date: Mon Jan 7 00:54:48 2013 +0000 + + * code for task#1056. + +commit 41b7f69c7962017e958241c05a32f1cb0c9a49dd +Author: zhujinyong +Date: Mon Jan 7 00:51:52 2013 +0000 + + * code for task#1056. + +commit 5af8b54dd620c055330e5e6f98f6c45862bb7036 +Author: zhujinyong +Date: Mon Jan 7 00:43:37 2013 +0000 + + * code for task#1056. + +commit 1cfc9b220defe9d9ca47e74af61ef76f5dcdb1b9 +Author: zhujinyong +Date: Mon Jan 7 00:41:04 2013 +0000 + + * code for task#1056. + +commit c5611b701626198d2acadf9818c80c8495ce31ad +Author: zhujinyong +Date: Sun Jan 6 08:37:34 2013 +0000 + + * code for task#1057. + +commit b6da64af0ea4c972e45e00d92aa07f3bc41e6f04 +Author: zhujinyong +Date: Sun Jan 6 08:12:41 2013 +0000 + + * code for task#1066. + +commit 0c1b21dd4d238e95c1952c616e854964bc9fb9f6 +Author: wangyidong +Date: Sun Jan 6 07:09:21 2013 +0000 + + * adjust for task #1045. + +commit 8c80183c28e8d73c828a9d3a51b05ac6724502df +Author: wangyidong +Date: Sun Jan 6 05:34:21 2013 +0000 + + * finish task #1062. + +commit 36318acbfae30546749d578f035bb8ed1f0c385a +Author: zhujinyong +Date: Sun Jan 6 05:24:44 2013 +0000 + + * code for task#1043. + +commit 3f8c141dd4cae5bd57c5b78e37847dc2a529a23f +Author: zhujinyong +Date: Sun Jan 6 05:19:00 2013 +0000 + + * code for task#1043. + +commit 7454437d5e1ac17cc387fa46d11e7c1f70beb2de +Author: zhujinyong +Date: Sun Jan 6 03:34:12 2013 +0000 + + * code for task#1043. + +commit 35ffa07dce4eea68d798b49fad037fb98cf47d23 +Author: zhujinyong +Date: Sun Jan 6 03:18:40 2013 +0000 + + * code for task#1043. + +commit f5259d3ec0bf016ee525bf84791b4f1aeed1e4d5 +Author: zhujinyong +Date: Sun Jan 6 03:11:16 2013 +0000 + + * code for task#1043. + +commit 4f23bc92db5980005259cb07ae0b635fe5fe4102 +Author: zhujinyong +Date: Sun Jan 6 03:03:10 2013 +0000 + + * code for task#1043. + +commit 3b9ede6473e7998ab91d8cc80fd20e89b919f6c2 +Author: zhujinyong +Date: Sun Jan 6 02:44:52 2013 +0000 + + * code for task#1043. + +commit b073f1f57f576e6a85eca61e78328d3e12b00759 +Author: zhujinyong +Date: Sun Jan 6 02:43:45 2013 +0000 + + * code for task#1043. + +commit 3d0dffd995d4c8aaa749b8f5e7ace6c43714b3d4 +Author: zhujinyong +Date: Sun Jan 6 02:03:30 2013 +0000 + + * code for task#1043. + +commit 0a7bad1defefb906cb0d8476bd967d7c486c0813 +Author: zhujinyong +Date: Sun Jan 6 01:57:35 2013 +0000 + + * code for task#1043. + +commit 8ac9e393dd70c6fe501b1093868b1f393acd197a +Author: zhujinyong +Date: Sat Jan 5 08:33:20 2013 +0000 + + * code for task#1055. + +commit b3b63c506382cdca7418478ff6b3c109d3e4af27 +Author: chencongzhi520@gmail.com +Date: Sat Jan 5 07:24:29 2013 +0000 + + * finish task#1070. + +commit 17d4f9069c501fb630ee01bb8d925856df394f3a +Author: zhujinyong +Date: Sat Jan 5 07:17:17 2013 +0000 + + * code for task#1029. + +commit 672a462453726df520ef17701116cb8ce6f7c979 +Author: chencongzhi520@gmail.com +Date: Sat Jan 5 06:51:43 2013 +0000 + + * finish task#1046. + +commit 1a94f54b267048a6d36212670c4d330dbde1ffe9 +Author: zhujinyong +Date: Sat Jan 5 06:19:43 2013 +0000 + + * code for task#1029. + +commit fa7c8ad84600f666ea0b91d95af2ecc1e77ed400 +Author: zhujinyong +Date: Sat Jan 5 05:51:16 2013 +0000 + + + add role field. + +commit 35bf23cac2ef2c5a6a5d5a0948388619a27e506c +Author: zhujinyong +Date: Sat Jan 5 03:16:38 2013 +0000 + + * code for task#1060. + +commit 8feafd6fbb9bb4d0cf82e5d19c436df6f83bc7aa +Author: chencongzhi520@gmail.com +Date: Sat Jan 5 02:42:06 2013 +0000 + + * finish task#1038. + +commit d1d0b901e45ba9728b59102ac511f822089286d5 +Author: zhujinyong +Date: Sat Jan 5 02:36:54 2013 +0000 + + * code for task #1031. + +commit c3fd3b8c47f261b5436d98775b07e1ccfe83f4ee +Author: chencongzhi520@gmail.com +Date: Sat Jan 5 02:04:58 2013 +0000 + + * finish task#1063. + +commit b1cccb035a8d989da1d4ac1002ee6376e6ee7c1a +Author: zhujinyong +Date: Sat Jan 5 01:52:09 2013 +0000 + + * code for task#1052. + +commit 73609e2512221db577a040418a5be4cea6dd3fe9 +Author: chencongzhi520@gmail.com +Date: Sat Jan 5 00:55:15 2013 +0000 + + * finish task#1053. + +commit 6a5180863ecef66c8d43f49122ff7f8da50e736f +Author: chencongzhi520@gmail.com +Date: Sat Jan 5 00:49:08 2013 +0000 + + * finish task#1032. + +commit 160a702965c58f468ef74d277991cf6a4561d95f +Author: zhujinyong +Date: Fri Jan 4 08:46:14 2013 +0000 + + * finish task#897. + +commit 10ef9328d2faece273889cc1a04a3af6d3c63071 +Author: zhujinyong +Date: Fri Jan 4 07:58:45 2013 +0000 + + * code for task#1025. + +commit 587cb3a918e68ef5eab28cbe1e492e29b9b023ea +Author: chencongzhi520@gmail.com +Date: Fri Jan 4 07:52:39 2013 +0000 + + * finish task#1023. + +commit 42bce933a8a7b445e921a6a727df0954eb478c82 +Author: wangyidong +Date: Fri Jan 4 07:47:18 2013 +0000 + + * finish task #1069. + +commit 143c902e8b2692d7a8b80eb987c98284f5e2f7c9 +Author: wangyidong +Date: Fri Jan 4 07:13:49 2013 +0000 + + * finish task #1050. + +commit f922a8a2fd8ce4217bdaef1f62d878d9b842e2b4 +Author: chencongzhi520@gmail.com +Date: Fri Jan 4 07:03:07 2013 +0000 + + * finish task#1061. + +commit 26f2ccb1d53a1173d2b7da0cac225b3935e33104 +Author: wangyidong +Date: Fri Jan 4 06:58:38 2013 +0000 + + * finish task #1040. + +commit a1b6828dc2a9c62b71582360f1824c76880d6cf7 +Author: chencongzhi520@gmail.com +Date: Fri Jan 4 06:45:27 2013 +0000 + + * finish task#1065. + +commit 24b86134082f5fcc3be209e21c2ccfec887f40e5 +Author: wangyidong +Date: Fri Jan 4 05:56:30 2013 +0000 + + * finish task #1034. + +commit 2cf8710a16f50eee3110347f2a870ebf37848c94 +Author: chencongzhi520@gmail.com +Date: Fri Jan 4 05:31:44 2013 +0000 + + * finish task#1036. + +commit f00b31cd5940df0e5c0c52a44f31880ab75adad2 +Author: chencongzhi520@gmail.com +Date: Sat Dec 29 02:13:09 2012 +0000 + + * adjust the isOpenMethod method. + +commit 92a4e7f6127d000487876483815690081e76a904 +Author: chencongzhi520@gmail.com +Date: Sat Dec 29 02:00:09 2012 +0000 + + * open the auth of downNofity method. + +commit 819f94f54c007b2cf0fab273004f28664ac17a91 +Author: wangyidong +Date: Fri Dec 28 03:39:51 2012 +0000 + + * fix some bugs. + +commit d5ea39e03f8d939fc542753f78547e706d29b0c4 +Author: zhujinyong +Date: Fri Dec 28 03:26:42 2012 +0000 + + * fix a bug : if the project of task is closed, project is not list. + +commit e9535c219bb1253db90a6af6ce699be33df9cb77 +Author: wangyidong +Date: Thu Dec 27 01:27:35 2012 +0000 + + * fix a bug for module of doc. + +commit bb6a211100ded7980ae3c2e256596b3de7f1f74f +Author: wangyidong +Date: Wed Dec 26 08:02:28 2012 +0000 + + * fix a bug for init variable. + +commit c32c7acd690a3601f9c8d1940c6d087c69dd229e +Author: wangyidong +Date: Wed Dec 26 06:27:20 2012 +0000 + + * fix a bug for preAndNext. + +commit 121bbb81dc597927cacabf0050756b7dfe0d382c +Author: zhujinyong +Date: Wed Dec 26 06:00:00 2012 +0000 + + * fix a bug : word error. + +commit 785f7baa469704ab7de1a66bb7755d5057dabc7f +Author: wangyidong +Date: Tue Dec 25 07:25:18 2012 +0000 + + * rename for compute burn. + +commit 7c2b36a0b244647ac9daa2e83b9fba4b7fbd5d1c +Author: wangchunsheng +Date: Tue Dec 25 06:44:32 2012 +0000 + + * change die to return. + +commit 4410853c5edd015538e02dc0baadce77a69dd275 +Author: wangchunsheng +Date: Tue Dec 25 06:44:02 2012 +0000 + + * adjust the padding of mainmenu. + +commit 6615f026e05794d94937eda4aea1759ac5a73fb9 +Author: wangchunsheng +Date: Tue Dec 25 06:43:23 2012 +0000 + + * set debug to true. + +commit 5d89a0f75135593b9b85f52da978e3b451bb1393 +Author: wangchunsheng +Date: Tue Dec 25 06:42:39 2012 +0000 + + * revert the including of colorize.html.php. + +commit 88b170dd5da37368c2c747ed9a4fe35737642d38 +Author: zhujinyong +Date: Tue Dec 25 03:31:08 2012 +0000 + + * guest user has no priv of ajax functions. + +commit 1f96375f2121d1d7b9897f4e9ddb10d44202a7b2 +Author: wangchunsheng +Date: Tue Dec 25 02:49:07 2012 +0000 + + * adjust code format. + +commit 5881a8050dba31be341cd468c0ce0c7199cb4bc0 +Author: wangchunsheng +Date: Tue Dec 25 02:26:14 2012 +0000 + + * rename computeburn.bat. + * adjust the notice. + +commit c6ddb8dcdba392bd21db4626bf3b2542e7a41899 +Author: wangyidong +Date: Tue Dec 25 02:08:58 2012 +0000 + + * change for win to unix. + +commit de267d6d8dd411ac1cec3ec069221c33bed35c49 +Author: wangyidong +Date: Tue Dec 25 01:36:06 2012 +0000 + + * fix a bug for short tags. + +commit 4cc60dc51fd6c19102d959d55bb6d460cf4687eb +Author: zhujinyong +Date: Tue Dec 25 01:18:05 2012 +0000 + + * fix a bug: get preAndNexObject error. + +commit f1bb2bb4e15c0fa5980c80a36422ee91cc6d2370 +Author: wangchunsheng +Date: Tue Dec 25 01:17:29 2012 +0000 + + * add change log since 3.3. + +commit f174a220cd0b0f153ca50878342feb5f1c424dd3 +Author: zhujinyong +Date: Tue Dec 25 01:12:20 2012 +0000 + + * finish task#1002. + +commit 354b2cce045462230e58e7b9e34a003aea51776c +Author: wangyidong +Date: Tue Dec 25 01:09:51 2012 +0000 + + * fix a bug for upgrade. + +commit d28a555b831c0c6bef8527d49c118d76d44a02a9 +Author: wangchunsheng +Date: Tue Dec 25 01:06:31 2012 +0000 + + * fix the warnning error. + +commit d4797d951eb5d5e422d8c897f85e83c1124403c2 +Author: wangyidong +Date: Tue Dec 25 00:56:04 2012 +0000 + + * change for zh-tw for user. + +commit d768ae5471c5bb4d00bd173a68549603e0cfbebb +Author: wangchunsheng +Date: Mon Dec 24 10:17:18 2012 +0000 + + * convert zh-tw language. + +commit b494d305ec9e6a1c1687d55e68fd47fe8ce95757 +Author: wangchunsheng +Date: Mon Dec 24 10:16:44 2012 +0000 + + + add contact actions to group-resource. + +commit 2425918f3464424750e01c66c5a69c3b7f556bd5 +Author: wangchunsheng +Date: Mon Dec 24 10:06:50 2012 +0000 + + + add contact list feature to story, task and bug. + +commit abbcc2a5cada3116abefb4b1e45e5a75a40749f8 +Author: wangyidong +Date: Mon Dec 24 09:12:25 2012 +0000 + + * fix for check zentao errors. + +commit 88bf2ed394a344297971732759c028d2841d307d +Author: wangchunsheng +Date: Mon Dec 24 08:55:41 2012 +0000 + + + add the feature to manage user contacts. + +commit 24cc7f43e3c430cb899231de07cab648c0261fcc +Author: wangyidong +Date: Mon Dec 24 08:53:55 2012 +0000 + + * change for notify.zip. + +commit 6e992a3a9f3559f11f6b52c0cda1d211c2450d82 +Author: wangyidong +Date: Mon Dec 24 08:16:22 2012 +0000 + + * adjust style for user. + +commit 78e5c03bdf18efe58140b68c05f3b936d3ae22cf +Author: zhujinyong +Date: Mon Dec 24 07:20:10 2012 +0000 + + * finish task#1008. + +commit d34475224481f8f5dc917ac695da172bb7fb729b +Author: wangyidong +Date: Mon Dec 24 07:17:19 2012 +0000 + + * change for new priv. + +commit 6c13c990740e1432c290469c5ad5fa55a51025c1 +Author: wangyidong +Date: Mon Dec 24 06:45:36 2012 +0000 + + * adjust demo.sql for 4.0.beta2. + +commit ff1bd9352fef421c08d6ee3d05c2383b3c33ab9a +Author: wangyidong +Date: Mon Dec 24 06:24:54 2012 +0000 + + * change for group name . + +commit ed656ec09e53dc6ecc758e15120b57a1972d692a +Author: zhujinyong +Date: Mon Dec 24 03:34:59 2012 +0000 + + * fix a bug : if param is date default, dynamic date error. + +commit 7f0bf4140ebb96d10b1574d9fa1ae13511f32bfa +Author: zhujinyong +Date: Mon Dec 24 03:16:45 2012 +0000 + + * change date sort. + +commit 08f86b68f9a20f2399052d5708b1860f66b37e3a +Author: wangyidong +Date: Mon Dec 24 01:38:11 2012 +0000 + + * fix style for show action in firefox browser. + +commit bc59ffa8f1b284666ef2847bee096669803fe24a +Author: wangyidong +Date: Mon Dec 24 01:30:08 2012 +0000 + + * fix style for action. + +commit 5f7282aa6a8bb9ec88204738d4ac86bb02131f02 +Author: wangchunsheng +Date: Mon Dec 24 01:01:12 2012 +0000 + + * adjust user list order. + +commit 27dbf21c0b86e72a062aad058348a7d5d04c7bcd +Author: zhujinyong +Date: Mon Dec 24 00:53:01 2012 +0000 + + * finish task#1007. + +commit 229d651476bbd3d7526ad0138287b0fc0b4510c0 +Author: zhujinyong +Date: Mon Dec 24 00:50:43 2012 +0000 + + * finish task #1011. + +commit 934a7ba29335832723b10462287029bb6f492adc +Author: chencongzhi520@gmail.com +Date: Fri Dec 21 07:38:31 2012 +0000 + + * fix bug#169. + +commit a73e19a55877c97a96ee27e645f4d850c1fb2e7f +Author: wangyidong +Date: Fri Dec 21 06:31:31 2012 +0000 + + * ajdust webapp style for task #972. + +commit 5d807f93250f2a3c88fdee7b3e2b918d73a70e63 +Author: chencongzhi520@gmail.com +Date: Fri Dec 21 06:26:07 2012 +0000 + + * refatory the search page. + * code for task#953. + +commit 67014fc6b76be37bf03a33d2d8dff72805e72a87 +Author: chencongzhi520@gmail.com +Date: Fri Dec 21 06:09:46 2012 +0000 + + * code for bug#360. + +commit df2f22fcd6921975e4e6ff5f7f6ea09f55c84280 +Author: chencongzhi520@gmail.com +Date: Fri Dec 21 05:55:51 2012 +0000 + + * fix bug#360. + +commit 0c5b8888ad4552c12fade2fa3538a591bd72797b +Author: chencongzhi520@gmail.com +Date: Fri Dec 21 02:37:37 2012 +0000 + + * code for task#980. + +commit b071b1d9628c2ca9a0bcc56ce9ec6efa4f66c50e +Author: chencongzhi520@gmail.com +Date: Fri Dec 21 02:26:55 2012 +0000 + + * code for task#962. + +commit cd4915729d1c99fd867db7c75454f73ad9d79d38 +Author: wangyidong +Date: Thu Dec 20 08:00:07 2012 +0000 + + * adjust style. + +commit 7c69fc9b5a2add25592a43e9becd3766c349240c +Author: zhujinyong +Date: Thu Dec 20 07:49:45 2012 +0000 + + * finish task#1006. + +commit 09f045fd69152edd22643264526871a9306dda49 +Author: zhujinyong +Date: Thu Dec 20 06:16:19 2012 +0000 + + * finish task#996. + +commit 84e60732d39c1d7f2fdc9da58f272c34292a7ed7 +Author: zhujinyong +Date: Thu Dec 20 05:49:15 2012 +0000 + + * finish task#997. + +commit d56cfd1da6087f328cc812f642cd9ecde88b3a34 +Author: wangyidong +Date: Wed Dec 19 10:08:20 2012 +0000 + + * finish task #983. + +commit 12d1bce624aa7d92298f63bd332df6455814fbc0 +Author: zhujinyong +Date: Wed Dec 19 08:29:23 2012 +0000 + + * code for task#386. + +commit 27c8372f87ad43b64b087e8bdc9948b422e1f771 +Author: wangyidong +Date: Wed Dec 19 08:16:17 2012 +0000 + + * change for order by data in server. + +commit 93d1eba0f8b82be39bb3c4679db753c9b1a9714f +Author: zhujinyong +Date: Wed Dec 19 08:05:30 2012 +0000 + + * finish task #994. + +commit c0bddae8819644d50fdf982a3837f6f0b29535c4 +Author: wangyidong +Date: Wed Dec 19 07:50:54 2012 +0000 + + * add for batch edit user. + +commit 73a332d847bf274e55a1a9436255467973206b03 +Author: zhujinyong +Date: Wed Dec 19 07:29:46 2012 +0000 + + * fix bug#992. + +commit a8f8a6e09bcfee3cc6cca048332dd99b175f85e8 +Author: zhujinyong +Date: Wed Dec 19 06:31:07 2012 +0000 + + * fix bug#388. + +commit ec216f73b7454e86e6ddd4ec5e96631253eebbde +Author: wangyidong +Date: Wed Dec 19 05:41:11 2012 +0000 + + * finish task #961. + +commit b3a162c98a558391e3727e24d1e05ca952f4e340 +Author: zhujinyong +Date: Wed Dec 19 03:20:14 2012 +0000 + + * fix a bug : display title. + +commit 421e3e9578f8aa41da50720f7f3b677e5cf79ff9 +Author: zhujinyong +Date: Wed Dec 19 03:18:34 2012 +0000 + + * fix a bug : display title. + +commit 69467ac85b6c010d004880f56b173babec1e8ed0 +Author: zhujinyong +Date: Wed Dec 19 02:39:20 2012 +0000 + + * code for task #951. + +commit d333ca1698b8357885e3169f0a16c9196ac0ee42 +Author: zhujinyong +Date: Wed Dec 19 02:35:03 2012 +0000 + + * code for task#951. + +commit c2e912af0a1d7693fcbcde255d98564987db7035 +Author: zhujinyong +Date: Wed Dec 19 02:33:31 2012 +0000 + + * code for task#951. + +commit 01d58609fdfe6967ef13fb99fb50ddd951179a76 +Author: chencongzhi520@gmail.com +Date: Wed Dec 19 01:05:15 2012 +0000 + + * fix bug: testcase can't batch edit. + +commit cc409aaff9e816fa8c03fe3ab7d1b8c6424eb479 +Author: wangchunsheng +Date: Tue Dec 18 12:37:39 2012 +0000 + + * when create testtask, place qa users at first. + +commit 21d3dad18a5d16a5ebb9816c7f0c51105ddc789d +Author: wangchunsheng +Date: Tue Dec 18 12:30:35 2012 +0000 + + * fix the error of warnnin. + +commit e9f357731b81885b6ab6ffa68a6f49bae4ea1ac8 +Author: wangchunsheng +Date: Tue Dec 18 12:28:45 2012 +0000 + + * when first load, make sure dev users at first. + * when a project selected, make sure members of this project at first. + +commit 9a4993d97db99460fbe3468e712608011395b7ba +Author: wangchunsheng +Date: Tue Dec 18 12:26:29 2012 +0000 + + * adjust code foramt. + +commit 12a6c8fc3a9f11d8ee1120294618a3fb169544c9 +Author: wangchunsheng +Date: Tue Dec 18 12:23:18 2012 +0000 + + * fix the error when create kindeditor. + +commit 8e574ffc3b962c0580b69779d76c8d141b875fa7 +Author: zhujinyong +Date: Tue Dec 18 07:50:48 2012 +0000 + + * code for task #951. + +commit f26c417d64b78f599a547d35792e9b503bd3e180 +Author: zhujinyong +Date: Tue Dec 18 07:47:20 2012 +0000 + + * code for task#951. + +commit 28b9f8de227bd1300a51c1511d041e14b54052c3 +Author: zhujinyong +Date: Tue Dec 18 07:46:26 2012 +0000 + + * code for task#951. + * add time for date. + +commit 4667dfb16321d0edd6ddba241151bdee534d87b2 +Author: zhujinyong +Date: Tue Dec 18 07:41:23 2012 +0000 + + * code for task #951. + +commit 83c6c5dfd2bdd93387d3f1bc7c1b95685f93ff6e +Author: wangyidong +Date: Tue Dec 18 03:05:26 2012 +0000 + + * change for upgrade to 4.0.beta2. + +commit 0dbce5cb8f9a85d23afaeb04ec80c90f7e9a63c6 +Author: chencongzhi520@gmail.com +Date: Tue Dec 18 00:42:32 2012 +0000 + + * code for task#947. + +commit e6f2057f4dba23f4da78d5f00f49a32312aa827d +Author: wangchunsheng +Date: Mon Dec 17 10:26:50 2012 +0000 + + * when manage a team, can select one project to copy. + * adjust the edit page. + +commit 711938a9dd44c024b7d70d4ca1229d9eca45ea03 +Author: wangchunsheng +Date: Mon Dec 17 10:21:31 2012 +0000 + + * adjust the getUserPairs() param. + +commit 280fe761f5c8ee318db83cdb3a154be1ff7c6798 +Author: chencongzhi520@gmail.com +Date: Mon Dec 17 09:06:33 2012 +0000 + + * code for task#957. + +commit 1a4b28ca77249422965d43c688e31e80065f0cdc +Author: wangchunsheng +Date: Mon Dec 17 08:14:18 2012 +0000 + + * change burndownchart to burndown. + +commit 9d73e6dfdd0a6a22d865084882f4a33ce17da473 +Author: wangchunsheng +Date: Mon Dec 17 08:01:34 2012 +0000 + + * adjust the menu of company and admin module. + +commit d65b6c8625d00e5fa590214e95707d51ded2994b +Author: wangyidong +Date: Mon Dec 17 07:40:00 2012 +0000 + + * adjust for task #925. + +commit 1cdd994dc0bb239259c87bea5e45cc7ea2d1e1f4 +Author: chencongzhi520@gmail.com +Date: Mon Dec 17 07:34:31 2012 +0000 + + * remove class file instead zfile. + +commit 658e7af2270fda5fd3557b7bb63430b3ac8e7c9b +Author: wangchunsheng +Date: Mon Dec 17 07:15:34 2012 +0000 + + * change QM to QD, RM to RD. + +commit 6bba4db67f4a509b90598249e4e293955f81e40a +Author: wangchunsheng +Date: Mon Dec 17 07:14:42 2012 +0000 + + * change RM to RD, QM to QD. + +commit 3523642713eaf7b88a9511ee411fa52f22a00d04 +Author: wangchunsheng +Date: Mon Dec 17 07:11:59 2012 +0000 + + * change QM to QD. + +commit 3f7260fb8b8fc0ca5aa1c193cfc537510b02155d +Author: wangchunsheng +Date: Mon Dec 17 07:09:42 2012 +0000 + + + add pdfirst and qdfirst. + +commit 318b9f450c741341bcb5cc04b6c758106266ac57 +Author: wangchunsheng +Date: Mon Dec 17 07:08:53 2012 +0000 + + * change QM to QD. + +commit 10524d52df77c20c575136ba3fe9de3e9d0b06b0 +Author: wangchunsheng +Date: Mon Dec 17 07:06:29 2012 +0000 + + * revert the RM field and rename it to RD. + +commit ecad94a7de28a46cdca7c3a692ac74efdc071677 +Author: wangchunsheng +Date: Mon Dec 17 06:09:31 2012 +0000 + + * adjust the project-view page. + +commit 335c8e515994907e768899d2b4d73c0215cc96e1 +Author: wangyidong +Date: Mon Dec 17 02:59:04 2012 +0000 + + * finish task #938. + +commit 8129d176110c2502cb97d2f8fe13301d578bdf3a +Author: chencongzhi520@gmail.com +Date: Mon Dec 17 01:40:06 2012 +0000 + + * rename 'testtask' instead 'testTask'. + +commit 45a948c2afce67504276f043c30fcd637f5cb3a9 +Author: wangyidong +Date: Mon Dec 17 01:25:52 2012 +0000 + + * adjust line color for burn. + +commit 15ea157a2ca94fc150a32a8000e0be53cfa4ecbd +Author: zhujinyong +Date: Mon Dec 17 01:19:18 2012 +0000 + + * code for task #949. + +commit 1ce56970e9317a650b7af1c1c986015eb12254df +Author: zhujinyong +Date: Mon Dec 17 01:16:30 2012 +0000 + + * code for task#949. + +commit ef97b1c24886da52702f249301f356d97ca964a7 +Author: wangchunsheng +Date: Mon Dec 17 01:11:40 2012 +0000 + + * change QM to QD. + * adjust the view page of product. + * set productList session when browse all products. + +commit 6376670b55a952aac9f95a260d6004f7c39d6d1d +Author: zhujinyong +Date: Mon Dec 17 01:03:11 2012 +0000 + + * code for task #949. + +commit dd4fc9f01f0f808fb1560fba8030d0b21e3547eb +Author: zhujinyong +Date: Mon Dec 17 01:01:05 2012 +0000 + + * code for task#949. + +commit 4e8a6151bffe3dd810ed6cf6ee693f7f708f6dd1 +Author: wangchunsheng +Date: Sun Dec 16 03:17:47 2012 +0000 + + * task#980, add more roles. + +commit ff0fbc2a3eb3bf60ee97833fbf697f78bb9a8a43 +Author: wangchunsheng +Date: Sun Dec 16 03:12:29 2012 +0000 + + * task#980, add more roles. + +commit 4129e897d41721c19640fbe53bcb60eb0203198b +Author: wangchunsheng +Date: Sun Dec 16 03:11:14 2012 +0000 + + * task#980, add more roles. + +commit cae5417f1851ccc8f17620dac3d3ea7380346286 +Author: wangchunsheng +Date: Sun Dec 16 03:09:58 2012 +0000 + + * when check, avoid the ajax methods. + +commit c9bb6bc9f000347f9e2aeaabfe5e3a93e4918141 +Author: wangchunsheng +Date: Sun Dec 16 01:46:51 2012 +0000 + + * task#980, when change and edit a story, place product owners at first. + +commit 04d5809cfeb4b8554b899b6148c3b2dd80ae767a +Author: wangchunsheng +Date: Sat Dec 15 13:20:52 2012 +0000 + + * task#980, when create story, sort the po at the first. + +commit f833a8a6069851b36c7b8cb6e8fa77c36cc25999 +Author: wangchunsheng +Date: Sat Dec 15 06:01:34 2012 +0000 + + - remove the colorbox code for all projects and all products. + +commit a2720b5fe074c7b0c4e95a1f35c59bdd52bf2d01 +Author: wangchunsheng +Date: Sat Dec 15 01:34:09 2012 +0000 + + * adjust the all projects page. + +commit dc0a46bb3abca4c25d36adeb2088a8cef63d142d +Author: wangchunsheng +Date: Sat Dec 15 01:14:50 2012 +0000 + + * adjust the display style of product's projects page and all products page. + +commit 1148b028c3c6377f6afd4750db7608310e61a828 +Author: wangchunsheng +Date: Sat Dec 15 01:01:55 2012 +0000 + + * adjust the save button of tree-browse page. + +commit a815c6eee46af47d686b477636c9be0e1aa63454 +Author: wangchunsheng +Date: Sat Dec 15 00:34:24 2012 +0000 + + * adjust code format. + +commit 613d7d72b7e63c95b242be0c272b943120ea4cd2 +Author: zhujinyong +Date: Fri Dec 14 07:46:43 2012 +0000 + + * code for task#949. + +commit 7d5fa4f494959ca6636505b65f0241c44dc9a170 +Author: zhujinyong +Date: Fri Dec 14 07:34:27 2012 +0000 + + * code for task#949. + +commit 653b19791287368cbd011efdfaa1e38ebd9cc5a5 +Author: wangyidong +Date: Fri Dec 14 07:34:07 2012 +0000 + + + finish task #939. + +commit d0041a5abbe95fb9dbbcb7fb8014124c57b66c54 +Author: wangyidong +Date: Fri Dec 14 05:53:35 2012 +0000 + + * finish task #963. + +commit 152b5921b2dff6699bc188fb99c270ada52d63fe +Author: zhujinyong +Date: Fri Dec 14 03:14:56 2012 +0000 + + * code for task#949. + +commit e3f0659ea74d3b74071ffbe77c5cad7ff5d7f599 +Author: wangchunsheng +Date: Thu Dec 13 08:44:08 2012 +0000 + + * adjust menu items. + * adjust menu order according to the user's role. + +commit e04956fb65bde4c2177216796c3cc971ac739112 +Author: wangyidong +Date: Thu Dec 13 08:25:33 2012 +0000 + + * fix a bug for search in link story. + +commit 76200fb6335ad911b28824c38057e14ad8a1bff1 +Author: wangyidong +Date: Thu Dec 13 08:24:11 2012 +0000 + + * recall right code. + +commit 7f1652b1b23bf4680b33599d984f9242b9b7e4ca +Author: wangyidong +Date: Thu Dec 13 08:07:07 2012 +0000 + + * adjust for ajax get search form. + +commit 78e6472bb750eb0d0bfd8f54758970a56da1d035 +Author: wangyidong +Date: Thu Dec 13 06:34:30 2012 +0000 + + * finish task #971. + +commit 7b06b0811a7315f9ce4f6a88ff2422725f763a37 +Author: zhujinyong +Date: Thu Dec 13 06:13:02 2012 +0000 + + * code for task#936. + +commit 1d1da6da8f0c0a5ca220a98d33b88ee916b5a922 +Author: wangchunsheng +Date: Thu Dec 13 05:27:14 2012 +0000 + + * task#980, add role field to user table. + +commit 582bba412d0b7716fade2206ef8a31509add96ad +Author: wangchunsheng +Date: Thu Dec 13 05:11:34 2012 +0000 + + - delete user-view.html.php because locate to todo page. + +commit 45c4e3c0f88609125c8c4d21653c53521c204ead +Author: zhujinyong +Date: Thu Dec 13 03:22:48 2012 +0000 + + - remove this code. + +commit 4777d6a239c7a0ab93a84203148701715756524e +Author: zhujinyong +Date: Thu Dec 13 03:21:12 2012 +0000 + + * code for task#964. + +commit 185338c26d92bc17ff8b3e68f1ff513c29f2ed46 +Author: zhujinyong +Date: Thu Dec 13 03:09:10 2012 +0000 + + * code for task#964. + +commit 5f8ca55c0857dfedfc1758e8c5dc35221da5aedb +Author: zhujinyong +Date: Thu Dec 13 03:05:09 2012 +0000 + + * code for task#926. + +commit 54f0be49c20ba270ec61c22561ea8e556b13b373 +Author: zhujinyong +Date: Thu Dec 13 02:45:52 2012 +0000 + + * code for task#926. + +commit 66c1ad00380df7607b1253b66330d616b24a5cde +Author: wangyidong +Date: Thu Dec 13 02:27:58 2012 +0000 + + * adust for task #928. + +commit 94e3c1bbb2c8e6b92ed86802e1736f44907bb541 +Author: zhujinyong +Date: Wed Dec 12 09:30:52 2012 +0000 + + - remove redundant code. + +commit 272897c2944a9c489ef52eef7002f4d4c77e0731 +Author: wangchunsheng +Date: Wed Dec 12 09:16:41 2012 +0000 + + * task#982, mail module. + +commit a1d94879333507e0eac081eb874c76aab01879a3 +Author: wangyidong +Date: Wed Dec 12 07:33:06 2012 +0000 + + * finish task #976. + +commit 7f7d61426f38cbe233fa45d46e6c993ff4f8c988 +Author: wangchunsheng +Date: Wed Dec 12 07:26:19 2012 +0000 + + * task#982, editor module. + +commit 21dccf09943dcbb162cf1d03b56c4503690b5a1a +Author: wangchunsheng +Date: Wed Dec 12 06:47:54 2012 +0000 + + * task#982, misc module. + +commit dc4346cdfd739dc84b7204d85ad22e07c6d6cf75 +Author: wangchunsheng +Date: Wed Dec 12 06:47:28 2012 +0000 + + * task#982, fix the warning for report model. + +commit 7fc12a026878dfb10c0782c2e5d6d0c9b3cf36b7 +Author: wangchunsheng +Date: Wed Dec 12 06:46:01 2012 +0000 + + * task#982. + +commit 4dd49e4479b0dcf9744670efae74f713fd4583e9 +Author: wangchunsheng +Date: Wed Dec 12 06:43:42 2012 +0000 + + * if not defined $config->$moduleName, init it auto. + +commit b993ad7ac1d74a641a8f82742d392dd60e49679e +Author: zhujinyong +Date: Wed Dec 12 03:24:41 2012 +0000 + + * code for task#973. + +commit c7b06ce453755b9734b61429de0a885dfaf58d8e +Author: zhujinyong +Date: Wed Dec 12 03:08:03 2012 +0000 + + * add pri of testtask. + +commit 17d432f6d5ac3cefa63ecd585ef7c065f4bd775c +Author: wangyidong +Date: Wed Dec 12 03:07:36 2012 +0000 + + * finish task #821. + +commit 0f963343f621e52b2f00544ef3893c879f5f2a43 +Author: wangchunsheng +Date: Wed Dec 12 02:18:16 2012 +0000 + + * task#982. + +commit e9f11a3287f51f48fe66195538f25d3dc37ef420 +Author: zhujinyong +Date: Wed Dec 12 01:40:52 2012 +0000 + + * code for task #981. + +commit 9823320500411bcf3b21be434a54cda3ff80919a +Author: zhujinyong +Date: Wed Dec 12 01:40:19 2012 +0000 + + * code for task#981. + +commit bbe7892dbcbce405ab630f5c3547fd62e4d0ba9e +Author: zhujinyong +Date: Wed Dec 12 01:37:26 2012 +0000 + + * code for task#981. + +commit 1bb978909ddc8536c4bb13cd12015ed7f9be6c7a +Author: zhujinyong +Date: Wed Dec 12 00:44:35 2012 +0000 + + * code for task#981. + +commit ef70f537e597d0be94bdabc9e81d9c869b97091a +Author: wangyidong +Date: Tue Dec 11 08:40:52 2012 +0000 + + * finish task #970. + +commit 6030b6218e14edbc0e121b8cba0cf90fa32db879 +Author: wangyidong +Date: Tue Dec 11 08:33:24 2012 +0000 + + * finish task #965. + +commit de7ae1f6e32afe00c7fb5c331deaaf3d76e19a6a +Author: wangyidong +Date: Tue Dec 11 08:28:42 2012 +0000 + + * change for task #925. + +commit e718c395375d30b63280af2e04b3c8e1a67c4d14 +Author: wangyidong +Date: Tue Dec 11 07:54:15 2012 +0000 + + * adjust judge decode. + +commit f68b25550993fe1d61ac4f4e839a22f9b83d4c36 +Author: wangyidong +Date: Tue Dec 11 07:40:07 2012 +0000 + + * finish task #962. + +commit 32ff8ff4a6aeaeadcbf2b47c0250e958a0594fde +Author: zhujinyong +Date: Tue Dec 11 07:39:36 2012 +0000 + + * code for task#978. + +commit 50bb37bd3151cb87e6783f46fe1b67d62d72fb40 +Author: zhujinyong +Date: Tue Dec 11 07:23:16 2012 +0000 + + * code for task#978. + +commit 60ef357beca7a6737ee46ae48103ee98b60fbb55 +Author: zhujinyong +Date: Tue Dec 11 07:21:54 2012 +0000 + + * code for task#978. + +commit 506f9bc72f4492d0d96185ea8b7c0f7e587be04c +Author: wangchunsheng +Date: Tue Dec 11 07:02:10 2012 +0000 + + * task#982, company module. + +commit 3dd8e2b550581855bad993e6bb10df57716f87ac +Author: wangchunsheng +Date: Tue Dec 11 07:00:57 2012 +0000 + + * task#982, common model. + +commit 3145632e61fff17ab07c232a4e7118dba06ce085 +Author: wangchunsheng +Date: Tue Dec 11 06:58:28 2012 +0000 + + * task#982, task module. + +commit 743507cd50a17c917d8ccec1da9aecd58fdb53a3 +Author: wangchunsheng +Date: Tue Dec 11 06:24:12 2012 +0000 + + * task#982, project module. + +commit 45f2955136ea63819ccadacd3b2c0c05c307abad +Author: wangchunsheng +Date: Tue Dec 11 06:05:36 2012 +0000 + + * task#982, my module. + +commit 97117ded147bf6242cfb66ffbf5dd04dbde4abf1 +Author: wangchunsheng +Date: Tue Dec 11 05:59:06 2012 +0000 + + * task#982, action mdoule. + +commit ca6cb09270a38d3fe5d464f1e43c349693cf61cd +Author: wangchunsheng +Date: Tue Dec 11 05:51:16 2012 +0000 + + * task#982, todo module. + +commit 489eeffde855966d2b2bc135b33300a4277f6076 +Author: zhujinyong +Date: Tue Dec 11 05:43:45 2012 +0000 + + * code for task#968. + +commit 8ea6eb39ea8714e801b17f2b9d2fb7af2a84d912 +Author: zhujinyong +Date: Tue Dec 11 05:41:33 2012 +0000 + + * code for task#968. + +commit 58fe311258cf31b02971b010398d0aa185b21c07 +Author: wangyidong +Date: Tue Dec 11 05:13:40 2012 +0000 + + * finish task #984. + +commit b592eecd68a21b563a4a8c63a9876d7517c9aa46 +Author: wangyidong +Date: Tue Dec 11 03:32:37 2012 +0000 + + * finish task #985. + +commit 1a95b47c7ac718da3442328cf6c138431ed2931a +Author: wangyidong +Date: Tue Dec 11 02:17:46 2012 +0000 + + * finish task #960. + +commit aaac1ec99864a88d79e458d7c1c96a2b23a18715 +Author: zhujinyong +Date: Tue Dec 11 02:09:36 2012 +0000 + + * display realname instead of account. + +commit 48e7be67658522013d232ab4113d7330a18df69c +Author: zhujinyong +Date: Tue Dec 11 01:43:46 2012 +0000 + + * finish task#958. + +commit 3c04a1671ce944eb60aec46c826c7cf0c36b113e +Author: wangyidong +Date: Tue Dec 11 01:14:57 2012 +0000 + + * finish task #959. + +commit 53101768d9af58655436a02caafac7b967dc9295 +Author: wangyidong +Date: Tue Dec 11 00:26:50 2012 +0000 + + * finish task #967. + +commit 575eadc0739a8d3c1afdd885f8048081816483a8 +Author: wangyidong +Date: Mon Dec 10 09:02:11 2012 +0000 + + * finish task #953. + +commit 1252eb0fc40260352090034b9b3b78d70a1bf7e1 +Author: wangchunsheng +Date: Mon Dec 10 08:41:09 2012 +0000 + + * task#982, admin module. + +commit e84eb450d03d404ef18702d15aba39ff87850fad +Author: wangchunsheng +Date: Mon Dec 10 08:40:13 2012 +0000 + + * task#982, install module. + +commit 7e9fb8335c87300f6d2164e0031389cacc23aa74 +Author: wangchunsheng +Date: Mon Dec 10 08:39:16 2012 +0000 + + * task#982, control.class.php + +commit a523fe8d3f18b35f68f4b4833e0445d7b8637e41 +Author: wangchunsheng +Date: Mon Dec 10 08:38:23 2012 +0000 + + * task#982, front.class.php + +commit fc501eca9eb71eb3bee05ccc542237fedb5622a6 +Author: chencongzhi520@gmail.com +Date: Mon Dec 10 08:28:49 2012 +0000 + + * code for task#933. + * move todoBatchEdit for open source version to pro version. + +commit 52279e1cb4497ed56e64a7d3f7c64ea9301c5660 +Author: wangchunsheng +Date: Mon Dec 10 08:21:12 2012 +0000 + + * adjust code format. + +commit 4e7f6e5f819196f6d1d2e08525b7dab331c3a5a6 +Author: wangchunsheng +Date: Mon Dec 10 08:20:09 2012 +0000 + + * task#982, user module. + +commit a9fb847163a30b9cbe96761b7a07b6172ab58807 +Author: wangchunsheng +Date: Mon Dec 10 08:16:26 2012 +0000 + + * adjust the check.php. + +commit b9f4899214af34ca3e70e05b684d5ee1ed28a819 +Author: wangchunsheng +Date: Mon Dec 10 08:15:28 2012 +0000 + + * task#982, control.class.php. + +commit 4c971aeeec0be54799739fdd0e3e3a99fda5146f +Author: wangchunsheng +Date: Mon Dec 10 08:13:40 2012 +0000 + + * task#982, common module. + +commit a00647131ee1cb3e153e1043059ce5275ed6be86 +Author: chencongzhi520@gmail.com +Date: Mon Dec 10 07:54:11 2012 +0000 + + * code for task#933. + * move storyBatchEdit from open source version to pro version. + +commit 354eed2ec9c0b50bf1807fde1337c6f6c38d598b +Author: wangchunsheng +Date: Mon Dec 10 07:53:54 2012 +0000 + + * task#982, install module. + +commit a6e0c1bcffc19ae821899b3c85c6b348ec710e37 +Author: chencongzhi520@gmail.com +Date: Mon Dec 10 07:18:58 2012 +0000 + + * code for task#933. + * move caseBatchEdit for open source version to pro version. + +commit 6d2ba0712bce2e4003e8b92f153275b62cdec105 +Author: chencongzhi520@gmail.com +Date: Mon Dec 10 06:59:00 2012 +0000 + + * code for task#933. + +commit ec22ffa252ab56b1c5f755ac71d3291674ec6208 +Author: chencongzhi520@gmail.com +Date: Mon Dec 10 06:38:45 2012 +0000 + + * code for task#933. + * move bugBatchEdit for openSource version to pro version. + +commit 91c38f01e221ee8a594e50093c4b8bf5bebbb8c6 +Author: zhujinyong +Date: Mon Dec 10 06:08:53 2012 +0000 + + * finish task#955. + +commit 6f0cf77d472d9eb01ee6e793f1f2fbf662eb9ca5 +Author: wangyidong +Date: Fri Dec 7 01:11:24 2012 +0000 + + * fix a bug for sql annotation. + +commit edf9c7eac88afa47767312ec9dd26b8298a21836 +Author: wangyidong +Date: Wed Dec 5 06:21:11 2012 +0000 + + + add win to unix sql. + +commit 66cb7ee3d35f146c99c18c50e44bde17ba2b270a +Author: zhujinyong +Date: Wed Dec 5 06:01:30 2012 +0000 + + * correct a word. + +commit 46c5ef0ff02ac0dbf92a4c39581888a23fa13842 +Author: zhujinyong +Date: Wed Dec 5 01:59:33 2012 +0000 + + * fix bug#364. + +commit fb3f376a68c0560cdd4232329ec5a8c1d212c015 +Author: zhujinyong +Date: Wed Dec 5 01:58:17 2012 +0000 + + * adjust style for ie6, ie7. + +commit fece3b826508d3cc304e49f11ab81a87c70b2ad6 +Author: wangyidong +Date: Wed Dec 5 01:23:53 2012 +0000 + + * add company column for webapp table. + +commit 83efbed6f54c080314923b28b2d7a658fb08c9f9 +Author: zhujinyong +Date: Wed Dec 5 00:41:28 2012 +0000 + + * fix bug#371. + +commit af5b62a922e81f0e0a00651ebab68bd2203bec29 +Author: zhujinyong +Date: Wed Dec 5 00:39:40 2012 +0000 + + * fix bug#371. + +commit 891c1065ce4e666507d2af2dbd8fba8a103f8fd3 +Author: zhujinyong +Date: Wed Dec 5 00:38:33 2012 +0000 + + * fix bug #371. + +commit e900722d234c2074f9242812fe22984101db7e5e +Author: zhujinyong +Date: Wed Dec 5 00:37:07 2012 +0000 + + * fix bug#371. + +commit 399f5cbe76484cf80c688fa5a2946bf0a0978715 +Author: zhujinyong +Date: Tue Dec 4 08:18:58 2012 +0000 + + * fix bug #375. + +commit 8624379f6f4e4ede8d4a1babe87f859929f4f74a +Author: zhujinyong +Date: Tue Dec 4 07:35:27 2012 +0000 + + * fix bug #375. + +commit 9087f1b6ca15ebd84333f6159f4e875ade6f9cc0 +Author: wangyidong +Date: Tue Dec 4 05:32:18 2012 +0000 + + * add two dll file for apache in xampp. + +commit 5065ba7ef5216e63930eb304cd16d69c5fb1cb4e +Author: zhujinyong +Date: Tue Dec 4 01:58:47 2012 +0000 + + * fix bug #359. + +commit 920db9783e2002d39065ded48e33e998fc14cb6c +Author: zhujinyong +Date: Mon Dec 3 08:00:04 2012 +0000 + + * fix bug#366. + +commit d9ce269db4269f181668f0797b4cb3e9e6b78848 +Author: zhujinyong +Date: Mon Dec 3 07:17:08 2012 +0000 + + * fix bug #370. + +commit a9d4474b7b22d854e0afd7f41e3e468debb962df +Author: zhujinyong +Date: Mon Dec 3 05:43:12 2012 +0000 + + * fix bug #373. + +commit 41010ad0114249ddf2781e8977db13a1f95345f7 +Author: zhujinyong +Date: Mon Dec 3 05:22:48 2012 +0000 + + * fix bug#374. + +commit daed2afae748dc680478757c4e6df5064c4dd85c +Author: zhujinyong +Date: Mon Dec 3 02:46:58 2012 +0000 + + * fix a bug #378. + +commit ac8324d66e38af7953817aa7c08c97b94a05e401 +Author: wangyidong +Date: Mon Dec 3 02:32:13 2012 +0000 + + - remove useless code. + +commit 42325b0d3a15b967a54280a1543dc570883606cf +Author: zhujinyong +Date: Mon Dec 3 02:15:42 2012 +0000 + + * fix bug#380. + +commit 980a1ebbde75a98e5d4b9fc9493e0c752ab094ed +Author: wangyidong +Date: Mon Dec 3 01:45:42 2012 +0000 + + * fix a bug for sql file. + +commit f9b9e92e0bf7880905c40e88ab68ff07730321eb +Author: wangyidong +Date: Mon Dec 3 01:25:07 2012 +0000 + + * change zentao.sql. + +commit a65c1c249ee5f84ffa1ce505ea7b2d83482df974 +Author: wangyidong +Date: Sun Dec 2 11:05:14 2012 +0000 + + * change for zh-tw lang file. + +commit a5140d41aae6a81497c47d8417ccacff2e3609a8 +Author: zhujinyong +Date: Sun Dec 2 10:59:36 2012 +0000 + + + add priv check of batch create users. + +commit be7fe4eff7d468398873b7e0be833848b52c2237 +Author: wangchunsheng +Date: Sun Dec 2 10:41:38 2012 +0000 + + * hightlight the doc menu when view, create or edit a doc. + +commit 52da19034723fb75347797722f1476cd6679b0d6 +Author: wangyidong +Date: Sun Dec 2 10:41:43 2012 +0000 + + * set action read column to 1. + +commit 9c30cf55c8d40707f029cf662135feb6445f2302 +Author: wangchunsheng +Date: Sun Dec 2 10:39:13 2012 +0000 + + * adjust the table id. + +commit e3e41ca8ba0a6b1829536d69b6ea47749851b9bd +Author: zhujinyong +Date: Sun Dec 2 09:14:31 2012 +0000 + + * code for task#952. + +commit 732a020e3a89a5465ce9a92d17100745d079924a +Author: wangyidong +Date: Sun Dec 2 09:11:31 2012 +0000 + + * fix a bug for search box. + +commit 8df260352a8f8ae1dabe672cc0b3783f14913bf1 +Author: zhujinyong +Date: Sun Dec 2 09:09:00 2012 +0000 + + * code for task #952. + +commit 3525f166bbd0b38979cf0909c84bf09f4379819c +Author: wangyidong +Date: Sun Dec 2 07:54:23 2012 +0000 + + * fix a bug for keep login. + +commit f58b5362bd121f1cd90bac5f6e970652f2961638 +Author: chencongzhi520@gmail.com +Date: Sun Dec 2 05:54:07 2012 +0000 + + * code for task#943. + +commit f86e04590d7f5841f43866337b6896bb2b98d808 +Author: wangchunsheng +Date: Sun Dec 2 03:15:12 2012 +0000 + + * add support of the table border. + +commit 787e16d8100b286a733380a8a68ca251456de8ae +Author: wangyidong +Date: Sun Dec 2 02:54:31 2012 +0000 + + * fix bug for no project when unset this project. + +commit 07588583fc0ef55335293be5687ce18f14e4886c +Author: zhujinyong +Date: Sun Dec 2 02:44:04 2012 +0000 + + * adjust style of p tag. + +commit 6ced79b6b66c52889187c5c873d70c5f0ba6b798 +Author: wangyidong +Date: Sun Dec 2 02:33:18 2012 +0000 + + * remove webapp in group module. + +commit 4a66546239c69b4efdcc02b322eec6a15f71cf1b +Author: wangyidong +Date: Sun Dec 2 02:28:23 2012 +0000 + + * set default value in flow list. + +commit ef8f35fe9fe08e02a52cb31900e27fbb2ae42f85 +Author: chencongzhi520@gmail.com +Date: Sun Dec 2 02:24:20 2012 +0000 + + * code for task#913. + +commit 63e3d733a01dc6d7a4954d24e702e52d85098a8e +Author: wangyidong +Date: Sun Dec 2 02:10:28 2012 +0000 + + * add zentaotask zentaotest zentaostory extension in Makefile. + +commit a8f8823f17beac831d6feb69445b3063c80ed51a +Author: zhujinyong +Date: Sun Dec 2 01:51:33 2012 +0000 + + * linux need not check session_save_path. + +commit 5c60b09b120c8a82a21025eecb48904e66e2b1fe +Author: wangchunsheng +Date: Sun Dec 2 01:37:19 2012 +0000 + + * rewrite the doc-view page. + +commit fd5b777517856239a14ce46fc9c409eee8ddb99e +Author: wangyidong +Date: Sun Dec 2 01:14:35 2012 +0000 + + * upgrade 3.3 to 4.0.beta1. + +commit 680408464251b6f6a6fbd9575752cec0cd1e5489 +Author: wangchunsheng +Date: Sun Dec 2 01:06:56 2012 +0000 + + + add support of doc when get previous and next records. + +commit 4725de8b1b2f0c78e468bf18161293bfee81f7e2 +Author: wangyidong +Date: Sun Dec 2 00:55:24 2012 +0000 + + * change for zentao flow. + +commit 1316901b23a19250925121a5e31643b379f7ffb9 +Author: wangchunsheng +Date: Sun Dec 2 00:29:52 2012 +0000 + + * adjust the tool items of kindeditor. + * adjust the kindeditor path. + +commit 9302afa5f152e327de472fd4015f58be5dc7e08a +Author: wangyidong +Date: Sun Dec 2 00:29:27 2012 +0000 + + * remove webapp menu. + +commit 9d953a4654409621681936ee1a63605ca1c8f9da +Author: wangchunsheng +Date: Sat Dec 1 09:35:45 2012 +0000 + + * fix the error of sel at 2733. + +commit 822a2ad5aeae30eba361c01c937dee506092dd57 +Author: wangchunsheng +Date: Sat Dec 1 08:15:42 2012 +0000 + + * readjust the image upload page's logic. + +commit 9f969c4662708a4b62681e2d427e19506cf445a6 +Author: wangchunsheng +Date: Sat Dec 1 07:45:35 2012 +0000 + + * adjust the tab index of upload image image. + * fix the css style of image upload page. + +commit 211b7a3ce30a1a169b722ce3158773f8199507fe +Author: wangchunsheng +Date: Sat Dec 1 06:42:03 2012 +0000 + + * adjust the code created by kindeditor. + +commit cc5b96591cf98d385eba821a5db99299dd12df9c +Author: wangchunsheng +Date: Sat Dec 1 02:31:49 2012 +0000 + + - move it to /js/ + +commit e6f57518285ce7e09a1cb6dc497ba1affeffa5d2 +Author: wangchunsheng +Date: Sat Dec 1 02:30:45 2012 +0000 + + * move ke to www/js/ + +commit cd4d7b660a40bf2eb91d753c911c3fea4f0f5ced +Author: wangyidong +Date: Fri Nov 30 10:51:48 2012 +0000 + + * add null size for webapp. + +commit 51f50fad77491f30c333630ea819a72603692160 +Author: wangyidong +Date: Fri Nov 30 09:34:53 2012 +0000 + + * adjust webapp lang. + +commit 7f7ef475f792b84fadcca7b5e245548069b512b9 +Author: chencongzhi520@gmail.com +Date: Fri Nov 30 09:08:38 2012 +0000 + + * code for task#948. + +commit 8610f6b0f11207d2d8f6d7318e8e653f8b09b1e5 +Author: wangyidong +Date: Fri Nov 30 06:06:33 2012 +0000 + + + add webapp module. + +commit fe9cdd4b2a2edbfcbb25ebe23160d0b70b114c64 +Author: wangchunsheng +Date: Fri Nov 30 03:25:35 2012 +0000 + + * when upgrade or install, turn off the debug feature. + +commit 4388b6335223225116b2dd6a183ade5a3788228a +Author: wangchunsheng +Date: Fri Nov 30 03:10:47 2012 +0000 + + * fix the error of the update3.3.sql. + +commit eb4f44e64c29ecb475db10a66f425d2f4bf82eb9 +Author: wangchunsheng +Date: Fri Nov 30 03:10:05 2012 +0000 + + * after packging, remove the zentaopm directory. + +commit a057e9c9dc66637c227241a05a66dc6fd747ac88 +Author: wangchunsheng +Date: Fri Nov 30 02:24:24 2012 +0000 + + * upgrade the version. + +commit 7bbfbd3bdab0acc84a5e09ac5c6c7bf85fa38a2c +Author: wangchunsheng +Date: Thu Nov 29 08:17:58 2012 +0000 + + + add help links. + +commit cbb164aac4b5ba82d7b900cbf9b8205b28f7fa27 +Author: wangchunsheng +Date: Thu Nov 29 06:54:51 2012 +0000 + + * adjust the documents. + +commit 395c0739e1a63c341e6d351060e59d9deb3e3c31 +Author: wangchunsheng +Date: Thu Nov 29 06:51:28 2012 +0000 + + * adjust the THANKS document. + +commit 74193029d03b3b71e0f5f59cfd4cbd6dba3d1c36 +Author: wangchunsheng +Date: Thu Nov 29 05:54:04 2012 +0000 + + * adjust the readme documents. + +commit 08eee9e31e031a034520e5ecbfd54bfb85f88e5c +Author: wangchunsheng +Date: Thu Nov 29 05:52:22 2012 +0000 + + * adjust the install documents. + +commit f5ee2e90f25e1736a4654529abc15eaa2f3be2a9 +Author: wangchunsheng +Date: Thu Nov 29 03:34:57 2012 +0000 + + * when start, change the port of apache and mysql. + +commit a04a6b2e79e7a4cc7e90c542ed88d1666ab43466 +Author: wangchunsheng +Date: Thu Nov 29 02:37:16 2012 +0000 + + * rename lampp to lamppctrl. + +commit ed3fc47c73543c7d4cfebe9c456cdcff0317872a +Author: wangchunsheng +Date: Thu Nov 29 02:26:05 2012 +0000 + + * when packing, copy the modified lampp script. + +commit a5921184a4a4437503be6ae5ecc661232a9f0b0e +Author: wangyidong +Date: Wed Nov 28 07:35:43 2012 +0000 + + * chang name to win2unix. + +commit 8299741019329ba12121f1ba2353a65badb7b266 +Author: wangchunsheng +Date: Wed Nov 28 07:14:52 2012 +0000 + + * add .bat files to bin. + * keep doc directory. + +commit f143a7aa2209529dc7194c2a6c8e054316abeb7b +Author: chencongzhi520@gmail.com +Date: Wed Nov 28 06:55:35 2012 +0000 + + * code for task#948. + +commit 47029366a6bfecc97158446283aaa0fa59ce4837 +Author: chencongzhi520@gmail.com +Date: Wed Nov 28 06:07:49 2012 +0000 + + * code for task#948. + * code for notify client. + +commit 43c2361779be5acad78689466343377216b0bcd0 +Author: wangchunsheng +Date: Wed Nov 28 05:48:57 2012 +0000 + + - remove the lampp when clean. + +commit 96d82b71bc69df3931ef7fa7a31ade4bf169c845 +Author: wangchunsheng +Date: Wed Nov 28 05:41:18 2012 +0000 + + - remove the phpmyadmin in xampp, use the latest version instead. + +commit 09c5edeaee6c377f75faf38190e38c248db6c74f +Author: wangchunsheng +Date: Wed Nov 28 05:28:21 2012 +0000 + + * upgrade the package for new xampp version. + +commit 9eca15241ed96840c5ac073c6432c5ba0aec5e19 +Author: chencongzhi520@gmail.com +Date: Wed Nov 28 03:10:20 2012 +0000 + + * code for task#948. + +commit 218f90adfd2404ab1fe0aaa218551691ef1cd1f7 +Author: chencongzhi520@gmail.com +Date: Wed Nov 28 03:08:12 2012 +0000 + + * delete update4.0.beta1.sql. + * update 3.3.sql. + +commit 4e663ff1fede4b7bde777045375549ba97419c71 +Author: wangyidong +Date: Wed Nov 28 02:43:33 2012 +0000 + + * change renametable of function name to win2unit. + +commit 10dc55f150a69a13a7fb5813aa26c74cc076c087 +Author: wangchunsheng +Date: Tue Nov 27 14:10:34 2012 +0000 + + * replace the ioncube loader to 5.4 version. + +commit fecb3abb852de62a34bdb51eb53982e906f46bb2 +Author: chencongzhi520@gmail.com +Date: Tue Nov 27 06:34:36 2012 +0000 + + * code for task#932. + +commit 8f1b6f2ab4f68d27df47755b2d38d435bfa419b8 +Author: wangyidong +Date: Mon Nov 26 09:30:54 2012 +0000 + + + add bak in windows. + +commit 2903b59fbc595047a21f665fddb451bdfe3d5e58 +Author: zhujinyong +Date: Mon Nov 26 09:09:38 2012 +0000 + + * code for task #950. + +commit f1e02d712e9a5fa7f876f331e8afaec13e540410 +Author: zhujinyong +Date: Mon Nov 26 09:05:11 2012 +0000 + + * code for task #950. + +commit a9b8126f121d54285c4e1f224c834cebf41c88b3 +Author: zhujinyong +Date: Mon Nov 26 09:03:59 2012 +0000 + + * code for task #950. + +commit 182c3a1d605c8fc421a4b1f2f2606737edade60c +Author: wangchunsheng +Date: Mon Nov 26 08:49:14 2012 +0000 + + * add the link of this two js plugins. + +commit 3cdddc61bda56b7d6718a5d6d959af1096749706 +Author: wangyidong +Date: Mon Nov 26 08:12:49 2012 +0000 + + * finish task #934. + +commit 30c1499d060e722058770c1b4fe4a35bcc6d0d51 +Author: wangyidong +Date: Mon Nov 26 06:51:08 2012 +0000 + + * adjust judge delay. + +commit 3910229e1d6fac432d0e6012dd27e6541aff63b8 +Author: wangyidong +Date: Mon Nov 26 05:34:50 2012 +0000 + + * finish task #901. + +commit 7cf9a891789a30c156b94a18151f437fda804fc8 +Author: wangyidong +Date: Mon Nov 26 05:26:15 2012 +0000 + + * finish task #908. + +commit 4ebb86bdd30e2df2e1bdeb81622b8c0331daab83 +Author: wangchunsheng +Date: Fri Nov 23 11:00:51 2012 +0000 + + * adjust the mkdir() params. + +commit 3d6cf4044f29b8b2408a9e08169f86ee1be4b42c +Author: wangchunsheng +Date: Fri Nov 23 10:58:29 2012 +0000 + + + add sliksvn. + * ajust the build.php. + +commit 2d8e72f92cc15c86b235a6a07c03895a34b44555 +Author: wangchunsheng +Date: Thu Nov 22 10:22:11 2012 +0000 + + * adjust the build script for latest xampp version. + +commit 9f9969a2bbbbf18337660c2d6f57a7227692e15b +Author: wangyidong +Date: Thu Nov 22 07:48:20 2012 +0000 + + * change for get config params. + +commit 6108ca5439168dcaa13ec09c810eb32beb811d7b +Author: wangyidong +Date: Thu Nov 22 03:56:56 2012 +0000 + + * change for task #947. + +commit 482d9649e5783031ed85f3cc164f3a85009aab15 +Author: wangyidong +Date: Thu Nov 22 03:51:15 2012 +0000 + + * finish task #947. + +commit bc17d2b5e63b070b30e497667c46dfb80d9322c2 +Author: wangyidong +Date: Thu Nov 22 01:43:24 2012 +0000 + + * finish task #945. + +commit 12769523c2515f8815395b0bd801e8efd7688b64 +Author: wangyidong +Date: Thu Nov 22 01:42:35 2012 +0000 + + * change priv for task #919. + +commit 4aad9ef7bcc81d8fa13919c09cf4c24f341f900f +Author: wangyidong +Date: Thu Nov 22 01:41:37 2012 +0000 + + * finish task #919. + +commit b5de8a7d758250e81be3c1f9add0d9ab80b3b6d9 +Author: chencongzhi520@gmail.com +Date: Thu Nov 22 00:29:02 2012 +0000 + + * finish task#917. + +commit c395e5c095f555fc7d65b0ebd43d8d9c64c006a0 +Author: wangyidong +Date: Wed Nov 21 09:16:52 2012 +0000 + + * add renametable.php script. + +commit 541d8835f81912119b738136d1f267bdf8f397e2 +Author: wangyidong +Date: Wed Nov 21 07:54:52 2012 +0000 + + * finish task #946. + +commit fa743d05d4a71e9a47d873ee79d31fe00d8b3e8f +Author: wangyidong +Date: Wed Nov 21 03:23:51 2012 +0000 + + * finish task #924. + +commit e74d0a98254466d3114005a1a3026c649f59d07b +Author: wangyidong +Date: Wed Nov 21 03:21:23 2012 +0000 + + * finish task #927. + +commit c8f824673289f3cca88134690f2c16726ab90a48 +Author: wangyidong +Date: Wed Nov 21 02:35:06 2012 +0000 + + * finish task #922. + +commit c290f08bbecc14b8abca9ba339d43ff6295ee90c +Author: wangyidong +Date: Wed Nov 21 02:27:42 2012 +0000 + + * finish task #902. + +commit c31392fdad4294d10e787bbb20eac8dbfe814e9a +Author: chencongzhi520@gmail.com +Date: Wed Nov 21 00:55:46 2012 +0000 + + * finish task#911. + +commit af3bda62e252d6a7d24d6a3179aa8da976580c88 +Author: chencongzhi520@gmail.com +Date: Wed Nov 21 00:32:02 2012 +0000 + + * finish task#943. + +commit b08073b8075f2892f625ea42b8b9ce54e1f01ae2 +Author: wangyidong +Date: Tue Nov 20 09:16:55 2012 +0000 + + * finish task #914. + +commit 42905c61ed4233663a28283a755da150a303f81f +Author: chencongzhi520@gmail.com +Date: Tue Nov 20 09:15:28 2012 +0000 + + * finish task#932. + +commit 68f73144df58293171bb96e6788e7ca524f9b3a5 +Author: chencongzhi520@gmail.com +Date: Tue Nov 20 08:55:35 2012 +0000 + + * refactory the code. + * rename icon-addFile instead icon-add. + * rename icon-delFile instead icon-delete. + +commit ed2ad7306d7f7c3960a663dceea57f1ef714d728 +Author: zhujinyong +Date: Tue Nov 20 08:49:28 2012 +0000 + + + add session.save_path check. + * adjust align of checking title. + +commit 0264aff0d2c28419e78f9f5629ecdeb48a72c30f +Author: wangyidong +Date: Tue Nov 20 08:46:25 2012 +0000 + + * finish task #791. + +commit 8e0c27ee033467da7b42b913d4f08251ee8bc9f8 +Author: chencongzhi520@gmail.com +Date: Tue Nov 20 08:24:29 2012 +0000 + + * finish task#931. + +commit 0d2ce195105dd857b7d3b53784127d41ebd93406 +Author: chencongzhi520@gmail.com +Date: Tue Nov 20 08:04:56 2012 +0000 + + * finish task#921. + +commit 7a2642bc8d4a58458e7c063bbcd8e3906a1fdab6 +Author: wangyidong +Date: Tue Nov 20 07:50:57 2012 +0000 + + * finish task #15. + +commit c585fb83e567e8efeffab0a4729797534a876e88 +Author: chencongzhi520@gmail.com +Date: Tue Nov 20 03:23:45 2012 +0000 + + * finish task#913. + +commit b255513ac32eb6c829191534b8ce6308e4434ca1 +Author: chencongzhi520@gmail.com +Date: Tue Nov 20 03:00:01 2012 +0000 + + * finis task#910. + +commit 21dd59fe3b8e2542f663e32115f820e1aea0971f +Author: chencongzhi520@gmail.com +Date: Tue Nov 20 02:49:30 2012 +0000 + + * finish task#909. + +commit cd44d63ec67ba1e959b318596e509a08aada5020 +Author: wangyidong +Date: Fri Nov 16 02:27:15 2012 +0000 + + * finish for costom zentao type. + +commit cf5250b0a0122b9fa635994018ae24775deb20b8 +Author: zhujinyong +Date: Thu Nov 15 06:13:57 2012 +0000 + + * fix bug #240. + +commit 9e91037cc5dd247b01b8e8554a52ebde55025c7a +Author: zhujinyong +Date: Thu Nov 15 02:38:33 2012 +0000 + + - remove testcase.js. + +commit ef2de0d3521d84f9d3d703c21f856b82c1ebabff +Author: wangyidong +Date: Fri Nov 9 06:40:42 2012 +0000 + + * delete var i in js. + +commit 21546152815400d598dc120840c68cb769c9da08 +Author: wangyidong +Date: Wed Nov 7 07:40:17 2012 +0000 + + * fix a bug for get default param. + +commit 593a9f12c1da46d16d45d631ce6d9e018765b04d +Author: wangyidong +Date: Mon Nov 5 08:57:50 2012 +0000 + + * revert update1.1.sql. + +commit 3aca2a54160f0e489a4df1d7b8a51a1ece3ad6b5 +Author: zhujinyong +Date: Fri Nov 2 00:35:42 2012 +0000 + + * change date('Y-m-j') to date('Y-m-d'). + +commit a910d345aeab29bafe43d24197d7dd7de1f97e11 +Author: wangyidong +Date: Thu Nov 1 09:15:30 2012 +0000 + + * adjust lang. + +commit e944f281689d8f22f762c98c37e19d85ff081cac +Author: zhujinyong +Date: Thu Nov 1 09:12:36 2012 +0000 + + * fix a bug : change date('Y-m-j') to date('Y-m-d'). + +commit 348c12b564a2732c7d7b780f6fb71b09f2aaf1fd +Author: zhujinyong +Date: Wed Oct 31 05:35:58 2012 +0000 + + * if date equal today or yesterday, highlight. + +commit c4f689c7b5d1a93339360573d88463609aa8089e +Author: zhujinyong +Date: Tue Oct 30 08:18:31 2012 +0000 + + * fix a bug : only type = bydate, check date whether is today. + +commit 40b8b967e8642cf12a5ba701726dda517fed9442 +Author: chencongzhi520@gmail.com +Date: Tue Oct 30 07:04:28 2012 +0000 + + * code for bug#358. + +commit 08467d7d9723c3e0cfa81fb03212e5dc896704ce +Author: zhujinyong +Date: Tue Oct 30 05:43:21 2012 +0000 + + * fix a bug in ie8: button too small. + +commit 6cb6fc4599fd5210b5870ae91115bd00999c6df0 +Author: chencongzhi520@gmail.com +Date: Tue Oct 30 02:47:37 2012 +0000 + + * code for bug:358. + * refactory syncProduct and syncProject. + +commit 756a0c28793af26cf8c1e804ab0cd5b7782c41a5 +Author: chencongzhi520@gmail.com +Date: Tue Oct 30 01:48:39 2012 +0000 + + * fix bug#358. + +commit e4aed95dbe378b0ff188f58cf1fc624e77892342 +Author: zhujinyong +Date: Mon Oct 29 08:07:59 2012 +0000 + + * fix bug #350. + +commit b1bde8cac5224fc251a54058cc2052778d285e33 +Author: chencongzhi520@gmail.com +Date: Mon Oct 29 07:34:36 2012 +0000 + + * fix bug#332. + +commit d544ef476a1e71d590dd563ac726ed50b634f0f6 +Author: chencongzhi520@gmail.com +Date: Mon Oct 29 06:51:19 2012 +0000 + + * fix bug#201. + +commit 1b2630244eb6c008ec6bfa5d9350ab19656b27ac +Author: chencongzhi520@gmail.com +Date: Mon Oct 29 05:43:56 2012 +0000 + + * fix bug#356. + +commit 28e052719cdcfd14cab2487aa0877664d7f940d4 +Author: chencongzhi520@gmail.com +Date: Thu Oct 25 08:21:45 2012 +0000 + + * fix bug#354. + +commit b71634a16e9abaaab674b1a2e718d6b832112d0f +Author: chencongzhi520@gmail.com +Date: Thu Oct 25 08:02:08 2012 +0000 + + * fix bug#355. + +commit 3d970eee009577355c490e08e017027eb7ac4377 +Author: chencongzhi520@gmail.com +Date: Thu Oct 25 08:01:40 2012 +0000 + + * adjust the goback link-botton layout. + +commit 5e7427426f250706c80a9ac40705353819ba8934 +Author: chencongzhi520@gmail.com +Date: Thu Oct 25 07:40:02 2012 +0000 + + * fix bug:357. + +commit b9fdee73e0034165fb0569b36553842d02685eae +Author: chencongzhi520@gmail.com +Date: Thu Oct 25 07:39:14 2012 +0000 + + * adjust code layout. + +commit 95f8fb5d62d25e6fce97be67792393fe67f159d1 +Author: chencongzhi520@gmail.com +Date: Thu Oct 25 07:26:53 2012 +0000 + + * add icons for doc list. + +commit b4db11553257e2b00c089818f627c4bf53d2b5fb +Author: chencongzhi520@gmail.com +Date: Thu Oct 25 07:24:18 2012 +0000 + + * add icons for user list. + +commit a31ceff70ee0ff1157a22c1ea2d4ca8d80d965b7 +Author: chencongzhi520@gmail.com +Date: Thu Oct 25 07:00:49 2012 +0000 + + * adjust the layout of product release list. + +commit 809cd8c8c27b41d4bf8381363bc48569e108c8b6 +Author: chencongzhi520@gmail.com +Date: Thu Oct 25 06:59:29 2012 +0000 + + * adjust layout of product plan list. + +commit aacc18a46dffa450de483c2f7c3002219f792936 +Author: chencongzhi520@gmail.com +Date: Thu Oct 25 06:53:12 2012 +0000 + + * add icons for testtask page of project. + +commit f61fa823a5efc4904da0dba847927710897553d0 +Author: zhujinyong +Date: Thu Oct 25 05:54:24 2012 +0000 + + + add syntaxhighlighter. + +commit 72e17d1cd231e908e76aabf1a1d8abb44076fb8c +Author: zhujinyong +Date: Thu Oct 25 05:53:30 2012 +0000 + + * code for task#904. + +commit f5e41e376f50a9ff9daf62ffe6a4cc63e1b7dca6 +Author: zhujinyong +Date: Thu Oct 25 05:45:20 2012 +0000 + + + code for task#904. + +commit 8b982db1d2f9ad26c9611e28d9480faf490348fa +Author: zhujinyong +Date: Thu Oct 25 05:31:01 2012 +0000 + + * code for task#904. + +commit 20d3c284abfa2337ff8ac29b395b95b6d4c245fa +Author: chencongzhi520@gmail.com +Date: Thu Oct 25 05:30:31 2012 +0000 + + * adjust the icon-goback button. + +commit 9464930c48c300d2732d5f51d2b78a9e7b153759 +Author: zhujinyong +Date: Thu Oct 25 05:24:58 2012 +0000 + + * code for task#937. + +commit 1a63a2db1f772be36091cac99b87721cf7c5b0ff +Author: zhujinyong +Date: Thu Oct 25 05:21:26 2012 +0000 + + * code for task#937. + +commit a78faf5cf6f6a0ffbf7bc740c14701dcdfb6b369 +Author: zhujinyong +Date: Thu Oct 25 05:20:46 2012 +0000 + + * code for task#937. + +commit 03cce9978200fd618c279d8c9b138ba6abda67d7 +Author: chencongzhi520@gmail.com +Date: Thu Oct 25 05:14:51 2012 +0000 + + * adjust the align of list. + +commit 867c9ae7db5c979b4656b3f8d8ed7573df21702c +Author: chencongzhi520@gmail.com +Date: Thu Oct 25 05:14:17 2012 +0000 + + * add icons for group browse. + +commit eff7933da1da882ee6944390eab3e32c09f9d135 +Author: chencongzhi520@gmail.com +Date: Thu Oct 25 02:58:57 2012 +0000 + + * change the icon of addProject,addProduct,allProducts,allProduct. + +commit d0108775ce065e904b2b89250ddda57dbbd71f42 +Author: chencongzhi520@gmail.com +Date: Thu Oct 25 02:56:00 2012 +0000 + + * add icons for release list. + +commit 030c890e938bc99eb2685ded8acbd66a3acaccb7 +Author: chencongzhi520@gmail.com +Date: Thu Oct 25 02:40:01 2012 +0000 + + * add icons for productplan list. + +commit a79041f051f3acee716bf49f251710ae0505f507 +Author: zhujinyong +Date: Thu Oct 25 02:32:25 2012 +0000 + + * update savetemplate compatible with kindeditor 4.1.3. + +commit 3c24b63dc2dd4431922d5c2fe895026cae328d1d +Author: chencongzhi520@gmail.com +Date: Thu Oct 25 01:13:39 2012 +0000 + + * add icon for todo-create and todo-batchCreate. + +commit 3889ee0c7a751965e90d9710bed9e301893b6e49 +Author: zhujinyong +Date: Thu Oct 25 00:58:20 2012 +0000 + + * update kindeditor4.1.3. + +commit d49ca8c9327ac52536843a310d5c4615849dfaab +Author: zhujinyong +Date: Thu Oct 25 00:51:07 2012 +0000 + + + add kindeditor. + +commit 6fb1a9fe1af3b047cc8bb7a4ebaacf80afae90d3 +Author: zhujinyong +Date: Thu Oct 25 00:50:24 2012 +0000 + + - remove kindeditor. + +commit 4361a28b7b610219c7b15aef926aca3a547cb7ca +Author: wangyidong +Date: Mon Oct 22 07:36:52 2012 +0000 + + * finish task #907. + +commit ae85550f6d87cd07d20213c0f3c509722990ea63 +Author: wangyidong +Date: Mon Oct 22 07:26:27 2012 +0000 + + * finish task #902. + +commit 01302515dc5cd1fb6c3c5ab66c81991bf166449b +Author: wangyidong +Date: Fri Oct 19 01:38:04 2012 +0000 + + * fix a bug for export todo. + +commit d064b008b9bf47fedab65b576fcf669ccd6f2ae9 +Author: zhujinyong +Date: Thu Oct 18 02:16:04 2012 +0000 + + * only select done projects. + +commit c4c98f2b27924d6df4852e092c64a49161e33667 +Author: wangyidong +Date: Thu Oct 18 00:34:07 2012 +0000 + + * change for task #936. + +commit 84d87388ef628553cc31f08e87060571aacdc4f4 +Author: zhujinyong +Date: Mon Oct 15 02:26:29 2012 +0000 + + * if date is today, type = 'today'; + +commit a31f01cda4b407e513ef34d6d2df2a612281e024 +Author: wangyidong +Date: Thu Oct 11 03:35:04 2012 +0000 + + * revert early version. + +commit 0c3a3974fdc9af17b9185080d2290ca873a0a378 +Author: wangchunsheng +Date: Thu Sep 27 09:17:59 2012 +0000 + + * rename it. + +commit f2f2e990b914c1b08d48d84572bfd09040b3c599 +Author: wangchunsheng +Date: Thu Sep 27 09:15:54 2012 +0000 + + * adjust the include path. + +commit 17fa1b6499119959293f86be800f3ea9d959dde5 +Author: zhujinyong +Date: Thu Sep 27 06:35:54 2012 +0000 + + * fix locked time. + +commit 555035593818413da1e9bddf5e638db65f4305ba +Author: zhujinyong +Date: Thu Sep 27 06:13:56 2012 +0000 + + * add lang of unlock. + +commit 584a9f909ffd011186da20afffddb70865e7172c +Author: zhujinyong +Date: Thu Sep 27 06:08:50 2012 +0000 + + * add user lock in resource. + +commit a4f420d8ca295e58987f37f1edbbee45ef6fca1d +Author: zhujinyong +Date: Thu Sep 27 03:24:26 2012 +0000 + + * adjust align of action. + +commit fcabc226d9580cbff6b09ca98c24f719d7aa7cad +Author: zhujinyong +Date: Thu Sep 27 03:20:25 2012 +0000 + + * change hour to minute. + +commit ce482227f490674a1899939e9dba1d989e986859 +Author: wangyidong +Date: Wed Sep 26 05:44:48 2012 +0000 + + * fix for export. + +commit 2262a90df2476e4dffc4c65a4e256aef7782678a +Author: wangyidong +Date: Tue Sep 25 05:39:11 2012 +0000 + + * fix bug for delay. + +commit f6ad30e7de0c80c7eabc713bb928a68d2906c74a +Author: chencongzhi520@gmail.com +Date: Mon Sep 24 09:33:03 2012 +0000 + + * fix a wrong function: getThisSeason(). + +commit 02654e31af0f98f8c90d9709502fec445b3c2e6a +Author: zhujinyong +Date: Mon Sep 24 02:10:31 2012 +0000 + + * check wether plans is empty. + +commit da98e09af12ba0fbcbfbe0b6fbb890f97f218ef0 +Author: zhujinyong +Date: Fri Sep 21 08:19:22 2012 +0000 + + * change locked field type. + +commit 14f7dd2c2387061cd2b33ebafc0fee3f5f8d51dd +Author: zhujinyong +Date: Fri Sep 21 08:18:45 2012 +0000 + + * fix login lock. + +commit 09f195d547995b3f6d87021194026b522ae61234 +Author: zhujinyong +Date: Fri Sep 21 03:09:38 2012 +0000 + + * finish task#588. + +commit 2dc2326f31d87e4bec351035a6a63219d050498b +Author: zhujinyong +Date: Fri Sep 21 03:08:41 2012 +0000 + + * finish task #587. + +commit b8e1144ab97533c2cf91c04200f8183ddbf37a0b +Author: zhujinyong +Date: Fri Sep 21 00:59:06 2012 +0000 + + * fix bug in login locked sql. + +commit ad951c29f45f214d630e869ee692ca0a2dc7abb5 +Author: zhujinyong +Date: Thu Sep 20 09:03:36 2012 +0000 + + * add fails and locked in user table. + +commit d8ba9c16c81a3e5616d88ffd3f986bd2e2eaae43 +Author: wangyidong +Date: Thu Sep 20 07:21:47 2012 +0000 + + * fix a bug for team power. + +commit 921059608295f9000691c3d5158e712549b927fa +Author: chencongzhi520@gmail.com +Date: Wed Sep 19 06:09:12 2012 +0000 + + * fix a bug: strpos match no strict. + +commit 66b6f5de74abdf3759a304770682c758282b3dc0 +Author: chencongzhi520@gmail.com +Date: Wed Sep 19 06:02:07 2012 +0000 + + * fix a bug: if a testcase has been deleted, don't show it in story view page. + +commit 91cec4ea8e76cdb2142ba9303c1df81a886fb196 +Author: chencongzhi520@gmail.com +Date: Wed Sep 19 05:56:40 2012 +0000 + + * fix a bug: if delete a story/task/testcase actionLinks can't show. + +commit e47263a926acc075681e56ffd30a84de236ee813 +Author: zhujinyong +Date: Fri Sep 7 08:02:56 2012 +0000 + + * move array_flip() to getTeamMemberPairs(). + +commit efbaf72178a92526d910a6cd7e444694e041027f +Author: zhujinyong +Date: Fri Sep 7 07:43:27 2012 +0000 + + * fix a bug : array plus should user array_merge() function. + +commit 9d5635935f491a1cbf2d064787b23d4636f4f271 +Author: chencongzhi520@gmail.com +Date: Fri Sep 7 01:34:16 2012 +0000 + + * fix bug:346. + +commit 22e8a5deb6f359175f72c9686f9eee48f941d81f +Author: chencongzhi520@gmail.com +Date: Fri Sep 7 01:16:51 2012 +0000 + + * fix the bug: var statusUndone and statusDone is undefined. + +commit 1c4246dbf02e527f4bf39c609b043a9c4d9d0e6d +Author: wangyidong +Date: Wed Sep 5 07:14:35 2012 +0000 + + * fix bug that checkpriv for private product. + +commit b316e3dd22dfc5084c884bd0cda26ad1458a87f4 +Author: wangyidong +Date: Wed Sep 5 02:15:56 2012 +0000 + + * fix no type when upload extension. + +commit cf9c17460427cbe326317654fe0e2c4c070d8a32 +Author: wangyidong +Date: Wed Sep 5 01:53:14 2012 +0000 + + * fix bug for story export and task search. + +commit a86141a18f23cf67fd20630b7698df56211f6b42 +Author: wangchunsheng +Date: Tue Sep 4 00:42:43 2012 +0000 + + * fix the bug of burn data order. + +commit 72a9e6e9cdaa97fe57d360965c2fdcfcc55274cb +Author: wangyidong +Date: Mon Sep 3 06:09:48 2012 +0000 + + + add power for todo batch create. + +commit 1621d6c5e10452ab0cc822bb3cca6a4c81c6ef75 +Author: wangyidong +Date: Mon Sep 3 03:41:28 2012 +0000 + + * revert update1.1.sql. + +commit 4fe8e9333d1e807d15fec17b0218417b1630d39a +Author: chencongzhi520@gmail.com +Date: Mon Sep 3 02:56:32 2012 +0000 + + * code for task#889. + +commit c0c15e3cc4b0d511e2ec47ef135ef9a34e7266da +Author: chencongzhi520@gmail.com +Date: Mon Sep 3 02:20:24 2012 +0000 + + * fix the bug of batchcreate of task. + +commit e662c95672fb473b987289969bb724010ef1a39f +Author: wangchunsheng +Date: Mon Sep 3 02:11:31 2012 +0000 + + + add ldap extension. + + add mysql_uninstallservice.bat. + +commit edd88a5b55f6554f49d432d98d06d93c24cc4c7e +Author: shiyangyangwork@yahoo.cn +Date: Mon Sep 3 01:47:59 2012 +0000 + + + add update3.2.sql + +commit aafb03240c3ec3ff25d610633cc339368d04b810 +Author: wangchunsheng +Date: Mon Sep 3 01:01:54 2012 +0000 + + + add changelog. + +commit 72c17ee61a83cc939f3ad9c6b168fdf05f173df2 +Author: shiyangyangwork@yahoo.cn +Date: Mon Sep 3 00:58:51 2012 +0000 + + * change 3.3.stable to 3.3 + +commit dd8cb448f0fea40f67967cef913a83b5c777d594 +Author: wangchunsheng +Date: Mon Sep 3 00:46:42 2012 +0000 + + * adjust the code format. + +commit 808c8d1ba07a60f58797c5b3ca0922b6de9c21e9 +Author: wangchunsheng +Date: Sun Sep 2 09:15:35 2012 +0000 + + - move the reload() to importtask.js. + +commit e3502ab2032e5b0a9e9ba2b3133fa2438d33c8fd +Author: wangchunsheng +Date: Sun Sep 2 08:57:13 2012 +0000 + + * adjust comment format for onlybody feature. + +commit 4a9027e531031f7e0f2735e6cb9df2a14c6b4bc7 +Author: chencongzhi520@gmail.com +Date: Sun Sep 2 08:56:38 2012 +0000 + + * adjust the icons. + +commit 3859c8f4e9300fd8dad2ccbab812968c6feb599b +Author: wangyidong +Date: Sun Sep 2 08:55:17 2012 +0000 + + * fix a bug. + +commit a080b8cf63fd5cc8aa33e1bc5e32c7ef92e32f9e +Author: wangyidong +Date: Sun Sep 2 08:50:33 2012 +0000 + + * adjust for light use alias. + +commit bed26e91db3668409c35cd01294a0b7773ef6977 +Author: wangchunsheng +Date: Sun Sep 2 08:46:58 2012 +0000 + + * adjust title. + +commit d9b3b7b1e50e52f9a28160775fd9037b53bbbf73 +Author: wangchunsheng +Date: Sun Sep 2 08:40:32 2012 +0000 + + * adjust title. + +commit 0c5af200e9b658d9cc74bbec62b044003748d0f9 +Author: wangchunsheng +Date: Sun Sep 2 08:36:28 2012 +0000 + + * adjust the title. + +commit cffc98eae1842fbae28e2ec01b65fc4c15285b6d +Author: wangchunsheng +Date: Sun Sep 2 08:05:03 2012 +0000 + + * adjus the notice of unique, add note of admin-trash page. + +commit d44ccf11d75075233910250438cee848873f2049 +Author: wangchunsheng +Date: Sun Sep 2 07:56:50 2012 +0000 + + * adjust code format. + +commit 4b30caecc7a72e0393b42a137e5879ca4b69012c +Author: wangchunsheng +Date: Sun Sep 2 07:53:30 2012 +0000 + + * adjust the title of doc module. + +commit e3912d8f0d33d5394ed4d236d4536248101530c2 +Author: shiyangyangwork@yahoo.cn +Date: Sun Sep 2 07:44:37 2012 +0000 + + * update upgrade. + +commit fcb241632e0a3d3deb0b51911a0243c1089feb96 +Author: wangchunsheng +Date: Sun Sep 2 07:32:53 2012 +0000 + + - remove unused codes. + +commit 80023501b1a7cb2a6fc7003bd2048433e13f1e7b +Author: wangchunsheng +Date: Sun Sep 2 07:31:12 2012 +0000 + + * adjust title. + +commit 917921ee76d553aa188b4b7ebe27e56714295284 +Author: wangchunsheng +Date: Sun Sep 2 07:07:29 2012 +0000 + + * adjust code format. + +commit 7f1a5c780db3f80ab002f0b750f8570ae3d60488 +Author: wangchunsheng +Date: Sun Sep 2 06:54:54 2012 +0000 + + * adjust comment for only body feature. + +commit a8f692d6443d2c3f7bf6bace5e1eb685bc700c81 +Author: wangchunsheng +Date: Sun Sep 2 06:53:10 2012 +0000 + + * adjust comments for only body feature. + +commit ef6e3fd46c0058d3ad8582d80fa29266d18a0307 +Author: wangchunsheng +Date: Sun Sep 2 06:40:24 2012 +0000 + + * upgrade version. + +commit ae8491853105d60f22d6e72ddc66213af4ed4552 +Author: wangchunsheng +Date: Sun Sep 2 06:38:01 2012 +0000 + + * convert language. + +commit 44f752ec2d46bcc3398bbecbea41ce142564dfae +Author: chencongzhi520@gmail.com +Date: Sun Sep 2 06:30:52 2012 +0000 + + * adjust the icons. + +commit 7a41469d835bcb6c3da337861c95f1a25432ca42 +Author: wangchunsheng +Date: Sun Sep 2 06:11:33 2012 +0000 + + + add the js for project create page. + +commit 8c5d04e49c356e9282477c5e6fe04a24d32068cf +Author: wangchunsheng +Date: Sun Sep 2 05:53:18 2012 +0000 + + * adjust the copy project feature. + +commit 15cc3121bb6f79e3d2395bb909ab91803409a623 +Author: chencongzhi520@gmail.com +Date: Sun Sep 2 03:28:31 2012 +0000 + + * adjust the icons. + +commit a2f4583049a56ddc97a69a50e4cb2c904689e4be +Author: chencongzhi520@gmail.com +Date: Sun Sep 2 03:23:38 2012 +0000 + + * adjust the icons. + +commit 56e892557f371a95e305b2d416de8ea9eb40ddb7 +Author: wangchunsheng +Date: Sun Sep 2 03:22:42 2012 +0000 + + * adjust the batch create page of todo. + +commit 7a35c59cc6948f2816aa1cfa17083bb6e502b200 +Author: wangyidong +Date: Sun Sep 2 02:54:15 2012 +0000 + + - delete pro power. + +commit 84fc79e8c01efb3d8afe4a208427311bac40e5ef +Author: wangchunsheng +Date: Sun Sep 2 02:53:29 2012 +0000 + + * rewrite batch create page. + +commit 2ee371d194c072b839833a8588bf0a089a5325e1 +Author: chencongzhi520@gmail.com +Date: Sun Sep 2 01:51:36 2012 +0000 + + * update zt-*.png + +commit 4bc02408db0f7e8257ece49e1c5901d883e6af44 +Author: wangchunsheng +Date: Sun Sep 2 01:43:09 2012 +0000 + + - remove it. + +commit 4cc148a4fb86fde9e3dbb1d6bc122c081221cf8a +Author: wangchunsheng +Date: Sun Sep 2 01:28:11 2012 +0000 + + - remove it. + +commit e9abe8c682d0b57eb71dd8b9337a01ea8ab0a4a6 +Author: wangchunsheng +Date: Sun Sep 2 01:25:50 2012 +0000 + + * adjust the batchEdit page. + + add module field when batch edit tasks. + +commit e758b7c33e806971c1a1c128dcfc66efce5c4806 +Author: chencongzhi520@gmail.com +Date: Sun Sep 2 01:04:14 2012 +0000 + + * update fusioncharts.js and fcf_pie2d. + +commit 79248f83238817b0818b78bced29023e1063b387 +Author: chencongzhi520@gmail.com +Date: Sun Sep 2 01:02:47 2012 +0000 + + * code for task#882. + +commit ba31414fc2934fd532eff865438dc4fe7ae53b83 +Author: wangyidong +Date: Sun Sep 2 00:58:22 2012 +0000 + + * fix light . + +commit 72dc0c41904c9c3bb02745d77bd2233b2bd028e2 +Author: wangchunsheng +Date: Sat Sep 1 11:37:54 2012 +0000 + + * fix bug#315. + +commit bfff59aa8b614dcc31c9f4c6cd62cf2c7875f4eb +Author: wangchunsheng +Date: Sat Sep 1 11:34:57 2012 +0000 + + * adjust the padding of select control. + +commit 1900a376d19fad89a5747f6d75bdf53bb408496e +Author: chencongzhi520@gmail.com +Date: Sat Sep 1 09:31:29 2012 +0000 + + * code for task#893. + +commit 0d1a0d90faf5abc588dd3c81becf8bef3a23d38c +Author: chencongzhi520@gmail.com +Date: Sat Sep 1 09:14:10 2012 +0000 + + * code for task#900. + +commit 146411365bdc3abf6bb59daf6ea375b9577e1547 +Author: zhujinyong +Date: Sat Sep 1 09:04:54 2012 +0000 + + * if a project is not exists in db, delete it. + +commit 1d4cbb8fe01e190ddc2de551aaff0373820c77e8 +Author: chencongzhi520@gmail.com +Date: Sat Sep 1 08:26:56 2012 +0000 + + * adjust the link-button's font-size of view page. + +commit 76d03b7d8679ef6231e7835d9e71a24b32e625bd +Author: chencongzhi520@gmail.com +Date: Sat Sep 1 08:25:57 2012 +0000 + + * adjust the link-button of view page. + +commit 953402b1c745160a744914ddacdb1c3dda0b30d5 +Author: chencongzhi520@gmail.com +Date: Sat Sep 1 08:12:43 2012 +0000 + + * code for task#893. + +commit db5ea5de977136b8e242b25f22a7915f0d3b5b72 +Author: wangchunsheng +Date: Sat Sep 1 08:12:34 2012 +0000 + + * adjust the padding of input and select. + +commit 379913349c0337799e4947965cd409006b887f2c +Author: chencongzhi520@gmail.com +Date: Sat Sep 1 08:05:21 2012 +0000 + + * code for task#893. + +commit 9ee621f3fedeac7062dde951b9e6c7da587c4761 +Author: wangchunsheng +Date: Sat Sep 1 08:02:45 2012 +0000 + + * when browse by date, active it. + +commit 7a942a3686197f9d52d49708a7cb234c53bb1476 +Author: chencongzhi520@gmail.com +Date: Sat Sep 1 07:46:30 2012 +0000 + + * code for task#892. + +commit 647d6d65a0b8ef4f8fc24a21f117dbe21dd6c6b0 +Author: wangchunsheng +Date: Sat Sep 1 07:39:20 2012 +0000 + + * adjust the font size of buttons. + +commit b49cc31ea45bedb46c81c55e94ec5cbe08ee5ca3 +Author: wangchunsheng +Date: Sat Sep 1 07:11:58 2012 +0000 + + * fix the bug#338. + +commit 445e165003ffe94352d857d9269e3a6979142e19 +Author: chencongzhi520@gmail.com +Date: Sat Sep 1 07:04:35 2012 +0000 + + * code for task#893. + +commit c87f1527999669a494e49ba0e0eb82c323d7f31b +Author: wangchunsheng +Date: Sat Sep 1 06:56:59 2012 +0000 + + * fix bug#339. + +commit 41cf62ef771b95f625c053a4465b7d7160b8736f +Author: wangchunsheng +Date: Sat Sep 1 06:20:31 2012 +0000 + + * fix the bug#344. + +commit 554279732a8ec6044e3240dd6f71a828a59d9c0c +Author: wangchunsheng +Date: Sat Sep 1 06:19:50 2012 +0000 + + * adjust the column width of group browse page. + +commit 722b1ec24e2a67a9f12cb69ec701baa44a6c235d +Author: wangchunsheng +Date: Sat Sep 1 05:53:57 2012 +0000 + + * fix bug#345. + +commit d3a15be3ea55fb9dd84076b18655d64626618d17 +Author: chencongzhi520@gmail.com +Date: Sat Sep 1 02:16:36 2012 +0000 + + * code for task#828. + * adjust the featurebar of task. + +commit 1f0931085860082b0f8ddb1749488f154b8d2958 +Author: chencongzhi520@gmail.com +Date: Sat Sep 1 00:39:10 2012 +0000 + + * code for task#878. + +commit 31e1608fdfa3d45aecc164a4db2c65c8833af157 +Author: wangchunsheng +Date: Fri Aug 31 08:43:40 2012 +0000 + + * finish task#885. + +commit f3caba603e68080f705e7ed55d95f1460500479f +Author: wangyidong +Date: Fri Aug 31 08:32:16 2012 +0000 + + * fix a bug for file link. + +commit 7788f10987aec4c09ee748a55d2e3dbcdf83781c +Author: wangchunsheng +Date: Fri Aug 31 08:28:59 2012 +0000 + + * finish task #874. + +commit 38c4edacd636e13d0a5029fee6f945d0eeee658d +Author: wangchunsheng +Date: Fri Aug 31 08:03:53 2012 +0000 + + * finish task#874. + +commit 15d133646695110f04cedfddf0f99f380c706a41 +Author: wangchunsheng +Date: Fri Aug 31 07:14:27 2012 +0000 + + * adjust the Makefile. + +commit 49bbee878104869f882ba6dc408a9118aab6b5a5 +Author: wangchunsheng +Date: Fri Aug 31 06:41:30 2012 +0000 + + * only include js and css files when debug. + +commit dca15157e6ff4353f89bc0d39ff035979b4993af +Author: wangchunsheng +Date: Fri Aug 31 06:40:22 2012 +0000 + + + add the files to combine and minify css and js files. + +commit 31fa082995e496b61db21bc9373deaca966cfa1c +Author: chencongzhi520@gmail.com +Date: Fri Aug 31 03:00:45 2012 +0000 + + * code for task#882. + +commit aaa19e3550c2852fbfab5bc8a0a8776f91f538f9 +Author: chencongzhi520@gmail.com +Date: Fri Aug 31 02:53:24 2012 +0000 + + * code for task#882. + * add icon for add file and delete file. + +commit a14c48fb4389d3037520f99c3b8435be437022ba +Author: chencongzhi520@gmail.com +Date: Fri Aug 31 02:15:25 2012 +0000 + + * finish task#872. + * complete the permission. + +commit 1b4620549a862e7e6a66b1bd415def1dac439249 +Author: wangyidong +Date: Thu Aug 30 08:43:57 2012 +0000 + + * fix bug. + +commit 54195c44e52db4b2dd349a51b7091997e537e4b6 +Author: wangchunsheng +Date: Thu Aug 30 08:37:10 2012 +0000 + + * finish task#882. + +commit f9f59a8a9a9f045cc8904692175d64fd5b5057a7 +Author: wangyidong +Date: Thu Aug 30 08:24:36 2012 +0000 + + * adjust onlybody. + +commit e707d6d3141ca91be4e7ed3b34fff473a672776a +Author: chencongzhi520@gmail.com +Date: Thu Aug 30 07:53:34 2012 +0000 + + * code for task#890. + * cancel the task temporary. + +commit 1bbcc48da0ab8bf4ebd7a9698fc2ffb533ffd0a9 +Author: wangyidong +Date: Thu Aug 30 07:53:06 2012 +0000 + + * fix bug #458. + +commit 2df9e66e87bdfc69837688354d10be7b8c391b55 +Author: chencongzhi520@gmail.com +Date: Thu Aug 30 07:47:12 2012 +0000 + + * code for task#870. + +commit fa594c132e1fdff7869616755070b50265938fa3 +Author: chencongzhi520@gmail.com +Date: Thu Aug 30 07:45:20 2012 +0000 + + * code for task#870. + +commit bcc40a8f6a8281c851dde2acbd39f91d758caa5a +Author: wangyidong +Date: Thu Aug 30 03:24:05 2012 +0000 + + * adjust export page. + +commit 64d4e9f4a6f3c6d745c90a574b43210efd2f2b53 +Author: wangchunsheng +Date: Thu Aug 30 02:30:05 2012 +0000 + + * rewrite the getProjectStats() function. + +commit c6f7b22612a8ae8a7e54337b742120e50f1f5c90 +Author: wangchunsheng +Date: Thu Aug 30 02:25:50 2012 +0000 + + * fix the error of $this->user->getGroup() should be $this->getGroup(). + +commit 3f7e8ef522c4e336f8c54bdffc554fbad06f30c5 +Author: chencongzhi520@gmail.com +Date: Wed Aug 29 09:25:08 2012 +0000 + + * code for task#892. + +commit e547a244ce864f1e386dda23fdbea7afc688d8e2 +Author: chencongzhi520@gmail.com +Date: Wed Aug 29 09:22:43 2012 +0000 + + * finish task#892. + +commit ab0708f3fa483a8a5529657abc7137476602adcc +Author: chencongzhi520@gmail.com +Date: Wed Aug 29 07:17:59 2012 +0000 + + * finish task#893. + +commit 5e459eb832146b3f0970f672fcb4de887cf74027 +Author: zhujinyong +Date: Wed Aug 29 06:31:07 2012 +0000 + + * fix a bug #460. + +commit e714a4a6e2aabdbb76e275899fda2b382c1281cd +Author: chencongzhi520@gmail.com +Date: Wed Aug 29 02:27:28 2012 +0000 + + * add ';' + +commit fabc9f0ded9327a9f3fa451819dbb5dc7b0bc346 +Author: wangchunsheng +Date: Wed Aug 29 01:57:12 2012 +0000 + + * rewrite the checkPriv() logic to improve performance. + +commit b060a6bb41a47a52c17e026b69f718ce5cffc91c +Author: wangyidong +Date: Tue Aug 28 09:29:32 2012 +0000 + + * change hide footer and header not use hook. + +commit 3891ce2ac3847fc7ad34a7940047e3e049fad0ba +Author: wangchunsheng +Date: Tue Aug 28 06:37:10 2012 +0000 + + * adjust the css of products. + +commit f3e2a7f11e9a8b187c0a1a1fdae35f2240d45863 +Author: wangchunsheng +Date: Tue Aug 28 06:15:20 2012 +0000 + + * rewrite the checkPriv(), getProjectStats(), getBurnData() methods. + +commit ce25be3c5ae3102a25d1424a167c8ae186296e6c +Author: wangyidong +Date: Tue Aug 28 03:32:36 2012 +0000 + + * limit date select for todo. + +commit 6469d03fab449227b99ed9918bc4448d4b1bd1a9 +Author: wangchunsheng +Date: Tue Aug 28 03:01:55 2012 +0000 + + + the optimizer sql. + +commit 233cc85ac6cd3ed70799c0710d24830f5aab1dcc +Author: wangchunsheng +Date: Tue Aug 28 01:16:53 2012 +0000 + + * adjust code format. + +commit 02f17061882cfc9facb7db084b654956b107c92d +Author: wangchunsheng +Date: Tue Aug 28 01:14:14 2012 +0000 + + * get dynamic of latest 3 days. + +commit 2bd72c839c52502362e7a814cf8e57606c2edce9 +Author: wangchunsheng +Date: Tue Aug 28 01:07:41 2012 +0000 + + * adjust code format. + * add latest3days period param. + +commit 6c6abc6590e9e80830952279fcd680010d37c90d +Author: wangchunsheng +Date: Tue Aug 28 01:06:23 2012 +0000 + + * when identify a user, fetch groups of him thus when check priv of projects, use groups stored in session. + +commit fff1597dd58160b07daa044d68ffee65542c165d +Author: wangyidong +Date: Tue Aug 28 01:00:59 2012 +0000 + + - delete encrypt. + +commit 9031b4211f265ea8cd4b1546a0affb9fce918782 +Author: wangyidong +Date: Mon Aug 27 09:33:03 2012 +0000 + + * adjust notice when license is expired. + +commit df9f5c28e0b63578916587e5113712183a8a0109 +Author: zhujinyong +Date: Fri Aug 24 08:29:21 2012 +0000 + + - remove redundant code. + +commit c2112604803f0c5e5679bcf376ebc5dda5de181e +Author: zhujinyong +Date: Fri Aug 24 08:26:28 2012 +0000 + + * fix bug #471. + +commit c90800e6cbe19289013806cc4df9d9f0d8d8a1e0 +Author: zhujinyong +Date: Fri Aug 24 07:54:02 2012 +0000 + + * fix bug #474. + +commit 59455273643b53afd70108a90344ba51c6bb9443 +Author: zhujinyong +Date: Fri Aug 24 06:57:33 2012 +0000 + + * add color. + - remove deleted user. + +commit b8d79b1d24d6c4e6a54accc76c95a61f2ec5e2de +Author: zhujinyong +Date: Fri Aug 24 02:39:11 2012 +0000 + + * fix a bug : highlight in test build report. + +commit aba0b8afefe92b6d7fa3913011b4b34050f251ac +Author: areyou123456 +Date: Thu Aug 23 07:28:45 2012 +0000 + + * finish the task #879 + +commit 26e1b572be140c5b8899f2e70a0f5891e8f8aa69 +Author: areyou123456 +Date: Thu Aug 23 01:57:50 2012 +0000 + + * finish the task #880 + +commit 6e353035d48e0cbc0c1acf61b32c4924684a5af8 +Author: areyou123456 +Date: Thu Aug 23 01:56:08 2012 +0000 + + *finish the task #880 + +commit f705b3e1a2735503d1b6810dac1cf2f7f5a16ec2 +Author: areyou123456 +Date: Tue Aug 21 08:29:48 2012 +0000 + + * finish the task #877 + +commit 769085669f19a643efc47a3e403cbf15d05171f6 +Author: zhujinyong +Date: Tue Aug 21 07:54:00 2012 +0000 + + * fix a bug : class error. + +commit 1be5e2b9d3147d817738ebfd6bccb3c0de4d2f92 +Author: areyou123456 +Date: Mon Aug 20 09:29:11 2012 +0000 + + * modify the kindeditor + +commit 29c34ec21375c3db2b737234b90cc009ccd75c17 +Author: areyou123456 +Date: Mon Aug 20 09:03:58 2012 +0000 + + * finish the task #889 + +commit 48aecfb4de69b8088c73137225cb3f826eec8379 +Author: areyou123456 +Date: Fri Aug 17 06:37:02 2012 +0000 + + finish the task #879 + +commit 8fe580c350e3445d597ef3bc6816660212774970 +Author: chencongzhi520@gmail.com +Date: Fri Aug 17 06:10:50 2012 +0000 + + * adjust the style of chosen. + +commit e5a73b916727d66e904826c1f87d7c0eaf42357e +Author: chencongzhi520@gmail.com +Date: Fri Aug 17 05:47:30 2012 +0000 + + * Finish task#895. + +commit 6c756e3dc681dfaa26639ac582ca8d0d56716a31 +Author: chencongzhi520@gmail.com +Date: Fri Aug 17 02:36:27 2012 +0000 + + * finish task#888. + +commit 06c19ef39164ea3e51429edf87e12ed8edf80a06 +Author: chencongzhi520@gmail.com +Date: Fri Aug 17 02:17:39 2012 +0000 + + * Code for task#890. + * add jquery plugin:validation. + +commit bd10311b3fe5a4a4e1a56961f15434e8ee25bcee +Author: wangyidong +Date: Thu Aug 16 08:23:56 2012 +0000 + + * fix a bug for case step. + +commit f232fbbde9d48fc3a7209648eb6b03b660e1776c +Author: areyou123456 +Date: Thu Aug 16 07:31:48 2012 +0000 + + * finish the task #869 + +commit 447ca49c5088ff83a4a04eecfc4d86ba46904591 +Author: wangyidong +Date: Thu Aug 16 05:56:11 2012 +0000 + + + add loader-wizard.php. + +commit fe3957bb4923ce8a9d25b48570117c9be1f7f0f2 +Author: wangyidong +Date: Wed Aug 15 08:28:08 2012 +0000 + + * adjust for encrypt file when no install loader. + +commit d2d2cfc211d58c2ff4da7fa0ada9af19c235a29f +Author: areyou123456 +Date: Wed Aug 15 06:40:20 2012 +0000 + + * finish the task #876 + +commit 0891800ea2d803d62fd552323e86d779d44bbb64 +Author: areyou123456 +Date: Wed Aug 15 06:36:28 2012 +0000 + + * finish the task #876 + +commit 8dc6222d5e7e97e8145a85d600c214b2873f07a5 +Author: areyou123456 +Date: Wed Aug 15 05:45:51 2012 +0000 + + * finish the task #876 + +commit 85e283602a673f3a28888388eceb13d53e4cd856 +Author: wangyidong +Date: Tue Aug 14 07:32:40 2012 +0000 + + + add for chinesize encrypt. + +commit dfda27d5ca447208ed09bfde08d10264f96f45be +Author: areyou123456 +Date: Tue Aug 14 07:09:20 2012 +0000 + + * finish the task #896 + +commit 0618a0c5bafe4740ca5b3f45d2eee0f7aacfdfd8 +Author: wangyidong +Date: Tue Aug 14 06:49:33 2012 +0000 + + * adjust encrypt file. + +commit d099f9f594cdeb7a3355a4cb42f4c4abb5b0c6e9 +Author: areyou123456 +Date: Tue Aug 14 06:39:09 2012 +0000 + + * finish the task #894 + +commit 6f44323caf5c8b56a78dd8d02112a3fce9c80af3 +Author: zhujinyong +Date: Mon Aug 13 07:49:08 2012 +0000 + + * adjust style of report. + +commit b5610aecf42e5a2e443adb445989c07381468967 +Author: zhujinyong +Date: Thu Aug 9 09:25:12 2012 +0000 + + * finish task #820. + +commit 96f15df6195ef06f0a5f9ce49a4702e1c97f8a5e +Author: zhujinyong +Date: Tue Aug 7 06:27:27 2012 +0000 + + * finish task #817. + +commit d1741ea6c9f13e3eaf600369e6490816c488933f +Author: zhujinyong +Date: Tue Aug 7 02:04:57 2012 +0000 + + * change report module. + +commit 511354f2d71802d278ef387c5f92e72d3a750031 +Author: zhujinyong +Date: Fri Aug 3 01:50:58 2012 +0000 + + * change subMenu order. + +commit 304cca99b9c191997e3a583364652add8fa99b6e +Author: chencongzhi520@gmail.com +Date: Wed Aug 1 02:47:10 2012 +0000 + + * fix the bug that the page of bug'custom fields can't show. + +commit 206764871668719bcb013a6a0b831babed75f6fe +Author: wangyidong +Date: Fri Jul 27 05:57:49 2012 +0000 + + * adjust for batch create todo. + +commit b6ac217b20cde978d150e0861a13990a49ffd472 +Author: wangchunsheng +Date: Fri Jul 27 02:57:29 2012 +0000 + + * adjust the packing of syun version. + +commit 7cf5d68a1c6b614cdf4a212dc9df7db9a727c4b2 +Author: wangchunsheng +Date: Fri Jul 27 01:23:08 2012 +0000 + + * adjust the install logic, check table exists or not instead of checking database. + +commit 5c91d6998d29e1b7c9d5dc4a10a9aa791bc5b2f8 +Author: wangchunsheng +Date: Tue Jul 24 05:23:11 2012 +0000 + + * improve performance: adjust the action->getDynamic() method. + +commit 57d7a7a81af82941ce016e648b677271e844728d +Author: wangyidong +Date: Mon Jul 23 14:51:29 2012 +0000 + + * adjust db prefix for extension. + +commit d51fa01ee873dee15c8d6cb99c31c91059ce04d9 +Author: wangchunsheng +Date: Mon Jul 23 06:56:28 2012 +0000 + + * adjust the makefile for syun version. + +commit 5844223ac8c627cad6a88f0656d87b967aafb525 +Author: wangchunsheng +Date: Fri Jul 20 11:19:33 2012 +0000 + + * when include ext config files, check it first. + +commit ce1db86419a4566f94a79432c87e139d94ad12e9 +Author: wangchunsheng +Date: Fri Jul 20 10:45:01 2012 +0000 + + + add the logic of init data, tmp directories and .htaccess file. + +commit 05809e01c9bd1d9441a62881deea5227fba6c4e8 +Author: wangchunsheng +Date: Fri Jul 20 07:34:53 2012 +0000 + + * add the make shell for sina yunshangdian. + +commit 342333ea08da63820a60671c385e27743aabdb9f +Author: wangchunsheng +Date: Fri Jul 20 07:08:41 2012 +0000 + + * when include default values files, check it first. + +commit 0edcf5c8e7fe0b55d6a02a7c2616b2afe84729e0 +Author: wangchunsheng +Date: Fri Jul 20 06:11:28 2012 +0000 + + * when edit a story, process the images in it. + +commit 9d4feeb0319bd5b5f3113f883b2dcd3d7792e062 +Author: wangchunsheng +Date: Fri Jul 20 06:02:42 2012 +0000 + + * change timeout to 3 seconds. + +commit c164075712c6905a106e8ba62a6bd08bc194e6f8 +Author: wangchunsheng +Date: Fri Jul 20 06:01:36 2012 +0000 + + * only connected to db when installed. + +commit 2f212964c92cd04284e43e0e936585dc7cde3e16 +Author: chencongzhi520@gmail.com +Date: Tue Jul 17 09:01:04 2012 +0000 + + * Adjust the icons. + +commit 1bf93dcfdc5bdbc8c388d403209a2c1ddf38e894 +Author: shiyangyangwork@yahoo.cn +Date: Tue Jul 17 01:24:02 2012 +0000 + + * add 3.2 of upgrade for 3.2 + +commit 9e2677813c72cab4255c1f03f8ce592c1857d243 +Author: chencongzhi520@gmail.com +Date: Mon Jul 16 08:09:51 2012 +0000 + + * Adjust the story can't be activate. + +commit bc3867350965907d522639736c04a2f9ba48fce6 +Author: shiyangyangwork@yahoo.cn +Date: Mon Jul 16 08:08:43 2012 +0000 + + * modified VERSION + +commit 7aa7daf6cbc085b3b9fdbb6d75625a3c32893e28 +Author: zhujinyong +Date: Mon Jul 16 08:01:15 2012 +0000 + + * add date limit. + +commit 12eabaa7506cad444f667dce917c0d8f5051692e +Author: shiyangyangwork@yahoo.cn +Date: Mon Jul 16 07:54:38 2012 +0000 + + * modified build.php for xampp. + +commit 4c9531e4e61087998fda9722f3c8ddfd174c7bbd +Author: chencongzhi520@gmail.com +Date: Mon Jul 16 03:16:55 2012 +0000 + + * Adjust the changelog of 3.2.1 + +commit 1553b6b3449a7a7eac989ed7a0450777ed6da5c1 +Author: zhujinyong +Date: Mon Jul 16 03:10:21 2012 +0000 + + * fix a bug in productinfo report. + +commit a165a5280df4bf66ff27ac14ea38b7032b7f56f0 +Author: chencongzhi520@gmail.com +Date: Mon Jul 16 03:02:27 2012 +0000 + + * remore checkGT and checkGE for class fixer to class validater. + +commit e07729d225215abf2bddeaca56cb86eb41e63155 +Author: zhujinyong +Date: Mon Jul 16 02:44:52 2012 +0000 + + * init bug summary. + +commit 653d168326d5b1f1fb50accc133eeeee8713161e +Author: zhujinyong +Date: Mon Jul 16 02:42:42 2012 +0000 + + * remove 'closed' user. + +commit e25914e557b4f90349ec73d9ddc5b4d618d82fe7 +Author: zhujinyong +Date: Mon Jul 16 02:36:10 2012 +0000 + + * fix a bug in bugSummary. + +commit 34252282fce1570d509e67c2ccbe19a8bd407ec3 +Author: wangyidong +Date: Mon Jul 16 02:34:28 2012 +0000 + + * revert for stripTags . + +commit 677107fb5fdcd3bf96a70fe4f3054e32c72e4dc6 +Author: chencongzhi520@gmail.com +Date: Mon Jul 16 02:29:42 2012 +0000 + + * adjust the changelog of 3.2.1 + +commit 3b1d22015b576754b770c60085787ab68fca5eb9 +Author: chencongzhi520@gmail.com +Date: Mon Jul 16 02:24:35 2012 +0000 + + * add changeLog of 3.2.1 + +commit cf69fb93dafd6bcf3b08fee7217f7504005093cb +Author: shiyangyangwork@yahoo.cn +Date: Mon Jul 16 01:58:48 2012 +0000 + + * update upgrade for 3.2.1. + +commit b6da51a3e11f2a89e78f137dd08e4ded72017e1e +Author: chencongzhi520@gmail.com +Date: Mon Jul 16 01:51:19 2012 +0000 + + * Adjust the icons. + +commit 1f4ad4371191ed22b07d845521c951568052b4da +Author: zhujinyong +Date: Mon Jul 16 01:45:37 2012 +0000 + + * change account to username. + +commit 5ba97f144ae574db941b4762dcc798ccee719b70 +Author: zhujinyong +Date: Mon Jul 16 01:31:58 2012 +0000 + + * fix a bug : data perhaps not set. + +commit b2446d6dd7ece3dd9f79e56f5696bbac7e19f4d9 +Author: chencongzhi520@gmail.com +Date: Mon Jul 16 01:15:26 2012 +0000 + + * Adjust the icons. + +commit 76328c97009737b010462b1fe223f005217a4a67 +Author: zhujinyong +Date: Sat Jul 14 08:54:57 2012 +0000 + + * fix the bug that task's status must be done when task's status is wait and task'left is 0 + * at edit page. + +commit 031b8fc9f0cd7a4d58821ca009309300e2d3e010 +Author: chencongzhi520@gmail.com +Date: Sat Jul 14 07:26:53 2012 +0000 + + * Adjust the icons. + +commit e804d246aca43b6957ac8220b063e3d6919f8c19 +Author: zhujinyong +Date: Sat Jul 14 05:22:35 2012 +0000 + + * change stripTags param. + +commit 23860f35b040dfe6f034c0f570d092cd59174f7f +Author: zhujinyong +Date: Fri Jul 13 01:23:41 2012 +0000 + + * fix report data error. + +commit e6b891607912a55d57cfb2ad2f419ce9899049ab +Author: wangyidong +Date: Thu Jul 12 02:20:49 2012 +0000 + + * adjust encrypt. + +commit 28a22cc6a0b79ee37ea6e48acc01dd9682418cea +Author: zhujinyong +Date: Thu Jul 12 01:34:27 2012 +0000 + + * get bugs, tasks, stories exclude deleted project. + +commit 305b7805954366c4d848adf89bd5620d98a3b2ed +Author: zhujinyong +Date: Wed Jul 11 08:36:27 2012 +0000 + + * move report list to blockreportlist.html.php. + +commit 0618cde77229cdb73fff2350cbacc1a185250765 +Author: chencongzhi520@gmail.com +Date: Wed Jul 11 06:41:49 2012 +0000 + + * Fix the bug that product select didn't order by `order`. + +commit f05c9e52c9ebef32d9e1ec6c254d4763a3fadecc +Author: zhujinyong +Date: Wed Jul 11 06:40:37 2012 +0000 + + * fix a bug : change 'consumed' to 'left'. + +commit 84f1aaa36ef5ff7c51967b806e43f1cba320d99c +Author: chencongzhi520@gmail.com +Date: Mon Jul 9 01:35:36 2012 +0000 + + * Add module field of task-edit and task-view page. + +commit e8b03fe0e0b679b41f7d23ababaa7b85e0d57c32 +Author: chencongzhi520@gmail.com +Date: Mon Jul 9 01:34:05 2012 +0000 + + * Fixed the bug of can't close the task in my-tasks page. + +commit b127b8757bcd7da1203d1cafa211fe6ce196a81d +Author: chencongzhi520@gmail.com +Date: Mon Jul 9 01:31:05 2012 +0000 + + * Add title prompt of assign icon. + +commit c71e97a747a150cf6bc61db42202a8a65f206140 +Author: chencongzhi520@gmail.com +Date: Mon Jul 9 01:28:02 2012 +0000 + + * Adjust code loyout. + +commit d98daae818f423d0410c999ec185b50e6866bda7 +Author: chencongzhi520@gmail.com +Date: Mon Jul 9 01:27:12 2012 +0000 + + * Revert the index page, remove the table header fixed. + +commit 77104b622201ed8f17b57f2f0a9e1763f2168124 +Author: chencongzhi520@gmail.com +Date: Mon Jul 9 01:24:11 2012 +0000 + + * Add the title prompt of report icon. + +commit 46df0a82205b200d5ba7d97887c5275ed6db05a1 +Author: chencongzhi520@gmail.com +Date: Mon Jul 9 01:22:37 2012 +0000 + + * Remove the objectIDs session when get pre and next object. + +commit cf007529d604ddb00430e5df353b3c7588eb53b9 +Author: chencongzhi520@gmail.com +Date: Mon Jul 9 01:20:46 2012 +0000 + + * set w-id=55px instead 45px. + +commit 2c133da7c08b91312c62f91c0a35e24afb662bb2 +Author: chencongzhi520@gmail.com +Date: Mon Jul 9 01:19:40 2012 +0000 + + + Include clas spyc. + +commit 7e6c4d33fa33706794287758537daddc6c620dc8 +Author: wangchunsheng +Date: Wed Jul 4 00:16:12 2012 +0000 + + * fix the error of stop88, should be start88. + +commit 94946ff95b6b2acda0e1e9a363bf98ecbccae4da +Author: wangchunsheng +Date: Tue Jul 3 05:58:52 2012 +0000 + + + add checkdb.php and backup.php + +commit 6d6c45e272338d40453bf2ff359c7bff0ea3e783 +Author: wangchunsheng +Date: Tue Jul 3 05:23:39 2012 +0000 + + * add the tag. + +commit 802bd2789f6e13e709c690f3aec3c06b947e1436 +Author: chencongzhi520@gmail.com +Date: Tue Jul 3 03:39:16 2012 +0000 + + * Remove changlog of checkDB. + * Rename exportStoriesAndBugs instead export. + +commit e0c4024f9730300f01d8d42140485ec18747fe8f +Author: zhujinyong +Date: Tue Jul 3 03:30:06 2012 +0000 + + * add method order of report. + +commit fdb9e43840cbe49185635e309d20fcd3d02ef1b3 +Author: wangchunsheng +Date: Tue Jul 3 03:11:44 2012 +0000 + + * adjust the resovled date field. + +commit 582a69279070b0d9d6bfab83f03bf8bccf18cc74 +Author: wangchunsheng +Date: Tue Jul 3 03:03:18 2012 +0000 + + * adjust code format. + +commit 0dd0c547ced59d6d70119eaa0c6fb381a58657e0 +Author: wangchunsheng +Date: Tue Jul 3 03:01:12 2012 +0000 + + + add id for bug's story. + * adjust code format. + +commit 92019b09fd356e5992060d5122b4dee5cb2f77b6 +Author: wangyidong +Date: Tue Jul 3 03:01:08 2012 +0000 + + * fix a bug for demo login link. + +commit dbc1add468318db98e9bf83d534cc99680b8555f +Author: wangchunsheng +Date: Tue Jul 3 02:58:19 2012 +0000 + + * adjust the code format. + +commit 575c0277311bafd45455034e171d1cb4dd1b3fff +Author: shiyangyangwork@yahoo.cn +Date: Tue Jul 3 02:54:09 2012 +0000 + + * add ssleay32.dll for xampp. + +commit 7c098e20dd626d3df61615911bdcfcfbc8dbfdca +Author: wangchunsheng +Date: Tue Jul 3 02:53:55 2012 +0000 + + * adjust the build-notice logic. + * sync zh-tw lang. + +commit a58d888922083d97bfd3edda9a19b58b6fda2dc0 +Author: wangchunsheng +Date: Tue Jul 3 02:50:07 2012 +0000 + + * sync the export lang item. + +commit c4898b9c6ea3ac93045732ceaa4f77de2f8f5779 +Author: wangchunsheng +Date: Tue Jul 3 02:45:15 2012 +0000 + + * Remove notice2 lang. + +commit 7837ceefeceac9b2379b72ae81438f0d89f45cc6 +Author: wangchunsheng +Date: Tue Jul 3 02:31:31 2012 +0000 + + - remove unused class. + +commit d53b44263b412bcb6776b21363800485a80a93cb +Author: wangchunsheng +Date: Tue Jul 3 02:26:48 2012 +0000 + + - remove unused style. + +commit 57d7ad6cfcee144e72fe349288215722c95f0bbf +Author: wangchunsheng +Date: Tue Jul 3 01:48:50 2012 +0000 + + * remove the border of rowhead. + +commit de75494c4333b5ec4c4ad84938e06fb95a3ac30d +Author: wangchunsheng +Date: Tue Jul 3 01:48:08 2012 +0000 + + + add changelog for 3.2. + +commit 4b36d7241d799c6c4a94425d98f268f55e51dacd +Author: chencongzhi520@gmail.com +Date: Tue Jul 3 01:25:29 2012 +0000 + + * Rename exportStoriesAndBugs instead export. + +commit e6b3e291341b1ae25bd95483cc15797bc47204a3 +Author: chencongzhi520@gmail.com +Date: Tue Jul 3 01:00:28 2012 +0000 + + * Remove the importTask and importBug link into task create page. + +commit faafd463010158b6902e8839db6df08d583950ec +Author: zhujinyong +Date: Tue Jul 3 01:00:09 2012 +0000 + + * change display of workload report. + +commit b357ac39ace7ecddb5ed68805d5cfdc87df3aab1 +Author: chencongzhi520@gmail.com +Date: Tue Jul 3 00:51:38 2012 +0000 + + * Refactory the importDemoData. + +commit fdec83821d4a175693d6223077cd8f2a1d4c23bc +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 16:06:25 2012 +0000 + + * Refactory the printIcon function, replace the create title instead copy title if method='create' and icon='copy'; + +commit 7c3d4243a1bce6e878c8bbeb3a86f00e646cd9d5 +Author: zhujinyong +Date: Mon Jul 2 16:04:12 2012 +0000 + + * fix a bug : workload not include done task. + +commit 1b1680fda6dd76380be0e55c289ae2775a4b9f23 +Author: wangchunsheng +Date: Mon Jul 2 15:57:32 2012 +0000 + + * convert zh-tw lang. + +commit 79cfaf26a9228eb32659903da685b2391e99adc2 +Author: wangchunsheng +Date: Mon Jul 2 15:56:54 2012 +0000 + + * sync the english lang. + +commit 59fa864732ecfdf1878161623f6e986ebffaaf56 +Author: wangchunsheng +Date: Mon Jul 2 15:56:31 2012 +0000 + + * add vim commands to open to diff files. + +commit 1d5ac3c24a20f2181f0cf30d0f1afd91c9cf08bb +Author: zhujinyong +Date: Mon Jul 2 15:54:42 2012 +0000 + + * change style of workload report. + +commit 45f5d00dea8fbfbe6d67a5aa9c03df25647d9767 +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 15:48:03 2012 +0000 + + * Refactory the clearData function. + +commit 40e18c5adbc844cd551b087decf6d8fe42ef15bd +Author: wangyidong +Date: Mon Jul 2 15:23:59 2012 +0000 + + * format date. + +commit 50dcc5381bd384f774822e70c2b5cb2259087c1a +Author: wangchunsheng +Date: Mon Jul 2 15:08:18 2012 +0000 + + * adjust the getSysAndPersonal() method. + +commit bfd6f0d2521851a81914283206e53e9f691f4296 +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 15:01:46 2012 +0000 + + * Adjust the import demo data for the unique fields of db. + +commit 5b8d456f77fdc73e14b56f6a7c6b09066a9d9756 +Author: wangchunsheng +Date: Mon Jul 2 14:49:18 2012 +0000 + + * delete the version record. + +commit 678d44885b9d95b257e8e1cd51b3314ef09e2ccf +Author: wangchunsheng +Date: Mon Jul 2 14:48:46 2012 +0000 + + * init projects for report charts. + +commit 3bc20919d77b5aa84ad801a2d6bd79a91f23d25d +Author: zhujinyong +Date: Mon Jul 2 14:37:00 2012 +0000 + + * fix a bug : logic error. + +commit 6677222be15bf6bb454a7e45b73920e77d8fc44a +Author: wangchunsheng +Date: Mon Jul 2 14:24:00 2012 +0000 + + * when get sn, set company to 0. + +commit 17d7510a732e5b24c052a229a90388d37ffd09c3 +Author: zhujinyong +Date: Mon Jul 2 14:19:23 2012 +0000 + + * fix a bug : must lower word. + +commit 091243f32c7dd1b1eb1e4c10a1ff6fe36eda83aa +Author: wangchunsheng +Date: Mon Jul 2 13:40:50 2012 +0000 + + * rewrite the updateVersion() and setItem() logic. + +commit 440b707141981a2d18773cb68ab1e8fd4b139e07 +Author: wangyidong +Date: Mon Jul 2 13:39:53 2012 +0000 + + * fix a bug for testTask build. + +commit 6d95b1ccec926d6b4814ef9c7d9bf1b78e546002 +Author: zhujinyong +Date: Mon Jul 2 13:38:12 2012 +0000 + + * default not checked. + +commit 1e4af47abd7b2438ddbf372b6426fd0ed94c56c1 +Author: wangchunsheng +Date: Mon Jul 2 12:27:05 2012 +0000 + + * remove cleardata, confirmClearData and mail's methods. + * adjust module order. + +commit b0bc82aedf1d020dbc3ab505beb6f53ebaaf0416 +Author: wangchunsheng +Date: Mon Jul 2 12:15:12 2012 +0000 + + + add css for proversion and zentaotrain. + +commit a5005ac06adca4eaa3f7db0e423099931a3e079c +Author: wangchunsheng +Date: Mon Jul 2 12:14:08 2012 +0000 + + + add proversion at report page. + +commit 05ce7585aaa751a33c040e193bddb9b77deeba30 +Author: wangchunsheng +Date: Mon Jul 2 12:12:06 2012 +0000 + + + add proversion link at footer. + +commit 8c65e5bf2dc32253ca12c936aaa9376c8671db1c +Author: wangchunsheng +Date: Mon Jul 2 12:09:36 2012 +0000 + + + add link of proversion. + * adjust link items. + +commit 98745b3707b2031b6b8659eba543b9d99f5af57f +Author: wangchunsheng +Date: Mon Jul 2 11:58:00 2012 +0000 + + * change #search to #searchicon. + +commit 73606663e1e28ac26f1fdf449d0acc20be3bf588 +Author: wangchunsheng +Date: Mon Jul 2 11:09:18 2012 +0000 + + * adjust the table width for my-index page. + +commit 9f9a874d79127db0b052692784c710fa2670e4c1 +Author: zhujinyong +Date: Mon Jul 2 11:07:34 2012 +0000 + + * fix a bug : include error. + +commit 80da9285071ddf565a2bce1975a866f26b1a538c +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 11:04:53 2012 +0000 + + * Adjust the blockproduct layout. + +commit f892ccb8c7007a09ed48d8d97ddac4edd60d6519 +Author: shiyangyangwork@yahoo.cn +Date: Mon Jul 2 09:10:03 2012 +0000 + + * fix a bug for upgrade. + +commit 9b12ee6523774ff23023d5606e0cdbed378550fe +Author: shiyangyangwork@yahoo.cn +Date: Mon Jul 2 08:57:08 2012 +0000 + + * delete * from zt_config when `key` = 'version'. + +commit 3109b5a426b98604b12f93231a669848b1aac2e1 +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 08:51:24 2012 +0000 + + * Adjust the icon. + +commit f73f4a911633ffc3e3bf0e8b7abf1c402838e9e2 +Author: shiyangyangwork@yahoo.cn +Date: Mon Jul 2 08:47:26 2012 +0000 + + * delete '3.0' and '3.0.stable' from zt_config. + +commit d2b56efd43cfca09490647aa8d267d21eb52d6b3 +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 08:43:39 2012 +0000 + + * Adjust the style of delayed task. + +commit 4fdca462a4514618c014aa79dcd3e0d66c69567a +Author: shiyangyangwork@yahoo.cn +Date: Mon Jul 2 08:28:51 2012 +0000 + + * fix bugs for upgrade. + +commit 56191bcd71ebe2797f746c85fe947b1dbb2e947b +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 08:21:08 2012 +0000 + + * Fix bug#328. + +commit 095c43253b5cbc2d001d6e64ed4beb922e1ef0f1 +Author: wangchunsheng +Date: Mon Jul 2 07:55:47 2012 +0000 + + * fix the bug of todo. + +commit b305fdaf4c0d936ed7bad65551dddcff3aa5c9bb +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 07:40:16 2012 +0000 + + * Adjust the export class for whose not use icon link. + +commit a2b433fb3c2502471267472be357c9a2782d0eb8 +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 07:31:14 2012 +0000 + + * Adjust the search form css. + +commit 7b16aa510556e3ac02d368cda07d844c7005bcb5 +Author: wangyidong +Date: Mon Jul 2 07:03:54 2012 +0000 + + * adjust classblue style. + +commit fe8a06e710851a03e935573884d16dfa3e6a943d +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 06:46:54 2012 +0000 + + * Adjust the icon. + +commit 4241bcdc52ec66c2307038e2ab870bafa3bd95d2 +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 06:42:15 2012 +0000 + + * Adjust the icon. + +commit b6607176e9a85e3b7103c19c4216e948887bb4fe +Author: wangchunsheng +Date: Mon Jul 2 06:25:41 2012 +0000 + + * change edit page's form to dataform. + +commit 211158e91e10f62aa20cf19e6d9cd7349b8112c2 +Author: zhujinyong +Date: Mon Jul 2 06:21:57 2012 +0000 + + * move menu order to new file. + +commit 5af8ab05e15d693ea9f06d53ca37b16d8662d254 +Author: zhujinyong +Date: Mon Jul 2 06:20:48 2012 +0000 + + * move moduleOrder and methodOrder to group. + +commit 18ce9941c33b79f78da31f297814264d31daf735 +Author: wangchunsheng +Date: Mon Jul 2 06:02:35 2012 +0000 + + * convert the zh-tw version. + +commit 0572dba0d5f97c7200f49972c14a70d862ba2314 +Author: wangchunsheng +Date: Mon Jul 2 05:59:24 2012 +0000 + + * change createform to dataform. + +commit c87200ba461d2d8f0e49268f6876e95c24030f43 +Author: wangchunsheng +Date: Mon Jul 2 05:57:03 2012 +0000 + + * rewrite the getVersion() method to compatiable for old version. + +commit 85156a7e333a820afcefb95099d06fc02990dd81 +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 05:56:36 2012 +0000 + + * Adjust the icon. + +commit 0b0c6b1f97bbd2464b51258272771a0d566ae240 +Author: wangchunsheng +Date: Mon Jul 2 05:38:39 2012 +0000 + + * fix the status error of getProductStoryPairs() method. + +commit 152399eb4bfe418869284bd5d1376fb2dba9b1c6 +Author: wangchunsheng +Date: Mon Jul 2 03:18:42 2012 +0000 + + * adjust the style of roadmap. + * adjust the createform's style. + +commit 20c1307c36e3cebff8ae5c07304326a26ff95b28 +Author: zhujinyong +Date: Mon Jul 2 03:18:23 2012 +0000 + + * change lt,gt to le,ge. + +commit 6258997d5f7ef13ca637a4aee600cb5ba84b315c +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 03:17:51 2012 +0000 + + * Adjust the icon of task list. + +commit 28ca16dcd7f1500832230b1141e2da6bc5f0d949 +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 03:15:31 2012 +0000 + + * Adjust the icon css for linux env. + +commit ac053668295ff00f92f188934d0b79ea32612622 +Author: wangchunsheng +Date: Mon Jul 2 03:13:31 2012 +0000 + + * adjust the about page. + +commit 232604384cf44add468baf40958d3f57c2cc668c +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 02:53:02 2012 +0000 + + * Adjust the icon. + +commit a54b6e184e469be35c377328b7ea6dd153bd83a4 +Author: zhujinyong +Date: Mon Jul 2 02:44:27 2012 +0000 + + * fix a bug : think devidend is 0. + +commit 21fbd52c123115ce38cc4d2123265d407ba931e7 +Author: zhujinyong +Date: Mon Jul 2 02:40:18 2012 +0000 + + * fix a bug : get projects error. + +commit 33e7344345de5fa2b089eedd982567b5dfdaaee7 +Author: shiyangyangwork@yahoo.cn +Date: Mon Jul 2 02:10:12 2012 +0000 + + * update zentao.sql. + +commit 9e3ffe9ec6e16dd07563cb363d93487cb456873f +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 02:05:23 2012 +0000 + + * Adjust the icon of project view page. + +commit ba8aecd0d185445a1acceffa6f5a3fb46727b920 +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 02:03:05 2012 +0000 + + * Adjust the icon of task. + +commit 162ccc536b0089431d17316330937418e9445449 +Author: wangchunsheng +Date: Mon Jul 2 01:44:49 2012 +0000 + + * adjust the placeholders. + +commit 284e17f8d7edbe21ba9e2348659745d1ddf4e886 +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 01:35:31 2012 +0000 + + * Adjust the icon of task. + +commit 8945c8071c0a7fa2dc110e9aca63d612f25d63c1 +Author: wangyidong +Date: Mon Jul 2 01:29:43 2012 +0000 + + * change error lang. + +commit cad45cb7e1a4f482ffe86d496c7e1ef1b8e163b2 +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 01:24:48 2012 +0000 + + * Adjust the printIcon function. + +commit 52a94383bca9e79ebca6aa7b342b3987f5ba2c54 +Author: chencongzhi520@gmail.com +Date: Mon Jul 2 01:23:59 2012 +0000 + + * Adjust the icon of story. + +commit b0fb9c5761993955db082970fc0b953109bed669 +Author: zhujinyong +Date: Mon Jul 2 01:17:23 2012 +0000 + + * fix a bug : label value is error. + +commit 9c6ee246b832646b6df4ed6e545fbc1230a46b25 +Author: wangchunsheng +Date: Mon Jul 2 01:12:17 2012 +0000 + + * adjust the placeholder. + +commit 2295b4669cf7693afef228302d24da76e7db2121 +Author: wangchunsheng +Date: Mon Jul 2 01:11:55 2012 +0000 + + * remove the delta field when create a project. + +commit c5f4fd37d2fc2563f3fd246cc4124c4a2dcaaaa3 +Author: wangchunsheng +Date: Mon Jul 2 01:03:04 2012 +0000 + + + import the date.js library. + +commit 991d232e857665506750226295f7a3088d0a29c6 +Author: wangchunsheng +Date: Mon Jul 2 01:02:27 2012 +0000 + + * adjust the computeDays() feature. + +commit e592cfd399b6f44d4de60102a8b6cdeece7dbb34 +Author: wangchunsheng +Date: Mon Jul 2 01:01:43 2012 +0000 + + * rename company to companyname. + +commit 1a265e444a48a7b224f5cbd0a2da5c493cf2d113 +Author: wangchunsheng +Date: Mon Jul 2 01:00:21 2012 +0000 + + * rewrite the computeDays() function. + +commit 3b6bdc1b45ea0e3f0fc5fe91d0224ecd956c092a +Author: wangchunsheng +Date: Mon Jul 2 00:26:39 2012 +0000 + + * fix the error of printIcon(). + +commit afce24e1d45dfa4df552040741acc18069959a07 +Author: chencongzhi520@gmail.com +Date: Sun Jul 1 13:46:03 2012 +0000 + + * Adjust the icon. + +commit 0d5dc8a12c2c89057ea63515bb8f5b62b280f085 +Author: chencongzhi520@gmail.com +Date: Sun Jul 1 13:45:31 2012 +0000 + + * Add printCommentIcon printSplitIcon printIcon function. + +commit f8866ea2be827379bd97a5e40d3dd13f5b479fff +Author: chencongzhi520@gmail.com +Date: Sun Jul 1 13:43:57 2012 +0000 + + * Adjust the icon of testtask module. + +commit 5f443ed8cf5e14d52e0301a9706a14bc7538f62c +Author: chencongzhi520@gmail.com +Date: Sun Jul 1 13:43:20 2012 +0000 + + * Adjust the icon of testcase browse and view page. + +commit bf33d56133e883d6978685709137599c27d59ba1 +Author: chencongzhi520@gmail.com +Date: Sun Jul 1 13:42:39 2012 +0000 + + * Adjust the icon of bug browse and view page. + +commit 4f57c6e1b1fc57558c8cb6bea93c7f54ba0553c6 +Author: zhujinyong +Date: Sun Jul 1 13:41:07 2012 +0000 + + + add comment of sort resource. + +commit 24a65cfbb814be2df9c09342b5727293e13a1372 +Author: zhujinyong +Date: Sun Jul 1 13:20:13 2012 +0000 + + * add comment of report. + +commit 460898e1223e8a846753da2f2d1c6fd8900315a0 +Author: zhujinyong +Date: Sun Jul 1 12:50:38 2012 +0000 + + * adjust position of project subMenu. + - remove link story subMenu. + +commit a07af7eea8c71fc813834a4eedb6a2c8e0856be0 +Author: wangchunsheng +Date: Sun Jul 1 12:41:15 2012 +0000 + + * change the id of company to companyname. + +commit 18fc74633170eac674988ca74204a1f7b425ba41 +Author: zhujinyong +Date: Sun Jul 1 12:31:12 2012 +0000 + + * adjust position of dynamic. + +commit 0e1ad4f1f5ef0d7d05555ccff52de3644068b902 +Author: zhujinyong +Date: Sun Jul 1 10:14:16 2012 +0000 + + * add module and method order. + +commit 88065a41115adf2b29dd51e9ad57c20570ba7d34 +Author: wangchunsheng +Date: Sun Jul 1 09:13:17 2012 +0000 + + * adjust the width of input. + +commit e1a939147fba180557314514c52ce9a6f9fc8a01 +Author: wangchunsheng +Date: Sun Jul 1 09:12:31 2012 +0000 + + * set margin of row2. + +commit aaedbeae3366d16bc1f1692ff63e87bca50e676f +Author: wangchunsheng +Date: Sun Jul 1 09:00:24 2012 +0000 + + + add isClickable() method. + +commit 2db31344aa27eb93423f78286f59cc1681276f23 +Author: shiyangyangwork@yahoo.cn +Date: Sun Jul 1 08:57:59 2012 +0000 + + * display realname in workload of report. + +commit 529f53a883f47306555b43467f72c39163a91b51 +Author: wangyidong +Date: Sun Jul 1 08:48:16 2012 +0000 + + + add lang for group resources. + +commit 0f9faaee762d9fe285fe25b60036818026146709 +Author: shiyangyangwork@yahoo.cn +Date: Sun Jul 1 08:40:39 2012 +0000 + + * fix bugs for report. + +commit bdfc2e3ea55f0860f4fb2e580b86af41b42c470b +Author: zhujinyong +Date: Sun Jul 1 08:39:36 2012 +0000 + + * check key is exist or not. + +commit 0f2e699807ff4126ebb0edd6419f15854ab867f7 +Author: zhujinyong +Date: Sun Jul 1 08:09:54 2012 +0000 + + + add function of sort resource. + +commit 563646b3d420436f480d6a2ad3ffecf2943fe037 +Author: shiyangyangwork@yahoo.cn +Date: Sun Jul 1 07:14:13 2012 +0000 + + * modified version of config.php. + +commit 9179700e79612fc0957f8a13d64d2bb2f4ab2dcb +Author: wangyidong +Date: Sun Jul 1 07:01:37 2012 +0000 + + + add note for getBurnDataFolt method + * change get burn data without empty. + +commit fcccfb2440611d9ee4bbfcefc12619858002c264 +Author: areyou123456 +Date: Sun Jul 1 06:19:51 2012 +0000 + + * finish a bug #3327 + +commit 63e35e85e50121912bbfae6471cd075d61db6344 +Author: wangchunsheng +Date: Sun Jul 1 06:06:20 2012 +0000 + + * adjust the comments. + +commit c45a513a4691d46e9d2d7a3619d006fa402d7278 +Author: wangyidong +Date: Sun Jul 1 03:24:34 2012 +0000 + + * adjust delete config. + +commit f8acb8cf27125f3b6722e998cf1cf49aa202e932 +Author: wangyidong +Date: Sun Jul 1 03:21:49 2012 +0000 + + * add z-index for colbox in chosen. + +commit 9414b6d312c299f0c0c5ad381402e2ddf77a03f6 +Author: areyou123456 +Date: Sun Jul 1 03:18:56 2012 +0000 + + * finish a bug #325 + +commit d827ee3da85d0b5e78d8dcee051420da32eb5a0d +Author: shiyangyangwork@yahoo.cn +Date: Sun Jul 1 03:11:28 2012 +0000 + + * update upgrade. + +commit 8f9c10c31da8c444808cde30d2f8affd77e36214 +Author: areyou123456 +Date: Sun Jul 1 02:54:03 2012 +0000 + + * modified the lang of release + +commit 064d2ea36c92522d535dccdbc90886502de1e4a8 +Author: wangchunsheng +Date: Sun Jul 1 02:48:44 2012 +0000 + + * add bug link for imported bugs. + +commit 454437f440793ce4ea5f53f92e749afea9a0b251 +Author: chencongzhi520@gmail.com +Date: Sun Jul 1 02:38:33 2012 +0000 + + * Adjust the layout of blockProduct and blockProject. + +commit 987668855e495a7a62982af7f22605ff86693bba +Author: wangchunsheng +Date: Sun Jul 1 02:25:28 2012 +0000 + + * adjust the dynamic counts. + +commit a38cb53baea07452ca304a208912efc86b6277c0 +Author: wangchunsheng +Date: Sun Jul 1 02:24:52 2012 +0000 + + - remove the css of tab. + +commit 0876498ec097f67b9ce8b8d325d6c7005513eaae +Author: chencongzhi520@gmail.com +Date: Sun Jul 1 02:21:09 2012 +0000 + + * Adjust the icon. + +commit 39e89dba2efa689d26815a62a4dbf91037470e0b +Author: wangchunsheng +Date: Sun Jul 1 02:14:45 2012 +0000 + + * adjust the dynamic records. + +commit 531400123f45d288077c6b2900c30d4c2d4e6090 +Author: wangchunsheng +Date: Sun Jul 1 02:09:55 2012 +0000 + + * fix the error of setsn. + +commit 65baf8be837c2cff0e898e0973d88cb73474f978 +Author: zhujinyong +Date: Sun Jul 1 02:08:31 2012 +0000 + + * check isset of menuOrder. + +commit 055412ddb41e6cf2e363b5b93bb3fdd8b115a5b4 +Author: wangchunsheng +Date: Sun Jul 1 02:07:25 2012 +0000 + + * fix the login error. + +commit 4d4413828dd3bd91f190973a96e07ac1c860001d +Author: zhujinyong +Date: Sun Jul 1 02:06:32 2012 +0000 + + * adjust menuOrder. + +commit 52e8dc12ad124bdb323e397429bc83f282f49efd +Author: zhujinyong +Date: Sun Jul 1 02:05:18 2012 +0000 + + * adjust menuOrder. + +commit bdf4c0d1e9141f8f90779ed2588a5162851d6905 +Author: zhujinyong +Date: Sun Jul 1 01:59:14 2012 +0000 + + * adjust menuOrder. + +commit 10883b31bc3e5840b3d951f6ac2296d89f41ea0b +Author: zhujinyong +Date: Sun Jul 1 01:58:06 2012 +0000 + + * adjust menuOrder. + +commit d073e88a2785a627108168bc5f16d744e10b6682 +Author: zhujinyong +Date: Sun Jul 1 01:54:28 2012 +0000 + + * adjust menuOrder. + +commit 7705ce5b598a8e07fb77fd463125e8e0529d7880 +Author: zhujinyong +Date: Sun Jul 1 01:51:38 2012 +0000 + + * adjust menuOrder. + +commit 84168198e8eeb4cbda374a250739397b2106c5ea +Author: zhujinyong +Date: Sun Jul 1 01:50:13 2012 +0000 + + * adjust menuOrder. + +commit 482a6bdd3d70259892716e7c07456252335e4913 +Author: zhujinyong +Date: Sun Jul 1 01:46:56 2012 +0000 + + * adjust menuOrdrer. + +commit 5f5d8f19abe72414c6ac0a1d6f63581937375386 +Author: chencongzhi520@gmail.com +Date: Sun Jul 1 01:34:04 2012 +0000 + + * Adjust the icon. + +commit 739d59d0f461da6cd6808f07da470ccda10ee3e3 +Author: chencongzhi520@gmail.com +Date: Sun Jul 1 01:25:16 2012 +0000 + + * Adjust the icon. + +commit d8b1f914db7cf6504dcbb0e738c8aac0bcf84a4e +Author: chencongzhi520@gmail.com +Date: Sun Jul 1 01:21:19 2012 +0000 + + * Adjust the icon. + +commit 329c7fa8963e345da0d2e3bcb0da91df238450fb +Author: areyou123456 +Date: Sun Jul 1 01:14:42 2012 +0000 + + * finish a bug #318 + +commit d5b08a2379dec42d58b7b825ec6d6dc21a87da32 +Author: chencongzhi520@gmail.com +Date: Sun Jul 1 01:09:45 2012 +0000 + + * Adjust the icon. + +commit 32c5f410882097852aed261d9064e5d1bb4ab285 +Author: chencongzhi520@gmail.com +Date: Sun Jul 1 00:39:16 2012 +0000 + + * Process the `left` to left. + +commit b262f5e8bd52a9db363c61f790d00802d066583c +Author: chencongzhi520@gmail.com +Date: Sun Jul 1 00:13:49 2012 +0000 + + * Adjust the align of product and project block. + +commit 763fff16a4bae42c098ed03040510a0c1d369448 +Author: wangchunsheng +Date: Sun Jul 1 00:05:16 2012 +0000 + + * adjust the topbar. + +commit 0130b1f1b0e39a65436b95fae31e13f700138703 +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 10:59:47 2012 +0000 + + * Adjust the icon. + +commit de02e86ff8171a79a5018fa07a4002cbfc5751ae +Author: zhujinyong +Date: Sat Jun 30 10:59:04 2012 +0000 + + * fix a bug : testtask lost. + +commit 09f98ca322bc22f5fa0dc94820d5f8d68b2aa087 +Author: zhujinyong +Date: Sat Jun 30 09:23:53 2012 +0000 + + - remove 'edit' and 'delete' menu. + +commit a5e174431adcbebe744f01f37e8704ee2ee12a19 +Author: shiyangyangwork@yahoo.cn +Date: Sat Jun 30 09:21:27 2012 +0000 + + * fix a bug of create of task. + +commit e585a27819202ecbd8b11c843840a9cc6a71b7d4 +Author: zhujinyong +Date: Sat Jun 30 09:15:47 2012 +0000 + + * adjust menu. + +commit 11914a67cb9325a893e29432e543d7795f23a000 +Author: wangyidong +Date: Sat Jun 30 08:53:06 2012 +0000 + + * add a delete item method for setting. + +commit 132ce7fa51cd27c878c94b617660d49bda7e1964 +Author: areyou123456 +Date: Sat Jun 30 08:49:00 2012 +0000 + + * finish a bug #319 + +commit e8e0b7641251a16c87fbc25eca7069c0c352aa22 +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 08:44:09 2012 +0000 + + * Adjust bug list. + +commit f89921cd2ef6800da76e6ea0b28b82b1b20bc50d +Author: zhujinyong +Date: Sat Jun 30 08:29:49 2012 +0000 + + * fix a bug : menu not menuOrder. + +commit cfb6b6553177770d6c903a1a5c245fe84e7f1eb0 +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 08:25:53 2012 +0000 + + * Hide the import link of testcase. + +commit 77ab2c769ff6a5885b4c2a18933c5f3b153ab06b +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 08:22:32 2012 +0000 + + * Adjust the bug severity icon. + +commit 23dddd5526cc3b7d00e517fb87433be0646b2bac +Author: zhujinyong +Date: Sat Jun 30 08:19:43 2012 +0000 + + + add menuOrder. + +commit d3d696b8e926e6434976f159c5acdfd4c6bf4eae +Author: wangchunsheng +Date: Sat Jun 30 08:05:43 2012 +0000 + + * adjust the login form. + +commit e7031c192d908ed244daf94a81c178dd20a99c68 +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 07:49:46 2012 +0000 + + * Add import encode list. + +commit 9e7b9c3777de126fe2724bbee5c74832ce4c67b4 +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 07:49:01 2012 +0000 + + * Add import for testcase. + +commit 4d8473fd658d1cd2a23e8eab0a7be2d9e0afd304 +Author: zhujinyong +Date: Sat Jun 30 07:48:08 2012 +0000 + + * fix a bug : include error. + +commit 421764720230f2f6ef12ea3fa5bc8cb701c184d0 +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 07:47:51 2012 +0000 + + * Adjust the icon. + +commit 42f15203263f74578c031f563e9acd406ce8cfe3 +Author: shiyangyangwork@yahoo.cn +Date: Sat Jun 30 07:36:19 2012 +0000 + + * update zentao.sql. + +commit 537a0f7636304e36b87de007434e911364cdef38 +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 07:25:52 2012 +0000 + + * Code for task#727. + +commit 78873b15e7698bc9ccb3302fe0a9a30ff37c3a23 +Author: wangchunsheng +Date: Sat Jun 30 07:10:32 2012 +0000 + + * adjust the create form's style. + * adjust row height of table. + * adjust fieldset's style. + +commit fbc412e1030ac56125e622d3b470cc4b6bbd34ba +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 07:08:13 2012 +0000 + + * Adjust the icon. + +commit 7edbed63e820d5893e251aaf229ad6c8ca261c63 +Author: wangchunsheng +Date: Sat Jun 30 07:08:07 2012 +0000 + + - remove the helplink feature. + +commit 8d544b2393f77485136074a4df7c76eedae3be62 +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 07:06:59 2012 +0000 + + * Adjust the icon. + +commit feedce60cb5d924535e8d082b6f349ee8cc898ac +Author: shiyangyangwork@yahoo.cn +Date: Sat Jun 30 07:06:40 2012 +0000 + + * add module of zt_task in db. + +commit 3a8f688e4f2df2fdbb1b6797047e735c3aa53646 +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 06:52:52 2012 +0000 + + * Adjust the icon. + +commit 0f9f2607d78bb44eb43de9ed04169d3f6b85da94 +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 06:51:50 2012 +0000 + + * Adjust the icon. + +commit fb7de8c997cbe967eab8cdd3797580b8bcc5149f +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 06:51:06 2012 +0000 + + * Adjust the icon. + +commit 581a7b1a6866c607cf1b80858cc13cd330fa273a +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 06:50:29 2012 +0000 + + * Adjust the printLink function judge whether need newline. + +commit c1a18f55ddd78bcbc0128126a2725a033d746880 +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 06:49:16 2012 +0000 + + * Change a tag function adjust whether need newline. + +commit 9ec694cf4ed78e6f645beb283e0b9b8eef2a389b +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 06:48:15 2012 +0000 + + * Add zentao icon. + +commit 4957fad27ca159d20a5ffa8831263d26b835d3e7 +Author: wangchunsheng +Date: Sat Jun 30 05:14:51 2012 +0000 + + * adjust the style of chosen for product. + +commit a403b6d0cf7ba33e166ca3ef3fa0eee0b765227d +Author: shiyangyangwork@yahoo.cn +Date: Sat Jun 30 03:33:43 2012 +0000 + + * update db for adding module of task. + +commit 1b1877637462086300cca991a1b1ec99f5ca77d5 +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 02:53:54 2012 +0000 + + * Replace action link instead of icons. + +commit 0c5d4a5094d69e88753d82383c6e01a7f541a8dc +Author: chencongzhi520@gmail.com +Date: Sat Jun 30 02:52:48 2012 +0000 + + * Replace action link instead icon. + +commit 1f7d094231d4a00dcb0dcf1c116bc09179950737 +Author: zhujinyong +Date: Sat Jun 30 02:37:37 2012 +0000 + + * adjust style of product info report. + +commit 3d60ba2bfdc01b07ac3a9f5345f5cad72bb43b63 +Author: zhujinyong +Date: Sat Jun 30 02:36:43 2012 +0000 + + + add zh-cn language of report. + +commit 53f35b583a64fa0bacb7696233db66a48dd86e86 +Author: wangchunsheng +Date: Sat Jun 30 02:25:33 2012 +0000 + + * adjust the link color in feature bar. + * adjust the button's padding. + * adjust the table color. + +commit a4d9694d6fa965e8e7bcf8de5bf6a97c9944622d +Author: wangchunsheng +Date: Sat Jun 30 02:23:09 2012 +0000 + + * adjust the table color. + +commit efd2269c5b649cf3c67499200b2111b498054033 +Author: wangchunsheng +Date: Sat Jun 30 01:58:05 2012 +0000 + + * adjust the pager tip. + +commit 5aeab032831f24a1ed4689570e69f98fe5826a1b +Author: wangchunsheng +Date: Sat Jun 30 01:39:56 2012 +0000 + + * adjust the color of tree. + +commit 8fc5dfd984260f2584f32d3418645a6949f03242 +Author: zhujinyong +Date: Sat Jun 30 00:48:03 2012 +0000 + + + move css to common.css. + +commit 61a7852947eeec720e8007000dc9fdb9c5be0979 +Author: zhujinyong +Date: Fri Jun 29 10:37:34 2012 +0000 + + - remove date limit of workload report. + +commit d2ebeb6689390cb94c3c57e394e04ae84774f8c0 +Author: zhujinyong +Date: Fri Jun 29 10:36:58 2012 +0000 + + * add float number round. + +commit 1e99f45c9cb0dc0bd5eff8ab344264f62af9354e +Author: zhujinyong +Date: Fri Jun 29 10:36:01 2012 +0000 + + * adjust language of report. + +commit b3442e20383e5edfef00d0747510e2d7f42b62e8 +Author: zhujinyong +Date: Fri Jun 29 10:35:26 2012 +0000 + + * adjust style of report. + +commit 598c6e9fdcc2fd59cf42321426636507e59577ab +Author: wangchunsheng +Date: Fri Jun 29 09:16:55 2012 +0000 + + * adjust the boarder color of select and text. + +commit 94a38a7655566170e382db885380be832258b5a7 +Author: shiyangyangwork@yahoo.cn +Date: Fri Jun 29 08:27:11 2012 +0000 + + * finish the task #854. + +commit c9d6cb0cd24dffc058d71fa393fd85e0de53f204 +Author: wangchunsheng +Date: Fri Jun 29 08:15:00 2012 +0000 + + * adjust the topbar's margin. + +commit 84abf0397eeb09759a3668800b248145c0f0f021 +Author: wangchunsheng +Date: Fri Jun 29 08:14:30 2012 +0000 + + - remove the keywords and description. + * adjust the header. + +commit cf956ce82294c587233d860e543a0db04cf86e20 +Author: chencongzhi520@gmail.com +Date: Fri Jun 29 06:34:50 2012 +0000 + + * Add action icons. + * Code for task#831. + +commit f1b909c0d237562b49934efe8f13976ee6ef0e24 +Author: chencongzhi520@gmail.com +Date: Fri Jun 29 06:21:07 2012 +0000 + + * Add chosen.css. + * code for task#727. + +commit 29a5660d06203c9733b737eb87d561edb13cffcb +Author: chencongzhi520@gmail.com +Date: Fri Jun 29 06:08:03 2012 +0000 + + * code for task#727. + +commit c605a704207c7d6bdf529459bd5648afccee6168 +Author: chencongzhi520@gmail.com +Date: Fri Jun 29 06:07:34 2012 +0000 + + * Code for task#727. + +commit d9afee028d4dbc8a2aba5c7f10af89b8daffbb59 +Author: wangchunsheng +Date: Fri Jun 29 05:55:50 2012 +0000 + + * foucus the searchQuery auto. + * adjust the placeholder info of searchquery. + +commit a507f4f4df00a29cb0f9bea19ed96f5e76664e6c +Author: wangchunsheng +Date: Fri Jun 29 03:41:27 2012 +0000 + + - remove the keywords and desc from the template. + +commit 00b78808f01ac93bdf9d0fa7e92dfe146de34e42 +Author: wangchunsheng +Date: Fri Jun 29 03:33:03 2012 +0000 + + * adjust the search query and search type's color. + * adjust the #modulemenu activate's color. + +commit ce3d8e680044d60e6b08a6b158de651844222e69 +Author: wangchunsheng +Date: Fri Jun 29 03:14:50 2012 +0000 + + * adjust the color of header. + +commit 2f9f67c7bc918243f5e99031ba0d179ac300964e +Author: wangchunsheng +Date: Fri Jun 29 03:10:12 2012 +0000 + + + upgrade the version. + +commit 18f53e97ef062b924294333107880d7962665159 +Author: wangchunsheng +Date: Fri Jun 29 03:09:14 2012 +0000 + + - remove the feature of selection products or projects by keyboard. + +commit 72441bedf9b5fab4a16cbd9d19e69e40755d1b6a +Author: wangchunsheng +Date: Fri Jun 29 03:05:26 2012 +0000 + + - remove the feature of selection products or projects by keyboard. + +commit 757a29bd436f99efcc950f66ad05152ff5ac7a1b +Author: zhujinyong +Date: Fri Jun 29 02:47:11 2012 +0000 + + + add workload javascript. + +commit f2de2cfd08cc69b0c58dbb1091a27cf874c1e05a +Author: zhujinyong +Date: Fri Jun 29 02:46:28 2012 +0000 + + + add time select. + +commit d19a61c7082a2303ad62b204ead47b03251b7457 +Author: zhujinyong +Date: Fri Jun 29 02:44:50 2012 +0000 + + * change list to