projects
/
fusionforge
/
fusionforge.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1de8b45
2fd6761
)
Merged from 5.0: three patches from Ralf Habacker
author
Roland Mas
<lolando@debian.org>
Thu, 27 May 2010 15:56:10 +0000
(15:56 +0000)
committer
Roland Mas
<lolando@debian.org>
Thu, 27 May 2010 15:56:10 +0000
(15:56 +0000)
1
2
gforge/www/activity/index.php
patch
|
diff1
|
diff2
|
blob
|
history
gforge/www/reporting/projecttime.php
patch
|
diff1
|
diff2
|
blob
|
history
gforge/www/reporting/sitetime.php
patch
|
diff1
|
diff2
|
blob
|
history
gforge/www/reporting/sitetimebar.php
patch
|
diff1
|
diff2
|
blob
|
history
gforge/www/reporting/toolspie.php
patch
|
diff1
|
diff2
|
blob
|
history
gforge/www/reporting/usersummary.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
gforge/www/activity/index.php
Simple merge
diff --cc
gforge/www/reporting/projecttime.php
Simple merge
diff --cc
gforge/www/reporting/sitetime.php
Simple merge
diff --cc
gforge/www/reporting/sitetimebar.php
Simple merge
diff --cc
gforge/www/reporting/toolspie.php
index eb2c4cf973d7f08441a4d8a849b339f82184e503,73f2bfa859677b8a53042fdfa3f9b3f22fe63039..c5ef92487bb38b462f1ab5379344e6fc2cc518e4
---
1
/
gforge/www/reporting/toolspie.php
---
2
/
gforge/www/reporting/toolspie.php
+++ b/
gforge/www/reporting/toolspie.php
@@@
-40,10
-40,15
+40,15
@@@
$end = getIntFromRequest('end')
if (!$start) {
$z =& $report->getMonthStartArr();
- $start = $z[count($z)-1];
+ $start = $z[0];
+ }
+
+ if (!$end) {
+ $z =& $report->getMonthStartArr();
+ $end = $z[count($z)-1];
}
-session_require
( array('group'=>$sys_stats_group) )
;
+session_require
_global_perm ('forge_stats', 'read')
;
echo report_header(_('Tool Pie Graphs'));
diff --cc
gforge/www/reporting/usersummary.php
Simple merge