Commit Graph

4398 Commits

Author SHA1 Message Date
Thomas Huang f12504cd09 Merge pull request #2209 from MetaMask/greenkeeper/coveralls-3.0.0
Update coveralls to the latest version 🚀
2017-10-03 12:35:25 -07:00
Thomas Huang 4f678c7c34 Merge pull request #2264 from MetaMask/greenkeeper/mocha-4.0.0
Update mocha to the latest version 🚀
2017-10-03 12:33:11 -07:00
Kevin Serrano 1893c50730 Merge pull request #2175 from MetaMask/RemoveSlackLink
Remove slack link
2017-10-03 10:46:29 -07:00
Frankie 948a0b1078 Merge pull request #2250 from interfect/master
Don't pass origin as an HTTP header
2017-10-03 10:36:39 -07:00
Kevin Serrano 44949813de Merge pull request #2251 from BrandenSoropia/remove-metamask-title
Removed MetaMask title. Fixed #1730.
2017-10-03 10:15:33 -07:00
greenkeeper[bot] 98641f6f66 chore(package): update mocha to version 4.0.0 2017-10-03 04:33:04 +00:00
Sergey Ukustov e11ca12890 Merge remote-tracking branch 'upstream/master' 2017-10-03 02:10:47 +03:00
Frankie 62a022336a Merge pull request #2261 from MetaMask/retry-warn-not-fail
Resubmit - warn not fail on error
2017-10-02 16:09:19 -07:00
kumavis 2113d83489 ui - tx history - simplify error+warning display code 2017-10-02 15:39:44 -07:00
kumavis 062eaa6a82 pending tx tracker - on tx:warn append error message instead of error obj 2017-10-02 15:39:11 -07:00
Kevin Serrano 4b0e6a0a77 Merge branch 'master' into RemoveSlackLink 2017-10-02 15:23:27 -07:00
kumavis 25a80932a6 pending tx tracker - test - expect warning event on resubmit failure 2017-10-02 15:20:18 -07:00
kumavis ed77304e73 pending tx tracker - tx:warning event includes err obj 2017-10-02 15:20:01 -07:00
kumavis a86f6d6d90 pending tx tracker - test - rename tests to match event name 2017-10-02 15:14:15 -07:00
kumavis 22eaf92ec2 pending tx tracker - resubmit - warn dont error on unknown error 2017-10-02 15:00:23 -07:00
kumavis 7af696bfbe pending tx tracker - dont throw on load failure 2017-10-02 14:56:59 -07:00
kumavis b7c1951602 Merge pull request #2260 from MetaMask/history-notes
transaction - provide notes for history
2017-10-02 14:11:50 -07:00
kumavis 167ad729fd Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into history-notes 2017-10-02 13:45:47 -07:00
frankiebee e08a727d44 Merge branch 'master' into history-notes 2017-10-02 13:44:15 -07:00
kumavis df59ef9942 tx state history - append note to first op of diff 2017-10-02 13:44:11 -07:00
kumavis c9c0e6f674 tx state history - test - fix format of history entries 2017-10-02 13:43:26 -07:00
Frankie bf390bd63d Merge pull request #2259 from MetaMask/tx-history-fix
tx state history - fix bug where initial snapshot was mutated on updateTx
2017-10-02 13:41:56 -07:00
frankiebee 833da191c3 transaction - provide notes for history 2017-10-02 13:41:29 -07:00
kumavis d29b5f10ef tx state history - fix bug where initial snapshot was mutated on updateTx 2017-10-02 13:14:42 -07:00
Kevin Serrano da4b790034 Merge pull request #2254 from MetaMask/block-cache-fix
deps - bump pe for block cache fix
2017-10-02 12:05:08 -07:00
kumavis e682611301 deps - bump pe for block cache fix 2017-10-02 11:35:26 -07:00
Thomas Huang 1769f880db Merge pull request #2138 from sunify/fix-firefox-cors
Fix CORS issues in FireFox
2017-10-02 11:09:06 -07:00
Kevin Serrano 36bc8f3c60 Update manifest.json 2017-10-02 10:59:15 -07:00
Branden Soropia db1dd46f8d Removed MetaMasktitle. Fixed #1730. 2017-10-02 00:02:30 -04:00
Adam Novak 8cc8fecdac Don't pass origin as an HTTP header
Requests with this nonstandard header are being blocked by CORS when
made against Parity.

Not sending it ought to fix #1779.
2017-10-01 18:55:52 -07:00
Dan Finlay 37979fca68 Merge pull request #2241 from MetaMask/Version-3.10.8-FixCurrency
Version 3.10.8 - Fix Currency Conversion
2017-09-29 21:10:10 -07:00
Dan Finlay d5b0d8af4f Version 3.10.8 - Fix Currency Conversion
In our conversion to the new Infura API, somehow we were sending upper-cased conversions to their lower-case sensitive API.

Fixes the first part of #2240
2017-09-29 20:57:15 -07:00
kumavis 7bdf73b1dd Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactions
pending-tx - dont check the balance to rebrodcast
2017-09-29 17:36:49 -07:00
Frankie 8425fb04d3 Merge pull request #2239 from MetaMask/network-controller-contd
network - make network controller internal network switching explicit
2017-09-29 17:22:16 -07:00
kumavis 1ad8a9a0ff network - make network controller internal network switching explicit 2017-09-29 17:10:34 -07:00
Frankie f57fd717fe Merge pull request #2237 from MetaMask/network-controller-contd
Networking refactor
2017-09-29 16:50:31 -07:00
kumavis a2b6d3ffc5 network - remove long dead etherscan provider code 2017-09-29 16:37:01 -07:00
kumavis d6ea2fa425 network - convert localhost from custom rpc to network type 2017-09-29 16:35:58 -07:00
kumavis b88d11f86e network controller - small refactor 2017-09-29 16:09:38 -07:00
kumavis b2796c168b Merge pull request #2234 from MetaMask/Version-3.10.7
Version 3.10.7
2017-09-29 13:23:12 -07:00
Dan Finlay 14d58e630d Version 3.10.7 2017-09-29 13:17:21 -07:00
frankiebee ac80eaca1f pending-tx - dont check the balance to rebrodcast 2017-09-29 12:54:05 -07:00
Dan Finlay 77963e8417 Merge pull request #2230 from MetaMask/ui-dev-fix
development - fix ui dev
2017-09-29 12:11:48 -07:00
kumavis 19e7adad19 development - fix ui dev 2017-09-29 11:50:24 -07:00
Kevin Serrano d61f36808a Merge pull request #2228 from MetaMask/i2218-SelectAccountBugFix
Ensure selected account is always set if possible
2017-09-29 11:31:18 -07:00
Dan Finlay 861bd877f3 Ensure selected account is always set if possible
Fixes #2218

Subscribes to keyringController, and if only one account exists, sets it as selected.
2017-09-29 11:19:54 -07:00
Sergey Ukustov 82d1f39198 Respect code style 2017-09-29 19:53:03 +03:00
Sergey Ukustov c2b8dada91 Add eth_signTypedData handler 2017-09-29 19:40:46 +03:00
greenkeeper[bot] f69cf1670f chore(package): update coveralls to version 3.0.0 2017-09-28 17:02:58 +00:00
kumavis cdf41c2857 Merge pull request #2124 from MetaMask/breakout-mascara
require metamascara
2017-09-27 16:27:01 -07:00