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

7696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kumavis
9268c4ed54
Merge pull request #5079 from MetaMask/v4.9.3 
Version 4.9.3
 2018-08-17 08:56:34 -07:00
Thomas
d636cc3552 v4.9.3 2018-08-15 10:06:20 -07:00
Thomas
595fc403ed Bump Changelog 2018-08-15 10:05:43 -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
Dan J Miller
a41afebd66
Merge pull request #5059 from MetaMask/e2e-tests-more-reliable 
Another e2e beta test fix
 2018-08-15 12:10:04 -02:30
Dan Miller
3c8a4162a4 Remove unnecessary else in test/e2e/beta/contract-test/contract.js 2018-08-14 19:18:04 -02:30
Dan Finlay
d7aa1bf5c0
Merge pull request #5060 from MetaMask/bignumber-string 
Cast arguments for new Bignumbers() to string.
 2018-08-14 14:36:27 -07:00
Dan Miller
ff72423491 Add explicit waits for submitted status for some txs initiated from test dapp. 2018-08-14 17:30:43 -02:30
Dan Miller
c4fe6aa9cf Reload e2e beta test browser if initial screen doesn't load. 2018-08-14 16:45:07 -02:30
Dan Miller
42256cfbd2 Increase timeout on wait for contract status update in metamask-beta-ui-spec 2018-08-14 16:28:04 -02:30
Dan Miller
ebb23721ed Cast arguments for new Bignumbers() to string. 2018-08-14 15:46:58 -02:30
Dan Miller
a59e47e7b0 Add missing awaits and/or missing wait timeouts in test/e2e/beta/metamask-beta-ui.spec.js 2018-08-14 12:50:26 -02:30
Dan Miller
860bf42346 Make deployment states in test/e2e/beta/contract-test/contract.js more explicit 2018-08-14 12:35:50 -02:30
Dan Miller
c00d0daeb5 Improve error handling in assertElementNotPresent of test/e2e/beta/helpers.js 2018-08-14 12:35:50 -02:30
Whymarrh Whitby
742aa8bb11
Merge pull request #5058 from whymarrh/fix-words 
Fix casing of some proper nouns in localised messages
 2018-08-14 07:24:01 -02:30
Whymarrh Whitby
9ba91e69c7
Merge pull request #4961 from whymarrh/download-seed-phrase 
Add download seed phrase link to new UI
 2018-08-14 07:23:25 -02:30
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
Whymarrh Whitby
4dadeb9a31 Add link to download seed words in new UI 2018-08-13 18:55:04 -02:30
Whymarrh Whitby
b83a746e4f Add exportAsFile optional type argument 2018-08-13 18:38:13 -02:30
Whymarrh Whitby
247fa2cc51 Fix casing of 1Password 2018-08-13 18:38:13 -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
Dan Finlay
ef7e638dda
Merge pull request #5025 from MetaMask/v4.9.2 
v4.9.2
 2018-08-09 15:39:48 -07:00
Thomas Huang
06633da1b3
Merge branch 'master' into v4.9.2 2018-08-09 14:48:28 -07:00
Thomas
a1ced0f197 Bump Changelog 2018-08-09 14:46:47 -07: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
0442e5dfd7
Merge pull request #5022 from MetaMask/sentry-release-version 
sentry - change releaseVersion to release
 2018-08-09 14:08:47 -07:00
Jenny Pollack
00a2ab21ae sentry - change releaseVersion to release 2018-08-09 13:49:40 -07:00
Esteban MIno
d263d60b4c tests for migration 28 2018-08-09 16:41:16 -04:00
Esteban MIno
8df3f2696c fix migration 28 2018-08-09 16:15:56 -04:00
Dan Finlay
2b25902561
Merge pull request #5017 from MetaMask/v4.9.1 
V4.9.1
 2018-08-09 10:52:11 -07:00
bobby dresser
438fd5bce0
remove duplicate template (#5016) 2018-08-09 10:48:10 -07:00
Thomas
1605c8544a v4.9.1 2018-08-09 10:23:16 -07:00
Thomas
bbde2ea4fc Bump Changelog 2018-08-09 10:23:03 -07:00
Thomas
2e82f7e7ba Merge branch 'develop' of github.com:MetaMask/metamask-extension into develop 2018-08-09 10:10:03 -07:00
Thomas
500ef5cb3a Merge branch 'master' into develop 2018-08-09 10:09:53 -07:00
bobby dresser
6fb790e9a8
Create issue templates (#4972) 
adds issue templates
 2018-08-09 10:09:33 -07:00
Thomas Huang
09b81a2d22
Merge pull request #5010 from eduadiez/develop 
Fix ENS resolution issues
 2018-08-09 09:47:25 -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
Dan J Miller
d4af5b7bec
Merge pull request #5000 from MetaMask/contract-method-conf-sim-failure 
Show error while allowing confirmation of tx where simulation fails
 2018-08-08 22:13:41 -02:30
Dan Miller
973325a6c4 Show error while allowing confirmation of transaction where simulation fails 2018-08-08 21:26:25 -02:30
Dan J Miller
1ae668fa5e
Merge pull request #4995 from MetaMask/nonce-for-retry-from-ethquery 
Get nonce for showing retry button using ethQuery transaction count.
 2018-08-08 21:09:27 -02:30
Whymarrh Whitby
51644962e9
Fix lint error in tx-list 2018-08-08 19:32:45 -02:30
brunobar79
d0ccc59e45 add comment 2018-08-08 15:42:25 -04:00
brunobar79
656afeefad fix merge conflicts 2018-08-08 15:40:04 -04:00
Dan Miller
e98c3b4c01 Get nonce for showing retry button using ethQuery transaction count. 2018-08-08 17:04:42 -02:30
Dan J Miller
1d4ee6bf76
Merge pull request #4986 from MetaMask/approve-calc-token-decimals 
Use token decimals when calculating confirm screen token approval amount
 2018-08-08 16:26:03 -02:30
Paul Bouchon
8ac4b586eb
Update eth-keyring-controller and eth-hd-keyring versions (#4989) 2018-08-08 13:17:48 -04:00