m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 18:00:18 +01:00
Code
11,987 Commits 2 Branches 0 Tags 265 MiB
2c47ace438
Commit Graph

1049 Commits

Author SHA1 Message Date
Whymarrh Whitby
e5231eed3d Update CHANGELOG.md for v7.1.0 2019-08-21 17:47:06 -02:30
MetaMask Bot
fc55b1007b Version v7.1.0 2019-08-21 17:47:06 -02:30
Dan Miller
9ac2720981 Changelog update for v7.0.1 2019-08-08 09:24:38 -02:30
MetaMask Bot
aceb6f0d3e Version v7.0.1 2019-08-08 11:40:52 +00:00
Mark Stacey
372241e935 Add #6967 to changelog 2019-08-06 17:11:14 -03:00
Whymarrh Whitby
3ba3eacbbd Merge remote-tracking branch 'upstream/develop' into HEAD 2019-08-06 11:29:12 -02:30
Thomas
bf00f42252 Merge branch 'master' into develop-master-parity 2019-08-05 12:21:41 -07:00
Dan Miller
8c9404f2ae Version 7.0.0 2019-08-02 20:44:29 -02:30
Dan Finlay
4139019d0f
Version 6.7.3 (#6889) 2019-07-18 20:48:07 -07:00
Thomas Huang
96a12a627e
Merge pull request #6832 from MetaMask/master-rebased 
Master rebased
 2019-07-12 10:58:19 -07:00
Erik Marks
9be7fd39ba Sync lockfile (#6833) 2019-07-12 15:22:27 -02:30
Mark Stacey
1c19ce91a4 Fix changelog formatting errors 
The description for one entry has also been corrected.
 2019-07-11 19:05:55 -03:00
Brian Soule
fabba27b78 Capitalized speed up label to match rest of UI (#6828) 2019-07-10 09:26:20 -03:00
Mark O'Sullivan
0311f2d28c Added visual documentation of the account menu component (#6775) 
* Added visual documentation of the menu bar component

* updated CHANGELOG.md

* renamed to account menu which is the component highlighted in the screenshot

* updated contributions document
 2019-07-05 10:24:30 -02:30
Dan Finlay
397e0d128d Version 6.7.2 RC1 2019-07-04 14:14:03 -02:30
Dan Finlay
e768ed9b16 Version 6.7.2 RC1 2019-07-01 13:03:57 -07:00
Mark Stacey
56088d8370 Version 6.7.1 2019-06-28 02:08:18 -03:00
Thomas
84c28896a6 Version 6.7.0 2019-06-25 12:43:38 -07:00
Thomas Huang
3f8f2a9ae1
Merge branch 'develop' into Version-6.6.2 2019-06-17 10:26:57 -07:00
Kirill Goncharov
a47370057e Fix styles on 'import account' page, update help link (#6700) 
* Fix styles on 'import account' page, update help link

* Update changelog
 2019-06-17 08:37:34 -02:30
Dan Finlay
4f8bfded79 Version 6.6.2 RC1 2019-06-07 10:37:12 -07:00
Dan Finlay
94efbfaa1c Version 6.6.1 RC1 2019-06-06 10:37:50 -07:00
Dan Finlay
f9ce7485bd Version 6.6.0 RC1 2019-06-03 13:14:52 -07:00
Dan Finlay
8bd27f50b0 Version 6.5.3 RC1 2019-05-16 08:54:43 -07:00
Thomas Huang
7ff1857156 Version Bump 2019-05-15 02:16:05 -07:00
Dan Finlay
3d715e5cf9 Version 6.5.1 RC1 2019-05-14 11:25:51 -07:00
Dan Miller
55764b71bb Improve changelog for 6.5.0 2019-05-13 13:51:19 -02:30
Dan Finlay
25323c8e18 Version 6.5.0 RC1 2019-05-10 15:38:32 -07:00
Dan Finlay
a56fc14122 Version 6.4.1 RC1 2019-04-26 10:28:39 -07:00
Dan Finlay
49d77415db Version 6.4.0 RC1 2019-04-18 08:34:24 -06:00
Dan J Miller
79804ec79b Version 6.3.2 (#6418) 2019-04-08 11:22:23 -07:00
Dan Miller
57bcf1449c Version 6.3.1 2019-03-29 15:23:55 -02:30
Dan J Miller
91c4c3bdce Version 6.3.0 (#6350) 2019-03-26 10:03:15 -07:00
Thomas Huang
5d565174b7 Patch/bump version (#6294) 2019-03-12 15:24:30 -07:00
Thomas Huang
5abcce2be7 Version 6.2.1 (#6251) 2019-03-11 11:23:11 -07:00
Dan J Miller
dc79456695 Version 6.2.0 (#6239) 
* Version 6.2.0 RC1

* Update changelog.md for 6.2.0
 2019-03-05 10:57:10 -08:00
Dan Finlay
29b64bdb17 Version 6.1.0 RC1 2019-02-19 12:22:01 -08:00
Jonathan Smirnoff
8dddf48904 Fixed issue #5838 (#6001) 
Update changelog file
 2019-02-13 10:30:46 -10:00
Whymarrh Whitby
ff292dcb70 Version 6.0.1 (#6141) 2019-02-12 08:33:40 -08:00
Dan Finlay
140fcb4bf1
Version 6 RC1 (#6117) 
* Version 6 RC1

* Make gas input feature more readable

* Update CHANGELOG.md with additional 6.0.0 changes
 2019-02-11 10:19:07 -08:00
Whymarrh Whitby
7bbd6e7039 Version 5.3.5 (#6109) 2019-02-04 12:04:43 -08:00
Dan Finlay
015414c31d
Version 5.3.4 RC1 (#6084) 2019-01-31 10:27:58 -08:00
Dan Finlay
5c49ce77bd Version 5.3.3 RC1 2019-01-30 10:45:42 -08:00
Dan Finlay
98d5b4d632
Version 5.3.2 RC1 (#6069) 2019-01-28 11:14:32 -08:00
Dan Finlay
72775340bb Version 5.3.1 RC2 2019-01-16 11:25:41 -08:00
Dan Finlay
da7208c16d Version 5.3.0 RC1 2019-01-02 16:44:59 -08:00
Dan Finlay
75a737b69a Version 5.2.2 RC1 2018-12-12 18:48:50 -08:00
Dan J Miller
ea5eb855e8 Version 5.2.1 RC1 (#5918) 2018-12-12 09:02:42 -08:00
Dan Miller
5ab3f5bb20 Changelog and version bump for 5.2.0 2018-12-11 13:51:19 -03:30
Noah Zinsmeister
49971e9ec2 fix formatting of 32-byte strings in personal_sign (#5878) 2018-12-10 09:47:52 -03:30
Dan Finlay
a1528674bc Version 5.1.0: East Bay 2018-12-03 10:54:31 -08:00
Dan Finlay
4be3fe5906 Version 5.0.4 RC1 (#5859) 2018-11-29 11:43:00 -10:00
Dan Finlay
5956f8d260 Version 5.0.3 (#5785) 
* Version 5.0.3

Includes a fix to the `version:bump` script that now correctly updates
the changelog header.

* Include inpage provider events
 2018-11-20 08:34:14 -10:00
Esteban MIno
6dce32fc1e provide automatic changelog since last tag for linux 2018-11-15 10:12:11 -08:00
Dan Finlay
3a6e513f47
Add old changelog entry 
Describing when we added support for cross-extension comms.
https://github.com/MetaMask/metamask-extension/pull/3997
 2018-11-14 16:02:16 -08:00
Dan Finlay
22ba0b0c2d Resubmit approved transactions on new block (#5752) 
* Add beginning of test

* Resubmit approved transactions on new block

May fix #4343 and related issues, where an error could leave
transactions stranded in the approved state.

* Remove unused test

* Re-approve transactions when retrying approved

* Add retry approved test

* Include approved in pending tx count

* Fix getPendingTxs()

* Linted

* Only throw hash error in submitted state

* Only check submitted txs for block inclusion

* Fix test expectations
 2018-11-14 11:34:07 -10:00
Dan Finlay
da1036f2c4 Version 5.0.2 2018-11-09 20:03:18 -08:00
Dan Finlay
e53ceb6bc1 Version 5.0.1 (#5694) 2018-11-07 12:07:14 -05:00
Dan Finlay
7b8a73b01f Version 5.0.0 (#5685) 2018-11-06 11:42:22 -05:00
Dan Finlay
2d4ff1dd82 Version 4.17.1 2018-11-05 14:05:33 -08:00
kumavis
e683684e8d 4.17.0 2018-11-01 21:05:37 -04:00
kumavis
9b42416fc0 Merge branch 'develop' of github.com:MetaMask/metamask-extension into HowardBraham-develop 2018-10-25 22:24:30 -04:00
kumavis
75ccb6d5e0 Update CHANGELOG.md (#5566) 2018-10-23 11:05:26 +08:00
kumavis
3e2bf36d59 i18n - update haitian translations (#5565) 
* addedd new keys and updated translations to Haitian Creole

* changelog - add entry for hatian creole fix
 2018-10-22 21:55:06 +02:00
kumavis
3b46478024
Merge branch 'develop' into develop 2018-10-20 23:48:10 -04:00
Kevin Serrano
17372e150d
Update CHANGELOG.md 2018-10-17 17:09:46 -07:00
kumavis
7e9e403060
Changelog - fix release dates 2018-10-17 20:07:10 -04:00
kumavis
09c3611171 4.16.0 2018-10-17 19:49:25 -04:00
matteopey
61dec4ea46 Update Italian translations (#5502) 
* Add new english messages

* Update translation

* Update changelog

* Fix casing of MetaMask
 2018-10-15 19:07:18 -02:30
kumavis
f194f07801 Merge branch 'master' of github.com:MetaMask/metamask-extension into develop 2018-10-11 22:42:37 -04:00
Dan Finlay
1bbc55a533 Correct 4.14.0 version 2018-10-11 10:21:29 -07:00
Dan Finlay
837eb796e5 Version 4.14.0 2018-10-11 09:42:21 -07:00
Howard Braham
222e62d7f1 Bug Fix: #1789 and #4525 eth.getCode() with no contract 2018-10-09 15:31:25 -07:00
Vincent
cd91b45686 100% French locale, reordering of English locale, fixes #5457 (#5470) 
* french locales: fix typos and improve wording

* french locales: more fixes and rewording

* fixed typo

* fixed typo

* added missing translations

* fixed alphabetical order

* fixed alphabetical order

* added missing translations for FR

* fixed verify-locale-strings.js

* fixed indentation

* fixed indentation

* updated french locale

* updated changelog with changes logs

* a few fixes after receiving comments, mostly Caps removing and adding
 2018-10-09 12:17:38 -02:30
Dan Finlay
507397f6c3 Fix updating of pending transactions 
Transaction statuses were not being properly updated when:

- MetaMask was unlocked
- The network was changed

This PR fixes both of those. Fixes #5174
 2018-10-05 10:35:14 -07:00
Dan Finlay
78709499da Version 4.13.0 2018-09-27 10:35:37 -07:00
Dan Finlay
43b39beb7e Correct changelog date 2018-09-27 10:22:51 -07:00
Dan Finlay
9d8f4d547c Version 4.12.0 2018-09-27 10:12:44 -07:00
Dan Finlay
140cee6c32 Merge remote-tracking branch 'origin/master' into Version-4.12.0 2018-09-27 10:11:51 -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
6920429343 Version 4.11.0 2018-09-21 15:00:45 -07:00
tmashuang
0ec01cc1d7 Bump Changelog 2018-09-17 14:41:11 -05:00
Paul Bouchon
daca7f9b41
Merge branch 'develop' into eip-712 2018-09-17 12:11:10 -04:00
Paul Bouchon
2ec09362c5
EIP-1102: Transitionary API (#5256) 2018-09-14 19:26:03 -04:00
bitpshr
36dd0354e7 Implement latest EIP-712 protocol 2018-09-13 15:40:57 -04:00
Eugene Marinelli
d27332955c Use correct loading message when connecting to Kovan (#5189) 
* Use correct loading message when connecting to Kovan

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md
 2018-09-06 12:20:55 -02:30
Eugene Marinelli
810fbc4da0
Fix CHANGELOG.md formatting 2018-09-03 12:25:08 -04:00
Esteban MIno
8af45d50cf add watchAsset CHANGELOG 2018-08-23 16:44:21 -03:00
Dan Matthews
df799d7fd6 Restores accounts until one with a zero balance is found 2018-08-17 10:26:47 -04:00
Thomas
595fc403ed Bump Changelog 2018-08-15 10:05:43 -07:00
Thomas
a1ced0f197 Bump Changelog 2018-08-09 14:46:47 -07:00
Thomas
bbde2ea4fc Bump Changelog 2018-08-09 10:23:03 -07:00
Thomas
500ef5cb3a Merge branch 'master' into develop 2018-08-09 10:09:53 -07:00
Esteban MIno
66c76c04ef CHANGELOG 2018-08-07 14:25:21 -04:00
Kevin Serrano
bb40a8169c
Update CHANGELOG.md 2018-08-07 10:05:05 -07:00
pinkiebell
3667f3cb85 network.js: convert rpc protocol to lower case (#4855) 
Fixes #4253
 2018-07-24 19:33:36 -02:30
Csaba S
c11dea9afc
Merge branch 'develop' into transaction-notifications 2018-07-20 20:09:57 +02:00
Csaba Solya
682d59cfe0 adding changelog entry 2018-07-20 19:58:51 +02:00
Esteban Miño
cb045fd8fe
Auto-detect tokens #3034 (#4683) 
* detect tokens polling

* network store to detect token

* tests for spec

* passtest-lint

* fix lint

* improve tests

* detect tokens through infura

* detect tokens when submit password and new account selected

* keyring unlocked detect and unit tests

* add changelog
 2018-07-20 12:36:24 -04:00
brunobar79
03254680c9 add changelog 2018-07-13 20:15:37 -04:00
frankiebee
650cef103e add to CHANGELOG.md 2018-06-25 15:10:13 -07:00
kumavis
bc84ed6081
changelog - remove incorrect entry 
4.8.0 claimed dapp autoreload was disabled. Actually this was reverted and is still active at this time
 2018-06-19 10:55:05 -07:00
Thomas
0e3ecbbc4f Update Changelog 2018-06-18 13:05:50 -07:00
Thomas
ea0dcdd312 Merge branch 'develop' into v4.8.0 2018-06-18 12:37:01 -07:00
Dan Finlay
3a6cc3c8fd Re-enable dapp reload on network change 
We want to give devs some time to digest [this blog post](https://medium.com/metamask/breaking-change-no-longer-reloading-pages-on-network-change-4a3e1fd2f5e7) before we making a breaking change to our platform.

Makes it easy to re-implement the change.
 2018-06-14 15:15:23 -07:00
Thomas
ef31eeccb2 v4.8.0 2018-06-14 10:48:38 -07:00
kumavis
d9ef72cb7e
Merge branch 'develop' into save-brave 2018-06-14 10:11:35 -07:00
Dan Finlay
3a5089da6f
Merge pull request #4566 from MetaMask/notice-phishing 
Push new notice on recent phishing incidents
 2018-06-14 09:49:38 -07:00
kumavis
e9cb650832 Merge branch 'develop' of github.com:MetaMask/metamask-extension into ValidateEmptyKey 2018-06-13 21:11:04 -07:00
kumavis
86f7692c04 changelog - add note on persistence bug 2018-06-13 16:54:05 -07:00
Kevin Serrano
4481c7be44
Add changelog item. 2018-06-13 13:52:34 -07:00
kumavis
5032d6e4c5
Merge branch 'develop' into nonce-tracker-mutex-fix 2018-06-12 23:22:09 -07:00
Erik Marks
6ba70a039a update changelog 2018-06-12 13:37:37 -07:00
kumavis
013d8451c8 changelog - add note on nonce-lock mutex fix 2018-06-12 13:08:28 -07:00
kumavis
368fe229c2
changelog - version fix 2018-06-08 21:04:20 -07:00
Jenny Pollack
93bdfc0bba changelog 4270 2018-06-07 14:15:02 -07:00
Dan Finlay
c53c5d5c9e Fix bug where reset account would not work. 
Fixes #4462

Ensures that resetAccount() can work on non-stock providers.

I'm unclear how this was ever working, this code hasn't moved in months,
but users report it recently breaking. Maybe we only recently pushed it
to prod.
 2018-06-06 16:46:39 -07:00
Dan Finlay
3e0747f9ce Bump changelog 2018-06-05 13:45:38 -07:00
kumavis
f73feccf5a 4.7.4 2018-06-05 13:22:48 -07:00
kumavis
c12b02b4af changelog - add note on new modal 2018-06-04 16:16:18 -07:00
kumavis
12a7fc4016 4.7.3 2018-06-04 16:11:19 -07:00
Dan Finlay
cd1e77c0f6 Add changelog entry 2018-06-04 14:56:50 -07:00
kumavis
0a7584999e 4.7.2 - additional changelog notes 2018-06-03 12:35:32 -07:00
kumavis
a09b3737f2 4.7.2 2018-06-03 12:31:09 -07:00
Dan Finlay
b1b90a6bb9 Version 4.7.1 2018-06-01 15:48:16 -07:00
kumavis
e59f606adb 4.7.0 2018-05-30 15:08:44 -07:00
kumavis
adfa033829 changelog - add note on brave 2018-05-30 15:07:46 -07:00
Dan J Miller
e3cc89cc7b
Update changelog 2018-05-29 21:59:53 -02:30
kumavis
4205d92729 Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-master 2018-05-29 16:12:36 -07:00
bitpshr
ce2834400c Add new json-rpc-engine middleware for improved error handling 2018-05-14 08:33:47 -04:00
kumavis
477063a5a0 Version 4.6.1 2018-04-30 13:29:22 -07:00
kumavis
2b9925a9e4
Merge pull request #4110 from MetaMask/master 
Develop - Add commits to develop that are already in Master
 2018-04-27 16:17:46 -06:00
Paul Bouchon
1bad3fa257
Allow transactions with 0-gwei gas price (#4073) 
* Allow transactions with 0-gwei gas price
* Add tests to verify tx with 0 gas fee
* Conditionally use CurrencyInput in CurrencyDisplay
 2018-04-27 10:42:02 -04:00
kumavis
b97457e9e2 v4.6.0 2018-04-26 13:43:44 -07:00
Dan Finlay
40f0a40edf
Merge pull request #3998 from MetaMask/i3988-checksummed-address 
Show checksum addresses on UI
 2018-04-18 11:43:38 -07:00
bitpshr
cce123c30e Show checksummed addresses throughout the UI 2018-04-18 09:47:05 -04:00
Dan Finlay
6ee57dcad7
Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-17 13:36:21 -07:00
Dan Finlay
0668976514
Merge branch 'master' into i3981-contract-rates 2018-04-16 16:32:56 -07:00
bitpshr
6e1fcefdf1 Update CHANGELOG with information about rate fetching 2018-04-16 19:24:31 -04:00
Dan Finlay
34692acdf9 Fix action for setting locale 2018-04-13 16:14:23 -07:00
kumavis
f15b81089e
Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-10 02:13:05 -07:00
kumavis
df1f891585
Merge branch 'master' into i3621-LogoPerformance 2018-04-09 13:56:59 -07:00
Dan
2c4426e4de Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-09 16:52:26 -02:30
kumavis
b91bd818c7 4.5.5 2018-04-06 09:58:51 -07:00
kumavis
2953429fed changelog - add changes for v4.5.5 2018-04-06 09:58:09 -07:00
kumavis
000aa55dd3 v4.5.4 2018-04-06 09:02:56 -07:00
kumavis
89415e40d5 changelog - add missing entries 2018-04-06 09:02:48 -07:00
Thomas Huang
e774fbcece
Merge pull request #3865 from MetaMask/openlinkinnewwindow 
Make token helpscout link open in new tab.
 2018-04-05 09:34:47 -07:00
Kevin Serrano
67de7fc0cc
Bump Changelog 2018-04-05 00:46:55 -07:00
Thomas
467629217f Update Changelog 2018-04-04 16:34:54 -07:00
kumavis
db177c79f6 4.5.3 2018-04-04 15:20:25 -07:00
frankiebee
6ab938546c Merge branch 'master' of https://github.com/MetaMask/metamask-extension into normalize-transactions 2018-04-04 14:28:25 -07:00
frankiebee
ef21af29f2 add to CHANGELOG.md 2018-04-04 14:27:28 -07:00
frankiebee
632a0db89b add to CHANGELOG.md 2018-04-04 13:58:35 -07:00
kumavis
222f207b78 4.5.2 2018-04-04 09:10:33 -07:00
kumavis
6be7365dd1 changelog - add note on txParams.chainId validation change 2018-04-04 09:01:19 -07:00
kumavis
31a9fb38c8 4.5.1 2018-04-03 14:28:30 -07:00
kumavis
27832d3e86 changelog - add note on fixed NODE_ENV side effects 2018-04-03 14:06:49 -07:00
Dan Finlay
17b9ab1148 Bump changelog 2018-04-03 13:59:03 -07:00
Dan Finlay
931ce12073 Improve fox logo performance 
By including metamask-logo@2.1.4

Fixes #3621
 2018-04-03 13:53:02 -07:00
kumavis
cbf94dad4b 4.5.0 2018-04-02 17:19:50 -07:00
kumavis
945653eb78 changelog - add note on locales 2018-04-02 17:19:10 -07:00
Dan
0a48aa84ca Add changelog entry for language selection. 2018-03-29 20:52:45 -02:30
Dan Finlay
4cd9c155db Bump changelog 2018-03-29 12:31:10 -07:00
Dan Finlay
729a473210 Fix bug where resetAccount does not clear network cache 
Fixes #3439
 2018-03-27 18:07:51 -07:00
kumavis
3b54541a5f changelog - add note ofr i18n zh_tw th sl 2018-03-26 17:11:00 -07:00
kumavis
e0576d0526 v4.4.0 2018-03-26 17:05:52 -07:00
Dan Finlay
e196b6dcb7 Fix bug where full localStorage would crash on start 2018-03-26 15:25:26 -07:00
Dan
e5af7e1abd New-ui changelog updates (March 26) 2018-03-26 17:37:40 -02:30
kumavis
ea137777ab changelog - add note on i18n being beta only 2018-03-21 14:33:03 -07:00
kumavis
9362239231 v4.3.0 2018-03-21 14:16:00 -07:00
kumavis
a3a24d718d changelog - update with new changes 2018-03-21 14:14:17 -07:00
frankiebee
74e9a5c491 add to CHANGELOG.md 2018-03-15 10:41:25 -07:00
kumavis
dc5fbf5eb2
Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-13 15:43:37 -07:00
kumavis
16deea3927
changelog - update "txParams.to" validation note 2018-03-13 15:29:33 -07:00
kumavis
28a41c203f
Update CHANGELOG.md 2018-03-13 15:24:26 -07:00
Frankie
c83a9ceb04
Merge branch 'master' into i#3509 2018-03-13 15:23:46 -07:00
frankiebee
d7bf6e36b1 add to CHANGELOG.md 2018-03-13 15:17:13 -07:00
kumavis
e48934dc04 Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead 2018-03-13 14:49:26 -07:00
Thomas
5a1b2093f8 Update Changelog 2018-03-13 11:20:15 -07:00
Thomas Huang
508d2c3eb7
Merge branch 'master' into i18n 2018-03-13 11:16:26 -07:00
Thomas
13c3166f38 Update Changelog 2018-03-13 11:15:40 -07:00
Dan
e99644afd5 Changlog updates for PRs 3468, 3470 and 3495. 2018-03-13 15:20:58 -02:30
kumavis
455faece9e Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead 2018-03-08 14:14:49 -08:00
Alexander Tseung
cbb65cc493
Fix flashing to Log in screen after logging in or restoring from seed phrase (#3466) 2018-03-08 16:29:29 +01:00
Dan Finlay
d0ba2d2d94 Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-07 13:39:44 -08:00
kumavis
e91a521b1b Version 4.2.0 2018-03-06 17:30:12 -08:00
kumavis
6a9ca29244
Merge branch 'master' into ImportAccountMessageV2 2018-03-06 17:13:57 -08:00
kumavis
8e0131cbb5
Merge pull request #3455 from MetaMask/i2475-UnifyLogInWording 
Replace Lock wording with Log Out / Log In
 2018-03-06 17:12:32 -08:00
Dan Finlay
423f084cb4 Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-06 14:59:09 -08:00
Dan Finlay
cb4ad60800 Merge branch 'master' into i2475-UnifyLogInWording 2018-03-06 14:57:01 -08:00
Dan Finlay
b87687110d Replace Lock wording with Log Out / Log In 
Fixes #2475
 2018-03-06 14:51:26 -08:00
Dan Finlay
a4bd7992cd
Merge branch 'master' into ImportAccountMessageV2 2018-03-06 10:32:47 -08:00
Dan
376ffb758f Shapeshift form handles market info unavailable errors. 2018-03-06 13:49:41 -03:30
Dan J Miller
9734969e5d
Add missed changelog updates. (#3407) 2018-03-06 10:51:21 -03:30
Thomas Huang
d3a0a27c0c
Merge branch 'master' into ImportAccountMessageV2 2018-03-02 18:26:52 -08:00
Dan Finlay
452c5d0513 Version 4.1.3 2018-03-02 12:47:40 -08:00
Thomas Huang
cb109a8233 Add retry transaction back into old ui transaction list item (#3381) 
* Add retry transaction back into old ui transaction list item

* Update Changelog
 2018-03-02 16:38:13 -03:30
Dan Finlay
81fa0742f7 Fix inpage provider name regression 
Fixes #3372 by not minifying the name of our inpage provider, which some
people were using to identify MetaMask (not our preferred, supported
method of web3.currentProvider.isMetaMask).
 2018-03-02 10:32:53 -08:00