Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ui - change window title 'MetaMask Plugin' to 'MetaMask' | kumavis | 2018-03-29 | 1 | -1/+1 |
* | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra... | kumavis | 2018-03-28 | 2 | -3/+102 |
|\ | |||||
| * | Merge pull request #3758 from MetaMask/i#3731 | kumavis | 2018-03-28 | 2 | -3/+102 |
| |\ | |||||
| | * | migration for removing unnecessary transactions from state | frankiebee | 2018-03-28 | 2 | -3/+102 |
* | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra... | kumavis | 2018-03-28 | 2 | -0/+140 |
|\| | | |||||
| * | | Merge branch 'master' into selenium-e2e | Thomas Huang | 2018-03-28 | 5 | -27/+64 |
| |\| | |||||
| * | | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-22 | 6 | -13/+217 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-15 | 9 | -285/+198 |
| |\ \ \ | |||||
| * | | | | Update selenium tests | Thomas | 2018-03-10 | 1 | -9/+7 |
| * | | | | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-10 | 30 | -323/+3489 |
| |\ \ \ \ | |||||
| * | | | | | chromedriver, changed extension id(might need zip/crx file) | Thomas | 2018-01-19 | 2 | -1/+2 |
| * | | | | | Update | Thomas | 2018-01-18 | 2 | -0/+141 |
| |\ \ \ \ \ | |||||
| | * | | | | | E2E testing with selenium | tmashuang | 2017-09-13 | 2 | -0/+141 |
* | | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 4 | -11/+45 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merge pull request #3680 from danjm/i3517-popup-newui-onboarding | Thomas Huang | 2018-03-27 | 1 | -3/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix tests. | Dan | 2018-03-27 | 1 | -3/+3 |
| * | | | | | | | Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdate | Thomas Huang | 2018-03-27 | 1 | -7/+10 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into i3326-addtokenscreendesignupdate | Dan | 2018-03-27 | 3 | -17/+20 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Update add token integration tests. | Dan | 2018-03-26 | 1 | -9/+11 |
| | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #3729 from MetaMask/test-timeout-fix | Thomas Huang | 2018-03-27 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | test - remove timeout causing mocha disconnect issues | kumavis | 2018-03-27 | 1 | -1/+0 |
| | | |/ / / / / / | | |/| | | | | | | |||||
| * / | | | | | | | migration for adding submittedTime to the txMeta (#3727) | Frankie | 2018-03-27 | 1 | -0/+32 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 3 | -17/+19 |
|\| | | | | | | | |||||
| * | | | | | | | Merge pull request #3721 from alextsg/cb-944 | Dan Finlay | 2018-03-27 | 3 | -17/+17 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Update button styles | Alexander Tseung | 2018-03-26 | 3 | -17/+17 |
| | |/ / / / / / | |||||
| * / / / / / / | Use ens-input component in send-v2 to allow sending to ens names. | Dan | 2018-03-26 | 1 | -0/+2 |
| |/ / / / / / | |||||
* / / / / / / | Include locales in served test files. | Dan | 2018-03-24 | 1 | -0/+2 |
|/ / / / / / | |||||
* | | | | / | test - flat - add extra timeout, idk maybe | kumavis | 2018-03-22 | 1 | -0/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Update confirm transaction screen | Alexander Tseung | 2018-03-21 | 1 | -3/+3 |
* | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-20 | 5 | -5/+166 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #3594 from danjm/i3344-improve-currency-input | Thomas Huang | 2018-03-20 | 2 | -1/+162 |
| |\ \ \ \ \ | |||||
| | * | | | | | Use customized react-trigger-change in send-new-ui integration tests.. | Dan | 2018-03-19 | 2 | -1/+162 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Remove unused files from ui folder. (#3577) | anticlimactic | 2018-03-19 | 3 | -3/+3 |
| * | | | | | Fix styling on confirm-send-ether and confirm-send-token (#3600) | Alexander Tseung | 2018-03-17 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'master' into retry-tx-refractor | frankiebee | 2018-03-15 | 1 | -3/+1 |
|\| | | | | |||||
| * | | | | deps - use pify instead of util.promisify | kumavis | 2018-03-15 | 1 | -3/+1 |
* | | | | | Fix tests. | Dan | 2018-03-14 | 1 | -4/+4 |
* | | | | | Merge branch 'master' into retry-tx-refractor | Dan | 2018-03-14 | 9 | -286/+203 |
|\| | | | | |||||
| * | | | | test - mascara - fix async wrap | kumavis | 2018-03-12 | 1 | -1/+1 |
| * | | | | test - use new async selectors for faster testing | kumavis | 2018-03-12 | 2 | -89/+49 |
| * | | | | test - add comment about test behavior oddity | kumavis | 2018-03-12 | 2 | -4/+2 |
| * | | | | test - poll for element instead of manual timeouts | kumavis | 2018-03-12 | 4 | -189/+144 |
| * | | | | ci - split integration tests into parallel firefox and chrome runs | kumavis | 2018-03-11 | 1 | -1/+3 |
| | |_|/ | |/| | | |||||
| * | | | Merge pull request #3497 from MetaMask/testing | kumavis | 2018-03-10 | 1 | -4/+6 |
| |\ \ \ | |||||
| | * | | | Persist rinkeby.infura.io and clean nock after | Thomas | 2018-03-10 | 1 | -4/+6 |
* | | | | | tests - add tests for transactions#retryTransaction and transactions#_markNon... | frankiebee | 2018-03-14 | 1 | -1/+44 |
|/ / / / | |||||
* | | | | Merge pull request #3409 from scsaba/seed-phrase-verification | Dan Finlay | 2018-03-08 | 1 | -0/+133 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | move more test code to beforeEach | Csaba Solya | 2018-03-04 | 1 | -23/+8 |
| * | | | verify seedwords on log in | Csaba Solya | 2018-03-04 | 1 | -40/+8 |
| * | | | verify addresses regardless case | Csaba Solya | 2018-03-03 | 1 | -0/+44 |
| * | | | seed phrase verifier | Csaba Solya | 2018-03-03 | 1 | -0/+136 |
* | | | | fix typo in tests and tx-state-manager | Jeffrey Tong | 2018-03-08 | 2 | -4/+4 |
* | | | | Merge pull request #3259 from MetaMask/controllerStubs | kumavis | 2018-03-07 | 4 | -126/+1470 |
|\ \ \ \ | |||||
| * | | | | Using noop to not lose it | Thomas | 2018-02-28 | 1 | -1/+1 |
| * | | | | Revert initializing first-time-state | Thomas | 2018-02-28 | 2 | -17/+3 |
| * | | | | Network controller nock | Thomas Huang | 2018-02-16 | 1 | -24/+16 |
| * | | | | Offline testing | Thomas Huang | 2018-02-16 | 5 | -103/+1469 |
* | | | | | Merge pull request #3309 from scsaba/edge-support | Dan Finlay | 2018-03-07 | 1 | -0/+101 |
|\ \ \ \ \ | |||||
| * | | | | | fix test | Csaba Solya | 2018-02-23 | 1 | -1/+2 |
| * | | | | | add negative decrypt test | Csaba Solya | 2018-02-23 | 1 | -0/+20 |
| * | | | | | fix tests | Csaba Solya | 2018-02-23 | 1 | -6/+20 |
| * | | | | | adding tests | Csaba Solya | 2018-02-23 | 1 | -0/+66 |
| | |/ / / | |/| | | | |||||
* | | | | | Remove logs | Dan Finlay | 2018-03-03 | 1 | -1/+0 |
* | | | | | Add version bumping script | Dan Finlay | 2018-03-03 | 3 | -0/+1031 |
|/ / / / | |||||
* | | | | [NewUI] Adds the mascara first time flow to betaUI extension (#3257) | Dan J Miller | 2018-02-16 | 1 | -2/+1 |
* | | | | Merge branch 'uat' into uat-next | Dan | 2018-02-08 | 5 | -5/+112 |
|\ \ \ \ | |||||
| * | | | | Point add-token unit test to old-ui component. | Dan | 2018-02-08 | 1 | -1/+1 |
| * | | | | Merge branch 'master' into uat | Dan | 2018-02-08 | 5 | -5/+112 |
| |\| | | | |||||
| | * | | | Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputs | Frankie | 2018-02-01 | 3 | -0/+67 |
| | |\ \ \ | |||||
| | | * | | | Clean up test, remove react & mountWithStore | Thomas | 2018-01-31 | 1 | -3/+2 |
| | | * | | | Set address to default with empty string, add test validation. | Thomas | 2018-01-31 | 3 | -0/+68 |
| | * | | | | Merge branch 'master' into localStorage-clean-up | Frankie | 2018-02-01 | 1 | -0/+43 |
| | |\ \ \ \ | |||||
| | | * | | | | clean up | Bruno Barbieri | 2018-02-01 | 1 | -19/+13 |
| | | * | | | | add test for wipeTransactions | Bruno Barbieri | 2018-02-01 | 1 | -0/+49 |
| | | |/ / / | |||||
| | * | | | | remove RecentBlocks from disk | frankiebee | 2018-02-01 | 1 | -0/+1 |
| | * | | | | test for migration 021 | frankiebee | 2018-01-31 | 2 | -0/+16 |
| | |/ / / | |||||
* | | | | | Update modal header design on send screen (#3196) | Alexander Tseung | 2018-02-07 | 1 | -12/+8 |
* | | | | | Integration tests for signature requests confirmations. (#3194) | Dan J Miller | 2018-02-07 | 1 | -0/+67 |
* | | | | | Add functional integration testing to Add Token flow (#3189) | Alexander Tseung | 2018-02-06 | 2 | -0/+160 |
* | | | | | Functional Integration Tests for send ether flow. (#3119) | Dan J Miller | 2018-01-30 | 1 | -0/+229 |
|/ / / / | |||||
* | | | | Revert integration to oldUi | Thomas | 2018-01-23 | 1 | -18/+23 |
* | | | | Merge branch 'uat' into newmaster | Chi Kei Chan | 2018-01-20 | 10 | -168/+172 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch 'uat' into uat-master-011618 | Alexander Tseung | 2018-01-17 | 10 | -168/+172 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c | Alexander Tseung | 2018-01-04 | 10 | -168/+172 |
| | |\ \ | |||||
| | | * | | [NewUI] Fixes tests and sends user to NewUI after registering. (#2788) | Dan J Miller | 2017-12-22 | 2 | -3/+4 |
| | | * | | Merge branch 'master' into NewUI-flat | Dan | 2017-12-21 | 1 | -0/+48 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-12-07 | 1 | -20/+67 |
| | | |\ \ \ | |||||
| | | * | | | | Merge branch 'master' into NewUI-flat-merge-with-master | Dan | 2017-12-07 | 2 | -35/+57 |
| | | * | | | | Update to Enzyme 3.2.0 | Thomas Huang | 2017-11-26 | 5 | -10/+19 |
| | | * | | | | Merge branch 'master' into merge-master | Chi Kei Chan | 2017-11-16 | 1 | -4/+4 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Update classnames for integration tests and add output/index.css to integrati... | Dan | 2017-11-03 | 2 | -37/+24 |
| | | * | | | | | Get current NewUI-flat tests working. | Dan | 2017-11-03 | 5 | -137/+112 |
| | | * | | | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-25 | 4 | -5/+174 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'NewUI-flat' into merge | Chi Kei Chan | 2017-10-19 | 1 | -0/+32 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-04 | 3 | -56/+36 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge branch 'master' into mmn | Chi Kei Chan | 2017-09-28 | 11 | -417/+592 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-09-19 | 4 | -17/+94 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | Merge branch 'master' into nm | Chi Kei Chan | 2017-09-19 | 11 | -236/+3482 |
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ | | | | | |/| | | | | | | | |||||
| | | | * | | | | | | | | | Merge branch 'master' into NewUI-flat | kumavis | 2017-08-09 | 7 | -123/+345 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | refactored and added unit test | Simon Liang | 2017-08-08 | 1 | -0/+32 |
* | | | | | | | | | | | | | | test - createTestProviderTools includes block tracker layer | kumavis | 2018-01-18 | 4 | -21/+25 |
* | | | | | | | | | | | | | | test - tx controller - fix txGasUtil reference | kumavis | 2018-01-18 | 1 | -2/+2 |
* | | | | | | | | | | | | | | test - typo - fix spelling of word stubbed | kumavis | 2018-01-18 | 4 | -8/+8 |
* | | | | | | | | | | | | | | test - remove createEthJsQueryStub | kumavis | 2018-01-18 | 2 | -18/+3 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | test - fix to match expected behavior | frankiebee | 2018-01-15 | 1 | -14/+28 |
* | | | | | | | | | | | | | test - create ethJsQuery stub | frankiebee | 2018-01-15 | 1 | -1/+14 |
* | | | | | | | | | | | | | Add test for gas estimate default | Dan Finlay | 2018-01-09 | 1 | -0/+19 |
* | | | | | | | | | | | | | Merge pull request #2891 from MetaMask/i2621-0xRecipientAddress | Thomas Huang | 2018-01-09 | 1 | -0/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into i2621-0xRecipientAddress | Dan Finlay | 2018-01-09 | 1 | -0/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Account for 0x/empty string address and contract creation | Thomas | 2018-01-08 | 1 | -0/+32 |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #2851 from MetaMask/i2812-seedworderrorfix | Kevin Serrano | 2018-01-09 | 1 | -2/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Test for failure of the async methods. | Kevin Serrano | 2018-01-04 | 1 | -2/+20 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Fix feature to work | Dan Finlay | 2018-01-06 | 1 | -3/+5 |
* | | | | | | | | | | | | | Add test for better gas estimation | Dan Finlay | 2018-01-06 | 1 | -0/+25 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #2817 from MetaMask/i#2810 | Frankie | 2017-12-29 | 1 | -2/+61 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | tests - be more verbose in test messages | frankiebee | 2017-12-29 | 1 | -2/+2 |
| * | | | | | | | | | | | | add tests for #_checkIfNonceIsTaken | frankiebee | 2017-12-28 | 1 | -2/+61 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Add additional test to ui utils to account for exact wei values. | Kevin Serrano | 2017-12-28 | 1 | -0/+6 |
* | | | | | | | | | | | | Add test for edge case. | Kevin Serrano | 2017-12-28 | 1 | -0/+6 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | / | Add failing test for updating token details | Dan Finlay | 2017-12-19 | 1 | -0/+48 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | Add tests for exponential backoff code in _resubmitTx | Dan | 2017-12-07 | 1 | -17/+63 |
* | | | | | | | | | | Update resubmitPendingTxs tests. | Dan | 2017-12-07 | 1 | -3/+4 |
* | | | | | | | | | | Remove debugger | Dan Finlay | 2017-11-30 | 1 | -1/+0 |
* | | | | | | | | | | Add markdown class to mascara ui markdown field | Dan Finlay | 2017-11-30 | 1 | -3/+4 |
* | | | | | | | | | | Fix test reference | Dan Finlay | 2017-11-30 | 1 | -3/+3 |
* | | | | | | | | | | Make notice skipping async | Dan Finlay | 2017-11-30 | 1 | -3/+3 |
* | | | | | | | | | | Redundantly skip notices | Dan Finlay | 2017-11-30 | 1 | -25/+22 |
* | | | | | | | | | | Make test more resilient | Dan Finlay | 2017-11-30 | 1 | -3/+3 |
* | | | | | | | | | | Remove duplicate button declaration | Dan Finlay | 2017-11-30 | 1 | -2/+2 |
* | | | | | | | | | | Fix test selector | Dan Finlay | 2017-11-30 | 1 | -0/+1 |
* | | | | | | | | | | Accept all notices in integration tests | Dan Finlay | 2017-11-30 | 1 | -18/+3 |
* | | | | | | | | | | Fix test to skip screens before privacy notice | Dan Finlay | 2017-11-29 | 1 | -1/+7 |
* | | | | | | | | | | Remove logs | Dan Finlay | 2017-11-21 | 1 | -6/+0 |
* | | | | | | | | | | Get test passing | Dan Finlay | 2017-11-21 | 1 | -4/+25 |
* | | | | | | | | | | Add failing test for #2577 Seed Phrase Bug | Dan Finlay | 2017-11-21 | 1 | -0/+18 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
* | | | | | | | | | newUnaprovedTx => newUnapprovedTx | Dora E. Mondrian | 2017-11-06 | 1 | -4/+4 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Add Integration Tests | Chi Kei Chan | 2017-10-21 | 1 | -9/+50 |
* | | | | | | | | Fixing integraiton test | Chi Kei Chan | 2017-10-21 | 2 | -3/+130 |
* | | | | | | | | Fix unit test | Chi Kei Chan | 2017-10-21 | 2 | -2/+3 |
|/ / / / / / / | |||||
* | | | | | | | Revert "NetworkController refactor for new EthClient interface" | kumavis | 2017-10-19 | 3 | -12/+23 |
* | | | | | | | Move etherscan link logic into module | Dan Finlay | 2017-10-14 | 2 | -30/+0 |
* | | | | | | | nonce-tracker - use blockTracker directly | kumavis | 2017-10-12 | 1 | -3/+4 |
* | | | | | | | test - integration - intercept reload attempts | kumavis | 2017-10-11 | 1 | -0/+3 |
* | | | | | | | network-controller - use obj-proxy for providerProxy | kumavis | 2017-10-11 | 1 | -20/+5 |
* | | | | | | | Make modification | Kevin Serrano | 2017-10-10 | 1 | -1/+1 |
* | | | | | | | Fix to actually fail in earlier versions. | Kevin Serrano | 2017-10-10 | 1 | -5/+7 |
* | | | | | | | Add test to look for wei precision. | Kevin Serrano | 2017-10-10 | 1 | -0/+36 |
* | | | | | | | Merge pull request #2305 from MetaMask/nodeify | Frankie | 2017-10-07 | 1 | -4/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | nodeify - fix test | kumavis | 2017-10-07 | 1 | -4/+3 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Provide method for tx tracker to refer to all txs | Dan Finlay | 2017-10-07 | 1 | -2/+3 |
* | | | | | | | Add failing test for issue #2294 | Dan Finlay | 2017-10-07 | 1 | -1/+52 |
|/ / / / / / | |||||
* | | | | | | pending tx tracker - test - expect warning event on resubmit failure | kumavis | 2017-10-03 | 1 | -2/+9 |
* | | | | | | pending tx tracker - test - rename tests to match event name | kumavis | 2017-10-03 | 1 | -4/+4 |
* | | | | | | Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into h... | kumavis | 2017-10-03 | 1 | -3/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | tx state history - fix bug where initial snapshot was mutated on updateTx | kumavis | 2017-10-03 | 1 | -0/+22 |
* | | | | | | | tx state history - test - fix format of history entries | kumavis | 2017-10-03 | 1 | -0/+26 |
|/ / / / / / | |||||
* | | | | / | pending-tx - dont check the balance to rebrodcast | frankiebee | 2017-09-30 | 2 | -51/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #2124 from MetaMask/breakout-mascara | kumavis | 2017-09-28 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | stub platform | frankiebee | 2017-09-20 | 1 | -0/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'master' into new-currency-test | kumavis | 2017-09-28 | 9 | -404/+581 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #2194 from MetaMask/network-controller-refactor | kumavis | 2017-09-28 | 1 | -3/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | network controller - refactor to use _setProvider | kumavis | 2017-09-28 | 1 | -3/+3 |
| * | | | | | | Merge branch 'master' into direct-block-tracker | kumavis | 2017-09-28 | 5 | -233/+471 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3 | kumavis | 2017-09-28 | 5 | -233/+471 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | | * | | | | | pending-tx - move incrementing of the retryCount on the txMeta outside pendin... | frankiebee | 2017-09-27 | 1 | -1/+1 |
| | | * | | | | | fix tests | frankiebee | 2017-09-27 | 1 | -2/+2 |
| | | * | | | | | Merge branch 'transactionControllerRefractorPt3' of https://github.com/MetaMa... | frankiebee | 2017-09-27 | 1 | -14/+153 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Clean up transactionController tests | tmashuang | 2017-09-26 | 1 | -71/+53 |
| | | | * | | | | | Remove pending updateAndApprovedTransaction test | tmashuang | 2017-09-26 | 1 | -10/+0 |
| | | | * | | | | | Most of transaction controller tests | tmashuang | 2017-09-23 | 1 | -12/+180 |
| | | * | | | | | | transactions: make evnt names pretty and eaiser to read | frankiebee | 2017-09-27 | 1 | -9/+9 |
| | | * | | | | | | transactions: lint fixes and reveal status-update event for balance controller | frankiebee | 2017-09-27 | 1 | -1/+1 |
| | | * | | | | | | Merge branch 'master' into transactionControllerRefractorPt3 | frankiebee | 2017-09-27 | 12 | -113/+320 |
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||||
| | | * | | | | | | add test for pendingTxCount | frankiebee | 2017-09-14 | 1 | -0/+13 |
| | | * | | | | | | match other controller patterns | frankiebee | 2017-09-13 | 1 | -1/+1 |
| | | * | | | | | | more tests and craete a getPendingTransactions function | frankiebee | 2017-09-09 | 2 | -1/+24 |
| | | * | | | | | | Merge branch 'master' into transactionControllerRefractorPt3 | frankiebee | 2017-09-07 | 4 | -34/+243 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | add better comments | frankiebee | 2017-09-06 | 1 | -2/+2 |
| | | * | | | | | | | rename tx-utils.js -> tx-gas-utils.js | frankiebee | 2017-09-06 | 1 | -1/+1 |
| | | * | | | | | | | remove #buildEthTxFromParams | frankiebee | 2017-09-06 | 1 | -1/+3 |
| | | * | | | | | | | fix tests | frankiebee | 2017-08-22 | 1 | -4/+7 |
| | | * | | | | | | | Merge branch 'master' into transactionControllerRefractorPt3 | frankiebee | 2017-08-22 | 5 | -92/+3099 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Create tests for TxStateManager | frankiebee | 2017-08-19 | 2 | -196/+253 |
| | | | |_|_|_|_|/ / | | | |/| | | | | | | |||||
| * | / | | | | | | | style - small whitespace nitpick | kumavis | 2017-09-28 | 1 | -3/+3 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'master' into filter-fixes-moar | Dan Finlay | 2017-09-28 | 5 | -169/+104 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOut... | kumavis | 2017-09-27 | 2 | -13/+11 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | |||||
| | | * | | | | | | | Add mock random value generator | Dan Finlay | 2017-09-26 | 1 | -0/+4 |
| | | * | | | | | | | Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin in... | Dan Finlay | 2017-09-26 | 1 | -4/+1 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge branch 'master' into AddBalanceController | Dan Finlay | 2017-09-26 | 1 | -4/+1 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Implemented feedback | Dan Finlay | 2017-09-26 | 1 | -13/+7 |
| | | |/ / / / / / / / | |||||
| | * | | | | | | | | | Remove keyring controller from project | Dan Finlay | 2017-09-23 | 1 | -164/+0 |
| | * | | | | | | | | | Merge branch 'AddBalanceController' into BreakOutKeyringController | Dan Finlay | 2017-09-23 | 4 | -3/+107 |
| | |\| | | | | | | | | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | | * | | | | | | | Fix test references | Dan Finlay | 2017-09-23 | 2 | -3/+3 |
| | | * | | | | | | | Merge branch 'master' into AddBalanceController | Dan Finlay | 2017-09-23 | 4 | -17/+94 |
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | | | |||||
| | | * | | | | | | | Fix test | Dan Finlay | 2017-09-14 | 1 | -0/+5 |
| | | * | | | | | | | Merge branch 'master' into AddBalanceController | Dan Finlay | 2017-09-14 | 3 | -106/+118 |
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | | | |||||
| | | * | | | | | | | Some progress | Dan Finlay | 2017-09-13 | 1 | -0/+1 |
| | | * | | | | | | | Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController | Dan Finlay | 2017-09-12 | 1 | -0/+98 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | Improve test name | Dan Finlay | 2017-09-08 | 1 | -1/+1 |
| | | | * | | | | | | | Add test for computing gas price | Dan Finlay | 2017-09-08 | 1 | -0/+16 |
| | | | * | | | | | | | Remove logs | Dan Finlay | 2017-09-08 | 1 | -5/+0 |
| | | | * | | | | | | | Fix balance calc test | Dan Finlay | 2017-09-08 | 1 | -1/+1 |
| | | | * | | | | | | | Fix valueFor test | Dan Finlay | 2017-09-08 | 1 | -4/+5 |
| | | | * | | | | | | | Add basic test for valueFor | Dan Finlay | 2017-09-08 | 1 | -3/+22 |
| | | | * | | | | | | | test not passing | Dan Finlay | 2017-09-08 | 1 | -3/+32 |
| | | | * | | | | | | | Add first passing balance calc test | Dan Finlay | 2017-09-07 | 1 | -7/+8 |
| | | | * | | | | | | | Add test template | Dan Finlay | 2017-09-07 | 1 | -0/+37 |
| | | | | |_|_|_|/ / | | | | |/| | | | | | |||||
| * | | | | | | | | | fix test | frankiebee | 2017-09-27 | 1 | -1/+1 |
| * | | | | | | | | | wrap block tracker in events proxy | frankiebee | 2017-09-27 | 1 | -0/+1 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Modify tests for new API. | Kevin Serrano | 2017-09-27 | 1 | -10/+10 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Allow custom encryptor to be passed to MetaMaskController and KeyringControll... | Dan Finlay | 2017-09-22 | 1 | -4/+1 |
|/ / / / / / / | |||||
* | | | | | | | test - integration - bump timeout | kumavis | 2017-09-19 | 1 | -1/+1 |
* | | | | | | | tests - mascara - increase timeout before test starts | kumavis | 2017-09-16 | 1 | -1/+1 |
* | | | | | | | test - mascara - move skip reload test flag | kumavis | 2017-09-16 | 1 | -1/+0 |
* | | | | | | | tests - integration - mascara - small cleanup and timeout adjustments | kumavis | 2017-09-16 | 1 | -5/+3 |
* | | | | | | | set time if platform is mascara | frankiebee | 2017-09-16 | 1 | -2/+4 |
* | | | | | | | remove testem files | frankiebee | 2017-09-16 | 1 | -1/+1 |
* | | | | | | | dont reload on initial download and wait before passing sw to ui | frankiebee | 2017-09-16 | 1 | -2/+2 |
* | | | | | | | tests - integration - get flat and mascara tests closer to compatible | kumavis | 2017-09-14 | 2 | -9/+6 |
* | | | | | | | tests - refactor and rename npm scripts | kumavis | 2017-09-14 | 1 | -0/+0 |
* | | | | | | | tests - mascara - move temp build files into dist/mascara | kumavis | 2017-09-14 | 1 | -6/+6 |
* | | | | | | | tests - start migrating mascara tests to karma | kumavis | 2017-09-14 | 3 | -0/+81 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | tests - integration - fix bad cherry-pick | kumavis | 2017-09-12 | 1 | -16/+7 |
* | | | | | | test - integration - drop testem for karma | kumavis | 2017-09-12 | 2 | -22/+43 |
* | | | | | | test - integration - build - manually exit from test builder + add bundle des... | kumavis | 2017-09-12 | 1 | -1/+2 |
* | | | | | | test - integration - build - use pump + log bundling information | kumavis | 2017-09-12 | 1 | -6/+12 |
* | | | | | | test - integration - use async fn for error catching | kumavis | 2017-09-12 | 1 | -94/+87 |
|/ / / / / | |||||
* | | | | | Merge pull request #1987 from MetaMask/CheckFaq67 | Kevin Serrano | 2017-09-08 | 1 | -0/+19 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add test for trying to reproduce faq#67 | Dan Finlay | 2017-08-30 | 1 | -0/+19 |
* | | | | | Update mock-store dependency | tmashuang | 2017-09-07 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Add some tests to tx-state-history-helper | Dan Finlay | 2017-08-29 | 1 | -0/+26 |
* | | | | Corrected test constraints | Dan Finlay | 2017-08-24 | 1 | -2/+2 |
* | | | | Add mysterious failing test | Dan Finlay | 2017-08-24 | 1 | -0/+20 |
* | | | | Pass nonce tests | Dan Finlay | 2017-08-24 | 1 | -4/+4 |
* | | | | Fix new test, break an older maybe wrong one | Dan Finlay | 2017-08-24 | 1 | -3/+3 |
* | | | | Add failing test for newly identified error state | Dan Finlay | 2017-08-24 | 1 | -0/+17 |
* | | | | Merge branch 'master' into useLocalNonce | Dan Finlay | 2017-08-24 | 3 | -10/+3101 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #1914 from MetaMask/history-diff | Dan Finlay | 2017-08-19 | 3 | -10/+3101 |
| |\ \ \ | |||||
| | * | | | tx controller - test - fix typo from moved test | kumavis | 2017-08-15 | 1 | -3/+3 |
| | * | | | tx controller - tx state history various small fixes | kumavis | 2017-08-15 | 1 | -1/+1 |
| | * | | | tx controller - test - test tx state history in updateTx | kumavis | 2017-08-15 | 1 | -6/+18 |
| | * | | | introduce tx-state-history-helper and diff-based history | kumavis | 2017-08-15 | 3 | -5/+3084 |
| | |/ / | |||||
* | | | | Refer to pending nonces, not just their count | Dan Finlay | 2017-08-22 | 1 | -0/+15 |
* | | | | fix test | frankiebee | 2017-08-22 | 1 | -9/+9 |
* | | | | When network nonce is highest, it should be used. | Dan Finlay | 2017-08-22 | 1 | -4/+15 |
* | | | | Fix test | Dan Finlay | 2017-08-22 | 1 | -5/+5 |
* | | | | Add new assertions and de-duplicate nonce tracker generation | Dan Finlay | 2017-08-22 | 1 | -29/+73 |
* | | | | Add test for no previous txs | Dan Finlay | 2017-08-22 | 1 | -4/+25 |
* | | | | Confine mock strategy to describe block | Dan Finlay | 2017-08-22 | 1 | -35/+39 |
* | | | | Move mock txs to tx mocking class | Dan Finlay | 2017-08-22 | 2 | -35/+48 |