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 bc08309ceec8de0af8108b9a18f2bd42fbd1f93b (commit)
via 6610e5099a3aa472f47ae86af88286c6fb3d20c6 (commit)
via 702190b08be3d87d6e68d3877fc617a1828be309 (commit)
via a7511bfc1c7e9b3c82de7e2d8c6f058145ecc27d (commit)
from 705552ad0cb56ac415715cd994136f6d47652404 (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=bc08309ceec8de0af8108b9a18f2bd42fbd1f93b
commit bc08309ceec8de0af8108b9a18f2bd42fbd1f93b
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Oct 25 12:58:09 2016 +0200
Use global
diff --git a/src/common/tracker/include/ArtifactHtml.class.php
b/src/common/tracker/include/ArtifactHtml.class.php
index 33b0da1..2e37338 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -101,7 +101,7 @@ function hide_edit_button(id) {
<tbody>';
for ($i=0; $i < $rows; $i++) {
- echo '<tr
onmouseover="show_edit_button(\'edit_bt_'.$i.'\')"
onmouseout="hide_edit_button(\'edit_bt_'.$i.'\')" '.
$GLOBALS['HTML']->boxGetAltRowStyle($i) .'><td>';
+ echo '<tr
onmouseover="show_edit_button(\'edit_bt_'.$i.'\')"
onmouseout="hide_edit_button(\'edit_bt_'.$i.'\')" '.
$HTML->boxGetAltRowStyle($i) .'><td>';
$params = array('user_id' =>
db_result($result,$i,'user_id'), 'size' => 's');
plugin_hook("user_logo", $params);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=6610e5099a3aa472f47ae86af88286c6fb3d20c6
commit 6610e5099a3aa472f47ae86af88286c6fb3d20c6
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Oct 25 12:57:13 2016 +0200
Empty cell is OK
diff --git a/src/common/widget/Widget_MyProjects.class.php
b/src/common/widget/Widget_MyProjects.class.php
index 692fd87..8b41370 100644
--- a/src/common/widget/Widget_MyProjects.class.php
+++ b/src/common/widget/Widget_MyProjects.class.php
@@ -87,7 +87,7 @@ class Widget_MyProjects extends Widget {
array('onClick' => 'return confirm("'._("Quit this project?").'")')).
'</td></tr>';
} else {
- $html_my_projects .=
'</td><td> </td></tr>';
+ $html_my_projects .=
'</td><td></td></tr>';
}
}
$html_my_projects .= $HTML->listTableBottom();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=702190b08be3d87d6e68d3877fc617a1828be309
commit 702190b08be3d87d6e68d3877fc617a1828be309
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Oct 25 12:56:10 2016 +0200
Add ARTIFACT_EXTRAFIELDTYPE_SLA = 13
diff --git a/src/common/tracker/ArtifactExtraField.class.php
b/src/common/tracker/ArtifactExtraField.class.php
index c875c11..aefebd3 100644
--- a/src/common/tracker/ArtifactExtraField.class.php
+++ b/src/common/tracker/ArtifactExtraField.class.php
@@ -36,11 +36,9 @@ define('ARTIFACT_EXTRAFIELDTYPE_STATUS',7);
//define('ARTIFACT_EXTRAFIELDTYPE_ASSIGNEE',8);
define('ARTIFACT_EXTRAFIELDTYPE_RELATION',9);
define('ARTIFACT_EXTRAFIELDTYPE_INTEGER',10);
-/* reserved for aljeux extension, for merge into FusionForge */
define('ARTIFACT_EXTRAFIELDTYPE_FORMULA',11);
-/* reserved for Evolvis extension, for merge into FusionForge */
define('ARTIFACT_EXTRAFIELDTYPE_DATETIME',12);
-/* reserved */
+define('ARTIFACT_EXTRAFIELDTYPE_SLA',13);
define('ARTIFACT_EXTRAFIELDTYPE_USER',14);
define ("ARTIFACT_EXTRAFIELDTYPE_SINGLECHOICETYPE", serialize (array
(ARTIFACT_EXTRAFIELDTYPE_SELECT, ARTIFACT_EXTRAFIELDTYPE_RADIO,
ARTIFACT_EXTRAFIELDTYPE_STATUS)));
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=a7511bfc1c7e9b3c82de7e2d8c6f058145ecc27d
commit a7511bfc1c7e9b3c82de7e2d8c6f058145ecc27d
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Oct 25 12:55:17 2016 +0200
PHP Doc
diff --git a/src/common/pm/ProjectTask.class.php
b/src/common/pm/ProjectTask.class.php
index cd0aea0..784e5ca 100644
--- a/src/common/pm/ProjectTask.class.php
+++ b/src/common/pm/ProjectTask.class.php
@@ -800,6 +800,7 @@ class ProjectTask extends FFError {
* Here we are converting an array like array(1,5,9,77) to
array(1=>SS,5=>SF,9=>FS,77=>SS)
*
* @param array $arr
+ * @return array
*/
function &convertDependentOn($arr) {
$new = array();
-----------------------------------------------------------------------
Summary of changes:
src/common/pm/ProjectTask.class.php | 1 +
src/common/tracker/ArtifactExtraField.class.php | 4 +---
src/common/tracker/include/ArtifactHtml.class.php | 2 +-
src/common/widget/Widget_MyProjects.class.php | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
