1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Commit Graph

2613 Commits

Author SHA1 Message Date
Dan Finlay
76e7d6fbb1 Merge branch 'master' into i1237-xmlfix2 2017-03-22 15:43:26 -07:00
Dan Finlay
5e40ed1ee9 Merge pull request #1245 from MetaMask/i1193-errorstylefix
Fix styling of error message in import accounts
2017-03-22 15:43:14 -07:00
Kevin Serrano
2687b8604b Merge branch 'master' into i1237-xmlfix2 2017-03-22 15:39:30 -07:00
Dan Finlay
9545ef3ba8 Merge branch 'master' into i1193-errorstylefix 2017-03-22 15:39:20 -07:00
Dan Finlay
5b81f7120b Merge pull request #1244 from MetaMask/i1227-uidumpblockhash
Add current block number and hash to the state.
2017-03-22 15:38:54 -07:00
Dan Finlay
bb971baf81 Merge branch 'master' into i1237-xmlfix2 2017-03-22 15:37:44 -07:00
Dan Finlay
7e6445110a Merge branch 'master' into i1227-uidumpblockhash 2017-03-22 15:34:23 -07:00
Dan Finlay
33ba38df6e Merge pull request #1225 from MetaMask/i1033-spinnerfix
Fix spinner issue on seed word request
2017-03-22 15:32:39 -07:00
Kevin Serrano
5d14925842
Fix styling of error message. 2017-03-22 16:54:10 -04:00
Kevin Serrano
1b7326048d
Add current block number and hash to the state. 2017-03-22 16:41:19 -04:00
Kevin Serrano
b5b88392b9 Merge branch 'master' into i1237-xmlfix2 2017-03-22 11:33:56 -07:00
Kevin Serrano
9906da86a4
Modify logic for injection conditions. 2017-03-22 14:25:56 -04:00
kumavis
9ac2ce1744 Merge branch 'master' into i1033-spinnerfix 2017-03-22 09:57:15 -07:00
kumavis
864f8b06f9 Merge pull request #1239 from MetaMask/betterErrors
Better errors
2017-03-22 09:55:47 -07:00
frankiebee
2ffd42f9f0 Add to CHANGELOG 2017-03-22 09:49:44 -07:00
frankiebee
8c7be43403 Have better error messages 2017-03-22 09:48:41 -07:00
Kevin Serrano
046774e768 Require redux-logger of 2.10.2 and up (#1235)
* Require redux-logger of 2.8.1 and up

* Bump to 2.10.2 and above, 2.10.1 had critical bug.
2017-03-22 09:38:03 -07:00
Kevin Serrano
f2e40e85b7 Add one more loading indication. 2017-03-22 12:18:13 -04:00
Dan Finlay
327d18855c Merge pull request #1226 from MetaMask/i1195-privatekeyexportstyle
Polish Private Key Export UI
2017-03-21 20:33:43 -07:00
Kevin Serrano
b0c0c30689 Uncomment lines relating to showing indicator. 2017-03-21 13:38:27 -07:00
Kevin Serrano
605c2a7404 Remove redundant removal of loading indicator. Integrate loading indicator disappear with display warning. 2017-03-21 09:15:12 -07:00
Kevin Serrano
6e6fa703cc Add to changelog. 2017-03-21 08:57:19 -07:00
Kevin Serrano
0e43606b16 Adjust private key confirmation style and logic. 2017-03-21 08:53:34 -07:00
Kevin Serrano
a7b7be8309 Add new development states for UI development. 2017-03-21 08:52:28 -07:00
Kevin Serrano
10040bee49 Changelog addition. 2017-03-21 06:59:08 -07:00
Kevin Serrano
889132b16c Add action to hide loading indication on an incorrect pw. 2017-03-21 06:57:49 -07:00
Kevin Serrano
0c82c520fe Merge pull request #1214 from MetaMask/i1181-RemoveLightwallet
Remove eth-lightwallet
2017-03-20 13:11:36 -07:00
Kevin Serrano
24173ee7cb Merge branch 'master' into i1181-RemoveLightwallet 2017-03-20 11:01:30 -07:00
Dan Finlay
f3da24cd04 Merge pull request #1215 from MetaMask/ImprovePersonalSignStyle
Improve personal_sign style
2017-03-20 10:57:03 -07:00
Dan Finlay
35c05607b0 Improve personal_sign style
textarea was not resizing the way I'd expected, so made it permanently larger, to accomodate larger messages.
2017-03-16 12:23:12 -07:00
Dan Finlay
b6e2eaf7b1 Remove eth-lightwallet 2017-03-16 11:16:03 -07:00
Dan Finlay
00f1a2d78d Merge pull request #1198 from MetaMask/i1165-predictive
Add predictive address functionality to recipient field in send
2017-03-16 10:21:21 -07:00
Kevin Serrano
a186e40d17 Merge branch 'master' into i1165-predictive 2017-03-14 17:52:03 -07:00
kumavis
570cc891b5 Merge pull request #1212 from MetaMask/i1211-currencyretention
Fix currency settings retention
2017-03-14 17:24:55 -07:00
Kevin Serrano
311b80adf3 Merge branch 'master' into i1211-currencyretention 2017-03-14 17:09:21 -07:00
Kevin Serrano
37ffcfcf0e Rename variables to proper currency state variables. 2017-03-14 17:06:16 -07:00
Kevin Serrano
177f2dc948 Fix description of some migrations. 2017-03-14 17:05:47 -07:00
Kevin Serrano
956482be96 Fix development to use new currency state. 2017-03-14 17:05:27 -07:00
Kevin Serrano
fcee7723e9 Merge branch 'i1165-predictive' of github.com:MetaMask/metamask-plugin into i1165-predictive 2017-03-14 14:05:28 -07:00
Kevin Serrano
1ec7930c75 Minor change in removing opts object. 2017-03-14 14:04:52 -07:00
kumavis
c759300d4c Merge branch 'master' into i1165-predictive 2017-03-14 13:11:03 -07:00
Kevin Serrano
c136cb6cd4 Add to changelog. 2017-03-14 11:44:54 -07:00
Kevin Serrano
2a68c89ba7 Merge pull request #1207 from MetaMask/i1206-customrpc
Allow changing custom RPCs from lock screen
2017-03-13 16:57:37 -07:00
Kevin Serrano
7d0bfdf076 Changelog addition. 2017-03-13 16:46:33 -07:00
Kevin Serrano
b10f370c74 Render config screen from unlock. 2017-03-13 16:43:34 -07:00
Kevin Serrano
e4feb50f6f Display Custom RPC on lock screen. 2017-03-13 16:41:25 -07:00
Kevin Serrano
4933e2e2ee Limit the number of addresses stored in our book. 2017-03-13 16:37:53 -07:00
Kevin Serrano
d85cc7ec4e Add test to account for prevention of identities duplication. 2017-03-10 10:48:07 -08:00
Kevin Serrano
7dcab52a9e Connect keyring controller to address book to prevent additional duplicates. 2017-03-10 10:34:46 -08:00
Kevin Serrano
c47f7f6a76 Add another test for duplicates. 2017-03-10 10:34:18 -08:00