Commit Graph

658 Commits

Author SHA1 Message Date
Marek Kotewicz c8e576893e fixed log fields 2015-04-21 18:46:42 +02:00
Marek Kotewicz d38f5a215a Merge branch 'develop' into events_refactor
Conflicts:
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js.map
	dist/web3.min.js
2015-04-21 17:17:22 +02:00
Fabian Vogelsteller a5c1bcc6e4 changed default providor port to 8545 closes #160 2015-04-21 17:01:00 +02:00
Fabian Vogelsteller 9e8cb8d17f removed non existing eth.flush method 2015-04-21 16:02:10 +02:00
Marek Kotewicz eeb0bc014b Merge branch 'develop' into events_refactor
Conflicts:
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js.map
	dist/web3.min.js
2015-04-20 23:13:47 +02:00
Marek Kotewicz cdf02ec58b Merge pull request #173 from ethereum/failing_develop
Fixed tests
2015-04-20 23:12:40 +02:00
Marek Kotewicz 501e3bc56e utils cleanup 2015-04-20 23:01:21 +02:00
Marek Kotewicz a88be00cef docs 2015-04-20 22:48:01 +02:00
Marek Kotewicz 9d8a51d439 event.js refactored 2015-04-20 22:06:49 +02:00
Marek Kotewicz ea6bda4cbb event refactor in progress 2015-04-20 21:59:35 +02:00
Fabian Vogelsteller a827076d5d fixed tx/block return value tests 2015-04-20 19:52:43 +02:00
Marek Kotewicz 99a3696e51 events refactor, function.js 2015-04-20 18:16:15 +02:00
Fabian Vogelsteller 04cdb6ca02 format also tx nonce to number 2015-04-20 16:31:40 +02:00
Fabian Vogelsteller 385cc2c73b removed minGasPrice from blocks 2015-04-20 16:08:12 +02:00
Marek Kotewicz c06d75b301 Merge pull request #170 from ethereum/abi_refactor
abi refactor
2015-04-20 15:13:19 +02:00
Marek Kotewicz e80ff10f52 Merge branch 'master' into abi_refactor
Conflicts:
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js.map
	dist/web3.min.js
2015-04-20 15:12:54 +02:00
Marek Kotewicz 38641dfa9c fixed #154 2015-04-20 14:38:08 +02:00
Marek Kotewicz 1c8cd7d6b0 web3.eth.defaultAccount property, updated event_inc example, fixed #96 2015-04-20 14:16:29 +02:00
Marek Kotewicz 4aeba40514 fixed event_inc example 2015-04-20 13:52:40 +02:00
Marek Kotewicz 5362e2a5da Merge branch 'develop' into abi_refactor 2015-04-20 12:09:33 +02:00
Marek Kotewicz 2a11852afd Merge branch 'master' into develop 2015-04-20 12:09:24 +02:00
Marek Kotewicz ea413a85b6 updated gitter badge 2015-04-20 12:08:42 +02:00
Marek Kotewicz a46b9ea016 Merge branch 'develop' into abi_refactor
Conflicts:
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js.map
	dist/web3.min.js
2015-04-20 11:51:10 +02:00
Marek Kotewicz 779a608076 documentation 2015-04-20 11:20:05 +02:00
Marek Kotewicz 941535fe47 SolidityParam moved to its own file && documented 2015-04-20 10:36:11 +02:00
Marek Kotewicz 18cef7c3f5 removed *collapse in contrat, gulp 2015-04-20 10:08:41 +02:00
Fabian Vogelsteller 677bb68633 add bundle version 2015-04-17 10:26:11 +02:00
Fabian Vogelsteller 135b0440e2 Merge pull request #164 from karalabe/empty-topics-fix
Fix #162: allow empty topic list in messages
2015-04-17 10:24:47 +02:00
Péter Szilágyi b326202314 formatters/whisper: polish corner case handling code 2015-04-17 11:20:40 +03:00
Marek Kotewicz 0567ba1826 outputParser do not require 0x prefix before hash 2015-04-16 22:11:15 +02:00
Marek Kotewicz b5c6aa6530 little cleanup && renaming 2015-04-16 21:46:07 +02:00
Marek Kotewicz dccfca1af5 solidity abi refactor in progress 2015-04-16 21:16:26 +02:00
Péter Szilágyi 6a058b690b Allow unset topics in posts too. 2015-04-16 18:13:47 +03:00
Péter Szilágyi af443f2acb Fix #162: allow empty topic list in messages 2015-04-16 18:05:08 +03:00
Marek Kotewicz d643d06b78 solidity abi refactor in progress 2015-04-16 16:37:13 +02:00
Fabian Vogelsteller 271b00f069 bumped version 2015-04-16 12:58:01 +02:00
Fabian Vogelsteller f4cf699324 rebuild 2015-04-16 12:55:30 +02:00
Fabian Vogelsteller 4eeaf19371 rebuild 2015-04-16 12:54:48 +02:00
Marek Kotewicz 20fb2e3c70 Merge branch 'develop' of https://github.com/ethereum/ethereum.js into develop
Conflicts:
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js.map
	dist/web3.min.js
2015-04-16 12:43:06 +02:00
Fabian Vogelsteller ac696408f2 Merge pull request #158 from ethereum/watchImprovement2
Looks fine
2015-04-16 12:25:47 +02:00
Marek Kotewicz 96b44682f1 fixed #161, web3.ssh.post 2015-04-16 12:22:20 +02:00
Marek Kotewicz a320ef8bd9 fixed coverage, unified creating errors 2015-04-16 11:11:33 +02:00
Fabian Vogelsteller 364eab72b1 add callback for async error 2015-04-15 11:48:05 +02:00
Marek Kotewicz c62f817cc6 picked watch change3 2015-04-13 12:56:14 +02:00
Fabian Vogelsteller 56d13f72fb picked watch change2 2015-04-13 12:55:43 +02:00
Fabian Vogelsteller 2215e7c3af picked watch change 2015-04-13 12:53:26 +02:00
Fabian Vogelsteller dc0f2318bf merged meteor package fixes 2015-04-13 12:39:26 +02:00
Fabian Vogelsteller c89ad86ba1 renamed meteor package 2015-04-13 12:37:10 +02:00
Fabian Vogelsteller a0709f3df1 fixed meteor package 2015-04-13 12:37:01 +02:00
Marek Kotewicz 1a8032c72c version 0.2.7 2015-04-11 11:41:24 +02:00