aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-0730-85/+300
|\
| * Merge pull request #4512 from MetaMask/test-metamask-no-diagnosticsThomas Huang2018-06-071-0/+3
| |\
| | * test - metamask-controller - disable diagnosticskumavis2018-06-061-0/+3
| * | Merge pull request #4414 from scsaba/recipient-blacklistkumavis2018-06-075-1/+137
| |\ \
| | * | remove generating blocked accounts and use a config file insteadCsaba Solya2018-05-314-29/+30
| | * | fix documentationCsaba Solya2018-05-301-1/+1
| | * | adding tests for recipient blacklist checkerCsaba Solya2018-05-303-5/+83
| | * | adding transaction controller testsCsaba Solya2018-05-302-1/+18
| | * | initial implementationCsaba Solya2018-05-302-1/+41
| * | | Merge pull request #4418 from MetaMask/handle-import-account-failure-in-uikumavis2018-06-074-19/+47
| |\ \ \
| | * \ \ Merge branch 'develop' into handle-import-account-failure-in-uiDan2018-06-0523-60/+366
| | |\ \ \
| | * \ \ \ Merge branch 'develop' into handle-import-account-failure-in-uiDan2018-06-0347-282/+458
| | |\ \ \ \
| | * | | | | Fix then-catch + error handling in import-accountDan2018-05-312-4/+2
| | * | | | | Importing account by json and private key shows error and does not change acc...Dan2018-05-314-16/+46
| * | | | | | Merge pull request #4514 from whymarrh/account-label-type-checkkumavis2018-06-071-0/+1
| |\ \ \ \ \ \
| | * | | | | | Add account type assertion to PreferencesController#setAccountLabelWhymarrh Whitby2018-06-061-0/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | i18n - ja improvements03-262018-06-077-18/+75
| * | | | | | Merge pull request #4515 from MetaMask/masterThomas Huang2018-06-072-2/+12
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #4511 from MetaMask/v4.7.4kumavis2018-06-068-49/+102
| | |\ \ \ \ \ \
| | | * | | | | | 4.7.4v4.7.4kumavis2018-06-062-1/+6
| | | * | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into v4.7.4kumavis2018-06-062-2/+7
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | | |/ / / / /
| | * | | | | | Merge pull request #4490 from MetaMask/v4.7.3Thomas Huang2018-06-0520-41/+293
| | |\ \ \ \ \ \
| | | * | | | | | changelog - add note on new modalv4.7.3kumavis2018-06-051-0/+1
| | | * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into v4.7.3kumavis2018-06-053-3/+3
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | * | | | | | 4.7.3kumavis2018-06-052-2/+6
| * | | | | | | | Merge pull request #4507 from whymarrh/fix-account-orderDan J Miller2018-06-0710-45/+25
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Fix mock addresses used for integration testsWhymarrh Whitby2018-06-066-18/+18
| | * | | | | | | Fix account list order for the old UIWhymarrh Whitby2018-06-061-2/+3
| | * | | | | | | Render the accounts in keyring orderWhymarrh Whitby2018-06-061-3/+4
| | * | | | | | | Remove unused identities reducer from UIWhymarrh Whitby2018-06-062-22/+0
| |/ / / / / / /
* | | | | | | | lint - remove unused requirekumavis2018-06-071-1/+0
* | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-0788-416/+1325
|\| | | | | | |
| * | | | | | | Merge pull request #4509 from whymarrh/wallet-view-assertionkumavis2018-06-061-5/+7
| |\ \ \ \ \ \ \
| | * | | | | | | Remove selectedIdentity prop from wallet viewWhymarrh Whitby2018-06-061-5/+3
| | * | | | | | | Ensure selectedAddress exists when render walletWhymarrh Whitby2018-06-061-0/+4
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge pull request #4506 from MetaMask/diagnostics-multivaultkumavis2018-06-065-43/+89
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | diagnostics - fix reportMultipleKeyrings callkumavis2018-06-061-1/+1
| | * | | | | | diagnostics - minor fixeskumavis2018-06-062-5/+5
| | * | | | | | lint - fix diagnostics reporterkumavis2018-06-061-1/+1
| | * | | | | | diagnostics - rewrite bug-notifier as diagnostics-reporterkumavis2018-06-065-71/+84
| | * | | | | | add multivault detection to diagnostics reportingkumavis2018-06-061-0/+33
| |/ / / / / /
| * | / / / / Update hide-token-confirmation-modal.js to use new modalState schema (#4482)Dan J Miller2018-06-053-3/+3
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #4486 from MetaMask/i4475-ClearUnknownIdentitieskumavis2018-06-055-4/+135
| |\ \ \ \ \
| | * | | | | Record identity before deleting itDan Finlay2018-06-051-1/+1
| | * | | | | Mock notifier in testDan Finlay2018-06-052-1/+7
| | * | | | | Add commentDan Finlay2018-06-051-0/+2
| | * | | | | Do not alert to userDan Finlay2018-06-051-5/+0
| | * | | | | LintedDan Finlay2018-06-052-1/+2
| | * | | | | Add bug info under metadata keyDan Finlay2018-06-051-1/+7
| | * | | | | Add first time info to bug reportDan Finlay2018-06-052-1/+5
| | * | | | | Add version to reportDan Finlay2018-06-052-4/+6
| | * | | | | Add changelog entryDan Finlay2018-06-051-0/+2
| | * | | | | Fine tune error postingDan Finlay2018-06-052-6/+2
| | * | | | | Only notify first time lost ids are detectedDan Finlay2018-06-051-2/+8
| | * | | | | Add reporting uriDan Finlay2018-06-051-1/+1
| | * | | | | Begin adding unconfigured notifierDan Finlay2018-06-052-13/+21
| | * | | | | Persist lost identities to storage for later analysisDan Finlay2018-06-052-2/+33
| | * | | | | Add minimal user notification of issue.Dan Finlay2018-06-051-1/+1
| | * | | | | Add identity synchronizing codeDan Finlay2018-06-052-1/+48
| | * | | | | Add failing test for unknown identity entryDan Finlay2018-06-051-3/+28
| |/ / / / /
| * | | | | Merge pull request #4428 from MetaMask/fix-tokenlist-balance-overflowDan J Miller2018-06-052-4/+13
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #4432 from alextsg/fix-tokenlist-balance-overflowDan J Miller2018-06-021-5/+6
| | |\ \ \ \ \
| | | * | | | | Fix ellipsesAlexander Tseung2018-06-011-5/+6
| | |/ / / / /
| | * | | | | Token name is not hidden in wallet if balance is exceptionally long.Dan2018-06-012-3/+11
| * | | | | | Reduce height of notice container in onboarding (#4435)Alexander Tseung2018-06-051-8/+9
| * | | | | | Indicate the current selected account on the popup account view (#4445)Alexander Tseung2018-06-058-21/+127
| * | | | | | Merge pull request #4471 from MetaMask/masterDan Finlay2018-06-043-9/+23
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #4470 from MetaMask/v4.7.2Dan Finlay2018-06-0411-24/+85
| | |\ \ \ \ \
| | | * | | | | 4.7.2 - additional changelog notesv4.7.2kumavis2018-06-041-0/+3
| | | * | | | | 4.7.2kumavis2018-06-042-1/+5
| | | * | | | | deps - update package-lock via npm@5.10.0kumavis2018-06-041-8/+15
| | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4467 from MetaMask/preferences-account-syncDan Finlay2018-06-042-3/+34
| |\ \ \ \ \ \
| | * | | | | | metamask-controller - clear account labels on restore from seed phrasekumavis2018-06-041-0/+4
| | * | | | | | preferences controller - jsdoc fixkumavis2018-06-041-2/+2
| | * | | | | | metamask - update preferences controller identities on keyring controller updatekumavis2018-06-042-3/+30
| * | | | | | | Merge pull request #4353 from MetaMask/publishing-guide-updatekumavis2018-06-041-7/+21
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Update publishing.mdDan Finlay2018-05-241-5/+5
| | * | | | | | Update publishing guideDan Finlay2018-05-241-6/+20
| * | | | | | | Merge pull request #4426 from MetaMask/sentry-url-rewrite-fixkumavis2018-06-041-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | sentry - message rewrite - guard against missing messagekumavis2018-05-311-1/+1
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #4425 from MetaMask/masterkumavis2018-06-023-2/+28
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge pull request #4449 from MetaMask/Version-4.7.1kumavis2018-06-0242-271/+434
| | |\ \ \ \ \
| | | * | | | | Version 4.7.1v4.7.1Dan Finlay2018-06-023-1/+22
| | | * | | | | Merge branch 'master' into developDan Finlay2018-06-022-2/+7
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge pull request #4408 from MetaMask/v4.7.0rc2Thomas Huang2018-05-31205-18582/+12645
| | |\ \ \ \ \ \
| | | * | | | | | 4.7.0v4.7.0kumavis2018-05-312-2/+6
| | | * | | | | | changelog - add note on bravekumavis2018-05-311-0/+1
| | | | |/ / / / | | | |/| | | |
| * | | | | | | Merge pull request #4436 from MetaMask/bmd/update-zenhub-linksDan Finlay2018-06-022-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | update helpscout links to zenhubBobby Dresser2018-06-012-2/+2
| * | | | | | | | Merge pull request #4438 from wjmelements/yarnDan Finlay2018-06-021-1/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | recommend yarn for node >= 10William Morriss2018-06-011-1/+3
| | |/ / / / / / /
| * | | | | | | | Merge pull request #4450 from MetaMask/fix-migration-26Dan Finlay2018-06-021-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Fix return value of migration 26 when missing KC or PCWhymarrh Whitby2018-06-021-1/+1
| |/ / / / / / /
| * | | | | | | Merge pull request #4433 from MetaMask/i4431-error-throwingkumavis2018-06-022-30/+24
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Properly end the middleware stack on RPC errorbitpshr2018-06-022-30/+24
| |/ / / / / /
| * | | | | | Add new alert modalsAlexander Tseung2018-06-0121-178/+309
| * | | | | | Change btn-secondary styles to btn-default. Make btn-secondary red warning st...Alexander Tseung2018-06-0116-62/+79
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #4419 from MetaMask/deps-bump-keyring-controllerkumavis2018-05-312-8/+14
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | deps - bump eth-keyring-controller for bugfixkumavis2018-05-312-8/+14
| |/ / / /
| * | | | Prevent loading screen from overlaying the app bar (#4417)Alexander Tseung2018-05-314-12/+4
| * | | | Merge pull request #4407 from MetaMask/e2e-testkumavis2018-05-311-0/+7
| |\ \ \ \
| | * | | | Delay before getting address textThomas2018-05-301-0/+1
| | * | | | Merge branch 'develop' into e2e-testThomas2018-05-3011-79/+143
| | |\ \ \ \
| | * | | | | Add accountThomas2018-05-301-0/+6
| * | | | | | Fix error handling on incorrect password (#4401)Alexander Tseung2018-05-311-11/+9
| | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #4402 from MetaMask/danjm-changelog-update-52918kumavis2018-05-301-0/+11
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Update changelogDan J Miller2018-05-301-0/+11
| * | | | | Merge pull request #4403 from MetaMask/bugfix-keyring-controllerkumavis2018-05-303-55/+60
| |\ \ \ \ \
| | * | | | | ci - job-screens - use e2e funcskumavis2018-05-301-6/+4
| | * | | | | deps - bump eth-keyring-controller + update package-lockkumavis2018-05-302-49/+56
| | |/ / / /
| * | | | | Merge pull request #4374 from MetaMask/test-unit-fail-on-onlykumavis2018-05-302-1/+8
| |\ \ \ \ \
| | * | | | | test - unit - fail if tests contain a .only callkumavis2018-05-262-1/+8
| * | | | | | Add rpc key to i18n messages (#4375)Alexander Tseung2018-05-301-0/+3
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #4399 from MetaMask/merge-masterkumavis2018-05-307-23/+72
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-ma...kumavis2018-05-307-23/+72
| |/| | | | | | | |/ / | | |/| |
| | * | | Merge pull request #4384 from antonper/masterkumavis2018-05-303-10/+37
| | |\ \ \
| | | * | | cleanErrorStack moved to separate library moduleAnton2018-05-293-19/+36
| | | * | | error message fixAnton2018-05-291-2/+1
| | | * | | Clean up user rejection error messageAnton2018-05-281-3/+14
| | |/ / /
| | * | | Merge pull request #3997 from jakubsta/masterkumavis2018-05-222-5/+12
| | |\ \ \
| | | * | | Update: allow other extension to connectJakub Stasiak2018-04-182-5/+12
| | * | | | Merge pull request #4140 from MetaMask/v4.6.1Thomas Huang2018-05-0143-660/+887
| | |\ \ \ \
| | | * | | | Version 4.6.1kumavis2018-05-012-2/+9
| | * | | | | Merge pull request #4131 from MetaMask/emitter-cleanupkumavis2018-05-011-7/+14
| | |\ \ \ \ \
| | | * | | | | require logfrankiebee2018-05-011-0/+1
| | | * | | | | log emitter errorsfrankiebee2018-04-301-6/+10
| | | * | | | | transactions - run event emitters outside context of _setTxStatusfrankiebee2018-04-301-7/+9
| * | | | | | | Merge pull request #4394 from MetaMask/MissionStatementkumavis2018-05-302-2/+20
| |\ \ \ \ \ \ \
| | * | | | | | | Mission v2Dan Finlay2018-05-301-3/+3
| | * | | | | | | Add mission statement v1Dan Finlay2018-05-302-2/+20
| * | | | | | | | Merge pull request #4390 from MetaMask/i18n-brave-fixkumavis2018-05-301-4/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | i18n - getFirstPreferredLangCode - guard against missing i18n apikumavis2018-05-291-4/+7
| * | | | | | | | | Add notification for dropped retry transactions (#4363)Alexander Tseung2018-05-3016-71/+317
| * | | | | | | | | Fix add-token token list placeholder width (#4365)Alexander Tseung2018-05-301-0/+4
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Fix text field labels of first time flow. Add text fields to storybook (#4389)Alexander Tseung2018-05-294-44/+84
| * | | | | | | | Merge pull request #4393 from MetaMask/newui-unlock-catchkumavis2018-05-291-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | newui - unlock - dont catch errors unrelated to tryUnlockMetamaskkumavis2018-05-291-2/+2
| | |/ / / / / / /
| * | | | | | | | Merge pull request #4391 from MetaMask/newui-imported-accounts-select-fixkumavis2018-05-291-10/+10
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | metamask-controller - lint fixkumavis2018-05-291-1/+1
| | * | | | | | | metamask-controller - update preferences controller addresses after import ac...kumavis2018-05-291-10/+10
| |/ / / / / / /
* | | | | | | | test - unit - tx-controller - fix blockTracker stubkumavis2018-05-291-0/+1
* | | | | | | | controllers - transactions - fix tx status update on bootkumavis2018-05-292-2/+13
* | | | | | | | controllers - transactions - fix tx confirmationkumavis2018-05-292-3/+3
* | | | | | | | newui - unlock - dont catch errors unrelated to tryUnlockMetamaskkumavis2018-05-291-2/+2
* | | | | | | | metamask-controller - lint fixkumavis2018-05-291-1/+1
* | | | | | | | metamask-controller - update preferences controller addresses after import ac...kumavis2018-05-291-10/+10
* | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-298-15/+1013
|\| | | | | | |
| * | | | | | | Merge pull request #4373 from whymarrh/new-ui-e2ekumavis2018-05-297-12/+1143
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Add basic e2e tests for the new UIWhymarrh Whitby2018-05-256-2/+973
| | * | | | | | fix: Why does npm insist on reordering the lockfile?Whymarrh Whitby2018-05-251-10/+170
| |/ / / / / /
| * | | | | | Merge pull request #4241 from MetaMask/greenkeeper/ethjs-0.4.0kumavis2018-05-241-1/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | fix(package): update ethjs to version 0.4.0greenkeeper[bot]2018-05-121-1/+1
| * | | | | | Fix scrolling in Deposit Ether modal (#4336)Alexander Tseung2018-05-241-2/+4
* | | | | | | test - unit - pending-tx-tracker - update method namekumavis2018-05-291-2/+2
* | | | | | | test - unit - nonce-tracker - fix blockTracker stubkumavis2018-05-291-0/+1
* | | | | | | controllers - transaction - pending-tx-tracker - lint fixkumavis2018-05-291-1/+1
* | | | | | | controllers - transactions - merge @frankiebee's work with minekumavis2018-05-297-153/+78
* | | | | | | controllers - transactions - pending-tx-tracker - _getBlock - poll until bloc...kumavis2018-05-261-1/+10
* | | | | | | tx-gas-utils - query for block without tx bodieskumavis2018-05-261-2/+2
* | | | | | | test - unit - metamask-controller - remove logkumavis2018-05-261-1/+0
* | | | | | | test - unit - code style nitpickkumavis2018-05-251-1/+2
* | | | | | | test - unit - metamask-controller - fix many bugs in testskumavis2018-05-252-33/+61
* | | | | | | test - unit - run ganache-server in backgroundkumavis2018-05-251-0/+7
* | | | | | | test - unit - tx-controller-test - add history object to txMeta when using in...kumavis2018-05-251-31/+29
* | | | | | | test - unit - move fetch polyfill to helperkumavis2018-05-253-6/+3
* | | | | | | test - unit - metamask-controller - polyfill global.fetchkumavis2018-05-251-2/+4
* | | | | | | deps - bump eth-json-rpc-middleware for fetch bugfixkumavis2018-05-252-4/+4
* | | | | | | metamask-controller - wrap txController.addUnapprovedTx for wallet middleware...kumavis2018-05-251-1/+13
* | | | | | | test - remove .only from unit testskumavis2018-05-251-1/+1
* | | | | | | provider - update wallet hooks for new wallet middlewarekumavis2018-05-256-68/+114
* | | | | | | deps - bump json-rpc modules for bugfixeskumavis2018-05-252-187/+403
* | | | | | | metamask-controller - fix account lookup hookkumavis2018-05-251-2/+2
* | | | | | | account-tracker - guard against empty blockkumavis2018-05-251-1/+2
* | | | | | | controllers - recent-blocks - guard against empty blockkumavis2018-05-251-3/+3
* | | | | | | controllers - recent-blocks - wrap block-tracker event in try-catchkumavis2018-05-241-1/+7
* | | | | | | Merge branch 'network-remove-provider-engine' of github.com:MetaMask/metamask...kumavis2018-05-243-40/+44
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #4347 from MetaMask/transactions-use-new-block-trackerkumavis2018-05-243-40/+44
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/...frankiebee2018-05-23122-17010/+4318
| | |\ \ \ \ \ \ \
| | * | | | | | | | transactions - update pending-tx-tracker to use the new block trackerfrankiebee2018-05-232-8/+19
| | * | | | | | | | remove dependance on the even tx:confirmedfrankiebee2018-05-231-2/+6
| | * | | | | | | | test pending-tx-tracker - update tests to reflect new block tracker behavior ...frankiebee2018-05-231-32/+21
* | | | | | | | | | deps - bump eth-block-tracker for bugfixkumavis2018-05-241-1/+1
* | | | | | | | | | sentry - setupRaven - ensure message is truthykumavis2018-05-241-2/+2
* | | | | | | | | | controllers - recent-blocks - ensure full blockskumavis2018-05-241-2/+2
|/ / / / / / / / /
* | | | | | | | | controllers - account-tracker - refactor + update for eth-block-tracker@4kumavis2018-05-241-67/+56
* | | | | | | | | controllers - recent-blocks - doc updatekumavis2018-05-241-4/+4
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-231-15/+7
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #4337 from MetaMask/recent-blocks-parallelFrankie2018-05-231-15/+7
| |\ \ \ \ \ \ \
| | * | | | | | | controllers - recent-blocks - pull first historical blocks in parallelkumavis2018-05-221-15/+7
* | | | | | | | | deps - eth-json-rpc-filters@2.0.0kumavis2018-05-231-1/+1
* | | | | | | | | deps - eth-block-tracker@4.0.1kumavis2018-05-231-1/+1
* | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-23121-16993/+4309
|\| | | | | | | | | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Merge pull request #4321 from MetaMask/testingkumavis2018-05-2336-1557/+691
| |\ \ \ \ \ \ \
| | * | | | | | | Merge branch 'develop' into testingtmashuang2018-05-226-53/+57
| | |\| | | | | |
| | * | | | | | | Merge branch 'develop' into testingtmashuang2018-05-229-13446/+22
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' into testingtmashuang2018-05-2223-1810/+342
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'develop' into testingtmashuang2018-05-228-548/+1503
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Moved loose some loose test files to sub folderstmashuang2018-05-2129-59/+108
| | * | | | | | | | | | signMessage and signPersonalMessageThomas2018-05-181-13/+33
| | * | | | | | | | | | Merge branch 'develop' into testingThomas2018-05-1726-328/+371
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into testingThomas2018-05-1762-2419/+5812
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'testing' of https://github.com/tmashuang/metamask-extension int...Thomas2018-05-17245-5461/+19016
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | console.log -> assert.equalThomas2018-05-091-1/+1
| | | * | | | | | | | | | | | ImportAccountWithStrategies Json and KeystoreThomas2018-05-091-0/+30
| | | * | | | | | | | | | | | Remove approvePersonalMessage testThomas2018-05-081-45/+0
| | | * | | | | | | | | | | | Merge branch 'develop' into testingThomas2018-05-08114-1662/+7483
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Bump package-lockThomas2018-04-251-621/+186
| | | * | | | | | | | | | | | | setupUntrustedCommunication and setupTrustedCommunicationThomas2018-04-252-1/+46
| | | * | | | | | | | | | | | | Merge branch 'master' into testingThomas2018-04-24117-1908/+5281
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | ConfigManager markAccountsFound, markPasswordForgotten, unMarkPasswordForgottenThomas2018-04-241-7/+70
| | | * | | | | | | | | | | | | | resetAccount and addNewAccountThomas2018-04-201-0/+45
| | | * | | | | | | | | | | | | | newUnsignedMessage and newUnsignedPersonalMessageThomas2018-04-191-0/+102
| | | * | | | | | | | | | | | | | Merge branch 'master' into testingThomas2018-04-11136-3068/+10732
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | MM-controlller testsThomas2018-04-111-2/+55
| | | * | | | | | | | | | | | | | | Update Sinon methods. sinon.sandbox.create() -> sandbox.createSandbox()Thomas2018-04-057-8/+8
| | | * | | | | | | | | | | | | | | Merge branch 'testing' of https://github.com/tmashuang/metamask-extension int...Thomas2018-04-033-7/+466
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Update sinion methods. sandbox.create() -> createSandbox()Thomas2018-04-057-7/+7
| | * | | | | | | | | | | | | | | | | Merge branch 'testing' of https://github.com/tmashuang/metamask-extension int...Thomas2018-04-053-7/+466
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Metamask controller methodsThomas2018-03-281-1/+146
| | | * | | | | | | | | | | | | | | | Remove console.logThomas2018-03-281-1/+0
| | | * | | | | | | | | | | | | | | | Update blacklistThomas2018-03-281-5/+320
| * | | | | | | | | | | | | | | | | | Merge pull request #4333 from MetaMask/test-e2e-check-for-errorsThomas Huang2018-05-233-52/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | test - e2e - only inspect console for errors in chromekumavis2018-05-221-6/+10
| | * | | | | | | | | | | | | | | | | | test - e2e - ignore 'development build of Redux' warningkumavis2018-05-221-1/+3
| | * | | | | | | | | | | | | | | | | | test - e2e - ignore 'development build of React' warningkumavis2018-05-221-0/+2
| | * | | | | | | | | | | | | | | | | | test - e2e - ignore favicon 404skumavis2018-05-221-1/+6
| | * | | | | | | | | | | | | | | | | | old-ui - app - use state.metamask.selectedAddress instead of currentView.contextkumavis2018-05-221-3/+3
| | * | | | | | | | | | | | | | | | | | old-ui - ens-input - fix params passed to inputkumavis2018-05-221-48/+53
| | * | | | | | | | | | | | | | | | | | test - e2e - ignore react 'unknown props dataset' warningskumavis2018-05-221-2/+5
| | * | | | | | | | | | | | | | | | | | test - e2e - check for console errors after each testkumavis2018-05-221-1/+17
| | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge pull request #4308 from MetaMask/i4232-addtokenkumavis2018-05-2352-1086/+1442
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Update input field border on focusAlexander Tseung2018-05-221-1/+3
| | * | | | | | | | | | | | | | | | | | Fix testsAlexander Tseung2018-05-213-41/+50
| | * | | | | | | | | | | | | | | | | | Update designs for Add Token screenAlexander Tseung2018-05-2050-1056/+1401
| * | | | | | | | | | | | | | | | | | | Merge pull request #4338 from MetaMask/ci-job-screens-enhanceThomas Huang2018-05-232-95/+131
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | ci - screens - continue screenshots through account creation + export accountkumavis2018-05-222-95/+131
| |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Reveal get filtered tx list (#4332)Frankie2018-05-223-46/+1
| * | | | | | | | | | | | | | | | | | Merge pull request #4297 from MetaMask/ci-publish-releaseThomas Huang2018-05-223-7/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge branch 'develop' into ci-publish-releasekumavis2018-05-2234-14106/+1855
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | ci - add docs publish to job-publish-releasekumavis2018-05-192-0/+10
| | * | | | | | | | | | | | | | | | | | docs - jsdoc - fix syntaxkumavis2018-05-191-1/+1
| | * | | | | | | | | | | | | | | | | | ci - add prep-docs jobkumavis2018-05-191-0/+18
| | * | | | | | | | | | | | | | | | | | ci - add job-publish-releasekumavis2018-05-191-0/+21
| | * | | | | | | | | | | | | | | | | | ci - rename job-publish to job-publish-prereleasekumavis2018-05-191-2/+2
| | * | | | | | | | | | | | | | | | | | ci - clean - whitespace fixkumavis2018-05-191-4/+3
| | | |_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge pull request #4295 from MetaMask/kumavis-patch-3Frankie2018-05-221-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | token-util - warn via loglevel on token lookup failurekumavis2018-05-191-1/+2
| | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge pull request #4319 from MetaMask/ci-test-depsFrankie2018-05-221-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | CI - remove node security test as blocker for buildskumavis2018-05-221-2/+1
| | | |_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge pull request #4328 from MetaMask/i4325-yarnignoreFrankie2018-05-221-13432/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit (git 2.34.1) at 2024-10-18 20:28:29 +0800