8 commits

Author	SHA1	Message	Date
Dan Callahan	7dc14730d9	Name release branches just after major.minor (#10013) ... With the prior format, 1.33.0 / 1.33.1 / 1.33.2 got separate branches: release-v1.33.0 release-v1.33.1 release-v1.33.2 Under the new model, all three would share a common branch: release-v1.33 As before, RCs and actual releases exist as tags on these branches. This better reflects our support model, e.g., that the "1.33" series had a formal release followed by two patches / updates. Signed-off-by: Dan Callahan <danc@element.io>	2021-06-08 11:44:50 +01:00
Patrick Cloke	4218473f9e	Refactor the CAS handler in prep for using the abstracted SSO code. (#8958) ... This makes the CAS handler look more like the SAML/OIDC handlers: * Render errors to users instead of throwing JSON errors. * Internal reorganization.	2020-12-18 13:09:45 -05:00
Richard van der Hoff	11de843626	Cleanups to the OpenID Connect integration (#7628) ... docs, default configs, comments. Nothing very significant.	2020-06-03 21:13:17 +01:00
Richard van der Hoff	ec0b72bc4e	Merge branch 'master' into develop	2020-05-14 18:12:00 +01:00
Richard van der Hoff	66d03639dc	Notes on using git (#7496) ... * general updates to CONTRIBUTING.md * notes on updating your PR * Notes on squash-merging or otherwise * document git branching model	2020-05-14 18:03:10 +01:00
Quentin Gliech	616af44137	Implement OpenID Connect-based login (#7256)	2020-05-08 08:30:40 -04:00
Patrick Cloke	c5f89fba55	Add developer documentation for running a local CAS server (#7147)	2020-03-30 07:28:42 -04:00
Travis Ralston	c755955f33	Add developer docs for using SAML without a server (#6032)	2019-09-13 08:58:18 +01:00