aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Modify buy and send buttons color, border-radius and various size properties....Dan J Miller2017-08-233-5/+11
* Hook up showAddToken to dropdown menu item in account options dropdownsdtsui2017-08-232-3/+5
* Render TxListItem component from real data: address, identicon, status, ETH v...sdtsui2017-08-232-9/+18
* Remove fake transactions and balances from tx-list and wallet-view, respectivelysdtsui2017-08-232-70/+10
* Add data field to send token screensdtsui2017-08-231-1/+34
* [WIP] Successfully sign a hardcoded transaction, hook up remaining inputs and...sdtsui2017-08-231-12/+19
* [WIP] Use hardcoded values for dispatching from signTxsdtsui2017-08-231-17/+80
* Remove border and apply background color to gas inputsdtsui2017-08-233-2/+20
* Add layout and props for send screen inputssdtsui2017-08-233-21/+89
* Add bolt and info icon vector imagessdtsui2017-08-232-0/+22
* [WIP] - Styling Send Screen - Need to bring in data contract for signTxsdtsui2017-08-232-141/+39
* Tweak z-indiciessdtsui2017-08-223-6/+7
* Adjust zIndex and width for send screensdtsui2017-08-223-10/+17
* [WIP] Tweak Send Screen Stylessdtsui2017-08-224-22/+37
* Hook up send screen action to Send Button in TxViewsdtsui2017-08-222-1/+5
* Hook up identicon and buttons to AccountDetailsModal, clean up colorssdtsui2017-08-228-39/+37
* Integrate old QR component with new modal layoutsdtsui2017-08-224-32/+37
* [WIP] Render a QR code in AccountDetailsModalsdtsui2017-08-222-8/+6
* [WIP] Aggregate data for QRViewsdtsui2017-08-222-3/+18
* Add wrapper CSS for NewAccountModalsdtsui2017-08-212-40/+39
* Add wrapper CSS for AccountDetailsModalsdtsui2017-08-213-32/+45
* Hook up hideModal action to close icon in EditAccountNameModalsdtsui2017-08-211-1/+5
* Hook up selected account label display to main wallet viewsdtsui2017-08-211-4/+3
* Hook up actions to EditAccountNameModalsdtsui2017-08-218-111/+150
* Enhance global modal to accept styles from different componentssdtsui2017-08-211-45/+62
* Implement new dropdown design, integrate account balancessdtsui2017-08-215-27/+83
* Hook up edit account name modalsdtsui2017-08-211-26/+42
* Remove old design - 'Show QR Code' dropdown menu item from account selection ...sdtsui2017-08-211-16/+0
* Hook up template for New Account Modalsdtsui2017-08-213-1/+95
* Enhance global modal to handle Buy, Edit, and Details Modalssdtsui2017-08-217-52/+169
* Extend modal implementation and state management to accomodate multiple modal...sdtsui2017-08-215-11/+40
* Add 'Account Details' dropdown menu item to account options dropdownsdtsui2017-08-211-0/+14
* Add 'Add Token' dropdown menu item to account options dropdownsdtsui2017-08-211-0/+15
* [WiP] Add comments for multiple modalssdtsui2017-08-151-0/+20
* Merge remote-tracking branch 'mm/master' into NewUI-flatsdtsui2017-08-1410-56/+271
|\
| * Merge pull request #1904 from MetaMask/web3-depreciationkumavis2017-08-132-1/+6
| |\
| | * fix wordingfrankiebee2017-08-121-1/+1
| | * Add to CHANGELOGfrankiebee2017-08-121-0/+2
| | * add deprecation warning for web3frankiebee2017-08-121-1/+4
| * | Merge pull request #1899 from sdtsui/fix/acct-name-lengthsFrankie2017-08-123-4/+22
| |\ \ | | |/ | |/|
| | * Cleanup stray logs and lintsdtsui2017-08-112-6/+1
| | * Add overflow support for all account names in account detailssdtsui2017-08-111-2/+11
| | * Fix logic for dropdown components attaching checkmark to correct accountsdtsui2017-08-111-1/+2
| | * Fix text overflow for dropdown components flagged by @frankiebeesdtsui2017-08-111-1/+14
| |/
| * Merge pull request #1894 from MetaMask/3.9.6v3.9.6Thomas Huang2017-08-102-3/+5
| |\
| | * 3.9.6kumavis2017-08-102-3/+5
| |/
| * Merge pull request #1892 from MetaMask/deps-queryThomas Huang2017-08-101-1/+1
| |\
| | * deps - bump ethjs-querykumavis2017-08-101-1/+1
| |/
| * Merge pull request #1883 from MetaMask/estimateGas-fixThomas Huang2017-08-101-3/+11
| |\
| | * tx utils - detect estimateGas err and set simulationFailedkumavis2017-08-091-3/+11
| * | Merge pull request #1885 from MetaMask/dharmakumavis2017-08-102-46/+115
| |\ \
| | * | ui - buy eth - formatting and moved network names to configkumavis2017-08-102-23/+24
| | * | lint fixkumavis2017-08-091-1/+1
| | * | ui - buy eth - add dharma beta to kovankumavis2017-08-091-12/+22
| | * | ui - buy button view - refactorkumavis2017-08-091-46/+104
| | |/
| * | Merge pull request #1884 from MetaMask/waffle-badgeFrankie2017-08-091-1/+2
| |\ \ | | |/ | |/|
| | * readme - add waffle.io badgekumavis2017-08-091-1/+2
| |/
* | Lint and cleanup all scsssdtsui2017-08-1421-248/+331
* | [WIP] Add packages and tasks for linting scsssdtsui2017-08-144-4/+88
* | Center account selection dropdown and specify useCssTransition propsdtsui2017-08-142-5/+8
* | Remove unnecessary imports, and account-detail.jssdtsui2017-08-142-283/+0
* | Reconfigure AccoutSelector dropdown to use new fa-caret-down instead of old iconsdtsui2017-08-141-1/+3
* | Extract dropdown component into components/dropdowns, hook up to appsdtsui2017-08-146-16/+73
* | Fix odd relative position conflict so main icon is rounded - See flyswatter/j...sdtsui2017-08-141-22/+19
* | Remove unused code - network dropdown components in appsdtsui2017-08-142-214/+2
* | Remove deprecated feature: main app settings dropdownsdtsui2017-08-141-48/+0
* | [WIP] Extract network dropdown into own componentsdtsui2017-08-145-32/+95
* | [WIP] Extract network dropdown out of main app render functionsdtsui2017-08-144-6/+279
* | Move global modals into own pod, inside components/modalssdtsui2017-08-144-6/+44
* | Implement infinite scrolls (no lazy loading) for wallet viewsdtsui2017-08-123-155/+44
* | [WIP] Begin fixing responsive layout with many walletssdtsui2017-08-112-2/+57
* | Allow fullscreen scrolling on mobile view, while retaining in-window scroll f...sdtsui2017-08-111-2/+4
* | Implement responsive wallet balancessdtsui2017-08-115-18/+213
* | Cleanup SCSS and improve organization of color varssdtsui2017-08-119-54/+45
* | Add UI tweaks, including separation of overflow logic for mobile (full-height...sdtsui2017-08-113-16/+45
* | Improve text positioning on mobile viewsdtsui2017-08-113-37/+63
* | Extract scss breakpoints into variablessdtsui2017-08-111-0/+4
* | Implement widescreen layout for tx listsdtsui2017-08-114-40/+72
* | Move Txs list item styles into classessdtsui2017-08-112-37/+61
* | Add new color for txs - dusty-graysdtsui2017-08-111-2/+4
* | Add Tx List and selectorsDaniel Tsui2017-08-115-137/+244
|\ \
| * | Cleanup txList and txView componentssdtsui2017-08-112-48/+87
| * | Add selectors for txsToRender and conversionRatesdtsui2017-08-111-0/+18
| * | added logging for account balanceSimon Liang2017-08-101-1/+3
| * | reverted my changesSimon Liang2017-08-101-17/+17
| * | connected wallet view dropdown button with real dataSimon Liang2017-08-101-17/+17
| * | redid tx-view and balance-component mapStateToProps logicSimon Liang2017-08-102-23/+27
| * | moved the props initialization steps into mapStateToPropsSimon Liang2017-08-101-14/+13
| * | extracted transaction listSimon Liang2017-08-102-102/+151
| * | removing styling commentsSimon Liang2017-08-101-4/+0
|/ /
* | [WIP] Position account potions dropdown correctly and hook up to action creatorssdtsui2017-08-103-42/+73
* | Add new selectors for addresses, identities, and accountssdtsui2017-08-101-0/+27
* | Adjust modal styles to match new modal size, from cancel button tweaksdtsui2017-08-101-1/+1
* | Switch buy modal 'cancel' from text to button for accessibilitysdtsui2017-08-102-3/+19
* | Vertically center modal in mobile view - @cjeriasdtsui2017-08-101-1/+4
* | Improve layout of buy buttons by tweaking text stylessdtsui2017-08-101-1/+10
* | Merge branch 'master' into NewUI-flatkumavis2017-08-0922-446/+767
|\|
| * Merge pull request #1882 from MetaMask/tx-cont-fixesFrankie2017-08-092-4/+12
| |\
| | * tx controller - fix error serializationkumavis2017-08-091-2/+5
| | * tx controller - fix getBalance fnkumavis2017-08-091-1/+1
| | * util - sufficientBalance - validate inputkumavis2017-08-091-1/+6
| |/
| * Merge pull request #1880 from MetaMask/pendingFixFrankie2017-08-092-3/+4
| |\
| | * filter by network for pending txsfrankiebee2017-08-091-0/+2
| | * fix getPendingTransactions function for pendingTxTrackerfrankiebee2017-08-092-3/+2
| * | Merge pull request #1879 from MetaMask/build-err-fixThomas Huang2017-08-092-19/+28
| |\ \
| | * | build - factor watcify into bundler generationkumavis2017-08-091-17/+11
| | * | build - fix error swallowing on devkumavis2017-08-091-1/+16
| | * | deps - bump watchifykumavis2017-08-091-2/+2
| |/ /
| * | Merge pull request #1854 from MetaMask/greenkeeper/initialThomas Huang2017-08-099-46/+49
| |\ \
| | * \ Merge branch 'master' into greenkeeper/initialkumavis2017-08-0914-380/+680
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1877 from MetaMask/hotfix/mobile-buy-layoutkumavis2017-08-092-70/+80
| |\ \ \ | | |_|/ | |/| |
| | * | Fix layout issues flagged by @tmashuangsdtsui2017-08-091-69/+79
| | * | Make buy ui more central to the screensdtsui2017-08-091-1/+1
| * | | Merge pull request #1861 from MetaMask/transactionControllerRefractorkumavis2017-08-0912-310/+600
| |\ \ \ | | |/ / | |/| |
| | * | add json-rpc-engine && eth-json-rpc-middleware to devDependenciesfrankiebee2017-08-091-0/+2
| | * | fix class namesfrankiebee2017-08-093-18/+25
| | * | use provider stubfrankiebee2017-08-092-88/+65
| | * | create a provider stubfrankiebee2017-08-091-0/+25
| | * | fix the bind on pending tx watchersfrankiebee2017-08-081-3/+3
| | * | remove .onlyfrankiebee2017-08-081-1/+1
| | * | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-0836-737/+1151
| | |\ \ | | |/ / | |/| |
| | * | fix testfrankiebee2017-08-081-3/+3
| | * | remove logging of the message and log the errorfrankiebee2017-08-081-1/+1
| | * | remove unnecessary if statment for error messagefrankiebee2017-08-081-1/+0
| | * | fix spellingfrankiebee2017-08-082-15/+12
| | * | rename PendingTransactionUtils -> PendingTransactionWatchersfrankiebee2017-08-051-8/+8
| | * | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-0520-160/+188
| | |\ \
| | * | | fixed: showing tx-s as errors vs. warningfrankiebee2017-08-051-3/+12
| | * | | bring your own BNfrankiebee2017-08-051-0/+1
| | * | | break out tx status pendding watchersfrankiebee2017-08-052-145/+192
| | * | | test for pending tx watcherfrankiebee2017-08-054-100/+280
| | * | | test for SufficientBalancefrankiebee2017-08-051-0/+41
| | * | | move util functions to util.jsfrankiebee2017-08-052-32/+40
| | * | | rename the test description Transaction Manger -> Message Mangerfrankiebee2017-08-051-1/+1
| | * | | use error for #approveTransaction when setting failedfrankiebee2017-08-031-5/+2
| | | | * Updated commonjs require path for redux-logger and redux-thunk modulesThomas Huang2017-08-091-2/+2
| | | | * Merge branch 'greenkeeper/initial' of github.com:MetaMask/metamask-extension ...kumavis2017-08-081-2/+2
| | | | |\
| | | | | * readme - fix greenkeeper badge positionkumavis2017-08-041-2/+2
| | | | * | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee...kumavis2017-08-0839-744/+1178
| | | | |\ \ | | |_|_|/ / | |/| | | / | | | | |/
| * | | | Merge pull request #1835 from MetaMask/NewUIkumavis2017-08-0834-732/+1137
| |\ \ \ \
| | | | | * Merge branch 'greenkeeper/initial' of github.com:MetaMask/metamask-extension ...kumavis2017-08-041-4/+0
| | | | | |\
| | | | | | * README - fix bad mergekumavis2017-08-041-4/+0
| | | | | * | deps - updatekumavis2017-08-041-4/+5
| | | | | |/
| | | | | * test - dont mix callback and promisekumavis2017-08-041-2/+1
| | | | | * Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee...kumavis2017-08-042-2/+5
| | | | | |\
| | | | | * | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee...kumavis2017-08-0427-345/+605
| | | | | * | lint fixeskumavis2017-08-045-8/+11
| | | | | * | docs(readme): add Greenkeeper badgegreenkeeper[bot]2017-07-191-0/+2
| | | | | * | chore(package): update dependenciesgreenkeeper[bot]2017-07-191-32/+32
* | | | | | | Fix dropdown z-index valuesdtsui2017-08-091-1/+1
* | | | | | | Add z indicies to settings-variablessdtsui2017-08-091-1/+13
* | | | | | | Add backdrop styles and box shadow to new global modal defaultssdtsui2017-08-091-0/+7
* | | | | | | Add minor comments and cleanup for new componentssdtsui2017-08-093-24/+16
* | | | | | | Hook up 'Buy with Fiat', redirect to Coinbasesdtsui2017-08-091-7/+10
* | | | | | | Move buy view into its own component - BuyOptionssdtsui2017-08-092-36/+72
* | | | | | | Add an additional font-size breakpoint for buy modal on the largest screenssdtsui2017-08-092-2/+20
* | | | | | | Add minor positioning tweaks for buy modal, laptop viewsdtsui2017-08-091-3/+8
* | | | | | | Move inline styles out into explicitly named BEM classessdtsui2017-08-093-47/+79
* | | | | | | Implement utility helper for checking viewport size in jssdtsui2017-08-091-0/+5
* | | | | | | Implement modal content for buy flow - mobile viewsdtsui2017-08-094-6/+115
* | | | | | | Add note for responsive modal stylessdtsui2017-08-092-0/+6
* | | | | | | Hook up global modal to Tx view, Buy buttonsdtsui2017-08-091-0/+4
* | | | | | | Implement global modalsdtsui2017-08-092-0/+85
* | | | | | | Add actions and reducers for global modalsdtsui2017-08-092-0/+29
* | | | | | | Add dependencies and JSX support (reactify), for global modal implementationsdtsui2017-08-091-0/+3
* | | | | | | refactored and added unit testSimon Liang2017-08-082-23/+58
* | | | | | | extracted balance component and renders to the format, also wired in the acco...Simon Liang2017-08-083-26/+135
* | | | | | | Opt for calculated values in absolutely positioned caretsdtsui2017-08-072-2/+8
* | | | | | | Improve positioning of caret and add reusable color for wallet viewsdtsui2017-08-073-24/+16
* | | | | | | Position account icon, name, and caretsdtsui2017-08-073-23/+85
* | | | | | | Move tx and wallet view styles to component classessdtsui2017-08-073-10/+17
* | | | | | | Merge branch 'NewUI' into feat/mm-ui-5-mergedsdtsui2017-08-0718-91/+334
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Improve readability of changelogsdtsui2017-08-071-9/+9
| * | | | | | Merge branch 'master' into NewUIkumavis2017-08-054-4/+9
| |\| | | | |
| * | | | | | Merge pull request #1867 from sdtsui/NewUIkumavis2017-08-052-2/+7
| |\ \ \ \ \ \
| | * | | | | | Fix integration test failures: ensure qr code is accessiblesdtsui2017-08-051-1/+7
| | * | | | | | Fix integration test failures: unnecessary sandwich-expando event stopPropaga...sdtsui2017-08-051-1/+0
| |/ / / / / /
| * | | | | | Merge pull request #1864 from sdtsui/lint-droppokumavis2017-08-051-31/+24
| |\ \ \ \ \ \
| | * | | | | | Lint menu-dropposdtsui2017-08-051-31/+24
| |/ / / / / /
| * | | | | | Merge pull request #1862 from sdtsui/add-rctkumavis2017-08-055-3/+145
| |\ \ \ \ \ \
| | * | | | | | Bring menu-droppo component into project, remove as a dependencysdtsui2017-08-053-2/+139
| | * | | | | | Re-enable css transitions for dropdowns in header, needs menu-droppo library ...sdtsui2017-08-053-1/+6
| * | | | | | | Merge pull request #1863 from sdtsui/newui-early-breakkumavis2017-08-051-0/+27
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Cleanup breakpoint css + comment on hackinesssdtsui2017-08-051-11/+14
| | * | | | | | Adds early breakpoint from @frankiebee 's + @kumavis 's CRsdtsui2017-08-051-0/+24
| |/ / / / / /
| * | | | | | Merge branch 'NewUI' of github.com:MetaMask/metamask-extension into NewUIkumavis2017-08-042-2/+6
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into NewUIkumavis2017-08-042-2/+6
| | |\ \ \ \ \ \
| * | | | | | | | test - integration - better error handlingkumavis2017-08-041-10/+9
| |/ / / / / / /
| * | | | | | | test - integration - syntax - prefer constkumavis2017-08-041-12/+7
| * | | | | | | test - integration - remove unused codekumavis2017-08-041-1/+3
| * | | | | | | test - integration - throw error on failurekumavis2017-08-041-2/+2
| * | | | | | | ui - dropdown - use Object.assign syntax to appease coverage parserkumavis2017-08-041-3/+2
| * | | | | | | Merge branch 'master' into NewUIkumavis2017-08-049-44/+50
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge pull request #1858 from sdtsui/NewUIkumavis2017-08-047-31/+120
| |\ \ \ \ \ \ \
| | * | | | | | | Adjust padding of accountSwitcher dropdownsdtsui2017-08-041-4/+7
| | * | | | | | | Adjust top and bottom padding of accountSwitchersdtsui2017-08-041-2/+9
| | * | | | | | | Lint ui/appsdtsui2017-08-043-14/+11
| | * | | | | | | Allow new accounts selector to handle clickssdtsui2017-08-041-2/+2
| | * | | | | | | Increase size of accountSelection dropdownsdtsui2017-08-041-8/+22
| | * | | | | | | Increase size of settings dropdown and account settings dropdownsdtsui2017-08-042-2/+2
| | * | | | | | | Increase size of network dropdownsdtsui2017-08-044-4/+28
| | * | | | | | | De-dupe click handler for sandwich-expandosdtsui2017-08-041-6/+12
| | * | | | | | | Add note with previous fa-angle-down for future refactorsdtsui2017-08-041-0/+2
| | * | | | | | | Position account switcher icon back in app headersdtsui2017-08-041-2/+6
| | * | | | | | | Move accountselector menu-droppo up to app-headersdtsui2017-08-041-0/+22
| | * | | | | | | Disable account selection dropdown from account detailssdtsui2017-08-042-7/+16
| | * | | | | | | Adjust account checksumAddress location upsdtsui2017-08-041-0/+1
| * | | | | | | | Fix fox positioning.Kevin Serrano2017-08-041-1/+5
| |/ / / / / / /
| * | | | | | | Fix wonky widths for notices.Kevin Serrano2017-08-042-2/+6
| * | | | | | | Add maximum width for private key revealKevin Serrano2017-08-041-1/+1
| * | | | | | | Remove 100% properties that were messing up sizing.Kevin Serrano2017-08-041-2/+0
| * | | | | | | Add QR functionalityKevin Serrano2017-08-041-0/+13
| * | | | | | | Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUIKevin Serrano2017-08-0428-695/+829
| |\ \ \ \ \ \ \
| | * | | | | | | lint fixkumavis2017-08-022-3/+3
| | * | | | | | | Merge pull request #1841 from sdtsui/fix/dropdown-toggleKevin Serrano2017-08-022-4/+32
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Merge branch 'master' into feat/mm-ui-5sdtsui2017-08-0722-430/+526
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #1866 from MetaMask/v3.9.5v3.9.5Frankie2017-08-053-2/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | v3.9.5kumavis2017-08-052-1/+5
| | * | | | | | | | | blacklist - bump phishing detectorkumavis2017-08-051-1/+1
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #1865 from MetaMask/blacklist-moarFrankie2017-08-052-3/+4
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | blacklist - update phishing on boot and speed up polling to 4 minkumavis2017-08-052-3/+4
| |/ / / / / / / /
| * | | | | | | | Merge pull request #1859 from MetaMask/v3.9.4v3.9.4Frankie2017-08-042-2/+6
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | v3.9.4kumavis2017-08-042-2/+6
| |/ / / / / / /
| * | | | | | | Merge pull request #1857 from MetaMask/hotFixCancleTxkumavis2017-08-044-8/+25
| |\ \ \ \ \ \ \
| | * | | | | | | test - actions - tx - fix async testkumavis2017-08-041-5/+4
| | * | | | | | | test - actions - remove commented codekumavis2017-08-041-2/+0
| | * | | | | | | nodeify - test - syntax nitpickkumavis2017-08-041-3/+3
| | * | | | | | | add test for no callback errorfrankiebee2017-08-041-0/+11
| | * | | | | | | fix testfrankiebee2017-08-041-2/+7
| | * | | | | | | fix cancelTransaction not reciving a callbackfrankiebee2017-08-042-4/+8
| * | | | | | | | Merge pull request #1856 from MetaMask/v3.9.3Frankie2017-08-042-1/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | v3.9.3kumavis2017-08-042-1/+4
| |/ / / / / / / /
| * | | | | | | | Merge pull request #1855 from MetaMask/blacklist-refactor2v3.9.3Kevin Serrano2017-08-041-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | deps - bump eth-detect-phishingkumavis2017-08-041-1/+1
| * | | | | | | | Merge pull request #1852 from MetaMask/blacklist-refactor2Kevin Serrano2017-08-043-35/+20
| |\| | | | | | | | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into blacklist-r...kumavis2017-08-041-3/+0
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #1850 from MetaMask/stackKevin Serrano2017-08-041-3/+0
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | remove stack from txsfrankiebee2017-08-041-3/+0
| |/ / / / / /
| | * / / / / blacklist - use module eth-phishing-detectkumavis2017-08-043-35/+20
| |/ / / / /
| * | | | | Merge pull request #1848 from MetaMask/transactionControllerRefractorkumavis2017-08-036-272/+331
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | remove unused sinonfrankiebee2017-08-031-1/+0
| | * | | | use async with #publishTransactionfrankiebee2017-08-031-2/+2
| | * | | | fix testfrankiebee2017-08-031-1/+1
| | * | | | move newUnapprovedTransaction to transactions.jsfrankiebee2017-08-035-54/+115
| | * | | | lint fixesfrankiebee2017-08-023-11/+4
| | * | | | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-0213-25/+163
| | |\ \ \ \
| | * | | | | fix spelling mistakefrankiebee2017-08-021-1/+1
| | * | | | | fix addTxDefaultsfrankiebee2017-08-022-2/+3
| | * | | | | add test for addTxDefaultsfrankiebee2017-08-021-5/+30
| | * | | | | make addUnapprovedTransaction async function and use promise based ethQueryfrankiebee2017-08-026-241/+219
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 16:04:00 +0800