aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* seed phrase verifierCsaba Solya2018-03-033-2/+197
* Fix network menu for custom URLs (#3366)Alexander Tseung2018-03-023-46/+190
* Fix exception thrown when styleOverride is not present (#3364)Alexander Tseung2018-03-021-1/+1
* Merge pull request #3356 from MetaMask/cdn-minimizationKevin Serrano2018-03-0210-6/+1657
|\
| * Correct ttf format name to 'truetype'Dan2018-03-023-126/+126
| * Check in all font files locally.Kevin Serrano2018-03-0110-6/+1657
* | Merge pull request #3363 from MetaMask/4.1.2v4.1.2Thomas Huang2018-03-012-1/+5
|\ \
| * | 4.1.2kumavis2018-03-012-1/+5
|/ /
* | Merge pull request #3361 from MetaMask/4.1.1v4.1.1Thomas Huang2018-03-012-1/+7
|\ \
| * | v4.1.1kumavis2018-03-012-1/+7
* | | Merge pull request #3359 from MetaMask/token-check-urlkumavis2018-03-012-1/+3
|\| |
| * | changelog - add entry about 'Add Token' screen fixkumavis2018-03-011-0/+2
| * | add token - check for logo url before trying to usekumavis2018-03-011-1/+1
* | | Merge pull request #3332 from danjm/MM-onboarding-flow-style-improvementskumavis2018-03-015-3/+54
|\ \ \
| * | | Padding of alpha warning aligns with app-barDan2018-02-281-1/+1
| * | | Adds beta label to Metamask name in full screen app bar.Dan2018-02-282-0/+17
| * | | Move beta warning to app header.Dan2018-02-282-1/+6
| * | | NewUI first time flow warning message change.Dan2018-02-281-1/+1
| * | | Body width container in first time flow is consistent with app bar.Dan2018-02-282-1/+30
* | | | Merge pull request #3339 from danjm/i3336-cancel-button-buy-ethkumavis2018-03-011-1/+1
|\ \ \ \
| * | | | Fix cancel button on buy eth screen.Dan2018-02-281-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #3340 from danjm/i3338-contract-published-terminologykumavis2018-03-013-3/+3
|\ \ \ \
| * | | | Replace 'Contract Published' with 'Contract Deployment' for clearer indicatio...Dan2018-02-283-3/+3
| |/ / /
* | | | Merge pull request #3353 from MetaMask/sentry-fail-tx-1kumavis2018-03-014-8/+44
|\ \ \ \
| * | | | 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 #3350 from danjm/onclick-undefined-sentry-errorkumavis2018-03-011-9/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Prevent user from switching network in old-ui notificationDan2018-03-011-9/+11
| |/ /
* | | Merge pull request #3346 from danjm/i3228-event-not-definedkumavis2018-03-013-3/+3
|\ \ \ | |/ / |/| |
| * | Define event locally in onClickOutside method in account-dropdowns.jsDan2018-03-013-3/+3
|/ /
* | Merge pull request #3333 from MetaMask/mascara-deployFrankie2018-02-281-1/+4
|\ \
| * \ Merge branch 'master' into mascara-deploykumavis2018-02-28580-12071/+67151
| |\ \
| * | | mascara deploy - improve deploy instructionskumavis2017-04-072-1/+10
* | | | Merge pull request #2363 from MetaMask/greenkeeper/metamascara-2.0.0Frankie2018-02-281-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | fix(package): update metamascara to version 2.0.0greenkeeper[bot]2017-10-141-1/+1
* | | | Merge pull request #3323 from MetaMask/version-4.0.0v4.1.0Frankie2018-02-282-1/+11
|\ \ \ \
| * | | | changelog - improve changelog noteskumavis2018-02-281-3/+3
| * | | | Bump VersionThomas2018-02-282-1/+7
| * | | | Version 4.0.0Thomas2018-02-232-1/+5
* | | | | Merge pull request #3275 from MetaMask/licenseDan Finlay2018-02-281-27/+13
|\ \ \ \ \
| * | | | | Update LICENSE to current year.Thomas2018-02-271-1/+1
| * | | | | Standardize license.Kevin Serrano2018-02-141-27/+13
* | | | | | 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 #3324 from MetaMask/fix-feature-flagsKevin Serrano2018-02-271-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | fix feature flags being undefinedfrankiebee2018-02-271-0/+1
|/ / / / /
* | | | | Merge pull request #3050 from MetaMask/uatDan Finlay2018-02-22382-3802/+42016
|\ \ \ \ \
| * \ \ \ \ 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 pull request #3288 from MetaMask/uat-masterDan Finlay2018-02-226-4/+24
| |\ \ \ \ \ \
| | * | | | | | Merge branch 'master' into uat-masterDan Finlay2018-02-226-4/+24
| |/| | | | | | | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #3278 from MetaMask/Version-3.14.1Dan Finlay2018-02-171-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Make announcement more generalDan Finlay2018-02-021-1/+1
* | | | | | | | Merge pull request #3250 from MetaMask/i#3136kumavis2018-02-161-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | fix - hex prefix estimatedGas on txMetafrankiebee2018-02-151-2/+3
* | | | | | | | | Merge pull request #3267 from MetaMask/i3266-IgnoreZeroGasLimitkumavis2018-02-162-2/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | lint - lift comment to new linekumavis2018-02-161-1/+2
| * | | | | | | | Fix incorrect promise instantiationDan Finlay2018-02-161-1/+1
| * | | | | | | | Default validated block gas limit to 8MM when none identifiedDan Finlay2018-02-161-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #3265 from MetaMask/Version-3.14.2kumavis2018-02-162-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Version 3.14.2v3.14.2Dan Finlay2018-02-162-1/+4
|/ / / / / / / /
* | | | | | | | Merge pull request #3260 from MetaMask/changelog-mesh-testingDan Finlay2018-02-161-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Update CHANGELOG.mdkumavis2018-02-161-0/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #3222 from MetaMask/mesh-testDan Finlay2018-02-162-0/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | metamask mesh - inject mesh testing containerkumavis2018-02-112-0/+13
* | | | | | | | Merge pull request #3242 from MetaMask/AddChangelogEntryKevin Serrano2018-02-141-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Bump changelogDan Finlay2018-02-141-0/+2
|/ / / / / / /
* | | | | | | Merge pull request #3224 from lazaridiscom/masterDan Finlay2018-02-141-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | use the providers initial _blocktracker. fixes #2393Lazaridis2018-02-111-1/+1
|/ / / / / /
| | * | | | Merge pull request #3296 from danjm/MM-806-new-ui-first-time-import-seed-in-p...Thomas Huang2018-02-2211-36/+109
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Remove output fileThomas Huang2018-02-211-1889/+0
| | | * | | Use same logic for downloading state logs in the old/uatThomas Huang2018-02-211-1/+7
| | | * | | Merge branch 'MM-806-new-ui-first-time-import-seed-in-popup' of https://githu...Thomas Huang2018-02-217-37/+31
| | | |\ \ \
| | | | * | | Fix old-ui active notices width.Dan2018-02-211-1/+3
| | | | * | | Render loading inside notice screen, and don't set isLoading from unMarkPassw...Dan2018-02-213-32/+24
| | | | * | | Fix promise constructionDan Finlay2018-02-211-1/+1
| | | | * | | Add 8MM gas limit default to send screenDan Finlay2018-02-211-1/+2
| | | | * | | Try fixing notice screen synchronous state callDan Finlay2018-02-211-2/+1
| | | * | | | Merge branch 'MM-806-new-ui-first-time-import-seed-in-popup' of https://githu...Thomas Huang2018-02-210-0/+0
| | | |\| | |
| | | | * | | Temporarily disable loading indicator.Dan2018-02-211-3/+4
| | | * | | | Temporarily disable loading indicator.Dan2018-02-212-3/+1893
| | | |/ / /
| | | * | | Fix variable spelling error.Dan2018-02-212-7/+8
| | | * | | Fix Import Existing DEN in popup New UI first time flow.Dan2018-02-204-9/+80
| | |/ / /
| | * | | Merge pull request #3286 from danjm/uat-version-bumpkumavis2018-02-171-1/+1
| | |\ \ \
| | | * | | Bump uat version to 4.0.12Dan2018-02-171-1/+1
| | |/ / /
| | * | | Ensures that mascara initialize screen is not shown in popup. (#3279)Dan J Miller2018-02-171-1/+4
| | * | | Merge pull request #3200 from alextsg/cb-703kumavis2018-02-1720-50/+68
| | |\ \ \
| | | * | | Remove accessing PropTypes from main React packageAlexander Tseung2018-02-0720-50/+68
| | * | | | Merge pull request #3261 from MetaMask/uat-oldui-compatibilitykumavis2018-02-164-5/+6
| | |\ \ \ \
| | | * | | | Make oldui compatible with newUI style changesThomas Huang2018-02-164-5/+6
| | * | | | | [NewUI] Adds the mascara first time flow to betaUI extension (#3257)Dan J Miller2018-02-164-7/+10
| | |/ / / /
| | * | | | Merge pull request #3240 from MetaMask/AddSassToDevDepsDan Finlay2018-02-141-0/+1
| | |\ \ \ \
| | | * | | | Add node-sass to dev dependenciesDan Finlay2018-02-141-0/+1
| | |/ / / /
| | * | | | Merge pull request #3231 from danjm/MM-744-restore-from-seed-fixDan J Miller2018-02-142-3/+4
| | |\ \ \ \
| | | * | | | Remove isInBrowser method and use environment-type.jsDan2018-02-142-22/+4
| | | * | | | Only open a new window on restore from seed if in extension view.Dan2018-02-143-3/+22
| | * | | | | Merge pull request #3239 from MetaMask/uat-nextDan J Miller2018-02-1459-281/+2143
| | |\ \ \ \ \
| | | * \ \ \ \ Merge pull request #3209 from danjm/MM-634-newui-reset-accountDan Finlay2018-02-146-35/+204
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Add reset account button to new UI.Dan2018-02-096-35/+204
| | | * | | | | Merge pull request #3216 from danjm/MM-666-try-beta-link-unlock-privacy-screensDan Finlay2018-02-142-5/+42
| | | |\ \ \ \ \
| | | | * | | | | Try beta link on unlock and privacy screens.Dan2018-02-092-5/+42
| | | | |/ / / /
| | | * | | | | Updates the styling of confirm send ether and token screens. (#3235)Dan J Miller2018-02-133-26/+20
| | | * | | | | Send screen style updates. (#3234)Dan J Miller2018-02-134-9/+52
| | | * | | | | Remove chrome focus outline for mouse users. (#3230)Dan J Miller2018-02-134-1/+40
| | | * | | | | Fix exception thrown in selected token tx list with shapeshift txs (#3215)Alexander Tseung2018-02-091-3/+3
| | | * | | | | Fixes shapeshift txs so that they render in tx list. (#3208)Dan J Miller2018-02-092-36/+28
| | | |/ / / /
| | | * | | | Merge pull request #3206 from danjm/merge-uat-to-uatnext-feb072019Dan J Miller2018-02-0818-26/+269
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'uat' into uat-nextDan2018-02-0818-26/+269
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge pull request #3203 from danjm/merge-master-to-uat-feb72018Dan J Miller2018-02-0818-26/+269
| | |\ \ \ \ \ \
| | | * | | | | | Point add-token unit test to old-ui component.Dan2018-02-081-1/+1
| | | * | | | | | Merge branch 'master' into uatDan2018-02-0818-26/+269
| | |/| | | | | | | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #3177 from MetaMask/Version-3.14.1Thomas Huang2018-02-022-1/+5
|\| | | | | | |
| * | | | | | | Version 3.14.1v3.14.1Dan Finlay2018-02-022-1/+5
|/ / / / / / /
* | | | | | | Merge pull request #3176 from MetaMask/FirefoxSettingsOverflowDan Finlay2018-02-022-1/+7
|\ \ \ \ \ \ \
| * | | | | | | Scrollable Settings screen for FirefoxThomas2018-02-022-1/+7
|/ / / / / / /
* | | | | | | Merge pull request #3175 from MetaMask/Version-3.13.9Frankie2018-02-023-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Version 3.14.0Dan Finlay2018-02-022-1/+3
| * | | | | | | Remove deps from build processDan Finlay2018-02-021-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #3161 from MetaMask/AddResetExplanationFrankie2018-02-012-59/+20
|\ \ \ \ \ \ \
| * | | | | | | Add explanation of account resettingDan Finlay2018-02-011-0/+20
| * | | | | | | Remove unused fileDan Finlay2018-02-011-59/+0
* | | | | | | | Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputsFrankie2018-02-016-4/+74
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump ChangelogThomas2018-01-311-0/+1
| * | | | | | | | Add enzyme, redux-test-utils, and enzyme-adapter-react-15 to depsThomas2018-01-311-2/+4
| * | | | | | | | Clean up test, remove react & mountWithStoreThomas2018-01-311-3/+2
| * | | | | | | | Set address to default with empty string, add test validation.Thomas2018-01-314-2/+70
* | | | | | | | | Merge pull request #3148 from MetaMask/localStorage-clean-upFrankie2018-02-016-9/+55
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | fix changelogfrankiebee2018-02-011-1/+1
| * | | | | | | | Merge branch 'master' into localStorage-clean-upFrankie2018-02-017-0/+102
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #3155 from brunobar79/feature/reset-accountDan Finlay2018-02-017-0/+102
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clean upBruno Barbieri2018-02-011-19/+13
| * | | | | | | | | add test for wipeTransactionsBruno Barbieri2018-02-011-0/+49
| * | | | | | | | | 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-316-0/+52
|/ / / / / / / / /
| * | | | | | | | Merge branch 'localStorage-clean-up' of https://github.com/MetaMask/metamask-...frankiebee2018-02-012-0/+7
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into localStorage-clean-upFrankie2018-01-312-0/+7
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #3145 from MetaMask/i3089-FixNullErrorFrankie2018-01-312-0/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add warning when importing no valid fileDan Finlay2018-01-312-0/+8
|/ / / / / / / / / /
| * / / / / / / / / remove RecentBlocks from diskfrankiebee2018-02-013-3/+3
| |/ / / / / / / /
| * | | | | | | | test for migration 021frankiebee2018-01-312-0/+16
| * | | | | | | | add to CHANGELOG.mdfrankiebee2018-01-311-0/+2
| * | | | | | | | creater migration to remove BlacklistControllerfrankiebee2018-01-311-0/+33
| * | | | | | | | remove BlacklistController from disk statefrankiebee2018-01-312-6/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #3126 from MetaMask/Version-3.13.8Thomas Huang2018-01-302-1/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Version 3.13.8v3.13.8Dan Finlay2018-01-302-1/+4
|/ / / / / / /
* | | | | | | Merge pull request #2885 from MetaMask/greenkeeper/gulp-watch-5.0.0Thomas Huang2018-01-301-1/+1
|\ \ \ \ \ \ \
| * | | | | | | chore(package): update gulp-watch to version 5.0.0greenkeeper[bot]2018-01-071-1/+1
* | | | | | | | Merge pull request #3026 from MetaMask/greenkeeper/mocha-5.0.0Thomas Huang2018-01-301-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | chore(package): update mocha to version 5.0.0greenkeeper[bot]2018-01-181-1/+1
* | | | | | | | | Merge pull request #3091 from MetaMask/greenkeeper/testem-2.0.0Thomas Huang2018-01-301-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | chore(package): update testem to version 2.0.0greenkeeper[bot]2018-01-251-1/+1
* | | | | | | | | | Merge pull request #3101 from MetaMask/eventemitterwarningThomas Huang2018-01-302-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bump ChangelogKevin Serrano2018-01-261-0/+2
| * | | | | | | | | | Bump limit for event emitter warning.Kevin Serrano2018-01-261-0/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #3100 from MetaMask/kovan-fixDan Finlay2018-01-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | deps - bump eth-json-rpc-infura for kovan fixkumavis2018-01-261-1/+1
|/ / / / / / / / /
| | | | * / / / / Make blockies icon round to match identicons (#3205)Alexander Tseung2018-02-082-5/+5
| | | | |/ / / /
| | | | * | | | [NewUI] Opens to full screen when restoring from seed. (#3201)Dan J Miller2018-02-087-24/+65
| | | | * | | | Update modal header design on send screen (#3196)Alexander Tseung2018-02-074-67/+134
| | | | * | | | Fix alignment of ellipsis and address in wallet view. (#3198)Dan J Miller2018-02-073-2/+3
| | | | |/ / /
| | | | * | | Remove duplicate token balance on uat next. (#3195)Dan J Miller2018-02-071-2/+0
| | | | * | | Integration tests for signature requests confirmations. (#3194)Dan J Miller2018-02-075-2/+292
| | | | * | | Add functional integration testing to Add Token flow (#3189)Alexander Tseung2018-02-065-5/+304
| | | | * | | Wallet view supports screen sizes between 576px and 667px (#3193)Dan J Miller2018-02-065-24/+70
| | | | * | | Change styling of Import Account with Seed Phrease (#3182)Alexander Tseung2018-02-063-29/+44
| | | | * | | [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120)Dan J Miller2018-02-017-17/+136
| | | | * | | [NewUI] Updates capitalization and alignment for the import account screen. (...Dan J Miller2018-02-013-11/+35
| | | | * | | [NewUI] Set default new account name as placeholder, but not value (#3121)Dan J Miller2018-02-011-5/+8
| | | | * | | Fix bug stemming from erroneously persistant unlock failure error message. (#...Dan J Miller2018-01-302-0/+15
| | | | * | | Functional Integration Tests for send ether flow. (#3119)Dan J Miller2018-01-304-0/+670
| | | |/ / /
| | | * | | Merge branch 'master' into uatThomas Huang2018-01-241-1/+0
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #3065 from MetaMask/Version-3.13.7Dan Finlay2018-01-232-1/+8
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'Version-3.13.7' of github.com:MetaMask/metamask-plugin into Ver...Dan Finlay2018-01-230-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into Version-3.13.7kumavis2018-01-233-2/+15
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| | * | | | | | Version 3.13.7v3.13.7Dan Finlay2018-01-232-1/+8
| * | | | | | | Merge remote-tracking branch 'origin/master' into Version-3.13.7Dan Finlay2018-01-233-1/+14
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #3066 from MetaMask/sentry-failed-txkumavis2018-01-233-1/+14
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | changelog - add note on sentrykumavis2018-01-231-0/+1
| * | | | | | | sentry - report failed txskumavis2018-01-232-1/+13
|/ / / / / / /
| * / / / / / Version 3.13.7Dan Finlay2018-01-232-1/+8
|/ / / / / /
* | | | | | Merge pull request #3047 from MetaMask/fix-provider-json-parseKevin Serrano2018-01-231-2/+2
|\ \ \ \ \ \
| * | | | | | deps - bump provider engine and infura-middleware for better retry and error ...kumavis2018-01-201-2/+2
| * | | | | | deps - bump providers for better JSON parse error messageskumavis2018-01-201-2/+2
* | | | | | | Merge pull request #3064 from MetaMask/engine-patchDan Finlay2018-01-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | deps - bump json rpc engine for bugfixkumavis2018-01-231-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #3025 from MetaMask/i#3018kumavis2018-01-233-2/+18
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Bump changelogDan Finlay2018-01-231-0/+2
| * | | | | | add a `x` close button to gas calc loding screen on conf-txfrankiebee2018-01-182-2/+16
| | | | * | | Merge pull request #3069 from tmashuang/uatDan J Miller2018-01-2411-27/+75
| | | | |\ \ \
| | | | | * | | Merge branch 'master' into uatThomas2018-01-237-7/+43
| | | | | * | | Revert integration to oldUiThomas2018-01-231-18/+23
| | | | | * | | String interpolate version in settingsThomas2018-01-231-1/+1
| | | | | * | | Remove duplicate eth-contract-metadataThomas2018-01-231-1/+1
| | | | | * | | Add ExtensionPlatform = 'development' to mockUiThomas2018-01-232-0/+7
| | | | |/ / /
| | | | * | | Merge pull request #3049 from chikeichan/newmasterChi Kei Chan2018-01-2014-73/+208
| | | | |\ \ \
| | | | | * | | update yarn.lockChi Kei Chan2018-01-201-24/+99
| | | | | * | | Merge branch 'uat' into newmasterChi Kei Chan2018-01-20352-3709/+39827
| |_|_|_|/| | | |/| | | | | | |
* | | | | | | | Merge pull request #3023 from MetaMask/build-lock-gulpDan Finlay2018-01-191-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into build-lock-gulpThomas Huang2018-01-197-42/+40
| |\ \ \ \ \ \ \ \
| * | | | | | | | | test - stub provider needs to handle errorskumavis2018-01-181-2/+2
| * | | | | | | | | build - lock pre-release gulp dep to commitkumavis2018-01-181-1/+1
* | | | | | | | | | Merge pull request #3016 from MetaMask/sentryDan Finlay2018-01-195-1/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | lint - ignore vendor jskumavis2018-01-181-1/+1
| * | | | | | | | | | sentry - dedupe raven vendorkumavis2018-01-182-5/+2
| * | | | | | | | | | lint - ignore vendor jskumavis2018-01-181-1/+1
| * | | | | | | | | | 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
* | | | | | | | | | | Merge pull request #3035 from MetaMask/infura-rest-fixDan Finlay2018-01-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | deps - bump infura provider for uri length limit fixkumavis2018-01-191-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #3029 from MetaMask/test-provider-stubThomas Huang2018-01-196-43/+33
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | deps - re-add eth-block-trackerkumavis2018-01-181-0/+1
| * | | | | | | | | test - createTestProviderTools includes block tracker layerkumavis2018-01-185-22/+25
| * | | | | | | | | test - tx controller - fix txGasUtil referencekumavis2018-01-182-3/+4
| * | | | | | | | | deps - bump json-rpc-engine for better errorskumavis2018-01-181-1/+1
| * | | | | | | | | test - typo - fix spelling of word stubbedkumavis2018-01-184-8/+8
| * | | | | | | | | test - remove createEthJsQueryStubkumavis2018-01-182-18/+3
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3021 from MetaMask/i#3020kumavis2018-01-181-0/+8
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Update transactions.jskumavis2018-01-181-1/+1
| | |/ / / / / / | |/| | | | | |
| * | | | | | | transactions - transtion approved transactions to failed transactions on bootfrankiebee2018-01-181-0/+8
|/ / / / / / /
* | | | | | | Merge pull request #3019 from MetaMask/i#3015Frankie2018-01-181-2/+22
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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
|/ / / / / /
* | | | | | Merge pull request #3012 from MetaMask/AddNetworkIndicatorClasstoLoadingFrankie2018-01-181-1/+1
|\ \ \ \ \ \
| * | | | | | Add network-indicator classname to network loading spinnerThomas2018-01-181-1/+1
|/ / / / / /
| | * / / / Get version from manifest instead of hard coding in New UI info page.Dan2018-01-201-1/+3
| | |/ / /
| | * | | 4.0.10kumavis2018-01-191-1/+1
| | * | | Fix transaction list font sizes, paddingAlexander Tseung2018-01-192-17/+7
| | * | | Merge pull request #3024 from alextsg/cb-529Kevin Serrano2018-01-194-3/+26
| | |\ \ \
| | | * | | Fix lint errorsAlexander Tseung2018-01-181-1/+1
| | | * | | Update popout to fullscreen iconAlexander Tseung2018-01-183-2/+25
| | * | | | [NewUI] Send screen gas loading fixes (#3027)Dan J Miller2018-01-183-27/+25
| | |/ / /
| | * | | Show now tokens by default and improve search on add token screen.Dan2018-01-181-5/+10
| | * | | Fix tx-list, confirmation screen stylingAlexander Tseung2018-01-184-13/+18
| | * | | Merge pull request #3005 from alextsg/cb-385Chi Kei Chan2018-01-182-1/+4
| | |\ \ \
| | | * | | Fix rendering QR code in old UI, hide unnecessary back buttonAlexander Tseung2018-01-172-1/+4
| | * | | | Merge pull request #3007 from alextsg/uat-master-011618Chi Kei Chan2018-01-1824-84/+395
| | |\ \ \ \
| | | * | | | Fix merge conflictsAlexander Tseung2018-01-171-5/+14
| | | * | | | Merge branch 'uat' into uat-master-011618Alexander Tseung2018-01-17351-3712/+39761
| |_|/| | | | |/| | |/ / /
* | | | | | Merge pull request #2996 from MetaMask/Version-3.13.5Thomas Huang2018-01-172-1/+3
|\ \ \ \ \ \
| * | | | | | Version 3.13.5v3.13.5Dan Finlay2018-01-172-1/+3
|/ / / / / /
* | | | | | Merge pull request #2983 from MetaMask/i2907-NoCodeGasLimitkumavis2018-01-172-6/+24
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into i2907-NoCodeGasLimitDan Finlay2018-01-173-0/+5
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #2929 from MetaMask/i2779-FirefoxSpecifyAccountDetailHeightkumavis2018-01-173-0/+5
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeightDan Finlay2018-01-176-18/+56
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeightDan Finlay2018-01-1611-29/+116
| |\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 23:54:32 +0800