Commit Graph

16 Commits

Author SHA1 Message Date
Jaco Greeff
8798ed4499 Merge branch 'master' into ui-2 2017-06-28 14:27:25 +02:00
Craig O'Connor
614a80bd23 Cancel propagated TX (#5899)
* lgtm

* linting

* Slight shortening
2017-06-23 10:32:19 +02:00
Jaco Greeff
6a480ffb5b Merge branch 'master' into ui-2 2017-06-06 09:35:22 +02:00
Tomasz Drwięga
5ec5d2fa0b Fix local transactions without condition. (#5716) 2017-06-03 15:41:31 +03:00
Nicolas Gotchac
c2c7231cad Recover from empty phrase in dev mode (#5698)
* Add dev chain to isTest

* Fix signer

* Fix no condfition transactions

* Fix case : old parity

* Fix propTypes.
2017-05-30 19:28:50 +02:00
Jaco Greeff
851003c07c UI 2 light styling (placeholder until component move) (#5503)
* Adjust cards

* Clickable TxRow

* Modal background adjustment (stop-gap)

* Adjust container to light

* UI light updates
2017-04-25 15:41:46 +02:00
Craig O'Connor
f7d5d6c0cd Cancel tx JS (#4958)
* Remove transaction RPC

* Bumping multihash and libc

* Updating nanomsg

* bump nanomsg

* cancel tx

* cancel-tx-js

* cancel-tx-js

* cancel-tx-js

* cancel-tx-hs

* cancel-tx-js

* cancel-tx-js

* cancel-tx-js

* small fixes

* edit & time till submit

* edit & time till submit

* updates

* updates

* udpates

* udpates

* grumbles

* step 1

* Wonderful updates

* ready

* small refact

* small refact

* grumbles 1

* ffx2

* good ol' fashioned updates

* latest and greatest

* removeHash

* removeHash

* spec

* fix 1

* fix 1

* fix 2

* fix 2

* ff

* ff

* ff

* updates
2017-04-25 10:08:09 +02:00
Nicolas Gotchac
e1e2674cd2 Show ETH value (even 0) if ETH transfert in transaction list (#5406) 2017-04-19 16:02:24 +02:00
Nicolas Gotchac
1c37ea5860 Go through contract links in Transaction List display (#4863)
* Go through contract links (#4822)

* Fix tests, add one for /contracts/<address>
2017-03-11 15:25:36 +01:00
Jaco Greeff
0b24a3d7f6 Etherscan links based on netVersion identifier (#4772)
* Use netVersion to determine external links

* Update additional isTest references
2017-03-06 08:54:59 +01:00
Nicolas Gotchac
48eac51c8a Fix address and accounts links (#4491)
* Add proper links to TxRows (#4314)

* Add proper link to the Signer (#4314)

* Fix and add tests
2017-02-09 17:41:17 +01:00
Gav Wood
8404edb656 Fix whitespace (#4299)
* Fix whitespace.

* Update copyright years/owner.

* Push release only for tags.
2017-01-25 18:51:41 +01:00
Jaco Greeff
66e540edf8 Eslint formatting updates (#4234)
* Eslint updated (newline-after-var)

* Fix newline-after-var

* Eslint updated (one-var-declaration-per-line)

* Fix one-var-declaration-per-line

* Fix additional errors

* Lint after merge
2017-01-23 13:39:52 +01:00
Jaco Greeff
08f80f2695 ESLint additional rules (#4186)
* Add eslint rule for consistent block padding

* Fix padding consistency issues

* Eslint test for duplicate imports

* Eslint closing bracket location

* Fix eslint jsx closing bracket

* missed a file

* Formatting

* Manual overrides for auto

* Manual overrides for auto

* More minor auto-override manual adjustments
2017-01-18 13:05:01 +01:00
Gav Wood
58b72c521d
Rename ethcore -> parity in licenses. 2016-12-11 19:31:31 +01:00
Jaco Greeff
296301e284 Extend tests for TxList 2016-12-09 10:55:46 +01:00