diff options
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | web/react/utils/markdown.jsx | 2 | ||||
| -rw-r--r-- | web/templates/head.html | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 18238d9eb..2abbb6460 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,11 +21,6 @@ Admin Console - (Preview) Ability to view server logs and change config settings -Integrations - -- (Preview) Added API for incoming webhooks -- (Preview) Added OAuth2 as a service provider to allow for more secure connection to external apps - ### Improvements Documentation diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx index 8b511cd07..7e88f8644 100644 --- a/web/react/utils/markdown.jsx +++ b/web/react/utils/markdown.jsx @@ -39,7 +39,7 @@ export class MattermostMarkdownRenderer extends marked.Renderer { if (title) { output += ' title="' + title + '"'; } - output += '>' + text + '</a>'; + output += ' target="_blank">' + text + '</a>'; return output; } diff --git a/web/templates/head.html b/web/templates/head.html index e1f2fe43f..2b83119d8 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -53,7 +53,7 @@ <script type="text/javascript"> if (window.config.SegmentDeveloperKey != null && window.config.SegmentDeveloperKey !== "") { !function(){var analytics=window.analytics=window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","group","track","ready","alias","page","once","off","on"];analytics.factory=function(t){return function(){var e=Array.prototype.slice.call(arguments);e.unshift(t);analytics.push(e);return analytics}};for(var t=0;t<analytics.methods.length;t++){var e=analytics.methods[t];analytics[e]=analytics.factory(e)}analytics.load=function(t){var e=document.createElement("script");e.type="text/javascript";e.async=!0;e.src=("https:"===document.location.protocol?"https://":"http://")+"cdn.segment.com/analytics.js/v1/"+t+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(e,n)};analytics.SNIPPET_VERSION="3.0.1"; - analytics.load(window.config.SegmentWriteKey); + analytics.load(window.config.SegmentDeveloperKey); var user = window.UserStore.getCurrentUser(true); if (user) { analytics.identify(user.id, { @@ -62,7 +62,6 @@ createdAt: user.create_at, username: user.username, team_id: user.team_id, - team_domain: window.getSubDomain(), id: user.id }); } |