grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
de6066d6b0
openethereum/ethcore/res/ethereum
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
..
tests@9b722a014a Fixed tests after rename 2017-10-10 17:48:37 +02:00
byzantium_test.json Generalize engine trait (#6591) 2017-09-26 14:19:08 +02:00
classic.json Add Musicoin and MCIP-3 UBI hardfork. (#6621) 2017-10-08 18:17:59 +02:00
constantinople_test.json Generalize engine trait (#6591) 2017-09-26 14:19:08 +02:00
eip150_test.json Generalize engine trait (#6591) 2017-09-26 14:19:08 +02:00
eip161_test.json Generalize engine trait (#6591) 2017-09-26 14:19:08 +02:00
expanse.json Generalize engine trait (#6591) 2017-09-26 14:19:08 +02:00
foundation.json Byzantium fork block number 2017-10-06 09:47:04 +02:00
frontier_like_test.json Generalize engine trait (#6591) 2017-09-26 14:19:08 +02:00
frontier_test.json Generalize engine trait (#6591) 2017-09-26 14:19:08 +02:00
homestead_test.json Generalize engine trait (#6591) 2017-09-26 14:19:08 +02:00
kovan.json Fixed kovan chain validation (#6758) 2017-10-14 21:59:26 +02:00
mcip3_test.json Add Musicoin and MCIP-3 UBI hardfork. (#6621) 2017-10-08 18:17:59 +02:00
morden.json Generalize engine trait (#6591) 2017-09-26 14:19:08 +02:00
musicoin.json Add Musicoin and MCIP-3 UBI hardfork. (#6621) 2017-10-08 18:17:59 +02:00
olympic.json Generalize engine trait (#6591) 2017-09-26 14:19:08 +02:00
ropsten.json Generalize engine trait (#6591) 2017-09-26 14:19:08 +02:00
transition_test.json Generalize engine trait (#6591) 2017-09-26 14:19:08 +02:00