Commit Graph

934 Commits

Author SHA1 Message Date
Marian OANCΞA
5e6e3d5105 Merge pull request #271 from cubedro/develop
fixed secret bug
2015-08-24 10:06:08 +03:00
cubedro
84037d3671 fixed secret bug 2015-08-24 10:05:50 +03:00
Marian OANCΞA
c3543af46c Merge pull request #270 from cubedro/develop
updated dependency libraries
2015-08-21 22:25:29 +03:00
cubedro
79a16327b2 updated dependency libraries 2015-08-21 22:25:16 +03:00
Marian OANCΞA
b46a976656 Merge pull request #269 from cubedro/develop
changed olympic block announcement color to orange
2015-08-20 21:45:11 +03:00
cubedro
4a2821a4b0 changed olympic block announcement color to orange 2015-08-20 21:44:40 +03:00
Marian OANCΞA
731d6f79bd Merge pull request #268 from cubedro/develop
added back olympic block to lite version
2015-08-20 21:43:42 +03:00
cubedro
0bd26a6f0c added back olympic block to lite version 2015-08-20 21:43:26 +03:00
Marian OANCΞA
84d88e7788 Merge pull request #267 from cubedro/develop
Added security alert blog post
2015-08-20 21:38:37 +03:00
cubedro
eccd9d566c added security alert blog post 2015-08-20 21:38:21 +03:00
Marian OANCΞA
10541dcb9f Merge pull request #266 from cubedro/develop
WS_SECRET json accepts object
2015-08-19 21:21:41 +03:00
cubedro
1f5a8eebf8 WS_SECRET json accepts object 2015-08-19 21:20:02 +03:00
Marian OANCΞA
2524a797f8 Merge pull request #265 from cubedro/develop
secret from js to json
2015-08-19 21:05:07 +03:00
cubedro
f4ac50612b secret from js to json 2015-08-19 21:03:03 +03:00
Marian OANCΞA
fa3e8d8912 Merge pull request #264 from cubedro/develop
fixed WS_SECRET bug
2015-08-19 21:01:00 +03:00
cubedro
3237db0d1a fixed WS_SECRET bug 2015-08-19 21:00:47 +03:00
Marian OANCΞA
b50dda7424 Merge pull request #263 from cubedro/develop
fixed WS_SECRET if no pipe line found
2015-08-18 21:29:46 +03:00
cubedro
a5ffebfd6f fixed WS_SECRET if no pipe line found 2015-08-18 21:29:29 +03:00
Marian OANCΞA
67e6e897b9 Merge pull request #262 from cubedro/meteor
Merge pull request #261 from cubedro/master
2015-08-17 17:08:14 +03:00
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