Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ | |||||
| * | 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 |
| | | |||||
| * | 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 |
| | | |||||
* | | tests for spec | Esteban MIno | 2018-06-28 | 1 | -0/+101 |
|/ | |||||
* | 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 |
| | | |||||
| * | 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 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 |
| | | | | | |||||
| | * | | | diagnostics - rewrite bug-notifier as diagnostics-reporter | kumavis | 2018-06-06 | 1 | -5/+0 |
| | | | | | |||||
| * | | | | 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 |
| | | | | | | |||||
* | | | | | | 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 |
| |_|_|/ / |/| | | | | |||||
* | | | | | 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 |
|/ / / | |||||
* | / | Add basic e2e tests for the new UI | Whymarrh Whitby | 2018-05-25 | 5 | -2/+971 |
| |/ |/| | |||||
* | | 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 |
| | | | | | | | | | |||||
* | | | | | | | | | 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 |
| | | | | | | | | | |||||
| | * | | | | | | | Multistep Shadow Dom Query Selector for local extension id | Thomas | 2018-05-11 | 1 | -10/+10 |
| | | | | | | | | | |||||
| | * | | | | | | | Update test:screens to newest chrome extension list | Thomas | 2018-05-08 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-08 | 1 | -0/+30 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | |||||
| | * | | | | | | | Update to extension Id path for new chrome | Thomas | 2018-05-08 | 1 | -5/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove waiting for button to be enabled TOU | Thomas | 2018-05-04 | 1 | -1/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'e2e-tests' of https://github.com/tmashuang/metamask-extension ↵ | Thomas | 2018-05-04 | 13 | -226/+258 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into e2e-tests | ||||
| | | * | | | | | | | Add a comment on the confirmation transaction metamask popup showing blank, ↵ | Thomas | 2018-05-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but button still renders | ||||
| | | * | | | | | | | Quit chromedriver after test | Thomas | 2018-05-04 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-04 | 11 | -223/+254 |
| | | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Increase timeout for TOU scroll | Thomas | 2018-05-04 | 1 | -1/+1 |
| | |/ / / / / / / / | |||||
| | * | | | | | | | | Reduce delay for installing firefox addon | Thomas | 2018-05-04 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add Timeouts for driver.wait | Thomas | 2018-05-04 | 1 | -9/+8 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Test wit driver.wait | Thomas | 2018-05-04 | 1 | -18/+21 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Delay around the addon install | Thomas | 2018-05-02 | 1 | -2/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | test increase timeout | Thomas | 2018-05-02 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Async/await installing extension | Thomas | 2018-05-02 | 1 | -4/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Firefox | Thomas | 2018-05-02 | 4 | -147/+638 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | test - network controller - remove tests for deprecated APIs + update tests | kumavis | 2018-05-03 | 1 | -25/+5 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | add time stamps to transaction history log entries | Csaba Solya | 2018-05-10 | 3 | -65/+129 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | transactions - add a nonce check utility for ui use | frankiebee | 2018-05-02 | 1 | -0/+30 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4116 from MetaMask/test-unit-ganache | Thomas Huang | 2018-05-01 | 3 | -16/+32 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Test - Move unit tests to ganache-core | ||||
| * | | | | | | test - unit - send from test accounts to avoid not-enough-balance error from ↵ | kumavis | 2018-04-28 | 2 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ganache | ||||
| * | | | | | | test - unit - use ganache instead of deprecated block-tracker test util | kumavis | 2018-04-28 | 1 | -4/+20 |
| | | | | | | | |||||
* | | | | | | | Verify identities state after restoring new accounts (#4091) | Paul Bouchon | 2018-04-30 | 1 | -8/+25 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4110 from MetaMask/master | kumavis | 2018-04-28 | 8 | -173/+164 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Develop - Add commits to develop that are already in Master | ||||
| * \ \ \ \ \ | Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3 | kumavis | 2018-04-26 | 8 | -173/+164 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | docs and file organization for txController | ||||
| | * | | | | | Merge branch 'master' into tx-controller-rewrite-v3 | frankiebee | 2018-04-20 | 9 | -20/+165 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | * | | | | | meta - transactions - code clean up and jsDoc | frankiebee | 2018-04-14 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | meta - transactions - create a transactions dir in controller and move ↵ | frankiebee | 2018-04-11 | 8 | -171/+162 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | relevant files into it | ||||
* | | | | | | | Allow transactions with 0-gwei gas price (#4073) | Paul Bouchon | 2018-04-27 | 1 | -26/+33 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow transactions with 0-gwei gas price * Add tests to verify tx with 0 gas fee * Conditionally use CurrencyInput in CurrencyDisplay | ||||
* | / / / / | Clean up network config | Alexander Tseung | 2018-04-24 | 1 | -1/+41 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #3998 from MetaMask/i3988-checksummed-address | Dan Finlay | 2018-04-19 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Show checksum addresses on UI | ||||
| * | | | | | Show checksummed addresses throughout the UI | bitpshr | 2018-04-18 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into i3580-InternationalizeCurrency | Dan Finlay | 2018-04-18 | 3 | -0/+69 |
|\| | | | | | |||||
| * | | | | | Disable token price polling when no client is active | bitpshr | 2018-04-17 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Maintain token prices using a background service | bitpshr | 2018-04-16 | 1 | -0/+28 |
| | | | | | | |||||
| * | | | | | Add tests for ComposableObservableStore | bitpshr | 2018-04-14 | 1 | -0/+35 |
| | | | | | | |||||
| * | | | | | Add ComposableObservableStore for subscription management | bitpshr | 2018-04-13 | 1 | -0/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Add basic currency localization test. | Dan | 2018-04-10 | 1 | -0/+28 |
| | | | | | |||||
* | | | | | Fix integration tests so that they check for localize currency. | Dan | 2018-04-10 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | Merge branch 'master' into i3580-InternationalizeCurrency | Dan | 2018-04-10 | 10 | -72/+261 |
|\| | | | | |||||
| * | | | | Merge pull request #3921 from MetaMask/gh-3736-react-router | kumavis | 2018-04-10 | 3 | -15/+36 |
| |\ \ \ \ | | |/ / / | |/| | | | Add react-router integration | ||||
| | * | | | Fix integration tests | Alexander Tseung | 2018-04-07 | 2 | -15/+33 |
| | | | | | |||||
| | * | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-06 | 5 | -11/+109 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | cb-254 | ||||
| | * | | | | Revert "commit" | Alexander Tseung | 2018-04-06 | 3 | -17/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fa8500e09ad599837f6ad1b2dfc3530195a03b33. | ||||
| | * | | | | commit | Alexander Tseung | 2018-04-06 | 3 | -5/+17 |
| | | | | | | |||||
| | * | | | | Fix confirm-sig-requests integration test | Alexander Tseung | 2018-04-05 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-05 | 3 | -53/+115 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | cb-254 | ||||
| | * | | | | | Fix integration tests | Alexander Tseung | 2018-04-05 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | migrations - back fixes | frankiebee | 2018-04-06 | 1 | -1/+9 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | create migration 25 | frankiebee | 2018-04-06 | 2 | -3/+50 |
| | | | | | | |||||
| * | | | | | test - run live migrations over first time state | frankiebee | 2018-04-06 | 1 | -4/+25 |
| | | | | | | |||||
| * | | | | | meta - create a migration template | frankiebee | 2018-04-06 | 1 | -0/+17 |
| | | | | | | |||||
| * | | | | | Merge pull request #3887 from MetaMask/i#3886 | kumavis | 2018-04-06 | 1 | -8/+9 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | transactions - remove unnecessary keys on txParams | ||||
| | * | | | | | transactions - _normalizeTxParams will now return a new object for txParams | frankiebee | 2018-04-06 | 1 | -9/+9 |
| | | | | | | | |||||
| | * | | | | | transactions - remove unnecessary keys on txParams | frankiebee | 2018-04-05 | 1 | -1/+2 |
| | | |/ / / | | |/| | | | |||||
| * / | | | | make migration-24 compat with first-time-state | frankiebee | 2018-04-06 | 1 | -0/+12 |
| |/ / / / | |||||
| * | | | | transactions - make #_validateTxParams not async and "linting" wink wink ↵ | frankiebee | 2018-04-05 | 1 | -11/+8 |
| | | | | | | | | | | | | | | | | | | | | nudge nudge | ||||
| * | | | | hot-fix - migrate unaproved txParams so that the from is lowercase | frankiebee | 2018-04-05 | 1 | -0/+37 |
| | | | | | |||||
| * | | | | transactions - normalize txParams | frankiebee | 2018-04-05 | 2 | -44/+72 |
| |/ / / | |||||
| * | | | Merge pull request #3834 from MetaMask/3734 | kumavis | 2018-04-04 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Address Add Token design feedback | ||||
| | * | | | Fix tests | David Yoo | 2018-04-03 | 1 | -1/+1 |
| | |/ / | |||||
* | | | | Fix and improve test | Dan Finlay | 2018-04-04 | 1 | -2/+12 |
| | | | | |||||
* | | | | Internationalize currency | Dan Finlay | 2018-04-04 | 1 | -0/+17 |
|/ / / | | | | | | | | | | Fixes #3580 | ||||
* | | | Merge pull request #3831 from MetaMask/i#3770 | Frankie | 2018-04-03 | 2 | -2/+28 |
|\ \ \ | | | | | | | | | some more transaction validation bug fixes | ||||
| * | | | tests - fix txController tests so that txMetas have a from feild | frankiebee | 2018-04-03 | 1 | -2/+4 |
| | | | | |||||
| * | | | transactions validationt - valdate from field on txParams | frankiebee | 2018-04-03 | 1 | -0/+24 |
| |/ / | |||||
* | | | ci:screens - turn on repeat in walkthrough gif | kumavis | 2018-04-03 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 1 | -0/+61 |
|\| | | |||||
| * | | Merge pull request #3801 from danjm/i3684-txlistitemstest | kumavis | 2018-03-31 | 1 | -0/+61 |
| |\ \ | | | | | | | | | Adds integration tests for different tx list items | ||||
| | * | | Adds integration tests for rendering of tx list items. | Dan | 2018-03-30 | 1 | -0/+61 |
| | | | | |||||
* | | | | ci - screens - increase delay before setting provider type | kumavis | 2018-03-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | ci - screens - add delay after setting network | kumavis | 2018-03-31 | 1 | -0/+1 |
| | | | | |||||
* | | | | development - ci-screens - remove mocha wrapper that was losing exit code | kumavis | 2018-03-31 | 2 | -116/+11 |
| | | | | |||||
* | | | | development - screens - fix screenshot on failure | kumavis | 2018-03-31 | 1 | -3/+4 |
| | | | | |||||
* | | | | development - screens - screenshot on failure | kumavis | 2018-03-31 | 1 | -4/+25 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-03-31 | 1 | -1/+1 |
|\| | | | |||||
| * | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-03-30 | 2 | -23/+76 |
| |\| | | | | | | | | | | | | | | ci-artifacts | ||||
| * | | | ui - change window title 'MetaMask Plugin' to 'MetaMask' | kumavis | 2018-03-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | test - e2e - set network to localhost | kumavis | 2018-03-31 | 1 | -0/+6 |
| | | | | |||||
* | | | | development - screens - use localhost for network | kumavis | 2018-03-31 | 1 | -3/+12 |
| | | | | |||||
* | | | | development - screenshotter - capture en locale and build gif from only en | kumavis | 2018-03-30 | 1 | -7/+8 |
| | | | | |||||
* | | | | development - screenshotter - capture screens across all locales | kumavis | 2018-03-30 | 1 | -13/+30 |
| | | | | |||||
* | | | | development - create selenium screen shotter | kumavis | 2018-03-30 | 1 | -45/+77 |
| | | | | |||||
* | | | | test - add auto screen shotter | kumavis | 2018-03-30 | 3 | -0/+271 |
| |/ / |/| | | |||||
* | | | Merge branch 'master' into e2e-selector | kumavis | 2018-03-30 | 2 | -2/+41 |
|\ \ \ | |||||
| * \ \ | Merge pull request #3794 from MetaMask/e2e-selector | Thomas Huang | 2018-03-30 | 1 | -17/+16 |
| |\ \ \ | | | | | | | | | | | test - e2e - prefer css selectors over xpath | ||||
| | * | | | Better delays and fix logout css selector | Thomas | 2018-03-30 | 1 | -3/+6 |
| | | | | |