Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ci - rename job-publish to job-publish-prerelease | kumavis | 2018-05-19 | 1 | -2/+2 |
* | ci - clean - whitespace fix | kumavis | 2018-05-19 | 1 | -4/+3 |
* | Merge pull request #4266 from MetaMask/send-screen-detailed-QA-checklist | kumavis | 2018-05-17 | 1 | -0/+96 |
|\ | |||||
| * | Adds description to send-screen-QA-checklist.md | Dan | 2018-05-16 | 1 | -1/+7 |
| * | Adds detailed QA checklist for the New UI send screen. | Dan | 2018-05-16 | 1 | -0/+90 |
* | | Merge pull request #4235 from scsaba/transaction-history-timestamps | kumavis | 2018-05-17 | 5 | -74/+143 |
|\ \ | |||||
| * \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-... | kumavis | 2018-05-17 | 55 | -3285/+2945 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #4146 from MetaMask/sentry-error-like2 | kumavis | 2018-05-17 | 1 | -17/+25 |
|\ \ \ | |||||
| * | | | sentry - add helper to fully rewrite all error messages | kumavis | 2018-05-01 | 1 | -17/+25 |
* | | | | Merge pull request #4255 from MetaMask/i4233-dropdowns | kumavis | 2018-05-17 | 5 | -21/+58 |
|\ \ \ \ | |||||
| * | | | | Fix account and network dropdowns in confirm screen | Alexander Tseung | 2018-05-15 | 5 | -21/+58 |
* | | | | | Merge pull request #4155 from MetaMask/network-controller-remove-setNetworkEn... | kumavis | 2018-05-17 | 14 | -216/+49 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | ui - unlock - remove setNetworkEndpoints calls from new unlock screen | kumavis | 2018-05-17 | 2 | -3/+0 |
| * | | | | ui - remove files accidently added by bad merge | kumavis | 2018-05-17 | 2 | -328/+0 |
| * | | | | network - remove debugging console.log | kumavis | 2018-05-17 | 1 | -1/+0 |
| * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network... | kumavis | 2018-05-17 | 73 | -2757/+8317 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #4251 from whymarrh/e2e-fixes | Thomas Huang | 2018-05-15 | 3 | -6/+7 |
|\ \ \ \ \ | |||||
| * | | | | | e2e: Use the more reliable enter key for logging in | Whymarrh Whitby | 2018-05-15 | 1 | -1/+1 |
| * | | | | | e2e: Wait a bit before clicking through privacy screen | Whymarrh Whitby | 2018-05-15 | 1 | -0/+1 |
| * | | | | | e2e: Adjust the extension ID query for newer Chrome versions | Whymarrh Whitby | 2018-05-15 | 1 | -1/+1 |
| * | | | | | e2e: Use newest window as MM tx confirm popup | Whymarrh Whitby | 2018-05-15 | 2 | -2/+2 |
| * | | | | | Bail after the first e2e test failure | Whymarrh Whitby | 2018-05-15 | 1 | -2/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #4245 from MetaMask/i4208-error | Kevin Serrano | 2018-05-15 | 8 | -233/+216 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add error message when passwords don't match in first time flow. Change input... | Alexander Tseung | 2018-05-14 | 8 | -233/+216 |
|/ / / / | |||||
* | | | | Merge pull request #4190 from MetaMask/i3614-unlock | Frankie | 2018-05-13 | 30 | -598/+964 |
|\ \ \ \ | |||||
| * | | | | Add TextField component to storybook | Alexander Tseung | 2018-05-12 | 3 | -2/+25 |
| * | | | | Add new unlock screen design | Alexander Tseung | 2018-05-12 | 29 | -598/+941 |
|/ / / / | |||||
* | | | | Merge pull request #4226 from MetaMask/e2e-tests | kumavis | 2018-05-12 | 8 | -793/+1058 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-12 | 5 | -1440/+607 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Chinese translation Enhancements (#4218) | Orange | 2018-05-12 | 1 | -25/+358 |
* | | | | | Merge pull request #4231 from MetaMask/fix-nodesecurity | kumavis | 2018-05-12 | 3 | -1414/+248 |
|\ \ \ \ \ | |||||
| * | | | | | Add advisory #157 to .nsprc | Alexander Tseung | 2018-05-11 | 1 | -1/+4 |
| * | | | | | Update lodash | Alexander Tseung | 2018-05-10 | 1 | -51/+51 |
| * | | | | | Update deep-extend and sshpk | Alexander Tseung | 2018-05-10 | 2 | -1362/+193 |
|/ / / / / | |||||
| * | | | | Increase timeout | Thomas | 2018-05-11 | 1 | -1/+1 |
| * | | | | Fix typo | Thomas | 2018-05-11 | 1 | -1/+1 |
| * | | | | Job Screens with Shadow Dom Css selector | Thomas | 2018-05-11 | 3 | -6/+7 |
| * | | | | Multistep Shadow Dom Query Selector for local extension id | Thomas | 2018-05-11 | 1 | -10/+10 |
| * | | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-09 | 23 | -25/+3195 |
| |\ \ \ \ | |||||
| * | | | | | Update test:screens to newest chrome extension list | Thomas | 2018-05-08 | 1 | -1/+1 |
| * | | | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-08 | 5 | -5/+51 |
| |\ \ \ \ \ | |||||
| * | | | | | | Update to extension Id path for new chrome | Thomas | 2018-05-08 | 1 | -5/+5 |
| * | | | | | | Remove waiting for button to be enabled TOU | Thomas | 2018-05-04 | 1 | -1/+0 |
| * | | | | | | Merge branch 'e2e-tests' of https://github.com/tmashuang/metamask-extension i... | Thomas | 2018-05-04 | 81 | -1892/+4484 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Add a comment on the confirmation transaction metamask popup showing blank, b... | Thomas | 2018-05-04 | 1 | -0/+1 |
| | * | | | | | | Quit chromedriver after test | Thomas | 2018-05-04 | 1 | -3/+3 |
| | * | | | | | | Bump package lock | Thomas | 2018-05-04 | 1 | -629/+285 |
| | * | | | | | | Merge branch 'develop' into e2e-tests | Thomas | 2018-05-04 | 79 | -1361/+4296 |
| | |\ \ \ \ \ \ | |||||
| * | | | | | | | | Increase timeout for TOU scroll | Thomas | 2018-05-04 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | Reduce delay for installing firefox addon | Thomas | 2018-05-04 | 1 | -2/+1 |
| * | | | | | | | Add Timeouts for driver.wait | Thomas | 2018-05-04 | 1 | -9/+8 |
| * | | | | | | | Test wit driver.wait | Thomas | 2018-05-04 | 1 | -18/+21 |
| * | | | | | | | Ci Firefox | Thomas | 2018-05-03 | 1 | -5/+1 |
| * | | | | | | | Delay around the addon install | Thomas | 2018-05-02 | 1 | -2/+3 |
| * | | | | | | | test increase timeout | Thomas | 2018-05-02 | 1 | -1/+1 |
| * | | | | | | | Async/await installing extension | Thomas | 2018-05-02 | 1 | -4/+4 |
| * | | | | | | | Firefox | Thomas | 2018-05-02 | 7 | -216/+2543 |
| | | | | * | | | lint - cleanup some unused variables | kumavis | 2018-05-03 | 8 | -15/+0 |
| | | | | * | | | test - network controller - remove tests for deprecated APIs + update tests | kumavis | 2018-05-03 | 1 | -25/+5 |
| | | | | * | | | controllers - network - move default config out of first-time-state | kumavis | 2018-05-03 | 2 | -11/+15 |
| | | | | * | | | network - refactor to remove unnecesary code | kumavis | 2018-05-01 | 3 | -124/+29 |
| | | | | * | | | network - remove setNetworkEndpoints | kumavis | 2018-05-01 | 10 | -45/+1 |
| | | | | * | | | controllers - network - more semantic assert | kumavis | 2018-05-01 | 1 | -1/+1 |
| | | | | |/ / | |||||
| | | | | | * | tx-state-history-helper - use more readable Date.now method | kumavis | 2018-05-17 | 1 | -1/+1 |
| | | | | | * | fix lint issues | Csaba Solya | 2018-05-10 | 2 | -2/+2 |
| | | | | | * | remove unnecessary lib | Csaba Solya | 2018-05-10 | 1 | -1/+0 |
| | | | | | * | revert unnecessary change in state manager | Csaba Solya | 2018-05-10 | 1 | -13/+7 |
| | | | | | * | add time stamps to transaction history log entries | Csaba Solya | 2018-05-10 | 5 | -81/+157 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge pull request #4214 from MetaMask/tx-controller-doc-typo | Dan Finlay | 2018-05-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Fix documentation typo | bitpshr | 2018-05-08 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #4196 from MetaMask/i3457-fontweight | Thomas Huang | 2018-05-09 | 11 | -22/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Change font weight from 300 to 400 | Alexander Tseung | 2018-05-06 | 11 | -22/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #4099 from MetaMask/i4043-storybook-dev2 | Thomas Huang | 2018-05-09 | 12 | -3/+3199 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Add storybook README.md file | Alexander Tseung | 2018-05-08 | 1 | -0/+10 |
| * | | | | Add storybook integration | Alexander Tseung | 2018-05-04 | 11 | -3/+3189 |
| |/ / / | |||||
* | | | | Fix Slovenian translation (#4189) | Filip Š | 2018-05-08 | 1 | -4/+4 |
* | | | | Merge pull request #4163 from MetaMask/check-nonce-ussage | kumavis | 2018-05-08 | 4 | -1/+47 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | transactions - add a nonce check utility for ui use | frankiebee | 2018-05-02 | 3 | -0/+46 |
| * | | | fix - getTxsByMetaData check if the key is in the object not if the value is ... | frankiebee | 2018-05-02 | 1 | -1/+1 |
* | | | | Merge pull request #4156 from MetaMask/i4010-spinner | kumavis | 2018-05-03 | 9 | -10/+115 |
|\ \ \ \ | |||||
| * | | | | Fix styling of the app spinner | Alexander Tseung | 2018-05-01 | 9 | -10/+115 |
* | | | | | Merge pull request #4173 from MetaMask/chromedriver | kumavis | 2018-05-03 | 2 | -182/+1360 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | 2 | -181/+1360 |
|/ / / / / | |||||
* | | | | | Merge pull request #4172 from MetaMask/nodesecurity | kumavis | 2018-05-03 | 3 | -0/+319 |
|\ \ \ \ \ | |||||
| * | | | | | Adds nsp check to CircleCI tests | Alexander Tseung | 2018-05-03 | 3 | -0/+319 |
|/ / / / / | |||||
* | | | | | Merge pull request #4166 from MetaMask/i4010-deps4 | Frankie | 2018-05-02 | 2 | -0/+290 |
|\ \ \ \ \ | |||||
| * | | | | | Adds sass-loader and style-loader packages for storybook integration | Alexander Tseung | 2018-05-02 | 2 | -0/+123 |
| * | | | | | Adds path and resolve-url-loader packages for storybook integration | Alexander Tseung | 2018-05-02 | 2 | -0/+167 |
|/ / / / / | |||||
* | | | | | Merge pull request #4164 from MetaMask/i4010-deps3 | Frankie | 2018-05-02 | 2 | -1395/+1723 |
|\ \ \ \ \ | |||||
| * | | | | | Adds css-loader and file-loader needed for storybook integration | Alexander Tseung | 2018-05-02 | 2 | -1395/+1723 |
|/ / / / / | |||||
* | | | | | Merge pull request #4162 from MetaMask/ui-actions-pify-importNewAccount | kumavis | 2018-05-02 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | ui - actions - importNewAccount - rethrow err on failure | kumavis | 2018-05-02 | 1 | -1/+1 |
* | | | | | Merge pull request #4143 from prettymuchbryce/blacklist-shopify-iframe | kumavis | 2018-05-01 | 1 | -0/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Blacklist problematic shopify iFrame | Bryce Neal | 2018-05-01 | 1 | -0/+1 |
* | | | | | Handle Promise rejections when importing accounts (#4142) | Paul Bouchon | 2018-05-01 | 5 | -0/+12 |
* | | | | | Merge pull request #4144 from MetaMask/ui-actions-pify-importNewAccount | kumavis | 2018-05-01 | 1 | -24/+20 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | ui - actions - importNewAccount - use async and pify for cleaner syntax | kumavis | 2018-05-01 | 1 | -24/+20 |
|/ / / / | |||||
* | | | | Merge pull request #4139 from MetaMask/sentry-enhancementsv4.6.1 | Thomas Huang | 2018-05-01 | 1 | -16/+34 |
|\ \ \ \ | |||||
| * | | | | sentry - report error-like messages using the obj message | kumavis | 2018-05-01 | 1 | -0/+10 |
| * | | | | sentry - wrap report modifiers in a try-catch | kumavis | 2018-05-01 | 1 | -16/+24 |
|/ / / / | |||||
* | | | | Merge pull request #4059 from MetaMask/i-4033-seed-words | kumavis | 2018-05-01 | 21 | -425/+475 |
|\ \ \ \ | |||||
| * | | | | Redirect to correct seed phrase screen | Alexander Tseung | 2018-04-27 | 1 | -2/+2 |
| * | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-23 | 28 | -4150/+305 |
| |\ \ \ \ | |||||
| * | | | | | Use new design for reveal seed screen. Persist seed words only in first time ... | Alexander Tseung | 2018-04-23 | 18 | -306/+461 |
| * | | | | | Revert "Fix UI getting stuck in Reveal Seed screen" | Alexander Tseung | 2018-04-22 | 6 | -116/+23 |
* | | | | | | Merge pull request #4111 from MetaMask/build-fix-sourcemaps | Frankie | 2018-05-01 | 4 | -62/+103 |
|\ \ \ \ \ \ | |||||
| * | | | | | | deps - package-lock | kumavis | 2018-04-28 | 1 | -51/+43 |
| * | | | | | | development - add sourcemap debug tool | kumavis | 2018-04-28 | 2 | -0/+50 |
| * | | | | | | build - minify via gulp-uglify-es instead of uglifyify | kumavis | 2018-04-28 | 2 | -11/+10 |
* | | | | | | | Merge pull request #4121 from MetaMask/i3688-shapeshift-500s | kumavis | 2018-05-01 | 2 | -7/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix ShapeShift purchases on new UI | bitpshr | 2018-04-29 | 1 | -6/+7 |
| * | | | | | | | Update old UI ShapeshiftForm to gracefully handle errors | bitpshr | 2018-04-29 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #4116 from MetaMask/test-unit-ganache | Thomas Huang | 2018-05-01 | 5 | -55/+114 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | deps - package-lock | kumavis | 2018-04-28 | 1 | -38/+80 |
| * | | | | | | | test - unit - send from test accounts to avoid not-enough-balance error from ... | kumavis | 2018-04-28 | 2 | -12/+12 |
| * | | | | | | | test - unit - use ganache instead of deprecated block-tracker test util | kumavis | 2018-04-28 | 2 | -5/+22 |
* | | | | | | | | Merge pull request #4132 from MetaMask/master | kumavis | 2018-04-30 | 2 | -18/+25 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge pull request #4128 from MetaMask/raven-transport-fix | kumavis | 2018-04-30 | 2 | -18/+25 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| | * | | | | | | | guard adainst raven erroring | frankiebee | 2018-04-30 | 2 | -18/+25 |
| |/ / / / / / / | |||||
* | | / / / / / | Verify identities state after restoring new accounts (#4091) | Paul Bouchon | 2018-04-30 | 1 | -8/+25 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #4113 from MetaMask/i4107-send-tokens-without-symbols-deci... | kumavis | 2018-04-28 | 4 | -45/+43 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Simplify return of existing token in getSymbolAndDecimals | Dan | 2018-04-28 | 1 | -4/+1 |
| * | | | | | | Convert decimals to string in getSymbolAndDecimals; return null for symbol or... | Dan | 2018-04-28 | 3 | -20/+10 |
| * | | | | | | Wraps calls to symbol() and decimals() in try catch | Dan | 2018-04-28 | 3 | -30/+41 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4110 from MetaMask/master | kumavis | 2018-04-28 | 20 | -395/+862 |
|\| | | | | | |||||
| * | | | | | Merge pull request #4095 from MetaMask/v4.6.0v4.6.0 | Thomas Huang | 2018-04-27 | 10 | -123/+1848 |
| |\ \ \ \ \ | |||||
| | * | | | | | v4.6.0 | kumavis | 2018-04-27 | 2 | -1/+3 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3 | kumavis | 2018-04-26 | 18 | -394/+859 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | transactions - more docs and clean ups | frankiebee | 2018-04-26 | 6 | -55/+116 |
| | * | | | | Cleaned up some typos and JSDocs in Transactions | Dan Finlay | 2018-04-24 | 3 | -38/+40 |
| | * | | | | transactions - fix refernces | frankiebee | 2018-04-20 | 2 | -1/+2 |
| | * | | | | Merge branch 'master' into tx-controller-rewrite-v3 | frankiebee | 2018-04-20 | 163 | -3365/+14592 |
| | |\ \ \ \ | |||||
| | * | | | | | meta - transactions - docs yo! | frankiebee | 2018-04-20 | 9 | -73/+351 |
| | * | | | | | fix up - more docs | frankiebee | 2018-04-14 | 3 | -38/+77 |
| | * | | | | | meta - transactions - code clean up and jsDoc | frankiebee | 2018-04-14 | 2 | -43/+111 |
| | * | | | | | transactions - code cleanup | frankiebee | 2018-04-13 | 2 | -58/+59 |
| | * | | | | | transactions - lint fixes | frankiebee | 2018-04-11 | 3 | -12/+12 |
| | * | | | | | meta - transactions - create a transactions dir in controller and move releva... | frankiebee | 2018-04-11 | 16 | -240/+255 |
* | | | | | | | Merge pull request #4097 from MetaMask/i4096-token-rates-error | Kevin Serrano | 2018-04-28 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Return 0 for token rate fetch failures | bitpshr | 2018-04-27 | 1 | -1/+5 |
| | |_|_|/ / / | |/| | | | | | |||||
* / | | | | | | Allow transactions with 0-gwei gas price (#4073) | Paul Bouchon | 2018-04-27 | 7 | -48/+80 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4065 from MetaMask/i18n-helper-bugfix | Dan Finlay | 2018-04-26 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | i18n-helper - wrap fallback in brackets to help indicate something is wrong | kumavis | 2018-04-26 | 1 | -1/+1 |
| * | | | | | | Return key instead of empty string on i18n fail | Dan Finlay | 2018-04-26 | 1 | -1/+1 |
| * | | | | | | i18n-helper - abort on i18n failure | kumavis | 2018-04-25 | 1 | -1/+2 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4083 from MetaMask/pe-bump | Dan Finlay | 2018-04-26 | 3 | -42/+176 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rpc - bump provider-engine + eth-json-rpc-filters | kumavis | 2018-04-26 | 3 | -42/+176 |
* | | | | | | | Merge pull request #4068 from MetaMask/privacy-notice-patch | kumavis | 2018-04-26 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Updated notices json file. | Kevin Serrano | 2018-04-26 | 1 | -1/+1 |
| * | | | | | | Clarify privacy notice | Dan Finlay | 2018-04-25 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4080 from MetaMask/AddDevelopGuideToContributing | Dan Finlay | 2018-04-26 | 1 | -2/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add develop guide to contributing.md | Dan Finlay | 2018-04-26 | 1 | -2/+4 |
* | | | | | | | Merge pull request #4070 from MetaMask/i3999-DeterministicBuilds | Dan Finlay | 2018-04-26 | 2 | -75/+1661 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Move uglifyify to MetaMask org | Dan Finlay | 2018-04-26 | 1 | -1/+1 |
| * | | | | | | Make minified builds more determinstic | Dan Finlay | 2018-04-25 | 2 | -75/+1661 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4069 from MetaMask/i4056-LatestPriceApi | Dan Finlay | 2018-04-26 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Use latest balanc3 api for prices | Dan Finlay | 2018-04-25 | 1 | -1/+1 |
* | | | | | | Merge pull request #4040 from MetaMask/dm-docs-2 | Dan Finlay | 2018-04-25 | 13 | -54/+764 |
|\ \ \ \ \ \ | |||||
| * | | | | | | lint fix | Dan | 2018-04-24 | 1 | -0/+1 |
| * | | | | | | Merge branch 'master' into dm-docs-2 | Dan | 2018-04-24 | 54 | -4390/+957 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #3940 from nyatla/master | Dan Finlay | 2018-04-24 | 3 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Reduced button padding. | nyatla | 2018-04-10 | 1 | -0/+1 |
| * | | | | | | | Expanded dropdown menu width of title. | nyatla | 2018-04-10 | 1 | -1/+1 |
| * | | | | | | | Changed mouse cursor to "pointer" on the cancel text at the top left of the p... | nyatla | 2018-04-10 | 1 | -0/+1 |
* | | | | | | | | Merge pull request #4023 from MetaMask/greenkeeper/ethjs-contract-0.2.0 | Dan Finlay | 2018-04-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix(package): update ethjs-contract to version 0.2.0 | greenkeeper[bot] | 2018-04-19 | 1 | -1/+1 |
* | | | | | | | | | Merge pull request #4062 from MetaMask/i4056-LatestPriceApi | Dan Finlay | 2018-04-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Use the metamask balanc3 dev price api | Dan Finlay | 2018-04-24 | 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 | kumavis | 2018-04-10 | 1 | -1/+1 |
* | | | | | | | | | | Merge pull request #3935 from MetaMask/ci-tests-first-then-dessert | Dan Finlay | 2018-04-24 | 1 | -10/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | ci - complete all tests before running extras | kumavis | 2018-04-10 | 1 | -10/+11 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #4057 from MetaMask/sentry-bump | Dan Finlay | 2018-04-24 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | deps - bump sentry for more detailed fetch failure | kumavis | 2018-04-24 | 2 | -4/+4 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #4029 from MetaMask/DocumentMetaMaskController | Dan Finlay | 2018-04-24 | 1 | -131/+330 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Linted docs | Dan Finlay | 2018-04-24 | 1 | -1/+1 |
| * | | | | | | | | | Linted jsdocs | Dan Finlay | 2018-04-21 | 1 | -52/+60 |
| * | | | | | | | | | Added docs to MM-controller | Dan Finlay | 2018-04-19 | 1 | -130/+321 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #3968 from MetaMask/gh-3653 | Dan Finlay | 2018-04-24 | 20 | -121/+212 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Clean up network config | Alexander Tseung | 2018-04-24 | 20 | -121/+212 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #4028 from MetaMask/i4016-customrpc | Dan Finlay | 2018-04-24 | 1 | -6/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix custom RPC not redirecting to Settings page | Alexander Tseung | 2018-04-19 | 1 | -6/+8 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #4041 from MetaMask/DocumentBackground | Dan Finlay | 2018-04-24 | 1 | -2/+127 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Remove wrong chars | Dan Finlay | 2018-04-21 | 1 | -2/+2 |
| * | | | | | | | | Add ui note to background docs | Dan Finlay | 2018-04-21 | 1 | -1/+1 |
| * | | | | | | | | Lint background docs | Dan Finlay | 2018-04-21 | 1 | -12/+12 |
| * | | | | | | | | Document MetaMaskState and TransactionMeta | Dan Finlay | 2018-04-21 | 1 | -0/+69 |
| * | | | | | | | | Document Background Script | Dan Finlay | 2018-04-20 | 1 | -2/+58 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshr | Dan Finlay | 2018-04-21 | 27 | -4149/+296 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Clean up JSDoc for background scripts | bitpshr | 2018-04-20 | 7 | -24/+32 |
| * | | | | | | | Add more documentation to computed balances controller | bitpshr | 2018-04-20 | 4 | -6/+77 |
| * | | | | | | | Add JSDoc to various background scripts | bitpshr | 2018-04-19 | 30 | -9339/+14 |
| * | | | | | | | Add generated docs | bitpshr | 2018-04-19 | 18 | -227/+5485 |
| * | | | | | | | Add JSDoc to various background scripts | bitpshr | 2018-04-19 | 6 | -70/+205 |
| | | | | | * | | Remove accidentally added code in message-manager. | Dan | 2018-04-24 | 1 | -8/+0 |
| | | | | | * | | Remove unnecessary doc comment. | Dan | 2018-04-24 | 1 | -2/+0 |
| | | | | | * | | Fix nits. | Dan | 2018-04-24 | 4 | -33/+33 |
| | | | | | * | | Minor fixes in a number of docs. | Dan | 2018-04-21 | 6 | -18/+17 |
| | | | | | * | | Notification manager method docs. | Dan | 2018-04-21 | 1 | -4/+31 |
| | | | | | * | | Merge branch 'master' into dm-docs-2 | Dan | 2018-04-20 | 117 | -1965/+8813 |
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #4030 from MetaMask/i4014-metamask-version | Thomas Huang | 2018-04-20 | 1 | -1/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Show correct MetaMask version number in the Info page | Alexander Tseung | 2018-04-19 | 1 | -1/+9 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #4026 from MetaMask/i4015-oldui-seed | Thomas Huang | 2018-04-19 | 1 | -6/+18 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix exception thrown when revealing seed words | Alexander Tseung | 2018-04-19 | 1 | -6/+18 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3984 from whymarrh/3941-jsdoc | Dan Finlay | 2018-04-19 | 9 | -48/+150 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add a few missing docblocks to background files | Whymarrh Whitby | 2018-04-19 | 9 | -48/+150 |
* | | | | | | | Merge pull request #3987 from MetaMask/dm-docs-1 | Dan Finlay | 2018-04-19 | 8 | -17/+389 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Missing bracket in docblock. | Dan | 2018-04-19 | 1 | -1/+1 |
| * | | | | | | Merge branch 'master' into dm-docs-1 | Dan | 2018-04-19 | 92 | -1703/+8290 |
| |\| | | | | | |||||
| * | | | | | | NO MIXED TABS AND SPACES | Dan | 2018-04-19 | 3 | -137/+137 |
| * | | | | | | Documentation fix: @constant -> @property | Dan | 2018-04-19 | 1 | -1/+1 |
* | | | | | | | Merge pull request #3977 from MetaMask/i-3913-big-number | Dan Finlay | 2018-04-19 | 5 | -25/+52 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix spinner layout | Alexander Tseung | 2018-04-18 | 5 | -26/+28 |
| * | | | | | | | Fix BigNumber exception in confirm-send-ether | Alexander Tseung | 2018-04-18 | 2 | -3/+28 |
* | | | | | | | | Merge pull request #4004 from MetaMask/i3955-reveal-seed | Dan Finlay | 2018-04-19 | 6 | -23/+116 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix UI getting stuck in Reveal Seed screen | Alexander Tseung | 2018-04-19 | 6 | -23/+116 |
* | | | | | | | | | Merge pull request #3998 from MetaMask/i3988-checksummed-address | Dan Finlay | 2018-04-19 | 12 | -27/+46 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Show checksummed addresses throughout the UI | bitpshr | 2018-04-18 | 12 | -27/+46 |
| |/ / / / / / / | |||||
* | / / / / / / | I18n - add Tamil + some Hindi fixes | Vikas Kumar Yadav | 2018-04-19 | 3 | -10/+923 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #4000 from MetaMask/deps | Dan Finlay | 2018-04-18 | 2 | -33/+36 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | deps - update keyring controller and other eth-dependinces | frankiebee | 2018-04-18 | 2 | -33/+36 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #3853 from MetaMask/i3580-InternationalizeCurrency | Dan Finlay | 2018-04-18 | 12 | -1300/+1235 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merge branch 'master' into i3580-InternationalizeCurrency | Dan Finlay | 2018-04-18 | 82 | -346/+6088 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #3969 from MetaMask/i3966-AddJsDocsPage | Thomas Huang | 2018-04-18 | 21 | -0/+4254 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add JSDocs Page and Script | Dan Finlay | 2018-04-13 | 21 | -61/+4681 |
* | | | | | | | | Merge pull request #3995 from MetaMask/i3759-popup | Dan Finlay | 2018-04-18 | 12 | -68/+104 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix confirmation popup not always opening | Alexander Tseung | 2018-04-17 | 12 | -68/+104 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #3982 from MetaMask/i3981-contract-rates | Dan Finlay | 2018-04-17 | 13 | -92/+147 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into i3981-contract-rates | Dan Finlay | 2018-04-17 | 44 | -141/+1166 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #3967 from MetaMask/AddTeamDocs | Dan Finlay | 2018-04-17 | 2 | -0/+79 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix spelling typo | Dan Finlay | 2018-04-17 | 1 | -1/+1 |
| * | | | | | | | | | Add Herman team documentation | Dan Finlay | 2018-04-13 | 1 | -0/+11 |
| * | | | | | | | | | Linted | Dan Finlay | 2018-04-13 | 1 | -2/+0 |
| * | | | | | | | | | Add Paul to team docs | Dan Finlay | 2018-04-13 | 1 | -0/+7 |
| * | | | | | | | | | Add team member documentation | Dan Finlay | 2018-04-13 | 2 | -0/+63 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #3970 from MetaMask/i3651-removeGlobalLog | Dan Finlay | 2018-04-17 | 37 | -113/+172 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Require loglevel singleton in each module that uses it | bitpshr | 2018-04-14 | 37 | -113/+172 |
* | | | | | | | | | | Merge pull request #3978 from espoem/cs-lang | Dan Finlay | 2018-04-17 | 2 | -0/+913 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix vault translation | Martin Šmíd | 2018-04-14 | 1 | -4/+4 |
| * | | | | | | | | | | Add czech translation | Martin Šmíd | 2018-04-14 | 2 | -0/+913 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #3985 from whymarrh/unused-jshint | Dan Finlay | 2018-04-17 | 1 | -27/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Remove unused JSHint file, ESLint is the standard | Whymarrh Whitby | 2018-04-17 | 1 | -27/+0 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #3976 from MetaMask/i3973-FixLocaleSettings | kumavis | 2018-04-17 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix action for setting locale | Dan Finlay | 2018-04-14 | 2 | -1/+2 |
|/ / / / / / / / / | |||||
| | * | | | | | | | Update CHANGELOG with information about rate fetching | bitpshr | 2018-04-17 | 1 | -1/+2 |
| | * | | | | | | | Disable token price polling when no client is active | bitpshr | 2018-04-17 | 4 | -0/+14 |
| | * | | | | | | | Maintain token prices using a background service | bitpshr | 2018-04-16 | 7 | -81/+117 |
| | * | | | | | | | Fetch token prices based on contract address | bitpshr | 2018-04-16 | 8 | -81/+85 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #3975 from MetaMask/i3947-composableStore | Dan Finlay | 2018-04-14 | 6 | -265/+637 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | |