Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | v4.6.0 | kumavis | 2018-04-27 | 2 | -1/+3 | |
| | | |_|/ / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3 | kumavis | 2018-04-26 | 18 | -394/+859 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
| | * | | | | | | | | transactions - more docs and clean ups | frankiebee | 2018-04-26 | 6 | -55/+116 | |
| | * | | | | | | | | Cleaned up some typos and JSDocs in Transactions | Dan Finlay | 2018-04-24 | 3 | -38/+40 | |
| | * | | | | | | | | transactions - fix refernces | frankiebee | 2018-04-20 | 2 | -1/+2 | |
| | * | | | | | | | | Merge branch 'master' into tx-controller-rewrite-v3 | frankiebee | 2018-04-20 | 163 | -3365/+14592 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | meta - transactions - docs yo! | frankiebee | 2018-04-20 | 9 | -73/+351 | |
| | * | | | | | | | | | fix up - more docs | frankiebee | 2018-04-14 | 3 | -38/+77 | |
| | * | | | | | | | | | meta - transactions - code clean up and jsDoc | frankiebee | 2018-04-14 | 2 | -43/+111 | |
| | * | | | | | | | | | transactions - code cleanup | frankiebee | 2018-04-13 | 2 | -58/+59 | |
| | * | | | | | | | | | transactions - lint fixes | frankiebee | 2018-04-11 | 3 | -12/+12 | |
| | * | | | | | | | | | meta - transactions - create a transactions dir in controller and move releva... | frankiebee | 2018-04-11 | 16 | -240/+255 | |
* | | | | | | | | | | | Merge pull request #4097 from MetaMask/i4096-token-rates-error | Kevin Serrano | 2018-04-28 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Return 0 for token rate fetch failures | bitpshr | 2018-04-27 | 1 | -1/+5 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* / | | | | | | | | | | Allow transactions with 0-gwei gas price (#4073) | Paul Bouchon | 2018-04-27 | 7 | -48/+80 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #4065 from MetaMask/i18n-helper-bugfix | Dan Finlay | 2018-04-26 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | i18n-helper - wrap fallback in brackets to help indicate something is wrong | kumavis | 2018-04-26 | 1 | -1/+1 | |
| * | | | | | | | | | | Return key instead of empty string on i18n fail | Dan Finlay | 2018-04-26 | 1 | -1/+1 | |
| * | | | | | | | | | | i18n-helper - abort on i18n failure | kumavis | 2018-04-25 | 1 | -1/+2 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #4083 from MetaMask/pe-bump | Dan Finlay | 2018-04-26 | 3 | -42/+176 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | rpc - bump provider-engine + eth-json-rpc-filters | kumavis | 2018-04-26 | 3 | -42/+176 | |
* | | | | | | | | | | | Merge pull request #4068 from MetaMask/privacy-notice-patch | kumavis | 2018-04-26 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Updated notices json file. | Kevin Serrano | 2018-04-26 | 1 | -1/+1 | |
| * | | | | | | | | | | Clarify privacy notice | Dan Finlay | 2018-04-25 | 1 | -1/+1 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #4080 from MetaMask/AddDevelopGuideToContributing | Dan Finlay | 2018-04-26 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add develop guide to contributing.md | Dan Finlay | 2018-04-26 | 1 | -2/+4 | |
* | | | | | | | | | | | Merge pull request #4070 from MetaMask/i3999-DeterministicBuilds | Dan Finlay | 2018-04-26 | 2 | -75/+1661 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Move uglifyify to MetaMask org | Dan Finlay | 2018-04-26 | 1 | -1/+1 | |
| * | | | | | | | | | | Make minified builds more determinstic | Dan Finlay | 2018-04-25 | 2 | -75/+1661 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #4069 from MetaMask/i4056-LatestPriceApi | Dan Finlay | 2018-04-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Use latest balanc3 api for prices | Dan Finlay | 2018-04-25 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #4040 from MetaMask/dm-docs-2 | Dan Finlay | 2018-04-25 | 13 | -54/+764 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | lint fix | Dan | 2018-04-24 | 1 | -0/+1 | |
| * | | | | | | | | | | Merge branch 'master' into dm-docs-2 | Dan | 2018-04-24 | 54 | -4390/+957 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #3940 from nyatla/master | Dan Finlay | 2018-04-24 | 3 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Reduced button padding. | nyatla | 2018-04-10 | 1 | -0/+1 | |
| * | | | | | | | | | | | Expanded dropdown menu width of title. | nyatla | 2018-04-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | Changed mouse cursor to "pointer" on the cancel text at the top left of the p... | nyatla | 2018-04-10 | 1 | -0/+1 | |
* | | | | | | | | | | | | Merge pull request #4023 from MetaMask/greenkeeper/ethjs-contract-0.2.0 | Dan Finlay | 2018-04-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | fix(package): update ethjs-contract to version 0.2.0 | greenkeeper[bot] | 2018-04-19 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge pull request #4062 from MetaMask/i4056-LatestPriceApi | Dan Finlay | 2018-04-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Use the metamask balanc3 dev price api | Dan Finlay | 2018-04-24 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge pull request #3934 from MetaMask/node-engines | Dan Finlay | 2018-04-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | package.json - update engines field to require node v8.x.x | kumavis | 2018-04-10 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Merge pull request #3935 from MetaMask/ci-tests-first-then-dessert | Dan Finlay | 2018-04-24 | 1 | -10/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | ci - complete all tests before running extras | kumavis | 2018-04-10 | 1 | -10/+11 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #4057 from MetaMask/sentry-bump | Dan Finlay | 2018-04-24 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | deps - bump sentry for more detailed fetch failure | kumavis | 2018-04-24 | 2 | -4/+4 | |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #4029 from MetaMask/DocumentMetaMaskController | Dan Finlay | 2018-04-24 | 1 | -131/+330 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Linted docs | Dan Finlay | 2018-04-24 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Linted jsdocs | Dan Finlay | 2018-04-21 | 1 | -52/+60 | |
| * | | | | | | | | | | | | | Added docs to MM-controller | Dan Finlay | 2018-04-19 | 1 | -130/+321 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #3968 from MetaMask/gh-3653 | Dan Finlay | 2018-04-24 | 20 | -121/+212 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Clean up network config | Alexander Tseung | 2018-04-24 | 20 | -121/+212 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #4028 from MetaMask/i4016-customrpc | Dan Finlay | 2018-04-24 | 1 | -6/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix custom RPC not redirecting to Settings page | Alexander Tseung | 2018-04-19 | 1 | -6/+8 | |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #4041 from MetaMask/DocumentBackground | Dan Finlay | 2018-04-24 | 1 | -2/+127 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Remove wrong chars | Dan Finlay | 2018-04-21 | 1 | -2/+2 | |
| * | | | | | | | | | | | | Add ui note to background docs | Dan Finlay | 2018-04-21 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Lint background docs | Dan Finlay | 2018-04-21 | 1 | -12/+12 | |
| * | | | | | | | | | | | | Document MetaMaskState and TransactionMeta | Dan Finlay | 2018-04-21 | 1 | -0/+69 | |
| * | | | | | | | | | | | | Document Background Script | Dan Finlay | 2018-04-20 | 1 | -2/+58 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshr | Dan Finlay | 2018-04-21 | 27 | -4149/+296 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Clean up JSDoc for background scripts | bitpshr | 2018-04-20 | 7 | -24/+32 | |
| * | | | | | | | | | | | Add more documentation to computed balances controller | bitpshr | 2018-04-20 | 4 | -6/+77 | |
| * | | | | | | | | | | | Add JSDoc to various background scripts | bitpshr | 2018-04-19 | 30 | -9339/+14 | |
| * | | | | | | | | | | | Add generated docs | bitpshr | 2018-04-19 | 18 | -227/+5485 | |
| * | | | | | | | | | | | Add JSDoc to various background scripts | bitpshr | 2018-04-19 | 6 | -70/+205 | |
| | | | | | * | | | | | | Remove accidentally added code in message-manager. | Dan | 2018-04-24 | 1 | -8/+0 | |
| | | | | | * | | | | | | Remove unnecessary doc comment. | Dan | 2018-04-24 | 1 | -2/+0 | |
| | | | | | * | | | | | | Fix nits. | Dan | 2018-04-24 | 4 | -33/+33 | |
| | | | | | * | | | | | | Minor fixes in a number of docs. | Dan | 2018-04-21 | 6 | -18/+17 | |
| | | | | | * | | | | | | Notification manager method docs. | Dan | 2018-04-21 | 1 | -4/+31 | |
| | | | | | * | | | | | | Merge branch 'master' into dm-docs-2 | Dan | 2018-04-20 | 117 | -1965/+8813 | |
| | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #4030 from MetaMask/i4014-metamask-version | Thomas Huang | 2018-04-20 | 1 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Show correct MetaMask version number in the Info page | Alexander Tseung | 2018-04-19 | 1 | -1/+9 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #4026 from MetaMask/i4015-oldui-seed | Thomas Huang | 2018-04-19 | 1 | -6/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix exception thrown when revealing seed words | Alexander Tseung | 2018-04-19 | 1 | -6/+18 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #3984 from whymarrh/3941-jsdoc | Dan Finlay | 2018-04-19 | 9 | -48/+150 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Add a few missing docblocks to background files | Whymarrh Whitby | 2018-04-19 | 9 | -48/+150 | |
* | | | | | | | | | | | Merge pull request #3987 from MetaMask/dm-docs-1 | Dan Finlay | 2018-04-19 | 8 | -17/+389 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Missing bracket in docblock. | Dan | 2018-04-19 | 1 | -1/+1 | |
| * | | | | | | | | | | Merge branch 'master' into dm-docs-1 | Dan | 2018-04-19 | 92 | -1703/+8290 | |
| |\| | | | | | | | | | ||||||
| * | | | | | | | | | | NO MIXED TABS AND SPACES | Dan | 2018-04-19 | 3 | -137/+137 | |
| * | | | | | | | | | | Documentation fix: @constant -> @property | Dan | 2018-04-19 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge pull request #3977 from MetaMask/i-3913-big-number | Dan Finlay | 2018-04-19 | 5 | -25/+52 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix spinner layout | Alexander Tseung | 2018-04-18 | 5 | -26/+28 | |
| * | | | | | | | | | | | Fix BigNumber exception in confirm-send-ether | Alexander Tseung | 2018-04-18 | 2 | -3/+28 | |
* | | | | | | | | | | | | Merge pull request #4004 from MetaMask/i3955-reveal-seed | Dan Finlay | 2018-04-19 | 6 | -23/+116 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix UI getting stuck in Reveal Seed screen | Alexander Tseung | 2018-04-19 | 6 | -23/+116 | |
* | | | | | | | | | | | | | Merge pull request #3998 from MetaMask/i3988-checksummed-address | Dan Finlay | 2018-04-19 | 12 | -27/+46 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Show checksummed addresses throughout the UI | bitpshr | 2018-04-18 | 12 | -27/+46 | |
| |/ / / / / / / / / / / | ||||||
* | / / / / / / / / / / | I18n - add Tamil + some Hindi fixes | Vikas Kumar Yadav | 2018-04-19 | 3 | -10/+923 | |
| |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #4000 from MetaMask/deps | Dan Finlay | 2018-04-18 | 2 | -33/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | deps - update keyring controller and other eth-dependinces | frankiebee | 2018-04-18 | 2 | -33/+36 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #3853 from MetaMask/i3580-InternationalizeCurrency | Dan Finlay | 2018-04-18 | 12 | -1300/+1235 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'master' into i3580-InternationalizeCurrency | Dan Finlay | 2018-04-18 | 82 | -346/+6088 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #3969 from MetaMask/i3966-AddJsDocsPage | Thomas Huang | 2018-04-18 | 21 | -0/+4254 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add JSDocs Page and Script | Dan Finlay | 2018-04-13 | 21 | -61/+4681 | |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #3995 from MetaMask/i3759-popup | Dan Finlay | 2018-04-18 | 12 | -68/+104 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix confirmation popup not always opening | Alexander Tseung | 2018-04-17 | 12 | -68/+104 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #3982 from MetaMask/i3981-contract-rates | Dan Finlay | 2018-04-17 | 13 | -92/+147 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into i3981-contract-rates | Dan Finlay | 2018-04-17 | 44 | -141/+1166 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #3967 from MetaMask/AddTeamDocs | Dan Finlay | 2018-04-17 | 2 | -0/+79 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix spelling typo | Dan Finlay | 2018-04-17 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Add Herman team documentation | Dan Finlay | 2018-04-13 | 1 | -0/+11 | |
| * | | | | | | | | | | | | Linted | Dan Finlay | 2018-04-13 | 1 | -2/+0 | |
| * | | | | | | | | | | | | Add Paul to team docs | Dan Finlay | 2018-04-13 | 1 | -0/+7 | |
| * | | | | | | | | | | | | Add team member documentation | Dan Finlay | 2018-04-13 | 2 | -0/+63 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #3970 from MetaMask/i3651-removeGlobalLog | Dan Finlay | 2018-04-17 | 37 | -113/+172 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Require loglevel singleton in each module that uses it | bitpshr | 2018-04-14 | 37 | -113/+172 | |
* | | | | | | | | | | | | | Merge pull request #3978 from espoem/cs-lang | Dan Finlay | 2018-04-17 | 2 | -0/+913 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix vault translation | Martin Šmíd | 2018-04-14 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | Add czech translation | Martin Šmíd | 2018-04-14 | 2 | -0/+913 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #3985 from whymarrh/unused-jshint | Dan Finlay | 2018-04-17 | 1 | -27/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Remove unused JSHint file, ESLint is the standard | Whymarrh Whitby | 2018-04-17 | 1 | -27/+0 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #3976 from MetaMask/i3973-FixLocaleSettings | kumavis | 2018-04-17 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Fix action for setting locale | Dan Finlay | 2018-04-14 | 2 | -1/+2 | |
|/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | Update CHANGELOG with information about rate fetching | bitpshr | 2018-04-17 | 1 | -1/+2 | |
| | * | | | | | | | | | | Disable token price polling when no client is active | bitpshr | 2018-04-17 | 4 | -0/+14 | |
| | * | | | | | | | | | | Maintain token prices using a background service | bitpshr | 2018-04-16 | 7 | -81/+117 | |
| | * | | | | | | | | | | Fetch token prices based on contract address | bitpshr | 2018-04-16 | 8 | -81/+85 | |
| |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #3975 from MetaMask/i3947-composableStore | Dan Finlay | 2018-04-14 | 6 | -265/+637 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Add tests for ComposableObservableStore | bitpshr | 2018-04-14 | 2 | -11/+46 | |
| * | | | | | | | | | | Add ComposableObservableStore for subscription management | bitpshr | 2018-04-13 | 5 | -265/+602 | |
|/ / / / / / / / / / | ||||||
| * | | | | | | | | | Merge branch 'master' into i3580-InternationalizeCurrency | kumavis | 2018-04-10 | 6 | -33/+994 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Add basic currency localization test. | Dan | 2018-04-10 | 2 | -0/+162 | |
| * | | | | | | | | | Fix integration tests so that they check for localize currency. | Dan | 2018-04-10 | 1 | -4/+4 | |
| * | | | | | | | | | Lint fix. | Dan | 2018-04-10 | 2 | -2/+2 | |
| * | | | | | | | | | Merge branch 'master' into i3580-InternationalizeCurrency | Dan | 2018-04-10 | 104 | -3163/+5310 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Internationalize converted value in confirm screens | Dan | 2018-04-10 | 2 | -4/+36 | |
| * | | | | | | | | | | Internationalize converted value in currency-input.js | Dan | 2018-04-10 | 1 | -10/+25 | |
| * | | | | | | | | | | Improve display of crypto currencies when selected as the 'Current Conversion' | Dan | 2018-04-10 | 2 | -35/+1206 | |
| * | | | | | | | | | | Fix and improve test | Dan Finlay | 2018-04-04 | 1 | -2/+12 | |
| * | | | | | | | | | | Linted | Dan Finlay | 2018-04-04 | 1 | -1/+1 | |
| * | | | | | | | | | | Bump changelog | Dan Finlay | 2018-04-04 | 1 | -0/+2 | |
| * | | | | | | | | | | Internationalize currency | Dan Finlay | 2018-04-04 | 4 | -1/+44 | |
| | | | | | * | | | | | Even more documentation for various controllers and libs. | Dan | 2018-04-19 | 13 | -49/+742 | |
| | | | |_|/ / / / / | | | |/| | | | | | | ||||||
| | | * | | | | | | | Add missing descriptions in util.js | Dan | 2018-04-17 | 1 | -4/+4 | |
| | | * | | | | | | | Document async function as returning a promise. | Dan | 2018-04-17 | 1 | -1/+1 | |
| | | * | | | | | | | Improve documentation of promises that return undefined. | Dan | 2018-04-17 | 2 | -4/+4 | |
| | | * | | | | | | | Typo fixes, type fixes on the return clauses of the buyEthUrl and getPreffere... | Dan | 2018-04-17 | 6 | -7/+8 | |
| | | * | | | | | | | Spell deprecated correctly. | Dan | 2018-04-17 | 1 | -2/+2 | |
| | | * | | | | | | | @params -> @param fix | Dan | 2018-04-17 | 3 | -8/+8 | |
| | | * | | | | | | | Documentation for various controllers and libs | Dan | 2018-04-17 | 9 | -19/+387 | |
| | | * | | | | | | | Documentation for environemnt-type.js | Dan | 2018-04-12 | 1 | -0/+9 | |
| |_|/ / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #3938 from nyatla/master | kumavis | 2018-04-10 | 1 | -27/+72 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | ローカライズファイル以外を元に戻した | nyatla | 2018-04-10 | 3 | -3337/+1793 | |
| * | | | | | | | | Merge tag 'v4.5.5' | nyatla | 2018-04-10 | 184 | -3344/+10841 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Update messages.json | R.IIzuka | 2018-04-10 | 2 | -92/+207 | |
* | | | | | | | | | | Merge pull request #3894 from danjm/i3696-disablefirsttimeimportloading | kumavis | 2018-04-10 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Disable the first time flow import button while isLoading is true. | Dan | 2018-04-09 | 1 | -3/+4 | |
* | | | | | | | | | | | Merge pull request #3852 from MetaMask/i3621-LogoPerformance | kumavis | 2018-04-10 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into i3621-LogoPerformance | kumavis | 2018-04-10 | 98 | -2011/+6507 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Translate to Turkish (#3876) | Mert Ozdag | 2018-04-10 | 2 | -0/+913 | |
* | | | | | | | | | | | | Merge pull request #3895 from MetaMask/greenkeeper/gulp-sass-4.0.0 | kumavis | 2018-04-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | fix(package): update gulp-sass to version 4.0.0 | greenkeeper[bot] | 2018-04-05 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge pull request #3925 from MetaMask/greenkeeper/ethjs-0.3.4 | kumavis | 2018-04-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | fix(package): update ethjs to version 0.3.4 | greenkeeper[bot] | 2018-04-07 | 1 | -1/+1 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #3921 from MetaMask/gh-3736-react-router | kumavis | 2018-04-10 | 61 | -1787/+4799 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix integration tests | Alexander Tseung | 2018-04-07 | 6 | -19/+39 | |
| * | | | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-06 | 17 | -49/+315 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix editing transaction | Alexander Tseung | 2018-04-06 | 1 | -2/+1 | |
| * | | | | | | | | | | | | Revert "commit" | Alexander Tseung | 2018-04-06 | 4 | -18/+7 | |
| * | | | | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-06 | 5 | -3/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | commit | Alexander Tseung | 2018-04-06 | 4 | -7/+18 | |
| * | | | | | | | | | | | | | Fix confirm-sig-requests integration test | Alexander Tseung | 2018-04-05 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-05 | 13 | -95/+239 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix integration tests | Alexander Tseung | 2018-04-05 | 3 | -7/+28 | |
| * | | | | | | | | | | | | | Use new design for showing seed words | Alexander Tseung | 2018-04-04 | 1 | -1/+13 | |
| * | | | | | | | | | | | | | commit | Alexander Tseung | 2018-04-04 | 1 | -8/+2 | |
| * | | | | | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-04 | 24 | -156/+250 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Fix transaction confirmations | Alexander Tseung | 2018-04-04 | 4 | -35/+161 | |
| * | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-03 | 6 | -17/+93 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Fix merge conflicts. Modify send workflow | Alexander Tseung | 2018-04-03 | 48 | -808/+5271 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Fix lint errors | Alexander Tseung | 2018-04-03 | 13 | -414/+21 | |
| * | | | | | | | | | | | | | | | | Add withRouter to I18nProvider component | Alexander Tseung | 2018-04-03 | 1 | -1/+6 | |
| * | | | | | | | | | | | | | | | | Refactor onboarding flow | Alexander Tseung | 2018-04-02 | 16 | -235/+403 | |
| * | | | | | | | | | | | | | | | | Fix conf-tx render | Alexander Tseung | 2018-03-31 | 3 | -7/+50 | |
| * | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-03-31 | 5 | -23/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 101 | -944/+1774 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Fix merge conflicts. Refactor renderPrimary into Home component | Alexander Tseung | 2018-03-31 | 10 | -610/+694 | |
| * | | | | | | | | | | | | | | | | | | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 120 | -849/+2004 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Fix merge conflicts. Refactor onboarding flow. | Alexander Tseung | 2018-03-29 | 18 | -91/+176 | |
| * | | | | | | | | | | | | | | | | | | | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 267 | -5943/+47127 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Fix react-router related exceptions | Alexander Tseung | 2018-02-10 | 2 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int... | Alexander Tseung | 2018-02-09 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int... | Alexander Tseung | 2018-02-09 | 2 | -36/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int... | Alexander Tseung | 2018-02-09 | 47 | -173/+1349 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add prop-types to package.json, redirect from create-password screen when isI... | Alexander Tseung | 2017-12-15 | 2 | -2/+22 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add route for signature request | Alexander Tseung | 2017-12-15 | 6 | -305/+454 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add initialized checks for first time flow routes | Alexander Tseung | 2017-12-15 | 6 | -83/+60 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add route for Mascara confirm seed | Alexander Tseung | 2017-12-15 | 4 | -120/+151 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fix lint errors | Alexander Tseung | 2017-12-15 | 4 | -14/+44 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add routes for mascara | Alexander Tseung | 2017-12-15 | 13 | -198/+296 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 43 | -1468/+2065 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3922 from MetaMask/empty-vault-fix | kumavis | 2018-04-07 | 1 | -3/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | metamask - never persist if state is missing | kumavis | 2018-04-07 | 1 | -1/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | metamask - never persist if state is missing data | kumavis | 2018-04-07 | 1 | -3/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | metamask - attempt recovery from empty vault | kumavis | 2018-04-07 | 1 | -0/+22 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3917 from MetaMask/kumavis-patch-3 | Frankie | 2018-04-07 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | tx-state-manager - dont remove old tx history if candidate is not found | kumavis | 2018-04-07 | 1 | -2/+4 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3916 from MetaMask/4.5.5 | Frankie | 2018-04-07 | 2 | -1/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | 4.5.5v4.5.5 | kumavis | 2018-04-07 | 2 | -1/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | changelog - add changes for v4.5.5 | kumavis | 2018-04-07 | 1 | -1/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | v4.5.4 | kumavis | 2018-04-07 | 2 | -1/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | changelog - add missing entries | kumavis | 2018-04-07 | 1 | -1/+3 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3901 from MetaMask/MM-QA-Guide | kumavis | 2018-04-06 | 1 | -0/+48 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Update QA_Guide.md | Thomas Huang | 2018-04-06 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Update QA_Guide.md | Thomas Huang | 2018-04-06 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Update | Thomas | 2018-04-06 | 1 | -2/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Commit Metamask QA Guide | Thomas | 2018-04-06 | 1 | -0/+44 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3907 from MetaMask/fix-all-migrations | kumavis | 2018-04-06 | 9 | -89/+124 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | migrations - back fixes | frankiebee | 2018-04-06 | 9 | -89/+124 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3906 from MetaMask/migration-25 | Thomas Huang | 2018-04-06 | 4 | -3/+133 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | create migration 25 | frankiebee | 2018-04-06 | 4 | -3/+112 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | test - run live migrations over first time state | frankiebee | 2018-04-06 | 1 | -4/+25 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3904 from MetaMask/migrations-template | Frankie | 2018-04-06 | 2 | -0/+46 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | meta - create a migration template | frankiebee | 2018-04-06 | 2 | -0/+46 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3857 from MetaMask/match-local-localecodes | kumavis | 2018-04-06 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Map existingLocaleCodes and userPreferredLocaleCodes to lower case in get-fir... | Dan | 2018-04-04 | 1 | -2/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Ensure get-first-preferred-lang-code.js matches locale codes from local direc... | Dan | 2018-04-04 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3883 from danjm/i3685-define-event-privatekey-import | kumavis | 2018-04-06 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | event object actually passed to this.createKeyringOnEnter in private-key.js | Dan | 2018-04-05 | 1 | -1/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3887 from MetaMask/i#3886 | kumavis | 2018-04-06 | 2 | -27/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | transactions - _normalizeTxParams will now return a new object for txParams | frankiebee | 2018-04-06 | 2 | -40/+27 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | transactions - remove unnecessary keys on txParams | frankiebee | 2018-04-05 | 2 | -1/+14 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3900 from MetaMask/migration-error-report | Frankie | 2018-04-06 | 4 | -14/+80 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | migrator - dont overwrite error stack and warn to console | kumavis | 2018-04-06 | 1 | -2/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | migrator - fix typo | kumavis | 2018-04-06 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | migrations - report migrations errors to sentry with vault structure | kumavis | 2018-04-06 | 4 | -14/+77 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3892 from alextsg/gh-3891 | kumavis | 2018-04-06 | 2 | -1/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix populating txParams with undefined data | Alexander Tseung | 2018-04-06 | 2 | -1/+10 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3899 from MetaMask/migration-24-fix | kumavis | 2018-04-06 | 2 | -1/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | make migration-24 compat with first-time-state | frankiebee | 2018-04-06 | 2 | -1/+13 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3865 from MetaMask/openlinkinnewwindow | Thomas Huang | 2018-04-06 | 2 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Bump Changelog | Kevin Serrano | 2018-04-05 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into openlink... | Kevin Serrano | 2018-04-05 | 13 | -95/+239 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Make token helpscout link open in new tab. | Kevin Serrano | 2018-04-04 | 1 | -0/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3882 from MetaMask/i#3791 | Kevin Serrano | 2018-04-05 | 3 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Change double-quotes to single-quotes | Thomas | 2018-04-05 | 2 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | Update Changelog | Thomas | 2018-04-05 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into i#3791 | Thomas | 2018-04-05 | 2 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Add target=_blank exportAsFile | Thomas | 2018-04-05 | 2 | -0/+2 | |
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3884 from danjm/i3874-send-eth-to-self | Kevin Serrano | 2018-04-05 | 1 | -3/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |