| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | use latest keyring packages | brunobar79 | 2018-07-17 | 1 | -2/+2 |
| | | |||||
| * | remove account modal updated | brunobar79 | 2018-07-13 | 1 | -2/+2 |
| | | |||||
| * | catching up with develop | brunobar79 | 2018-07-13 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-13 | 1 | -0/+3 |
| |\ | | | | | | | initial-trezor-support | ||||
| | * | Fix existing unit tests | Alexander Tseung | 2018-07-08 | 1 | -0/+1 |
| | | | |||||
| | * | Use eth-method-registry to get method data | Alexander Tseung | 2018-07-07 | 1 | -0/+1 |
| | | | |||||
| | * | Refactor and redesign confirm transaction views | Alexander Tseung | 2018-07-07 | 1 | -0/+1 |
| | | | |||||
| * | | update to temp dependencies | brunobar79 | 2018-07-12 | 1 | -2/+2 |
| | | | |||||
| * | | update package-lock.json | brunobar79 | 2018-07-07 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-07 | 1 | -1/+3 |
| |\| | | | | | | | initial-trezor-support | ||||
| | * | Merge remote-tracking branch 'upstream/develop' into HEAD | brunobar79 | 2018-07-04 | 1 | -16/+17 |
| | |\ | |||||
| | * \ | Merge branch 'develop' into portal-metamask | PhyrexTsai | 2018-06-01 | 1 | -2/+5 |
| | |\ \ | |||||
| | * | | | Intergrate ENS with IPFS | MikeCheng1208 | 2018-05-29 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | package.json updated and tests passing | brunobar79 | 2018-07-04 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | tests are passing | brunobar79 | 2018-07-04 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | fix merge conflicts | brunobar79 | 2018-07-04 | 1 | -4/+3 |
| |\ \ \ \ | | |_|/ | |/| | | |||||
| | * | | | Merge pull request #4712 from MetaMask/lint-fix | kumavis | 2018-07-04 | 1 | -3/+2 |
| | |\ \ \ | | | | | | | | | | | Lint - Lint all the things (without conflicts!) | ||||
| | | * | | | remove gulp eslint and cleanup gulpfile | brunobar79 | 2018-07-03 | 1 | -3/+2 |
| | | | | | | |||||
| | * | | | | point eth-contract-metadata to repo master | Esteban MIno | 2018-07-03 | 1 | -1/+1 |
| | |/ / / | |||||
| * | | | | update package-lock.json | brunobar79 | 2018-07-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix merge conflicts | brunobar79 | 2018-07-03 | 1 | -9/+9 |
| |\| | | | |||||
| | * | | | npm 6 fresh lock + node 8 (#4675) | Bruno Barbieri | 2018-07-03 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * run npm install with npm 6 and node 8 * npm audit fix --force * bump node version on circleci docker img * bump lodash | ||||
| * | | | | use latest eth-keyring-controller | brunobar79 | 2018-07-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix merge conflicts | brunobar79 | 2018-07-02 | 1 | -2/+2 |
| |\| | | | |||||
| | * | | | Use supersonic instead of httpserver to serve local dapp (e2e beta tests) | Dan | 2018-06-28 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Use locally served dapp to test contract calls in e2e beta tests | Dan | 2018-06-27 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | notices - notices collection is now manually edited | kumavis | 2018-06-14 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | use latest eth-trezor-keyring | brunobar79 | 2018-06-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fixes | brunobar79 | 2018-06-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | point to new version of eth-trezor-keyring | brunobar79 | 2018-06-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix merge conflicts | Bruno | 2018-06-13 | 1 | -0/+1 |
| |\| | | | |||||
| | * | | | Add script for auto-re-running tests on change | Dan Finlay | 2018-06-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | `npm run watch:test:unit` will re-run the unit test suite whenever a file in `app`, `ui`, or `test` changes. | ||||
| * | | | | upgrade eth-trezor-keyring | Bruno | 2018-06-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | move TrezorKeyring to its own package | Bruno | 2018-06-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | initial trezor support | Bruno | 2018-06-10 | 1 | -1/+2 |
| |/ / / | |||||
| * | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-01 | 1 | -3/+6 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | deps - bump eth-keyring-controller for bugfix | kumavis | 2018-05-31 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge pull request #4403 from MetaMask/bugfix-keyring-controller | kumavis | 2018-05-30 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | deps - bump eth-keyring-controller + update package-lock | ||||
| | | * | | deps - bump eth-keyring-controller + update package-lock | kumavis | 2018-05-30 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge pull request #4374 from MetaMask/test-unit-fail-on-only | kumavis | 2018-05-30 | 1 | -1/+2 |
| | |\ \ \ | | |/ / | |/| | | test - unit - fail if tests contain a .only call | ||||
| | | * | | test - unit - fail if tests contain a .only call | kumavis | 2018-05-26 | 1 | -1/+2 |
| | | |/ | |||||
| | * / | Add basic e2e tests for the new UI | Whymarrh Whitby | 2018-05-25 | 1 | -0/+2 |
| | |/ | |||||
| | * | Merge pull request #4241 from MetaMask/greenkeeper/ethjs-0.4.0 | kumavis | 2018-05-24 | 1 | -1/+1 |
| | |\ | | | | | | | Update ethjs to the latest version 🚀 | ||||
| | | * | fix(package): update ethjs to version 0.4.0 | greenkeeper[bot] | 2018-05-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-05-24 | 1 | -6/+8 |
| |\| | | |||||
| | * | | Merge pull request #4321 from MetaMask/testing | kumavis | 2018-05-23 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | MM controller tests and reorganizing test files | ||||
| | | * \ | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 1 | -0/+1 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 1 | -2/+2 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'develop' into testing | Thomas | 2018-05-17 | 1 | -4/+14 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch 'develop' into testing | Thomas | 2018-05-08 | 1 | -9/+16 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | setupUntrustedCommunication and setupTrustedCommunication | Thomas | 2018-04-25 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge pull request #4308 from MetaMask/i4232-addtoken | kumavis | 2018-05-23 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Update designs for Add Token screen | ||||
| | | * | | | | | | | | | Update designs for Add Token screen | Alexander Tseung | 2018-05-20 | 1 | -1/+1 |
| | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | | ci - screens - continue screenshots through account creation + export account | kumavis | 2018-05-22 | 1 | -0/+1 |
| | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| | * | | | | | | | | Merge branch 'develop' into ci-publish-release | kumavis | 2018-05-22 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | | * | | | | | | | Merge branch 'develop' of https://github.com/Jabher/metamask-extension into ↵ | kumavis | 2018-05-22 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | Jabher-develop | ||||
| | | | * | | | | | | bump extensionizer version to 1.0.1 (see ↵ | jabher | 2018-05-08 | 1 | -1/+1 |
| | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | https://github.com/MetaMask/extensionizer/pull/4) | ||||
| | | * | | | | | | Merge pull request #4034 from whymarrh/account-nicknames | kumavis | 2018-05-22 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | Move account names out of KeyringController | ||||
| | | | * | | | | | Update eth-keyring-controller dependency | Whymarrh Whitby | 2018-05-17 | 1 | -1/+1 |
| | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-15 | 1 | -0/+1 |
| | | |\| | | | | |||||
| | | * | | | | | Merge e2e tests into one | Thomas | 2018-05-15 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | ci - add docs publish to job-publish-release | kumavis | 2018-05-19 | 1 | -0/+1 |
| | | |/ / / / | |/| | | | | |||||
| | * | | | | | Bail after the first e2e test failure | Whymarrh Whitby | 2018-05-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where the tests are sequential, every test after the first failure is bound for failure as well so we can bail after the first. | ||||
| | * | | | | | Add new unlock screen design | Alexander Tseung | 2018-05-12 | 1 | -0/+1 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-12 | 1 | -1/+1 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | | Update deep-extend and sshpk | Alexander Tseung | 2018-05-10 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-09 | 1 | -1/+7 |
| | |\| | | | |||||
| | | * | | | Add storybook integration | Alexander Tseung | 2018-05-04 | 1 | -1/+7 |
| | | |/ / | |||||
| | * | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-04 | 1 | -6/+13 |
| | |\| | | |||||
| | | * | | Remove eth-block-tracker package | Alexander Tseung | 2018-05-03 | 1 | -1/+0 |
| | | | | | |||||
| | | * | | Pin chromedriver version to 2.36.0 | Alexander Tseung | 2018-05-03 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Adds nsp check to CircleCI tests | Alexander Tseung | 2018-05-03 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | Adds sass-loader and style-loader packages for storybook integration | Alexander Tseung | 2018-05-02 | 1 | -0/+2 |
| | | | | | |||||
| | | * | | Adds path and resolve-url-loader packages for storybook integration | Alexander Tseung | 2018-05-02 | 1 | -0/+2 |
| | | | | | |||||
| | | * | | Adds css-loader and file-loader needed for storybook integration | Alexander Tseung | 2018-05-02 | 1 | -0/+2 |
| | | | | | |||||
| | | * | | Merge pull request #4111 from MetaMask/build-fix-sourcemaps | Frankie | 2018-05-01 | 1 | -1/+1 |
| | | |\ \ | | | | | | | | | | | Build - fix sourcemaps | ||||
| | | | * | | development - add sourcemap debug tool | kumavis | 2018-04-28 | 1 | -0/+1 |
| | | | | | | |||||
| | | | * | | build - minify via gulp-uglify-es instead of uglifyify | kumavis | 2018-04-28 | 1 | -1/+0 |
| | | | | | | |||||
| | | * | | | test - unit - use ganache instead of deprecated block-tracker test util | kumavis | 2018-04-28 | 1 | -1/+2 |
| | | |/ / | |||||
| | | * | | rpc - bump provider-engine + eth-json-rpc-filters | kumavis | 2018-04-26 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | Move uglifyify to MetaMask org | Dan Finlay | 2018-04-26 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Make minified builds more determinstic | Dan Finlay | 2018-04-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | May fix #3999, but will need to see if Mozilla can reproduce the build with this updated repo. Switches our `uglifyify` dependency from the production one (under-maintained) to one that I've merged a critical patch into. I'm open to discussion of how else we might approach this problem here. Maybe we should use a different minification module entirely, remove minification, or maybe refactor our build system! | ||||
| | * | | | Firefox | Thomas | 2018-05-02 | 1 | -2/+5 |
| | |/ / | |||||
| * | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-05-15 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-05-14 | 1 | -10/+27 |
| | | | | |||||
| * | | | Unit tests for containers, utils and selectors in send_/ | Dan | 2018-05-05 | 1 | -1/+2 |
| |/ / | |||||
| * | | Merge pull request #4023 from MetaMask/greenkeeper/ethjs-contract-0.2.0 | Dan Finlay | 2018-04-24 | 1 | -1/+1 |
| |\ \ | | | | | | | Update ethjs-contract to the latest version 🚀 | ||||
| | * | | fix(package): update ethjs-contract to version 0.2.0 | greenkeeper[bot] | 2018-04-19 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge pull request #3934 from MetaMask/node-engines | Dan Finlay | 2018-04-24 | 1 | -1/+1 |
| |\ \ | | | | | | | package.json - update engines field to require node v8.x.x | ||||
| | * | | package.json - update engines field to require node v8.x.x | kumavis | 2018-04-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | deps - bump sentry for more detailed fetch failure | kumavis | 2018-04-24 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | deps - update keyring controller and other eth-dependinces | frankiebee | 2018-04-18 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into i3580-InternationalizeCurrency | Dan Finlay | 2018-04-18 | 1 | -1/+4 |
| |\ \ | |||||
| | * \ | Merge pull request #3969 from MetaMask/i3966-AddJsDocsPage | Thomas Huang | 2018-04-18 | 1 | -0/+3 |
| | |\ \ | | | | | | | | | Add JSDocs Page and Script | ||||
| | | * | | Add JSDocs Page and Script | Dan Finlay | 2018-04-13 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | Includes new script `npm run doc` for generating docs page. | ||||
| | * | | | Add ComposableObservableStore for subscription management | bitpshr | 2018-04-13 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge branch 'master' into i3580-InternationalizeCurrency | kumavis | 2018-04-10 | 1 | -3/+3 |
| |\| | | |||||
| | * | | Merge branch 'master' into i3621-LogoPerformance | kumavis | 2018-04-10 | 1 | -2/+4 |
| | |\ \ | |||||
| | | * \ | 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 |
| | | | |/ | |||||
| | * | / | Improve fox logo performance | Dan Finlay | 2018-04-04 | 1 | -1/+1 |
| | | |/ | |/| | | | | | | | | | | | | | By including metamask-logo@2.1.4 Fixes #3621 | ||||
| * | | | Merge branch 'master' into i3580-InternationalizeCurrency | Dan | 2018-04-10 | 1 | -7/+3 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-04 | 1 | -9/+2 |
| | |\| | | | | | | | | | | cb-254 | ||||
| | | * | ci - job-publish - publish source+sourcemaps to sentry if new release | kumavis | 2018-04-04 | 1 | -7/+1 |
| | | | | |||||
| | * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-03 | 1 | -1/+2 |
| | |\ \ | | | | | | | | | | | | | cb-254 | ||||
| | * \ \ | Fix merge conflicts. Modify send workflow | Alexander Tseung | 2018-04-03 | 1 | -2/+12 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-03-31 | 1 | -2/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | cb-254 | ||||
| | * \ \ \ \ | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 1 | -11/+10 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 1 | -6/+12 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 1 | -21/+36 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵ | Alexander Tseung | 2018-02-09 | 1 | -7/+7 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into cb-254 | ||||
| | * \ \ \ \ \ \ \ \ | Fix merge conflicts from uat-next | Alexander Tseung | 2018-02-01 | 1 | -5/+7 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 1 | -11/+16 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Add prop-types to package.json, redirect from create-password screen when ↵ | Alexander Tseung | 2017-12-15 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isInitialized | ||||
| | * | | | | | | | | | | | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Internationalize currency | Dan Finlay | 2018-04-04 | 1 | -0/+1 |
| | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3580 | ||||
| * | | | | | | | | | | | build - correctly set METAMASK_ENV via envify | kumavis | 2018-04-04 | 1 | -2/+1 |
| | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into build-perf | kumavis | 2018-04-03 | 1 | -2/+12 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | * | | | | | | | | | deps - update shell-parallel | kumavis | 2018-04-03 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | lint - lint json files in app/ | kumavis | 2018-04-03 | 1 | -0/+1 |
| | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 1 | -2/+1 |
| | |\| | | | | | | | | |||||
| | * | | | | | | | | | development - ci-screens - remove mocha wrapper that was losing exit code | kumavis | 2018-03-31 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-03-31 | 1 | -10/+9 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | * | | | | | | | | | ci - e2e+screens - add sleep to make sure ganache is ready | kumavis | 2018-03-31 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | ci - e2e+screens - use shell-parallel to run ganache | kumavis | 2018-03-31 | 1 | -3/+5 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Ganache:start script with seed phrase | Thomas | 2018-03-31 | 1 | -2/+4 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | development - create selenium screen shotter | kumavis | 2018-03-30 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | test - add auto screen shotter | kumavis | 2018-03-30 | 1 | -1/+5 |
| | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | | build - use uglifyify and gulp-multi-process for better performance | kumavis | 2018-03-31 | 1 | -1/+2 |
| | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #3808 from MetaMask/txMeta-origin | kumavis | 2018-03-31 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | transactions - add origin to txMeta | ||||
| | * | | | | | | | | deps - bump proviedr-engine | frankiebee | 2018-03-31 | 1 | -1/+1 |
| | | |/ / / / / / | |/| | | | | | | |||||
| * / | | | | | | | build - properly set GULP_METAMASK_DEBUG on dev | kumavis | 2018-03-31 | 1 | -1/+0 |
| |/ / / / / / / | |||||
| * | | | | | | | npm scripts - rewrite default scripts to new task names | kumavis | 2018-03-30 | 1 | -6/+5 |
| | | | | | | | | |||||
| * | | | | | | | npm scripts - simplify and speed up dist builds | kumavis | 2018-03-29 | 1 | -2/+1 |
| | | | | | | | | |||||
| * | | | | | | | deps - update package-lock | kumavis | 2018-03-29 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | mascara - use sw-controller and other cleanups | kumavis | 2018-03-29 | 1 | -2/+3 |
| |/ / / / / / | |||||
| * | | | | | | deps - bump ethjs-query to fix unhandled promise rejections | kumavis | 2018-03-29 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3713 from MetaMask/greenkeeper/eslint-plugin-mocha-5.0.0 | kumavis | 2018-03-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Update eslint-plugin-mocha to the latest version 🚀 | ||||
| | * | | | | | | chore(package): update eslint-plugin-mocha to version 5.0.0 | greenkeeper[bot] | 2018-03-24 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #3652 from MetaMask/greenkeeper/sinon-5.0.0 | kumavis | 2018-03-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Update sinon to the latest version 🚀 | ||||
| | * | | | | | | | chore(package): update sinon to version 5.0.0 | greenkeeper[bot] | 2018-03-22 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | test - integration - add locale build step | kumavis | 2018-03-28 | 1 | -2/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-03-28 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n-translator-redux | ||||
| | * | | | | | | | | ci - run e2e jobs | kumavis | 2018-03-28 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into selenium-e2e | Thomas Huang | 2018-03-28 | 1 | -1/+10 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-22 | 1 | -3/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-22 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-15 | 1 | -6/+8 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-10 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-10 | 1 | -21/+54 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | chromedriver, changed extension id(might need zip/crx file) | Thomas | 2018-01-19 | 1 | -3/+4 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Update | Thomas | 2018-01-18 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | E2E testing with selenium | tmashuang | 2017-09-13 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 1 | -1/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | sentry - npm scripts for uploading source maps | kumavis | 2018-03-24 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | sentry - rewrite report urls + use raven-js from npm | kumavis | 2018-03-24 | 1 | -0/+1 |
| | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | changes test to unit-integration-lint, closes #3650 | Lazaridis | 2018-03-22 | 1 | -1/+1 |
| | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |||||
| * / | | | | | | | | | | | Use extension api to get initial locale. | Dan | 2018-03-22 | 1 | -0/+1 |
| |/ / / / / / / / / / / | |||||
| * | | | | | / / / / / | Revert "Issue 3505 | Transpile to ES5" | Thomas Huang | 2018-03-22 | 1 | -3/+1 |
| | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #3605 from lazaridiscom/master | kumavis | 2018-03-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | use mkdirp for cross-platform, re #3426 | ||||
| | * | | | | | | | | | | use mkdirp for cross-platform, re #3426 | Lazaridis | 2018-03-18 | 1 | -1/+1 |
| | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| * / | | | | | | | | | Issue 3505 | Transpile to ES5 | Ryan Rowland | 2018-03-20 | 1 | -1/+3 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-03-14 | 1 | -13/+14 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i3076-UseStorageLocalInstead | ||||
| | * | | | | | | | | | use 'cross-env' for env-variables within npm scripts, re #3426 | Lazaridis | 2018-03-14 | 1 | -3/+4 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Moved mock-dev.js and ui-dev.js to development folder. | Vincent | 2018-03-13 | 1 | -3/+3 |
| | | |_|_|/ / / / / | |/| | | | | | | | |||||
| | * | | | | | | | | Merge pull request #3501 from MetaMask/circleci-2.0 | kumavis | 2018-03-10 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | ci - introduce circle ci 2.0 | ||||
| | | * | | | | | | | test - breakout npm script for building for integration tests | kumavis | 2018-03-10 | 1 | -1/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | chore(package): update gulp-stylelint to version 7.0.0 | greenkeeper[bot] | 2018-03-10 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | chore(package): update stylelint-config-standard to version 18.2.0 | greenkeeper[bot] | 2018-03-10 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix(package): update gulp-autoprefixer to version 5.0.0 | greenkeeper[bot] | 2018-03-10 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | deps - remove unused missippi dep | kumavis | 2018-03-10 | 1 | -1/+0 |
| | | | | | | | | | | |||||
| | * | | | | | | | | chore(package): update browserify to version 16.1.1 | greenkeeper[bot] | 2018-03-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #2861 | ||||
| | * | | | | | | | | deps - bump pump | kumavis | 2018-03-10 | 1 | -1/+1 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInstead | Dan Finlay | 2018-03-08 | 1 | -2/+2 |
| |\| | | | | | | | |||||
| | * | | | | | | | Merge pull request #2791 from MetaMask/greenkeeper/karma-2.0.0 | Thomas Huang | 2018-03-08 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update karma to the latest version 🚀 | ||||
| | | * | | | | | | | chore(package): update karma to version 2.0.0 | greenkeeper[bot] | 2017-12-22 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge pull request #3259 from MetaMask/controllerStubs | kumavis | 2018-03-07 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Offline testing | ||||
| | | * | | | | | | | | Offline testing | Thomas Huang | 2018-02-16 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into i3076-UseStorageLocalInstead | Dan Finlay | 2018-03-07 | 1 | -12/+46 |
| |\| | | | | | | | | | |||||
| | * | | | | | | | | | Merge pull request #3309 from scsaba/edge-support | Dan Finlay | 2018-03-07 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Add Edge Support | ||||
| | | * | | | | | | | | | add browserify-unibabel to package.json | Csaba Solya | 2018-03-06 | 1 | -2/+3 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Merge branch 'master' into edge-support | Csaba S | 2018-02-22 | 1 | -5/+34 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | add edge support | Csaba Solya | 2018-02-22 | 1 | -0/+1 |
| | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Add version bumping script | Dan Finlay | 2018-03-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One step towards automating our deploy process is automating our version bumping scheme. This PR does that. | ||||
| | * | | | | | | | | | | Fix inpage provider name regression | Dan Finlay | 2018-03-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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). | ||||
| | * | | | | | | | | | | Merge pull request #2363 from MetaMask/greenkeeper/metamascara-2.0.0 | Frankie | 2018-02-28 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | Update metamascara to the latest version 🚀 | ||||
| | | * | | | | | | | | | fix(package): update metamascara to version 2.0.0 | greenkeeper[bot] | 2017-10-14 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Add node-sass to dev dependencies | Dan Finlay | 2018-02-14 | 1 | -0/+1 |
| | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | To fix build | ||||
| | * | | | | | | | | | Merge branch 'uat' into uat-next | Dan | 2018-02-08 | 1 | -7/+7 |
| | |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | | * | | | | | | | | Merge branch 'master' into uat | Dan | 2018-02-08 | 1 | -7/+7 |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | |||||
| | | | * | | | | | | | Add enzyme, redux-test-utils, and enzyme-adapter-react-15 to deps | Thomas | 2018-01-31 | 1 | -2/+4 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | Merge pull request #2885 from MetaMask/greenkeeper/gulp-watch-5.0.0 | Thomas Huang | 2018-01-30 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Update gulp-watch to the latest version 🚀 | ||||
| | | | | * | | | | | | | chore(package): update gulp-watch to version 5.0.0 | greenkeeper[bot] | 2018-01-07 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Merge pull request #3026 from MetaMask/greenkeeper/mocha-5.0.0 | Thomas Huang | 2018-01-30 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update mocha to the latest version 🚀 | ||||
| | | | | * | | | | | | | | chore(package): update mocha to version 5.0.0 | greenkeeper[bot] | 2018-01-18 | 1 | -1/+1 |
| | | | | | |_|_|/ / / / | | | | |/| | | | | | | |||||
| | | | * | | | | | | | | Merge pull request #3091 from MetaMask/greenkeeper/testem-2.0.0 | Thomas Huang | 2018-01-30 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update testem to the latest version 🚀 | ||||
| | | | | * | | | | | | | | chore(package): update testem to version 2.0.0 | greenkeeper[bot] | 2018-01-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | deps - bump eth-json-rpc-infura for kovan fix | kumavis | 2018-01-26 | 1 | -1/+1 |
| | | | |/ / / / / / / / | |||||
| | * | / / / / / / / / | [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120) | Dan J Miller | 2018-02-01 | 1 | -0/+1 |
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use tooltip for display of helper text in wallet views copy to clipboard feature. * Use react-tippy in wallet-view.js; center arrow tooltip throughout tooltip text change. * Remove unnecessary tabIndex attribute from wallet view address element. | ||||
| | * | | | | | | | | | Merge branch 'master' into uat | Thomas | 2018-01-23 | 1 | -3/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Remove duplicate eth-contract-metadata | Thomas | 2018-01-23 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'uat' into newmaster | Chi Kei Chan | 2018-01-20 | 1 | -4/+33 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | | * | | | | | | | | Merge branch 'uat' into uat-master-011618 | Alexander Tseung | 2018-01-17 | 1 | -5/+33 |
| | | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | | | * | | | | | | | [NewUI-flat] Fix gulp build (#2975) | Dan J Miller | 2018-01-16 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Only run uglify when building for prod; set environment when building for prod; use gulp-uglify-es. * Revert change of dist script. | ||||
| | | | * | | | | | | | [NewUI] Build mascara with uglification and gzipping. (#2735) | Dan J Miller | 2018-01-12 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adds uglification and gzipping. * Build mascara with uglification and gzipping. * Remove gzipping from extension build. | ||||
| | | | * | | | | | | | Merge pull request #2848 from MetaMask/NewUI-flat | Alexander Tseung | 2018-01-04 | 1 | -4/+4 |
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | [NewUI] Merge NewUI-flat into uat | ||||
| | | | | * \ \ \ \ \ \ | 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 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Merge pull request #2799 from MetaMask/NewUI-flat | Alexander Tseung | 2017-12-23 | 1 | -19/+24 |
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | | Update UAT to version 4.0.5 | ||||
| | | | | * | | | | | | | Merge branch 'master' into NewUI-flat | Dan | 2017-12-21 | 1 | -2/+3 |
| | | | | |\ \ \ \ \ \ \ | | | | | | |_|_|/ / / | | | | | |/| | | | / | | | | | |_|_|_|_|/ | | | | |/| | | | | | |||||
| | | | | * | | | | | | 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 |
| | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Provide blockie identicon option | ||||
| | | | | | * | | | | | | 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 ↵ | Jason Clark | 2017-11-26 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | identicon.js code | ||||
| | | | | | * | | | | | | 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 ↵ | Dan | 2017-11-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration test for ci | ||||
| | | | | * | | | | | | 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 branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-25 | 1 | -3/+10 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-21 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | 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 ↵ | Chi Kei Chan | 2017-09-13 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pending-tx." This reverts commit 080890a46ec98814bce8680f561fae3b52d81ed2. | ||||
| | | | | * | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | |||||
 |
index : tangerine-wallet-browser | |
| Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser) | LAN-TW |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/package.json