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 fd0fbb458d1d26bb9dc238db9ee143ddde29b2a0 (commit)
via 31582f6307d0aa0cf287f58fe8f98fc816f6d6d7 (commit)
via 8c869d1646ea6c1f2ba3635449abb9500b11d80e (commit)
via 2b0ef4b85ebd6868aaae72c0d47878bab989003d (commit)
from 269fa2494d42fe2e653dbd391abd28224d95b711 (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=fd0fbb458d1d26bb9dc238db9ee143ddde29b2a0
commit fd0fbb458d1d26bb9dc238db9ee143ddde29b2a0
Author: Franck Villaume <[email protected]>
Date: Fri Dec 30 19:00:48 2016 +0100
add missing licence + use HTML theme pic
diff --git a/src/plugins/mailman/www/mailman_utils.php
b/src/plugins/mailman/www/mailman_utils.php
index d6ed7b4..e1d4a16 100644
--- a/src/plugins/mailman/www/mailman_utils.php
+++ b/src/plugins/mailman/www/mailman_utils.php
@@ -5,13 +5,28 @@
* Portions Copyright 1999-2001 (c) VA Linux Systems
* The rest Copyright 2003 (c) Guillaume Smet
* Portions Copyright 2010 (c) Mélanie Le Bail
+ * Copyright 2016, Franck Villaume - TrivialDev
+ * http://fusionforge.org
*
- * @version $Id$
+ * This file is part of FusionForge. FusionForge is free software;
+ * you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or (at your option)
+ * any later version.
*
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with FusionForge; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
require_once 'mailman/include/MailmanList.class.php';
require_once 'mailman/include/MailmanListFactory.class.php';
+
+global $HTML;
global $class;
$current_user=UserManager::instance()->getCurrentUser();
@@ -125,7 +140,7 @@ $p =& $plugin_manager->getPluginByName('mailman');
echo ' </a></td>';
echo ' <td> <a
href="index.php?group_id='.$request->get('group_id').'&action=options&id='.$currentList->getID().'">'._('Preferences').'</a></td>';
} else {
- echo ' <a
href="index.php?group_id='.$request->get('group_id').'&action=subscribe&id='.$currentList->getID().'"><img
src="'.$p->getThemePath().'/images/ic/add.png" title='._('Subscribe').'>';
+ echo ' <a
href="index.php?group_id='.$request->get('group_id').'&action=subscribe&id='.$currentList->getID().'">'.$HTML->getNewPic(_('Subscribe'));
;
echo '</a></td> <td></td>';
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=31582f6307d0aa0cf287f58fe8f98fc816f6d6d7
commit 31582f6307d0aa0cf287f58fe8f98fc816f6d6d7
Author: Franck Villaume <[email protected]>
Date: Fri Dec 30 19:00:17 2016 +0100
use HTML theme pic
diff --git a/src/plugins/hudson/include/hudsonViews.class.php
b/src/plugins/hudson/include/hudsonViews.class.php
index 1e11f30..a62b743 100644
--- a/src/plugins/hudson/include/hudsonViews.class.php
+++ b/src/plugins/hudson/include/hudsonViews.class.php
@@ -3,7 +3,7 @@
* Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights
reserved
* Copyright (c) 2010 Alcatel-Lucent
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2013-2014, Franck Villaume - TrivialDev
+ * Copyright 2013-2014,2016, Franck Villaume - TrivialDev
*
* This file is a part of Fusionforge.
*
@@ -398,10 +398,11 @@ class hudsonViews extends Views {
}
function _display_add_job_form($group_id) {
+ global $HTML;
$project_manager = ProjectManager::instance();
$project = $project_manager->getProject($group_id);
- echo '<a href="#"
onclick="jQuery(\'#hudson_add_job\').slideToggle(); return false;">' .
getIcon("ic/add.png") . ' '._("Add job").'</a>';
+ echo '<a href="#"
onclick="jQuery(\'#hudson_add_job\').slideToggle(); return false;">' .
$HTML->getNewPic() . ' '._("Add job").'</a>';
echo ' '.$this->_getHelp('HudsonService', true);
echo '<div id="hudson_add_job" class="hide" >';
echo ' <form action="">'."\n";
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=8c869d1646ea6c1f2ba3635449abb9500b11d80e
commit 8c869d1646ea6c1f2ba3635449abb9500b11d80e
Author: Franck Villaume <[email protected]>
Date: Fri Dec 30 18:59:56 2016 +0100
space vs. tab
diff --git a/src/plugins/forumml/www/forumml_utils.php
b/src/plugins/forumml/www/forumml_utils.php
index 895f92b..65a58cc 100644
--- a/src/plugins/forumml/www/forumml_utils.php
+++ b/src/plugins/forumml/www/forumml_utils.php
@@ -75,17 +75,17 @@ function
plugin_forumml_show_search_results($p,$result,$group_id,$list_id) {
$res1 =
getForumMLDao()->getSpecificMessage($rows['id_message'],$list_id)->getRow();
$subject = mb_decode_mimeheader($res1['value']);
$res2 =
getForumMLDao()->getHeaderValue($rows['id_message'],array(2,3));
- $k = 1;
- while ($rows2 =$res2->getRow()) {
- $header[$k] = $rows2['value'];
- $k++;
- }
- $from = mb_decode_mimeheader($header[1]);
-
- // Replace '<' by '<' and '>' by '>'. Otherwise the email adress
won't be displayed
- // because it will be considered as an xhtml tag.
- $from = preg_replace('/\</', '<', $from);
- $from = preg_replace('/\>/', '>', $from);
+ $k = 1;
+ while ($rows2 =$res2->getRow()) {
+ $header[$k] = $rows2['value'];
+ $k++;
+ }
+ $from = mb_decode_mimeheader($header[1]);
+
+ // Replace '<' by '<' and '>' by '>'. Otherwise the email
adress won't be displayed
+ // because it will be considered as an xhtml tag.
+ $from = preg_replace('/\</', '<', $from);
+ $from = preg_replace('/\>/', '>', $from);
$date = date("Y-m-d H:i",strtotime($header[2]));
// purify message subject (CODENDI_PURIFIER_FORUMML level)
@@ -730,5 +730,4 @@ function plugin_forumml_process_mail($plug,$reply=false) {
}
}
return $continue;
-
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=2b0ef4b85ebd6868aaae72c0d47878bab989003d
commit 2b0ef4b85ebd6868aaae72c0d47878bab989003d
Author: Franck Villaume <[email protected]>
Date: Fri Dec 30 10:07:24 2016 +0100
remove empty lines
diff --git a/src/www/tracker/index.php b/src/www/tracker/index.php
index 685f113..8f67eb4 100644
--- a/src/www/tracker/index.php
+++ b/src/www/tracker/index.php
@@ -82,10 +82,8 @@ if (getStringFromRequest('rtype') == 'ajax') {
if ($group_id && $atid) {
include $gfcommon.'tracker/actions/tracker.php';
-
} elseif ($group_id) {
include $gfcommon.'tracker/actions/ind.php';
-
}
// Local Variables:
-----------------------------------------------------------------------
Summary of changes:
src/plugins/forumml/www/forumml_utils.php | 23 +++++++++++------------
src/plugins/hudson/include/hudsonViews.class.php | 5 +++--
src/plugins/mailman/www/mailman_utils.php | 21 ++++++++++++++++++---
src/www/tracker/index.php | 2 --
4 files changed, 32 insertions(+), 19 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
