| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int... | Alexander Tseung | 2018-02-09 | 47 | -173/+1349 |
|\ |
|
| * | 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 |
* | | | | | | Fix lint errors | Alexander Tseung | 2018-02-02 | 4 | -10/+3 |
* | | | | | | Checks if there is currently a send in progress before redirecting to default... | Dan | 2018-02-01 | 1 | -3/+7 |
* | | | | | | Fix merge conflicts from uat-next | Alexander Tseung | 2018-02-01 | 40 | -230/+1152 |
|\| | | | | |
|
| * | | | | | [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 #3065 from MetaMask/Version-3.13.7 | Dan Finlay | 2018-01-23 | 2 | -1/+8 |
| | |\ \ \ |
|
| | | * \ \ | Merge branch 'Version-3.13.7' of github.com:MetaMask/metamask-plugin into Ver... | Dan Finlay | 2018-01-23 | 0 | -0/+0 |
| | | |\ \ \ |
|
| | | | * \ \ | Merge branch 'master' into Version-3.13.7 | kumavis | 2018-01-23 | 3 | -2/+15 |
| | | | |\ \ \
| | | |_|/ / /
| | |/| | | | |
|
| | | | * | | | Version 3.13.7v3.13.7 | Dan Finlay | 2018-01-23 | 2 | -1/+8 |
| | | * | | | | Merge remote-tracking branch 'origin/master' into Version-3.13.7 | Dan Finlay | 2018-01-23 | 3 | -1/+14 |
| | | |\ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge pull request #3066 from MetaMask/sentry-failed-tx | kumavis | 2018-01-23 | 3 | -1/+14 |
| | |\ \ \ \ \
| | | |_|/ / /
| | |/| | | | |
|
| | | * | | | | changelog - add note on sentry | kumavis | 2018-01-23 | 1 | -0/+1 |
| | | * | | | | sentry - report failed txs | kumavis | 2018-01-23 | 2 | -1/+13 |
| | |/ / / / |
|
| | | * / / | Version 3.13.7 | Dan Finlay | 2018-01-23 | 2 | -1/+8 |
| | |/ / / |
|
| | * | | | Merge pull request #3047 from MetaMask/fix-provider-json-parse | Kevin Serrano | 2018-01-23 | 1 | -2/+2 |
| | |\ \ \ |
|
| | | * | | | deps - bump provider engine and infura-middleware for better retry and error ... | kumavis | 2018-01-20 | 1 | -2/+2 |
| | | * | | | deps - bump providers for better JSON parse error messages | kumavis | 2018-01-20 | 1 | -2/+2 |
| | * | | | | Merge pull request #3064 from MetaMask/engine-patch | Dan Finlay | 2018-01-23 | 1 | -1/+1 |
| | |\ \ \ \ |
|
| | | * | | | | deps - bump json rpc engine for bugfix | kumavis | 2018-01-23 | 1 | -1/+1 |
| | |/ / / / |
|
| | * | | | | Merge pull request #3025 from MetaMask/i#3018 | kumavis | 2018-01-23 | 3 | -2/+18 |
| | |\ \ \ \
| | | |/ / /
| | |/| | | |
|
| | | * | | | Bump changelog | Dan Finlay | 2018-01-23 | 1 | -0/+2 |
| | | * | | | add a `x` close button to gas calc loding screen on conf-tx | frankiebee | 2018-01-18 | 2 | -2/+16 |
| * | | | | | 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 |
| | |\ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge pull request #3023 from MetaMask/build-lock-gulp | Dan Finlay | 2018-01-19 | 1 | -1/+1 |
| | |\ \ \ \ \ |
|
| | | * \ \ \ \ | Merge branch 'master' into build-lock-gulp | Thomas Huang | 2018-01-19 | 7 | -42/+40 |
| | | |\ \ \ \ \ |
|
| | | * | | | | | | test - stub provider needs to handle errors | kumavis | 2018-01-18 | 1 | -2/+2 |
| | | * | | | | | | build - lock pre-release gulp dep to commit | kumavis | 2018-01-18 | 1 | -1/+1 |
| | * | | | | | | | Merge pull request #3016 from MetaMask/sentry | Dan Finlay | 2018-01-19 | 5 | -1/+38 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | lint - ignore vendor js | kumavis | 2018-01-18 | 1 | -1/+1 |
| | | * | | | | | | | sentry - dedupe raven vendor | kumavis | 2018-01-18 | 2 | -5/+2 |
| | | * | | | | | | | lint - ignore vendor js | kumavis | 2018-01-18 | 1 | -1/+1 |
| | | * | | | | | | | sentry - breakout raven setup and add release config | kumavis | 2018-01-18 | 3 | -9/+35 |
| | | * | | | | | | | sentry - update raven and add to ui | kumavis | 2018-01-18 | 4 | -7/+13 |
| | | * | | | | | | | sentry - add raven + sentry reporting config | kumavis | 2018-01-18 | 2 | -0/+8 |
| | * | | | | | | | | Merge pull request #3035 from MetaMask/infura-rest-fix | Dan Finlay | 2018-01-19 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \
| | | |_|_|/ / / / /
| | |/| | | | | | | |
|
| | | * | | | | | | | deps - bump infura provider for uri length limit fix | kumavis | 2018-01-19 | 1 | -1/+1 |
| | |/ / / / / / / |
|
| | * | | | | | | | Merge pull request #3029 from MetaMask/test-provider-stub | Thomas Huang | 2018-01-19 | 6 | -43/+33 |
| | |\ \ \ \ \ \ \
| | | |_|_|_|_|/ /
| | |/| | | | | | |
|
| | | * | | | | | | deps - re-add eth-block-tracker | kumavis | 2018-01-18 | 1 | -0/+1 |
| | | * | | | | | | test - createTestProviderTools includes block tracker layer | kumavis | 2018-01-18 | 5 | -22/+25 |
| | | * | | | | | | test - tx controller - fix txGasUtil reference | kumavis | 2018-01-18 | 2 | -3/+4 |
| | | * | | | | | | deps - bump json-rpc-engine for better errors | kumavis | 2018-01-18 | 1 | -1/+1 |
| | | * | | | | | | test - typo - fix spelling of word stubbed | kumavis | 2018-01-18 | 4 | -8/+8 |
| | | * | | | | | | test - remove createEthJsQueryStub | kumavis | 2018-01-18 | 2 | -18/+3 |
| | |/ / / / / / |
|
| | * | | | | | | Merge pull request #3021 from MetaMask/i#3020 | kumavis | 2018-01-18 | 1 | -0/+8 |
| | |\ \ \ \ \ \
| | | |_|/ / / /
| | |/| | | | | |
|
| | | * | | | | | Update transactions.js | kumavis | 2018-01-18 | 1 | -1/+1 |
| | | | |_|/ /
| | | |/| | | |
|
| | | * | | | | transactions - transtion approved transactions to failed transactions on boot | frankiebee | 2018-01-18 | 1 | -0/+8 |
| | |/ / / / |
|
| | * | | | | Merge pull request #3019 from MetaMask/i#3015 | Frankie | 2018-01-18 | 1 | -2/+22 |
| | |\ \ \ \
| | | |/ / /
| | |/| | | |
|
| | | * | | | transactions - fail txs on boot who fail addTxDefaults | frankiebee | 2018-01-18 | 1 | -0/+2 |
| | | * | | | transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on ... | frankiebee | 2018-01-18 | 1 | -2/+20 |
| | |/ / / |
|
| | * | | | Merge pull request #3012 from MetaMask/AddNetworkIndicatorClasstoLoading | Frankie | 2018-01-18 | 1 | -1/+1 |
| | |\ \ \ |
|
| | | * | | | Add network-indicator classname to network loading spinner | Thomas | 2018-01-18 | 1 | -1/+1 |
| | |/ / / |
|
| * | / / | 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 |
* | | | | Add create new account routes, fix conflicts from uat updates | Alexander Tseung | 2018-02-01 | 20 | -643/+674 |
* | | | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 111 | -2410/+6087 |
|\| | | |
|
| * | | | 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 |
| | |\| | |
| | | |/ /
| | |/| | |
|
| | * | | | Merge pull request #2996 from MetaMask/Version-3.13.5 | Thomas Huang | 2018-01-17 | 2 | -1/+3 |
| | |\ \ \ |
|
| | | * | | | Version 3.13.5v3.13.5 | Dan Finlay | 2018-01-17 | 2 | -1/+3 |
| | |/ / / |
|
| | * | | | Merge pull request #2983 from MetaMask/i2907-NoCodeGasLimit | kumavis | 2018-01-17 | 2 | -6/+24 |
| | |\ \ \ |
|
| | | * \ \ | Merge branch 'master' into i2907-NoCodeGasLimit | Dan Finlay | 2018-01-17 | 3 | -0/+5 |
| | | |\ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | Merge pull request #2929 from MetaMask/i2779-FirefoxSpecifyAccountDetailHeight | kumavis | 2018-01-17 | 3 | -0/+5 |
| | |\ \ \ \ |
|
| | | * \ \ \ | Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeight | Dan Finlay | 2018-01-17 | 6 | -18/+56 |
| | | |\ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | | * | | | | Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeight | Dan Finlay | 2018-01-16 | 11 | -29/+116 |
| | | |\ \ \ \ |
|
| | | * | | | | | Edit: Fix Firefox scrollbar Changelog | Thomas Huang | 2018-01-16 | 1 | -1/+1 |
| | | * | | | | | Bump Changelog | Thomas | 2018-01-16 | 1 | -0/+3 |
| | | * | | | | | Add max height for Firefox addon overflow and hide horizontal scroll | tmashuang | 2018-01-11 | 1 | -0/+2 |
| | | * | | | | | Add one px to address for Firefox clipping | tmashuang | 2018-01-11 | 1 | -0/+1 |
| | | | | * | | | Create new flag for simple sends to avoid overloading other flag | Dan Finlay | 2018-01-17 | 1 | -2/+2 |
| | | | | * | | | Merge branch 'master' into i2907-NoCodeGasLimit | kumavis | 2018-01-17 | 6 | -18/+56 |
| | | | | |\ \ \
| | | |_|_|/ / /
| | |/| | | | | |
|
| | * | | | | | | Merge pull request #2984 from MetaMask/RenameLockToLogout | Thomas Huang | 2018-01-17 | 1 | -1/+1 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Rename lock to log out | Dan Finlay | 2018-01-16 | 1 | -1/+1 |
| | | | |/ / / /
| | | |/| | | | |
|
| | * | | | | | | Merge pull request #2962 from MetaMask/open-popup | Dan Finlay | 2018-01-16 | 5 | -17/+55 |
| | |\ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | | * | | | | | Merge branch 'master' into open-popup | Frankie | 2018-01-16 | 9 | -26/+90 |
| | | |\ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | | * | | | | | add to CHANGELOG.md | frankiebee | 2018-01-16 | 1 | -0/+2 |
| | | * | | | | | test - fix to match expected behavior | frankiebee | 2018-01-15 | 1 | -14/+28 |
| | | * | | | | | test - create ethJsQuery stub | frankiebee | 2018-01-15 | 1 | -1/+14 |
| | | * | | | | | transactions - emit 'newUnapprovedTx' before estimateGas finishes | frankiebee | 2018-01-15 | 1 | -2/+6 |
| | | * | | | | | add a loading spinner to conf-tx view | frankiebee | 2018-01-15 | 1 | -0/+6 |
| | | | | * | | | Merge branch 'master' into i2907-NoCodeGasLimit | Dan Finlay | 2018-01-16 | 4 | -15/+78 |
| | | | | |\ \ \
| | | |_|_|/ / /
| | |/| | | | | |
|
| | * | | | | | | Merge pull request #2953 from MetaMask/i2826-SignBytes | Frankie | 2018-01-16 | 2 | -4/+3 |
| | |\ \ \ \ \ \ |
|
| | | * \ \ \ \ \ | Merge branch 'master' into i2826-SignBytes | Frankie | 2018-01-16 | 3 | -11/+75 |
| | | |\ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge pull request #2936 from MetaMask/i2925-BetterGasEstimation | Dan Finlay | 2018-01-16 | 3 | -11/+76 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | Prefer passing a provider over an ethQuery instance | Dan Finlay | 2018-01-13 | 2 | -8/+4 |
| | | * | | | | | | | Improve gas price estimation by backfilling recent-blocks | Dan Finlay | 2018-01-12 | 3 | -9/+78 |
| | | | * | | | | | | Merge branch 'master' into i2826-SignBytes | Dan Finlay | 2018-01-16 | 4 | -7/+8 |
| | | | |\ \ \ \ \ \
| | | |_|/ / / / / /
| | |/| | | | | | | |
|
| | | | * | | | | | | Bump keyringController version | Dan Finlay | 2018-01-16 | 1 | -3/+1 |
| | | | * | | | | | | Fix signTypedData bytes signing | Dan Finlay | 2018-01-14 | 2 | -1/+3 |
| | | | | | | * | | | Set gas limit to 21k for recipients with no code | Dan Finlay | 2018-01-16 | 2 | -5/+24 |
| | | |_|_|_|/ / /
| | |/| | | | | | |
|
| | * | | | | | | | Merge pull request #2862 from wbt/UpdateNotice | Dan Finlay | 2018-01-16 | 2 | -3/+1 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | Cut statement about test network default | wbt | 2018-01-05 | 1 | -1/+1 |
| | | * | | | | | | | Cut statement about test network default | wbt | 2018-01-05 | 1 | -2/+0 |
| | * | | | | | | | | Merge pull request #2900 from MetaMask/infura-rest-api | kumavis | 2018-01-16 | 2 | -4/+7 |
| | |\ \ \ \ \ \ \ \
| | | |_|_|/ / / / /
| | |/| | | | | | | |
|
| | | * | | | | | | | Merge branch 'master' into infura-rest-api | kumavis | 2018-01-12 | 6 | -5/+32 |
| | | |\ \ \ \ \ \ \
| | | | | |_|_|/ / /
| | | | |/| | | | | |
|
| | | * | | | | | | | deps - bump eth-json-infura | kumavis | 2018-01-10 | 1 | -1/+1 |
| | | * | | | | | | | provider - infura - use infura REST api | kumavis | 2018-01-09 | 2 | -4/+7 |
| | | * | | | | | | | bugfix - transactions controller - breakout logic and fix order of operations... | kumavis | 2018-01-09 | 1 | -2/+4 |
| | * | | | | | | | | Merge pull request #2909 from MetaMask/UpdateSupportLinks | Kevin Serrano | 2018-01-13 | 2 | -4/+4 |
| | |\ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / /
| | |/| | | | | | | |
|
| | | * | | | | | | | Use https | Dan Finlay | 2018-01-13 | 2 | -2/+2 |
| | | * | | | | | | | Merge branch 'UpdateReadmeSupportLink' into UpdateSupportLinks | Dan Finlay | 2018-01-13 | 6 | -5/+30 |
| | | |\ \ \ \ \ \ \ |
|
| | | | * | | | | | | | Update support link on readme | Dan Finlay | 2018-01-13 | 1 | -1/+1 |
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Merge pull request #2926 from MetaMask/gulp-npmls | Dan Finlay | 2018-01-12 | 2 | -3/+16 |
| | |\ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / /
| | |/| | | | | | | |
|
| | | * | | | | | | | build - add 'deps' step that records output of 'npm ls' into build | kumavis | 2018-01-11 | 1 | -1/+15 |
| | | * | | | | | | | deps - gulp in dev deps only | kumavis | 2018-01-11 | 1 | -2/+1 |
| | | | |/ / / / /
| | | |/| | | | | |
|
| | * | | | | | | | Merge pull request #2917 from x86kernel/ci/add-ko-locale | kumavis | 2018-01-12 | 1 | -0/+10 |
| | |\ \ \ \ \ \ \
| | | |_|_|/ / / /
| | |/| | | | | | |
|
| | | * | | | | | | ci(ko/messages.json): add korean localization file | x86kernel | 2018-01-10 | 1 | -0/+10 |
| | |/ / / / / / |
|
| | * | | | | | | Merge pull request #2906 from MetaMask/Version-3.13.4 | Thomas Huang | 2018-01-10 | 2 | -1/+3 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Version 3.13.4v3.13.4 | Dan Finlay | 2018-01-10 | 2 | -1/+3 |
| | |/ / / / / / |
|
| | | | * / / / | Update support links for helpscout | Dan Finlay | 2018-01-10 | 1 | -3/+3 |
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge pull request #2855 from abitrolly/patch-2 | kumavis | 2018-01-09 | 1 | -1/+0 |
| | |\ \ \ \ \ |
|
| | | * | | | | | info.js Remove width element to fix email layout | Anatoli Babenia | 2018-01-04 | 1 | -1/+0 |
| | | | |_|_|/
| | | |/| | | |
|
| | * | | | | | Merge pull request #2902 from MetaMask/DefaultToOneGwei | Dan Finlay | 2018-01-09 | 1 | -1/+2 |
| | |\ \ \ \ \ |
|
| | | * \ \ \ \ | Merge branch 'master' into DefaultToOneGwei | Dan Finlay | 2018-01-09 | 1 | -1/+1 |
| | | |\ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | * | | | | | | Merge pull request #2796 from MetaMask/filter-case-sensitive | Dan Finlay | 2018-01-09 | 1 | -1/+1 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | deps - eth-json-rpc-filters@1.2.5 | kumavis | 2017-12-23 | 1 | -1/+1 |
| | * | | | | | | | Merge pull request #2901 from MetaMask/DefaultToOneGwei | kumavis | 2018-01-09 | 2 | -0/+25 |
| | |\ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ | Merge pull request #2899 from MetaMask/danfinlay-patch-1 | kumavis | 2018-01-09 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | Default to estimating 1 gwei for empty blocks. | Dan Finlay | 2018-01-09 | 1 | -1/+1 |
| | |/ / / / / / / / |
|
| | | | | * / / / / | Default to 1 gwei for empty blocks | Dan Finlay | 2018-01-09 | 1 | -2/+3 |
| | | | |/ / / / /
| | | |/| | | | | |
|
| | | * | | | | | | Add test for gas estimate default | Dan Finlay | 2018-01-09 | 1 | -0/+19 |
| | | * | | | | | | Default gas estimate to 1 gwei for networks with no block activity | Dan Finlay | 2018-01-09 | 1 | -0/+6 |
| | |/ / / / / / |
|
| | * | | | | | | Merge pull request #2896 from MetaMask/kumavis-patch-2 | Dan Finlay | 2018-01-09 | 1 | -2/+4 |
| | |\ \ \ \ \ \
| | | |_|_|/ / /
| | |/| | | | | |
|
| | | * | | | | | bugfix - transactions controller - breakout logic and fix order of operations... | kumavis | 2018-01-09 | 1 | -2/+4 |
| | |/ / / / / |
|
| | * | | | | | Merge pull request #2854 from MetaMask/UpdateVinyl-BufferPackage | kumavis | 2018-01-09 | 1 | -1/+1 |
| | |\ \ \ \ \ |
|
| | | * | | | | | Update vinyl-buffer to version 1.0.1 | Thomas Huang | 2018-01-04 | 1 | -1/+1 |
| | | | |/ / /
| | | |/| | | |
|
| | * | | | | | Merge pull request #2891 from MetaMask/i2621-0xRecipientAddress | Thomas Huang | 2018-01-09 | 3 | -0/+44 |
| | |\ \ \ \ \ |
|
| | | * \ \ \ \ | Merge branch 'master' into i2621-0xRecipientAddress | Dan Finlay | 2018-01-09 | 6 | -2/+57 |
| | | |\ \ \ \ \ |
|
| | | * | | | | | | Account for 0x/empty string address and contract creation | Thomas | 2018-01-08 | 3 | -0/+44 |
| | | | |/ / / /
| | | |/| | | | |
|
| | * | | | | | | Merge pull request #2851 from MetaMask/i2812-seedworderrorfix | Kevin Serrano | 2018-01-09 | 4 | -6/+34 |
| | |\ \ \ \ \ \
| | | |_|/ / / /
| | |/| | | | | |
|
| | | * | | | | | Update CHANGELOG.md | Kevin Serrano | 2018-01-09 | 1 | -0/+1 |
| | | * | | | | | Test for failure of the async methods. | Kevin Serrano | 2018-01-04 | 1 | -2/+20 |
| | | * | | | | | Add fix for infinite spinner for incorrect seed phrase. | Kevin Serrano | 2018-01-04 | 2 | -4/+13 |
| | * | | | | | | Merge pull request #2879 from MetaMask/ImproveGasEstimation | Dan Finlay | 2018-01-09 | 6 | -2/+57 |
| | |\ \ \ \ \ \
| | | |_|/ / / /
| | |/| | | | | |
|
| | | * | | | | | Fix feature to work | Dan Finlay | 2018-01-06 | 3 | -6/+16 |
| | | * | | | | | Linted | Dan Finlay | 2018-01-06 | 1 | -3/+0 |
| | | * | | | | | Bump changelog | Dan Finlay | 2018-01-06 | 1 | -0/+1 |
| | | * | | | | | Derive gas price estimate from previous transactions | Dan Finlay | 2018-01-06 | 4 | -2/+24 |
| | | * | | | | | Add test for better gas estimation | Dan Finlay | 2018-01-06 | 1 | -0/+25 |
| | |/ / / / / |
|
| * | | | | | | 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 |