Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | Merge pull request #6089 from matrix-org/erikj/cleanup_user_ips | Erik Johnston | 2019-09-25 | 2 | -49/+99 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us... | Erik Johnston | 2019-09-25 | 18 | -400/+1104 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Use if `is not None` | Erik Johnston | 2019-09-25 | 1 | -1/+1 | |
| | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Query devices table for last seen info. | Erik Johnston | 2019-09-23 | 1 | -49/+8 | |
| | * | | | | | | | | | Add BG update to populate devices last seen info | Erik Johnston | 2019-09-23 | 2 | -0/+55 | |
| | * | | | | | | | | | Add last seen info to devices table. | Erik Johnston | 2019-09-23 | 2 | -0/+36 | |
* | | | | | | | | | | | Enable cleaning up extremities with dummy events by default to prevent undue ... | Andrew Morgan | 2020-02-25 | 2 | -32/+35 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Enable cleaning up extremities with dummy events by default to prevent undue ... | Neil Johnson | 2019-09-25 | 1 | -3/+1 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Threepid validity checks on msisdns should not be dependent on 'threepid_beha... | Neil Johnson | 2019-09-25 | 1 | -29/+34 | |
* | | | | | | | | | | Stop advertising unsupported flows for registration (#6107) | Andrew Morgan | 2020-02-25 | 3 | -4/+65 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Stop advertising unsupported flows for registration (#6107) | Richard van der Hoff | 2019-09-25 | 3 | -4/+65 | |
* | | | | | | | | | | Refactor the user-interactive auth handling (#6105) | Andrew Morgan | 2020-02-25 | 3 | -131/+248 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Refactor the user-interactive auth handling (#6105) | Richard van der Hoff | 2019-09-25 | 3 | -131/+248 | |
* | | | | | | | | | | Refactor code for calculating registration flows (#6106) | Andrew Morgan | 2020-02-25 | 1 | -62/+62 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Refactor code for calculating registration flows (#6106) | Richard van der Hoff | 2019-09-25 | 1 | -62/+62 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #6092 from matrix-org/babolivier/background_update_deactiv... | Andrew Morgan | 2020-02-25 | 2 | -6/+6 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #6092 from matrix-org/babolivier/background_update_deactiv... | Brendan Abolivier | 2019-09-24 | 2 | -6/+6 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Incorporate review | Brendan Abolivier | 2019-09-24 | 1 | -3/+3 | |
| | * | | | | | | | | Fix logging | Brendan Abolivier | 2019-09-24 | 1 | -1/+1 | |
| | * | | | | | | | | Typo | Brendan Abolivier | 2019-09-23 | 1 | -1/+1 | |
| | * | | | | | | | | Fix the return value in the users_set_deactivated_flag background job | Brendan Abolivier | 2019-09-23 | 1 | -4/+4 | |
* | | | | | | | | | | Merge pull request #6037 from matrix-org/rav/saml_mapping_work | Andrew Morgan | 2020-02-25 | 5 | -10/+253 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-24 | 4 | -8/+72 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-24 | 20 | -196/+674 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge commit '33757bad1' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-20 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | More better logging | Richard van der Hoff | 2019-09-20 | 1 | -1/+2 | |
| * | | | | | | | | | | | | Merge branch 'develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-19 | 181 | -2622/+6021 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | better logging | Richard van der Hoff | 2019-09-19 | 1 | -0/+2 | |
| * | | | | | | | | | | | | Record mappings from saml users in an external table | Richard van der Hoff | 2019-09-13 | 5 | -10/+250 | |
* | | | | | | | | | | | | | remove unused parameter to get_user_id_by_threepid (#6099) | Andrew Morgan | 2020-02-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | remove unused parameter to get_user_id_by_threepid (#6099) | Richard van der Hoff | 2019-09-24 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge pull request #6069 from matrix-org/rav/fix_attribute_mapping | Andrew Morgan | 2020-02-25 | 2 | -7/+61 | |
|\| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #6069 from matrix-org/rav/fix_attribute_mapping | Richard van der Hoff | 2019-09-24 | 2 | -7/+61 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | docstrings and comments | Richard van der Hoff | 2019-09-24 | 1 | -7/+21 | |
| | * | | | | | | | | | | | | Merge branch 'develop' into rav/fix_attribute_mapping | Richard van der Hoff | 2019-09-19 | 181 | -2622/+6021 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Fix a bug with saml attribute maps. | Richard van der Hoff | 2019-09-19 | 2 | -7/+47 | |
* | | | | | | | | | | | | | | Add sid to next_link for email validation (#6097) | Andrew Morgan | 2020-02-25 | 1 | -0/+10 | |
|\| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Add sid to next_link for email validation (#6097) | J. Ryan Stinnett | 2019-09-24 | 1 | -0/+10 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Add submit_url response parameter to msisdn /requestToken (#6079) | Andrew Morgan | 2020-02-25 | 2 | -1/+13 | |
|\| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add submit_url response parameter to msisdn /requestToken (#6079) | Andrew Morgan | 2019-09-23 | 2 | -1/+13 | |
* | | | | | | | | | | | | | Add an unstable feature flag for separate add/bind 3pid APIs (#6044) | Andrew Morgan | 2020-02-25 | 1 | -0/+2 | |
|\| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add an unstable feature flag for separate add/bind 3pid APIs (#6044) | Andrew Morgan | 2019-09-23 | 1 | -0/+2 | |
* | | | | | | | | | | | | | Merge pull request #6064 from matrix-org/rav/saml_config_cleanup | Andrew Morgan | 2020-02-25 | 1 | -51/+62 | |
|\| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #6064 from matrix-org/rav/saml_config_cleanup | Richard van der Hoff | 2019-09-23 | 1 | -51/+62 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into rav/saml_config_cleanup | Richard van der Hoff | 2019-09-19 | 181 | -2622/+6021 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| / / / / / / / / / | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Make the sample saml config closer to our standards | Richard van der Hoff | 2019-09-13 | 1 | -51/+62 | |
| | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000) | Andrew Morgan | 2020-02-25 | 3 | -3/+23 | |
|\| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000) | Andrew Morgan | 2019-09-23 | 3 | -4/+24 | |
* | | | | | | | | | | | | Add m.id_access_token to /versions unstable_features (MSC2264) (#5974) | Andrew Morgan | 2020-02-25 | 1 | -0/+3 | |
|\| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add m.id_access_token to /versions unstable_features (MSC2264) (#5974) | Andrew Morgan | 2019-09-23 | 1 | -0/+3 | |
* | | | | | | | | | | | | Add m.require_identity_server to /versions unstable_flags (#5972) | Andrew Morgan | 2020-02-25 | 1 | -1/+13 | |
|\| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add m.require_identity_server to /versions unstable_flags (#5972) | Andrew Morgan | 2019-09-23 | 1 | -1/+13 | |
* | | | | | | | | | | | | Add POST submit_token endpoint for MSISDN (#6078) | Andrew Morgan | 2020-02-25 | 2 | -2/+79 | |
|\| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add POST submit_token endpoint for MSISDN (#6078) | Andrew Morgan | 2019-09-23 | 2 | -2/+79 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Implement MSC2290 (#6043) | Andrew Morgan | 2020-02-25 | 5 | -124/+235 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Implement MSC2290 (#6043) | Andrew Morgan | 2019-09-23 | 5 | -125/+202 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Disable /register/available if registration is disabled (#6082) | Andrew Morgan | 2020-02-25 | 1 | -0/+5 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Disable /register/available if registration is disabled (#6082) | Andrew Morgan | 2019-09-23 | 1 | -0/+5 | |
* | | | | | | | | | | Generalize email sending logging (#6075) | Andrew Morgan | 2020-02-25 | 1 | -1/+1 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Generalize email sending logging (#6075) | Andrew Morgan | 2019-09-23 | 1 | -1/+1 | |
* | | | | | | | | | | Return timeout error to user for identity server calls (#6073) | Andrew Morgan | 2020-02-25 | 2 | -11/+37 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Return timeout error to user for identity server calls (#6073) | Andrew Morgan | 2019-09-23 | 2 | -11/+37 | |
* | | | | | | | | | | Merge pull request #6072 from matrix-org/rav/fix_retry_reset | Andrew Morgan | 2020-02-25 | 3 | -3/+3 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #6072 from matrix-org/rav/fix_retry_reset | Richard van der Hoff | 2019-09-23 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Fix exception when resetting retry timings | Richard van der Hoff | 2019-09-20 | 1 | -1/+1 | |
| * | | | | | | | | | | fix broken copyrights | Matthew Hodgson | 2019-09-23 | 2 | -2/+2 | |
* | | | | | | | | | | | Allow HS to send emails when adding an email to the HS (#6042) | Andrew Morgan | 2020-02-25 | 10 | -81/+372 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Allow HS to send emails when adding an email to the HS (#6042) | Andrew Morgan | 2019-09-20 | 10 | -72/+346 | |
* | | | | | | | | | | | Remove trailing slash ability from password reset's submit_token endpoint (#6... | Andrew Morgan | 2020-02-25 | 1 | -1/+1 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Remove trailing slash ability from password reset's submit_token endpoint (#6... | Andrew Morgan | 2019-09-20 | 1 | -1/+1 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Ensure email validation link parameters are URL-encoded (#6063) | Andrew Morgan | 2020-02-25 | 1 | -4/+6 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Ensure email validation link parameters are URL-encoded (#6063) | Andrew Morgan | 2019-09-20 | 1 | -4/+6 | |
* | | | | | | | | | | Drop support for bind param on POST /account/3pid (MSC2290) (#6067) | Andrew Morgan | 2020-02-25 | 1 | -4/+0 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Drop support for bind param on POST /account/3pid (MSC2290) (#6067) | Andrew Morgan | 2019-09-20 | 1 | -4/+0 | |
* | | | | | | | | | | Use unstable prefix for 3PID unbind API (#6062) | Andrew Morgan | 2020-02-25 | 1 | -1/+1 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Use unstable prefix for 3PID unbind API (#6062) | J. Ryan Stinnett | 2019-09-19 | 1 | -1/+1 | |
* | | | | | | | | | | Undo the deletion of some tables (#6047) | Andrew Morgan | 2020-02-25 | 1 | -20/+0 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Undo the deletion of some tables (#6047) | Richard van der Hoff | 2019-09-19 | 1 | -20/+0 | |
* | | | | | | | | | | Remove POST method from password reset submit_token endpoint (#6056) | Andrew Morgan | 2020-02-25 | 1 | -19/+0 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Remove POST method from password reset submit_token endpoint (#6056) | Andrew Morgan | 2019-09-19 | 1 | -17/+0 | |
* | | | | | | | | | | Fix typo in account_threepid_delegates config (#6028) | Andrew Morgan | 2020-02-25 | 1 | -1/+1 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Fix typo in account_threepid_delegates config (#6028) | Jorik Schellekens | 2019-09-18 | 1 | -1/+1 | |
* | | | | | | | | | | Fix logcontext spam on non-Linux platforms (#6059) | Andrew Morgan | 2020-02-25 | 1 | -2/+11 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Fix logcontext spam on non-Linux platforms (#6059) | J. Ryan Stinnett | 2019-09-18 | 1 | -2/+11 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | v2 3PID Invites (part of MSC2140) (#5979) | Andrew Morgan | 2020-02-25 | 1 | -25/+84 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | v2 3PID Invites (part of MSC2140) (#5979) | Andrew Morgan | 2019-09-17 | 1 | -23/+81 | |
* | | | | | | | | | (#5849) Convert rst to markdown (#6040) | Andrew Morgan | 2020-02-25 | 1 | -6/+6 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | (#5849) Convert rst to markdown (#6040) | dstipp | 2019-09-17 | 1 | -6/+6 | |
* | | | | | | | | | Fix race condition in room stats. (#6029) | Andrew Morgan | 2020-02-25 | 1 | -4/+10 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Fix race condition in room stats. (#6029) | Erik Johnston | 2019-09-17 | 1 | -4/+10 | |
* | | | | | | | | | Add 'failure_ts' column to 'destinations' table (#6016) | Andrew Morgan | 2020-02-25 | 3 | -8/+56 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Add 'failure_ts' column to 'destinations' table (#6016) | Richard van der Hoff | 2019-09-17 | 3 | -8/+56 | |
* | | | | | | | | | Fix well-known lookups with the federation certificate whitelist (#5997) | Andrew Morgan | 2020-02-25 | 3 | -15/+22 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Fix well-known lookups with the federation certificate whitelist (#5997) | Amber Brown | 2019-09-14 | 3 | -15/+22 | |
* | | | | | | | | | Fix for structured logging tests stomping on logs (#6023) | Andrew Morgan | 2020-02-25 | 7 | -24/+45 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Fix for structured logging tests stomping on logs (#6023) | Amber Brown | 2019-09-13 | 7 | -24/+45 | |
* | | | | | | | | | Remove the cap on federation retry interval. (#6026) | Andrew Morgan | 2020-02-25 | 1 | -2/+2 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Remove the cap on federation retry interval. (#6026) | Richard van der Hoff | 2019-09-12 | 1 | -2/+2 | |
* | | | | | | | | | Fix bug in calculating the federation retry backoff period (#6025) | Andrew Morgan | 2020-02-25 | 1 | -2/+3 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Fix bug in calculating the federation retry backoff period (#6025) | Richard van der Hoff | 2019-09-12 | 1 | -2/+3 | |
* | | | | | | | | | Merge pull request #6024 from matrix-org/dbkr/fix_sso_fallback_login | Andrew Morgan | 2020-02-25 | 1 | -1/+1 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Fix SSO fallback login | David Baker | 2019-09-12 | 1 | -1/+1 | |
* | | | | | | | | | add report_stats_endpoint config option (#6012) | Andrew Morgan | 2020-02-25 | 2 | -2/+13 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | add report_stats_endpoint config option (#6012) | Sorunome | 2019-09-12 | 2 | -2/+13 | |
* | | | | | | | | | Blow up config if opentracing is missing (#5985) | Andrew Morgan | 2020-02-25 | 1 | -0/+7 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Blow up config if opentracing is missing (#5985) | Jorik Schellekens | 2019-09-12 | 1 | -0/+7 | |
* | | | | | | | | | Merge pull request #6020 from matrix-org/jaywink/allow-support-users-to-register | Andrew Morgan | 2020-02-25 | 1 | -2/+9 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Ensure support users can be registered even if MAU limit is reached | Jason Robinson | 2019-09-11 | 1 | -2/+9 | |
* | | | | | | | | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976) | Andrew Morgan | 2020-02-25 | 5 | -32/+273 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976) | Andrew Morgan | 2019-09-11 | 5 | -35/+237 | |
* | | | | | | | | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction | Andrew Morgan | 2020-02-25 | 4 | -12/+70 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction | Erik Johnston | 2019-09-11 | 4 | -12/+70 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Fix comments | Erik Johnston | 2019-09-11 | 3 | -3/+3 | |
| | * | | | | | | | | Fix how we check for self redaction | Erik Johnston | 2019-09-11 | 1 | -4/+18 | |
| | * | | | | | | | | Allow use of different ratelimits for admin redactions. | Erik Johnston | 2019-09-11 | 4 | -12/+56 | |
* | | | | | | | | | | Clean up some code in the retry logic (#6017) | Andrew Morgan | 2020-02-25 | 2 | -36/+13 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Clean up some code in the retry logic (#6017) | Richard van der Hoff | 2019-09-11 | 2 | -36/+13 | |
* | | | | | | | | | | Add note about extra arg to send_membership_event, remove arg in remote_rejec... | Andrew Morgan | 2020-02-25 | 1 | -10/+2 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Add note about extra arg to send_membership_event, remove arg in remote_rejec... | Andrew Morgan | 2019-09-11 | 1 | -10/+2 | |
* | | | | | | | | | | Check dependencies on setup in the nicer way. (#5989) | Andrew Morgan | 2020-02-25 | 3 | -28/+19 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Check dependencies on setup in the nicer way. (#5989) | Jorik Schellekens | 2019-09-11 | 3 | -28/+19 | |
* | | | | | | | | | | Fix existing v2 identity server calls (MSC2140) (#6013) | Andrew Morgan | 2020-02-25 | 1 | -2/+26 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Fix existing v2 identity server calls (MSC2140) (#6013) | Andrew Morgan | 2019-09-11 | 1 | -2/+26 | |
* | | | | | | | | | | Remove origin parameter from add_display_name_to_third_party_invite and add p... | Andrew Morgan | 2020-02-25 | 3 | -4/+9 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Remove origin parameter from add_display_name_to_third_party_invite and add p... | Andrew Morgan | 2019-09-11 | 3 | -4/+9 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validation | Andrew Morgan | 2020-02-25 | 3 | -41/+45 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validation | Erik Johnston | 2019-09-10 | 3 | -42/+45 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Add changelog | Andrew Morgan | 2019-09-10 | 2 | -4/+4 | |
| | * | | | | | | | | Use account_threepid_delegate for 3pid validation | Andrew Morgan | 2019-09-10 | 3 | -42/+45 | |
* | | | | | | | | | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-users | Andrew Morgan | 2020-02-25 | 2 | -8/+41 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-users | Jason Robinson | 2019-09-09 | 2 | -8/+41 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Fix code style, again | Jason Robinson | 2019-09-09 | 1 | -3/+1 | |
| | * | | | | | | | | | Simplify count_real_users SQL to only count user_type is null rows | Jason Robinson | 2019-09-09 | 1 | -1/+1 | |
| | * | | | | | | | | | Simplify is_real_user_txn check to trust user_type is null if real user | Jason Robinson | 2019-09-09 | 1 | -1/+1 | |
| | * | | | | | | | | | Auto-fix a few code style issues | Jason Robinson | 2019-09-09 | 1 | -4/+4 | |
| | * | | | | | | | | | Only count real users when checking for auto-creation of auto-join room | Jason Robinson | 2019-09-09 | 2 | -8/+43 | |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5934 from matrix-org/erikj/censor_redactions | Andrew Morgan | 2020-02-25 | 3 | -1/+136 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #5934 from matrix-org/erikj/censor_redactions | Erik Johnston | 2019-09-09 | 3 | -1/+136 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Fix comments | Erik Johnston | 2019-09-09 | 1 | -2/+3 | |
| | * | | | | | | | | | Default to censoring redactions after seven days | Erik Johnston | 2019-09-09 | 1 | -4/+6 | |
| | * | | | | | | | | | Use better names in SQL | Erik Johnston | 2019-09-09 | 1 | -5/+8 | |
| | * | | | | | | | | | Fixup comment | Erik Johnston | 2019-09-09 | 1 | -4/+12 | |
| | * | | | | | | | | | Don't start looping call unless enabled | Erik Johnston | 2019-09-09 | 1 | -1/+2 | |
| | * | | | | | | | | | Handle setting retention period to 0 | Erik Johnston | 2019-09-09 | 2 | -2/+2 | |
| | * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/censor_red... | Erik Johnston | 2019-09-05 | 102 | -1339/+1680 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Make redaction retention period configurable | Erik Johnston | 2019-09-05 | 2 | -2/+19 | |
| | * | | | | | | | | | | Censor redactions in DB after a month | Erik Johnston | 2019-08-30 | 2 | -1/+104 | |
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | ||||||
* | | | | | | | | | | | Add a build info metric to Prometheus (#6005) | Andrew Morgan | 2020-02-25 | 1 | -0/+12 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Add a build info metric to Prometheus (#6005) | Amber Brown | 2019-09-10 | 1 | -0/+12 | |
* | | | | | | | | | | | Merge pull request #6003 from matrix-org/erikj/push_opentracing | Andrew Morgan | 2020-02-25 | 1 | -1/+12 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Add opentracing span for HTTP push | Erik Johnston | 2019-09-09 | 1 | -1/+12 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Servers-known-about statistic (#5981) | Andrew Morgan | 2020-02-25 | 2 | -0/+90 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Servers-known-about statistic (#5981) | Amber Brown | 2019-09-07 | 2 | -0/+90 | |
* | | | | | | | | | | Ensure a sid parameter is passed to bind_threepid (#5995) | Andrew Morgan | 2020-02-25 | 1 | -1/+7 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Ensure a sid parameter is passed to bind_threepid (#5995) | Andrew Morgan | 2019-09-06 | 1 | -1/+7 | |
* | | | | | | | | | | Merge pull request #5998 from matrix-org/erikj/fixup_federate_flag | Andrew Morgan | 2020-02-25 | 2 | -2/+6 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #5998 from matrix-org/erikj/fixup_federate_flag | Erik Johnston | 2019-09-06 | 2 | -2/+6 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
| | * | | | | | | | | Correctly handle non-bool m.federate flag | Erik Johnston | 2019-09-06 | 2 | -2/+6 | |
* | | | | | | | | | | Merge pull request #5993 from matrix-org/anoa/worker_store_reg | Andrew Morgan | 2020-02-25 | 1 | -79/+79 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #5993 from matrix-org/anoa/worker_store_reg | Erik Johnston | 2019-09-06 | 1 | -79/+79 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Move delete_threepid_session into RegistrationWorkerStore | Andrew Morgan | 2019-09-06 | 1 | -25/+25 | |
| | * | | | | | | | | | Move get_threepid_validation_session into RegistrationWorkerStore | Andrew Morgan | 2019-09-06 | 1 | -54/+54 | |
| | |/ / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #5994 from matrix-org/anoa/html_template_fix | Andrew Morgan | 2020-02-25 | 2 | -2/+2 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Apply suggestions from code review | Andrew Morgan | 2019-09-06 | 2 | -2/+2 | |
| * | | | | | | | | | Fix destructuring assumption bug | Andrew Morgan | 2019-09-06 | 2 | -2/+2 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcs | Andrew Morgan | 2020-02-25 | 1 | -5/+5 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcs | Erik Johnston | 2019-09-06 | 1 | -5/+5 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Don't assume there is a 'self' arg in @trace decorator | Erik Johnston | 2019-09-06 | 1 | -5/+5 | |
* | | | | | | | | | | Allow Synapse to send registration emails + choose Synapse or an external ser... | Andrew Morgan | 2020-02-25 | 20 | -292/+706 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Allow Synapse to send registration emails + choose Synapse or an external ser... | Andrew Morgan | 2019-09-06 | 20 | -289/+706 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Trace how long it takes for the send trasaction to complete, including retrys... | Andrew Morgan | 2020-02-25 | 3 | -38/+57 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Trace how long it takes for the send trasaction to complete, including retrys... | Jorik Schellekens | 2019-09-05 | 3 | -38/+57 | |
* | | | | | | | | | Gracefully handle log context slips and missing opentracing import errors. (#... | Andrew Morgan | 2020-02-25 | 1 | -24/+58 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Gracefully handle log context slips and missing opentracing import errors. (#... | Jorik Schellekens | 2019-09-05 | 1 | -24/+58 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_... | Andrew Morgan | 2020-02-25 | 4 | -8/+15 | |
|\| | | | | | | | ||||||
| * | | | | | | | Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_... | Erik Johnston | 2019-09-05 | 4 | -8/+15 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | use access methods (duh..) | Jorik Schellekens | 2019-09-05 | 1 | -1/+3 | |
| | * | | | | | | | Opentracing context cannot be none | Jorik Schellekens | 2019-09-05 | 1 | -1/+1 | |
| | * | | | | | | | Link the send loop with the edus contexts | Jorik Schellekens | 2019-09-05 | 3 | -7/+12 | |
| | | |_|_|_|_|/ | | |/| | | | | | ||||||
* | | | | | | | | Add opentracing to all client servlets (#5983) | Andrew Morgan | 2020-02-25 | 5 | -18/+25 | |
|\| | | | | | | | ||||||
| * | | | | | | | Add opentracing to all client servlets (#5983) | Jorik Schellekens | 2019-09-05 | 5 | -18/+25 | |
* | | | | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892) | Andrew Morgan | 2020-02-25 | 2 | -47/+127 | |
|\| | | | | | | | ||||||
| * | | | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892) | Andrew Morgan | 2019-09-05 | 2 | -47/+126 | |
* | | | | | | | | Fix opentracing contexts missing from outbound replication requests (#5982) | Andrew Morgan | 2020-02-25 | 1 | -4/+16 | |
|\| | | | | | | | ||||||
| * | | | | | | | Fix opentracing contexts missing from outbound replication requests (#5982) | Jorik Schellekens | 2019-09-05 | 1 | -4/+16 | |
* | | | | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980) | Andrew Morgan | 2020-02-25 | 2 | -1/+35 | |
|\| | | | | | | | ||||||
| * | | | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980) | Andrew Morgan | 2019-09-05 | 2 | -1/+35 | |
| |/ / / / / / | ||||||
* | | | | | | | Remove bind_email and bind_msisdn (#5964) | Andrew Morgan | 2020-02-25 | 3 | -64/+9 | |
|\| | | | | | | ||||||
| * | | | | | | Remove bind_email and bind_msisdn (#5964) | Andrew Morgan | 2019-09-04 | 3 | -64/+9 | |
* | | | | | | | Cleanup event auth type initialisation (#5975) | Andrew Morgan | 2020-02-25 | 1 | -5/+5 | |
|\| | | | | | | ||||||
| * | | | | | | Cleanup event auth type initialisation (#5975) | Andrew Morgan | 2019-09-04 | 1 | -5/+5 | |
* | | | | | | | Fix and refactor room and user stats (#5971) | Andrew Morgan | 2020-02-25 | 8 | -535/+1043 | |
|\| | | | | | | ||||||
| * | | | | | | Fix and refactor room and user stats (#5971) | Erik Johnston | 2019-09-04 | 7 | -528/+1041 | |
| * | | | | | | code cleanups | Andrew Morgan | 2019-09-03 | 1 | -7/+2 | |
* | | | | | | | Ensure the list media admin API is always available (#5966) | Andrew Morgan | 2020-02-25 | 2 | -5/+6 | |
|\| | | | | | | ||||||
| * | | | | | | Ensure the list media admin API is always available (#5966) | Travis Ralston | 2019-09-03 | 1 | -2/+5 | |
| * | | | | | | Fix docstring | Andrew Morgan | 2019-09-03 | 1 | -2/+1 | |
| * | | | | | | Remove unnecessary variable declaration | Andrew Morgan | 2019-09-03 | 1 | -1/+0 | |
* | | | | | | | Ensure an auth instance is available to ListMediaInRoom (#5967) | Andrew Morgan | 2020-02-25 | 2 | -1/+2 | |
|\| | | | | | | ||||||
| * | | | | | | Ensure an auth instance is available to ListMediaInRoom (#5967) | Travis Ralston | 2019-09-03 | 1 | -0/+1 | |
| * | | | | | | fix typo | Matthew Hodgson | 2019-09-03 | 1 | -1/+1 | |
* | | | | | | | Remove double return statements (#5962) | Andrew Morgan | 2020-02-25 | 14 | -20/+0 | |
|\| | | | | | | ||||||
| * | | | | | | Remove double return statements (#5962) | Andrew Morgan | 2019-09-03 | 14 | -20/+0 | |
* | | | | | | | Opentrace device lists (#5853) | Andrew Morgan | 2020-02-25 | 7 | -58/+117 | |
|\| | | | | | | ||||||
| * | | | | | | Opentrace device lists (#5853) | Jorik Schellekens | 2019-09-03 | 7 | -58/+117 | |
* | | | | | | | Remove unused methods from c/s api v1 in register.py (#5963) | Andrew Morgan | 2020-02-24 | 2 | -218/+1 | |
|\| | | | | | | ||||||
| * | | | | | | Remove unused methods from c/s api v1 in register.py (#5963) | Andrew Morgan | 2019-09-02 | 2 | -137/+1 | |
* | | | | | | | fix thumbnail storage location (#5915) | Andrew Morgan | 2020-02-24 | 1 | -1/+1 | |
|\| | | | | | | ||||||
| * | | | | | | fix thumbnail storage location (#5915) | L0ric0 | 2019-09-02 | 1 | -1/+1 | |
* | | | | | | | Revert "Add m.id_access_token flag (#5930)" (#5945) | Andrew Morgan | 2020-02-24 | 1 | -6/+1 | |
|\| | | | | | | ||||||
| * | | | | | | Revert "Add m.id_access_token flag (#5930)" (#5945) | Andrew Morgan | 2019-08-30 | 1 | -6/+1 | |
* | | | | | | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2020-02-24 | 75 | -294/+282 | |
|\| | | | | | | ||||||
| * | | | | | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2019-08-30 | 74 | -280/+280 | |
| * | | | | | | Add m.id_access_token flag (#5930) | Andrew Morgan | 2019-08-30 | 1 | -1/+6 | |
| * | | | | | | Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937) | Andrew Morgan | 2019-08-30 | 3 | -165/+9 | |
| |/ / / / / | ||||||
* | | | | | | Add m.id_access_token flag (#5930) | Andrew Morgan | 2020-02-24 | 1 | -1/+6 | |
* | | | | | | Revert "Use the v2 lookup API for 3PID invites (#5897)" | Andrew Morgan | 2020-02-24 | 5 | -293/+179 | |
* | | | | | | Add a link to python's logging config schema (#5926) | Andrew Morgan | 2020-02-24 | 1 | -1/+2 | |
|\| | | | | | ||||||
| * | | | | | Add a link to python's logging config schema (#5926) | Jorik Schellekens | 2019-08-28 | 1 | -1/+2 | |
* | | | | | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent | Andrew Morgan | 2020-02-24 | 3 | -2/+7 | |
|\| | | | | | ||||||
| * | | | | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent | Will Hunt | 2019-08-28 | 3 | -2/+7 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Apply suggestions from code review | Will Hunt | 2019-08-23 | 1 | -2/+2 | |
| | * | | | | | Exempt bot users | Half-Shot | 2019-08-23 | 1 | -1/+1 | |
| | * | | | | | Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consent | Half-Shot | 2019-08-23 | 1 | -1/+2 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Add bot type | Half-Shot | 2019-08-23 | 1 | -1/+2 | |
| | * | | | | | | Ignore consent for support users | Half-Shot | 2019-08-23 | 1 | -0/+1 | |
| | * | | | | | | Return user_type in get_user_by_id | Half-Shot | 2019-08-23 | 1 | -1/+4 | |
| | |/ / / / / | ||||||
* | | | | | | | Let synctl use a config directory. (#5904) | Andrew Morgan | 2020-02-24 | 1 | -3/+4 | |
|\| | | | | | | ||||||
| * | | | | | | Let synctl use a config directory. (#5904) | Jorik Schellekens | 2019-08-28 | 1 | -3/+4 | |
* | | | | | | | Use the v2 lookup API for 3PID invites (#5897) | Andrew Morgan | 2020-02-24 | 5 | -179/+293 | |
|\| | | | | | | ||||||
| * | | | | | | Use the v2 lookup API for 3PID invites (#5897) | Andrew Morgan | 2019-08-28 | 3 | -9/+165 | |
* | | | | | | | Config templating (#5900) | Andrew Morgan | 2020-02-21 | 4 | -37/+161 | |
|\| | | | | | | ||||||
| * | | | | | | Config templating (#5900) | Jorik Schellekens | 2019-08-28 | 4 | -37/+161 | |
* | | | | | | | Implement a structured logging output system. (#5680) | Andrew Morgan | 2020-02-21 | 19 | -77/+763 | |
|\| | | | | | | ||||||
| * | | | | | | Implement a structured logging output system. (#5680) | Amber Brown | 2019-08-28 | 19 | -77/+763 | |
* | | | | | | | Fix a cache-invalidation bug for worker-based deployments (#5920) | Andrew Morgan | 2020-02-21 | 1 | -8/+16 | |
|\| | | | | | | ||||||
| * | | | | | | Fix a cache-invalidation bug for worker-based deployments (#5920) | Richard van der Hoff | 2019-08-28 | 1 | -8/+16 | |
* | | | | | | | Merge pull request #5914 from matrix-org/rei/admin_getadmin | Andrew Morgan | 2020-02-21 | 3 | -9/+42 | |
|\| | | | | | | ||||||
| * | | | | | | Merge pull request #5914 from matrix-org/rei/admin_getadmin | reivilibre | 2019-08-28 | 3 | -9/+42 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Add GET method to admin API /users/@user:dom/admin | Olivier Wilkinson (reivilibre) | 2019-08-27 | 3 | -9/+42 | |
* | | | | | | | | Merge pull request #5859 from matrix-org/rei/msc2197 | Andrew Morgan | 2020-02-21 | 3 | -16/+95 | |
|\| | | | | | | | ||||||
| * | | | | | | | Merge pull request #5859 from matrix-org/rei/msc2197 | reivilibre | 2019-08-28 | 3 | -16/+95 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Use MSC2197 on stable prefix as it has almost finished FCP | Olivier Wilkinson (reivilibre) | 2019-08-20 | 2 | -26/+4 | |
| | * | | | | | | | Add support for inbound MSC2197 requests on unstable Federation API | Olivier Wilkinson (reivilibre) | 2019-08-15 | 1 | -1/+59 | |
| | * | | | | | | | Support MSC2197 outbound with unstable prefix | Olivier Wilkinson (reivilibre) | 2019-08-15 | 2 | -16/+59 | |
* | | | | | | | | | Merge pull request #5864 from matrix-org/erikj/reliable_lookups | Andrew Morgan | 2020-02-21 | 2 | -208/+217 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #5864 from matrix-org/erikj/reliable_lookups | Erik Johnston | 2019-08-27 | 2 | -208/+217 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Fix off by one error in SRV result shuffling | Erik Johnston | 2019-08-27 | 1 | -8/+13 | |
| | * | | | | | | | | Fixup comments | Erik Johnston | 2019-08-23 | 1 | -1/+9 | |
| | * | | | | | | | | Fix logcontexts | Erik Johnston | 2019-08-23 | 1 | -4/+8 |