bug->action->unlinkedfromplan = array('main' => '$date, supprimé par $actor du Plan $extra.');
$lang->bug->action->linked2build = array('main' => '$date, lié par $actor au Build $extra.');
$lang->bug->action->unlinkedfrombuild = array('main' => '$date, retiré par $actor du Build $extra.');
-$lang->bug->action->linked2release = array('main' => '$date, ajouté par $actor à la Release $extra.');
$lang->bug->action->unlinkedfromrelease = array('main' => '$date, retiré par $actor de la Release $extra.');
+$lang->bug->action->linked2release = array('main' => '$date, ajouté par $actor à la Release $extra.');
$lang->bug->action->linked2revision = array('main' => '$date, linked by $actor to Revision $extra.');
$lang->bug->action->unlinkedfromrevision = array('main' => '$date, unlinked by $actor to Revision $extra.');
$lang->bug->action->linkrelatedbug = array('main' => '$date, associé par $actor au Bug $extra.');
diff --git a/module/execution/view/build.html.php b/module/execution/view/build.html.php
index 38b6f48b2e..570bf72994 100644
--- a/module/execution/view/build.html.php
+++ b/module/execution/view/build.html.php
@@ -69,7 +69,7 @@
| branchName;?> |
- createLink('build', 'view', "build=$build->id"), $build->name);?> |
+ createLink('build', 'view', "build=$build->id"), $build->name);?> |
scmPath)
diff --git a/module/my/lang/de.php b/module/my/lang/de.php
index 04898925e6..b508fa00cc 100644
--- a/module/my/lang/de.php
+++ b/module/my/lang/de.php
@@ -139,14 +139,14 @@ $lang->my->productLinkList['product-browse'] = 'Demand list of the latest pro
$lang->my->projectLinkList = array();
$lang->my->projectLinkList['project-browse'] = 'Project List/Can view all items';
+$lang->my->projectLinkList['project-kanban'] = 'Project Kanban/The project board can visually view the progress of all projects';
$lang->my->projectLinkList['project-execution'] = 'All execution lists under the project/View all execution information';
$lang->my->projectLinkList['project-index'] = 'Recent Project Dashboard/You can view the current project overview';
-$lang->my->projectLinkList['project-kanban'] = 'Project Kanban/The project board can visually view the progress of all projects';
$lang->my->executionLinkList = array();
$lang->my->executionLinkList['execution-all'] = 'Execution list/You can view all executions';
-$lang->my->executionLinkList['execution-task'] = 'List of recently executed tasks/You can view the task information under the current iteration';
$lang->my->executionLinkList['execution-executionkanban'] = 'Execute Kanban/You can view the implementation status of projects in progress';
+$lang->my->executionLinkList['execution-task'] = 'List of recently executed tasks/You can view the task information under the current iteration';
$lang->my->confirmReview['pass'] = 'Do you want to pass it?';
$lang->my->guideChangeTheme = <<my->productLinkList['product-browse'] = 'Demand list of the latest pro
$lang->my->projectLinkList = array();
$lang->my->projectLinkList['project-browse'] = 'Project List/Can view all items';
+$lang->my->projectLinkList['project-kanban'] = 'Project Kanban/The project board can visually view the progress of all projects';
$lang->my->projectLinkList['project-execution'] = 'All execution lists under the project/View all execution information';
$lang->my->projectLinkList['project-index'] = 'Recent Project Dashboard/You can view the current project overview';
-$lang->my->projectLinkList['project-kanban'] = 'Project Kanban/The project board can visually view the progress of all projects';
$lang->my->executionLinkList = array();
$lang->my->executionLinkList['execution-all'] = 'Execution list/You can view all executions';
-$lang->my->executionLinkList['execution-task'] = 'List of recently executed tasks/You can view the task information under the current iteration';
$lang->my->executionLinkList['execution-executionkanban'] = 'Execute Kanban/You can view the implementation status of projects in progress';
+$lang->my->executionLinkList['execution-task'] = 'List of recently executed tasks/You can view the task information under the current iteration';
$lang->my->confirmReview['pass'] = 'Do you want to pass it?';
$lang->my->guideChangeTheme = <<my->productLinkList['product-browse'] = 'Demand list of the latest pro
$lang->my->projectLinkList = array();
$lang->my->projectLinkList['project-browse'] = 'Project List/Can view all items';
+$lang->my->projectLinkList['project-kanban'] = 'Project Kanban/The project board can visually view the progress of all projects';
$lang->my->projectLinkList['project-execution'] = 'All execution lists under the project/View all execution information';
$lang->my->projectLinkList['project-index'] = 'Recent Project Dashboard/You can view the current project overview';
-$lang->my->projectLinkList['project-kanban'] = 'Project Kanban/The project board can visually view the progress of all projects';
$lang->my->executionLinkList = array();
$lang->my->executionLinkList['execution-all'] = 'Execution list/You can view all executions';
-$lang->my->executionLinkList['execution-task'] = 'List of recently executed tasks/You can view the task information under the current iteration';
$lang->my->executionLinkList['execution-executionkanban'] = 'Execute Kanban/You can view the implementation status of projects in progress';
+$lang->my->executionLinkList['execution-task'] = 'List of recently executed tasks/You can view the task information under the current iteration';
$lang->my->confirmReview['pass'] = 'Do you want to pass it?';
$lang->my->guideChangeTheme = <<project->datatable->fieldList['consume']['pri'] = '7';
$config->project->datatable->fieldList['progress']['title'] = 'progress';
$config->project->datatable->fieldList['progress']['fixed'] = 'no';
-$config->project->datatable->fieldList['progress']['width'] = '60';
+$config->project->datatable->fieldList['progress']['width'] = '65';
$config->project->datatable->fieldList['progress']['required'] = 'no';
$config->project->datatable->fieldList['progress']['sort'] = 'no';
$config->project->datatable->fieldList['progress']['pri'] = '6';
$config->project->datatable->fieldList['actions']['title'] = 'actions';
$config->project->datatable->fieldList['actions']['fixed'] = 'right';
-$config->project->datatable->fieldList['actions']['width'] = '180';
+$config->project->datatable->fieldList['actions']['width'] = '165';
$config->project->datatable->fieldList['actions']['required'] = 'yes';
$config->project->datatable->fieldList['actions']['pri'] = '1';
diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php
index f16668565b..cc5b0eb611 100644
--- a/module/project/view/manageproducts.html.php
+++ b/module/project/view/manageproducts.html.php
@@ -11,6 +11,9 @@
*/
?>
+
+
+
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index aabf2af686..76a05f2302 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -12,6 +12,9 @@
?>
+
+
+
@@ -195,7 +198,7 @@
- | | | |
+ | | | |
|
model == 'waterfall' ? $this->project->getWaterfallProgress($project->id) : (($workhour->totalConsumed + $workhour->totalLeft) ? floor($workhour->totalConsumed / ($workhour->totalConsumed + $workhour->totalLeft) * 1000) / 1000 * 100 : 0);?>
diff --git a/module/upgrade/config.php b/module/upgrade/config.php
index 63535d3a0c..14459578e0 100644
--- a/module/upgrade/config.php
+++ b/module/upgrade/config.php
@@ -31,6 +31,7 @@ $config->upgrade->maxVersion['max3_8'] = '17_8';
$config->upgrade->maxVersion['max4_0_beta1'] = '18_0_beta1';
$config->upgrade->maxVersion['max4_0_beta2'] = '18_0_beta2';
$config->upgrade->maxVersion['max4_0_beta3'] = '18_0_beta3';
+$config->upgrade->maxVersion['max4_0'] = '18_0';
$config->upgrade->bizVersion = array();
$config->upgrade->bizVersion['biz1_0'] = '9_5_1';
@@ -100,6 +101,7 @@ $config->upgrade->bizVersion['biz7_8'] = '17_8';
$config->upgrade->bizVersion['biz8_0_beta1'] = '18_0_beta1';
$config->upgrade->bizVersion['biz8_0_beta2'] = '18_0_beta2';
$config->upgrade->bizVersion['biz8_0_beta3'] = '18_0_beta3';
+$config->upgrade->bizVersion['biz8_0'] = '18_0';
$config->upgrade->proVersion = array();
$config->upgrade->proVersion['pro1_0'] = '3_1';
diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php
index 255abfb4a1..ffe505b73e 100644
--- a/module/upgrade/lang/version.php
+++ b/module/upgrade/lang/version.php
@@ -172,6 +172,7 @@ $lang->upgrade->fromVersions['17_8'] = '17.8';
$lang->upgrade->fromVersions['18_0_beta1'] = '18.0.beta1';
$lang->upgrade->fromVersions['18_0_beta2'] = '18.0.beta2';
$lang->upgrade->fromVersions['18_0_beta3'] = '18.0.beta3';
+$lang->upgrade->fromVersions['18_0'] = '18.0';
global $config;
/* Lite. */
@@ -348,6 +349,7 @@ $lang->upgrade->fromVersions['biz7_8'] = 'Biz7.8';
$lang->upgrade->fromVersions['biz8_0_beta1'] = 'Biz8.0.beta1';
$lang->upgrade->fromVersions['biz8_0_beta2'] = 'Biz8.0.beta2';
$lang->upgrade->fromVersions['biz8_0_beta3'] = 'Biz8.0.beta3';
+$lang->upgrade->fromVersions['biz8_0'] = 'Biz8.0';
/* Max. */
$lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4';
@@ -380,3 +382,4 @@ $lang->upgrade->fromVersions['max3_7'] = 'Max3.7';
$lang->upgrade->fromVersions['max3_8'] = 'Max3.8';
$lang->upgrade->fromVersions['max4_0_beta1'] = 'Max4.0.beta1';
$lang->upgrade->fromVersions['max4_0_beta2'] = 'Max4.0.beta2';
+$lang->upgrade->fromVersions['max4_0_beta3'] = 'Max4.0.beta3';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 75fa33ea5c..734db0e769 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -1079,6 +1079,8 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($xuanxuanSql);
case '18_0_beta2':
$confirmContent .= file_get_contents($this->getUpgradeFile('18.0.beta2'));
+ case '18_0_beta3':
+ $confirmContent .= file_get_contents($this->getUpgradeFile('18.0.beta3'));
}
return $confirmContent;
diff --git a/xuanxuan/XUANVERSION b/xuanxuan/XUANVERSION
index 0d4941ed31..d18077c214 100644
--- a/xuanxuan/XUANVERSION
+++ b/xuanxuan/XUANVERSION
@@ -1 +1 @@
-839559059945d23f741a9651c547979db4e07fe6
+v7.0.0
| |