[Fusionforge-commits] FusionForge branch 6.1 updated. v6.0.5-2221-g25b385f

Franck Villaume nerville at libremir.placard.fr.eu.org
Sun Oct 1 13:33:03 CEST 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, 6.1 has been updated
       via  25b385fbf28132d7228f3bf834abd7951553ef8f (commit)
       via  61a181711ead4a2ad7bbdacda2e5719847aba0cd (commit)
       via  786992d11a9ab8458dea646b7cf875de2e28fe4a (commit)
      from  e9f2528d1f296a8b949eb353484688de0b04434d (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=25b385fbf28132d7228f3bf834abd7951553ef8f

commit 25b385fbf28132d7228f3bf834abd7951553ef8f
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Oct 1 13:32:31 2017 +0200

    dash not permitted in rpm

diff --git a/src/VERSION b/src/VERSION
index 2688cc1..a3af1f5 100644
--- a/src/VERSION
+++ b/src/VERSION
@@ -1 +1 @@
-6.1.0-alpha0
+6.1.0alpha0

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

commit 61a181711ead4a2ad7bbdacda2e5719847aba0cd
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Oct 1 13:29:33 2017 +0200

    less code

diff --git a/src/common/include/user_profile.php b/src/common/include/user_profile.php
index 14b6edb..42ccbc9 100644
--- a/src/common/include/user_profile.php
+++ b/src/common/include/user_profile.php
@@ -44,20 +44,16 @@ function user_personal_information($user, $compact = false, $title = false) {
 		$user_logo = $params['content'];
 	}
 	$html = $HTML->listTableTop(array(), array(), 'full');
-	if($compact) {
-
-		if($title) {
-			$html .= '<tr>
-						<td colspan="2">'. $title . '</td>
-					  </tr>';
-		}
+	if ($compact && $title) {
+		$html .= '<tr>
+			<td colspan="2">'. $title . '</td>
+			  </tr>';
 	}
 
 	$html .= '<tr>';
 	if($user_logo) {
 		$html .= '<td style="width: 150px;">'. $user_logo .'</td>';
-	}
-	else {
+	} else {
 		$html .= '<td></td>';
 	}
 	$html .='<td>
@@ -83,8 +79,7 @@ function user_personal_information($user, $compact = false, $title = false) {
 			</tr>
 			<tr>
 				<td>'. _('Login Name') . _(': ') .'</td>
-				<td><strong><span property="sioc:name">' .
-	$user->getUnixName() . '</span></strong></td>
+				<td><strong><span property="sioc:name">' . $user->getUnixName() . '</span></strong></td>
 			</tr>
 			<tr>
 				<td>'. _('Real Name') . _(': ')  .'</td>';
@@ -93,8 +88,7 @@ function user_personal_information($user, $compact = false, $title = false) {
 	$html .= '<td>
 				<div rev="foaf:account">
 					<div about="#me" typeof="foaf:Person">
-						<strong><span property="foaf:name">'.
-	$user_title_name .'</span></strong>
+						<strong><span property="foaf:name">'. $user_title_name .'</span></strong>
 					</div>
 				</div>
 				</td>
@@ -110,7 +104,7 @@ function user_personal_information($user, $compact = false, $title = false) {
 		// Removed for privacy reasons
 		//print '<span property="sioc:email" content="'. $user_mail .'">';
 				'<span property="sioc:email_sha1" content="'. $user_mailsha1 .'">' .
-		util_make_link ('/sendmessage.php?touser='.$user_id, str_replace('@',' @nospam@ ',$user_mail)) .
+		util_make_link('/sendmessage.php?touser='.$user_id, str_replace('@',' @nospam@ ',$user_mail)) .
 				'</span>
 				</strong>
 			</td>
@@ -147,7 +141,7 @@ function user_personal_information($user, $compact = false, $title = false) {
 				<td><strong>'. relative_date($user->getAddDate()). '</strong>
 				</td>
 			</tr>';
-	if($compact) {
+	if ($compact) {
 		$user_uri = util_make_url('/users/'. $user->getUnixName() . '/');
 		$html .= '<tr>
 					<td><small>'. _('URI:') .'</small></td>

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

commit 786992d11a9ab8458dea646b7cf875de2e28fe4a
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Sep 30 19:22:46 2017 +0200

    do not use s size. default is xs

diff --git a/src/common/tracker/include/ArtifactHtml.class.php b/src/common/tracker/include/ArtifactHtml.class.php
index 04ac92a..482b355 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -196,7 +196,7 @@ function hide_edit_button(id) {
 					'<td>'. date(_('Y-m-d H:i'),db_result($result, $i, 'entrydate')) .'</td>';
 				$user = user_get_object_by_name(db_result($result, $i, 'user_name'));
 				if ($user && is_object($user)) {
-					$return .= '<td>'.util_display_user($user->getUnixName(), $user->getID(), $user->getRealName(), 's').'</td></tr>';
+					$return .= '<td>'.util_display_user($user->getUnixName(), $user->getID(), $user->getRealName()).'</td></tr>';
 				} else {
 					$return .= '<td>'.db_result($result, $i, 'user_name').'</td></tr>';
 				}

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

Summary of changes:
 src/VERSION                                       |  2 +-
 src/common/include/user_profile.php               | 24 +++++++++--------------
 src/common/tracker/include/ArtifactHtml.class.php |  2 +-
 3 files changed, 11 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list