Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

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

Browse Source
This commit is contained in:
wangyidong
2019-06-04 09:44:48 +08:00
parent b561598c63 32e5c9bea5
commit fe9c2c277b
8 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/lang/en.php
+2 -2
View File
@@ -150,8 +150,8 @@ $lang->doc->fastMenuIconList['collectedbyme'] = 'icon-folder-star';
$lang->doc->customObjectLibs['files'] = 'Show Attachment Library';
$lang->doc->customObjectLibs['customFiles'] = 'Show Custom Library';
$lang->doc->orderLib = 'Library Rank Settings';
$lang->doc->customShowLibs = 'Library Display Settings';
$lang->doc->orderLib = 'Rank Settings';
$lang->doc->customShowLibs = 'Display Settings';
$lang->doc->customShowLibsList['zero'] = 'Display Empty Library';
$lang->doc->customShowLibsList['children'] = 'Display Child-category Documents';
$lang->doc->customShowLibsList['unclosed'] = 'Display Active Projects Only';
module/misc/lang/en.php
+1 -1
View File
@@ -131,7 +131,7 @@ $lang->misc->feature->all['10.4.stable'][] = array('title'=>'Upgrade existing in
$lang->misc->feature->all['10.3.stable'][] = array('title'=>'Fix Bug.', 'desc' => '');
$lang->misc->feature->all['10.2.stable'][] = array('title'=>'Xuan.im is integrated!', 'desc' => '');
$lang->misc->feature->all['10.0.stable'][] = array('title'=>'New UI/UX and new experience', 'desc' => '<ol><li>My Dashboard</li><li>Dynamic</li><li>Product Home</li><li>Product overview</li><li>Roadmap</li><li>Project Home</li><li>Project overview</li><li>QA Home</li><li>Document Home</li><li>Added work report on My Dashboard</li><li>Add/Edit/Finish todos on My Dashboard</li><li>Add prodcut report on Product Home</li><li>Add prodcut overview on Product Home</li><li>Add project report on Project Home</li><li>Add project overview on Project Home</li><li>Add QA report on QA Home</li><li>All Product/product Home/All Project/Project Home/QA Home is moved from the right of the secondary Narbar to the left.</li><li>Kanban/Burndown/Tree/ByGroup of Project/Task has been moved from the third Navbar to the secondary one; Tree/ByGroup/Task Liat has been integrated to a drop-down.</li><li>Bug/Build of Project on the secondary Navbar has been integrated to a drop-down.</li><li>Display build and list by group, which is more reasonable.</li><li>Added tree to display docuemnt on the left of the page.</li><li>Added quick entry to document, including Last Update, My Doc and My Favorite</li><li>Added My Favorite to Doc module.</li></ol>');
$lang->misc->feature->all['10.0.stable'][] = array('title'=>'New UI/UX and new experience', 'desc' => '<ol><li>My Dashboard</li><li>Dynamics</li><li>Product Home</li><li>Product Overview</li><li>Roadmap</li><li>Project Home</li><li>Project overview</li><li>QA Home</li><li>Document Home</li><li>Added work report on My Dashboard</li><li>Add/Edit/Finish todos on My Dashboard</li><li>Add prodcut report on Product Home</li><li>Add prodcut overview on Product Home</li><li>Add project report on Project Home</li><li>Add project overview on Project Home</li><li>Add Testing report on QA Home</li><li>All Product/product Home/All Project/Project Home/QA Home is moved from the right of the secondary Navbar to the left.</li><li>Kanban/Burndown/Tree/ByGroup of Project/Task has been moved from the third Navbar to the secondary one; Tree/ByGroup/Task List has been integrated to a drop-down.</li><li>Bug/Build of Project on the secondary Navbar has been integrated to a drop-down.</li><li>Display build and list by group, which is more reasonable.</li><li>Added tree to display document on the left of the page.</li><li>Added quick entry to document, including Last Update, My Doc and My Favorite</li><li>Added My Favorite to Doc module.</li></ol>');
$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Message centralized management', 'desc' => '<p>Gather Mail，SMS，webhook into Message</p>');
$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Add recurred Todo', 'desc' => '');
module/report/css/bugcreate.css
+3
View File
@@ -1,2 +1,5 @@
#begin{min-width: 85px}
#end{min-width: 85px}
table th{font-size: 12px}
table th:nth-child(7){width: 87px}
table th:nth-child(10){width: 100px}
module/report/lang/en.php
+4 -4
View File
@@ -49,8 +49,8 @@ $lang->report->deviationChart = $lang->projectCommon . ' Deviation Chart';
$lang->reportList->project->lists[10] = $lang->projectCommon . ' Deviation|report|projectdeviation';
$lang->reportList->product->lists[10] = $lang->productCommon . ' Summary|report|productsummary';
$lang->reportList->test->lists[10] = 'Bug Reported|report|bugcreate';
$lang->reportList->test->lists[13] = 'Bug Assigned|report|bugassign';
$lang->reportList->test->lists[10] = 'Bug Reported Summary|report|bugcreate';
$lang->reportList->test->lists[13] = 'Bug Assigned Summary|report|bugassign';
$lang->reportList->staff->lists[10] = 'Team Workload|report|workload';
$lang->report->id = 'ID';
@@ -80,8 +80,8 @@ $lang->report->typeList['bar'] = 'Bar';
$lang->report->typeList['line'] = 'Line';
$lang->report->conditions = 'Filter by:';
$lang->report->closedProduct = 'Closed ' . $lang->productCommon;
$lang->report->overduePlan = 'Expired Plan';
$lang->report->closedProduct = 'Closed ' . $lang->productCommon . 's';
$lang->report->overduePlan = 'Expired Plans';
/* daily reminder. */
$lang->report->idAB = 'ID';
module/task/lang/en.php
+4 -4
View File
@@ -78,7 +78,7 @@ $lang->task->assignTo = $lang->task->assign;
$lang->task->batchAssignTo = 'Batch Assign';
$lang->task->assignedTo = 'AssignedTo';
$lang->task->assignedToAB = 'AssignedTo';
$lang->task->assignedDate = 'AssignedOn';
$lang->task->assignedDate = 'AssignedDate';
$lang->task->openedBy = 'CreatedBy';
$lang->task->openedDate = 'CreatedDate';
$lang->task->openedDateAB = 'CreatedOn';
@@ -93,7 +93,7 @@ $lang->task->closedBy = 'ClosedBy';
$lang->task->closedDate = 'ClosedDate';
$lang->task->closedReason = 'CloseReason';
$lang->task->lastEditedBy = 'ModifiedBy';
$lang->task->lastEditedDate = 'ModifiedOn';
$lang->task->lastEditedDate = 'ModifiedDate';
$lang->task->lastEdited = 'Last Edited';
$lang->task->recordEstimate = '%';
$lang->task->editEstimate = 'Edit Estimates';
@@ -117,8 +117,8 @@ $lang->task->lblTestStory = 'Story Tested';
$lang->task->ditto = 'Ditto';
$lang->task->dittoNotice = "This Task is not linked to the project as the previous one is!";
$lang->task->selectTestStory = 'Select Story Testd';
$lang->task->selectAllUser = 'All Users';
$lang->task->noStory = 'No Story';
$lang->task->selectAllUser = 'Load All Users';
$lang->task->noStory = 'No Story Linked';
$lang->task->noAssigned = 'Unassigned';
$lang->task->noFinished = 'Unfinished';
$lang->task->noClosed = 'Unclosed';
module/testreport/lang/en.php
+3 -3
View File
@@ -1,6 +1,6 @@
<?php
$lang->testreport->common = 'QA Report';
$lang->testreport->browse = 'QA Report';
$lang->testreport->common = 'Testing Report';
$lang->testreport->browse = 'Testing Reports';
$lang->testreport->create = 'Create Report';
$lang->testreport->edit = 'Edit Report';
$lang->testreport->delete = 'Delete';
@@ -64,7 +64,7 @@ $lang->testreport->noReport = "No report has been generated. Please check
$lang->testreport->foundBugTip = "Bugs generated in this build and generated in the test period.";
$lang->testreport->legacyBugTip = "Active bugs, or solved bugs that are not in the test period.";
$lang->testreport->fromCaseBugTip = "Bugs generated due to the failed case run in the test period.";
$lang->testreport->errorTrunk = "You cannot create a Test report for the trunk. Please modify the linked build!";
$lang->testreport->errorTrunk = "You cannot create a Testing report for the trunk. Please modify the linked build!";
$lang->testreport->moreProduct = "Testing reports can only be generated for the same product.";
$lang->testreport->bugSummary = <<<EOD
module/user/lang/en.php
+2 -2
View File
@@ -87,8 +87,8 @@ $lang->user->project = $lang->projectCommon;
$lang->user->task = 'Task';
$lang->user->bug = 'Bug';
$lang->user->test = 'QA';
$lang->user->testTask = 'Request';
$lang->user->testCase = 'Case';
$lang->user->testTask = 'Test Request';
$lang->user->testCase = 'Test Case';
$lang->user->schedule = 'Schedule';
$lang->user->todo = 'Todo';
$lang->user->story = 'Story';
module/webhook/lang/en.php
+7 -7
View File
@@ -15,7 +15,7 @@ $lang->webhook->delete = 'Delete';
$lang->webhook->id = 'ID';
$lang->webhook->type = 'Type';
$lang->webhook->name = 'Name';
$lang->webhook->url = 'Webhook Address';
$lang->webhook->url = 'Webhook URL';
$lang->webhook->domain = 'ZenTao Domain';
$lang->webhook->contentType = 'Content Type';
$lang->webhook->sendType = 'Sending Type';
@@ -55,13 +55,13 @@ $lang->webhook->confirmDelete = 'Do you want to delete this hook?';
$lang->webhook->trimWords = '';
$lang->webhook->note = new stdClass();
$lang->webhook->note->async = 'If the send type is asynchronous, you need open cron.';
$lang->webhook->note->product = "All actions will trigger the hook if the {$lang->productCommon} is empty, else only actions of the {$lang->productCommon} will trigger it.";
$lang->webhook->note->project = "All actions will trigger the hook if the {$lang->projectCommon} is empty, else only actions of the {$lang->projectCommon} will trigger it.";
$lang->webhook->note->async = 'If the sending type is asynchronous, you need turn on cron.';
$lang->webhook->note->product = "All actions will trigger the hook if {$lang->productCommon} is empty, or only actions of {$lang->productCommon} will trigger it.";
$lang->webhook->note->project = "All actions will trigger the hook if {$lang->projectCommon} is empty, or only actions of {$lang->projectCommon} will trigger it.";
$lang->webhook->note->typeList['bearychat'] = 'Add a ZenTao bot in bearychat and get the webhook address.';
$lang->webhook->note->typeList['dingding'] = 'Add a customed bot in dingding and get the webhook address.';
$lang->webhook->note->typeList['default'] = 'Get a webhook address from others';
$lang->webhook->note->typeList['bearychat'] = 'Add a ZenTao bot in bearychat and get the webhook url.';
$lang->webhook->note->typeList['dingding'] = 'Add a customized bot in dingding and get the webhook url.';
$lang->webhook->note->typeList['default'] = 'Get a webhook url from others';
$lang->webhook->error = new stdclass();
$lang->webhook->error->curl = 'Load php-curl in php.ini.';