Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4428 from MetaMask/fix-tokenlist-balance-overflow | Dan J Miller | 2018-06-05 | 2 | -4/+13 |
|\ | |||||
| * | Merge pull request #4432 from alextsg/fix-tokenlist-balance-overflow | Dan J Miller | 2018-06-02 | 1 | -5/+6 |
| |\ | |||||
| | * | Fix ellipses | Alexander Tseung | 2018-06-01 | 1 | -5/+6 |
| |/ | |||||
| * | Token name is not hidden in wallet if balance is exceptionally long. | Dan | 2018-06-01 | 2 | -3/+11 |
* | | Reduce height of notice container in onboarding (#4435) | Alexander Tseung | 2018-06-05 | 1 | -8/+9 |
* | | Indicate the current selected account on the popup account view (#4445) | Alexander Tseung | 2018-06-05 | 8 | -21/+127 |
* | | Merge pull request #4471 from MetaMask/master | Dan Finlay | 2018-06-04 | 3 | -9/+23 |
|\ \ | |||||
| * \ | Merge pull request #4470 from MetaMask/v4.7.2 | Dan Finlay | 2018-06-04 | 11 | -24/+85 |
| |\ \ | |||||
| | * | | 4.7.2 - additional changelog notesv4.7.2 | kumavis | 2018-06-04 | 1 | -0/+3 |
| | * | | 4.7.2 | kumavis | 2018-06-04 | 2 | -1/+5 |
| | * | | deps - update package-lock via npm@5.10.0 | kumavis | 2018-06-04 | 1 | -8/+15 |
| |/ / |/| | | |||||
* | | | Merge pull request #4467 from MetaMask/preferences-account-sync | Dan Finlay | 2018-06-04 | 2 | -3/+34 |
|\ \ \ | |||||
| * | | | metamask-controller - clear account labels on restore from seed phrase | kumavis | 2018-06-04 | 1 | -0/+4 |
| * | | | preferences controller - jsdoc fix | kumavis | 2018-06-04 | 1 | -2/+2 |
| * | | | metamask - update preferences controller identities on keyring controller update | kumavis | 2018-06-04 | 2 | -3/+30 |
* | | | | Merge pull request #4353 from MetaMask/publishing-guide-update | kumavis | 2018-06-04 | 1 | -7/+21 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Update publishing.md | Dan Finlay | 2018-05-24 | 1 | -5/+5 |
| * | | | Update publishing guide | Dan Finlay | 2018-05-24 | 1 | -6/+20 |
* | | | | Merge pull request #4426 from MetaMask/sentry-url-rewrite-fix | kumavis | 2018-06-04 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | sentry - message rewrite - guard against missing message | kumavis | 2018-05-31 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #4425 from MetaMask/master | kumavis | 2018-06-02 | 3 | -2/+28 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge pull request #4449 from MetaMask/Version-4.7.1 | kumavis | 2018-06-02 | 42 | -271/+434 |
| |\ \ \ | |||||
| | * | | | Version 4.7.1v4.7.1 | Dan Finlay | 2018-06-02 | 3 | -1/+22 |
| | * | | | Merge branch 'master' into develop | Dan Finlay | 2018-06-02 | 2 | -2/+7 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #4408 from MetaMask/v4.7.0rc2 | Thomas Huang | 2018-05-31 | 205 | -18582/+12645 |
| |\ \ \ \ | |||||
| | * | | | | 4.7.0v4.7.0 | kumavis | 2018-05-31 | 2 | -2/+6 |
| | * | | | | changelog - add note on brave | kumavis | 2018-05-31 | 1 | -0/+1 |
| | | |/ / | | |/| | | |||||
* | | | | | Merge pull request #4436 from MetaMask/bmd/update-zenhub-links | Dan Finlay | 2018-06-02 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | update helpscout links to zenhub | Bobby Dresser | 2018-06-01 | 2 | -2/+2 |
* | | | | | | Merge pull request #4438 from wjmelements/yarn | Dan Finlay | 2018-06-02 | 1 | -1/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | recommend yarn for node >= 10 | William Morriss | 2018-06-01 | 1 | -1/+3 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4450 from MetaMask/fix-migration-26 | Dan Finlay | 2018-06-02 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Fix return value of migration 26 when missing KC or PC | Whymarrh Whitby | 2018-06-02 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #4433 from MetaMask/i4431-error-throwing | kumavis | 2018-06-02 | 2 | -30/+24 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Properly end the middleware stack on RPC error | bitpshr | 2018-06-02 | 2 | -30/+24 |
|/ / / / | |||||
* | | | | Add new alert modals | Alexander Tseung | 2018-06-01 | 21 | -178/+309 |
* | | | | Change btn-secondary styles to btn-default. Make btn-secondary red warning st... | Alexander Tseung | 2018-06-01 | 16 | -62/+79 |
| |/ / |/| | | |||||
* | | | Merge pull request #4419 from MetaMask/deps-bump-keyring-controller | kumavis | 2018-05-31 | 2 | -8/+14 |
|\ \ \ | |||||
| * | | | deps - bump eth-keyring-controller for bugfix | kumavis | 2018-05-31 | 2 | -8/+14 |
|/ / / | |||||
* | | | Prevent loading screen from overlaying the app bar (#4417) | Alexander Tseung | 2018-05-31 | 4 | -12/+4 |
* | | | Merge pull request #4407 from MetaMask/e2e-test | kumavis | 2018-05-31 | 1 | -0/+7 |
|\ \ \ | |||||
| * | | | Delay before getting address text | Thomas | 2018-05-30 | 1 | -0/+1 |
| * | | | Merge branch 'develop' into e2e-test | Thomas | 2018-05-30 | 11 | -79/+143 |
| |\ \ \ | |||||
| * | | | | Add account | Thomas | 2018-05-30 | 1 | -0/+6 |
* | | | | | Fix error handling on incorrect password (#4401) | Alexander Tseung | 2018-05-31 | 1 | -11/+9 |
* | | | | | Merge pull request #4402 from MetaMask/danjm-changelog-update-52918 | kumavis | 2018-05-30 | 1 | -0/+11 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Update changelog | Dan J Miller | 2018-05-30 | 1 | -0/+11 |
* | | | | | Merge pull request #4403 from MetaMask/bugfix-keyring-controller | kumavis | 2018-05-30 | 3 | -55/+60 |
|\ \ \ \ \ | |||||
| * | | | | | ci - job-screens - use e2e funcs | kumavis | 2018-05-30 | 1 | -6/+4 |
| * | | | | | deps - bump eth-keyring-controller + update package-lock | kumavis | 2018-05-30 | 2 | -49/+56 |
| |/ / / / | |||||
* | | | | | Merge pull request #4374 from MetaMask/test-unit-fail-on-only | kumavis | 2018-05-30 | 2 | -1/+8 |
|\ \ \ \ \ | |||||
| * | | | | | test - unit - fail if tests contain a .only call | kumavis | 2018-05-26 | 2 | -1/+8 |
* | | | | | | Add rpc key to i18n messages (#4375) | Alexander Tseung | 2018-05-30 | 1 | -0/+3 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #4399 from MetaMask/merge-master | kumavis | 2018-05-30 | 7 | -23/+72 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-ma... | kumavis | 2018-05-30 | 7 | -23/+72 |
|/| | | | | | |/ / | |/| | | |||||
| * | | | Merge pull request #4384 from antonper/master | kumavis | 2018-05-30 | 3 | -10/+37 |
| |\ \ \ | |||||
| | * | | | cleanErrorStack moved to separate library module | Anton | 2018-05-29 | 3 | -19/+36 |
| | * | | | error message fix | Anton | 2018-05-29 | 1 | -2/+1 |
| | * | | | Clean up user rejection error message | Anton | 2018-05-28 | 1 | -3/+14 |
| |/ / / | |||||
| * | | | Merge pull request #3997 from jakubsta/master | kumavis | 2018-05-22 | 2 | -5/+12 |
| |\ \ \ | |||||
| | * | | | Update: allow other extension to connect | Jakub Stasiak | 2018-04-18 | 2 | -5/+12 |
| * | | | | Merge pull request #4140 from MetaMask/v4.6.1 | Thomas Huang | 2018-05-01 | 43 | -660/+887 |
| |\ \ \ \ | |||||
| | * | | | | Version 4.6.1 | kumavis | 2018-05-01 | 2 | -2/+9 |
| * | | | | | Merge pull request #4131 from MetaMask/emitter-cleanup | kumavis | 2018-05-01 | 1 | -7/+14 |
| |\ \ \ \ \ | |||||
| | * | | | | | require log | frankiebee | 2018-05-01 | 1 | -0/+1 |
| | * | | | | | log emitter errors | frankiebee | 2018-04-30 | 1 | -6/+10 |
| | * | | | | | transactions - run event emitters outside context of _setTxStatus | frankiebee | 2018-04-30 | 1 | -7/+9 |
* | | | | | | | Merge pull request #4394 from MetaMask/MissionStatement | kumavis | 2018-05-30 | 2 | -2/+20 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Mission v2 | Dan Finlay | 2018-05-30 | 1 | -3/+3 |
| * | | | | | | | Add mission statement v1 | Dan Finlay | 2018-05-30 | 2 | -2/+20 |
* | | | | | | | | Merge pull request #4390 from MetaMask/i18n-brave-fix | kumavis | 2018-05-30 | 1 | -4/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | i18n - getFirstPreferredLangCode - guard against missing i18n api | kumavis | 2018-05-29 | 1 | -4/+7 |
* | | | | | | | | | Add notification for dropped retry transactions (#4363) | Alexander Tseung | 2018-05-30 | 16 | -71/+317 |
* | | | | | | | | | Fix add-token token list placeholder width (#4365) | Alexander Tseung | 2018-05-30 | 1 | -0/+4 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Fix text field labels of first time flow. Add text fields to storybook (#4389) | Alexander Tseung | 2018-05-29 | 4 | -44/+84 |
* | | | | | | | | Merge pull request #4393 from MetaMask/newui-unlock-catch | kumavis | 2018-05-29 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | newui - unlock - dont catch errors unrelated to tryUnlockMetamask | kumavis | 2018-05-29 | 1 | -2/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #4391 from MetaMask/newui-imported-accounts-select-fix | kumavis | 2018-05-29 | 1 | -10/+10 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | metamask-controller - lint fix | kumavis | 2018-05-29 | 1 | -1/+1 |
| * | | | | | | | metamask-controller - update preferences controller addresses after import ac... | kumavis | 2018-05-29 | 1 | -10/+10 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #4373 from whymarrh/new-ui-e2e | kumavis | 2018-05-29 | 7 | -12/+1143 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Add basic e2e tests for the new UI | Whymarrh Whitby | 2018-05-25 | 6 | -2/+973 |
| * | | | | | | fix: Why does npm insist on reordering the lockfile? | Whymarrh Whitby | 2018-05-25 | 1 | -10/+170 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4241 from MetaMask/greenkeeper/ethjs-0.4.0 | kumavis | 2018-05-24 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | fix(package): update ethjs to version 0.4.0 | greenkeeper[bot] | 2018-05-12 | 1 | -1/+1 |
* | | | | | | Fix scrolling in Deposit Ether modal (#4336) | Alexander Tseung | 2018-05-24 | 1 | -2/+4 |
* | | | | | | Merge pull request #4337 from MetaMask/recent-blocks-parallel | Frankie | 2018-05-23 | 1 | -15/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | controllers - recent-blocks - pull first historical blocks in parallel | kumavis | 2018-05-22 | 1 | -15/+7 |
* | | | | | | | Merge pull request #4321 from MetaMask/testing | kumavis | 2018-05-23 | 36 | -1557/+691 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 6 | -53/+57 |
| |\| | | | | | | |||||
| * | | | | | | | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 9 | -13446/+22 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 23 | -1810/+342 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 8 | -548/+1503 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 | 26 | -328/+371 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into testing | Thomas | 2018-05-17 | 62 | -2419/+5812 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'testing' of https://github.com/tmashuang/metamask-extension int... | Thomas | 2018-05-17 | 245 | -5461/+19016 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | 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 | 114 | -1662/+7483 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Bump package-lock | Thomas | 2018-04-25 | 1 | -621/+186 |
| | * | | | | | | | | | | | | | setupUntrustedCommunication and setupTrustedCommunication | Thomas | 2018-04-25 | 2 | -1/+46 |
| | * | | | | | | | | | | | | | Merge branch 'master' into testing | Thomas | 2018-04-24 | 117 | -1908/+5281 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | 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 | 136 | -3068/+10732 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | 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 int... | Thomas | 2018-04-03 | 3 | -7/+466 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Update sinion methods. sandbox.create() -> createSandbox() | Thomas | 2018-04-05 | 7 | -7/+7 |
| * | | | | | | | | | | | | | | | | | Merge branch 'testing' of https://github.com/tmashuang/metamask-extension int... | Thomas | 2018-04-05 | 3 | -7/+466 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | 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 | 3 | -52/+89 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | | | | | | | old-ui - app - use state.metamask.selectedAddress instead of currentView.context | kumavis | 2018-05-22 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | | | | old-ui - ens-input - fix params passed to input | kumavis | 2018-05-22 | 1 | -48/+53 |
| * | | | | | | | | | | | | | | | | | | 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 | 52 | -1086/+1442 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Update input field border on focus | Alexander Tseung | 2018-05-22 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | | | | | Fix tests | Alexander Tseung | 2018-05-21 | 3 | -41/+50 |
| * | | | | | | | | | | | | | | | | | | Update designs for Add Token screen | Alexander Tseung | 2018-05-20 | 50 | -1056/+1401 |
* | | | | | | | | | | | | | | | | | | | Merge pull request #4338 from MetaMask/ci-job-screens-enhance | Thomas Huang | 2018-05-23 | 2 | -95/+131 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | ci - screens - continue screenshots through account creation + export account | kumavis | 2018-05-22 | 2 | -95/+131 |
|/ / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | Reveal get filtered tx list (#4332) | Frankie | 2018-05-22 | 3 | -46/+1 |
* | | | | | | | | | | | | | | | | | | Merge pull request #4297 from MetaMask/ci-publish-release | Thomas Huang | 2018-05-22 | 3 | -7/+56 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge branch 'develop' into ci-publish-release | kumavis | 2018-05-22 | 34 | -14106/+1855 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | ci - add docs publish to job-publish-release | kumavis | 2018-05-19 | 2 | -0/+10 |
| * | | | | | | | | | | | | | | | | | | docs - jsdoc - fix syntax | kumavis | 2018-05-19 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | ci - add prep-docs job | kumavis | 2018-05-19 | 1 | -0/+18 |
| * | | | | | | | | | | | | | | | | | | ci - add job-publish-release | kumavis | 2018-05-19 | 1 | -0/+21 |
| * | | | | | | | | | | | | | | | | | | ci - rename job-publish to job-publish-prerelease | kumavis | 2018-05-19 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | ci - clean - whitespace fix | kumavis | 2018-05-19 | 1 | -4/+3 |
| | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge pull request #4295 from MetaMask/kumavis-patch-3 | Frankie | 2018-05-22 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | token-util - warn via loglevel on token lookup failure | kumavis | 2018-05-19 | 1 | -1/+2 |
| |/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge pull request #4319 from MetaMask/ci-test-deps | Frankie | 2018-05-22 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | CI - remove node security test as blocker for builds | kumavis | 2018-05-22 | 1 | -2/+1 |
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge pull request #4328 from MetaMask/i4325-yarnignore | Frankie | 2018-05-22 | 1 | -13432/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | It tried to get away, but justice must be served. | Kevin Serrano | 2018-05-22 | 5 | -10/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge pull request #4326 from MetaMask/Jabher-develop | Frankie | 2018-05-22 | 3 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of https://github.com/Jabher/metamask-extension into J... | kumavis | 2018-05-22 | 3 | -6/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | bump extensionizer version to 1.0.1 (see https://github.com/MetaMask/extensio... | jabher | 2018-05-08 | 3 | -6/+6 |
| | | |_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge pull request #4329 from MetaMask/Trigalti-develop | Kevin Serrano | 2018-05-22 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of https://github.com/Trigalti/metamask-extension into... | kumavis | 2018-05-22 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Added trailing comma for eslint | simon | 2018-05-18 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | Added adyen.com to blacklisted domains because postMessages are blocking car... | simon | 2018-05-18 | 1 | -1/+2 |
| | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge pull request #4316 from MetaMask/fix-signature-request | kumavis | 2018-05-22 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Fix signature request header text | Alexander Tseung | 2018-05-21 | 1 | -2/+0 |
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge pull request #4273 from brunobar79/fix-new-ui-popup-header | kumavis | 2018-05-22 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | remove fix header height | Bruno | 2018-05-17 | 1 | -2/+0 |
| | | | | | * | | | | | | | | | | | | | Please, this is my third PR already, stop adding extra baggage. Also, remove... | Kevin Serrano | 2018-05-22 | 1 | -13432/+0 |
| |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge pull request #4240 from MetaMask/EnhancePortGuide | kumavis | 2018-05-22 | 1 | -1/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Enhance guide to porting to new platform | Dan Finlay | 2018-05-12 | 1 | -1/+12 |
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge pull request #4034 from whymarrh/account-nicknames | kumavis | 2018-05-22 | 22 | -114/+332 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fix migration 026 to produce the correct shape for state.identities | Whymarrh Whitby | 2018-05-18 | 2 | -3/+10 |
| * | | | | | | | | | | | | | | | | Update MetaMaskController vault restoration test for new KC api | Whymarrh Whitby | 2018-05-17 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | Update eth-keyring-controller dependency | Whymarrh Whitby | 2018-05-17 | 2 | -194/+1363 |
| * | | | | | | | | | | | | | | | | Add migration to move identities from KeyringController | Whymarrh Whitby | 2018-05-17 | 3 | -0/+82 |
| * | | | | | | | | | | | | | | | | 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 | 3 | -8/+66 |
| * | | | | | | | | | | | | | | | | Update AddressBookController to read from preferences store | Whymarrh Whitby | 2018-05-17 | 3 | -35/+21 |
| * | | | | | | | | | | | | | | | | Move setAccountLabel into PreferencesController | Whymarrh Whitby | 2018-05-17 | 14 | -58/+122 |
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge pull request #4278 from MetaMask/e2e-tests | kumavis | 2018-05-22 | 4 | -366/+83 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Adjustments for previous PR | Thomas | 2018-05-17 | 1 | -4/+4 |
| * | | | | | | | | | | | | | | | Testing timeouts | Thomas | 2018-05-17 | 2 | -200/+1369 |
| * | | | | | | | | | | | | | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-15 | 34 | -823/+1172 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge e2e tests into one | Thomas | 2018-05-15 | 4 | -361/+79 |
* | | | | | | | | | | | | | | | | Merge pull request #4199 from MetaMask/i3487-provider-errors | Dan Finlay | 2018-05-19 | 4 | -182/+1420 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Add new json-rpc-engine middleware for improved error handling | bitpshr | 2018-05-14 | 4 | -182/+1420 |
* | | | | | | | | | | | | | | | | Merge pull request #4266 from MetaMask/send-screen-detailed-QA-checklist | kumavis | 2018-05-17 | 1 | -0/+96 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Adds description to send-screen-QA-checklist.md | Dan | 2018-05-16 | 1 | -1/+7 |
| * | | | | | | | | | | | | | | | Adds detailed QA checklist for the New UI send screen. | Dan | 2018-05-16 | 1 | -0/+90 |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #4235 from scsaba/transaction-history-timestamps | kumavis | 2018-05-17 | 5 | -74/+143 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-... | kumavis | 2018-05-17 | 55 | -3285/+2945 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge pull request #4146 from MetaMask/sentry-error-like2 | kumavis | 2018-05-17 | 1 | -17/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | sentry - add helper to fully rewrite all error messages | kumavis | 2018-05-01 | 1 | -17/+25 |
* | | | | | | | | | | | | | | | | | Merge pull request #4255 from MetaMask/i4233-dropdowns | kumavis | 2018-05-17 | 5 | -21/+58 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Fix account and network dropdowns in confirm screen | Alexander Tseung | 2018-05-15 | 5 | -21/+58 |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge pull request #4155 from MetaMask/network-controller-remove-setNetworkEn... | kumavis | 2018-05-17 | 14 | -216/+49 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | ui - unlock - remove setNetworkEndpoints calls from new unlock screen | kumavis | 2018-05-17 | 2 | -3/+0 |
| * | | | | | | | | | | | | | | | | ui - remove files accidently added by bad merge | kumavis | 2018-05-17 | 2 | -328/+0 |
| * | | | | | | | | | | | | | | | | network - remove debugging console.log | kumavis | 2018-05-17 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network... | kumavis | 2018-05-17 | 73 | -2757/+8317 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge pull request #4251 from whymarrh/e2e-fixes | Thomas Huang | 2018-05-15 | 3 | -6/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | | | | | | Bail after the first e2e test failure | Whymarrh Whitby | 2018-05-15 | 1 | -2/+2 |
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge pull request #4245 from MetaMask/i4208-error | Kevin Serrano | 2018-05-15 | 8 | -233/+216 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Add error message when passwords don't match in first time flow. Change input... | Alexander Tseung | 2018-05-14 | 8 | -233/+216 |
|/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Merge pull request #4190 from MetaMask/i3614-unlock | Frankie | 2018-05-13 | 30 | -598/+964 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Add TextField component to storybook | Alexander Tseung | 2018-05-12 | 3 | -2/+25 |
| * | | | | | | | | | | | | | | | | Add new unlock screen design | Alexander Tseung | 2018-05-12 | 29 | -598/+941 |
|/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Merge pull request #4226 from MetaMask/e2e-tests | kumavis | 2018-05-12 | 8 | -793/+1058 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | / / / / / / / / / / / | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-12 | 5 | -1440/+607 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Chinese translation Enhancements (#4218) | Orange | 2018-05-12 | 1 | -25/+358 |
* | | | | | | | | | | | | | | | Merge pull request #4231 from MetaMask/fix-nodesecurity | kumavis | 2018-05-12 | 3 | -1414/+248 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Add advisory #157 to .nsprc | Alexander Tseung | 2018-05-11 | 1 | -1/+4 |
| * | | | | | | | | | | | | | | | Update lodash | Alexander Tseung | 2018-05-10 | 1 | -51/+51 |
| * | | | | | | | | | | | | | | | Update deep-extend and sshpk | Alexander Tseung | 2018-05-10 | 2 | -1362/+193 |
|/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-09 | 23 | -25/+3195 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | 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 | 5 | -5/+51 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | 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 i... | Thomas | 2018-05-04 | 81 | -1892/+4484 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Add a comment on the confirmation transaction metamask popup showing blank, b... | Thomas | 2018-05-04 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | Quit chromedriver after test | Thomas | 2018-05-04 | 1 | -3/+3 |
| | * | | | | | | | | | | | | | | | Bump package lock | Thomas | 2018-05-04 | 1 | -629/+285 |
| | * | | | | | | | | | | | | | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-04 | 79 | -1361/+4296 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | | | | | Ci Firefox | Thomas | 2018-05-03 | 1 | -5/+1 |
| * | | | | | | | | | | | | | | | | 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 | 7 | -216/+2543 |
| | | | | * | | | | | | | | | | | | lint - cleanup some unused variables | kumavis | 2018-05-03 | 8 | -15/+0 |
| | | | | * | | | | | | | | | | | | test - network controller - remove tests for deprecated APIs + update tests | kumavis | 2018-05-03 | 1 | -25/+5 |
| | | | | * | | | | | | | | | | | | controllers - network - move default config out of first-time-state | kumavis | 2018-05-03 | 2 | -11/+15 |
| | | | | * | | | | | | | | | | | | network - refactor to remove unnecesary code | kumavis | 2018-05-01 | 3 | -124/+29 |
| | | | | * | | | | | | | | | | | | network - remove setNetworkEndpoints | kumavis | 2018-05-01 | 10 | -45/+1 |
| | | | | * | | | | | | | | | | | | controllers - network - more semantic assert | kumavis | 2018-05-01 | 1 | -1/+1 |
| | | | | |/ / / / / / / / / / / | |||||
| | | | | | * | | | | | | | | | | tx-state-history-helper - use more readable Date.now method | kumavis | 2018-05-17 | 1 | -1/+1 |
| | | | | | * | | | | | | | | | | fix lint issues | Csaba Solya | 2018-05-10 | 2 | -2/+2 |
| | | | | | * | | | | | | | | | | remove unnecessary lib | Csaba Solya | 2018-05-10 | 1 | -1/+0 |
| | | | | | * | | | | | | | | | | revert unnecessary change in state manager | Csaba Solya | 2018-05-10 | 1 | -13/+7 |
| | | | | | * | | | | | | | | | | add time stamps to transaction history log entries | Csaba Solya | 2018-05-10 | 5 | -81/+157 |
| |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #4214 from MetaMask/tx-controller-doc-typo | Dan Finlay | 2018-05-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fix documentation typo | bitpshr | 2018-05-08 | 1 | -1/+1 |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #4196 from MetaMask/i3457-fontweight | Thomas Huang | 2018-05-09 | 11 | -22/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Change font weight from 300 to 400 | Alexander Tseung | 2018-05-06 | 11 | -22/+2 |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #4099 from MetaMask/i4043-storybook-dev2 | Thomas Huang | 2018-05-09 | 12 | -3/+3199 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Add storybook README.md file | Alexander Tseung | 2018-05-08 | 1 | -0/+10 |
| * | | | | | | | | | | | | | Add storybook integration | Alexander Tseung | 2018-05-04 | 11 | -3/+3189 |
| |/ / / / / / / / / / / / |