Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cleanup txList and txView components | sdtsui | 2017-08-11 | 2 | -48/+87 |
| | |||||
* | Add selectors for txsToRender and conversionRate | sdtsui | 2017-08-11 | 1 | -0/+18 |
| | |||||
* | added logging for account balance | Simon Liang | 2017-08-10 | 1 | -1/+3 |
| | |||||
* | reverted my changes | Simon Liang | 2017-08-10 | 1 | -17/+17 |
| | |||||
* | connected wallet view dropdown button with real data | Simon Liang | 2017-08-10 | 1 | -17/+17 |
| | |||||
* | redid tx-view and balance-component mapStateToProps logic | Simon Liang | 2017-08-10 | 2 | -23/+27 |
| | |||||
* | moved the props initialization steps into mapStateToProps | Simon Liang | 2017-08-10 | 1 | -14/+13 |
| | |||||
* | extracted transaction list | Simon Liang | 2017-08-10 | 2 | -102/+151 |
| | |||||
* | removing styling comments | Simon Liang | 2017-08-10 | 1 | -4/+0 |
| | |||||
* | [WIP] Position account potions dropdown correctly and hook up to action creators | sdtsui | 2017-08-10 | 3 | -42/+73 |
| | |||||
* | Add new selectors for addresses, identities, and accounts | sdtsui | 2017-08-10 | 1 | -0/+27 |
| | |||||
* | Adjust modal styles to match new modal size, from cancel button tweak | sdtsui | 2017-08-10 | 1 | -1/+1 |
| | |||||
* | Switch buy modal 'cancel' from text to button for accessibility | sdtsui | 2017-08-10 | 2 | -3/+19 |
| | |||||
* | Vertically center modal in mobile view - @cjeria | sdtsui | 2017-08-10 | 1 | -1/+4 |
| | |||||
* | Improve layout of buy buttons by tweaking text styles | sdtsui | 2017-08-10 | 1 | -1/+10 |
| | |||||
* | Merge branch 'master' into NewUI-flat | kumavis | 2017-08-09 | 22 | -446/+767 |
|\ | |||||
| * | Merge pull request #1882 from MetaMask/tx-cont-fixes | Frankie | 2017-08-09 | 2 | -4/+12 |
| |\ | | | | | | | Tx cont fixes | ||||
| | * | tx controller - fix error serialization | kumavis | 2017-08-09 | 1 | -2/+5 |
| | | | |||||
| | * | tx controller - fix getBalance fn | kumavis | 2017-08-09 | 1 | -1/+1 |
| | | | |||||
| | * | util - sufficientBalance - validate input | kumavis | 2017-08-09 | 1 | -1/+6 |
| |/ | |||||
| * | Merge pull request #1880 from MetaMask/pendingFix | Frankie | 2017-08-09 | 2 | -3/+4 |
| |\ | | | | | | | fix getPendingTransactions function for pendingTxTracker | ||||
| | * | filter by network for pending txs | frankiebee | 2017-08-09 | 1 | -0/+2 |
| | | | |||||
| | * | fix getPendingTransactions function for pendingTxTracker | frankiebee | 2017-08-09 | 2 | -3/+2 |
| | | | |||||
| * | | Merge pull request #1879 from MetaMask/build-err-fix | Thomas Huang | 2017-08-09 | 2 | -19/+28 |
| |\ \ | | | | | | | | | Build sys - prevent err from being swallowed | ||||
| | * | | build - factor watcify into bundler generation | kumavis | 2017-08-09 | 1 | -17/+11 |
| | | | | |||||
| | * | | build - fix error swallowing on dev | kumavis | 2017-08-09 | 1 | -1/+16 |
| | | | | |||||
| | * | | deps - bump watchify | kumavis | 2017-08-09 | 1 | -2/+2 |
| |/ / | |||||
| * | | Merge pull request #1854 from MetaMask/greenkeeper/initial | Thomas Huang | 2017-08-09 | 9 | -46/+49 |
| |\ \ | | | | | | | | | Greenkeeper/initial | ||||
| | * \ | Merge branch 'master' into greenkeeper/initial | kumavis | 2017-08-09 | 14 | -380/+680 |
| | |\ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #1877 from MetaMask/hotfix/mobile-buy-layout | kumavis | 2017-08-09 | 2 | -70/+80 |
| |\ \ \ | | |_|/ | |/| | | Improve layout for legacy buy screen | ||||
| | * | | Fix layout issues flagged by @tmashuang | sdtsui | 2017-08-09 | 1 | -69/+79 |
| | | | | |||||
| | * | | Make buy ui more central to the screen | sdtsui | 2017-08-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #1861 from MetaMask/transactionControllerRefractor | kumavis | 2017-08-09 | 12 | -310/+600 |
| |\ \ \ | | |/ / | |/| | | Transaction controller refractor part 2 | ||||
| | * | | add json-rpc-engine && eth-json-rpc-middleware to devDependencies | frankiebee | 2017-08-09 | 1 | -0/+2 |
| | | | | |||||
| | * | | fix class names | frankiebee | 2017-08-09 | 3 | -18/+25 |
| | | | | |||||
| | * | | use provider stub | frankiebee | 2017-08-09 | 2 | -88/+65 |
| | | | | |||||
| | * | | create a provider stub | frankiebee | 2017-08-09 | 1 | -0/+25 |
| | | | | |||||
| | * | | fix the bind on pending tx watchers | frankiebee | 2017-08-08 | 1 | -3/+3 |
| | | | | |||||
| | * | | remove .only | frankiebee | 2017-08-08 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-08 | 36 | -737/+1151 |
| | |\ \ | | |/ / | |/| | | |||||
| | * | | fix test | frankiebee | 2017-08-08 | 1 | -3/+3 |
| | | | | |||||
| | * | | remove logging of the message and log the error | frankiebee | 2017-08-08 | 1 | -1/+1 |
| | | | | |||||
| | * | | remove unnecessary if statment for error message | frankiebee | 2017-08-08 | 1 | -1/+0 |
| | | | | |||||
| | * | | fix spelling | frankiebee | 2017-08-08 | 2 | -15/+12 |
| | | | | |||||
| | * | | rename PendingTransactionUtils -> PendingTransactionWatchers | frankiebee | 2017-08-05 | 1 | -8/+8 |
| | | | | |||||
| | * | | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-05 | 20 | -160/+188 |
| | |\ \ | |||||
| | * | | | fixed: showing tx-s as errors vs. warning | frankiebee | 2017-08-05 | 1 | -3/+12 |
| | | | | | |||||
| | * | | | bring your own BN | frankiebee | 2017-08-05 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | break out tx status pendding watchers | frankiebee | 2017-08-05 | 2 | -145/+192 |
| | | | | | |||||
| | * | | | test for pending tx watcher | frankiebee | 2017-08-05 | 4 | -100/+280 |
| | | | | | |||||
| | * | | | test for SufficientBalance | frankiebee | 2017-08-05 | 1 | -0/+41 |
| | | | | | |||||
| | * | | | move util functions to util.js | frankiebee | 2017-08-05 | 2 | -32/+40 |
| | | | | | |||||
| | * | | | rename the test description Transaction Manger -> Message Manger | frankiebee | 2017-08-05 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | use error for #approveTransaction when setting failed | frankiebee | 2017-08-03 | 1 | -5/+2 |
| | | | | | |||||
| | | | * | Updated commonjs require path for redux-logger and redux-thunk modules | Thomas Huang | 2017-08-09 | 1 | -2/+2 |
| | | | | | |||||
| | | | * | Merge branch 'greenkeeper/initial' of github.com:MetaMask/metamask-extension ↵ | kumavis | 2017-08-08 | 1 | -2/+2 |
| | | | |\ | | | | | | | | | | | | | | | | | | | into greenkeeper/initial | ||||
| | | | | * | readme - fix greenkeeper badge position | kumavis | 2017-08-04 | 1 | -2/+2 |
| | | | | | | |||||
| | | | * | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2017-08-08 | 39 | -744/+1178 |
| | | | |\ \ | | |_|_|/ / | |/| | | / | | | | |/ | greenkeeper/initial | ||||
| * | | | | Merge pull request #1835 from MetaMask/NewUI | kumavis | 2017-08-08 | 34 | -732/+1137 |
| |\ \ \ \ | | | | | | | | | | | | | Begin UI Refactor with Responsiveness & New Menus | ||||
| | | | | * | Merge branch 'greenkeeper/initial' of github.com:MetaMask/metamask-extension ↵ | kumavis | 2017-08-04 | 1 | -4/+0 |
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | into greenkeeper/initial | ||||
| | | | | | * | README - fix bad merge | kumavis | 2017-08-04 | 1 | -4/+0 |
| | | | | | | | |||||
| | | | | * | | deps - update | kumavis | 2017-08-04 | 1 | -4/+5 |
| | | | | |/ | |||||
| | | | | * | test - dont mix callback and promise | kumavis | 2017-08-04 | 1 | -2/+1 |
| | | | | | | |||||
| | | | | * | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2017-08-04 | 2 | -2/+5 |
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | greenkeeper/initial | ||||
| | | | | * | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2017-08-04 | 27 | -345/+605 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | greenkeeper/initial | ||||
| | | | | * | | lint fixes | kumavis | 2017-08-04 | 5 | -8/+11 |
| | | | | | | | |||||
| | | | | * | | docs(readme): add Greenkeeper badge | greenkeeper[bot] | 2017-07-19 | 1 | -0/+2 |
| | | | | | | | |||||
| | | | | * | | chore(package): update dependencies | greenkeeper[bot] | 2017-07-19 | 1 | -32/+32 |
| | | | | | | | |||||
* | | | | | | | Fix dropdown z-index value | sdtsui | 2017-08-09 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Add z indicies to settings-variables | sdtsui | 2017-08-09 | 1 | -1/+13 |
| | | | | | | | |||||
* | | | | | | | Add backdrop styles and box shadow to new global modal defaults | sdtsui | 2017-08-09 | 1 | -0/+7 |
| | | | | | | | |||||
* | | | | | | | Add minor comments and cleanup for new components | sdtsui | 2017-08-09 | 3 | -24/+16 |
| | | | | | | | |||||
* | | | | | | | Hook up 'Buy with Fiat', redirect to Coinbase | sdtsui | 2017-08-09 | 1 | -7/+10 |
| | | | | | | | |||||
* | | | | | | | Move buy view into its own component - BuyOptions | sdtsui | 2017-08-09 | 2 | -36/+72 |
| | | | | | | | |||||
* | | | | | | | Add an additional font-size breakpoint for buy modal on the largest screens | sdtsui | 2017-08-09 | 2 | -2/+20 |
| | | | | | | | |||||
* | | | | | | | Add minor positioning tweaks for buy modal, laptop view | sdtsui | 2017-08-09 | 1 | -3/+8 |
| | | | | | | | |||||
* | | | | | | | Move inline styles out into explicitly named BEM classes | sdtsui | 2017-08-09 | 3 | -47/+79 |
| | | | | | | | |||||
* | | | | | | | Implement utility helper for checking viewport size in js | sdtsui | 2017-08-09 | 1 | -0/+5 |
| | | | | | | | |||||
* | | | | | | | Implement modal content for buy flow - mobile view | sdtsui | 2017-08-09 | 4 | -6/+115 |
| | | | | | | | |||||
* | | | | | | | Add note for responsive modal styles | sdtsui | 2017-08-09 | 2 | -0/+6 |
| | | | | | | | |||||
* | | | | | | | Hook up global modal to Tx view, Buy button | sdtsui | 2017-08-09 | 1 | -0/+4 |
| | | | | | | | |||||
* | | | | | | | Implement global modal | sdtsui | 2017-08-09 | 2 | -0/+85 |
| | | | | | | | |||||
* | | | | | | | Add actions and reducers for global modal | sdtsui | 2017-08-09 | 2 | -0/+29 |
| | | | | | | | |||||
* | | | | | | | Add dependencies and JSX support (reactify), for global modal implementation | sdtsui | 2017-08-09 | 1 | -0/+3 |
| | | | | | | | |||||
* | | | | | | | refactored and added unit test | Simon Liang | 2017-08-08 | 2 | -23/+58 |
| | | | | | | | |||||
* | | | | | | | extracted balance component and renders to the format, also wired in the ↵ | Simon Liang | 2017-08-08 | 3 | -26/+135 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | account name | ||||
* | | | | | | | Opt for calculated values in absolutely positioned caret | sdtsui | 2017-08-07 | 2 | -2/+8 |
| | | | | | | | |||||
* | | | | | | | Improve positioning of caret and add reusable color for wallet view | sdtsui | 2017-08-07 | 3 | -24/+16 |
| | | | | | | | |||||
* | | | | | | | Position account icon, name, and caret | sdtsui | 2017-08-07 | 3 | -23/+85 |
| | | | | | | | |||||
* | | | | | | | Move tx and wallet view styles to component classes | sdtsui | 2017-08-07 | 3 | -10/+17 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'NewUI' into feat/mm-ui-5-merged | sdtsui | 2017-08-07 | 18 | -91/+334 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Improve readability of changelog | sdtsui | 2017-08-07 | 1 | -9/+9 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into NewUI | kumavis | 2017-08-05 | 4 | -4/+9 |
| |\| | | | | | |||||
| * | | | | | | Merge pull request #1867 from sdtsui/NewUI | kumavis | 2017-08-05 | 2 | -2/+7 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix integration tests for NewUI | ||||
| | * | | | | | | Fix integration test failures: ensure qr code is accessible | sdtsui | 2017-08-05 | 1 | -1/+7 |
| | | | | | | | | |||||
| | * | | | | | | Fix integration test failures: unnecessary sandwich-expando event ↵ | sdtsui | 2017-08-05 | 1 | -1/+0 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | stopPropagation | ||||
| * | | | | | | Merge pull request #1864 from sdtsui/lint-droppo | kumavis | 2017-08-05 | 1 | -31/+24 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Lint menu-droppo | ||||
| | * | | | | | | Lint menu-droppo | sdtsui | 2017-08-05 | 1 | -31/+24 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #1862 from sdtsui/add-rct | kumavis | 2017-08-05 | 5 | -3/+145 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Re-enable css transitions, only for dropdowns in app header | ||||
| | * | | | | | | Bring menu-droppo component into project, remove as a dependency | sdtsui | 2017-08-05 | 3 | -2/+139 |
| | | | | | | | | |||||
| | * | | | | | | Re-enable css transitions for dropdowns in header, needs menu-droppo library ↵ | sdtsui | 2017-08-05 | 3 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update | ||||
| * | | | | | | | Merge pull request #1863 from sdtsui/newui-early-break | kumavis | 2017-08-05 | 1 | -0/+27 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Add early breakpoint from @frankiebee 's + @kumavis 's CR of #1835 | ||||
| | * | | | | | | Cleanup breakpoint css + comment on hackiness | sdtsui | 2017-08-05 | 1 | -11/+14 |
| | | | | | | | | |||||
| | * | | | | | | Adds early breakpoint from @frankiebee 's + @kumavis 's CR | sdtsui | 2017-08-05 | 1 | -0/+24 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'NewUI' of github.com:MetaMask/metamask-extension into NewUI | kumavis | 2017-08-04 | 2 | -2/+6 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into NewUI | kumavis | 2017-08-04 | 2 | -2/+6 |
| | |\ \ \ \ \ \ | |||||
| * | | | | | | | | test - integration - better error handling | kumavis | 2017-08-04 | 1 | -10/+9 |
| |/ / / / / / / | |||||
| * | | | | | | | test - integration - syntax - prefer const | kumavis | 2017-08-04 | 1 | -12/+7 |
| | | | | | | | | |||||
| * | | | | | | | test - integration - remove unused code | kumavis | 2017-08-04 | 1 | -1/+3 |
| | | | | | | | | |||||
| * | | | | | | | test - integration - throw error on failure | kumavis | 2017-08-04 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | ui - dropdown - use Object.assign syntax to appease coverage parser | kumavis | 2017-08-04 | 1 | -3/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into NewUI | kumavis | 2017-08-04 | 9 | -44/+50 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #1858 from sdtsui/NewUI | kumavis | 2017-08-04 | 7 | -31/+120 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | UI Tweaks, Minor Bugfixes, and Dropdown Resizing | ||||
| | * | | | | | | | Adjust padding of accountSwitcher dropdown | sdtsui | 2017-08-04 | 1 | -4/+7 |
| | | | | | | | | | |||||
| | * | | | | | | | Adjust top and bottom padding of accountSwitcher | sdtsui | 2017-08-04 | 1 | -2/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | Lint ui/app | sdtsui | 2017-08-04 | 3 | -14/+11 |
| | | | | | | | | | |||||
| | * | | | | | | | Allow new accounts selector to handle clicks | sdtsui | 2017-08-04 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Increase size of accountSelection dropdown | sdtsui | 2017-08-04 | 1 | -8/+22 |
| | | | | | | | | | |||||
| | * | | | | | | | Increase size of settings dropdown and account settings dropdown | sdtsui | 2017-08-04 | 2 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Increase size of network dropdown | sdtsui | 2017-08-04 | 4 | -4/+28 |
| | | | | | | | | | |||||
| | * | | | | | | | De-dupe click handler for sandwich-expando | sdtsui | 2017-08-04 | 1 | -6/+12 |
| | | | | | | | | | |||||
| | * | | | | | | | Add note with previous fa-angle-down for future refactor | sdtsui | 2017-08-04 | 1 | -0/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Position account switcher icon back in app header | sdtsui | 2017-08-04 | 1 | -2/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | Move accountselector menu-droppo up to app-header | sdtsui | 2017-08-04 | 1 | -0/+22 |
| | | | | | | | | | |||||
| | * | | | | | | | Disable account selection dropdown from account details | sdtsui | 2017-08-04 | 2 | -7/+16 |
| | | | | | | | | | |||||
| | * | | | | | | | Adjust account checksumAddress location up | sdtsui | 2017-08-04 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix fox positioning. | Kevin Serrano | 2017-08-04 | 1 | -1/+5 |
| |/ / / / / / / | |||||
| * | | | | | | | Fix wonky widths for notices. | Kevin Serrano | 2017-08-04 | 2 | -2/+6 |
| | | | | | | | | |||||
| * | | | | | | | Add maximum width for private key reveal | Kevin Serrano | 2017-08-04 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Remove 100% properties that were messing up sizing. | Kevin Serrano | 2017-08-04 | 1 | -2/+0 |
| | | | | | | | | |||||
| * | | | | | | | Add QR functionality | Kevin Serrano | 2017-08-04 | 1 | -0/+13 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI | Kevin Serrano | 2017-08-04 | 28 | -695/+829 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | lint fix | kumavis | 2017-08-02 | 2 | -3/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #1841 from sdtsui/fix/dropdown-toggle | Kevin Serrano | 2017-08-02 | 2 | -4/+32 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [Part-1] Fix/dropdown toggle | ||||
* | | \ \ \ \ \ \ \ | Merge branch 'master' into feat/mm-ui-5 | sdtsui | 2017-08-07 | 22 | -430/+526 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1866 from MetaMask/v3.9.5v3.9.5 | Frankie | 2017-08-05 | 3 | -2/+6 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | V3.9.5 | ||||
| | * | | | | | | | | | v3.9.5 | kumavis | 2017-08-05 | 2 | -1/+5 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | blacklist - bump phishing detector | kumavis | 2017-08-05 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #1865 from MetaMask/blacklist-moar | Frankie | 2017-08-05 | 2 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | blacklist - update phishing on boot and speed up polling to 4 min | ||||
| | * | | | | | | | | blacklist - update phishing on boot and speed up polling to 4 min | kumavis | 2017-08-05 | 2 | -3/+4 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #1859 from MetaMask/v3.9.4v3.9.4 | Frankie | 2017-08-04 | 2 | -2/+6 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | v3.9.4 | ||||
| | * | | | | | | | v3.9.4 | kumavis | 2017-08-04 | 2 | -2/+6 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #1857 from MetaMask/hotFixCancleTx | kumavis | 2017-08-04 | 4 | -8/+25 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fix cancelTransaction not receiving a callback | ||||
| | * | | | | | | | test - actions - tx - fix async test | kumavis | 2017-08-04 | 1 | -5/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | test - actions - remove commented code | kumavis | 2017-08-04 | 1 | -2/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | nodeify - test - syntax nitpick | kumavis | 2017-08-04 | 1 | -3/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | add test for no callback error | frankiebee | 2017-08-04 | 1 | -0/+11 |
| | | | | | | | | | |||||
| | * | | | | | | | fix test | frankiebee | 2017-08-04 | 1 | -2/+7 |
| | | | | | | | | | |||||
| | * | | | | | | | fix cancelTransaction not reciving a callback | frankiebee | 2017-08-04 | 2 | -4/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #1856 from MetaMask/v3.9.3 | Frankie | 2017-08-04 | 2 | -1/+4 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | v3.9.3 | ||||
| | * | | | | | | | | v3.9.3 | kumavis | 2017-08-04 | 2 | -1/+4 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #1855 from MetaMask/blacklist-refactor2v3.9.3 | Kevin Serrano | 2017-08-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | deps - bump eth-detect-phishing | ||||
| | * | | | | | | | deps - bump eth-detect-phishing | kumavis | 2017-08-04 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #1852 from MetaMask/blacklist-refactor2 | Kevin Serrano | 2017-08-04 | 3 | -35/+20 |
| |\| | | | | | | | | |_|/ / / / / | |/| | | | | | | blacklist - use module eth-phishing-detect | ||||
| | * | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵ | kumavis | 2017-08-04 | 1 | -3/+0 |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | blacklist-refactor2 | ||||
| * | | | | | | | Merge pull request #1850 from MetaMask/stack | Kevin Serrano | 2017-08-04 | 1 | -3/+0 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | remove stack from txs | ||||
| | * | | | | | | remove stack from txs | frankiebee | 2017-08-04 | 1 | -3/+0 |
| |/ / / / / / | |||||
| | * / / / / | blacklist - use module eth-phishing-detect | kumavis | 2017-08-04 | 3 | -35/+20 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1848 from MetaMask/transactionControllerRefractor | kumavis | 2017-08-03 | 6 | -272/+331 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | Transaction controller refractor part 1: promises for everyone and more tests! | ||||
| | * | | | | remove unused sinon | frankiebee | 2017-08-03 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | use async with #publishTransaction | frankiebee | 2017-08-03 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | fix test | frankiebee | 2017-08-03 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | move newUnapprovedTransaction to transactions.js | frankiebee | 2017-08-03 | 5 | -54/+115 |
| | | | | | | |||||
| | * | | | | lint fixes | frankiebee | 2017-08-02 | 3 | -11/+4 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-02 | 13 | -25/+163 |
| | |\ \ \ \ | |||||
| | * | | | | | fix spelling mistake | frankiebee | 2017-08-02 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | fix addTxDefaults | frankiebee | 2017-08-02 | 2 | -2/+3 |
| | | | | | | | |||||
| | * | | | | | add test for addTxDefaults | frankiebee | 2017-08-02 | 1 | -5/+30 |
| | | | | | | | |||||
| | * | | | | | make addUnapprovedTransaction async function and use promise based ethQuery | frankiebee | 2017-08-02 | 6 | -241/+219 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1849 from MetaMask/blacklist-refactor | Kevin Serrano | 2017-08-03 | 14 | -130/+156 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | Blacklist refactor | ||||
| | * | | | | | blacklist controller - breakout from metamask and infura controllers | kumavis | 2017-08-03 | 6 | -83/+108 |
| | | | | | | | |||||
| | * | | | | | phishing detection - move phishing detection into contentscript and metamask ↵ | kumavis | 2017-08-03 | 10 | -67/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | controller | ||||
| | * | | | | | obj-multiplex - missing name error + prefer const over var | kumavis | 2017-08-03 | 1 | -6/+10 |
| | | | | | | | |||||
| | * | | | | | blacklist - add tests for metamask subdomains | kumavis | 2017-08-02 | 1 | -0/+12 |
| | | | | | | | |||||
| | * | | | | | blacklist - clearer test format | kumavis | 2017-08-02 | 1 | -5/+5 |
| |/ / / / / | |||||
* | | | | | | Cleanup before rebase on NewUI - need new version of AccountDropdowns | sdtsui | 2017-08-07 | 1 | -11/+2 |
| | | | | | | |||||
* | | | | | | Allow clicks on account view to enable sidebar, not just burger | sdtsui | 2017-08-07 | 1 | -4/+4 |
| | | | | | | |||||
* | | | | | | Refactor account name css - mobile views | sdtsui | 2017-08-07 | 4 | -12/+12 |
| | | | | | | |||||
* | | | | | | Add sidebar click handler to overlay | sdtsui | 2017-08-07 | 1 | -2/+11 |
| | | | | | | |||||
* | | | | | | 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, ↵ | sdtsui | 2017-08-07 | 9 | -311/+358 |
| | | | | | | | | | | | | | | | | | | | | | | | | respectively | ||||
* | | | | | | 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 |
| | | | | | |