status-im/web3.js
2
0
Fork 0
mirror of https://github.com/status-im/web3.js.git synced 2025-02-23 11:38:12 +00:00
Code Issues Projects Releases Wiki Activity
392 Commits 27 Branches 52 Tags 24 MiB
Commit Graph

392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Marek Kotewicz
9b3a0f0256 Merge branch 'event_hash' 
Conflicts:
	dist/ethereum.js.map
	dist/ethereum.min.js
v0.0.16 		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
Marek Kotewicz
30111f7cf5 Merge pull request #87 from kumavis/develop 
Move browserify transforms to package.json
 2015-02-28 10:39:32 +01:00
Marek Kotewicz
f2029b4e33 Merge pull request #85 from ethers/abiString 
constants should be before (dynamic) string contents, fix #84
 2015-02-28 10:03:23 +01:00
aaron
ee686b0ec4 Move browserify transforms to package.json 2015-02-27 15:47:41 -08:00
ethers
4b9bc177f7 constants should be before (dynamic) string contents 2015-02-27 14:41:52 -08:00
Marek Kotewicz
81b19cc9a7 event hash 2015-02-27 20:16:45 +01:00
Marek Kotewicz
8cf8b9e9d3 gulp 2015-02-27 09:19:35 +01:00
Marek Kotewicz
fd85749764 Merge pull request #81 from ethers/arraySupport 
constants should be before array contents, fixes #30
 2015-02-27 09:18:29 +01:00
ethers
fcab219d7d vary the length of the arrays 2015-02-26 20:28:21 -08:00
ethers
f8db634a8f need to save/concat per iteration 2015-02-26 20:24:19 -08:00
ethers
ce664d61d5 fix test descriptions 2015-02-26 20:17:27 -08:00
ethers
66196ee8ba constants should be before array contents, fixes #30 2015-02-26 20:06:26 -08:00
Marek Kotewicz
2e9a41113e Merge pull request #71 from frozeman/apiOverhaul 
add formatter for gasPrice and balance
 2015-02-26 11:50:01 +01:00
Fabian Vogelsteller
30518ae6c8 fixed complexities 2015-02-26 10:56:04 +01:00
Marek Kotewicz
5bd166cc82 clearing timeout 2015-02-25 17:07:16 +01:00
Fabian Vogelsteller
84900e6463 merged with solved conflicts 2015-02-25 17:01:23 +01:00
Fabian Vogelsteller
eaef1a2d37 merged develop 2015-02-25 16:33:07 +01:00