Commit Graph

12 Commits

Author SHA1 Message Date
Marek Kotewicz 75e92c8048 Merge branch 'master' into develop 2015-03-07 16:48:30 +01:00
Wilfried Kopp cbb1efe4e1 test(eth): Disable few tests
Disable for now few tests that fail until the switch to karma is done.

test(karma): Replace mocha by Karma.
2015-03-06 20:58:23 +01:00
Fabian Vogelsteller 181f1093e6 changed getCode to getData 2015-02-25 11:01:58 +01:00
Fabian Vogelsteller 36ca47f11c Changed watch to filter for eth and shh 2015-02-23 18:30:37 +01:00
Fabian Vogelsteller 188e9e5325 Add toWei/fromWei and isAddress 2015-02-20 09:34:26 +01:00
Marek Kotewicz ec6f9b3d08 added transactionCount && uncleCount methods 2015-02-17 19:55:02 +01:00
Marek Kotewicz fdcc1af4e2 clearing tests 2015-02-03 19:48:51 +01:00
Marek Kotewicz c2cb2bef96 removed web3.eth.account, fixed #37 2015-01-27 16:02:42 +01:00
Marek Kotewicz da4c2d530d removed promise dependency, updated readme, fixed node.js version of lib 2015-01-27 00:54:21 +01:00
Marek Kotewicz ceb4357a8d sync api tests running, removed unused pieces of code 2015-01-21 20:43:20 +01:00
Marek Kotewicz bacc5aa6d3 methodExists and propertyExists are now separated tests 2015-01-15 11:38:21 +01:00
Gav Wood ded221fba2 Merge commit 'ab745d3b0eb89d67db1ed953020c665be3d072ed' into develop
Conflicts:
	libjsqrc/ethereumjs/.travis.yml
	libjsqrc/ethereumjs/README.md
	libjsqrc/ethereumjs/dist/ethereum.js
	libjsqrc/ethereumjs/dist/ethereum.js.map
	libjsqrc/ethereumjs/lib/abi.js
	libjsqrc/ethereumjs/package.json
2015-01-11 17:54:36 +01:00