Commit Graph

78 Commits

Author SHA1 Message Date
Victor Baranov 7a0a069681 Refactoring: var -> let, const 2020-04-29 12:17:33 +03:00
Victor Baranov e24a9d2b51 Refactoring 2020-03-27 14:17:25 +03:00
Victor Baranov e1e9f833a0 eslint fix 2019-04-17 23:39:27 +03:00
Victor Baranov 0c76e9bbf0 utf8 encoding 2019-04-17 23:32:53 +03:00
Victor Baranov 9316e26865 Get upstream from v4.16.0 2018-10-24 20:17:32 +03:00
Victor Baranov 9c0b5661e2 upstream from MM 4.11.0 2018-10-19 18:18:48 +03:00
Victor Baranov 48f457f3ae upstream from mm 4.9.3 2018-10-18 15:52:58 +03:00
Whymarrh Whitby d44b7ef3da Fix document extension check when injecting web3 2018-10-16 11:08:48 -02:30
Whymarrh Whitby c92fee7771 Hook MetaMaskController up with phishing detection page 2018-10-02 10:45:39 -02:30
Thomas Huang 8c3091aa7a
Merge pull request #5053 from hahnmichaelf/esdb-support
Link to ESDB in local phishing.html
2018-09-27 10:19:06 -05:00
Dan Finlay 6ce119d1fb Move inpage-provider and port-stream outside
With the creation of the [metamask-extension-provider](https://github.com/MetaMask/metamask-extension-provider) we have our first non-core module that is dependent on the inpage-provider and port-stream.

To reduce the size of its dependencies, I have moved the
[metamask-inpage-provider](https://github.com/MetaMask/metamask-inpage-provider) into its own module, as well as [extension-port-stream](https://github.com/MetaMask/extension-port-stream).

This allows them to be more easily depended & iterated on by external
projects.
2018-08-20 15:45:50 -07:00
hahnmichaelf 4808ce25eb fix for lint-test 2018-08-13 13:16:37 -04:00
hahnmichaelf 9666eaba66 base - working. fixes #4774 2018-08-12 18:57:58 -04:00
brunobar79 4339f04e80 use existing modals 2018-07-30 17:50:05 -04:00
Kelvin Tan 7ca402147d add phishing html page, and redirect to bundled page in-window 2018-07-27 00:03:39 +08:00
viktor 914a624d12 get upstream 2018-07-25 16:56:16 +03:00
Kevin Serrano 1d241bef76
Merge branch 'develop' into no-inject-ani-gamer 2018-07-24 12:27:18 -07:00
viktor a5106b7794 Merge remote-tracking branch 'upstream/develop' into sokol-network 2018-07-19 17:27:38 +03:00
viktor fafd3fed0d merge with develop branch 2018-07-19 12:41:40 +03:00
Dan Finlay dd9e3587d4
Do not inject on ani.gamer.com.tw
Fixes #4799
2018-07-18 15:23:32 -07:00
Gerardo Nardelli acef6cc297 Inject web3 even if already exists 2018-07-18 11:17:25 -03:00
viktor 804bbaa9c0 new extension name and icons 2018-07-17 20:18:12 +03:00
Dan Finlay 6be6b9ef29
Do not inject on blueskybooking.com
Per zendesk 2312.
2018-07-16 15:39:35 -07:00
Dan Finlay c4ae399577
Add harbourair.com to injection block list
This site was getting unexpected results when MetaMask was installed.

https://consensys.zendesk.com/agent/tickets/2312
2018-07-12 14:21:32 -07:00
brunobar79 a8f745f9fe eslint --fix . 2018-07-02 18:49:33 -04:00
Dan Finlay 764643ed5f
Block gravityforms.com from web3 injection
Fixes #3073
2018-06-03 19:38:47 -07:00
simon 22753d96fd Added trailing comma for eslint 2018-05-18 16:11:46 +02:00
simon 41502cb384 Added adyen.com to blacklisted domains because postMessages are blocking card encryption 2018-05-18 15:43:27 +02:00
Bryce Neal 18a8a21179 Blacklist problematic shopify iFrame 2018-04-30 14:35:47 -07:00
bitpshr 8636f3bae5 Clean up JSDoc for background scripts 2018-04-19 15:14:00 -04:00
bitpshr c9f83fe8bc Add JSDoc to various background scripts 2018-04-18 17:02:08 -04:00
Dan Finlay 86693af156
Add webby awards to web3 block list. 2018-04-03 20:33:19 -07:00
kumavis 253abd60fc build - extension - move js files to toplevel 2018-03-28 21:29:57 -07:00
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
William Chong 03f86acd60 fix #1398, prevent injecting xml without xml suffix 2017-12-05 19:53:01 +08:00
kumavis 53a360b65d contentscript - fix inpage require and bundling 2017-10-12 12:51:48 -07:00
Dan Finlay c9a984a237 Break up inpage file read into multiple lines 2017-10-12 14:16:40 -04:00
Dan Finlay 1cba6543a4 Begin implementing sync injection idea 2017-10-04 15:35:04 -07:00
kumavis 0a5ae39509 bug - fix event emitter mem leak warning 2017-09-21 17:37:30 -07:00
kumavis 8545453a9d contentscript - fix obj-multiplex instantiation and use pump for streams 2017-09-11 14:30:30 -07:00
kumavis da16f39626 Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-03 15:05:32 -07:00
kumavis da7471e095 lint fixes 2017-08-03 14:48:19 -07:00
frankiebee 473b88f399 Reload the page when switching networks for sites that use web3 2017-05-24 23:00:58 -04:00
Thomas Huang 6bdb4c8728 Fix linting warnings 2017-04-26 21:05:45 -07:00
kumavis be88c87b25 extension - prefer extensionizer module 2017-03-30 18:30:24 -07:00
Kevin Serrano 0625b4a110
Fix injection logic. 2017-03-28 14:30:39 -04:00
Stefaan Ponnet 0faddb2ed2 Allow injection in IFrames + dynamic IFrames 2017-03-26 13:57:44 +02:00
Kevin Serrano 9906da86a4
Modify logic for injection conditions. 2017-03-22 14:25:56 -04:00
Kevin Serrano 23263bec7d
Linting to the max. 2016-11-11 10:26:12 -08:00
Kevin Serrano 0d495372da
Lint. 2016-10-15 15:41:24 -07:00