Commit Graph

5625 Commits (208b3bc4c1a22b7848e0d9f30ddf3de629f7f0c9)
 

Author SHA1 Message Date
Thomas 208b3bc4c1 Add i18n back into JsonImportSubview 7 years ago
Thomas Huang b7c7083a11
Merge branch 'master' into i18n 7 years ago
kumavis ddc85354d3
Merge pull request #3501 from MetaMask/circleci-2.0 7 years ago
kumavis efe516857a ci - adjust scss cache key 7 years ago
kumavis 5cbd5cd50a ci - cache firefox against Revision 7 years ago
kumavis 650a88412b ci - cache firefox install under build number 7 years ago
kumavis a59d9d996c ci - split download and install firefox steps 7 years ago
kumavis 6093d46ba1 ci - install firefox58 and cache 7 years ago
kumavis 702d09b557 ci - prep-deps - install latest firefox 7 years ago
Thomas Huang 634e5d8f55
Merge pull request #3500 from MetaMask/greenkeeper-chill 7 years ago
kumavis 9378bc50d2 ci - optimize - dont update npm 7 years ago
kumavis dab47e5bfa ci - integration tests need to generate scss cache key 7 years ago
kumavis 6c3706f3e8 ci - fix typo 7 years ago
kumavis 3580196650 test - breakout npm script for building for integration tests 7 years ago
kumavis 7ad1421f61 ci - fix config formatting 7 years ago
kumavis e024b57150 ci - add prep-scss to flow 7 years ago
kumavis 79a0b22ea4 ci - parallize flat + mascara integration tests 7 years ago
kumavis 828ac9a232 ci - breakup npm test into parallel processes 7 years ago
kumavis 69345770fb ci - restore node_modules before test 7 years ago
kumavis 8cf6db16f7 ci - test on all branches 7 years ago
kumavis 4ed6ac92e4 ci - update circle config 7 years ago
kumavis a13ed5e65a ci - introduce circle ci 2.0 7 years ago
kumavis 25f147cc4b deps - update package-lock 7 years ago
greenkeeper[bot] ce139db99b chore(package): update gulp-stylelint to version 7.0.0 7 years ago
greenkeeper[bot] 16050f4aeb chore(package): update stylelint-config-standard to version 18.2.0 7 years ago
greenkeeper[bot] c05b220024 fix(package): update gulp-autoprefixer to version 5.0.0 7 years ago
kumavis 85d48b4fb7 deps - remove unused missippi dep 7 years ago
greenkeeper[bot] c4f697d87f chore(package): update browserify to version 16.1.1 7 years ago
kumavis b4a686a5c6 deps - bump pump 7 years ago
kumavis 7d0363e950
Merge pull request #3497 from MetaMask/testing 7 years ago
Thomas ae795c9770 Persist rinkeby.infura.io and clean nock after 7 years ago
Dan Finlay 174f57b464 Document process of adding a new translation 7 years ago
kumavis 51b806797a
Merge pull request #3496 from MetaMask/nsp-fix 7 years ago
kumavis 4c698be1d5 node security - ignore known hoek advisory 7 years ago
Alexander Tseung ab1b39f554
Remove de-selected token from selectedTokens hash instead of setting to null (#3494) 7 years ago
Alexander Tseung d84341f323
Add empty object default value for tokenData (#3493) 7 years ago
Alexander Tseung 4b2e52795d
Explicitly define state in import account from json component (#3491) 7 years ago
Dan Finlay f28bbe5b03
Merge pull request #3485 from MetaMask/package-lock 7 years ago
kumavis 4af2066298 meta - add package-lock to git 7 years ago
Alexander Tseung cbb65cc493
Fix flashing to Log in screen after logging in or restoring from seed phrase (#3466) 7 years ago
Dan 09dae760bc Correct caps of Send button on main screen. 7 years ago
Dan Finlay f4e5dd37b1
Merge pull request #3409 from scsaba/seed-phrase-verification 7 years ago
Dan J Miller ca047b1ea0
Update network colours for better accessibility. (#3469) 7 years ago
Thomas Huang a74439a1a7
Merge pull request #2791 from MetaMask/greenkeeper/karma-2.0.0 7 years ago
Thomas Huang bd67deae13
Merge pull request #3460 from trigun0x2/master 7 years ago
Jeffrey Tong cad5f5f000 fix typo in tests and tx-state-manager 7 years ago
Jeffrey Tong 57dc5a6e9b fix typo in transaction.js 7 years ago
Dan Finlay abe8bc19a8
Merge branch 'master' into i18n 7 years ago
Dan 2420ad2477 Correct merge conflict resolution errors. 7 years ago
Thomas Huang 5ebdb215ae
Merge pull request #3458 from MetaMask/version-4.2.0 7 years ago