aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'i3725-refactor-send-component-' into i3914-fix-newui-send-gas-e...Dan2018-06-0179-550/+2072
|\
| * Remove .onlyDan2018-06-011-1/+1
| * Merge branch 'i3725-refactor-send-component-' of github.com:MetaMask/metamask...Dan2018-06-019-156/+108
| |\
| | * Merge pull request #4386 from MetaMask/i4077-replace-currency-input-with-nume...Dan J Miller2018-06-019-156/+108
| | |\
| | | * Fix send amount field select in send-new-ui integration test.Dan2018-06-011-1/+1
| | | * Improve input width calculation in currency-display.jsDan2018-06-011-3/+2
| | | * Fix send-new-ui gas fee display expectation.Dan2018-06-011-1/+1
| | | * Fix currency display send integration tests.Dan2018-05-312-2/+2
| | | * Delete currency-input.jsDan2018-05-302-114/+0
| | | * Remove currency input from input-numberDan2018-05-301-4/+4
| | | * Stop using external NumericInput component.Dan2018-05-303-14/+27
| | | * Replaces currency-input.js with NumericInputDan2018-05-297-38/+231
| * | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-0171-394/+1963
| |\ \ \ | | |/ / | |/| |
| | * | 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
| | |/ / / / / / /
| | * | | | | | | 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
* | | | | | | | | Improve efficiency of estimateGasPriceFromRecentBlocksDan2018-05-311-10/+5
* | | | | | | | | test - send-utils.test - lint fixkumavis2018-05-311-1/+1
* | | | | | | | | Gas estimation uses block gas limit as fallback if query.estimateGas returns ...Dan2018-05-312-5/+39
* | | | | | | | | Auto update gas estimate when to changes.Dan2018-05-3115-64/+123
* | | | | | | | | Fix test to account for greater precision currency display.Dan2018-05-311-1/+1
* | | | | | | | | Support smaller decimals in currency-displayDan2018-05-311-1/+1
* | | | | | | | | Estimate gas using same algorithm as backend.Dan2018-05-3112-98/+153
* | | | | | | | | Simplify gas estimate actions and add local estimateGasPriceFromRecentBlocks ...Dan2018-05-3113-55/+203
* | | | | | | | | getParamsForGasEstimate extracts symbol from token instead of just accepting ...Dan2018-05-313-6/+6
* | | | | | | | | Rename gas change actions.Dan2018-05-314-22/+22
* | | | | | | | | Split out getGasEstimate logic from updateGasTotalDan2018-05-311-3/+12
|/ / / / / / / /
* | | | | | | | Update amount error on update of send screen.Dan2018-05-314-23/+169
* | | | | | | | Fix setting of token balance on account switch in send screen from field.Dan2018-05-313-3/+3
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Send refactor: fix error handling and form disabling in send form.Dan2018-05-268-47/+37
* | | | | | | Clean up for send refactor PR.Dan2018-05-256-17/+8
* | | | | | | Move formShouldBeDisabled from send-footer util to component.Dan2018-05-254-40/+72
* | | | | | | Fix order of button text in page-container-footer.Dan2018-05-252-10/+4
* | | | | | | Display correct titles and subtitles on send token and editing send transacti...Dan2018-05-259-14/+112
* | | | | | | Fix display of primary currency symbol in send amount rowDan2018-05-252-2/+8
* | | | | | | Send refactor: fix amount max button for tokens.Dan2018-05-242-2/+13
* | | | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-24141-18228/+4692
|\| | | | | |
| * | | | | | 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
| * | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ It tried to get away, but justice must be served.Kevin Serrano2018-05-225-10/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge pull request #4326 from MetaMask/Jabher-developFrankie2018-05-223-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of https://github.com/Jabher/metamask-extension into J...kumavis2018-05-223-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | bump extensionizer version to 1.0.1 (see https://github.com/MetaMask/extensio...jabher2018-05-083-6/+6
| | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge pull request #4329 from MetaMask/Trigalti-developKevin Serrano2018-05-221-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of https://github.com/Trigalti/metamask-extension into...kumavis2018-05-221-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Added trailing comma for eslintsimon2018-05-181-1/+1
| | | * | | | | | | | | | | | | | | | | Added adyen.com to blacklisted domains because postMessages are blocking car...simon2018-05-181-1/+2
| | | | |_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge pull request #4316 from MetaMask/fix-signature-requestkumavis2018-05-221-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Fix signature request header textAlexander Tseung2018-05-211-2/+0
| | | |_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge pull request #4273 from brunobar79/fix-new-ui-popup-headerkumavis2018-05-221-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | remove fix header heightBruno2018-05-171-2/+0
| | | | | | | * | | | | | | | | | | | | Please, this is my third PR already, stop adding extra baggage. Also, remove...Kevin Serrano2018-05-221-13432/+0
| | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge pull request #4240 from MetaMask/EnhancePortGuidekumavis2018-05-221-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Enhance guide to porting to new platformDan Finlay2018-05-121-1/+12
| | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge pull request #4034 from whymarrh/account-nicknameskumavis2018-05-2222-114/+332
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Fix migration 026 to produce the correct shape for state.identitiesWhymarrh Whitby2018-05-182-3/+10
| | * | | | | | | | | | | | | | | | Update MetaMaskController vault restoration test for new KC apiWhymarrh Whitby2018-05-171-1/+1
| | * | | | | | | | | | | | | | | | Update eth-keyring-controller dependencyWhymarrh Whitby2018-05-172-194/+1363
| | * | | | | | | | | | | | | | | | Add migration to move identities from KeyringControllerWhymarrh Whitby2018-05-173-0/+82
| | * | | | | | | | | | | | | | | | Add test case for PreferencesController#setAccountLabelWhymarrh Whitby2018-05-171-0/+21
| | * | | | | | | | | | | | | | | | Add PreferencesController#setAddresses to update idsWhymarrh Whitby2018-05-173-8/+66
| | * | | | | | | | | | | | | | | | Update AddressBookController to read from preferences storeWhymarrh Whitby2018-05-173-35/+21
| | * | | | | | | | | | | | | | | | Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-1714-58/+122
| | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge pull request #4278 from MetaMask/e2e-testskumavis2018-05-224-366/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Adjustments for previous PRThomas2018-05-171-4/+4
| | * | | | | | | | | | | | | | | Testing timeoutsThomas2018-05-172-200/+1369
| | * | | | | | | | | | | | | | | Merge branch 'develop' into e2e-testsThomas2018-05-1534-823/+1172
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge e2e tests into oneThomas2018-05-154-361/+79
| * | | | | | | | | | | | | | | | Merge pull request #4199 from MetaMask/i3487-provider-errorsDan Finlay2018-05-194-182/+1420
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Add new json-rpc-engine middleware for improved error handlingbitpshr2018-05-144-182/+1420
| * | | | | | | | | | | | | | | | Merge pull request #4266 from MetaMask/send-screen-detailed-QA-checklistkumavis2018-05-171-0/+96
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Adds description to send-screen-QA-checklist.mdDan2018-05-161-1/+7
| | * | | | | | | | | | | | | | | Adds detailed QA checklist for the New UI send screen.Dan2018-05-161-0/+90
| | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #4235 from scsaba/transaction-history-timestampskumavis2018-05-175-74/+143
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-...kumavis2018-05-1755-3285/+2945
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge pull request #4146 from MetaMask/sentry-error-like2kumavis2018-05-171-17/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | sentry - add helper to fully rewrite all error messageskumavis2018-05-011-17/+25
| * | | | | | | | | | | | | | | | | Merge pull request #4255 from MetaMask/i4233-dropdownskumavis2018-05-175-21/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Fix account and network dropdowns in confirm screenAlexander Tseung2018-05-155-21/+58
| | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge pull request #4155 from MetaMask/network-controller-remove-setNetworkEn...kumavis2018-05-1714-216/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | ui - unlock - remove setNetworkEndpoints calls from new unlock screenkumavis2018-05-172-3/+0
| | * | | | | | | | | | | | | | | | ui - remove files accidently added by bad mergekumavis2018-05-172-328/+0
| | * | | | | | | | | | | | | | | | network - remove debugging console.logkumavis2018-05-171-1/+0
| | * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-1773-2757/+8317
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | lint - cleanup some unused variableskumavis2018-05-038-15/+0
| | * | | | | | | | | | | | | | | | test - network controller - remove tests for deprecated APIs + update testskumavis2018-05-031-25/+5
| | * | | | | | | | | | | | | | | | controllers - network - move default config out of first-time-statekumavis2018-05-032-11/+15
| | * | | | | | | | | | | | | | | | network - refactor to remove unnecesary codekumavis2018-05-013-124/+29
| | * | | | | | | | | | | | | | | | network - remove setNetworkEndpointskumavis2018-05-0110-45/+1
| | * | | | | | | | | | | | | | | | controllers - network - more semantic assertkumavis2018-05-011-1/+1
| | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | tx-state-history-helper - use more readable Date.now methodkumavis2018-05-171-1/+1
| | | | * | | | | | | | | | | | | fix lint issuesCsaba Solya2018-05-102-2/+2
| | | | * | | | | | | | | | | | | remove unnecessary libCsaba Solya2018-05-101-1/+0
| | | | * | | | | | | | | | | | | revert unnecessary change in state managerCsaba Solya2018-05-101-13/+7
| | | | * | | | | | | | | | | | | add time stamps to transaction history log entriesCsaba Solya2018-05-105-81/+157
* | | | | | | | | | | | | | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-150-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge pull request #4251 from whymarrh/e2e-fixesThomas Huang2018-05-153-6/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | e2e: Use the more reliable enter key for logging inWhymarrh Whitby2018-05-151-1/+1
| | * | | | | | | | | | | | | | | | e2e: Wait a bit before clicking through privacy screenWhymarrh Whitby2018-05-151-0/+1
| | * | | | | | | | | | | | | | | | e2e: Adjust the extension ID query for newer Chrome versionsWhymarrh Whitby2018-05-151-1/+1
| | * | | | | | | | | | | | | | | | e2e: Use newest window as MM tx confirm popupWhymarrh Whitby2018-05-152-2/+2
| | * | | | | | | | | | | | | | | | Bail after the first e2e test failureWhymarrh Whitby2018-05-151-2/+2
| | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge pull request #4245 from MetaMask/i4208-errorKevin Serrano2018-05-158-233/+216
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Add error message when passwords don't match in first time flow. Change input...Alexander Tseung2018-05-148-233/+216
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge pull request #4190 from MetaMask/i3614-unlockFrankie2018-05-1330-598/+964
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Add TextField component to storybookAlexander Tseung2018-05-123-2/+25
| | * | | | | | | | | | | | | | | Add new unlock screen designAlexander Tseung2018-05-1229-598/+941
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge pull request #4226 from MetaMask/e2e-testskumavis2018-05-128-793/+1058
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | / / / / / / / / / / / | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'develop' into e2e-testsThomas2018-05-125-1440/+607
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Chinese translation Enhancements (#4218)Orange2018-05-121-25/+358
| * | | | | | | | | | | | | | Merge pull request #4231 from MetaMask/fix-nodesecuritykumavis2018-05-123-1414/+248
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Add advisory #157 to .nsprcAlexander Tseung2018-05-111-1/+4
| | * | | | | | | | | | | | | Update lodashAlexander Tseung2018-05-101-51/+51
| | * | | | | | | | | | | | | Update deep-extend and sshpkAlexander Tseung2018-05-102-1362/+193
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #4214 from MetaMask/tx-controller-doc-typoDan Finlay2018-05-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fix documentation typobitpshr2018-05-081-1/+1
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Increase timeoutThomas2018-05-111-1/+1
| | | * | | | | | | | | | | Fix typoThomas2018-05-111-1/+1
| | | * | | | | | | | | | | Job Screens with Shadow Dom Css selectorThomas2018-05-113-6/+7
| | | * | | | | | | | | | | Multistep Shadow Dom Query Selector for local extension idThomas2018-05-111-10/+10
| | | * | | | | | | | | | | Merge branch 'develop' into e2e-testsThomas2018-05-0923-25/+3195
| | | |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #4196 from MetaMask/i3457-fontweightThomas Huang2018-05-0911-22/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Change font weight from 300 to 400Alexander Tseung2018-05-0611-22/+2
| * | | | | | | | | | | | | | Merge pull request #4099 from MetaMask/i4043-storybook-dev2Thomas Huang2018-05-0912-3/+3199
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Add storybook README.md fileAlexander Tseung2018-05-081-0/+10
| | * | | | | | | | | | | | | Add storybook integrationAlexander Tseung2018-05-0411-3/+3189
| | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | Update test:screens to newest chrome extension listThomas2018-05-081-1/+1
| | | * | | | | | | | | | | Merge branch 'develop' into e2e-testsThomas2018-05-085-5/+51
| | | |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Fix Slovenian translation (#4189)Filip Š2018-05-081-4/+4
| * | | | | | | | | | | | | Merge pull request #4163 from MetaMask/check-nonce-ussagekumavis2018-05-084-1/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | transactions - add a nonce check utility for ui usefrankiebee2018-05-023-0/+46
| | * | | | | | | | | | | | fix - getTxsByMetaData check if the key is in the object not if the value is ...frankiebee2018-05-021-1/+1
| | | * | | | | | | | | | | Update to extension Id path for new chromeThomas2018-05-081-5/+5
| | | * | | | | | | | | | | Remove waiting for button to be enabled TOUThomas2018-05-041-1/+0
| | | * | | | | | | | | | | Merge branch 'e2e-tests' of https://github.com/tmashuang/metamask-extension i...Thomas2018-05-0481-1892/+4484
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Add a comment on the confirmation transaction metamask popup showing blank, b...Thomas2018-05-041-0/+1
| | | | * | | | | | | | | | | Quit chromedriver after testThomas2018-05-041-3/+3
| | | | * | | | | | | | | | | Bump package lockThomas2018-05-041-629/+285
| | | | * | | | | | | | | | | Merge branch 'develop' into e2e-testsThomas2018-05-0479-1361/+4296
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #4156 from MetaMask/i4010-spinnerkumavis2018-05-039-10/+115
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fix styling of the app spinnerAlexander Tseung2018-05-019-10/+115
| * | | | | | | | | | | | | | | Merge pull request #4173 from MetaMask/chromedriverkumavis2018-05-032-182/+1360
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Remove eth-block-tracker packageAlexander Tseung2018-05-031-1/+0
| | * | | | | | | | | | | | | | | Pin chromedriver version to 2.36.0Alexander Tseung2018-05-032-181/+1360
| |/ / / / / / / / / / / / / / /
generated by cgit (git 2.34.1) at 2024-10-14 14:14:28 +0800