aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use customized react-trigger-change in send-new-ui integration tests..Dan2018-03-192-1/+162
|
* Currency input defaults to empty stringDan2018-03-171-6/+14
|
* Merge pull request #3587 from MetaMask/i18nDan Finlay2018-03-161-0/+210
|\ | | | | More for i18n
| * More for i18nThomas2018-03-161-0/+210
|/
* Merge pull request #3576 from Senshii/masterkumavis2018-03-161-1/+1
|\ | | | | fix plural in french translation
| * fix plural in french translationsimon fourdinier2018-03-151-1/+1
| |
* | Update Deposit Eth icon (#3569)Alexander Tseung2018-03-164-460/+260
|/
* Merge pull request #3558 from MetaMask/fix-two-translationsThomas Huang2018-03-152-2/+2
|\ | | | | Fix translations whose substitutions params were not in arrays.
| * Fix translations whose substitutions params were not in arrays.Dan2018-03-142-2/+2
| |
* | Merge pull request #3562 from MetaMask/danfinlay-patch-1kumavis2018-03-151-1/+1
|\ \ | | | | | | Grammar correction
| * | Grammar correctionDan Finlay2018-03-151-1/+1
| | |
* | | Merge pull request #3545 from vincentlg/masterkumavis2018-03-151-0/+609
|\ \ \ | | | | | | | | Add French translation 🇫🇷
| * | | Update messages.jsonVincent Le Gallic2018-03-151-12/+12
| | | | | | | | | | | | thx to @Senshii
| * | | Add French translationVincent Le Gallic2018-03-141-0/+609
| | | |
* | | | Merge pull request #3565 from MetaMask/local-store-fixDan Finlay2018-03-154-9/+31
|\ \ \ \ | |_|/ / |/| | | Fix local store promisification
| * | | local-store - fix class syntaxkumavis2018-03-151-2/+2
| | | |
| * | | local-store - check for error from extension.runtimekumavis2018-03-151-3/+28
| | | |
| * | | deps - use pify instead of util.promisifykumavis2018-03-153-5/+3
| | | |
| * | | local-store - fix promisification of methodskumavis2018-03-151-3/+2
|/ / /
* | | Merge pull request #3559 from MetaMask/fix-promisify-refDan Finlay2018-03-141-1/+1
|\ \ \ | |_|/ |/| | fix destructuring of variables
| * | fix destructuring of variablesfrankiebee2018-03-141-1/+1
|/ /
* | Merge pull request #3083 from MetaMask/i3076-UseStorageLocalInsteadkumavis2018-03-146-4/+75
|\ \ | | | | | | Use storage.local instead of localStorage
| * \ Merge branch 'master' into i3076-UseStorageLocalInsteadkumavis2018-03-144-2/+32
| |\ \ | |/ / |/| |
* | | Merge pull request #3551 from MetaMask/i#3509kumavis2018-03-142-2/+7
|\ \ \ | | | | | | | | fix for where null is not supported in txParams
| * | | tx-gas-utils - fix code stylekumavis2018-03-141-1/+1
| | | |
| * | | Merge branch 'i#3509' of https://github.com/MetaMask/metamask-extension into ↵frankiebee2018-03-141-1/+2
| |\ \ \ | | | | | | | | | | | | | | | i#3509
| | * | | changelog - update "txParams.to" validation notekumavis2018-03-141-1/+2
| | | | |
| * | | | transactions move validation of the to field to validateRecipientfrankiebee2018-03-141-7/+3
| |/ / /
| * | | Merge remote-tracking branch 'origin/i#3509' into i#3509frankiebee2018-03-14117-1446/+27032
| |\ \ \
| | * \ \ Merge branch 'master' into i#3509Frankie2018-03-14117-1446/+27032
| | |\ \ \
| * | | | | fix error messagefrankiebee2018-03-141-1/+1
| |/ / / /
| * | | | add to CHANGELOG.mdfrankiebee2018-03-141-0/+1
| | | | |
| * | | | transactions - insure if a to field in tx params has a truthy valu that it ↵frankiebee2018-03-141-1/+7
| | | | | | | | | | | | | | | | | | | | is a valid addres and if it is falsy that it is not null to fix issue #3509
* | | | | Merge pull request #3552 from MetaMask/danfinlay-patch-1Thomas Huang2018-03-141-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Fix grammar
| * | | | Fix grammarDan Finlay2018-03-141-1/+1
|/ / / /
* | | | Merge pull request #3546 from MetaMask/TheCriw-patch-1Thomas Huang2018-03-142-0/+26
|\ \ \ \ | |_|_|/ |/| | | improved verification of restore from seed phrase
| * | | ui - lint fixkumavis2018-03-142-2/+2
| | | |
| * | | Merge pull request #3445 from TheCriw/i3440-seed-restore-trim-invalid-characterskumavis2018-03-142-0/+26
|/| | | | | | | | | | | improved verification of restore from seed phrase
| * | | FIX #3440 improved verification of restore from seed phrasecriw2018-03-062-0/+26
| | | |
| | | * Update CHANGELOG.mdkumavis2018-03-141-2/+3
| | | |
| | | * Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵kumavis2018-03-1496-1055/+36969
| | | |\ | |_|_|/ |/| | | | | | | i3076-UseStorageLocalInstead
* | | | Merge pull request #3538 from MetaMask/lazaridiscom-patch-1Dan Finlay2018-03-142-3/+14
|\ \ \ \ | | | | | | | | | | cross platform - use 'cross-env' for env-variables within npm scripts
| * | | | deps - update package-lockkumavis2018-03-141-0/+10
| | | | |
| * | | | use 'cross-env' for env-variables within npm scripts, re #3426Lazaridis2018-03-141-3/+4
|/ / / /
* | | | Merge pull request #3456 from MetaMask/i18nkumavis2018-03-1463-352/+1038
|\ \ \ \ | | | | | | | | | | Add i18n
| * | | | Update ChangelogThomas2018-03-141-1/+1
| | | | |
| * | | | Merge branch 'master' into i18nThomas Huang2018-03-141-0/+5
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #3527 from danjm/changelog-updates-march13kumavis2018-03-141-0/+5
|\ \ \ \ \ | | | | | | | | | | | | Changlog updates for PRs 3468, 3470 and 3495.
| * | | | | Changlog updates for PRs 3468, 3470 and 3495.Dan2018-03-141-0/+5
| | | | | |
| | * | | | Update ChangelogThomas2018-03-141-0/+1
| | | | | |
| | * | | | Remove windows.h from i18n.jsThomas2018-03-141-1/+0
| | | | | |
| | * | | | Add closing parens to appNameThomas2018-03-141-1/+1
| | | | | |
| | * | | | Merge branch 'master' into i18nThomas Huang2018-03-1426-455/+646
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge pull request #3468 from danjm/i3033-responsive-newui-onboardingkumavis2018-03-149-13/+232
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Make new-ui create password screen responsive.
| * | | | | Merge branch 'master' into i3033-responsive-newui-onboardingkumavis2018-03-1448-934/+24189
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #3470 from danjm/newui-onboarding-fontskumavis2018-03-142-24/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | Change fonts in new-ui onboarding to Roboto, with weight 400.
| * | | | | | Update first time flow button fonts, and first-time-flow default font, to ↵Dan2018-03-082-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Roboto.
| * | | | | | Change fonts in new-ui onboarding to Roboto, with weight 400.Dan2018-03-081-23/+31
| | | | | | |
* | | | | | | Merge pull request #3495 from alextsg/cb-290kumavis2018-03-145-99/+93
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Increase tap areas for menu buttons on mobile
| * | | | | | | Increase tap areas for menu buttons on mobileAlexander Tseung2018-03-105-99/+93
| | | | | | | |
* | | | | | | | Merge pull request #3525 from anticlimactic/move-dev-fileskumavis2018-03-143-19/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Moved mock-dev.js and ui-dev.js to development folder.
| * | | | | | | | Moved mock-dev.js and ui-dev.js to development folder.Vincent2018-03-133-19/+19
| | | | | | | | |
* | | | | | | | | Merge pull request #3518 from MetaMask/ci-moar-fastThomas Huang2018-03-1410-300/+268
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | CI - make CI moar fast
| * | | | | | | | test - mascara - fix async wrapkumavis2018-03-121-1/+1
| | | | | | | | |
| * | | | | | | | test - use new async selectors for faster testingkumavis2018-03-122-89/+49
| | | | | | | | |
| * | | | | | | | genStates - fix fs api callskumavis2018-03-121-2/+2
| | | | | | | | |
| * | | | | | | | test - add comment about test behavior odditykumavis2018-03-122-4/+2
| | | | | | | | |
| * | | | | | | | test - poll for element instead of manual timeoutskumavis2018-03-124-189/+144
| | | | | | | | |
| * | | | | | | | test - genStates - use async apikumavis2018-03-121-14/+17
| | | | | | | | |
| * | | | | | | | ci - wrap env var in quoteskumavis2018-03-111-4/+4
| | | | | | | | |
| * | | | | | | | ci - split integration tests into parallel firefox and chrome runskumavis2018-03-112-5/+57
| | | | | | | | |
| | | | * | | | | Left align create password.Dan2018-03-133-10/+22
| | | | | | | | |
| | | | * | | | | Styling fixes to welcome; hide network component on create password; shown ↵Dan2018-03-134-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | welcoem in popup.
| | | | * | | | | Add welcome screen to new-ui browser first time flow.Dan2018-03-098-12/+165
| | | | | | | | |
| | | | * | | | | Make new-ui create password screen responsive.Dan2018-03-083-25/+57
| | | |/ / / / /
| | | | * | | | Add missing opening parens to pag-container__subtitleThomas2018-03-141-1/+1
| | | | | | | |
| | | | * | | | Merge branch 'master' into i18nThomas Huang2018-03-145-83/+122
| | | | |\ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Update deposit ether styling (#3510)Alexander Tseung2018-03-135-82/+125
|/ / / / / / /
| | | * | | | Add sigRequest for Signature RequestThomas2018-03-131-0/+3
| | | | | | |
| | | * | | | Add loglevel and window.log to i18n.jsThomas2018-03-131-0/+2
| | | | | | |
| | | * | | | Add i18n back into JsonImportSubviewThomas2018-03-121-7/+7
| | | | | | |
| | | * | | | Merge branch 'master' into i18nThomas Huang2018-03-1228-415/+23632
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #3501 from MetaMask/circleci-2.0kumavis2018-03-103-18/+154
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | ci - introduce circle ci 2.0
| * | | | | | | ci - adjust scss cache keykumavis2018-03-101-3/+3
| | | | | | | |
| * | | | | | | ci - cache firefox against Revisionkumavis2018-03-101-3/+3
| | | | | | | |
| * | | | | | | ci - cache firefox install under build numberkumavis2018-03-101-3/+3
| | | | | | | |
| * | | | | | | ci - split download and install firefox stepskumavis2018-03-101-14/+32
| | | | | | | |
| * | | | | | | ci - install firefox58 and cachekumavis2018-03-101-1/+17
| | | | | | | |
| * | | | | | | ci - prep-deps - install latest firefoxkumavis2018-03-101-2/+4
| | | | | | | |
| * | | | | | | ci - optimize - dont update npmkumavis2018-03-101-4/+1
| | | | | | | |
| * | | | | | | ci - integration tests need to generate scss cache keykumavis2018-03-101-1/+9
| | | | | | | |
| * | | | | | | ci - fix typokumavis2018-03-101-1/+2
| | | | | | | |
| * | | | | | | test - breakout npm script for building for integration testskumavis2018-03-102-3/+4
| | | | | | | |
| * | | | | | | ci - fix config formattingkumavis2018-03-101-2/+2
| | | | | | | |
| * | | | | | | ci - add prep-scss to flowkumavis2018-03-101-0/+3
| | | | | | | |
| * | | | | | | ci - parallize flat + mascara integration testskumavis2018-03-101-8/+49
| | | | | | | |
| * | | | | | | ci - breakup npm test into parallel processeskumavis2018-03-101-6/+33
| | | | | | | |
| * | | | | | | ci - restore node_modules before testkumavis2018-03-101-2/+4
| | | | | | | |
| * | | | | | | ci - test on all brancheskumavis2018-03-101-17/+0
| | | | | | | |
| * | | | | | | ci - update circle configkumavis2018-03-101-13/+15
| | | | | | | |
| * | | | | | | ci - introduce circle ci 2.0kumavis2018-03-102-17/+52
| | | | | | | |
* | | | | | | | Merge pull request #3500 from MetaMask/greenkeeper-chillThomas Huang2018-03-103-880/+608
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | deps - update deps to appease greenkeeper
| * | | | | | | | deps - update package-lockkumavis2018-03-101-1037/+1998
| | | | | | | | |
| * | | | | | | | chore(package): update gulp-stylelint to version 7.0.0greenkeeper[bot]2018-03-101-1/+1
| | | | | | | | |
| * | | | | | | | chore(package): update stylelint-config-standard to version 18.2.0greenkeeper[bot]2018-03-101-1/+1
| | | | | | | | |
| * | | | | | | | fix(package): update gulp-autoprefixer to version 5.0.0greenkeeper[bot]2018-03-101-1/+1
| | | | | | | | |
| * | | | | | | | deps - remove unused missippi depkumavis2018-03-102-2/+0
| | | | | | | | |
| * | | | | | | | chore(package): update browserify to version 16.1.1greenkeeper[bot]2018-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #2861
| * | | | | | | | deps - bump pumpkumavis2018-03-102-1440/+209
| |/ / / / / / /
* | | | | | | | Merge pull request #3497 from MetaMask/testingkumavis2018-03-101-4/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Persist rinkeby.infura.io and clean nock after
| * | | | | | | Persist rinkeby.infura.io and clean nock afterThomas2018-03-101-4/+6
| | | | | | | |
* | | | | | | | Merge pull request #3496 from MetaMask/nsp-fixkumavis2018-03-101-0/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | node security - ignore known hoek advisory
| * | | | | | | node security - ignore known hoek advisorykumavis2018-03-101-0/+3
|/ / / / / / /
* | | | | | | Remove de-selected token from selectedTokens hash instead of setting to null ↵Alexander Tseung2018-03-091-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (#3494)
* | | | | | | Add empty object default value for tokenData (#3493)Alexander Tseung2018-03-091-2/+2
| | | | | | |
* | | | | | | Explicitly define state in import account from json component (#3491)Alexander Tseung2018-03-094-246/+839
| | | | | | |
* | | | | | | Merge pull request #3485 from MetaMask/package-lockDan Finlay2018-03-092-2/+22512
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | meta - add package-lock to git
| * | | | | | | meta - add package-lock to gitkumavis2018-03-092-2/+22512
|/ / / / / / /
| | | * | | | Document process of adding a new translationDan Finlay2018-03-102-0/+19
| | | | | | |
| | | * | | | Correct caps of Send button on main screen.Dan2018-03-081-1/+1
| | | | | | |
| | | * | | | Merge branch 'master' into i18nDan Finlay2018-03-0717-166/+1542
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Correct merge conflict resolution errors.Dan2018-03-072-9/+0
| | | | | | |
| | | * | | | Missing comma in messages.jsonDan2018-03-071-1/+1
| | | | | | |
| | | * | | | Merge branch 'master' into i18nDan2018-03-07146-646/+6356
| | | |\ \ \ \
| | | * | | | | Implemented feedback to make i18n work on macDan Finlay2018-03-073-8/+11
| | | | | | | |
| | | * | | | | complete i18n across new UINick Doiron2018-01-3034-165/+220
| | | | | | | |
| | | * | | | | CI still has MetaMask title doubledNick Doiron2018-01-291-1/+1
| | | | | | | |
| | | * | | | | pass linter, update ui testNick Doiron2018-01-282-9/+11
| | | | | | | |
| | | * | | | | get t imported in all files currently using i18nNick Doiron2018-01-2530-1/+30
| | | | | | | |
| | | * | | | | separate out cross-browser i18n for extensionsNick Doiron2018-01-2524-7/+41
| | | | | | | |
| | | * | | | | better organization of locale file; i18n in more view filesNick Doiron2018-01-2426-260/+629
| | | | | | | |
| | | * | | | | first steps to i18nNick Doiron2018-01-2332-154/+314
| | | | | | | |
| | | | | | | * lint fixkumavis2018-03-091-1/+1
| | | | | | | |
| | | | | | | * Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵kumavis2018-03-098-68/+331
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | i3076-UseStorageLocalInstead
* | | | | | | | Fix flashing to Log in screen after logging in or restoring from seed phrase ↵Alexander Tseung2018-03-086-115/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#3466)
* | | | | | | | Merge pull request #3409 from scsaba/seed-phrase-verificationDan Finlay2018-03-084-9/+232
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Add seed phrase verification script into background process
| * | | | | | | modify verifySeedPhrase to async and call it from addNewAccount alsoCsaba Solya2018-03-061-32/+34
| | | | | | | |
| * | | | | | | move more test code to beforeEachCsaba Solya2018-03-041-23/+8
| | | | | | | |
| * | | | | | | add documentationCsaba Solya2018-03-042-0/+9
| | | | | | | |
| * | | | | | | verify seedwords on log inCsaba Solya2018-03-043-43/+31
| | | | | | | |
| * | | | | | | verify addresses regardless caseCsaba Solya2018-03-032-1/+45
| | | | | | | |
| * | | | | | | fix lint issuesCsaba Solya2018-03-032-11/+11
| | | | | | | |
| * | | | | | | seed phrase verifierCsaba Solya2018-03-033-2/+197
| | | | | | | |
| | | | | | | * gitignore - add yarn.lockkumavis2018-03-092-12554/+2
| | | | | | | |
| | | | | | | * background - storage - cleanup storage wiringkumavis2018-03-092-34/+30
| | | | | | | |
| | | | | | | * Tighten up data loading codeDan Finlay2018-03-081-4/+8
| | | | | | | |
| | | | | | | * Add clarifying commentDan Finlay2018-03-081-0/+1
| | | | | | | |
| | | | | | | * Some fixes for new storage strategyDan Finlay2018-03-081-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't persist undefined data - Write to new storage strategy without waiting for completion. - Continue writing to localStorage as fallback.
| | | | | | | * Update yarn.lockDan Finlay2018-03-081-143/+668
| | | | | | | |
| | | | | | | * Increase storage debounce to 2sDan Finlay2018-03-081-1/+1
| | | | | | | |
| | | | | | | * Merge branch 'master' into i3076-UseStorageLocalInsteadDan Finlay2018-03-0829-186/+1596
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Update network colours for better accessibility. (#3469)Dan J Miller2018-03-082-4/+8
| | | | | | | |
* | | | | | | | Merge pull request #2791 from MetaMask/greenkeeper/karma-2.0.0Thomas Huang2018-03-081-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update karma to the latest version 🚀
| * | | | | | | | chore(package): update karma to version 2.0.0greenkeeper[bot]2017-12-221-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #3460 from trigun0x2/masterThomas Huang2018-03-084-7/+7
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | fix typo in transaction.js
| * | | | | | | | fix typo in tests and tx-state-managerJeffrey Tong2018-03-083-5/+5
| | | | | | | | |
| * | | | | | | | fix typo in transaction.jsJeffrey Tong2018-03-071-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #3458 from MetaMask/version-4.2.0v4.2.0Thomas Huang2018-03-072-9/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Version 4.2.0
| * | | | | | | | Version 4.2.0kumavis2018-03-072-9/+7
|/ / / / / / / /
* | | | | | | | Merge pull request #3335 from MetaMask/ImportAccountMessageV2kumavis2018-03-078-25/+59
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Import account disclaimer and change loose label to imported.
| * \ \ \ \ \ \ \ Merge branch 'master' into ImportAccountMessageV2kumavis2018-03-0712-23/+56
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into ImportAccountMessageV2Dan Finlay2018-03-0710-100/+324
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into ImportAccountMessageV2Thomas Huang2018-03-0349-144/+3297
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Import Account disclaimerThomas2018-03-032-9/+12
| | | | | | | | | | | |
| * | | | | | | | | | | Swap color scheme for import account labelThomas2018-03-031-2/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Add changes to CHANGELOGThomas2018-02-281-0/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Remove committed out merge codeThomas2018-02-281-16/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Change Loose label to ImportedThomas2018-02-282-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Add import account disclaimerThomas2018-02-283-5/+45
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3259 from MetaMask/controllerStubskumavis2018-03-075-127/+1471
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | Offline testing
| * | | | | | | | | | | Using noop to not lose itThomas2018-02-281-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Revert initializing first-time-stateThomas2018-02-282-17/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Network controller nockThomas Huang2018-02-161-24/+16
| | | | | | | | | | | |
| * | | | | | | | | | | Offline testingThomas Huang2018-02-166-104/+1470
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3455 from MetaMask/i2475-UnifyLogInWordingkumavis2018-03-073-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Replace Lock wording with Log Out / Log In
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into i2475-UnifyLogInWordingDan Finlay2018-03-0711-98/+320
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Replace Lock wording with Log Out / Log InDan Finlay2018-03-073-3/+5
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2475
* | | | | | | | | | | | Merge pull request #3411 from MetaMask/AutoVersionBumpkumavis2018-03-071-7/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | Clean up run version bump script
| * | | | | | | | | | | Clean up run version bump scriptDan Finlay2018-03-031-7/+6
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3433 from danjm/i3087-shapeshift-split-undefinedDan Finlay2018-03-076-5/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Shapeshift form handles 'market info unavailable' errors.
| * | | | | | | | | | | | Shapeshift form handles market info unavailable errors.Dan2018-03-076-5/+30
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3446 from danjm/NewUI-handle-token-balance-on-editDan Finlay2018-03-071-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gracefully handle null token balance in new ui send.
| * | | | | | | | | | | | | Gracefully handle null token balance in new ui send.Dan2018-03-061-3/+7
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3444 from danjm/i3348-minus-not-a-numberDan Finlay2018-03-071-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | Prevent user from selecting max amount until gas is estimated.
| * | | | | | | | | | | | Prevent user from selecting max amount until there is an estimated gas total.Dan2018-03-061-2/+3
| |/ / / / / / / / / / /
| | | | | | | | | | | * Merge branch 'master' into i3076-UseStorageLocalInsteadDan Finlay2018-03-07415-3993/+45808
| | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Ensure this reference is defined in old-ui info.js (#3450)Dan J Miller2018-03-071-3/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Default add-token decimal value to string (#3451)Dan J Miller2018-03-071-1/+1
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #3309 from scsaba/edge-supportDan Finlay2018-03-074-2/+182
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Add Edge Support
| * | | | | | | | | | add browserify-unibabel to package.jsonCsaba Solya2018-03-061-2/+3
| | | | | | | | | | |
| * | | | | | | | | | fix testCsaba Solya2018-02-231-1/+2
| | | | | | | | | | |
| * | | | | | | | | | add negative decrypt testCsaba Solya2018-02-231-0/+20
| | | | | | | | | | |
| * | | | | | | | | | fix testsCsaba Solya2018-02-231-6/+20
| | | | | | | | | | |
| * | | | | | | | | | make keyFromPassword privateCsaba Solya2018-02-231-3/+3
| | | | | | | | | | |
| * | | | | | | | | | adding testsCsaba Solya2018-02-231-0/+66
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into edge-supportCsaba S2018-02-22382-3802/+42016
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add edge supportCsaba Solya2018-02-223-0/+78
| | | | | | | | | | | |
* | | | | | | | | | | | Fix seed phrase validation clearing form (#3417)Alexander Tseung2018-03-074-92/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix seed phrase validation clearing form * Make new ui import seed error feedback live, and allow newlines with and without carriage returns.
* | | | | | | | | | | | Add missed changelog updates. (#3407)Dan J Miller2018-03-061-0/+5
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Fixes shapeshift coin selection dropdown. (#3416)Dan J Miller2018-03-062-6/+7
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Fix NewUI reveal seed flow. (#3410)Dan J Miller2018-03-034-8/+22
| | | | | | | | | |
* | | | | | | | | | Allow adding 0 balance tokens in old ui and editing custom token info in new ↵Dan J Miller2018-03-033-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#3395) * Shows tokens with 0 balance in old ui; goHome after adding tokens. * Allow users to edit custom token info when not autofilled. (New UI add token screen).
* | | | | | | | | | Merge pull request #3398 from MetaMask/AutoVersionBumpkumavis2018-03-038-3/+1163
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | Add version bumping script
| * | | | | | | | | Remove logsDan Finlay2018-03-033-9/+0
| | | | | | | | | |
| * | | | | | | | | Add version bumping scriptDan Finlay2018-03-038-3/+1172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One step towards automating our deploy process is automating our version bumping scheme. This PR does that.
* | | | | | | | | | Merge pull request #3396 from MetaMask/Version-4.1.3kumavis2018-03-032-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 4.1.3
| * | | | | | | | | Version 4.1.3v4.1.3Dan Finlay2018-03-032-1/+3
|/ / / / / / / / /
* | | | | | | | | Add retry transaction back into old ui transaction list item (#3381)Thomas Huang2018-03-032-35/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add retry transaction back into old ui transaction list item * Update Changelog
* | | | | | | | | Merge pull request #3394 from MetaMask/i3372-PreserveInpageProviderNameThomas Huang2018-03-034-5/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | Fix inpage provider name regression
| * | | | | | | | Fix inpage provider name regressionDan Finlay2018-03-034-5/+9
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3372 by not minifying the name of our inpage provider, which some people were using to identify MetaMask (not our preferred, supported method of web3.currentProvider.isMetaMask).
* | | | | | | | Fix network menu for custom URLs (#3366)Alexander Tseung2018-03-023-46/+190
| | | | | | | |
* | | | | | | | Fix exception thrown when styleOverride is not present (#3364)Alexander Tseung2018-03-021-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #3356 from MetaMask/cdn-minimizationKevin Serrano2018-03-0210-6/+1657
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Check in all font files locally.
| * | | | | | | | Correct ttf format name to 'truetype'Dan2018-03-023-126/+126
| | | | | | | | |
| * | | | | | | | Check in all font files locally.Kevin Serrano2018-03-0110-6/+1657
| | | | | | | | |
* | | | | | | | | Merge pull request #3363 from MetaMask/4.1.2v4.1.2Thomas Huang2018-03-012-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | 4.1.2
| * | | | | | | | | 4.1.2kumavis2018-03-012-1/+5
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3361 from MetaMask/4.1.1v4.1.1Thomas Huang2018-03-012-1/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Version 4.1.1
| * | | | | | | | | v4.1.1kumavis2018-03-012-1/+7
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3359 from MetaMask/token-check-urlkumavis2018-03-012-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [new-ui] add token - check for logo url before trying to use
| * | | | | | | | | changelog - add entry about 'Add Token' screen fixkumavis2018-03-011-0/+2
| | | | | | | | | |
| * | | | | | | | | add token - check for logo url before trying to usekumavis2018-03-011-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3332 from danjm/MM-onboarding-flow-style-improvementskumavis2018-03-015-3/+54
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [NewUI] Onboarding flow style improvements
| * | | | | | | | | | Padding of alpha warning aligns with app-barDan2018-02-281-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Adds beta label to Metamask name in full screen app bar.Dan2018-02-282-0/+17
| | | | | | | | | | |
| * | | | | | | | | | Move beta warning to app header.Dan2018-02-282-1/+6
| | | | | | | | | | |
| * | | | | | | | | | NewUI first time flow warning message change.Dan2018-02-281-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Body width container in first time flow is consistent with app bar.Dan2018-02-282-1/+30
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #3339 from danjm/i3336-cancel-button-buy-ethkumavis2018-03-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [Old-UI] Fix cancel button on buy eth screen.
| * | | | | | | | | | | Fix cancel button on buy eth screen.Dan2018-02-281-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #3340 from danjm/i3338-contract-published-terminologykumavis2018-03-013-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [NewUI] Replace 'Contract Published' label with 'Contract Deployment'
| * | | | | | | | | | | Replace 'Contract Published' with 'Contract Deployment' for clearer ↵Dan2018-02-283-3/+3
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | indication of contract tx state.
* | | | | | | | | | | Merge pull request #3353 from MetaMask/sentry-fail-tx-1kumavis2018-03-014-8/+44
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Sentry - improve ethjs-rpc error formating for failed txs
| * | | | | | | | | | | sentry - extractErrorMessage - fix comment formattingkumavis2018-03-011-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | sentry - failed tx - improve ethjs-rpc error formatingkumavis2018-03-012-5/+41
| | | | | | | | | | | |
| * | | | | | | | | | | sentry - clean - move setupRaven to libkumavis2018-03-013-3/+3
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #3350 from danjm/onclick-undefined-sentry-errorkumavis2018-03-011-9/+11
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | [old-ui] Prevent user from switching network in old-ui notification
| * | | | | | | | | | Prevent user from switching network in old-ui notificationDan2018-03-011-9/+11
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #3346 from danjm/i3228-event-not-definedkumavis2018-03-013-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | [old-ui] Define event locally in onClickOutside method in account-dropdowns.js
| * | | | | | | | | Define event locally in onClickOutside method in account-dropdowns.jsDan2018-03-013-3/+3
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3333 from MetaMask/mascara-deployFrankie2018-02-281-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | mascara deploy - improve deploy instructions
| * \ \ \ \ \ \ \ \ Merge branch 'master' into mascara-deploykumavis2018-02-28580-12071/+67151
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | mascara deploy - improve deploy instructionskumavis2017-04-072-1/+10
| | | | | | | | | |
* | | | | | | | | | Merge pull request #2363 from MetaMask/greenkeeper/metamascara-2.0.0Frankie2018-02-281-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Update metamascara to the latest version 🚀
| * | | | | | | | | fix(package): update metamascara to version 2.0.0greenkeeper[bot]2017-10-141-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3323 from MetaMask/version-4.0.0v4.1.0Frankie2018-02-282-1/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Version 4.1.0
| * | | | | | | | | | changelog - improve changelog noteskumavis2018-02-281-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Bump VersionThomas2018-02-282-1/+7
| | | | | | | | | | |
| * | | | | | | | | | Version 4.0.0Thomas2018-02-232-1/+5
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3275 from MetaMask/licenseDan Finlay2018-02-281-27/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Standardize license
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 19:45:32 +0800