grassrootseconomics
/
openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
openethereum/ethcore/res
History
Jaco Greeff 8453dda7ef Merge branch 'master' into ui-2 
# 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
 		2017-10-16 12:41:41 +02:00
..
ethereum Merge branch 'master' into ui-2 2017-10-16 12:41:41 +02:00
wasm-tests@c8129ce2f3 WASM Runtime refactoring (#6596) 2017-10-04 13:15:59 +02:00
authority_round.json Move more params to the common section. (#6134) 2017-07-31 12:34:29 +02:00
basic_authority.json Move more params to the common section. (#6134) 2017-07-31 12:34:29 +02:00
constructor.json Generalize engine trait (#6591) 2017-09-26 14:19:08 +02:00
instant_seal.json Move more params to the common section. (#6134) 2017-07-31 12:34:29 +02:00
null.json Generalize engine trait (#6591) 2017-09-26 14:19:08 +02:00
null_morden.json Generalize engine trait (#6591) 2017-09-26 14:19:08 +02:00
null_morden_with_reward.json Generalize engine trait (#6591) 2017-09-26 14:19:08 +02:00
tendermint.json Move more params to the common section. (#6134) 2017-07-31 12:34:29 +02:00
validator_contract.json Move more params to the common section. (#6134) 2017-07-31 12:34:29 +02:00
validator_multi.json Move more params to the common section. (#6134) 2017-07-31 12:34:29 +02:00
validator_safe_contract.json Chainspec validation (#6197) 2017-08-02 12:50:36 +02:00