| Commit message (Expand) | Author | Age | Files | Lines |
* | Improve signature checking on some federation APIs (#6262) | Richard van der Hoff | 2019-10-28 | 1 | -2/+18 |
* | Remove repeated calls to config.stats_enabled. | Erik Johnston | 2019-10-25 | 1 | -1/+3 |
* | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2 | Hubert Chathi | 2019-10-22 | 1 | -1/+390 |
|\ |
|
| * | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-10-18 | 18 | -851/+1390 |
| |\ |
|
| * | | fix doc strings | Hubert Chathi | 2019-10-18 | 1 | -9/+13 |
| * | | make isort happy | Hubert Chathi | 2019-09-24 | 1 | -1/+0 |
| * | | add some comments | Hubert Chathi | 2019-09-24 | 1 | -2/+10 |
| * | | drop some logger lines to debug | Hubert Chathi | 2019-09-24 | 1 | -3/+3 |
| * | | make changes based on PR feedback | Hubert Chathi | 2019-09-24 | 1 | -107/+159 |
| * | | add function docs | Hubert Chathi | 2019-09-07 | 1 | -2/+24 |
| * | | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-09-07 | 5 | -114/+280 |
| |\ \ |
|
| * | | | run black | Hubert Chathi | 2019-09-06 | 1 | -24/+10 |
| * | | | split out signature processing into separate functions | Hubert Chathi | 2019-09-06 | 1 | -195/+204 |
| * | | | avoid modifying input parameter | Hubert Chathi | 2019-09-05 | 1 | -7/+7 |
| * | | | update with newer coding style | Hubert Chathi | 2019-09-04 | 1 | -1/+1 |
| * | | | make black happy | Hubert Chathi | 2019-09-04 | 1 | -78/+69 |
| * | | | allow uploading signatures of master key signed by devices | Hubert Chathi | 2019-09-04 | 1 | -82/+150 |
| * | | | implement device signature uploading/fetching | Hubert Chathi | 2019-09-04 | 1 | -0/+250 |
* | | | | Remove Auth.check method (#6217) | Richard van der Hoff | 2019-10-18 | 1 | -3/+4 |
| |_|/
|/| | |
|
* | | | Merge branch 'uhoreg/e2e_cross-signing_merged' into develop | Hubert Chathi | 2019-10-18 | 3 | -6/+216 |
|\ \ \ |
|
| * \ \ | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-10-18 | 18 | -746/+1387 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-09-07 | 5 | -114/+280 |
| |\ \ \ \
| | |_|/ /
| |/| | /
| | | |/
| | |/| |
|
| * | | | Merge branch 'develop' into cross-signing_keys | Hubert Chathi | 2019-09-04 | 17 | -485/+228 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys | Hubert Chathi | 2019-08-28 | 16 | -65/+412 |
| |\ \ \ \ |
|
| * | | | | | black | Hubert Chathi | 2019-08-28 | 1 | -3/+1 |
| * | | | | | use stream ID generator instead of timestamp | Hubert Chathi | 2019-08-28 | 1 | -4/+3 |
| * | | | | | make isort happy | Hubert Chathi | 2019-08-21 | 1 | -1/+0 |
| * | | | | | apply PR review suggestions | Hubert Chathi | 2019-08-21 | 1 | -42/+34 |
| * | | | | | make changes from PR review | Hubert Chathi | 2019-08-01 | 1 | -6/+18 |
| * | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keys | Hubert Chathi | 2019-08-01 | 32 | -462/+638 |
| |\ \ \ \ \ |
|
| * | | | | | | allow uploading keys for cross-signing | Hubert Chathi | 2019-07-25 | 3 | -6/+216 |
* | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1 | Richard van der Hoff | 2019-10-18 | 1 | -4/+9 |
|\ \ \ \ \ \ \
| | |_|_|_|_|/
| |/| | | | | |
|
| * | | | | | | Fix presence timeouts when synchrotron restarts. (#6212) | Erik Johnston | 2019-10-18 | 1 | -4/+9 |
* | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1 | Richard van der Hoff | 2019-10-18 | 2 | -10/+4 |
|\| | | | | | |
|
| * | | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storage | Hubert Chathi | 2019-10-11 | 1 | -8/+2 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | make sure we actually return something | Hubert Chathi | 2019-10-10 | 1 | -0/+5 |
| | * | | | | | | make storage layer in charge of interpreting the device key data | Hubert Chathi | 2019-10-10 | 1 | -11/+0 |
| * | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version | Hubert Chathi | 2019-10-11 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | make version optional in body of e2e backup version update | Hubert Chathi | 2019-10-09 | 1 | -2/+2 |
| | |/ / / / / / |
|
* | / / / / / / | rip out some unreachable code | Richard van der Hoff | 2019-10-17 | 1 | -102/+0 |
|/ / / / / / / |
|
* | | | | | | | Add domain validation when creating room with list of invitees (#6121) | werner291 | 2019-10-10 | 1 | -1/+3 |
* | | | | | | | Fix races in room stats (and other) updates. (#6187) | Richard van der Hoff | 2019-10-10 | 3 | -14/+31 |
* | | | | | | | Move tag/push rules room upgrade checking ealier (#6155) | Andrew Morgan | 2019-10-10 | 1 | -18/+44 |
|/ / / / / / |
|
* | | | | | | Remove unused public room list timeout param (#6179) | Andrew Morgan | 2019-10-08 | 1 | -12/+1 |
* | | | | | | Merge pull request #6161 from matrix-org/erikj/dont_regen_user_id_on_failure | Erik Johnston | 2019-10-07 | 1 | -6/+4 |
|\ \ \ \ \ \ |
|
| * | | | | | | Remove unused variable | Erik Johnston | 2019-10-03 | 1 | -2/+0 |
| * | | | | | | Don't regenerate numeric user ID if registration fails. | Erik Johnston | 2019-10-03 | 1 | -4/+4 |
* | | | | | | | add some logging to the rooms stats updates, to try to track down a flaky tes... | Richard van der Hoff | 2019-10-07 | 1 | -0/+1 |
* | | | | | | | Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revoked | Brendan Abolivier | 2019-10-04 | 1 | -2/+7 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
| * | | | | | | Typo | Brendan Abolivier | 2019-10-04 | 1 | -1/+1 |
| * | | | | | | Lint | Brendan Abolivier | 2019-10-04 | 1 | -3/+1 |
| * | | | | | | Incorporate review | Brendan Abolivier | 2019-10-04 | 1 | -14/+8 |
| * | | | | | | Add test case | Brendan Abolivier | 2019-10-03 | 1 | -1/+1 |
| * | | | | | | Lint | Brendan Abolivier | 2019-10-02 | 1 | -1/+3 |
| * | | | | | | Don't 500 code when trying to exchange a revoked 3PID invite | Brendan Abolivier | 2019-10-02 | 1 | -2/+13 |
* | | | | | | | Fix public room list pagination. | Erik Johnston | 2019-10-02 | 1 | -10/+23 |
* | | | | | | | Land improved room list based on room stats (#6019) | Erik Johnston | 2019-10-02 | 1 | -234/+89 |
* | | | | | | | Fix yields and copy instead of move push rules on room upgrade (#6144) | Andrew Morgan | 2019-10-02 | 1 | -2/+2 |
|/ / / / / / |
|
* | | | | | | 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 |
* | | | | | | Lint | Brendan Abolivier | 2019-09-27 | 1 | -3/+1 |
* | | | | | | 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 | 2 | -364/+359 |
* | | | | | | Fix dummy event insertion consent bug (#6053) | Neil Johnson | 2019-09-26 | 1 | -27/+72 |
* | | | | | | 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) | Richard van der Hoff | 2019-09-25 | 2 | -1/+36 |
* | | | | | | Refactor the user-interactive auth handling (#6105) | Richard van der Hoff | 2019-09-25 | 3 | -131/+248 |
* | | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-24 | 1 | -0/+10 |
|\ \ \ \ \ \ |
|
| * | | | | | | Add sid to next_link for email validation (#6097) | J. Ryan Stinnett | 2019-09-24 | 1 | -0/+10 |
* | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-24 | 3 | -82/+192 |
|\| | | | | | |
|
| * | | | | | | Add submit_url response parameter to msisdn /requestToken (#6079) | Andrew Morgan | 2019-09-23 | 1 | -1/+11 |
| * | | | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000) | Andrew Morgan | 2019-09-23 | 2 | -4/+21 |
| * | | | | | | Add POST submit_token endpoint for MSISDN (#6078) | Andrew Morgan | 2019-09-23 | 1 | -0/+34 |
| * | | | | | | Implement MSC2290 (#6043) | Andrew Morgan | 2019-09-23 | 2 | -52/+86 |
| * | | | | | | Return timeout error to user for identity server calls (#6073) | Andrew Morgan | 2019-09-23 | 2 | -11/+37 |
| * | | | | | | Allow HS to send emails when adding an email to the HS (#6042) | Andrew Morgan | 2019-09-20 | 1 | -14/+3 |
* | | | | | | | 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 | 26 | -571/+1051 |
|\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| / / / / / /
| |/ / / / / / |
|
| * | | | | | | v2 3PID Invites (part of MSC2140) (#5979) | Andrew Morgan | 2019-09-17 | 1 | -23/+81 |
| * | | | | | | Fix race condition in room stats. (#6029) | Erik Johnston | 2019-09-17 | 1 | -4/+10 |
| * | | | | | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976) | Andrew Morgan | 2019-09-11 | 3 | -35/+203 |
| * | | | | | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction | Erik Johnston | 2019-09-11 | 2 | -12/+53 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Fix comments | Erik Johnston | 2019-09-11 | 2 | -2/+2 |
| | * | | | | | | 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 | 2 | -12/+39 |
| * | | | | | | | Add note about extra arg to send_membership_event, remove arg in remote_rejec... | Andrew Morgan | 2019-09-11 | 1 | -10/+2 |
| * | | | | | | | 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 | 2019-09-11 | 1 | -1/+6 |
| |/ / / / / / |
|
| * | | | | | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validation | Erik Johnston | 2019-09-10 | 2 | -41/+43 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Add changelog | Andrew Morgan | 2019-09-10 | 1 | -3/+3 |
| | * | | | | | | Use account_threepid_delegate for 3pid validation | Andrew Morgan | 2019-09-10 | 2 | -41/+43 |
| * | | | | | | | Only count real users when checking for auto-creation of auto-join room | Jason Robinson | 2019-09-09 | 1 | -8/+4 |
| | |_|_|_|_|/
| |/| | | | | |
|
| * | | | | | | Ensure a sid parameter is passed to bind_threepid (#5995) | Andrew Morgan | 2019-09-06 | 1 | -1/+7 |
| * | | | | | | Correctly handle non-bool m.federate flag | Erik Johnston | 2019-09-06 | 1 | -1/+3 |
| |/ / / / / |
|
| * | | | | | Allow Synapse to send registration emails + choose Synapse or an external ser... | Andrew Morgan | 2019-09-06 | 3 | -71/+153 |
| * | | | | | Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_... | Erik Johnston | 2019-09-05 | 1 | -4/+1 |
| |\ \ \ \ \ |
|
| | * | | | | | Link the send loop with the edus contexts | Jorik Schellekens | 2019-09-05 | 1 | -4/+1 |
| | | |_|_|/
| | |/| | | |
|
| * | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892) | Andrew Morgan | 2019-09-05 | 1 | -41/+119 |
| * | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980) | Andrew Morgan | 2019-09-05 | 1 | -1/+2 |
| |/ / / / |
|
| * | | | | Remove bind_email and bind_msisdn (#5964) | Andrew Morgan | 2019-09-04 | 1 | -44/+6 |
| * | | | | Fix and refactor room and user stats (#5971) | Erik Johnston | 2019-09-04 | 1 | -175/+132 |
| * | | | | code cleanups | Andrew Morgan | 2019-09-03 | 1 | -7/+2 |
| * | | | | Fix docstring | Andrew Morgan | 2019-09-03 | 1 | -2/+1 |
| * | | | | Remove unnecessary variable declaration | Andrew Morgan | 2019-09-03 | 1 | -1/+0 |
| * | | | | fix typo | Matthew Hodgson | 2019-09-03 | 1 | -1/+1 |
| * | | | | Remove double return statements (#5962) | Andrew Morgan | 2019-09-03 | 5 | -7/+0 |
| * | | | | Opentrace device lists (#5853) | Jorik Schellekens | 2019-09-03 | 2 | -3/+68 |
| * | | | | Remove unused methods from c/s api v1 in register.py (#5963) | Andrew Morgan | 2019-09-02 | 1 | -104/+0 |
| * | | | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2019-08-30 | 10 | -19/+19 |
| * | | | | Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937) | Andrew Morgan | 2019-08-30 | 2 | -132/+9 |
| | |_|/
| |/| | |
|
| * | | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent | Will Hunt | 2019-08-28 | 1 | -1/+4 |
| |\ \ \ |
|
| | * | | | Apply suggestions from code review | Will Hunt | 2019-08-23 | 1 | -2/+2 |
| | * | | | Exempt bot users | Half-Shot | 2019-08-23 | 1 | -1/+1 |
| | * | | | Return user_type in get_user_by_id | Half-Shot | 2019-08-23 | 1 | -1/+4 |
| * | | | | Use the v2 lookup API for 3PID invites (#5897) | Andrew Morgan | 2019-08-28 | 2 | -9/+132 |
| * | | | | Implement a structured logging output system. (#5680) | Amber Brown | 2019-08-28 | 1 | -2/+3 |
| * | | | | Merge pull request #5914 from matrix-org/rei/admin_getadmin | reivilibre | 2019-08-28 | 1 | -0/+9 |
| |\ \ \ \ |
|
| | * | | | | Add GET method to admin API /users/@user:dom/admin | Olivier Wilkinson (reivilibre) | 2019-08-27 | 1 | -0/+9 |
| * | | | | | Merge pull request #5859 from matrix-org/rei/msc2197 | reivilibre | 2019-08-28 | 1 | -1/+28 |
| |\ \ \ \ \ |
|
| | * | | | | | Support MSC2197 outbound with unstable prefix | Olivier Wilkinson (reivilibre) | 2019-08-15 | 1 | -1/+28 |
| * | | | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limit | Richard van der Hoff | 2019-08-27 | 1 | -1/+1 |
| |\ \ \ \ \ \
| | |_|/ / / /
| |/| | | | | |
|
| | * | | | | | Increase max display name limit | Neil Johnson | 2019-08-24 | 1 | -1/+1 |
| | | |/ / /
| | |/| | | |
|
| * / | | | | Add Admin API capability to set adminship of a user (#5878) | reivilibre | 2019-08-27 | 1 | -0/+10 |
| |/ / / / |
|
| * | | | | Propagate opentracing contexts through EDUs (#5852) | Jorik Schellekens | 2019-08-22 | 1 | -6/+21 |
| * | | | | Revert "Add "require_consent" parameter for registration" | Brendan Abolivier | 2019-08-22 | 1 | -12/+2 |
| * | | | | Add "require_consent" parameter for registration | Half-Shot | 2019-08-22 | 1 | -2/+12 |
| * | | | | Opentrace e2e keys (#5855) | Jorik Schellekens | 2019-08-22 | 2 | -3/+77 |
| * | | | | Servlet to purge old rooms (#5845) | Richard van der Hoff | 2019-08-22 | 1 | -0/+17 |
| * | | | | Merge pull request #5860 from matrix-org/erikj/update_5704_comments | Erik Johnston | 2019-08-19 | 1 | -17/+5 |
| |\ \ \ \ |
|
| | * | | | | Remove logging for #5407 and update comments | Erik Johnston | 2019-08-15 | 1 | -17/+5 |
| | |/ / / |
|
| * / / / | Don't create broken room when power_level_content_override.users does not con... | Michael Telatynski | 2019-08-15 | 1 | -1/+13 |
| |/ / / |
|
* | | | | 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 | 1 | -8/+95 |
|/ / / |
|
* | | | Handle TimelineBatch being limited and empty. | Erik Johnston | 2019-08-06 | 1 | -6/+37 |
* | | | Account validity: allow defining HTML templates to serve the us… (#5807) | Brendan Abolivier | 2019-08-01 | 1 | -1/+9 |
|\ \ \ |
|
| * | | | Allow defining HTML templates to serve the user on account renewal | Brendan Abolivier | 2019-08-01 | 1 | -1/+9 |
| | |/
| |/| |
|
* | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_room | Erik Johnston | 2019-08-01 | 1 | -1/+3 |
|\ \ \ |
|
| * | | | Deny redaction of events in a different room. | Erik Johnston | 2019-07-31 | 1 | -1/+3 |
* | | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errors | Erik Johnston | 2019-08-01 | 2 | -32/+60 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Don't log as exception when failing durig backfill | Erik Johnston | 2019-07-30 | 1 | -0/+3 |
| * | | | Correctly handle errors doing requests to group servers | Erik Johnston | 2019-07-29 | 1 | -32/+57 |
* | | | | Remove duplicate return statement | Andrew Morgan | 2019-07-31 | 1 | -1/+0 |
| |/ /
|/| | |
|
* | | | Unwrap error | Erik Johnston | 2019-07-30 | 1 | -1/+2 |
* | | | Fix error handling when fetching remote device keys | Erik Johnston | 2019-07-30 | 1 | -3/+1 |
* | | | Remove non-functional 'expire_access_token' setting (#5782) | Richard van der Hoff | 2019-07-30 | 1 | -1/+1 |
* | | | Room Complexity Client Implementation (#5783) | Amber Brown | 2019-07-30 | 2 | -4/+105 |
|/ / |
|
* | | Move some timeout checking logs to DEBUG #5785 | Amber Brown | 2019-07-30 | 2 | -2/+2 |
* | | Update the device list cache when keys/query is called (#5693) | Jorik Schellekens | 2019-07-29 | 2 | -74/+136 |
* | | Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatch | Richard van der Hoff | 2019-07-26 | 1 | -2/+35 |
|\ \ |
|
| * | | Log when we receive a /make_* request from a different origin | Richard van der Hoff | 2019-07-26 | 1 | -2/+35 |
| |/ |
|
* | | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatch | Erik Johnston | 2019-07-24 | 1 | -13/+22 |
|\ \ |
|
| * | | Log when we receive receipt from a different origin | Erik Johnston | 2019-07-23 | 1 | -13/+22 |
| |/ |
|
* | | Stop trying to fetch events with event_id=None. (#5753) | Richard van der Hoff | 2019-07-24 | 1 | -1/+7 |
* | | Replace returnValue with return (#5736) | Amber Brown | 2019-07-23 | 32 | -364/+330 |
|/ |
|
* | Ignore redactions of m.room.create events (#5701) | Richard van der Hoff | 2019-07-17 | 1 | -9/+24 |
* | Return a different error from Invalid Password when a user is deactivated (#5... | Andrew Morgan | 2019-07-15 | 1 | -0/+9 |
* | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_data | Erik Johnston | 2019-07-15 | 1 | -0/+183 |
|\ |
|
| * | pep8 | Erik Johnston | 2019-07-05 | 1 | -4/+0 |
| * | Remove FileExfiltrationWriter | Erik Johnston | 2019-07-05 | 1 | -63/+0 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfi... | Erik Johnston | 2019-07-05 | 13 | -36/+168 |
| |\ |
|
| * | | Assume key existence. Update docstrings | Erik Johnston | 2019-07-05 | 1 | -3/+1 |
| * | | Fixup from review comments. | Erik Johnston | 2019-07-04 | 1 | -17/+22 |
| * | | Apply comment fixups from code review | Erik Johnston | 2019-07-03 | 1 | -6/+6 |
| * | | Add basic function to get all data for a user out of synapse | Erik Johnston | 2019-07-02 | 1 | -0/+247 |
* | | | Implement access token expiry (#5660) | Richard van der Hoff | 2019-07-12 | 2 | -14/+38 |
* | | | Inline issue_access_token (#5659) | Richard van der Hoff | 2019-07-11 | 1 | -7/+3 |
* | | | Merge pull request #5658 from matrix-org/babolivier/is-json | Brendan Abolivier | 2019-07-10 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Typo | Brendan Abolivier | 2019-07-10 | 1 | -1/+1 |
| * | | | Send 3PID bind requests as JSON data | Brendan Abolivier | 2019-07-10 | 1 | -1/+1 |
* | | | | Remove access-token support from RegistrationStore.register (#5642) | Richard van der Hoff | 2019-07-10 | 1 | -1/+1 |
|/ / / |
|
* | | | Merge pull request #5638 from matrix-org/babolivier/invite-json | Brendan Abolivier | 2019-07-09 | 1 | -4/+18 |
|\ \ \ |
|
| * \ \ | Merge branch 'develop' into babolivier/invite-json | Brendan Abolivier | 2019-07-08 | 18 | -196/+251 |
| |\ \ \ |
|
| * | | | | Lint | Brendan Abolivier | 2019-07-08 | 1 | -1/+2 |
| * | | | | Use application/json when querying the IS's /store-invite endpoint | Brendan Abolivier | 2019-07-08 | 1 | -4/+17 |
* | | | | | remove unused and unnecessary check for FederationDeniedError (#5645) | Hubert Chathi | 2019-07-09 | 1 | -4/+1 |
* | | | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-self | Brendan Abolivier | 2019-07-09 | 1 | -0/+4 |
|\ \ \ \ \ |
|
| * | | | | | Allow newly-registered users to lookup their own profiles | Brendan Abolivier | 2019-07-08 | 1 | -0/+4 |
| | |/ / /
| |/| | | |
|
* | | | | | Remove access-token support from RegistrationHandler.register (#5641) | Richard van der Hoff | 2019-07-08 | 1 | -24/+3 |
* | | | | | Better logging for auto-join. (#5643) | Richard van der Hoff | 2019-07-08 | 1 | -0/+7 |
|/ / / / |
|
* | | | | Move get_or_create_user to test code (#5628) | Richard van der Hoff | 2019-07-08 | 1 | -51/+0 |
* | | | | Remove support for invite_3pid_guest. (#5625) | Richard van der Hoff | 2019-07-05 | 3 | -81/+0 |
| |_|/
|/| | |
|
* | | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Amber Brown | 2019-07-04 | 12 | -35/+36 |
* | | | Fix a number of "Starting txn from sentinel context" warnings (#5605) | Richard van der Hoff | 2019-07-03 | 1 | -1/+9 |
* | | | Complete the SAML2 implementation (#5422) | Richard van der Hoff | 2019-07-02 | 1 | -0/+123 |
|\ \ \
| |_|/
|/| | |
|
| * | | Merge branch 'develop' into rav/saml2_client | Richard van der Hoff | 2019-07-01 | 5 | -26/+64 |
| |\ \ |
|
| * | | | Address review comments | Richard van der Hoff | 2019-07-01 | 1 | -5/+7 |
| * | | | cleanups | Richard van der Hoff | 2019-06-27 | 1 | -1/+1 |
| * | | | Add support for tracking SAML2 sessions. | Richard van der Hoff | 2019-06-26 | 1 | -2/+37 |
| * | | | Move all the saml stuff out to a centralised handler | Richard van der Hoff | 2019-06-26 | 1 | -0/+86 |
| | |/
| |/| |
|
* | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloop | Erik Johnston | 2019-07-01 | 1 | -2/+19 |
|\ \ \
| |_|/
|/| | |
|
| * | | Fixup comment | Erik Johnston | 2019-07-01 | 1 | -6/+13 |
| * | | Fix sync tightloop bug. | Erik Johnston | 2019-06-21 | 1 | -2/+12 |
* | | | Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimit | Brendan Abolivier | 2019-06-28 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | Only ratelimit when sending the email | Brendan Abolivier | 2019-06-28 | 1 | -1/+2 |
| * | | | Don't update the ratelimiter before sending a 3PID invite | Brendan Abolivier | 2019-06-28 | 1 | -1/+1 |
| | |/
| |/| |
|
* | | | Added possibilty to disable local password authentication (#5092) | Daniel Hoffend | 2019-06-27 | 2 | -1/+4 |
* | | | Review comments | Erik Johnston | 2019-06-27 | 1 | -4/+4 |
* | | | Refactor and comment sync device list code | Erik Johnston | 2019-06-26 | 1 | -17/+53 |
* | | | Rename get_users_whose_devices_changed | Erik Johnston | 2019-06-26 | 2 | -2/+2 |
* | | | Refactor get_user_ids_changed to pull less from DB | Erik Johnston | 2019-06-26 | 2 | -18/+16 |
|/ / |
|
* | | Prevent multiple upgrades on the same room at once (#5051) | Andrew Morgan | 2019-06-25 | 1 | -51/+89 |
* | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_token | Erik Johnston | 2019-06-24 | 1 | -3/+1 |
|\ \ |
|
| * | | Fix /messages on workers when no from param specified. | Erik Johnston | 2019-06-24 | 1 | -3/+1 |
| |/ |
|
* | | Allow configuration of the path used for ACME account keys. | Richard van der Hoff | 2019-06-24 | 2 | -5/+38 |
* | | Factor acme bits out to a separate file (#5521) | Richard van der Hoff | 2019-06-24 | 2 | -53/+93 |
|/ |
|
* | Run Black. (#5482) | Amber Brown | 2019-06-20 | 35 | -2765/+2187 |
* | Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_error | Erik Johnston | 2019-06-19 | 1 | -9/+19 |
|\ |
|
| * | Fix logline | Erik Johnston | 2019-06-18 | 1 | -1/+1 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_get_mi... | Erik Johnston | 2019-06-18 | 20 | -323/+1372 |
| |\ |
|
| * | | Handle the case of `get_missing_events` failing | Erik Johnston | 2019-04-10 | 1 | -9/+20 |
* | | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_events | Erik Johnston | 2019-06-19 | 1 | -1/+74 |
|\ \ \ |
|
| * | | | Run as background process and fix comments | Erik Johnston | 2019-06-19 | 1 | -2/+5 |
| * | | | Add experimental option to reduce extremities. | Erik Johnston | 2019-06-18 | 1 | -1/+71 |
* | | | | Add some logging to 3pid invite sig verification (#5015) | David Baker | 2019-06-18 | 1 | -8/+38 |
| |_|/
|/| | |
|
* | | | Add third party rules hook for 3PID invites | Brendan Abolivier | 2019-06-17 | 1 | -0/+10 |
* | | | Add third party rules hook into create room | Erik Johnston | 2019-06-17 | 1 | -1/+24 |
|/ / |
|
* | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptions | Erik Johnston | 2019-06-17 | 2 | -16/+17 |
|\ \ |
|
| * | | Handle HttpResponseException when using federation client. | Erik Johnston | 2019-06-07 | 2 | -16/+17 |
* | | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_state | Erik Johnston | 2019-06-17 | 1 | -6/+0 |
|\ \ \ |
|
| * | | | Fix 3PID invite room state over federation. | Erik Johnston | 2019-06-14 | 1 | -6/+0 |
* | | | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rules | Brendan Abolivier | 2019-06-14 | 2 | -4/+78 |
|\ \ \ \ |
|
| * | | | | Add plugin APIs for implementations of custom event rules. | Brendan Abolivier | 2019-06-14 | 2 | -4/+78 |
| |/ / / |
|
* | | | | Don't send renewal emails to deactivated users | Brendan Abolivier | 2019-06-14 | 2 | -0/+9 |
* | | | | Track deactivated accounts in the database (#5378) | Brendan Abolivier | 2019-06-14 | 1 | -0/+4 |
|/ / / |
|
* / / | Fix defaults on checking threepids | Erik Johnston | 2019-06-10 | 1 | -0/+1 |
|/ / |
|
* | | Add ability to perform password reset via email without trusting the identity... | Andrew Morgan | 2019-06-06 | 2 | -14/+63 |
* | | Fix missing logcontext for PresenceHandler.on_shutdown. (#5369) | Richard van der Hoff | 2019-06-06 | 1 | -1/+7 |
* | | Merge pull request #5089 from dnaf/m-heroes-empty-room-name | Brendan Abolivier | 2019-06-06 | 1 | -5/+4 |
|\ \ |
|
| * | | Simplify condition | Brendan Abolivier | 2019-06-06 | 1 | -2/+2 |
| * | | Simplify condition | Brendan Abolivier | 2019-06-05 | 1 | -3/+2 |
| * | | Merge branch 'develop' into m-heroes-empty-room-name | Brendan Abolivier | 2019-06-05 | 15 | -254/+832 |
| |\ \ |
|
| * | | | Lint | Katie Wolfe | 2019-04-24 | 1 | -1/+1 |
| * | | | Clean up code | Katie Wolfe | 2019-04-24 | 1 | -2/+3 |
| * | | | Show heroes if room name or canonical alias are empty | Katie Wolfe | 2019-04-24 | 1 | -3/+4 |
| * | | | Show heroes if room name or canonical alias are empty | Katie Wolfe | 2019-04-24 | 1 | -5/+3 |
* | | | | Merge pull request #5355 from matrix-org/babolivier/heroes_left_members | Brendan Abolivier | 2019-06-06 | 1 | -15/+19 |
|\ \ \ \ |
|
| * | | | | Do user_id != me checks before deciding whether we should pick heroes from th... | Brendan Abolivier | 2019-06-05 | 1 | -15/+19 |
| | |/ /
| |/| | |
|
* | | | | Fix background updates to handle redactions/rejections (#5352) | Erik Johnston | 2019-06-06 | 2 | -9/+20 |
* | | | | Add logging when request fails and clarify we ignore errors. | Erik Johnston | 2019-06-05 | 1 | -4/+12 |
* | | | | Fix handling of failures when calling /event_auth. | Erik Johnston | 2019-06-03 | 1 | -12/+38 |
|/ / / |
|
* | | | Merge pull request #5309 from matrix-org/rav/limit_displayname_length | Richard van der Hoff | 2019-06-01 | 2 | -0/+15 |
|\ \ \ |
|
| * | | | Limit displaynames and avatar URLs | Richard van der Hoff | 2019-06-01 | 2 | -0/+15 |
* | | | | Fix "db txn 'update_presence' from sentinel context" log messages (#5275) | Richard van der Hoff | 2019-05-28 | 1 | -52/+47 |
* | | | | Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_events | Erik Johnston | 2019-05-24 | 2 | -0/+6 |
|\ \ \ \ |
|
| * | | | | Don't bundle aggs for /state and /members etc APIs | Erik Johnston | 2019-05-24 | 1 | -0/+3 |
| * | | | | Don't bundle events in /sync or /events | Erik Johnston | 2019-05-21 | 1 | -0/+3 |
* | | | | | Add config option for setting homeserver's default room version (#5223) | Andrew Morgan | 2019-05-23 | 1 | -2/+7 |