Commit Graph

132 Commits

Author SHA1 Message Date
GitLab Build Bot
f4c9524eb4 [ci skip] js-precompiled 20171020-105109 2017-10-20 11:04:41 +00:00
Tomasz Drwięga
2472a2be0c
Merge branch 'ui-2' into td-ui-2 2017-10-18 14:13:08 +02:00
Jaco Greeff
9e04be754c Update dependencies (should fix account) 2017-10-18 11:51:29 +02:00
Tomasz Drwięga
304b067417
Support both versions. 2017-10-17 18:10:59 +02:00
Jaco Greeff
fc2b58a4eb Updated dependencies 2017-10-17 18:02:17 +02:00
Tomasz Drwięga
0f8fb62581
Integrate old UI. 2017-10-17 16:09:43 +02:00
Jaco Greeff
9a62119a82 Updated dependencies 2017-10-17 12:41:31 +02:00
Jaco Greeff
9c5b96ccbe Updated dependencies 2017-10-17 09:09:54 +02:00
Jaco Greeff
a76f768077 Updated dependencies 2017-10-16 18:06:40 +02:00
Jaco Greeff
de6066d6b0 Add babel-polyfill entry 2017-10-16 15:45:30 +02:00
Jaco Greeff
b49d7ee29c Rebuild after master merge 2017-10-16 15:20:30 +02:00
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
GitLab Build Bot
ba6594e30a [ci skip] js-precompiled 20171013-002644 2017-10-13 00:31:48 +00:00
GitLab Build Bot
df39f5e7fc [ci skip] js-precompiled 20171012-210804 2017-10-12 21:19:11 +00:00
GitLab Build Bot
7472bc3570 [ci skip] js-precompiled 20171012-181858 2017-10-12 18:24:04 +00:00
Nicolas Gotchac
3e7b775961 Fix tokens and badges (#6725)
* Update new token fetching

* Working Certifications Monitoring

* Update on Certification / Revoke

* Fix none-fetched tokens value display

* Fix tests
2017-10-12 20:09:44 +02:00
GitLab Build Bot
1d2319207a [ci skip] js-precompiled 20171011-214450 2017-10-11 21:49:51 +00:00
GitLab Build Bot
0b666f605f [ci skip] js-precompiled 20171011-192355 2017-10-11 19:29:28 +00:00
GitLab Build Bot
df19b8df69 [ci skip] js-precompiled 20171011-183646 2017-10-11 18:43:16 +00:00
GitLab Build Bot
0bb845a05c [ci skip] js-precompiled 20171011-121439 2017-10-11 12:19:40 +00:00
Jaco Greeff
c116e064d8 Merge master 2017-10-09 14:27:59 +02:00
GitLab Build Bot
dbd1976fc1 [ci skip] js-precompiled 20171009-121402 2017-10-09 12:19:46 +00:00
Jaco Greeff
439eb294bb Merge branch 'master' into ui-2 2017-10-09 10:23:21 +02:00
GitLab Build Bot
ca6d5660c1 [ci skip] js-precompiled 20171008-172308 2017-10-08 17:28:31 +00:00
Jaco Greeff
21c95bbec5 Update after merge 2017-10-05 15:04:45 +02:00
GitLab Build Bot
3f520b864b [ci skip] js-precompiled 20171005-120001 2017-10-05 12:04:49 +00:00
GitLab Build Bot
c7ea25227a [ci skip] js-precompiled 20171005-114154 2017-10-05 11:46:58 +00:00
Jaco Greeff
55b0b09d6a Merge branch 'master' into ui-2 2017-10-04 12:31:09 +02:00
Jaco Greeff
9f00159228 Rebuild 2017-10-04 08:26:26 +02:00
GitLab Build Bot
931a7a2210 [ci skip] js-precompiled 20171002-143145 2017-10-02 14:37:01 +00:00
Jaco Greeff
341697630d Fix form submission issues 2017-10-02 11:30:20 +02:00
Jaco Greeff
39b5e5b98a Signer-plugin-based approach (plugins available) 2017-09-29 15:04:57 +02:00
GitLab Build Bot
cc759530fe [ci skip] js-precompiled 20170926-133548 2017-09-26 13:40:38 +00:00
Tomasz Drwięga
59d946bf00 Debounce sync status. (#6572) 2017-09-26 13:05:41 +02:00
GitLab Build Bot
6840df4c09 [ci skip] js-precompiled 20170926-093714 2017-09-26 09:43:21 +00:00
Jaco Greeff
9daa884699 Update dependencies 2017-09-26 09:07:22 +02:00
GitLab Build Bot
f576926fa2 [ci skip] js-precompiled 20170925-101032 2017-09-25 10:15:30 +00:00
Jaco Greeff
ab902bfb66 Update packages 2017-09-22 14:03:26 +02:00
Jaco Greeff
4fa4dd8fc8 Update status plugins 2017-09-20 15:01:30 +02:00
Jaco Greeff
d02c696030 Update failing tests 2017-09-20 12:48:03 +02:00
Jaco Greeff
f9b7be7576 Merge branch 'master' into ui-2 2017-09-20 12:14:46 +02:00
GitLab Build Bot
65ca9afce2 [ci skip] js-precompiled 20170920-093438 2017-09-20 09:39:32 +00:00
Jaco Greeff
abb94c8bf3 Update ParityBar (container in Status) 2017-09-20 11:24:19 +02:00
Jaco Greeff
206abaebb9 Add latest @parity/ui 2017-09-20 09:45:28 +02:00
Jaco Greeff
51674f2cc4 Update dependencies 2017-09-19 20:48:05 +02:00
Jaco Greeff
2eac4f6606 Align request overlay styling 2017-09-18 15:20:10 +02:00
Jaco Greeff
3795a4869e Update with master merged packages 2017-09-18 14:03:34 +02:00
Jaco Greeff
312360ef4e Update master merge packages 2017-09-18 11:52:21 +02:00
Jaco Greeff
1e1137a6f7 Update dependencies 2017-09-18 10:35:00 +02:00
Jaco Greeff
935d1476e9 Update test execution 2017-09-18 10:15:36 +02:00