m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-30 08:09:15 +01:00
Code
5,723 Commits 2 Branches 0 Tags 265 MiB
0a725285b4
Commit Graph

5723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan
2b9af0734b Replace 'Contract Published' with 'Contract Deployment' for clearer indication of contract tx state. 2018-02-27 20:09:02 -03:30
Dan
5de0471fcb Fix cancel button on buy eth screen. 2018-02-27 19:14:23 -03:30
Thomas
b4aac16c58 Add changes to CHANGELOG 2018-02-27 12:08:05 -08:00
Thomas
7aa324bdf6 Remove committed out merge code 2018-02-27 12:06:24 -08:00
Thomas
ac2e92fa54 Change Loose label to Imported 2018-02-27 12:02:48 -08:00
Thomas
50f20358c1 Add import account disclaimer 2018-02-27 12:01:09 -08:00
Frankie
33373b676f
Merge pull request #3333 from MetaMask/mascara-deploy 
mascara deploy - improve deploy instructions
 2018-02-27 11:42:22 -08:00
Frankie
2b8cfcb73c
Merge pull request #2363 from MetaMask/greenkeeper/metamascara-2.0.0 
Update metamascara to the latest version 🚀
 2018-02-27 11:31:17 -08:00
kumavis
3fefccd372
Merge branch 'master' into mascara-deploy 2018-02-27 19:25:29 +00:00
Frankie
ced62ac551
Merge pull request #3323 from MetaMask/version-4.0.0 
Version 4.1.0
 2018-02-27 10:48:36 -08:00
kumavis
dae5d085d1
changelog - improve changelog notes 2018-02-27 10:37:43 -08:00
Thomas
d9486a3ce5 Bump Version 2018-02-27 10:35:43 -08:00
Dan Finlay
c2cb8a8abe
Merge pull request #3275 from MetaMask/license 
Standardize license
 2018-02-27 10:16:12 -08:00
Dan Finlay
fe21f8a952
Merge pull request #3281 from MetaMask/sentry-failed-tx-debatch 
sentry - report failed tx with more specific message
 2018-02-27 10:15:18 -08:00
Dan
baab9917ff Padding of alpha warning aligns with app-bar 2018-02-27 14:14:55 -03:30
Dan
0739d3507b Adds beta label to Metamask name in full screen app bar. 2018-02-27 14:13:05 -03:30
Dan
def369ba07 Move beta warning to app header. 2018-02-27 14:13:05 -03:30
Dan
07edf3f9ff NewUI first time flow warning message change. 2018-02-27 14:13:04 -03:30
Dan
746c3e5f18 Body width container in first time flow is consistent with app bar. 2018-02-27 14:12:45 -03:30
Thomas
3eba74a0f5 Update LICENSE to current year. 2018-02-26 16:23:24 -08:00
Kevin Serrano
c789bf1842
Merge pull request #3324 from MetaMask/fix-feature-flags 
fix feature flags being undefined
 2018-02-26 14:16:33 -08:00
frankiebee
b24d949ca4 fix feature flags being undefined 2018-02-26 10:55:30 -08:00
Csaba Solya
1b367bc215 fix test 2018-02-23 11:11:14 +01:00
Csaba Solya
8292dabed5 add negative decrypt test 2018-02-23 11:03:53 +01:00
Csaba Solya
cd05d77c3f fix tests 2018-02-23 10:49:56 +01:00
Csaba Solya
73d9bfc52c make keyFromPassword private 2018-02-23 10:09:16 +01:00
Csaba Solya
c1aa59f6ed adding tests 2018-02-23 10:08:23 +01:00
Thomas
b45295499e Version 4.0.0 2018-02-22 14:57:24 -08:00
Csaba S
2f34630486
Merge branch 'master' into edge-support 2018-02-22 14:55:46 +01:00
Csaba Solya
5ec311ba3e add edge support 2018-02-22 14:39:32 +01:00
Dan Finlay
eed75735b8
Merge pull request #3050 from MetaMask/uat 
[EPIC] Merge UAT into master
 2018-02-21 15:46:31 -08:00
Thomas Huang
e27a3823ba
Merge pull request #3306 from danjm/MM-805-send-from-tab-popup-fix 
[NewUI] Prevents new tx from active tab from opening popup
 2018-02-21 12:50:45 -08:00
Dan Finlay
8da20e15bd
Merge pull request #3288 from MetaMask/uat-master 
Uat master
 2018-02-21 11:26:00 -08:00
Dan Finlay
716acc088e Merge branch 'master' into uat-master 2018-02-21 10:56:23 -08:00
Dan
a4ed6af2ad Prevents new transaction from generating popup when metamask is open in an active tab. 2018-02-21 15:04:04 -03:30
Thomas Huang
b8ee83e973
Merge pull request #3296 from danjm/MM-806-new-ui-first-time-import-seed-in-popup 
[NewUI] Fix Import Existing DEN in popup New UI first time flow.
 2018-02-21 10:22:19 -08:00
Thomas Huang
c26c57fad7 Remove output file 2018-02-20 20:09:32 -08:00
Thomas Huang
84c023ba40 Use same logic for downloading state logs in the old/uat 2018-02-20 19:52:32 -08:00
Thomas Huang
3fb9e04f5f Merge branch 'MM-806-new-ui-first-time-import-seed-in-popup' of https://github.com/danjm/metamask-extension into MM-806-new-ui-first-time-import-seed-in-popup 2018-02-20 17:49:31 -08:00
Dan
b1b9772731 Fix old-ui active notices width. 2018-02-20 21:44:17 -03:30
Dan
66f55f954e Render loading inside notice screen, and don't set isLoading from unMarkPasswordForgotten. 2018-02-20 20:52:41 -03:30
Dan Finlay
98d3fba3ef Fix promise construction 2018-02-20 15:45:48 -08:00
Dan Finlay
16f9ddc72c Add 8MM gas limit default to send screen 2018-02-20 15:44:04 -08:00
Dan Finlay
a1b72e5252 Try fixing notice screen synchronous state call 2018-02-20 13:51:06 -08:00
Thomas Huang
f2f4795697 Merge branch 'MM-806-new-ui-first-time-import-seed-in-popup' of https://github.com/danjm/metamask-extension into MM-806-new-ui-first-time-import-seed-in-popup 2018-02-20 12:00:06 -08:00
Dan
6740be109b Temporarily disable loading indicator. 2018-02-20 16:28:41 -03:30
Dan
cca931c783 Temporarily disable loading indicator. 2018-02-20 16:17:30 -03:30
Dan
00c5dd2736 Fix variable spelling error. 2018-02-20 14:00:35 -03:30
Dan
c26e0d555b Fix Import Existing DEN in popup New UI first time flow. 2018-02-19 22:46:18 -03:30
kumavis
13b12efa03
Merge pull request #3286 from danjm/uat-version-bump 
[NewUI] uat version bump
 2018-02-16 23:36:45 +00:00