| Commit message (Expand) | Author | Age | Files | Lines |
* | Move getTaxBN and bnMultiplyByFraction to util.js | Dan | 2017-08-29 | 2 | -25/+29 |
* | Using eth balance component to ensure proper rounding. | Dan | 2017-08-29 | 3 | -32/+56 |
* | Bind SendTransactionScreen methods to this in constructor. | Dan | 2017-08-29 | 1 | -9/+20 |
* | Remove unused dependency. | Dan | 2017-08-29 | 1 | -1/+0 |
* | Refactor for clean handling of tooltip close. | Dan | 2017-08-29 | 3 | -94/+64 |
* | Styles and behaviour correct | Dan | 2017-08-29 | 4 | -18/+58 |
* | Final styling improvements for tooltip; plus a few for send form. | Dan | 2017-08-26 | 1 | -6/+12 |
* | Fully connect gas data in send form and tooltip to state; final styling impro... | Dan | 2017-08-26 | 3 | -18/+30 |
* | Updating current currency from send form. | Dan | 2017-08-26 | 2 | -1/+23 |
* | Tooltip closing on click outside. | Dan | 2017-08-26 | 2 | -11/+62 |
* | Refactor tooltip to remove external lib; tooltip now updating gas fee in parent. | Dan | 2017-08-26 | 5 | -72/+242 |
* | Toggling tooltip. | Dan | 2017-08-26 | 4 | -1/+91 |
* | Add 'customize' text to gas input. | Dan | 2017-08-26 | 2 | -1/+15 |
* | Patch 3 new account modal (#1962) | Dan J Miller | 2017-08-25 | 4 | -16/+105 |
* | Patch 2 account details modal (#1957) | Dan J Miller | 2017-08-25 | 5 | -19/+55 |
* | Modify buy and send buttons color, border-radius and various size properties.... | Dan J Miller | 2017-08-23 | 3 | -5/+11 |
* | Hook up showAddToken to dropdown menu item in account options dropdown | sdtsui | 2017-08-23 | 2 | -3/+5 |
* | Render TxListItem component from real data: address, identicon, status, ETH v... | sdtsui | 2017-08-23 | 2 | -9/+18 |
* | Remove fake transactions and balances from tx-list and wallet-view, respectively | sdtsui | 2017-08-23 | 2 | -70/+10 |
* | Add data field to send token screen | sdtsui | 2017-08-23 | 1 | -1/+34 |
* | [WIP] Successfully sign a hardcoded transaction, hook up remaining inputs and... | sdtsui | 2017-08-23 | 1 | -12/+19 |
* | [WIP] Use hardcoded values for dispatching from signTx | sdtsui | 2017-08-23 | 1 | -17/+80 |
* | Remove border and apply background color to gas input | sdtsui | 2017-08-23 | 3 | -2/+20 |
* | Add layout and props for send screen inputs | sdtsui | 2017-08-23 | 3 | -21/+89 |
* | Add bolt and info icon vector images | sdtsui | 2017-08-23 | 2 | -0/+22 |
* | [WIP] - Styling Send Screen - Need to bring in data contract for signTx | sdtsui | 2017-08-23 | 2 | -141/+39 |
* | Tweak z-indicies | sdtsui | 2017-08-22 | 3 | -6/+7 |
* | Adjust zIndex and width for send screen | sdtsui | 2017-08-22 | 3 | -10/+17 |
* | [WIP] Tweak Send Screen Styles | sdtsui | 2017-08-22 | 4 | -22/+37 |
* | Hook up send screen action to Send Button in TxView | sdtsui | 2017-08-22 | 2 | -1/+5 |
* | Hook up identicon and buttons to AccountDetailsModal, clean up colors | sdtsui | 2017-08-22 | 8 | -39/+37 |
* | Integrate old QR component with new modal layout | sdtsui | 2017-08-22 | 4 | -32/+37 |
* | [WIP] Render a QR code in AccountDetailsModal | sdtsui | 2017-08-22 | 2 | -8/+6 |
* | [WIP] Aggregate data for QRView | sdtsui | 2017-08-22 | 2 | -3/+18 |
* | Add wrapper CSS for NewAccountModal | sdtsui | 2017-08-21 | 2 | -40/+39 |
* | Add wrapper CSS for AccountDetailsModal | sdtsui | 2017-08-21 | 3 | -32/+45 |
* | Hook up hideModal action to close icon in EditAccountNameModal | sdtsui | 2017-08-21 | 1 | -1/+5 |
* | Hook up selected account label display to main wallet view | sdtsui | 2017-08-21 | 1 | -4/+3 |
* | Hook up actions to EditAccountNameModal | sdtsui | 2017-08-21 | 8 | -111/+150 |
* | Enhance global modal to accept styles from different components | sdtsui | 2017-08-21 | 1 | -45/+62 |
* | Implement new dropdown design, integrate account balances | sdtsui | 2017-08-21 | 5 | -27/+83 |
* | Hook up edit account name modal | sdtsui | 2017-08-21 | 1 | -26/+42 |
* | Remove old design - 'Show QR Code' dropdown menu item from account selection ... | sdtsui | 2017-08-21 | 1 | -16/+0 |
* | Hook up template for New Account Modal | sdtsui | 2017-08-21 | 3 | -1/+95 |
* | Enhance global modal to handle Buy, Edit, and Details Modals | sdtsui | 2017-08-21 | 7 | -52/+169 |
* | Extend modal implementation and state management to accomodate multiple modal... | sdtsui | 2017-08-21 | 5 | -11/+40 |
* | Add 'Account Details' dropdown menu item to account options dropdown | sdtsui | 2017-08-21 | 1 | -0/+14 |
* | Add 'Add Token' dropdown menu item to account options dropdown | sdtsui | 2017-08-21 | 1 | -0/+15 |
* | [WiP] Add comments for multiple modals | sdtsui | 2017-08-15 | 1 | -0/+20 |
* | Merge remote-tracking branch 'mm/master' into NewUI-flat | sdtsui | 2017-08-14 | 10 | -56/+271 |
|\ |
|
| * | Merge pull request #1904 from MetaMask/web3-depreciation | kumavis | 2017-08-13 | 2 | -1/+6 |
| |\ |
|
| | * | fix wording | frankiebee | 2017-08-12 | 1 | -1/+1 |
| | * | Add to CHANGELOG | frankiebee | 2017-08-12 | 1 | -0/+2 |
| | * | add deprecation warning for web3 | frankiebee | 2017-08-12 | 1 | -1/+4 |
| * | | Merge pull request #1899 from sdtsui/fix/acct-name-lengths | Frankie | 2017-08-12 | 3 | -4/+22 |
| |\ \
| | |/
| |/| |
|
| | * | Cleanup stray logs and lint | sdtsui | 2017-08-11 | 2 | -6/+1 |
| | * | Add overflow support for all account names in account details | sdtsui | 2017-08-11 | 1 | -2/+11 |
| | * | Fix logic for dropdown components attaching checkmark to correct account | sdtsui | 2017-08-11 | 1 | -1/+2 |
| | * | Fix text overflow for dropdown components flagged by @frankiebee | sdtsui | 2017-08-11 | 1 | -1/+14 |
| |/ |
|
| * | Merge pull request #1894 from MetaMask/3.9.6v3.9.6 | Thomas Huang | 2017-08-10 | 2 | -3/+5 |
| |\ |
|
| | * | 3.9.6 | kumavis | 2017-08-10 | 2 | -3/+5 |
| |/ |
|
| * | Merge pull request #1892 from MetaMask/deps-query | Thomas Huang | 2017-08-10 | 1 | -1/+1 |
| |\ |
|
| | * | deps - bump ethjs-query | kumavis | 2017-08-10 | 1 | -1/+1 |
| |/ |
|
| * | Merge pull request #1883 from MetaMask/estimateGas-fix | Thomas Huang | 2017-08-10 | 1 | -3/+11 |
| |\ |
|
| | * | tx utils - detect estimateGas err and set simulationFailed | kumavis | 2017-08-09 | 1 | -3/+11 |
| * | | Merge pull request #1885 from MetaMask/dharma | kumavis | 2017-08-10 | 2 | -46/+115 |
| |\ \ |
|
| | * | | ui - buy eth - formatting and moved network names to config | kumavis | 2017-08-10 | 2 | -23/+24 |
| | * | | lint fix | kumavis | 2017-08-09 | 1 | -1/+1 |
| | * | | ui - buy eth - add dharma beta to kovan | kumavis | 2017-08-09 | 1 | -12/+22 |
| | * | | ui - buy button view - refactor | kumavis | 2017-08-09 | 1 | -46/+104 |
| | |/ |
|
| * | | Merge pull request #1884 from MetaMask/waffle-badge | Frankie | 2017-08-09 | 1 | -1/+2 |
| |\ \
| | |/
| |/| |
|
| | * | readme - add waffle.io badge | kumavis | 2017-08-09 | 1 | -1/+2 |
| |/ |
|
* | | Lint and cleanup all scss | sdtsui | 2017-08-14 | 21 | -248/+331 |
* | | [WIP] Add packages and tasks for linting scss | sdtsui | 2017-08-14 | 4 | -4/+88 |
* | | Center account selection dropdown and specify useCssTransition prop | sdtsui | 2017-08-14 | 2 | -5/+8 |
* | | Remove unnecessary imports, and account-detail.js | sdtsui | 2017-08-14 | 2 | -283/+0 |
* | | Reconfigure AccoutSelector dropdown to use new fa-caret-down instead of old icon | sdtsui | 2017-08-14 | 1 | -1/+3 |
* | | Extract dropdown component into components/dropdowns, hook up to app | sdtsui | 2017-08-14 | 6 | -16/+73 |
* | | Fix odd relative position conflict so main icon is rounded - See flyswatter/j... | sdtsui | 2017-08-14 | 1 | -22/+19 |
* | | Remove unused code - network dropdown components in app | sdtsui | 2017-08-14 | 2 | -214/+2 |
* | | Remove deprecated feature: main app settings dropdown | sdtsui | 2017-08-14 | 1 | -48/+0 |
* | | [WIP] Extract network dropdown into own component | sdtsui | 2017-08-14 | 5 | -32/+95 |
* | | [WIP] Extract network dropdown out of main app render function | sdtsui | 2017-08-14 | 4 | -6/+279 |
* | | Move global modals into own pod, inside components/modals | sdtsui | 2017-08-14 | 4 | -6/+44 |
* | | Implement infinite scrolls (no lazy loading) for wallet view | sdtsui | 2017-08-12 | 3 | -155/+44 |
* | | [WIP] Begin fixing responsive layout with many wallets | sdtsui | 2017-08-11 | 2 | -2/+57 |
* | | Allow fullscreen scrolling on mobile view, while retaining in-window scroll f... | sdtsui | 2017-08-11 | 1 | -2/+4 |
* | | Implement responsive wallet balances | sdtsui | 2017-08-11 | 5 | -18/+213 |
* | | Cleanup SCSS and improve organization of color vars | sdtsui | 2017-08-11 | 9 | -54/+45 |
* | | Add UI tweaks, including separation of overflow logic for mobile (full-height... | sdtsui | 2017-08-11 | 3 | -16/+45 |
* | | Improve text positioning on mobile view | sdtsui | 2017-08-11 | 3 | -37/+63 |
* | | Extract scss breakpoints into variables | sdtsui | 2017-08-11 | 1 | -0/+4 |
* | | Implement widescreen layout for tx list | sdtsui | 2017-08-11 | 4 | -40/+72 |
* | | Move Txs list item styles into classes | sdtsui | 2017-08-11 | 2 | -37/+61 |
* | | Add new color for txs - dusty-gray | sdtsui | 2017-08-11 | 1 | -2/+4 |
* | | Add Tx List and selectors | Daniel Tsui | 2017-08-11 | 5 | -137/+244 |
|\ \ |
|
| * | | 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 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 |
| |\ |
|
| | * | 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 - 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 |
| |\ \ |
|
| | * \ | 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 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | 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 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | 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 |
| | | | |\ |
|
| | | | | * | readme - fix greenkeeper badge position | kumavis | 2017-08-04 | 1 | -2/+2 |
| | | | * | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee... | kumavis | 2017-08-08 | 39 | -744/+1178 |
| | | | |\ \
| | |_|_|/ /
| |/| | | /
| | | | |/ |
|
| * | | | | Merge pull request #1835 from MetaMask/NewUI | kumavis | 2017-08-08 | 34 | -732/+1137 |
| |\ \ \ \ |
|
| | | | | * | Merge branch 'greenkeeper/initial' of github.com:MetaMask/metamask-extension ... | kumavis | 2017-08-04 | 1 | -4/+0 |
| | | | | |\ |
|
| | | | | | * | 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 greenkee... | kumavis | 2017-08-04 | 2 | -2/+5 |
| | | | | |\ |
|
| | | | | * | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee... | kumavis | 2017-08-04 | 27 | -345/+605 |
| | | | | * | | 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 acco... | Simon Liang | 2017-08-08 | 3 | -26/+135 |
* | | | | | | | 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 test failures: ensure qr code is accessible | sdtsui | 2017-08-05 | 1 | -1/+7 |
| | * | | | | | | Fix integration test failures: unnecessary sandwich-expando event stopPropaga... | sdtsui | 2017-08-05 | 1 | -1/+0 |
| |/ / / / / / |
|
| * | | | | | | Merge pull request #1864 from sdtsui/lint-droppo | kumavis | 2017-08-05 | 1 | -31/+24 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | 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 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | 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 |
| * | | | | | | | Merge pull request #1863 from sdtsui/newui-early-break | kumavis | 2017-08-05 | 1 | -0/+27 |
| |\ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | | |
|
| | * | | | | | | 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 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | 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 |
| | |\ \ \ \ \ \ \ |
|
* | | \ \ \ \ \ \ \ | 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 | 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 | 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 | kumavis | 2017-08-04 | 2 | -2/+6 |
| |/ / / / / / / |
|
| * | | | | | | | Merge pull request #1857 from MetaMask/hotFixCancleTx | kumavis | 2017-08-04 | 4 | -8/+25 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | 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 | 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 | kumavis | 2017-08-04 | 1 | -1/+1 |
| * | | | | | | | | Merge pull request #1852 from MetaMask/blacklist-refactor2 | Kevin Serrano | 2017-08-04 | 3 | -35/+20 |
| |\| | | | | | |
| | |_|/ / / / /
| |/| | | | | | |
|