summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #6332 from matrix-org/erikj/query_devices_fixErik Johnston2019-11-261-3/+16
|\ \ \ \
| * | | | Fix caching devices for remote servers in worker.Erik Johnston2019-11-051-3/+16
| | |_|/ | |/| |
* | | | Clean up newline quote marks around the codebase (#6362)Andrew Morgan2019-11-211-1/+1
* | | | Merge pull request #6335 from matrix-org/erikj/rc_login_cleanupsBrendan Abolivier2019-11-201-53/+31
|\ \ \ \ | |_|_|/ |/| | |
| * | | Apply suggestions from code reviewErik Johnston2019-11-181-2/+2
| * | | Add failed auth ratelimiting to UIAErik Johnston2019-11-061-1/+32
| * | | Only do `rc_login` ratelimiting on succesful login.Erik Johnston2019-11-061-54/+1
| |/ /
* | / Replace instance variations of homeserver with correct case/spacingAndrew Morgan2019-11-126-11/+11
| |/ |/|
* | Merge pull request #6295 from matrix-org/erikj/split_purge_historyErik Johnston2019-11-081-2/+4
|\ \
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-11-0416-144/+357
| |\|
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-10-3115-69/+95
| |\ \
| * | | Split purge API into events vs stateErik Johnston2019-10-301-2/+5
* | | | Merge pull request #6235 from matrix-org/anoa/room_upgrade_groupsAndrew Morgan2019-11-071-0/+9
|\ \ \ \
| * | | | Re-add docstring, with caveats detailedAndrew Morgan2019-11-041-1/+1
| * | | | Transfer upgraded rooms on groupsAndrew Morgan2019-11-041-0/+9
| | |_|/ | |/| |
* | | | raise exception after multiple failuresAndrew Morgan2019-11-061-3/+10
* | | | Address review commentsAndrew Morgan2019-11-061-12/+12
* | | | Don't forget to ratelimit calls outside of RegistrationHandlerAndrew Morgan2019-11-061-2/+2
* | | | Numeric ID checker now checks @0, don't ratelimit on checkingAndrew Morgan2019-11-061-16/+25
* | | | Fix bug which caused rejected events to be stored with the wrong room state ...Richard van der Hoff2019-11-061-0/+1
* | | | Add some checks that we aren't using state from rejected events (#6330)Richard van der Hoff2019-11-051-1/+5
|/ / /
* | | Factor out an _AsyncEventContextImpl (#6298)Richard van der Hoff2019-11-011-19/+19
* | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-011-1/+1
* | | Remove last usages of deprecated logging.warn method (#6314)Andrew Morgan2019-11-011-1/+1
* | | Depublish a room from the public rooms list when it is upgraded (#6232)Andrew Morgan2019-11-013-29/+90
* | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-3121-153/+202
|\ \ \
| * | | Update black to 19.10b0 (#6304)Amber Brown2019-11-0113-84/+106
| | |/ | |/|
| * | Merge pull request #6294 from matrix-org/erikj/add_state_storageErik Johnston2019-10-3110-40/+63
| |\ \
| | * | Port to use state storageErik Johnston2019-10-3010-40/+63
| | |/
| * / Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-319-29/+33
| |/
* | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-305-39/+43
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_...Erik Johnston2019-10-304-37/+39
| |\
| | * Fix log line that was printing undefined value (#6278)Andrew Morgan2019-10-301-1/+1
| | * Port receipt and read markers to async/waitErik Johnston2019-10-292-33/+17
| | * Improve signature checking on some federation APIs (#6262)Richard van der Hoff2019-10-281-2/+18
| | * Remove repeated calls to config.stats_enabled.Erik Johnston2019-10-251-1/+3
| * | Use new EventPersistenceStoreErik Johnston2019-10-232-2/+4
| |/
* | blackHubert Chathi2019-10-301-1/+3
* | apply changes as a result of PR reviewHubert Chathi2019-10-301-12/+10
* | don't error if federation query doesn't have cross-signing keysHubert Chathi2019-10-241-7/+9
* | blackHubert Chathi2019-10-221-1/+2
* | vendor-prefix the EDU name until MSC1756 is merged into the specHubert Chathi2019-10-221-1/+2
* | update to work with newer code, and fix formattingHubert Chathi2019-10-222-5/+6
* | add missing paramHubert Chathi2019-10-221-1/+1
* | make black happyHubert Chathi2019-10-221-5/+7
* | implement federation parts of cross-signingHubert Chathi2019-10-222-3/+126
|/
* Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2Hubert Chathi2019-10-221-1/+390
|\
| * Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-1818-851/+1390
| |\
| * | fix doc stringsHubert Chathi2019-10-181-9/+13
| * | make isort happyHubert Chathi2019-09-241-1/+0
| * | add some commentsHubert Chathi2019-09-241-2/+10
| * | drop some logger lines to debugHubert Chathi2019-09-241-3/+3
| * | make changes based on PR feedbackHubert Chathi2019-09-241-107/+159
| * | add function docsHubert Chathi2019-09-071-2/+24
| * | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-075-114/+280
| |\ \
| * | | run blackHubert Chathi2019-09-061-24/+10
| * | | split out signature processing into separate functionsHubert Chathi2019-09-061-195/+204
| * | | avoid modifying input parameterHubert Chathi2019-09-051-7/+7
| * | | update with newer coding styleHubert Chathi2019-09-041-1/+1
| * | | make black happyHubert Chathi2019-09-041-78/+69
| * | | allow uploading signatures of master key signed by devicesHubert Chathi2019-09-041-82/+150
| * | | implement device signature uploading/fetchingHubert Chathi2019-09-041-0/+250
* | | | Remove Auth.check method (#6217)Richard van der Hoff2019-10-181-3/+4
| |_|/ |/| |
* | | Merge branch 'uhoreg/e2e_cross-signing_merged' into developHubert Chathi2019-10-183-6/+216
|\ \ \
| * \ \ Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-1818-746/+1387
| |\ \ \
| * \ \ \ Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-075-114/+280
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| * | | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-0417-485/+228
| |\ \ \
| * \ \ \ Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-2816-65/+412
| |\ \ \ \
| * | | | | blackHubert Chathi2019-08-281-3/+1
| * | | | | use stream ID generator instead of timestampHubert Chathi2019-08-281-4/+3
| * | | | | make isort happyHubert Chathi2019-08-211-1/+0
| * | | | | apply PR review suggestionsHubert Chathi2019-08-211-42/+34
| * | | | | make changes from PR reviewHubert Chathi2019-08-011-6/+18
| * | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-0132-462/+638
| |\ \ \ \ \
| * | | | | | allow uploading keys for cross-signingHubert Chathi2019-07-253-6/+216
* | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1Richard van der Hoff2019-10-181-4/+9
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix presence timeouts when synchrotron restarts. (#6212)Erik Johnston2019-10-181-4/+9
* | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1Richard van der Hoff2019-10-182-10/+4
|\| | | | | |
| * | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storageHubert Chathi2019-10-111-8/+2
| |\ \ \ \ \ \
| | * | | | | | make sure we actually return somethingHubert Chathi2019-10-101-0/+5
| | * | | | | | make storage layer in charge of interpreting the device key dataHubert Chathi2019-10-101-11/+0
| * | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionHubert Chathi2019-10-111-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | make version optional in body of e2e backup version updateHubert Chathi2019-10-091-2/+2
| | |/ / / / / /
* | / / / / / / rip out some unreachable codeRichard van der Hoff2019-10-171-102/+0
|/ / / / / / /
* | | | | | | Add domain validation when creating room with list of invitees (#6121)werner2912019-10-101-1/+3
* | | | | | | Fix races in room stats (and other) updates. (#6187)Richard van der Hoff2019-10-103-14/+31
* | | | | | | Move tag/push rules room upgrade checking ealier (#6155)Andrew Morgan2019-10-101-18/+44
|/ / / / / /
* | | | | | Remove unused public room list timeout param (#6179)Andrew Morgan2019-10-081-12/+1
* | | | | | Merge pull request #6161 from matrix-org/erikj/dont_regen_user_id_on_failureErik Johnston2019-10-071-6/+4
|\ \ \ \ \ \
| * | | | | | Remove unused variableErik Johnston2019-10-031-2/+0
| * | | | | | Don't regenerate numeric user ID if registration fails.Erik Johnston2019-10-031-4/+4
* | | | | | | add some logging to the rooms stats updates, to try to track down a flaky tes...Richard van der Hoff2019-10-071-0/+1
* | | | | | | Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revokedBrendan Abolivier2019-10-041-2/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | TypoBrendan Abolivier2019-10-041-1/+1
| * | | | | | LintBrendan Abolivier2019-10-041-3/+1
| * | | | | | Incorporate reviewBrendan Abolivier2019-10-041-14/+8
| * | | | | | Add test caseBrendan Abolivier2019-10-031-1/+1
| * | | | | | LintBrendan Abolivier2019-10-021-1/+3
| * | | | | | Don't 500 code when trying to exchange a revoked 3PID inviteBrendan Abolivier2019-10-021-2/+13
* | | | | | | Fix public room list pagination.Erik Johnston2019-10-021-10/+23
* | | | | | | 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 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 Morgan2019-09-272-364/+359
* | | | | | Fix dummy event insertion consent bug (#6053)Neil Johnson2019-09-261-27/+72
* | | | | | 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)Richard van der Hoff2019-09-252-1/+36
* | | | | | Refactor the user-interactive auth handling (#6105)Richard van der Hoff2019-09-253-131/+248
* | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-241-0/+10
|\ \ \ \ \ \
| * | | | | | Add sid to next_link for email validation (#6097)J. Ryan Stinnett2019-09-241-0/+10
* | | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-243-82/+192
|\| | | | | |
| * | | | | | 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 Morgan2019-09-232-4/+21
| * | | | | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2019-09-231-0/+34
| * | | | | | Implement MSC2290 (#6043)Andrew Morgan2019-09-232-52/+86
| * | | | | | 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 Morgan2019-09-201-14/+3
* | | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | v2 3PID Invites (part of MSC2140) (#5979)Andrew Morgan2019-09-171-23/+81
| * | | | | | 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 Morgan2019-09-113-35/+203
| * | | | | | 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 Morgan2019-09-111-10/+2
| * | | | | | | 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 Morgan2019-09-111-1/+6
| |/ / / / / /
| * | | | | | 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
| * | | | | | | 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 Morgan2019-09-061-1/+7
| * | | | | | 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 Morgan2019-09-063-71/+153
| * | | | | 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 Morgan2019-09-051-41/+119
| * | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2019-09-051-1/+2
| |/ / / /
| * | | | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2019-09-041-44/+6
| * | | | Fix and refactor room and user stats (#5971)Erik Johnston2019-09-041-175/+132
| * | | | code cleanupsAndrew Morgan2019-09-031-7/+2
| * | | | Fix docstringAndrew Morgan2019-09-031-2/+1
| * | | | Remove unnecessary variable declarationAndrew Morgan2019-09-031-1/+0
| * | | | fix typoMatthew Hodgson2019-09-031-1/+1
| * | | | Remove double return statements (#5962)Andrew Morgan2019-09-035-7/+0
| * | | | Opentrace device lists (#5853)Jorik Schellekens2019-09-032-3/+68
| * | | | 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 Morgan2019-08-3010-19/+19
| * | | | Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937)Andrew Morgan2019-08-302-132/+9
| | |_|/ | |/| |
| * | | 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 Morgan2019-08-282-9/+132
| * | | | Implement a structured logging output system. (#5680)Amber Brown2019-08-281-2/+3
| * | | | 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/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_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)reivilibre2019-08-271-0/+10
| |/ / / /
| * | | | 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)Jorik Schellekens2019-08-222-3/+77
| * | | | Servlet to purge old rooms (#5845)Richard van der Hoff2019-08-221-0/+17
| * | | | 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...Michael Telatynski2019-08-151-1/+13
| |/ / /
* | | | 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
|/ / /
* | | 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_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_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
* | | | Remove duplicate return statementAndrew Morgan2019-07-311-1/+0
| |/ / |/| |
* | | 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)Richard van der Hoff2019-07-301-1/+1
* | | Room Complexity Client Implementation (#5783)Amber Brown2019-07-302-4/+105
|/ /
* | 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)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
|\ \
| * | Log when we receive a /make_* request from a different originRichard van der Hoff2019-07-261-2/+35
| |/
* | 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)Richard van der Hoff2019-07-241-1/+7
* | Replace returnValue with return (#5736)Amber Brown2019-07-2332-364/+330
|/
* 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 Morgan2019-07-151-0/+9
* 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)Richard van der Hoff2019-07-122-14/+38
* | | Inline issue_access_token (#5659)Richard van der Hoff2019-07-111-7/+3
* | | 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)Richard van der Hoff2019-07-101-1/+1
|/ / /
* | | 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)Hubert Chathi2019-07-091-4/+1
* | | | | 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)Richard van der Hoff2019-07-081-24/+3
* | | | | 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)Richard van der Hoff2019-07-053-81/+0
| |_|/ |/| |
* | | 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)Richard van der Hoff2019-07-031-1/+9
* | | 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_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)Daniel Hoffend2019-06-272-1/+4
* | | 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 Morgan2019-06-251-51/+89
* | 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
| |/