Merge branch 'master' of https://github.com/cubedro/eth-netstats into default-colors

This commit is contained in:
Konstantin 2016-11-08 11:20:06 +00:00
commit dbbdb5f170
2 changed files with 3 additions and 2 deletions

View File

@ -37,7 +37,7 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, $localStorage, soc
$scope.latency = 0; $scope.latency = 0;
$scope.currentApiVersion = "0.1.0"; $scope.currentApiVersion = "0.1.1";
$scope.predicate = $localStorage.predicate || ['-pinned', '-stats.active', '-stats.block.number', 'stats.block.propagation']; $scope.predicate = $localStorage.predicate || ['-pinned', '-stats.active', '-stats.block.number', 'stats.block.propagation'];
$scope.reverse = $localStorage.reverse || false; $scope.reverse = $localStorage.reverse || false;

View File

@ -32,5 +32,6 @@
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-68390837-2', 'auto'); // ga('create', 'UA-68390837-2', 'auto');
ga('create', 'UA-80834434-1', 'auto');
ga('send', 'pageview'); ga('send', 'pageview');