Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Suppress CORS errors in the 'failed to join room' dialog #2306

Merged
merged 3 commits into from
Dec 5, 2018
Merged

Suppress CORS errors in the 'failed to join room' dialog #2306

merged 3 commits into from
Dec 5, 2018

Commits on Nov 27, 2018

  1. Suppress CORS errors in the 'failed to join room' dialog 

    This isn't pretty, but it does address element-hq/element-web#7526

Tested with Chrome and Firefox to ensure the message is stable enough to parse.
    @turt2live
    turt2live committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    2b027b7 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2018

  1. Add a helpful comment

    @turt2live
    turt2live committed Dec 5, 2018
    Configuration menu
    Copy the full SHA
    7e817f4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into travis/cors-on-join

    @turt2live
    turt2live committed Dec 5, 2018
    Configuration menu
    Copy the full SHA
    c46bae5 View commit details
    Browse the repository at this point in the history