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 d1baeacc7abf265b270d03338e53b29d7d39e3cc (commit)
via 320aa2044a0fd5e8c3a2a95fe37c9fd09724f6ef (commit)
via 341452892e6474c7c0bbd56a234250c079d08059 (commit)
via b2770ab1271e43af8bbf510602de380529409f58 (commit)
via 82823f9c5bdb911090feb76c25cf1f4c5ca7e359 (commit)
from 7771000f1f78e854823ce054ac6a90eae313815e (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 -----------------------------------------------------------------
commit d1baeacc7abf265b270d03338e53b29d7d39e3cc
Merge: 7771000 320aa20
Author: Roland Mas <[email protected]>
Date: Thu Jun 4 22:34:29 2015 +0200
Merge branch '6.0'
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 12 ++++++++++++
src/common/tracker/include/ArtifactHtml.class.php | 6 +++---
src/www/scm/viewvc.php | 1 -
src/www/scm/viewvc/viewvc.cgi | 1 +
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/CHANGES b/src/CHANGES
index 0b44099..de52f65 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,3 +1,15 @@
+FusionForge 6.0.1:
+* Accounts: accept elliptic curve ssh keys (Unit 193)
+* Accounts: fix project join request form (Inria)
+* SCM: fix commit privileges (*_scmro group membership) (Inria)
+* FRS: display new releases first (Roland Mas, for Inria)
+* Tracker: fix description re-html-ization when editing item (Inria)
+* Widgets: MyProjects: only display active projects (Inria)
+* SCM SVN: fix double-compression in ViewVC (Inria)
+* Plugin scmhook: git commitemail: fix subject, handle special chars (Roland
Mas, for Inria)
+* Plugin scmhook: fix hook deactivation (Inria)
+* Doc clean-up (Inria)
+
FusionForge 6.0:
* New install system [#710] (Inria)
* Reactivity: system replication is now performed immediately (rather than
waiting for cron jobs) [#147] (Inria)
diff --git a/src/common/tracker/include/ArtifactHtml.class.php
b/src/common/tracker/include/ArtifactHtml.class.php
index eb3473d..d40f359 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -36,9 +36,9 @@ class ArtifactHtml extends Artifact {
function showDetails($editable = false) {
global $HTML;
$result = $this->getDetails();
- $result = util_gen_cross_ref($result,
$this->ArtifactType->Group->getID());
+ $result_html = util_gen_cross_ref($result,
$this->ArtifactType->Group->getID());
//$result = util_line_wrap( $result, 120,"\n");
- $result = nl2br($result);
+ $result_html = nl2br($result_html);
$title_arr = array();
if ($editable === true) {
@@ -51,7 +51,7 @@ class ArtifactHtml extends Artifact {
}
echo $HTML->listTableTop($title_arr);
echo $HTML->multiTableRow(array('class' =>
$HTML->boxGetAltRowStyle(0, true), 'id' => 'editdescription', 'style' =>
'display:none'), array(array(html_e('textarea', array('id' =>
'tracker-description', 'required' => 'required', 'name' => 'description',
'rows' => 20, 'cols' => 79, 'title' =>
util_html_secure(html_get_tooltip_description('description'))), $result))));
- echo $HTML->multiTableRow(array('class' =>
$HTML->boxGetAltRowStyle(0, true), 'id' => 'showdescription'),
array(array($result)));
+ echo $HTML->multiTableRow(array('class' =>
$HTML->boxGetAltRowStyle(0, true), 'id' => 'showdescription'),
array(array($result_html)));
echo $HTML->listTableBottom();
}
diff --git a/src/www/scm/viewvc.php b/src/www/scm/viewvc.php
index 2822119..52f620b 100644
--- a/src/www/scm/viewvc.php
+++ b/src/www/scm/viewvc.php
@@ -113,7 +113,6 @@ if ($external_scm) {
curl_setopt($ch, CURLOPT_USERAGENT,
$_SERVER['HTTP_USER_AGENT']); // for session validation
curl_setopt($ch, CURLOPT_HTTPHEADER,
array('Accept-Language:
'.$_SERVER['HTTP_ACCEPT_LANGUAGE'], // for i18n
- 'Accept-Encoding:
'.$_SERVER['HTTP_ACCEPT_ENCODING'], // for compression
'X-Forwarded-For:
'.$_SERVER['REMOTE_ADDR'])); // for session validation
$content = curl_exec($ch);
if ($content === false) {
diff --git a/src/www/scm/viewvc/viewvc.cgi b/src/www/scm/viewvc/viewvc.cgi
index 40e9d18..1a25283 100755
--- a/src/www/scm/viewvc/viewvc.cgi
+++ b/src/www/scm/viewvc/viewvc.cgi
@@ -1,5 +1,6 @@
#!/usr/bin/env python
# Locate ViewVC and run it
+# (local CGI version, see also plugins/scmsvn/libexec/viewvc.cgi)
import sys
import os
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
