| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | | | | | | | | Merge pull request #3359 from MetaMask/token-check-url | kumavis | 2018-03-01 | 2 | -1/+3 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | changelog - add entry about 'Add Token' screen fix | kumavis | 2018-03-01 | 1 | -0/+2 |
| * | | | | | | | | | | add token - check for logo url before trying to use | kumavis | 2018-03-01 | 1 | -1/+1 |
* | | | | | | | | | | | Merge pull request #3332 from danjm/MM-onboarding-flow-style-improvements | kumavis | 2018-03-01 | 5 | -3/+54 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Padding of alpha warning aligns with app-bar | Dan | 2018-02-28 | 1 | -1/+1 |
| * | | | | | | | | | | | Adds beta label to Metamask name in full screen app bar. | Dan | 2018-02-28 | 2 | -0/+17 |
| * | | | | | | | | | | | Move beta warning to app header. | Dan | 2018-02-28 | 2 | -1/+6 |
| * | | | | | | | | | | | NewUI first time flow warning message change. | Dan | 2018-02-28 | 1 | -1/+1 |
| * | | | | | | | | | | | Body width container in first time flow is consistent with app bar. | Dan | 2018-02-28 | 2 | -1/+30 |
* | | | | | | | | | | | | Merge pull request #3339 from danjm/i3336-cancel-button-buy-eth | kumavis | 2018-03-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Fix cancel button on buy eth screen. | Dan | 2018-02-28 | 1 | -1/+1 |
| | |_|/ / / / / / / / /
| |/| | | | | | | | | | |
|
* | | | | | | | | | | | | Merge pull request #3340 from danjm/i3338-contract-published-terminology | kumavis | 2018-03-01 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Replace 'Contract Published' with 'Contract Deployment' for clearer indicatio... | Dan | 2018-02-28 | 3 | -3/+3 |
| |/ / / / / / / / / / / |
|
* | | | | | | | | | | | | Merge pull request #3353 from MetaMask/sentry-fail-tx-1 | kumavis | 2018-03-01 | 4 | -8/+44 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | sentry - extractErrorMessage - fix comment formatting | kumavis | 2018-03-01 | 1 | -1/+1 |
| * | | | | | | | | | | | | sentry - failed tx - improve ethjs-rpc error formating | kumavis | 2018-03-01 | 2 | -5/+41 |
| * | | | | | | | | | | | | sentry - clean - move setupRaven to lib | kumavis | 2018-03-01 | 3 | -3/+3 |
| | |_|/ / / / / / / / /
| |/| | | | | | | | | | |
|
* | | | | | | | | | | | | Merge pull request #3350 from danjm/onclick-undefined-sentry-error | kumavis | 2018-03-01 | 1 | -9/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | Prevent user from switching network in old-ui notification | Dan | 2018-03-01 | 1 | -9/+11 |
| |/ / / / / / / / / / |
|
* | | | | | | | | | | | Merge pull request #3346 from danjm/i3228-event-not-defined | kumavis | 2018-03-01 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | Define event locally in onClickOutside method in account-dropdowns.js | Dan | 2018-03-01 | 3 | -3/+3 |
|/ / / / / / / / / / |
|
* | | | | | | | | | | Merge pull request #3333 from MetaMask/mascara-deploy | Frankie | 2018-02-28 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into mascara-deploy | kumavis | 2018-02-28 | 580 | -12071/+67151 |
| |\ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / /
| | |/| | | | | | | | |
|
| * | | | | | | | | | | mascara deploy - improve deploy instructions | kumavis | 2017-04-07 | 2 | -1/+10 |
* | | | | | | | | | | | Merge pull request #2363 from MetaMask/greenkeeper/metamascara-2.0.0 | Frankie | 2018-02-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | fix(package): update metamascara to version 2.0.0 | greenkeeper[bot] | 2017-10-14 | 1 | -1/+1 |
* | | | | | | | | | | | Merge pull request #3323 from MetaMask/version-4.0.0v4.1.0 | Frankie | 2018-02-28 | 2 | -1/+11 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | changelog - improve changelog notes | kumavis | 2018-02-28 | 1 | -3/+3 |
| * | | | | | | | | | | | Bump Version | Thomas | 2018-02-28 | 2 | -1/+7 |
| * | | | | | | | | | | | Version 4.0.0 | Thomas | 2018-02-23 | 2 | -1/+5 |
| | |_|_|_|/ / / / / /
| |/| | | | | | | | | |
|
* | | | | | | | | | | | Merge pull request #3275 from MetaMask/license | Dan Finlay | 2018-02-28 | 1 | -27/+13 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Update LICENSE to current year. | Thomas | 2018-02-27 | 1 | -1/+1 |
| * | | | | | | | | | | | Standardize license. | Kevin Serrano | 2018-02-14 | 1 | -27/+13 |
* | | | | | | | | | | | | Merge pull request #3281 from MetaMask/sentry-failed-tx-debatch | Dan Finlay | 2018-02-28 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|/ / / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | sentry - report failed tx with more specific message | kumavis | 2018-02-17 | 1 | -1/+2 |
* | | | | | | | | | | | | Merge pull request #3324 from MetaMask/fix-feature-flags | Kevin Serrano | 2018-02-27 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|/ / / / / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | fix feature flags being undefined | frankiebee | 2018-02-27 | 1 | -0/+1 |
|/ / / / / / / / / / / |
|
* | | | | | | | | | | | Merge pull request #3050 from MetaMask/uat | Dan Finlay | 2018-02-22 | 382 | -3802/+42016 |
|\ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|/ / / / / /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | Merge pull request #3306 from danjm/MM-805-send-from-tab-popup-fix | Thomas Huang | 2018-02-22 | 1 | -1/+11 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | Prevents new transaction from generating popup when metamask is open in an ac... | Dan | 2018-02-22 | 1 | -1/+11 |
| * | | | | | | | | | | | Merge pull request #3288 from MetaMask/uat-master | Dan Finlay | 2018-02-22 | 6 | -4/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | Merge branch 'master' into uat-master | Dan Finlay | 2018-02-22 | 6 | -4/+24 |
| |/| | | | | | | | | | |
| |/ / / / / / / / / / /
|/| | | | | | | | | | | |
|
* | | | | | | | | | | | | Merge pull request #3278 from MetaMask/Version-3.14.1 | Dan Finlay | 2018-02-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Make announcement more general | Dan Finlay | 2018-02-02 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge pull request #3250 from MetaMask/i#3136 | kumavis | 2018-02-16 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | fix - hex prefix estimatedGas on txMeta | frankiebee | 2018-02-15 | 1 | -2/+3 |
* | | | | | | | | | | | | | | Merge pull request #3267 from MetaMask/i3266-IgnoreZeroGasLimit | kumavis | 2018-02-16 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|/ / / / / / / / /
|/| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | lint - lift comment to new line | kumavis | 2018-02-16 | 1 | -1/+2 |
| * | | | | | | | | | | | | | Fix incorrect promise instantiation | Dan Finlay | 2018-02-16 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Default validated block gas limit to 8MM when none identified | Dan Finlay | 2018-02-16 | 1 | -1/+1 |
|/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge pull request #3265 from MetaMask/Version-3.14.2 | kumavis | 2018-02-16 | 2 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Version 3.14.2v3.14.2 | Dan Finlay | 2018-02-16 | 2 | -1/+4 |
|/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge pull request #3260 from MetaMask/changelog-mesh-testing | Dan Finlay | 2018-02-16 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Update CHANGELOG.md | kumavis | 2018-02-16 | 1 | -0/+1 |
| |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge pull request #3222 from MetaMask/mesh-test | Dan Finlay | 2018-02-16 | 2 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / /
|/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | metamask mesh - inject mesh testing container | kumavis | 2018-02-11 | 2 | -0/+13 |
| | |_|_|_|_|_|/ / / / /
| |/| | | | | | | | | | |
|
* | | | | | | | | | | | | Merge pull request #3242 from MetaMask/AddChangelogEntry | Kevin Serrano | 2018-02-14 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|/ / / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | Bump changelog | Dan Finlay | 2018-02-14 | 1 | -0/+2 |
|/ / / / / / / / / / / |
|
* | | | | | | | | | | | Merge pull request #3224 from lazaridiscom/master | Dan Finlay | 2018-02-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | use the providers initial _blocktracker. fixes #2393 | Lazaridis | 2018-02-11 | 1 | -1/+1 |
|/ / / / / / / / / / |
|
| | * | | | | | | | | Merge pull request #3296 from danjm/MM-806-new-ui-first-time-import-seed-in-p... | Thomas Huang | 2018-02-22 | 11 | -36/+109 |
| | |\ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| | | * | | | | | | | Remove output file | Thomas Huang | 2018-02-21 | 1 | -1889/+0 |
| | | * | | | | | | | Use same logic for downloading state logs in the old/uat | Thomas Huang | 2018-02-21 | 1 | -1/+7 |
| | | * | | | | | | | Merge branch 'MM-806-new-ui-first-time-import-seed-in-popup' of https://githu... | Thomas Huang | 2018-02-21 | 7 | -37/+31 |
| | | |\ \ \ \ \ \ \ |
|
| | | | * | | | | | | | Fix old-ui active notices width. | Dan | 2018-02-21 | 1 | -1/+3 |
| | | | * | | | | | | | Render loading inside notice screen, and don't set isLoading from unMarkPassw... | Dan | 2018-02-21 | 3 | -32/+24 |
| | | | * | | | | | | | Fix promise construction | Dan Finlay | 2018-02-21 | 1 | -1/+1 |
| | | | * | | | | | | | Add 8MM gas limit default to send screen | Dan Finlay | 2018-02-21 | 1 | -1/+2 |
| | | | * | | | | | | | Try fixing notice screen synchronous state call | Dan Finlay | 2018-02-21 | 1 | -2/+1 |
| | | * | | | | | | | | Merge branch 'MM-806-new-ui-first-time-import-seed-in-popup' of https://githu... | Thomas Huang | 2018-02-21 | 0 | -0/+0 |
| | | |\| | | | | | | |
|
| | | | * | | | | | | | Temporarily disable loading indicator. | Dan | 2018-02-21 | 1 | -3/+4 |
| | | * | | | | | | | | Temporarily disable loading indicator. | Dan | 2018-02-21 | 2 | -3/+1893 |
| | | |/ / / / / / / |
|
| | | * | | | | | | | Fix variable spelling error. | Dan | 2018-02-21 | 2 | -7/+8 |
| | | * | | | | | | | Fix Import Existing DEN in popup New UI first time flow. | Dan | 2018-02-20 | 4 | -9/+80 |
| | |/ / / / / / / |
|
| | * | | | | | | | Merge pull request #3286 from danjm/uat-version-bump | kumavis | 2018-02-17 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | Bump uat version to 4.0.12 | Dan | 2018-02-17 | 1 | -1/+1 |
| | |/ / / / / / / |
|
| | * | | | | | | | Ensures that mascara initialize screen is not shown in popup. (#3279) | Dan J Miller | 2018-02-17 | 1 | -1/+4 |
| | * | | | | | | | Merge pull request #3200 from alextsg/cb-703 | kumavis | 2018-02-17 | 20 | -50/+68 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | Remove accessing PropTypes from main React package | Alexander Tseung | 2018-02-07 | 20 | -50/+68 |
| | * | | | | | | | | Merge pull request #3261 from MetaMask/uat-oldui-compatibility | kumavis | 2018-02-16 | 4 | -5/+6 |
| | |\ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | Make oldui compatible with newUI style changes | Thomas Huang | 2018-02-16 | 4 | -5/+6 |
| | * | | | | | | | | | [NewUI] Adds the mascara first time flow to betaUI extension (#3257) | Dan J Miller | 2018-02-16 | 4 | -7/+10 |
| | |/ / / / / / / / |
|
| | * | | | | | | | | Merge pull request #3240 from MetaMask/AddSassToDevDeps | Dan Finlay | 2018-02-14 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | Add node-sass to dev dependencies | Dan Finlay | 2018-02-14 | 1 | -0/+1 |
| | |/ / / / / / / / |
|
| | * | | | | | | | | Merge pull request #3231 from danjm/MM-744-restore-from-seed-fix | Dan J Miller | 2018-02-14 | 2 | -3/+4 |
| | |\ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | Remove isInBrowser method and use environment-type.js | Dan | 2018-02-14 | 2 | -22/+4 |
| | | * | | | | | | | | Only open a new window on restore from seed if in extension view. | Dan | 2018-02-14 | 3 | -3/+22 |
| | * | | | | | | | | | Merge pull request #3239 from MetaMask/uat-next | Dan J Miller | 2018-02-14 | 59 | -281/+2143 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ | Merge pull request #3209 from danjm/MM-634-newui-reset-account | Dan Finlay | 2018-02-14 | 6 | -35/+204 |
| | | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / /
| | | |/| | | | | | | | |
|
| | | | * | | | | | | | | Add reset account button to new UI. | Dan | 2018-02-09 | 6 | -35/+204 |
| | | * | | | | | | | | | Merge pull request #3216 from danjm/MM-666-try-beta-link-unlock-privacy-screens | Dan Finlay | 2018-02-14 | 2 | -5/+42 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | Try beta link on unlock and privacy screens. | Dan | 2018-02-09 | 2 | -5/+42 |
| | | | |/ / / / / / / / |
|
| | | * | | | | | | | | | Updates the styling of confirm send ether and token screens. (#3235) | Dan J Miller | 2018-02-13 | 3 | -26/+20 |
| | | * | | | | | | | | | Send screen style updates. (#3234) | Dan J Miller | 2018-02-13 | 4 | -9/+52 |
| | | * | | | | | | | | | Remove chrome focus outline for mouse users. (#3230) | Dan J Miller | 2018-02-13 | 4 | -1/+40 |
| | | * | | | | | | | | | Fix exception thrown in selected token tx list with shapeshift txs (#3215) | Alexander Tseung | 2018-02-09 | 1 | -3/+3 |
| | | * | | | | | | | | | Fixes shapeshift txs so that they render in tx list. (#3208) | Dan J Miller | 2018-02-09 | 2 | -36/+28 |
| | | |/ / / / / / / / |
|
| | | * | | | | | | | | Merge pull request #3206 from danjm/merge-uat-to-uatnext-feb072019 | Dan J Miller | 2018-02-08 | 18 | -26/+269 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ | Merge branch 'uat' into uat-next | Dan | 2018-02-08 | 18 | -26/+269 |
| | | | |\ \ \ \ \ \ \ \
| | | |_|/ / / / / / / /
| | |/| | | | | | | | | |
|
| | * | | | | | | | | | | Merge pull request #3203 from danjm/merge-master-to-uat-feb72018 | Dan J Miller | 2018-02-08 | 18 | -26/+269 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | Point add-token unit test to old-ui component. | Dan | 2018-02-08 | 1 | -1/+1 |
| | | * | | | | | | | | | | Merge branch 'master' into uat | Dan | 2018-02-08 | 18 | -26/+269 |
| | |/| | | | | | | | | |
| |_|/ / / / / / / / / /
|/| | | | | | | | | | | |
|
* | | | | | | | | | | | | Merge pull request #3177 from MetaMask/Version-3.14.1 | Thomas Huang | 2018-02-02 | 2 | -1/+5 |
|\| | | | | | | | | | | |
|
| * | | | | | | | | | | | Version 3.14.1v3.14.1 | Dan Finlay | 2018-02-02 | 2 | -1/+5 |
|/ / / / / / / / / / / |
|
* | | | | | | | | | | | Merge pull request #3176 from MetaMask/FirefoxSettingsOverflow | Dan Finlay | 2018-02-02 | 2 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Scrollable Settings screen for Firefox | Thomas | 2018-02-02 | 2 | -1/+7 |
|/ / / / / / / / / / / |
|
* | | | | | | | | | | | Merge pull request #3175 from MetaMask/Version-3.13.9 | Frankie | 2018-02-02 | 3 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Version 3.14.0 | Dan Finlay | 2018-02-02 | 2 | -1/+3 |
| * | | | | | | | | | | | Remove deps from build process | Dan Finlay | 2018-02-02 | 1 | -1/+1 |
|/ / / / / / / / / / / |
|
* | | | | | | | | | | | Merge pull request #3161 from MetaMask/AddResetExplanation | Frankie | 2018-02-01 | 2 | -59/+20 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Add explanation of account resetting | Dan Finlay | 2018-02-01 | 1 | -0/+20 |
| * | | | | | | | | | | | Remove unused file | Dan Finlay | 2018-02-01 | 1 | -59/+0 |
* | | | | | | | | | | | | Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputs | Frankie | 2018-02-01 | 6 | -4/+74 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Bump Changelog | Thomas | 2018-01-31 | 1 | -0/+1 |
| * | | | | | | | | | | | | Add enzyme, redux-test-utils, and enzyme-adapter-react-15 to deps | Thomas | 2018-01-31 | 1 | -2/+4 |
| * | | | | | | | | | | | | Clean up test, remove react & mountWithStore | Thomas | 2018-01-31 | 1 | -3/+2 |
| * | | | | | | | | | | | | Set address to default with empty string, add test validation. | Thomas | 2018-01-31 | 4 | -2/+70 |
* | | | | | | | | | | | | | Merge pull request #3148 from MetaMask/localStorage-clean-up | Frankie | 2018-02-01 | 6 | -9/+55 |
|\ \ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / / /
|/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | fix changelog | frankiebee | 2018-02-01 | 1 | -1/+1 |
| * | | | | | | | | | | | | Merge branch 'master' into localStorage-clean-up | Frankie | 2018-02-01 | 7 | -0/+102 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / /
|/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | Merge pull request #3155 from brunobar79/feature/reset-account | Dan Finlay | 2018-02-01 | 7 | -0/+102 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | clean up | Bruno Barbieri | 2018-02-01 | 1 | -19/+13 |
| * | | | | | | | | | | | | | add test for wipeTransactions | Bruno Barbieri | 2018-02-01 | 1 | -0/+49 |
| * | | | | | | | | | | | | | preserve other networks TXs | Bruno Barbieri | 2018-02-01 | 1 | -3/+4 |
| * | | | | | | | | | | | | | use txMeta.txParams | Bruno Barbieri | 2018-01-31 | 1 | -1/+1 |
| * | | | | | | | | | | | | | wipe only transactions for current account | Bruno Barbieri | 2018-01-31 | 3 | -9/+15 |
| * | | | | | | | | | | | | | clean up | Bruno Barbieri | 2018-01-31 | 1 | -3/+3 |
| * | | | | | | | | | | | | | added reset account feature | Bruno Barbieri | 2018-01-31 | 6 | -0/+52 |
|/ / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | Merge branch 'localStorage-clean-up' of https://github.com/MetaMask/metamask-... | frankiebee | 2018-02-01 | 2 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into localStorage-clean-up | Frankie | 2018-01-31 | 2 | -0/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / / / /
|/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | Merge pull request #3145 from MetaMask/i3089-FixNullError | Frankie | 2018-01-31 | 2 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | Add warning when importing no valid file | Dan Finlay | 2018-01-31 | 2 | -0/+8 |
|/ / / / / / / / / / / / / / |
|
| * / / / / / / / / / / / / | remove RecentBlocks from disk | frankiebee | 2018-02-01 | 3 | -3/+3 |
| |/ / / / / / / / / / / / |
|
| * | | | | | | | | | | | | test for migration 021 | frankiebee | 2018-01-31 | 2 | -0/+16 |
| * | | | | | | | | | | | | add to CHANGELOG.md | frankiebee | 2018-01-31 | 1 | -0/+2 |
| * | | | | | | | | | | | | creater migration to remove BlacklistController | frankiebee | 2018-01-31 | 1 | -0/+33 |
| * | | | | | | | | | | | | remove BlacklistController from disk state | frankiebee | 2018-01-31 | 2 | -6/+2 |
|/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | Merge pull request #3126 from MetaMask/Version-3.13.8 | Thomas Huang | 2018-01-30 | 2 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | Version 3.13.8v3.13.8 | Dan Finlay | 2018-01-30 | 2 | -1/+4 |
|/ / / / / / / / / / / |
|
* | | | | | | | | | | | Merge pull request #2885 from MetaMask/greenkeeper/gulp-watch-5.0.0 | Thomas Huang | 2018-01-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | chore(package): update gulp-watch to version 5.0.0 | greenkeeper[bot] | 2018-01-07 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge pull request #3026 from MetaMask/greenkeeper/mocha-5.0.0 | Thomas Huang | 2018-01-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | chore(package): update mocha to version 5.0.0 | greenkeeper[bot] | 2018-01-18 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge pull request #3091 from MetaMask/greenkeeper/testem-2.0.0 | Thomas Huang | 2018-01-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | chore(package): update testem to version 2.0.0 | greenkeeper[bot] | 2018-01-25 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge pull request #3101 from MetaMask/eventemitterwarning | Thomas Huang | 2018-01-30 | 2 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | Bump Changelog | Kevin Serrano | 2018-01-26 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | Bump limit for event emitter warning. | Kevin Serrano | 2018-01-26 | 1 | -0/+2 |
| |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge pull request #3100 from MetaMask/kovan-fix | Dan Finlay | 2018-01-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / /
|/| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | deps - bump eth-json-rpc-infura for kovan fix | kumavis | 2018-01-26 | 1 | -1/+1 |
|/ / / / / / / / / / / / / |
|
| | | | * / / / / / / / / | Make blockies icon round to match identicons (#3205) | Alexander Tseung | 2018-02-08 | 2 | -5/+5 |
| | | | |/ / / / / / / / |
|
| | | | * | | | | | | | | [NewUI] Opens to full screen when restoring from seed. (#3201) | Dan J Miller | 2018-02-08 | 7 | -24/+65 |
| | | | * | | | | | | | | Update modal header design on send screen (#3196) | Alexander Tseung | 2018-02-07 | 4 | -67/+134 |
| | | | * | | | | | | | | Fix alignment of ellipsis and address in wallet view. (#3198) | Dan J Miller | 2018-02-07 | 3 | -2/+3 |
| | | | |/ / / / / / / |
|
| | | | * | | | | | | | Remove duplicate token balance on uat next. (#3195) | Dan J Miller | 2018-02-07 | 1 | -2/+0 |
| | | | * | | | | | | | Integration tests for signature requests confirmations. (#3194) | Dan J Miller | 2018-02-07 | 5 | -2/+292 |
| | | | * | | | | | | | Add functional integration testing to Add Token flow (#3189) | Alexander Tseung | 2018-02-06 | 5 | -5/+304 |
| | | | * | | | | | | | Wallet view supports screen sizes between 576px and 667px (#3193) | Dan J Miller | 2018-02-06 | 5 | -24/+70 |
| | | | * | | | | | | | Change styling of Import Account with Seed Phrease (#3182) | Alexander Tseung | 2018-02-06 | 3 | -29/+44 |
| | | | * | | | | | | | [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120) | Dan J Miller | 2018-02-01 | 7 | -17/+136 |
| | | | * | | | | | | | [NewUI] Updates capitalization and alignment for the import account screen. (... | Dan J Miller | 2018-02-01 | 3 | -11/+35 |
| | | | * | | | | | | | [NewUI] Set default new account name as placeholder, but not value (#3121) | Dan J Miller | 2018-02-01 | 1 | -5/+8 |
| | | | * | | | | | | | Fix bug stemming from erroneously persistant unlock failure error message. (#... | Dan J Miller | 2018-01-30 | 2 | -0/+15 |
| | | | * | | | | | | | Functional Integration Tests for send ether flow. (#3119) | Dan J Miller | 2018-01-30 | 4 | -0/+670 |
| | | |/ / / / / / / |
|
| | | * | | | | | | | Merge branch 'master' into uat | Thomas Huang | 2018-01-24 | 1 | -1/+0 |
| | | |\ \ \ \ \ \ \
| |_|_|/ / / / / / /
|/| | | | | | | | | |
|
| | | * | | | | | | | Merge pull request #3069 from tmashuang/uat | Dan J Miller | 2018-01-24 | 11 | -27/+75 |
| | | |\ \ \ \ \ \ \
| | | | |_|_|_|/ / /
| | | |/| | | | | | |
|
| | | | * | | | | | | Merge branch 'master' into uat | Thomas | 2018-01-23 | 7 | -7/+43 |
| | | | * | | | | | | Revert integration to oldUi | Thomas | 2018-01-23 | 1 | -18/+23 |
| | | | * | | | | | | String interpolate version in settings | Thomas | 2018-01-23 | 1 | -1/+1 |
| | | | * | | | | | | Remove duplicate eth-contract-metadata | Thomas | 2018-01-23 | 1 | -1/+1 |
| | | | * | | | | | | Add ExtensionPlatform = 'development' to mockUi | Thomas | 2018-01-23 | 2 | -0/+7 |
| | | |/ / / / / / |
|
| | | * | | | | | | Merge pull request #3049 from chikeichan/newmaster | Chi Kei Chan | 2018-01-20 | 14 | -73/+208 |
| | | |\ \ \ \ \ \ |
|
| | | | * | | | | | | update yarn.lock | Chi Kei Chan | 2018-01-20 | 1 | -24/+99 |
| | | | * | | | | | | Merge branch 'uat' into newmaster | Chi Kei Chan | 2018-01-20 | 352 | -3709/+39827 |
| | | | |\ \ \ \ \ \ |
|
| | | * | | | | | | | | Get version from manifest instead of hard coding in New UI info page. | Dan | 2018-01-20 | 1 | -1/+3 |
| | | | |/ / / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | 4.0.10 | kumavis | 2018-01-19 | 1 | -1/+1 |
| | | * | | | | | | | Fix transaction list font sizes, padding | Alexander Tseung | 2018-01-19 | 2 | -17/+7 |
| | | * | | | | | | | Merge pull request #3024 from alextsg/cb-529 | Kevin Serrano | 2018-01-19 | 4 | -3/+26 |
| | | |\ \ \ \ \ \ \ |
|
| | | | * | | | | | | | Fix lint errors | Alexander Tseung | 2018-01-18 | 1 | -1/+1 |
| | | | * | | | | | | | Update popout to fullscreen icon | Alexander Tseung | 2018-01-18 | 3 | -2/+25 |
| | | * | | | | | | | | [NewUI] Send screen gas loading fixes (#3027) | Dan J Miller | 2018-01-18 | 3 | -27/+25 |
| | | |/ / / / / / / |
|
| | | * | | | | | | | Show now tokens by default and improve search on add token screen. | Dan | 2018-01-18 | 1 | -5/+10 |
| | | * | | | | | | | Fix tx-list, confirmation screen styling | Alexander Tseung | 2018-01-18 | 4 | -13/+18 |
| | | * | | | | | | | Merge pull request #3005 from alextsg/cb-385 | Chi Kei Chan | 2018-01-18 | 2 | -1/+4 |
| | | |\ \ \ \ \ \ \ |
|
| | | | * | | | | | | | Fix rendering QR code in old UI, hide unnecessary back button | Alexander Tseung | 2018-01-17 | 2 | -1/+4 |
| | | * | | | | | | | | Merge pull request #3007 from alextsg/uat-master-011618 | Chi Kei Chan | 2018-01-18 | 24 | -84/+395 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | Fix merge conflicts | Alexander Tseung | 2018-01-17 | 1 | -5/+14 |
| | | | * | | | | | | | | Merge branch 'uat' into uat-master-011618 | Alexander Tseung | 2018-01-17 | 351 | -3712/+39761 |
| | | | |\| | | | | | | |
|
| | | * | | | | | | | | | Readjust gas fees when switching networks on the send screen | Alexander Tseung | 2018-01-17 | 2 | -22/+44 |
| | | * | | | | | | | | | Vertically centers the text of the new ui modal header. (#2987) | Dan J Miller | 2018-01-17 | 1 | -0/+1 |
| | | * | | | | | | | | | Adding one or more tokens sets the selected token before returning the user t... | Dan J Miller | 2018-01-17 | 2 | -0/+8 |
| | | | |/ / / / / / /
| | | |/| | | | | | | |
|
| | | * | | | | | | | | [NewUI-flat] Fix gulp build (#2975) | Dan J Miller | 2018-01-16 | 3 | -14/+90 |
| | | * | | | | | | | | Restore display of all unconfirmed transactions. | Dan | 2018-01-16 | 1 | -34/+34 |
| | | * | | | | | | | | Fix send screen value input | Alexander Tseung | 2018-01-16 | 1 | -3/+11 |
| | | * | | | | | | | | Fix Hide Token modal styling, popup positioning | Alexander Tseung | 2018-01-16 | 4 | -25/+15 |
| | | * | | | | | | | | Merge pull request #2964 from alextsg/cb-505c | Dan Finlay | 2018-01-16 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | Move blockies option to the bottom of Settings | Alexander Tseung | 2018-01-15 | 1 | -1/+1 |
| | | * | | | | | | | | | [NewUI] Place all users of extension into old UI (disable auto adding). (#2946) | Dan J Miller | 2018-01-16 | 3 | -26/+79 |
| | | * | | | | | | | | | Fix confirm Add Token button order | Alexander Tseung | 2018-01-13 | 1 | -4/+4 |
| | | * | | | | | | | | | Fix Add Token button order, styling | Alexander Tseung | 2018-01-13 | 2 | -14/+16 |
| | | * | | | | | | | | | Fix input box padding and select highlight in new account create and import p... | Dan | 2018-01-13 | 2 | -1/+11 |
| | | * | | | | | | | | | New add account page with create and import options. | Dan | 2018-01-13 | 13 | -95/+475 |
| | | * | | | | | | | | | Merge pull request #2928 from alextsg/cb-388 | Chi Kei Chan | 2018-01-13 | 24 | -234/+284 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ | Merge branch 'uat' into cb-388 | Chi Kei Chan | 2018-01-13 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / /
| | | |/| | | | | | | | | |
|
| | | | * | | | | | | | | | Merge branch 'uat' into cb-388 | Chi Kei Chan | 2018-01-13 | 24 | -315/+758 |
| | | | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / /
| | | |/| | | | | | | | | |
|
| | | * | | | | | | | | | | Fix styling in initialization | Alexander Tseung | 2018-01-13 | 3 | -7/+21 |
| | | | |/ / / / / / / /
| | | |/| | | | | | | | |
|
| | | * | | | | | | | | | [NewUI-flat] New deposit ether modal UI. (#2642) | Dan J Miller | 2018-01-13 | 14 | -318/+717 |
| | | * | | | | | | | | | Fix margin styling for name and address in account detail section. (#2790) | Dan J Miller | 2018-01-12 | 2 | -3/+4 |
| | | * | | | | | | | | | [NewUI] Build mascara with uglification and gzipping. (#2735) | Dan J Miller | 2018-01-12 | 4 | -1/+15 |
| | | * | | | | | | | | | Fix logging out of old UI causing infinite spinner (#2914) | Alexander Tseung | 2018-01-12 | 2 | -2/+6 |
| | | * | | | | | | | | | Fix padding of a hovered tx-list-item (#2859) | Dan J Miller | 2018-01-12 | 1 | -1/+1 |
| | | | * | | | | | | | | Fix token balance color | Alexander Tseung | 2018-01-12 | 1 | -1/+3 |
| | | | * | | | | | | | | Fix lint errors | Alexander Tseung | 2018-01-12 | 1 | -1/+0 |
| | | | * | | | | | | | | Change styling for network dropdown | Alexander Tseung | 2018-01-12 | 2 | -58/+25 |
| | | | * | | | | | | | | Update styling for buttons, font weights | Alexander Tseung | 2018-01-12 | 16 | -125/+83 |
| | | | * | | | | | | | | Update main view styling | Alexander Tseung | 2018-01-11 | 13 | -85/+198 |
| | | |/ / / / / / / / |
|
| | | * | | | | | | | | 4.0.9 | kumavis | 2018-01-09 | 1 | -1/+1 |
| | | * | | | | | | | | ui - fix font path name | kumavis | 2018-01-09 | 1 | -2/+2 |
| | | * | | | | | | | | Merge pull request #2848 from MetaMask/NewUI-flat | Alexander Tseung | 2018-01-04 | 12 | -1313/+2204 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ | Merge pull request #2845 from alextsg/NewUI-flat-4.0.5c | Alexander Tseung | 2018-01-04 | 10 | -14/+115 |
| | | | |\ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | Fix merge conflict | Alexander Tseung | 2018-01-04 | 1 | -1/+0 |
| | | | | * | | | | | | | | Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c | Alexander Tseung | 2018-01-04 | 338 | -3279/+38277 |
| | | |_|/| | | | | | | |
| | |/| |/ / / / / / / / |
|
| | | | * | | | | | | | | Fix sign typed data | Alexander Tseung | 2017-12-30 | 2 | -1298/+2088 |
| | | | * | | | | | | | | Fix mascara first time flow button colors | Alexander Tseung | 2017-12-30 | 1 | -3/+3 |
| | | * | | | | | | | | | Merge pull request #2799 from MetaMask/NewUI-flat | Alexander Tseung | 2017-12-23 | 193 | -659/+21414 |
| | | |\| | | | | | | | |
|
| | | | * | | | | | | | | Merge pull request #2798 from alextsg/NewUI-flat-4.0.5 | Alexander Tseung | 2017-12-23 | 3 | -8/+1 |
| | | | |\ \ \ \ \ \ \ \ |
|
| | | | | * \ \ \ \ \ \ \ | Merge branch 'NewUI-flat' into merge-master | Alexander Tseung | 2017-12-23 | 1 | -1/+1 |
| | | | | |\ \ \ \ \ \ \ \
| | | | | |/ / / / / / / /
| | | | |/| | | | | | | | |
|
| | | | * | | | | | | | | | Update manifest.json version from 4.0.4 to 4.0.5 (#2797) | Alexander Tseung | 2017-12-23 | 1 | -1/+1 |
| | | | | * | | | | | | | | Merge branch 'NewUI-flat' into merge-master | Alexander Tseung | 2017-12-23 | 337 | -2146/+36353 |
| | | | | |\ \ \ \ \ \ \ \
| | | | | |/ / / / / / / /
| | | | |/| | | | | | | | |
|
| | | | * | | | | | | | | | Track usage of old and new UI (#2794) | Alexander Tseung | 2017-12-23 | 9 | -17/+125 |
| | | | * | | | | | | | | | [NewUI] Fixes tests and sends user to NewUI after registering. (#2788) | Dan J Miller | 2017-12-22 | 6 | -8/+12 |
| | | | * | | | | | | | | | Merge pull request #2785 from danjm/merge-master-to-newUI-flat-dec20 | Chi Kei Chan | 2017-12-21 | 20 | -79/+1114 |
| | | | |\ \ \ \ \ \ \ \ \ |
|
| | | | | * \ \ \ \ \ \ \ \ | Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 | Chi Kei Chan | 2017-12-21 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / /
| | | | |/| | | | | | | | | |
|
| | | | | * | | | | | | | | | Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 | Chi Kei Chan | 2017-12-21 | 8 | -74/+98 |
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / /
| | | | |/| | | | | | | | | |
|
| | | | * | | | | | | | | | | Clone transaction while editing instead of mutating object from state. | Dan | 2017-12-21 | 1 | -6/+7 |
| | | | * | | | | | | | | | | Add constanst for token transfer function signature. | Dan | 2017-12-21 | 2 | -1/+5 |
| | | | * | | | | | | | | | | Lint fixes. | Dan | 2017-12-21 | 4 | -6/+2 |
| | | | * | | | | | | | | | | Adds updateTransaction to background and used it to update after editing in s... | Dan | 2017-12-21 | 8 | -101/+85 |
| | | | * | | | | | | | | | | Canceled, edited transactions show edited amount. | Dan | 2017-12-21 | 5 | -2/+41 |
| | | | | * | | | | | | | | | Merge branch 'master' into NewUI-flat | Dan | 2017-12-21 | 20 | -79/+1114 |
| | | | |/| | | | | | | | |
| | | | | | |_|_|_|_|/ / /
| | | | | |/| | | | | | | |
|
| | | | * | | | | | | | | | [NewUI] Hide UI toggle in mascara (#2772) | Dan J Miller | 2017-12-21 | 4 | -19/+23 |
| | | | * | | | | | | | | | Hide fiat values on account details screen when eth/token value is 0. | Dan | 2017-12-21 | 3 | -3/+8 |
| | | | * | | | | | | | | | Hides the sidebar after the an account menu actions changes the screen behind... | Dan | 2017-12-21 | 1 | -0/+6 |
| | | | * | | | | | | | | | Fix edit to field bug. (#2738) | Dan J Miller | 2017-12-13 | 1 | -6/+7 |
| | | | * | | | | | | | | | Remove inline style. | Dan | 2017-12-13 | 3 | -4/+4 |
| | | | * | | | | | | | | | Make transaction list and item more flexible. | Dan | 2017-12-13 | 2 | -4/+4 |
| | | | * | | | | | | | | | Flex account-data-subsection | Dan | 2017-12-13 | 3 | -19/+20 |
| | | | * | | | | | | | | | Fix old ui width in mobile and extension. | Dan | 2017-12-13 | 2 | -24/+21 |
| | | | * | | | | | | | | | Fix height of login screen | Dan | 2017-12-13 | 1 | -27/+25 |
| | | | * | | | | | | | | | Fix isMascara and update yarn.lock | Chi Kei Chan | 2017-12-13 | 2 | -290/+464 |