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,737 Commits 2 Branches 0 Tags 265 MiB
db981b827b
Commit Graph

7737 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Finlay
db981b827b
Merge pull request #5384 from MetaMask/Version-4.13.0 
Version 4.13.0
 2018-10-04 17:43:59 -07:00
Dan Finlay
78709499da Version 4.13.0 2018-09-27 10:35:37 -07:00
Kevin Serrano
84077c2da9
Merge pull request #5349 from MetaMask/v4.11.1 
Version 4.11.1
 2018-09-25 10:46:32 -07:00
bobby dresser
6257b45765
remove comment about etherdelta 2018-09-25 10:19:27 -07:00
Dan Finlay
91cb1ecd33 Version 4.11.1 2018-09-25 09:54:51 -07:00
Dan Finlay
dfd6c99270
Merge pull request #5346 from MetaMask/v4.11.1 
v4.11.1
 2018-09-25 09:50:25 -07:00
brunobar79
49d518983f update package-lock.json 2018-09-25 12:29:18 -04:00
Bruno Barbieri
ed3529b70b
Merge branch 'master' into v4.11.1 2018-09-25 11:58:43 -04:00
brunobar79
e1c6306f83 bump to v4.11.1 2018-09-25 11:57:28 -04:00
Thomas Huang
bef7d7a867
Merge pull request #5313 from MetaMask/Version-4.11.0 
Version 4.11.0
 2018-09-24 11:35:05 -05:00
Dan Finlay
6920429343 Version 4.11.0 2018-09-21 15:00:45 -07:00
Dan Finlay
097c1e90e3
Merge pull request #5084 from MetaMask/ledger-support-without-provider 
Ledger support (in case of rollback)
 2018-08-20 10:23:15 -07:00
kumavis
9268c4ed54
Merge pull request #5079 from MetaMask/v4.9.3 
Version 4.9.3
 2018-08-17 08:56:34 -07:00
brunobar79
51e4a6d335 fix ledger affiliate link 2018-08-16 21:15:50 -04:00
brunobar79
b369560569 fix e2e tests 2018-08-16 20:59:11 -04:00
brunobar79
285814646f ui ready 2018-08-16 20:41:23 -04:00
brunobar79
2ea05e303d connect screen ready 2018-08-16 19:39:52 -04: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
brunobar79
837be704f5 change Metamask for MetaMask 2018-08-15 11:44:00 -04: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
brunobar79
d2d8d38346 update package-lock.json 2018-08-14 23:08:50 -04:00
brunobar79
8fb7099bf2 Merge branch 'ledger-support' of github.com:MetaMask/metamask-extension into ledger-support 2018-08-14 23:02:14 -04:00
brunobar79
e54b8507d2 use eth-ledger-bridge-keyring from npm 2018-08-14 23:02:01 -04:00
Bruno Barbieri
80fe3ce888
Merge branch 'develop' into ledger-support 2018-08-14 22:55:47 -04:00
brunobar79
82a5ed1e03 remove console logs 2018-08-14 22:40:29 -04:00
brunobar79
fdf202efb0 fixed unit tests 2018-08-14 21:19:01 -04:00
brunobar79
53dcad5a3b more ui 2018-08-14 19:38:23 -04:00
brunobar79
19d1988715 fix 2018-08-14 19:24:15 -04:00
brunobar79
c72ced79ae ui fixes 2018-08-14 19:22:00 -04:00
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
brunobar79
b77cc3d969 fix tx tests 2018-08-14 03:42:23 -04:00
brunobar79
61a279204a legacy and new hd path working 2018-08-14 01:26:18 -04:00
brunobar79
4e1d8ba19d good progress adding paths 2018-08-13 19:29:43 -04: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
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