Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PLT-6368 Changed client to always use window.location.origin over SiteURL (3.8) #6190

Merged
merged 1 commit into from Apr 21, 2017
Merged

PLT-6368 Changed client to always use window.location.origin over SiteURL (3.8) #6190

merged 1 commit into from Apr 21, 2017

Conversation

hmhealey
Copy link
Member

This is to fix the various websocket issues that come up when the SiteURL is set. It also makes sure that any URLs displayed in the client match the current URL

Ticket Link

https://mattermost.atlassian.net/browse/PLT-6368

Checklist

  • Touches critical sections of the codebase (auth, upgrade, etc.)

@hmhealey hmhealey added the 2: Dev Review Requires review by a developer label Apr 21, 2017
@hmhealey hmhealey added this to the v3.8.0 milestone Apr 21, 2017
@jwilander jwilander added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a developer labels Apr 21, 2017
@grundleborg grundleborg merged commit dd1db76 into release-3.8 Apr 21, 2017
@grundleborg grundleborg deleted the plt6368-3.8 branch April 21, 2017 16:23
@jasonblais jasonblais added Changelog/Done Required changelog entry has been written Docs/Not Needed Does not require documentation Tests/Not Needed New release tests not required labels Apr 21, 2017
danmaas added a commit to spinpunch/battlehouse-mattermost that referenced this pull request Sep 8, 2017
@danmaas
Merge mainline v3.8.3 into battlehouse-v3.8.x
d9df043 
* commit '17c1e6c67ba89933c068b48928e47fba1c20e0b2': (36 commits)
  Update channel header and email fix
  Minor fix
  Fixing broken react-input-autosize dependancy (mattermost#6354)
  PLT-6368 Changed client to always use window.location.origin over SiteURL (3.8) (mattermost#6190)
  Fix update and get user endpoints to sanitize properly (mattermost#6195)
  Fix copyright date (mattermost#6163)
  Patching race in unit test (mattermost#6160)
  Invite salt fix for 3.8 (mattermost#6149)
  Revert "Usernames must start with a letter (mattermost#5581)"
  Check for HTTPS protocol if not coming from proxy (mattermost#6137)
  translations PR 20170417 (mattermost#6139)
  Wait for channel membership before completing GM creation (mattermost#6133)
  Fix getPublicChannelsForTeam pagination (mattermost#6121)
  translations PR 20170410 (mattermost#6065)
  PLT-6294 Fixed iOS not scrolling to bottom of post list (mattermost#6077)
  PLT-6300 Fixed flag icons not appearing (mattermost#6078)
  PLT-6311 - Link text wrapping fix (mattermost#6079)
  get the latest message from the mailbox. It fixes the issue PLT-6176 (mattermost#6005)
  Fix configuration setting
  PLT-6253: Handle demote self from Team Admin. (mattermost#6056)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@coreyhulen coreyhulen coreyhulen approved these changes

@jwilander jwilander jwilander approved these changes

@crspeller crspeller crspeller approved these changes

Assignees

@grundleborg grundleborg

Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Done Required changelog entry has been written Docs/Not Needed Does not require documentation Tests/Not Needed New release tests not required
Projects
None yet
Milestone
v3.8.0
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@hmhealey @coreyhulen @jwilander @crspeller @grundleborg @jasonblais