1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Commit Graph

3861 Commits

Author SHA1 Message Date
Kevin Serrano
b7e24dcda7
Remove cryptonator from chrome permissions. 2017-09-07 18:17:43 -07:00
Kevin Serrano
941ea65af7 Merge pull request #2046 from MetaMask/RewordSeedRestore
Reword forgot password to restore seed phrase
2017-09-07 16:28:37 -07:00
Dan Finlay
64717726c4 Reword forgot password to restore seed phrase
This always confuses people, I just finally did it.
2017-09-07 15:27:40 -07:00
Kevin Serrano
13c7b28d40 Merge pull request #1987 from MetaMask/CheckFaq67
Add test for trying to reproduce faq#67
2017-09-07 15:26:29 -07:00
Thomas Huang
a27a7e22f2 Merge pull request #1893 from MetaMask/readd-loose
Re-add loose label onto accounts.
2017-09-07 12:57:56 -07:00
Kevin Serrano
69c7fe24b3
Place object property retrieval inside try-catch 2017-09-07 12:17:36 -07:00
Kevin Serrano
f0ab4ce52d
Change expected type to array. 2017-09-07 11:51:04 -07:00
Kevin Serrano
7ff5fd8691
Changelog bump 2017-09-06 14:04:17 -07:00
Kevin Serrano
0217984a40
Merge branch 'master' into readd-loose 2017-09-06 13:59:52 -07:00
Kevin Serrano
b5f48730cd
Properly update keyring state on new account addition. 2017-09-06 13:59:41 -07:00
kumavis
351db952c5 Merge pull request #2033 from MetaMask/Version-3.9.12
Version 3.9.12
2017-09-06 13:54:47 -07:00
Dan Finlay
5e934994d1 Version 3.9.12 2017-09-06 13:33:30 -07:00
kumavis
47340ca550 Merge pull request #2017 from MetaMask/DevEnviornment
Update redux middleware imports
2017-09-06 13:18:14 -07:00
tmashuang
36a44ef61f Update mock-store dependency 2017-09-06 11:04:17 -07:00
Dan Finlay
88556dce74 Merge pull request #2023 from MetaMask/web3-1.0-fix
inpage - bug fix
2017-09-06 10:33:43 -07:00
kumavis
ea7e46ed38 inpage - bug fix
prevents mutation of original message object which causes problems with web3 1.0
2017-09-05 16:46:21 -07:00
Kevin Serrano
3e2bd19881
Merge branch 'master' into readd-loose 2017-09-05 15:48:15 -07:00
Kevin Serrano
32c799a135 Merge pull request #2019 from MetaMask/i2016-ImproveSignDeprecationWarning
Make eth_sign deprecation warning more useful
2017-09-05 11:49:48 -07:00
Kevin Serrano
ba2d1f8d3e Merge pull request #2018 from MetaMask/i2014-BetterWeb3DeprecationWarning
Make web3 deprecation notice more useful
2017-09-05 11:49:18 -07:00
Dan Finlay
90272e252f Make eth_sign deprecation warning more useful
Link to descriptive article that demonstrates the new preferred method.
2017-09-05 11:44:26 -07:00
Dan Finlay
70a61f8712 Make web3 deprecation notice more useful
Linking to a descriptive & precriptive article on a path forward.
2017-09-05 11:35:33 -07:00
Kevin Serrano
e647337a8a
Resolve merge conflict from master 2017-09-05 09:03:44 -07:00
tmashuang
1172c6a94b Update development store 2017-09-05 08:58:01 -07:00
kumavis
2885a95471 Merge pull request #2008 from MetaMask/mascara-fix
mascara - fix iframe stream constructor
2017-09-01 12:07:28 -07:00
Thomas Huang
33dfed15a6 Merge pull request #1897 from MetaMask/greenkeeper/sinon-3.2.0
Update sinon to the latest version 🚀
2017-09-01 12:05:08 -07:00
kumavis
dbcc82f5c4 mascara - fix iframe stream constructor 2017-09-01 12:03:28 -07:00
Kevin Serrano
b47d3735fe Merge pull request #2007 from MetaMask/i2005-HttpsLinjs
Use HTTPS links when available
2017-09-01 11:57:57 -07:00
Dan Finlay
01f961976a Bump changelog 2017-09-01 11:42:44 -07:00
Dan Finlay
8498daee88 Update etherscan links to https
Fixes #2005
2017-09-01 11:41:47 -07:00
Dan Finlay
ddd559718f Update support link 2017-09-01 11:01:53 -07:00
Kevin Serrano
48021f4f94 Merge pull request #1988 from MetaMask/i1986-AddVersionToStateLogs
Add version to state logs
2017-08-29 18:17:17 -07:00
Kevin Serrano
4b058bc7eb Merge branch 'master' into i1986-AddVersionToStateLogs 2017-08-29 18:09:39 -07:00
Kevin Serrano
ec286a2b33 Merge pull request #1992 from MetaMask/MultipleTokensText
Multiple tokens shows the amount when greater than 1
2017-08-29 18:09:16 -07:00
Thomas Huang
725e4aae7f Update changelog 2017-08-29 18:00:57 -07:00
Thomas Huang
04011f9ea7 Multiple tokens shows the amount when greater than 1 2017-08-29 17:54:01 -07:00
Dan Finlay
54ce267a9f Add version to state logs
Fixes #1986
2017-08-29 11:42:44 -07:00
Dan Finlay
2117490d41 Add test for trying to reproduce faq#67
Failed to reproduce this issue with the same inputs.
2017-08-29 11:36:53 -07:00
kumavis
71de68fc13 Merge pull request #1985 from MetaMask/i1974-EnsureDeepCloneHistory
Add some tests to tx-state-history-helper
2017-08-28 12:04:54 -07:00
Dan Finlay
b97a65e1d1 Add some tests to tx-state-history-helper 2017-08-28 11:40:28 -07:00
Kevin Serrano
a812c02ed7 Merge pull request #1965 from MetaMask/inpage-provider-fixes
Various Inpage fixes
2017-08-28 11:36:36 -07:00
kumavis
76de053b0b Merge branch 'master' into inpage-provider-fixes 2017-08-28 11:29:47 -07:00
kumavis
6bff55ba2a inpage - add changelog note 2017-08-28 11:29:13 -07:00
kumavis
e294aa7e0d inpage - lint fix 2017-08-28 10:41:01 -07:00
Dan Finlay
34b327caf0 Merge pull request #1977 from MetaMask/Version-3.9.11
Version 3.9.11
2017-08-24 00:21:57 -07:00
Dan Finlay
72bccec440 Version 3.9.11 2017-08-24 00:16:19 -07:00
kumavis
9ce82640f2 Merge pull request #1973 from MetaMask/hotfix-migration019
hotfix - fail submitted txs whos nonce is out of bound
2017-08-24 00:15:24 -07:00
frankiebee
c2624dd1a0 fall back to latest if blockNumber is null 2017-08-24 00:02:06 -07:00
Dan Finlay
803e696cdc Make method return a number 2017-08-23 23:24:01 -07:00
Dan Finlay
17a71a9b4c Only cancel pending txs with non continuously high nonces 2017-08-23 23:13:42 -07:00
frankiebee
f42687d25f fix description 2017-08-23 22:53:29 -07:00