1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-23 03:36:18 +02:00
Commit Graph

1525 Commits

Author SHA1 Message Date
Dan
be845fd190 Merge branch 'master' into i18n-translator-redux 2018-03-21 22:28:58 -02:30
kumavis
5d3246c836 Merge branch 'master' of https://github.com/trigun0x2/metamask-extension into trigun0x2-master 2018-03-21 11:55:09 -07:00
kumavis
112a9443ee
Merge pull request #3585 from lazaridiscom/laz/i3568
[WIP] document/rearrange metamask-controller.js, re #3568
2018-03-20 16:47:04 -07:00
kumavis
1a60094d50
Merge pull request #3504 from lazaridiscom/laz/i3427
adds READMEs to folders, re #3427
2018-03-20 16:28:47 -07:00
kumavis
29cc2f8ab9 Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux 2018-03-20 13:01:08 -07:00
Jeffrey Tong
93495b2809 fix for lint 2018-03-20 12:18:48 -07:00
Dan
2ddc2cc1fb Lint fixes. 2018-03-19 16:53:06 -02:30
Dan
d8788af9b8 Merge branch 'master' into retry-tx-refractor 2018-03-19 15:30:47 -02:30
Dan
5733820024 Merge branch 'master' into i18n-translator-redux 2018-03-19 14:39:04 -02:30
Dan
a51e8f6a16 Fetch localeMessages in front end only. 2018-03-19 13:36:16 -02:30
Saptak Sengupta
6174c00c10
Inject Script: Blacklist domains where not to inject script
Put a blacklist domain check where if the page url is in the list
of blacklisted domains, we shouldn't inject script in that web page.
2018-03-17 01:02:08 +05:30
Lazaridis
e1d6398b0f moves setup-related code towads end of file, re #3568 2018-03-16 18:37:56 +02:00
Lazaridis
bb6af25e20 add ESLint exceptions for //= and //-, re #3568 2018-03-16 03:22:10 +02:00
Lazaridis
904f00e8ac group all vault/keyring related methods together, re #3568 2018-03-16 02:29:53 +02:00
Dan
5fe0be722b Handle i18n with redux. 2018-03-15 21:59:45 -02:30
Lazaridis
d8f5150aa5 adds initial documentation, re #3568 2018-03-16 00:27:10 +02:00
frankiebee
cd721f52cb Merge branch 'master' into retry-tx-refractor 2018-03-15 08:07:16 -07:00
kumavis
34aeef50a0 i18n - load locales manually 2018-03-14 16:32:35 -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
481983aae8 local-store - fix promisification of methods 2018-03-14 10:31:25 -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
106ce091a9 Fix TransactionStateManager spelling. 2018-03-14 11:45:04 -02:30
Lazaridis
2d3763d709 add READMEs to folders, re #3427 2018-03-14 15:33:22 +02:00
Dan
798988597b Merge branch 'master' into retry-tx-refractor 2018-03-14 00:02:27 -02:30
kumavis
dc5fbf5eb2
Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-13 15:43:37 -07:00
kumavis
22cd788203
tx-gas-utils - fix code style 2018-03-13 15:39:33 -07:00
frankiebee
e5a83d3f1a transactions move validation of the to field to validateRecipient 2018-03-13 15:32:03 -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
Frankie
c83a9ceb04
Merge branch 'master' into i#3509 2018-03-13 15:23:46 -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
frankiebee
9d7640996a transactions - return the txMeta in retryTransaction 2018-03-13 14:42:26 -07:00
frankiebee
9fd349d740 transactions:state - add a submittedTime stamp so the ui has a better grasp of the time of submission 2018-03-13 09:51:37 -07:00
Jeffrey Tong
4f853bbd3c remove console log 2018-03-11 10:18:55 -07:00
Jeffrey Tong
bda493dc9d add comments that need clarification on naming convention 2018-03-11 10:17:08 -07:00
Dan
81e72147ef Merge branch 'master' into retry-tx-refractor 2018-03-09 02:07:27 -03:30
kumavis
a88e436b7d lint fix 2018-03-08 14:55:35 -08:00
kumavis
455faece9e Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead 2018-03-08 14:14:49 -08:00
kumavis
98efca0a97 background - storage - cleanup storage wiring 2018-03-08 14:10:28 -08:00
frankiebee
5572345b78 fix marking of confirmed transaction as dropped 2018-03-08 10:37:47 -08:00
frankiebee
4a3288fec9 transactions - make _markNonceDuplicatesDropped 2018-03-07 22:01:14 -08:00
Jeffrey Tong
aaef2aeefd fixed multiple notification windows when executing batch 2018-03-07 20:09:40 -08:00
frankiebee
8adb03074c Merge branch 'master' into retry-tx-refractor 2018-03-07 17:16:35 -08:00
frankiebee
62febac876 refactor retrytx with higher gas price:
- create a new tx instead of overwriting the tx hash
- add a new state 'dropped' to the txStateManager
- mark duplicate txs as dropped when one gets confirmed in a block
2018-03-07 17:16:16 -08:00
Dan Finlay
f4e5dd37b1
Merge pull request #3409 from scsaba/seed-phrase-verification
Add seed phrase verification script into background process
2018-03-07 16:47:13 -08:00
Dan Finlay
64fcd27102 Tighten up data loading code 2018-03-07 14:42:59 -08:00
Dan Finlay
b97ac5106f Add clarifying comment 2018-03-07 14:38:26 -08:00
Dan Finlay
d58e47edec Some fixes for new storage strategy
- Don't persist undefined data
- Write to new storage strategy without waiting for completion.
- Continue writing to localStorage as fallback.
2018-03-07 14:23:31 -08:00