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 c1d5fe010fa423fbb19476a77fe87571f293af42 (commit)
via 4ae21748e9f89a4a30ae41beaaa59135a0111249 (commit)
via 92b72cdf0242f08dde0c84f267c8661a82f17d0a (commit)
via c10e257cd798aa3f184a0dc3fd66af29d5043a8d (commit)
from 6ee3f831a81335c212c373cc2a73d88a46c101ad (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=c1d5fe010fa423fbb19476a77fe87571f293af42
commit c1d5fe010fa423fbb19476a77fe87571f293af42
Author: Franck Villaume <[email protected]>
Date: Sun Mar 26 20:02:00 2017 +0200
remove dead code
diff --git a/src/bin/forge b/src/bin/forge
index 457f280..063825d 100755
--- a/src/bin/forge
+++ b/src/bin/forge
@@ -256,13 +256,6 @@ class CliActions {
$this->print_result($groupDump, $format);
}
- function newsDump($nid, $format = 'json') {
- $newsDump['id'] = $nid;
- ksort($newsDump);
- $this->print_result($newsDump, $format);
- return $newsDump;
- }
-
function surveyDump($sid, $format = 'json') {
$surveyDump['id'] = $sid;
$surveyObject = survey_get_object($sid);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=4ae21748e9f89a4a30ae41beaaa59135a0111249
commit 4ae21748e9f89a4a30ae41beaaa59135a0111249
Author: Franck Villaume <[email protected]>
Date: Sun Mar 26 20:01:23 2017 +0200
forge cli: dump news
diff --git a/src/bin/forge b/src/bin/forge
index b01a384..457f280 100755
--- a/src/bin/forge
+++ b/src/bin/forge
@@ -230,6 +230,15 @@ class CliActions {
}
if ($group->usesNews()) {
$groupDump['news'] = array();
+ $resultdb = db_query_params ('SELECT forum_id
FROM news_bytes WHERE news_bytes.group_id = $1',
+
array($group_id));
+ $forumIds = array();
+ if ($resultdb && db_numrows($resultdb)) {
+ $forumIds =
util_result_column_to_array($resultdb);
+ }
+ foreach ($forumIds as $forumId) {
+ $groupDump['news'][] =
$this->forumDump($forumId, 'return');
+ }
}
if ($group->usesSurvey()) {
$groupDump['surveys'] = array();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=92b72cdf0242f08dde0c84f267c8661a82f17d0a
commit 92b72cdf0242f08dde0c84f267c8661a82f17d0a
Author: Franck Villaume <[email protected]>
Date: Sun Mar 26 19:34:49 2017 +0200
fix missing col with tech permission
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index ec7bbf3..5c96a2a 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -509,6 +509,9 @@ class ArtifactTypeHtml extends ArtifactType {
$title_arr[] = _('Date');
$title_arr[] = _('By');
$title_arr[] = _('Download');
+ if (forge_check_perm('tracker', $this->getID(),
'tech')) {
+ $title_arr[] = '';
+ }
$return .= $HTML->listTableTop($title_arr);
foreach ($file_list as $file) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c10e257cd798aa3f184a0dc3fd66af29d5043a8d
commit c10e257cd798aa3f184a0dc3fd66af29d5043a8d
Author: Franck Villaume <[email protected]>
Date: Sun Mar 26 19:31:16 2017 +0200
translate error message
diff --git a/src/common/tracker/include/ArtifactFileHtml.class.php
b/src/common/tracker/include/ArtifactFileHtml.class.php
index 266f35f..9f2a042 100644
--- a/src/common/tracker/include/ArtifactFileHtml.class.php
+++ b/src/common/tracker/include/ArtifactFileHtml.class.php
@@ -1,11 +1,11 @@
<?php
/**
- *
- * SourceForge Generic Tracker facility
+ * FusionForge Generic Tracker facility
*
* SourceForge: Breaking Down the Barriers to Open Source Development
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2011, Franck Villaume - Capgemini
+ * Copyright 2017, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -30,7 +30,7 @@ class ArtifactFileHtml extends ArtifactFile {
function
upload($input_file,$input_file_name,$input_file_type,$description) {
if (!util_check_fileupload($input_file)) {
- $this->setError('ArtifactFile: Invalid filename');
+ $this->setError(_('ArtifactFile')._(': ')._('Invalid
filename'));
return false;
}
$size = @filesize($input_file);
-----------------------------------------------------------------------
Summary of changes:
src/bin/forge | 16 +++++++++-------
src/common/tracker/include/ArtifactFileHtml.class.php | 6 +++---
src/common/tracker/include/ArtifactTypeHtml.class.php | 3 +++
3 files changed, 15 insertions(+), 10 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
