Commit Graph

765 Commits

Author SHA1 Message Date
Marian OANCΞA
a896730843 Merge pull request #261 from cubedro/master
Update from master
2015-08-17 17:08:05 +03:00
Marian OANCΞA
5f3dffcc1f Merge pull request #260 from cubedro/develop
Added secret split by | char
2015-08-17 17:07:45 +03:00
cubedro
c2a98f5728 added secret split by | char 2015-08-17 17:07:26 +03:00
Marian OANCΞA
02a561a7d6 Merge pull request #259 from cubedro/develop
Added multiple secrets
2015-08-17 16:39:57 +03:00
cubedro
8573431f9f added multiple secrets 2015-08-17 16:39:36 +03:00
Marian OANCΞA
fef93f7098 Merge pull request #258 from cubedro/develop
Merge pull request #257 from cubedro/master
2015-08-17 16:32:23 +03:00
Marian OANCΞA
9401b91009 Merge pull request #257 from cubedro/master
update from master
2015-08-17 16:32:15 +03:00
Marian OANCΞA
472cc1f778 Merge pull request #256 from cubedro/meteor
Merge pull request #255 from cubedro/master
2015-08-17 12:01:05 +03:00
Marian OANCΞA
3aa81faa1f Merge pull request #255 from cubedro/master
Update from master
2015-08-17 12:00:58 +03:00
Fabian Vogelsteller
f53e5559f8 add meteor frontend app 2015-08-14 19:22:53 +02:00
Marian OANCΞA
b9cd95bedc Merge pull request #254 from cubedro/develop
Merge pull request #253 from cubedro/master
2015-08-13 10:34:56 +03:00
Marian OANCΞA
10c7f9309c Merge pull request #253 from cubedro/master
Update from master
2015-08-13 10:34:46 +03:00
Marian OANCΞA
7051070853 Merge pull request #252 from cubedro/develop
removed ip from display
2015-08-12 23:56:37 +03:00
cubedro
99e74187ac removed ip from display 2015-08-12 23:55:20 +03:00
Fabian Vogelsteller
91e54ecbef add xss filter 2015-08-11 19:40:28 +02:00
Marian OANCΞA
c0b0cbbd68 Merge pull request #250 from cubedro/develop
Develop
2015-08-07 16:18:29 +03:00
cubedro
f86ef9e740 Merge branch 'develop' of https://github.com/cubedro/eth-netstats into develop
Merge with develop
2015-08-07 16:18:02 +03:00
cubedro
e2cdec1f3d unbanned ip 2015-08-07 16:17:37 +03:00
Marian OANCΞA
9214e4bd1a Merge pull request #249 from cubedro/develop
Merge pull request #248 from cubedro/gasLimit
2015-08-06 14:00:02 +03:00
Marian OANCΞA
a234329103 Merge pull request #248 from cubedro/gasLimit
Gas limit
2015-08-06 13:59:52 +03:00
Marian OANCΞA
73c1ffbdb5 Merge pull request #247 from cubedro/gasLimit
Add gas limit chart
2015-08-06 13:59:29 +03:00
cubedro
409af3720e fixed styling 2015-08-06 13:54:10 +03:00
Fabian Vogelsteller
95ce5488f1 merged master 2015-08-06 12:25:42 +02:00
Fabian Vogelsteller
c1f1a0989d add gas limit chart 2015-08-06 12:22:47 +02:00
Marian OANCΞA
fa20910fc1 Merge pull request #246 from cubedro/develop
Removed olympic block 1028201
2015-08-05 23:01:40 +03:00
cubedro
bb2f1aa22a removed olympic block 1028201 2015-08-05 23:01:18 +03:00
Marian OANCΞA
894131ed2b Merge pull request #244 from cubedro/develop
Fixed total difficulty display
2015-08-04 13:24:18 +03:00
cubedro
5ac1f302ba fixed total difficulty display 2015-08-04 13:24:01 +03:00
Marian OANCΞA
c4f8343372 Merge pull request #242 from cubedro/develop
Fixed grunt-cli in readme.md
2015-08-01 18:33:00 +03:00
cubedro
38a405917f fixed grunt-cli in readme.md 2015-08-01 18:21:53 +03:00
Marian OANCΞA
b4285a176c Merge pull request #240 from cubedro/develop
Fixed chart blocktime colorcode
2015-07-31 16:57:02 +03:00
cubedro
f4ce48d4d6 fixed chart blocktime colorcode 2015-07-31 16:56:30 +03:00
Marian OANCΞA
19753ba3ec Merge pull request #239 from cubedro/develop
Fixed target blocktime colorcode
2015-07-31 13:40:37 +03:00
cubedro
6b70370a17 fixed target blocktime colorcode 2015-07-31 13:40:02 +03:00
Marian OANCΞA
c95b35b4df Merge pull request #238 from cubedro/develop
Added banned ip
2015-07-31 00:13:38 +03:00
cubedro
a9bfb43a51 added banned ip 2015-07-31 00:13:11 +03:00
Marian OANCΞA
63956b42ed Merge pull request #237 from cubedro/develop
added 2 decimals to avg block time
2015-07-30 21:54:46 +03:00
cubedro
5f21a82a3e added 2 decimals to avg block time 2015-07-30 21:54:34 +03:00
Marian OANCΞA
19dd9be7fa Merge pull request #236 from cubedro/develop
added another node to trusted nodes
2015-07-30 20:49:51 +03:00
cubedro
dadb8b195f added another node to trusted nodes 2015-07-30 20:47:34 +03:00
Marian OANCΞA
9dc7db071f Merge pull request #235 from cubedro/develop
removed warning icon
2015-07-30 20:40:49 +03:00
cubedro
fa72fa88f4 removed warning icon 2015-07-30 20:39:19 +03:00
Marian OANCΞA
f899b6e59f Merge pull request #234 from cubedro/develop
added more nodes to config
2015-07-30 20:36:01 +03:00
cubedro
15d64ad1f2 added more nodes to config 2015-07-30 20:34:34 +03:00
Marian OANCΞA
6c83900a32 Merge pull request #233 from cubedro/develop
Added genesis hash
2015-07-30 18:35:27 +03:00
cubedro
308921870d added genesis hash 2015-07-30 18:34:10 +03:00
Marian OANCΞA
1337c04ff9 Merge pull request #232 from cubedro/develop
Removed unnecessary boxes from LITE version
2015-07-30 18:00:41 +03:00
cubedro
79da0eed0c removed unnecessary boxes from LITE version 2015-07-30 18:00:18 +03:00
Marian OANCΞA
e2207472c1 Merge pull request #231 from cubedro/develop
Added announcements box to LITE version
2015-07-30 15:58:24 +03:00
cubedro
f01b69e8ce added announcements box to LITE version 2015-07-30 15:58:11 +03:00