projects / kraken-ui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad4b1c6 2f3edc8)
Merge branch 'master' into rc-tabs
authordeclerambaul <fabian.kaelin@gmail.com>
Thu, 3 May 2012 06:22:45 +0000 (02:22 -0400)
committerdeclerambaul <fabian.kaelin@gmail.com>
Thu, 3 May 2012 06:22:45 +0000 (02:22 -0400)
1  2 
lib/dashboard/dashboard-view.co patch | diff1 | diff2 | blob | history
lib/template/dashboard.jade patch | diff1 | diff2 | blob | history

diff --cc lib/dashboard/dashboard-view.co
index 3705f43,1358afc..832f4d2
--- 1/lib/dashboard/dashboard-view.co
--- 2/lib/dashboard/dashboard-view.co
+++ b/lib/dashboard/dashboard-view.co
@@@ -32,10 -33,10 +33,13 @@@ DashboardView = exports.DashboardView 
          active_editors
          active_editors_target
          very_active_editors
+         mobile_devices
+         mobile_devices_browsers
+         mobile_devices_applications
      ]>
 +
 +    core_graph_ids : ["unique_visitors ","pageviews","pageviews_mobile", "new_editors","active_editors", "active_editors_target"]
 +
      subviews : []
      graphs   : null
      ready    : false
diff --cc lib/template/dashboard.jade
Simple merge
Data Visualizer Toolkit