aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* initial trezor supportBruno2018-06-1014-6478/+8369
|
* Merge pull request #4523 from MetaMask/i4462-FixResetBugDan Finlay2018-06-083-6/+12
|\ | | | | Fix bug where reset account would not work.
| * Fix bug where reset account would not work.Dan Finlay2018-06-073-6/+12
| | | | | | | | | | | | | | | | | | | | Fixes #4462 Ensures that resetAccount() can work on non-stock providers. I'm unclear how this was ever working, this code hasn't moved in months, but users report it recently breaking. Maybe we only recently pushed it to prod.
* | Merge pull request #4090 from MetaMask/i3725-refactor-send-component-Dan J Miller2018-06-07163-1349/+7527
|\ \ | | | | | | I3725 Refactor Send Component
| * | Bump beta e2e timeouts on faucet page.Dan2018-06-072-4/+4
| | |
| * | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-077-141/+218
| |\ \ | |/ / |/| |
* | | Merge pull request #4385 from MetaMask/ci-test-e2e-betakumavis2018-06-076-141/+217
|\ \ \ | |_|/ |/| | CI - Add e2e-beta tests
| * | Improve e2e beta tests by adding appropriate waits.Dan2018-06-072-47/+56
| | |
| * | Conditionally close info page in beta e2e tests.Dan2018-06-062-4/+14
| | |
| * | Merge remote-tracking branch 'whymarrh/ci-test-e2e-beta' into ci-test-e2e-betaDan2018-06-062-63/+79
| | |
| * | Fix e2e beta tests to account for add-token updates and actual behaviour of ↵Dan2018-06-062-14/+10
| | | | | | | | | | | | tab openings on installation.
| * | Merge branch 'develop' into ci-test-e2e-betaDan2018-06-0629-70/+452
| |\ \
| * | | Adjust delays in new beta e2e testsWhymarrh Whitby2018-06-021-2/+2
| | | |
| * | | ci - breakout firefox helpers into scriptskumavis2018-06-023-23/+19
| | | |
| * | | ci - run e2e:beta testskumavis2018-06-021-4/+53
| | | |
* | | | Merge pull request #4477 from MetaMask/i3073-block-gravityformskumavis2018-06-071-0/+1
|\ \ \ \ | | | | | | | | | | Block gravityforms.com from web3 injection
| * | | | Block gravityforms.com from web3 injectionDan Finlay2018-06-041-0/+1
| | | | | | | | | | | | | | | Fixes #3073
| | | | * Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-0733-131/+394
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Merge pull request #4512 from MetaMask/test-metamask-no-diagnosticsThomas Huang2018-06-071-0/+3
|\ \ \ \ \ | | | | | | | | | | | | test - metamask-controller - disable diagnostics
| * | | | | test - metamask-controller - disable diagnosticskumavis2018-06-061-0/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #4414 from scsaba/recipient-blacklistkumavis2018-06-075-1/+137
|\ \ \ \ \ | | | | | | | | | | | | Disallow sending to ganache default accounts on main net
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Handle errors for null selected address after Importing account (json or private key)
| * \ \ \ \ \ 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 ↵Dan2018-05-314-16/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | account if no selectedAddress comes after import.
* | | | | | | | | Merge pull request #4514 from whymarrh/account-label-type-checkkumavis2018-06-071-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add account type assertion to PreferencesController#setAccountLabel
| * | | | | | | | | 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 Master into Develop
| * \ \ \ \ \ \ \ \ Merge pull request #4511 from MetaMask/v4.7.4kumavis2018-06-068-49/+102
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Version 4.7.4
| | * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Version 4.7.3
| | * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | Render accounts in keyring order
| * | | | | | | | | | 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
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #4509 from whymarrh/wallet-view-assertionkumavis2018-06-061-5/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add explicit selectedAddress assertion to the wallet view
| * | | | | | | | | | Remove selectedIdentity prop from wallet viewWhymarrh Whitby2018-06-061-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The selectedIdentity property is computed based on the selectedAddress which means that using both the selectedAddress and the selectedIdentity is redundant. In the case of the Array#find call on the set of keyrings, we wouldn't have a situation where one is included and the other isn't. This changeset removes the selectedIdentity from the wallet view because it isn't needed.
| * | | | | | | | | | Ensure selectedAddress exists when render walletWhymarrh Whitby2018-06-061-0/+4
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #4506 from MetaMask/diagnostics-multivaultkumavis2018-06-065-43/+89
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | diagnostics - add multiple vault detection to diagnostics reporting
| * | | | | | | | | 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
|/ / / / / / / / /
| | | | | | | | * Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-0529-72/+400
| | | | | | | | |\ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Update hide-token-confirmation-modal.js to use new modalState schema (#4482)Dan J Miller2018-06-053-3/+3
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update hide-token-confirmation-modal.js to use new modalState schema (added in 41e38fe55). * Fix modalState props
* | | | | | | | Merge pull request #4486 from MetaMask/i4475-ClearUnknownIdentitieskumavis2018-06-055-4/+135
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Clear unknown identities
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses #4475, where entries in the identities object do not necessarily have corresponding accounts in the vault. On password submission, this change passes known accounts to the preferencesController (responsible for nickname management), and removes unknown entries. Includes "TODO" notes for where we could log the issue to sentry or notify the user.
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Token name is not hidden in wallet if balance is exceptionally long.
| * \ \ \ \ \ \ \ Merge pull request #4432 from alextsg/fix-tokenlist-balance-overflowDan J Miller2018-06-021-5/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix ellipses
| | * | | | | | | | 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
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | 4.7.2 - Merge master into develop
| * | | | | | | Merge pull request #4470 from MetaMask/v4.7.2Dan Finlay2018-06-0411-24/+85
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Version 4.7.2
| | * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | bugfix - update preferences controller identities on keyring controller update
| * | | | | | | | 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 guide
| * | | | | | | | 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 message
| * | | | | | | | sentry - message rewrite - guard against missing messagekumavis2018-05-311-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #4425 from MetaMask/masterkumavis2018-06-023-2/+28
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Merge Master into Develop
| * | | | | | | Merge pull request #4449 from MetaMask/Version-4.7.1kumavis2018-06-0242-271/+434
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Version 4.7.1
| | * | | | | | | 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
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Version 4.7.0 - rc2
| | * | | | | | | 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 zendesk
| * | | | | | | | update helpscout links to zenhubBobby Dresser2018-06-012-2/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #4438 from wjmelements/yarnDan Finlay2018-06-021-1/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Suggest Yarn for Node >= 10
| * | | | | | | | | 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 PC
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | End json-rpc-engine stack on error
| * | | | | | | Properly end the middleware stack on RPC errorbitpshr2018-06-022-30/+24
|/ / / / / / /
| | | | | | * Merge pull request #4350 from MetaMask/i3914-fix-newui-send-gas-estimationDan J Miller2018-06-0523-165/+461
| | | | | | |\ | | | | | | | | | | | | | | | | NewUI gas estimation produces same results as old-ui (exception: contract addresses)
| | | | | | | * Simplify recipient code check in send.utils estimateGasDan2018-06-051-4/+5
| | | | | | | |
| | | | | | | * Default currency-display valueToRender to empty string when not readOnly ↵Dan2018-06-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ('0' if readOnly).
| | | | | | | * Fix calculation of data property for gas estimation on token transfers.Dan2018-06-027-47/+41
| | | | | | | |
| | | | | | | * Merge branch 'i3725-refactor-send-component-' into ↵Dan2018-06-0179-550/+2072
| | | | | | | |\ | | | | | | | |/ | | | | | | |/| | | | | | | | | i3914-fix-newui-send-gas-estimation
| | | | | | * | Remove .onlyDan2018-06-011-1/+1
| | | | | | | |
| | | | | | * | Merge branch 'i3725-refactor-send-component-' of ↵Dan2018-06-019-156/+108
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:MetaMask/metamask-extension into i3725-refactor-send-component-
| | | | | | | * \ Merge pull request #4386 from ↵Dan J Miller2018-06-019-156/+108
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MetaMask/i4077-replace-currency-input-with-numeric-input Replace currency-input.js with NumericInput
| | | | | | | | * | 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 ↵Alexander Tseung2018-06-0116-62/+79
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | style buttons
* | | | | | | | Merge pull request #4419 from MetaMask/deps-bump-keyring-controllerkumavis2018-05-312-8/+14
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | deps - bump eth-keyring-controller for bugfix
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Adds account in e2e test
| * | | | | | | 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 changelog
| * | | | | | | Update changelogDan J Miller2018-05-301-0/+11
| | | | | | | |
* | | | | | | | Merge pull request #4403 from MetaMask/bugfix-keyring-controllerkumavis2018-05-303-55/+60
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | deps - bump eth-keyring-controller + update package-lock
| * | | | | | | | 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 call
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Pull master changes back into develop
| * | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵kumavis2018-05-307-23/+72
|/| | | | | | | | | |/ / / / / | |/| | | | | | | | | | | | merge-master
| * | | | | | Merge pull request #4384 from antonper/masterkumavis2018-05-303-10/+37
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | UI Errors stack cleaned
| | * | | | | | cleanErrorStack moved to separate library moduleAnton2018-05-293-19/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more errors traces cleaned up
| | * | | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow other extensions to connect
| | * | | | | | 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.1
| | * | | | | | | Version 4.6.1kumavis2018-05-012-2/+9
| | | | | | | | |
| * | | | | | | | Merge pull request #4131 from MetaMask/emitter-cleanupkumavis2018-05-011-7/+14
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | transactions - run event emitters outside context of _setTxStatus
| | * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add mission statement v1
| * | | | | | | | | | 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 api
| * | | | | | | | | | | i18n - getFirstPreferredLangCode - guard against missing i18n apikumavis2018-05-291-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix for brave
* | | | | | | | | | | | 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 tryUnlockMetamask
| * | | | | | | | | | | 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 - update preferences controller addresses after import account
| * | | | | | | | | | metamask-controller - lint fixkumavis2018-05-291-1/+1
| | | | | | | | | | |
| * | | | | | | | | | metamask-controller - update preferences controller addresses after import ↵kumavis2018-05-291-10/+10
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | account
* | | | | | | | | | Merge pull request #4373 from whymarrh/new-ui-e2ekumavis2018-05-297-12/+1143
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | Basic end-to-end (e2e) tests for the new UI
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Update ethjs to the latest version 🚀
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an expected error.
| | | | | | | | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | method.
| | | | | | | | * getParamsForGasEstimate extracts symbol from token instead of just accepting ↵Dan2018-05-313-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | symbol.
| | | | | | | | * 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 ↵Dan2018-05-259-14/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | transaction screens.
| | | | | | * 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 parallel
| * | | | | | | controllers - recent-blocks - pull first historical blocks in parallelkumavis2018-05-221-15/+7
| | | | | | | |
* | | | | | | | Merge pull request #4321 from MetaMask/testingkumavis2018-05-2336-1557/+691
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | MM controller tests and reorganizing test files
| * | | | | | | | 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 ↵Thomas2018-05-17245-5461/+19016
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into testing
| | * | | | | | | | | | | | | 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 ↵Thomas2018-04-033-7/+466
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into testing
| * | | | | | | | | | | | | | | | | | Update sinion methods. sandbox.create() -> createSandbox()Thomas2018-04-057-7/+7
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'testing' of https://github.com/tmashuang/metamask-extension ↵Thomas2018-04-053-7/+466
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into testing
| | * | | | | | | | | | | | | | | | | 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 - check for console errors after each test
| * | | | | | | | | | | | | | | | | | | 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 designs for Add Token screen
| * | | | | | | | | | | | | | | | | | | 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 account
| * | | | | | | | | | | | | | | | | | | ci - screens - continue screenshots through account creation + export accountkumavis2018-05-222-95/+131
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Reveal get filtered tx list (#4332)Frankie2018-05-223-46/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add getFilteredTxList from txController to getApi * transactions - remove dead code (isNonceTaken)
* | | | | | | | | | | | | | | | | | | Merge pull request #4297 from MetaMask/ci-publish-releaseThomas Huang2018-05-223-7/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | CI - publish release/prerelease
| * | | | | | | | | | | | | | | | | | Merge branch 'develop' into ci-publish-releasekumavis2018-05-2234-14106/+1855
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | ci - add docs publish to job-publish-releasekumavis2018-05-192-0/+10
| | | | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 16:45:22 +0800