This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via f70c2a06dedcf1680320b70665152559986179a7 (commit)
via f75251fb1af02798645a1e6bf7f4ee7eaf833ac9 (commit)
via 411623ae28f8f88102aacb4f012ba09530b0266e (commit)
via ba150598e986aaf830b6a0883bd9a7eac1346789 (commit)
via 19f476edb6fc6e70b87696eee6a9bfa55788c560 (commit)
via 053a1683127bedbebae5d9151718dc52c732e6cb (commit)
via ac16a8cee952057452ce87d685045d590530bdc7 (commit)
via b60fecfe3afe1441f68734c961af30108dc3e4e7 (commit)
via 6ead7e31f4f9f440eb8328ea29ebaf01b4753360 (commit)
via 41a4e05464966878efa5e41b1d132d827d38e642 (commit)
via e11caeb4594e41d4dfc1c3487559e86f098e1cc4 (commit)
via b64c0c913e6e686990a8d3283c1bf8fcab205544 (commit)
via 7de24ad7ca9f4c05359d412cf7f95e609fe63f44 (commit)
via 4bbf773a6e9809f7d49b221d7c7fea9d1b941ab8 (commit)
via 8a9c4749ba2c74700b8c3c978d48d4e29aac33ae (commit)
via 6cd7090e5be13ae2b82439fb000e1c4006f451e2 (commit)
via bc8bd86160d287f6bc88d50a22a63f55f4278c00 (commit)
via 7bf8348806a706600c195be783bfb5d90049f239 (commit)
via 66a9c861584fb47d9c282f5a102031e398987229 (commit)
via 7eae1b4a48c488d20f30b78a2156d9eb45ced970 (commit)
via 942b4218dde91b66484bb65aab726512b24757da (commit)
via 95c133844639f8b9949703c5b50b1b8520fb2db4 (commit)
via 5ddf0c26d2d28b7651660c7a90c6352d21d41e39 (commit)
via bd3653b64ab5997a54fce70af9f2cbd9f4957ebe (commit)
via 3ac34aa6f0f21b277447f84b076061321ddd061e (commit)
via fdc2df3a465791a929ae56d65c011c3a95337881 (commit)
via c8ee5a7f73e454520bc6cb05d93fd76aafb8d37c (commit)
via 5b4f965658150d3fd77e9753b882d2f323910c3e (commit)
via f2d1d05cd98c298c641dc2a44b953b57c59eb5ee (commit)
via 88e3c1d2ba077c513b82fe6f3ecd75dc7ddafa91 (commit)
via bdd5414b820dc7b68d628e0edec5d214a76d6431 (commit)
from 6cf16f75e4164f17b9c0c3ca605712dbcbd3cc76 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=f70c2a06dedcf1680320b70665152559986179a7
commit f70c2a06dedcf1680320b70665152559986179a7
Merge: 6cf16f7 f75251f
Author: Roland Mas <[email protected]>
Date: Tue Jun 30 14:36:17 2015 +0200
Merge branch '6.0'
Conflicts:
src/debian/changelog
src/plugins/taskboard/www/js/agile-board.js
tests/buildbot/lxc/lxc-wrapper
diff --cc src/common/tracker/views/form-addextrafieldoption.php
index bb905c6,da3b86c..342f373
--- a/src/common/tracker/views/form-addextrafieldoption.php
+++ b/src/common/tracker/views/form-addextrafieldoption.php
@@@ -41,20 -39,23 +41,20 @@@ global $HTML
echo '<h2>'._('Custom Field Name')._(':
').$ac->getName().'</h2>';
$rows=count($efearr);
if ($rows > 0) {
-
- ?>
- <form action="<?php echo
'index.php?group_id='.$group_id.'&atid='.$ath->getID().'&boxid='.$boxid;
?>" method="post">
- <?php
+ echo $HTML->openForm(array('action' =>
'/tracker/admin?group_id='.$group_id.'&atid='.$ath->getID().'&boxid='.$boxid,
'method' => 'post'));
$title_arr=array();
$title_arr[]=_('Current / New positions');
- $title_arr[]=_('Up/Down positions');
- $title_arr[]=_('Elements Defined');
if ($ac->getType() == ARTIFACT_EXTRAFIELDTYPE_STATUS) {
$title_arr[] = _('Mapping');
}
+ $title_arr[]=_('Up/Down positions');
+ $title_arr[]=_('Elements Defined');
$title_arr[]='';
- echo $GLOBALS['HTML']->listTableTop ($title_arr,false,
' ');
+ echo $HTML->listTableTop ($title_arr,false, ' ');
for ($i=0; $i < $rows; $i++) {
- echo '<tr '.
$GLOBALS['HTML']->boxGetAltRowStyle($i) .'>'.
+ echo '<tr '. $HTML->boxGetAltRowStyle($i) .'>'.
'<td class="align-right">'.
($i + 1).' --> <input type="text"
name="order['. $efearr[$i]['element_id'] .']" value="" size="3" maxlength="3"
/>'.
"</td>\n";
diff --cc src/debian/changelog
index 25be1c4,cada704..856b371
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
+fusionforge (6.0.50-0) UNRELEASED; urgency=medium
+
+ * New snapshot from master branch.
+
+ -- Roland Mas <[email protected]> Wed, 24 Jun 2015 11:32:26 +0200
+
+ fusionforge (6.0.1-2) UNRELEASED; urgency=medium
+
+ * New upstream snapshot following the stable branch.
+ * Silent lintian command-with-path-in-maintainer-script
+ * Remove logs on purge (closes: #789801)
+ * Fix upgrade conflict on locale files (closes: #789925)
+ * Stop fusionforge-systasksd on uninstall (closes: #789778)
+
+ -- Sylvain Beucler <[email protected]> Wed, 24 Jun 2015 17:09:24 +0200
+
fusionforge (6.0.1-1) unstable; urgency=medium
* New upstream release.
diff --cc src/plugins/taskboard/www/js/agile-board.js
index d55b7fc,dc7dd85..7c14ffa
--- a/src/plugins/taskboard/www/js/agile-board.js
+++ b/src/plugins/taskboard/www/js/agile-board.js
@@@ -139,15 -139,12 +139,15 @@@ function drawBoardProgress()
if( taskInPhase( aUserStories[i].tasks[t],
aPhases[j].id ) ) {
aPhases[j].progressTasks ++;
totalTasks ++;
-
+
if(
aUserStories[i].tasks[t].estimated_dev_effort ) {
- totalCostEstimated += parseInt(
aUserStories[i].tasks[t].estimated_dev_effort );
- totalCostRemaining += parseInt(
aUserStories[i].tasks[t].remaining_dev_effort );
+ totalCostEstimated +=
parseFloat( aUserStories[i].tasks[t].estimated_dev_effort );
+ }
+
+ if(
aUserStories[i].tasks[t].remaining_dev_effort ) {
+ totalCostRemaining +=
parseFloat( aUserStories[i].tasks[t].remaining_dev_effort );
}
-
+
lastPhaseWithTasks = j;
}
}
@@@ -185,11 -182,11 +185,11 @@@
// show progress by cost
html += '<table>';
html += '<tr><td width="' + parseInt( 100 / aPhases.length ) +
'%" style="padding: 0;">' + gMessages.progressByCost + ':</td><td
style="padding: 0;">';
- html += '<div class="agile-board-progress-bar-done"
style="width: ' + wt + '%;">' + totalCostCompleted + '</div>';
- html += '<div class="agile-board-progress-bar-remains"
style="width: ' + ( 100 - wt ) + '%;">' + totalCostRemaining + '</div>';
+ html += '<div class="agile-board-progress-bar-done"
style="width: ' + wt + '%;" title="' + gMessages['completedCost'] + '">' +
totalCostCompleted + '</div>';
+ html += '<div class="agile-board-progress-bar-remains"
style="width: ' + ( 100 - wt ) + '%;" title="' + gMessages['remainingCost'] +
'">' + totalCostRemaining + '</div>';
html += '</td></tr><table>';
}
-
+
jQuery('#agile-board-progress').html( html );
}
@@@ -483,6 -480,6 +483,5 @@@ function initEditable()
});
}
});
-
-
}
-----------------------------------------------------------------------
Summary of changes:
autoinstall/common-backports | 25 +++++----
src/CHANGES | 11 ++++
src/GNUmakefile | 1 +
src/common/frs/FRSPackage.class.php | 10 +++-
src/common/frs/views/listpackages.php | 2 +-
src/common/include/RBAC.php | 6 ++-
src/common/include/account.php | 3 +-
.../tracker/views/form-addextrafieldoption.php | 4 +-
src/cronjobs/lists/mailing_lists_create.php | 25 +++++++--
src/debian/changelog | 10 ++++
src/debian/control.in | 2 +
src/debian/fusionforge-common.postrm | 2 +
src/debian/fusionforge-common.prerm | 1 +
src/debian/fusionforge-db-local.prerm | 1 +
...orge-db-local.prerm => fusionforge-lists.prerm} | 3 +-
src/debian/fusionforge-mta-exim4.prerm | 1 +
src/debian/fusionforge-mta-postfix.prerm | 1 +
src/debian/fusionforge-shell.prerm | 1 +
...onforge-shell.postrm => fusionforge-web.postrm} | 10 ++--
src/debian/fusionforge-web.prerm | 2 +-
src/debian/plugin.prerm | 2 +-
src/etc/config.ini.d/defaults.ini | 1 +
src/etc/httpd.conf.d/vhost-list.inc | 11 ++--
src/plugins/mediawiki/bin/install.sh | 3 +-
.../common/include/TaskBoardHtml.class.php | 4 +-
.../taskboard/common/views/admin/columns.php | 4 +-
...-plugin-taskboard-fix-columnbackgroundcolor.sql | 1 +
src/plugins/taskboard/www/index.php | 38 ++++++-------
src/plugins/taskboard/www/js/agile-board.js | 63 +++++++++++-----------
src/post-install.d/common/systasksd.sh | 3 ++
src/post-install.d/lists/lists.sh | 24 +++++----
src/post-install.d/web/web.sh | 3 ++
src/www/mail/admin/index.php | 4 --
tests/buildbot/lxc/Makefile | 8 ++-
tests/buildbot/lxc/lxc-wrapper | 2 +-
35 files changed, 182 insertions(+), 110 deletions(-)
copy src/debian/{fusionforge-db-local.prerm => fusionforge-lists.prerm} (86%)
copy src/debian/{fusionforge-shell.postrm => fusionforge-web.postrm} (84%)
create mode 100644
src/plugins/taskboard/db/20150628-plugin-taskboard-fix-columnbackgroundcolor.sql
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
