859 Commits

Author SHA1 Message Date
Fabian Vogelsteller
0e3b29c7c2 fixed coverage issue 2015-06-19 13:33:43 +02:00
Fabian Vogelsteller
d51e9a2f30 merged latest develop 2015-06-19 11:08:34 +02:00
Marek Kotewicz
4228b02cd0 common fixes in requestmanager 2015-06-15 07:00:38 +02:00
Marek Kotewicz
47e292a12c version 0.6.0 0.6.0 2015-06-11 05:04:28 +02:00
Marek Kotewicz
c597034d71 gulp 2015-06-11 05:00:48 +02:00
Marek Kotewicz
9417bbfe92 Merge branch 'master' into develop 2015-06-11 04:58:27 +02:00
Marek Kotewicz
15df5d663d Merge branch 'master' of https://github.com/ethereum/ethereum.js 2015-06-11 04:58:17 +02:00
Marek Kotewicz
e9472521f6 Merge pull request #234 from ethereum/ethers-patch-1
update license per name change to web3.js
2015-06-11 04:12:27 +02:00
ethers
4d165de35d update license per name change to web3.js 2015-06-10 10:04:05 -07:00
Marek Kotewicz
03ae21bd77 special logs will never be nulls, so there is no reason to check for null value 2015-06-10 12:20:39 +02:00
Marek Kotewicz
66f1deff38 updated dependencies, gulp 2015-06-10 12:14:44 +02:00
Marek Kotewicz
ccb436e3ea Merge branch 'master' into develop 2015-06-10 12:09:40 +02:00
Marek Kotewicz
d72988475d unrelevant change in example 2015-06-10 12:06:37 +02:00
Fabian Vogelsteller
bd6d9ba5b2 merged develop 2015-06-09 12:56:05 +02:00
Fabian Vogelsteller
fdf46edbb0 fixed providor not set in request manager 2015-06-09 11:14:24 +02:00
Marek Kotewicz
811e3b2ca5 Merge branch 'develop' of https://github.com/ethereum/ethereum.js into develop
Conflicts:
	dist/web3-light.js
	dist/web3-light.min.js
	dist/web3.js
	dist/web3.min.js
2015-06-08 18:04:48 +02:00
Marek Kotewicz
f454dda8e6 Merge branch 'develop' of https://github.com/asinyagin/web3.js into develop
Conflicts:
	dist/web3-light.js
	dist/web3-light.min.js
	dist/web3.js
	dist/web3.min.js
2015-06-08 18:04:05 +02:00
Fabian Vogelsteller
4384805768 build files 2015-06-08 17:37:59 +02:00
Marek Kotewicz
b09bf319bd Merge branch 'develop' into allAsync
Conflicts:
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js.map
	dist/web3.min.js
2015-06-08 17:31:58 +02:00
Alexander Sinyagin
6ea0d670b6 Set requests content type to application/json 2015-06-08 20:30:14 +05:00
Fabian Vogelsteller
fe703f5fae Merge pull request #229 from ethereum/extendWeb3
add extend method and tests
2015-06-08 17:07:49 +02:00
Fabian Vogelsteller
a90a85aa5c mereg develop 2015-06-08 17:07:23 +02:00
Fabian Vogelsteller
a2e5fbdf63 add tests for the outputformatters 2015-06-08 17:06:20 +02:00
Fabian Vogelsteller
556eb45bb0 re-add map files 2015-06-08 16:54:12 +02:00
Fabian Vogelsteller
08d2212953 small fix on outputFormatters, dont transform null to 0 2015-06-08 16:53:28 +02:00
Fabian Vogelsteller
1495a0c67c add comlexity push for poll, does only show on travis 2015-06-08 15:18:48 +02:00
Fabian Vogelsteller
7518ed47f8 changed extend to _extend 2015-06-08 14:46:19 +02:00
Fabian Vogelsteller
1aefebd78f merged develop 2015-06-08 14:41:49 +02:00
Fabian Vogelsteller
b6c49d4db7 improved async polling 2015-06-08 14:38:16 +02:00
Fabian Vogelsteller
16252f3de5 imporved async callback adding, without setinterval 2015-06-08 10:46:30 +02:00
Marek Kotewicz
ca46cb5c94 updated examples 2015-06-07 08:46:39 +02:00
Marek Kotewicz
aff349705a updated icap example 2015-06-07 02:04:34 +02:00
Fabian Vogelsteller
f242489f81 add optional default block parameter to contract call fixes #159 2015-06-05 11:34:50 +02:00
Fabian Vogelsteller
1d3d727f31 improved comment 2015-06-05 11:05:14 +02:00
Fabian Vogelsteller
d9ce08e49e improved filter interval 2015-06-05 11:04:06 +02:00
Fabian Vogelsteller
ddafe0027a asyncified filters 2015-06-05 10:47:17 +02:00
Fabian Vogelsteller
7b730b18e1 Merge branch 'strings' of github.com:ethereum/web3.js into strings 2015-06-04 23:14:03 +02:00
Fabian Vogelsteller
cc533d9e83 fixed bytes wrong encoding 2015-06-04 23:13:33 +02:00
Fabian Vogelsteller
d14c706901 build and improved extend function 2015-06-04 12:43:58 +02:00
Fabian Vogelsteller
733e19e474 add extend method and tests 2015-06-04 12:25:46 +02:00
Marek Kotewicz
9fa9b16197 gulp 2015-06-03 17:18:32 +02:00
Fabian Vogelsteller
61f1ba6dda Merge pull request #224 from alexvandesande/prefix-name-reorg
Prefix name reorg
2015-06-03 17:16:05 +02:00
Fabian Vogelsteller
7c970e35c8 add bytes32 test with leading 0 2015-06-03 16:55:45 +02:00
Fabian Vogelsteller
9c7f7bb1cb re-add .map files 2015-06-03 16:50:14 +02:00
Fabian Vogelsteller
189484f057 add extra int tests 2015-06-02 10:18:20 +02:00
Marek Kotewicz
73cc71128d Merge branch 'develop' into strings 2015-06-02 09:20:07 +02:00
Marek Kotewicz
448dd30299 Merge branch 'master' into develop 2015-06-02 09:19:41 +02:00
Marek Kotewicz
fa3239f457 abi string type, fixes #216, #218, #219 2015-06-01 19:50:45 +02:00
Fabian Vogelsteller
7753724270 build files 2015-06-01 09:45:03 +02:00
Fabian Vogelsteller
fc3dc7acea build files 2015-06-01 09:41:22 +02:00