m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-12 20:57:12 +01:00
Code
7,696 Commits 2 Branches 0 Tags 265 MiB
9268c4ed54
Commit Graph

2459 Commits

Author SHA1 Message Date
Thomas
d636cc3552 v4.9.3 2018-08-15 10:06:20 -07:00
Dan Finlay
7c47187f4d
Merge pull request #5037 from MetaMask/master 
Update develop branch to v4.9.2
 2018-08-15 10:02:20 -07:00
Whymarrh Whitby
6e6a4825ac Fix casing of Bitcoin, Ethereum, and Litecoin across localized messages 
Using the following commands:

    sed -i.bak s/bitcoin/Bitcoin/ app/_locales/**/*.json && \
        find app/_locales/ -name '*.bak' -delete

    sed -i.bak s/ethereum/Ethereum/ app/_locales/**/*.json && \
        find app/_locales/ -name '*.bak' -delete

    sed -i.bak s/litecoin/Litecoin/ app/_locales/**/*.json && \
        find app/_locales/ -name '*.bak' -delete
 2018-08-13 19:47:56 -02:30
Whymarrh Whitby
6c11ae44bf Fix casing of MetaMask in all localized messages 
Using the following:

    sed -i.bak s/Metamask/MetaMask/ app/_locales/**/*.json && \
        find app/_locales/ -name '*.bak' -delete
 2018-08-13 19:47:45 -02:30
Bruno Barbieri
e2be22a4b7
Merge pull request #4897 from MetaMask/qr-code-scan 
QR Code Scanner
 2018-08-10 13:40:06 -04:00
Thomas
b887730be7 v4.9.2 2018-08-09 14:42:34 -07:00
Dan Finlay
be1d5a7dd9
Merge pull request #5020 from MetaMask/FixMigration28 
Fixes migration 28
 2018-08-09 14:24:38 -07:00
Jenny Pollack
00a2ab21ae sentry - change releaseVersion to release 2018-08-09 13:49:40 -07:00
Esteban MIno
8df3f2696c fix migration 28 2018-08-09 16:15:56 -04:00
Thomas
1605c8544a v4.9.1 2018-08-09 10:23:16 -07:00
Thomas
500ef5cb3a Merge branch 'master' into develop 2018-08-09 10:09:53 -07:00
Eduardo Antuña Díez
a2082bae5c Avoid overwriting a domain that can be resolved by DNS 
According to the current implementation any domain ending in .eth or .test will try to resolve through ENS even if the DNS is able to resolve it.
changing `onBeforeRequest` to `onErrorOccurred` will only resolve those .eth or .test domains that the DNS is not able to resolve.
 2018-08-09 12:20:51 +02:00
Eduardo Antuña Díez
543207b5af Fixed ENS to IPFS functionality in Firefox 
`tabs.getSelected` is deprecated and it doesn't work in firefox replaced by `tabs.query({active: true}`
 2018-08-09 12:14:09 +02:00
brunobar79
c6b7e460b5 code review changes 2018-08-08 03:00:39 -04:00
brunobar79
2e0916d8ff fix merge conflicts 2018-08-08 02:32:35 -04:00
Esteban MIno
c0cdda8321 Merge branch 'develop' into TokensPerAccountBasis 2018-08-07 14:17:40 -04:00
Whymarrh Whitby
d0611741a2 Show invalid seed phrase error when importing new account 2018-08-07 02:09:26 -02:30
brunobar79
71ef4d85da design complete 2018-08-03 18:57:23 -04:00
brunobar79
710b4e294f added crossbrowser support and error handling 2018-07-31 18:30:56 -04:00
Esteban MIno
d8817b2646 fix doc tag 2018-07-31 16:18:06 -04:00
Esteban MIno
3124e8c612 tokens related functions refactor 2018-07-31 15:59:19 -04:00
Esteban MIno
ccae79d392 fix undefined for tokens on tests 2018-07-31 13:07:28 -04:00
brunobar79
edb154749d send to fullscreen if no permission from popup 2018-07-30 22:57:05 -04:00
Esteban MIno
22cf5a1391 improve comments 2018-07-30 20:44:22 -04:00
Esteban MIno
822c1734d6 fix double state update when account changed 2018-07-30 20:36:31 -04:00
Esteban MIno
fbcba8f019 create tokens storage when setadresses 2018-07-30 19:09:17 -04:00
Esteban MIno
31286673c3 isolation of tokens related methods in preferences 2018-07-30 18:43:34 -04:00
brunobar79
34617a21c3 copy 2018-07-30 18:36:37 -04:00
brunobar79
4339f04e80 use existing modals 2018-07-30 17:50:05 -04:00
Esteban MIno
0757f47e84 passing tokens to all accounts in migration 2018-07-30 11:41:31 -04:00
Thomas
d1734b8d7c Update Phishing Html 2018-07-27 14:10:18 -07:00
Esteban MIno
e687bc5a47 fix migration for preferences controller tokens 2018-07-27 16:17:28 -04:00
Dan Finlay
9dc5d0cee0
Merge pull request #4905 from MetaMask/eip-712-deprecation 
EIP-712: deprecation message
 2018-07-27 13:16:44 -07:00
Esteban Miño
228f48c6e5
Merge branch 'develop' into TokensPerAccountBasis 2018-07-27 16:07:08 -04:00
Esteban MIno
5b9725d1f1 refactor to accountTokens 2018-07-27 16:05:12 -04:00
Thomas Huang
1540b5e256
Merge pull request #4893 from kelvintyb/develop 
Move phishing warning to the extension
 2018-07-27 12:23:31 -07:00
bitpshr
642ae25073 Add deprecation message for eth_signTypedData 2018-07-27 15:23:05 -04:00
Esteban MIno
f5107fa12e migration for preferences controller tokens 2018-07-27 14:56:03 -04:00
Esteban MIno
2827e13caa add & delete tokens per network 2018-07-26 19:28:12 -04:00
kumavis
e715d0e691
Merge pull request #4858 from MetaMask/chinesesimplifiedandtraditional 
Update Chinese naming on our language list
 2018-07-26 15:13:24 -07:00
Esteban MIno
1d3ad7cfbb tokens per network for individual account 2018-07-26 18:04:34 -04:00
kumavis
ffefeb65d4
Merge pull request #4802 from 03-26/develop 
Update translation 🇯🇵
 2018-07-26 14:59:12 -07:00
Kelvin Tan
7ca402147d add phishing html page, and redirect to bundled page in-window 2018-07-27 00:03:39 +08:00
Frankie
b5e3aafe2e
Merge pull request #4871 from MetaMask/3519-new-contract-gas 
tx-gas-utils -  catch all errors from gas estimation
 2018-07-25 15:33:17 -10:00
Esteban MIno
adee549c43 preferences test fixes for tokens per account 2018-07-25 17:46:31 -04:00
frankiebee
527b62ee8e migrations - fix to include 27 2018-07-25 14:11:07 -07:00
Esteban MIno
2770df80e3 add & delete tokens per account 2018-07-25 16:14:10 -04:00
William Morriss
5782926c28
Merge pull request #4825 from MetaMask/no-inject-ani-gamer 
Do not inject on ani.gamer.com.tw
 2018-07-24 19:48:10 -07:00
pinkiebell
3667f3cb85 network.js: convert rpc protocol to lower case (#4855) 
Fixes #4253
 2018-07-24 19:33:36 -02:30
Jenny Pollack
00bae74475 tx-gas-utils - catch all errors from gas estimation 2018-07-24 14:16:37 -07:00