[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1343-g998be2c

Franck Villaume nerville at libremir.placard.fr.eu.org
Mon Jan 16 19:55:40 CET 2017


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  998be2cf5c3f353e8f7e716ce5bf3b608f410ce6 (commit)
       via  29ba9d1da4408369376506be5d973c4a574255f0 (commit)
      from  64d451ba1bd08b64c931753fe3884b19b2b2c246 (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=998be2cf5c3f353e8f7e716ce5bf3b608f410ce6

commit 998be2cf5c3f353e8f7e716ce5bf3b608f410ce6
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Jan 16 19:55:11 2017 +0100

    fix space in licence header + typo

diff --git a/src/common/tracker/actions/effort_units.php b/src/common/tracker/actions/effort_units.php
index 806fa95..282cf2f 100644
--- a/src/common/tracker/actions/effort_units.php
+++ b/src/common/tracker/actions/effort_units.php
@@ -1,25 +1,25 @@
 <?php
 /**
  * Project Admin page to edit units
-*
-* Copyright 2017, St├ęphane-Eymeric Bredthauer - TrivialDev
-* http://fusionforge.org/
-*
-* 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.
-*/
+ *
+ * Copyright 2017, St├ęphane-Eymeric Bredthauer - TrivialDev
+ * http://fusionforge.org/
+ *
+ * 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 $gfcommon.'include/pre.php';
 require_once $gfcommon.'tracker/EffortUnit.class.php';
@@ -446,7 +446,7 @@ function postdelete_unit(&$effortUnitSet) {
 	}
 	$sure = getIntFromRequest('confirm_delete',0);
 	if (!$sure) {
-		echo $HTML->error_msg(_('You haven\' confirm the delete of the Unit'));
+		echo $HTML->error_msg(_('You haven\'t confirm the delete of the Unit'));
 		return false;
 	}
 	$name = $unit->getName();
@@ -539,4 +539,4 @@ function urlParameters($effortUnitSet){
 			break;
 	}
 	return $return;
-}
\ No newline at end of file
+}

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=29ba9d1da4408369376506be5d973c4a574255f0

commit 29ba9d1da4408369376506be5d973c4a574255f0
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Jan 16 19:53:30 2017 +0100

    less string

diff --git a/src/common/docman/views/additem.php b/src/common/docman/views/additem.php
index 4e2141c..bf31951 100644
--- a/src/common/docman/views/additem.php
+++ b/src/common/docman/views/additem.php
@@ -83,7 +83,7 @@ if (forge_check_perm('docman', $group_id, 'approve')) {
 	} else {
 		echo $HTML->openForm(array('id' => 'injectzip', 'name' => 'injectzip', 'method' => 'post', 'action' => '/docman/?group_id='.$group_id.'&action=injectzip&dirid='.$dirid, 'enctype' => 'multipart/form-data'));
 		echo html_ao('p');
-		echo html_e('label', array(), _('Upload archive:'), false);
+		echo html_e('label', array(), _('Upload archive')._(':'), false);
 		echo html_e('input', array('type' => 'file', 'name' => 'uploaded_zip', 'required' => 'required'));
 		echo html_e('span', array(), '('._('max upload size')._(': ').human_readable_bytes(util_get_maxuploadfilesize()).')', false);
 		echo html_e('input', array('id' => 'submitinjectzip', 'type' => 'button', 'value' => _('Inject Tree')));

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

Summary of changes:
 src/common/docman/views/additem.php         |  2 +-
 src/common/tracker/actions/effort_units.php | 42 ++++++++++++++---------------
 2 files changed, 22 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list