summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Stop Auth methods from polling the config on every req. (#7420)Andrew Morgan2020-05-062-73/+114
* Merge pull request #7423 from matrix-org/erikj/faster_device_lists_fetchErik Johnston2020-05-063-10/+25
|\
| * Merge branch 'release-v1.13.0' into erikj/faster_device_lists_fetchRichard van der Hoff2020-05-0542-577/+562
| |\
| * | Speed up fetching device lists changes in sync.Erik Johnston2020-05-053-10/+25
* | | Merge branch 'release-v1.13.0' into rav/fix_dropped_messagesRichard van der Hoff2020-05-051-1/+1
|\ \ \
| * | | Move logs about discarded RDATA to debug (#7421)Brendan Abolivier2020-05-051-1/+1
| | |/ | |/|
* | | Merge branch 'release-v1.13.0' into rav/fix_dropped_messagesRichard van der Hoff2020-05-0542-576/+562
|\| |
| * | Add backwards compatibility codepath to LoggingContext. (#7408)Patrick Cloke2020-05-051-0/+41
| * | Fix bug in EventContext.deserialize. (#7393)Erik Johnston2020-05-051-2/+5
| * | Fix redis password support. (#7401)Erik Johnston2020-05-041-0/+3
| * | Convert synapse.server_notices to async/await. (#7394)Patrick Cloke2020-05-011-10/+6
| * | Convert the synapse.notifier module to async/await. (#7395)Patrick Cloke2020-05-011-10/+7
| * | Wait for current_state_events_membership before populate_stats_process_rooms ...Richard van der Hoff2020-05-011-1/+5
| * | Thread through instance name to replication client. (#7369)Erik Johnston2020-05-018-35/+94
| * | Use `stream.current_token()` and remove `stream_positions()` (#7172)Erik Johnston2020-05-0114-120/+3
| * | async/await is_server_admin (#7363)Andrew Morgan2020-05-0117-376/+328
| * | Further improvements to requesting the public rooms list on a homeserver whic...Andrew Morgan2020-05-012-23/+70
| |/
* | Wait for a POSITION on the right connection before accepting RDATARichard van der Hoff2020-05-052-19/+38
* | Wait to subscribe before sending REPLICATERichard van der Hoff2020-05-052-20/+35
|/
* Workaround for assertion errors from db_query_to_update_function (#7378)Richard van der Hoff2020-05-011-2/+1
* Persist user interactive authentication sessions (#7302)Patrick Cloke2020-04-3010-120/+387
* Apply federation check for /publicRooms with filter list (#7367)Andrew Morgan2020-04-301-1/+5
* Add instance name to RDATA/POSITION commands (#7364)Erik Johnston2020-04-296-31/+65
* Don't relay REMOTE_SERVER_UP cmds to same conn. (#7352)Erik Johnston2020-04-294-25/+51
* Fix limit logic for EventsStream (#7358)Richard van der Hoff2020-04-294-19/+76
* Fix fallback value for account_threepid_delegates.email (#7316)Andrew Morgan2020-04-291-3/+8
* Return total number of users and profile attributes in admin users endpoint (...Manuel Stahl2020-04-282-33/+43
* Fix typo 'datbases' in ConfigErrorAndrew Morgan2020-04-281-1/+1
* Run replication streamers on workers (#7146)Erik Johnston2020-04-282-22/+24
* Fix incorrect metrics reporting for renew_attestations (#7344)Richard van der Hoff2020-04-271-10/+9
* Don't crash when one of the configuration files is empty (#7341)Brendan Abolivier2020-04-271-0/+6
* Add documentation to the sample config about the templates for SSO. (#7343)Patrick Cloke2020-04-241-0/+24
* Convert some of the federation handler methods to async/await. (#7338)Patrick Cloke2020-04-241-25/+24
* Merge pull request #7337 from matrix-org/rav/fix_update_limit_assertionRichard van der Hoff2020-04-244-44/+146
|\
| * Fix EventsStream raising assertions when it falls behindRichard van der Hoff2020-04-242-30/+129
| * Make it clear that the limit for an update_function is a targetRichard van der Hoff2020-04-231-5/+9
| * Remove 'limit' param from `get_repl_stream_updates` APIRichard van der Hoff2020-04-232-9/+8
* | Merge branch 'master' into developPatrick Cloke2020-04-231-1/+1
|\ \ | |/ |/|
| * 1.12.4 v1.12.4 github/release-v1.12.4 release-v1.12.4Patrick Cloke2020-04-231-1/+1
* | Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_t...Brendan Abolivier2020-04-233-2/+48
* | Stop the master relaying USER_SYNC for other workers (#7318)Richard van der Hoff2020-04-228-154/+197
* | Fix replication metrics when using redis (#7325)Erik Johnston2020-04-222-37/+29
* | Merge tag 'v1.12.4rc1' into developRichard van der Hoff2020-04-221-1/+1
|\|
| * 1.12.4rc1Richard van der Hoff2020-04-221-1/+1
* | Another go at fixing one-word commands (#7326)Richard van der Hoff2020-04-221-1/+1
* | Extend StreamChangeCache to support multiple entities per stream ID (#7303)Richard van der Hoff2020-04-221-46/+71
* | Extend room admin api with additional attributes (#7225)Dirk Klimpel2020-04-222-5/+88
* | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-224-18/+193
|\|
| * Do not treat display names as globs for push rules. (#7271)Patrick Cloke2020-04-221-30/+39
| * Query missing cross-signing keys on local sig upload (#7289)Andrew Morgan2020-04-222-18/+179
| * Support GET account_data requests on a worker (#7311)Richard van der Hoff2020-04-212-0/+14
* | Add ability to run replication protocol over redis. (#7040)Erik Johnston2020-04-229-34/+299
* | Reduce logging verbosity of URL cache cleanup. (#7295)Michael Kaye2020-04-221-2/+7
* | import urllib.parse when using urllib.parse.quote (#7319)Andrew Morgan2020-04-221-1/+1
* | Reduce federation logging on success (#7321)Michael Kaye2020-04-221-8/+14
* | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-202-140/+12
|\|
| * Revert "Query missing cross-signing keys on local sig upload"Richard van der Hoff2020-04-202-140/+12
* | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-202-12/+140
|\|
| * Always send the user updates to their own device list (#7160)David Baker2020-04-202-3/+18
| * Query missing cross-signing keys on local sig uploadAndrew Morgan2020-04-172-12/+140
| * Only register devices edu handler on the master process (#7255)Andrew Morgan2020-04-141-7/+11
* | Fix indention in generated config file (#7300)Lars Franke2020-04-201-22/+22
* | Reject unknown UI auth sessions (instead of silently generating a new one) (#...Patrick Cloke2020-04-201-65/+94
* | On catchup, process each row with its own stream id (#7286)Richard van der Hoff2020-04-202-5/+71
* | Use a template for the SSO success page to allow for customization. (#7279)Patrick Cloke2020-04-174-33/+60
* | Improve type checking in `replication.tcp.Stream` (#7291)Richard van der Hoff2020-04-174-122/+142
* | Clarify the comments for media_storage_providers options (#7272)Tristan Lins2020-04-171-4/+3
* | Do not treat display names as globs for push rules. (#7271)Patrick Cloke2020-04-161-30/+39
* | Fix 'generator object is not subscriptable' error (#7290)Richard van der Hoff2020-04-161-1/+2
* | Convert auth handler to async/await (#7261)Patrick Cloke2020-04-155-113/+119
* | Allow specifying the value of Accept-Language header for URL previews (#7265)Andrew Morgan2020-04-152-2/+35
* | Fix a potentially-huge sql query (#7274)Richard van der Hoff2020-04-151-7/+16
* | Only register devices edu handler on the master process (#7255)Andrew Morgan2020-04-141-7/+11
* | Check on room creation if the user is allowed to publish the room to the room...PeerD2020-04-131-0/+7
* | typosMatthew Hodgson2020-04-112-2/+2
* | Default PL100 to enable encryption in a room (#7230)Andrew Morgan2020-04-091-0/+1
* | Do not allow a deactivated user to login via SSO. (#7240)Patrick Cloke2020-04-096-7/+70
* | Fix --help commandline argument (#7249)Richard van der Hoff2020-04-091-16/+8
* | Make it clearer to the user that they haven't overridden onLogin/Register (#7...Andrew Morgan2020-04-092-3/+2
* | Upgrade jQuery to 3.x on fallback login/registration screens (#7236)Andrew Morgan2020-04-098-16/+14
* | Add documentation to password_providers config option (#7238)Andrew Morgan2020-04-081-2/+14
* | bg update to clear out duplicate outbound_device_list_pokes (#7193)Richard van der Hoff2020-04-074-13/+181
* | Merge pull request #7239 from matrix-org/rav/replication_cleanupRichard van der Hoff2020-04-073-32/+35
|\ \
| * | Handle one-word replication commands correctlyRichard van der Hoff2020-04-071-3/+11
| * | Fix warnings about not calling superclass constructorRichard van der Hoff2020-04-071-15/+24
| * | Remove vestigal references to SYNC replication commandRichard van der Hoff2020-04-072-14/+0
* | | Convert delete_url_cache_media to async/await. (#7241)Patrick Cloke2020-04-071-2/+2
* | | Add typing information to federation_server. (#7219)Patrick Cloke2020-04-071-66/+107
* | | Fix typo in the login fallback javascript (#7235)Brendan Abolivier2020-04-071-1/+1
|/ /
* | Remove sent outbound device list pokes from the database (#7192)Richard van der Hoff2020-04-072-2/+23
* | Fix race in replication (#7226)Erik Johnston2020-04-073-49/+67
* | Move server command handling out of TCP protocol (#7187)Erik Johnston2020-04-073-269/+236
* | Remove stream before/after debug log lines (#7207)Andrew Morgan2020-04-061-2/+0
* | Improve error responses when a remote server doesn't allow you to access its ...Andrew Morgan2020-04-062-24/+32
* | Move client command handling out of TCP protocol (#7185)Erik Johnston2020-04-068-342/+352
* | Server notices: Dissociate room creation/lookup from invite (#7199)Brendan Abolivier2020-04-042-10/+45
* | Support CAS in UI Auth flows. (#7186)Patrick Cloke2020-04-034-83/+130
* | Extend web_client_location to handle absolute URLs (#7006)Martin Milata2020-04-032-6/+21
* | Convert http.HTTPStatus objects to their int equivalent (#7188)Andrew Morgan2020-04-031-1/+8
* | Reduce the number of calls to `resource.getrusage` (#7183)Richard van der Hoff2020-04-031-39/+63
* | Merge pull request #7190 from matrix-org/rav/one_bg_update_at_a_timeRichard van der Hoff2020-04-033-59/+76
|\ \
| * | Update docstring per review commentsRichard van der Hoff2020-04-031-1/+1
| * | review commentRichard van der Hoff2020-04-021-1/+1
| * | Only run one background update at a timeRichard van der Hoff2020-03-313-27/+68
| * | Make do_next_background_update return a boolRichard van der Hoff2020-03-311-7/+5
| * | Make `has_completed_background_updates` asyncRichard van der Hoff2020-03-311-4/+3
| * | Remove unused `start_background_update`Richard van der Hoff2020-03-311-21/+0
* | | Remove some `run_in_background` calls in replication code (#7203)Richard van der Hoff2020-04-031-8/+8
* | | Merge branch 'master' into developRichard van der Hoff2020-04-031-1/+1
|\ \ \
| * | | Revert "Revert "Merge pull request #7153 from matrix-org/babolivier/sso_white...Richard van der Hoff2020-04-031-0/+15
| * | | Revert "Revert "Improve the UX of the login fallback when using SSO (#7152)""Richard van der Hoff2020-04-032-22/+31
| | |/ | |/|
| * | 1.12.3Richard van der Hoff2020-04-031-1/+1
| * | Fix the debian build in a better way. (#7212)Richard van der Hoff2020-04-031-3/+1
| * | 1.12.2Andrew Morgan2020-04-021-1/+1
| * | Pin Pillow>=4.3.0,<7.1.0 to fix dep issueAndrew Morgan2020-04-021-1/+3
| * | 1.12.1Andrew Morgan2020-04-021-1/+1
* | | Fix device list update stream ids going backward (#7158)Richard van der Hoff2020-04-031-2/+8
* | | Merge branch 'master' into developAndrew Morgan2020-04-021-1/+1
|\ \ \
| * \ \ Merge tag 'v1.12.1'Andrew Morgan2020-04-024-13/+32
| |\ \ \
| | * | | 1.12.1 v1.12.1 github/release-v1.12.1 release-v1.12.1Andrew Morgan2020-04-021-1/+1
| | |/ /
| | * | 1.12.1rc1Andrew Morgan2020-03-311-1/+1
| | * | Only import sqlite3 when type checkingDavid Vo2020-03-311-2/+5
| | * | Fix another instanceAndrew Morgan2020-03-311-5/+7
| | * | Only setdefault for signatures if device has key_jsonAndrew Morgan2020-03-311-5/+7
| | * | Fix starting workers when federation sending not split out.Erik Johnston2020-03-311-0/+12
| * | | Improve the UX of the login fallback when using SSO (#7152)Brendan Abolivier2020-03-272-22/+31
| * | | Update the wording of the config commentBrendan Abolivier2020-03-271-3/+3
| * | | Whitelist the login fallback by default for SSOBrendan Abolivier2020-03-261-1/+16
| |/ /
* | | Support SAML in the user interactive authentication workflow. (#7102)Patrick Cloke2020-04-019-44/+218
* | | Allow admins to create aliases when they are not in the room (#7191)Patrick Cloke2020-04-011-1/+5
* | | Remove connections per replication stream metric. (#7195)Erik Johnston2020-04-011-16/+0
| |/ |/|
* | Fix "'NoneType' has no attribute start|stop" logcontext errors (#7181)Richard van der Hoff2020-03-312-7/+11
* | Fill in the 'default' field for user-defined push rules (#6639)Karlinde2020-03-311-0/+1
* | Only setdefault for signatures if device has key_json (#7177)Andrew Morgan2020-03-311-10/+14
* | Fix use of async/await in media code (#7184)Patrick Cloke2020-03-311-2/+2
* | Fix a bug which could cause incorrect 'cyclic dependency' error. (#7178)Richard van der Hoff2020-03-311-12/+10
* | Rewrite prune_old_outbound_device_pokes for efficiency (#7159)Richard van der Hoff2020-03-303-37/+80
* | Transfer alias mappings when joining an upgraded room (#6946)Andrew Morgan2020-03-302-3/+26
* | Fix a small typo in the `metrics_flags` config option. (#7171)Andrew Morgan2020-03-301-1/+1
* | Remove usage of "conn_id" for presence. (#7128)Erik Johnston2020-03-307-22/+79
* | Merge pull request #7160 from matrix-org/dbkr/always_send_own_device_list_upd...David Baker2020-03-302-3/+18
|\ \
| * | Add explanatory commentAndrew Morgan2020-03-302-1/+4
| * | blackDavid Baker2020-03-301-1/+3
| * | Just add own user ID to the list we track device changes forDavid Baker2020-03-302-7/+11
| * | Fix undefined variable & remove debug loggingDavid Baker2020-03-271-10/+2
| * | blackDavid Baker2020-03-271-4/+4
| * | Always send the user updates to their own device listDavid Baker2020-03-272-6/+20
* | | Always whitelist the login fallback for SSO (#7153)Richard van der Hoff2020-03-271-0/+15
* | | Improve the UX of the login fallback when using SSO (#7152)Brendan Abolivier2020-03-272-22/+31
* | | Admin API to join users to a room. (#7051)Dirk Klimpel2020-03-272-4/+82
* | | Add options to prevent users from changing their profile. (#7096)Dirk Klimpel2020-03-273-0/+59
* | | Ensure is_verified on /_matrix/client/r0/room_keys/keys is a boolean (#7150)Andrew Morgan2020-03-272-2/+3
* | | Only import sqlite3 when type checking (#7155)David Vo2020-03-271-2/+5
|/ /
* | Merge pull request #7151 from matrix-org/jaywink/saml-redirect-fixJason Robinson2020-03-261-0/+4
|\ \
| * | Allow RedirectResponse in SAML response handlerJason Robinson2020-03-261-0/+4
* | | Refactor the CAS code (move the logic out of the REST layer to a handler) (#7...Patrick Cloke2020-03-263-155/+225
* | | Don't default to an invalid sqlite config if no database configuration is pro...Nektarios Katakis2020-03-261-22/+47
* | | Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-268-0/+222
|/ /
* | Validate that the session is not modified during UI-Auth (#7068)Patrick Cloke2020-03-265-12/+47
* | Remove unused captcha_bypass_secret option (#7137)Aaron Raimist2020-03-251-5/+0
* | Move catchup of replication streams to worker. (#7024)Erik Johnston2020-03-2520-431/+537
* | Merge pull request #7133 from matrix-org/erikj/fix_worker_startupErik Johnston2020-03-251-0/+12
|\ \
| * | Fix starting workers when federation sending not split out.Erik Johnston2020-03-241-0/+12
| |/
* | Clean up some LoggingContext stuff (#7120)Richard van der Hoff2020-03-2411-163/+161
* | Fix CAS redirect url (#6634)Naugrimm2020-03-241-11/+16
* | Use the proper error code when a canonical alias that does not exist is used....Patrick Cloke2020-03-231-19/+38
* | Convert `*StreamRow` classes to inner classes (#7116)Richard van der Hoff2020-03-234-98/+103
* | Merge branch 'master' into developRichard van der Hoff2020-03-231-1/+1
|\|
| * 1.12.0Richard van der Hoff2020-03-231-1/+1
* | Fix processing of `groups` stream, and use symbolic names for streams (#7117)Richard van der Hoff2020-03-232-30/+75
* | Set Referrer-Policy to no-referrer for media (#7009)Dionysis Grigoropoulos2020-03-231-0/+3
* | Clean-up some auth/login REST code (#7115)Patrick Cloke2020-03-202-41/+20
* | Improve database configuration docs (#6988)Richard van der Hoff2020-03-202-36/+59
* | Remove concept of a non-limited stream. (#7011)Erik Johnston2020-03-207-67/+70
* | Convert some of the media REST code to async/await (#7110)Patrick Cloke2020-03-203-111/+90
* | Fix a bug in the federation API which could cause occasional "Failed to get P...Patrick Cloke2020-03-193-30/+21
* | Change device list streams to have one row per ID (#7010)Erik Johnston2020-03-195-85/+111
|\ \ | |/ |/|
| * Comments from reviewErik Johnston2020-03-183-8/+25
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_devi...Erik Johnston2020-03-023-29/+45
| |\
| * | Fix worker handlingErik Johnston2020-03-021-2/+3
| * | Remove handling of multiple rows per IDErik Johnston2020-02-281-34/+1
| * | Change device list replication to match new semantics.Erik Johnston2020-02-284-23/+32
| * | Change device lists stream to have one row per id.Erik Johnston2020-02-281-18/+41
| * | Add 'device_lists_outbound_pokes' as extra table.Erik Johnston2020-02-282-2/+11
* | | 1.12.0rc1Richard van der Hoff2020-03-191-1/+1
* | | Fix concurrent modification errors in pusher metrics (#7106)Richard van der Hoff2020-03-191-9/+18
* | | Add prometheus metrics for the number of active pushers (#7103)Richard van der Hoff2020-03-193-8/+33
* | | Move pusherpool startup into _base.setup (#7104)Richard van der Hoff2020-03-192-1/+1
* | | Improve get auth chain difference algorithm. (#7095)Erik Johnston2020-03-183-49/+161
* | | Add an option to the set password API to choose whether to logout other devic...Patrick Cloke2020-03-183-19/+33
* | | Share SSL contexts for non-federation requests (#7094)Richard van der Hoff2020-03-174-31/+48
* | | Set charset to utf-8 when adding headers for certain text content types (#7044)The Stranjer2020-03-171-1/+24
* | | Remove unused federation endpoint (`query_auth`) (#7026)Patrick Cloke2020-03-174-146/+79
* | | Remove special casing of `m.room.aliases` events (#7034)Patrick Cloke2020-03-172-27/+1
* | | Revert "Add options to disable setting profile info for prevent changes. (#70...Richard van der Hoff2020-03-173-49/+0
* | | Populate the room version from state events (#7070)Brendan Abolivier2020-03-162-0/+62
* | | Fix buggy condition in account validity handler (#7074)Brendan Abolivier2020-03-161-1/+5
* | | Merge pull request #7067 from matrix-org/babolivier/saml_error_moarBrendan Abolivier2020-03-132-23/+72
|\ \ \
| * | | Use innerText instead of innerHTMLBrendan Abolivier2020-03-131-1/+2
| * | | LintBrendan Abolivier2020-03-111-2/+1
| * | | Put the file in the templates directoryBrendan Abolivier2020-03-111-12/+21
| * | | Update wording and configBrendan Abolivier2020-03-112-2/+5
| * | | Move the default SAML2 error HTML to a dedicated fileBrendan Abolivier2020-03-112-18/+55
* | | | Add type annotations and comments to auth handler (#7063)Patrick Cloke2020-03-121-89/+104
* | | | Refactor a bitBrendan Abolivier2020-03-111-28/+30
* | | | Also don't fail on aliases events in this caseBrendan Abolivier2020-03-111-1/+1
* | | | LintBrendan Abolivier2020-03-111-1/+5
* | | | Also don't filter out events sent by ignored users when checking state visibi...Brendan Abolivier2020-03-111-1/+1
* | | | Fix conditionBrendan Abolivier2020-03-111-1/+1
* | | | Don't filter out dummy events when we're checking the visibility of stateBrendan Abolivier2020-03-112-9/+8
|/ / /
* | | Add options to disable setting profile info for prevent changes. (#7053)Brendan Abolivier2020-03-103-0/+49
|\ \ \
| * | | Update synapse/config/registration.pyDirk Klimpel2020-03-101-1/+1
| * | | lint, fix testsdklimpel2020-03-091-1/+3
| * | | updates after reviewdklimpel2020-03-093-18/+24
| * | | add disable_3pid_changesdklimpel2020-03-082-0/+16
| * | | lint2dklimpel2020-03-081-2/+2
| * | | lintdklimpel2020-03-081-4/+2
| * | | changelogdklimpel2020-03-082-4/+10
| * | | Add options to disable setting profile info for prevent changes.dklimpel2020-03-082-0/+21
| | |/ | |/|
* | | Rephrase default messageBrendan Abolivier2020-03-101-2/+2
* | | Hopefully mypy is happy nowBrendan Abolivier2020-03-102-3/+10
* | | Attempt at appeasing the gods of mypyBrendan Abolivier2020-03-101-1/+1
* | | LintBrendan Abolivier2020-03-101-1/+1
* | | SAML2: render a comprehensible error page if something goes wrongBrendan Abolivier2020-03-103-2/+62
* | | Merge pull request #7055 from matrix-org/babolivier/get_time_of_last_push_act...Brendan Abolivier2020-03-092-18/+20
|\ \ \
| * | | Fix undefined `room_id` in `make_summary_text`Brendan Abolivier2020-03-091-1/+3
| * | | Move `get_time_of_last_push_action_before` to the `EventPushActionsWorkerStore`Brendan Abolivier2020-03-091-17/+17
* | | | Remove special auth and redaction rules for aliases events in experimental ro...Patrick Cloke2020-03-095-19/+22
* | | | Merge pull request #7045 from matrix-org/babolivier/room_keys_checkBrendan Abolivier2020-03-091-0/+7
|\ \ \ \
| * | | | LintBrendan Abolivier2020-03-061-2/+1
| * | | | Mention the session ID in the error messageBrendan Abolivier2020-03-061-2/+3
| * | | | LintBrendan Abolivier2020-03-061-1/+2
| * | | | Make sure that is_verified is a boolean when processing room keysBrendan Abolivier2020-03-061-0/+6
| |/ / /
* | | | Add type hints to logging/context.py (#6309)Neil Pilgrim2020-03-071-47/+74
* | | | Break down monthly active users by appservice_id (#7030)Neil Johnson2020-03-062-1/+44
|/ / /
* | | Convert remote key resource REST layer to async/await. (#7020)Patrick Cloke2020-03-051-7/+4
* | | Store room_versions in EventBase objects (#6875)Richard van der Hoff2020-03-054-32/+62
* | | Hide extremities dummy events from clientsBrendan Abolivier2020-03-041-0/+3
* | | Allow deleting an alias if the user has sufficient power level (#6986)Patrick Cloke2020-03-042-40/+76
* | | Read the room version from database when fetching events (#6874)Richard van der Hoff2020-03-041-16/+68
* | | Merge branch 'master' into developBrendan Abolivier2020-03-039-34/+219
|\ \ \
| * | | v1.11.1Brendan Abolivier2020-03-031-1/+1
| * | | Fix wrong handler being used in SAML handlerBrendan Abolivier2020-03-031-3/+2
| * | | Factor out complete_sso_login and expose it to the Module APIBrendan Abolivier2020-03-034-57/+96
| * | | Add a whitelist for the SSO confirmation step.Richard van der Hoff2020-03-022-8/+36
| * | | Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1Richard van der Hoff2020-03-022-10/+12
| |\ \ \
| | * | | Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-03-022-10/+12
| * | | | Add a confirmation step to the SSO login flowBrendan Abolivier2020-03-025-6/+126
| |/ / /
* | / / Validate the alt_aliases property of canonical alias events (#6971)Patrick Cloke2020-03-034-15/+62
| |/ / |/| |
* | | Always return a deferred from `get_current_state_deltas`. (#7019)Erik Johnston2020-03-021-1/+3