aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Adds e2e tests for sending tokens from token factory.Dan2018-06-271-3/+61
* Adds e2e tests for sending tokens within metamask.Dan2018-06-271-2/+48
* Merge pull request #4627 from TrejGun/gas-fee-displayDan J Miller2018-06-278-57/+121
|\
| * fix default importtrejgun2018-06-232-2/+2
| * linttrejgun2018-06-212-3/+13
| * refactor gas-fee-display componenttrejgun2018-06-218-57/+111
* | Merge pull request #4649 from hermanjunge/developThomas Huang2018-06-231-0/+1
|\ \
| * | LicenseHerman Junge2018-06-231-0/+1
|/ /
* | Merge pull request #4592 from vittominacori/fix/close-popup-bug-#4553Thomas Huang2018-06-211-2/+4
|\ \
| * | set the popup id returned by create promisevittominacori2018-06-181-3/+4
| * | set an id to the metamask notification popupvittominacori2018-06-171-1/+2
| |/
* | Merge pull request #4575 from whymarrh/token-amount-overflowWhymarrh Whitby2018-06-218-16/+35
|\ \
| * | Accept whitespace when matching token balances in e2e testsWhymarrh Whitby2018-06-212-7/+8
| * | Add explicit timeout for add token testWhymarrh Whitby2018-06-211-1/+1
| * | Scroll large amounts in the send componentWhymarrh Whitby2018-06-212-4/+6
| * | Handle large token balances in tx list heroWhymarrh Whitby2018-06-214-5/+21
|/ /
* | Merge pull request #4612 from MetaMask/changelog-4.8.0-fixThomas Huang2018-06-201-1/+0
|\ \
| * | changelog - remove incorrect entrykumavis2018-06-201-1/+0
|/ /
* | Merge pull request #4605 from MetaMask/masterThomas Huang2018-06-192-7/+11
|\ \
| * \ Merge pull request #4603 from MetaMask/v4.8.0kumavis2018-06-19222-8310/+15077
| |\ \
| | * | Update ChangelogThomas2018-06-191-6/+1
| | * | Merge branch 'develop' into v4.8.0Thomas2018-06-1923-62/+283
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #4602 from MetaMask/notice-controller-fixv4.8.0Thomas Huang2018-06-191-3/+6
|\ \ \ \
| * | | | notice controller - properly show new notices for non-new userskumavis2018-06-191-3/+6
* | | | | Merge pull request #4582 from MetaMask/fixEmailLinkkumavis2018-06-191-1/+1
|\ \ \ \ \
| * | | | | Fix email link in phishing noticeThomas2018-06-151-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4584 from MetaMask/fix-send-tokenkumavis2018-06-1912-21/+142
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update integration tests for newui gas estimation fixes.Dan2018-06-191-2/+2
| * | | | On send screen amount change, updateGas call now includes current to address.Dan2018-06-196-4/+37
| * | | | Send screen returns simple gas cost if no to address specified when not sendi...Dan2018-06-192-3/+8
| * | | | Remove leading zeroes from send screen amount row input.Dan2018-06-191-1/+5
| * | | | Fix currency-display.js rendering of token amounts.Dan2018-06-191-0/+1
| * | | | Revert to updating amount on blur of input change; update gas on blur of amou...Dan2018-06-192-5/+11
| * | | | Fix unit testsAlexander Tseung2018-06-161-3/+8
| * | | | Estimate gas limit when the token amount changes. Fix amount inputAlexander Tseung2018-06-164-16/+18
| * | | | Update send.utils.js estimateGas tests.Dan2018-06-152-5/+20
| * | | | Add a buffer to new ui gas estimatesDan2018-06-152-2/+52
| * | | | Add hex-prefix to gas estimate resultAlexander Tseung2018-06-152-4/+4
| |/ / /
* | | | Merge pull request #4586 from MetaMask/block-idex-phisherkumavis2018-06-193-15/+18
|\ \ \ \
| * | | | lint - fix recipient-blacklist.jskumavis2018-06-161-13/+13
| * | | | blacklist - recipient blacklist as js for inline commentskumavis2018-06-162-2/+2
| * | | | Update recipient-blacklist-config.jsonkumavis2018-06-161-0/+2
| * | | | Add apparent phishing address to block listDan Finlay2018-06-151-0/+1
| |/ / /
* | | | View address of an added token (#4591)Csaba S2018-06-193-22/+43
* | | | Merge pull request #4585 from MetaMask/ReenableDappReloadDan Finlay2018-06-173-1/+67
|\ \ \ \ | |/ / / |/| | |
| * | | Re-enable dapp reload on network changeDan Finlay2018-06-153-1/+67
|/ / /
| | * v4.8.0Thomas2018-06-152-8/+10
| |/ |/|
* | Merge pull request #4524 from MetaMask/save-braveThomas Huang2018-06-152-3/+18
|\ \
| * \ Merge branch 'develop' into save-bravekumavis2018-06-1539-6789/+6857
| |\ \ | |/ / |/| |
* | | Merge pull request #4571 from MetaMask/disable-diagnosticsDan Finlay2018-06-151-8/+0
|\ \ \
| * | | diagnostics - temporarily disablekumavis2018-06-141-8/+0
* | | | Merge pull request #4566 from MetaMask/notice-phishingDan Finlay2018-06-1523-183/+140
|\ \ \ \
| * | | | test - e2e-beta - from import - handle phishing warningkumavis2018-06-141-8/+21
| * | | | test - e2e-beta - separate notice tests into individual testskumavis2018-06-141-1/+5
| * | | | test - e2e - clear phishing warningkumavis2018-06-142-1/+7
| * | | | notice-controller - update memStore on bootkumavis2018-06-141-0/+1
| * | | | test - e2e - check for phishing warningkumavis2018-06-144-15/+29
| * | | | notices - replace getLatestNotice with getNextNoticekumavis2018-06-1412-97/+39
| * | | | notices - notices collection is now manually editedkumavis2018-06-147-65/+35
| * | | | Add changelog item.Kevin Serrano2018-06-141-0/+1
| * | | | Add phishing notice.Kevin Serrano2018-06-143-2/+8
| |/ / /
* | | | Merge pull request #4513 from MetaMask/ValidateEmptyKeykumavis2018-06-145-18/+77
|\ \ \ \
| * \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into Validat...kumavis2018-06-14204-1737/+8267
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #4570 from MetaMask/persistence-stream-fixkumavis2018-06-143-6/+33
|\ \ \ \ \
| * | | | | changelog - add note on persistence bugkumavis2018-06-141-0/+1
| * | | | | background - persistence pipeline - fix persistence bugkumavis2018-06-142-6/+32
| | |/ / / | |/| | |
* | | | | Merge pull request #4550 from MetaMask/bmd/sign-warning-helplinkbobby dresser2018-06-142-1/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add help link to eth_sign warningBobby Dresser2018-06-122-1/+14
* | | | | Merge pull request #4560 from MetaMask/nonce-tracker-mutex-fixKevin Serrano2018-06-141-1/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' into nonce-tracker-mutex-fixkumavis2018-06-135-6532/+6544
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #4558 from MetaMask/stop-reload-on-network-changeDan Finlay2018-06-133-65/+20
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into stop-reload-on-network-changeErik Marks2018-06-13172-7992/+14314
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #4557 from MetaMask/nonce-tracker-mutex-fixkumavis2018-06-134-40/+47
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge pull request #4556 from MetaMask/WatchTestReloadDan Finlay2018-06-132-6468/+6525
|\ \ \ \ \ \ \ \
| * | | | | | | | Add script for auto-re-running tests on changeDan Finlay2018-06-132-6468/+6525
|/ / / / / / / /
| | * | | | | | update changelogErik Marks2018-06-131-0/+3
| | * | | | | | undo package.json and package-lock.json changesErik Marks2018-06-132-6817/+6539
| | * | | | | | removed auto-reload.js, moved global web3 export to inpage.jsErik Marks2018-06-132-43/+16
| | * | | | | | wipErik Marks2018-06-134-6580/+6839
| | | * | | | | changelog - add note on nonce-lock mutex fixkumavis2018-06-131-0/+1
| | |/ / / / / | |/| | | | |
| * | | | | | controllers - transaction - prefer log over consolekumavis2018-06-131-2/+2
| * | | | | | metamask - ensure all nonce locks are releasedkumavis2018-06-134-17/+18
| * | | | | | nonce-tracker - wrap nonce calculations in try-catch and release lock on errorkumavis2018-06-131-22/+28
|/ / / / / /
* | | | | | Merge pull request #4554 from whymarrh/fix-e2e-profile-pathWhymarrh Whitby2018-06-131-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix e2e test Chrome profile pathsWhymarrh Whitby2018-06-131-1/+1
|/ / / / /
* | | | | Merge pull request #4535 from MetaMask/i4508-fix-gas-edit-confirm-screenDan J Miller2018-06-112-2/+2
|\ \ \ \ \
| * | | | | Access correct property from state in confirm screen components gatherTxMeta()Dan2018-06-082-2/+2
|/ / / / /
| | * | | account-import-strategies - ensure privateKey is prefixed before converting t...kumavis2018-06-141-2/+3
| | * | | test - unit - add assertRejects to test asyncFnskumavis2018-06-142-5/+23
| | * | | test - unit - import strategies - properly await async methodskumavis2018-06-141-8/+8
| | * | | Make account import tests much more specificDan Finlay2018-06-123-6467/+6530
| | * | | Improve private key import testsDan Finlay2018-06-081-1/+25
| | * | | Improve test formattingDan Finlay2018-06-081-16/+19
| | * | | Bump changelogDan Finlay2018-06-061-0/+1
| | * | | Add validation for importing empty private keyDan Finlay2018-06-061-0/+3
| | | * | Handle brave throwsDan Finlay2018-06-151-3/+11
| | | * | changelog - version fixkumavis2018-06-091-2/+0
| | | * | changelog 4270Jenny Pollack2018-06-081-0/+3
| | | * | Merge branch 'develop' into save-braveJenny Pollack2018-06-08186-1530/+8026
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge pull request #4523 from MetaMask/i4462-FixResetBugDan Finlay2018-06-083-6/+12
|\ \ \ \ \
| * | | | | Fix bug where reset account would not work.Dan Finlay2018-06-073-6/+12
| |/ / / /
* | | | | Merge pull request #4090 from MetaMask/i3725-refactor-send-component-Dan J Miller2018-06-07163-1349/+7527
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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 t...Dan2018-06-062-14/+10
| * | | | | 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 injectionDan Finlay2018-06-041-0/+1
| | | | * | | | 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 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 branch 'develop' into i3725-refactor-send-component-Dan2018-06-0529-72/+400
| | | | | | | | | | |\ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | | | | | | | | | * | Merge pull request #4350 from MetaMask/i3914-fix-newui-send-gas-estimationDan J Miller2018-06-0523-165/+461
| | | | | | | | | | |\ \
| | | | | | | | | | | * | Simplify recipient code check in send.utils estimateGasDan2018-06-051-4/+5
| | | | | | | | | | | * | Default currency-display valueToRender to empty string when not readOnly ('0'...Dan2018-06-021-2/+2
| | | | | | | | | | | * | Fix calculation of data property for gas estimation on token transfers.Dan2018-06-027-47/+41
| | | | | | | | | | | * | 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
| | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | |/ / / / | | | | | | | | | | |/| | | |
| | | | | | | | | | | | | * | 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 branch 'develop' into i3725-refactor-send-component-Dan2018-05-150-0/+0
| | | | | | | | | | |\ \ \ \
| | | | | | | | | | * | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-1511-239/+223
| | | | | | | | | | * | | | | Import defaults in send_/Dan2018-05-1510-17/+18
| | | | | | | | | | * | | | | Fix Button component path in page-container footer.Dan2018-05-151-1/+1
| | | | | | | | | | * | | | | Add index.js files to send_ subdirectoriesDan2018-05-1513-0/+13
| | | | | | | | | | * | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-14142-4065/+12673
| | | | | | | | | | * | | | | Tests for send.duck.jsDan2018-05-144-20/+167
| | | | | | | | | | * | | | | Rename ducks/send.js to ducks/send.duck.jsDan2018-05-1415-14/+14
| | | | | | | | | | * | | | | Add missing unit tests in send_/: now 100% function test coverage in send_/Dan2018-05-144-112/+298
| | | | | | | | | | * | | | | Lint fixesDan2018-05-1410-31/+6
| | | | | | | | | | * | | | | Unit tests for account-list-item, amount-max-button and send-amount-row compo...Dan2018-05-143-0/+381
| | | | | | | | | | * | | | | Unit tests for from-dropdown; split out send-dropdown-list from from-dropdownDan2018-05-124-39/+260
| | | | | | | | | | * | | | | SendRowErrorMessage component test.Dan2018-05-111-0/+28
| | | | | | | | | | * | | | | Unit tests for send from, gas, to and wrapper row components.Dan2018-05-114-0/+403
| | | | | | | | | | * | | | | Fix test descriptions and remove unnecessary proptypes.Dan2018-05-105-14/+10
| | | | | | | | | | * | | | | Adds test for send, send-content, send-footer and send-header components.Dan2018-05-076-16/+516
| | | | | | | | | | * | | | | Unit tests for containers, utils and selectors in send_/Dan2018-05-0546-127/+3222
| | | | | | | | | | * | | | | Merge branch 'i3725-refactor-send-component-' of github.com:MetaMask/metamask...Dan2018-05-0113-1153/+1500
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | * \ \ \ \ Merge pull request #4157 from danjm/i3725-refactor-send-component-2Dan J Miller2018-05-0115-1169/+1941
| | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ Merge branch 'i3725-refactor-send-component-' into i3725-refactor-send-compon...Dan2018-05-01227-2737/+11177
| | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | |/ / / / / | | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | * | | | | Refactor page-container component structureAlexander Tseung2018-04-1114-106/+1367
| | | | | | | | | | * | | | | | | Delete dead send code.Dan2018-05-0110-723/+2
| | | | | | | | | | |/ / / / / /
| | | | | | | | | | * | | | | | Remove 'goHome' from send_Dan2018-05-012-4/+1
| | | | | | | | | | * | | | | | Move getMaxModeOn selector to amount-max-button container.Dan2018-05-013-6/+10
| | | | | | | | | | * | | | | | Use constants for send screen errors messages.Dan2018-05-014-9/+29
| | | | | | | | | | * | | | | | Fix send-v2__form class in send-content.componentDan2018-05-011-1/+1
| | | | | | | | | | * | | | | | Fix amount max button.Dan2018-05-015-7/+7
| | | | | | | | | | * | | | | | Fix close button on send screenDan2018-04-302-4/+5
| | | | | | | | | | * | | | | | Further refactors; includes refactor of send-v2.js and associated containerDan2018-04-3025-156/+489
| | | | | | | | | | * | | | | | Fixes to get tests passing.Dan2018-04-279-15/+35
| | | | | | | | | | * | | | | | Lint fixes and alphabetization for i3725-refactor-send-componentDan2018-04-2735-365/+330
| | | | | | | | | | * | | | | | Core of the refactor completeDan2018-04-2734-489/+757
| | | | | | | | | | * | | | | | Merge branch 'master' into i3725-refactor-send-componentDan2018-04-25132-2147/+5940
| | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | * | | | | | | second commitDan2018-04-1118-50/+461
| | | | | | | | | | * | | | | | | Merge branch 'master' into i3725-refactor-send-componentDan2018-04-1078-1913/+6030
| | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | |_|/ / / / / | | | | | | | | | | |/| | | | | |
| | | | | | | | | | * | | | | | | first commitDan2018-04-0794-37/+845
| | | | | | | | | | | | | | | | * lintJenny Pollack2018-06-071-1/+1
| | | | | | | | | | | | | | | | * remove loglevelJenny Pollack2018-06-071-2/+1
| | | | | | | | | | | | | | | | * preferred first languauge - check for BraveJenny Pollack2018-06-071-8/+5
| | | | | | | | | | | | | | | | * first language - add check for brave browser on getAcceptLanguagesJenny Pollack2018-06-071-1/+11
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | 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
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 02:10:41 +0800