aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Add sigRequest for Signature RequestThomas2018-03-131-0/+3
* Merge branch 'master' into i18nThomas Huang2018-03-124-12/+95
|\
| * Merge pull request #3409 from scsaba/seed-phrase-verificationDan Finlay2018-03-082-9/+92
| |\
| | * modify verifySeedPhrase to async and call it from addNewAccount alsoCsaba Solya2018-03-061-32/+34
| | * add documentationCsaba Solya2018-03-042-0/+9
| | * verify seedwords on log inCsaba Solya2018-03-041-3/+16
| | * verify addresses regardless caseCsaba Solya2018-03-031-1/+1
| | * fix lint issuesCsaba Solya2018-03-032-11/+11
| | * seed phrase verifierCsaba Solya2018-03-032-2/+61
| * | fix typo in tests and tx-state-managerJeffrey Tong2018-03-081-1/+1
| * | fix typo in transaction.jsJeffrey Tong2018-03-071-2/+2
* | | Merge branch 'master' into i18nDan Finlay2018-03-071-3/+3
|\| |
| * | Version 4.2.0kumavis2018-03-071-3/+3
* | | Missing comma in messages.jsonDan2018-03-071-1/+1
* | | Merge branch 'master' into i18nDan2018-03-0724-25/+912
|\| |
| * | Merge pull request #3309 from scsaba/edge-supportDan Finlay2018-03-072-0/+77
| |\ \
| | * | make keyFromPassword privateCsaba Solya2018-02-231-3/+3
| | * | Merge branch 'master' into edge-supportCsaba S2018-02-2271-41/+562
| | |\ \
| | * | | add edge supportCsaba Solya2018-02-222-0/+77
| * | | | Version 4.1.3v4.1.3Dan Finlay2018-03-031-1/+1
| | |_|/ | |/| |
| * | | Merge pull request #3356 from MetaMask/cdn-minimizationKevin Serrano2018-03-027-0/+644
| |\ \ \
| | * | | Check in all font files locally.Kevin Serrano2018-03-017-0/+644
| * | | | 4.1.2kumavis2018-03-011-1/+1
| * | | | Merge pull request #3361 from MetaMask/4.1.1v4.1.1Thomas Huang2018-03-011-1/+1
| |\ \ \ \
| | * | | | v4.1.1kumavis2018-03-011-1/+1
| | |/ / /
| * | | | sentry - extractErrorMessage - fix comment formattingkumavis2018-03-011-1/+1
| * | | | sentry - failed tx - improve ethjs-rpc error formatingkumavis2018-03-012-5/+41
| * | | | sentry - clean - move setupRaven to libkumavis2018-03-013-3/+3
| |/ / /
| * | | Merge pull request #3323 from MetaMask/version-4.0.0v4.1.0Frankie2018-02-281-1/+1
| |\ \ \
| | * | | Bump VersionThomas2018-02-281-1/+1
| | * | | Version 4.0.0Thomas2018-02-231-1/+1
| | | |/ | | |/|
| * | | Merge pull request #3281 from MetaMask/sentry-failed-tx-debatchDan Finlay2018-02-281-1/+2
| |\ \ \ | | |/ / | |/| |
| | * | sentry - report failed tx with more specific messagekumavis2018-02-171-1/+2
| * | | Merge pull request #3306 from danjm/MM-805-send-from-tab-popup-fixThomas Huang2018-02-221-1/+11
| |\ \ \
| | * | | Prevents new transaction from generating popup when metamask is open in an ac...Dan2018-02-221-1/+11
| * | | | Merge branch 'master' into uat-masterDan Finlay2018-02-224-3/+17
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge pull request #3250 from MetaMask/i#3136kumavis2018-02-161-2/+3
| | |\ \ \
| | | * | | fix - hex prefix estimatedGas on txMetafrankiebee2018-02-151-2/+3
| | * | | | Fix incorrect promise instantiationDan Finlay2018-02-161-1/+1
| | | |_|/ | | |/| |
| | * | | Version 3.14.2v3.14.2Dan Finlay2018-02-161-1/+1
| | * | | Merge pull request #3222 from MetaMask/mesh-testDan Finlay2018-02-162-0/+13
| | |\ \ \ | | | |/ / | | |/| |
| | | * | metamask mesh - inject mesh testing containerkumavis2018-02-112-0/+13
| | * | | use the providers initial _blocktracker. fixes #2393Lazaridis2018-02-111-1/+1
| | |/ /
| * | / Fix promise constructionDan Finlay2018-02-211-1/+1
| | |/ | |/|
| * | Bump uat version to 4.0.12Dan2018-02-171-1/+1
| * | Make oldui compatible with newUI style changesThomas Huang2018-02-161-2/+2
| * | Merge branch 'uat' into uat-nextDan2018-02-086-10/+63
| |\ \
| | * | Merge branch 'master' into uatDan2018-02-086-10/+63
| | |\|
| | | * Version 3.14.1v3.14.1Dan Finlay2018-02-021-1/+1
| | | * Version 3.14.0Dan Finlay2018-02-021-1/+1
| | | * Merge branch 'master' into localStorage-clean-upFrankie2018-02-013-0/+23
| | | |\
| | | | * preserve other networks TXsBruno Barbieri2018-02-011-3/+4
| | | | * use txMeta.txParamsBruno Barbieri2018-01-311-1/+1
| | | | * wipe only transactions for current accountBruno Barbieri2018-01-313-9/+15
| | | | * clean upBruno Barbieri2018-01-311-3/+3
| | | | * added reset account featureBruno Barbieri2018-01-313-0/+16
| | | * | remove RecentBlocks from diskfrankiebee2018-02-012-3/+2
| | | * | creater migration to remove BlacklistControllerfrankiebee2018-01-311-0/+33
| | | * | remove BlacklistController from disk statefrankiebee2018-01-312-6/+2
| | | |/
| | | * Version 3.13.8v3.13.8Dan Finlay2018-01-301-1/+1
| | | * Bump limit for event emitter warning.Kevin Serrano2018-01-261-0/+2
| | | * Merge remote-tracking branch 'origin/master' into Version-3.13.7Dan Finlay2018-01-232-1/+13
| | | |\
| | | | * sentry - report failed txskumavis2018-01-232-1/+13
| | | * | Version 3.13.7Dan Finlay2018-01-231-1/+1
| | | |/
| * | / [NewUI] Opens to full screen when restoring from seed. (#3201)Dan J Miller2018-02-082-0/+26
| |/ /
| * | Merge branch 'master' into uatThomas2018-01-233-2/+14
* | | complete i18n across new UINick Doiron2018-01-302-69/+105
* | | better organization of locale file; i18n in more view filesNick Doiron2018-01-241-125/+506
* | | first steps to i18nNick Doiron2018-01-231-1/+166
|/ /
* | Merge branch 'uat' into newmasterChi Kei Chan2018-01-2069-40/+525
|\ \ | |/ |/|
| * 4.0.10kumavis2018-01-191-1/+1
| * Update popout to fullscreen iconAlexander Tseung2018-01-181-0/+21
| * Merge branch 'uat' into uat-master-011618Alexander Tseung2018-01-1768-42/+502
| |\
| | * [NewUI] Place all users of extension into old UI (disable auto adding). (#2946)Dan J Miller2018-01-161-3/+7
| | * Merge branch 'uat' into cb-388Chi Kei Chan2018-01-133-2/+7
| | |\
| | | * Fix styling in initializationAlexander Tseung2018-01-131-2/+7
| | | * [NewUI-flat] New deposit ether modal UI. (#2642)Dan J Miller2018-01-132-0/+0
| | * | Update main view stylingAlexander Tseung2018-01-111-0/+128
| | |/
| | * 4.0.9kumavis2018-01-091-1/+1
| | * Merge branch 'NewUI-flat' into NewUI-flat-4.0.5cAlexander Tseung2018-01-0465-42/+365
| | |\
| | | * Merge branch 'NewUI-flat' into merge-masterAlexander Tseung2017-12-231-1/+1
| | | |\
| | | | * Update manifest.json version from 4.0.4 to 4.0.5 (#2797)Alexander Tseung2017-12-231-1/+1
| | | * | Merge branch 'NewUI-flat' into merge-masterAlexander Tseung2017-12-2365-42/+365
| | | |\|
| | | | * Track usage of old and new UI (#2794)Alexander Tseung2017-12-233-6/+57
| | | | * Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-212-0/+5
| | | | |\
| | | | | * Adds updateTransaction to background and used it to update after editing in s...Dan2017-12-212-6/+5
| | | | | * Canceled, edited transactions show edited amount.Dan2017-12-212-0/+6
| | | | * | Merge branch 'master' into NewUI-flatDan2017-12-219-37/+179
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | * | Adds button for opening app in main browser window in extension.Dan2017-12-132-0/+20
| | | | * | Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UIChi Kei Chan2017-12-0810-29/+150
| | | | |\ \
| | | | | * \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-12-072-3/+21
| | | | | |\ \
| | | | | * | | Merge branch 'master' into NewUI-flat-merge-with-masterDan2017-12-078-26/+129
| | | | * | | | Lint fixDan2017-12-051-1/+1
| | | | * | | | Css selected in background based on betaUI state.Dan2017-12-051-6/+15
| | | | * | | | Add UI selectionDan2017-12-053-0/+19
| | | | |/ / /
| | | | * | | Fixes changes requested in pullrequestreview-79088534Jason Clark2017-11-271-0/+1
| | | | * | | more eslint fixesJason Clark2017-11-261-1/+1
| | | | * | | toggle wired up to preferences property storeJason Clark2017-11-252-2/+12
| | | | * | | incremental commitClark, Jason (Contractor)2017-11-241-0/+8
| | | | * | | Version BumpChi Kei Chan2017-11-161-1/+1
| | | | * | | Merge branch 'master' into merge-masterChi Kei Chan2017-11-163-2/+12
| | | | |\ \ \
| | | | * \ \ \ Merge pull request #2519 from danjm/NewUI-flat-lintfixesThomas Huang2017-11-031-2/+0
| | | | |\ \ \ \
| | | | | * | | | Lint fixes for NewUI-flat.Dan2017-11-021-2/+0
| | | | * | | | | 4.0.3kumavis2017-10-261-1/+1
| | | | * | | | | Merge branch 'NewUI-flat' into uatChi Kei Chan2017-10-2619-37/+134
| | | | |\| | | |
| | | | | * | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-261-3/+7
| | | | | |\ \ \ \
| | | | | * | | | | Sign Typed Request styling fixesChi Kei Chan2017-10-261-1/+1
| | | | | * | | | | Signature request fixes.Dan2017-10-261-1/+1
| | | | | * | | | | Add Info sectionAlexander Tseung2017-10-261-0/+0
| | | | | * | | | | Fix styling on notification viewChi Kei Chan2017-10-251-2/+2
| | | | | * | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-2513-31/+30
| | | | | |\ \ \ \ \
| | | | | * \ \ \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-253-1/+81
| | | | | |\ \ \ \ \ \
| | | | | * | | | | | | Account menu white check markChi Kei Chan2017-10-241-0/+14
| | | | * | | | | | | | 4.0.2kumavis2017-10-211-1/+1
| | | | * | | | | | | | 4.0.1kumavis2017-10-211-1/+1
| | | | |/ / / / / / /
| | | | * | | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-214-27/+88
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'NewUI-flat' into mergeChi Kei Chan2017-10-1955-29/+215
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Adding Account Dropdown V2Chi Kei Chan2017-10-134-24/+57
| | | | | * | | | | | | | UI for send screen container without form rows.Dan2017-10-091-1/+4
| | | | | * | | | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-049-86/+90
| | | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Enables remove token and ensures add/remove update the list without need for ...Dan2017-10-042-1/+13
| | | | | * | | | | | | | | Merge branch 'master' into mmnChi Kei Chan2017-09-2820-1119/+751
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-09-192-4/+10
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into nmChi Kei Chan2017-09-1920-245/+519
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | Improve styling in Confirmation Screen; Show decoded send token dataChi Kei Chan2017-09-131-1/+0
| | | | | * | | | | | | | | | | | Added signTokenTx; Adding token confirmation screenChi Kei Chan2017-09-121-0/+3
| | | | | * | | | | | | | | | | | Fix html heightChi Kei Chan2017-09-061-2/+2
| | | | | * | | | | | | | | | | | Replace Avenir Next with alternative.Dan2017-08-3011-0/+93
| | | | | * | | | | | | | | | | | Add bolt and info icon vector imagessdtsui2017-08-232-0/+22
| | | | | * | | | | | | | | | | | Merge remote-tracking branch 'mm/master' into NewUI-flatsdtsui2017-08-144-5/+21
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into NewUI-flatkumavis2017-08-095-189/+253
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into feat/mm-ui-5sdtsui2017-08-0713-370/+308
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Add Roboto without hooking it up via importsdtsui2017-08-0518-0/+0
| | | | | * | | | | | | | | | | | | | | Adjust sidebar transition using @cjeria\'s feedbacksdtsui2017-08-031-0/+10
| | | | | * | | | | | | | | | | | | | | Ensure app-header is rendered in responsive layoutsdtsui2017-08-031-1/+1
| | | | | * | | | | | | | | | | | | | | Add Ethereum Logosdtsui2017-08-031-0/+11
| | | | | * | | | | | | | | | | | | | | Reset popup to 350x500, old form factor as advised by @Zanibassdtsui2017-08-011-1/+1
| | | | | * | | | | | | | | | | | | | | Add new fonts from @cjeria: DIN Next and DIN OTsdtsui2017-08-0112-0/+0
| | | | | * | | | | | | | | | | | | | | Adjust popup size to 545x450; refactor wallet view to fitsdtsui2017-08-011-1/+1
| | | | | * | | | | | | | | | | | | | | Set font-size on body of popup.html, for responsivenesssdtsui2017-07-311-1/+1
| | | | | * | | | | | | | | | | | | | | Adjust dimensions of popup.html and app bar to matchsdtsui2017-07-312-2/+2
* | | | | | | | | | | | | | | | | | | | Merge pull request #3016 from MetaMask/sentryDan Finlay2018-01-194-0/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | sentry - dedupe raven vendorkumavis2018-01-182-5/+2
| * | | | | | | | | | | | | | | | | | | | sentry - breakout raven setup and add release configkumavis2018-01-183-9/+35
| * | | | | | | | | | | | | | | | | | | | sentry - update raven and add to uikumavis2018-01-184-7/+13
| * | | | | | | | | | | | | | | | | | | | sentry - add raven + sentry reporting configkumavis2018-01-182-0/+8
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | test - tx controller - fix txGasUtil referencekumavis2018-01-181-1/+2
* | | | | | | | | | | | | | | | | | | | Update transactions.jskumavis2018-01-181-1/+1
* | | | | | | | | | | | | | | | | | | | transactions - transtion approved transactions to failed transactions on bootfrankiebee2018-01-181-0/+8
* | | | | | | | | | | | | | | | | | | | transactions - fail txs on boot who fail addTxDefaultsfrankiebee2018-01-181-0/+2
* | | | | | | | | | | | | | | | | | | | transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on ...frankiebee2018-01-181-2/+20
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Version 3.13.5v3.13.5Dan Finlay2018-01-171-1/+1
* | | | | | | | | | | | | | | | | | | Create new flag for simple sends to avoid overloading other flagDan Finlay2018-01-171-2/+2
* | | | | | | | | | | | | | | | | | | Merge branch 'master' into i2907-NoCodeGasLimitkumavis2018-01-171-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into open-popupFrankie2018-01-163-13/+79
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | transactions - emit 'newUnapprovedTx' before estimateGas finishesfrankiebee2018-01-151-2/+6
* | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into i2907-NoCodeGasLimitDan Finlay2018-01-162-11/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge pull request #2936 from MetaMask/i2925-BetterGasEstimationDan Finlay2018-01-162-11/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | Prefer passing a provider over an ethQuery instanceDan Finlay2018-01-132-8/+4
| | * | | | | | | | | | | | | | | | | | | | Improve gas price estimation by backfilling recent-blocksDan Finlay2018-01-122-9/+76
| | |/ / / / / / / / / / / / / / / / / / /
* | / / / / / / / / / / / / / / / / / / / Set gas limit to 21k for recipients with no codeDan Finlay2018-01-161-5/+22
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge pull request #2900 from MetaMask/infura-rest-apikumavis2018-01-161-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into infura-rest-apikumavis2018-01-122-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | provider - infura - use infura REST apikumavis2018-01-091-2/+5
| * | | | | | | | | | | | | | | | | | | | bugfix - transactions controller - breakout logic and fix order of operations...kumavis2018-01-091-2/+4
* | | | | | | | | | | | | | | | | | | | | ci(ko/messages.json): add korean localization filex86kernel2018-01-101-0/+10
| |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Version 3.13.4v3.13.4Dan Finlay2018-01-101-1/+1
* | | | | | | | | | | | | | | | | | | | Default to 1 gwei for empty blocksDan Finlay2018-01-091-2/+3
* | | | | | | | | | | | | | | | | | | | Default gas estimate to 1 gwei for networks with no block activityDan Finlay2018-01-091-0/+6
* | | | | | | | | | | | | | | | | | | | bugfix - transactions controller - breakout logic and fix order of operations...kumavis2018-01-091-2/+4
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #2891 from MetaMask/i2621-0xRecipientAddressThomas Huang2018-01-091-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into i2621-0xRecipientAddressDan Finlay2018-01-093-2/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Account for 0x/empty string address and contract creationThomas2018-01-081-0/+11
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #2851 from MetaMask/i2812-seedworderrorfixKevin Serrano2018-01-091-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add fix for infinite spinner for incorrect seed phrase.Kevin Serrano2018-01-041-4/+9
* | | | | | | | | | | | | | | | | | | | Fix feature to workDan Finlay2018-01-062-3/+11
* | | | | | | | | | | | | | | | | | | | LintedDan Finlay2018-01-061-3/+0
* | | | | | | | | | | | | | | | | | | | Derive gas price estimate from previous transactionsDan Finlay2018-01-063-2/+23
| |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #2783 from MetaMask/tx-param-vaalidationkumavis2018-01-031-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | tx-gas-utils - tx-param-validation - use more intuitive checkkumavis2018-01-031-2/+2
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into tx-param-vaalidationFrankie2017-12-223-18/+73
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | transactions - throw error if dapp provides txParams whos value has a decimalfrankiebee2017-12-211-2/+9
* | | | | | | | | | | | | | | | | | | Merge pull request #2817 from MetaMask/i#2810Frankie2017-12-291-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | transactions:pending - only check nonces of transactions who's from adress ma...frankiebee2017-12-281-1/+2
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | | | Fix some silly linting issues.Kevin Serrano2017-12-282-2/+2
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Remove retryTimePeriod from tx controllerDan Finlay2017-12-221-1/+0
* | | | | | | | | | | | | | | | | | Stop failing pending transactions after any period of timeDan Finlay2017-12-221-7/+0
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #2763 from MetaMask/AddRecentBlocksControllerThomas Huang2017-12-212-14/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Do not log whole txs in recent block controller.Dan Finlay2017-12-201-1/+8
| * | | | | | | | | | | | | | | | | Add Recent Blocks controllerDan Finlay2017-12-182-14/+62
* | | | | | | | | | | | | | | | | | Allow updating token detailsDan Finlay2017-12-191-4/+4
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'master' into i#2720frankiebee2017-12-161-1/+1
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Change console.log for opts in _configureInfuraProviderThomas Huang2017-12-161-1/+1
* | | | | | | | | | | | | | | | | transactions:gas-utils - handle new type of estimateGas errorfrankiebee2017-12-151-1/+5
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #2747 from MetaMask/Version-3.13.3Thomas Huang2017-12-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Version 3.13.3v3.13.3Dan Finlay2017-12-151-1/+1
* | | | | | | | | | | | | | | | | Merge pull request #2662 from williamchong007/masterThomas Huang2017-12-151-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | fix #1398, prevent injecting xml without xml suffixWilliam Chong2017-12-051-2/+10
* | | | | | | | | | | | | | | | | Revert "Revert "network - for infura networks use the infura block tracker pr...kumavis2017-12-141-7/+50
* | | | | | | | | | | | | | | | | Revert "network - for infura networks use the infura block tracker provider"Frankie2017-12-141-50/+7
* | | | | | | | | | | | | | | | | Merge pull request #2741 from MetaMask/infura-block-trackerFrankie2017-12-141-7/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | network - for infura networks use the infura block tracker providerkumavis2017-12-141-7/+50
* | | | | | | | | | | | | | | | | | dont aggresively query account datafrankiebee2017-12-141-2/+0
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Version 3.13.2v3.13.2Dan Finlay2017-12-101-1/+1
* | | | | | | | | | | | | | | | | Pass polling interval to zero client providerDan Finlay2017-12-101-1/+5
* | | | | | | | | | | | | | | | | tx-controller - failed state is a finished statekumavis2017-12-082-7/+9
* | | | | | | | | | | | | | | | | Version 3.13.1Dan Finlay2017-12-081-1/+1
* | | | | | | | | | | | | | | | | Do not allow nonces larger than the next valid nonceDan Finlay2017-12-081-0/+4
* | | | | | | | | | | | | | | | | Merge branch 'master' into patch-2Dan Finlay2017-12-084-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Version 3.13.0Dan Finlay2017-12-071-1/+1
| * | | | | | | | | | | | | | | | | Enforce retry tx at minimum gas of previous txDan Finlay2017-12-071-1/+4
| * | | | | | | | | | | | | | | | | Fix retry actionDan Finlay2017-12-071-1/+9
| * | | | | | | | | | | | | | | | | Add retry background method and actionDan Finlay2017-12-073-0/+9
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | A more expressive wayvicnaum2017-12-071-5/+2
* | | | | | | | | | | | | | | | | Fix for #2644 - Specified Nonce isn't usedvicnaum2017-12-071-1/+6
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta in...Dan2017-12-071-1/+1
* | | | | | | | | | | | | | | | Correct note for updateTx after block-update event in transaction.jsDan2017-12-071-1/+1
* | | | | | | | | | | | | | | | Fix undefined latestBlockNumber in _resubmitTxDan2017-12-071-1/+1
* | | | | | | | | | | | | | | | Exponentional backoff on transaction retry in pending-tx-trackerDan2017-12-062-2/+20
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #2630 from MetaMask/i2624-VersionedNoticesv3.12.1Thomas Huang2017-11-305-17/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Bump version to 3.12.1Dan Finlay2017-11-301-1/+1
| * | | | | | | | | | | | | | | Fix migration commentDan Finlay2017-11-301-2/+3
| * | | | | | | | | | | | | | | Migrate old data to include firstVersion infoDan Finlay2017-11-292-0/+41
| * | | | | | | | | | | | | | | LintedDan Finlay2017-11-292-2/+2
| * | | | | | | | | | | | | | | Add seed phrase bounty award noticeDan Finlay2017-11-291-1/+0
| * | | | | | | | | | | | | | | Get notice version filtering working nicelyDan Finlay2017-11-292-24/+28
| * | | | | | | | | | | | | | | Add firstVersion field to notices selectorDan Finlay2017-11-292-1/+5
| * | | | | | | | | | | | | | | Add optional version field to noticesDan Finlay2017-11-292-1/+20
* | | | | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fixkumavis2017-11-301-1/+1
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #2441 from MetaMask/kumavis-patch-3Dan Finlay2017-11-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | network controller - warn via log.warnkumavis2017-11-281-1/+1
| | * | | | | | | | | | | | | | | Update network.jskumavis2017-10-241-1/+1
* | | | | | | | | | | | | | | | | deps - obs-store@3 + migrate stream plumbingkumavis2017-11-293-6/+10
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Prevent creation of multiple vaultsDan Finlay2017-11-211-31/+20
* | | | | | | | | | | | | | | | Add reproduction and mutex codeDan Finlay2017-11-211-2/+37
* | | | | | | | | | | | | | | | Merge pull request #2516 from MetaMask/i2507-DoubleWeb3ErrorThomas Huang2017-11-211-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add useful error when duplicate web3 is detected.Dan Finlay2017-11-011-0/+7
* | | | | | | | | | | | | | | | newUnaprovedTx => newUnapprovedTxDora E. Mondrian2017-11-062-2/+2
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #2291 from MetaMask/gasPriceSpecifiedKevin Serrano2017-10-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add indicator for specified gas priceKevin Serrano2017-10-061-0/+1
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Resolve merge conflictsKevin Serrano2017-10-2720-64/+209
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | 3.12.0v3.12.0kumavis2017-10-261-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Resolving that ugly merge.Kevin Serrano2017-10-261-3/+7
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #2422 from watilde/fixes-lintKevin Serrano2017-10-2513-31/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Fix lint warningsDaijiro Wachi2017-10-2213-31/+30
| * | | | | | | | | | | | | Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin...tmashuang2017-10-241-0/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Add ShapeShift UIChi Kei Chan2017-10-211-0/+76
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | Try to fix intermittent test failure in NonceTracker testsDan Finlay2017-10-231-0/+4
| * | | | | | | | | | | | Version 3.11.2v3.11.2Dan Finlay2017-10-221-1/+1
| |/ / / / / / / / / / /
| * | | | | | | | | | / Version 3.11.1v3.11.1Dan Finlay2017-10-211-1/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 16:25:53 +0800