Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [NewUI-flat] Fix gulp build (#2975) | Dan J Miller | 2018-01-16 | 1 | -1/+2 |
* | [NewUI] Build mascara with uglification and gzipping. (#2735) | Dan J Miller | 2018-01-12 | 1 | -0/+2 |
* | Merge pull request #2848 from MetaMask/NewUI-flat | Alexander Tseung | 2018-01-04 | 1 | -4/+4 |
|\ | |||||
| * | Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c | Alexander Tseung | 2018-01-04 | 1 | -4/+26 |
| |\ | |||||
| | * | Fix sign typed data | Alexander Tseung | 2017-12-30 | 1 | -3/+3 |
| * | | chore(package): update vinyl-source-stream to version 2.0.0 | greenkeeper[bot] | 2017-12-23 | 1 | -1/+1 |
* | | | Merge pull request #2799 from MetaMask/NewUI-flat | Alexander Tseung | 2017-12-23 | 1 | -19/+24 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' into NewUI-flat | Dan | 2017-12-21 | 1 | -2/+3 |
| |\| | |||||
| | * | Add exit flag to mocha to exit after tests run | Thomas Huang | 2017-12-16 | 1 | -1/+1 |
| | * | Revert "Revert "network - for infura networks use the infura block tracker pr... | kumavis | 2017-12-14 | 1 | -1/+1 |
| | * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into infura-bloc... | kumavis | 2017-12-14 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Revert "network - for infura networks use the infura block tracker provider" | Frankie | 2017-12-14 | 1 | -2/+1 |
| | * | | deps - bump eth-json-rpc-infura | kumavis | 2017-12-14 | 1 | -1/+1 |
| | |/ | |||||
| | * | network - for infura networks use the infura block tracker provider | kumavis | 2017-12-14 | 1 | -1/+2 |
| | * | Version 3.13.2v3.13.2 | Dan Finlay | 2017-12-10 | 1 | -1/+1 |
| | * | Merge pull request #2630 from MetaMask/i2624-VersionedNoticesv3.12.1 | Thomas Huang | 2017-11-30 | 1 | -0/+2 |
| | |\ | |||||
| | | * | Get notice version filtering working nicely | Dan Finlay | 2017-11-29 | 1 | -0/+1 |
| | | * | Add optional version field to notices | Dan Finlay | 2017-11-29 | 1 | -0/+1 |
| | * | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fix | kumavis | 2017-11-30 | 1 | -7/+7 |
| | |\| | |||||
| | | * | Update greenkeeper deps for master | Thomas Huang | 2017-11-28 | 1 | -7/+7 |
| | * | | deps - obs-store@3 + migrate stream plumbing | kumavis | 2017-11-29 | 1 | -1/+1 |
| | |/ | |||||
| | * | fix(package): update react-markdown to version 3.0.0 | greenkeeper[bot] | 2017-11-20 | 1 | -1/+1 |
| * | | Merge branch 'master' into NewUI-flat-merge-with-master | Dan | 2017-12-07 | 1 | -2/+4 |
| * | | Merge pull request #2615 from jpclark/NewUI-flat | Thomas Huang | 2017-11-29 | 1 | -8/+9 |
| |\ \ | |||||
| | * | | Fixes changes requested in pullrequestreview-79088534 | Jason Clark | 2017-11-27 | 1 | -0/+1 |
| | * | | swapped out ethereum-blockies lib for MEW blockies library, tightened up iden... | Jason Clark | 2017-11-26 | 1 | -1/+0 |
| | * | | incremental commit of working blockie component | Jason Clark | 2017-11-25 | 1 | -3/+1 |
| | * | | toggle wired up to preferences property store | Jason Clark | 2017-11-25 | 1 | -4/+5 |
| | * | | incremental commit | Clark, Jason (Contractor) | 2017-11-24 | 1 | -4/+6 |
| * | | | Update babelify to 8.0.0 | Thomas Huang | 2017-11-28 | 1 | -1/+1 |
| * | | | Update react, react-dom, and react-test-renderer to 15.6.2 | Thomas Huang | 2017-11-27 | 1 | -3/+3 |
| * | | | Update ethjs-query to v0.3.1 | Thomas Huang | 2017-11-27 | 1 | -1/+1 |
| * | | | Update Qunit to QunitJS v2.4.1 | Thomas Huang | 2017-11-27 | 1 | -1/+1 |
| * | | | Update to Enzyme 3.2.0 | Thomas Huang | 2017-11-26 | 1 | -1/+2 |
| |/ / | |||||
* | | | Merge remote-tracking branch 'origin/uat' into mascara-first-screen | frankiebee | 2017-11-08 | 1 | -1/+3 |
|\| | | |||||
| * | | Update classnames for integration tests and add output/index.css to integrati... | Dan | 2017-11-03 | 1 | -1/+1 |
| * | | Get current NewUI-flat tests working. | Dan | 2017-11-03 | 1 | -0/+1 |
| * | | More lint fixes | Dan | 2017-11-02 | 1 | -0/+1 |
* | | | fix mascara build | frankiebee | 2017-11-01 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-25 | 1 | -0/+1 |
|\| | |||||
| * | Merge pull request #2422 from watilde/fixes-lint | Kevin Serrano | 2017-10-25 | 1 | -0/+1 |
| |\ | |||||
| | * | Add lint:fix command to gulp and npm-scripts | Daijiro Wachi | 2017-10-22 | 1 | -0/+1 |
* | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-25 | 1 | -3/+10 |
|\| | | |||||
| * | | Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin... | tmashuang | 2017-10-24 | 1 | -1/+9 |
| |\ \ | |||||
| | * | | Add Integration Tests | Chi Kei Chan | 2017-10-21 | 1 | -0/+1 |
| | * | | Fix linter | Chi Kei Chan | 2017-10-21 | 1 | -1/+1 |
| | * | | Add ShapeShift UI | Chi Kei Chan | 2017-10-21 | 1 | -1/+1 |
| | * | | Fix merge conflict; separate onboarding buy screen | Chi Kei Chan | 2017-10-21 | 1 | -0/+1 |
| | * | | Add missing presets | Chi Kei Chan | 2017-10-21 | 1 | -0/+1 |
| | * | | Shuffle tokens | Jacky Chan | 2017-10-21 | 1 | -0/+3 |
| | * | | Add BackupPhraseScreen | Jacky Chan | 2017-10-21 | 1 | -0/+1 |
| | * | | Add UniqueImageScreen | Jacky Chan | 2017-10-21 | 1 | -0/+1 |
| | |/ | |||||
| * / | Temporarily reversal of json-rpc-engine | Kevin Serrano | 2017-10-22 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-f... | kumavis | 2017-10-21 | 1 | -3/+3 |
| |\ | |||||
| * | | deps - bump eth-json-rpc-filters for log filter fix | kumavis | 2017-10-21 | 1 | -1/+1 |
| * | | deps - bump eth-json-rpc-filters | kumavis | 2017-10-19 | 1 | -1/+1 |
* | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-21 | 1 | -2/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' into i2348-SelectAccountOnNewVault | Thomas Huang | 2017-10-20 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | Update eth-keyring-controller dependency | Chi Kei Chan | 2017-10-20 | 1 | -1/+1 |
| * | | | Patch sandwich-expando for security update | Dan Finlay | 2017-10-20 | 1 | -1/+1 |
| * | | | Remove account-tracker from keyringController | Dan Finlay | 2017-10-19 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'NewUI-flat' into merge | Chi Kei Chan | 2017-10-19 | 1 | -1/+20 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Refactor amount input: dynamic input width with vanilla js. | Dan | 2017-10-13 | 1 | -1/+0 |
| * | | Adds amount and gas field to sendV2. | Dan | 2017-10-13 | 1 | -0/+1 |
| * | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-04 | 1 | -3/+3 |
| |\ \ | |||||
| * | | | Query for gas estimates | Chi Kei Chan | 2017-09-29 | 1 | -2/+3 |
| * | | | Merge branch 'master' into mmn | Chi Kei Chan | 2017-09-28 | 1 | -10/+13 |
| |\ \ \ | |||||
| * | | | | Add Add Token UI; Add Fuzzy search for tokens | Chi Kei Chan | 2017-09-20 | 1 | -2/+3 |
| * | | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-09-19 | 1 | -21/+24 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into nm | Chi Kei Chan | 2017-09-19 | 1 | -7/+16 |
| |\ \ \ \ \ | |||||
| * | | | | | | Update yarn.lock; Fix tx-list-item overflow; Fix gas exchange rate | Chi Kei Chan | 2017-09-14 | 1 | -0/+1 |
| * | | | | | | Reapply conversion utility changes and fix calls to utility in pending-tx. | Dan | 2017-09-14 | 1 | -0/+2 |
| * | | | | | | Improve styling in Confirmation Screen; Show decoded send token data | Chi Kei Chan | 2017-09-13 | 1 | -0/+2 |
| * | | | | | | Revert "Overhaul currency conversion utility and update calls to utility in p... | Chi Kei Chan | 2017-09-13 | 1 | -2/+0 |
| * | | | | | | Overhaul currency conversion utility and update calls to utility in pending-tx. | Dan | 2017-09-13 | 1 | -0/+2 |
| * | | | | | | Added signTokenTx; Adding token confirmation screen | Chi Kei Chan | 2017-09-12 | 1 | -0/+1 |
| * | | | | | | Add buttons; handle back; add yarn.lock | Chi Kei Chan | 2017-09-12 | 1 | -0/+1 |
| * | | | | | | Fixes lint errors and adds stylelint-config-standard to package.json | Dan | 2017-08-31 | 1 | -0/+1 |
| * | | | | | | Merge remote-tracking branch 'mm/master' into NewUI-flat | sdtsui | 2017-08-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | [WIP] Add packages and tasks for linting scss | sdtsui | 2017-08-14 | 1 | -3/+5 |
| * | | | | | | | Merge branch 'master' into NewUI-flat | kumavis | 2017-08-09 | 1 | -34/+37 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add dependencies and JSX support (reactify), for global modal implementation | sdtsui | 2017-08-09 | 1 | -0/+3 |
| * | | | | | | | | Merge branch 'NewUI' into feat/mm-ui-5-merged | sdtsui | 2017-08-07 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into feat/mm-ui-5 | sdtsui | 2017-08-07 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Migrate from css to scss + autoprefixer | sdtsui | 2017-08-07 | 1 | -0/+2 |
| * | | | | | | | | | | Hook up css animation | sdtsui | 2017-08-03 | 1 | -0/+2 |
| * | | | | | | | | | | Add dependejncy: react-burger-menu | sdtsui | 2017-08-03 | 1 | -0/+1 |
* | | | | | | | | | | | Merge pull request #2368 from MetaMask/greenkeeper/react-simple-file-input-2.0.0 | Kevin Serrano | 2017-10-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | fix(package): update react-simple-file-input to version 2.0.0 | greenkeeper[bot] | 2017-10-14 | 1 | -1/+1 |
* | | | | | | | | | | | Revert "NetworkController refactor for new EthClient interface" | kumavis | 2017-10-19 | 1 | -2/+0 |
* | | | | | | | | | | | Merge pull request #2370 from MetaMask/MoveOutEtherscanLinkGeneration | Kevin Serrano | 2017-10-17 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Move etherscan link logic into module | Dan Finlay | 2017-10-14 | 1 | -0/+1 |
| |/ / / / / / / / / / | |||||
* / / / / / / / / / / | Bump version on eth-simple-keyring | Dan Finlay | 2017-10-16 | 1 | -1/+1 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | deps - bump eth-rpc-client for fix | kumavis | 2017-10-12 | 1 | -1/+1 |
* | | | | | | | | | | deps - bump eth-json-rpc-middleware for fix | kumavis | 2017-10-11 | 1 | -1/+1 |
* | | | | | | | | | | network-controller - use obj-proxy for providerProxy | kumavis | 2017-10-11 | 1 | -2/+2 |
* | | | | | | | | | | network controller - refactor to use eth-rpc-client | kumavis | 2017-10-11 | 1 | -0/+2 |
* | | | | | | | | | | Validate data format for eth_signTypedData | Sergey Ukustov | 2017-10-07 | 1 | -1/+1 |
* | | | | | | | | | | Bump provider-engine for better sender validations | Dan Finlay | 2017-10-06 | 1 | -1/+1 |
* | | | | | | | | | | Require keyring-controller 2.1.0 | Dan Finlay | 2017-10-06 | 1 | -1/+1 |
* | | | | | | | | | | Enforce 0x prefix on accounts with new hd keyring | Dan Finlay | 2017-10-05 | 1 | -1/+1 |
* | | | | | | | | | | deps - bump eth-json-rpc-filters for log filter fix | kumavis | 2017-10-05 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #2209 from MetaMask/greenkeeper/coveralls-3.0.0 | Thomas Huang | 2017-10-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | chore(package): update coveralls to version 3.0.0 | greenkeeper[bot] | 2017-09-29 | 1 | -1/+1 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | chore(package): update mocha to version 4.0.0 | greenkeeper[bot] | 2017-10-03 | 1 | -1/+1 |
* | | | | | | | | | deps - bump pe for block cache fix | kumavis | 2017-10-03 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #2124 from MetaMask/breakout-mascara | kumavis | 2017-09-28 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | bump metamascara version | frankiebee | 2017-09-23 | 1 | -1/+1 |
| * | | | | | | | | mascara: turn off background | frankiebee | 2017-09-20 | 1 | -1/+1 |
| * | | | | | | | | update metamascara | frankiebee | 2017-09-20 | 1 | -1/+1 |
| * | | | | | | | | Merge branch 'master' into breakout-mascara | frankiebee | 2017-09-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | require metamascara | frankiebee | 2017-09-19 | 1 | -0/+1 |
* | | | | | | | | | Merge pull request #2196 from MetaMask/express-bump | Dan Finlay | 2017-09-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | deps - bump express for security fix | kumavis | 2017-09-28 | 1 | -1/+1 |
* | | | | | | | | | | fix(package): update eth-keyring-controller to version 2.0.0 | greenkeeper[bot] | 2017-09-28 | 1 | -1/+1 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'master' into filter-fixes-moar | Dan Finlay | 2017-09-28 | 1 | -5/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOut... | kumavis | 2017-09-27 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge pull request #2174 from MetaMask/i2162-TokenPrecision | Thomas Huang | 2017-09-27 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Fix token precision bug | Dan Finlay | 2017-09-27 | 1 | -1/+1 |
| | * | | | | | | | | | | chore(package): update sinon to version 4.0.0 | greenkeeper[bot] | 2017-09-26 | 1 | -1/+1 |
| | |/ / / / / / / / / | |||||
| * / / / / / / / / / | Remove keyring controller from project | Dan Finlay | 2017-09-23 | 1 | -4/+1 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Patch security update | Dan Finlay | 2017-09-23 | 1 | -1/+1 |
* | | | | | | | | | | deps - bump filter deps and add random missing deps | kumavis | 2017-09-23 | 1 | -2/+4 |
* | | | | | | | | | | deps - bump provider engine for block tracker | kumavis | 2017-09-23 | 1 | -1/+1 |
* | | | | | | | | | | deps - bump eth-block-tracker | kumavis | 2017-09-23 | 1 | -0/+1 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into json-rpc-en... | kumavis | 2017-09-20 | 1 | -21/+24 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #2119 from MetaMask/mascara-tests2 | Frankie | 2017-09-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | tests - integration - re-add mascara to normal run | kumavis | 2017-09-19 | 1 | -1/+1 |
| * | | | | | | | | Merge pull request #2098 from MetaMask/mascara-tests | Frankie | 2017-09-19 | 1 | -21/+24 |
| |\| | | | | | | | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | tests - integration - remove failing mascara integration tests from normal ru... | kumavis | 2017-09-19 | 1 | -1/+1 |
| | * | | | | | | tests - integration - add mascara to integration test run | kumavis | 2017-09-16 | 1 | -1/+1 |
| | * | | | | | | tests - refactor and rename npm scripts | kumavis | 2017-09-14 | 1 | -23/+24 |
| | * | | | | | | tests - mascara - move temp build files into dist/mascara | kumavis | 2017-09-14 | 1 | -4/+4 |
| | * | | | | | | tests - start migrating mascara tests to karma | kumavis | 2017-09-14 | 1 | -5/+6 |
| | * | | | | | | tests - break out coveralls npm script | kumavis | 2017-09-14 | 1 | -1/+2 |
* | | | | | | | | deps - bump json-rpc-middleware-stream | kumavis | 2017-09-20 | 1 | -1/+1 |
* | | | | | | | | deps - bump json-rpc-engine | kumavis | 2017-09-20 | 1 | -2/+1 |
|/ / / / / / / | |||||
* | | | | | | | metamask controller - move middleware into seperate files | kumavis | 2017-09-14 | 1 | -1/+1 |
* | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l... | kumavis | 2017-09-13 | 1 | -4/+8 |
|\| | | | | | | |||||
| * | | | | | | Merge pull request #2073 from MetaMask/greenkeeper/babel-eslint-8.0.0 | kumavis | 2017-09-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | chore(package): update babel-eslint to version 8.0.0 | greenkeeper[bot] | 2017-09-12 | 1 | -1/+1 |
| * | | | | | | | test - integration - drop testem for karma | kumavis | 2017-09-12 | 1 | -1/+6 |
| * | | | | | | | test - integration - remove redundant testem scripts | kumavis | 2017-09-12 | 1 | -1/+0 |
| * | | | | | | | ci - dont attempt to submit coveralls if not configured | kumavis | 2017-09-12 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l... | kumavis | 2017-09-08 | 1 | -1/+1 |
|\| | | | | | | |||||
| * | | | | | | Merge pull request #1897 from MetaMask/greenkeeper/sinon-3.2.0 | Thomas Huang | 2017-09-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | chore(package): update sinon to version 3.2.0 | greenkeeper[bot] | 2017-08-10 | 1 | -1/+1 |
| | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | deps - bump jsonrpc filters for log filter formate fix | kumavis | 2017-09-08 | 1 | -1/+1 |
* | | | | | | | streams - use pump and published obj-multiplex | kumavis | 2017-09-08 | 1 | -1/+3 |
* | | | | | | | inpage - add idRemapMiddleware | kumavis | 2017-09-08 | 1 | -0/+1 |
* | | | | | | | inpage - use json-rpc-engine for inpage-provider | kumavis | 2017-08-25 | 1 | -0/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1914 from MetaMask/history-diff | Dan Finlay | 2017-08-19 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | introduce tx-state-history-helper and diff-based history | kumavis | 2017-08-15 | 1 | -0/+1 |
| |/ / / / / | |||||
* / / / / / | Fix token balance precision rendering | Dan Finlay | 2017-08-18 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | / | deps - bump ethjs-query | kumavis | 2017-08-10 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | deps - bump watchify | kumavis | 2017-08-09 | 1 | -2/+2 |
* | | | | Merge branch 'master' into greenkeeper/initial | kumavis | 2017-08-09 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * | | | | add json-rpc-engine && eth-json-rpc-middleware to devDependencies | frankiebee | 2017-08-09 | 1 | -0/+2 |
| * | | | | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-08 | 1 | -3/+2 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-05 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| * | | | | | bring your own BN | frankiebee | 2017-08-05 | 1 | -0/+1 |
* | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee... | kumavis | 2017-08-08 | 1 | -3/+2 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'master' into NewUI | kumavis | 2017-08-05 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | blacklist - bump phishing detector | kumavis | 2017-08-05 | 1 | -1/+1 |
| | * | | | | blacklist - update phishing on boot and speed up polling to 4 min | kumavis | 2017-08-05 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
| * | | | | Bring menu-droppo component into project, remove as a dependency | sdtsui | 2017-08-05 | 1 | -1/+1 |
| * | | | | Merge branch 'master' into NewUI | kumavis | 2017-08-04 | 1 | -2/+2 |
| |\| | | | |||||
| | * | | | deps - bump eth-detect-phishing | kumavis | 2017-08-04 | 1 | -1/+1 |
| * | | | | Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI | Kevin Serrano | 2017-08-04 | 1 | -2/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge branch 'master' into NewUI | Dan Finlay | 2017-07-28 | 1 | -1/+6 |
| | |\ \ \ | |||||
| | * | | | | Bump menu-droppo to 2.0.1 | Dan Finlay | 2017-07-28 | 1 | -1/+1 |
| | * | | | | Bump version of menu-droppo, no longer needs css transitions | sdtsui | 2017-07-27 | 1 | -1/+1 |
| | * | | | | Lots of flex rearrangement on account detail view | Dan Finlay | 2017-07-26 | 1 | -2/+0 |
| | * | | | | Merge branch 'master' into NewUI | Dan Finlay | 2017-07-21 | 1 | -6/+9 |
| | |\ \ \ \ | |||||
| | * | | | | | Bump version of menu-droppo to include bugfix | sdtsui | 2017-07-18 | 1 | -1/+1 |
| | * | | | | | Add tests for new dropdown component | sdtsui | 2017-07-13 | 1 | -0/+1 |
* | | | | | | | deps - update | kumavis | 2017-08-04 | 1 | -4/+5 |
* | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee... | kumavis | 2017-08-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | blacklist - use module eth-phishing-detect | kumavis | 2017-08-04 | 1 | -2/+2 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1848 from MetaMask/transactionControllerRefractor | kumavis | 2017-08-03 | 1 | -0/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-02 | 1 | -0/+1 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | make addUnapprovedTransaction async function and use promise based ethQuery | frankiebee | 2017-08-02 | 1 | -0/+1 |
| * | | | | | phishing detection - move phishing detection into contentscript and metamask ... | kumavis | 2017-08-03 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
| * | | | | Add levenshtein logic to blacklister. | Kevin Serrano | 2017-07-27 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Merge pull request #1816 from MetaMask/test-coverage | kumavis | 2017-07-26 | 1 | -0/+4 |
| |\ \ \ | |||||
| | * | | | One script runs for Ci build | Thomas Huang | 2017-07-26 | 1 | -0/+1 |
| | * | | | Simplify the test-coverage script | Thomas Huang | 2017-07-25 | 1 | -1/+1 |
| | * | | | Add coveralls to script | Thomas Huang | 2017-07-25 | 1 | -1/+1 |
| | * | | | Add Test Coverage with nyc package and coveralls for github badge | Thomas Huang | 2017-07-24 | 1 | -0/+3 |
| | | |/ | | |/| | |||||
| * / | | prov-eng - bump to ignore json parse errors | kumavis | 2017-07-26 | 1 | -1/+1 |
| |/ / | |||||
| * | | Version 3.9.1v3.9.1 | Dan Finlay | 2017-07-20 | 1 | -1/+1 |
* | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee... | kumavis | 2017-08-04 | 1 | -6/+11 |
* | | | chore(package): update dependencies | greenkeeper[bot] | 2017-07-19 | 1 | -32/+32 |
|/ / | |||||
* | | nonce-tracker - fix lock mechanism to be a real mutex | kumavis | 2017-07-19 | 1 | -0/+1 |
* | | Update Sinon | tmashuang | 2017-07-15 | 1 | -1/+1 |
* | | Merge pull request #1617 from MetaMask/nonce-tracker | Frankie | 2017-07-14 | 1 | -1/+1 |
|\ \ | |||||
| * | | remove denodeify | frankiebee | 2017-07-14 | 1 | -1/+0 |
| * | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-07-13 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into nonce-tracker | kumavis | 2017-07-08 | 1 | -7/+5 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-06-28 | 1 | -2/+6 |
| |\ \ \ | |||||
| * | | | | add a test for #getNonceLock | frankiebee | 2017-06-22 | 1 | -0/+1 |
* | | | | | Merge branch 'master' into UpdateMetadata | Dan Finlay | 2017-07-13 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Refresh blacklist before dist | Dan Finlay | 2017-07-13 | 1 | -1/+1 |
| * | | | | | Correct github link | Dan Finlay | 2017-07-13 | 1 | -1/+1 |
| * | | | | | Point blacklist at main repository | Dan Finlay | 2017-07-13 | 1 | -1/+1 |
| * | | | | | Add first version of phishing site warning | Dan Finlay | 2017-07-13 | 1 | -0/+1 |
| | |_|_|/ | |/| | | | |||||
* / | | | | Update eth-contract-metadata on build | Dan Finlay | 2017-07-13 | 1 | -2/+3 |
|/ / / / | |||||
* | | | | deps - bump prov-eng | kumavis | 2017-07-12 | 1 | -1/+1 |
* | | | | deps - bump prov-eng for fetch retry | kumavis | 2017-07-12 | 1 | -1/+1 |
* | | | | deps - bump prov-eng for retry on gateway timeout | kumavis | 2017-07-12 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | metamask - append dapp origin domain to rpc request | kumavis | 2017-07-05 | 1 | -2/+2 |
* | | | Bump token-tracker to 1.1.2 | Dan Finlay | 2017-07-01 | 1 | -1/+1 |
* | | | Bump token-tracker to 1.1.1 | Dan Finlay | 2017-07-01 | 1 | -1/+1 |
* | | | deps - remove duplicated dev-dependencies | kumavis | 2017-06-30 | 1 | -3/+1 |
* | | | Bump web3 version to 0.9.1 | Dan Finlay | 2017-06-30 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Simplify build variables. Remove maps from production. | Kevin Serrano | 2017-06-27 | 1 | -1/+1 |
* | | Fix token balance rendering | Dan Finlay | 2017-06-20 | 1 | -1/+1 |
* | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo... | Dan Finlay | 2017-06-20 | 1 | -2/+2 |
|\ \ | |||||
| * \ | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo... | Kevin Serrano | 2017-06-20 | 1 | -1/+5 |
| |\ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' into i1567-FixInaccurateError | Frankie | 2017-06-17 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | bump provider engine | frankiebee | 2017-06-17 | 1 | -1/+1 |
| * | | | Merge branch 'master' into i1567-FixInaccurateError | frankiebee | 2017-06-16 | 1 | -1/+1 |
| |\| | | |||||
| | * | | check for the tx in the block that provider engine gives us | frankiebee | 2017-06-15 | 1 | -1/+1 |
| | * | | Bump provider-engine | frankiebee | 2017-06-15 | 1 | -1/+1 |
| * | | | bump eth-query for quiter logs | frankiebee | 2017-06-15 | 1 | -1/+1 |
| |/ / | |||||
* | / | Add MetaMark support | Dan Finlay | 2017-06-20 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Bump token-tracker version | Dan Finlay | 2017-06-15 | 1 | -1/+1 |
* | | Refresh token balance on network change | Dan Finlay | 2017-06-15 | 1 | -1/+1 |
* | | Persist selected account tab | Dan Finlay | 2017-06-15 | 1 | -2/+2 |
* | | Fix build for eth-contract-metadata | Dan Finlay | 2017-06-14 | 1 | -1/+1 |
* | | Merge branch 'master' into AddTokenList | Dan Finlay | 2017-06-13 | 1 | -9/+26 |
|\| | |||||
| * | deps - prov-eng 12.2.4 | kumavis | 2017-06-13 | 1 | -1/+1 |
| * | Merge pull request #1572 from MetaMask/mascaraUpkeep | kumavis | 2017-06-13 | 1 | -1/+1 |
| |\ | |||||
| | * | bump cswready event | frankiebee | 2017-06-09 | 1 | -1/+1 |
| * | | deps - bump provider engine for warp feature | kumavis | 2017-06-09 | 1 | -1/+1 |
| |/ | |||||
| * | Move to eth-contract-metadata | Dan Finlay | 2017-05-27 | 1 | -1/+1 |
| * | Add address image map to icon factory | Dan Finlay | 2017-05-26 | 1 | -0/+1 |
| * | Throw if ENS Resolver isn't set up | Dan Finlay | 2017-05-23 | 1 | -1/+1 |
| * | Merge branch 'master' into HelpDebugStalledTxs | kumavis | 2017-05-23 | 1 | -1/+1 |
| |\ | |||||
| | * | deps - use stream-subprovider from provider-engine | kumavis | 2017-05-23 | 1 | -2/+2 |
| | * | Use filter subprovider in-page to avoid filter leaks | Dan Finlay | 2017-05-23 | 1 | -1/+1 |
| * | | Tolerate nonces of any format | Dan Finlay | 2017-05-23 | 1 | -0/+1 |
| |/ | |||||
| * | Linted and removed unused deps | Dan Finlay | 2017-05-17 | 1 | -1/+0 |
| * | Merge pull request #1430 from MetaMask/i1407-FixNonEditingTxForm | kumavis | 2017-05-16 | 1 | -0/+7 |
| |\ | |||||
| | * | Merge branch 'master' into i1407-FixNonEditingTxForm | Dan Finlay | 2017-05-16 | 1 | -3/+2 |
| | |\ | |||||
| | * | | Skip jazzicons in unit tests | Dan Finlay | 2017-05-16 | 1 | -0/+2 |
| | * | | Add support for async/await | Dan Finlay | 2017-05-13 | 1 | -1/+5 |
| | * | | Got a useful error message for next step | Dan Finlay | 2017-05-12 | 1 | -0/+1 |
| | * | | Use react test utils to start composing test | Dan Finlay | 2017-05-12 | 1 | -0/+4 |
| * | | | Merge pull request #1431 from MetaMask/pe-bump | Dan Finlay | 2017-05-16 | 1 | -1/+1 |
| |\ \ \ | | |_|/ | |/| | |