Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6154 from matrix-org/erikj/fix_appservice_pagination | Erik Johnston | 2019-10-02 | 2 | -18/+19 |
|\ | |||||
| * | Newsfile | Erik Johnston | 2019-10-02 | 1 | -0/+1 |
| * | Fix appservice room list pagination | Erik Johnston | 2019-10-02 | 1 | -18/+18 |
* | | Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatable | Erik Johnston | 2019-10-02 | 2 | -0/+4 |
|\ \ | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_room_l... | Erik Johnston | 2019-10-02 | 0 | -0/+0 |
| |\| | |||||
| * | | Newsfile | Erik Johnston | 2019-10-02 | 1 | -0/+1 |
| * | | Fix not showing non-federatable rooms to remote room list queries | Erik Johnston | 2019-10-02 | 1 | -0/+3 |
* | | | Merge pull request #6148 from matrix-org/erikj/find_next_generated | Erik Johnston | 2019-10-02 | 2 | -1/+4 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Newsfile | Erik Johnston | 2019-10-02 | 1 | -0/+1 |
| * | | Bound find_next_generated_user_id DB query. | Erik Johnston | 2019-10-02 | 1 | -1/+3 |
* | | | Merge pull request #6152 from matrix-org/erikj/fix_room_list | Erik Johnston | 2019-10-02 | 3 | -27/+60 |
|\ \ \ | | |/ | |/| | |||||
| * | | Newsfile | Erik Johnston | 2019-10-02 | 1 | -0/+1 |
| * | | Fix public room list pagination. | Erik Johnston | 2019-10-02 | 2 | -27/+59 |
|/ / | |||||
* | | Merge branch 'master' into develop | Brendan Abolivier | 2019-10-02 | 4 | -9/+45 |
|\ \ | |||||
| * | | Update the issue template for new way of getting server version (#6051) | Richard van der Hoff | 2019-09-19 | 1 | -9/+13 |
| * | | Update INSTALL.md with void-linux (#5873) | Pete | 2019-09-19 | 1 | -0/+7 |
| * | | add explanations on how to actually include an access_token (#6031) | axel simon | 2019-09-13 | 1 | -0/+12 |
| * | | README: link to reverse_proxy.rst (#6027) | Richard van der Hoff | 2019-09-12 | 1 | -0/+13 |
* | | | Land improved room list based on room stats (#6019) | Erik Johnston | 2019-10-02 | 7 | -350/+273 |
* | | | Fix up some typechecking (#6150) | Amber Brown | 2019-10-02 | 22 | -40/+104 |
* | | | Fix yields and copy instead of move push rules on room upgrade (#6144) | Andrew Morgan | 2019-10-02 | 3 | -12/+9 |
| |/ |/| | |||||
* | | Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-10-02 | 11 | -19/+193 |
|\ \ | |||||
| * \ | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings | Erik Johnston | 2019-10-02 | 4 | -1/+31 |
| |\ \ | |||||
| | * | | Newsfile | Erik Johnston | 2019-10-02 | 1 | -0/+1 |
| | * | | Fix errors storing large retry intervals. | Erik Johnston | 2019-10-02 | 3 | -1/+30 |
| * | | | Merge pull request #6145 from matrix-org/erikj/fix_censored_redactions | Erik Johnston | 2019-10-02 | 3 | -0/+51 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Newsfile | Erik Johnston | 2019-10-02 | 1 | -0/+1 |
| | * | | Fix fetching censored redactions from DB | Erik Johnston | 2019-10-02 | 2 | -0/+50 |
| * | | | Merge pull request #6141 from matrix-org/erikj/censor_redactions_fix | Erik Johnston | 2019-10-02 | 4 | -18/+111 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Newsfile | Erik Johnston | 2019-10-01 | 1 | -0/+1 |
| | * | | Use `received_ts` to find uncensored redacted events | Erik Johnston | 2019-10-01 | 1 | -14/+7 |
| | * | | Add received_ts column to redactions. | Erik Johnston | 2019-10-01 | 3 | -9/+92 |
| | * | | Don't repeatedly attempt to censor events we don't have. | Erik Johnston | 2019-10-01 | 1 | -1/+17 |
| |/ / | |||||
| * | | Merge pull request #6135 from matrix-org/erikj/fixup_devices_last_seen_query | Erik Johnston | 2019-10-01 | 4 | -7/+55 |
| |\ \ | |||||
* | \ \ | Merge branch 'erikj/fixup_devices_last_seen_query' of github.com:matrix-org/s... | Erik Johnston | 2019-10-01 | 8 | -11/+60 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Newsfile | Erik Johnston | 2019-09-30 | 1 | -0/+1 |
| * | | | Fix `devices_last_seen` background update. | Erik Johnston | 2019-09-30 | 3 | -7/+54 |
| |/ / | |||||
| * | | Merge pull request #6117 from matrix-org/erikj/fix_sample_config | Erik Johnston | 2019-09-26 | 3 | -2/+3 |
| |\ \ | |||||
| | * | | Newsfile | Erik Johnston | 2019-09-26 | 1 | -0/+1 |
| | * | | Fix 'redaction_retention_period' sampel config to match guidelines | Erik Johnston | 2019-09-26 | 2 | -2/+2 |
| |/ / | |||||
| * | | s/month/week/ to match config | Neil Johnson | 2019-09-26 | 1 | -1/+1 |
| * | | Update CHANGES.md | Richard van der Hoff | 2019-09-26 | 1 | -1/+1 |
* | | | Drop unused tables (#6115) | Richard van der Hoff | 2019-09-30 | 2 | -0/+21 |
* | | | Edit SimpleHttpClient to reference that header keys can be passed as str or b... | Andrew Morgan | 2019-09-27 | 2 | -6/+7 |
* | | | Merge pull request #6125 from matrix-org/babolivier/deactivation-invite | Brendan Abolivier | 2019-09-27 | 3 | -14/+92 |
|\ \ \ | |||||
| * | | | Incorporate review | Brendan Abolivier | 2019-09-27 | 1 | -4/+2 |
| * | | | Update synapse/handlers/deactivate_account.py | Brendan Abolivier | 2019-09-27 | 1 | -1/+3 |
| * | | | Update synapse/handlers/deactivate_account.py | Brendan Abolivier | 2019-09-27 | 1 | -1/+1 |
| * | | | Update changelog.d/6125.feature | Brendan Abolivier | 2019-09-27 | 1 | -1/+1 |
| * | | | ok | Brendan Abolivier | 2019-09-27 | 1 | -1/+3 |
| * | | | Lint | Brendan Abolivier | 2019-09-27 | 2 | -10/+2 |
| * | | | Changelog | Brendan Abolivier | 2019-09-27 | 1 | -0/+1 |
| * | | | Add test to validate the change | Brendan Abolivier | 2019-09-27 | 1 | -13/+57 |
| * | | | Fixup and add some logging | Brendan Abolivier | 2019-09-27 | 1 | -1/+9 |
| * | | | Reject pending invites on deactivation | Brendan Abolivier | 2019-09-27 | 1 | -0/+31 |
|/ / / | |||||
* | | | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978) | Andrew Morgan | 2019-09-27 | 3 | -364/+360 |
* | | | Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-span | Erik Johnston | 2019-09-27 | 3 | -1/+22 |
|\ \ \ | |||||
| * | | | isort | Erik Johnston | 2019-09-25 | 1 | -1/+1 |
| * | | | Add device and appservice tags | Erik Johnston | 2019-09-25 | 1 | -0/+3 |
| * | | | Newsfile | Erik Johnston | 2019-09-25 | 1 | -0/+1 |
| * | | | Add tags for event_id and txn_id in event sending | Erik Johnston | 2019-09-25 | 1 | -0/+18 |
| * | | | Don't create new span for get_user_by_req | Erik Johnston | 2019-09-25 | 1 | -1/+0 |
* | | | | Kill off half-implemented password-reset via sms (#6101) | Richard van der Hoff | 2019-09-26 | 2 | -64/+2 |
| |/ / |/| | | |||||
* | | | more changelog updates v1.4.0rc1 | Richard van der Hoff | 2019-09-26 | 1 | -7/+7 |
* | | | Changelog formatting | Richard van der Hoff | 2019-09-26 | 1 | -2/+1 |
* | | | changelog | Richard van der Hoff | 2019-09-26 | 132 | -132/+156 |
* | | | Explicitly log when a homeserver does not have a trusted key server configure... | Neil Johnson | 2019-09-26 | 4 | -16/+63 |
* | | | Merge commit '1b23f991a' into release-v1.4.0 | Richard van der Hoff | 2019-09-26 | 2 | -42/+152 |
|\ \ \ | |||||
| * | | | Clarify upgrade notes ahead of 1.4.0 release | Neil Johnson | 2019-09-26 | 2 | -42/+152 |
* | | | | bump version | Richard van der Hoff | 2019-09-26 | 1 | -1/+1 |
|/ / / | |||||
* | | | Fix dummy event insertion consent bug (#6053) | Neil Johnson | 2019-09-26 | 5 | -39/+266 |
* | | | Merge pull request #6098 from matrix-org/erikj/cleanup_user_ips_2 | Erik Johnston | 2019-09-26 | 7 | -11/+197 |
|\ \ \ | |||||
| * | | | Update comments and docstring | Richard van der Hoff | 2019-09-25 | 1 | -4/+6 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us... | Erik Johnston | 2019-09-25 | 42 | -495/+1317 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #6089 from matrix-org/erikj/cleanup_user_ips | Erik Johnston | 2019-09-25 | 4 | -50/+179 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us... | Erik Johnston | 2019-09-25 | 40 | -491/+1314 |
| |\ \ \ \ | |||||
| * | | | | | Use if `is not None` | Erik Johnston | 2019-09-25 | 1 | -1/+1 |
* | | | | | | Enable cleaning up extremities with dummy events by default to prevent undue ... | Neil Johnson | 2019-09-25 | 2 | -3/+2 |
| |/ / / / |/| | | | | |||||
* | | | | | Threepid validity checks on msisdns should not be dependent on 'threepid_beha... | Neil Johnson | 2019-09-25 | 2 | -29/+35 |
* | | | | | Stop advertising unsupported flows for registration (#6107) | Richard van der Hoff | 2019-09-25 | 5 | -16/+83 |
* | | | | | Refactor the user-interactive auth handling (#6105) | Richard van der Hoff | 2019-09-25 | 5 | -141/+265 |
* | | | | | Refactor code for calculating registration flows (#6106) | Richard van der Hoff | 2019-09-25 | 4 | -83/+145 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #6092 from matrix-org/babolivier/background_update_deactiv... | Brendan Abolivier | 2019-09-24 | 3 | -6/+7 |
|\ \ \ \ | |||||
| * | | | | 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 |
| * | | | | Changelog | Brendan Abolivier | 2019-09-23 | 1 | -0/+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 | Richard van der Hoff | 2019-09-24 | 7 | -10/+280 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-24 | 7 | -8/+75 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | remove unused parameter to get_user_id_by_threepid (#6099) | Richard van der Hoff | 2019-09-24 | 2 | -1/+2 |
* | | | | | | Merge pull request #6069 from matrix-org/rav/fix_attribute_mapping | Richard van der Hoff | 2019-09-24 | 3 | -7/+62 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 | 363 | -5354/+10634 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fix a bug with saml attribute maps. | Richard van der Hoff | 2019-09-19 | 3 | -7/+48 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Add sid to next_link for email validation (#6097) | J. Ryan Stinnett | 2019-09-24 | 2 | -0/+11 |
| | | * | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-24 | 51 | -231/+840 |
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
* | | | | | | | Add submit_url response parameter to msisdn /requestToken (#6079) | Andrew Morgan | 2019-09-23 | 4 | -1/+16 |
* | | | | | | | Add an unstable feature flag for separate add/bind 3pid APIs (#6044) | Andrew Morgan | 2019-09-23 | 2 | -0/+3 |
* | | | | | | | Merge pull request #6064 from matrix-org/rav/saml_config_cleanup | Richard van der Hoff | 2019-09-23 | 3 | -102/+122 |
|\ \ \ \ \ \ \ | |||||
* | | | | | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000) | Andrew Morgan | 2019-09-23 | 5 | -4/+28 |
* | | | | | | | | Add m.id_access_token to /versions unstable_features (MSC2264) (#5974) | Andrew Morgan | 2019-09-23 | 2 | -0/+4 |
* | | | | | | | | Add m.require_identity_server to /versions unstable_flags (#5972) | Andrew Morgan | 2019-09-23 | 2 | -1/+14 |
* | | | | | | | | Add POST submit_token endpoint for MSISDN (#6078) | Andrew Morgan | 2019-09-23 | 3 | -2/+80 |
| |_|_|_|/ / / |/| | | | | | | |||||
* | | | | | | | Implement MSC2290 (#6043) | Andrew Morgan | 2019-09-23 | 7 | -134/+203 |
| | | | * | | | 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 |
| | | | * | | | | Update 6037.feature | Richard van der Hoff | 2019-09-19 | 1 | -1/+1 |
| | | | * | | | | Merge branch 'rav/saml_config_cleanup' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-19 | 1 | -0/+1 |
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'develop' into rav/saml_config_cleanup | Richard van der Hoff | 2019-09-19 | 363 | -5354/+10634 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Add changelog | Richard van der Hoff | 2019-09-19 | 1 | -0/+1 |
| | | | * | | | | Merge branch 'develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-19 | 363 | -5354/+10634 |
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | / / / | | | | |/ / / | |||||
| | | | * | | | better logging | Richard van der Hoff | 2019-09-19 | 1 | -0/+2 |
| | | | * | | | changelog | Richard van der Hoff | 2019-09-13 | 1 | -0/+1 |
| | | | * | | | Record mappings from saml users in an external table | Richard van der Hoff | 2019-09-13 | 6 | -10/+276 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | Make the sample saml config closer to our standards | Richard van der Hoff | 2019-09-13 | 2 | -102/+121 |
| | |/ / / | |/| | | | |||||
| | | | * | Review comments | Erik Johnston | 2019-09-25 | 4 | -7/+4 |
| | | | * | Newsfile | Erik Johnston | 2019-09-24 | 1 | -0/+1 |
| | | | * | Test that pruning of old user IPs works | Erik Johnston | 2019-09-24 | 1 | -0/+71 |
| | | | * | Prune rows in user_ips older than configured period | Erik Johnston | 2019-09-24 | 3 | -8/+73 |
| | | | * | Add has_completed_background_update | Erik Johnston | 2019-09-24 | 1 | -1/+24 |
| | | | * | Add wrap_as_background_process decorator. | Erik Johnston | 2019-09-24 | 1 | -1/+28 |
| | | |/ | |||||
| | | * | Test background update | Erik Johnston | 2019-09-23 | 1 | -0/+79 |
| | | * | Newsfile | Erik Johnston | 2019-09-23 | 1 | -0/+1 |
| | | * | Query devices table for last seen info. | Erik Johnston | 2019-09-23 | 2 | -50/+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 |
| |_|/ |/| | | |||||
* | | | Disable /register/available if registration is disabled (#6082) | Andrew Morgan | 2019-09-23 | 2 | -0/+6 |
* | | | Generalize email sending logging (#6075) | Andrew Morgan | 2019-09-23 | 2 | -1/+2 |
* | | | Return timeout error to user for identity server calls (#6073) | Andrew Morgan | 2019-09-23 | 3 | -11/+38 |
* | | | Merge pull request #6072 from matrix-org/rav/fix_retry_reset | Richard van der Hoff | 2019-09-23 | 2 | -1/+2 |
|\ \ \ | |||||
| * | | | Fix exception when resetting retry timings | Richard van der Hoff | 2019-09-20 | 2 | -1/+2 |
* | | | | 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 | 2019-09-20 | 12 | -72/+359 |
* | | | | Remove trailing slash ability from password reset's submit_token endpoint (#6... | Andrew Morgan | 2019-09-20 | 2 | -1/+2 |
|/ / / | |||||
* | | | Ensure email validation link parameters are URL-encoded (#6063) | Andrew Morgan | 2019-09-20 | 2 | -4/+7 |
* | | | Drop support for bind param on POST /account/3pid (MSC2290) (#6067) | Andrew Morgan | 2019-09-20 | 3 | -4/+10 |
* | | | Docker: support SYNAPSE_WORKER envvar (#6058) | Michael Kaye | 2019-09-19 | 3 | -1/+5 |
* | | | Use unstable prefix for 3PID unbind API (#6062) | J. Ryan Stinnett | 2019-09-19 | 3 | -2/+3 |
* | | | Update the upgrade notes (#6050) | Richard van der Hoff | 2019-09-19 | 2 | -27/+54 |
* | | | Add some notes on rolling back to v1.3.1. (#6049) | Richard van der Hoff | 2019-09-19 | 2 | -0/+26 |
* | | | Undo the deletion of some tables (#6047) | Richard van der Hoff | 2019-09-19 | 3 | -21/+3 |
* | | | Remove POST method from password reset submit_token endpoint (#6056) | Andrew Morgan | 2019-09-19 | 2 | -17/+1 |
* | | | Fix typo in account_threepid_delegates config (#6028) | Jorik Schellekens | 2019-09-18 | 3 | -2/+3 |
* | | | Give appropriate exit codes when synctl fails (#5992) | Jorik Schellekens | 2019-09-18 | 2 | -4/+40 |
* | | | Fix logcontext spam on non-Linux platforms (#6059) | J. Ryan Stinnett | 2019-09-18 | 2 | -2/+12 |
| |/ |/| | |||||
* | | fix sample config | Richard van der Hoff | 2019-09-18 | 1 | -1/+1 |
* | | v2 3PID Invites (part of MSC2140) (#5979) | Andrew Morgan | 2019-09-17 | 2 | -23/+82 |
* | | (#5849) Convert rst to markdown (#6040) | dstipp | 2019-09-17 | 41 | -2192/+2088 |
* | | Fix race condition in room stats. (#6029) | Erik Johnston | 2019-09-17 | 2 | -4/+11 |
* | | Add 'failure_ts' column to 'destinations' table (#6016) | Richard van der Hoff | 2019-09-17 | 7 | -12/+195 |
* | | Fix well-known lookups with the federation certificate whitelist (#5997) | Amber Brown | 2019-09-14 | 5 | -15/+63 |
* | | Add developer docs for using SAML without a server (#6032) | Travis Ralston | 2019-09-13 | 2 | -0/+38 |
* | | Fix for structured logging tests stomping on logs (#6023) | Amber Brown | 2019-09-13 | 13 | -41/+154 |
* | | Remove the cap on federation retry interval. (#6026) | Richard van der Hoff | 2019-09-12 | 2 | -2/+3 |
* | | Fix bug in calculating the federation retry backoff period (#6025) | Richard van der Hoff | 2019-09-12 | 2 | -2/+4 |
* | | Merge pull request #6024 from matrix-org/dbkr/fix_sso_fallback_login | David Baker | 2019-09-12 | 2 | -1/+2 |
|\ \ | |||||
| * | | changelog | David Baker | 2019-09-12 | 1 | -0/+1 |
| * | | Fix SSO fallback login | David Baker | 2019-09-12 | 1 | -1/+1 |
|/ / | |||||
* | | add report_stats_endpoint config option (#6012) | Sorunome | 2019-09-12 | 4 | -2/+19 |
* | | Blow up config if opentracing is missing (#5985) | Jorik Schellekens | 2019-09-12 | 2 | -0/+8 |
* | | Merge pull request #6020 from matrix-org/jaywink/allow-support-users-to-register | Jason Robinson | 2019-09-12 | 3 | -2/+28 |
|\ \ | |||||
| * | | Ensure support users can be registered even if MAU limit is reached | Jason Robinson | 2019-09-11 | 3 | -2/+28 |
|/ / | |||||
* | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976) | Andrew Morgan | 2019-09-11 | 6 | -35/+238 |
* | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction | Erik Johnston | 2019-09-11 | 7 | -12/+103 |
|\ \ | |||||
| * | | Update sample config | Erik Johnston | 2019-09-11 | 1 | -1/+1 |
| * | | Fix comments | Erik Johnston | 2019-09-11 | 4 | -5/+5 |
| * | | Add test for admin redaction ratelimiting. | Erik Johnston | 2019-09-11 | 1 | -0/+25 |
| * | | Fix how we check for self redaction | Erik Johnston | 2019-09-11 | 1 | -4/+18 |
| * | | Update sample config | Erik Johnston | 2019-09-11 | 1 | -0/+7 |
| * | | Newsfile | Erik Johnston | 2019-09-11 | 1 | -0/+1 |
| * | | 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) | Richard van der Hoff | 2019-09-11 | 3 | -36/+14 |
* | | | Add note about extra arg to send_membership_event, remove arg in remote_rejec... | Andrew Morgan | 2019-09-11 | 2 | -10/+3 |
* | | | Check dependencies on setup in the nicer way. (#5989) | Jorik Schellekens | 2019-09-11 | 4 | -28/+20 |
* | | | Fix existing v2 identity server calls (MSC2140) (#6013) | Andrew Morgan | 2019-09-11 | 2 | -2/+27 |
* | | | Remove origin parameter from add_display_name_to_third_party_invite and add p... | Andrew Morgan | 2019-09-11 | 4 | -4/+10 |
|/ / | |||||
* | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validation | Erik Johnston | 2019-09-10 | 4 | -42/+46 |
|\ \ | |||||
| * | | Add changelog | Andrew Morgan | 2019-09-10 | 3 | -4/+5 |
| * | | 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 | Jason Robinson | 2019-09-09 | 4 | -10/+69 |
|\ \ \ | |||||
| * | | | 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 | 4 | -10/+71 |
* | | | | Merge pull request #5934 from matrix-org/erikj/censor_redactions | Erik Johnston | 2019-09-09 | 6 | -2/+220 |
|\ \ \ \ | |||||
| * | | | | Fix comments | Erik Johnston | 2019-09-09 | 1 | -2/+3 |
| * | | | | Default to censoring redactions after seven days | Erik Johnston | 2019-09-09 | 2 | -7/+11 |
| * | | | | 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 | 144 | -1781/+2395 |
| |\ \ \ \ | |||||
| * | | | | | Fix test | Erik Johnston | 2019-09-05 | 1 | -1/+3 |
| * | | | | | Make redaction retention period configurable | Erik Johnston | 2019-09-05 | 4 | -3/+27 |
| * | | | | | Newsfile | Erik Johnston | 2019-08-30 | 1 | -0/+1 |
| * | | | | | Censor redactions in DB after a month | Erik Johnston | 2019-08-30 | 3 | -1/+175 |
* | | | | | | Add a build info metric to Prometheus (#6005) | Amber Brown | 2019-09-10 | 3 | -2/+33 |
* | | | | | | Merge pull request #6003 from matrix-org/erikj/push_opentracing | Erik Johnston | 2019-09-09 | 2 | -1/+13 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Newsfile | Erik Johnston | 2019-09-09 | 1 | -0/+1 |
| * | | | | | Add opentracing span for HTTP push | Erik Johnston | 2019-09-09 | 1 | -1/+12 |
|/ / / / / | |||||
* | | | | | Servers-known-about statistic (#5981) | Amber Brown | 2019-09-07 | 7 | -60/+226 |
* | | | | | Ensure a sid parameter is passed to bind_threepid (#5995) | Andrew Morgan | 2019-09-06 | 2 | -1/+8 |
* | | | | | Merge pull request #5998 from matrix-org/erikj/fixup_federate_flag | Erik Johnston | 2019-09-06 | 3 | -2/+7 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Newsfile | Erik Johnston | 2019-09-06 | 1 | -0/+1 |
| * | | | | 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 | Erik Johnston | 2019-09-06 | 2 | -79/+80 |
|\ \ \ \ \ | |||||
| * | | | | | Move delete_threepid_session into RegistrationWorkerStore | Andrew Morgan | 2019-09-06 | 1 | -25/+25 |
| * | | | | | Change changelog | Andrew Morgan | 2019-09-06 | 2 | -1/+1 |
| * | | | | | Move get_threepid_validation_session into RegistrationWorkerStore | Andrew Morgan | 2019-09-06 | 1 | -54/+54 |
| * | | | | | Add changelog | Andrew Morgan | 2019-09-06 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #5994 from matrix-org/anoa/html_template_fix | Erik Johnston | 2019-09-06 | 3 | -2/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Apply suggestions from code review | Andrew Morgan | 2019-09-06 | 2 | -2/+2 |
| * | | | | Add changelog | Andrew Morgan | 2019-09-06 | 1 | -0/+1 |
| * | | | | Fix destructuring assumption bug | Andrew Morgan | 2019-09-06 | 2 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcs | Erik Johnston | 2019-09-06 | 2 | -5/+6 |
|\ \ \ \ | |||||
| * | | | | Update changelog | Erik Johnston | 2019-09-06 | 1 | -1/+1 |
| * | | | | Newsfile | Erik Johnston | 2019-09-06 | 1 | -0/+1 |
| * | | | | 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 | 2019-09-06 | 29 | -302/+820 |
|/ / / / | |||||
* | | | | Trace how long it takes for the send trasaction to complete, including retrys... | Jorik Schellekens | 2019-09-05 | 4 | -38/+58 |
* | | | | Gracefully handle log context slips and missing opentracing import errors. (#... | Jorik Schellekens | 2019-09-05 | 2 | -24/+59 |
| |/ / |/| | | |||||
* | | | Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_... | Erik Johnston | 2019-09-05 | 5 | -8/+16 |
|\ \ \ | |||||
| * | | | use access methods (duh..) | Jorik Schellekens | 2019-09-05 | 1 | -1/+3 |
| * | | | Bugfix phrasing | Jorik Schellekens | 2019-09-05 | 1 | -1/+1 |
| * | | | Opentracing context cannot be none | Jorik Schellekens | 2019-09-05 | 1 | -1/+1 |
| * | | | newsfile | Jorik Schellekens | 2019-09-05 | 1 | -0/+1 |
| * | | | Link the send loop with the edus contexts | Jorik Schellekens | 2019-09-05 | 3 | -7/+12 |
* | | | | Add opentracing to all client servlets (#5983) | Jorik Schellekens | 2019-09-05 | 6 | -18/+26 |
* | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892) | Andrew Morgan | 2019-09-05 | 4 | -47/+132 |
* | | | | Fix opentracing contexts missing from outbound replication requests (#5982) | Jorik Schellekens | 2019-09-05 | 2 | -4/+17 |
* | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980) | Andrew Morgan | 2019-09-05 | 3 | -1/+36 |
|/ / / | |||||
* | | | Remove bind_email and bind_msisdn (#5964) | Andrew Morgan | 2019-09-04 | 4 | -64/+10 |
* | | | Cleanup event auth type initialisation (#5975) | Andrew Morgan | 2019-09-04 | 2 | -5/+6 |
* | | | Fix and refactor room and user stats (#5971) | Erik Johnston | 2019-09-04 | 11 | -641/+1642 |
* | | | code cleanups | Andrew Morgan | 2019-09-03 | 1 | -7/+2 |
* | | | Ensure the list media admin API is always available (#5966) | Travis Ralston | 2019-09-03 | 2 | -2/+6 |
* | | | Fix docstring | Andrew Morgan | 2019-09-03 | 1 | -2/+1 |
* | | | Remove unnecessary variable declaration | Andrew Morgan | 2019-09-03 | 1 | -1/+0 |
* | | | Docker packaging should not su-exec or chmod if already running as UID/GID (#... | Michael Kaye | 2019-09-03 | 2 | -35/+50 |
* | | | Ensure an auth instance is available to ListMediaInRoom (#5967) | Travis Ralston | 2019-09-03 | 2 | -0/+2 |
* | | | fix typo | Matthew Hodgson | 2019-09-03 | 1 | -1/+1 |
* | | | Remove double return statements (#5962) | Andrew Morgan | 2019-09-03 | 15 | -20/+1 |
* | | | Opentrace device lists (#5853) | Jorik Schellekens | 2019-09-03 | 8 | -58/+118 |
* | | | Remove unused methods from c/s api v1 in register.py (#5963) | Andrew Morgan | 2019-09-02 | 3 | -137/+2 |
* | | | fix thumbnail storage location (#5915) | L0ric0 | 2019-09-02 | 2 | -1/+2 |
* | | | Update INSTALL.md to say that Python 2 is no longer supported (#5953) | Aaron Raimist | 2019-09-02 | 2 | -2/+3 |
* | | | Revert "Add m.id_access_token flag (#5930)" (#5945) | Andrew Morgan | 2019-08-30 | 2 | -7/+1 |
* | | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2019-08-30 | 81 | -286/+287 |