aboutsummaryrefslogtreecommitdiffstats
path: root/test
Commit message (Expand)AuthorAgeFilesLines
* feature: integrate gaba/CurrencyRateController (#6570)Paul Bouchon2019-06-012-80/+7
* transactions/deps - use broken out nonce-tracker module (#6555)Frankie2019-05-211-238/+0
* Improved UX for sweeping accounts (#6488)Etienne Dusseault2019-05-211-3/+21
* drop transactions who's nonce is lower then the known network nonce but were ...Frankie2019-05-161-5/+67
* Adds e2e test for removing imported accounts. (#6615)Dan J Miller2019-05-161-2/+53
* feature: integrate gaba/ShapeShiftController (#6569)Paul Bouchon2019-05-151-1/+1
* Set a default value for code in _determineTransactionCategory (#6604)Dan J Miller2019-05-154-15/+259
* Merge pull request #6568 from MetaMask/feature/gaba-phishing-controllerThomas Huang2019-05-112-58/+1
|\
| * feature: integrate gaba/PhishingControllerbitpshr2019-05-092-58/+1
* | New settings custom rpc form (#6490)Dan J Miller2019-05-102-5/+8
|/
* Check for unused function arguments (#6583)Whymarrh Whitby2019-05-0918-65/+65
* Merge pull request #6577 from MetaMask/fix-integration-testsThomas Huang2019-05-084-7/+31
|\
| * Fix fetch and ethquery mocks in integration testsDan Miller2019-05-084-7/+31
* | Remove nock#restore call from actions.spec.jsWhymarrh Whitby2019-05-081-5/+0
|/
* Make height consistent on all row in send-content (#6480)Chi Kei Chan2019-04-181-3/+0
* Update confirm to use btn-primary (#6473)Chi Kei Chan2019-04-181-1/+1
* Add token selection to the send screen (#6445)Chi Kei Chan2019-04-181-2/+2
* feature: add Goerli support (#6459)Paul Bouchon2019-04-185-5/+24
* Update buttons & colors to match design system (#6446)Chi Kei Chan2019-04-172-6/+6
* Adds e2e test for most web3 methods that dapps use (#6160)Sneh Koul2019-04-175-0/+722
* Remove NoticeController (#6382)Thomas Huang2019-04-025-196/+42
* Further e2e fixes in wake of #6364 and #6367 (#6374)Dan J Miller2019-03-291-16/+34
* Merge pull request #6364 from MetaMask/prevent-infura-requests-e2e-testsWhymarrh Whitby2019-03-294-50/+62
|\
| * Split e2e run-all commands onto multiple linesWhymarrh Whitby2019-03-291-1/+2
| * Run from-import e2e tests with additional account, to avoid conflict with acc...Dan Miller2019-03-292-4/+4
| * Use localhost instead of mainnent/infura for custom rpc tests in e2e tests.Dan Miller2019-03-291-5/+5
| * e2e: Update Contract Interaction wordingWhymarrh Whitby2019-03-291-3/+2
| * e2e: Skip approving token testWhymarrh Whitby2019-03-291-1/+1
| * e2e: Remove Privacy mode toggle stepWhymarrh Whitby2019-03-291-20/+0
| * Retry transaction list item click in 'adds multiple transactions' tests first...Dan Miller2019-03-291-1/+8
| * Default to localhost network when running e2e testsDan Miller2019-03-291-10/+0
| * Use webRequest to cancel all requests to infura in e2e tests.Dan Miller2019-03-293-6/+41
* | test - unit - ui - actions - setCompletedOnboarding - fix stub to call callbackkumavis2019-03-291-0/+2
* | lint fixkumavis2019-03-291-1/+1
* | notice-controller - make markAllNoticesRead synckumavis2019-03-291-1/+1
* | lib - nodeify - correctly wrap synchronous functionskumavis2019-03-291-4/+45
* | notices - markAllNoticesRead - use async/awaitkumavis2019-03-292-10/+6
* | Merge branch 'develop' into clearNoticeskumavis2019-03-2917-38/+39
|\|
| * E2E - Dont close window notifications (#6349)Thomas Huang2019-03-261-2/+0
| * New settings page rebased (#6333)Dan J Miller2019-03-261-4/+12
| * Replaces the coinbase link in the deposit modal with one for wyre (#6302)Dan J Miller2019-03-221-8/+3
| * Folder restructure (#6304)Chi Kei Chan2019-03-2215-24/+24
* | Remove exclusive testThomas Huang2019-03-211-1/+1
* | Clear notices when setCompletedOnboarding is calledThomas Huang2019-03-212-0/+50
|/
* mascara - remove from project (#6283)kumavis2019-03-121-17/+0
* GABA: Integrate AddressBookController (#5847)Paul Bouchon2019-03-121-54/+0
* Metametrics (#6171)Dan J Miller2019-03-058-23/+74
* First time flow updates (#6192)Dan J Miller2019-02-273-188/+135
* Show/Hide Fiat on Testnets based on User Preference (#6153)Chi Kei Chan2019-02-271-10/+28
* Delete old-ui folderWhymarrh Whitby2019-02-214-196/+0
* Adds tests for advanced gas controls on confim screen (#6144)Dan J Miller2019-02-131-1/+47
* Add e2e tests adjusting gas before sendingWhymarrh Whitby2019-02-091-10/+90
* Remove betaUI preference state, replace with completedUiMigrationWhymarrh Whitby2019-02-051-5/+3
* e2e: Use close instead of save for gas modal (#6066)Thomas Huang2019-01-301-1/+2
* Add visual indicator when displaying a cached balance (#5854)Dan J Miller2019-01-302-0/+2
* I#5956 fix2 dont overwrite existing rpc settings (#6044)Frankie2019-01-301-0/+12
* Fix bugs in e2e tests related to gas customization inputs.Dan Miller2019-01-251-14/+17
* Add integration test for ordering of shapeshift txs in history list.Dan Miller2019-01-251-7/+15
* Fix integration testsAlexander Tseung2019-01-251-12/+8
* Refactor first time flow, remove seed phrase from state (#5994)Alexander Tseung2019-01-237-63/+124
* I#5956 fix 1 (#6026)Frankie2019-01-181-0/+37
* Clean up drizzle test runner scriptWhymarrh Whitby2019-01-041-10/+21
* Revert "remove error flags from drizzle setup"Whymarrh Whitby2019-01-041-0/+4
* remove --unsafe-permBruno Barbieri2019-01-031-1/+1
* no globalsBruno Barbieri2019-01-031-3/+3
* Use sudo consistentlyBruno Barbieri2019-01-031-2/+2
* --unsafe-perm ?Bruno Barbieri2019-01-031-1/+1
* Dont use sudo to install truffleBruno Barbieri2019-01-011-1/+1
* Prevent users from changing the From field in the send screen (#5922)Alexander Tseung2018-12-141-20/+5
* Disallow loading as metamaskNetworkId (#5924)Frankie2018-12-141-2/+11
* Adds network loading retry / error screen.Dan Miller2018-12-131-2/+2
* Ensures that advanced tab gas limit reflects tx gas limitDan Miller2018-12-121-0/+16
* Improve ux for low gas price set (#5862)Dan J Miller2018-12-112-1/+18
* Group transactions by nonce (#5886)Alexander Tseung2018-12-102-20/+10
* Final gas customization fixesDan Miller2018-12-041-1/+1
* Uses more reliable api on main send screen; caches basic api results in modalDan Miller2018-12-042-1/+4
* Remove gas customization integration tests (in favour of e2e tests)Dan Miller2018-12-041-35/+0
* Update e2e tests for new gas customization modal.Dan Miller2018-12-044-20/+61
* Adds createSpeedUpTransaction to txControllerDan Miller2018-12-041-0/+67
* Adds not yet functional gas price chart.Dan Miller2018-12-041-0/+2
* Save recent network balances in local storage (#5843)Dan J Miller2018-12-011-0/+137
* Update e2e tests to handle any post-install window creationWhymarrh Whitby2018-11-273-9/+38
* Add JSDoc to closeAllWindowHandlesExcept e2e helper fnWhymarrh Whitby2018-11-271-0/+7
* Autofill gasPrice for retry attempts with either the recommended gasprice or ...Frankie2018-11-271-1/+4
* Merge pull request #5797 from MetaMask/trezor-v6Bruno Barbieri2018-11-221-30/+1
|\
| * fix merge conflictsbrunobar792018-11-2110-34/+76
| |\
| * | clean upbrunobar792018-11-151-2/+2
| * | Merge branch 'trezor-v5' of github.com:MetaMask/metamask-extension into trezo...brunobar792018-11-151-2/+2
| |\ \
| | * | testbrunobar792018-11-151-4/+0
| | * | testbrunobar792018-11-151-1/+1
| | * | testbrunobar792018-11-151-1/+1
| | * | try with custom boxbrunobar792018-11-151-1/+1
| * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-11-153-8/+20
| |\ \ \ | | |/ / | |/| |
| * | | Merge branch 'develop' into trezor-v5brunobar792018-11-149-32/+2179
| |\ \ \
| * \ \ \ fix merge conflictsbrunobar792018-11-0714-180/+234
| |\ \ \ \
| * \ \ \ \ fix merge conflictsbrunobar792018-10-216-203/+43
| |\ \ \ \ \
| * \ \ \ \ \ fix conflictsbrunobar792018-10-1734-217/+3609
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-09-069-101/+348
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-08-223-16/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ fix merge conflictsbrunobar792018-08-2118-255/+402
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix e2e testsbrunobar792018-08-111-30/+1
* | | | | | | | | | | Merge pull request #5334 from whymarrh/ui-switchWhymarrh Whitby2018-11-228-551/+37
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Remove first-time and navigate-txs integration testsWhymarrh Whitby2018-11-213-337/+0
| * | | | | | | | | | Add timeout to waitUntilXWindowHandles e2e helper fnWhymarrh Whitby2018-11-211-5/+16
| * | | | | | | | | | Update new UI e2e tests for new UI defaultWhymarrh Whitby2018-11-214-209/+21
* | | | | | | | | | | Version 5.0.3 (#5785)Dan Finlay2018-11-211-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Fix rounding issue when sending max tokens (#5695)Alexander Tseung2018-11-202-5/+5
* | | | | | | | | | Auto fail transactions that have been approved for over 12 hours (#5765)Dan Finlay2018-11-171-0/+38
* | | | | | | | | | ESLint fixes (#5775)Whymarrh Whitby2018-11-172-4/+4
* | | | | | | | | | Tx controller now uses safe event emitter (#5769)Frankie2018-11-174-24/+28
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | remove error flags from drizzle setupbrunobar792018-11-151-4/+0
* | | | | | | | | Resubmit approved transactions on new block (#5752)Dan Finlay2018-11-152-4/+20
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Update Balanc3 API (#5744)Paul Bouchon2018-11-141-9/+0
* | | | | | | | Fixes #3425: Better support for batch transactions (#5437)PaddyMc2018-11-143-5/+229
* | | | | | | | Merge pull request #5674 from MetaMask/responsive-e2e-testsThomas Huang2018-11-104-18/+376
|\ \ \ \ \ \ \ \
| * | | | | | | | Moves e2e tests for extension only behaviour to metamask-beta-responsive-ui.specDan Miller2018-11-084-18/+376
* | | | | | | | | Merge pull request #5481 from MetaMask/reducersThomas Huang2018-11-072-0/+1574
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Remove .onlyThomas2018-10-311-1/+1
| * | | | | | | | Readable tests, and set nextUnreadNotice to null when CLEAR_NOTICES is dispat...Thomas2018-10-311-23/+95
| * | | | | | | | Merge branch 'develop' into reducersThomas2018-10-3114-263/+1629
| |\| | | | | | |
| * | | | | | | | Isolate variables to individual testsThomas2018-10-311-53/+64
| * | | | | | | | ReducersThomas2018-10-102-0/+1491
* | | | | | | | | fix typobrunobar792018-11-071-1/+1
* | | | | | | | | update drizzle testsbrunobar792018-11-071-5/+20
* | | | | | | | | Update Connect Request screen design (#5644)Whymarrh Whitby2018-11-061-1/+1
* | | | | | | | | Increase timeout in Mascara testbitpshr2018-11-061-1/+1
* | | | | | | | | Fix beta e2e testsbitpshr2018-11-061-1/+1
* | | | | | | | | Cleanup after rebasebitpshr2018-11-061-1/+1
* | | | | | | | | EIP-1102: add user privacy optionbitpshr2018-11-062-29/+20
* | | | | | | | | EIP-1102: updated implementationbitpshr2018-11-065-110/+166
* | | | | | | | | Update watchAsset ERC20 validation (#5653)Esteban Miño2018-11-061-0/+26
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Add support for RPC endpoints with custom chain IDs (#5134)HackyMiner2018-10-264-11/+13
* | | | | | | | Fix blockies icons overriding contract map icons. Refactor Identicon componen...Alexander Tseung2018-10-251-36/+0
* | | | | | | | Merge pull request #5570 from alextsg/i5558-account-display-widthkumavis2018-10-214-19/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix account display width for large currency valuesAlexander Tseung2018-10-214-19/+19
* | | | | | | | | install truffle globallybrunobar792018-10-211-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #5555 from MetaMask/support-wallet-watch-assetkumavis2018-10-211-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | add support for wallet_watchAssetEsteban MIno2018-10-201-0/+5
* | | | | | | | specific add and remove methods for frequentRpcList (#5554)Esteban Miño2018-10-201-0/+19
|/ / / / / / /
* | | | | | | Extract Add Token button into its own componentWhymarrh Whitby2018-10-181-2/+2
* | | | | | | Delete add-token integration testWhymarrh Whitby2018-10-181-140/+0
* | | | | | | Adds toggle for primary currency (#5421)Alexander Tseung2018-10-174-61/+17
| |_|_|_|_|/ |/| | | | |
* | | | | | Ensure that new transactions added are using the selected addressWhymarrh Whitby2018-10-111-4/+26
* | | | | | test - add actions unit tests (#5369)Thomas Huang2018-10-102-0/+1538
* | | | | | Make all addresses EIP-55 compliant (#5379)bakaoh2018-10-101-1/+1
|/ / / / /
* | | | | tests - integration - Add Drizzle tests (#5467)Bruno Barbieri2018-10-103-2/+308
* | | | | Added account options on home screenSantiago Gonzalez Toral2018-10-101-0/+11
* | | | | Refactor buffer constructor (#5468)Noel Yoo2018-10-092-2/+2
* | | | | Fix typos (#5471)Noel Yoo2018-10-091-2/+2
* | | | | Merge pull request #5428 from alextsg/i5372-queue-orderDan Finlay2018-10-061-2/+2
|\ \ \ \ \
| * | | | | Reverse pending transactions orderAlexander Tseung2018-10-051-2/+2
* | | | | | Increase suggested gas percentile to 65 (#5359)Dan Finlay2018-10-051-1/+1
|/ / / / /
* | | | | Add ability to whitelist a blacklisted domain at runtimeWhymarrh Whitby2018-10-021-0/+15
* | | | | Fix error message shown in assertElementNotPresent e2e helper fnWhymarrh Whitby2018-10-011-3/+1
* | | | | Don't log errors extraneously in e2e testsWhymarrh Whitby2018-10-011-1/+0
* | | | | Update e2e tests for adding mutliple custom RPC endpointsWhymarrh Whitby2018-10-011-12/+2
* | | | | Switch string concatenation to template stringWhymarrh Whitby2018-10-011-1/+1
* | | | | Merge pull request #5332 from MetaMask/ui-unit-testsThomas Huang2018-09-2611-24/+1635
|\ \ \ \ \
| * | | | | Some Ui teststmashuang2018-09-2511-24/+1635
* | | | | | Bugfix: Upgrade json-rpc-engine (#5348)Paul Bouchon2018-09-261-5/+5
* | | | | | Merge pull request #5282 from MetaMask/tx-cancel-uiAlexander Tseung2018-09-251-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix integration testsAlexander Tseung2018-09-201-1/+1
* | | | | | Refactor settings page to use JSX and follow component file folder structureAlexander Tseung2018-09-201-1/+1
|/ / / / /
* | | | | Implement latest EIP-712 protocolbitpshr2018-09-141-1/+1
* | | | | Fix tests. Add className to Identicon ethLogos.Alexander Tseung2018-09-134-10/+12
* | | | | Default NoticeController ctor opts to empty objWhymarrh Whitby2018-09-121-1/+1
* | | | | Delete ConfigManager, replacing its usages with PreferencesControllerWhymarrh Whitby2018-09-125-146/+46
| |_|_|/ |/| | |
* | | | fix conflictsEsteban MIno2018-08-298-101/+238
|\ \ \ \
| * | | | Revert changes to tx-list-items.json, and to mock getTransactionCount method ...Dan Miller2018-08-281-1/+1
| * | | | Fix testsAlexander Tseung2018-08-245-13/+13
| * | | | Reduce large timeoutsAlexander Tseung2018-08-241-6/+6
| * | | | Increase e2e timeouts for firefoxAlexander Tseung2018-08-241-7/+7
| * | | | Change "Outgoing" to "Sent Ether" or "Sent Token"Alexander Tseung2018-08-241-4/+4
| * | | | Fix Firefox e2e testsAlexander Tseung2018-08-241-2/+2
| * | | | Fix integration testsAlexander Tseung2018-08-241-1/+1
| * | | | Fix e2e testsAlexander Tseung2018-08-242-14/+6
| * | | | Fix integration testsAlexander Tseung2018-08-241-1/+1
| * | | | Fix e2e testsAlexander Tseung2018-08-241-58/+78
| * | | | Fix integration testsAlexander Tseung2018-08-245-21/+18
| * | | | Fix e2e testsAlexander Tseung2018-08-241-7/+7
| * | | | Fix testsAlexander Tseung2018-08-241-10/+7
| * | | | implemented improvements to RPC historyEvgeniy Filatov2018-08-231-0/+60
| * | | | Add tabs support for PageContainerAlexander Tseung2018-08-231-1/+1
| * | | | Merge pull request #5066 from whymarrh/fix-key-exportWhymarrh Whitby2018-08-231-0/+71
| |\ \ \ \
| | * | | | Add test cases for MetaMaskController#_onKeyringControllerUpdateWhymarrh Whitby2018-08-231-0/+71
| | | |_|/ | | |/| |
| * / | | Add new variant for SenderToRecipient componentAlexander Tseung2018-08-231-2/+2
| |/ / /
* | | | watchAsset small changesEsteban MIno2018-08-281-1/+1
* | | | typo watchAsset imageUrl to imageEsteban MIno2018-08-241-7/+7
* | | | Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-223-16/+3
|\| | |
| * | | Merge pull request #5108 from MetaMask/run-ganache-with-blocktime-flagDan J Miller2018-08-222-15/+2
| |\ \ \
| | * | | Remove unnecessary checks and user actions in metamask-beta-ui.specDan Miller2018-08-222-15/+2
| | * | | Run ganache with a blocktime flag for npm:run:ganache:start.Dan Miller2018-08-221-2/+2
| | | |/ | | |/|
| * / | fix unit testsbrunobar792018-08-211-1/+1
| |/ /
* / / unit tests for watchAssetEsteban MIno2018-08-221-0/+110
|/ /
* | Merge branch 'develop' into ledger-supportBruno Barbieri2018-08-181-0/+62
|\ \
| * | Restores accounts until one with a zero balance is foundDan Matthews2018-08-171-0/+62
| * | Merge pull request #4279 from MetaMask/network-remove-provider-engineDan Finlay2018-08-1615-223/+266
| |\ \
| | * | Remove commented out code for detect-token-testThomas2018-08-151-10/+0
| | * | E2E - Dont error on browser errorsThomas2018-08-151-1/+2
| | * | Merge branch 'develop' into network-remove-provider-engineThomas2018-08-154-16/+228
| | |\|
| | * | Confirms new contract token in the popupThomas2018-08-141-6/+6
| | * | DelayThomas2018-08-091-0/+1
| | * | confirms a deplay contract tx in the popupThomas2018-08-091-0/+9
| | * | Use develop e2e beta testsThomas2018-08-081-109/+34
| | * | lint fixesfrankiebee2018-08-081-2/+2
| | * | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into...frankiebee2018-08-075-66/+48
| | |\ \
| | * \ \ Merge branch 'develop' into network-remove-provider-engine-testsThomas Huang2018-08-024-66/+140
| | |\ \ \
| | * | | | LintThomas Huang2018-07-311-2/+2
| | * | | | Set metamask controller network provider to localhostThomas Huang2018-07-313-2/+24
| | * | | | Disallow netConnections other than localhostsThomas2018-07-301-0/+4
| | * | | | Detect Tokens are weirdThomas2018-07-301-26/+31
| | * | | | Merge branch 'develop' into network-remove-provider-engineThomas2018-07-2619-301/+993
| | |\ \ \ \
| | * | | | | test - unit - remove tests for obsolete methodskumavis2018-07-041-52/+0
| | * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-0445-345/+367
| | |\ \ \ \ \
| | * | | | | | test - e2e - contract test - add logskumavis2018-07-041-7/+9
| | * | | | | | test - e2e - fix missing importkumavis2018-07-031-1/+1
| | * | | | | | test - e2e - move timingskumavis2018-07-031-1/+1
| | * | | | | | test - e2e-beta - update some api callskumavis2018-07-031-6/+4
| | * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-0312-207/+666
| | |\ \ \ \ \ \
| | * | | | | | | test - e2e - beta - from import - fix missing startup phasekumavis2018-06-121-0/+3
| | * | | | | | | test - e2e - beta - dont select localhost as it is already setkumavis2018-06-122-20/+1
| | * | | | | | | test - e2e - extensionUri should point to home.htmlkumavis2018-06-121-2/+2
| | * | | | | | | test - e2e - remove usage of extensionId from testskumavis2018-06-124-28/+12
| | * | | | | | | test - e2e - fix incomplete setup phasekumavis2018-06-122-2/+5
| | * | | | | | | test - e2e - properly export setupBrowserAndExtensionkumavis2018-06-121-0/+1
| | * | | | | | | test - e2e - more factoring of test setupkumavis2018-06-125-64/+27
| | * | | | | | | test - e2e - use fs-extra instead of fskumavis2018-06-121-1/+1
| | * | | | | | | test - e2e - factor out setup phase + rename METAMASK_CONFIG to METAMASK_TEST...kumavis2018-06-123-46/+49
| | * | | | | | | test - e2e - inject metamask config to point at localhostkumavis2018-06-121-11/+10
| | * | | | | | | test - e2e - reduce browser-specific codekumavis2018-06-121-20/+13
| | * | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-084-123/+154
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-073-0/+97
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-076-19/+49
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | test - unit - tx-controller - fix blockTracker stubkumavis2018-05-291-0/+1
| | * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-295-2/+971
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | test - unit - pending-tx-tracker - update method namekumavis2018-05-291-2/+2
| | * | | | | | | | | | | test - unit - nonce-tracker - fix blockTracker stubkumavis2018-05-291-0/+1
| | * | | | | | | | | | | controllers - transactions - merge @frankiebee's work with minekumavis2018-05-292-56/+7
| | * | | | | | | | | | | test - unit - metamask-controller - remove logkumavis2018-05-261-1/+0
| | * | | | | | | | | | | test - unit - code style nitpickkumavis2018-05-251-1/+2
| | * | | | | | | | | | | test - unit - metamask-controller - fix many bugs in testskumavis2018-05-252-33/+61
| | * | | | | | | | | | | test - unit - run ganache-server in backgroundkumavis2018-05-251-0/+7
| | * | | | | | | | | | | test - unit - tx-controller-test - add history object to txMeta when using in...kumavis2018-05-251-31/+29
| | * | | | | | | | | | | test - unit - move fetch polyfill to helperkumavis2018-05-253-6/+3
| | * | | | | | | | | | | test - unit - metamask-controller - polyfill global.fetchkumavis2018-05-251-2/+4
| | * | | | | | | | | | | test - remove .only from unit testskumavis2018-05-251-1/+1
| | * | | | | | | | | | | Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/...frankiebee2018-05-2345-2170/+1226
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-2345-2170/+1226
| | | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | transactions - update pending-tx-tracker to use the new block trackerfrankiebee2018-05-231-1/+1
| | * | | | | | | | | | | | | test pending-tx-tracker - update tests to reflect new block tracker behavior ...frankiebee2018-05-231-32/+21
| | |/ / / / / / / / / / / /