aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | 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 #2368 from MetaMask/greenkeeper/react-simple-file-input-2.0.0Kevin Serrano2017-10-191-1/+1
| | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | |_|_|/ / / / | | | | | | | | | | |/| | | | | |
| | | | | | | | | | | * | | | | | fix(package): update react-simple-file-input to version 2.0.0greenkeeper[bot]2017-10-141-1/+1
| | | | | | | | | | | |/ / / / /
| | | | | | | | | | * | | | | | Merge pull request #2396 from MetaMask/revert-2318-network-controller-clientKevin Serrano2017-10-1911-105/+96
| | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | * | | | | | Revert "NetworkController refactor for new EthClient interface"kumavis2017-10-1911-105/+96
| | | | | | | | | | |/ / / / / /
| | | | | | | | | | * | | | | | Merge pull request #2387 from watilde/fixes-2208Kevin Serrano2017-10-191-0/+1
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | |_|/ / / / | | | | | | | | | | |/| | | | |
| | | | | | | | | | | * | | | | Increase line-height for account nicknamesDaijiro Wachi2017-10-181-0/+1
| | | | | | | | | | |/ / / / /
| | | | | | | | | | * | | | | Merge pull request #2370 from MetaMask/MoveOutEtherscanLinkGenerationKevin Serrano2017-10-178-65/+4
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | * | | | | Move etherscan link logic into moduleDan Finlay2017-10-148-65/+4
| | | | | | | | | | | |/ / / /
| | | | | | | | | | * | | | | Merge pull request #2379 from MetaMask/FixImportedTypedDataSigningKevin Serrano2017-10-172-1/+2
| | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | |/ / / / | | | | | | | | | | |/| | | |
| | | | | | | | | | | * | | | Bump changelogDan Finlay2017-10-161-0/+1
| | | | | | | | | | | * | | | Bump version on eth-simple-keyringDan Finlay2017-10-161-1/+1
| | | | | | | | | | |/ / / /
| | | | | | | | | | * | | | Merge pull request #2352 from MetaMask/i1340-SynchronousInjectionkumavis2017-10-133-5/+13
| | | | | | | | | | |\ \ \ \
| | | | | | | | | | | * | | | contentscript - fix inpage require and bundlingkumavis2017-10-131-4/+4
| | | | | | | | | | | * | | | Break up inpage file read into multiple linesDan Finlay2017-10-131-1/+3
| | | | | | | | | | | * | | | Increase build readabilityDan Finlay2017-10-131-2/+7
| | | | | | | | | | | * | | | Merge branch 'master' into i1340-SynchronousInjectionDan Finlay2017-10-1341-217/+742
| | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | |/ / / / | | | | | | | | | | |/| | | |
| | | | | | | | | | * | | | | Merge pull request #2345 from MetaMask/Version-3.11.0Thomas Huang2017-10-132-2/+4
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | * | | | | Version 3.11.0v3.11.0Dan Finlay2017-10-122-2/+4
| | | | | | | | | | * | | | | | Merge pull request #2318 from MetaMask/network-controller-clientFrankie2017-10-1211-96/+105
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | |/ / / / / | | | | | | | | | | |/| | | | |
| | | | | | | | | | | * | | | | deps - bump eth-rpc-client for fixkumavis2017-10-121-1/+1
| | | | | | | | | | | * | | | | nonce-tracker - use blockTracker directlykumavis2017-10-123-10/+8
| | | | | | | | | | | * | | | | ui - network - fix localhost active statuskumavis2017-10-111-1/+1
| | | | | | | | | | | * | | | | network - convert localhost from custom rpc to network typekumavis2017-10-110-0/+0
| | | | | | | | | | | * | | | | test - integration - intercept reload attemptskumavis2017-10-111-0/+3
| | | | | | | | | | | * | | | | deps - bump eth-json-rpc-middleware for fixkumavis2017-10-111-1/+1
| | | | | | | | | | | * | | | | network-controller - use obj-proxy for providerProxykumavis2017-10-113-25/+11
| | | | | | | | | | | * | | | | util - add obj-proxykumavis2017-10-111-0/+19
| | | | | | | | | | | * | | | | events-proxy - clean upkumavis2017-10-111-5/+5
| | | | | | | | | | | * | | | | lint fixeskumavis2017-10-112-8/+3
| | | | | | | | | | | * | | | | network controller - refactor to use eth-rpc-clientkumavis2017-10-113-29/+36
| | | | | | | | | | | * | | | | metamask controller - define this.newTransaction to ease instantiation orderkumavis2017-10-111-1/+6
| | | | | | | | | | | * | | | | metamask controller - simplify provider initkumavis2017-10-111-22/+16
| | | | | | | | | | | * | | | | metamask controller - breakout getAccounts methodkumavis2017-10-111-12/+14
| | | | | | | | | | | | |_|/ / | | | | | | | | | | | |/| | |
| | | | | | | | | | * | | | | Merge pull request #2344 from MetaMask/FixTokenHelpLinkDan Finlay2017-10-122-1/+2
| | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | |/ / / / | | | | | | | | | | |/| | | |
| | | | | | | | | | | * | | | Fix link to token support pageDan Finlay2017-10-122-1/+2
| | | | | | | | | | |/ / / /
| | | | | | | | | | * | | | Merge pull request #2296 from MetaMask/precision-fixDan Finlay2017-10-102-4/+45
| | | | | | | | | | |\ \ \ \
| | | | | | | | | | | * | | | Make modificationKevin Serrano2017-10-101-1/+1
| | | | | | | | | | | * | | | Fix to actually fail in earlier versions.Kevin Serrano2017-10-101-5/+7
| | | | | | | | | | | * | | | Add test to look for wei precision.Kevin Serrano2017-10-101-0/+36
| | | | | | | | | | | * | | | Merge branch 'master' into precision-fixKevin Serrano2017-10-107-8/+97
| | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | * \ \ \ \ Merge branch 'master' into precision-fixKevin Serrano2017-10-062-1/+4
| | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | |_|/ / | | | | | | | | | | | | |/| | |
| | | | | | | | | | | * | | | | Fix precision to account for small wei increase.Kevin Serrano2017-10-061-4/+7
| | | | | | | | | | * | | | | | Merge pull request #2223 from ukstv/masterDan Finlay2017-10-1013-12/+397
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | |_|_|/ / / | | | | | | | | | | |/| | | | |
| | | | | | | | | | | * | | | | More appropriate stylingSergey Ukustov2017-10-081-1/+2
| | | | | | | | | | | * | | | | Validate data format for eth_signTypedDataSergey Ukustov2017-10-072-1/+5
| | | | | | | | | | | * | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-075-2/+84
| | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | * | | | | | Bump changelogDan Finlay2017-10-061-0/+2
| | | | | | | | | | | * | | | | | Merge branch 'Version-3.10.9' into SignTypedDataDan Finlay2017-10-062-1/+4
| | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ \ Merge branch 'master' into SignTypedDataDan Finlay2017-10-0611-90/+83
| | | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | |_|/ / / / | | | | | | | | | | | | |/| | | | |
| | | | | | | | | | | * | | | | | | Bump provider-engine for better sender validationsDan Finlay2017-10-061-1/+1
| | | | | | | | | | | * | | | | | | Add signTypedData input validationsDan Finlay2017-10-062-4/+20
| | | | | | | | | | | * | | | | | | Require keyring-controller 2.1.0Dan Finlay2017-10-061-1/+1
| | | | | | | | | | | * | | | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-0610-47/+52
| | | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | |_|_|_|_|/ | | | | | | | | | | | | |/| | | | |
| | | | | | | | | | | * | | | | | | Merge remote-tracking branch 'upstream/master'Sergey Ukustov2017-10-0318-224/+193
| | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | * | | | | | | | Respect code styleSergey Ukustov2017-09-302-3/+2
| | | | | | | | | | | * | | | | | | | Add eth_signTypedData handlerSergey Ukustov2017-09-3011-9/+372
| | | | | | | | | |_|/ / / / / / / / | | | | | | | | |/| | | | | | | | |
| | | | | | | | | | * | | | | | | | Merge pull request #2305 from MetaMask/nodeifyFrankie2017-10-072-6/+13
| | | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | |_|_|_|_|/ / / | | | | | | | | | | |/| | | | | | |
| | | | | | | | | | | * | | | | | | Merge branch 'nodeify' of github.com:MetaMask/metamask-extension into nodeifykumavis2017-10-071-1/+1
| | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | * | | | | | | lint fix - nodeifykumavis2017-10-071-1/+1
| | | | | | | | | | | * | | | | | | | nodeify - fix testkumavis2017-10-071-4/+3
| | | | | | | | | | | |/ / / / / / /
| | | | | | | | | | | * | / / / / / nodeify - allow callback to be optionalkumavis2017-10-071-2/+10
| | | | | | | | | | | | |/ / / / / | | | | | | | | | | | |/| | | | |
| | | | | | | | | | * | | | | | | Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInitkumavis2017-10-072-0/+3
| | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | * | | | | | | Check status of pending transactions on startupDan Finlay2017-10-072-0/+3
| | | | | | | | | | | | |_|_|_|/ / | | | | | | | | | | | |/| | | | |
| | | | | | | | | | * | | | | | | Merge pull request #2306 from MetaMask/i2294-MarkTxAsFailedAfterSameNonceIsMinedkumavis2017-10-074-2/+81
| | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | |/ / / / / / | | | | | | | | | | |/| | | | | |
| | | | | | | | | | | * | | | | | When checking pending txs, check for successful txs with same nonce.Dan Finlay2017-10-071-0/+20
| | | | | | | | | | | * | | | | | Provide method for tx tracker to refer to all txsDan Finlay2017-10-073-3/+11
| | | | | | | | | | | * | | | | | Add failing test for issue #2294Dan Finlay2017-10-071-1/+52
| | | | | | | | | | |/ / / / / /
| | | | | | | | | | * | | | | | Merge pull request #2293 from MetaMask/Version-3.10.9kumavis2017-10-062-1/+4
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | |_|_|/ / / | | | | | | | | | | |/| | | / / | | | | | | | | | | | | |_|/ / | | | | | | | | | | | |/| | |
| | | | | | | | | | | * | | | Version 3.10.9v3.10.9Dan Finlay2017-10-062-1/+4
| | | | | | | | | | |/ / / /
| | | | | | | | | | * | | | Merge pull request #2292 from MetaMask/rebrocast-by-timeStampDan Finlay2017-10-063-4/+7
| | | | | | | | | | |\ \ \ \
| | | | | | | | | | | * | | | add to CHANGELOG.mdfrankiebee2017-10-061-0/+1
| | | | | | | | | | | * | | | "fix" hours for messagefrankiebee2017-10-061-1/+2
| | | | | | | | | | | * | | | Merge branch 'master' into rebrocast-by-timeStampfrankiebee2017-10-063-6/+6
| | | | | | | | | | | |\| | |
| | | | | | | | | | | * | | | pending-tx - check time stamp instead of block number for resubmitfrankiebee2017-10-062-4/+5
| | | | | | | | | | * | | | | Merge pull request #2289 from MetaMask/mascara-tuneupsThomas Huang2017-10-068-86/+76
| | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | |_|/ / / | | | | | | | | | | |/| | | |
| | | | | | | | | | | * | | | mascara/background: use async awaitfrankiebee2017-10-051-20/+13
| | | | | | | | | | | * | | | use log.debugfrankiebee2017-10-051-3/+3
| | | | | | | | | | | * | | | mascara: linting and code clean upfrankiebee2017-10-055-58/+41
| | | | | | | | | | | * | | | dont lint jqueryfrankiebee2017-10-051-1/+1
| | | | | | | | | | | * | | | add /mascara to lintingfrankiebee2017-10-051-1/+1
| | | | | | | | | | | * | | | mascara:exampl/app - add a send tx buttonfrankiebee2017-10-052-8/+22
| | | | | | | | | | * | | | | Merge pull request #2282 from MetaMask/Enforce0xPrefixForKeyringsThomas Huang2017-10-051-1/+1
| | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | |/ / / / | | | | | | | | | | |/| | | |
| | | | | | | | | | | * | | | Enforce 0x prefix on accounts with new hd keyringDan Finlay2017-10-051-1/+1
| | | | | | | | | | |/ / / /
| | | | | | | | | | * | | | Merge pull request #2276 from MetaMask/revert-computeDan Finlay2017-10-052-5/+5
| | | | | | | | | | |\ \ \ \ | | | | | | | | | | | |/ / / | | | | | | | | | | |/| | |
| | | | | | | | | | | * | | Revert to normal balances.Kevin Serrano2017-10-052-5/+5
| | | | | | | | | | |/ / / | | | | | | | | | |/| | |
| | | | | | | | | | | | * Begin implementing sync injection ideaDan Finlay2017-10-052-4/+3
| | | | | | | | | | | |/ | | | | | | | | | | |/|
| | | | | | | | | | * | Merge pull request #2279 from MetaMask/filter-default-fixFrankie2017-10-051-1/+1
| | | | | | | | | |/| |
| | | | | | | | | | * | deps - bump eth-json-rpc-filters for log filter fixkumavis2017-10-051-1/+1
| | | | | | | | | |/ /
| | | | | | | | | * | Merge pull request #2209 from MetaMask/greenkeeper/coveralls-3.0.0Thomas Huang2017-10-041-1/+1
| | | | | | | | | |\ \
| | | | | | | | | | * | chore(package): update coveralls to version 3.0.0greenkeeper[bot]2017-09-291-1/+1
| | | | | | | | | |/ / | | | | | | | | |/| |
| | | | | | | | | * | Merge pull request #2264 from MetaMask/greenkeeper/mocha-4.0.0Thomas Huang2017-10-041-1/+1
| | | | | | | | | |\ \
| | | | | | | | | | * | chore(package): update mocha to version 4.0.0greenkeeper[bot]2017-10-031-1/+1
| | | | | | | | | * | | Merge pull request #2175 from MetaMask/RemoveSlackLinkKevin Serrano2017-10-042-7/+2
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ Merge branch 'master' into RemoveSlackLinkKevin Serrano2017-10-0346-1925/+1786
| | | | | | | | | | |\ \ \ | | | | | | | | | | | | |/ | | | | | | | | | | | |/|
| | | | | | | | | | * | | Merge branch 'master' into RemoveSlackLinkKevin Serrano2017-09-2718-82/+356
| | | | | | | | | | |\ \ \
| | | | | | | | | | * | | | Remove slack linkDan Finlay2017-09-272-7/+2
| | | | | | | | | * | | | | Merge pull request #2250 from interfect/masterFrankie2017-10-041-1/+0
| | | | | | | | | |\ \ \ \ \
| | | | | | | | | | * | | | | Don't pass origin as an HTTP headerAdam Novak2017-10-021-1/+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
| | | | | | | | | | |/ / / /
| | | | | | | | | * | | | | Merge pull request #2261 from MetaMask/retry-warn-not-failFrankie2017-10-033-22/+41
| | | | | | | | | |\ \ \ \ \ | | | | | | | | | | |_|_|_|/ | | | | | | | | | |/| | | |
| | | | | | | | | | * | | | ui - tx history - simplify error+warning display codekumavis2017-10-031-12/+22
generated by cgit (git 2.34.1) at 2024-10-21 04:00:13 +0800