status-im
/
MyCrypto
mirror of https://github.com/status-im/MyCrypto.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,284 Commits 56 Branches 27 Tags 12 MiB
Commit Graph

1284 Commits

Author SHA1 Message Date
Barry G cc70314582
Merge pull request #1 from MyCryptoHQ/develop 
update fork develop branch from main
 2018-08-25 09:42:26 -04:00
Connor Bryan 67a885e7db
Merge pull request #2120 from OpenCommunityCoin/ella-ledger 
enable ledger nano s for Ella
 2018-08-22 17:19:59 -07:00
Connor Bryan 4d417b8504
Merge branch 'develop' into ella-ledger 2018-08-22 17:07:17 -07:00
Connor Bryan 963a4b588e
Merge pull request #1998 from aerth/develop 
add aquachain node
 2018-08-22 17:06:20 -07:00
Connor Bryan 29deeb6814
Merge branch 'develop' into develop 2018-08-22 16:53:02 -07:00
Connor Bryan f7d185e792
Merge pull request #2029 from MyCryptoHQ/fix-translation-strings 
Remove some unused keys, change incorrect keys to use variables
 2018-08-22 16:49:54 -07:00
Connor Bryan 8e72d2e2ad Updating... 2018-08-22 16:12:42 -07:00
aerth 16b9d2042f
add network: aquachain 2018-08-20 17:25:15 -07:00
Connor Bryan 16ba70d61a
Merge pull request #2125 from MyCryptoHQ/release/1.2.2.1 
Add an icon to the wallets in the middle row
 2018-08-17 15:57:42 -05:00
Connor Bryan 1527ae098b Add an icon to the middle row 2018-08-17 15:42:59 -05:00
hackyminer 76617c1339
enable ledger nano s for Ella 
* MINING token added. Please see https://github.com/kvhnuke/etherwallet/pull/1636
 2018-08-17 06:26:17 +09:00
Connor Bryan 1308b6193d
Merge pull request #2112 from MyCryptoHQ/release/1.2.2 
Release 1.2.2
 2018-08-16 12:13:40 -05:00
Connor Bryan de2ffdb03a Release commit 2018-08-16 11:52:01 -05:00
Connor Bryan 283a97c145
Merge pull request #2055 from MyCryptoHQ/enhancement/address-book-to-view-address 
Enhance `View Address` screen with a dropdown that draws from address book and recent addresses
 2018-08-16 11:33:29 -05:00
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