aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* update content-hashpldespaigne2019-05-052-7551/+7580
* fix npm ci bug (version mismatch)pldespaigne2019-04-111-5/+6
* issue#5742pldespaigne2019-04-045-7798/+7795
* renaming registrar into registrypldespaigne2019-04-042-8/+8
* Merge pull request #6397 from MetaMask/wyre-deposit-modalkumavis2019-04-041-4/+4
|\
| * Change coinbase to wyreThomas Huang2019-04-041-4/+4
* | bump ledger and trezor keyring (#6395)Bruno Barbieri2019-04-042-131/+195
* | Fix display of gas chart on Ethereum networks (#6389)Dan J Miller2019-04-044-3/+7
|/
* Remove NoticeController (#6382)Thomas Huang2019-04-0225-1000/+77
* Remove unused account-dropdowns components (#6363)v6.3.2Whymarrh Whitby2019-04-022-811/+0
* Remove unused mascara directory (#6360)Whymarrh Whitby2019-04-022-416/+0
* Merge pull request #6375 from MetaMask/Version-6.3.1v6.3.1Thomas Huang2019-03-304-2/+16
|\
| * Version 6.3.1Dan Miller2019-03-302-1/+7
| * Check token name constants against the lower case methodData name in conf tx ...Dan Miller2019-03-301-1/+1
| * Ensure correct confirm screen in case of smartcontract check failDan Miller2019-03-302-1/+9
* | About tab copy changes; Update route for Info & Help in account menu (#6356)Chi Kei Chan2019-03-303-4/+10
|/
* Revert to providing inline defaults in getHexGasTotal and increaseLastGasPric...Dan J Miller2019-03-291-4/+4
* Further e2e fixes in wake of #6364 and #6367 (#6374)Dan J Miller2019-03-293-40/+64
* Merge pull request #6364 from MetaMask/prevent-infura-requests-e2e-testsWhymarrh Whitby2019-03-298-57/+132
|\
| * Split e2e run-all commands onto multiple linesWhymarrh Whitby2019-03-291-1/+2
| * Run from-import e2e tests with additional account, to avoid conflict with acc...Dan Miller2019-03-292-4/+4
| * Use localhost instead of mainnent/infura for custom rpc tests in e2e tests.Dan Miller2019-03-291-5/+5
| * ci: Add build:test Gulp task for e2e buildWhymarrh Whitby2019-03-293-4/+19
| * e2e: Update Contract Interaction wordingWhymarrh Whitby2019-03-291-3/+2
| * e2e: Skip approving token testWhymarrh Whitby2019-03-291-1/+1
| * e2e: Remove Privacy mode toggle stepWhymarrh Whitby2019-03-291-20/+0
| * Retry transaction list item click in 'adds multiple transactions' tests first...Dan Miller2019-03-291-1/+8
| * Default to localhost network when running e2e testsDan Miller2019-03-293-14/+15
| * Use webRequest to cancel all requests to infura in e2e tests.Dan Miller2019-03-295-6/+78
* | Merge pull request #6328 from MetaMask/clearNoticeskumavis2019-03-297-19/+136
|\ \
| * | test - unit - ui - actions - setCompletedOnboarding - fix stub to call callbackkumavis2019-03-291-0/+2
| * | lint fixkumavis2019-03-292-2/+2
| * | actions - setCompletedOnboarding - make async with pifykumavis2019-03-291-24/+17
| * | notice-controller - make markAllNoticesRead synckumavis2019-03-292-2/+2
| * | lib - nodeify - correctly wrap synchronous functionskumavis2019-03-292-7/+57
| * | notices - markAllNoticesRead - use async/awaitkumavis2019-03-294-25/+16
| * | Merge branch 'develop' into clearNoticeskumavis2019-03-291009-38167/+38369
| |\|
| * | Remove exclusive testThomas Huang2019-03-211-1/+1
| * | Clear notices when setCompletedOnboarding is calledThomas Huang2019-03-215-4/+85
* | | Merge pull request #6372 from MetaMask/addAddressIfNewkumavis2019-03-292-2/+5
|\ \ \
| * | | send-footer.utils.js - addressIsNew - improve readabilitykumavis2019-03-291-1/+3
| * | | prevent add duplicates when address is not newJenny Pollack2019-03-292-2/+3
| | |/ | |/|
* | | Merge pull request #5575 from vimalsagar/developkumavis2019-03-2924-17/+240
|\ \ \ | |/ / |/| |
| * | buy-eth-url - lint fixkumavis2019-03-291-1/+1
| * | buy-eth-url - fix variable namekumavis2019-03-291-2/+2
| * | Merge branch 'develop' of https://github.com/vimalsagar/metamask-extension in...kumavis2019-03-2924-17/+240
|/| |
| * | depoit-ether-modal - make buyEth args more explicitkumavis2019-03-291-2/+2
| * | getBuyEthUrl - getDefaultServiceForNetwork then switch on servicekumavis2019-03-291-23/+29
| * | PR 5575 review comment fixesVimal2019-02-282-24/+25
| * | merging upstream branchVimal2018-11-12254-10828/+19266
| |\ \
| * | | Adding CoinSwitch exchangeVimal2018-10-2224-1/+215
* | | | Delete some unused components (#6278)Dan J Miller2019-03-280-0/+0
* | | | Merge pull request #6358 from MetaMask/dont-assume-tx-has-gas-data-in-listThomas Huang2019-03-281-2/+2
|\ \ \ \
| * | | | Defaults to the args list in increaseLastGasPrice and getHexGasTotalDan Miller2019-03-281-4/+4
| * | | | getHexGasTotal and increaseLastGasPrice now gracefully handle null and undefi...Dan Miller2019-03-281-2/+2
|/ / / /
* | | | Open retore-vault route from popup (#6353)Chi Kei Chan2019-03-271-1/+1
* | | | Version 6.3.0 (#6350)v6.3.0Dan J Miller2019-03-272-1/+16
* | | | enable privacy mode for first time users (#6347)Thomas Huang2019-03-261-1/+3
* | | | Don't include tx value in calculation of balance sufficiency for cancel butto...Dan J Miller2019-03-261-2/+2
* | | | E2E - Dont close window notifications (#6349)Thomas Huang2019-03-261-2/+0
* | | | Cancel error rebased (#6341)Dan J Miller2019-03-264-16/+72
* | | | Close transaction on close of notification window (#6340)Dan J Miller2019-03-263-33/+88
* | | | New settings page rebased (#6333)Dan J Miller2019-03-2619-581/+1010
* | | | Replaces the coinbase link in the deposit modal with one for wyre (#6302)Dan J Miller2019-03-225-17/+30
* | | | Fix oversized loading overlay on gas customization modal. (#6326)Dan J Miller2019-03-221-0/+4
* | | | Fix gas fee in the submitted step of the transaction details activity log. (#...Dan J Miller2019-03-221-2/+11
* | | | Hide gas price chart and prevent api call when not on ethereum networks. (#6300)Dan J Miller2019-03-2210-25/+76
* | | | Folder restructure (#6304)Chi Kei Chan2019-03-22984-37646/+37215
* | | | Enable mobile sync (#6332)Bruno Barbieri2019-03-223-9/+2
* | | | Stop reloading dapps on network change allowing dapps to decide if it should ...Josh Stevens2019-03-222-0/+8
* | | | Fixing spelling of Ethereum in MetaMetrics copy (#6329)fixanoid2019-03-212-2/+2
| |_|/ |/| |
* | | Merge pull request #6327 from MetaMask/eth-contract-metadataWhymarrh Whitby2019-03-212-376/+153
|\ \ \
| * | | Bump gaba version to avoid broken eth-contract-metadataWhymarrh Whitby2019-03-212-376/+153
|/ / /
* | | Add rollback script, move auto-changelog script (#6252)Dan Finlay2019-03-204-5/+41
* | | Fix typos in English messages (#6317)Thomas Huang2019-03-191-2/+2
* | | Fixes popups not showing when screen size is odd (#6312)William Monti Souza2019-03-181-2/+2
* | | Centre the notification in the current window (#6307)Whymarrh Whitby2019-03-151-4/+3
* | | Merge pull request #6298 from whymarrh/node-8.15.1Whymarrh Whitby2019-03-132-18/+18
|\ \ \
| * | | ci: Skip updating npm@6 as it is defaultWhymarrh Whitby2019-03-131-2/+2
| * | | Update Node minor versionWhymarrh Whitby2019-03-132-16/+16
* | | | Merge pull request #6213 from whymarrh/seed-phrase-newlineWhymarrh Whitby2019-03-131-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Allow seed phrases with a trailing newlineWhymarrh Whitby2019-03-131-1/+1
|/ / /
* | | Patch/bump version (#6294)v6.2.2Thomas Huang2019-03-132-2/+9
* | | Merge pull request #6281 from MetaMask/fix-browser-back-on-reveal-seedThomas Huang2019-03-131-2/+2
|\ \ \
| * | | Fixes the use of the browser back button on the reveal seed screenDan Miller2019-03-121-2/+2
* | | | Merge pull request #6292 from whymarrh/npm-cikumavis2019-03-121-8/+1
|\ \ \ \
| * | | | ci: Use npm ci for fast(er) installsWhymarrh Whitby2019-03-121-8/+1
* | | | | build - babel - move config to babelrc (#6284)kumavis2019-03-122-26/+23
* | | | | Merge pull request #6271 from whymarrh/centre-notificatonskumavis2019-03-121-5/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Centre all notification popupsWhymarrh Whitby2019-03-121-5/+10
* | | | | Improve Korean translations (#6268)bowbowbow2019-03-121-29/+350
* | | | | ui - add missing PropTypes (#6287)kumavis2019-03-122-0/+3
|/ / / /
* | | | circleci - disable npm dep cache (#6288)kumavis2019-03-121-7/+7
* | | | mascara - remove from project (#6283)kumavis2019-03-1233-726/+24
* | | | Merge pull request #6289 from whymarrh/fix-ci-depskumavis2019-03-122-448/+1224
|\ \ \ \
| * | | | npm i -D ganache-core@2.5.3Whymarrh Whitby2019-03-122-368/+984
| * | | | Allow npm to update the package-lock.json fileWhymarrh Whitby2019-03-121-90/+250
|/ / / /
* | | | ci: Use cache version from circle environment var (#6286)kumavis2019-03-121-2/+2
* | | | GABA: Integrate AddressBookController (#5847)Paul Bouchon2019-03-126-221/+532
* | | | Merge pull request #6279 from MetaMask/notification-windowThomas Huang2019-03-121-1/+1
|\ \ \ \
| * | | | Nonmultiple notifications for batch txsThomas Huang2019-03-121-1/+1
* | | | | Merge pull request #6280 from MetaMask/network-checksum-disableThomas Huang2019-03-121-2/+1
|\ \ \ \ \
| * | | | | Remove line rather than comment outThomas Huang2019-03-121-4/+0
| * | | | | No longer check network when validating checksum addressesThomas Huang2019-03-121-2/+5
* | | | | | Version 6.2.1 (#6251)Thomas Huang2019-03-122-1/+3
|/ / / / /
* | / / / development - enhancement for sourcemap validator tool (#6277)kumavis2019-03-121-22/+71
| |/ / / |/| | |
* | | | Merge pull request #6261 from Pedro-vk/patch-1Thomas Huang2019-03-081-18/+18
|\ \ \ \ | |/ / / |/| | |
| * | | Uppercase and context fixes on Spanish translation.Pedro Gutiérrez2019-03-071-18/+18
|/ / /
* | | Handle undefined gas limits and prices in transaction-breakdown.component (#6...Dan J Miller2019-03-072-21/+38
* | | Add privacy policy link to modal metrics opt-in (#6250)Dan J Miller2019-03-071-1/+7
* | | Prevent advanced gas input arrows from setting value to < 0 (#6248)Dan J Miller2019-03-072-4/+24
* | | Only call onRecipient and onSender methods if defined in sender-to-recipient ...Dan J Miller2019-03-071-2/+6
* | | Fix missing this reference in addtoken button onclick method (#6245)Dan J Miller2019-03-061-1/+2
* | | Fixes the 'Percentages row tracks and gutters' decpracation warning. (#6244)Dan J Miller2019-03-061-1/+1
* | | Version 6.2.0 (#6239)v6.2.0Dan J Miller2019-03-062-1/+7
* | | Metametrics fixes (#6238)Dan J Miller2019-03-066-38/+43
* | | Merge pull request #6237 from MetaMask/metrics-descriptionThomas Huang2019-03-062-2/+2
|\ \ \
| * | | Wrap in spanThomas Huang2019-03-061-1/+1
| * | | Fix typoThomas Huang2019-03-061-1/+1
|/ / /
* | | Fix MetaMetrics Environment Check (#6235)Dan J Miller2019-03-061-1/+1
* | | Metametrics (#6171)Dan J Miller2019-03-0594-162/+2203
* | | Merge pull request #6223 from MetaMask/fix-6221Thomas Huang2019-03-051-1/+1
|\ \ \
| * | | SimplifyThomas Huang2019-03-051-1/+1
| * | | ImprovementThomas Huang2019-03-011-1/+1
| * | | Show popup if notification or activeMMtab is true but not if popup is openThomas Huang2019-03-011-1/+1
* | | | bump trezor-connect to v7 (#6224)Bruno Barbieri2019-03-052-37/+46
|/ / /
* | | First time flow updates (#6192)Dan J Miller2019-02-2741-528/+763
* | | Show/Hide Fiat on Testnets based on User Preference (#6153)Chi Kei Chan2019-02-2739-113/+1169
* | | Merge pull request #6190 from whymarrh/tmp.RvdXXs4ikumavis2019-02-261-1/+0
|\ \ \
| * | | Remove public property from package.json fileWhymarrh Whitby2019-02-211-1/+0
* | | | Feature Flag + Mobile Sync (#5955)Dan Finlay2019-02-2618-78/+760
* | | | Fix gas estimation when sending to contracts (#6195)Dan J Miller2019-02-266-8/+16
* | | | Merge pull request #6166 from whymarrh/bye-bye-old-uiWhymarrh Whitby2019-02-21127-20282/+12
|\ \ \ \
| * | | | Remove unused CI jobs, rename e2e beta jobsWhymarrh Whitby2019-02-212-16/+12
| * | | | Remove outdated ui dev and ui mock docsWhymarrh Whitby2019-02-214-18/+0
| * | | | Delete old-ui folderWhymarrh Whitby2019-02-21121-20248/+0
| |/ / /
* / / / account tracker - update accounts from balanceChecker contract (#6181)Jenny Pollack2019-02-213-3/+70
|/ / /
* | | Disable npm audit (#6188)Thomas Huang2019-02-211-13/+13
* | | fix: update README to add a missing " " space (#6191)Alon Bukai2019-02-211-1/+1
* | | EIP-1193: standard provider API (#6170)Paul Bouchon2019-02-209-23/+138
* | | Merge pull request #6184 from chikeichan/6132Dan J Miller2019-02-202-1/+26
|\ \ \
| * | | turn camcelCase method name to space separatedChi Kei Chan2019-02-192-1/+26
* | | | Merge pull request #6185 from chikeichan/5681Dan J Miller2019-02-201-5/+0
|\ \ \ \
| * | | | Remove password check when importing Account JSONChi Kei Chan2019-02-191-5/+0
| |/ / /
* | | | Merge pull request #6183 from chikeichan/5171Dan J Miller2019-02-201-1/+1
|\ \ \ \
| * | | | Bring Popup to front when ui is tiggeredChi Kei Chan2019-02-191-1/+1
| |/ / /
* | | | Merge pull request #6187 from MetaMask/Version-6.1.0Thomas Huang2019-02-204-1/+56
|\ \ \ \
| * | | | Add sensitive publishing protocolv6.1.0Dan Finlay2019-02-202-0/+47
| * | | | Version 6.1.0 RC1Dan Finlay2019-02-202-1/+9
|/ / / /
* / / / Change "Token Address" to "Token Contract Address" (#6182)Chi Kei Chan2019-02-202-1/+4
|/ / /
* | | Fix inpage.js event handler memory leak (#6177)Graham Kaemmer2019-02-191-4/+5
* | | Add Copy Tx ID button to transaction-list-item-details (#6146)Chi Kei Chan2019-02-174-2/+42
* | | Merge pull request #6164 from whymarrh/delete-travis-configWhymarrh Whitby2019-02-151-13/+0
|\ \ \
| * | | Delete unused Travis CI configWhymarrh Whitby2019-02-151-13/+0
|/ / /
* | | Merge pull request #6137 from whymarrh/es6-backgroundWhymarrh Whitby2019-02-148-32/+32
|\ \ \
| * | | Update popup-core script to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-6/+6
| * | | Update platforms/extension to use ES6 destructuring requiresWhymarrh Whitby2019-02-121-1/+1
| * | | Update phishing-detect script to use ES6 destructuring requiresWhymarrh Whitby2019-02-121-1/+1
| * | | Update NoticesController to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-3/+3
| * | | Update MetaMaskController to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-5/+5
| * | | Fix all "var used instead of let or const" problems in inpage.jsWhymarrh Whitby2019-02-121-4/+4
| * | | Update contentscript to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-5/+5
| * | | Fix all "var used instead of let or const" problems in background.jsWhymarrh Whitby2019-02-121-7/+7
* | | | Checksum address before slicing it for the confirm screen (#6133)Whymarrh Whitby2019-02-141-2/+6
* | | | Fixed issue #5838 (#6001)Jonathan Smirnoff2019-02-1414-18/+46
* | | | Adds tests for advanced gas controls on confim screen (#6144)Dan J Miller2019-02-131-1/+47
* | | | Add button to force edit token symbol when adding custom token (#6147)Chi Kei Chan2019-02-132-2/+38
* | | | Merge pull request #6124 from MetaMask/dissable-recent-block-controllerThomas Huang2019-02-133-4/+30
|\ \ \ \
| * | | | fix typofrankiebee2019-02-131-4/+4
| * | | | recent-blocks - dont listen for block when on infura providersfrankiebee2019-02-123-4/+30
* | | | | Version 6.0.1 (#6141)v6.0.1Whymarrh Whitby2019-02-132-1/+9
* | | | | Merge pull request #6139 from whymarrh/fix-confirm-advanced-gasWhymarrh Whitby2019-02-121-1/+1
|\ \ \ \ \
| * | | | | Fix advanced gas controls on the confirm screenWhymarrh Whitby2019-02-121-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #6134 from whymarrh/first-time-seed-whitespaceWhymarrh Whitby2019-02-121-2/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Trim whitespace from seed phrase during importWhymarrh Whitby2019-02-121-2/+4
* | | | | Update Italian translation (#6119)matteopey2019-02-121-40/+277
* | | | | Improved Traditional Chinese translation (#6125)S.C. Chen2019-02-121-102/+735
|/ / / /
* | | | Version 6 RC1 (#6117)Dan Finlay2019-02-122-1/+12
* | | | Merge pull request #6131 from MetaMask/docs-patchWhymarrh Whitby2019-02-121-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Add native deps compilation troubleshooting to docsWhymarrh Whitby2019-02-111-0/+1
|/ / /
* | | Merge pull request #6122 from whymarrh/fix-gas-editingWhymarrh Whitby2019-02-097-76/+147
|\ \ \
| * | | Add e2e tests adjusting gas before sendingWhymarrh Whitby2019-02-092-12/+96
| * | | Fix inline advanced gas editingWhymarrh Whitby2019-02-096-64/+51
* | | | Fix locale codes contains underscore will never be preferred (#6116)S.C. Chen2019-02-091-4/+11
|/ / /
* | | Merge pull request #6121 from whymarrh/audit-depsWhymarrh Whitby2019-02-091-12/+40
|\ \ \
| * | | Fix 1 moderate severity vulnerability with depsWhymarrh Whitby2019-02-081-12/+40
* | | | implement class for sign footer button (#6120)Brandon Wissmann2019-02-081-0/+1
|/ / /
* | | Set custom gas data in state from inline advance gas controls on send screen ...Dan J Miller2019-02-072-2/+11
* | | Add Swap feature to CurrencyInput (#6091)Chi Kei Chan2019-02-068-45/+152
* | | Change gas labels to Slow/Average/Fast (#6090)Chi Kei Chan2019-02-062-60/+60
* | | Add togglable advanced gas controls on send and confirm screens (#6112)Dan J Miller2019-02-0620-36/+609
* | | Merge pull request #5929 from whymarrh/phishing-redesignWhymarrh Whitby2019-02-063-77/+465
|\ \ \
| * | | Update design of phishing warning screenWhymarrh Whitby2019-02-063-77/+465
|/ / /
* | | Merge pull request #6082 from whymarrh/migrate-to-new-uiWhymarrh Whitby2019-02-0525-229/+177
|\ \ \
| * | | Add announcement for users migrated to the new UIWhymarrh Whitby2019-02-0515-50/+122
| * | | Remove betaUI preference state, replace with completedUiMigrationWhymarrh Whitby2019-02-053-9/+42
| * | | Default to the new UI for all usersWhymarrh Whitby2019-02-056-116/+13
| * | | Remove commented references to Beta UIWhymarrh Whitby2019-02-051-18/+0
| * | | Remove "Use old UI" settingWhymarrh Whitby2019-02-052-37/+1
|/ / /
* | | Version 5.3.5 (#6109)v5.3.5Whymarrh Whitby2019-02-052-1/+5
* | | Privacy mode fixes (#6087)Bruno Barbieri2019-02-022-14/+16
* | | Version 5.3.4 RC1 (#6084)Dan Finlay2019-02-012-1/+5
* | | fix - migration 30 undefinds (#6079)Frankie2019-02-011-16/+18
* | | Merge pull request #6076 from MetaMask/Version-5.3.3Thomas Huang2019-01-312-1/+8
|\ \ \
| * | | Version 5.3.3 RC1v5.3.3Dan Finlay2019-01-312-1/+8
|/ / /
* | | EIP-1102 updates (#6006)Paul Bouchon2019-01-318-42/+49
* | | Remove unused InitializeMenuScreen component (#6075)Whymarrh Whitby2019-01-311-224/+0
* | | Improved Spanish translations (#6072)Pedro Gutiérrez2019-01-311-13/+13
* | | Merge pull request #6074 from MetaMask/ui-codeownersWhymarrh Whitby2019-01-301-1/+1
|\ \ \
| * | | Update UI codeownersWhymarrh Whitby2019-01-301-1/+1
|/ / /
* | | e2e: Use close instead of save for gas modal (#6066)Thomas Huang2019-01-301-1/+2
* | | Add visual indicator when displaying a cached balance (#5854)Dan J Miller2019-01-3022-31/+161
* | | I#5956 fix2 dont overwrite existing rpc settings (#6044)Frankie2019-01-307-9/+85
* | | Version 5.3.2 RC1 (#6069)Dan Finlay2019-01-292-1/+10
* | | Merge pull request #6021 from MetaMask/i5943-shapeshift-txDan J Miller2019-01-264-50/+1028
|\ \ \
| * | | Fix bugs in e2e tests related to gas customization inputs.Dan Miller2019-01-251-14/+17
| * | | Add integration test for ordering of shapeshift txs in history list.Dan Miller2019-01-252-8/+227
| * | | Fix integration testsAlexander Tseung2019-01-252-20/+756
| * | | Order shapeshift transactions by time within the transactions listAlexander Tseung2019-01-251-12/+32
* | | | add source for header in create infura client (#6023)Jenny Pollack2019-01-252-679/+266
|/ / /
* | | Prevent send to token warning (#6058)Esteban Miño2019-01-2428-15/+256
* | | Refactor first time flow, remove seed phrase from state (#5994)Alexander Tseung2019-01-23114-3002/+2722
* | | Updated Spanish translations (#6046)oliver renwick2019-01-231-3/+577
* | | Prevent send to token (#6051)Esteban Miño2019-01-239-3/+66
* | | fix asset detection (#6049)Bruno Barbieri2019-01-233-7/+45
* | | Use Parity on-chain registry only when is needed (#6052)Esteban Miño2019-01-237-6/+61
* | | Refactor BalanceComponent to jsx (#6048)Alexander Tseung2019-01-216-250/+121
* | | I#5956 fix 1 (#6026)Frankie2019-01-185-1/+93
* | | Fix grammar error in Current Conversion (#6029)Alexander Tseung2019-01-172-3/+3
* | | Merge pull request #6027 from MetaMask/Version-5.3.1Thomas Huang2019-01-172-1/+14
|\ \ \
| * \ \ Merge branch 'develop' into Version-5.3.1v5.3.1Dan Finlay2019-01-171-18/+18
| |\ \ \
| * | | | Version 5.3.1 RC2Dan Finlay2019-01-172-1/+14
* | | | | Disable account dropdown on signing screens (#6024)Alexander Tseung2019-01-175-85/+195
| |/ / / |/| | |
* | | | Skip drizzle tests unit issue with ci is determined (#5982)Thomas Huang2019-01-171-18/+18
|/ / /
* | | Merge pull request #5966 from filips123/patch-1Thomas Huang2019-01-111-3/+180
|\ \ \
| * \ \ Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into...Filip Š2019-01-1017-278/+445
| |\ \ \
| * | | | Update Slovenian translationFilip Š2018-12-261-3/+180
* | | | | Set auto conversion off for token/eth conversion (#6005)Thomas Huang2019-01-111-1/+1
* | | | | Fix confirm screen for sending ether tx with hex data (#6008)Alexander Tseung2019-01-111-0/+6
| |/ / / |/| | |
* | | | Merge pull request #5999 from MetaMask/app-descriptionThomas Huang2019-01-061-1/+1
|\ \ \ \
| * | | | Refine app descriptionDan Finlay2019-01-061-1/+1
|/ / / /
* | | | Merge pull request #5997 from whymarrh/drizzle-scriptThomas Huang2019-01-051-9/+24
|\ \ \ \
| * | | | Clean up drizzle test runner scriptWhymarrh Whitby2019-01-041-10/+21
| * | | | Revert "remove error flags from drizzle setup"Whymarrh Whitby2019-01-041-0/+4
|/ / / /
* | | | Fix ERC20 token value decoding (#5995)Hsuan Lee2019-01-041-1/+1
* | | | Merge pull request #5970 from Wathis/developVincent2019-01-041-6/+6
|\ \ \ \
| * | | | Wrong french translationWathis2019-01-041-6/+6
|/ / / /
* | | | Fix Component#componentDidUpdate usage (#5977)Bowen2019-01-041-3/+3
* | | | Merge pull request #5987 from MetaMask/Version-5.3.0Thomas Huang2019-01-042-1/+10
|\ \ \ \
| * | | | Version 5.3.0 RC1v5.3.0Dan Finlay2019-01-032-1/+10