[Fusionforge-commits] FusionForge branch master updated. e8632e2497bcfd33c71ba4f2cd87b02a7e07a229

Franck Villaume nerville at fusionforge.org
Tue Dec 23 14:20:51 CET 2014


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  e8632e2497bcfd33c71ba4f2cd87b02a7e07a229 (commit)
       via  8c106cd72c769858a7a6bd7eaa095056979742d5 (commit)
       via  7852416929149b3c90f6c0ab5a01b910767702c0 (commit)
       via  c8654169d6f8d4b79b63ff47e8ce9a21a267b404 (commit)
       via  9d5421b3bff4a6e6eb6960101c6a748b3c945260 (commit)
       via  24ec6e1ff46ba9461945ec892f3be2924843c7a4 (commit)
       via  7e026c448d1db6f4aa5ef21a6adc163534f91377 (commit)
       via  df1741378409f0edc9648da51771cb3adca39e2e (commit)
      from  bd7797010a3a8d3391f02dfd1fa6a599a4a1a74d (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 e8632e2497bcfd33c71ba4f2cd87b02a7e07a229
Merge: bd77970 8c106cd
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Tue Dec 23 14:20:41 2014 +0100

    Merge Branch_5_3

diff --cc src/www/stats/site_stats_utils.php
index 7f44186,2f1b866..d94f8f2
--- a/src/www/stats/site_stats_utils.php
+++ b/src/www/stats/site_stats_utils.php
@@@ -574,10 -573,9 +574,10 @@@ function views_graph($monthly = 0) 
  
  function users_graph() {
  	global $gfcommon;
 +	global $HTML;
  	require_once $gfcommon.'reporting/Report.class.php';
  	$report = new Report();
- 	$res = db_query_params ('SELECT month,day,new_users,new_projects FROM stats_site ORDER BY month ASC, day ASC',
+ 	$res = db_query_params ('SELECT month,SUM(new_users) as new_users, SUM(new_projects) as new_projects FROM stats_site GROUP BY month ORDER BY month',
  			array ());
  
  	$i = 0;

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/mediawiki/www/LocalSettings.php |   19 ++++++++++++--
 src/www/stats/site_stats_utils.php          |   36 +++++++++++++++------------
 2 files changed, 37 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list