m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-27 21:00:13 +01:00
Code
5,762 Commits 2 Branches 0 Tags 265 MiB
4c947d466c
Commit Graph

5762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
frankiebee
4c947d466c Merge branch 'master' into retry-tx-refractor 2018-03-15 09:47:25 -07:00
Alexander Tseung
66193c823c Update Deposit Eth icon (#3569) 2018-03-15 13:50:22 -02:30
frankiebee
cd721f52cb Merge branch 'master' into retry-tx-refractor 2018-03-15 08:07:16 -07:00
frankiebee
a087546148 Merge branch 'master' into retry-tx-refractor 2018-03-15 08:06:05 -07:00
Thomas Huang
e2efc91aee
Merge pull request #3558 from MetaMask/fix-two-translations 
Fix translations whose substitutions params were not in arrays.
 2018-03-14 13:00:42 -07:00
kumavis
5d970be4f3
Merge pull request #3562 from MetaMask/danfinlay-patch-1 
Grammar correction
 2018-03-14 12:17:52 -07:00
kumavis
6bdef5f4c8
Merge pull request #3545 from vincentlg/master 
Add French translation 🇫🇷
 2018-03-14 11:47:53 -07:00
Dan Finlay
19b553907c
Merge pull request #3565 from MetaMask/local-store-fix 
Fix local store promisification
 2018-03-14 11:27:24 -07:00
kumavis
6aef2ed0b2 local-store - fix class syntax 2018-03-14 10:59:47 -07:00
kumavis
c4e90c9359 local-store - check for error from extension.runtime 2018-03-14 10:49:54 -07:00
kumavis
39a831e2a0 deps - use pify instead of util.promisify 2018-03-14 10:32:55 -07:00
kumavis
481983aae8 local-store - fix promisification of methods 2018-03-14 10:31:25 -07:00
Vincent Le Gallic
9963bf6429
Update messages.json 
thx to @Senshii
 2018-03-14 18:08:14 +01:00
Dan Finlay
fae6a44bac
Grammar correction 2018-03-14 09:34:25 -07:00
Dan Finlay
9226de6c95
Merge pull request #3559 from MetaMask/fix-promisify-ref 
fix destructuring of variables
 2018-03-14 08:45:56 -07:00
frankiebee
b609924125 fix destructuring of variables 2018-03-14 08:21:50 -07:00
frankiebee
bc987a1129 fix destructuring of variables 2018-03-14 08:20:54 -07:00
Dan
edd5c38492 Fix translations whose substitutions params were not in arrays. 2018-03-14 12:34:13 -02:30
Dan
f8e13fd793 Fix tests. 2018-03-14 12:28:26 -02:30
Dan
106ce091a9 Fix TransactionStateManager spelling. 2018-03-14 11:45:04 -02:30
Dan
798988597b Merge branch 'master' into retry-tx-refractor 2018-03-14 00:02:27 -02:30
Dan
cc267d6c81 Fix more lint errors. 2018-03-13 23:56:45 -02:30
Dan
c37684d7bd Remove unnecessary addition of nonce to state. 2018-03-13 23:49:10 -02:30
Dan
e94a14ef8a Make token confirmations compatible. 2018-03-13 23:44:05 -02:30
Dan
0d33aed20e Fix tx-list-item submitted check. 2018-03-13 23:29:47 -02:30
Dan
bf3c5add08 Adds styles for dropped txs in old-ui. 2018-03-13 22:17:08 -02:30
Dan
80a2e59194 Correctly set latest submitted retry with nonces that matches others in old-ui transaction-list-item. 2018-03-13 22:08:27 -02:30
Dan
c52253bb0e Use correct name for submittedTime field in tx-list.js 2018-03-13 21:57:23 -02:30
Dan
46ded45b81 Use correct var name in new-ui showRetryButton 2018-03-13 21:38:08 -02:30
Dan
8c7988978f Undefined check in showRetryButton 2018-03-13 21:32:22 -02:30
Dan
e293b6349c Styling for dropped. 2018-03-13 21:15:35 -02:30
Dan
d6e4d2e80d Use new submittedTime field to correctly show retry button in old and new ui. 2018-03-13 21:15:35 -02:30
kumavis
5fbfb0b67c
Merge pull request #3083 from MetaMask/i3076-UseStorageLocalInstead 
Use storage.local instead of localStorage
 2018-03-13 15:47:52 -07:00
kumavis
dc5fbf5eb2
Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-13 15:43:37 -07:00
kumavis
b7a24840f2
Merge pull request #3551 from MetaMask/i#3509 
fix for where null is not supported in txParams
 2018-03-13 15:42:50 -07:00
kumavis
22cd788203
tx-gas-utils - fix code style 2018-03-13 15:39:33 -07:00
Thomas Huang
b183d879d6
Merge pull request #3552 from MetaMask/danfinlay-patch-1 
Fix grammar
 2018-03-13 15:33:08 -07:00
frankiebee
bee3e57b28 Merge branch 'i#3509' of https://github.com/MetaMask/metamask-extension into i#3509 2018-03-13 15:32:32 -07:00
frankiebee
e5a83d3f1a transactions move validation of the to field to validateRecipient 2018-03-13 15:32:03 -07:00
kumavis
16deea3927
changelog - update "txParams.to" validation note 2018-03-13 15:29:33 -07:00
frankiebee
a2c14ad02b Merge remote-tracking branch 'origin/i#3509' into i#3509 2018-03-13 15:27:26 -07:00
frankiebee
c465d510b1 fix error message 2018-03-13 15:26:45 -07:00
Dan Finlay
26231a42b6
Fix grammar 2018-03-13 15:24:35 -07:00
kumavis
28a41c203f
Update CHANGELOG.md 2018-03-13 15:24:26 -07:00
Frankie
c83a9ceb04
Merge branch 'master' into i#3509 2018-03-13 15:23:46 -07:00
frankiebee
d7bf6e36b1 add to CHANGELOG.md 2018-03-13 15:17:13 -07:00
frankiebee
d195cfab50 transactions - insure if a to field in tx params has a truthy valu that it is a valid addres and if it is falsy that it is not null to fix issue #3509 2018-03-13 15:13:05 -07:00
Thomas Huang
578139be4a
Merge pull request #3546 from MetaMask/TheCriw-patch-1 
improved verification of restore from seed phrase
 2018-03-13 15:02:07 -07:00
kumavis
e48934dc04 Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead 2018-03-13 14:49:26 -07:00
frankiebee
9d7640996a transactions - return the txMeta in retryTransaction 2018-03-13 14:42:26 -07:00