aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Re-enable Contract tx list itemChi Kei Chan2017-09-082-19/+8
| * | | | | | Fix css merge conflictsChi Kei Chan2017-09-082-2/+2
| * | | | | | Modify readonly value in for input in qr-code.Dan2017-09-081-1/+1
| * | | | | | Account-detail address is a readonly input.Dan2017-09-082-2/+7
| * | | | | | Close button in account-details-modal working.Dan2017-09-081-1/+3
| * | | | | | Remove highlight on modalDan2017-09-081-0/+4
| * | | | | | Touch up style of account-details-modal.Dan2017-09-083-12/+27
| * | | | | | Modify status copy for status === 'unapproved'Dan2017-09-081-0/+1
| * | | | | | Link user from transaction list to etherscan if they have a transaction hash.Dan2017-09-083-4/+34
| * | | | | | Use ternary operator instead of two conditionals.Dan2017-09-081-1/+1
| * | | | | | Improve tx-list item hover scss.Dan2017-09-081-3/+3
| * | | | | | Create tx-list-item component.Dan2017-09-083-74/+123
| * | | | | | Show confirm transaction screen when clicking a pending transaction in the list.Dan2017-09-084-7/+20
| * | | | | | Remove default to confirm screen on login.Dan2017-09-081-4/+0
| * | | | | | Fix font sizes on Send TokenChi Kei Chan2017-09-071-3/+3
| * | | | | | Send Token screen partial UIChi Kei Chan2017-09-077-3/+283
| * | | | | | Add Contract Tx List Item; Update Token Tx on selectChi Kei Chan2017-09-078-58/+96
| * | | | | | Show token balance and identiconChi Kei Chan2017-09-077-57/+90
| * | | | | | Adding Token transaction detail screenChi Kei Chan2017-09-0611-81/+256
| * | | | | | Fix token listChi Kei Chan2017-09-062-15/+24
| * | | | | | Implement tokens list UIChi Kei Chan2017-09-069-106/+121
| * | | | | | Use .entries() instead of .keys(), and use more destructuring, for simpler code.Dan2017-09-061-9/+8
| * | | | | | Send tx working; user is taken to confirm page with correct transaction infor...Dan2017-09-062-38/+66
| * | | | | | Remove wallet-view scrollbars.Dan2017-09-051-0/+6
| * | | | | | Touch up transaction list item styles, remove main-content scroll bars, align...Dan2017-09-055-51/+76
| * | | | | | Fix styling of buy and send buttons on main screen.Dan2017-09-051-5/+4
| * | | | | | Capitalizations via text-transform for main screen transactions.Dan2017-09-052-2/+7
| * | | | | | Adjust left margin in main container.Dan2017-09-054-5/+12
| * | | | | | Fix header style; Address commentsChi Kei Chan2017-09-0510-59/+75
| * | | | | | Fix merge conflictChi Kei Chan2017-09-051-6/+0
| * | | | | | Fix menu styleJacky Chan2017-09-057-42/+114
| * | | | | | Use flex to ensure network name does not wrap.Dan2017-09-011-0/+1
| * | | | | | Adjust z-index of header so that it stays in place when scrolling.Dan2017-09-011-1/+1
| * | | | | | Fix margin, padding, height for header.Dan2017-09-013-45/+58
| * | | | | | Fixed network fontDan2017-09-011-0/+2
| * | | | | | Fixes lint errors and adds stylelint-config-standard to package.jsonDan2017-08-316-58/+55
| * | | | | | Lint fixesDan2017-08-3133-263/+210
| * | | | | | Refactor gas-fee-display to include usd and eth fee displays as separate comp...Dan2017-08-313-30/+93
| * | | | | | Move gas fee to a separate component.Dan2017-08-312-26/+59
| * | | | | | Move currency toggle to its own component.Dan2017-08-313-13/+33
| * | | | | | Clean up send.js and eth-balance.js with es6.Dan2017-08-313-76/+87
| * | | | | | Minor clean up.Dan2017-08-303-17/+12
| * | | | | | Replace Avenir Next with alternative.Dan2017-08-302-1/+8
| * | | | | | Center tooltip on small screen size by using flexboxDan2017-08-303-20/+23
| * | | | | | Use hex values only in send.js to handle limit and price; GasTooltip accepts ...Dan2017-08-293-17/+24
| * | | | | | Move getTaxBN and bnMultiplyByFraction to util.jsDan2017-08-292-25/+29
| * | | | | | Using eth balance component to ensure proper rounding.Dan2017-08-293-32/+56
| * | | | | | Bind SendTransactionScreen methods to this in constructor.Dan2017-08-291-9/+20
| * | | | | | Refactor for clean handling of tooltip close.Dan2017-08-293-94/+64
| * | | | | | Styles and behaviour correctDan2017-08-294-18/+58
| * | | | | | Final styling improvements for tooltip; plus a few for send form.Dan2017-08-261-6/+12
| * | | | | | Fully connect gas data in send form and tooltip to state; final styling impro...Dan2017-08-263-18/+30
| * | | | | | Updating current currency from send form.Dan2017-08-262-1/+23
| * | | | | | Tooltip closing on click outside.Dan2017-08-262-11/+62
| * | | | | | Refactor tooltip to remove external lib; tooltip now updating gas fee in parent.Dan2017-08-265-72/+242
| * | | | | | Toggling tooltip.Dan2017-08-263-1/+90
| * | | | | | Add 'customize' text to gas input.Dan2017-08-262-1/+15
| * | | | | | Patch 3 new account modal (#1962)Dan J Miller2017-08-254-16/+105
| * | | | | | Patch 2 account details modal (#1957)Dan J Miller2017-08-255-19/+55
| * | | | | | Modify buy and send buttons color, border-radius and various size properties....Dan J Miller2017-08-233-5/+11
| * | | | | | Hook up showAddToken to dropdown menu item in account options dropdownsdtsui2017-08-232-3/+5
| * | | | | | Render TxListItem component from real data: address, identicon, status, ETH v...sdtsui2017-08-232-9/+18
| * | | | | | Remove fake transactions and balances from tx-list and wallet-view, respectivelysdtsui2017-08-232-70/+10
| * | | | | | Add data field to send token screensdtsui2017-08-231-1/+34
| * | | | | | [WIP] Successfully sign a hardcoded transaction, hook up remaining inputs and...sdtsui2017-08-231-12/+19
| * | | | | | [WIP] Use hardcoded values for dispatching from signTxsdtsui2017-08-231-17/+80
| * | | | | | Remove border and apply background color to gas inputsdtsui2017-08-233-2/+20
| * | | | | | Add layout and props for send screen inputssdtsui2017-08-233-21/+89
| * | | | | | [WIP] - Styling Send Screen - Need to bring in data contract for signTxsdtsui2017-08-232-141/+39
| * | | | | | Tweak z-indiciessdtsui2017-08-223-6/+7
| * | | | | | Adjust zIndex and width for send screensdtsui2017-08-223-10/+17
| * | | | | | [WIP] Tweak Send Screen Stylessdtsui2017-08-224-22/+37
| * | | | | | Hook up send screen action to Send Button in TxViewsdtsui2017-08-222-1/+5
| * | | | | | Hook up identicon and buttons to AccountDetailsModal, clean up colorssdtsui2017-08-228-39/+37
| * | | | | | Integrate old QR component with new modal layoutsdtsui2017-08-224-32/+37
| * | | | | | [WIP] Render a QR code in AccountDetailsModalsdtsui2017-08-222-8/+6
| * | | | | | [WIP] Aggregate data for QRViewsdtsui2017-08-222-3/+18
| * | | | | | Add wrapper CSS for NewAccountModalsdtsui2017-08-212-40/+39
| * | | | | | Add wrapper CSS for AccountDetailsModalsdtsui2017-08-213-32/+45
| * | | | | | Hook up hideModal action to close icon in EditAccountNameModalsdtsui2017-08-211-1/+5
| * | | | | | Hook up selected account label display to main wallet viewsdtsui2017-08-211-4/+3
| * | | | | | Hook up actions to EditAccountNameModalsdtsui2017-08-218-111/+150
| * | | | | | Enhance global modal to accept styles from different componentssdtsui2017-08-211-45/+62
| * | | | | | Implement new dropdown design, integrate account balancessdtsui2017-08-215-27/+83
| * | | | | | Hook up edit account name modalsdtsui2017-08-211-26/+42
| * | | | | | Remove old design - 'Show QR Code' dropdown menu item from account selection ...sdtsui2017-08-211-16/+0
| * | | | | | Hook up template for New Account Modalsdtsui2017-08-213-1/+95
| * | | | | | Enhance global modal to handle Buy, Edit, and Details Modalssdtsui2017-08-217-52/+169
| * | | | | | Extend modal implementation and state management to accomodate multiple modal...sdtsui2017-08-215-11/+40
| * | | | | | Add 'Account Details' dropdown menu item to account options dropdownsdtsui2017-08-211-0/+14
| * | | | | | Add 'Add Token' dropdown menu item to account options dropdownsdtsui2017-08-211-0/+15
| * | | | | | [WiP] Add comments for multiple modalssdtsui2017-08-151-0/+20
| * | | | | | Merge remote-tracking branch 'mm/master' into NewUI-flatsdtsui2017-08-143-47/+241
| |\ \ \ \ \ \
| * | | | | | | Lint and cleanup all scsssdtsui2017-08-1420-246/+331
| * | | | | | | Center account selection dropdown and specify useCssTransition propsdtsui2017-08-142-5/+8
| * | | | | | | Remove unnecessary imports, and account-detail.jssdtsui2017-08-142-283/+0
| * | | | | | | Reconfigure AccoutSelector dropdown to use new fa-caret-down instead of old iconsdtsui2017-08-141-1/+3
| * | | | | | | Extract dropdown component into components/dropdowns, hook up to appsdtsui2017-08-146-16/+73
| * | | | | | | Fix odd relative position conflict so main icon is rounded - See flyswatter/j...sdtsui2017-08-141-22/+19
| * | | | | | | Remove unused code - network dropdown components in appsdtsui2017-08-142-214/+2
| * | | | | | | Remove deprecated feature: main app settings dropdownsdtsui2017-08-141-48/+0
| * | | | | | | [WIP] Extract network dropdown into own componentsdtsui2017-08-145-32/+95
| * | | | | | | [WIP] Extract network dropdown out of main app render functionsdtsui2017-08-144-6/+279
| * | | | | | | Move global modals into own pod, inside components/modalssdtsui2017-08-144-6/+44
| * | | | | | | Implement infinite scrolls (no lazy loading) for wallet viewsdtsui2017-08-123-155/+44
| * | | | | | | [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 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-073-1184/+3
| * | | | | | | | | | Migrate from css to scss + autoprefixersdtsui2017-08-079-1/+2369
| * | | | | | | | | | 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-143-3/+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
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |