# Conflicts:
#	js/package-lock.json
#	js/package.json
#	js/src/api/api.js
#	js/src/api/local/accounts/accounts.js
#	js/src/api/local/localAccountsMiddleware.js
#	js/src/api/local/transactions.js
#	js/src/api/pubsub/signer/signer.js
#	js/src/api/subscriptions/signer.js
#	js/src/api/transport/jsonRpcBase.js
#	js/src/api/transport/middleware.js
#	js/src/api/util/format.js
#	js/src/api/util/format.spec.js
#	js/src/contracts/abi/index.js
#	js/src/contracts/badgereg.js
#	js/src/dapps/tokenreg/Application/application.css
#	js/src/dapps/tokenreg/Application/application.js
#	js/src/modals/CreateWallet/WalletDetails/walletDetails.js
#	js/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js
#	js/src/modals/CreateWallet/createWalletStore.js
#	js/src/modals/DeployContract/ParametersStep/parametersStep.js
#	js/src/modals/DeployContract/deployContract.js
#	js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
#	js/src/modals/WalletSettings/walletSettings.js
#	js/src/redux/providers/certifications/actions.js
#	js/src/redux/providers/certifications/middleware.js
#	js/src/redux/providers/certifications/reducer.js
#	js/src/redux/providers/requestsActions.js
#	js/src/redux/providers/tokensActions.js
#	js/src/ui/AccountCard/accountCard.css
#	js/src/ui/Balance/balance.js
#	js/src/ui/Balance/balance.spec.js
#	js/src/ui/DappCard/dappCard.js
#	js/src/ui/Form/AddressSelect/addressSelect.js
#	js/src/ui/Form/AddressSelect/addressSelectStore.js
#	js/src/ui/Form/InputAddressSelect/inputAddressSelect.js
#	js/src/ui/Form/TypedInput/typedInput.js
#	js/src/ui/IdentityIcon/identityIcon.js
#	js/src/ui/MethodDecoding/tokenValue.js
#	js/src/util/tx.js
#	js/src/util/wallets.js
#	js/src/util/wallets/consensys-wallet.js
#	js/src/util/wallets/foundation-wallet.js
#	js/src/views/Account/account.js
#	js/src/views/Accounts/List/list.js
#	js/src/views/Contract/Queries/inputQuery.js
#	js/src/views/Contract/Queries/queries.js
#	js/src/views/Contract/contract.js
#	js/src/views/Signer/components/SignRequest/signRequest.css
#	js/src/views/Signer/components/SignRequest/signRequest.js
#	js/src/views/Signer/components/SignRequest/signRequest.spec.js

* Fix CHANGLOG for 1.8.0

* Update changelog for 1.8.0

* Add changelog for 1.7.7

Remove redundant `mut`

* Fixed kovan chain validation

* Fork detection

* Fixed typo

Afri Schoedon authored Oct 13, 2017 and Arkadiy Paronyan committed Oct 13, 2017

* Update CHANGELOG for 1.7.4

* Update CHANGELOG for 1.7.5

* Update CHANGELOG for 1.7.5

* Move stable changelog to docs/

* Prepare CHANGELOG for 1.8.0

* Update CHANGELOG for 1.8.0

* Add changelog for 1.7.6

* Update CHANGELOG for 1.8.0

* Describe CHANGELOG for 1.8.0

use cc 1.0 instead of gcc

Axel Chalon authored Oct 13, 2017 and Arkadiy Paronyan committed Oct 13, 2017

* CLI: Reject invalid argument values rather than ignore them

* Fix grumbles

Nicolas Gotchac authored Oct 12, 2017 and Jaco Greeff committed Oct 12, 2017

* Fix badges not showing up

* Always fetch meta data first [badges]

Nicolas Gotchac authored Oct 12, 2017 and Jaco Greeff committed Oct 12, 2017

* Update new token fetching

* Working Certifications Monitoring

* Update on Certification / Revoke

* Fix none-fetched tokens value display

* Fix tests

* Check vouch status on appId in addition to contentHash

* Simplify var expansion

Prevent going offline when restoring or taking a snapshot

Graceful exit when invalid CLI flags are passed (#6485)

Fixed RETURNDATA out of bounds check

* Remove .only

* Add vouch overlays to dapps

* Cleanup address

* Only run where we have a contentHash

* GitLab kickstart

Emulate signer pubsub on public node

Removes  dependency on rustc_serialize (#5988)