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.0 has been updated
via d53e5872d29a3a18961c1e2607c33d154613a92b (commit)
via 934d9def8ad66c4efa3048b6ad8ad14c67ca1b5b (commit)
via d3d57067a69ee7f6f3275a2dbd23b57de027e12b (commit)
via c6b52e298b170623f55c35889b3af11a96b9a164 (commit)
via 5fabb2adf8bdcaf752d84e876d63036ac5a9af8e (commit)
via 490685fe2e4255f40a48a19d38fab68f8982b48b (commit)
via a0d280c2727f8e140ecc85c5cf6345a68d362d80 (commit)
via 335c06363e247c90ed054a9f0f5a43ebfcb19f4a (commit)
via 394ea6b4c3290f7c6df32f3e19a59b81f7f296c7 (commit)
via 6a62ce789ec0795764a0256231000221b84d1316 (commit)
via 31b4fa6c8c5b6966df39d26ef1150ef568661f58 (commit)
via 099e211368f2b03144180daf8e6a3b66b2927186 (commit)
via a62ca7f92f2093be4bc300a7f0caf7f705281ff6 (commit)
via cee8a8963191b2d0e894a1c6f36189cb6853382f (commit)
via 9743c14c65f8cea4e204e1d0175ef6b40d94ff32 (commit)
via 87c361706c37fd92a2d5fbefbcd986c7447dc86a (commit)
via 0d8d0aa798866bce12755e13b53d97c09be4fd3e (commit)
via d309b6fedfc4c84a582f05ffdb0adea6201098d4 (commit)
via 0af799080c541e217c9ec1513de16280467009d6 (commit)
via 72f5b489d2d00915fad4d4569c70d5e3405b5375 (commit)
via 49065676219f3a733ec79d0fc01e2b21846a5a83 (commit)
via 98725015dc32e3e1ecf3b7b0ff4d54ba34a63138 (commit)
via 2fa98307554e6cd7b0aafbff02bf7adedadbe16a (commit)
via 46728af14da43af43761e1aefea2e4d3b60935d4 (commit)
via 1819a070562e532d696ddd20caabd5efacb99eaf (commit)
via d8990bfbc5f9505b1f580bbd4be9016c617d0bf8 (commit)
from 1fe81daa99d88b3ac909bf48fe528c5a937e2f14 (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 d53e5872d29a3a18961c1e2607c33d154613a92b
Author: Sylvain Beucler <[email protected]>
Date: Mon May 18 14:51:26 2015 +0200
vm: update debian netinst URL
diff --git a/vm/packer/fusionforge-dev-debian.json
b/vm/packer/fusionforge-dev-debian.json
index 25ac96f..bd73227 100644
--- a/vm/packer/fusionforge-dev-debian.json
+++ b/vm/packer/fusionforge-dev-debian.json
@@ -36,8 +36,8 @@
"disk_size": 7168,
"guest_os_type": "Debian_64",
"http_directory": "http",
- "iso_url":
"http://cdimage.debian.org/cdimage/jessie_di_rc1/amd64/iso-cd/debian-jessie-DI-rc1-amd64-netinst.iso";,
- "iso_checksum":
"734f93daa163924125e48594cf3b4d97cd582a6591db648eb62c6597b87855d603202daca6f8906464b0e13e509687c732d941d5dfac8081f564df980bb16a31",
+ "iso_url":
"http://cdimage.debian.org/debian-cd/8.0.0/amd64/iso-cd/debian-8.0.0-amd64-netinst.iso";,
+ "iso_checksum":
"95b46c1c8cb3a02f7b65b5de5dd57d335424684e4b605c2786b168b4851bc17b0b6bf4a53ba22a701532d01883ff4de393ad896ed5595e6c8fd1652d0e3e5690",
"iso_checksum_type": "sha512",
"ssh_username": "root",
"ssh_password": "vagrant",
@@ -62,8 +62,8 @@
},
{
"type": "qemu",
- "iso_url":
"http://cdimage.debian.org/cdimage/jessie_di_rc1/amd64/iso-cd/debian-jessie-DI-rc1-amd64-netinst.iso";,
- "iso_checksum":
"734f93daa163924125e48594cf3b4d97cd582a6591db648eb62c6597b87855d603202daca6f8906464b0e13e509687c732d941d5dfac8081f564df980bb16a31",
+ "iso_url":
"http://cdimage.debian.org/debian-cd/8.0.0/amd64/iso-cd/debian-8.0.0-amd64-netinst.iso";,
+ "iso_checksum":
"95b46c1c8cb3a02f7b65b5de5dd57d335424684e4b605c2786b168b4851bc17b0b6bf4a53ba22a701532d01883ff4de393ad896ed5595e6c8fd1652d0e3e5690",
"iso_checksum_type": "sha512",
"shutdown_command": "poweroff",
"disk_size": 7168,
commit 934d9def8ad66c4efa3048b6ad8ad14c67ca1b5b
Author: Sylvain Beucler <[email protected]>
Date: Mon May 18 14:40:18 2015 +0200
system: sysRegenUserGroups: revert additional group by's, pending check
that error wasn't due to old pgsql
diff --git a/src/common/include/system/pgsql.class.php
b/src/common/include/system/pgsql.class.php
index a6346e3..11c2924 100644
--- a/src/common/include/system/pgsql.class.php
+++ b/src/common/include/system/pgsql.class.php
@@ -538,7 +538,7 @@ WHERE users.unix_status='A'
-- JOIN pfo_role_setting ON
(role_project_refs.role_id=pfo_role_setting.role_id AND
(pfo_role_setting.ref_id=nss_groups.group_id) AND
((section_name='project_admin' AND perm_val=1) OR (section_name='scm' AND
perm_val=2)))
-- WHERE users.unix_status='A' AND nss_groups.gid < $1
-GROUP BY users.user_id, nss_groups.gid, users.unix_uid, nss_groups.group_id,
users.user_name, nss_groups.name;
+GROUP BY users.user_id, nss_groups.gid;
";
$res = db_query_params($sql, array($this->GID_ADD_SCMRW,
$this->GID_ADD_SCMRO));
if (!$res) {
commit d3d57067a69ee7f6f3275a2dbd23b57de027e12b
Author: Sylvain Beucler <[email protected]>
Date: Mon May 18 14:39:00 2015 +0200
spacing
diff --git a/src/common/include/system/pgsql.class.php
b/src/common/include/system/pgsql.class.php
index 4af093a..a6346e3 100644
--- a/src/common/include/system/pgsql.class.php
+++ b/src/common/include/system/pgsql.class.php
@@ -492,7 +492,7 @@ FROM users
JOIN pfo_role ON (pfo_user_role.role_id=pfo_role.role_id)
LEFT JOIN role_project_refs ON
(pfo_user_role.role_id=role_project_refs.role_id)
JOIN nss_groups ON (pfo_role.home_group_id=nss_groups.group_id)
-WHERE users.unix_status='A'AND nss_groups.gid < $1
+WHERE users.unix_status='A' AND nss_groups.gid < $1
UNION
commit c6b52e298b170623f55c35889b3af11a96b9a164
Author: Franck Villaume <[email protected]>
Date: Sun May 17 20:17:32 2015 +0200
fix sysRegenUserGroups, missing columns in group by clause
diff --git a/src/common/include/system/pgsql.class.php
b/src/common/include/system/pgsql.class.php
index 245eedb..4af093a 100644
--- a/src/common/include/system/pgsql.class.php
+++ b/src/common/include/system/pgsql.class.php
@@ -492,7 +492,7 @@ FROM users
JOIN pfo_role ON (pfo_user_role.role_id=pfo_role.role_id)
LEFT JOIN role_project_refs ON
(pfo_user_role.role_id=role_project_refs.role_id)
JOIN nss_groups ON (pfo_role.home_group_id=nss_groups.group_id)
-WHERE users.unix_status='A'AND nss_groups.gid < $1
+WHERE users.unix_status='A'AND nss_groups.gid < $1
UNION
@@ -529,7 +529,7 @@ WHERE users.unix_status='A'
-- Not supported, this is not sane
-- UNION
---
+--
-- -- 'Open' privileges for Anonymous and LoggedIn users
-- SELECT users.unix_uid, nss_groups.gid, users.user_id, nss_groups.group_id,
user_name, nss_groups.name::text||'_scmro'
-- FROM users
@@ -538,7 +538,7 @@ WHERE users.unix_status='A'
-- JOIN pfo_role_setting ON
(role_project_refs.role_id=pfo_role_setting.role_id AND
(pfo_role_setting.ref_id=nss_groups.group_id) AND
((section_name='project_admin' AND perm_val=1) OR (section_name='scm' AND
perm_val=2)))
-- WHERE users.unix_status='A' AND nss_groups.gid < $1
-GROUP BY users.user_id, nss_groups.gid;
+GROUP BY users.user_id, nss_groups.gid, users.unix_uid, nss_groups.group_id,
users.user_name, nss_groups.name;
";
$res = db_query_params($sql, array($this->GID_ADD_SCMRW,
$this->GID_ADD_SCMRO));
if (!$res) {
@@ -546,7 +546,7 @@ GROUP BY users.user_id, nss_groups.gid;
return false;
}
db_commit();
-
+
return true;
}
}
commit 5fabb2adf8bdcaf752d84e876d63036ac5a9af8e
Author: Franck Villaume <[email protected]>
Date: Fri May 15 09:57:37 2015 +0200
scm: add missing global var
diff --git a/src/www/scm/include/scm_utils.php
b/src/www/scm/include/scm_utils.php
index 31353ad..dba0dcc 100644
--- a/src/www/scm/include/scm_utils.php
+++ b/src/www/scm/include/scm_utils.php
@@ -81,6 +81,7 @@ function scm_footer($params = array('inframe' => 0)) {
}
function commitstime_graph($group_id, $chartid) {
+ global $HTML;
$g = group_get_object($group_id);
$end = time();
$res = db_query_params ('SELECT month, sum(commits) AS count
commit 490685fe2e4255f40a48a19d38fab68f8982b48b
Author: Franck Villaume <[email protected]>
Date: Fri May 15 00:47:57 2015 +0200
frs: newest packages first
diff --git a/src/common/frs/FRSPackageFactory.class.php
b/src/common/frs/FRSPackageFactory.class.php
index acc7ecd..f02f6e4 100644
--- a/src/common/frs/FRSPackageFactory.class.php
+++ b/src/common/frs/FRSPackageFactory.class.php
@@ -107,7 +107,7 @@ class FRSPackageFactory extends Error {
if ($status)
$qpa = db_construct_qpa($qpa, 'AND status_id=$1',
array(1));
- $qpa = db_construct_qpa($qpa, 'ORDER BY package_id ASC');
+ $qpa = db_construct_qpa($qpa, 'ORDER BY package_id DESC');
$res = db_query_qpa($qpa);
if ($res) {
while ($arr = db_fetch_array($res)) {
commit a0d280c2727f8e140ecc85c5cf6345a68d362d80
Author: Franck Villaume <[email protected]>
Date: Fri May 15 00:36:57 2015 +0200
plugin taskboard: clean-up ini file
diff --git a/src/plugins/taskboard/etc/taskboard.ini
b/src/plugins/taskboard/etc/taskboard.ini
index e7ac718..3a72ad5 100644
--- a/src/plugins/taskboard/etc/taskboard.ini
+++ b/src/plugins/taskboard/etc/taskboard.ini
@@ -1,4 +1,4 @@
[taskboard]
-trackers_adapter_class = TaskBoardBasicAdapter
-plugin_status = valid
+trackers_adapter_class = TaskBoardBasicAdapter
+plugin_status = valid
commit 335c06363e247c90ed054a9f0f5a43ebfcb19f4a
Author: Franck Villaume <[email protected]>
Date: Fri May 15 00:21:13 2015 +0200
fix php syntax
diff --git a/src/plugins/hudson/include/hudsonViews.class.php
b/src/plugins/hudson/include/hudsonViews.class.php
index c8c59d4..48854cd 100644
--- a/src/plugins/hudson/include/hudsonViews.class.php
+++ b/src/plugins/hudson/include/hudsonViews.class.php
@@ -439,7 +439,7 @@ class hudsonViews extends Views {
function _display_iframe($url = '') {
if (!empty($url)) {
echo '<div id="hudson_iframe_div">';
- htmlIframe($url, array('id' => 'hudson_iframe', 'class'
=> 'iframe_service', 'absolute' = true));
+ htmlIframe($url, array('id' => 'hudson_iframe', 'class'
=> 'iframe_service', 'absolute' => true));
echo '</div>';
}
}
commit 394ea6b4c3290f7c6df32f3e19a59b81f7f296c7
Author: Franck Villaume <[email protected]>
Date: Thu May 14 20:06:41 2015 +0200
plugin hudson: fix iframe url => absolute
diff --git a/src/plugins/hudson/include/hudsonViews.class.php
b/src/plugins/hudson/include/hudsonViews.class.php
index 6f0eb13..c8c59d4 100644
--- a/src/plugins/hudson/include/hudsonViews.class.php
+++ b/src/plugins/hudson/include/hudsonViews.class.php
@@ -439,7 +439,7 @@ class hudsonViews extends Views {
function _display_iframe($url = '') {
if (!empty($url)) {
echo '<div id="hudson_iframe_div">';
- htmlIframe($url, array('id' => 'hudson_iframe', 'class'
=> 'iframe_service'));
+ htmlIframe($url, array('id' => 'hudson_iframe', 'class'
=> 'iframe_service', 'absolute' = true));
echo '</div>';
}
}
commit 6a62ce789ec0795764a0256231000221b84d1316
Author: Franck Villaume <[email protected]>
Date: Thu May 14 19:56:33 2015 +0200
plugin taskboard: fix artifact creation with resolution extra field
diff --git
a/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
b/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
index b37a801..f6283c9 100644
--- a/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
+++ b/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
@@ -272,25 +272,30 @@ class TaskBoardBasicAdapter {
if ($tracker) {
$artifact = new Artifact($tracker);
- $extra_fields = array();
$user_story_alias =
$this->TaskBoard->getUserStoriesReferenceField();
$release_alias = $this->TaskBoard->getReleaseField();
+ $fields_ids = $this->getFieldsIds($tracker_id);
+ $at = $this->getTasksTracker($tracker_id);
+ $extra_fields = $at->getExtraFields();
- $fields = $this->getFieldsIds($tracker_id);
+ if (array_key_exists('resolution', $fields_ids)) {
+ $elements =
$this->getExtraFieldValues($tracker_id, 'resolution');
+ $extra_fields[ $fields_ids['resolution'] ] =
array_shift($elements);
+ }
// link create task to user story (if specified)
if ($user_story_id && $user_story_alias) {
- if(array_key_exists($user_story_alias,
$fields)) {
- $extra_fields[ $fields[
$user_story_alias ] ] = $user_story_id;
+ if(array_key_exists($user_story_alias,
$fields_ids)) {
+ $extra_fields[ $fields_ids[
$user_story_alias ] ] = $user_story_id;
}
}
// link create task to release (if specified)
if ($release_value && $release_alias) {
- if(array_key_exists($release_alias, $fields)) {
+ if(array_key_exists($release_alias,
$fields_ids)) {
$elements =
$this->getExtraFieldValues($tracker_id, $release_alias);
if(array_key_exists($release_value,
$elements)) {
- $extra_fields[ $fields[
$release_alias ] ] = $elements[$release_value];
+ $extra_fields[ $fields_ids[
$release_alias ] ] = $elements[$release_value];
}
}
}
commit 31b4fa6c8c5b6966df39d26ef1150ef568661f58
Author: Franck Villaume <[email protected]>
Date: Thu May 14 19:55:53 2015 +0200
tracker: fix remap error message, avoid echo => use setError
diff --git a/src/common/tracker/ArtifactType.class.php
b/src/common/tracker/ArtifactType.class.php
index 2e2a7f4..a1f5a51 100644
--- a/src/common/tracker/ArtifactType.class.php
+++ b/src/common/tracker/ArtifactType.class.php
@@ -496,6 +496,10 @@ class ArtifactType extends Error {
return false;
}
$status_id = db_result($res, 0, 'status_id');
+ if ($status_id < 1 || $status_id > 4) {
+ $this->setError('INVALID STATUS REMAP:
'.$status_id.' FROM SELECTED ELEMENT: '.$element_id);
+ return false;
+ }
} else {
// custom status was not passed... use the
first status from the database
$res = db_query_params('SELECT status_id FROM
artifact_extra_field_elements WHERE extra_field_id=$1 ORDER BY element_id ASC
LIMIT 1 OFFSET 0',
@@ -506,11 +510,6 @@ class ArtifactType extends Error {
}
$status_id = db_result($res, 0, 'status_id');
}
-
- if ($status_id < 1 || $status_id > 4) {
- echo "INVALID STATUS REMAP: $status_id FROM
SELECTED ELEMENT: $element_id";
- return false;
- }
return $status_id;
} else {
return $status_id;
commit 099e211368f2b03144180daf8e6a3b66b2927186
Author: Franck Villaume <[email protected]>
Date: Thu May 14 19:03:01 2015 +0200
tracker: add missing separator
diff --git a/src/common/tracker/include/ArtifactHtml.class.php
b/src/common/tracker/include/ArtifactHtml.class.php
index 75c61a9..eb3473d 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -43,7 +43,7 @@ class ArtifactHtml extends Artifact {
$title_arr = array();
if ($editable === true) {
$title_arr[] = '<div style="width:100%;">' .
- '<div style="float:left">' . _('Detailed
description') . '</div>' .
+ '<div style="float:left">' . _('Detailed
description')._(':') . '</div>' .
'<div>' .
html_image('ic/forum_edit.gif','37','15',array('title'=>_('Edit this message'),
'alt'=>_('Edit this message'), 'class' => 'mini_buttons tip-ne',
'onclick'=>"switch2edit(this, 'showdescription', 'editdescription')")) .
'</div>' .
'</div>';
} else {
commit a62ca7f92f2093be4bc300a7f0caf7f705281ff6
Author: Franck Villaume <[email protected]>
Date: Thu May 14 19:00:03 2015 +0200
tracker: fix edit feature on artifact detail view
diff --git a/src/common/tracker/include/ArtifactHtml.class.php
b/src/common/tracker/include/ArtifactHtml.class.php
index 6263f7a..75c61a9 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -1,12 +1,10 @@
<?php
-/*
+/**
+ * FusionForge Generic Tracker facility
*
- * SourceForge Generic Tracker facility
- *
- * SourceForge: Breaking Down the Barriers to Open Source Development
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright (C) 2011-2012 Alain Peyrat - Alcatel-Lucent
- * Copyright 2011, Franck Villaume - Capgemini
+ * Copyright 2011,2015 Franck Villaume - Capgemini
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -31,9 +29,12 @@ require_once $gfcommon.'include/utils_crossref.php';
class ArtifactHtml extends Artifact {
/**
- * show details preformatted (like followups)
+ * showDetails - show details preformatted (like followups)
+ *
+ * @param bool $editable is the detail editable or not?
default is false.
*/
function showDetails($editable = false) {
+ global $HTML;
$result = $this->getDetails();
$result = util_gen_cross_ref($result,
$this->ArtifactType->Group->getID());
//$result = util_line_wrap( $result, 120,"\n");
@@ -43,17 +44,15 @@ class ArtifactHtml extends Artifact {
if ($editable === true) {
$title_arr[] = '<div style="width:100%;">' .
'<div style="float:left">' . _('Detailed
description') . '</div>' .
- '<div style="float:right">' .
html_image('ic/forum_edit.gif','37','15',array('title'=>_('Edit this message'),
'alt'=>_('Edit this message'), 'class' => 'mini_buttons tip-ne',
'onclick'=>"switch2edit(this, 'show', 'edit')")) . '</div>' .
+ '<div>' .
html_image('ic/forum_edit.gif','37','15',array('title'=>_('Edit this message'),
'alt'=>_('Edit this message'), 'class' => 'mini_buttons tip-ne',
'onclick'=>"switch2edit(this, 'showdescription', 'editdescription')")) .
'</div>' .
'</div>';
- }
- else {
+ } else {
$title_arr[] = _('Detailed description');
}
- echo $GLOBALS['HTML']->listTableTop ($title_arr);
-
- echo '<tr ' . $GLOBALS['HTML']->boxGetAltRowStyle(0) .'><td>'.
$result. '</td></tr>';
-
- echo $GLOBALS['HTML']->listTableBottom();
+ 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->listTableBottom();
}
function showMessages() {
commit cee8a8963191b2d0e894a1c6f36189cb6853382f
Author: Franck Villaume <[email protected]>
Date: Thu May 14 18:05:52 2015 +0200
tracker: use preg_replace_callback (preg_replace /e option is obsolete),
fix tooltip on artifact link
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index db6dd5b..26ebb13 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -222,7 +222,7 @@ class ArtifactTypeHtml extends ArtifactType {
"<a
href=\"\\1\" target=\"_blank\">\\1</a>", $value);
} elseif ($efarr[$i]['field_type'] ==
ARTIFACT_EXTRAFIELDTYPE_RELATION) {
// Convert artifact id to links.
- $value = preg_replace('/\b(\d+)\b/e',
"_artifactid2url('\\1')", $value);
+ $value =
preg_replace_callback('/\b(\d+)\b/', create_function('$matches', 'return
_artifactid2url($matches[1], \'title\');'), $value);
}
$template =
str_replace('{$PostName:'.$efarr[$i]['field_name'].'}', $post_name, $template);
$template =
str_replace('{$'.$efarr[$i]['field_name'].'}', $value, $template);
@@ -671,11 +671,10 @@ class ArtifactTypeHtml extends ArtifactType {
$vals[$i]=$arr[$i]['element_name'];
}
// Convert artifact id to links.
- $html_contents = preg_replace('/\b(\d+)\b/e',
"_artifactid2url('\\1','title')", $contents);
+ $html_contents = preg_replace_callback('/\b(\d+)\b/',
create_function('$matches', 'return _artifactid2url($matches[1], \'title\');'),
$contents);
$edit_contents = $this->renderTextField
($extra_field_id,$contents,$size,$maxlength);
- $edit_tips = '<br/><span class="tips">'._('Tip: Enter a
space-separated list of artifact ids ([#NNN] also accepted)').'</span>';
return '
- <div id="edit'.$extra_field_id.'" style="display:
none;">'.$edit_contents.$edit_tips.'</div>
+ <div id="edit'.$extra_field_id.'" style="display:
none;" title="'._('Tip: Enter a space-separated list of artifact ids ([#NNN]
also accepted)').'" >'.$edit_contents.'</div>
<div id="show'.$extra_field_id.'" style="display:
block;">'.$html_contents.'</div>';
}
commit 9743c14c65f8cea4e204e1d0175ef6b40d94ff32
Author: Franck Villaume <[email protected]>
Date: Thu May 14 17:31:36 2015 +0200
plugin taskboard: fix display error message on artifact creation
diff --git a/src/plugins/taskboard/www/index.php
b/src/plugins/taskboard/www/index.php
index 51a7c92..182f687 100644
--- a/src/plugins/taskboard/www/index.php
+++ b/src/plugins/taskboard/www/index.php
@@ -284,8 +284,8 @@ jQuery( document ).ready(function( $ ) {
}).done(function( answer ) {
jQuery('#new-task-dialog').dialog( "close" );
- if(answer['message']) {
-
showMessage(answer['message'], 'error');
+ if(answer['alert']) {
+
showMessage(answer['alert'], 'error');
}
if(answer['action'] ==
'reload') {
commit 87c361706c37fd92a2d5fbefbcd986c7447dc86a
Author: Franck Villaume <[email protected]>
Date: Thu May 14 17:16:25 2015 +0200
tracker: do not hide error on status mapping, reuse the real error message
diff --git a/src/common/tracker/Artifact.class.php
b/src/common/tracker/Artifact.class.php
index 9715193..6f0eaa9 100644
--- a/src/common/tracker/Artifact.class.php
+++ b/src/common/tracker/Artifact.class.php
@@ -234,7 +234,7 @@ class Artifact extends Error {
//
$status_id =
$this->ArtifactType->remapStatus($status_id,$extra_fields);
if (!$status_id) {
- $this->setError(_('Error remapping status'));
+ $this->setError($this->ArtifactType->getErrorMessage());
return false;
}
commit 0d8d0aa798866bce12755e13b53d97c09be4fd3e
Author: Sylvain Beucler <[email protected]>
Date: Wed May 13 18:42:21 2015 +0200
deb: prepare for upload
diff --git a/src/debian/changelog b/src/debian/changelog
index 1215d32..0b0d4b1 100644
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@ -1,4 +1,4 @@
-fusionforge (6.0~rc2-0) UNRELEASED; urgency=medium
+fusionforge (6.0~rc2+20150513-1) unstable; urgency=medium
* New upstream release candidate
(closes: #769098, #666236, #717803, #769098, #309518)
commit d309b6fedfc4c84a582f05ffdb0adea6201098d4
Author: Sylvain Beucler <[email protected]>
Date: Wed May 13 18:39:03 2015 +0200
lintian: description-is-pkg-name
diff --git a/src/debian/fusionforge-plugin-blocks.lintian-overrides
b/src/debian/fusionforge-plugin-blocks.lintian-overrides
new file mode 100644
index 0000000..df6c5f3
--- /dev/null
+++ b/src/debian/fusionforge-plugin-blocks.lintian-overrides
@@ -0,0 +1,2 @@
+# Auto-documented, clear package name, so we can use the same words for the
description
+fusionforge-plugin-blocks: description-is-pkg-name FusionForge plugin - Blocks
diff --git a/src/debian/fusionforge-plugin-globalsearch.lintian-overrides
b/src/debian/fusionforge-plugin-globalsearch.lintian-overrides
new file mode 100644
index 0000000..4f1811f
--- /dev/null
+++ b/src/debian/fusionforge-plugin-globalsearch.lintian-overrides
@@ -0,0 +1,2 @@
+# Auto-documented, clear package name, so we can use the same words for the
description
+fusionforge-plugin-globalsearch: description-is-pkg-name FusionForge plugin -
Globalsearch
diff --git a/src/debian/fusionforge-plugin-mediawiki.lintian-overrides
b/src/debian/fusionforge-plugin-mediawiki.lintian-overrides
new file mode 100644
index 0000000..29d3c0c
--- /dev/null
+++ b/src/debian/fusionforge-plugin-mediawiki.lintian-overrides
@@ -0,0 +1,2 @@
+# Auto-documented, clear package name, so we can use the same words for the
description
+fusionforge-plugin-mediawiki: description-is-pkg-name FusionForge plugin -
Mediawiki
diff --git a/src/debian/fusionforge-plugin-message.lintian-overrides
b/src/debian/fusionforge-plugin-message.lintian-overrides
new file mode 100644
index 0000000..10429c7
--- /dev/null
+++ b/src/debian/fusionforge-plugin-message.lintian-overrides
@@ -0,0 +1,2 @@
+# Auto-documented, clear package name, so we can use the same words for the
description
+fusionforge-plugin-message: description-is-pkg-name FusionForge plugin -
Message
diff --git a/src/debian/fusionforge-plugin-scmhook.lintian-overrides
b/src/debian/fusionforge-plugin-scmhook.lintian-overrides
index e19e850..6ec90f0 100644
--- a/src/debian/fusionforge-plugin-scmhook.lintian-overrides
+++ b/src/debian/fusionforge-plugin-scmhook.lintian-overrides
@@ -3,3 +3,5 @@ fusionforge-plugin-scmhook: script-not-executable
usr/share/fusionforge/plugins/
fusionforge-plugin-scmhook: script-not-executable
usr/share/fusionforge/plugins/scmhook/library/scmsvn/skel/post-commit/head
fusionforge-plugin-scmhook: script-not-executable
usr/share/fusionforge/plugins/scmhook/library/scmsvn/skel/pre-commit/head
fusionforge-plugin-scmhook: script-not-executable
usr/share/fusionforge/plugins/scmhook/library/scmsvn/skel/pre-revprop-change/head
+# Auto-documented, clear package name, so we can use the same words for the
description
+fusionforge-plugin-scmhook: description-is-pkg-name FusionForge plugin -
Scmhook
diff --git a/src/debian/fusionforge-plugin-webanalytics.lintian-overrides
b/src/debian/fusionforge-plugin-webanalytics.lintian-overrides
new file mode 100644
index 0000000..0a252f7
--- /dev/null
+++ b/src/debian/fusionforge-plugin-webanalytics.lintian-overrides
@@ -0,0 +1 @@
+fusionforge-plugin-webanalytics: description-is-pkg-name FusionForge plugin -
webanalytics
commit 0af799080c541e217c9ec1513de16280467009d6
Author: Sylvain Beucler <[email protected]>
Date: Wed May 13 18:25:31 2015 +0200
lintian: script-in-etc-init.d-not-registered-via-update-rc.d +
init.d-script-does-not-source-init-functions
diff --git a/src/debian/fusionforge-common.lintian-overrides
b/src/debian/fusionforge-common.lintian-overrides
new file mode 100644
index 0000000..67e3c07
--- /dev/null
+++ b/src/debian/fusionforge-common.lintian-overrides
@@ -0,0 +1,4 @@
+# It is registered, in a separate script called from postinst
+fusionforge-common: script-in-etc-init.d-not-registered-via-update-rc.d
etc/init.d/fusionforge-systasksd
+# It's a portable init script; also FF doesn't rely on systemd so no need to
"redirect /etc/init.d/$script calls to systemctl"
+fusionforge-common: init.d-script-does-not-source-init-functions
etc/init.d/fusionforge-systasksd
commit 72f5b489d2d00915fad4d4569c70d5e3405b5375
Author: Sylvain Beucler <[email protected]>
Date: Wed May 13 18:21:54 2015 +0200
lintian: python-script-but-no-python-dep
diff --git a/src/debian/plugins b/src/debian/plugins
index 5b530f0..de4dc91 100644
--- a/src/debian/plugins
+++ b/src/debian/plugins
@@ -2,7 +2,7 @@ Package: fusionforge-plugin-scmgit
Depends: git, xinetd, rsync
Package: fusionforge-plugin-scmsvn
-Depends: subversion, subversion-tools, viewvc, python-pycurl, xinetd, rsync,
libapache2-mod-svn
+Depends: subversion, subversion-tools, viewvc, python, python-pycurl, xinetd,
rsync, libapache2-mod-svn
Package: fusionforge-plugin-scmbzr
Depends: bzr, libapache2-mod-wsgi, loggerhead (>= 1.19~bzr477~),
python-pastedeploy
commit 49065676219f3a733ec79d0fc01e2b21846a5a83
Author: Sylvain Beucler <[email protected]>
Date: Wed May 13 18:15:22 2015 +0200
lintian: script-not-executable
diff --git a/src/common/docman/engine/parser_unoconv_document.php
b/src/common/docman/engine/parser_unoconv_document.php
old mode 100644
new mode 100755
diff --git a/src/common/docman/engine/parser_unoconv_presentation.php
b/src/common/docman/engine/parser_unoconv_presentation.php
old mode 100644
new mode 100755
diff --git a/src/common/docman/engine/parser_unoconv_spreadsheet.php
b/src/common/docman/engine/parser_unoconv_spreadsheet.php
old mode 100644
new mode 100755
commit 98725015dc32e3e1ecf3b7b0ff4d54ba34a63138
Author: Sylvain Beucler <[email protected]>
Date: Wed May 13 18:13:21 2015 +0200
lintian: init.d-script-does-not-implement-required-option
diff --git a/src/etc/init.d/fusionforge-systasksd
b/src/etc/init.d/fusionforge-systasksd
index 4a3b890..4243a72 100755
--- a/src/etc/init.d/fusionforge-systasksd
+++ b/src/etc/init.d/fusionforge-systasksd
@@ -54,7 +54,7 @@ case $1 in
return 3
fi
;;
- restart)
+ restart|force-reload)
$0 stop
$0 start
;;
commit 2fa98307554e6cd7b0aafbff02bf7adedadbe16a
Author: Sylvain Beucler <[email protected]>
Date: Wed May 13 18:12:55 2015 +0200
lintian: script-not-executable
diff --git a/src/plugins/scmhook/library/scmsvn/hooks/committracker/post.php
b/src/plugins/scmhook/library/scmsvn/hooks/committracker/post.php
old mode 100644
new mode 100755
commit 46728af14da43af43761e1aefea2e4d3b60935d4
Merge: 1819a07 d8990bf
Author: Sylvain Beucler <[email protected]>
Date: Wed May 13 18:07:45 2015 +0200
Merge branch 'Branch_5_3' into 6.0
Conflicts:
src/common/include/FusionForge.class.php
src/www/index_std.php
commit 1819a070562e532d696ddd20caabd5efacb99eaf
Author: Sylvain Beucler <[email protected]>
Date: Wed May 13 17:31:07 2015 +0200
install: list-valid-plugins.sh obsoleted by faster 'grep' one-liner in
GNUMakefile
diff --git a/src/utils/list-valid-plugins.sh b/src/utils/list-valid-plugins.sh
deleted file mode 100755
index 214aac1..0000000
--- a/src/utils/list-valid-plugins.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-
-# Lists which plugins are enabled or disabled.
-
-# Takes into account the 'plugin_status = valid' values if the plugin's
etc/pluginname.ini file exists
-if ! type confget >/dev/null 2>&1 && ! type python >/dev/null 2>&1 ; then
- echo >&2 Aborting, neither confget nor python are available
- exit 255
-fi
-
-if [ -e plugins ] ; then
- cd .
-elif [ -e ../src/plugins ] ; then
- cd ../src
-else
- echo "Couldn't find source directory..."
- exit 1
-fi
-
-enabled=""
-disabled=""
-
-for name in plugins/*/NAME ; do
- dir=${name%%/NAME}
- plugin=${dir##plugins/}
- if [ -e $dir/packaging/control/[1-9][0-9][0-9]plugin-$plugin ] ; then
- if [ ! -e $dir/etc/$plugin.ini ] ; then
- enabled="$enabled $plugin"
- else
- if [ -x /usr/bin/confget ] ; then
- status=$(confget -f $dir/etc/$plugin.ini plugin_status | sed -r
's/[ \t]*;.*//g')
- else
- status=$(python 2>/dev/null <<EOF
-import ConfigParser
-config = ConfigParser.ConfigParser()
-config.read("plugins/$plugin/etc/$plugin.ini")
-print config.get("$plugin","plugin_status").strip()
-EOF
-) || status=error
- fi
- # confget returns litteral semi-colons after values, so get rid of
comments
- if [ "$status" = "valid" ] ; then
- enabled="$enabled $plugin"
- else
- disabled="$disabled $plugin"
- fi
- fi
- else
- disabled="$disabled $plugin"
- fi
-done
-
-if [ "$1" = "--disabled" ] ; then
- echo $disabled
-else
- echo $enabled
-fi
commit d8990bfbc5f9505b1f580bbd4be9016c617d0bf8
Author: Sylvain Beucler <[email protected]>
Date: Wed May 13 16:59:57 2015 +0200
Prepare v5.3.3
diff --git a/src/common/include/FusionForge.class.php
b/src/common/include/FusionForge.class.php
index 13ff200..b262e9d 100644
--- a/src/common/include/FusionForge.class.php
+++ b/src/common/include/FusionForge.class.php
@@ -49,7 +49,7 @@ class FusionForge extends Error {
if (isset($forge_pkg_version)) {
$this->software_version = $forge_pkg_version;
} else {
- $this->software_version = '5.3.2' ;
+ $this->software_version = '5.3.3' ;
}
if (isset($forge_pkg_type)) {
diff --git a/src/www/index_std.php b/src/www/index_std.php
index 0360694..c55dc06 100644
--- a/src/www/index_std.php
+++ b/src/www/index_std.php
@@ -46,6 +46,34 @@ require_once $gfcommon.'include/FusionForge.class.php';
<li><?php print _('A powerful plugin system to add new features.'); ?></li>
</ul>
+<h3><?php print "What's new in FusionForge 5.3.3"; ?></h3>
+<p><?php print _('Checkout the roadmap for closed issues (bugs, patches,
features requests) ') ?><a
href="https://fusionforge.org/tracker/roadmap.php?group_id=6&roadmap_id=1&release=5.3.3";><?php
echo _('here') ?></a></p>
+<p><?php print _('Fixes:') ?></p>
+<ul>
+ <li><?php print 'User e-mail change: simplify confirmation hash and precise
encoding to avoid mangling in some versions of Thunderbird and Apple Mail
[#738] (Inria)'; ?></li>
+ <li><?php print 'Project homepage: default to http:// rather than https://
for external homepage links [#752] (Inria)'; ?></li>
+ <li><?php print 'Site stats: fix "new users" and "new groups" charts
(Inria)'; ?></li>
+ <li><?php print 'SCM: use \'shell_host\' variable (or failing that,
\'web_host\') to document where users can SSH to the group shared directory
[#698] (Inria)'; ?></li>
+ <li><?php print 'SCM stats: fix order in stats block [#736] (TrivialDev)';
?></li>
+ <li><?php print 'System replication: refresh nscd cache before applying
changes, fix spurious warning output from cron jobs (Inria)'; ?></li>
+ <li><?php print 'Docman: fix edit file when filename has quote [#750]
(TrivialDev)'; ?></li>
+ <li><?php print 'Docman: fix move to files to fs script [#763]
(TrivialDev)'; ?></li>
+ <li><?php print 'FRS: wrong tooltip displayed in admin page [#703]
(TrivialDev)'; ?></li>
+ <li><?php print 'PM: fix test on success [#762] (TrivialDev)'; ?></li>
+ <li><?php print 'PM: fix allow new tasks without replace older one [#761]
patch from Philipp Keidel (TrivialDev)'; ?></li>
+ <li><?php print 'Tracker: fix delete elements of an extrafield [#758]
(TrivialDev)'; ?></li>
+ <li><?php print 'Plugin AuthLDAP: error and warning messages displayed twice
[#732] (TrivialDev)'; ?></li>
+ <li><?php print 'Plugin AuthLDAP: fix check user status before login [#767]
(TrivialDev)'; ?></li>
+ <li><?php print 'Plugin scmhook: fix display when only one SCM plugin
enabled [#735] (TrivialDev)'; ?></li>
+ <li><?php print 'Plugin Hudson: fix global status in Hudson Job widget
[#740] (TrivialDev)'; ?></li>
+ <li><?php print 'Plugin Hudson: delete jobs on project deletion [#742]
(TrivialDev)'; ?></li>
+ <li><?php print 'Plugin MediaWiki: activate MediaWiki extensions (in the
database) when creating a new project wiki (Thorsten Glaser & Inria)'; ?></li>
+ <li><?php print 'Plugin MediaWiki: integrate e-mail from FusionForge
account, to send watchlist notifications (Inria)'; ?></li>
+ <li><?php print 'Plugin OSLC: Undefined index: is_public [#748]
(TrivialDev)'; ?></li>
+ <li><?php print 'I18N: updated French translation (Stéphane Aulery and
Inria)'; ?></li>
+ <li><?php print 'Project deletion: fix failure to delete project if tools
have been deleted [#681] (Roland Mas)'; ?></li>
+</ul>
+
<h3><?php print _("What's new in FusionForge 5.3.2"); ?></h3>
<p><?php print _('Checkout the roadmap for closed issues (bugs, patches,
features requests) ') ?><a
href="https://fusionforge.org/tracker/roadmap.php?group_id=6&roadmap_id=1&release=5.3.2";><?php
echo _('here') ?></a></p>
<p><?php print _('Fixes:') ?></p>
@@ -179,55 +207,6 @@ require_once $gfcommon.'include/FusionForge.class.php';
<li><?php print _('new admssw plugin to provide ADMS.SW compatible RDF
descriptions of projects'); ?></li>
</ul>
-<h3><?php print _("What's new in FusionForge 5.2"); ?></h3>
-<p><?php print _('Standards features:') ?></p>
-<ul>
-<li><?php print _('Docman:'); ?>
- <ul>
- <li><?php print _('Inject ZIP as a tree (Capgemini)') ?></li>
- <li><?php print _('Mass action (Capgemini)') ?></li>
- <li><?php print _('Interaction with the projects-hierarchy plugin to enable
hierarchical browsing. (Capgemini)') ?></li>
- <li><?php print _('Complete rewritten of trash and pending view
(Capgemini)') ?></li>
- </ul>
-</li>
-<li><?php print _('scmsvn:'); ?>
- <ul>
- <li><?php print _('Private projects can now be browsed with viewvc, using
user rights management (TrivialDev).') ?></li>
- <li><?php print _('Basic activity support (TrivialDev).') ?></li>
- </ul>
-</li>
-<li><?php print _('Trackers: New view to display roadmaps view for trackers
(Alcatel-Lucent)') ?></li>
-<li><?php print _('Admin: User add membership to multiples projects in one
shot (Capgemini)') ?></li>
-<li><?php print _('Widgets:'); ?>
- <ul>
- <li><?php print _('New Widget: last 5 documents published in my project
(Capgemini)') ?></li>
- <li><?php print _('New Widget: smcgit personal URL of cloned repositories.
Currently just a list of URLs of your personal repository cloned from project
you belong. (Capgemini)') ?></li>
- </ul>
-</li>
-</ul>
-<p><?php print _('Plugins:') ?></p>
-<ul>
-<li><?php print _('New Scmhook plugin: complete library to handle hooks for
any scm available in fusionforge. Currently supporting post-commit and
pre-commit hook. scmsvn pre-commit and post-commit library is provided
(Capgemini)') ?></li>
-<li><?php print _('New Message plugin to display global messages like planned
upgrade or outage (Alcatel-Lucent).') ?></li>
-<li><?php print _('New MoinMoinWiki plugin (AdaCore)') ?></li>
-</ul>
-
-<h3><?php print _("What's new in FusionForge 5.1"); ?></h3>
-<ul>
-<li><?php print _('New Funky Theme (Capgemini).'); ?></li>
-<li><?php print _('New UI and features for the document manager (download as
ZIP, locking, referencing documents by URL) (Capgemini).'); ?></li>
-<li><?php print _('New progress bar displaying completion state of trackers
using a custom status field.'); ?></li>
-<li><?php print _('Improved sorting in trackers (Alcatel-Lucent).'); ?></li>
-<li><?php print _('More flexible and more powerful role-based access control
system (Coclico).'); ?></li>
-<li><?php print _('New unobtrusive tooltip system based on jquery and tipsy to
replace old help window (Alcatel-Lucent)'); ?></li>
-<li><?php print _('New plugins: Blocks, to add free HTML blocks on top of each
tool of the project; Gravatar, to display user faces; OSLC, implementing the
OSLC-CM API for tracker interoperability with external tools.'); ?></li>
-<li><?php print _('scmgit plugin: Personal Git repositories for project
members (AdaCore).'); ?></li>
-<li><?php print _('Template projects: there can be several of them, and users
registering new projects can pick which template to clone from for their new
projects (Coclico).'); ?></li>
-<li><?php print _('Simplified configuration system, using standard *.ini
files.'); ?></li>
-<li><?php print _('Reorganised, modular Apache configuration.'); ?></li>
-<li><?php print _('RPM packages for Red Hat (and derived) distributions.');
?></li>
-</ul>
-
<?php
if(forge_get_config('use_news')) {
echo $HTML->boxTop(_('Latest News'), 'Latest_News');
-----------------------------------------------------------------------
Summary of changes:
.../docman/engine/parser_unoconv_document.php | 0
.../docman/engine/parser_unoconv_presentation.php | 0
.../docman/engine/parser_unoconv_spreadsheet.php | 0
src/common/frs/FRSPackageFactory.class.php | 2 +-
src/common/include/system/pgsql.class.php | 6 +--
src/common/tracker/Artifact.class.php | 2 +-
src/common/tracker/ArtifactType.class.php | 9 ++--
src/common/tracker/include/ArtifactHtml.class.php | 29 ++++++-----
.../tracker/include/ArtifactTypeHtml.class.php | 7 ++-
src/debian/changelog | 2 +-
src/debian/fusionforge-common.lintian-overrides | 4 ++
.../fusionforge-plugin-blocks.lintian-overrides | 2 +
...sionforge-plugin-globalsearch.lintian-overrides | 2 +
.../fusionforge-plugin-mediawiki.lintian-overrides | 2 +
.../fusionforge-plugin-message.lintian-overrides | 2 +
.../fusionforge-plugin-scmhook.lintian-overrides | 2 +
...sionforge-plugin-webanalytics.lintian-overrides | 1 +
src/debian/plugins | 2 +-
src/etc/init.d/fusionforge-systasksd | 2 +-
src/plugins/hudson/include/hudsonViews.class.php | 2 +-
.../library/scmsvn/hooks/committracker/post.php | 0
.../adapters/TaskBoardBasicAdapter.class.php | 17 ++++---
src/plugins/taskboard/etc/taskboard.ini | 4 +-
src/plugins/taskboard/www/index.php | 4 +-
src/utils/list-valid-plugins.sh | 57 ----------------------
src/www/scm/include/scm_utils.php | 1 +
vm/packer/fusionforge-dev-debian.json | 8 +--
27 files changed, 65 insertions(+), 104 deletions(-)
mode change 100644 => 100755
src/common/docman/engine/parser_unoconv_document.php
mode change 100644 => 100755
src/common/docman/engine/parser_unoconv_presentation.php
mode change 100644 => 100755
src/common/docman/engine/parser_unoconv_spreadsheet.php
create mode 100644 src/debian/fusionforge-common.lintian-overrides
create mode 100644 src/debian/fusionforge-plugin-blocks.lintian-overrides
create mode 100644 src/debian/fusionforge-plugin-globalsearch.lintian-overrides
create mode 100644 src/debian/fusionforge-plugin-mediawiki.lintian-overrides
create mode 100644 src/debian/fusionforge-plugin-message.lintian-overrides
create mode 100644 src/debian/fusionforge-plugin-webanalytics.lintian-overrides
mode change 100644 => 100755
src/plugins/scmhook/library/scmsvn/hooks/committracker/post.php
delete mode 100755 src/utils/list-valid-plugins.sh
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
