[evolvis-commits] r17350: Merged from upstream 5.1
mirabilos at evolvis.org
mirabilos at evolvis.org
Fri Jul 8 15:02:33 CEST 2011
Author: mirabilos
Date: 2011-07-08 15:02:33 +0200 (Fri, 08 Jul 2011)
New Revision: 17350
Modified:
trunk/gforge_base/evolvisforge-5.1/src/AUTHORS
trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MyMonitoredDocuments.class.php
trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php
Log:
Merged from upstream 5.1
Modified: trunk/gforge_base/evolvisforge-5.1/src/AUTHORS
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/AUTHORS 2011-07-08 13:02:29 UTC (rev 17349)
+++ trunk/gforge_base/evolvisforge-5.1/src/AUTHORS 2011-07-08 13:02:33 UTC (rev 17350)
@@ -15,29 +15,30 @@
The new FusionForge Team
----------------------------------------------------------------------------
-TODO : name all contributors to FusionForge. The list below was
-extracted from the SVN stats.
+TODO: name all contributors to FusionForge. The list below was
+mostly extracted from the SVN stats.
-Roland Mas
+Patrick Apel
+Christian Bayle
+Mélanie Le Bail
+Olivier Berger
+Gonéri Le Bouder
Grégory Cuellar
-Christian Bayle
-Alain Peyrat
-Guillaume Smet
+Francisco Gimeno
+Thorsten Glaser
Julien Heyman
Ognyan Kulev
+Pierre Lacoste
+Olaf Lenz
+Roland Mas
+Olivier Meunier
Alexandre Neymann
+Mathieu Peltier
+Alain Peyrat
+Philip Schwartz
+Guillaume Smet
Reinhard Spisser
-Francisco Gimeno
-Mathieu Peltier
-Olivier Meunier
-Olaf Lenz
Franck Villaume
-Pierre Lacoste
-Thorsten Glaser
-Gonéri Le Bouder
-Mélanie Le Bail
-Olivier Berger
-Philip Schwartz
See also AUTHORS.gforge and AUTHORS.sourceforge for prior contributors.
@@ -45,4 +46,3 @@
# Local Variables:
# coding: utf-8
# End:
-
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MyMonitoredDocuments.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MyMonitoredDocuments.class.php 2011-07-08 13:02:29 UTC (rev 17349)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/widget/Widget_MyMonitoredDocuments.class.php 2011-07-08 13:02:33 UTC (rev 17350)
@@ -2,6 +2,7 @@
/**
* Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights reserved
* Copyright 2010, Franck Villaume - Capgemini
+ * Copyright 2011, Franck Villaume - TrivialDev
*
* This file is a part of FusionForge.
*
@@ -119,8 +120,8 @@
function getAjaxUrl($owner_id, $owner_type) {
$request =& HTTPRequest::instance();
$ajax_url = parent::getAjaxUrl($owner_id, $owner_type);
- if ($request->exist('hide_item_id') || $request->exist('hide_forum')) {
- $ajax_url .= '&hide_item_id=' . $request->get('hide_item_id') . '&hide_forum=' . $request->get('hide_forum');
+ if ($request->exist('hide_item_id') || $request->exist('hide_document')) {
+ $ajax_url .= '&hide_item_id=' . $request->get('hide_item_id') . '&hide_document=' . $request->get('hide_document');
}
return $ajax_url;
}
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php 2011-07-08 13:02:29 UTC (rev 17349)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php 2011-07-08 13:02:33 UTC (rev 17350)
@@ -345,10 +345,10 @@
* Forge-Identification Meta Header, Version 1.0
* cf. http://home.gna.org/forgeplucker/forge-identification.html
*/
+ echo "\t\t\t";
$ff = new FusionForge();
- echo "\t\t\t";
printf('<meta name="Forge-Identification" content="%s:%s" />',
- $ff->software_type, $ff->software_version);
+ $ff->software_name, $ff->software_version);
echo "\n";
}
More information about the evolvis-commits
mailing list