summary refs log tree commit diff
path: root/tests (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | Add tests for `last_successful_stream_ordering` (#8258)reivilibre2020-09-071-0/+76
* | Catch-up after Federation Outage (split, 1) (#8230)reivilibre2020-09-041-0/+82
|/
* Stop sub-classing object (#8249)Patrick Cloke2020-09-0421-48/+48
* Re-implement unread counts (again) (#8059)Brendan Abolivier2020-09-023-8/+167
* Add /user/{user_id}/shared_rooms/ api (#7785)Will Hunt2020-09-021-0/+138
* Convert the well known resolver to async (#8214)Patrick Cloke2020-09-011-6/+18
* Convert additional databases to async/await part 2 (#8200)Patrick Cloke2020-09-011-4/+3
* Make MultiWriterIDGenerator work for streams that use negative stream IDs (#8...Erik Johnston2020-09-011-0/+105
* Rename `get_e2e_device_keys` to better reflect its purpose (#8205)Richard van der Hoff2020-08-291-3/+5
* Convert ReadWriteLock to async/await. (#8202)Patrick Cloke2020-08-281-2/+4
* Ensure that the OpenID Connect remote ID is a string. (#8190)Patrick Cloke2020-08-281-2/+39
* Do not yield on awaitables in tests. (#8193)Patrick Cloke2020-08-2714-131/+229
* Convert stats and related calls to async/await (#8192)Patrick Cloke2020-08-275-29/+28
* Convert simple_delete to async/await. (#8191)Patrick Cloke2020-08-271-2/+4
* Fix missing _add_persisted_position (#8179)Erik Johnston2020-08-271-3/+49
* Convert additional database methods to async (select list, search, insert_man...Patrick Cloke2020-08-272-5/+6
* Convert simple_update* and simple_select* to async (#8173)Patrick Cloke2020-08-275-43/+47
* Reduce run-times of tests by advancing the reactor less (#7757)Andrew Morgan2020-08-276-8/+8
* Remove remaining is_guest argument uses from get_room_data calls (#8181)Andrew Morgan2020-08-261-10/+2
* Do not propagate typing notifications from shadow-banned users. (#8176)Patrick Cloke2020-08-263-8/+70
* Remove unused parameter from, and add safeguard in, get_room_data (#8174)Andrew Morgan2020-08-261-1/+1
* Do not propagate profile changes of shadow-banned users into rooms. (#8157)Patrick Cloke2020-08-262-157/+274
* Convert simple_select_one and simple_select_one_onecol to async (#8162)Patrick Cloke2020-08-268-40/+103
* Fix rate limiting unit tests. (#8167)Patrick Cloke2020-08-261-13/+14
* Add functions to `MultiWriterIdGen` used by events stream (#8164)Erik Johnston2020-08-251-0/+36
* Merge tag 'v1.19.1rc1' into developBrendan Abolivier2020-08-252-4/+93
|\
| * Fix join ratelimiter breaking profile updates and idempotency (#8153)Brendan Abolivier2020-08-242-4/+93
| * Do not apply ratelimiting on joins to appservices (#8139)Will Hunt2020-08-241-0/+73
* | Stop shadow-banned users from sending non-member events. (#8142)Patrick Cloke2020-08-241-1/+54
* | Allow capping a room's retention policy (#8104)Brendan Abolivier2020-08-241-28/+66
* | Fix flaky shadow-ban tests. (#8152)Patrick Cloke2020-08-241-1/+3
* | Don't fail /submit_token requests on incorrect session ID if request_token_in...Brendan Abolivier2020-08-241-0/+31
* | Do not apply ratelimiting on joins to appservices (#8139)Will Hunt2020-08-211-0/+73
* | Allow denying or shadow banning registrations via the spam checker (#8034)Patrick Cloke2020-08-203-7/+69
* | Stop shadow-banned users from sending invites. (#8095)Patrick Cloke2020-08-201-0/+100
* | Switch the JSON byte producer from a pull to a push producer. (#8116)Patrick Cloke2020-08-193-14/+9
* | Remove the unused inlineCallbacks code-paths in the caching code (#8119)Patrick Cloke2020-08-191-6/+6
* | Separate `get_current_token` into two. (#8113)Erik Johnston2020-08-191-8/+8
* | Convert events worker database to async/await. (#8071)Patrick Cloke2020-08-182-4/+5
* | Remove : from allowed client_secret chars (#8101)Andrew Morgan2020-08-181-3/+0
* | Iteratively encode JSON responses to avoid blocking the reactor. (#8013)Patrick Cloke2020-08-181-1/+0
* | Convert some of the general database methods to async (#8100)Patrick Cloke2020-08-177-30/+44
* | Use the default templates when a custom template file cannot be found (#8037)Andrew Morgan2020-08-171-0/+82
* | Convert stream database to async/await. (#8074)Patrick Cloke2020-08-172-34/+17
* | Add a shadow-banned flag to users. (#8092)Patrick Cloke2020-08-145-7/+11
* | Fix unawaited coroutine error in tests. (#8072)Patrick Cloke2020-08-131-10/+20
|/
* Convert the roommember database to async/await. (#8070)Patrick Cloke2020-08-121-1/+17
* Convert devices database to async/await. (#8069)Patrick Cloke2020-08-123-23/+39
* Add type hints to handlers.message and events.builder (#8067)Erik Johnston2020-08-121-1/+3
* Convert account data, device inbox, and censor events databases to async/awai...Patrick Cloke2020-08-121-1/+2
* Convert appservice, group server, profile and more databases to async (#8066)Patrick Cloke2020-08-121-12/+12
* Convert tags and metrics databases to async/await (#8062)Patrick Cloke2020-08-111-1/+4
* Converts event_federation and registration databases to async/await (#8061)Patrick Cloke2020-08-113-13/+24
* Add an assertion on prev_events in create_new_client_event (#8041)Richard van der Hoff2020-08-101-0/+4
* Convert directory, e2e_room_keys, end_to_end_keys, monthly_active_users datab...Patrick Cloke2020-08-074-18/+45
* Convert additional database stores to async/await (#8045)Patrick Cloke2020-08-071-2/+2
* Add health check endpoint (#8048)Erik Johnston2020-08-071-0/+34
* Revert #7736 (#8039)Brendan Abolivier2020-08-062-175/+2
* Convert some util functions to async (#8035)Patrick Cloke2020-08-061-33/+11
* Convert synapse.api to async/await (#8031)Patrick Cloke2020-08-069-68/+93
* Improve performance of the register endpoint (#8009)Patrick Cloke2020-08-061-1/+1
* Rename database classes to make some sense (#8033)Erik Johnston2020-08-0517-125/+129
* Convert streams to async. (#8014)Patrick Cloke2020-08-041-1/+1
* Prevent join->join membership transitions changing member count (#7977)Andrew Morgan2020-08-032-7/+63
* Implement handling of HTTP HEAD requests. (#7999)Patrick Cloke2020-08-031-3/+42
* Convert the crypto module to async/await. (#8003)Patrick Cloke2020-08-031-23/+16
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/add_rate_l...Erik Johnston2020-07-3125-170/+595
|\
| * Convert federation client to async/await. (#7975)Patrick Cloke2020-07-3010-52/+71
| * Convert appservice to async. (#7973)Patrick Cloke2020-07-303-38/+75
| * Convert some of the data store to async. (#7976)Patrick Cloke2020-07-303-19/+29
| * Re-implement unread counts (#7736)Brendan Abolivier2020-07-292-2/+175
| * Convert storage layer to async/await. (#7963)Patrick Cloke2020-07-285-45/+63
| * Add an option to disable purge in delete room admin API (#7964)Dirk Klimpel2020-07-281-2/+55
| * Option to allow server admins to join complex rooms (#7902)lugino-emeritus2020-07-281-0/+109
| * Convert a synapse.events to async/await. (#7949)Patrick Cloke2020-07-272-8/+10
| * Convert groups and visibility code to async / await. (#7951)Patrick Cloke2020-07-271-6/+6
| * Convert push to async/await. (#7948)Patrick Cloke2020-07-272-4/+8
* | Add ratelimiting on joinsErik Johnston2020-07-311-0/+4
|/
* Convert tests/rest/admin/test_room.py to unix file endings (#7953)Andrew Morgan2020-07-271-1447/+1447
* Support oEmbed for media previews. (#7920)Patrick Cloke2020-07-271-8/+134
* Convert state resolution to async/await (#7942)Patrick Cloke2020-07-245-50/+73
* Convert more of the media code to async/await (#7873)Patrick Cloke2020-07-241-1/+4
* Return an empty body for OPTIONS requests. (#7886)Patrick Cloke2020-07-241-6/+6
* Downgrade warning on client disconnect to INFO (#7928)Richard van der Hoff2020-07-241-58/+1
* Convert the federation agent and related code to async/await. (#7874)Patrick Cloke2020-07-232-37/+40
* Convert the message handler to async/await. (#7884)Patrick Cloke2020-07-228-102/+120
* Convert device handler to async/await (#7871)Patrick Cloke2020-07-173-28/+30
* Convert _base, profile, and _receipts handlers to async/await (#7860)Patrick Cloke2020-07-171-6/+11
* Add admin endpoint to get members in a room. (#7842)Michael Albert2020-07-161-0/+46
* Add ability to run multiple pusher instances (#7855)Erik Johnston2020-07-161-0/+193
* Merge branch 'erikj/faster_typing' of github.com:matrix-org/synapse into developErik Johnston2020-07-151-2/+2
|\
| * Fix testsErik Johnston2020-07-151-2/+2
* | Allow accounts to be re-activated from the admin APIs. (#7847)Patrick Cloke2020-07-151-0/+47
* | Fix client reader sharding tests (#7853)Erik Johnston2020-07-154-173/+271
|/
* Convert E2E key and room key handlers to async/await. (#7851)Patrick Cloke2020-07-152-237/+422
* Return the proper 403 Forbidden error during errors with JWT logins. (#7844)Patrick Cloke2020-07-151-21/+22
* Add delete room admin endpoint (#7613)Dirk Klimpel2020-07-142-0/+403
* Add the option to validate the `iss` and `aud` claims for JWT logins. (#7827)Patrick Cloke2020-07-141-6/+100
* Support handling registration requests across multiple client readers. (#7830)Patrick Cloke2020-07-131-0/+133
* Do not use canonicaljson to magically handle decoding bytes from JSON. (#7802)Patrick Cloke2020-07-101-1/+1
* Add ability to shard the federation sender (#7798)Erik Johnston2020-07-102-0/+287
* Fix some spelling mistakes / typos. (#7811)Patrick Cloke2020-07-096-7/+7
* Add `HomeServer.signing_key` property (#7805)Richard van der Hoff2020-07-081-5/+2
* Stop populating unused table `local_invites`. (#7793)Richard van der Hoff2020-07-071-1/+0
* Convert the appservice handler to async/await. (#7775)Patrick Cloke2020-07-061-33/+35
* Don't ignore `set_tweak` actions with no explicit `value`. (#7766)reivilibre2020-07-061-0/+17
* isort 5 compatibility (#7786)Will Hunt2020-07-053-8/+2
* Merge different Resource implementation classes (#7732)Erik Johnston2020-07-032-9/+65
* Fix inconsistent handling of upper and lower cases of email addresses. (#7021)Dirk Klimpel2020-07-032-30/+194
* Hack to add push priority to push notifications (#7765)reivilibre2020-07-011-5/+347
* Back out MSC2625 implementation (#7761)Brendan Abolivier2020-07-012-45/+19
* Additional configuration options for auto-join rooms (#7763)Patrick Cloke2020-06-301-2/+210
* Yield during large v2 state res. (#7735)Erik Johnston2020-06-241-0/+9
* add org.matrix.login.jwt so that m.login.jwt can be deprecated (#7675)Sorunome2020-06-241-3/+7
* Allow local media to be marked as safe from being quarantined. (#7718)Patrick Cloke2020-06-221-72/+65
* Convert the typing handler to async/await. (#7679)Patrick Cloke2020-06-171-6/+7
* Fetch from the r0 media path instead of the unspecced v1. (#7714)Patrick Cloke2020-06-171-1/+1
* Implement unread counter (MSC2625) (#7673)Brendan Abolivier2020-06-172-19/+45
|\
| * Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-152-21/+141
| |\
| * \ Merge branch 'develop' into babolivier/mark_unreadBrendan Abolivier2020-06-154-7/+110
| |\ \
| * | | LintBrendan Abolivier2020-06-121-3/+1
| * | | Test that a mark_unread action updates the right counter when using a slave s...Brendan Abolivier2020-06-121-0/+15
| * | | Remove debug loggingBrendan Abolivier2020-06-121-2/+0
| * | | Test that a mark_unread action updates the right counterBrendan Abolivier2020-06-121-5/+16
| * | | Fix testsBrendan Abolivier2020-06-102-17/+21
* | | | Include a user agent in federation requests. (#7677)Patrick Cloke2020-06-161-0/+10
* | | | Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-1610-23/+14
* | | | Create a ListenerConfig object (#7681)Richard van der Hoff2020-06-165-19/+31
* | | | Merge branch 'master' into developBrendan Abolivier2020-06-162-0/+54
|\ \ \ \
| * | | | Wrap register_device coroutine in an ensureDeferred (#7684)Andrew Morgan2020-06-162-0/+54
| |/ / /
* | | | Ensure the body is a string before comparing push rules. (#7701)Patrick Cloke2020-06-151-9/+30
* | | | Ensure etag is a string for GET room_keys/version response (#7691)Hubert Chathi2020-06-151-0/+1
| |_|/ |/| |
* | | Discard RDATA from already seen positions. (#7648)Patrick Cloke2020-06-152-21/+141
| |/ |/|
* | Add option to enable encryption by default for new rooms (#7639)Andrew Morgan2020-06-104-7/+110
|/
* Convert user directory handler and related classes to async/await. (#7640)Patrick Cloke2020-06-051-4/+4
* Add an option to disable autojoin for guest accounts (#6637)Travis Ralston2020-06-051-0/+10
* Allow new users to be registered via the admin API even if the monthly active...Dirk Klimpel2020-06-051-15/+163
* Add device management to admin API (#7481)Dirk Klimpel2020-06-051-0/+541
* Add support for webp thumbnailing (#7586)WGH2020-06-051-36/+99
* Performance improvements and refactor of Ratelimiter (#7595)Andrew Morgan2020-06-058-68/+128
* Fix encryption algorithm typos in tests/comments (#7637)Andrew Morgan2020-06-042-6/+6
* Replace instances of reactor pumping with get_success. (#7619)Andrew Morgan2020-06-032-121/+151
* Fix a bug in automatic user creation with m.login.jwt. (#7585)Olof Johansson2020-06-011-0/+153
* Process cross-signing keys when resyncing device lists (#7594)Brendan Abolivier2020-06-011-0/+56
* Email notifications for new users when creating via the Admin API. (#7267)Dirk Klimpel2020-06-011-0/+75
* Add test for Linearizer.is_queued(..)Erik Johnston2020-05-271-0/+32
* Fix specifying cache factors via env vars with * in name. (#7580)Erik Johnston2020-05-271-0/+28
* Don't apply cache factor to event cache. (#7578)Erik Johnston2020-05-271-0/+16
* Fix recording of federation stream token (#7564)Richard van der Hoff2020-05-261-0/+71
* Optimise some references to hs.config (#7546)Richard van der Hoff2020-05-224-117/+129
* Fix missing CORS headers on OPTION responses (#7560)Erik Johnston2020-05-221-0/+28
* Return 200 OK for all OPTIONS requests (#7534)Patrick Cloke2020-05-221-0/+53
* Add ability to wait for replication streams (#7542)Erik Johnston2020-05-225-8/+15
* Convert sending mail to async/await. (#7557)Erik Johnston2020-05-221-2/+2
* Retry to sync out of sync device lists (#7453)Brendan Abolivier2020-05-211-1/+62
* fix mypy for tests/replication (#7518)Richard van der Hoff2020-05-182-13/+7
* Fix limit logic for AccountDataStream (#7384)Richard van der Hoff2020-05-151-0/+117
* Support UI Authentication for OpenID Connect accounts (#7457)Patrick Cloke2020-05-151-5/+10
* Implement room version 6 (MSC2240). (#7506)Patrick Cloke2020-05-153-15/+9
* Strictly enforce canonicaljson requirements in a new room version (#7381)Patrick Cloke2020-05-141-1/+66
* Enforce MSC2209: auth rules for notifications in power level event (#7502)Patrick Cloke2020-05-141-0/+33
* Allow expired accounts to logout (#7443)Andrew Morgan2020-05-142-2/+103
* Merge tag 'v1.13.0rc2' into developRichard van der Hoff2020-05-142-46/+59
|\
| * Stop `get_joined_users` corruption from custom statuses (#7376)Richard van der Hoff2020-05-141-1/+49
| * Do not validate that the client dict is stable during UI Auth. (#7483)Patrick Cloke2020-05-131-45/+10
| * Fix new flake8 errors (#7489)Patrick Cloke2020-05-131-1/+1
* | Clean up replication unit tests. (#7490)Erik Johnston2020-05-137-51/+15
* | Shuffle persist event data store functions. (#7440)Erik Johnston2020-05-131-1/+2
* | Fix new flake8 errors (#7470)Erik Johnston2020-05-121-1/+1
* | Allow configuration of Synapse's cache without using synctl or environment va...Amber Brown2020-05-119-18/+178
* | Merge branch 'release-v1.13.0' into developAndrew Morgan2020-05-111-88/+216
|\|
| * Rework UI Auth session validation for registration (#7455)Patrick Cloke2020-05-081-88/+216
* | Extend spam checker to allow for multiple modules (#7435)Andrew Morgan2020-05-081-2/+2
* | Implement OpenID Connect-based login (#7256)Quentin Gliech2020-05-081-0/+565
* | Add room details admin endpoint (#7317)Manuel Stahl2020-05-072-0/+52
* | Merge branch 'release-v1.13.0' into developRichard van der Hoff2020-05-064-33/+53
|\|
| * Stop Auth methods from polling the config on every req. (#7420)Andrew Morgan2020-05-064-33/+53
* | Merge branch 'release-v1.13.0' into developRichard van der Hoff2020-05-062-6/+120
|\|
| * Fix bug in EventContext.deserialize. (#7393)Erik Johnston2020-05-052-6/+120
* | Fix catchup-on-reconnect for the Federation Stream (#7374)Richard van der Hoff2020-05-053-12/+94
* | Add MultiWriterIdGenerator. (#7281)Erik Johnston2020-05-041-0/+184
|/
* Convert synapse.server_notices to async/await. (#7394)Patrick Cloke2020-05-011-1/+1
* Thread through instance name to replication client. (#7369)Erik Johnston2020-05-013-6/+6
* Use `stream.current_token()` and remove `stream_positions()` (#7172)Erik Johnston2020-05-014-34/+26
* async/await is_server_admin (#7363)Andrew Morgan2020-05-014-62/+81
* Persist user interactive authentication sessions (#7302)Patrick Cloke2020-04-302-4/+44
* Add instance name to RDATA/POSITION commands (#7364)Erik Johnston2020-04-292-2/+5
* Don't relay REMOTE_SERVER_UP cmds to same conn. (#7352)Erik Johnston2020-04-291-0/+62
* Fix limit logic for EventsStream (#7358)Richard van der Hoff2020-04-298-48/+579
* Return total number of users and profile attributes in admin users endpoint (...Manuel Stahl2020-04-282-0/+48
* Add some replication tests (#7278)Erik Johnston2020-04-282-11/+298
* Fix collation for postgres for unit tests (#7359)Richard van der Hoff2020-04-281-1/+4
* Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_t...Brendan Abolivier2020-04-232-1/+62
* Another go at fixing one-word commands (#7326)Richard van der Hoff2020-04-221-0/+42
* Extend StreamChangeCache to support multiple entities per stream ID (#7303)Richard van der Hoff2020-04-221-9/+60
* Extend room admin api with additional attributes (#7225)Dirk Klimpel2020-04-222-592/+680
* Add ability to run replication protocol over redis. (#7040)Erik Johnston2020-04-221-2/+2
* Do not treat display names as globs for push rules. (#7271)Patrick Cloke2020-04-161-0/+65
* Convert auth handler to async/await (#7261)Patrick Cloke2020-04-154-57/+104
* Allow specifying the value of Accept-Language header for URL previews (#7265)Andrew Morgan2020-04-151-0/+55
* Fix the parameters of a test fixture (#7243)Zay11Zay2020-04-141-1/+1
* Default PL100 to enable encryption in a room (#7230)Andrew Morgan2020-04-092-4/+297
* Do not allow a deactivated user to login via SSO. (#7240)Patrick Cloke2020-04-091-3/+39
* bg update to clear out duplicate outbound_device_list_pokes (#7193)Richard van der Hoff2020-04-071-0/+52
* Move client command handling out of TCP protocol (#7185)Erik Johnston2020-04-063-29/+25
* Server notices: Dissociate room creation/lookup from invite (#7199)Brendan Abolivier2020-04-041-12/+108
* Merge pull request #7190 from matrix-org/rav/one_bg_update_at_a_timeRichard van der Hoff2020-04-032-13/+22
|\
| * Make do_next_background_update return a boolRichard van der Hoff2020-03-311-3/+3
| * Set a logging context while running the bg updatesRichard van der Hoff2020-03-311-4/+7
| * Make `has_completed_background_updates` asyncRichard van der Hoff2020-03-311-1/+3
| * Remove unused `start_background_update`Richard van der Hoff2020-03-311-5/+9
* | Fix device list update stream ids going backward (#7158)Richard van der Hoff2020-04-031-0/+6
* | Allow admins to create aliases when they are not in the room (#7191)Patrick Cloke2020-04-011-0/+62
|/
* Rewrite prune_old_outbound_device_pokes for efficiency (#7159)Richard van der Hoff2020-03-301-0/+92
* Merge pull request #7157 from matrix-org/rev.outbound_device_pokes_testsRichard van der Hoff2020-03-3010-22/+317
|\
| * Add tests for outbound device pokesRichard van der Hoff2020-03-272-3/+301
| * Remove spurious "name" parameter to `default_config`Richard van der Hoff2020-03-249-19/+16
* | Always whitelist the login fallback for SSO (#7153)Richard van der Hoff2020-03-271-1/+8
* | Admin API to join users to a room. (#7051)Dirk Klimpel2020-03-271-0/+288
* | Add options to prevent users from changing their profile. (#7096)Dirk Klimpel2020-03-272-1/+366
* | Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-261-0/+179
* | Validate that the session is not modified during UI-Auth (#7068)Patrick Cloke2020-03-262-2/+69
* | Move catchup of replication streams to worker. (#7024)Erik Johnston2020-03-252-23/+84
* | Clean up some LoggingContext stuff (#7120)Richard van der Hoff2020-03-2411-56/+68
|/
* Convert `*StreamRow` classes to inner classes (#7116)Richard van der Hoff2020-03-231-2/+2
* Improve database configuration docs (#6988)Richard van der Hoff2020-03-201-20/+2
* Change device list streams to have one row per ID (#7010)Erik Johnston2020-03-191-45/+0
|\
| * Remove handling of multiple rows per IDErik Johnston2020-02-281-45/+0
* | Improve get auth chain difference algorithm. (#7095)Erik Johnston2020-03-182-22/+148
* | Share SSL contexts for non-federation requests (#7094)Richard van der Hoff2020-03-172-13/+22
* | Remove special casing of `m.room.aliases` events (#7034)Patrick Cloke2020-03-172-15/+33
* | Revert "Add options to disable setting profile info for prevent changes. (#70...Richard van der Hoff2020-03-172-335/+1
* | Add options to disable setting profile info for prevent changes. (#7053)Brendan Abolivier2020-03-102-1/+335
|\ \
| * | lint, fix testsdklimpel2020-03-091-2/+2
| * | updates after reviewdklimpel2020-03-092-13/+10
| * | fix testsdklimpel2020-03-091-2/+2
| * | lintdklimpel2020-03-091-10/+8
| * | add testsdklimpel2020-03-092-3/+311
| * | Add options to disable setting profile info for prevent changes.dklimpel2020-03-081-1/+32
| |/
* | Remove special auth and redaction rules for aliases events in experimental ro...Patrick Cloke2020-03-092-3/+125
* | Break down monthly active users by appservice_id (#7030)Neil Johnson2020-03-061-0/+42
* | Allow deleting an alias if the user has sufficient power level (#6986)Patrick Cloke2020-03-041-24/+104
* | Read the room version from database when fetching events (#6874)Richard van der Hoff2020-03-041-0/+10
* | Merge branch 'master' into developBrendan Abolivier2020-03-031-0/+111
|\ \
| * | Add a whitelist for the SSO confirmation step.Richard van der Hoff2020-03-021-3/+29
| * | Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1Richard van der Hoff2020-03-021-28/+181
| |\ \
| | * | Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-03-021-28/+181
| * | | Add a confirmation step to the SSO login flowBrendan Abolivier2020-03-021-0/+85
| |/ /
* | / Validate the alt_aliases property of canonical alias events (#6971)Patrick Cloke2020-03-033-37/+191
| |/ |/|
* | Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-02-281-32/+186