summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Default PL100 to enable encryption in a room (#7230)Andrew Morgan2020-04-094-4/+299
* Do not allow a deactivated user to login via SSO. (#7240)Patrick Cloke2020-04-098-10/+110
* Unblacklist /upgrade creates a new room (#7228)Andrew Morgan2020-04-092-2/+1
* Add matrix-synapse-shared-secret-auth as an example password provider (#7248)Andrew Morgan2020-04-092-0/+2
* Revert "Unblacklist /upgrade creates a new room (#7228)" (#7254)Andrew Morgan2020-04-092-1/+2
* Unblacklist /upgrade creates a new room (#7228)Andrew Morgan2020-04-092-2/+1
* Fix --help commandline argument (#7249)Richard van der Hoff2020-04-092-16/+9
* Make it clearer to the user that they haven't overridden onLogin/Register (#7...Andrew Morgan2020-04-093-3/+3
* Upgrade jQuery to 3.x on fallback login/registration screens (#7236)Andrew Morgan2020-04-099-16/+15
* Fix bad merge of CHANGES.mdRichard van der Hoff2020-04-081-5/+1
* Remove redundant checks on `daemonize` from synctl (#7233)Richard van der Hoff2020-04-082-9/+12
* Make systemd-with-workers doc official (#7234)Richard van der Hoff2020-04-0810-194/+134
* Fix changelog for #7235Brendan Abolivier2020-04-082-1/+1
* Add documentation to password_providers config option (#7238)Andrew Morgan2020-04-084-4/+32
* bg update to clear out duplicate outbound_device_list_pokes (#7193)Richard van der Hoff2020-04-076-13/+234
* Merge pull request #7239 from matrix-org/rav/replication_cleanupRichard van der Hoff2020-04-074-32/+36
|\
| * changelogRichard van der Hoff2020-04-071-0/+1
| * 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-072-2/+3
* | Add typing information to federation_server. (#7219)Patrick Cloke2020-04-073-66/+109
* | Fix typo in the login fallback javascript (#7235)Brendan Abolivier2020-04-072-1/+2
|/
* Remove sent outbound device list pokes from the database (#7192)Richard van der Hoff2020-04-073-2/+24
* Fix race in replication (#7226)Erik Johnston2020-04-074-49/+68
* Move server command handling out of TCP protocol (#7187)Erik Johnston2020-04-074-269/+237
* Add information about .well-known to Debian installation. (#7227)Patrick Cloke2020-04-063-7/+18
* Remove stream before/after debug log lines (#7207)Andrew Morgan2020-04-062-2/+1
* Improve error responses when a remote server doesn't allow you to access its ...Andrew Morgan2020-04-063-24/+33
* Move client command handling out of TCP protocol (#7185)Erik Johnston2020-04-0612-371/+378
* Server notices: Dissociate room creation/lookup from invite (#7199)Brendan Abolivier2020-04-044-22/+154
* Support CAS in UI Auth flows. (#7186)Patrick Cloke2020-04-035-83/+131
* Extend web_client_location to handle absolute URLs (#7006)Martin Milata2020-04-034-9/+30
* Add some benchmarks for LruCache (#6446)Amber Brown2020-04-035-5/+91
* Convert http.HTTPStatus objects to their int equivalent (#7188)Andrew Morgan2020-04-032-1/+9
* Reduce the number of calls to `resource.getrusage` (#7183)Richard van der Hoff2020-04-032-39/+64
* Merge pull request #7190 from matrix-org/rav/one_bg_update_at_a_timeRichard van der Hoff2020-04-036-72/+99
|\
| * Update docstring per review commentsRichard van der Hoff2020-04-031-1/+1
| * review commentRichard van der Hoff2020-04-021-1/+1
| * changelogRichard van der Hoff2020-03-311-0/+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-312-10/+8
| * 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-312-5/+6
| * Remove unused `start_background_update`Richard van der Hoff2020-03-312-26/+9
* | Remove some `run_in_background` calls in replication code (#7203)Richard van der Hoff2020-04-032-8/+9
* | Merge branch 'master' into developRichard van der Hoff2020-04-034-7/+62
|\ \
| * | Revert "Revert "Merge pull request #7153 from matrix-org/babolivier/sso_white...Richard van der Hoff2020-04-034-1/+28
| * | Revert "Revert "Improve the UX of the login fallback when using SSO (#7152)""Richard van der Hoff2020-04-033-22/+32
| * | Merge tag 'v1.12.3'Richard van der Hoff2020-04-035-10/+46
| |\ \
| | * | tweak changelog v1.12.3 github/release-v1.12.3 release-v1.12.3Richard van der Hoff2020-04-031-5/+2
| | * | 1.12.3Richard van der Hoff2020-04-034-4/+16
| | * | Fix the debian build in a better way. (#7212)Richard van der Hoff2020-04-034-9/+36
| * | | Merge tag 'v1.12.2'Richard van der Hoff2020-04-034-2/+20
| |\| |
| | * | Fix changelog wording v1.12.2 github/release-v1.12.2 release-v1.12.2Andrew Morgan2020-04-021-1/+1
| | * | 1.12.2Andrew Morgan2020-04-023-1/+17
| | * | Pin Pillow>=4.3.0,<7.1.0 to fix dep issueAndrew Morgan2020-04-021-1/+3
| | * | 1.12.1Andrew Morgan2020-04-023-1/+13
| * | | Revert "Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_log...Richard van der Hoff2020-04-034-28/+1
| * | | Revert "Improve the UX of the login fallback when using SSO (#7152)"Richard van der Hoff2020-04-033-32/+22
* | | | Fix device list update stream ids going backward (#7158)Richard van der Hoff2020-04-033-2/+15
* | | | Merge branch 'master' into developAndrew Morgan2020-04-024-4/+26
|\| | |
| * | | Merge tag 'v1.12.1'Andrew Morgan2020-04-026-13/+55
| |\ \ \
| | * | | 1.12.1 v1.12.1 github/release-v1.12.1 release-v1.12.1Andrew Morgan2020-04-023-1/+13
| | |/ /
| | * | Note where bugs were introduced v1.12.1rc1Andrew Morgan2020-03-311-3/+3
| | * | 1.12.1rc1Andrew Morgan2020-03-315-4/+12
| | * | NewsfileErik Johnston2020-03-311-0/+1
| | * | Rewrite changelogAndrew Morgan2020-03-311-1/+1
| | * | Add changelogAndrew Morgan2020-03-311-0/+1
| | * | Only import sqlite3 when type checkingDavid Vo2020-03-312-2/+6
| | * | 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
| * | | Attempt to clarify Python version requirements (#7161)Richard van der Hoff2020-03-301-3/+3
| * | | Improve the UX of the login fallback when using SSO (#7152)Brendan Abolivier2020-03-273-22/+32
| * | | Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_login_fallbackBrendan Abolivier2020-03-274-1/+28
| |\ \ \
| | * | | Update the wording of the config commentBrendan Abolivier2020-03-272-6/+6
| | * | | LintBrendan Abolivier2020-03-261-5/+1
| | * | | ChangelogBrendan Abolivier2020-03-261-0/+1
| | * | | Regenerate sample configBrendan Abolivier2020-03-261-1/+5
| | * | | Whitelist the login fallback by default for SSOBrendan Abolivier2020-03-262-2/+28
| | |/ /
* | | | Support SAML in the user interactive authentication workflow. (#7102)Patrick Cloke2020-04-0111-44/+227
* | | | Allow admins to create aliases when they are not in the room (#7191)Patrick Cloke2020-04-013-1/+68
* | | | Update postgres.md (#7119)siroccal2020-04-012-1/+28
* | | | Remove connections per replication stream metric. (#7195)Erik Johnston2020-04-012-16/+1
* | | | Improve TURN documentation. (#7167)Jostein Kjønigsen2020-03-312-0/+8
| |_|/ |/| |
* | | Fix "'NoneType' has no attribute start|stop" logcontext errors (#7181)Richard van der Hoff2020-03-313-7/+12
* | | Fill in the 'default' field for user-defined push rules (#6639)Karlinde2020-03-312-0/+2
* | | Only setdefault for signatures if device has key_json (#7177)Andrew Morgan2020-03-312-10/+15
* | | Fix use of async/await in media code (#7184)Patrick Cloke2020-03-312-2/+3
* | | Fix a bug which could cause incorrect 'cyclic dependency' error. (#7178)Richard van der Hoff2020-03-312-12/+11
* | | Rewrite prune_old_outbound_device_pokes for efficiency (#7159)Richard van der Hoff2020-03-305-37/+173
* | | Transfer alias mappings when joining an upgraded room (#6946)Andrew Morgan2020-03-303-3/+27
* | | Fix a small typo in the `metrics_flags` config option. (#7171)Andrew Morgan2020-03-303-2/+3
* | | Remove usage of "conn_id" for presence. (#7128)Erik Johnston2020-03-309-22/+86
* | | Merge pull request #7160 from matrix-org/dbkr/always_send_own_device_list_upd...David Baker2020-03-303-3/+19
|\ \ \
| * | | 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
| * | | changelogDavid Baker2020-03-271-0/+1
| * | | Always send the user updates to their own device listDavid Baker2020-03-272-6/+20
* | | | Merge pull request #7157 from matrix-org/rev.outbound_device_pokes_testsRichard van der Hoff2020-03-3011-22/+318
|\ \ \ \
| * | | | Add tests for outbound device pokesRichard van der Hoff2020-03-273-3/+302
| * | | | Remove spurious "name" parameter to `default_config`Richard van der Hoff2020-03-249-19/+16
* | | | | Add developer documentation for running a local CAS server (#7147)Patrick Cloke2020-03-303-2/+71
* | | | | Always whitelist the login fallback for SSO (#7153)Richard van der Hoff2020-03-274-1/+28
* | | | | Improve the UX of the login fallback when using SSO (#7152)Brendan Abolivier2020-03-273-22/+32
* | | | | Admin API to join users to a room. (#7051)Dirk Klimpel2020-03-275-4/+405
* | | | | Add options to prevent users from changing their profile. (#7096)Dirk Klimpel2020-03-277-1/+449
* | | | | update debian installation instructions to recommend installing `virtualenv` ...txt-file2020-03-272-1/+2
* | | | | Ensure is_verified on /_matrix/client/r0/room_keys/keys is a boolean (#7150)Andrew Morgan2020-03-273-2/+4
* | | | | Only import sqlite3 when type checking (#7155)David Vo2020-03-272-2/+6
| |/ / / |/| | |
* | | | Merge pull request #7151 from matrix-org/jaywink/saml-redirect-fixJason Robinson2020-03-262-0/+5
|\ \ \ \
| * | | | Update changelog.d/7151.bugfixJason Robinson2020-03-261-1/+1
| * | | | Allow RedirectResponse in SAML response handlerJason Robinson2020-03-262-0/+5
* | | | | Refactor the CAS code (move the logic out of the REST layer to a handler) (#7...Patrick Cloke2020-03-265-155/+227
* | | | | Don't default to an invalid sqlite config if no database configuration is pro...Nektarios Katakis2020-03-262-22/+48
* | | | | Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-2611-0/+437
|/ / / /
* | | | Validate that the session is not modified during UI-Auth (#7068)Patrick Cloke2020-03-268-14/+117
* | | | Remove unused captcha_bypass_secret option (#7137)Aaron Raimist2020-03-253-9/+1
* | | | Move catchup of replication streams to worker. (#7024)Erik Johnston2020-03-2524-487/+635
* | | | Various cleanups to INSTALL.md (#7141)Andrew Morgan2020-03-252-59/+40
* | | | Merge pull request #7133 from matrix-org/erikj/fix_worker_startupErik Johnston2020-03-252-0/+13
|\ \ \ \
| * | | | NewsfileErik Johnston2020-03-241-0/+1
| * | | | 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-2424-222/+232
| |/ / |/| |
* | | Fix CAS redirect url (#6634)Naugrimm2020-03-242-11/+17
* | | Use the proper error code when a canonical alias that does not exist is used....Patrick Cloke2020-03-232-19/+39
* | | Update pre-built package name for FreeBSD (#7107). (#7107)Kartikaya Gupta (kats)2020-03-232-1/+2
* | | Convert `*StreamRow` classes to inner classes (#7116)Richard van der Hoff2020-03-236-100/+106
* | | Merge branch 'master' into developRichard van der Hoff2020-03-234-3/+68
|\| |
| * | Merge tag 'v1.12.0'Richard van der Hoff2020-03-23166-3778/+4329
| |\|
| | * matrix.org was fine v1.12.0 github/release-v1.12.0 release-v1.12.0Richard van der Hoff2020-03-231-0/+2
| | * Update CHANGES.mdNeil Johnson2020-03-231-1/+1
| | * changelog typosRichard van der Hoff2020-03-231-3/+3
| | * 1.12.0 changelogRichard van der Hoff2020-03-231-1/+53
| | * 1.12.0Richard van der Hoff2020-03-233-1/+13
| * | Update postgres.mdRichard van der Hoff2020-03-171-2/+1
* | | Fix processing of `groups` stream, and use symbolic names for streams (#7117)Richard van der Hoff2020-03-233-30/+76
* | | Set Referrer-Policy to no-referrer for media (#7009)Dionysis Grigoropoulos2020-03-232-0/+4
* | | Clean-up some auth/login REST code (#7115)Patrick Cloke2020-03-203-41/+21
* | | Improve database configuration docs (#6988)Richard van der Hoff2020-03-206-71/+132
* | | Remove concept of a non-limited stream. (#7011)Erik Johnston2020-03-208-67/+71
* | | Convert some of the media REST code to async/await (#7110)Patrick Cloke2020-03-204-111/+91
* | | Fix a bug in the federation API which could cause occasional "Failed to get P...Patrick Cloke2020-03-194-30/+22
* | | Change device list streams to have one row per ID (#7010)Erik Johnston2020-03-197-130/+112
|\ \ \ | |_|/ |/| |
| * | Comments from reviewErik Johnston2020-03-183-8/+25
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_devi...Erik Johnston2020-03-0213-40/+55
| |\ \
| * | | Fix worker handlingErik Johnston2020-03-021-2/+3
| * | | Remove handling of multiple rows per IDErik Johnston2020-02-282-79/+1
| * | | NewsfileErik Johnston2020-02-281-0/+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
* | | | more changelog v1.12.0rc1Richard van der Hoff2020-03-191-1/+1
* | | | changelog fixesRichard van der Hoff2020-03-191-3/+3
* | | | fix typoRichard van der Hoff2020-03-191-2/+2
* | | | 1.12.0rc1Richard van der Hoff2020-03-1960-59/+78
* | | | update grafana dashboardRichard van der Hoff2020-03-191-32/+213
* | | | Fix concurrent modification errors in pusher metrics (#7106)Richard van der Hoff2020-03-192-9/+19
* | | | Add prometheus metrics for the number of active pushers (#7103)Richard van der Hoff2020-03-195-8/+36
* | | | Move pusherpool startup into _base.setup (#7104)Richard van der Hoff2020-03-193-1/+2
* | | | Improve get auth chain difference algorithm. (#7095)Erik Johnston2020-03-186-71/+310
* | | | Add an option to the set password API to choose whether to logout other devic...Patrick Cloke2020-03-185-20/+39
* | | | Update INSTALL.md updated CentOS8 install instructions (#6925)Richard von Kellner2020-03-172-2/+12
* | | | Share SSL contexts for non-federation requests (#7094)Richard van der Hoff2020-03-177-44/+71
* | | | Set charset to utf-8 when adding headers for certain text content types (#7044)The Stranjer2020-03-172-1/+25
* | | | Remove unused federation endpoint (`query_auth`) (#7026)Patrick Cloke2020-03-175-146/+80
* | | | Remove special casing of `m.room.aliases` events (#7034)Patrick Cloke2020-03-175-42/+35
* | | | Revert "Add options to disable setting profile info for prevent changes. (#70...Richard van der Hoff2020-03-177-398/+1
* | | | Populate the room version from state events (#7070)Brendan Abolivier2020-03-163-0/+63
* | | | Fix buggy condition in account validity handler (#7074)Brendan Abolivier2020-03-162-1/+6
* | | | Merge pull request #7067 from matrix-org/babolivier/saml_error_moarBrendan Abolivier2020-03-134-28/+90
|\ \ \ \
| * | | | 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-112-19/+37
| * | | | Update wording and configBrendan Abolivier2020-03-113-2/+8
| * | | | ChangelogBrendan Abolivier2020-03-111-0/+1
| * | | | 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-123-89/+106
* | | | | Merge pull request #7066 from matrix-org/babolivier/dummy_events_stateBrendan Abolivier2020-03-113-31/+37
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
| * | | | ChangelogBrendan Abolivier2020-03-111-0/+1
| * | | | 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-107-1/+398
|\ \ \ \
| * | | | Update sample_config.yamlDirk Klimpel2020-03-101-1/+1
| * | | | Update synapse/config/registration.pyDirk Klimpel2020-03-101-1/+1
| * | | | lint, fix testsdklimpel2020-03-092-3/+5
| * | | | updates after reviewdklimpel2020-03-097-37/+40
| * | | | fix testsdklimpel2020-03-091-2/+2
| * | | | lintdklimpel2020-03-091-10/+8
| * | | | add testsdklimpel2020-03-092-3/+311
| * | | | add disable_3pid_changesdklimpel2020-03-083-0/+21
| * | | | lint2dklimpel2020-03-082-4/+4
| * | | | lintdklimpel2020-03-081-4/+2
| * | | | changelogdklimpel2020-03-084-4/+19
| * | | | Add options to disable setting profile info for prevent changes.dklimpel2020-03-083-1/+53
| | |/ / | |/| |
* | | | Merge pull request #7058 from matrix-org/babolivier/saml_error_htmlBrendan Abolivier2020-03-107-6/+81
|\ \ \ \
| * | | | 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
| * | | | ChangelogBrendan Abolivier2020-03-101-0/+1
| * | | | Update sample configBrendan Abolivier2020-03-101-0/+7
| * | | | 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-093-18/+21
|\ \ \ \
| * | | | ChangelogBrendan Abolivier2020-03-091-0/+1
| * | | | 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-098-22/+148
* | | | | Update routing of fallback auth in the worker docs. (#7048)Patrick Cloke2020-03-092-0/+2
* | | | | Merge pull request #7045 from matrix-org/babolivier/room_keys_checkBrendan Abolivier2020-03-092-0/+8
|\ \ \ \ \
| * | | | | 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
| * | | | | ChangelogBrendan Abolivier2020-03-061-0/+1
| * | | | | 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-072-47/+75
* | | | | Break down monthly active users by appservice_id (#7030)Neil Johnson2020-03-064-1/+87
|/ / / /
* | | | Convert remote key resource REST layer to async/await. (#7020)Patrick Cloke2020-03-052-7/+5
* | | | Store room_versions in EventBase objects (#6875)Richard van der Hoff2020-03-055-32/+63
* | | | Merge pull request #7035 from matrix-org/babolivier/hide_dummy_eventsBrendan Abolivier2020-03-052-0/+4
|\ \ \ \
| * | | | ChangelogBrendan Abolivier2020-03-041-0/+1
| * | | | 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-045-64/+182
* | | | Read the room version from database when fetching events (#6874)Richard van der Hoff2020-03-043-16/+79
* | | | Merge branch 'master' into developBrendan Abolivier2020-03-0314-35/+401
|\ \ \ \ | | |_|/ | |/| |
| * | | Update debian changelog v1.11.1 github/release-v1.11.1 release-v1.11.1Brendan Abolivier2020-03-031-0/+6
| * | | Merge branch 'babolivier/v1.11.1-changelog' into 'release-v1.11.1'Brendan Abolivier2020-03-034-3/+16
| |\ \ \
| | * | | v1.11.1Brendan Abolivier2020-03-034-3/+16
| |/ / /
| * | | Merge branch 'babolivier/complete_sso_login_saml' into 'release-v1.11.1'Brendan Abolivier2020-03-031-3/+2
| |\ \ \
| | * | | Fix wrong handler being used in SAML handlerBrendan Abolivier2020-03-031-3/+2
| |/ / /
| * | | Merge branch 'babolivier/sso_module_api' into 'release-v1.11.1'Brendan Abolivier2020-03-034-57/+96
| |\ \ \
| | * | | Factor out complete_sso_login and expose it to the Module APIBrendan Abolivier2020-03-034-57/+96
| |/ / /
| * | | Merge branch 'rav/sso-confirm-whitelist' into 'release-v1.11.1'Richard van der Hoff2020-03-024-14/+84
| |\ \ \
| | * | | Add a whitelist for the SSO confirmation step.Richard van der Hoff2020-03-024-14/+84
| |/ / /
| * | | Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1Richard van der Hoff2020-03-024-38/+194
| |\ \ \
| * \ \ \ Merge branch 'anoabolivier/sso-confirm' into 'release-v1.11.1'Brendan Abolivier2020-03-027-6/+245
| |\ \ \ \
| | * | | | Add a confirmation step to the SSO login flowBrendan Abolivier2020-03-027-6/+245
| |/ / / /
* | | / / Validate the alt_aliases property of canonical alias events (#6971)Patrick Cloke2020-03-038-52/+254
| |_|/ / |/| | |
* | | | Always return a deferred from `get_current_state_deltas`. (#7019)Erik Johnston2020-03-022-1/+4
* | | | Fix py35-old CI by using native tox. (#7018)Erik Johnston2020-03-022-6/+2
* | | | remove spurious changelogRichard van der Hoff2020-03-021-1/+0
* | | | Merge branch 'release-v1.11.1' into developRichard van der Hoff2020-03-020-0/+0
|\ \ \ \ | | |/ / | |/| |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-22 14:11:32 +0000