diff --git a/module/design/control.php b/module/design/control.php index 83dccda826..f7525c16ab 100644 --- a/module/design/control.php +++ b/module/design/control.php @@ -310,7 +310,7 @@ class design extends control $repoID = $repoID ? $repoID : key($repos); $repo = $this->loadModel('repo')->getRepoByID($repoID); - $revisions = $this->repo->getCommits($repo, '', 'HEAD', '', '', $begin, $end); + $revisions = $this->repo->getCommits($repo, '', 'HEAD', '', '', $begin, date('Y-m-d 23:59:59', strtotime($end))); if($_POST) { diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index 3040a6e2b1..299daac777 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -19,10 +19,13 @@ diff --git a/module/repo/model.php b/module/repo/model.php index dad33fcd20..4084cf90c8 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -376,7 +376,7 @@ class repoModel extends model foreach($repos as $repo) { $repo->acl = json_decode($repo->acl); - $scm = $repo->SCM == 'Subversion' ? 'svn' : 'git'; + $scm = $repo->SCM == 'Subversion' ? 'svn' : strtolower($repo->SCM); if($this->checkPriv($repo)) { if(($type == 'project' or $type == 'execution') and $projectID) diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index 480d43dfa3..b8b626cb9d 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -70,7 +70,7 @@ $lang->upgrade->to15Desc = <<You can try the online demo before you decide to enable new features: New Features Online Demo

You can also download an introduction PPT to help you understand it: New Features Introduction PPT

-

ZenTao Version 15.0 Introduction

+

ZenTao Version 15 Introduction


How do you like to use ZenTao?

EOD; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index cccfad8fa8..0d2b22ce7a 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -73,7 +73,7 @@ $lang->upgrade->to15Desc = <<您可以在线体验最新版本的功能,以决定是否启用新的模式:最新版演示demo

您还可以下载新版本功能介绍PPT:最新版功能介绍PPT

-

禅道15.0版本介绍

+

禅道15版本介绍


请问您计划如何使用禅道的新版本呢?

EOD; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index 9c4f163bb8..3d176575c8 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -73,7 +73,7 @@ $lang->upgrade->to15Desc = <<您可以在綫體驗最新版本的功能,以決定是否啟用新的模式:最新版演示demo

您還可以下載新版本功能介紹PPT:最新版功能介紹PPT

-

禪道15.0版本介紹

+

禪道15版本介紹


請問您計劃如何使用禪道的新版本呢?

EOD;