| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| | * | | | | | | | | | | | | | | | | | | Refactor app-header css, including box shadow and z-index | sdtsui | 2017-08-07 | 4 | -27/+46 |
| | * | | | | | | | | | | | | | | | | | | Add fine css tweaks to hero balance - laptop | sdtsui | 2017-08-07 | 2 | -21/+11 |
| | * | | | | | | | | | | | | | | | | | | Adjust hero balance on mobile | sdtsui | 2017-08-07 | 1 | -26/+31 |
| | * | | | | | | | | | | | | | | | | | | Adjust size of buttons for 576-780+px range | sdtsui | 2017-08-07 | 1 | -19/+5 |
| | * | | | | | | | | | | | | | | | | | | 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 #2793 from MetaMask/i2681-DoNotFailPending | Kevin Serrano | 2017-12-22 | 3 | -8/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Remove retryTimePeriod from tx controller | Dan Finlay | 2017-12-22 | 1 | -1/+0 |
| | * | | | | | | | | | | | | | | | | | | Bump changelog | Dan Finlay | 2017-12-22 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | | | | Stop failing pending transactions after any period of time | Dan Finlay | 2017-12-22 | 1 | -7/+0 |
| |/ / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | Merge pull request #2763 from MetaMask/AddRecentBlocksController | Thomas Huang | 2017-12-21 | 2 | -14/+69 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | Do not log whole txs in recent block controller. | Dan Finlay | 2017-12-20 | 1 | -1/+8 |
| | * | | | | | | | | | | | | | | | | | | Add Recent Blocks controller | Dan Finlay | 2017-12-18 | 2 | -14/+62 |
| * | | | | | | | | | | | | | | | | | | | Merge pull request #2771 from MetaMask/i2173-UpdateTokenValues | Thomas Huang | 2017-12-20 | 3 | -4/+54 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | Bump changelog | Dan Finlay | 2017-12-19 | 1 | -0/+2 |
| | * | | | | | | | | | | | | | | | | | | | Allow updating token details | Dan Finlay | 2017-12-19 | 1 | -4/+4 |
| | * | | | | | | | | | | | | | | | | | | | Add failing test for updating token details | Dan Finlay | 2017-12-19 | 1 | -0/+48 |
| |/ / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | Merge pull request #2751 from MetaMask/i#2720 | Thomas Huang | 2017-12-19 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' into i#2720 | frankiebee | 2017-12-16 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | transactions:gas-utils - handle new type of estimateGas error | frankiebee | 2017-12-15 | 1 | -1/+5 |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #2757 from MetaMask/kumavis-patch-2 | Thomas Huang | 2017-12-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | readme - fix "plugin" to "extension" | kumavis | 2017-12-16 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | Merge pull request #2755 from MetaMask/tests | Frankie | 2017-12-16 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Change console.log for opts in _configureInfuraProvider | Thomas Huang | 2017-12-16 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | Add exit flag to mocha to exit after tests run | Thomas Huang | 2017-12-16 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | Merge pull request #2747 from MetaMask/Version-3.13.3 | Thomas Huang | 2017-12-15 | 2 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | Version 3.13.3v3.13.3 | Dan Finlay | 2017-12-15 | 2 | -1/+4 |
| * | | | | | | | | | | | | | | | | | | | Merge pull request #2706 from danjm/MM-fix-buy-cancel-button | Thomas Huang | 2017-12-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | Fixes the cancel button in the buy screen to take the user home. | Dan | 2017-12-09 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #2662 from williamchong007/master | Thomas Huang | 2017-12-15 | 1 | -2/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | fix #1398, prevent injecting xml without xml suffix | William Chong | 2017-12-05 | 1 | -2/+10 |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #2733 from MetaMask/i2380-ShowNoBalance | Thomas Huang | 2017-12-15 | 2 | -4/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | | Bump changelog | Dan Finlay | 2017-12-13 | 1 | -0/+2 |
| | * | | | | | | | | | | | | | | | | | | | | Show watched tokens with no balance | Dan Finlay | 2017-12-13 | 1 | -4/+1 |
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #2744 from MetaMask/infura-block-tracker | Frankie | 2017-12-14 | 2 | -8/+52 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | | | Revert "Revert "network - for infura networks use the infura block tracker pr... | kumavis | 2017-12-14 | 2 | -8/+51 |
| | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into infura-bloc... | kumavis | 2017-12-14 | 3 | -53/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2743 from MetaMask/revert-2741-infura-block-tracker | Thomas Huang | 2017-12-14 | 2 | -52/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | | | | Revert "network - for infura networks use the infura block tracker provider" | Frankie | 2017-12-14 | 2 | -52/+8 |
| |/ / / / / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #2741 from MetaMask/infura-block-tracker | Frankie | 2017-12-14 | 2 | -8/+52 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #2740 from MetaMask/i#2729infura-chill-out | kumavis | 2017-12-14 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|/ / / / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | dont aggresively query account data | frankiebee | 2017-12-14 | 1 | -2/+0 |
| |/ / / / / / / / / / / / / / / / / / / / / / |
|
| | | * / / / / / / / / / / / / / / / / / / / | deps - bump eth-json-rpc-infura | kumavis | 2017-12-14 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / / / / / / / / / |
|
| | * / / / / / / / / / / / / / / / / / / / | network - for infura networks use the infura block tracker provider | kumavis | 2017-12-14 | 2 | -8/+52 |
| |/ / / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #2718 from MetaMask/ReducePollingInterval | kumavis | 2017-12-10 | 4 | -3/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Version 3.13.2v3.13.2 | Dan Finlay | 2017-12-10 | 3 | -2/+4 |
| | * | | | | | | | | | | | | | | | | | | | Bump changelog | Dan Finlay | 2017-12-10 | 1 | -0/+2 |
| | * | | | | | | | | | | | | | | | | | | | Pass polling interval to zero client provider | Dan Finlay | 2017-12-10 | 1 | -1/+5 |
| |/ / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | Merge pull request #2699 from MetaMask/patch-2v3.13.1 | kumavis | 2017-12-08 | 4 | -9/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | tx-controller - failed state is a finished state | kumavis | 2017-12-08 | 2 | -7/+9 |
| | * | | | | | | | | | | | | | | | | | | | Version 3.13.1 | Dan Finlay | 2017-12-08 | 2 | -1/+3 |
| | * | | | | | | | | | | | | | | | | | | | Bump changelog | Dan Finlay | 2017-12-08 | 1 | -0/+2 |
| | * | | | | | | | | | | | | | | | | | | | Do not allow nonces larger than the next valid nonce | Dan Finlay | 2017-12-08 | 1 | -0/+4 |
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into patch-2 | Dan Finlay | 2017-12-08 | 10 | -37/+885 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | | A more expressive way | vicnaum | 2017-12-07 | 1 | -5/+2 |
| | * | | | | | | | | | | | | | | | | | | | | Fix for #2644 - Specified Nonce isn't used | vicnaum | 2017-12-07 | 1 | -1/+6 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #2654 from abitrolly/patch-2 | Kevin Serrano | 2017-12-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Download State Logs with .json extension | Anatoli Babenia | 2017-12-05 | 1 | -1/+1 |
| | | |/ / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge pull request #2688 from MetaMask/AddPriceBumpv3.13.0 | Kevin Serrano | 2017-12-07 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | Add 10% price bump to retry attempts. | Dan Finlay | 2017-12-07 | 1 | -1/+3 |
| |/ / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | Merge pull request #2684 from MetaMask/RetryTransaction | Dan Finlay | 2017-12-07 | 10 | -37/+883 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into R... | Dan Finlay | 2017-12-07 | 2 | -1/+11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | | Show retry button on submitted transactions greater than 30 seconds, add hove... | Alexander Tseung | 2017-12-07 | 2 | -1/+11 |
| | * | | | | | | | | | | | | | | | | | | | Version 3.13.0 | Dan Finlay | 2017-12-07 | 2 | -1/+3 |
| | |/ / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | Bump changelog | Dan Finlay | 2017-12-07 | 1 | -0/+2 |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into R... | Dan Finlay | 2017-12-07 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | | Fix styling of Retry buton | Alexander Tseung | 2017-12-07 | 1 | -4/+4 |
| | * | | | | | | | | | | | | | | | | | | | Enforce retry tx at minimum gas of previous tx | Dan Finlay | 2017-12-07 | 2 | -2/+13 |
| | |/ / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | Fix retry action | Dan Finlay | 2017-12-07 | 2 | -3/+11 |
| | * | | | | | | | | | | | | | | | | | | View tx after editing state to unconfirmed | Dan Finlay | 2017-12-07 | 1 | -1/+9 |
| | * | | | | | | | | | | | | | | | | | | Fix action | Dan Finlay | 2017-12-07 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | | Add development state | Dan Finlay | 2017-12-07 | 1 | -0/+739 |
| | * | | | | | | | | | | | | | | | | | | Connect to redux for retryTransaction | Alexander Tseung | 2017-12-07 | 1 | -2/+10 |
| | * | | | | | | | | | | | | | | | | | | Add button to retry transaction | Alexander Tseung | 2017-12-07 | 1 | -34/+69 |
| | * | | | | | | | | | | | | | | | | | | Add retry background method and action | Dan Finlay | 2017-12-07 | 5 | -1/+24 |
| |/ / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | Merge pull request #2670 from danjm/MM-2669-tx-retry-exponential-backoff | Frankie | 2017-12-07 | 3 | -23/+88 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Add tests for exponential backoff code in _resubmitTx | Dan | 2017-12-07 | 1 | -17/+63 |
| | * | | | | | | | | | | | | | | | | | Update resubmitPendingTxs tests. | Dan | 2017-12-07 | 1 | -3/+4 |
| | * | | | | | | | | | | | | | | | | | firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta in... | Dan | 2017-12-07 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | Correct note for updateTx after block-update event in transaction.js | Dan | 2017-12-07 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | Fix undefined latestBlockNumber in _resubmitTx | Dan | 2017-12-07 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | Exponentional backoff on transaction retry in pending-tx-tracker | Dan | 2017-12-06 | 2 | -2/+20 |
| |/ / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | Merge pull request #2630 from MetaMask/i2624-VersionedNoticesv3.12.1 | Thomas Huang | 2017-11-30 | 12 | -54/+127 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | Bump changelog | Dan Finlay | 2017-11-30 | 1 | -0/+2 |
| | * | | | | | | | | | | | | | | | | | Remove debugger | Dan Finlay | 2017-11-30 | 1 | -1/+0 |
| | * | | | | | | | | | | | | | | | | | Add markdown class to mascara ui markdown field | Dan Finlay | 2017-11-30 | 2 | -4/+5 |
| | * | | | | | | | | | | | | | | | | | Bump version to 3.12.1 | Dan Finlay | 2017-11-30 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | Fix test reference | Dan Finlay | 2017-11-30 | 1 | -3/+3 |
| | * | | | | | | | | | | | | | | | | | Make notice skipping async | Dan Finlay | 2017-11-30 | 1 | -3/+3 |
| | * | | | | | | | | | | | | | | | | | Redundantly skip notices | Dan Finlay | 2017-11-30 | 1 | -25/+22 |
| | * | | | | | | | | | | | | | | | | | Make test more resilient | Dan Finlay | 2017-11-30 | 1 | -3/+3 |
| | * | | | | | | | | | | | | | | | | | Remove duplicate button declaration | Dan Finlay | 2017-11-30 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | Fix test selector | Dan Finlay | 2017-11-30 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | | | Fix migration comment | Dan Finlay | 2017-11-30 | 1 | -2/+3 |
| | * | | | | | | | | | | | | | | | | | Accept all notices in integration tests | Dan Finlay | 2017-11-30 | 1 | -18/+3 |
| | * | | | | | | | | | | | | | | | | | Fix test to skip screens before privacy notice | Dan Finlay | 2017-11-29 | 1 | -1/+7 |
| | * | | | | | | | | | | | | | | | | | Migrate old data to include firstVersion info | Dan Finlay | 2017-11-29 | 3 | -1/+42 |
| | * | | | | | | | | | | | | | | | | | Bump changelog | Dan Finlay | 2017-11-29 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | | | Linted | Dan Finlay | 2017-11-29 | 2 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | Add seed phrase bounty award notice | Dan Finlay | 2017-11-29 | 4 | -3/+4 |
| | * | | | | | | | | | | | | | | | | | Get notice version filtering working nicely | Dan Finlay | 2017-11-29 | 4 | -24/+38 |
| | * | | | | | | | | | | | | | | | | | Add firstVersion field to notices selector | Dan Finlay | 2017-11-29 | 2 | -1/+5 |
| | * | | | | | | | | | | | | | | | | | Add optional version field to notices | Dan Finlay | 2017-11-29 | 3 | -1/+21 |
| * | | | | | | | | | | | | | | | | | | Merge pull request #2627 from MetaMask/reload-fix | kumavis | 2017-11-30 | 4 | -7/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fix | kumavis | 2017-11-30 | 2 | -8/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge pull request #2620 from MetaMask/update-deps | Dan Finlay | 2017-11-29 | 1 | -7/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | Update greenkeeper deps for master | Thomas Huang | 2017-11-28 | 1 | -7/+7 |
| * | | | | | | | | | | | | | | | | | | | Merge pull request #2441 from MetaMask/kumavis-patch-3 | Dan Finlay | 2017-11-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | network controller - warn via log.warn | kumavis | 2017-11-28 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | | Update network.js | kumavis | 2017-10-24 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | | | | | | | deps - obs-store@3 + migrate stream plumbing | kumavis | 2017-11-29 | 4 | -7/+11 |
| | |_|/ / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge pull request #2605 from MetaMask/i2577-SeedPhraseBug | Thomas Huang | 2017-11-28 | 4 | -5/+68 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Bump changelog | Dan Finlay | 2017-11-21 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | | | | Remove logs | Dan Finlay | 2017-11-21 | 1 | -6/+0 |
| | * | | | | | | | | | | | | | | | | | | Get test passing | Dan Finlay | 2017-11-21 | 1 | -4/+25 |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'i2577-SeedPhraseBug' into i2577-SeedPhraseBug-Test | Dan Finlay | 2017-11-21 | 2 | -5/+34 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | | Prevent multiple submissions of first time form | Dan Finlay | 2017-11-21 | 1 | -1/+6 |
| | | * | | | | | | | | | | | | | | | | | | Prevent creation of multiple vaults | Dan Finlay | 2017-11-21 | 1 | -31/+20 |
| | | * | | | | | | | | | | | | | | | | | | Add reproduction and mutex code | Dan Finlay | 2017-11-21 | 1 | -2/+37 |
| | * | | | | | | | | | | | | | | | | | | | Add failing test for #2577 Seed Phrase Bug | Dan Finlay | 2017-11-21 | 1 | -0/+18 |
| | |/ / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | Merge pull request #2607 from MetaMask/i2504-OperaFix | Thomas Huang | 2017-11-28 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | Ensure Opera build excludes chromereload file | Dan Finlay | 2017-11-22 | 1 | -1/+7 |
| | |/ / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | Merge pull request #2603 from MetaMask/greenkeeper/react-markdown-3.0.0 | Thomas Huang | 2017-11-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | fix(package): update react-markdown to version 3.0.0 | greenkeeper[bot] | 2017-11-20 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | Merge pull request #2516 from MetaMask/i2507-DoubleWeb3Error | Thomas Huang | 2017-11-21 | 2 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | Add useful error when duplicate web3 is detected. | Dan Finlay | 2017-11-01 | 2 | -0/+9 |
| * | | | | | | | | | | | | | | | | | | | Merge pull request #2596 from MetaMask/issue-template-support-link | Thomas Huang | 2017-11-21 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Point issue template at new support center | Dan Finlay | 2017-11-18 | 1 | -3/+3 |
| |/ / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | Merge pull request #2540 from doraemondrian/master | Thomas Huang | 2017-11-15 | 3 | -6/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | newUnaprovedTx => newUnapprovedTx | Dora E. Mondrian | 2017-11-06 | 3 | -6/+6 |
| |/ / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | Merge pull request #2508 from watilde/fixes-1192 | Thomas Huang | 2017-10-31 | 3 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | Use const and fix lint warnings | Daijiro Wachi | 2017-10-31 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | Remove warning message when show import page | Daijiro Wachi | 2017-10-31 | 2 | -0/+2 |
| |/ / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | Merge pull request #2291 from MetaMask/gasPriceSpecified | Kevin Serrano | 2017-10-28 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | Add indicator for specified gas price | Kevin Serrano | 2017-10-06 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | | Merge pull request #2275 from MetaMask/version-debugging | Kevin Serrano | 2017-10-27 | 4 | -12/+45 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | Add option to copy directly to clipboard. | Kevin Serrano | 2017-10-27 | 1 | -3/+11 |
| | * | | | | | | | | | | | | | | | | | | Correct changelog. | Kevin Serrano | 2017-10-27 | 1 | -1/+0 |
| | * | | | | | | | | | | | | | | | | | | Bump Changelog | Kevin Serrano | 2017-10-27 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | | | | Resolve merge conflicts | Kevin Serrano | 2017-10-27 | 72 | -232/+12470 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | Merge pull request #2489 from MetaMask/3.12.0 | Frankie | 2017-10-26 | 2 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | 3.12.0v3.12.0 | kumavis | 2017-10-26 | 2 | -1/+3 |
| |/ / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | Merge pull request #2100 from ChainsawBaby/patch-1 | Kevin Serrano | 2017-10-26 | 2 | -3/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | Bump Changelog | Kevin Serrano | 2017-10-26 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | | | | Resolving that ugly merge. | Kevin Serrano | 2017-10-26 | 1 | -3/+7 |
| |/ / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | Merge pull request #2476 from MetaMask/100MweiMinGasPrice | Dan Finlay | 2017-10-26 | 3 | -12/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | Add labels to clarify warning. | Kevin Serrano | 2017-10-26 | 1 | -4/+4 |
| | * | | | | | | | | | | | | | | | | | | Account for non-submitted mins and max | Kevin Serrano | 2017-10-26 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | | Add clarifying comment about wei conversion. | Kevin Serrano | 2017-10-26 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | | | | Cut out intermediary wei steps. | Kevin Serrano | 2017-10-26 | 1 | -4/+2 |
| | * | | | | | | | | | | | | | | | | | | Remove unneeded toString conversions. | Kevin Serrano | 2017-10-26 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | | Move upsize conversions for input warning at front of fn. | Kevin Serrano | 2017-10-26 | 1 | -3/+5 |
| | * | | | | | | | | | | | | | | | | | | Fix mismatched decimal/hex conversion in pending-tx | Kevin Serrano | 2017-10-26 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | Remove css build bundle from uat | Dan Finlay | 2017-10-26 | 1 | -4491/+0 |
| | * | | | | | | | | | | | | | | | | | | Update changelog | Dan Finlay | 2017-10-26 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | Resolve merge conflict. | Kevin Serrano | 2017-10-25 | 3 | -1/+4493 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | | Reduce minimum gas price to 100 MWEI | Dan Finlay | 2017-10-25 | 3 | -7/+4499 |
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | | | | | | | | |
|
| | * / | | | | | | | | | | | | | | | | | Fix for gas price to be lowered. | Kevin Serrano | 2017-10-25 | 2 | -11/+13 |
| | |/ / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | Merge pull request #2478 from MetaMask/mascaraHeadersFix | Frankie | 2017-10-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | Fix X-Frame-Options for mascara | tmashuang | 2017-10-25 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | Merge pull request #2422 from watilde/fixes-lint | Kevin Serrano | 2017-10-25 | 22 | -49/+55 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | Fix lint warnings | Daijiro Wachi | 2017-10-22 | 20 | -49/+47 |
| | * | | | | | | | | | | | | | | | | Add lint:fix command to gulp and npm-scripts | Daijiro Wachi | 2017-10-22 | 2 | -0/+8 |
| * | | | | | | | | | | | | | | | | | Merge pull request #1990 from chikeichan/firsttimeflow | Thomas Huang | 2017-10-25 | 36 | -64/+12257 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|/ / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | |
|
