aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | Move Txs list item styles into classessdtsui2017-08-112-37/+61
| * | | | | | | | | | | | | | | | | Add new color for txs - dusty-graysdtsui2017-08-111-2/+4
| * | | | | | | | | | | | | | | | | Add Tx List and selectorsDaniel Tsui2017-08-115-137/+244
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Cleanup txList and txView componentssdtsui2017-08-112-48/+87
| | * | | | | | | | | | | | | | | | | Add selectors for txsToRender and conversionRatesdtsui2017-08-111-0/+18
| | * | | | | | | | | | | | | | | | | added logging for account balanceSimon Liang2017-08-101-1/+3
| | * | | | | | | | | | | | | | | | | reverted my changesSimon Liang2017-08-101-17/+17
| | * | | | | | | | | | | | | | | | | connected wallet view dropdown button with real dataSimon Liang2017-08-101-17/+17
| | * | | | | | | | | | | | | | | | | redid tx-view and balance-component mapStateToProps logicSimon Liang2017-08-102-23/+27
| | * | | | | | | | | | | | | | | | | moved the props initialization steps into mapStateToPropsSimon Liang2017-08-101-14/+13
| | * | | | | | | | | | | | | | | | | extracted transaction listSimon Liang2017-08-102-102/+151
| | * | | | | | | | | | | | | | | | | removing styling commentsSimon Liang2017-08-101-4/+0
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | [WIP] Position account potions dropdown correctly and hook up to action creatorssdtsui2017-08-103-42/+73
| * | | | | | | | | | | | | | | | | Add new selectors for addresses, identities, and accountssdtsui2017-08-101-0/+27
| * | | | | | | | | | | | | | | | | Adjust modal styles to match new modal size, from cancel button tweaksdtsui2017-08-101-1/+1
| * | | | | | | | | | | | | | | | | Switch buy modal 'cancel' from text to button for accessibilitysdtsui2017-08-102-3/+19
| * | | | | | | | | | | | | | | | | Vertically center modal in mobile view - @cjeriasdtsui2017-08-101-1/+4
| * | | | | | | | | | | | | | | | | Improve layout of buy buttons by tweaking text stylessdtsui2017-08-101-1/+10
| * | | | | | | | | | | | | | | | | Merge branch 'master' into NewUI-flatkumavis2017-08-0922-446/+767
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix dropdown z-index valuesdtsui2017-08-091-1/+1
| * | | | | | | | | | | | | | | | | | Add z indicies to settings-variablessdtsui2017-08-091-1/+13
| * | | | | | | | | | | | | | | | | | Add backdrop styles and box shadow to new global modal defaultssdtsui2017-08-091-0/+7
| * | | | | | | | | | | | | | | | | | Add minor comments and cleanup for new componentssdtsui2017-08-093-24/+16
| * | | | | | | | | | | | | | | | | | Hook up 'Buy with Fiat', redirect to Coinbasesdtsui2017-08-091-7/+10
| * | | | | | | | | | | | | | | | | | Move buy view into its own component - BuyOptionssdtsui2017-08-092-36/+72
| * | | | | | | | | | | | | | | | | | Add an additional font-size breakpoint for buy modal on the largest screenssdtsui2017-08-092-2/+20
| * | | | | | | | | | | | | | | | | | Add minor positioning tweaks for buy modal, laptop viewsdtsui2017-08-091-3/+8
| * | | | | | | | | | | | | | | | | | Move inline styles out into explicitly named BEM classessdtsui2017-08-093-47/+79
| * | | | | | | | | | | | | | | | | | Implement utility helper for checking viewport size in jssdtsui2017-08-091-0/+5
| * | | | | | | | | | | | | | | | | | Implement modal content for buy flow - mobile viewsdtsui2017-08-094-6/+115
| * | | | | | | | | | | | | | | | | | Add note for responsive modal stylessdtsui2017-08-092-0/+6
| * | | | | | | | | | | | | | | | | | Hook up global modal to Tx view, Buy buttonsdtsui2017-08-091-0/+4
| * | | | | | | | | | | | | | | | | | Implement global modalsdtsui2017-08-092-0/+85
| * | | | | | | | | | | | | | | | | | Add actions and reducers for global modalsdtsui2017-08-092-0/+29
| * | | | | | | | | | | | | | | | | | Add dependencies and JSX support (reactify), for global modal implementationsdtsui2017-08-091-0/+3
| * | | | | | | | | | | | | | | | | | refactored and added unit testSimon Liang2017-08-082-23/+58
| * | | | | | | | | | | | | | | | | | extracted balance component and renders to the format, also wired in the acco...Simon Liang2017-08-083-26/+135
| * | | | | | | | | | | | | | | | | | Opt for calculated values in absolutely positioned caretsdtsui2017-08-072-2/+8
| * | | | | | | | | | | | | | | | | | Improve positioning of caret and add reusable color for wallet viewsdtsui2017-08-073-24/+16
| * | | | | | | | | | | | | | | | | | Position account icon, name, and caretsdtsui2017-08-073-23/+85
| * | | | | | | | | | | | | | | | | | Move tx and wallet view styles to component classessdtsui2017-08-073-10/+17
| * | | | | | | | | | | | | | | | | | Merge branch 'NewUI' into feat/mm-ui-5-mergedsdtsui2017-08-0718-91/+334
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into feat/mm-ui-5sdtsui2017-08-0722-430/+526
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Cleanup before rebase on NewUI - need new version of AccountDropdownssdtsui2017-08-071-11/+2
| * | | | | | | | | | | | | | | | | | | | Allow clicks on account view to enable sidebar, not just burgersdtsui2017-08-071-4/+4
| * | | | | | | | | | | | | | | | | | | | Refactor account name css - mobile viewssdtsui2017-08-074-12/+12
| * | | | | | | | | | | | | | | | | | | | Add sidebar click handler to overlaysdtsui2017-08-071-2/+11
| * | | | | | | | | | | | | | | | | | | | Refactor app-header css, including box shadow and z-indexsdtsui2017-08-074-27/+46
| * | | | | | | | | | | | | | | | | | | | Add fine css tweaks to hero balance - laptopsdtsui2017-08-072-21/+11
| * | | | | | | | | | | | | | | | | | | | Adjust hero balance on mobilesdtsui2017-08-071-26/+31
| * | | | | | | | | | | | | | | | | | | | Adjust size of buttons for 576-780+px rangesdtsui2017-08-071-19/+5
| * | | | | | | | | | | | | | | | | | | | Fix font size of eth display for 576-780px vwsdtsui2017-08-072-3/+20
| * | | | | | | | | | | | | | | | | | | | Normalize sidebar dimensions and adjust hero button responsivenesssdtsui2017-08-074-26/+57
| * | | | | | | | | | | | | | | | | | | | Implement hero balance UI, mobilesdtsui2017-08-073-51/+92
| * | | | | | | | | | | | | | | | | | | | Position account display and burger in mobile tx viewsdtsui2017-08-072-7/+42
| * | | | | | | | | | | | | | | | | | | | Disable debug stylessdtsui2017-08-071-17/+17
| * | | | | | | | | | | | | | | | | | | | Move remaining debug, fonts, reset, and transitions into inverted trianglesdtsui2017-08-0713-392/+343
| * | | | | | | | | | | | | | | | | | | | Move debug and colors to itcsssdtsui2017-08-073-5/+33
| * | | | | | | | | | | | | | | | | | | | Ignore all compiled css, track only scsssdtsui2017-08-071-2/+2
| * | | | | | | | | | | | | | | | | | | | Remove output foldersdtsui2017-08-073-1177/+1
| * | | | | | | | | | | | | | | | | | | | Clean up gulpfilesdtsui2017-08-071-22/+7
| * | | | | | | | | | | | | | | | | | | | Use 4.x pattern for watching scsssdtsui2017-08-071-2/+5
| * | | | | | | | | | | | | | | | | | | | Ignore itcss sourcemapssdtsui2017-08-071-0/+3
| * | | | | | | | | | | | | | | | | | | | Remove unncessary sourcemaps from css output/sdtsui2017-08-0714-1264/+0
| * | | | | | | | | | | | | | | | | | | | Organize app components scsssdtsui2017-08-0719-818/+2115
| * | | | | | | | | | | | | | | | | | | | Organize app componentssdtsui2017-08-073-133/+68
| * | | | | | | | | | | | | | | | | | | | Move generic button components and body styles to components and generic, res...sdtsui2017-08-079-311/+358
| * | | | | | | | | | | | | | | | | | | | Move old colors intro settings/variablessdtsui2017-08-072-8/+18
| * | | | | | | | | | | | | | | | | | | | Add inverted triangle css (itcss) folder structuresdtsui2017-08-0714-0/+14
| * | | | | | | | | | | | | | | | | | | | Cleanup css and gulpfile post-migrationsdtsui2017-08-075-1203/+16
| * | | | | | | | | | | | | | | | | | | | Migrate from css to scss + autoprefixersdtsui2017-08-0712-8/+2402
| * | | | | | | | | | | | | | | | | | | | Add Roboto without hooking it up via importsdtsui2017-08-0518-0/+0
| * | | | | | | | | | | | | | | | | | | | Add rough layout for flat layout tx details, add notes for breakpointssdtsui2017-08-032-23/+56
| * | | | | | | | | | | | | | | | | | | | Implement 'clear buttons' for tx viewsdtsui2017-08-034-47/+57
| * | | | | | | | | | | | | | | | | | | | Fix color for large password inputsdtsui2017-08-031-1/+1
| * | | | | | | | | | | | | | | | | | | | Add notes for @Zanibar, with props.isUnlocked and currentView.name logssdtsui2017-08-031-0/+4
| * | | | | | | | | | | | | | | | | | | | Fix background color for lock screensdtsui2017-08-031-0/+1
| * | | | | | | | | | | | | | | | | | | | Isolate routing logic for isUnlocked, remove stray logssdtsui2017-08-036-21/+49
| * | | | | | | | | | | | | | | | | | | | Finalize sidebar dimensionssdtsui2017-08-033-31/+33
| * | | | | | | | | | | | | | | | | | | | Finalize height for main screens, excluding sidebarsdtsui2017-08-033-6/+5
| * | | | | | | | | | | | | | | | | | | | Finalize width of main container for all viewportssdtsui2017-08-031-12/+19
| * | | | | | | | | | | | | | | | | | | | Make mobile view flush with headersdtsui2017-08-032-20/+30
| * | | | | | | | | | | | | | | | | | | | Add note for styling buttonssdtsui2017-08-031-0/+2
| * | | | | | | | | | | | | | | | | | | | Isolate container component, add refactor notessdtsui2017-08-032-19/+57
| * | | | | | | | | | | | | | | | | | | | Adjust header spacing for 500px and 900px heightssdtsui2017-08-032-14/+5
| * | | | | | | | | | | | | | | | | | | | Adjust sidebar transition using @cjeria\'s feedbacksdtsui2017-08-032-10/+16
| * | | | | | | | | | | | | | | | | | | | Ensure app-header is rendered in responsive layoutsdtsui2017-08-032-2/+3
| * | | | | | | | | | | | | | | | | | | | Cleanup send, move send token into separate func to make room for send ETHsdtsui2017-08-032-35/+220
| * | | | | | | | | | | | | | | | | | | | Add Ethereum Logosdtsui2017-08-031-0/+11
| * | | | | | | | | | | | | | | | | | | | Move overlay out of transition areasdtsui2017-08-031-17/+18
| * | | | | | | | | | | | | | | | | | | | Hook up css animationsdtsui2017-08-033-41/+75
| * | | | | | | | | | | | | | | | | | | | Add notes for overlay click actionsdtsui2017-08-031-0/+1
| * | | | | | | | | | | | | | | | | | | | Implement custom sidebar, with close buttonsdtsui2017-08-033-13/+82
| * | | | | | | | | | | | | | | | | | | | Integrate slideout menu with tx viewsdtsui2017-08-034-16/+46
| * | | | | | | | | | | | | | | | | | | | Hook up responsive sidebarsdtsui2017-08-034-3/+27
| * | | | | | | | | | | | | | | | | | | | Add dependejncy: react-burger-menusdtsui2017-08-031-0/+1
| * | | | | | | | | | | | | | | | | | | | Add burger icon and phone-visible media queriessdtsui2017-08-032-4/+9
| * | | | | | | | | | | | | | | | | | | | Make wallet view visible iff vw above 575pxsdtsui2017-08-034-5/+25
| * | | | | | | | | | | | | | | | | | | | Hook up send button to Send Token screensdtsui2017-08-011-1/+12
| * | | | | | | | | | | | | | | | | | | | Implement mobile-friendly responsive layout with flex wrapsdtsui2017-08-014-4/+16
| * | | | | | | | | | | | | | | | | | | | Reset popup to 350x500, old form factor as advised by @Zanibassdtsui2017-08-011-1/+1
| * | | | | | | | | | | | | | | | | | | | Add rough layout for tx list itemssdtsui2017-08-011-0/+60
| * | | | | | | | | | | | | | | | | | | | Add tx-view content divider componentsdtsui2017-08-011-5/+6
| * | | | | | | | | | | | | | | | | | | | Add hyperscript for tx-view tabssdtsui2017-08-011-9/+27
| * | | | | | | | | | | | | | | | | | | | Add TxView, use width percentages instead of flex-grow for layoutsdtsui2017-08-013-5/+61
| * | | | | | | | | | | | | | | | | | | | Adjust button styles to left align with wallet textsdtsui2017-08-011-7/+4
| * | | | | | | | | | | | | | | | | | | | Use DIN OT in wallet viewsdtsui2017-08-012-6/+13
| * | | | | | | | | | | | | | | | | | | | Add new fonts from @cjeria: DIN Next and DIN OTsdtsui2017-08-0112-0/+0
| * | | | | | | | | | | | | | | | | | | | Adjust popup size to 545x450; refactor wallet view to fitsdtsui2017-08-013-61/+29
| * | | | | | | | | | | | | | | | | | | | Isolate wallet-content-display componentsdtsui2017-07-312-2/+62
| * | | | | | | | | | | | | | | | | | | | Add layout for Buy and Send buttonssdtsui2017-07-311-1/+44
| * | | | | | | | | | | | | | | | | | | | Add hyperscript for wallet display componentsdtsui2017-07-311-4/+48
| * | | | | | | | | | | | | | | | | | | | Center account name and dropdownssdtsui2017-07-312-8/+7
| * | | | | | | | | | | | | | | | | | | | Add note for later on isolating componentssdtsui2017-07-311-1/+1
| * | | | | | | | | | | | | | | | | | | | Add box shadow to main containersdtsui2017-07-311-0/+1
| * | | | | | | | | | | | | | | | | | | | Add containers for wallet view and dropdown UIsdtsui2017-07-312-3/+84
| * | | | | | | | | | | | | | | | | | | | Add layout for main container elementssdtsui2017-07-312-12/+49
| * | | | | | | | | | | | | | | | | | | | Remove old header spacesdtsui2017-07-311-11/+0
| * | | | | | | | | | | | | | | | | | | | Set font-size on body of popup.html, for responsivenesssdtsui2017-07-311-1/+1
| * | | | | | | | | | | | | | | | | | | | Adjust dimensions of popup.html and app bar to matchsdtsui2017-07-313-3/+3
| * | | | | | | | | | | | | | | | | | | | Adjust button styles for Send Token screensdtsui2017-07-312-1/+2
| * | | | | | | | | | | | | | | | | | | | Adjust copy in send token confirmation screensdtsui2017-07-301-2/+2
| * | | | | | | | | | | | | | | | | | | | Move action buttons out of send token container, tweak stylessdtsui2017-07-301-38/+40
| * | | | | | | | | | | | | | | | | | | | Simplify btn-green colorssdtsui2017-07-303-4/+4
| * | | | | | | | | | | | | | | | | | | | Enhance button and input css reset to protect from user agent stylesheetsdtsui2017-07-301-0/+4
| * | | | | | | | | | | | | | | | | | | | Add rounded background to total token, with minor styling tweakssdtsui2017-07-304-29/+180
| * | | | | | | | | | | | | | | | | | | | Add note to self, for future code cleanupsdtsui2017-07-301-1/+7
| * | | | | | | | | | | | | | | | | | | | Add content boxes to pendingTx, prep for reusabilitysdtsui2017-07-301-330/+179
| * | | | | | | | | | | | | | | | | | | | Cleanup unnecessary pending tx-switching logicsdtsui2017-07-301-60/+19
| * | | | | | | | | | | | | | | | | | | | [WIP] Isolate form logic from rest of confirmation UIsdtsui2017-07-301-22/+27
| * | | | | | | | | | | | | | | | | | | | Clean up send screensdtsui2017-07-301-2/+6
| * | | | | | | | | | | | | | | | | | | | Center action buttons, add minor style adjustmentssdtsui2017-07-302-58/+88
| * | | | | | | | | | | | | | | | | | | | Center send token content; hook up 'Next' and 'Cancel' buttonssdtsui2017-07-303-173/+203
| * | | | | | | | | | | | | | | | | | | | Add high-level css layout for Send Tokensdtsui2017-07-301-23/+78
| * | | | | | | | | | | | | | | | | | | | Add responsive container; add send token copysdtsui2017-07-302-93/+53
| * | | | | | | | | | | | | | | | | | | | Add token logo to send screensdtsui2017-07-302-2/+32
| * | | | | | | | | | | | | | | | | | | | Rearrange header components: closer to redesigned UIsdtsui2017-07-301-31/+18
| * | | | | | | | | | | | | | | | | | | | Add for use in main headersdtsui2017-07-302-1/+3
| * | | | | | | | | | | | | | | | | | | | [WIP] Propose more scaleable color managementsdtsui2017-07-301-0/+2
* | | | | | | | | | | | | | | | | | | | | Merge pull request #2996 from MetaMask/Version-3.13.5Thomas Huang2018-01-172-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Version 3.13.5v3.13.5Dan Finlay2018-01-172-1/+3
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #2983 from MetaMask/i2907-NoCodeGasLimitkumavis2018-01-172-6/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into i2907-NoCodeGasLimitDan Finlay2018-01-173-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #2929 from MetaMask/i2779-FirefoxSpecifyAccountDetailHeightkumavis2018-01-173-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeightDan Finlay2018-01-176-18/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeightDan Finlay2018-01-1611-29/+116
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Edit: Fix Firefox scrollbar ChangelogThomas Huang2018-01-161-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | Bump ChangelogThomas2018-01-161-0/+3
| * | | | | | | | | | | | | | | | | | | | | | | Add max height for Firefox addon overflow and hide horizontal scrolltmashuang2018-01-111-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | Add one px to address for Firefox clippingtmashuang2018-01-111-0/+1
| | | * | | | | | | | | | | | | | | | | | | | | Create new flag for simple sends to avoid overloading other flagDan Finlay2018-01-171-2/+2
| | | * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into i2907-NoCodeGasLimitkumavis2018-01-176-18/+56
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2984 from MetaMask/RenameLockToLogoutThomas Huang2018-01-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Rename lock to log outDan Finlay2018-01-161-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2962 from MetaMask/open-popupDan Finlay2018-01-165-17/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into open-popupFrankie2018-01-169-26/+90
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | add to CHANGELOG.mdfrankiebee2018-01-161-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | test - fix to match expected behaviorfrankiebee2018-01-151-14/+28
| * | | | | | | | | | | | | | | | | | | | | | | test - create ethJsQuery stubfrankiebee2018-01-151-1/+14
| * | | | | | | | | | | | | | | | | | | | | | | transactions - emit 'newUnapprovedTx' before estimateGas finishesfrankiebee2018-01-151-2/+6
| * | | | | | | | | | | | | | | | | | | | | | | add a loading spinner to conf-tx viewfrankiebee2018-01-151-0/+6
| | | * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into i2907-NoCodeGasLimitDan Finlay2018-01-164-15/+78
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2953 from MetaMask/i2826-SignBytesFrankie2018-01-162-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into i2826-SignBytesFrankie2018-01-163-11/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2936 from MetaMask/i2925-BetterGasEstimationDan Finlay2018-01-163-11/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Prefer passing a provider over an ethQuery instanceDan Finlay2018-01-132-8/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | Improve gas price estimation by backfilling recent-blocksDan Finlay2018-01-123-9/+78
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into i2826-SignBytesDan Finlay2018-01-164-7/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Bump keyringController versionDan Finlay2018-01-161-3/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | Fix signTypedData bytes signingDan Finlay2018-01-142-1/+3
| | | | | * | | | | | | | | | | | | | | | | | | | | Set gas limit to 21k for recipients with no codeDan Finlay2018-01-162-5/+24
| |_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2862 from wbt/UpdateNoticeDan Finlay2018-01-162-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Cut statement about test network defaultwbt2018-01-051-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | Cut statement about test network defaultwbt2018-01-051-2/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2900 from MetaMask/infura-rest-apikumavis2018-01-162-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into infura-rest-apikumavis2018-01-126-5/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | deps - bump eth-json-infurakumavis2018-01-101-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | provider - infura - use infura REST apikumavis2018-01-092-4/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | bugfix - transactions controller - breakout logic and fix order of operations...kumavis2018-01-091-2/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2909 from MetaMask/UpdateSupportLinksKevin Serrano2018-01-132-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Use httpsDan Finlay2018-01-132-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'UpdateReadmeSupportLink' into UpdateSupportLinksDan Finlay2018-01-136-5/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | Update support link on readmeDan Finlay2018-01-131-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2926 from MetaMask/gulp-npmlsDan Finlay2018-01-122-3/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | build - add 'deps' step that records output of 'npm ls' into buildkumavis2018-01-111-1/+15
| * | | | | | | | | | | | | | | | | | | | | | | | | deps - gulp in dev deps onlykumavis2018-01-111-2/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2917 from x86kernel/ci/add-ko-localekumavis2018-01-121-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | ci(ko/messages.json): add korean localization filex86kernel2018-01-101-0/+10
|/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2906 from MetaMask/Version-3.13.4Thomas Huang2018-01-102-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Version 3.13.4v3.13.4Dan Finlay2018-01-102-1/+3
|/ / / / / / / / / / / / / / / / / / / / / / / /
| | * / / / / / / / / / / / / / / / / / / / / / Update support links for helpscoutDan Finlay2018-01-101-3/+3
| |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2855 from abitrolly/patch-2kumavis2018-01-091-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | info.js Remove width element to fix email layoutAnatoli Babenia2018-01-041-1/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2902 from MetaMask/DefaultToOneGweiDan Finlay2018-01-091-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into DefaultToOneGweiDan Finlay2018-01-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2796 from MetaMask/filter-case-sensitiveDan Finlay2018-01-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | deps - eth-json-rpc-filters@1.2.5kumavis2017-12-231-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2901 from MetaMask/DefaultToOneGweikumavis2018-01-092-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2899 from MetaMask/danfinlay-patch-1kumavis2018-01-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Default to estimating 1 gwei for empty blocks.Dan Finlay2018-01-091-1/+1
|/ / / / / / / / / / / / / / / / / / / / / / / / /
| | | * / / / / / / / / / / / / / / / / / / / / / Default to 1 gwei for empty blocksDan Finlay2018-01-091-2/+3
| | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Add test for gas estimate defaultDan Finlay2018-01-091-0/+19
| * | | | | | | | | | | | | | | | | | | | | | | Default gas estimate to 1 gwei for networks with no block activityDan Finlay2018-01-091-0/+6
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2896 from MetaMask/kumavis-patch-2Dan Finlay2018-01-091-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | bugfix - transactions controller - breakout logic and fix order of operations...kumavis2018-01-091-2/+4
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #2854 from MetaMask/UpdateVinyl-BufferPackagekumavis2018-01-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Update vinyl-buffer to version 1.0.1Thomas Huang2018-01-041-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #2891 from MetaMask/i2621-0xRecipientAddressThomas Huang2018-01-093-0/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into i2621-0xRecipientAddressDan Finlay2018-01-096-2/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Account for 0x/empty string address and contract creationThomas2018-01-083-0/+44
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2851 from MetaMask/i2812-seedworderrorfixKevin Serrano2018-01-094-6/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Update CHANGELOG.mdKevin Serrano2018-01-091-0/+1
| * | | | | | | | | | | | | | | | | | | | | | Test for failure of the async methods.Kevin Serrano2018-01-041-2/+20
| * | | | | | | | | | | | | | | | | | | | | | Add fix for infinite spinner for incorrect seed phrase.Kevin Serrano2018-01-042-4/+13
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2879 from MetaMask/ImproveGasEstimationDan Finlay2018-01-096-2/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fix feature to workDan Finlay2018-01-063-6/+16
| * | | | | | | | | | | | | | | | | | | | | | LintedDan Finlay2018-01-061-3/+0
| * | | | | | | | | | | | | | | | | | | | | | Bump changelogDan Finlay2018-01-061-0/+1
| * | | | | | | | | | | | | | | | | | | | | | Derive gas price estimate from previous transactionsDan Finlay2018-01-064-2/+24
| * | | | | | | | | | | | | | | | | | | | | | Add test for better gas estimationDan Finlay2018-01-061-0/+25
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #2783 from MetaMask/tx-param-vaalidationkumavis2018-01-032-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | tx-gas-utils - tx-param-validation - use more intuitive checkkumavis2018-01-031-2/+2
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into tx-param-vaalidationFrankie2017-12-225-18/+122
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | SpellingDan Finlay2017-12-221-1/+1
| * | | | | | | | | | | | | | | | | | | | | | add to CHANGELOG.mdfrankiebee2017-12-211-0/+2
| * | | | | | | | | | | | | | | | | | | | | | transactions - throw error if dapp provides txParams whos value has a decimalfrankiebee2017-12-211-2/+9
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2840 from oosthuizenr/masterkumavis2018-01-031-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | fix commentoosthuizenr2018-01-031-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | Fixes #2834Renier Oosthuizen2018-01-031-5/+6
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2801 from MetaMask/greenkeeper/vinyl-source-stream-2.0.0kumavis2018-01-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | chore(package): update vinyl-source-stream to version 2.0.0greenkeeper[bot]2017-12-231-1/+1
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #2817 from MetaMask/i#2810Frankie2017-12-292-3/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | tests - be more verbose in test messagesfrankiebee2017-12-291-2/+2
| * | | | | | | | | | | | | | | | | | | | | | add tests for #_checkIfNonceIsTakenfrankiebee2017-12-281-2/+61
| * | | | | | | | | | | | | | | | | | | | | | transactions:pending - only check nonces of transactions who's from adress ma...frankiebee2017-12-281-1/+2
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #2818 from MetaMask/i2782-ethroundingerrorDan Finlay2017-12-296-3/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Bump ChangelogKevin Serrano2017-12-281-0/+1
| * | | | | | | | | | | | | | | | | | | | | Add frontend validation to ensure that ether inputs are valid.Kevin Serrano2017-12-281-2/+12
| * | | | | | | | | | | | | | | | | | | | | Add frontend validation to check if send ether input is a valid number.Kevin Serrano2017-12-281-0/+6
| * | | | | | | | | | | | | | | | | | | | | Add additional test to ui utils to account for exact wei values.Kevin Serrano2017-12-281-0/+6
| * | | | | | | | | | | | | | | | | | | | | Add backend fix for util in normalizeethstringtowei.Kevin Serrano2017-12-281-0/+3
| * | | | | | | | | | | | | | | | | | | | | Fix some silly linting issues.Kevin Serrano2017-12-282-2/+2
| * | | | | | | | | | | | | | | | | | | | | Add test for edge case.Kevin Serrano2017-12-281-0/+6
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #2793 from MetaMask/i2681-DoNotFailPendingKevin Serrano2017-12-223-8/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Remove retryTimePeriod from tx controllerDan Finlay2017-12-221-1/+0
| * | | | | | | | | | | | | | | | | | | | Bump changelogDan Finlay2017-12-221-0/+1
| * | | | | | | | | | | | | | | | | | | | Stop failing pending transactions after any period of timeDan Finlay2017-12-221-7/+0
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge pull request #2763 from MetaMask/AddRecentBlocksControllerThomas Huang2017-12-212-14/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Do not log whole txs in recent block controller.Dan Finlay2017-12-201-1/+8
| * | | | | | | | | | | | | | | | | | | | Add Recent Blocks controllerDan Finlay2017-12-182-14/+62