Commit Graph

617 Commits

Author SHA1 Message Date
Marek Kotewicz ccb37752d3 new api method names 2015-03-07 19:32:05 +01:00
Marek Kotewicz 2b17ad67c9 refactoring 2015-03-07 19:18:22 +01:00
Marek Kotewicz 0a995e1d1f common changes in utils, fixing code complexity 2015-03-07 18:31:09 +01:00
Marek Kotewicz 3f631094af fix all failing karma tests 2015-03-07 17:53:06 +01:00
Marek Kotewicz 1fd1a315bb Merge branch 'develop' into apiOverhaul
Conflicts:
	dist/ethereum.js
	dist/ethereum.js.map
	dist/ethereum.min.js
	lib/utils.js
2015-03-07 17:47:03 +01:00
Marek Kotewicz 0b9d450a4d fixed karma test 2015-03-07 17:43:51 +01:00
Marek Kotewicz 75e92c8048 Merge branch 'master' into develop 2015-03-07 16:48:30 +01:00
Marek Kotewicz a8697801cd Merge branch 'master' into apiOverhaul 2015-03-07 16:32:47 +01:00
Marek Kotewicz 2cdf08babf Merge pull request #101 from chevdor/master
Switch to Karma
2015-03-06 22:12:58 +01:00
Wilfried Kopp 437e2731de Helping travis a bit... old boy! 2015-03-06 21:37:44 +01:00
Wilfried Kopp d88effaedf Add node 0.12 + virtual screen for browsers/karma. 2015-03-06 21:31:45 +01:00
Wilfried Kopp 743eb3049f Including Karma to Travis 2015-03-06 21:12:50 +01:00
Wilfried Kopp f0da6ef78c Merge remote-tracking branch 'upstream/master' 2015-03-06 21:09:45 +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 b8193914cb fixed tests 2015-03-06 16:09:21 +01:00
Marek Kotewicz c1136a08c0 Merge branch 'master' into develop
Conflicts:
	dist/ethereum.js.map
	dist/ethereum.min.js
	package.json
2015-03-06 12:05:40 +01:00
Marek Kotewicz 1b475aaa51 downgrade to unreachable-branch-transform 0.1.0 2015-03-06 12:03:19 +01:00
Marek Kotewicz 636fb4b021 updated outdated deps 2015-03-06 10:21:37 +01:00
Marek Kotewicz cf3fa10837 Merge branch 'ch' 2015-03-06 10:07:33 +01:00
Marek Kotewicz 96f30766b6 karma 2015-03-06 10:06:50 +01:00
Marek Kotewicz 9c72d43f96 Merge pull request #100 from chevdor/master
Add Karma support for In-Browser testing
2015-03-06 10:03:13 +01:00
Marek Kotewicz 96fede81e5 Merge pull request #98 from kumavis/develop
Browserify transforms must be in normal dependencies
2015-03-06 09:28:21 +01:00
Wilfried Kopp 833b810038 doc(readme): Information about Karma in the readme
test(karma): Fix variable to make linter happy
2015-03-06 01:14:01 +01:00
Wilfried Kopp e46f6f156b test(utils): Add test for the toEth() function
- Several test cases to check the conversion into each unit
- Few test cases to check the conversion from strings
2015-03-06 01:03:19 +01:00
Wilfried Kopp 1e0d76e687 Remove phantomjs 2015-03-05 23:20:55 +01:00
Wilfried Kopp af5fef01ea test(karma): Add Karma support
- Karma support for Chrome, Firefox, Safari
2015-03-05 23:17:49 +01:00
aaron 20c4e285f0 Move envify and unreachable-branch-transform to normal dependencies for external browserify support. 2015-03-04 09:39:42 -08:00
Fabian Vogelsteller 333c3ff462 merged develop 2015-03-04 16:34:51 +01:00
Fabian Vogelsteller b07ddb40c7 add defualt block 2015-03-04 16:31:48 +01:00
Marek Kotewicz 9b3a0f0256 Merge branch 'event_hash'
Conflicts:
	dist/ethereum.js.map
	dist/ethereum.min.js
2015-03-04 01:04:13 +01:00
Marek Kotewicz 024433fbda Merge branch 'master' into develop
Conflicts:
	dist/ethereum.js.map
	dist/ethereum.min.js
2015-03-04 00:48:33 +01:00
Marek Kotewicz 9887972ba8 version 2015-03-04 00:46:53 +01:00
Marek Kotewicz 63dcee68ee ignore for maxcomplexity warning
Conflicts:
	dist/ethereum.js.map
2015-03-04 00:45:39 +01:00
Marek Kotewicz 8376bfa6ef gulp 2015-03-04 00:44:44 +01:00
Marek Kotewicz a59f3a4c5c Merge pull request #85 from ethers/abiString
constants should be before (dynamic) string contents, fix #84
2015-03-04 00:43:53 +01:00
Marek Kotewicz 0dd6cc41fa gulp 2015-03-04 00:43:10 +01:00
Marek Kotewicz 688faeca73 Merge pull request #81 from ethers/arraySupport
constants should be before array contents, fixes #30
Conflicts:
	lib/abi.js
2015-03-04 00:42:46 +01:00
Marek Kotewicz 601c8abf74 ignore for maxcomplexity warning 2015-03-04 00:30:29 +01:00
Marek Kotewicz d9d190ec33 Merge branch 'master' into develop
Conflicts:
	dist/ethereum.js
	dist/ethereum.js.map
	dist/ethereum.min.js
	lib/abi.js
2015-03-04 00:29:24 +01:00
Marek Kotewicz 64f6630b40 updated README.md 2015-03-04 00:27:06 +01:00
Marek Kotewicz 4f9aaec191 Merge pull request #94 from ethereum/signature
signature methods separated from abi.js
2015-03-04 00:12:18 +01:00
Marek Kotewicz 91321fbcd7 removed web3 dependency from abi.js 2015-03-03 18:38:23 +01:00
Marek Kotewicz 5c7d8a7e33 separated event signature 2015-03-03 18:34:06 +01:00
Fabian Vogelsteller a05742fda1 Add internal defaultBlock 2015-03-03 11:11:52 +01:00
Fabian Vogelsteller 6cd96c96b7 add net object 2015-03-02 16:29:23 +01:00
Fabian Vogelsteller 48c107e35b update meteor package 2015-03-02 13:15:46 +01:00
Fabian Vogelsteller 9c4080bf26 made filter polling async 2015-03-02 13:12:57 +01:00
Fabian Vogelsteller 869bb668e8 add optional callback 2015-03-02 13:00:20 +01:00
Fabian Vogelsteller 4096fb8c88 merged develop 2015-03-02 10:45:30 +01:00
Fabian Vogelsteller 5c4a36bd7b working on adding callbacks 2015-02-28 15:55:41 +01:00