Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into network-remove-provider-engine-tests | Thomas Huang | 2018-08-02 | 4 | -66/+140 |
|\ | |||||
| * | Don't show an additional beta UI notification | Whymarrh Whitby | 2018-07-28 | 2 | -9/+1 |
| | | | | | | | | | | | | When a user has opted-in to the new UI from the announcement, we don't need an additional notification letting the user know that they've switched. | ||||
| * | New ui e2e tests switch to localhost provider (needed after new ui selection ↵ | Dan Miller | 2018-07-28 | 2 | -0/+20 |
| | | | | | | | | screen addition). | ||||
| * | Fix integration tests to accomodate new ui suggestion screen changes. | Dan Miller | 2018-07-28 | 1 | -0/+5 |
| | | |||||
| * | Fix e2e tests to accomodate new ui suggestion screen changes. | Dan Miller | 2018-07-28 | 3 | -57/+83 |
| | | |||||
* | | Lint | Thomas Huang | 2018-07-31 | 1 | -2/+2 |
| | | |||||
* | | Set metamask controller network provider to localhost | Thomas Huang | 2018-07-31 | 3 | -2/+24 |
| | | |||||
* | | Disallow netConnections other than localhosts | Thomas | 2018-07-30 | 1 | -0/+4 |
| | | |||||
* | | Detect Tokens are weird | Thomas | 2018-07-30 | 1 | -26/+31 |
| | | |||||
* | | Merge branch 'develop' into network-remove-provider-engine | Thomas | 2018-07-26 | 19 | -301/+993 |
|\| | |||||
| * | Updates e2e beta tests to ensure that popup window closes after confirming a ↵ | Dan Miller | 2018-07-24 | 1 | -1/+1 |
| | | | | | | | | simple send. | ||||
| * | Merge branch 'develop' into detectTokenFeature | Esteban Miño | 2018-07-21 | 18 | -299/+816 |
| |\ | |||||
| | * | Auto-detect tokens #3034 (#4683) | Esteban Miño | 2018-07-21 | 1 | -0/+120 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * detect tokens polling * network store to detect token * tests for spec * passtest-lint * fix lint * improve tests * detect tokens through infura * detect tokens when submit password and new account selected * keyring unlocked detect and unit tests * add changelog | ||||
| | * | Merge pull request #4625 from MetaMask/initial-trezor-support | Bruno Barbieri | 2018-07-20 | 3 | -0/+228 |
| | |\ | | | | | | | | | Initial trezor support | ||||
| | | * | fix browser not supported screen | brunobar79 | 2018-07-18 | 1 | -1/+1 |
| | | | | |||||
| | | * | added some e2e tests | brunobar79 | 2018-07-18 | 1 | -0/+47 |
| | | | | |||||
| | | * | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-18 | 1 | -2/+2 |
| | | |\ | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| | | * | | added tests for removeAccount | brunobar79 | 2018-07-17 | 1 | -0/+33 |
| | | | | | |||||
| | | * | | added more unit tests | brunobar79 | 2018-07-17 | 1 | -2/+55 |
| | | | | | |||||
| | | * | | added unit tests for metamaskcontroller | brunobar79 | 2018-07-17 | 1 | -0/+70 |
| | | | | | |||||
| | | * | | added test for preferences controller | brunobar79 | 2018-07-17 | 1 | -0/+25 |
| | | | | | |||||
| | * | | | Fix tests | Alexander Tseung | 2018-07-18 | 2 | -75/+8 |
| | | |/ | | |/| | |||||
| | * | | Increase clickable area and padding of Retry Transaction bar | Alexander Tseung | 2018-07-17 | 1 | -2/+2 |
| | |/ | |||||
| | * | fix tos link; | Bobby Dresser | 2018-07-13 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #4691 from MetaMask/i4404-confirm-refactor | Alexander Tseung | 2018-07-12 | 9 | -207/+501 |
| | |\ | | | | | | | | | Refactor and redesign confirm transaction views | ||||
| | | * | Wait for an element with a .tx-list-pending-item-container to be rendered ↵ | Dan | 2018-07-12 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | before attempting to select the tx-list-item. (e2e beta tests) | ||||
| | | * | Reattempt to find network selector; wait for network selector dropdown to ↵ | Dan | 2018-07-12 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | contain localhost before attempting to click. (e2e beta tests) | ||||
| | | * | Wait for submitted tx list item amounts to match the expected before ↵ | Dan | 2018-07-12 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | clicking through. (e2e beta tests) | ||||
| | | * | Fix bug in test mock signature request methods. | Dan | 2018-07-12 | 2 | -0/+3 |
| | | | | |||||
| | | * | Fix send integration tests for compatability with confirm refactor. | Dan | 2018-07-11 | 1 | -7/+7 |
| | | | | |||||
| | | * | Fix signature request tests for compatability with confirm refactor. | Dan | 2018-07-11 | 1 | -7/+5 |
| | | | | |||||
| | | * | Update e2e beta tests to cover confirm refactor changes. | Dan | 2018-07-11 | 3 | -4/+155 |
| | | | | |||||
| | | * | Fix existing e2e tests | Dan | 2018-07-11 | 1 | -11/+26 |
| | | | | |||||
| | | * | Handles window indeterminancy issues for external dapps in e2e beta tests. | Dan | 2018-07-11 | 4 | -114/+255 |
| | | | | |||||
| | | * | Fix existing unit tests | Alexander Tseung | 2018-07-08 | 1 | -61/+41 |
| | | | | |||||
| | * | | test - check that #setTxStatusRejected removes transaction from history | frankiebee | 2018-07-11 | 1 | -0/+9 |
| | | | | |||||
| | * | | test - fix for lint | frankiebee | 2018-07-11 | 1 | -5/+5 |
| | | | | |||||
| | * | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension ↵ | frankiebee | 2018-07-11 | 46 | -555/+837 |
| | |\| | | | | | | | | | | | | | into i#3896 | ||||
| | | * | Merge pull request #4648 from MetaMask/update-import-from-seed-screen | Dan J Miller | 2018-07-06 | 1 | -3/+6 |
| | | |\ | | | | | | | | | | | Update import from seed screen on new ui. | ||||
| | | | * | Update import from seed screen on new ui. | Dan | 2018-07-05 | 1 | -3/+6 |
| | | | | | |||||
| | | * | | Merge pull request #4685 from MetaMask/estimate-gasprice-background-newui | Dan J Miller | 2018-07-05 | 1 | -12/+1 |
| | | |\ \ | | | | |/ | | | |/| | Use background gas price estimation method in new ui. | ||||
| | | | * | Update new-ui-send integration tests to always explicitly set gas price. ↵ | Dan | 2018-07-05 | 1 | -12/+1 |
| | | | | | | | | | | | | | | | | | | | | (e2e tests handle auto-setting and defaults) | ||||
| | * | | | tests - fix cancle transaction test to better fit new behavior | frankiebee | 2018-06-27 | 2 | -13/+10 |
| | | | | | |||||
| | * | | | woops - remove .only | frankiebee | 2018-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Co-authored-by: @jennypollack | ||||
| | * | | | trandsactions - remove rejected transactions from history | frankiebee | 2018-06-26 | 1 | -0/+14 |
| | | | | | |||||
| | * | | | migration 27 - remove rejected transactions from state | frankiebee | 2018-06-26 | 1 | -0/+50 |
| | | | | | |||||
| * | | | | fix detection on submit password | Esteban MIno | 2018-07-21 | 1 | -6/+27 |
| | | | | | |||||
| * | | | | keyring unlocked detect and unit tests | Esteban MIno | 2018-07-20 | 1 | -6/+32 |
| | | | | | |||||
| * | | | | detect tokens when submit password and new account selected | Esteban MIno | 2018-07-20 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | detect tokens through infura | Esteban MIno | 2018-07-13 | 1 | -9/+17 |
| | | | | | |||||
| * | | | | improve tests | Esteban MIno | 2018-07-12 | 1 | -56/+49 |
| | | | | | |||||
| * | | | | fix lint | Esteban MIno | 2018-07-04 | 1 | -54/+46 |
| | | | | | |||||
| * | | | | Merge branch 'develop' into detectTokenFeature | Esteban MIno | 2018-07-04 | 46 | -542/+832 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | tests for spec | Esteban MIno | 2018-06-28 | 1 | -0/+101 |
| | |/ / | |/| | | |||||
* | | | | test - unit - remove tests for obsolete methods | kumavis | 2018-07-04 | 1 | -52/+0 |
| | | | | |||||
* | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-07-04 | 45 | -345/+367 |
|\ \ \ \ | | |/ / | |/| | | | | | | network-remove-provider-engine | ||||
| * | | | fix contract-test | brunobar79 | 2018-07-03 | 1 | -3/+7 |
| | | | | |||||
| * | | | fix unit tests | brunobar79 | 2018-07-03 | 1 | -4/+3 |
| | | | | |||||
| * | | | fix tests | brunobar79 | 2018-07-03 | 2 | -6/+12 |
| | | | | |||||
| * | | | fix warning for new-ui screen tests | brunobar79 | 2018-07-03 | 1 | -4/+2 |
| | | | | |||||
| * | | | fix warning for unit tests | brunobar79 | 2018-07-03 | 14 | -68/+35 |
| | | | | |||||
| * | | | fix test/mascara.conf.js warnings | brunobar79 | 2018-07-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix warnings for integration tests | brunobar79 | 2018-07-03 | 3 | -7/+1 |
| | | | | |||||
| * | | | fix warnings for e2e tests | brunobar79 | 2018-07-03 | 3 | -10/+8 |
| | | | | |||||
| * | | | eslint --fix . | brunobar79 | 2018-07-03 | 39 | -273/+271 |
| | | | | |||||
* | | | | test - e2e - contract test - add logs | kumavis | 2018-07-04 | 1 | -7/+9 |
| | | | | |||||
* | | | | test - e2e - fix missing import | kumavis | 2018-07-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | test - e2e - move timings | kumavis | 2018-07-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | test - e2e-beta - update some api calls | kumavis | 2018-07-03 | 1 | -6/+4 |
| | | | | |||||
* | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-07-03 | 12 | -207/+666 |
|\| | | | | | | | | | | | | | | | network-remove-provider-engine | ||||
| * | | | Improve checks for closing info page on app installation in e2e beta tests. | Dan | 2018-06-29 | 1 | -5/+11 |
| | |/ | |/| | |||||
| * | | Use supersonic instead of httpserver to serve local dapp (e2e beta tests) | Dan | 2018-06-28 | 1 | -2/+2 |
| | | | |||||
| * | | Turn off failing e2e beta assertion in firefox until bugs in ↵ | Dan | 2018-06-28 | 1 | -2/+6 |
| | | | | | | | | | | | | webdriver/geckodriver are resolved. | ||||
| * | | Update condition for backspace in customize gas step of token factory send ↵ | Dan | 2018-06-28 | 1 | -1/+4 |
| | | | | | | | | | | | | test (e2e beta). | ||||
| * | | Fix add existing token test (e2e beta tests). | Dan | 2018-06-27 | 1 | -3/+1 |
| | | | |||||
| * | | Switch to eth and back before asserting on token balance (e2e beta token tests). | Dan | 2018-06-27 | 1 | -1/+2 |
| | | | |||||
| * | | await all clicks in e2e beta tests. | Dan | 2018-06-27 | 1 | -9/+11 |
| | | | |||||
| * | | Close popup window for e2e beta token factory send test. | Dan | 2018-06-27 | 1 | -2/+3 |
| | | | |||||
| * | | Fix retype seed phrase button. | Dan | 2018-06-27 | 1 | -35/+46 |
| | | | |||||
| * | | Disable e2e beta assertion after first token addition because of firefox / ↵ | Dan | 2018-06-27 | 1 | -1/+8 |
| | | | | | | | | | | | | webdriver bug. | ||||
| * | | Pass correct params to verboseReportOnFailure in beta e2e tests. | Dan | 2018-06-27 | 1 | -1/+1 |
| | | | |||||
| * | | Add timeouts to certain beta e2e driver.waits. | Dan | 2018-06-27 | 1 | -2/+2 |
| | | | |||||
| * | | Add try catch to deal with false negative timeouts in beta e2e tests. | Dan | 2018-06-27 | 1 | -7/+22 |
| | | | |||||
| * | | Wait for element text match in metamask-beta-ui e2e send token test | Dan | 2018-06-27 | 1 | -4/+2 |
| | | | |||||
| * | | Use locally served dapp to test contract calls in e2e beta tests | Dan | 2018-06-27 | 5 | -174/+130 |
| | | | |||||
| * | | Add extra delay to e2e tests after remix page load. | Dan | 2018-06-27 | 1 | -0/+1 |
| | | | |||||
| * | | Fix send token tests in beta ui e2e tests. | Dan | 2018-06-27 | 1 | -5/+18 |
| | | | |||||
| * | | Speed up page opening and fix timeout errors on remix page opening in beta ↵ | Dan | 2018-06-27 | 2 | -13/+26 |
| | | | | | | | | | | | | e2e tests. | ||||
| * | | Add delay before regularly failing test. | Dan | 2018-06-27 | 1 | -0/+1 |
| | | | |||||
| * | | Fix element located bug in beta e2e contract method call test. | Dan | 2018-06-27 | 1 | -1/+1 |
| | | | |||||
| * | | Improve wait for buy modal render after first time flow in beta e2e tests. | Dan | 2018-06-27 | 1 | -1/+2 |
| | | | |||||
| * | | Update metamask-beta-ui e2e spec to fail on insufficient gas estimation. | Dan | 2018-06-27 | 1 | -7/+31 |
| | | | |||||
| * | | Wait for locating of submit buttons before attempting to click in ↵ | Dan | 2018-06-27 | 1 | -3/+8 |
| | | | | | | | | | | | | metamask.spec.js | ||||
| * | | Update tests to accomodate token list menu additions. | Dan | 2018-06-27 | 1 | -1/+2 |
| | | | |||||
| * | | Disable onbeforeunload alert on remix for contract integration tests. | Dan | 2018-06-27 | 1 | -0/+1 |
| | | | |||||
| * | | Adds test for hiding tokens. | Dan | 2018-06-27 | 1 | -0/+19 |
| | | | |||||
| * | | e2e beta tests for contract deployment and calling a contract method. | Dan | 2018-06-27 | 2 | -2/+135 |
| | | | |||||
| * | | Improve reliability of beta e2e tests by using webdriver apis to wait for ↵ | Dan | 2018-06-27 | 2 | -5/+12 |
| | | | | | | | | | | | | certain dom elements. | ||||
| * | | Add test for importing from private key to from-import-beta-ui.spec.js, and ↵ | Dan | 2018-06-27 | 2 | -125/+19 |
| | | | | | | | | | | | | remove non-import related tests from that file. | ||||
| * | | metamask-beta-ui.spec.js tests custom token send before searched token. | Dan | 2018-06-27 | 1 | -38/+43 |
| | | | |||||
| * | | Adds e2e tests for sending tokens from token factory. | Dan | 2018-06-27 | 1 | -3/+61 |
| | | | |||||
| * | | Adds e2e tests for sending tokens within metamask. | Dan | 2018-06-27 | 1 | -0/+44 |
| | | | |||||
| * | | Adds e2e tests for sending tokens from token factory. | Dan | 2018-06-27 | 1 | -3/+61 |
| | | | |||||
| * | | Adds e2e tests for sending tokens within metamask. | Dan | 2018-06-27 | 1 | -2/+48 |
| |/ | |||||
| * | Accept whitespace when matching token balances in e2e tests | Whymarrh Whitby | 2018-06-21 | 2 | -7/+8 |
| | | |||||
| * | Add explicit timeout for add token test | Whymarrh Whitby | 2018-06-21 | 1 | -1/+1 |
| | | |||||
| * | Update integration tests for newui gas estimation fixes. | Dan | 2018-06-19 | 1 | -2/+2 |
| | | |||||
| * | Merge pull request #4566 from MetaMask/notice-phishing | Dan Finlay | 2018-06-15 | 4 | -67/+62 |
| |\ | | | | | | | Push new notice on recent phishing incidents | ||||
| | * | test - e2e-beta - from import - handle phishing warning | kumavis | 2018-06-14 | 1 | -8/+21 |
| | | | |||||
| | * | test - e2e-beta - separate notice tests into individual tests | kumavis | 2018-06-14 | 1 | -1/+5 |
| | | | |||||
| | * | test - e2e - clear phishing warning | kumavis | 2018-06-14 | 2 | -1/+7 |
| | | | |||||
| | * | test - e2e - check for phishing warning | kumavis | 2018-06-14 | 2 | -13/+27 |
| | | | |||||
| | * | notices - replace getLatestNotice with getNextNotice | kumavis | 2018-06-14 | 1 | -46/+4 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-06-14 | 8 | -129/+252 |
| |\| | | | | | | | | | | ValidateEmptyKey | ||||
| | * | Fix e2e test Chrome profile paths | Whymarrh Whitby | 2018-06-13 | 1 | -1/+1 |
| | | | |||||
| * | | test - unit - add assertRejects to test asyncFns | kumavis | 2018-06-14 | 2 | -5/+23 |
| | | | |||||
| * | | test - unit - import strategies - properly await async methods | kumavis | 2018-06-14 | 1 | -8/+8 |
| | | | |||||
| * | | Make account import tests much more specific | Dan Finlay | 2018-06-12 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | However, they no longer seem to work. I'm unclear why this test is failing. The private key being provided should be valid. | ||||
| * | | Improve private key import tests | Dan Finlay | 2018-06-08 | 1 | -1/+25 |
| | | | |||||
| * | | Improve test formatting | Dan Finlay | 2018-06-08 | 1 | -16/+19 |
| | | | |||||
* | | | test - e2e - beta - from import - fix missing startup phase | kumavis | 2018-06-12 | 1 | -0/+3 |
| | | | |||||
* | | | test - e2e - beta - dont select localhost as it is already set | kumavis | 2018-06-12 | 2 | -20/+1 |
| | | | |||||
* | | | test - e2e - extensionUri should point to home.html | kumavis | 2018-06-12 | 1 | -2/+2 |
| | | | |||||
* | | | test - e2e - remove usage of extensionId from tests | kumavis | 2018-06-12 | 4 | -28/+12 |
| | | | |||||
* | | | test - e2e - fix incomplete setup phase | kumavis | 2018-06-12 | 2 | -2/+5 |
| | | | |||||
* | | | test - e2e - properly export setupBrowserAndExtension | kumavis | 2018-06-12 | 1 | -0/+1 |
| | | | |||||
* | | | test - e2e - more factoring of test setup | kumavis | 2018-06-12 | 5 | -64/+27 |
| | | | |||||
* | | | test - e2e - use fs-extra instead of fs | kumavis | 2018-06-12 | 1 | -1/+1 |
| | | | |||||
* | | | test - e2e - factor out setup phase + rename METAMASK_CONFIG to ↵ | kumavis | 2018-06-12 | 3 | -46/+49 |
| | | | | | | | | | | | | METAMASK_TEST_CONFIG | ||||
* | | | test - e2e - inject metamask config to point at localhost | kumavis | 2018-06-12 | 1 | -11/+10 |
| | | | |||||
* | | | test - e2e - reduce browser-specific code | kumavis | 2018-06-12 | 1 | -20/+13 |
| | | | |||||
* | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-06-08 | 4 | -123/+154 |
|\ \ \ | | |/ | |/| | | | | network-remove-provider-engine | ||||
| * | | Bump beta e2e timeouts on faucet page. | Dan | 2018-06-07 | 2 | -4/+4 |
| | | | |||||
| * | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-07 | 3 | -119/+150 |
| |\ \ | |||||
| | * \ | Merge pull request #4385 from MetaMask/ci-test-e2e-beta | kumavis | 2018-06-07 | 3 | -119/+150 |
| | |\ \ | | | | | | | | | | | CI - Add e2e-beta tests | ||||
| | | * | | Improve e2e beta tests by adding appropriate waits. | Dan | 2018-06-07 | 2 | -47/+56 |
| | | | | | |||||
| | | * | | Conditionally close info page in beta e2e tests. | Dan | 2018-06-06 | 2 | -4/+14 |
| | | | | | |||||
| | | * | | Merge remote-tracking branch 'whymarrh/ci-test-e2e-beta' into ci-test-e2e-beta | Dan | 2018-06-06 | 2 | -63/+79 |
| | | | | | |||||
| | | * | | Fix e2e beta tests to account for add-token updates and actual behaviour of ↵ | Dan | 2018-06-06 | 2 | -14/+10 |
| | | | | | | | | | | | | | | | | | | | | tab openings on installation. | ||||
| | | * | | Merge branch 'develop' into ci-test-e2e-beta | Dan | 2018-06-06 | 1 | -3/+28 |
| | | |\ \ | |||||
| | | * | | | Adjust delays in new beta e2e tests | Whymarrh Whitby | 2018-06-02 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-07 | 3 | -5/+97 |
| |\| | | | | |||||
| * | | | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-05 | 1 | -3/+33 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge branch 'i3725-refactor-send-component-' into ↵ | Dan | 2018-06-01 | 10 | -23/+997 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | i3914-fix-newui-send-gas-estimation | ||||
| | * \ \ \ \ | Merge branch 'i3725-refactor-send-component-' of ↵ | Dan | 2018-06-01 | 1 | -3/+3 |
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | github.com:MetaMask/metamask-extension into i3725-refactor-send-component- | ||||
| | | * | | | | Fix send amount field select in send-new-ui integration test. | Dan | 2018-06-01 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Fix send-new-ui gas fee display expectation. | Dan | 2018-06-01 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Fix currency display send integration tests. | Dan | 2018-05-31 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fix test to account for greater precision currency display. | Dan | 2018-05-31 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Clean up for send refactor PR. | Dan | 2018-05-25 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-05-24 | 47 | -2266/+1366 |
| |\ \ \ \ \ | |||||
| * | | | | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-05-15 | 4 | -21/+21 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-05-14 | 18 | -377/+945 |
| | | | | | | | |||||
| * | | | | | | Further refactors; includes refactor of send-v2.js and associated container | Dan | 2018-04-30 | 1 | -1/+2 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-06-07 | 3 | -0/+97 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | network-remove-provider-engine | ||||
| * | | | | | | Merge pull request #4512 from MetaMask/test-metamask-no-diagnostics | Thomas Huang | 2018-06-07 | 1 | -0/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | test - metamask-controller - disable diagnostics | ||||
| | * | | | | | | test - metamask-controller - disable diagnostics | kumavis | 2018-06-06 | 1 | -0/+3 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merge pull request #4414 from scsaba/recipient-blacklist | kumavis | 2018-06-07 | 2 | -0/+94 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Disallow sending to ganache default accounts on main net | ||||
| | * | | | | | remove generating blocked accounts and use a config file instead | Csaba Solya | 2018-05-31 | 1 | -11/+10 |
| | | | | | | | |||||
| | * | | | | | adding tests for recipient blacklist checker | Csaba Solya | 2018-05-30 | 1 | -0/+78 |
| | | | | | | | |||||
| | * | | | | | adding transaction controller tests | Csaba Solya | 2018-05-30 | 1 | -0/+17 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-06-07 | 6 | -19/+49 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine | ||||
| * | | | | | | diagnostics - rewrite bug-notifier as diagnostics-reporter | kumavis | 2018-06-06 | 1 | -5/+0 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Mock notifier in test | Dan Finlay | 2018-06-05 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Add failing test for unknown identity entry | Dan Finlay | 2018-06-05 | 1 | -3/+28 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Add new alert modals | Alexander Tseung | 2018-06-01 | 4 | -12/+12 |
| | | | | | |||||
| * | | | | Delay before getting address text | Thomas | 2018-05-30 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'develop' into e2e-test | Thomas | 2018-05-30 | 1 | -6/+4 |
| |\| | | | |||||
| | * | | | ci - job-screens - use e2e funcs | kumavis | 2018-05-30 | 1 | -6/+4 |
| | | | | | |||||
| * | | | | Add account | Thomas | 2018-05-30 | 1 | -0/+6 |
| |/ / / | |||||
* | | | | test - unit - tx-controller - fix blockTracker stub | kumavis | 2018-05-29 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-29 | 5 | -2/+971 |
|\| | | | | | | | | | | | | | | | network-remove-provider-engine | ||||
| * | | | Add basic e2e tests for the new UI | Whymarrh Whitby | 2018-05-25 | 5 | -2/+971 |
| | |/ | |/| | |||||
* | | | test - unit - pending-tx-tracker - update method name | kumavis | 2018-05-29 | 1 | -2/+2 |
| | | | |||||
* | | | test - unit - nonce-tracker - fix blockTracker stub | kumavis | 2018-05-29 | 1 | -0/+1 |
| | | | |||||
* | | | controllers - transactions - merge @frankiebee's work with mine | kumavis | 2018-05-29 | 2 | -56/+7 |
| | | | |||||
* | | | test - unit - metamask-controller - remove log | kumavis | 2018-05-26 | 1 | -1/+0 |
| | | | |||||
* | | | test - unit - code style nitpick | kumavis | 2018-05-25 | 1 | -1/+2 |
| | | | |||||
* | | | test - unit - metamask-controller - fix many bugs in tests | kumavis | 2018-05-25 | 2 | -33/+61 |
| | | | |||||
* | | | test - unit - run ganache-server in background | kumavis | 2018-05-25 | 1 | -0/+7 |
| | | | |||||
* | | | test - unit - tx-controller-test - add history object to txMeta when using ↵ | kumavis | 2018-05-25 | 1 | -31/+29 |
| | | | | | | | | | | | | internal calls | ||||
* | | | test - unit - move fetch polyfill to helper | kumavis | 2018-05-25 | 3 | -6/+3 |
| | | | |||||
* | | | test - unit - metamask-controller - polyfill global.fetch | kumavis | 2018-05-25 | 1 | -2/+4 |
| | | | |||||
* | | | test - remove .only from unit tests | kumavis | 2018-05-25 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'network-remove-provider-engine' of ↵ | frankiebee | 2018-05-23 | 45 | -2170/+1226 |
|\ \ \ | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into transactions-use-new-block-tracker | ||||
| * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-23 | 45 | -2170/+1226 |
| |\| | | | | | | | | | | | | | | network-remove-provider-engine | ||||
| | * | | Merge pull request #4321 from MetaMask/testing | kumavis | 2018-05-23 | 35 | -1556/+690 |
| | |\ \ | | | | | | | | | | | MM controller tests and reorganizing test files | ||||
| | | * \ | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 1 | -30/+0 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 7 | -1746/+214 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 3 | -364/+81 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Moved loose some loose test files to sub folders | tmashuang | 2018-05-21 | 29 | -59/+108 |
| | | | | | | | | |||||
| | | * | | | | | signMessage and signPersonalMessage | Thomas | 2018-05-18 | 1 | -13/+33 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'develop' into testing | Thomas | 2018-05-17 | 4 | -90/+134 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'develop' into testing | Thomas | 2018-05-17 | 7 | -163/+670 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | console.log -> assert.equal | Thomas | 2018-05-09 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | ImportAccountWithStrategies Json and Keystore | Thomas | 2018-05-09 | 1 | -0/+30 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Remove approvePersonalMessage test | Thomas | 2018-05-08 | 1 | -45/+0 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge branch 'develop' into testing | Thomas | 2018-05-08 | 12 | -224/+324 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | setupUntrustedCommunication and setupTrustedCommunication | Thomas | 2018-04-25 | 1 | -0/+45 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Merge branch 'master' into testing | Thomas | 2018-04-24 | 7 | -5/+129 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | ConfigManager markAccountsFound, markPasswordForgotten, unMarkPasswordForgotten | Thomas | 2018-04-24 | 1 | -7/+70 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | resetAccount and addNewAccount | Thomas | 2018-04-20 | 1 | -0/+45 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | newUnsignedMessage and newUnsignedPersonalMessage | Thomas | 2018-04-19 | 1 | -0/+102 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Merge branch 'master' into testing | Thomas | 2018-04-11 | 13 | -50/+519 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | MM-controlller tests | Thomas | 2018-04-11 | 1 | -2/+55 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Update Sinon methods. sinon.sandbox.create() -> sandbox.createSandbox() | Thomas | 2018-04-05 | 7 | -8/+8 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Merge branch 'testing' of https://github.com/tmashuang/metamask-extension ↵ | Thomas | 2018-04-03 | 3 | -7/+466 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into testing | ||||
| | | | * | | | | | | | | | | Metamask controller methods | Thomas | 2018-03-28 | 1 | -1/+146 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | Remove console.log | Thomas | 2018-03-28 | 1 | -1/+0 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | Update blacklist | Thomas | 2018-03-28 | 1 | -5/+320 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge pull request #4333 from MetaMask/test-e2e-check-for-errors | Thomas Huang | 2018-05-23 | 1 | -1/+33 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test - e2e - check for console errors after each test | ||||
| | | * | | | | | | | | | | | | test - e2e - only inspect console for errors in chrome | kumavis | 2018-05-22 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | test - e2e - ignore 'development build of Redux' warning | kumavis | 2018-05-22 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | test - e2e - ignore 'development build of React' warning | kumavis | 2018-05-22 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | test - e2e - ignore favicon 404s | kumavis | 2018-05-22 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | test - e2e - ignore react 'unknown props dataset' warnings | kumavis | 2018-05-22 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | test - e2e - check for console errors after each test | kumavis | 2018-05-22 | 1 | -1/+17 |
| | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge pull request #4308 from MetaMask/i4232-addtoken | kumavis | 2018-05-23 | 2 | -30/+44 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update designs for Add Token screen | ||||
| | | * | | | | | | | | | | | | Fix tests | Alexander Tseung | 2018-05-21 | 2 | -30/+44 |
| | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | | ci - screens - continue screenshots through account creation + export account | kumavis | 2018-05-22 | 1 | -95/+130 |
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Reveal get filtered tx list (#4332) | Frankie | 2018-05-22 | 1 | -30/+0 |
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add getFilteredTxList from txController to getApi * transactions - remove dead code (isNonceTaken) | ||||
| | * | | | | | | | | | | Merge pull request #4034 from whymarrh/account-nicknames | kumavis | 2018-05-22 | 6 | -50/+204 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | Move account names out of KeyringController | ||||
| | | * | | | | | | | | | Fix migration 026 to produce the correct shape for state.identities | Whymarrh Whitby | 2018-05-18 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Update MetaMaskController vault restoration test for new KC api | Whymarrh Whitby | 2018-05-17 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Add migration to move identities from KeyringController | Whymarrh Whitby | 2018-05-17 | 1 | -0/+41 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Add test case for PreferencesController#setAccountLabel | Whymarrh Whitby | 2018-05-17 | 1 | -0/+21 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Add PreferencesController#setAddresses to update ids | Whymarrh Whitby | 2018-05-17 | 1 | -0/+44 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Update AddressBookController to read from preferences store | Whymarrh Whitby | 2018-05-17 | 1 | -13/+13 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Move setAccountLabel into PreferencesController | Whymarrh Whitby | 2018-05-17 | 3 | -36/+84 |
| | | |/ / / / / / / / | |||||
| | * | | | | | | | | | Merge pull request #4278 from MetaMask/e2e-tests | kumavis | 2018-05-22 | 3 | -364/+81 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | E2e tests | ||||
| | | * | | | | | | | | Adjustments for previous PR | Thomas | 2018-05-17 | 1 | -4/+4 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Testing timeouts | Thomas | 2018-05-17 | 1 | -18/+18 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-15 | 3 | -14/+26 |
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / | | | | |/| | | | | | | |||||
| | | * | | | | | | | | Merge e2e tests into one | Thomas | 2018-05-15 | 3 | -359/+77 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | transactions - update pending-tx-tracker to use the new block tracker | frankiebee | 2018-05-23 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | test pending-tx-tracker - update tests to reflect new block tracker behavior ↵ | frankiebee | 2018-05-23 | 1 | -32/+21 |
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and remove tx:confirmed event tests | ||||
* | | | | | | | | | | test - unit - network - get providerProxy via public method | kumavis | 2018-05-17 | 1 | -4/+5 |
| | | | | | | | | | | |||||
* | | | | | | | | | | network - create provider and block-tracker via json-rpc-engine | kumavis | 2018-05-17 | 1 | -4/+4 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-17 | 8 | -188/+675 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scsaba-transaction-history-timestamps | ||||
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-17 | 8 | -163/+700 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | network-controller-remove-setNetworkEndpoints | ||||
| | * | | | | | | | | Merge pull request #4251 from whymarrh/e2e-fixes | Thomas Huang | 2018-05-15 | 2 | -4/+5 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Small e2e test adjustments | ||||
| | | * | | | | | | | | e2e: Use the more reliable enter key for logging in | Whymarrh Whitby | 2018-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | e2e: Wait a bit before clicking through privacy screen | Whymarrh Whitby | 2018-05-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The network connection can take a bit so we need to wait for the spinner to go away. | ||||
| | | * | | | | | | | | e2e: Adjust the extension ID query for newer Chrome versions | Whymarrh Whitby | 2018-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | e2e: Use newest window as MM tx confirm popup | Whymarrh Whitby | 2018-05-15 | 2 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Add error message when passwords don't match in first time flow. Change ↵ | Alexander Tseung | 2018-05-14 | 2 | -17/+16 |
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | input field styling in first time flow | ||||
| | * / / / / / / / | Add new unlock screen design | Alexander Tseung | 2018-05-12 | 2 | -5/+18 |
| | |/ / / / / / / | |||||
| | * | | | | | | | Increase timeout | Thomas | 2018-05-11 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix typo | Thomas | 2018-05-11 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Job Screens with Shadow Dom Css selector | Thomas | 2018-05-11 | 3 | -6/+7 |
| | | | | | | | | |