aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'retry-tx-refractor' of https://github.com/MetaMask/metamask-ext...frankiebee2018-03-163-22/+49
|\
| * Set retry gasPrice to forceGasMin on confirm screen in cases where gas is not...Dan2018-03-152-4/+34
| * Force gas min has correct precision and is set when editing gas if max.Dan2018-03-153-7/+8
| * Ensure changes from customize gas modal opened from confirm screen are captur...Dan2018-03-152-12/+8
| * Revert 'Set txMeta.time to reflect time of tx approval.'Dan2018-03-151-3/+3
| * Merge branch 'master' into retry-tx-refractorDan2018-03-155-9/+640
| |\
| * \ Merge branch 'master' into retry-tx-refractorDan2018-03-141-1/+1
| |\ \
* | | | add to CHANGELOG.mdfrankiebee2018-03-161-0/+1
* | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-164-460/+260
|\ \ \ \
| * | | | Update Deposit Eth icon (#3569)Alexander Tseung2018-03-164-460/+260
* | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-158-12/+643
|\| | | |
| * | | | Merge pull request #3558 from MetaMask/fix-two-translationsThomas Huang2018-03-152-2/+2
| |\ \ \ \
| | * | | | 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 correctionDan Finlay2018-03-151-1/+1
| | | |_|/ | | |/| |
| * | | | Merge pull request #3545 from vincentlg/masterkumavis2018-03-151-0/+609
| |\ \ \ \
| | * | | | Update messages.jsonVincent Le Gallic2018-03-151-12/+12
| | * | | | Add French translationVincent Le Gallic2018-03-141-0/+609
| * | | | | Merge pull request #3565 from MetaMask/local-store-fixDan Finlay2018-03-154-9/+31
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | 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
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-150-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | fix destructuring of variablesfrankiebee2018-03-141-1/+1
| |/ / /
* | | / fix destructuring of variablesfrankiebee2018-03-141-1/+1
| |_|/ |/| |
* | | Fix tests.Dan2018-03-143-6/+6
* | | Fix TransactionStateManager spelling.Dan2018-03-141-2/+2
* | | Merge branch 'master' into retry-tx-refractorDan2018-03-14101-2026/+3530
|\| |
| * | Merge pull request #3083 from MetaMask/i3076-UseStorageLocalInsteadkumavis2018-03-146-4/+75
| |\ \
| | * \ Merge branch 'master' into i3076-UseStorageLocalInsteadkumavis2018-03-144-2/+32
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #3551 from MetaMask/i#3509kumavis2018-03-142-2/+7
| |\ \ \
| | * | | 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
| | |\ \ \
| | | * | | 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 is...frankiebee2018-03-141-1/+7
| * | | | | Merge pull request #3552 from MetaMask/danfinlay-patch-1Thomas Huang2018-03-141-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix grammarDan Finlay2018-03-141-1/+1
| |/ / / /
| * | | | Merge pull request #3546 from MetaMask/TheCriw-patch-1Thomas Huang2018-03-142-0/+26
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | ui - lint fixkumavis2018-03-142-2/+2
| | * | | Merge pull request #3445 from TheCriw/i3440-seed-restore-trim-invalid-characterskumavis2018-03-142-0/+26
| |/| | |
| | * | | 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 i3076-Us...kumavis2018-03-1496-1055/+36969
| | | | |\ | | |_|_|/ | |/| | |
| * | | | Merge pull request #3538 from MetaMask/lazaridiscom-patch-1Dan Finlay2018-03-142-3/+14
| |\ \ \ \
| | * | | | 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
| |\ \ \ \
| | * | | | 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.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
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | 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
| |\ \ \ \ \ \
| | * | | | | | Update first time flow button fonts, and first-time-flow default font, to Rob...Dan2018-03-082-1/+3
| | * | | | | | 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 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.Vincent2018-03-133-19/+19
| * | | | | | | | | Merge pull request #3518 from MetaMask/ci-moar-fastThomas Huang2018-03-1410-300/+268
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | 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 we...Dan2018-03-134-9/+8
| | | | | * | | | | 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 - 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 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
| | * | | | | | | | 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 afterThomas2018-03-101-4/+6
| * | | | | | | | Merge pull request #3496 from MetaMask/nsp-fixkumavis2018-03-101-0/+3
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | 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
| * | | | | | | 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
| | | | * | | | 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 i3076-Us...kumavis2018-03-098-68/+331
| | | | | | | | |\
| | | | | | | | * | 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
| | | | | | | | * | 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
| | | | | | | | |\ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | | | | | | | * | Merge branch 'master' into i3076-UseStorageLocalInsteadDan Finlay2018-03-07415-3993/+45808
| | | | | | | | |\ \ | | | | | | | | |/ / | | | | | | | |/| |
| | | | | | | | * | Increase storage debounce valueDan Finlay2018-01-261-1/+1
| | | | | | | | * | Debounce storage to avoid crashing pumpDan Finlay2018-01-262-8/+9
| | | | | | | | * | Remove local storage writes, add logDan Finlay2018-01-251-5/+16
| | | | | | | | * | Fix retrieval of objectDan Finlay2018-01-251-2/+1
| | | | | | | | * | Remove redundant async modifiersDan Finlay2018-01-251-2/+2
| | | | | | | | * | Remove already handled TODO comment.Dan2018-01-251-1/+0
| | | | | | | | * | Remove extension-store since we aren't using it yetDan Finlay2018-01-252-106/+0
| | | | | | | | * | Corrected unlimitedStorage permissionDan Finlay2018-01-251-1/+1
| | | | | | | | * | Bump changelogDan Finlay2018-01-251-0/+2
| | | | | | | | * | Merge pull request #3079 from MetaMask/i3076-UseStorageLocalInstead-danjm-1Dan Finlay2018-01-253-11/+59
| | | | | | | | |\ \
| | | | | | | | | * | Finish tests for extension-store fetch and sync.Dan2018-01-241-6/+44
| | | | | | | | | * | Check that extension.storage exists before attempting to call methods on it.Dan2018-01-241-3/+3
| | | | | | | | | * | Handle errors when getting and setting to localStore.Dan2018-01-241-2/+12
| | | | | | | | |/ /
| | | | | | | | * | Merge branch 'UseStorageLocal' into i3076-UseStorageLocalInsteadDan Finlay2018-01-244-0/+111
| | | | | | | | |\ \
| | | | | | | | | * | Modify @heyellieday's work to use storage.local to replace main storageDan Finlay2018-01-242-7/+33
| | | | | | | | | * | conditionally use extension store if supported or enabledEllie Day2018-01-032-3/+13
| | | | | | | | | * | handle situation where storage.sync is disabled in certain versions of firefoxEllie Day2018-01-032-5/+19
| | | | | | | | | * | Add ExtensionStore and add basic store instance syncing to main controllerEllie Day2017-12-233-0/+61
| | | | | | | | * | | Add unlimitedStorage option to manifestDan Finlay2018-01-241-0/+1
* | | | | | | | | | | Fix more lint errors.Dan2018-03-143-11/+2
* | | | | | | | | | | Remove unnecessary addition of nonce to state.Dan2018-03-143-10/+0
* | | | | | | | | | | Make token confirmations compatible.Dan2018-03-142-14/+88
* | | | | | | | | | | Fix tx-list-item submitted check.Dan2018-03-141-1/+1
* | | | | | | | | | | Adds styles for dropped txs in old-ui.Dan2018-03-142-0/+9
* | | | | | | | | | | Correctly set latest submitted retry with nonces that matches others in old-u...Dan2018-03-141-1/+1
* | | | | | | | | | | Use correct name for submittedTime field in tx-list.jsDan2018-03-141-1/+1
* | | | | | | | | | | Use correct var name in new-ui showRetryButtonDan2018-03-141-1/+1
* | | | | | | | | | | Undefined check in showRetryButtonDan2018-03-142-6/+8
* | | | | | | | | | | Styling for dropped.Dan2018-03-142-0/+5
* | | | | | | | | | | Use new submittedTime field to correctly show retry button in old and new ui.Dan2018-03-145-13/+19
* | | | | | | | | | | transactions - return the txMeta in retryTransactionfrankiebee2018-03-141-2/+3
* | | | | | | | | | | tests - add tests for transactions#retryTransaction and transactions#_markNon...frankiebee2018-03-141-1/+44
* | | | | | | | | | | transactions:state - add a submittedTime stamp so the ui has a better grasp o...frankiebee2018-03-141-0/+4
* | | | | | | | | | | Set txMeta.time to reflect time of tx approval.Dan2018-03-131-3/+3
* | | | | | | | | | | Improve phrasing of copy.Dan2018-03-132-2/+2
* | | | | | | | | | | Fix gas calculation and nonce / forceGasMin state setting errors; retry butto...Dan2018-03-133-25/+39
* | | | | | | | | | | Lint fixes.Dan2018-03-092-3/+1
* | | | | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-0938-306/+24463
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #3485 from MetaMask/package-lockDan Finlay2018-03-092-2/+22512
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | meta - add package-lock to gitkumavis2018-03-092-2/+22512
| |/ / / / / / / / /
| * | | | | | | | | Fix flashing to Log in screen after logging in or restoring from seed phrase ...Alexander Tseung2018-03-086-115/+129
| * | | | | | | | | Merge pull request #3409 from scsaba/seed-phrase-verificationDan Finlay2018-03-084-9/+232
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | 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
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | 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 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.0kumavis2018-03-072-9/+7
| |/ / / / / / / /
| * | | | | | | | Merge pull request #3335 from MetaMask/ImportAccountMessageV2kumavis2018-03-078-25/+59
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into i2475-UnifyLogInWordingDan Finlay2018-03-0711-98/+320
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Replace Lock wording with Log Out / Log InDan Finlay2018-03-073-3/+5
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3411 from MetaMask/AutoVersionBumpkumavis2018-03-071-7/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| | * | | | | | | | | | | 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.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.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 there is an estimated gas total.Dan2018-03-061-2/+3
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Adds inline opening of gas customization to confirm-send-ether screen.Dan2018-03-093-10/+63
* | | | | | | | | | | | | Retry transaction logic added to tx-list-item, confirm-send-ether, customize-...Dan2018-03-099-16/+113
* | | | | | | | | | | | | Add html and css for responsive retry button.Dan2018-03-093-0/+57
* | | | | | | | | | | | | fix marking of confirmed transaction as droppedfrankiebee2018-03-091-1/+1
* | | | | | | | | | | | | transactions - make _markNonceDuplicatesDroppedfrankiebee2018-03-081-21/+20
* | | | | | | | | | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-0853-238/+3612
|\| | | | | | | | | | | |
| * | | | | | | | | | | | 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 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
generated by cgit (git 2.34.1) at 2024-10-15 02:26:36 +0800