[Fusionforge-commits] FusionForge branch master updated. v6.0.2-143-g0874bca

Franck Villaume nerville at libremir.placard.fr.eu.org
Wed Jul 29 11:53:15 CEST 2015


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  0874bcab44be478a79c9cfc3f2e91f93a51d434a (commit)
       via  9dac33977dad721cf6f252b7892ae90f22f61a6f (commit)
       via  7e9d6bc7f6c7ee8a67dfc5f99d60b6b39967e193 (commit)
       via  e76bc193f2c1dad976d82a2eaad771f9531e2e10 (commit)
       via  16ca676898e7fdfff5094fbe2271c9c26d05b305 (commit)
       via  11d686cd253547a7e2c4388bc22e6e09f588edc0 (commit)
       via  0cde4e1c3a1a0f71860a868376bd2cb293be7f59 (commit)
       via  bdf0bb74b9e53948ee007004dd9d6ae4f73b0fc6 (commit)
       via  fe210b2384088ce80578c677ebacb1265c8eeae8 (commit)
       via  3b2fa8120d1f6b2aa0ba9ca13bddab341b1bf058 (commit)
       via  fedc9941750ef29d50504aecbe34e29380e51526 (commit)
       via  ed6e159908e7d021fed601586e87e866a14d5f0f (commit)
       via  946e7f8ac2710e68a823fd4a103f86afeae1cf40 (commit)
       via  1df1a8256487789d3c86862ee8f260bfa11fb346 (commit)
       via  da510ee47447fef73552f840cb6d2f7945da285b (commit)
       via  ea93121a027bb5e9b104f5a50fcba54a74daeeb1 (commit)
       via  95e13bbcc884df9a8cceaee2aa493fc5e6cb0697 (commit)
       via  39df32ed9022a5f6d5ee7df841e738c83cca4f8b (commit)
       via  a4a98ca99e7a5464be347d447fdde97c69fcf260 (commit)
       via  ac2b8fa90e80693d8e2d1a51acccca25569033e2 (commit)
       via  71213adfb6696954de71fb6def54329473604a09 (commit)
       via  518fa7d2e2bf16bb9c80d665c99b29124ca075c0 (commit)
       via  cef310d656ed26f4109fa366cd589480541503a0 (commit)
       via  27bd07697aa21d73135057cca79478e081d389fc (commit)
       via  aeece8070a7f75ef5b41f8d7ee3e521cb5a3d2ed (commit)
       via  2b0a8ba8fc3973f1d4594f8ee8b3b913cb1e9e35 (commit)
       via  9e8730c987fe3c5f81c63dcdd84191c1636754c5 (commit)
       via  7773f81623e8ce750d573ac6b1c1bb58c5f5cbf3 (commit)
       via  ecbd8dce718834c37c5f8fc0b137eac0f2dff5a1 (commit)
       via  d3f54459d23d922d1859caab60298bf74593c0bf (commit)
       via  929325af79936bdfa1e35729954a28b3b497f739 (commit)
       via  65dcb0adbe63c3f9ef47afd19b03e512f03a2bc2 (commit)
       via  e5a1f522e12f990481446a21fc3e378f4b50a105 (commit)
       via  31452b5f7bf99f9d036c5af0a48c1a21465a4bec (commit)
       via  3a6c4fcaa5b1434bb6ad95b75d917401cc3480e9 (commit)
       via  021ca32ca5e8ee908ad81d955c33d7914b1422d1 (commit)
      from  9d688b06e57a4e5eadfda1fbb5b9df2d3408baa4 (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=0874bcab44be478a79c9cfc3f2e91f93a51d434a

commit 0874bcab44be478a79c9cfc3f2e91f93a51d434a
Merge: 9d688b0 9dac339
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Jul 29 11:53:10 2015 +0200

    Merge 6.0

diff --cc src/CHANGES
index 6066629,87c423d..5e485c2
--- a/src/CHANGES
+++ b/src/CHANGES
@@@ -1,8 -1,13 +1,16 @@@
 +FusionForge 6.X:
 +* Spellcheck (Anders Jonsson)
 +
+ Fusionforge 6.0.3:
+ * Layout: fix rss url when url is absolute (TrivialDev)
+ * Accounts: accept more elliptic curve ssh keys types (Unit 193 & Inria)
+ * Docman: fix filesize sort [#784] (TrivialDev)
+ * News: allow moderating news comments even if the Forum tool is disabled (Inria)
+ 
  FusionForge 6.0.2:
  * Accounts: fix elliptic curve ssh keys support (Inria)
+ * Project stats: fix misleading label on statistics default empty graph (Inria)
+ * Project stats: fix weekly aggregation and display (Inria)
  * Mailing lists: fix description encoding depending on Mailman version (Inria & Thorsten Glaser)
  * Mailing lists: fix default list URL path (Inria)
  * Mailing lists: fix installation on CentOS (Inria)
diff --cc src/debian/changelog
index 856b371,d4b43dc..85a834b
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@@ -1,12 -1,20 +1,26 @@@
 +fusionforge (6.0.50-0) UNRELEASED; urgency=medium
 +
 +  * New snapshot from master branch.
 +
 + -- Roland Mas <lolando at debian.org>  Wed, 24 Jun 2015 11:32:26 +0200
 +
- fusionforge (6.0.1-2) UNRELEASED; urgency=medium
+ fusionforge (6.0.2+20150708-1) unstable; urgency=medium
  
-   * New upstream snapshot following the stable branch.
+   * New upstream snapshot following the 6.0 stable branch
+   * Fix dependency to obsolete shell-postgresql package
+ 
+  -- Sylvain Beucler <beuc at debian.org>  Wed, 08 Jul 2015 11:04:18 +0200
+ 
+ fusionforge (6.0.2+20150707-1) unstable; urgency=medium
+ 
+   * New upstream snapshot following the 6.0 stable branch.
+   * Fix upgrade conflict on /usr/bin/forge_make_admin (closes: #791619)
+ 
+  -- Sylvain Beucler <beuc at debian.org>  Tue, 07 Jul 2015 11:32:19 +0200
+ 
+ fusionforge (6.0.2-1) unstable; urgency=medium
+ 
+   * New upstream release (closes: #492881, #211085)
    * Silent lintian command-with-path-in-maintainer-script
    * Remove logs on purge (closes: #789801)
    * Fix upgrade conflict on locale files (closes: #789925)
diff --cc src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
index c986d60,0bd5ba8..ed2e1c8
--- a/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
+++ b/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
@@@ -173,7 -173,10 +173,10 @@@ class TaskBoardBasicAdapter 
  					$at = $this->getTasksTracker($tracker_id);
  
  					$elements = $at->getExtraFieldElements($extra_field_id);
 -					foreach($elements as $e) {
 +					foreach ($elements as $e) {
+ 						if ($field_alias == 'resolution' && $e['status_id'] == 2) {
+ 							continue;
+ 						}
  						$this->_elements[$tracker_id][$extra_field_id][$e['element_name']] = $e['element_id'];
  					}
  				}
diff --cc src/plugins/taskboard/common/views/admin/columns.php
index 2e1b837,e0bb4c9..ce7c349
--- a/src/plugins/taskboard/common/views/admin/columns.php
+++ b/src/plugins/taskboard/common/views/admin/columns.php
@@@ -61,33 -61,39 +61,38 @@@ if (count($taskboard->getUsedTrackersId
  	}
  	echo $HTML->listTableBottom();
  
- 	echo $HTML->openForm(array('action' => '/plugins/'.$pluginTaskboard->name.'/admin/?group_id='.$group_id.'&action=columns', 'method' => 'post'));
- 	echo html_e('input', array('type' => 'hidden', 'name' => 'post_changes', 'value' => 'y'));
+ 	$unused_resolutions = array_values($taskboard->getUnusedResolutions());
  	echo html_e('h2', array(), _('Add new column').(':'));
- 	echo $HTML->listTableTop();
- 	$cells = array();
- 	$cells[][] = html_e('strong', array(), _('Title').utils_requiredField()._(':'));
- 	$cells[][] = html_e('input', array('type' => 'text', 'name' => 'column_title', 'required' => 'required'));
- 	echo $HTML->multiTableRow(array(), $cells);
- 	$cells = array();
- 	$cells[][] = html_e('strong', array(), _('Title background color')._(':'));
- 	$cells[][] = $taskboard->colorBgChooser('title_bg_color');
- 	echo $HTML->multiTableRow(array(), $cells);
- 	$cells = array();
- 	$cells[][] = html_e('strong', array(), _('Column Background color')._(':'));
- 	$cells[][] = $taskboard->colorBgChooser('column_bg_color', 'white');
- 	echo $HTML->multiTableRow(array(), $cells);
- 	$cells = array();
- 	$cells[][] = html_e('strong', array(), _('Maximum tasks number')._(':'));
- 	$cells[][] = html_e('input', array('type' => 'text', 'name' => 'column_max_tasks'));
- 	echo $HTML->multiTableRow(array(), $cells);
- 	$cells = array();
- 	$cells[][] = html_e('strong', array(), _('Drop resolution by default').utils_requiredField()._(':'));
- 	$unused_resolutions = array_values( $taskboard->getUnusedResolutions() );
- 	$cells[][] = html_build_select_box_from_arrays( $unused_resolutions, $unused_resolutions, 'resolution_by_default', NULL, false);
- 	echo $HTML->multiTableRow(array(), $cells);
- 	echo $HTML->listTableBottom();
- 	echo html_e('p', array(), html_e('input', array('type' => 'submit', 'name' => 'post_changes', 'value' => _('Submit'))));
- 	echo $HTML->closeForm();
- 	echo $HTML->addRequiredFieldsInfoBox();
+ 	if (count($unused_resolutions)) {
+ 		echo $HTML->openForm(array('action' => '/plugins/'.$pluginTaskboard->name.'/admin/?group_id='.$group_id.'&action=columns', 'method' => 'post'));
+ 		echo html_e('input', array('type' => 'hidden', 'name' => 'post_changes', 'value' => 'y'));
 -
+ 		echo $HTML->listTableTop();
+ 		$cells = array();
+ 		$cells[][] = html_e('strong', array(), _('Title').utils_requiredField()._(':'));
+ 		$cells[][] = html_e('input', array('type' => 'text', 'name' => 'column_title', 'required' => 'required'));
+ 		echo $HTML->multiTableRow(array(), $cells);
+ 		$cells = array();
+ 		$cells[][] = html_e('strong', array(), _('Title backgound color')._(':'));
+ 		$cells[][] = $taskboard->colorBgChooser('title_bg_color');
+ 		echo $HTML->multiTableRow(array(), $cells);
+ 		$cells = array();
+ 		$cells[][] = html_e('strong', array(), _('Column Background color')._(':'));
+ 		$cells[][] = $taskboard->colorBgChooser('column_bg_color', 'white');
+ 		echo $HTML->multiTableRow(array(), $cells);
+ 		$cells = array();
+ 		$cells[][] = html_e('strong', array(), _('Maximum tasks number')._(':'));
+ 		$cells[][] = html_e('input', array('type' => 'text', 'name' => 'column_max_tasks'));
+ 		echo $HTML->multiTableRow(array(), $cells);
+ 		$cells = array();
+ 		$cells[][] = html_e('strong', array(), _('Drop resolution by default').utils_requiredField()._(':'));
+ 
+ 		$cells[][] = html_build_select_box_from_arrays( $unused_resolutions, $unused_resolutions, 'resolution_by_default', NULL, false);
+ 		echo $HTML->multiTableRow(array(), $cells);
+ 		echo $HTML->listTableBottom();
+ 		echo html_e('p', array(), html_e('input', array('type' => 'submit', 'name' => 'post_changes', 'value' => _('Submit'))));
+ 		echo $HTML->closeForm();
+ 		echo $HTML->addRequiredFieldsInfoBox();
+ 	} else {
+ 		echo $HTML->information(_('All resolutions are mapped to columns. To add a new column, you need at least one unmapped resolution.'));
+ 	}
  }

-----------------------------------------------------------------------

Summary of changes:
 src/CHANGES                                        |  13 +-
 src/bin/{normalize_roles.php => refresh_nss.php}   |  16 +-
 src/common/docman/Document.class.php               |   6 -
 src/common/docman/views/listfile.php               |   8 +-
 src/common/frs/FRSPackage.class.php                |  10 +-
 src/common/frs/actions/editrelease.php             |  10 -
 src/common/frs/views/listpackages.php              |   2 +-
 src/common/include/account.php                     |   2 +-
 src/common/reporting/ReportSetup.class.php         |  12 +-
 src/common/reporting/report_utils.php              |   1 +
 .../widget/Widget_MyMonitoredForums.class.php      |   4 +-
 src/common/widget/Widget_MyTasks.class.php         |   4 +-
 src/db/20150702-gnu-linux.sql                      |   9 +
 src/debian/changelog                               |  20 +-
 src/debian/control.in                              |   7 +-
 src/debian/plugins                                 |   4 +-
 src/locale/fusionforge.pot                         | 232 ++++++++++-----------
 src/plugins/authldap/www/post-login.php            |   7 +-
 .../adapters/TaskBoardBasicAdapter.class.php       |   4 +-
 .../taskboard/common/views/admin/columns.php       |  61 +++---
 src/rpm/fusionforge.spec.in                        |   5 +-
 src/www/forum/admin/index.php                      |   2 +-
 src/www/include/Layout.class.php                   |   7 +-
 src/www/project/stats/index.php                    |  10 +-
 src/www/snippet/delete.php                         |  36 ++--
 tests/func/README.TXT                              |  57 -----
 tests/func/db_reload.php                           | 129 ------------
 tests/func/db_reload.sh                            |  31 +--
 vm/Vagrantfile-sample                              |   4 +
 vm/packer/scripts/vagrant.sh                       |   2 +-
 30 files changed, 286 insertions(+), 429 deletions(-)
 copy src/bin/{normalize_roles.php => refresh_nss.php} (78%)
 create mode 100644 src/db/20150702-gnu-linux.sql
 delete mode 100644 tests/func/README.TXT
 delete mode 100755 tests/func/db_reload.php


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list