summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add option to allow profile queries without sharing a room (#6523)Will Hunt2019-12-161-1/+5
* Exclude rejected state events when calculating state at backwards extrems (#6...Richard van der Hoff2019-12-161-1/+1
* Persist auth/state events at backwards extremities when we fetch them (#6526)Richard van der Hoff2019-12-161-167/+80
* sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-131-0/+1
* Merge pull request #6496 from matrix-org/erikj/initial_sync_asnycErik Johnston2019-12-131-52/+44
|\
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/initial_sy...Erik Johnston2019-12-118-236/+452
| |\
| * | Port synapse.handlers.initial_sync to async/awaitErik Johnston2019-12-091-52/+44
* | | look up cross-signing keys from the DB in bulk (#6486)Hubert Chathi2019-12-121-8/+27
* | | Check the room_id of events when fetching room state/auth (#6524)Richard van der Hoff2019-12-121-23/+51
| |/ |/|
* | Add `include_event_in_state` to _get_state_for_room (#6521)Richard van der Hoff2019-12-111-22/+28
* | Merge pull request #6517 from matrix-org/rav/event_auth/13Richard van der Hoff2019-12-112-98/+88
|\ \
| * | convert to async: FederationHandler._process_received_pduRichard van der Hoff2019-12-111-11/+10
| * | convert to async: FederationHandler._get_state_for_roomRichard van der Hoff2019-12-111-21/+21
| * | convert to async: FederationHandler.on_receive_pduRichard van der Hoff2019-12-111-27/+22
| * | Convert federation backfill to asyncRichard van der Hoff2019-12-112-39/+35
* | | Merge pull request #6504 from matrix-org/erikj/account_validity_async_awaitErik Johnston2019-12-112-55/+45
|\ \ \ | |/ / |/| |
| * | Port handlers.account_validity to async/await.Erik Johnston2019-12-102-47/+41
| * | Port handlers.account_data to async/await.Erik Johnston2019-12-101-9/+5
* | | Clean up some logging (#6515)Richard van der Hoff2019-12-111-18/+19
* | | Prevent redacted events from appearing in message search (#6377)Andrew Morgan2019-12-112-4/+8
* | | Prevent message search in upgraded rooms we're not in (#6385)Andrew Morgan2019-12-112-11/+27
* | | Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-101-6/+95
* | | Allow SAML username provider plugins (#6411)Andrew Morgan2019-12-101-28/+170
* | | Merge pull request #6506 from matrix-org/erikj/remove_snapshot_cacheErik Johnston2019-12-101-11/+8
|\ \ \ | |/ / |/| / | |/
| * Remove SnapshotCache in favour of ResponseCacheErik Johnston2019-12-091-11/+8
* | Back out perf regression from get_cross_signing_keys_from_cache. (#6494)Neil Johnson2019-12-091-30/+8
|/
* Merge pull request #6493 from matrix-org/erikj/invite_state_configErik Johnston2019-12-091-1/+3
|\
| * Pull out room_invite_state_types config option once.Erik Johnston2019-12-091-1/+3
* | Merge pull request #6484 from matrix-org/erikj/port_sync_handlerErik Johnston2019-12-093-152/+131
|\ \ | |/ |/|
| * Fixup functions to consistently return deferredsErik Johnston2019-12-062-4/+4
| * Port SyncHandler to async/awaitErik Johnston2019-12-052-151/+130
* | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925)Manuel Stahl2019-12-051-9/+12
|/
* Stronger typing in the federation handler (#6480)Richard van der Hoff2019-12-051-24/+57
* Sanity-check the rooms of auth events before pulling them in. (#6472)Richard van der Hoff2019-12-051-9/+25
* get rid of (most of) have_events from _update_auth_events_and_context_for_aut...Richard van der Hoff2019-12-041-38/+24
* Merge pull request #6441 from syamgk/fix-parameter-mismatchErik Johnston2019-12-041-1/+1
|\
| * Issue #6406 Fix parameter mismatchSyam G Krishnan2019-12-041-1/+1
* | Merge pull request #6329 from matrix-org/babolivier/context_filtersBrendan Abolivier2019-12-041-2/+12
|\ \
| * \ Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-0414-192/+395
| |\ \
| * | | Incorporate reviewBrendan Abolivier2019-12-041-2/+1
| * | | Also filter state eventsBrendan Abolivier2019-11-061-1/+7
| * | | Only filter if a filter was providedBrendan Abolivier2019-11-051-4/+6
| * | | Update copyrightBrendan Abolivier2019-11-051-1/+2
| * | | Filter events_before and events_after in /context requestsBrendan Abolivier2019-11-051-2/+4
* | | | Add ephemeral messages support (MSC2228) (#6409)Brendan Abolivier2019-12-032-1/+130
| |/ / |/| |
* | | Transfer power level state events on room upgrade (#6237)Andrew Morgan2019-12-021-5/+31
| |/ |/|
* | Merge pull request #6434 from matrix-org/erikj/msc2367_membership_reasonsErik Johnston2019-11-293-7/+15
|\ \
| * | Propagate reason in remotely rejected invitesErik Johnston2019-11-283-7/+15
* | | Discard retention policies when retrieving stateBrendan Abolivier2019-11-281-1/+1
|/ /
* | Remove local threepids on account deactivation (#6426)Andrew Morgan2019-11-281-0/+3
* | add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-271-50/+80
* | Merge pull request #6358 from matrix-org/babolivier/message_retentionBrendan Abolivier2019-11-273-4/+110
|\ \
| * \ Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-269-88/+111
| |\ \
| * | | Fix 3PID invite exchangeBrendan Abolivier2019-11-191-1/+1
| * | | LintBrendan Abolivier2019-11-191-11/+6
| * | | Implement per-room message retention policiesBrendan Abolivier2019-11-043-3/+114
| | |/ | |/|
* | | Merge pull request #6343 from matrix-org/rav/event_auth/4Richard van der Hoff2019-11-261-37/+44
|\ \ \ | |_|/ |/| |
| * | remove confusing fixmeRichard van der Hoff2019-11-261-6/+0
| * | Merge remote-tracking branch 'origin/develop' into rav/event_auth/4Richard van der Hoff2019-11-186-11/+11
| |\ \
| * | | Use get_events_as_list rather than lots of calls to get_eventRichard van der Hoff2019-11-081-16/+8
| * | | Update some docstrings and commentsRichard van der Hoff2019-11-081-8/+31
| * | | Simplify _update_auth_events_and_context_for_authRichard van der Hoff2019-11-081-11/+9
* | | | 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