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

MSC2858: Multiple SSO Identity Providers #2858

Merged
merged 31 commits into from
Mar 14, 2021
Merged

MSC2858: Multiple SSO Identity Providers #2858

merged 31 commits into from
Mar 14, 2021

Commits on Nov 9, 2020

  1. Multiple SSO Identity Providers

    @t3chguy
    t3chguy committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    2047320 View commit details
    Browse the repository at this point in the history

  2. Fix MSC number

    @t3chguy
    t3chguy committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    a7eba77 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2020

  1. Update proposals/2858-Multiple-SSO-Identity-Providers.md 

    Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
    @t3chguy @richvdh
    t3chguy and richvdh committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    2064536 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2020

  1. Iterate the MSC

    @t3chguy
    t3chguy committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    a391a4a View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/t3chguy/msc/multi-sso' into t3ch… 

    …guy/msc/multi-sso
    @t3chguy
    t3chguy committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    874e32d View commit details
    Browse the repository at this point in the history

  3. be stricter on the icon url

    @t3chguy
    t3chguy committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    f444273 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2020

  1. Iterate MSC based on feedback

    @t3chguy
    t3chguy committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    8ac2359 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2020

  1. Add more explanation

    @t3chguy
    t3chguy committed Nov 26, 2020
    Configuration menu
    Copy the full SHA
    153c557 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2021

  1. Iterate PR based on feedback

    @t3chguy
    t3chguy committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    c7063a4 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2021

  1. Update proposals/2858-Multiple-SSO-Identity-Providers.md 

    Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
    @t3chguy @richvdh
    t3chguy and richvdh committed Jan 19, 2021
    Configuration menu
    Copy the full SHA
    8be6540 View commit details
    Browse the repository at this point in the history

  2. Remove UIA stuff

    @t3chguy
    t3chguy committed Jan 19, 2021
    Configuration menu
    Copy the full SHA
    85ccf93 View commit details
    Browse the repository at this point in the history

  3. Merge branch 't3chguy/msc/multi-sso' of github.com:matrix-org/matrix-… 

    …doc into t3chguy/msc/multi-sso
    @t3chguy
    t3chguy committed Jan 19, 2021
    Configuration menu
    Copy the full SHA
    1d90cac View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2021

  1. Formatting tweaks

    @richvdh
    richvdh committed Jan 27, 2021
    Configuration menu
    Copy the full SHA
    277ff68 View commit details
    Browse the repository at this point in the history

  2. grammar clarifications

    @richvdh
    richvdh committed Jan 27, 2021
    Configuration menu
    Copy the full SHA
    0c18f83 View commit details
    Browse the repository at this point in the history

  3. add 'brand'

    @richvdh
    richvdh committed Jan 27, 2021
    Configuration menu
    Copy the full SHA
    09d41c5 View commit details
    Browse the repository at this point in the history

  4. Update proposals/2858-Multiple-SSO-Identity-Providers.md 

    Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
    @richvdh @t3chguy
    richvdh and t3chguy committed Jan 27, 2021
    Configuration menu
    Copy the full SHA
    8434605 View commit details
    Browse the repository at this point in the history

  5. notes on and alternatives

    @richvdh
    richvdh committed Jan 27, 2021
    Configuration menu
    Copy the full SHA
    ba08c9f View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2021

  1. Notes on OAuth2 and unknown idps

    @richvdh
    richvdh committed Mar 1, 2021
    Configuration menu
    Copy the full SHA
    6badb3b View commit details
    Browse the repository at this point in the history

  2. Update proposals/2858-Multiple-SSO-Identity-Providers.md 

    Co-authored-by: Matthew Hodgson <matthew@matrix.org>
    @t3chguy @ara4n
    t3chguy and ara4n committed Mar 1, 2021
    Configuration menu
    Copy the full SHA
    ba3e204 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2021

  1. Move the idp brand assignments out to a registry

    @richvdh
    richvdh committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    dce9c9f View commit details
    Browse the repository at this point in the history

  2. fix up markdown

    @richvdh
    richvdh committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    434d686 View commit details
    Browse the repository at this point in the history

  3. more fix markdown

    @richvdh
    richvdh committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    2d4da14 View commit details
    Browse the repository at this point in the history

  4. fix link

    @richvdh
    richvdh committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    9a4e821 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2021

  1. Move sequence diagram into doc

    @richvdh
    richvdh committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    62cc76f View commit details
    Browse the repository at this point in the history

  2. Get rid of the registry for now 

    it should just be a proposal. We can add the registry later.
    @richvdh
    richvdh committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    a596efd View commit details
    Browse the repository at this point in the history

  3. Update proposals/2858-Multiple-SSO-Identity-Providers.md 

    Co-authored-by: Travis Ralston <travpc@gmail.com>
    @richvdh @turt2live
    richvdh and turt2live committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    178cbe1 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2021

  1. Change the brand identifiers again

    @richvdh
    richvdh committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    1ba0c39 View commit details
    Browse the repository at this point in the history

  2. Update proposals/2858-Multiple-SSO-Identity-Providers.md 

    Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
    @richvdh @uhoreg
    richvdh and uhoreg committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    7871da7 View commit details
    Browse the repository at this point in the history

  3. Update proposals/2858-Multiple-SSO-Identity-Providers.md

    @richvdh
    richvdh committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    d5166eb View commit details
    Browse the repository at this point in the history

  4. update brand descriptions

    @richvdh
    richvdh committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    49f7624 View commit details
    Browse the repository at this point in the history

  5. update UIA

    @richvdh
    richvdh committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    a8a7acc View commit details
    Browse the repository at this point in the history