Merge branch 'master' of https://github.com/easysoft/zentaopms

VERSION

@@ -1 +1 @@
-10.5.stable
+10.5.1

config/config.php

@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
 if(!function_exists('getWebRoot')){function getWebRoot(){}}
 
 /* 基本设置。Basic settings. */
-$config->version    = '10.5';               // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
+$config->version    = '10.5.1';               // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
 $config->charset    = 'UTF-8';              // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
 $config->cookieLife = time() + 2592000;     // Cookie的生存时间。The cookie life time.
 $config->timezone   = 'Asia/Shanghai';      // 时区设置。        The time zone setting, for more see http://www.php.net/manual/en/timezones.php.

module/doc/css/index.css

@@ -9,4 +9,6 @@
 #libs .libs-custom-heading a{display:block;height:100%;}
 #libs .libs-custom-heading .lable-custom{position: absolute;left:8px;}
 #libs hr {margin-top:0px;}
-#libs .panel-body {overflow: auto; max-height: 224px;}
+#libs .panel-body {overflow: auto; max-height: 224px;}
+
+#pageActions ul.dropdown-menu{left: 67px}

module/doc/lang/en.php

@@ -141,7 +141,7 @@ $lang->doc->customObjectLibs['customFiles'] = 'Show Custom Library';
 
 $lang->doc->customShowLibs = 'Library display settings';
 $lang->doc->customShowLibsList['zero']     = 'Display empty library';
-$lang->doc->customShowLibsList['unclosed'] = 'Display projects that are not closed';
+$lang->doc->customShowLibsList['unclosed'] = 'Only display projects that are not closed';
 
 $lang->doc->confirmDelete      = "Do you want to delete this document?";
 $lang->doc->confirmDeleteLib   = "Do you want to delete this Doc Lib?";

module/doc/lang/zh-cn.php

@@ -141,7 +141,7 @@ $lang->doc->customObjectLibs['customFiles'] = '显示自定义文档库';
 
 $lang->doc->customShowLibs = '文档库显示设置';
 $lang->doc->customShowLibsList['zero']     = '显示空文档的库';
-$lang->doc->customShowLibsList['unclosed'] = '显示未关闭的项目';
+$lang->doc->customShowLibsList['unclosed'] = '只显示未关闭的项目';
 
 $lang->doc->confirmDelete      = "您确定删除该文档吗？";
 $lang->doc->confirmDeleteLib   = "您确定删除该文档库吗？";

module/story/lang/zh-tw.php

@@ -181,6 +181,7 @@ $lang->story->lblChange            = '變更需求';
 $lang->story->lblReview            = '評審需求';
 $lang->story->lblActivate          = '激活需求';
 $lang->story->lblClose             = '關閉需求';
+$lang->story->lblTBC               = '任務Bug用例';
 
 $lang->story->checkAffection       = '影響範圍';
 $lang->story->affectedProjects     = '影響的' . $lang->projectCommon;

module/task/lang/zh-tw.php

@@ -39,6 +39,7 @@ $lang->task->confirmStoryChange  = "確認需求變動";
 $lang->task->progress            = '進度';
 $lang->task->progressTips        = '已消耗/(已消耗+剩餘)';
 $lang->task->copy                = '複製任務';
+$lang->task->waitTask            = '未開始的任務';
 
 $lang->task->common           = '任務';
 $lang->task->id               = '編號';

module/upgrade/lang/version.php

@@ -97,3 +97,4 @@ $lang->upgrade->fromVersions['10_2']       = '10.2';
 $lang->upgrade->fromVersions['10_3']       = '10.3';
 $lang->upgrade->fromVersions['10_3_1']     = '10.3.1';
 $lang->upgrade->fromVersions['10_4']       = '10.4';
+$lang->upgrade->fromVersions['10_5']       = '10.5';

module/upgrade/model.php

@@ -240,6 +240,7 @@ class upgradeModel extends model
             case '10_4':
                 $this->execSQL($this->getUpgradeFile('10.4'));
                 $this->changeTaskParentValue();
+            case '10_5':
         }
 
         $this->deletePatch();
@@ -356,6 +357,7 @@ class upgradeModel extends model
             case '10_3':
             case '10_3_1':     $confirmContent .= file_get_contents($this->getUpgradeFile('10.3.1'));
             case '10_4':       $confirmContent .= file_get_contents($this->getUpgradeFile('10.4'));
+            case '10_5':
         }
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
     }