Merge branch 'master' into develop

This commit is contained in:
Marek Kotewicz 2015-01-11 17:12:29 +01:00
commit e2c4525da7

@ -50,13 +50,37 @@ web3.eth.coinbase.then(function(result){
For another example see `example/index.html`.
## Contribute!
### Requirements
* Node.js
* npm
* gulp (build)
* mocha (tests)
```bash
sudo apt-get update
sudo apt-get install nodejs
sudo apt-get install npm
sudo apt-get install nodejs-legacy
sudo npm install -g gulp
sudo npm install -g mocha
```
## Building
* `gulp build`
```bash
gulp
```
### Testing
```bash
mocha
```
**Please note this repo is in it's early stage.**
If you'd like to run a WebSocket ethereum node check out
@ -76,4 +100,4 @@ ethereum -ws -loglevel=4
[dep-image]: https://david-dm.org/ethereum/ethereum.js.svg
[dep-url]: https://david-dm.org/ethereum/ethereum.js
[dep-dev-image]: https://david-dm.org/ethereum/ethereum.js/dev-status.svg
[dep-dev-url]: https://david-dm.org/ethereum/ethereum.js#info=devDependencies
[dep-dev-url]: https://david-dm.org/ethereum/ethereum.js#info=devDependencies