Commit Graph

236 Commits

Author SHA1 Message Date
Jeffrey Wilcke 507241f73c shh getMessage => getMessages 2015-01-12 18:34:37 +01:00
Gav Wood 9a9987aeed Merge commit 'a1023a5dffee7c06e8b75a21f5c9b8826e820942' into develop
Conflicts:
	libjsqrc/ethereumjs/dist/ethereum.js.map
2015-01-11 18:18:05 +01:00
Gav Wood 5582901ca5 Various fixes to ethereum.js and client web API stuff. 2015-01-11 18:15:35 +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
Marek Kotewicz ab745d3b0e updated readme 2015-01-11 17:23:03 +01:00
Marek Kotewicz b915c7a870 updated readme 2015-01-11 17:13:32 +01:00
Marek Kotewicz 6c26255979 Merge branch 'tests' into develop 2015-01-11 17:12:37 +01:00
Marek Kotewicz e2c4525da7 Merge branch 'master' into develop 2015-01-11 17:12:29 +01:00
Marek Kotewicz e778e127d6 spec reporter instead of nyan 2015-01-11 17:04:30 +01:00
Marek Kotewicz a4e6f0b3c6 fixed travis.yml && added nmp test script 2015-01-11 16:40:09 +01:00
Marek Kotewicz 048e7771fb Merge branch 'master' into tests 2015-01-11 16:36:38 +01:00
Marek Kotewicz 15c229300c updated package json 2015-01-11 16:36:07 +01:00
Marek Kotewicz 24814a4f0f Merge branch 'master' of https://github.com/ethereum/ethereum.js 2015-01-11 16:33:08 +01:00
Marek Kotewicz 6188e64473 Update README.md 2015-01-11 16:25:41 +01:00
Marek Kotewicz c34b0c67a1 Update README.md 2015-01-11 16:23:06 +01:00
Marek Kotewicz 47687cf085 default padding changed to 0 2015-01-09 17:27:56 +01:00
Marek Kotewicz 29c60c000a Merge branch 'develop' into tests 2015-01-09 16:48:44 +01:00
Marek Kotewicz 92f171ec99 rerun gulp 2015-01-09 16:40:55 +01:00
Marek Kotewicz 0933a79ab8 missing fromAscii 2015-01-09 16:38:26 +01:00
Marek Kotewicz 543a87c63f method signature length defined 2015-01-09 13:30:14 +01:00
Marek Kotewicz b3eda29f41 Merge branch 'master' into tests 2015-01-09 13:07:34 +01:00
Marek Kotewicz a5907a8239 Merge branch 'master' of https://github.com/ethereum/ethereum.js 2015-01-09 12:57:03 +01:00
Marek Kotewicz 2a6c84984a version upgraded 2015-01-09 12:55:46 +01:00
Marek Kotewicz 0538c11576 sha3 method signature 2015-01-09 12:55:04 +01:00
Jeffrey Wilcke c9015e2e04 module var fix 2015-01-09 12:44:11 +01:00
Jeffrey Wilcke 07fba274b1 module var fix 2015-01-09 12:43:45 +01:00
Marek Kotewicz c397e350f4 mocha opts file && init of parser tests 2015-01-08 20:24:30 +01:00
Marek Kotewicz b6058a837f methods existance tests in progress 2015-01-08 19:59:03 +01:00
Marek Kotewicz 5518022a5d mocha test init 2015-01-08 19:35:32 +01:00
Marek Kotewicz 807ec60e63 missing jshint ignore 2015-01-08 15:43:22 +01:00
Marek Kotewicz f9cc090473 fixed example 2015-01-08 15:31:46 +01:00
Marek Kotewicz 2f3384947b version upgrade 2015-01-08 15:13:43 +01:00
Marek Kotewicz a8dde17146 fixes for node.js 2015-01-08 15:11:20 +01:00
Marek Kotewicz 5208bb32f1 gulpfile modifications, default build set to dev 2015-01-07 14:13:29 +01:00
Marek Kotewicz df4d7846e5 Merge pull request #22 from debris/strings
strings, real, ureal paddings and implicit paddings for uint, int and hash
2015-01-07 11:16:46 +01:00
Marek Kotewicz 6c160adab3 Merge pull request #21 from debris/master
fixed gulp build
2015-01-07 11:16:27 +01:00
Marek Kotewicz 210682b734 real, ureal paddings and implicit paddings for uint, int and hash 2015-01-06 21:50:09 +01:00
Marek Kotewicz 1d139f7a0b solidity string support 2015-01-06 18:29:38 +01:00
Marek Kotewicz b6232cfdd1 fixed tabs 2015-01-06 13:37:02 +01:00
Marek Kotewicz a2a77172a6 bring back todos 2015-01-06 13:32:04 +01:00
Marek Kotewicz 8c1b26889a renamed example/index.html -> example/balance.html 2015-01-06 13:27:43 +01:00
Marek Kotewicz af9242f4cc fixed gulp build 2015-01-06 13:26:51 +01:00
caktux 1954b87819 bring back toHex 2014-12-30 11:59:33 -05:00
Gav Wood 123098ce79 Lots of fixes. 2014-12-22 01:13:49 +01:00
Jeffrey Wilcke e9db2d1b18 Merge pull request #15 from debris/master
changes from cpp-ethereum
2014-12-16 11:10:28 +01:00
Marek Kotewicz b402484e41 common changes 2014-11-18 13:59:17 +01:00
Marek Kotewicz 04845d42c0 Merge pull request #1 from cubedro/master
Fixed autoprovider bug
2014-11-18 09:08:15 +01:00
Marian Oancea 0d526d66b7 Updated version
Changed version from npm in order to publish the update
2014-11-18 09:23:16 +02:00
Marian OANCΞA 8fe16df6c9 Merge pull request #11 from debris/master
Update
2014-11-18 09:21:06 +02:00
Marian Oancea 1a9624af51 Fixed require web3 bug
Fixed error "Cannot find module './web3'" in autoprovider.js
2014-11-18 09:11:16 +02:00