aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix testfrankiebee2017-08-221-9/+9
* When network nonce is highest, it should be used.Dan Finlay2017-08-221-4/+15
* Fix testDan Finlay2017-08-221-5/+5
* Add new assertions and de-duplicate nonce tracker generationDan Finlay2017-08-221-29/+73
* Add test for no previous txsDan Finlay2017-08-221-4/+25
* Confine mock strategy to describe blockDan Finlay2017-08-221-35/+39
* Move mock txs to tx mocking classDan Finlay2017-08-222-35/+48
* break out network nonce calc.frankiebee2017-08-191-17/+21
* fix 0x0 nonce calc.frankiebee2017-08-191-8/+18
* include pendingTxs in localNoncefrankiebee2017-08-191-10/+9
* use "localNonce" when the network returns a nonce that is lower then a known ...frankiebee2017-08-192-3/+27
* add test for using localNoncefrankiebee2017-08-191-4/+42
* Merge pull request #1941 from MetaMask/i1912-TokenPrecisionFixKevin Serrano2017-08-192-1/+3
|\
| * Merge branch 'master' into i1912-TokenPrecisionFixKevin Serrano2017-08-193-2/+8
| |\ | |/ |/|
* | Merge pull request #1942 from MetaMask/i1903-EthSignFormatThomas Huang2017-08-183-2/+7
|\ \
| * | Bump changelogDan Finlay2017-08-181-0/+2
| * | Fix eth sign formattingDan Finlay2017-08-182-2/+5
|/ /
| * Fix token balance precision renderingDan Finlay2017-08-182-1/+2
|/
* Merge pull request #1935 from MetaMask/i1091-ShowTxErrorsFrankie2017-08-183-104/+8
|\
| * Remove dead testsDan Finlay2017-08-171-86/+1
| * Bump changelogDan Finlay2017-08-171-0/+2
| * Transition to home view after tx errorDan Finlay2017-08-171-18/+5
* | Merge pull request #1933 from MetaMask/Version-3.9.8Thomas Huang2017-08-172-1/+3
|\|
| * Version 3.9.8v3.9.8Dan Finlay2017-08-172-1/+3
|/
* Merge pull request #1928 from MetaMask/RemoveDefaultTokensKevin Serrano2017-08-173-52/+31
|\
| * Fallback to ethplorer linkDan Finlay2017-08-171-1/+18
| * Remove dead codeDan Finlay2017-08-171-14/+0
| * Bump changelogDan Finlay2017-08-171-0/+3
| * Remove default tokensDan Finlay2017-08-171-11/+1
| * ReEnable Token ListDan Finlay2017-08-171-26/+9
|/
* Merge pull request #1921 from MetaMask/v3.9.7Kevin Serrano2017-08-162-1/+3
|\
| * v3.9.7 update changelogv3.9.7kumavis2017-08-161-0/+2
| * v3.9.7kumavis2017-08-161-1/+1
* | Merge pull request #1916 from MetaMask/fix/account-name-scrollKevin Serrano2017-08-161-1/+1
|\ \ | |/ |/|
| * Fix overflow issue on QubesOS, flagged by @kumavissdtsui2017-08-151-1/+1
* | Merge pull request #1918 from MetaMask/token-hotfixKevin Serrano2017-08-162-9/+27
|\ \ | |/ |/|
| * Change cursor type to indicate link.Kevin Serrano2017-08-161-0/+1
| * fix spellingfrankiebee2017-08-161-4/+3
| * Add to CHANGELOGfrankiebee2017-08-161-0/+1
| * Disable token listfrankiebee2017-08-161-9/+26
|/
* 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
|/
* 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
|\ \ \ \
| * | | | Improve readability of changelogsdtsui2017-08-071-9/+9
| * | | | Merge branch 'master' into NewUIkumavis2017-08-054-4/+9
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | 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 #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
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge pull request #1859 from MetaMask/v3.9.4v3.9.4Frankie2017-08-042-2/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | v3.9.4kumavis2017-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 #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 #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
| | | | |\ \ \
| | | | | * | | Fix dropdown behavior - networksdtsui2017-07-291-1/+11
| | | | | * | | Fix dropdown toggle behavior - settingssdtsui2017-07-291-1/+5
| | | | | * | | Fix dropdown toggle behavior - account dropdownssdtsui2017-07-291-2/+16
| | | | |/ / /
| | | | * | | Create distinct responsive 'home.html' file, hard-code popup.html sizeDan Finlay2017-07-292-1/+13
| | | | * | | Correct viewport paramDan Finlay2017-07-281-1/+1
| | | | * | | Fix react warningDan Finlay2017-07-281-0/+6
| | | | * | | Limit max width of seed word conf screenDan Finlay2017-07-281-2/+5
| | | | * | | Correct token pluralization for one tokenDan Finlay2017-07-281-1/+3
| | | | * | | Bump changelogDan Finlay2017-07-281-0/+2
| | | | * | | Merge branch 'master' into NewUIDan Finlay2017-07-288-46/+104
| | | | |\ \ \
| | | | * \ \ \ Merge branch 'master' into NewUIDan Finlay2017-07-2816-58/+180
| | | | |\ \ \ \
| | | | * | | | | Set min gas price to 1 gweiDan Finlay2017-07-281-1/+1
| | | | * | | | | Disable user zoom in mobile modeDan Finlay2017-07-281-1/+1
| | | | * | | | | Fix viewport width to 1Dan Finlay2017-07-281-1/+1
| | | | * | | | | Ensure loading indication is full screenDan Finlay2017-07-281-0/+1
| | | | * | | | | Fix loading indication placementDan Finlay2017-07-281-1/+1
| | | | * | | | | Remove unused parameterDan Finlay2017-07-282-2/+2
| | | | * | | | | Restore support linkDan Finlay2017-07-281-4/+4
| | | | * | | | | Fix info page formattingDan Finlay2017-07-281-6/+14
| | | | * | | | | Fix spellingDan Finlay2017-07-281-1/+1
| | | | * | | | | Remove deprecated responsive dev docsDan Finlay2017-07-282-12/+0
| | | | * | | | | Bump menu-droppo to 2.0.1Dan Finlay2017-07-281-1/+1
| | | | * | | | | Fix custom provider indicationDan Finlay2017-07-272-6/+6
| | | | * | | | | Remove object spread syntaxDan Finlay2017-07-271-7/+9
| | | | * | | | | Adjust mobile scale for smaller devicesDan Finlay2017-07-271-1/+1
| | | | * | | | | Set initial scale for mobile.Dan Finlay2017-07-273-3/+6
| | | | * | | | | Merge pull request #1831 from sdtsui/pre-merge-fixesDan Finlay2017-07-274-11/+8
| | | | |\ \ \ \ \
| | | | | * | | | | Re-center network dropdownsdtsui2017-07-272-2/+5
| | | | | * | | | | Make account selection dropdown menu scrollable when too large for viewsdtsui2017-07-271-0/+2
| | | | | * | | | | Remove Account Settings item from optionsMenu, unnecessarysdtsui2017-07-271-8/+0
| | | | | * | | | | Bump version of menu-droppo, no longer needs css transitionssdtsui2017-07-271-1/+1
| | | | |/ / / / /
| | | | * | | | | Lots of flex rearrangement on account detail viewDan Finlay2017-07-2611-134/+129
| | | | * | | | | Remove responsive folder from gulpDan Finlay2017-07-261-1/+0
| | | | * | | | | Restore sort order fixDan Finlay2017-07-252-2/+5
| | | | * | | | | Replace ui with responsive-uiDan Finlay2017-07-25138-13934/+224
| | | | * | | | | Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUIDan Finlay2017-07-251-0/+1
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge pull request #1815 from sdtsui/fix/menu-cursorkumavis2017-07-251-0/+1
| | | | | |\ \ \ \ \
| | | | | | * | | | | Add cursor to account menu buttonssdtsui2017-07-251-0/+1
| | | | | |/ / / / /
| | | | * / / / / / Css tweaksDan Finlay2017-07-252-1/+7
| | | | |/ / / / /
| | | | * | | | | Improve account-detail panel responsivenessDan Finlay2017-07-211-1/+5
| | | | * | | | | Prevent buy button from floatingDan Finlay2017-07-211-6/+0
| | | | * | | | | Make main account detail view more responsiveDan Finlay2017-07-216-8/+32
| | | | * | | | | Merge pull request #1802 from MetaMask/RestructureNewUIDan Finlay2017-07-21268-295/+645
| | | | |\ \ \ \ \
| | | | | * | | | | Fix referenceDan Finlay2017-07-212-2/+2
| | | | | * | | | | Fix css linksDan Finlay2017-07-212-4/+4
| | | | | * | | | | Merge branch 'master' into NewUIDan Finlay2017-07-2127-214/+630
| | | | | |\ \ \ \ \
| | | | | * | | | | | Move responsive ui into its own folder for easier mergesDan Finlay2017-07-21245-75/+9
| | | | |/ / / / / /
| | | | * | | | | | Merge pull request #1790 from sdtsui/newui-account-dropdownsDan Finlay2017-07-1913-589/+510
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Reorder Account Selector and Account Optionssdtsui2017-07-192-115/+128
| | | | | * | | | | | Hook up new dropdown componentssdtsui2017-07-187-184/+157
| | | | | * | | | | | Remove account options iconssdtsui2017-07-183-177/+0
| | | | | * | | | | | Remove accounts screensdtsui2017-07-184-271/+244
| | | | | * | | | | | Add new tests for dropdown componentsdtsui2017-07-181-22/+86
| | | | | * | | | | | Bump version of menu-droppo to include bugfixsdtsui2017-07-181-1/+1
| | | | | * | | | | | Fix click handlers on AccountOptionsMenussdtsui2017-07-181-5/+5
| | | | | * | | | | | Cleanupsdtsui2017-07-185-33/+108
| | | | * | | | | | | Merge pull request #1772 from sdtsui/new-dropdownkumavis2017-07-143-0/+131
| | | | |\| | | | | |
| | | | | * | | | | | Brighten dropdown menu item\'s textsdtsui2017-07-141-3/+11
| | | | | * | | | | | Add tests for new dropdown componentsdtsui2017-07-132-0/+52
| | | | | * | | | | | Implement redesigned dropdownsdtsui2017-07-131-0/+71
| | | | |/ / / / / /
| | | | * | | | | | Merge branch 'master' into NewUIDan Finlay2017-07-066-9/+17
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Make responsive UI more flexyDan Finlay2017-07-045-12/+12
| | | | * | | | | | | Add responsive UI dev guideDan Finlay2017-07-042-0/+12
| | | | * | | | | | | Get duplicate UI template workingDan Finlay2017-07-04128-11/+13683
| | | | * | | | | | | Make folder for responsive UIDan Finlay2017-07-04125-3/+57
| | | | * | | | | | | Merge branch 'master' into NewUIDan Finlay2017-07-043-24/+52
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Began creating new UI templateDan Finlay2017-07-043-1/+46
| | | | | | | | | | | * 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 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
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 18:50:45 +0800