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

[FIX] Enable CORS for Restivus #8671

Merged
merged 14 commits into from
Dec 6, 2017
Merged

[FIX] Enable CORS for Restivus #8671

merged 14 commits into from
Dec 6, 2017

Commits on Oct 27, 2017

  1. Propagate CORS-enabling to Restivus - fixes RocketChat#7915 

    (cherry picked from commit cf7d37f)
    @mrsimpson
    mrsimpson committed Oct 27, 2017
    Configuration menu
    Copy the full SHA
    8180f8b View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2017

  1. Merge branch 'develop' into core/RocketChat#7915-enable-CORS-Restivus

    @engelgabriel
    engelgabriel committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    4f3b4f3 View commit details
    Browse the repository at this point in the history

  2. Re-instantiate API after changing CORS-setting

    @mrsimpson
    mrsimpson committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    92f1e2d View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2017

  1. Merge branch 'develop' into core/RocketChat#7915-enable-CORS-Restivus

    @rodrigok
    rodrigok committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    36e6d88 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2017

  1. Merge remote-tracking branch 'upstream/develop' into core/RocketChat#… 

    …7915-enable-CORS-Restivus
    @mrsimpson
    mrsimpson committed Dec 5, 2017
    Configuration menu
    Copy the full SHA
    9ec548f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into core/RocketChat#7915-enable-CORS-Restivus

    @rodrigok
    rodrigok committed Dec 5, 2017
    Configuration menu
    Copy the full SHA
    7dfed46 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2017

  1. use settings.get() instead of onLoad()

    @mrsimpson
    mrsimpson committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    dee0f58 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/core/RocketChat#7915-enable-CORS… 

    …-Restivus' into core/RocketChat#7915-enable-CORS-Restivus
    @mrsimpson
    mrsimpson committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    d0a5523 View commit details
    Browse the repository at this point in the history

  3. Create the API also immediately

    @mrsimpson
    mrsimpson committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    3021ce4 View commit details
    Browse the repository at this point in the history

  4. Create the API also immediately

    @mrsimpson
    mrsimpson committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    7775a1f View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/develop' into core/RocketChat#… 

    …7915-enable-CORS-Restivus
    @mrsimpson
    mrsimpson committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    86aa7af View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/core/RocketChat#7915-enable-CORS… 

    …-Restivus' into core/RocketChat#7915-enable-CORS-Restivus
    @mrsimpson
    mrsimpson committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    bacbfff View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into core/RocketChat#7915-enable-CORS-Restivus

    @mrsimpson
    mrsimpson committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    3ceb08f View commit details
    Browse the repository at this point in the history

  8. Only create new API once the setting changes.

    @mrsimpson
    mrsimpson committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    287d97a View commit details
    Browse the repository at this point in the history