Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | setupUntrustedCommunication and setupTrustedCommunication | Thomas | 2018-04-25 | 2 | -1/+46 |
| | |||||
* | Merge branch 'master' into testing | Thomas | 2018-04-24 | 117 | -1908/+5281 |
|\ | |||||
| * | Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshr | Dan Finlay | 2018-04-21 | 27 | -4149/+296 |
| |\ | | | | | | | Documentation | ||||
| | * | 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 |
| | | | |||||
| * | | 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 | ||||
| | * | | 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 | ||||
| | * | | 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 docblocks to background files | ||||
| | * | | 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 |
| |\ \ \ | | |/ / | |/| | | Documentation for various controllers and and lib utils | ||||
| | * | | 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 |
| | | | | |||||
| | * | | 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 ↵ | Dan | 2018-04-17 | 6 | -7/+8 |
| | | | | | | | | | | | | | | | | getPrefferedLangCode functions. | ||||
| | * | | 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 #3977 from MetaMask/i-3913-big-number | Dan Finlay | 2018-04-19 | 5 | -25/+52 |
| |\ \ \ | | | | | | | | | | | Fix BigNumber exception in confirm-send-ether | ||||
| | * | | | 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 | ||||
| | * | | | | 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 checksum addresses on UI | ||||
| | * | | | | 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 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * removed ethereum, coinbase typos * added ebtry for tamil * removed tamil from index.json for now will start adding tamil translations very soon. * Added transaltion directory for tamil language * Added some translations till BETA * added all translations for c * completed d and e alphabets * completed fand g alphabets * Added i,j and k translations * Added l,m,n and o translations * Added translations for p,q,r and s * Completed the translations. Kept some abbreviations such as JSON, URI, HTTP, ShapeShoft as it is in the translated version itself | ||||
| * | | | Merge pull request #4000 from MetaMask/deps | Dan Finlay | 2018-04-18 | 2 | -33/+36 |
| |\ \ \ | | | | | | | | | | | deps - update keyring controller and other eth-dependinces | ||||
| | * | | | 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 |
| |\ \ \ | | |/ / | |/| | | Internationalize currency | ||||
| | * | | 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 | ||||
| | * | | | Add JSDocs Page and Script | Dan Finlay | 2018-04-13 | 21 | -61/+4681 |
| | | |/ | | |/| | | | | | | | | | Includes new script `npm run doc` for generating docs page. | ||||
| * | | | Merge pull request #3995 from MetaMask/i3759-popup | Dan Finlay | 2018-04-18 | 12 | -68/+104 |
| |\ \ \ | | | | | | | | | | | Fix confirmation popup not always opening | ||||
| | * | | | 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 |
| |\ \ \ | | | | | | | | | | | Fetch token prices based on contract address | ||||
| | * \ \ | 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 |
| |\ \ \ \ | | | | | | | | | | | | | Add team member documentation | ||||
| | * | | | | 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 |
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | To help exeternal contributors make sense of who is active on the project, and who they should go to to ask certain questions. | ||||
| * | | | | Merge pull request #3970 from MetaMask/i3651-removeGlobalLog | Dan Finlay | 2018-04-17 | 37 | -113/+172 |
| |\ \ \ \ | | | | | | | | | | | | | Remove reliance on window.log | ||||
| | * | | | | 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 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Czech translation | ||||
| | * | | | | | 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 | ||||
| | * | | | | | 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 | ||||
| | * | | | | 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 ComposableObservableStore for subscription management | ||||
| | * | | 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 |
| | | | | | | | | | | | | | | | | Fixes #3580 | ||||
* | | | | ConfigManager markAccountsFound, markPasswordForgotten, unMarkPasswordForgotten | Thomas | 2018-04-24 | 1 | -7/+70 |
| | | | | |||||
* | | | | resetAccount and addNewAccount | Thomas | 2018-04-20 | 1 | -0/+45 |
| | | | | |||||
* | | | | newUnsignedMessage and newUnsignedPersonalMessage | Thomas | 2018-04-19 | 1 | -0/+102 |
| | | | | |||||
* | | | | Merge branch 'master' into testing | Thomas | 2018-04-11 | 136 | -3068/+10732 |
|\| | | | |||||
| * | | | Merge pull request #3938 from nyatla/master | kumavis | 2018-04-10 | 1 | -27/+72 |
| |\ \ \ | | | | | | | | | | | Japanese langurge Transration | ||||
| | * | | | ローカライズファイル以外を元に戻した | nyatla | 2018-04-10 | 3 | -3337/+1793 |
| | | | | | |||||
| | * | | | Merge tag 'v4.5.5' | nyatla | 2018-04-10 | 184 | -3344/+10841 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/_locales/ja/messages.json # package-lock.json messages.jsonのローカライズ | ||||
| | * | | | | Update messages.json | R.IIzuka | 2018-04-10 | 2 | -92/+207 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed Japanese phrases. Add some translations. | ||||
| * | | | | | 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. | ||||
| | * | | | | | 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 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Improve fox logo performance | ||||
| | * \ \ \ \ \ | 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 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update gulp-sass to the latest version 🚀 | ||||
| | * | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | Update ethjs to the latest version 🚀 | ||||
| | * | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | Add react-router integration | ||||
| | * | | | | | | | 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 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb-254 | ||||
| | * | | | | | | | | Fix editing transaction | Alexander Tseung | 2018-04-06 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Revert "commit" | Alexander Tseung | 2018-04-06 | 4 | -18/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fa8500e09ad599837f6ad1b2dfc3530195a03b33. | ||||
| | * | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-06 | 5 | -3/+6 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb-254 | ||||
| | * | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | cb-254 | ||||
| | * | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb-254 | ||||
| | * | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb-254 | ||||
| | * \ \ \ \ \ \ \ \ \ \ | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb-254 | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | 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 ↵ | Alexander Tseung | 2018-02-09 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into cb-254 | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵ | Alexander Tseung | 2018-02-09 | 2 | -36/+28 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into cb-254 | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵ | Alexander Tseung | 2018-02-09 | 47 | -173/+1349 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into cb-254 | ||||
| | * | | | | | | | | | | | | | | | | | | | Fix lint errors | Alexander Tseung | 2018-02-02 | 4 | -10/+3 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Checks if there is currently a send in progress before redirecting to ↵ | Dan | 2018-02-01 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default in conf-tx | ||||
| | * | | | | | | | | | | | | | | | | | | | 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 ↵ | Alexander Tseung | 2017-12-15 | 2 | -2/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isInitialized | ||||
| | * | | | | | | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Empty vault - attempt recovery | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Version 4.5.5 | ||||
| | * | | | | | | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit Metamask QA Guide | ||||
| | * | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | | | | | | | | | | | | | | | | | | 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 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migration 25 | ||||
| | * | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | | | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure get-first-preferred-lang-code.js matches locale codes from loc… | ||||
| | * | | | | | | | | | | | | | | | | | | | | | Map existingLocaleCodes and userPreferredLocaleCodes to lower case in ↵ | Dan | 2018-04-04 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get-first-preferred-lang-code.js | ||||
| | * | | | | | | | | | | | | | | | | | | | | | Ensure get-first-preferred-lang-code.js matches locale codes from local ↵ | Dan | 2018-04-04 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directory names and chrome extension api. | ||||
| * | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | | | | | | | | | | | | | | | | | | 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 - remove unnecessary keys on txParams | ||||
| | * | | | | | | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | migrations - report migrations errors to sentry with vault structure | ||||
| | * | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | | | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | Make token helpscout link open in new tab. | ||||
| | * | | | | | | | | | | | | | | | | | | | | Bump Changelog | Kevin Serrano | 2018-04-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | Kevin Serrano | 2018-04-05 | 13 | -95/+239 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | openlinkinnewwindow | ||||
| | * | | | | | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | Fixes download file buttons | ||||
| | * | | | | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | Allow from and to address to be the same in new-ui. | ||||
| | * | | | | | | | | | | | | | | | | | | Allow from and to address to be the same in new-ui. | Dan | 2018-04-05 | 1 | -3/+0 |
| |/ / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #3880 from MetaMask/v4.5.3v4.5.3 | Thomas Huang | 2018-04-05 | 2 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | Version 4.5.3 | ||||
| | * | | | | | | | | | | | | | | | | | 4.5.3 | kumavis | 2018-04-05 | 2 | -1/+3 |
| |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | Merge pull request #3879 from MetaMask/normalize-transactions | kumavis | 2018-04-05 | 8 | -89/+220 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normalize transactions | ||||
| | * | | | | | | | | | | | | | | | | | transactions - make #_validateTxParams not async and "linting" wink wink ↵ | frankiebee | 2018-04-05 | 2 | -18/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nudge nudge | ||||
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | frankiebee | 2018-04-05 | 6 | -6/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | normalize-transactions | ||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #3878 from MetaMask/hot-fix-for-new-ui | kumavis | 2018-04-05 | 2 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hot fix for new ui | ||||
| | * | | | | | | | | | | | | | | | | | | add to CHANGELOG.md | frankiebee | 2018-04-05 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | hot-fix new-ui - default to an object if identities is undefined | frankiebee | 2018-04-05 | 1 | -1/+2 |
| |/ / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #3875 from danjm/i3837-to-field-rinkeby-kovan | Thomas Huang | 2018-04-05 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't prevent user from sending to eth address when no ENS support | ||||
| | * | | | | | | | | | | | | | | | | | | Don't prevent user from setting an eth address in to field if there is no ↵ | Dan | 2018-04-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ens support. | ||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #3869 from MetaMask/4.5.2 | kumavis | 2018-04-05 | 2 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 4.5.2 | ||||
| | * | | | | | | | | | | | | | | | | | | | 4.5.2v4.5.2 | kumavis | 2018-04-05 | 2 | -1/+3 |
| |/ / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #3868 from MetaMask/chainid-fix | kumavis | 2018-04-05 | 2 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | tx - txParams - allow chainId to be a hex string | ||||
| | * | | | | | | | | | | | | | | | | | | changelog - add note on txParams.chainId validation change | kumavis | 2018-04-05 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | tx - txParams - allow chainId to be a hex string | kumavis | 2018-04-04 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #3862 from MetaMask/webby-awards-fix | Kevin Serrano | 2018-04-04 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | Add webby awards to web3 block list. | ||||
| | * | | | | | | | | | | | | | | | | | Add webby awards to web3 block list. | Dan Finlay | 2018-04-04 | 1 | -1/+5 |
| |/ / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | add to CHANGELOG.md | frankiebee | 2018-04-05 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | hot-fix - migrate unaproved txParams so that the from is lowercase | frankiebee | 2018-04-05 | 3 | -0/+83 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | transactions - normalize txParams | frankiebee | 2018-04-05 | 4 | -80/+125 |
| |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Merge pull request #3834 from MetaMask/3734 | kumavis | 2018-04-04 | 4 | -17/+37 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Address Add Token design feedback | ||||
| | * | | | | | | | | | | | | | | | | Address feedback | David Yoo | 2018-04-04 | 2 | -8/+24 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fix tests | David Yoo | 2018-04-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Address Add Token design feedback | David Yoo | 2018-04-03 | 3 | -8/+12 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge pull request #3854 from MetaMask/v4.5.1 | Dan Finlay | 2018-04-04 | 2 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 4.5.1 | ||||
| | * | | | | | | | | | | | | | | | | | 4.5.1v.4.5.1 | kumavis | 2018-04-04 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | changelog - add note on fixed NODE_ENV side effects | kumavis | 2018-04-04 | 1 | -0/+3 |
| |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | Merge pull request #3848 from MetaMask/i#3841 | kumavis | 2018-04-04 | 1 | -2/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transactions - dont throw if chain id is not a string | ||||
| | * | | | | | | | | | | | | | | | | | tx-state-manager - validateTxParams - validate chainId is Number | kumavis | 2018-04-04 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | transactions - dont throw if chain id is not a string | frankiebee | 2018-04-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | |||||
| | | | | | | | | | | | | | | | * | | | Improve fox logo performance | Dan Finlay | 2018-04-04 | 2 | -1/+3 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By including metamask-logo@2.1.4 Fixes #3621 | ||||
| * | | | | | | | | | | | | | | | | | Merge pull request #3850 from MetaMask/ci-improvements | Thomas Huang | 2018-04-04 | 5 | -74/+144 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | Ci improvements | ||||
| | * | | | | | | | | | | | | | | | | ci - metamaskbot-announce - gracefully handle missing PR | kumavis | 2018-04-04 | 1 | -47/+58 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | ci - job-publish - publish source+sourcemaps to sentry if new release | kumavis | 2018-04-04 | 4 | -11/+63 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | ci - metamaskbot announce - js style change | kumavis | 2018-04-04 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | ci - rename job-announce to job-publish | kumavis | 2018-04-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | ci - announce - add sourcemaps to artifacts | kumavis | 2018-04-04 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | ci - load npm deps by revision to always get latest for build | kumavis | 2018-04-04 | 1 | -12/+16 |
| |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Merge pull request #3846 from MetaMask/fetch-err-warn | kumavis | 2018-04-04 | 5 | -44/+38 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | app - warn on fetch errors instead of spamming sentry | ||||
| | * | | | | | | | | | | | | | | | app - currency - fix typo + prefer log over console | kumavis | 2018-04-04 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | app - currency - fix typo | kumavis | 2018-04-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | app - warn on fetch errors instead of spamming sentry | kumavis | 2018-04-04 | 5 | -44/+37 |
| |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge pull request #3845 from MetaMask/build-fix-env | Thomas Huang | 2018-04-04 | 8 | -18/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | build - correctly set METAMASK_ENV via envify | ||||
| | * | | | | | | | | | | | | | | build - correctly set METAMASK_ENV via envify | kumavis | 2018-04-04 | 8 | -18/+15 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge pull request #3835 from MetaMask/4.5.0v4.5.0 | Thomas Huang | 2018-04-03 | 2 | -3/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 4.5.0 | ||||
| | * | | | | | | | | | | | | | | 4.5.0 | kumavis | 2018-04-03 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | changelog - add note on locales | kumavis | 2018-04-03 | 1 | -1/+2 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge pull request #3830 from MetaMask/build-perf | Thomas Huang | 2018-04-03 | 3 | -13/+87 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | build - use uglifyify and gulp-multi-process for better performance | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:MetaMask/metamask-extension into build-perf | kumavis | 2018-04-03 | 41 | -974/+4192 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | build - use uglifyify and gulp-multi-process for better performance | kumavis | 2018-03-31 | 3 | -64/+91 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge pull request #3833 from MetaMask/ci-patch | kumavis | 2018-04-03 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ci - dont log unneeded env var | ||||
| | * | | | | | | | | | | | | | | ci - dont log unneeded env var | kumavis | 2018-04-03 | 1 | -1/+0 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge pull request #3831 from MetaMask/i#3770 | Frankie | 2018-04-03 | 4 | -6/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some more transaction validation bug fixes | ||||
| | * | | | | | | | | | | | | | | tests - fix txController tests so that txMetas have a from feild | frankiebee | 2018-04-03 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | transactions gasLimit - use the block gasLimit if getCode fails | frankiebee | 2018-04-03 | 2 | -3/+6 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | transactions validationt - valdate from field on txParams | frankiebee | 2018-04-03 | 2 | -1/+32 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge pull request #3805 from MetaMask/ci-screens | kumavis | 2018-04-03 | 10 | -355/+3156 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | CI - capture screenshots | ||||
| | * | | | | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 13 | -351/+341 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge pull request #3828 from MetaMask/lint-sys-fix | kumavis | 2018-04-03 | 8 | -8/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lint system fixes | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into lint-sys-fix | kumavis | 2018-04-03 | 18 | -302/+646 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | lint - remove use of 'event' global | kumavis | 2018-04-03 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | lint - rules - disallow 'event' global | kumavis | 2018-04-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | |