Commit Graph

1269 Commits

Author SHA1 Message Date
Connor Bryan 7d1f7184d7
Merge branch 'develop' into enhancement/address-book-to-view-address 2018-08-16 11:18:21 -05:00
Connor Bryan 35fc45d70b
Merge pull request #2108 from pyskell/gastracker-etc
Add gastracker; remove Commonwealth as their nodes are currently down
2018-08-16 11:17:46 -05:00
Anthony b4fa952026
GasTracker is not an ETCDEV project
Removed reference. My mistake.
2018-08-16 10:09:32 -04:00
Anthony ef8bbcf0f9
Add ETC Cooperative's ETC public node as well 2018-08-15 19:34:43 -04:00
Anthony b7e6a52212
Add gastracker; remove Commonwealth as Commonwealth nodes are currently down.
Preventative measure for increased traffic from the Coinbase addition. Will follow-up with more nodes.
2018-08-15 17:45:20 -04:00
Connor Bryan 952603aba7
Merge pull request #1989 from riddlez666/patch-1
Update reducer.ts - rename EGT to EGEM
2018-08-15 16:20:22 -05:00
Connor Bryan b865f590bd
Merge branch 'develop' into patch-1 2018-08-15 16:08:21 -05:00
Connor Bryan 4b12182f1f
Merge pull request #2101 from hav-noms/patch-2
Add Havven Contract and Havven Mintr ABI
2018-08-15 16:04:24 -05:00
Connor Bryan 04b6523c22
Merge branch 'develop' into patch-2 2018-08-15 15:46:54 -05:00
Connor Bryan f3f1d12084
Merge pull request #2009 from akx20000a/develop
Remove ETC Chainkorea from the list
2018-08-15 15:44:42 -05:00
Connor Bryan 71c76e8afc
Merge branch 'develop' into develop 2018-08-15 15:30:43 -05:00
Connor Bryan 5e86dba13b
Merge pull request #2079 from MyCryptoHQ/reorder-wallet-unlock
Change order of wallet unlock options
2018-08-15 15:30:05 -05:00
Connor Bryan c02570d6a8
Merge branch 'develop' into reorder-wallet-unlock 2018-08-15 15:09:51 -05:00
Connor Bryan 6330698862
Merge pull request #2106 from MyCryptoHQ/bug/enable-empty-trezor-passphrase
Remove empty check
2018-08-15 15:06:01 -05:00
Connor Bryan c4b615a8ce Merge branch 'bug/enable-empty-trezor-passphrase' of github.com:MyCryptoHQ/MyCrypto into bug/enable-empty-trezor-passphrase 2018-08-15 14:51:00 -05:00
Connor Bryan b6ae484f86 CI 2018-08-15 14:50:49 -05:00
Connor Bryan aec34948d0
Merge branch 'develop' into bug/enable-empty-trezor-passphrase 2018-08-15 14:16:26 -05:00
Connor Bryan fd7cd01262
Merge pull request #2104 from PrimaBlock/develop
Added GoChain testnet support
2018-08-15 14:15:07 -05:00
Connor Bryan 8dfe44c386 Remove empty check 2018-08-15 14:11:47 -05:00
Connor Bryan 4203a91d6a
Merge branch 'develop' into patch-1 2018-08-15 14:09:07 -05:00
Connor Bryan 58dbbc7d50
Merge branch 'develop' into patch-2 2018-08-15 14:06:14 -05:00
Connor Bryan 976ed15064
Merge branch 'develop' into enhancement/address-book-to-view-address 2018-08-15 14:05:53 -05:00
Connor Bryan d9084dbc87
Merge branch 'develop' into reorder-wallet-unlock 2018-08-15 14:02:47 -05:00
Connor Bryan 3980650e21
Merge branch 'develop' into develop 2018-08-15 14:01:03 -05:00
Connor Bryan 1591b3a7c4
Merge pull request #2102 from wtzb/update-gbx-decimals
Update GBX token decimal
2018-08-14 18:42:10 -05:00
CLINT 45dbed950d
Update eth.json
Fix whitespace formatting
2018-08-10 16:08:20 +10:00
CLINT 6f9527882d
Update eth.json
Removed extra " to make valid JSON
2018-08-10 15:31:11 +10:00
Wietze Bronkema 9e7a5533dd
Update GBX decimal
https://etherscan.io/token/0x12fcd6463e66974cf7bbc24ffc4d40d6be458283
2018-08-08 20:49:01 +02:00
CLINT 6b94dd7a08
Add Havven Contract and Havven Mintr ABI 2018-08-08 16:37:39 +10:00
Deams51 2a1fce3f3e Added GoChain testnet support 2018-08-05 20:01:43 +02:00
Daniel Ternyak 3c15449ac4
Merge branch 'develop' into enhancement/address-book-to-view-address 2018-07-18 15:23:42 -07:00
mwbailey 48304699a1 Discard signed message after leaving tab (#2056) 2018-07-18 15:05:41 -07:00
Connor Bryan 4853ca2a14 Change pluralization 2018-07-17 16:01:07 -05:00
Connor Bryan aa1c5383f8 Adjust ordering of wallet unlocks. 2018-07-17 15:56:29 -05:00
Daniel Ternyak e242d0960c
Update Version to 1.2.2 2018-07-17 12:47:07 -07:00
Jean-Christophe Rona 96798e71fa Add support for the Archos Safe-T mini hardware wallet (#1963)
* Add support for the Archos Safe-T mini

* Safe-T mini: Fix version requirements

* Fix fade-in animation is not hitting the 5th wallet option

* Disable safe-t on electron:
2018-07-17 12:46:41 -07:00
Daniel Ternyak 5505097c03
Update Version to 1.2.1 2018-07-13 18:23:18 -07:00
Danny Skubak 4db281bc9a Jenkins - use yarn for building (#2067) 2018-07-13 18:14:34 -07:00
Connor Bryan 918a8e7dd1 Styling adjustments, per Taylor 2018-07-12 17:46:17 -05:00
Connor Bryan 8d33ec6a3d Bad equality operator. Bad. 2018-07-12 16:54:50 -05:00
Connor Bryan 155900e29e Minor fixes I saw after committing 2018-07-12 16:28:54 -05:00
Connor Bryan 7f03ae4918 Remove previous <Select /> for recent addresses 2018-07-12 16:20:26 -05:00
Connor Bryan 85cd564fbb Incorporate recent addresses into dropdown 2018-07-12 16:04:32 -05:00
Connor Bryan af12e36606 Do dropdown better 2018-07-12 15:23:23 -05:00
Connor Bryan 1c601f58e4 Clean up typing and formatting 2018-07-12 13:04:22 -05:00
Connor Bryan 6b2a8eedbc Implement initial functionality 2018-07-12 12:49:21 -05:00
Taylor Monahan 97bfbba51f Add Margin to Wallet Decrypt (#2048)
Screenshot of new spacing: https://i.imgur.com/6FHf1nq.png

before on left. after on right.
2018-07-11 18:36:27 -05:00
Connor Bryan 6fc6d9e074 Enable login for TREZOR with passphrase (#2052)
* Replicate PIN functionality for Passphrase

* Typo...

* Lol, really?

* Removed _ from passphrase event callback

* Change passphrase input to password

* Test for daniel

* Small fixes

* Change passphrase on input, not on blur

* Be obvious about focused buttons
2018-07-11 18:22:02 -05:00
Connor Bryan 3f57520bca Handle back-to-back similar transactions (#2038)
* Catch errors from <Amounts /> field a level up.

* Move up the componentDidCatch to <Fields />

* ...
2018-07-10 14:59:31 -05:00
Scott Bigelow 18ddb9b22f REP Token Address Change (#2046) 2018-07-10 13:03:11 -05:00