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 c162a600e8b7dc26f86025af4c1389935d5513e0 (commit)
via 8568ad093e620374e753cc2468f2eba9ba70c5e6 (commit)
from 78c7b482b2beea739e3ead3ab02175f2407df2f7 (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=c162a600e8b7dc26f86025af4c1389935d5513e0
commit c162a600e8b7dc26f86025af4c1389935d5513e0
Author: Marc-Etienne Vargenau <[email protected]>
Date: Thu Sep 15 17:41:00 2016 +0200
&
diff --git a/src/plugins/globalsearch/common/globalsearch_edit_utils.php
b/src/plugins/globalsearch/common/globalsearch_edit_utils.php
index 8ab4204..b660a57 100644
--- a/src/plugins/globalsearch/common/globalsearch_edit_utils.php
+++ b/src/plugins/globalsearch/common/globalsearch_edit_utils.php
@@ -218,8 +218,8 @@ function globalsearch_admin_table_show () {
echo '<tr '. $HTML->boxGetAltRowStyle($j) . '>';
$id = db_result($result,$j,0);
- echo
'<td>'.util_make_link(getStringFromServer('PHP_SELF').'?function=edit&id='.$id,
'['._('edit').']');
- echo
util_make_link(getStringFromServer('PHP_SELF').'?function=confirmdelete&id='.$id,
'['._('delete').']').'</td>';
+ echo
'<td>'.util_make_link(getStringFromServer('PHP_SELF').'?function=edit&id='.$id,
'['._('edit').']');
+ echo
util_make_link(getStringFromServer('PHP_SELF').'?function=confirmdelete&id='.$id,
'['._('delete').']').'</td>';
echo '<td><strong>'.db_result ($result, $j,
'assoc_site_id').'</strong></td>';
echo '<td><strong>'.db_result ($result, $j,
'title').'</strong></td>';
diff --git a/src/plugins/mailman/www/admin/index.php
b/src/plugins/mailman/www/admin/index.php
index 22b1e00..454cdc8 100644
--- a/src/plugins/mailman/www/admin/index.php
+++ b/src/plugins/mailman/www/admin/index.php
@@ -45,7 +45,6 @@ $list_name=$request->get('list_name');
$is_public=$request->get('is_public');
$description=$request->get('description');
-
if ($group_id) {
if (!$Group || !is_object($Group) || $Group->isError()) {
exit_no_group();
@@ -229,7 +228,7 @@ if ($group_id) {
echo '<p>'.sprintf(_('You can administrate lists from here.
Please note that private lists can still be viewed by members of your project,
but are not listed on %s.'), forge_get_config ('forge_name')).'</p>';
echo '<ul>
<li>';
- echo
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&add_list=1',
_('Add Mailing List'));
+ echo
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&add_list=1',
_('Add Mailing List'));
echo ' </li>
</ul>';
$mlCount = count($mlArray);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=8568ad093e620374e753cc2468f2eba9ba70c5e6
commit 8568ad093e620374e753cc2468f2eba9ba70c5e6
Author: Marc-Etienne Vargenau <[email protected]>
Date: Thu Sep 15 17:40:30 2016 +0200
Add getPluginDescription
diff --git a/src/plugins/scmhg/common/HgPlugin.class.php
b/src/plugins/scmhg/common/HgPlugin.class.php
index d6f656f..d258bb2 100644
--- a/src/plugins/scmhg/common/HgPlugin.class.php
+++ b/src/plugins/scmhg/common/HgPlugin.class.php
@@ -49,6 +49,15 @@ Offer DAV or SSH access.");
$this->register();
}
+ /**
+ * getPluginDescription - display the description of this plugin in
pluginman admin page
+ *
+ * @return string the description
+ */
+ function getPluginDescription() {
+ return _('Use Mercurial as Source Code Management tool. Offer
DAV or SSH access.');
+ }
+
function getDefaultServer() {
return forge_get_config('default_server', 'scmhg');
}
-----------------------------------------------------------------------
Summary of changes:
src/plugins/globalsearch/common/globalsearch_edit_utils.php | 4 ++--
src/plugins/mailman/www/admin/index.php | 3 +--
src/plugins/scmhg/common/HgPlugin.class.php | 9 +++++++++
3 files changed, 12 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
