Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ci - metamaskbot announce - js style change | kumavis | 2018-04-04 | 1 | -5/+5 |
| | |||||
* | ci - rename job-announce to job-publish | kumavis | 2018-04-04 | 1 | -2/+2 |
| | |||||
* | ci - announce - add sourcemaps to artifacts | kumavis | 2018-04-04 | 1 | -0/+3 |
| | |||||
* | ci - load npm deps by revision to always get latest for build | kumavis | 2018-04-04 | 1 | -12/+16 |
| | |||||
* | Merge pull request #3846 from MetaMask/fetch-err-warn | kumavis | 2018-04-04 | 5 | -44/+38 |
|\ | | | | | app - warn on fetch errors instead of spamming sentry | ||||
| * | app - currency - fix typo + prefer log over console | kumavis | 2018-04-04 | 1 | -2/+3 |
| | | |||||
| * | app - currency - fix typo | kumavis | 2018-04-04 | 1 | -1/+1 |
| | | |||||
| * | app - warn on fetch errors instead of spamming sentry | kumavis | 2018-04-04 | 5 | -44/+37 |
|/ | |||||
* | Merge pull request #3845 from MetaMask/build-fix-env | Thomas Huang | 2018-04-04 | 8 | -18/+15 |
|\ | | | | | build - correctly set METAMASK_ENV via envify | ||||
| * | build - correctly set METAMASK_ENV via envify | kumavis | 2018-04-04 | 8 | -18/+15 |
|/ | |||||
* | Merge pull request #3835 from MetaMask/4.5.0v4.5.0 | Thomas Huang | 2018-04-03 | 2 | -3/+6 |
|\ | | | | | Version 4.5.0 | ||||
| * | 4.5.0 | kumavis | 2018-04-03 | 2 | -2/+4 |
| | | |||||
| * | changelog - add note on locales | kumavis | 2018-04-03 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #3830 from MetaMask/build-perf | Thomas Huang | 2018-04-03 | 3 | -13/+87 |
|\ | | | | | build - use uglifyify and gulp-multi-process for better performance | ||||
| * | Merge branch 'master' of github.com:MetaMask/metamask-extension into build-perf | kumavis | 2018-04-03 | 41 | -974/+4192 |
| |\ | |||||
| * | | build - use uglifyify and gulp-multi-process for better performance | kumavis | 2018-03-31 | 3 | -64/+91 |
| | | | |||||
* | | | Merge pull request #3833 from MetaMask/ci-patch | kumavis | 2018-04-03 | 1 | -1/+0 |
|\ \ \ | |_|/ |/| | | ci - dont log unneeded env var | ||||
| * | | ci - dont log unneeded env var | kumavis | 2018-04-03 | 1 | -1/+0 |
|/ / | |||||
* | | Merge pull request #3831 from MetaMask/i#3770 | Frankie | 2018-04-03 | 4 | -6/+42 |
|\ \ | | | | | | | some more transaction validation bug fixes | ||||
| * | | tests - fix txController tests so that txMetas have a from feild | frankiebee | 2018-04-03 | 1 | -2/+4 |
| | | | |||||
| * | | transactions gasLimit - use the block gasLimit if getCode fails | frankiebee | 2018-04-03 | 2 | -3/+6 |
| | | | |||||
| * | | transactions validationt - valdate from field on txParams | frankiebee | 2018-04-03 | 2 | -1/+32 |
| | | | |||||
* | | | Merge pull request #3805 from MetaMask/ci-screens | kumavis | 2018-04-03 | 10 | -355/+3156 |
|\ \ \ | | | | | | | | | CI - capture screenshots | ||||
| * \ \ | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 13 | -351/+341 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #3828 from MetaMask/lint-sys-fix | kumavis | 2018-04-03 | 8 | -8/+6 |
|\ \ \ \ | | | | | | | | | | | Lint system fixes | ||||
| * \ \ \ | Merge branch 'master' into lint-sys-fix | kumavis | 2018-04-03 | 18 | -302/+646 |
| |\ \ \ \ | |||||
| * | | | | | lint - remove use of 'event' global | kumavis | 2018-04-03 | 2 | -3/+3 |
| | | | | | | |||||
| * | | | | | lint - rules - disallow 'event' global | kumavis | 2018-04-03 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | old-ui - lint fixes | kumavis | 2018-04-03 | 4 | -4/+1 |
| | | | | | | |||||
| * | | | | | lint - include old ui | kumavis | 2018-04-03 | 1 | -2/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #3825 from danjm/i3668-warnusertxsimulationfails | Thomas Huang | 2018-04-03 | 5 | -343/+335 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Add simulation failure errors while improve send error handling on confirm screen | ||||
| * | | | | Adds simulation failure error messages to confirm screen. | Dan | 2018-04-03 | 4 | -0/+44 |
| | | | | | |||||
| * | | | | UpdateSendErrors only called when balance defined, recalled if balance updates. | Dan | 2018-04-03 | 3 | -343/+291 |
| | | | | | |||||
| | | * | | ci:screens - turn on repeat in walkthrough gif | kumavis | 2018-04-03 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | deps - update shell-parallel | kumavis | 2018-04-03 | 2 | -4/+15 |
| | | | | | |||||
| | | * | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 5 | -12/+130 |
| | | |\ \ | |_|_|/ / |/| | | | | |||||
* | | | | | Merge pull request #3829 from MetaMask/locales-lint | Thomas Huang | 2018-04-03 | 5 | -3/+121 |
|\ \ \ \ \ | | | | | | | | | | | | | Lint locale json | ||||
| * | | | | | lint - i18n - ru - lint fix | kumavis | 2018-04-03 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | lint - lint json files in app/ | kumavis | 2018-04-03 | 4 | -3/+120 |
|/ / / / / | |||||
| | | * | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-04-03 | 27 | -642/+1120 |
| | | |\ \ | |_|_|/ / |/| | | | | |||||
* | | | | | Merge pull request #3826 from danjm/ensure-txparams-0xprefixed | kumavis | 2018-04-03 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Ensure txParams are prefixed with 0x when sending. | ||||
| * | | | | | Ensure txParams are prefixed with 0x when sending. | Dan | 2018-04-03 | 1 | -0/+4 |
| |/ / / / | |||||
* | | | | | Merge pull request #3763 from MetaMask/i18n-helper | kumavis | 2018-04-03 | 11 | -125/+81 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | I18n - Improve verify locales utility | ||||
| * | | | | deps - bump package-lock.json | kumavis | 2018-04-03 | 1 | -47/+0 |
| | | | | | |||||
| * | | | | Update translating-guide.md | kumavis | 2018-04-03 | 1 | -3/+6 |
| | | | | | |||||
| * | | | | Merge branch 'master' into i18n-helper | kumavis | 2018-04-03 | 111 | -1215/+2523 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #3783 from gornov/master | kumavis | 2018-04-03 | 1 | -172/+250 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Modified Russian localization. resolves #3534, #3644 | ||||
| * | | | | Modified Russian localization. resolves #3534, #3644 | Gornov Dmitry | 2018-03-29 | 1 | -172/+250 |
| | | | | | |||||
* | | | | | Merge pull request #3816 from MetaMask/kumavis-patch-2 | Dan Finlay | 2018-04-01 | 1 | -3/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | identicon - set blockies height and width to identicon diameter | ||||
| * | | | | | identicon - set blockies height and width to identicon diameter | kumavis | 2018-03-31 | 1 | -3/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #3801 from danjm/i3684-txlistitemstest | kumavis | 2018-03-31 | 2 | -0/+189 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Adds integration tests for different tx list items | ||||
| * | | | | Adds integration tests for rendering of tx list items. | Dan | 2018-03-30 | 2 | -0/+189 |
| | | | | | |||||
* | | | | | Merge pull request #3774 from danjm/i3686-txparamundefined-sigrequestsintxlist | kumavis | 2018-03-31 | 3 | -9/+22 |
|\| | | | | | | | | | | | | | | Fix display of unapprovedMgs in txList; fix txParams undefined errors | ||||
| * | | | | Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlist | Dan | 2018-03-30 | 87 | -562/+1036 |
| |\ \ \ \ | |||||
| * | | | | | Ensure correct address used when rendering transfer transactions. | Dan | 2018-03-29 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Fix display of unapprovedMessages in txList (old and new ui); includes fix ↵ | Dan | 2018-03-28 | 3 | -9/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | of undefined txParams. | ||||
* | | | | | | Merge pull request #3762 from danjm/i3471-checkbalanceonconfirmscreen | kumavis | 2018-03-31 | 6 | -21/+175 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Checking for sufficient balance in tx confirmation screen | ||||
| * | | | | | | Fix lint and tests | Dan | 2018-03-30 | 2 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreen | Dan | 2018-03-30 | 87 | -561/+1035 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Show insufficient funds on confirm screen on first render. | Dan | 2018-03-30 | 2 | -1/+21 |
| | | | | | | | |||||
| * | | | | | | Confirm send token detects if balance is sufficient for gas. | Dan | 2018-03-28 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreen | kumavis | 2018-03-28 | 107 | -723/+1250 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Confirm send token detects if balance is sufficient for gas. | Dan | 2018-03-28 | 2 | -7/+56 |
| | | | | | | | |||||
| * | | | | | | Checking for sufficient balance in confirm ether screen; includes error ↵ | Dan | 2018-03-28 | 4 | -15/+97 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | messages for user. | ||||
* | | | | | | | Merge pull request #3808 from MetaMask/txMeta-origin | kumavis | 2018-03-31 | 4 | -16/+21 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | transactions - add origin to txMeta | ||||
| * | | | | | | | transactions#newUnapprovedTransaction - dont default origin to metamask | frankiebee | 2018-03-31 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | transactions - put the origing on the txMeta to help with debugging | frankiebee | 2018-03-31 | 2 | -3/+8 |
| | | | | | | | | |||||
| * | | | | | | | deps - bump proviedr-engine | frankiebee | 2018-03-31 | 2 | -13/+13 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3806 from MetaMask/build-dev-fix | Frankie | 2018-03-31 | 2 | -7/+5 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | build - properly set GULP_METAMASK_DEBUG on dev | ||||
| * | | | | | | | build - properly set GULP_METAMASK_DEBUG on dev | kumavis | 2018-03-31 | 2 | -7/+5 |
|/ / / / / / / | |||||
| | | | | * | | i18n - further improve locale verifier | kumavis | 2018-03-28 | 1 | -41/+28 |
| | | | | | | | |||||
| | | | | * | | i18n - cleanup verify locales util | kumavis | 2018-03-28 | 1 | -66/+80 |
| | | | | | | | |||||
| | | | | * | | i18n - fix casing for key 'downloadStateLogs' | kumavis | 2018-03-28 | 8 | -8/+8 |
| | | |_|/ / | | |/| | | | |||||
| | | | | * | ci - screens - increase delay before setting provider type | kumavis | 2018-03-31 | 1 | -1/+1 |
| | | | | | | |||||
| | | | | * | ci - breakout announce job to upload builds and screenshots | kumavis | 2018-03-31 | 1 | -13/+35 |
| | | | | | | |||||
| | | | | * | ci - screens - add delay after setting network | kumavis | 2018-03-31 | 1 | -0/+1 |
| | | | | | | |||||
| | | | | * | ci - build:announce - fix script path | kumavis | 2018-03-31 | 1 | -1/+1 |
| | | | | | | |||||
| | | | | * | ci - build:announce - replace bash qith js because of string escaping nightmare | kumavis | 2018-03-31 | 2 | -34/+52 |
| | | | | | | |||||
| | | | | * | ci - build:announce - fix json escaping | kumavis | 2018-03-31 | 1 | -6/+6 |
| | | | | | | |||||
| | | | | * | ci - build:announce - fix json escaping | kumavis | 2018-03-31 | 1 | -6/+6 |
| | | | | | | |||||
| | | | | * | ci - build:announce - fix shell script path | kumavis | 2018-03-31 | 1 | -1/+1 |
| | | | | | | |||||
| | | | | * | ci - build:announce - break out into shell script | kumavis | 2018-03-31 | 2 | -32/+35 |
| | | | | | | |||||
| | | | | * | ci - build:announce - rewrite github comment to include walkthrough gif | kumavis | 2018-03-31 | 1 | -9/+23 |
| | | | | | | |||||
| | | | | * | development - ci-screens - remove mocha wrapper that was losing exit code | kumavis | 2018-03-31 | 3 | -117/+12 |
| | | | | | | |||||
| | | | | * | development - screens - fix screenshot on failure | kumavis | 2018-03-31 | 1 | -3/+4 |
| | | | | | | |||||
| | | | | * | development - screens - screenshot on failure | kumavis | 2018-03-31 | 1 | -4/+25 |
| | | | | | | |||||
| | | | | * | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens | kumavis | 2018-03-31 | 26 | -667/+1249 |
| | | | | |\ | |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge pull request #3781 from MetaMask/ci-artifacts | Thomas Huang | 2018-03-31 | 26 | -434/+833 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Build - Refactor + CircleCI Mascara builds | ||||
| * | | | | | clean - mascara - remove unused code | kumavis | 2018-03-30 | 1 | -2/+0 |
| | | | | | | |||||
| * | | | | | mascara - server - serve bundles from dist | kumavis | 2018-03-30 | 3 | -14/+1 |
| | | | | | | |||||
| * | | | | | npm scripts - rewrite default scripts to new task names | kumavis | 2018-03-30 | 1 | -6/+5 |
| | | | | | | |||||
| * | | | | | build - split primary tasks into metamask + extension * dev + build | kumavis | 2018-03-30 | 1 | -7/+55 |
| | | | | | | |||||
| * | | | | | build - cleanup commented code | kumavis | 2018-03-30 | 1 | -27/+0 |
| | | | | | | |||||
| * | | | | | build - fix scss + js reload | kumavis | 2018-03-30 | 1 | -8/+12 |
| | | | | | | |||||
| * | | | | | build - fix copy devMode | kumavis | 2018-03-30 | 1 | -32/+31 |
| | | | | | | |||||
| * | | | | | build - refactor scss compilation into single config | kumavis | 2018-03-30 | 1 | -18/+63 |
| | | | | | | |||||
| * | | | | | build - dev - fix js build order | kumavis | 2018-03-30 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | build - dev - run js tasks in parallel and set watch flag | kumavis | 2018-03-30 | 1 | -3/+4 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-03-30 | 81 | -512/+952 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | ci-artifacts | ||||
| * | | | | | ci - build:announce - fix links to extension builds | kumavis | 2018-03-29 | 1 | -4/+5 |
| | | | | | | |||||
| * | | | | | ci - build:announce - fix link | kumavis | 2018-03-29 | 1 | -5/+5 |
| | | | | | | |||||
| * | | | | | ci - build:announce - link all builds | kumavis | 2018-03-29 | 1 | -2/+9 |
| | | | | | | |||||
| * | | | | | ci - artifacts - upload extension builds, dont upload extension source | kumavis | 2018-03-29 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | npm scripts - simplify and speed up dist builds | kumavis | 2018-03-29 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | ci - upload whole dist + fix announce mascara url | kumavis | 2018-03-29 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | ui - fix typo in settings | kumavis | 2018-03-29 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | ci - artifacts - simplify result path | kumavis | 2018-03-29 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | deps - update package-lock | kumavis | 2018-03-29 | 2 | -88/+226 |
| | | | | | | |||||
| * | | | | | ui - add guard against unset locale | kumavis | 2018-03-29 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | build - refactor copy and copy:watch (renamed to copy:dev) | kumavis | 2018-03-29 | 1 | -44/+62 |
| | | | | | | |||||
| * | | | | | ui - identicon - use relative link for ether logo | kumavis | 2018-03-29 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | ui - use relative location for images | kumavis | 2018-03-29 | 4 | -5/+5 |
| | | | | | | |||||
| * | | | | | ui - fix relative url for deposit-ether-modal | kumavis | 2018-03-29 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | ui - use relative url for i18n-helper fetching locales | kumavis | 2018-03-29 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | mascara - fix proxy html script link | kumavis | 2018-03-29 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | deps - update pakage-lock | kumavis | 2018-03-29 | 1 | -10/+97 |
| | | | | | | |||||
| * | | | | | mascara - use sw-controller and other cleanups | kumavis | 2018-03-29 | 5 | -40/+50 |
| | | | | | | |||||
| * | | | | | build - extension - move js files to toplevel | kumavis | 2018-03-29 | 6 | -14/+14 |
| | | | | | | |||||
| * | | | | | build - mascara - copy proxy html | kumavis | 2018-03-29 | 1 | -4/+13 |
| | | | | | | |||||
| * | | | | | build - refactor js build process | kumavis | 2018-03-29 | 1 | -43/+66 |
| | | | | | | |||||
| * | | | | | build - fix mascara sourcemaps dest | kumavis | 2018-03-29 | 1 | -49/+46 |
| | | | | | | |||||
| * | | | | | build - remove copy debug | kumavis | 2018-03-29 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | build - remove deprecated deps task | kumavis | 2018-03-29 | 1 | -12/+0 |
| | | | | | | |||||
| * | | | | | build - refactor copy tasks | kumavis | 2018-03-29 | 1 | -26/+46 |
| | | | | | | |||||
| * | | | | | mascara - server - server bundles before static assets + serve dist/mascara ↵ | kumavis | 2018-03-29 | 1 | -9/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | instead of chrome | ||||
| * | | | | | mascara - html - fix script locations | kumavis | 2018-03-29 | 2 | -4/+4 |
| | | | | | | |||||
| * | | | | | ci - announce QA build to GitHub pull request | kumavis | 2018-03-29 | 1 | -0/+12 |
| | | | | | | |||||
| * | | | | | ui - css - use relative path for fonts | kumavis | 2018-03-29 | 1 | -14/+14 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-03-29 | 6 | -49/+83 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | ci-artifacts | ||||
| * | | | | | | build - refactor build task generators + add mascara to standard build phase | kumavis | 2018-03-29 | 1 | -86/+116 |
| | | | | | | | |||||
| * | | | | | | mascara - move file locations to match extension structure | kumavis | 2018-03-29 | 3 | -6/+6 |
| | | | | | | | |||||
| * | | | | | | ci - upload mascara build as artifact | kumavis | 2018-03-29 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | build - rename 'popup.js' to 'ui.js' | kumavis | 2018-03-29 | 4 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | ui - change window title 'MetaMask Plugin' to 'MetaMask' | kumavis | 2018-03-29 | 3 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | ci - publish dist as artifact | kumavis | 2018-03-29 | 1 | -0/+3 |
| | |_|/ / / | |/| | | | | |||||
| | | | | * | test - e2e - set network to localhost | kumavis | 2018-03-31 | 1 | -0/+6 |
| | | | | | | |||||
| | | | | * | 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 | 2 | -17/+205 |
| | | | | | | |||||
| | | | | * | Update package-lock | Thomas | 2018-03-31 | 1 | -0/+1819 |
| | | | | | | |||||
| | | | | * | Ganache:start script with seed phrase | Thomas | 2018-03-31 | 1 | -2/+4 |
| | | | | | | |||||
| | | | | * | development - screens - use localhost for network | kumavis | 2018-03-31 | 2 | -6/+20 |
| | | | | | | |||||
| | | | | * | network - use providerType for localhost | kumavis | 2018-03-31 | 2 | -6/+7 |
| | | | | | | |||||
| | | | | * | ci - run screenshotter | kumavis | 2018-03-30 | 1 | -0/+21 |
| | | | | | | |||||
| | | | | * | development - screenshotter - capture en locale and build gif from only en | kumavis | 2018-03-30 | 1 | -7/+8 |
| | | | | | | |||||
| | | | | * | development - screenshotter - capture screens across all locales | kumavis | 2018-03-30 | 2 | -13/+35 |
| | | | | | | |||||
| | | | | * | development - create selenium screen shotter | kumavis | 2018-03-30 | 3 | -45/+246 |
| | | | | | | |||||
| | | | | * | test - add auto screen shotter | kumavis | 2018-03-30 | 4 | -1/+276 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #3788 from danjm/i3787-make-t-available-via-context | kumavis | 2018-03-30 | 73 | -451/+818 |
|\ \ \ \ \ | | | | | | | | | | | | | i18n - Removes t from props via metamask-connect; put t on context | ||||
| * \ \ \ \ | Merge branch 'master' into i3787-make-t-available-via-context | Dan | 2018-03-30 | 3 | -6/+29 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #3798 from MetaMask/e2e-selector | Thomas Huang | 2018-03-30 | 3 | -6/+29 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | test - e2e - generate artifacts on test failure | ||||
| * | | | | | | ci - upload e2e test artifacts | kumavis | 2018-03-30 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into e2e-selector | kumavis | 2018-03-30 | 13 | -89/+177 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | test - e2e - fix selector with extra div (?) | kumavis | 2018-03-30 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | test - e2e - generate artifacts on test failure | kumavis | 2018-03-30 | 2 | -6/+26 |
| | | | | | | | |||||
| | * | | | | | Add changelog entry for language selection. | Dan | 2018-03-30 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Stopping wrapping provider children in div; stop wrapping old-ui in provider. | Dan | 2018-03-30 | 3 | -6/+5 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into i3787-make-t-available-via-context | Dan | 2018-03-30 | 5 | -52/+67 |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #3795 from MetaMask/i3790-IncreaseSafeGasLimit | kumavis | 2018-03-30 | 2 | -3/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Increase safe gas limit | ||||
| * | | | | | | | Bump changelog | Dan Finlay | 2018-03-30 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Increase permitted safe gas limit | Dan Finlay | 2018-03-30 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Block gas limits have been incredibly stable lately: https://etherscan.io/chart/gaslimit And this validation has prevented Aragon's new beta from working: https://twitter.com/izqui9/status/979373309312815104 Fixes #3790 | ||||
* | | | | | | | | Merge pull request #3794 from MetaMask/e2e-selector | Thomas Huang | 2018-03-30 | 1 | -17/+16 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | test - e2e - prefer css selectors over xpath | ||||
| * | | | | | | | | Better delays and fix logout css selector | Thomas | 2018-03-30 | 1 | -3/+6 |
| | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | test - e2e - prefer css selectors over xpath | kumavis | 2018-03-30 | 1 | -15/+11 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | i18n - Update German Locale | Nico | 2018-03-30 | 1 | -24/+39 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3786 from FBrinkkemper/patch-1 | kumavis | 2018-03-30 | 1 | -8/+8 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | changed zaad -> back-up woorden | ||||
| * | | | | | | changed zaad -> back-up woorden | FBrinkkemper | 2018-03-29 | 1 | -8/+8 |
|/ / / / / / | | | | | | | | | | | | | Zaad sounds strange in Dutch. Back-up woorden (back-up words) are a better translation in Dutch. Back-up is also a Dutch phrase, like it is in English. | ||||
| | * / / / | Removes t from props via metamask-connect and instead places it on context ↵ | Dan | 2018-03-29 | 73 | -450/+817 |
| |/ / / / |/| | | | | | | | | | | | | | | via a provider. | ||||
* | | | | | Merge pull request #3782 from MetaMask/i3670-FixNonceBug | Frankie | 2018-03-29 | 2 | -3/+38 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Add test for suspected nonce bug | ||||
| * | | | | Rename variable to be more understandable | Dan Finlay | 2018-03-29 | 2 | -5/+21 |
| | | | | | |||||
| * | | | | Add test to reproduce issue behavior | Dan Finlay | 2018-03-29 | 1 | -0/+19 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #3777 from MetaMask/etc-fixes | Frankie | 2018-03-29 | 3 | -38/+54 |
|\ \ \ \ | | | | | | | | | | | Sentry spam fix and etc fixes | ||||
| * | | | | controllers - currency - warn currency and encountered error | kumavis | 2018-03-29 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | deps - bump ethjs-query to fix unhandled promise rejections | kumavis | 2018-03-29 | 2 | -14/+19 |
| | | | | | |||||
| * | | | | deps - update package-lock (maybe greenkeeper forgot?) | kumavis | 2018-03-29 | 1 | -23/+34 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #3765 from MetaMask/sentry-error-simplify | Frankie | 2018-03-29 | 1 | -2/+12 |
|\ \ \ \ | | | | | | | | | | | sentry - simplify error message 'Transaction Failed: known transaction' | ||||
| * | | | | sentry - simplify error message 'Transaction Failed: known transaction' | kumavis | 2018-03-28 | 1 | -2/+12 |
| |/ / / | |||||
* | | | | Merge pull request #3767 from MetaMask/tx-state-undefined-value | Frankie | 2018-03-29 | 2 | -9/+17 |
|\ \ \ \ | |/ / / |/| | | | tx controller - stricter validation and other improvements | ||||
| * | | | tx controller - explode on non-hex txParams + dont add chainId to txParams + ↵ | kumavis | 2018-03-28 | 2 | -9/+17 |
|/ / / | | | | | | | | | | sign with chainId as number | ||||
* | | | 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 |
| | | | | | |||||
* | | | | | Merge pull request #3752 from MetaMask/sentry-error-fix | Frankie | 2018-03-28 | 3 | -25/+35 |
|\ \ \ \ \ | | | | | | | | | | | | | sentry - simplify all ethjs errors for better batching | ||||
| * | | | | | sentry - simplify all ethjs errors for better batching | kumavis | 2018-03-28 | 3 | -25/+35 |
| | | | | | | |||||
* | | | | | | Merge pull request #3760 from MetaMask/i3439-ResetCacheOnAccountReset | kumavis | 2018-03-28 | 2 | -34/+41 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix bug where resetAccount does not clear network cache | ||||
| * | | | | | | metamask-controller - fix typo | kumavis | 2018-03-28 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fix bug where resetAccount does not clear network cache | Dan Finlay | 2018-03-28 | 2 | -34/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3439 | ||||
* | | | | | | | Merge pull request #3745 from danjm/i3723-fix-long-token-ammounts | kumavis | 2018-03-28 | 1 | -1/+8 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Long token amounts in wallet are truncated with ellipsis. | ||||
| * | | | | | | | Long token amounts in wallet are truncated with ellipsis. | Dan | 2018-03-27 | 1 | -1/+8 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3742 from danjm/i3705-prefix-to-address-with-0x | kumavis | 2018-03-28 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Prefixes to addresses with 0x before sending. | ||||
| * | | | | | | | Prefixes to addresses with 0x before sending. | Dan | 2018-03-27 | 1 | -1/+3 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #3741 from MetaMask/i3692-addtoken-address-undefined | kumavis | 2018-03-28 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Prevent users from adding custom token if decimals is an empty string. | ||||
| * | | | | | | | Prevent users from adding custom token if decimals is an empty string. | Dan | 2018-03-27 | 1 | -1/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #3740 from danjm/i3682-navigateTo-undefined | kumavis | 2018-03-28 | 1 | -5/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Stop using navigateTo for external link in settings. | ||||
| * | | | | | | | Stop using navigateTo for external link in settings. | Dan | 2018-03-27 | 1 | -5/+0 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #3743 from gasolin/buyetherview | kumavis | 2018-03-28 | 1 | -2/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | remove unavailable goToBuyEtherView propType | ||||
| * | | | | | | | remove unavailable goToBuyEtherView propType | gasolin | 2018-03-27 | 1 | -2/+0 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #3609 from MetaMask/i18n-translator-redux | kumavis | 2018-03-28 | 100 | -650/+1155 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Handle i18n with redux. | ||||
| * | | | | | | i18n - fix locales inde | kumavis | 2018-03-28 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | ui - actions - fix log for background call | kumavis | 2018-03-28 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | ui - settings - fix for currentLocale | kumavis | 2018-03-28 | 1 | -2/+3 |
| | | | | | | | |||||
| * | | | | | | ui - settings - derrive locales from index | kumavis | 2018-03-28 | 1 | -8/+1 |
| | | | | | | | |||||
| * | | | | | | i18n - derrive locale codes from index | kumavis | 2018-03-28 | 1 | -3/+2 |
| | | | | | | | |||||
| * | | | | | | development - genStates - simplify locale importing | kumavis | 2018-03-28 | 2 | -14/+2 |
| | | | | | | | |||||
| * | | | | | | i18n - add locales index json | kumavis | 2018-03-28 | 1 | -0/+19 |
| | | | | | | | |||||
| * | | | | | | test - integration - add locale build step | kumavis | 2018-03-28 | 1 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'i18n-translator-redux' of ↵ | kumavis | 2018-03-28 | 1 | -1/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | github.com:MetaMask/metamask-extension into i18n-translator-redux | ||||
| | * | | | | | | Don't query for undefined. | Dan | 2018-03-28 | 1 | -1/+3 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-03-28 | 6 | -12/+194 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | i18n-translator-redux | ||||
* | | | | | | | Merge pull request #3758 from MetaMask/i#3731 | kumavis | 2018-03-28 | 5 | -9/+154 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | I#3731 | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into i#3731 | frankiebee | 2018-03-28 | 5 | -28/+118 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | migration for removing unnecessary transactions from state | frankiebee | 2018-03-28 | 4 | -3/+154 |
| | | | | | | | | |||||
| * | | | | | | | transactions - only save up to 40 txs totall across all networks | frankiebee | 2018-03-27 | 1 | -6/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3755 from MetaMask/revert-3730-revert-3665-ci-build | Thomas Huang | 2018-03-28 | 1 | -3/+40 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | Restore "Ci - introduce a build job" | ||||
| * | | | | | | | ci - end by flowing all required tests into a single job | kumavis | 2018-03-28 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | ci - end by flowing all required tests into a single job | kumavis | 2018-03-28 | 1 | -7/+8 |
| | | | | | | | | |||||
| * | | | | | | | ci - end by flowing all required tests into a single job | kumavis | 2018-03-28 | 1 | -0/+16 |
| | | | | | | | | |||||
| * | | | | | | | ci - run e2e tests after build step | kumavis | 2018-03-28 | 1 | -18/+21 |
| | | | | | | | | |||||
| * | | | | | | | Revert "Revert "Ci - introduce a build job"" | kumavis | 2018-03-28 | 1 | -0/+17 |
|/ / / / / / / | |||||
| | | * | | | | deps - update package-lock | kumavis | 2018-03-28 | 1 | -3/+63 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-03-28 | 7 | -26/+448 |
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | i18n-translator-redux | ||||
* | | | | | | | Merge pull request #3754 from MetaMask/selenium-e2e | Thomas Huang | 2018-03-28 | 5 | -1/+336 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | test - e2e testing with selenium | ||||
| * | | | | | | deps - update package-lock | kumavis | 2018-03-28 | 1 | -0/+6 |
| | | | | | | | |||||
| * | | | | | | ci - run e2e jobs | kumavis | 2018-03-28 | 2 | -1/+18 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into selenium-e2e | Thomas Huang | 2018-03-28 | 59 | -429/+3417 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #3739 from gasolin/zhtwfixv4.4.0 | kumavis | 2018-03-28 | 1 | -11/+50 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [zh-TW] fix translation and add missing strings | ||||
| * | | | | | | | [zh-TW] fix translation and add missing strings | gasolin | 2018-03-27 | 1 | -11/+50 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3746 from nyatla/master | kumavis | 2018-03-28 | 1 | -14/+62 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | Updated the Japanese expression and added some translations. | ||||
| * | | | | | | | Update messages.json | R.IIzuka | 2018-03-27 | 1 | -14/+62 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Fixed Japanese phrases. Add some translations. | ||||
| | * | | | | | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-22 | 2 | -8/+2 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-22 | 121 | -4075/+11734 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-15 | 98 | -886/+2555 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-10 | 3 | -18/+154 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Update selenium tests | Thomas | 2018-03-10 | 1 | -9/+7 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Add selenium-webdriver and chromedriver | Thomas | 2018-03-10 | 1 | -0/+175 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into selenium-e2e | Thomas | 2018-03-10 | 428 | -4347/+70713 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | chromedriver, changed extension id(might need zip/crx file) | Thomas | 2018-01-19 | 3 | -4/+6 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Update | Thomas | 2018-01-18 | 3 | -1/+144 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | E2E testing with selenium | tmashuang | 2017-09-13 | 3 | -1/+144 |
| | | | | | | | | | | | | | |||||
| | | | | | | | | | * | | | Undo unnecessary line removals. | Dan | 2018-03-27 | 2 | -0/+2 |
| | | | | | | | | | | | | | |||||
| | | | | | | | | | * | | | Remove comments and console.logs | Dan | 2018-03-27 | 3 | -4/+3 |
| | | | | | | | | | | | | | |||||
| | | | | | | | | | * | | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-27 | 21 | -140/+2922 |
| | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #3737 from MetaMask/include-migration-22 | kumavis | 2018-03-27 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | include migration 22 | ||||
| * | | | | | | | | | | | | include migration 22 | frankiebee | 2018-03-27 | 1 | -0/+1 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #3735 from MetaMask/v4.4.0 | Dan Finlay | 2018-03-27 | 2 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | v4.4.0 | ||||
| * | | | | | | | | | | | | changelog - add note ofr i18n zh_tw th sl | kumavis | 2018-03-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | v4.4.0 | kumavis | 2018-03-27 | 2 | -1/+3 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #3732 from MetaMask/i3706-FixLocalStoreWrite | Dan Finlay | 2018-03-27 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | Fix bug where full localStorage would crash on start | ||||
| * | | | | | | | | | | | Fix bug where full localStorage would crash on start | Dan Finlay | 2018-03-27 | 2 | -2/+2 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #3680 from danjm/i3517-popup-newui-onboarding | Thomas Huang | 2018-03-27 | 4 | -14/+14 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Popup uses new ui onboarding when in beta. |