Merge branch '1.0' into update-readme-to-get-types-with-commonjs

.travis.yml

@@ -13,6 +13,7 @@ addons:
  packages:
  - g++-4.8
 before_script:
+ - npm i -g typescript@next
  - export DISPLAY=:99.0
  - sh -e /etc/init.d/xvfb start
 install:

docs/web3-eth-accounts.rst

@@ -306,7 +306,7 @@ Parameters
 Returns
 -------
 
-``String|Object``: The signed data RLP encoded signature, or if ``returnSignature`` is ``true`` the signature values as follows:
+``Object``: The signed data RLP encoded signature, or if ``returnSignature`` is ``true`` the signature values as follows:
  - ``message`` - ``String``: The the given message.
  - ``messageHash`` - ``String``: The hash of the given message.
  - ``r`` - ``String``: First 32 bytes of the signature

lerna.json

@@ -1,5 +1,5 @@
 {
- "version": "1.0.0-beta.48",
+ "version": "1.0.0-beta.50",
  "lerna": "2.0.0",
  "command": {
  "init": {

package.json

@@ -1,7 +1,7 @@
 {
  "name": "web3",
  "namespace": "ethereum",
- "version": "1.0.0-beta.48",
+ "version": "1.0.0-beta.49",
  "description": "Ethereum JavaScript API wrapper repository",
  "license": "LGPL-3.0",
  "main": "./packages/web3/src/index.js",
@@ -15,7 +15,7 @@
  "install:all": "lerna add",
  "remove:all": "lerna exec npm uninstall",
  "install:dev:all": "lerna exec npm install --save-dev",
- "publish": "npm run clean && npm run bootstrap && npm run travis && lerna publish",
+ "publish": "npm run clean && npm run bootstrap && npm run travis && lerna publish --skip-git",
  "build": "lerna run build",
  "test": "lerna run test",
  "test:coverage": "lerna run test -- --coverage && npm run istanbulCombine",