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 e0e4adaacf7c3a9eebc7f74b35adacef49a15667 (commit)
via 490854553e0b7ce8b54ba91fb0dabe20795237e6 (commit)
via c758db6678329b137d2b4c4ad22937e5d257e986 (commit)
via debe2325360c5511328344845d7d3194a5172180 (commit)
via 4941fbd38e67b68154d9d9ae5bceded8b100232d (commit)
from 409a7b95c4ff30e3d57c1badff42b919f68b6ca5 (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=e0e4adaacf7c3a9eebc7f74b35adacef49a15667
commit e0e4adaacf7c3a9eebc7f74b35adacef49a15667
Author: Franck Villaume <[email protected]>
Date: Wed May 1 19:41:02 2019 +0200
align icon & text in activity, in username + logo
diff --git a/src/common/include/Activity.class.php
b/src/common/include/Activity.class.php
index a1bc3f8..2d81767 100644
--- a/src/common/include/Activity.class.php
+++ b/src/common/include/Activity.class.php
@@ -184,7 +184,7 @@ class Activity extends FFError {
if ($docmanerror) {
return false;
}
- return $icon .' '.$url;
+ return html_e('div', array('class' => 'box'), $icon
.' '.$url);
}
function getActivitiesForProject($group_id, $begin, $end, $section) {
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 72c41ee..1d8df32 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -1002,7 +1002,7 @@ function util_display_user($username, $user_id = 0, $text
= '', $size = 'xs') {
$hook_params = array('resource_type' => 'user', 'username' =>
$username, 'user_id' => $user_id, 'size' => $size, 'link_text' => $text,
'user_link' => '');
plugin_hook_by_reference('user_link_with_tooltip', $hook_params);
if ($hook_params['user_link'] != '') {
- return $hook_params['user_link'];
+ return html_e('div', array('class' => 'box'),
$hook_params['user_link']);
}
// If no plugin replaced it, then back to default standard link
@@ -1013,7 +1013,7 @@ function util_display_user($username, $user_id = 0, $text
= '', $size = 'xs') {
$url = util_make_link_u($username, $user_id, $text);
if ($params['content']) {
- return $params['content'].$url;
+ return html_e('div', array('class' => 'box'),
$params['content'].' '.$url);
}
return $url;
}
diff --git a/src/www/themes/css/fusionforge.css
b/src/www/themes/css/fusionforge.css
index 8292a4c..3b93d72 100644
--- a/src/www/themes/css/fusionforge.css
+++ b/src/www/themes/css/fusionforge.css
@@ -137,6 +137,7 @@ table.listing tbody tr:nth-child(odd),
font-size: small;
font-weight: bold;
color: #009900;
+ font-family: arial,helvetica, sans-serif;
}
.down {
@@ -171,12 +172,6 @@ td.toptab {
background-color: #e0e0e0;
}
-.up {
- font-family: arial,helvetica, sans-serif;
- font-size: small;
- font-weight: bold;
-}
-
/* generic classes
----------------------------------------------- */
.align-left {text-align: left;}
@@ -1115,3 +1110,8 @@ span.insert {
cursor:pointer;
color:green;
}
+
+.box {
+ display: flex;
+ align-items: center;
+}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=490854553e0b7ce8b54ba91fb0dabe20795237e6
commit 490854553e0b7ce8b54ba91fb0dabe20795237e6
Author: Franck Villaume <[email protected]>
Date: Wed May 1 19:40:01 2019 +0200
add monitor user link in user_profile
diff --git a/src/common/include/user_profile.php
b/src/common/include/user_profile.php
index c2625f9..8fc5407 100644
--- a/src/common/include/user_profile.php
+++ b/src/common/include/user_profile.php
@@ -141,6 +141,21 @@ function user_personal_information($user, $compact =
false, $title = false) {
$subcells[][] = _('Following').'/'._('Followers')._(':');
$subcells[][] =
count($user->getMonitorIds()).'/'.count($user->getMonitorByIds());
$subtable .= $HTML->multiTableRow(array(), $subcells);
+ if (forge_get_config('use_diary') && session_loggedin() &&
($user->getID() != user_getid())) {
+ if ($user->isMonitoredBy(user_getid())) {
+ $option = 'stop';
+ $titleMonitor = _('Stop monitoring this user');
+ $image = $HTML->getStopMonitoringPic($titleMonitor, '');
+ } else {
+ $option = 'start';
+ $titleMonitor = _('Start monitoring this user');
+ $image = $HTML->getStartMonitoringPic($titleMonitor,
'');
+ }
+ $subcells = array();
+ $subcells[][] = $titleMonitor;
+ $subcells[][] =
util_make_link('/developer/monitor.php?diary_user='.$user->getID(), $image,
array('title' => $titleMonitor));
+ $subtable .= $HTML->multiTableRow(array(), $subcells);
+ }
$subtable .= $HTML->listTableBottom();
$cells[][] = $subtable;
$html .= $HTML->multiTableRow(array(), $cells);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c758db6678329b137d2b4c4ad22937e5d257e986
commit c758db6678329b137d2b4c4ad22937e5d257e986
Author: Franck Villaume <[email protected]>
Date: Wed May 1 19:39:32 2019 +0200
Monitor User: fix SQL queries
diff --git a/src/common/include/MonitorElement.class.php
b/src/common/include/MonitorElement.class.php
index aa3567e..28d8fb4 100644
--- a/src/common/include/MonitorElement.class.php
+++ b/src/common/include/MonitorElement.class.php
@@ -128,8 +128,8 @@ class MonitorElement extends FFError {
$this->_clearMonitorForUserIdQuery = 'delete
from user_diary_monitor where user_id = $1';
$this->_enableMonitoringByUserIdQuery = 'insert
into user_diary_monitor (monitored_user, user_id) values ($1, $2)';
$this->_disableMonitoringByUserIdQuery =
'delete from user_diary_monitor where monitored_user = $1 and user_id = $2';
- $this->_getMonitorUsersIdsInArrayQuery =
'select user_diary_monitor.user_id from user_diary_monitor, users where
users.user_id = user_diary_monitor.monitored_user and
user_diary_monitor.monitored_user = $1 and users.status = $2';
- $this->_getMonitoredByUserIdInArrayQuery =
'select monitored_user from user_diary_monitor where user_id = $1';
+ $this->_getMonitorUsersIdsInArrayQuery =
'select user_diary_monitor.monitored_user from user_diary_monitor, users where
users.user_id = user_diary_monitor.monitored_user and
user_diary_monitor.user_id = $1 and users.status = $2';
+ $this->_getMonitoredByUserIdInArrayQuery =
'select user_diary_monitor.user_id from user_diary_monitor where
user_diary_monitor.monitored_user = $1';
$this->_isMonitoredByUserIdQuery = 'select
monitored_user from user_diary_monitor where monitored_user = $1 and user_id =
$2';
break;
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=debe2325360c5511328344845d7d3194a5172180
commit debe2325360c5511328344845d7d3194a5172180
Author: Franck Villaume <[email protected]>
Date: Wed May 1 19:39:15 2019 +0200
sync CHANGES
diff --git a/src/CHANGES b/src/CHANGES
index 1ceffb6..aaea343 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -3,6 +3,8 @@ FusionForge X.y:
* Diary & Notes: support markdown (TrivialDev)
* Diary & Notes: support crossref (TrivialDev)
* Utils: crossref, support diary [Nxxx] and Project [Pxxx] (TrivialDev)
+* Developer page: use widget system, including general & scmgit widgets [#899]
(TrivialDev)
+* User: followers/following mechanism (TrivialDev)
FusionForge 6.1.1:
* Search Engine: fix PHP notice in SearchManager.class.php [#908] (TrivialDev)
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=4941fbd38e67b68154d9d9ae5bceded8b100232d
commit 4941fbd38e67b68154d9d9ae5bceded8b100232d
Author: Franck Villaume <[email protected]>
Date: Wed May 1 15:41:13 2019 +0200
fix crossref for project
diff --git a/src/common/include/utils_crossref.php
b/src/common/include/utils_crossref.php
index 8d232d1..871c56d 100644
--- a/src/common/include/utils_crossref.php
+++ b/src/common/include/utils_crossref.php
@@ -177,7 +177,7 @@ function _projectid2url($id) {
if ($p && is_object($p) && !$p->isError()) {
$url = $p->getHomePage();
$arg['title'] = $p->getPublicName();
- return util_make_link($url, $text, $arg);
+ return util_make_link($url, $text, $arg, true);
}
return $text;
}
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 2 ++
src/common/include/Activity.class.php | 2 +-
src/common/include/MonitorElement.class.php | 4 ++--
src/common/include/user_profile.php | 15 +++++++++++++++
src/common/include/utils.php | 4 ++--
src/common/include/utils_crossref.php | 2 +-
src/www/themes/css/fusionforge.css | 12 ++++++------
7 files changed, 29 insertions(+), 12 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
