Commit Graph

887 Commits

Author SHA1 Message Date
5chdn
9650f8eb85
grunt: disallow pow and poa at the same time 2018-12-03 13:30:37 +01:00
5chdn
f94779f132
grunt: make poa default 2018-12-03 13:24:39 +01:00
5chdn
832d59c88c
node: fix startup script 2018-12-03 13:24:15 +01:00
5chdn
32c56d54c6
server: allow for poa and pow network stats 2018-12-03 13:11:51 +01:00
5chdn
7e2bc16ad9
docs: update screenshot 2018-12-01 20:23:37 +01:00
Afri Schoedon
22bd2edd98
Merge pull request #9 from goerli/tao-staging
Merge all the lose ends
2018-12-01 20:20:30 +01:00
Afri Schoedon
854720459e
Merge pull request #11 from goerli/mix-staging
Merge mix stats
2018-12-01 20:18:12 +01:00
5chdn
6b74fe9eb1
views: remove merge artifact 2018-12-01 20:13:02 +01:00
5chdn
a7bed2007b
style: remove merge artifact 2018-12-01 20:12:36 +01:00
Afri Schoedon
574461c021
Merge branch 'tao-staging' into mix-staging 2018-12-01 20:10:50 +01:00
5chdn
065e2a112b
style: restore favicon 2018-12-01 20:08:34 +01:00
5chdn
271dab2a97
css: fix dracula theme 2018-12-01 20:05:23 +01:00
5chdn
59273a0b23
node: remove package lock 2018-12-01 20:03:14 +01:00
5chdn
8884cc3bb4
Merge branch 'master' of github.com:mix-blockchain/eth-netstats into mix-staging 2018-12-01 20:00:37 +01:00
5chdn
b8019ab9b8
Merge branch 'master' of github.com:Balanc3-Consensys/eth-netstats into tao-staging 2018-12-01 19:53:28 +01:00
5chdn
c0a49dd1dd
Merge branch 'patch-1' of github.com:AyushyaChitransh/eth-netstats into tao-staging 2018-12-01 19:49:38 +01:00
5chdn
90c13a472d
Merge branch 'docker-image' of github.com:letbetcoin/eth-netstats into tao-staging 2018-12-01 19:47:21 +01:00
5chdn
364ffb7816
Merge branch 'master' of github.com:bryant1410/eth-netstats into tao-staging 2018-12-01 19:42:54 +01:00
5chdn
d1f5d75b6b
css: restore min width 2018-12-01 19:29:03 +01:00
5chdn
432627fd31
views: rename dashboard title 2018-12-01 19:14:42 +01:00
5chdn
bfa888c243
server: delete ws secret 2018-12-01 19:13:29 +01:00
5chdn
55805d40ea
server: delete robots.txt 2018-12-01 19:12:49 +01:00
5chdn
c0e512ee3b
server: revert icons 2018-12-01 19:10:00 +01:00
Afri Schoedon
c8d92153d6
Delete package-lock.json 2018-12-01 19:01:56 +01:00
5chdn
e710021a50
Merge branch 'master' of github.com:tao-foundation/teo-netstats into tao-staging 2018-12-01 18:57:59 +01:00
Afri Schoedon
b7a828daf5
Merge pull request #8 from goerli/a5-deps-fix
deps: revert breaking changes
2018-12-01 18:43:29 +01:00
5chdn
fc8d3f6933
deps: revert breaking changes in lodash and d3 2018-12-01 18:39:56 +01:00
Afri Schoedon
4dbf27445b
Merge pull request #5 from goerli/a5-dependency-bumps
bump deps
2018-12-01 18:27:35 +01:00
5chdn
e03df307a2
deps: bump chalk to 2 2018-12-01 18:24:05 +01:00
5chdn
01f1083274
deps: bump d3 to 5 2018-12-01 18:23:28 +01:00
5chdn
9f953d190c
deps: bump debug to 4 2018-12-01 18:21:46 +01:00
5chdn
f4e1d298f9
deps: bump primus to 7 2018-12-01 18:20:51 +01:00
5chdn
7cf399f233
deps: bump lodash version to 4.17 2018-12-01 18:18:59 +01:00
5chdn
09ec62e8a5
deps: bump ws to 6.1 2018-12-01 18:17:49 +01:00
5chdn
7074edfdfa
deps: allow higher jade versions 2018-12-01 18:16:46 +01:00
5chdn
cd804b0e63
deps: fix grunt jade integration version 2018-12-01 18:14:52 +01:00
5chdn
c101c4cba0
deps: bump grunt-contrib libs 2018-12-01 18:13:43 +01:00
5chdn
0d1606e7dc
deps: run audit fix 2018-12-01 18:10:12 +01:00
5chdn
eb1c966fad
deps: bump geoip-lite to 1.3 2018-12-01 17:50:04 +01:00
5chdn
04c4066425
deps: bump grunt to 1 2018-12-01 17:47:05 +01:00
5chdn
a45b0caec3
deps: bump npm to 6 2018-12-01 17:44:32 +01:00
5chdn
938b571d2c
deps: bump node to 8 2018-12-01 17:42:10 +01:00
5chdn
1611b9dfc8
deps: bump node to 6 2018-12-01 17:40:41 +01:00
Afri Schoedon
93f6f8b634
Merge pull request #4 from goerli/a5-cleanup
cleanup meteor and lite
2018-12-01 17:37:09 +01:00
5chdn
2e476da905
grunt: remove lite 2018-12-01 17:33:45 +01:00
5chdn
6c3414b2c2
server: remove lite version 2018-12-01 17:31:21 +01:00
5chdn
322990a8c3
meteor: remove webapp 2018-12-01 17:30:56 +01:00
5chdn
737a9374dc
dist: cleanup build files 2018-12-01 17:30:36 +01:00
5chdn
1e305760d4
server: update gitignore 2018-12-01 17:30:02 +01:00
5chdn
41a4d9814b
Merge branch 'master' of github.com:goerli/netstats-server 2018-12-01 17:26:47 +01:00