aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Testing timeoutsThomas2018-05-172-200/+1369
* Merge branch 'develop' into e2e-testsThomas2018-05-1534-823/+1172
|\
| * Merge pull request #4251 from whymarrh/e2e-fixesThomas Huang2018-05-153-6/+7
| |\
| | * e2e: Use the more reliable enter key for logging inWhymarrh Whitby2018-05-151-1/+1
| | * e2e: Wait a bit before clicking through privacy screenWhymarrh Whitby2018-05-151-0/+1
| | * e2e: Adjust the extension ID query for newer Chrome versionsWhymarrh Whitby2018-05-151-1/+1
| | * e2e: Use newest window as MM tx confirm popupWhymarrh Whitby2018-05-152-2/+2
| | * Bail after the first e2e test failureWhymarrh Whitby2018-05-151-2/+2
| * | Merge pull request #4245 from MetaMask/i4208-errorKevin Serrano2018-05-158-233/+216
| |\ \ | | |/ | |/|
| | * Add error message when passwords don't match in first time flow. Change input...Alexander Tseung2018-05-148-233/+216
| |/
| * Merge pull request #4190 from MetaMask/i3614-unlockFrankie2018-05-1330-598/+964
| |\
| | * Add TextField component to storybookAlexander Tseung2018-05-123-2/+25
| | * Add new unlock screen designAlexander Tseung2018-05-1229-598/+941
| |/
| * Merge pull request #4226 from MetaMask/e2e-testskumavis2018-05-128-793/+1058
| |\
* | | Merge e2e tests into oneThomas2018-05-154-361/+79
| |/ |/|
* | Merge branch 'develop' into e2e-testsThomas2018-05-125-1440/+607
|\|
| * Chinese translation Enhancements (#4218)Orange2018-05-121-25/+358
| * Merge pull request #4231 from MetaMask/fix-nodesecuritykumavis2018-05-123-1414/+248
| |\
| | * Add advisory #157 to .nsprcAlexander Tseung2018-05-111-1/+4
| | * Update lodashAlexander Tseung2018-05-101-51/+51
| | * Update deep-extend and sshpkAlexander Tseung2018-05-102-1362/+193
| |/
| * Merge pull request #4214 from MetaMask/tx-controller-doc-typoDan Finlay2018-05-091-1/+1
| |\
| | * Fix documentation typobitpshr2018-05-081-1/+1
* | | Increase timeoutThomas2018-05-111-1/+1
* | | Fix typoThomas2018-05-111-1/+1
* | | Job Screens with Shadow Dom Css selectorThomas2018-05-113-6/+7
* | | Multistep Shadow Dom Query Selector for local extension idThomas2018-05-111-10/+10
* | | Merge branch 'develop' into e2e-testsThomas2018-05-0923-25/+3195
|\| |
| * | Merge pull request #4196 from MetaMask/i3457-fontweightThomas Huang2018-05-0911-22/+2
| |\ \
| | * | Change font weight from 300 to 400Alexander Tseung2018-05-0611-22/+2
| * | | Merge pull request #4099 from MetaMask/i4043-storybook-dev2Thomas Huang2018-05-0912-3/+3199
| |\ \ \ | | |_|/ | |/| |
| | * | Add storybook README.md fileAlexander Tseung2018-05-081-0/+10
| | * | Add storybook integrationAlexander Tseung2018-05-0411-3/+3189
| | |/
* | | Update test:screens to newest chrome extension listThomas2018-05-081-1/+1
* | | Merge branch 'develop' into e2e-testsThomas2018-05-085-5/+51
|\| |
| * | Fix Slovenian translation (#4189)Filip Š2018-05-081-4/+4
| * | Merge pull request #4163 from MetaMask/check-nonce-ussagekumavis2018-05-084-1/+47
| |\ \ | | |/ | |/|
| | * transactions - add a nonce check utility for ui usefrankiebee2018-05-023-0/+46
| | * fix - getTxsByMetaData check if the key is in the object not if the value is ...frankiebee2018-05-021-1/+1
* | | Update to extension Id path for new chromeThomas2018-05-081-5/+5
* | | Remove waiting for button to be enabled TOUThomas2018-05-041-1/+0
* | | Merge branch 'e2e-tests' of https://github.com/tmashuang/metamask-extension i...Thomas2018-05-0481-1892/+4484
|\ \ \
| * | | Add a comment on the confirmation transaction metamask popup showing blank, b...Thomas2018-05-041-0/+1
| * | | Quit chromedriver after testThomas2018-05-041-3/+3
| * | | Bump package lockThomas2018-05-041-629/+285
| * | | Merge branch 'develop' into e2e-testsThomas2018-05-0479-1361/+4296
| |\| |
| | * | Merge pull request #4156 from MetaMask/i4010-spinnerkumavis2018-05-039-10/+115
| | |\ \
| | | * | Fix styling of the app spinnerAlexander Tseung2018-05-019-10/+115
| | * | | Merge pull request #4173 from MetaMask/chromedriverkumavis2018-05-032-182/+1360
| | |\ \ \
| | | * | | Remove eth-block-tracker packageAlexander Tseung2018-05-031-1/+0
| | | * | | Pin chromedriver version to 2.36.0Alexander Tseung2018-05-032-181/+1360
| | |/ / /
| | * | | Merge pull request #4172 from MetaMask/nodesecuritykumavis2018-05-033-0/+319
| | |\ \ \
| | | * | | Adds nsp check to CircleCI testsAlexander Tseung2018-05-033-0/+319
| | |/ / /
| | * | | Merge pull request #4166 from MetaMask/i4010-deps4Frankie2018-05-022-0/+290
| | |\ \ \
| | | * | | Adds sass-loader and style-loader packages for storybook integrationAlexander Tseung2018-05-022-0/+123
| | | * | | Adds path and resolve-url-loader packages for storybook integrationAlexander Tseung2018-05-022-0/+167
| | |/ / /
| | * | | Merge pull request #4164 from MetaMask/i4010-deps3Frankie2018-05-022-1395/+1723
| | |\ \ \
| | | * | | Adds css-loader and file-loader needed for storybook integrationAlexander Tseung2018-05-022-1395/+1723
| | |/ / /
| | * | | Merge pull request #4162 from MetaMask/ui-actions-pify-importNewAccountkumavis2018-05-021-1/+1
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | ui - actions - importNewAccount - rethrow err on failurekumavis2018-05-021-1/+1
| | * | | Merge pull request #4143 from prettymuchbryce/blacklist-shopify-iframekumavis2018-05-011-0/+1
| | |\ \ \
| | | * | | Blacklist problematic shopify iFrameBryce Neal2018-05-011-0/+1
| | * | | | Handle Promise rejections when importing accounts (#4142)Paul Bouchon2018-05-015-0/+12
| | * | | | Merge pull request #4144 from MetaMask/ui-actions-pify-importNewAccountkumavis2018-05-011-24/+20
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | ui - actions - importNewAccount - use async and pify for cleaner syntaxkumavis2018-05-011-24/+20
| | |/ / /
| | * | | Merge pull request #4139 from MetaMask/sentry-enhancementsv4.6.1Thomas Huang2018-05-011-16/+34
| | |\ \ \
| | | * | | sentry - report error-like messages using the obj messagekumavis2018-05-011-0/+10
| | | * | | sentry - wrap report modifiers in a try-catchkumavis2018-05-011-16/+24
| | |/ / /
| | * | | Merge pull request #4059 from MetaMask/i-4033-seed-wordskumavis2018-05-0121-425/+475
| | |\ \ \
| | | * | | Redirect to correct seed phrase screenAlexander Tseung2018-04-271-2/+2
| | | * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-2328-4150/+305
| | | |\ \ \
| | | * | | | Use new design for reveal seed screen. Persist seed words only in first time ...Alexander Tseung2018-04-2318-306/+461
| | | * | | | Revert "Fix UI getting stuck in Reveal Seed screen"Alexander Tseung2018-04-226-116/+23
| | * | | | | Merge pull request #4111 from MetaMask/build-fix-sourcemapsFrankie2018-05-014-62/+103
| | |\ \ \ \ \
| | | * | | | | deps - package-lockkumavis2018-04-281-51/+43
| | | * | | | | development - add sourcemap debug toolkumavis2018-04-282-0/+50
| | | * | | | | build - minify via gulp-uglify-es instead of uglifyifykumavis2018-04-282-11/+10
| | * | | | | | Merge pull request #4121 from MetaMask/i3688-shapeshift-500skumavis2018-05-012-7/+8
| | |\ \ \ \ \ \
| | | * | | | | | Fix ShapeShift purchases on new UIbitpshr2018-04-291-6/+7
| | | * | | | | | Update old UI ShapeshiftForm to gracefully handle errorsbitpshr2018-04-291-1/+1
| | * | | | | | | Merge pull request #4116 from MetaMask/test-unit-ganacheThomas Huang2018-05-015-55/+114
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | deps - package-lockkumavis2018-04-281-38/+80
| | | * | | | | | test - unit - send from test accounts to avoid not-enough-balance error from ...kumavis2018-04-282-12/+12
| | | * | | | | | test - unit - use ganache instead of deprecated block-tracker test utilkumavis2018-04-282-5/+22
| | * | | | | | | Merge pull request #4132 from MetaMask/masterkumavis2018-04-302-18/+25
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge pull request #4128 from MetaMask/raven-transport-fixkumavis2018-04-302-18/+25
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | | * | | | | | guard adainst raven erroringfrankiebee2018-04-302-18/+25
| | | |/ / / / / /
| | * | | / / / / Verify identities state after restoring new accounts (#4091)Paul Bouchon2018-04-301-8/+25
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge pull request #4113 from MetaMask/i4107-send-tokens-without-symbols-deci...kumavis2018-04-284-45/+43
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Simplify return of existing token in getSymbolAndDecimalsDan2018-04-281-4/+1
| | | * | | | | Convert decimals to string in getSymbolAndDecimals; return null for symbol or...Dan2018-04-283-20/+10
| | | * | | | | Wraps calls to symbol() and decimals() in try catchDan2018-04-283-30/+41
| | | |/ / / /
| | * | | | | Merge pull request #4110 from MetaMask/masterkumavis2018-04-2820-395/+862
| | |\| | | |
| | | * | | | Merge pull request #4095 from MetaMask/v4.6.0v4.6.0Thomas Huang2018-04-2710-123/+1848
| | | |\ \ \ \
| | | | * | | | v4.6.0kumavis2018-04-272-1/+3
| | | | | |_|/ | | | | |/| |
| | | * | | | Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3kumavis2018-04-2618-394/+859
| | | |\ \ \ \
| | | | * | | | transactions - more docs and clean upsfrankiebee2018-04-266-55/+116
| | | | * | | | Cleaned up some typos and JSDocs in TransactionsDan Finlay2018-04-243-38/+40
| | | | * | | | transactions - fix referncesfrankiebee2018-04-202-1/+2
| | | | * | | | Merge branch 'master' into tx-controller-rewrite-v3frankiebee2018-04-20163-3365/+14592
| | | | |\ \ \ \
| | | | * | | | | meta - transactions - docs yo!frankiebee2018-04-209-73/+351
| | | | * | | | | fix up - more docsfrankiebee2018-04-143-38/+77
| | | | * | | | | meta - transactions - code clean up and jsDocfrankiebee2018-04-142-43/+111
| | | | * | | | | transactions - code cleanupfrankiebee2018-04-132-58/+59
| | | | * | | | | transactions - lint fixesfrankiebee2018-04-113-12/+12
| | | | * | | | | meta - transactions - create a transactions dir in controller and move releva...frankiebee2018-04-1116-240/+255
| | * | | | | | | Merge pull request #4097 from MetaMask/i4096-token-rates-errorKevin Serrano2018-04-281-1/+5
| | |\ \ \ \ \ \ \
| | | * | | | | | | Return 0 for token rate fetch failuresbitpshr2018-04-271-1/+5
| | | | |_|_|/ / / | | | |/| | | | |
| | * / | | | | | Allow transactions with 0-gwei gas price (#4073)Paul Bouchon2018-04-277-48/+80
| | |/ / / / / /
| | * | | | | | Merge pull request #4065 from MetaMask/i18n-helper-bugfixDan Finlay2018-04-261-1/+2
| | |\ \ \ \ \ \
| | | * | | | | | i18n-helper - wrap fallback in brackets to help indicate something is wrongkumavis2018-04-261-1/+1
| | | * | | | | | Return key instead of empty string on i18n failDan Finlay2018-04-261-1/+1
| | | * | | | | | i18n-helper - abort on i18n failurekumavis2018-04-251-1/+2
| | | |/ / / / /
| | * | | | | | Merge pull request #4083 from MetaMask/pe-bumpDan Finlay2018-04-263-42/+176
| | |\ \ \ \ \ \
| | | * | | | | | rpc - bump provider-engine + eth-json-rpc-filterskumavis2018-04-263-42/+176
| | * | | | | | | Merge pull request #4068 from MetaMask/privacy-notice-patchkumavis2018-04-262-2/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Updated notices json file.Kevin Serrano2018-04-261-1/+1
| | | * | | | | | Clarify privacy noticeDan Finlay2018-04-251-1/+1
| | | |/ / / / /
| | * | | | | | Merge pull request #4080 from MetaMask/AddDevelopGuideToContributingDan Finlay2018-04-261-2/+4
| | |\ \ \ \ \ \
| | | * | | | | | Add develop guide to contributing.mdDan Finlay2018-04-261-2/+4
| | * | | | | | | Merge pull request #4070 from MetaMask/i3999-DeterministicBuildsDan Finlay2018-04-262-75/+1661
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Move uglifyify to MetaMask orgDan Finlay2018-04-261-1/+1
| | | * | | | | | Make minified builds more determinsticDan Finlay2018-04-252-75/+1661
| | | |/ / / / /
| | * | | | | | Merge pull request #4069 from MetaMask/i4056-LatestPriceApiDan Finlay2018-04-261-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Use latest balanc3 api for pricesDan Finlay2018-04-251-1/+1
* | | | | | | | Increase timeout for TOU scrollThomas2018-05-041-1/+1
|/ / / / / / /
* | | | | | | Reduce delay for installing firefox addonThomas2018-05-041-2/+1
* | | | | | | Add Timeouts for driver.waitThomas2018-05-041-9/+8
* | | | | | | Test wit driver.waitThomas2018-05-041-18/+21
* | | | | | | Ci FirefoxThomas2018-05-031-5/+1
* | | | | | | Delay around the addon installThomas2018-05-021-2/+3
* | | | | | | test increase timeoutThomas2018-05-021-1/+1
* | | | | | | Async/await installing extensionThomas2018-05-021-4/+4
* | | | | | | FirefoxThomas2018-05-027-216/+2543
|/ / / / / /
* | | | | | Merge pull request #4040 from MetaMask/dm-docs-2Dan Finlay2018-04-2513-54/+764
|\ \ \ \ \ \
| * | | | | | lint fixDan2018-04-241-0/+1
| * | | | | | Merge branch 'master' into dm-docs-2Dan2018-04-2454-4390/+957
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #3940 from nyatla/masterDan Finlay2018-04-243-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Reduced button padding.nyatla2018-04-101-0/+1
| * | | | | | | Expanded dropdown menu width of title.nyatla2018-04-101-1/+1
| * | | | | | | Changed mouse cursor to "pointer" on the cancel text at the top left of the p...nyatla2018-04-101-0/+1
* | | | | | | | Merge pull request #4023 from MetaMask/greenkeeper/ethjs-contract-0.2.0Dan Finlay2018-04-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fix(package): update ethjs-contract to version 0.2.0greenkeeper[bot]2018-04-191-1/+1
* | | | | | | | | Merge pull request #4062 from MetaMask/i4056-LatestPriceApiDan Finlay2018-04-241-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Use the metamask balanc3 dev price apiDan Finlay2018-04-241-1/+1
* | | | | | | | | Merge pull request #3934 from MetaMask/node-enginesDan Finlay2018-04-241-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | package.json - update engines field to require node v8.x.xkumavis2018-04-101-1/+1
* | | | | | | | | | Merge pull request #3935 from MetaMask/ci-tests-first-then-dessertDan Finlay2018-04-241-10/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ci - complete all tests before running extraskumavis2018-04-101-10/+11
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #4057 from MetaMask/sentry-bumpDan Finlay2018-04-242-4/+4
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | deps - bump sentry for more detailed fetch failurekumavis2018-04-242-4/+4
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #4029 from MetaMask/DocumentMetaMaskControllerDan Finlay2018-04-241-131/+330
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Linted docsDan Finlay2018-04-241-1/+1
| * | | | | | | | | Linted jsdocsDan Finlay2018-04-211-52/+60
| * | | | | | | | | Added docs to MM-controllerDan Finlay2018-04-191-130/+321
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3968 from MetaMask/gh-3653Dan Finlay2018-04-2420-121/+212
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Clean up network configAlexander Tseung2018-04-2420-121/+212
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #4028 from MetaMask/i4016-customrpcDan Finlay2018-04-241-6/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix custom RPC not redirecting to Settings pageAlexander Tseung2018-04-191-6/+8
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #4041 from MetaMask/DocumentBackgroundDan Finlay2018-04-241-2/+127
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Remove wrong charsDan Finlay2018-04-211-2/+2
| * | | | | | | | Add ui note to background docsDan Finlay2018-04-211-1/+1
| * | | | | | | | Lint background docsDan Finlay2018-04-211-12/+12
| * | | | | | | | Document MetaMaskState and TransactionMetaDan Finlay2018-04-211-0/+69
| * | | | | | | | Document Background ScriptDan Finlay2018-04-201-2/+58
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshrDan Finlay2018-04-2127-4149/+296
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Clean up JSDoc for background scriptsbitpshr2018-04-207-24/+32
| * | | | | | | Add more documentation to computed balances controllerbitpshr2018-04-204-6/+77
| * | | | | | | Add JSDoc to various background scriptsbitpshr2018-04-1930-9339/+14
| * | | | | | | Add generated docsbitpshr2018-04-1918-227/+5485
| * | | | | | | Add JSDoc to various background scriptsbitpshr2018-04-196-70/+205
| | | | | | * | Remove accidentally added code in message-manager.Dan2018-04-241-8/+0
| | | | | | * | Remove unnecessary doc comment.Dan2018-04-241-2/+0
| | | | | | * | Fix nits.Dan2018-04-244-33/+33
| | | | | | * | Minor fixes in a number of docs.Dan2018-04-216-18/+17
| | | | | | * | Notification manager method docs.Dan2018-04-211-4/+31
| | | | | | * | Merge branch 'master' into dm-docs-2Dan2018-04-20117-1965/+8813
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge pull request #4030 from MetaMask/i4014-metamask-versionThomas Huang2018-04-201-1/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Show correct MetaMask version number in the Info pageAlexander Tseung2018-04-191-1/+9
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #4026 from MetaMask/i4015-oldui-seedThomas Huang2018-04-191-6/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix exception thrown when revealing seed wordsAlexander Tseung2018-04-191-6/+18
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #3984 from whymarrh/3941-jsdocDan Finlay2018-04-199-48/+150
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add a few missing docblocks to background filesWhymarrh Whitby2018-04-199-48/+150
* | | | | | | Merge pull request #3987 from MetaMask/dm-docs-1Dan Finlay2018-04-198-17/+389
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Missing bracket in docblock.Dan2018-04-191-1/+1
| * | | | | | Merge branch 'master' into dm-docs-1Dan2018-04-1992-1703/+8290
| |\| | | | |
| * | | | | | NO MIXED TABS AND SPACESDan2018-04-193-137/+137
| * | | | | | Documentation fix: @constant -> @propertyDan2018-04-191-1/+1
* | | | | | | Merge pull request #3977 from MetaMask/i-3913-big-numberDan Finlay2018-04-195-25/+52
|\ \ \ \ \ \ \
| * | | | | | | Fix spinner layoutAlexander Tseung2018-04-185-26/+28
| * | | | | | | Fix BigNumber exception in confirm-send-etherAlexander Tseung2018-04-182-3/+28
* | | | | | | | Merge pull request #4004 from MetaMask/i3955-reveal-seedDan Finlay2018-04-196-23/+116
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix UI getting stuck in Reveal Seed screenAlexander Tseung2018-04-196-23/+116
* | | | | | | | | Merge pull request #3998 from MetaMask/i3988-checksummed-addressDan Finlay2018-04-1912-27/+46
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Show checksummed addresses throughout the UIbitpshr2018-04-1812-27/+46
| |/ / / / / / /
* | / / / / / / I18n - add Tamil + some Hindi fixesVikas Kumar Yadav2018-04-193-10/+923
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #4000 from MetaMask/depsDan Finlay2018-04-182-33/+36
|\ \ \ \ \ \ \
| * | | | | | | deps - update keyring controller and other eth-dependincesfrankiebee2018-04-182-33/+36
|/ / / / / / /
* | | | | | | Merge pull request #3853 from MetaMask/i3580-InternationalizeCurrencyDan Finlay2018-04-1812-1300/+1235
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into i3580-InternationalizeCurrencyDan Finlay2018-04-1882-346/+6088
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #3969 from MetaMask/i3966-AddJsDocsPageThomas Huang2018-04-1821-0/+4254
|\ \ \ \ \ \ \
| * | | | | | | Add JSDocs Page and ScriptDan Finlay2018-04-1321-61/+4681
* | | | | | | | Merge pull request #3995 from MetaMask/i3759-popupDan Finlay2018-04-1812-68/+104
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix confirmation popup not always openingAlexander Tseung2018-04-1712-68/+104
|/ / / / / / / /
* | | | | | | | Merge pull request #3982 from MetaMask/i3981-contract-ratesDan Finlay2018-04-1713-92/+147
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into i3981-contract-ratesDan Finlay2018-04-1744-141/+1166
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #3967 from MetaMask/AddTeamDocsDan Finlay2018-04-172-0/+79
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix spelling typoDan Finlay2018-04-171-1/+1
| * | | | | | | | | Add Herman team documentationDan Finlay2018-04-131-0/+11
| * | | | | | | | | LintedDan Finlay2018-04-131-2/+0
| * | | | | | | | | Add Paul to team docsDan Finlay2018-04-131-0/+7
| * | | | | | | | | Add team member documentationDan Finlay2018-04-132-0/+63
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3970 from MetaMask/i3651-removeGlobalLogDan Finlay2018-04-1737-113/+172
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Require loglevel singleton in each module that uses itbitpshr2018-04-1437-113/+172
* | | | | | | | | | Merge pull request #3978 from espoem/cs-langDan Finlay2018-04-172-0/+913
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix vault translationMartin Šmíd2018-04-141-4/+4
| * | | | | | | | | | Add czech translationMartin Šmíd2018-04-142-0/+913
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #3985 from whymarrh/unused-jshintDan Finlay2018-04-171-27/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unused JSHint file, ESLint is the standardWhymarrh Whitby2018-04-171-27/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #3976 from MetaMask/i3973-FixLocaleSettingskumavis2018-04-172-1/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix action for setting localeDan Finlay2018-04-142-1/+2
|/ / / / / / / / /
| | * | | | | | | Update CHANGELOG with information about rate fetchingbitpshr2018-04-171-1/+2
| | * | | | | | | Disable token price polling when no client is activebitpshr2018-04-174-0/+14
| | * | | | | | | Maintain token prices using a background servicebitpshr2018-04-167-81/+117
| | * | | | | | | Fetch token prices based on contract addressbitpshr2018-04-168-81/+85
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #3975 from MetaMask/i3947-composableStoreDan Finlay2018-04-146-265/+637
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add tests for ComposableObservableStorebitpshr2018-04-142-11/+46
| * | | | | | | Add ComposableObservableStore for subscription managementbitpshr2018-04-135-265/+602
|/ / / / / / /
| * | | | | | Merge branch 'master' into i3580-InternationalizeCurrencykumavis2018-04-106-33/+994
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add basic currency localization test.Dan2018-04-102-0/+162
| * | | | | | Fix integration tests so that they check for localize currency.Dan2018-04-101-4/+4
| * | | | | | Lint fix.Dan2018-04-102-2/+2
| * | | | | | Merge branch 'master' into i3580-InternationalizeCurrencyDan2018-04-10104-3163/+5310
| |\ \ \ \ \ \
| * | | | | | | Internationalize converted value in confirm screensDan2018-04-102-4/+36
| * | | | | | | Internationalize converted value in currency-input.jsDan2018-04-101-10/+25
| * | | | | | | Improve display of crypto currencies when selected as the 'Current Conversion'Dan2018-04-102-35/+1206
| * | | | | | | Fix and improve testDan Finlay2018-04-041-2/+12
| * | | | | | | LintedDan Finlay2018-04-041-1/+1
| * | | | | | | Bump changelogDan Finlay2018-04-041-0/+2
| * | | | | | | Internationalize currencyDan Finlay2018-04-044-1/+44
| | | | | | * | Even more documentation for various controllers and libs.Dan2018-04-1913-49/+742
| | | | |_|/ / | | | |/| | |
| | | * | | | Add missing descriptions in util.jsDan2018-04-171-4/+4
| | | * | | | Document async function as returning a promise.Dan2018-04-171-1/+1
| | | * | | | Improve documentation of promises that return undefined.Dan2018-04-172-4/+4
| | | * | | | Typo fixes, type fixes on the return clauses of the buyEthUrl and getPreffere...Dan2018-04-176-7/+8
| | | * | | | Spell deprecated correctly.Dan2018-04-171-2/+2
| | | * | | | @params -> @param fixDan2018-04-173-8/+8
| | | * | | | Documentation for various controllers and libsDan2018-04-179-19/+387
| | | * | | | Documentation for environemnt-type.jsDan2018-04-121-0/+9
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #3938 from nyatla/masterkumavis2018-04-101-27/+72
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 17:52:05 +0800