| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| * | | | | | | | | | | | | | | Fix font size of eth display for 576-780px vw | sdtsui | 2017-08-07 | 2 | -3/+20 |
| * | | | | | | | | | | | | | | Normalize sidebar dimensions and adjust hero button responsiveness | sdtsui | 2017-08-07 | 4 | -26/+57 |
| * | | | | | | | | | | | | | | Implement hero balance UI, mobile | sdtsui | 2017-08-07 | 3 | -51/+92 |
| * | | | | | | | | | | | | | | Position account display and burger in mobile tx view | sdtsui | 2017-08-07 | 2 | -7/+42 |
| * | | | | | | | | | | | | | | Disable debug styles | sdtsui | 2017-08-07 | 1 | -17/+17 |
| * | | | | | | | | | | | | | | Move remaining debug, fonts, reset, and transitions into inverted triangle | sdtsui | 2017-08-07 | 13 | -392/+343 |
| * | | | | | | | | | | | | | | Move debug and colors to itcss | sdtsui | 2017-08-07 | 3 | -5/+33 |
| * | | | | | | | | | | | | | | Ignore all compiled css, track only scss | sdtsui | 2017-08-07 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | Remove output folder | sdtsui | 2017-08-07 | 3 | -1177/+1 |
| * | | | | | | | | | | | | | | Clean up gulpfile | sdtsui | 2017-08-07 | 1 | -22/+7 |
| * | | | | | | | | | | | | | | Use 4.x pattern for watching scss | sdtsui | 2017-08-07 | 1 | -2/+5 |
| * | | | | | | | | | | | | | | Ignore itcss sourcemaps | sdtsui | 2017-08-07 | 1 | -0/+3 |
| * | | | | | | | | | | | | | | Remove unncessary sourcemaps from css output/ | sdtsui | 2017-08-07 | 14 | -1264/+0 |
| * | | | | | | | | | | | | | | Organize app components scss | sdtsui | 2017-08-07 | 19 | -818/+2115 |
| * | | | | | | | | | | | | | | Organize app components | sdtsui | 2017-08-07 | 3 | -133/+68 |
| * | | | | | | | | | | | | | | Move generic button components and body styles to components and generic, res... | sdtsui | 2017-08-07 | 9 | -311/+358 |
| * | | | | | | | | | | | | | | Move old colors intro settings/variables | sdtsui | 2017-08-07 | 2 | -8/+18 |
| * | | | | | | | | | | | | | | Add inverted triangle css (itcss) folder structure | sdtsui | 2017-08-07 | 14 | -0/+14 |
| * | | | | | | | | | | | | | | Cleanup css and gulpfile post-migration | sdtsui | 2017-08-07 | 5 | -1203/+16 |
| * | | | | | | | | | | | | | | Migrate from css to scss + autoprefixer | sdtsui | 2017-08-07 | 12 | -8/+2402 |
| * | | | | | | | | | | | | | | Add Roboto without hooking it up via import | sdtsui | 2017-08-05 | 18 | -0/+0 |
| * | | | | | | | | | | | | | | Add rough layout for flat layout tx details, add notes for breakpoints | sdtsui | 2017-08-03 | 2 | -23/+56 |
| * | | | | | | | | | | | | | | Implement 'clear buttons' for tx view | sdtsui | 2017-08-03 | 4 | -47/+57 |
| * | | | | | | | | | | | | | | Fix color for large password input | sdtsui | 2017-08-03 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | Add notes for @Zanibar, with props.isUnlocked and currentView.name logs | sdtsui | 2017-08-03 | 1 | -0/+4 |
| * | | | | | | | | | | | | | | Fix background color for lock screen | sdtsui | 2017-08-03 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | Isolate routing logic for isUnlocked, remove stray logs | sdtsui | 2017-08-03 | 6 | -21/+49 |
| * | | | | | | | | | | | | | | Finalize sidebar dimensions | sdtsui | 2017-08-03 | 3 | -31/+33 |
| * | | | | | | | | | | | | | | Finalize height for main screens, excluding sidebar | sdtsui | 2017-08-03 | 3 | -6/+5 |
| * | | | | | | | | | | | | | | Finalize width of main container for all viewports | sdtsui | 2017-08-03 | 1 | -12/+19 |
| * | | | | | | | | | | | | | | Make mobile view flush with header | sdtsui | 2017-08-03 | 2 | -20/+30 |
| * | | | | | | | | | | | | | | Add note for styling buttons | sdtsui | 2017-08-03 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | Isolate container component, add refactor notes | sdtsui | 2017-08-03 | 2 | -19/+57 |
| * | | | | | | | | | | | | | | Adjust header spacing for 500px and 900px heights | sdtsui | 2017-08-03 | 2 | -14/+5 |
| * | | | | | | | | | | | | | | Adjust sidebar transition using @cjeria\'s feedback | sdtsui | 2017-08-03 | 2 | -10/+16 |
| * | | | | | | | | | | | | | | Ensure app-header is rendered in responsive layout | sdtsui | 2017-08-03 | 2 | -2/+3 |
| * | | | | | | | | | | | | | | Cleanup send, move send token into separate func to make room for send ETH | sdtsui | 2017-08-03 | 2 | -35/+220 |
| * | | | | | | | | | | | | | | Add Ethereum Logo | sdtsui | 2017-08-03 | 1 | -0/+11 |
| * | | | | | | | | | | | | | | Move overlay out of transition area | sdtsui | 2017-08-03 | 1 | -17/+18 |
| * | | | | | | | | | | | | | | Hook up css animation | sdtsui | 2017-08-03 | 3 | -41/+75 |
| * | | | | | | | | | | | | | | Add notes for overlay click action | sdtsui | 2017-08-03 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | Implement custom sidebar, with close button | sdtsui | 2017-08-03 | 3 | -13/+82 |
| * | | | | | | | | | | | | | | Integrate slideout menu with tx view | sdtsui | 2017-08-03 | 4 | -16/+46 |
| * | | | | | | | | | | | | | | Hook up responsive sidebar | sdtsui | 2017-08-03 | 4 | -3/+27 |
| * | | | | | | | | | | | | | | Add dependejncy: react-burger-menu | sdtsui | 2017-08-03 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | Add burger icon and phone-visible media queries | sdtsui | 2017-08-03 | 2 | -4/+9 |
| * | | | | | | | | | | | | | | Make wallet view visible iff vw above 575px | sdtsui | 2017-08-03 | 4 | -5/+25 |
| * | | | | | | | | | | | | | | Hook up send button to Send Token screen | sdtsui | 2017-08-01 | 1 | -1/+12 |
| * | | | | | | | | | | | | | | Implement mobile-friendly responsive layout with flex wrap | sdtsui | 2017-08-01 | 4 | -4/+16 |
| * | | | | | | | | | | | | | | Reset popup to 350x500, old form factor as advised by @Zanibas | sdtsui | 2017-08-01 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | Add rough layout for tx list items | sdtsui | 2017-08-01 | 1 | -0/+60 |
| * | | | | | | | | | | | | | | Add tx-view content divider component | sdtsui | 2017-08-01 | 1 | -5/+6 |
| * | | | | | | | | | | | | | | Add hyperscript for tx-view tabs | sdtsui | 2017-08-01 | 1 | -9/+27 |
| * | | | | | | | | | | | | | | Add TxView, use width percentages instead of flex-grow for layout | sdtsui | 2017-08-01 | 3 | -5/+61 |
| * | | | | | | | | | | | | | | Adjust button styles to left align with wallet text | sdtsui | 2017-08-01 | 1 | -7/+4 |
| * | | | | | | | | | | | | | | Use DIN OT in wallet view | sdtsui | 2017-08-01 | 2 | -6/+13 |
| * | | | | | | | | | | | | | | Add new fonts from @cjeria: DIN Next and DIN OT | sdtsui | 2017-08-01 | 12 | -0/+0 |
| * | | | | | | | | | | | | | | Adjust popup size to 545x450; refactor wallet view to fit | sdtsui | 2017-08-01 | 3 | -61/+29 |
| * | | | | | | | | | | | | | | Isolate wallet-content-display component | sdtsui | 2017-07-31 | 2 | -2/+62 |
| * | | | | | | | | | | | | | | Add layout for Buy and Send buttons | sdtsui | 2017-07-31 | 1 | -1/+44 |
| * | | | | | | | | | | | | | | Add hyperscript for wallet display component | sdtsui | 2017-07-31 | 1 | -4/+48 |
| * | | | | | | | | | | | | | | Center account name and dropdowns | sdtsui | 2017-07-31 | 2 | -8/+7 |
| * | | | | | | | | | | | | | | Add note for later on isolating components | sdtsui | 2017-07-31 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | Add box shadow to main container | sdtsui | 2017-07-31 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | Add containers for wallet view and dropdown UI | sdtsui | 2017-07-31 | 2 | -3/+84 |
| * | | | | | | | | | | | | | | Add layout for main container elements | sdtsui | 2017-07-31 | 2 | -12/+49 |
| * | | | | | | | | | | | | | | Remove old header space | sdtsui | 2017-07-31 | 1 | -11/+0 |
| * | | | | | | | | | | | | | | Set font-size on body of popup.html, for responsiveness | sdtsui | 2017-07-31 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | Adjust dimensions of popup.html and app bar to match | sdtsui | 2017-07-31 | 3 | -3/+3 |
| * | | | | | | | | | | | | | | Adjust button styles for Send Token screen | sdtsui | 2017-07-31 | 2 | -1/+2 |
| * | | | | | | | | | | | | | | Adjust copy in send token confirmation screen | sdtsui | 2017-07-30 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | Move action buttons out of send token container, tweak styles | sdtsui | 2017-07-30 | 1 | -38/+40 |
| * | | | | | | | | | | | | | | Simplify btn-green colors | sdtsui | 2017-07-30 | 3 | -4/+4 |
| * | | | | | | | | | | | | | | Enhance button and input css reset to protect from user agent stylesheet | sdtsui | 2017-07-30 | 1 | -0/+4 |
| * | | | | | | | | | | | | | | Add rounded background to total token, with minor styling tweaks | sdtsui | 2017-07-30 | 4 | -29/+180 |
| * | | | | | | | | | | | | | | Add note to self, for future code cleanup | sdtsui | 2017-07-30 | 1 | -1/+7 |
| * | | | | | | | | | | | | | | Add content boxes to pendingTx, prep for reusability | sdtsui | 2017-07-30 | 1 | -330/+179 |
| * | | | | | | | | | | | | | | Cleanup unnecessary pending tx-switching logic | sdtsui | 2017-07-30 | 1 | -60/+19 |
| * | | | | | | | | | | | | | | [WIP] Isolate form logic from rest of confirmation UI | sdtsui | 2017-07-30 | 1 | -22/+27 |
| * | | | | | | | | | | | | | | Clean up send screen | sdtsui | 2017-07-30 | 1 | -2/+6 |
| * | | | | | | | | | | | | | | Center action buttons, add minor style adjustments | sdtsui | 2017-07-30 | 2 | -58/+88 |
| * | | | | | | | | | | | | | | Center send token content; hook up 'Next' and 'Cancel' buttons | sdtsui | 2017-07-30 | 3 | -173/+203 |
| * | | | | | | | | | | | | | | Add high-level css layout for Send Token | sdtsui | 2017-07-30 | 1 | -23/+78 |
| * | | | | | | | | | | | | | | Add responsive container; add send token copy | sdtsui | 2017-07-30 | 2 | -93/+53 |
| * | | | | | | | | | | | | | | Add token logo to send screen | sdtsui | 2017-07-30 | 2 | -2/+32 |
| * | | | | | | | | | | | | | | Rearrange header components: closer to redesigned UI | sdtsui | 2017-07-30 | 1 | -31/+18 |
| * | | | | | | | | | | | | | | Add for use in main header | sdtsui | 2017-07-30 | 2 | -1/+3 |
| * | | | | | | | | | | | | | | [WIP] Propose more scaleable color management | sdtsui | 2017-07-30 | 1 | -0/+2 |
| | | | | | | | | | | * | | | | Merge pull request #2368 from MetaMask/greenkeeper/react-simple-file-input-2.0.0 | Kevin Serrano | 2017-10-19 | 1 | -1/+1 |
| | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | |_|_|/
| | | | | | | | | | |/| | | |
|
| | | | | | | | | | | | * | | | fix(package): update react-simple-file-input to version 2.0.0 | greenkeeper[bot] | 2017-10-14 | 1 | -1/+1 |
| | | | | | | | | | | | |/ / |
|
| | | | | | | | | | | * | | | Merge pull request #2396 from MetaMask/revert-2318-network-controller-client | Kevin Serrano | 2017-10-19 | 11 | -105/+96 |
| | | | | | | | | | | |\ \ \ |
|
| | | | | | | | | | | | * | | | Revert "NetworkController refactor for new EthClient interface" | kumavis | 2017-10-19 | 11 | -105/+96 |
| | | | | | | | | | | |/ / / |
|
| | | | | | | | | | | * | | | Merge pull request #2387 from watilde/fixes-2208 | Kevin Serrano | 2017-10-19 | 1 | -0/+1 |
| | | | | | | | | | | |\ \ \
| | | | | | | | | | | |_|/
| | | | | | | | | | |/| | |
|
| | | | | | | | | | | | * | | Increase line-height for account nicknames | Daijiro Wachi | 2017-10-18 | 1 | -0/+1 |
| | | | | | | | | | | |/ / |
|
| | | | | | | | | | | * | | Merge pull request #2370 from MetaMask/MoveOutEtherscanLinkGeneration | Kevin Serrano | 2017-10-17 | 8 | -65/+4 |
| | | | | | | | | | | |\ \ |
|
| | | | | | | | | | | | * | | Move etherscan link logic into module | Dan Finlay | 2017-10-14 | 8 | -65/+4 |
| | | | | | | | | | | | |/ |
|
| | | | | | | | | | | * | | Merge pull request #2379 from MetaMask/FixImportedTypedDataSigning | Kevin Serrano | 2017-10-17 | 2 | -1/+2 |
| | | | | | | | | | | |\ \
| | | | | | | | | | | |/
| | | | | | | | | | |/| |
|
| | | | | | | | | | | | * | Bump changelog | Dan Finlay | 2017-10-16 | 1 | -0/+1 |
| | | | | | | | | | | | * | Bump version on eth-simple-keyring | Dan Finlay | 2017-10-16 | 1 | -1/+1 |
| | | | | | | | | | | |/ |
|
| | | | | | | | | | | * | Merge pull request #2352 from MetaMask/i1340-SynchronousInjection | kumavis | 2017-10-13 | 3 | -5/+13 |
| | | | | | | | | | | |\ |
|
| | | | | | | | | | | | * | contentscript - fix inpage require and bundling | kumavis | 2017-10-13 | 1 | -4/+4 |
| | | | | | | | | | | | * | Break up inpage file read into multiple lines | Dan Finlay | 2017-10-13 | 1 | -1/+3 |
| | | | | | | | | | | | * | Increase build readability | Dan Finlay | 2017-10-13 | 1 | -2/+7 |
| | | | | | | | | | | | * | Merge branch 'master' into i1340-SynchronousInjection | Dan Finlay | 2017-10-13 | 41 | -217/+742 |
| | | | | | | | | | | | |\
| | | | | | | | | | | |/
| | | | | | | | | | |/| |
|
| | | | | | | | | | | * | | Merge pull request #2345 from MetaMask/Version-3.11.0 | Thomas Huang | 2017-10-13 | 2 | -2/+4 |
| | | | | | | | | | | |\ \ |
|
| | | | | | | | | | | | * | | Version 3.11.0v3.11.0 | Dan Finlay | 2017-10-12 | 2 | -2/+4 |
| | | | | | | | | | | * | | | Merge pull request #2318 from MetaMask/network-controller-client | Frankie | 2017-10-12 | 11 | -96/+105 |
| | | | | | | | | | | |\ \ \
| | | | | | | | | | | |/ /
| | | | | | | | | | |/| | |
|
| | | | | | | | | | | | * | | deps - bump eth-rpc-client for fix | kumavis | 2017-10-12 | 1 | -1/+1 |
| | | | | | | | | | | | * | | nonce-tracker - use blockTracker directly | kumavis | 2017-10-12 | 3 | -10/+8 |
| | | | | | | | | | | | * | | ui - network - fix localhost active status | kumavis | 2017-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | * | | network - convert localhost from custom rpc to network type | kumavis | 2017-10-11 | 0 | -0/+0 |
| | | | | | | | | | | | * | | test - integration - intercept reload attempts | kumavis | 2017-10-11 | 1 | -0/+3 |
| | | | | | | | | | | | * | | deps - bump eth-json-rpc-middleware for fix | kumavis | 2017-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | * | | network-controller - use obj-proxy for providerProxy | kumavis | 2017-10-11 | 3 | -25/+11 |
| | | | | | | | | | | | * | | util - add obj-proxy | kumavis | 2017-10-11 | 1 | -0/+19 |
| | | | | | | | | | | | * | | events-proxy - clean up | kumavis | 2017-10-11 | 1 | -5/+5 |
| | | | | | | | | | | | * | | lint fixes | kumavis | 2017-10-11 | 2 | -8/+3 |
| | | | | | | | | | | | * | | network controller - refactor to use eth-rpc-client | kumavis | 2017-10-11 | 3 | -29/+36 |
| | | | | | | | | | | | * | | metamask controller - define this.newTransaction to ease instantiation order | kumavis | 2017-10-11 | 1 | -1/+6 |
| | | | | | | | | | | | * | | metamask controller - simplify provider init | kumavis | 2017-10-11 | 1 | -22/+16 |
| | | | | | | | | | | | * | | metamask controller - breakout getAccounts method | kumavis | 2017-10-11 | 1 | -12/+14 |
| | | | | | | | | | | * | | | Merge pull request #2344 from MetaMask/FixTokenHelpLink | Dan Finlay | 2017-10-12 | 2 | -1/+2 |
| | | | | | | | | | | |\ \ \
| | | | | | | | | | | |/ /
| | | | | | | | | | |/| | |
|
| | | | | | | | | | | | * | | Fix link to token support page | Dan Finlay | 2017-10-12 | 2 | -1/+2 |
| | | | | | | | | | | |/ / |
|
| | | | | | | | | | | * | | Merge pull request #2296 from MetaMask/precision-fix | Dan Finlay | 2017-10-10 | 2 | -4/+45 |
| | | | | | | | | | | |\ \ |
|
| | | | | | | | | | | | * | | Make modification | Kevin Serrano | 2017-10-10 | 1 | -1/+1 |
| | | | | | | | | | | | * | | Fix to actually fail in earlier versions. | Kevin Serrano | 2017-10-10 | 1 | -5/+7 |
| | | | | | | | | | | | * | | Add test to look for wei precision. | Kevin Serrano | 2017-10-10 | 1 | -0/+36 |
| | | | | | | | | | | | * | | Merge branch 'master' into precision-fix | Kevin Serrano | 2017-10-10 | 7 | -8/+97 |
| | | | | | | | | | | | |\ \ |
|
| | | | | | | | | | | | * \ \ | Merge branch 'master' into precision-fix | Kevin Serrano | 2017-10-06 | 2 | -1/+4 |
| | | | | | | | | | | | |\ \ \ |
|
| | | | | | | | | | | | * | | | | Fix precision to account for small wei increase. | Kevin Serrano | 2017-10-06 | 1 | -4/+7 |
| | | | | | | | | | | * | | | | | Merge pull request #2223 from ukstv/master | Dan Finlay | 2017-10-10 | 13 | -12/+397 |
| | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | |_|_|/ /
| | | | | | | | | | |/| | | | |
|
| | | | | | | | | | | | * | | | | More appropriate styling | Sergey Ukustov | 2017-10-08 | 1 | -1/+2 |
| | | | | | | | | | | | * | | | | Validate data format for eth_signTypedData | Sergey Ukustov | 2017-10-07 | 2 | -1/+5 |
| | | | | | | | | | | | * | | | | Merge branch 'master' into SignTypedData | Dan Finlay | 2017-10-07 | 5 | -2/+84 |
| | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | * | | | | | Bump changelog | Dan Finlay | 2017-10-06 | 1 | -0/+2 |
| | | | | | | | | | | | * | | | | | Merge branch 'Version-3.10.9' into SignTypedData | Dan Finlay | 2017-10-06 | 2 | -1/+4 |
| | | | | | | | | | | | |\ \ \ \ \ |
|
| | | | | | | | | | | | * \ \ \ \ \ | Merge branch 'master' into SignTypedData | Dan Finlay | 2017-10-06 | 11 | -90/+83 |
| | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | |_|/ / /
| | | | | | | | | | | | |/| | | | |
|
| | | | | | | | | | | | * | | | | | | Bump provider-engine for better sender validations | Dan Finlay | 2017-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | * | | | | | | Add signTypedData input validations | Dan Finlay | 2017-10-06 | 2 | -4/+20 |
| | | | | | | | | | | | * | | | | | | Require keyring-controller 2.1.0 | Dan Finlay | 2017-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | * | | | | | | Merge branch 'master' into SignTypedData | Dan Finlay | 2017-10-06 | 10 | -47/+52 |
| | | | | | | | | | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | | | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Sergey Ukustov | 2017-10-03 | 18 | -224/+193 |
| | | | | | | | | | | | |\ \ \ \ \ \ \ |
|
| | | | | | | | | | | | * | | | | | | | | Respect code style | Sergey Ukustov | 2017-09-30 | 2 | -3/+2 |
| | | | | | | | | | | | * | | | | | | | | Add eth_signTypedData handler | Sergey Ukustov | 2017-09-30 | 11 | -9/+372 |
| | | | | | | | | | |_|/ / / / / / / /
| | | | | | | | |/| | | | | | | | | |
|
| | | | | | | | | | | * | | | | | | | | Merge pull request #2305 from MetaMask/nodeify | Frankie | 2017-10-07 | 2 | -6/+13 |
| | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | |_|_|_|_|/ / /
| | | | | | | | | | |/| | | | | | | |
|
| | | | | | | | | | | | * | | | | | | | Merge branch 'nodeify' of github.com:MetaMask/metamask-extension into nodeify | kumavis | 2017-10-07 | 1 | -1/+1 |
| | | | | | | | | | | | |\ \ \ \ \ \ \ |
|
| | | | | | | | | | | | | * | | | | | | | lint fix - nodeify | kumavis | 2017-10-07 | 1 | -1/+1 |
| | | | | | | | | | | | * | | | | | | | | nodeify - fix test | kumavis | 2017-10-07 | 1 | -4/+3 |
| | | | | | | | | | | | |/ / / / / / / |
|
| | | | | | | | | | | | * | / / / / / | nodeify - allow callback to be optional | kumavis | 2017-10-07 | 1 | -2/+10 |
| | | | | | | | | | | | | |/ / / / /
| | | | | | | | | | | |/| | | | | |
|
| | | | | | | | | | | * | | | | | | | Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInit | kumavis | 2017-10-07 | 2 | -0/+3 |
| | | | | | | | | | | |\ \ \ \ \ \ \ |
|
| | | | | | | | | | | | * | | | | | | | Check status of pending transactions on startup | Dan Finlay | 2017-10-07 | 2 | -0/+3 |
| | | | | | | | | | | | | |_|_|_|/ /
| | | | | | | | | | | |/| | | | | |
|
| | | | | | | | | | | * | | | | | | | Merge pull request #2306 from MetaMask/i2294-MarkTxAsFailedAfterSameNonceIsMined | kumavis | 2017-10-07 | 4 | -2/+81 |
| | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | |/ / / / / /
| | | | | | | | | | |/| | | | | | |
|
| | | | | | | | | | | | * | | | | | | When checking pending txs, check for successful txs with same nonce. | Dan Finlay | 2017-10-07 | 1 | -0/+20 |
| | | | | | | | | | | | * | | | | | | Provide method for tx tracker to refer to all txs | Dan Finlay | 2017-10-07 | 3 | -3/+11 |
| | | | | | | | | | | | * | | | | | | Add failing test for issue #2294 | Dan Finlay | 2017-10-07 | 1 | -1/+52 |
| | | | | | | | | | | |/ / / / / / |
|
| | | | | | | | | | | * | | | | | | Merge pull request #2293 from MetaMask/Version-3.10.9 | kumavis | 2017-10-06 | 2 | -1/+4 |
| | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | |_|_|/ / /
| | | | | | | | | | |/| | | / /
| | | | | | | | | | | | |_|/ /
| | | | | | | | | | | |/| | | |
|
| | | | | | | | | | | | * | | | | Version 3.10.9v3.10.9 | Dan Finlay | 2017-10-06 | 2 | -1/+4 |
| | | | | | | | | | | |/ / / / |
|
| | | | | | | | | | | * | | | | Merge pull request #2292 from MetaMask/rebrocast-by-timeStamp | Dan Finlay | 2017-10-06 | 3 | -4/+7 |
| | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | * | | | | add to CHANGELOG.md | frankiebee | 2017-10-06 | 1 | -0/+1 |
| | | | | | | | | | | | * | | | | "fix" hours for message | frankiebee | 2017-10-06 | 1 | -1/+2 |
| | | | | | | | | | | | * | | | | Merge branch 'master' into rebrocast-by-timeStamp | frankiebee | 2017-10-06 | 3 | -6/+6 |
| | | | | | | | | | | | |\| | | |
|
| | | | | | | | | | | | * | | | | pending-tx - check time stamp instead of block number for resubmit | frankiebee | 2017-10-06 | 2 | -4/+5 |
| | | | | | | | | | | * | | | | | Merge pull request #2289 from MetaMask/mascara-tuneups | Thomas Huang | 2017-10-06 | 8 | -86/+76 |
| | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | |_|/ / /
| | | | | | | | | | |/| | | | |
|
| | | | | | | | | | | | * | | | | mascara/background: use async await | frankiebee | 2017-10-05 | 1 | -20/+13 |
| | | | | | | | | | | | * | | | | use log.debug | frankiebee | 2017-10-05 | 1 | -3/+3 |
| | | | | | | | | | | | * | | | | mascara: linting and code clean up | frankiebee | 2017-10-05 | 5 | -58/+41 |
| | | | | | | | | | | | * | | | | dont lint jquery | frankiebee | 2017-10-05 | 1 | -1/+1 |
| | | | | | | | | | | | * | | | | add /mascara to linting | frankiebee | 2017-10-05 | 1 | -1/+1 |
| | | | | | | | | | | | * | | | | mascara:exampl/app - add a send tx button | frankiebee | 2017-10-05 | 2 | -8/+22 |
| | | | | | | | | | | * | | | | | Merge pull request #2282 from MetaMask/Enforce0xPrefixForKeyrings | Thomas Huang | 2017-10-05 | 1 | -1/+1 |
| | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | |/ / / /
| | | | | | | | | | |/| | | | |
|
| | | | | | | | | | | | * | | | | Enforce 0x prefix on accounts with new hd keyring | Dan Finlay | 2017-10-05 | 1 | -1/+1 |
| | | | | | | | | | | |/ / / / |
|
| | | | | | | | | | | * | | | | Merge pull request #2276 from MetaMask/revert-compute | Dan Finlay | 2017-10-05 | 2 | -5/+5 |
| | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | |/ / /
| | | | | | | | | | |/| | | |
|
| | | | | | | | | | | | * | | | Revert to normal balances. | Kevin Serrano | 2017-10-05 | 2 | -5/+5 |
| | | | | | | | | | | |/ / /
| | | | | | | | | |/| | | |
|
| | | | | | | | | | | | | * | Begin implementing sync injection idea | Dan Finlay | 2017-10-05 | 2 | -4/+3 |
| | | | | | | | | | | | |/
| | | | | | | | | | |/| |
|
| | | | | | | | | | | * | | Merge pull request #2279 from MetaMask/filter-default-fix | Frankie | 2017-10-05 | 1 | -1/+1 |
| | | | | | | | | | |/| | |
|
| | | | | | | | | | | * | | deps - bump eth-json-rpc-filters for log filter fix | kumavis | 2017-10-05 | 1 | -1/+1 |
| | | | | | | | | | |/ / |
|
| | | | | | | | | | * | | Merge pull request #2209 from MetaMask/greenkeeper/coveralls-3.0.0 | Thomas Huang | 2017-10-04 | 1 | -1/+1 |
| | | | | | | | | | |\ \ |
|
| | | | | | | | | | | * | | chore(package): update coveralls to version 3.0.0 | greenkeeper[bot] | 2017-09-29 | 1 | -1/+1 |
| | | | | | | | | | |/ /
| | | | | | | | |/| | |
|
| | | | | | | | | | * | | Merge pull request #2264 from MetaMask/greenkeeper/mocha-4.0.0 | Thomas Huang | 2017-10-04 | 1 | -1/+1 |
| | | | | | | | | | |\ \ |
|
| | | | | | | | | | | * | | chore(package): update mocha to version 4.0.0 | greenkeeper[bot] | 2017-10-03 | 1 | -1/+1 |
| | | | | | | | | | * | | | Merge pull request #2175 from MetaMask/RemoveSlackLink | Kevin Serrano | 2017-10-04 | 2 | -7/+2 |
| | | | | | | | | | |\ \ \ |
|
| | | | | | | | | | | * \ \ | Merge branch 'master' into RemoveSlackLink | Kevin Serrano | 2017-10-03 | 46 | -1925/+1786 |
| | | | | | | | | | | |\ \ \
| | | | | | | | | | | | |/
| | | | | | | | | | | |/| |
|
| | | | | | | | | | | * | | | Merge branch 'master' into RemoveSlackLink | Kevin Serrano | 2017-09-27 | 18 | -82/+356 |
| | | | | | | | | | | |\ \ \ |
|
| | | | | | | | | | | * | | | | Remove slack link | Dan Finlay | 2017-09-27 | 2 | -7/+2 |
| | | | | | | | | | * | | | | | Merge pull request #2250 from interfect/master | Frankie | 2017-10-04 | 1 | -1/+0 |
| | | | | | | | | | |\ \ \ \ \ |
|
| | | | | | | | | | | * | | | | | Don't pass origin as an HTTP header | Adam Novak | 2017-10-02 | 1 | -1/+0 |
| | | | | | | | | | * | | | | | | Merge pull request #2251 from BrandenSoropia/remove-metamask-title | Kevin Serrano | 2017-10-04 | 1 | -8/+0 |
| | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | |_|_|_|_|/
| | | | | | | | | |/| | | | | |
|
| | | | | | | | | | | * | | | | | Removed MetaMasktitle. Fixed #1730. | Branden Soropia | 2017-10-02 | 1 | -8/+0 |
| | | | | | | | | | | |/ / / / |
|
| | | | | | | | | | * | | | | | Merge pull request #2261 from MetaMask/retry-warn-not-fail | Frankie | 2017-10-03 | 3 | -22/+41 |
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | |_|_|_|/
| | | | | | | | | |/| | | | |
|
| | | | | | | | | | | * | | | | ui - tx history - simplify error+warning display code | kumavis | 2017-10-03 | 1 | -12/+22 |
| | | | | | | | | | | * | | | | pending tx tracker - on tx:warn append error message instead of error obj | kumavis | 2017-10-03 | 1 | -1/+1 |
| | | | | | | | | | | * | | | | pending tx tracker - test - expect warning event on resubmit failure | kumavis | 2017-10-03 | 1 | -2/+9 |
| | | | | | | | | | | * | | | | pending tx tracker - tx:warning event includes err obj | kumavis | 2017-10-03 | 1 | -2/+2 |
| | | | | | | | | | | * | | | | pending tx tracker - test - rename tests to match event name | kumavis | 2017-10-03 | 1 | -4/+4 |
| | | | | | | | | | | * | | | | pending tx tracker - resubmit - warn dont error on unknown error | kumavis | 2017-10-03 | 1 | -2/+5 |
| | | | | | | | | | | * | | | | pending tx tracker - dont throw on load failure | kumavis | 2017-10-03 | 1 | -1/+0 |
| | | | | | | | | | |/ / / / |
|
| | | | | | | | | | * | | | | Merge pull request #2260 from MetaMask/history-notes | kumavis | 2017-10-03 | 4 | -17/+23 |
| | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | * \ \ \ | Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into h... | kumavis | 2017-10-03 | 4 | -6/+5 |
| | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | * \ \ \ | Merge branch 'master' into history-notes | frankiebee | 2017-10-03 | 4 | -3/+27 |
| | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | |_|/ / / /
| | | | | | | | | |/| | | | | |
|
| | | | | | | | | | * | | | | | | Merge pull request #2259 from MetaMask/tx-history-fix | Frankie | 2017-10-03 | 3 | -2/+25 |
| | | | | | | | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | | * | | | | | | tx state history - fix bug where initial snapshot was mutated on updateTx | kumavis | 2017-10-03 | 3 | -2/+25 |
| | | | | | | | | | * | | | | | | | Merge pull request #2254 from MetaMask/block-cache-fix | Kevin Serrano | 2017-10-03 | 1 | -1/+1 |
| | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | |/ / / / / /
| | | | | | | | | |/| | | | | | |
|
| | | | | | | | | | | * | | | | | | deps - bump pe for block cache fix | kumavis | 2017-10-03 | 1 | -1/+1 |
| | | | | | | | | | |/ / / / / / |
|
| | | | | | | | | | * | | | | | | Merge pull request #2138 from sunify/fix-firefox-cors | Thomas Huang | 2017-10-03 | 1 | -1/+2 |
| | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | |_|_|/ / /
| | | | | | | | | |/| | | | | |
|
| | | | | | | | | | | * | | | | | Update manifest.json | Kevin Serrano | 2017-10-03 | 1 | -2/+1 |
| | | | | | | | | | | * | | | | | Wildcard for infura.io permissions, added permission for cryptonator api | Alex Lunyov | 2017-09-22 | 1 | -4/+2 |
| | | | | | | | | | | * | | | | | Fix CORS issues in FireFox | Alex Lunyov | 2017-09-21 | 1 | -1/+5 |
| | | | | | | | | | | | * | | | | tx state history - append note to first op of diff | kumavis | 2017-10-03 | 1 | -2/+5 |
| | | | | | | | | | | | * | | | | tx state history - test - fix format of history entries | kumavis | 2017-10-03 | 1 | -0/+26 |
| | | | | | | | | | | | |/ / / |
|
| | | | | | | | | | | | * / / | transaction - provide notes for history | frankiebee | 2017-10-03 | 2 | -12/+14 |
| | | | | | | | | | | |/ / /
| | | | | | | | | |/| | | |
|
| | | | | | | | | | * | | | | Merge pull request #2241 from MetaMask/Version-3.10.8-FixCurrency | Dan Finlay | 2017-09-30 | 3 | -2/+6 |
| | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | * | | | | Version 3.10.8 - Fix Currency Conversionv3.10.8 | Dan Finlay | 2017-09-30 | 3 | -2/+6 |
| | | | | | | | | | |/ / / / |
|
| | | | | | | | | | * | | | | Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactions | kumavis | 2017-09-30 | 5 | -77/+2 |
| | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | * | | | | pending-tx - dont check the balance to rebrodcast | frankiebee | 2017-09-30 | 5 | -77/+2 |
| | | | | | | | | | * | | | | | Merge pull request #2239 from MetaMask/network-controller-contd | Frankie | 2017-09-30 | 1 | -2/+3 |
| | | | | | | | | | |\ \ \ \ \ |
|
| | | | | | | | | | | * | | | | | network - make network controller internal network switching explicit | kumavis | 2017-09-30 | 1 | -2/+3 |
| | | | | | | | | | * | | | | | | Merge pull request #2237 from MetaMask/network-controller-contd | Frankie | 2017-09-30 | 5 | -62/+56 |
| | | | | | | | | | |\| | | | | |
|
| | | | | | | | | | | * | | | | | network - remove long dead etherscan provider code | kumavis | 2017-09-30 | 1 | -10/+0 |
| | | | | | | | | | | * | | | | | network - convert localhost from custom rpc to network type | kumavis | 2017-09-30 | 5 | -23/+12 |
| | | | | | | | | | | * | | | | | network controller - small refactor | kumavis | 2017-09-30 | 2 | -35/+50 |
| | | | | | | | | | | |/ / / / |
|
| | | | | | | | | | * | | | | | Merge pull request #2234 from MetaMask/Version-3.10.7 | kumavis | 2017-09-30 | 2 | -1/+3 |
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | |/ / / /
| | | | | | | | | |/| | | | |
|
| | | | | | | | | | | * | | | | Version 3.10.7v3.10.7 | Dan Finlay | 2017-09-30 | 2 | -1/+3 |
| | | | | | | | | | |/ / / / |
|
| | | | | | | | | | * | | | | Merge pull request #2230 from MetaMask/ui-dev-fix | Dan Finlay | 2017-09-30 | 2 | -66/+69 |
| | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | * | | | | development - fix ui dev | kumavis | 2017-09-30 | 2 | -66/+69 |
| | | | | | | | | | |/ / / /
| | | | | | | | |/| | | | |
|
| | | | | | | | | | * | | | | Merge pull request #2228 from MetaMask/i2218-SelectAccountBugFix | Kevin Serrano | 2017-09-30 | 2 | -0/+10 |
| | | | | | | | | |/| | | | |
|
| | | | | | | | | | * | | | | Ensure selected account is always set if possible | Dan Finlay | 2017-09-30 | 2 | -0/+10 |
| | | | | | | | | |/ / / / |
|
| | | | | | | | | * | | | | Merge pull request #2124 from MetaMask/breakout-mascara | kumavis | 2017-09-28 | 10 | -144/+27 |
| | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | * | | | | re-enabled x-metamask-origin for mascara | frankiebee | 2017-09-28 | 2 | -5/+1 |
| | | | | | | | | | * | | | | bump metamascara version | frankiebee | 2017-09-23 | 1 | -1/+1 |
| | | | | | | | | | * | | | | platforms: put context for extension in platform extension class | frankiebee | 2017-09-22 | 3 | -2/+4 |
| | | | | | | | | | * | | | | mascara: turn off background | frankiebee | 2017-09-20 | 2 | -3/+2 |
| | | | | | | | | | * | | | | update metamascara | frankiebee | 2017-09-20 | 1 | -1/+1 |
| | | | | | | | | | * | | | | stub platform | frankiebee | 2017-09-20 | 2 | -0/+2 |
| | | | | | | | | | * | | | | Merge branch 'master' into breakout-mascara | frankiebee | 2017-09-20 | 5 | -6/+18 |
| | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | * | | | | | add context to platform to not have X-Metamask-Origin in mascara | frankiebee | 2017-09-20 | 2 | -1/+2 |
| | | | | | | | | | * | | | | | require metamascara | frankiebee | 2017-09-19 | 6 | -140/+23 |
| | | | | | | | | * | | | | | | Merge pull request #2177 from MetaMask/new-currency-test | kumavis | 2017-09-28 | 7 | -225/+678 |
| | | | | | | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | * \ \ \ \ \ | Merge branch 'master' into new-currency-test | kumavis | 2017-09-28 | 33 | -1532/+1362 |
| | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | |/ / / / / /
| | | | | | | | |/| | | | | | |
|
| | | | | | | | | * | | | | | | | Merge pull request #2194 from MetaMask/network-controller-refactor | kumavis | 2017-09-28 | 3 | -36/+37 |
| | | | | | | | | |\ \ \ \ \ \ \ |
|
| | | | | | | | | | * | | | | | | | network controller - move _setProvider to bottom | kumavis | 2017-09-28 | 1 | -18/+18 |
| | | | | | | | | | * | | | | | | | network controller - refactor to use _setProvider | kumavis | 2017-09-28 | 2 | -20/+31 |
| | | | | | | | | | * | | | | | | | network - remove getter/setter | kumavis | 2017-09-28 | 1 | -23/+14 |
| | | | | | | | | | * | | | | | | | metamask - improve comment | kumavis | 2017-09-28 | 1 | -2/+1 |
| | | | | | | | | * | | | | | | | | Merge pull request #2193 from MetaMask/FixAccountSelection | Thomas Huang | 2017-09-28 | 4 | -598/+7 |
| | | | | | | | | |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | | * | | | | | | | | Version 3.10.6 | Dan Finlay | 2017-09-28 | 2 | -1/+3 |
| | | | | | | | | | * | | | | | | | | Commit to the eth-keyring-controller module | Dan Finlay | 2017-09-28 | 2 | -600/+1 |
| | | | | | | | | | * | | | | | | | | Remove dead reference | Dan Finlay | 2017-09-28 | 1 | -1/+0 |
| | | | | | | | | | * | | | | | | | | Bump changelog | Dan Finlay | 2017-09-28 | 1 | -0/+3 |
| | | | | | | | | | * | | | | | | | | Fix Account Selection | Dan Finlay | 2017-09-28 | 2 | -3/+7 |
| | | | | | | | | * | | | | | | | | | Merge pull request #2196 from MetaMask/express-bump | Dan Finlay | 2017-09-28 | 1 | -1/+1 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ |
|
