aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | [WIP] Begin fixing responsive layout with many walletssdtsui2017-08-112-2/+57
| * | | | | | | Allow fullscreen scrolling on mobile view, while retaining in-window scroll f...sdtsui2017-08-111-2/+4
| * | | | | | | Implement responsive wallet balancessdtsui2017-08-115-18/+213
| * | | | | | | Cleanup SCSS and improve organization of color varssdtsui2017-08-119-54/+45
| * | | | | | | Add UI tweaks, including separation of overflow logic for mobile (full-height...sdtsui2017-08-113-16/+45
| * | | | | | | Improve text positioning on mobile viewsdtsui2017-08-113-37/+63
| * | | | | | | Extract scss breakpoints into variablessdtsui2017-08-111-0/+4
| * | | | | | | Implement widescreen layout for tx listsdtsui2017-08-114-40/+72
| * | | | | | | Move Txs list item styles into classessdtsui2017-08-112-37/+61
| * | | | | | | Add new color for txs - dusty-graysdtsui2017-08-111-2/+4
| * | | | | | | 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-096-80/+102
| |\ \ \ \ \ \ \
| * | | | | | | | 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
| * | | | | | | | refactored and added unit testSimon Liang2017-08-081-23/+26
| * | | | | | | | 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-0714-60/+302
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into feat/mm-ui-5sdtsui2017-08-071-3/+6
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
| * | | | | | | | | | Remove output foldersdtsui2017-08-073-1177/+1
| * | | | | | | | | | 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-074-1188/+3
| * | | | | | | | | | Migrate from css to scss + autoprefixersdtsui2017-08-0710-6/+2374
| * | | | | | | | | | 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-031-10/+6
| * | | | | | | | | | Ensure app-header is rendered in responsive layoutsdtsui2017-08-031-1/+2
| * | | | | | | | | | Cleanup send, move send token into separate func to make room for send ETHsdtsui2017-08-032-35/+220
| * | | | | | | | | | Move overlay out of transition areasdtsui2017-08-031-17/+18
| * | | | | | | | | | Hook up css animationsdtsui2017-08-032-41/+73
| * | | | | | | | | | 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 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
| * | | | | | | | | | 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
| * | | | | | | | | | Adjust popup size to 545x450; refactor wallet view to fitsdtsui2017-08-012-60/+28
| * | | | | | | | | | 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
| * | | | | | | | | | Adjust dimensions of popup.html and app bar to matchsdtsui2017-07-311-1/+1
| * | | | | | | | | | 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
* | | | | | | | | | | Revert "NetworkController refactor for new EthClient interface"kumavis2017-10-191-1/+1
* | | | | | | | | | | Increase line-height for account nicknamesDaijiro Wachi2017-10-181-0/+1
* | | | | | | | | | | Move etherscan link logic into moduleDan Finlay2017-10-145-35/+3
* | | | | | | | | | | Merge pull request #2318 from MetaMask/network-controller-clientFrankie2017-10-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ui - network - fix localhost active statuskumavis2017-10-111-1/+1
* | | | | | | | | | | | Fix link to token support pageDan Finlay2017-10-121-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2296 from MetaMask/precision-fixDan Finlay2017-10-101-4/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix precision to account for small wei increase.Kevin Serrano2017-10-061-4/+7
* | | | | | | | | | | | More appropriate stylingSergey Ukustov2017-10-081-1/+2
* | | | | | | | | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-065-32/+27
|\| | | | | | | | | | |
| * | | | | | | | | | | Revert to normal balances.Kevin Serrano2017-10-052-5/+5
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #2175 from MetaMask/RemoveSlackLinkKevin Serrano2017-10-041-7/+0
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into RemoveSlackLinkKevin Serrano2017-10-036-237/+669
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into RemoveSlackLinkKevin Serrano2017-09-273-7/+9
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Remove slack linkDan Finlay2017-09-271-7/+0
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #2251 from BrandenSoropia/remove-metamask-titleKevin Serrano2017-10-041-8/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Removed MetaMasktitle. Fixed #1730.Branden Soropia2017-10-021-8/+0
| | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| * / | | | | | | | | | | ui - tx history - simplify error+warning display codekumavis2017-10-031-12/+22
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'Sergey Ukustov2017-10-032-26/+9
|\| | | | | | | | | | |
| * | | | | | | | | | | network - remove long dead etherscan provider codekumavis2017-09-301-10/+0
| * | | | | | | | | | | network - convert localhost from custom rpc to network typekumavis2017-09-302-16/+9
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Respect code styleSergey Ukustov2017-09-302-3/+2
* | | | | | | | | | | Add eth_signTypedData handlerSergey Ukustov2017-09-308-8/+210
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'master' into new-currency-testkumavis2017-09-283-7/+9
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-237-29/+56
| |\| | | | | | | |
| * | | | | | | | | Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-144-12/+49
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add computed balance to account detail viewDan Finlay2017-09-142-3/+3
| * | | | | | | | | | Use computed balance for tx confirmationDan Finlay2017-09-142-4/+6
* | | | | | | | | | | Add AUD, HKD, SGD, IDR, PHP to currency conversion listtmashuang2017-09-281-0/+55
* | | | | | | | | | | Remove old conversion list.Kevin Serrano2017-09-271-207/+0
* | | | | | | | | | | Polish names on currency list.Kevin Serrano2017-09-271-7/+7
* | | | | | | | | | | Account for undefined currencies.Kevin Serrano2017-09-271-1/+2
* | | | | | | | | | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-212-0/+12
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #2075 from MetaMask/mixed-caseDan Finlay2017-09-192-0/+12
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into mixed-caseDan Finlay2017-09-192-26/+41
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | Check if all lower or upper before doing checksum.Kevin Serrano2017-09-131-1/+1
| | * | | | | | | | | | Add specific error message for failed address checksum.Kevin Serrano2017-09-132-0/+12
| | | |_|/ / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | Comply with current currency API and add additional styling.Kevin Serrano2017-09-192-2/+2
* | | | | | | | | | | Fix the property query for new currencies.Kevin Serrano2017-09-191-2/+2
* | | | | | | | | | | Another merge conflict resolved.Roman Rodov2017-09-191-4/+4
* | | | | | | | | | | Resolve merge conflicts for currency sort merge.Roman Rodov2017-09-191-1/+3
* | | | | | | | | | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-194-28/+43
|\| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into fix-tooltipDan Finlay2017-09-191-25/+40
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Haha silly me, only when gas is estimated and not explicit.Kevin Serrano2017-09-141-1/+1
| | * | | | | | | | | Lower warning threshold for high tx fee to account for fluctuating blockGasLi...Kevin Serrano2017-09-141-1/+2
| | * | | | | | | | | Add warning of higher failure risk since app proposed gasLimit.Kevin Serrano2017-09-141-25/+39
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * / | | | | | | | fixed position of tooltips to avoid overflow.Kevin Serrano2017-09-133-3/+3
| |/ / / / / / / /
* | | | | | | | | Modify conversion to new api.Kevin Serrano2017-09-152-58/+597
* | | | | | | | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-1416-44/+166
|\| | | | | | | |
| * | | | | | | | Fix support linkDan Finlay2017-09-131-1/+1
| |/ / / / / / /
| * | | | | | | Convert state logs into a download.Kevin Serrano2017-09-131-3/+4
| * | | | | | | Fix typo.Kevin Serrano2017-09-121-2/+2
| * | | | | | | Add ability to save seed words as file.Kevin Serrano2017-09-121-0/+10
| * | | | | | | Add some styling.Kevin Serrano2017-09-121-0/+3
| * | | | | | | Move function as util function.Kevin Serrano2017-09-122-16/+18
| * | | | | | | Basic private key download file functionality.Kevin Serrano2017-09-121-9/+30
| |/ / / / / /
| * | | | | | Show reject all only when tx count is > 1Kevin Serrano2017-09-122-2/+6
| * | | | | | Merge github.com:MetaMask/metamask-extension into rejectallunapprovedKevin Serrano2017-09-123-10/+34
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #2047 from MetaMask/i1997-networkindicateThomas Huang2017-09-091-3/+8
| | |\ \ \ \ \ \
| | | * | | | | | Add cursor on hover on loading. Change some wording.Kevin Serrano2017-09-081-3/+3
| | | * | | | | | Add caret to indicate network is dropdown.Kevin Serrano2017-09-081-0/+5
| | * | | | | | | Fix typo.Kevin Serrano2017-09-081-1/+1
| | * | | | | | | Fix link to open new tab.Kevin Serrano2017-09-081-0/+1
| | * | | | | | | Add front-end validation for own adddresses as a token contract address. Add ...Kevin Serrano2017-09-081-6/+24
| | * | | | | | | Reword forgot password to restore seed phraseDan Finlay2017-09-081-1/+1
| | |/ / / / / /
| * | | | | | | Convert icon to button.Kevin Serrano2017-09-082-12/+18
| * | | | | | | Fold submit and buy ether into one button slotKevin Serrano2017-09-081-15/+9
| * | | | | | | Merge branch 'master' of github.com:davidp94/metamask-extension into rejectal...Kevin Serrano2017-09-082-0/+23
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | fix goHomedavidp942017-08-151-2/+6
| | * | | | | | remove unused action typedavidp942017-08-151-1/+0
| | * | | | | | cancel all txsDavidNinja2017-08-152-0/+20
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Place object property retrieval inside try-catchKevin Serrano2017-09-081-2/+3
| * | | | | | Change expected type to array.Kevin Serrano2017-09-081-1/+1
| * | | | | | Merge branch 'master' into readd-looseKevin Serrano2017-09-061-2/+13
| |\ \ \ \ \ \
| | * | | | | | Make eth_sign deprecation warning more usefulDan Finlay2017-09-061-2/+13
| * | | | | | | Resolve merge conflict from masterKevin Serrano2017-09-0611-68/+63
| |\| | | | | |
| * | | | | | | Readd loose label onto accounts.Kevin Serrano2017-08-104-4/+26
* | | | | | | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-064-8/+11
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Update etherscan links to httpsDan Finlay2017-09-021-5/+5
| * | | | | | | Update support linkDan Finlay2017-09-021-1/+1
| * | | | | | | Merge branch 'master' into i1986-AddVersionToStateLogsKevin Serrano2017-08-301-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Multiple tokens shows the amount when greater than 1Thomas Huang2017-08-301-1/+1
| * | | | | | | | Add version to state logsDan Finlay2017-08-301-1/+4
| |/ / / / / / /
* / / / / / / / integrate infura currencyKevin Serrano2017-08-302-3/+62
|/ / / / / / /
* | | | | | | Remove eth-tx-viz link from tx history iconsDan Finlay2017-08-241-10/+1
* | | | | | | Fix eth sign formattingDan Finlay2017-08-182-2/+5
* | | | | | | Transition to home view after tx errorDan Finlay2017-08-171-18/+5
* | | | | | | Fallback to ethplorer linkDan Finlay2017-08-171-1/+18
* | | | | | | Remove dead codeDan Finlay2017-08-171-14/+0
* | | | | | | Remove default tokensDan Finlay2017-08-171-11/+1
* | | | | | | ReEnable Token ListDan Finlay2017-08-171-26/+9
* | | | | | | Merge pull request #1916 from MetaMask/fix/account-name-scrollKevin Serrano2017-08-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix overflow issue on QubesOS, flagged by @kumavissdtsui2017-08-151-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Change cursor type to indicate link.Kevin Serrano2017-08-161-0/+1
* | | | | | | fix spellingfrankiebee2017-08-161-4/+3
* | | | | | | Disable token listfrankiebee2017-08-161-9/+26
|/ / / / / /
* | | | | | Cleanup stray logs and lintsdtsui2017-08-112-6/+1
* | | | | | Add overflow support for all account names in account detailssdtsui2017-08-111-2/+11
* | | | | | Fix logic for dropdown components attaching checkmark to correct accountsdtsui2017-08-111-1/+2
* | | | | | Fix text overflow for dropdown components flagged by @frankiebeesdtsui2017-08-111-1/+14
|/ / / / /
* | | | | ui - buy eth - formatting and moved network names to configkumavis2017-08-101-23/+19
* | | | | lint fixkumavis2017-08-091-1/+1
* | | | | ui - buy eth - add dharma beta to kovankumavis2017-08-091-12/+22
* | | | | ui - buy button view - refactorkumavis2017-08-091-46/+104
| |_|_|/ |/| | |
* | | | Merge branch 'master' into greenkeeper/initialkumavis2017-08-093-73/+92
|\ \ \ \
| * \ \ \ Merge pull request #1877 from MetaMask/hotfix/mobile-buy-layoutkumavis2017-08-092-70/+80
| |\ \ \ \
| | * | | | Fix layout issues flagged by @tmashuangsdtsui2017-08-091-69/+79
| | * | | | Make buy ui more central to the screensdtsui2017-08-091-1/+1
| | | |_|/ | | |/| |
| * | | | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-0827-701/+974
| |\| | |
| * | | | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-051-3/+6
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | fixed: showing tx-s as errors vs. warningfrankiebee2017-08-051-3/+12
* | | | | Updated commonjs require path for redux-logger and redux-thunk modulesThomas Huang2017-08-091-2/+2
* | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee...kumavis2017-08-0827-704/+980
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix integration test failures: unnecessary sandwich-expando event stopPropaga...sdtsui2017-08-051-1/+0
| * | | | Lint menu-dropposdtsui2017-08-051-31/+24