Commit Graph

4386 Commits (1e9c0a9db2d58e61361bff7430d3a74006ef131c)
 

Author SHA1 Message Date
Kevin Serrano 1e9c0a9db2
Resolve merge conflicts 7 years ago
Frankie 19afb63819 Merge pull request #2489 from MetaMask/3.12.0 7 years ago
kumavis a7424f0c0d 3.12.0 7 years ago
Kevin Serrano 988dd8fd61 Merge pull request #2100 from ChainsawBaby/patch-1 7 years ago
Kevin Serrano 23daca0e08
Bump Changelog 7 years ago
Kevin Serrano b9bbf8f329
Resolving that ugly merge. 7 years ago
Dan Finlay 2489caddd4 Merge pull request #2476 from MetaMask/100MweiMinGasPrice 7 years ago
Kevin Serrano 4903f3e71a
Add labels to clarify warning. 7 years ago
Kevin Serrano e7a22fc62b
Account for non-submitted mins and max 7 years ago
Kevin Serrano b3b9e16ec0
Add clarifying comment about wei conversion. 7 years ago
Kevin Serrano 7f093f67a7
Cut out intermediary wei steps. 7 years ago
Kevin Serrano dee172fb3a
Remove unneeded toString conversions. 7 years ago
Kevin Serrano e1b9734cbf
Move upsize conversions for input warning at front of fn. 7 years ago
Kevin Serrano cb7d07ebae
Fix mismatched decimal/hex conversion in pending-tx 7 years ago
Dan Finlay c0e0522c30 Remove css build bundle from uat 7 years ago
Dan Finlay 074f10575f Update changelog 7 years ago
Frankie bba2980d0a Merge pull request #2478 from MetaMask/mascaraHeadersFix 7 years ago
tmashuang 81d11ecd59 Fix X-Frame-Options for mascara 7 years ago
Kevin Serrano 1767dceba4 Merge pull request #2422 from watilde/fixes-lint 7 years ago
Kevin Serrano 242456ba6a
Resolve merge conflict. 7 years ago
Kevin Serrano 98d8275743
Fix for gas price to be lowered. 7 years ago
Dan Finlay 35ca7e83bd Reduce minimum gas price to 100 MWEI 7 years ago
Thomas Huang ae56b865e8 Merge pull request #1990 from chikeichan/firsttimeflow 7 years ago
tmashuang 099078d13b Add error messages when importing an account 7 years ago
tmashuang 91b23246cd Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin into firsttimeflow 7 years ago
Frankie 61eea51310 Merge pull request #2429 from MetaMask/i2428-AltEnsTlds 7 years ago
Dan Finlay 6d05238469 Try to fix intermittent test failure in NonceTracker tests 7 years ago
Dan Finlay 926abc12b1 Add support for alternative ENS TLDs 7 years ago
Dan Finlay e564ed8d4c Version 3.11.2 7 years ago
Thomas Huang 1c273b50d3 Merge pull request #2423 from MetaMask/json-rpc-fix 7 years ago
Kevin Serrano 721019bc2b
Temporarily reversal of json-rpc-engine 7 years ago
Daijiro Wachi 43b1cb9100 Fix lint warnings 7 years ago
Daijiro Wachi c1eb8f16dc Add lint:fix command to gulp and npm-scripts 7 years ago
Chi Kei Chan f503120b82 Add Import With Seed Phrase 7 years ago
Chi Kei Chan 2b26496826 Add mobile responsiveness 7 years ago
Chi Kei Chan 213cf6aa09 Remove import option 7 years ago
Chi Kei Chan 63a5eca967 Fix import 7 years ago
Chi Kei Chan 25f4f69706 Fix capitialization 7 years ago
Chi Kei Chan 5484e68896 Add Integration Tests 7 years ago
Chi Kei Chan d9735ed5b3 Fixing integraiton test 7 years ago
Chi Kei Chan 996523c790 Fix unit test 7 years ago
Chi Kei Chan ac50db52a9 Fix linter 7 years ago
Chi Kei Chan 5cbbb476b3 ShapeShift Integration 7 years ago
Chi Kei Chan 5aaa2d679b Add ShapeShift UI 7 years ago
Chi Kei Chan c6a3d00d80 Fix merge conflict; separate onboarding buy screen 7 years ago
Chi Kei Chan e88baff2ee Add missing presets 7 years ago
Jacky Chan ad647050d6 Move "Skip this step" to side panel 7 years ago
Jacky Chan a4ad88c331 Disable CTA unless notice is scrolled to bottom 7 years ago
Jacky Chan 945cc5d18d Fix Buy Ether flow 7 years ago
Jacky Chan 638bbe0428 Shuffle tokens 7 years ago