summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6152 from matrix-org/erikj/fix_room_listAndrew Morgan2020-02-261-10/+23
|\
| * Fix public room list pagination.Erik Johnston2019-10-021-10/+23
* | Land improved room list based on room stats (#6019)Andrew Morgan2020-02-261-234/+89
|\|
| * Land improved room list based on room stats (#6019)Erik Johnston2019-10-021-234/+89
* | Fix yields and copy instead of move push rules on room upgrade (#6144)Andrew Morgan2020-02-261-2/+2
|\|
| * Fix yields and copy instead of move push rules on room upgrade (#6144)Andrew Morgan2019-10-021-2/+2
| * Incorporate reviewBrendan Abolivier2019-09-271-4/+2
| * Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-1/+3
| * Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-1/+1
| * LintBrendan Abolivier2019-09-271-3/+1
| * Fixup and add some loggingBrendan Abolivier2019-09-271-1/+9
| * Reject pending invites on deactivationBrendan Abolivier2019-09-271-0/+31
* | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)Andrew Morgan2020-02-262-384/+354
|\|
| * Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)Andrew Morgan2019-09-272-364/+359
* | Fix dummy event insertion consent bug (#6053)Andrew Morgan2020-02-251-27/+72
|\|
| * Fix dummy event insertion consent bug (#6053)Neil Johnson2019-09-261-27/+72
* | Enable cleaning up extremities with dummy events by default to prevent undue ...Andrew Morgan2020-02-251-29/+34
|\|
| * Threepid validity checks on msisdns should not be dependent on 'threepid_beha...Neil Johnson2019-09-251-29/+34
* | Stop advertising unsupported flows for registration (#6107)Andrew Morgan2020-02-252-1/+36
|\|
| * Stop advertising unsupported flows for registration (#6107)Richard van der Hoff2019-09-252-1/+36
* | Refactor the user-interactive auth handling (#6105)Andrew Morgan2020-02-253-131/+248
|\|
| * Refactor the user-interactive auth handling (#6105)Richard van der Hoff2019-09-253-131/+248
* | Merge pull request #6037 from matrix-org/rav/saml_mapping_workAndrew Morgan2020-02-251-8/+98
|\|
| * Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-241-0/+10
| |\
| * \ Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-243-82/+192
| |\ \
| * \ \ Merge commit '33757bad1' into rav/saml_mapping_workRichard van der Hoff2019-09-201-1/+2
| |\ \ \
| | * | | More better loggingRichard van der Hoff2019-09-201-1/+2
| * | | | Merge branch 'develop' into rav/saml_mapping_workRichard van der Hoff2019-09-1926-571/+1051
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | better loggingRichard van der Hoff2019-09-191-0/+2
| * | | | Record mappings from saml users in an external tableRichard van der Hoff2019-09-131-8/+95
* | | | | Add sid to next_link for email validation (#6097)Andrew Morgan2020-02-251-0/+10
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Add sid to next_link for email validation (#6097)J. Ryan Stinnett2019-09-241-0/+10
| | |_|/ | |/| |
* | | | Add submit_url response parameter to msisdn /requestToken (#6079)Andrew Morgan2020-02-251-1/+11
|\| | |
| * | | Add submit_url response parameter to msisdn /requestToken (#6079)Andrew Morgan2019-09-231-1/+11
* | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2020-02-252-3/+20
|\| | |
| * | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2019-09-232-4/+21
* | | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2020-02-251-0/+34
|\| | |
| * | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2019-09-231-0/+34
* | | | Implement MSC2290 (#6043)Andrew Morgan2020-02-252-53/+87
|\| | |
| * | | Implement MSC2290 (#6043)Andrew Morgan2019-09-232-52/+86
* | | | Return timeout error to user for identity server calls (#6073)Andrew Morgan2020-02-252-11/+37
|\| | |
| * | | Return timeout error to user for identity server calls (#6073)Andrew Morgan2019-09-232-11/+37
* | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2020-02-251-10/+2
|\| | |
| * | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2019-09-201-14/+3
| | |/ | |/|
* | | v2 3PID Invites (part of MSC2140) (#5979)Andrew Morgan2020-02-251-25/+84
|\| |
| * | v2 3PID Invites (part of MSC2140) (#5979)Andrew Morgan2019-09-171-23/+81
* | | Fix race condition in room stats. (#6029)Andrew Morgan2020-02-251-4/+10
|\| |
| * | Fix race condition in room stats. (#6029)Erik Johnston2019-09-171-4/+10
* | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)Andrew Morgan2020-02-253-32/+239
|\| |
| * | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)Andrew Morgan2019-09-113-35/+203
* | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redactionAndrew Morgan2020-02-252-12/+53
|\| |
| * | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redactionErik Johnston2019-09-112-12/+53
| |\ \
| | * | Fix commentsErik Johnston2019-09-112-2/+2
| | * | Fix how we check for self redactionErik Johnston2019-09-111-4/+18
| | * | Allow use of different ratelimits for admin redactions.Erik Johnston2019-09-112-12/+39
* | | | Add note about extra arg to send_membership_event, remove arg in remote_rejec...Andrew Morgan2020-02-251-10/+2
|\| | |
| * | | Add note about extra arg to send_membership_event, remove arg in remote_rejec...Andrew Morgan2019-09-111-10/+2
* | | | Fix existing v2 identity server calls (MSC2140) (#6013)Andrew Morgan2020-02-251-2/+26
|\| | |
| * | | Fix existing v2 identity server calls (MSC2140) (#6013)Andrew Morgan2019-09-111-2/+26
* | | | Remove origin parameter from add_display_name_to_third_party_invite and add p...Andrew Morgan2020-02-251-1/+6
|\| | |
| * | | Remove origin parameter from add_display_name_to_third_party_invite and add p...Andrew Morgan2019-09-111-1/+6
| |/ /
* | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validationAndrew Morgan2020-02-252-40/+43
|\| |
| * | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validationErik Johnston2019-09-102-41/+43
| |\ \
| | * | Add changelogAndrew Morgan2019-09-101-3/+3
| | * | Use account_threepid_delegate for 3pid validationAndrew Morgan2019-09-102-41/+43
* | | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-usersAndrew Morgan2020-02-251-8/+4
|\| | |
| * | | Only count real users when checking for auto-creation of auto-join roomJason Robinson2019-09-091-8/+4
* | | | Ensure a sid parameter is passed to bind_threepid (#5995)Andrew Morgan2020-02-251-1/+7
|\| | |
| * | | Ensure a sid parameter is passed to bind_threepid (#5995)Andrew Morgan2019-09-061-1/+7
* | | | Merge pull request #5998 from matrix-org/erikj/fixup_federate_flagAndrew Morgan2020-02-251-1/+3
|\| | |
| * | | Correctly handle non-bool m.federate flagErik Johnston2019-09-061-1/+3
| |/ /
* | | Allow Synapse to send registration emails + choose Synapse or an external ser...Andrew Morgan2020-02-253-74/+154
|\| |
| * | Allow Synapse to send registration emails + choose Synapse or an external ser...Andrew Morgan2019-09-063-71/+153
* | | Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_...Andrew Morgan2020-02-251-4/+1
|\| |
| * | Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_...Erik Johnston2019-09-051-4/+1
| |\ \
| | * | Link the send loop with the edus contextsJorik Schellekens2019-09-051-4/+1
* | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2020-02-251-42/+120
|\| | |
| * | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2019-09-051-41/+119
* | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2020-02-251-1/+2
|\| | |
| * | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2019-09-051-1/+2
| |/ /
* | | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2020-02-251-44/+6
|\| |
| * | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2019-09-041-44/+6
* | | Fix and refactor room and user stats (#5971)Andrew Morgan2020-02-252-182/+134
|\| |
| * | Fix and refactor room and user stats (#5971)Erik Johnston2019-09-041-175/+132
| * | code cleanupsAndrew Morgan2019-09-031-7/+2
* | | Ensure the list media admin API is always available (#5966)Andrew Morgan2020-02-251-3/+1
|\| |
| * | Fix docstringAndrew Morgan2019-09-031-2/+1
| * | Remove unnecessary variable declarationAndrew Morgan2019-09-031-1/+0
* | | Ensure an auth instance is available to ListMediaInRoom (#5967)Andrew Morgan2020-02-251-1/+1
|\| |
| * | fix typoMatthew Hodgson2019-09-031-1/+1
* | | Remove double return statements (#5962)Andrew Morgan2020-02-255-7/+0
|\| |
| * | Remove double return statements (#5962)Andrew Morgan2019-09-035-7/+0
* | | Opentrace device lists (#5853)Andrew Morgan2020-02-252-3/+68
|\| |
| * | Opentrace device lists (#5853)Jorik Schellekens2019-09-032-3/+68
* | | Remove unused methods from c/s api v1 in register.py (#5963)Andrew Morgan2020-02-241-185/+0
|\| |
| * | Remove unused methods from c/s api v1 in register.py (#5963)Andrew Morgan2019-09-021-104/+0
* | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2020-02-2410-19/+21
|\| |
| * | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-3010-19/+19
| * | Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937)Andrew Morgan2019-08-302-132/+9
* | | Revert "Use the v2 lookup API for 3PID invites (#5897)"Andrew Morgan2020-02-242-256/+176
* | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentAndrew Morgan2020-02-241-1/+4
|\| |
| * | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentWill Hunt2019-08-281-1/+4
| |\ \
| | * | Apply suggestions from code reviewWill Hunt2019-08-231-2/+2
| | * | Exempt bot usersHalf-Shot2019-08-231-1/+1
| | * | Return user_type in get_user_by_idHalf-Shot2019-08-231-1/+4
* | | | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2020-02-242-176/+256
|\| | |
| * | | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2019-08-282-9/+132
* | | | Implement a structured logging output system. (#5680)Andrew Morgan2020-02-211-2/+3
|\| | |
| * | | Implement a structured logging output system. (#5680)Amber Brown2019-08-281-2/+3
* | | | Merge pull request #5914 from matrix-org/rei/admin_getadminAndrew Morgan2020-02-211-0/+9
|\| | |
| * | | Merge pull request #5914 from matrix-org/rei/admin_getadminreivilibre2019-08-281-0/+9
| |\ \ \
| | * | | Add GET method to admin API /users/@user:dom/adminOlivier Wilkinson (reivilibre)2019-08-271-0/+9
* | | | | Merge pull request #5859 from matrix-org/rei/msc2197Andrew Morgan2020-02-211-1/+28
|\| | | |
| * | | | Merge pull request #5859 from matrix-org/rei/msc2197reivilibre2019-08-281-1/+28
| |\ \ \ \
| | * | | | Support MSC2197 outbound with unstable prefixOlivier Wilkinson (reivilibre)2019-08-151-1/+28
| | | |_|/ | | |/| |
* | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limitAndrew Morgan2020-02-211-1/+1
|\| | | |
| * | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limitRichard van der Hoff2019-08-271-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Increase max display name limitNeil Johnson2019-08-241-1/+1
| | | |/ | | |/|
* | | | Add Admin API capability to set adminship of a user (#5878)Andrew Morgan2020-02-211-0/+10
|\| | |
| * | | Add Admin API capability to set adminship of a user (#5878)reivilibre2019-08-271-0/+10
| |/ /
* | | Propagate opentracing contexts through EDUs (#5852)Andrew Morgan2020-02-211-6/+21
|\| |
| * | Propagate opentracing contexts through EDUs (#5852)Jorik Schellekens2019-08-221-6/+21
| * | Revert "Add "require_consent" parameter for registration"Brendan Abolivier2019-08-221-12/+2
| * | Add "require_consent" parameter for registrationHalf-Shot2019-08-221-2/+12
* | | Opentrace e2e keys (#5855)Andrew Morgan2020-02-212-3/+77
|\| |
| * | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-222-3/+77
* | | Servlet to purge old rooms (#5845)Andrew Morgan2020-02-211-0/+17
|\| |
| * | Servlet to purge old rooms (#5845)Richard van der Hoff2019-08-221-0/+17
* | | Merge pull request #5860 from matrix-org/erikj/update_5704_commentsAndrew Morgan2020-02-211-17/+5
|\| |
| * | Merge pull request #5860 from matrix-org/erikj/update_5704_commentsErik Johnston2019-08-191-17/+5
| |\ \
| | * | Remove logging for #5407 and update commentsErik Johnston2019-08-151-17/+5
| | |/
* | | Don't create broken room when power_level_content_override.users does not con...Andrew Morgan2020-02-201-1/+13
|\| |
| * | Don't create broken room when power_level_content_override.users does not con...Michael Telatynski2019-08-151-1/+13
| |/
* | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_syncAndrew Morgan2020-02-201-6/+37
|\|
| * Handle TimelineBatch being limited and empty.Erik Johnston2019-08-061-6/+37
| * Account validity: allow defining HTML templates to serve the us… (#5807)Brendan Abolivier2019-08-011-1/+9
| |\
| | * Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-1/+9
* | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_roomAndrew Morgan2020-02-201-1/+3
|\| |
| * | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_roomErik Johnston2019-08-011-1/+3
| |\ \
| | * | Deny redaction of events in a different room.Erik Johnston2019-07-311-1/+3
* | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errorsAndrew Morgan2020-02-202-32/+60
|\| | |
| * | | Merge pull request #5790 from matrix-org/erikj/groups_request_errorsErik Johnston2019-08-012-32/+60
| |\ \ \ | | |/ / | |/| |
| | * | Don't log as exception when failing durig backfillErik Johnston2019-07-301-0/+3
| | * | Correctly handle errors doing requests to group serversErik Johnston2019-07-291-32/+57
* | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686)Andrew Morgan2020-02-201-1/+0
|\| | |
| * | | Remove duplicate return statementAndrew Morgan2019-07-311-1/+0
| | |/ | |/|
* | | Merge pull request #5789 from matrix-org/erikj/fix_error_handling_keysAndrew Morgan2020-02-201-4/+3
|\| |
| * | Unwrap errorErik Johnston2019-07-301-1/+2
| * | Fix error handling when fetching remote device keysErik Johnston2019-07-301-3/+1
* | | Remove non-functional 'expire_access_token' setting (#5782)Andrew Morgan2020-02-201-1/+1
|\| |
| * | Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-301-1/+1
* | | Room Complexity Client Implementation (#5783)Andrew Morgan2020-02-202-4/+105
|\| |
| * | Room Complexity Client Implementation (#5783)Amber Brown2019-07-302-4/+105
| |/
* | Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqliteAndrew Morgan2020-02-202-2/+2
|\|
| * Move some timeout checking logs to DEBUG #5785 Amber Brown2019-07-302-2/+2
* | Update the device list cache when keys/query is called (#5693)Andrew Morgan2020-02-202-82/+136
|\|
| * Update the device list cache when keys/query is called (#5693)Jorik Schellekens2019-07-292-74/+136
| * Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatchRichard van der Hoff2019-07-261-2/+35
| |\
* | \ Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1Andrew Morgan2020-02-191-2/+35
|\ \ \
| * \ \ Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1Richard van der Hoff2019-07-261-2/+35
| |\ \ \ | | | |/ | | |/|
| | * | Log when we receive a /make_* request from a different originRichard van der Hoff2019-07-261-2/+35
| * | | Log when we receive receipt from a different originErik Johnston2019-07-261-13/+22
| |/ /
* | | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatchAndrew Morgan2020-02-191-13/+22
|\ \ \ | | |/ | |/|
| * | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatchErik Johnston2019-07-241-13/+22
| |\ \
| | * | Log when we receive receipt from a different originErik Johnston2019-07-231-13/+22
| | |/
* | | Stop trying to fetch events with event_id=None. (#5753)Andrew Morgan2020-02-191-1/+7
|\| |
| * | Stop trying to fetch events with event_id=None. (#5753)Richard van der Hoff2019-07-241-1/+7
* | | Replace returnValue with return (#5736)Andrew Morgan2020-02-1932-364/+330
|\| |
| * | Replace returnValue with return (#5736)Amber Brown2019-07-2332-364/+330
| |/
* | Ignore redactions of m.room.create events (#5701)Andrew Morgan2020-02-191-9/+24
|\|
| * Ignore redactions of m.room.create events (#5701)Richard van der Hoff2019-07-171-9/+24
* | Return a different error from Invalid Password when a user is deactivated (#5...Andrew Morgan2020-02-171-0/+9
|\|
| * Return a different error from Invalid Password when a user is deactivated (#5...Andrew Morgan2019-07-151-0/+9
* | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_dataAndrew Morgan2020-02-171-0/+183
|\|
| * Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_dataErik Johnston2019-07-151-0/+183
| |\
| | * pep8Erik Johnston2019-07-051-4/+0
| | * Remove FileExfiltrationWriterErik Johnston2019-07-051-63/+0
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfi...Erik Johnston2019-07-0513-36/+168
| | |\
| | * | Assume key existence. Update docstringsErik Johnston2019-07-051-3/+1
| | * | Fixup from review comments.Erik Johnston2019-07-041-17/+22
| | * | Apply comment fixups from code reviewErik Johnston2019-07-031-6/+6
| | * | Add basic function to get all data for a user out of synapseErik Johnston2019-07-021-0/+247
* | | | Implement access token expiry (#5660)Andrew Morgan2020-02-172-14/+38
|\| | |
| * | | Implement access token expiry (#5660)Richard van der Hoff2019-07-122-14/+38
* | | | Inline issue_access_token (#5659)Andrew Morgan2020-02-171-7/+3
|\| | |
| * | | Inline issue_access_token (#5659)Richard van der Hoff2019-07-111-7/+3
* | | | Merge pull request #5658 from matrix-org/babolivier/is-jsonAndrew Morgan2020-02-171-1/+1
|\| | |
| * | | Merge pull request #5658 from matrix-org/babolivier/is-jsonBrendan Abolivier2019-07-101-1/+1
| |\ \ \
| | * | | TypoBrendan Abolivier2019-07-101-1/+1
| | * | | Send 3PID bind requests as JSON dataBrendan Abolivier2019-07-101-1/+1
* | | | | Remove access-token support from RegistrationStore.register (#5642)Andrew Morgan2020-02-171-1/+1
|\| | | |
| * | | | Remove access-token support from RegistrationStore.register (#5642)Richard van der Hoff2019-07-101-1/+1
| |/ / /
* | | | Merge pull request #5638 from matrix-org/babolivier/invite-jsonAndrew Morgan2020-02-171-4/+24
|\| | |
| * | | Merge pull request #5638 from matrix-org/babolivier/invite-jsonBrendan Abolivier2019-07-091-4/+18
| |\ \ \
| | * \ \ Merge branch 'develop' into babolivier/invite-jsonBrendan Abolivier2019-07-0818-196/+251
| | |\ \ \
| | * | | | LintBrendan Abolivier2019-07-081-1/+2
| | * | | | Use application/json when querying the IS's /store-invite endpointBrendan Abolivier2019-07-081-4/+17
* | | | | | remove unused and unnecessary check for FederationDeniedError (#5645)Andrew Morgan2020-02-171-4/+1
|\| | | | |
| * | | | | remove unused and unnecessary check for FederationDeniedError (#5645)Hubert Chathi2019-07-091-4/+1
* | | | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-selfAndrew Morgan2020-02-171-0/+4
|\| | | | |
| * | | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-selfBrendan Abolivier2019-07-091-0/+4
| |\ \ \ \ \
| | * | | | | Allow newly-registered users to lookup their own profilesBrendan Abolivier2019-07-081-0/+4
| | | |/ / / | | |/| | |
* | | | | | Remove access-token support from RegistrationHandler.register (#5641)Andrew Morgan2020-02-171-24/+3
|\| | | | |
| * | | | | Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-081-24/+3
* | | | | | Better logging for auto-join. (#5643)Andrew Morgan2020-02-171-0/+7
|\| | | | |
| * | | | | Better logging for auto-join. (#5643)Richard van der Hoff2019-07-081-0/+7
| |/ / / /
| * | | | Move get_or_create_user to test code (#5628)Richard van der Hoff2019-07-081-51/+0
* | | | | Remove support for invite_3pid_guest. (#5625)Andrew Morgan2020-02-173-81/+0
|\| | | |
| * | | | Remove support for invite_3pid_guest. (#5625)Richard van der Hoff2019-07-053-81/+0
| | |_|/ | |/| |
* | | | Fix with isort==4.3.21 and black==19.3b0Andrew Morgan2020-02-143-6/+5
* | | | Delete duplicate user deactivationAndrew Morgan2020-02-141-7/+0
* | | | Fix incorrect run_in_background import statementAndrew Morgan2020-02-141-1/+1
* | | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Andrew Morgan2020-02-1412-35/+36
|\| | |
| * | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-0412-35/+36
* | | | Fix a number of "Starting txn from sentinel context" warnings (#5605)Andrew Morgan2020-02-141-1/+9
|\| | |
| * | | Fix a number of "Starting txn from sentinel context" warnings (#5605)Richard van der Hoff2019-07-031-1/+9
* | | | Complete the SAML2 implementation (#5422)Andrew Morgan2020-02-141-0/+123
|\| | |
| * | | Complete the SAML2 implementation (#5422)Richard van der Hoff2019-07-021-0/+123
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-015-26/+64
| | |\ \
| | * | | Address review commentsRichard van der Hoff2019-07-011-5/+7
| | * | | cleanupsRichard van der Hoff2019-06-271-1/+1
| | * | | Add support for tracking SAML2 sessions.Richard van der Hoff2019-06-261-2/+37
| | * | | Move all the saml stuff out to a centralised handlerRichard van der Hoff2019-06-261-0/+86
| | | |/ | | |/|
* | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloopAndrew Morgan2020-02-141-2/+19
|\| | |
| * | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloopErik Johnston2019-07-011-2/+19
| |\ \ \ | | |_|/ | |/| |
| | * | Fixup commentErik Johnston2019-07-011-6/+13
| | * | Fix sync tightloop bug.Erik Johnston2019-06-211-2/+12
| * | | Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimitBrendan Abolivier2019-06-281-0/+1
| |\ \ \
| | * | | Only ratelimit when sending the emailBrendan Abolivier2019-06-281-1/+2
| | * | | Don't update the ratelimiter before sending a 3PID inviteBrendan Abolivier2019-06-281-1/+1
| | | |/ | | |/|
* | | | Added possibilty to disable local password authentication (#5092)Andrew Morgan2020-02-142-1/+4
|\| | |
| * | | Added possibilty to disable local password authentication (#5092)Daniel Hoffend2019-06-272-1/+4
* | | | Merge pull request #5559 from matrix-org/erikj/refactor_changed_devicesAndrew Morgan2020-02-142-25/+59
|\| | |
| * | | Review commentsErik Johnston2019-06-271-4/+4
| * | | Refactor and comment sync device list codeErik Johnston2019-06-261-17/+53
| * | | Rename get_users_whose_devices_changedErik Johnston2019-06-262-2/+2
| * | | Refactor get_user_ids_changed to pull less from DBErik Johnston2019-06-262-18/+16
| |/ /
* | | Prevent multiple upgrades on the same room at once (#5051)Andrew Morgan2020-02-141-51/+89
|\| |
| * | Prevent multiple upgrades on the same room at once (#5051)Andrew Morgan2019-06-251-51/+89
* | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_tokenAndrew Morgan2020-02-131-3/+1
|\| |
| * | Merge pull request #5531 from matrix-org/erikj/workers_pagination_tokenErik Johnston2019-06-241-3/+1
| |\ \
| | * | Fix /messages on workers when no from param specified.Erik Johnston2019-06-241-3/+1
| | |/
* | | Merge pull request #5516 from matrix-org/rav/acme_key_pathAndrew Morgan2020-02-132-5/+38
|\| |
| * | Allow configuration of the path used for ACME account keys.Richard van der Hoff2019-06-242-5/+38
* | | Factor acme bits out to a separate file (#5521)Andrew Morgan2020-02-132-53/+93
|\| |
| * | Factor acme bits out to a separate file (#5521)Richard van der Hoff2019-06-242-53/+93
| |/
* | Run Black. (#5482)Andrew Morgan2020-02-133-7/+3
|\|
| * Run Black. (#5482)Amber Brown2019-06-2035-2765/+2187
| * Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_errorErik Johnston2019-06-191-9/+19
| |\
* | | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-1136-2867/+2296
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-09-13 02:29:42 +0000