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 |
|
Arkadiy Paronyan
|
f3ea2f354e
|
v1.9.0 (#6727)
|
2017-10-12 23:44:02 +02:00 |
|
Jaco Greeff
|
a48f321fac
|
Merge branch 'master' into ui-2
|
2017-08-07 12:02:39 +02:00 |
|
debris
|
455ecf700c
|
updated tiny-keccak to 1.3
|
2017-08-07 10:06:02 +02:00 |
|
Jaco Greeff
|
49fdd23d58
|
Ui 2 move to packages/* (#6113)
* Move secureApi to shell
* Extract isTestnet test
* Use mobx + subscriptions for status
* Re-add status indicator
* Add lerna
* Move intial packages to js/packages
* Move 3rdparty/{email,sms}-verification to correct location
* Move package.json & README to library src
* Move tests for library packages
* Move views & dapps to packages
* Move i18n to root
* Move shell to actual src (main app)
* Remove ~ references
* Change ~ to root (explicit imports)
* Finalise convert of ~
* Move views into dapps as well
* Move dapps to packages/
* Fix references
* Update css
* Update test spec locations
* Update tests
* Case fix
* Skip flakey tests
* Update enzyme
* Skip previously ignored tests
* Allow empty api for hw
* Re-add theme for embed
|
2017-07-21 15:46:53 +02:00 |
|
arkpar
|
debbfc117a
|
Bumped version
|
2017-07-13 15:52:01 +02:00 |
|
Maciej Hirsz
|
b2a42f03eb
|
Public node WASM, performance and fixes (#5734)
|
2017-06-12 15:57:16 +02:00 |
|